From 65a05a9d7a7f2c9e0450a62606cfd6180c22ead2 Mon Sep 17 00:00:00 2001
From: Zachary Scheuren <scheuren@adobe.com>
Date: Mon, 22 Jun 2020 10:50:08 -0700
Subject: [PATCH] Fix reversed STAT flags

---
 c/makeotf/makeotf_lib/build/hotpccts/featgram.g      |  4 ++--
 c/makeotf/makeotf_lib/source/hotconv/featgram.c      |  8 ++++----
 tests/makeotfexe_data/expected_output/spec/9i-1.ttx  | 10 +++++-----
 tests/makeotfexe_data/expected_output/spec/9i-2.ttx  |  2 +-
 tests/makeotfexe_data/expected_output/spec/9i-20.ttx |  2 +-
 tests/makeotfexe_data/expected_output/spec/9i-21.ttx |  2 +-
 tests/makeotfexe_data/expected_output/spec/9i-25.ttx |  4 ++--
 tests/makeotfexe_data/expected_output/spec/9i-4.ttx  |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/c/makeotf/makeotf_lib/build/hotpccts/featgram.g b/c/makeotf/makeotf_lib/build/hotpccts/featgram.g
index ff8d68216..a272ed9e4 100644
--- a/c/makeotf/makeotf_lib/build/hotpccts/featgram.g
+++ b/c/makeotf/makeotf_lib/build/hotpccts/featgram.g
@@ -1988,9 +1988,9 @@ designAxis
 
 axisValueFlag[uint16_t *flags]
 	:
-		K_ElidableAxisValueName     << *flags |= 0x0001; >>
+		K_OlderSiblingFontAttribute     << *flags |= 0x0001; >>
 		|
-		K_OlderSiblingFontAttribute << *flags |= 0x0002; >>
+		K_ElidableAxisValueName << *flags |= 0x0002; >>
 	;
 
 axisValueFlags>[uint16_t flags]
diff --git a/c/makeotf/makeotf_lib/source/hotconv/featgram.c b/c/makeotf/makeotf_lib/source/hotconv/featgram.c
index 82c99868d..103b85151 100644
--- a/c/makeotf/makeotf_lib/source/hotconv/featgram.c
+++ b/c/makeotf/makeotf_lib/source/hotconv/featgram.c
@@ -4723,14 +4723,14 @@ axisValueFlag(uint16_t *flags)
     zzBLOCK(zztasp1);
     zzMake0;
     {
-        if ((LA(1) == K_ElidableAxisValueName)) {
-            zzmatch(K_ElidableAxisValueName);
+        if ((LA(1) == K_OlderSiblingFontAttribute)) {
+            zzmatch(K_OlderSiblingFontAttribute);
             *flags |= 0x0001;
             zzCONSUME;
 
         } else {
-            if ((LA(1) == K_OlderSiblingFontAttribute)) {
-                zzmatch(K_OlderSiblingFontAttribute);
+            if ((LA(1) == K_ElidableAxisValueName)) {
+                zzmatch(K_ElidableAxisValueName);
                 *flags |= 0x0002;
                 zzCONSUME;
 
diff --git a/tests/makeotfexe_data/expected_output/spec/9i-1.ttx b/tests/makeotfexe_data/expected_output/spec/9i-1.ttx
index 1f51a2c15..f8848ce23 100644
--- a/tests/makeotfexe_data/expected_output/spec/9i-1.ttx
+++ b/tests/makeotfexe_data/expected_output/spec/9i-1.ttx
@@ -87,13 +87,13 @@
     <AxisValueArray>
       <AxisValue index="0" Format="1">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="259"/>  <!-- Regular -->
         <Value value="400.0"/>
       </AxisValue>
       <AxisValue index="1" Format="2">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="260"/>  <!-- Regular -->
         <NominalValue value="400.0"/>
         <RangeMinValue value="300.0"/>
@@ -101,21 +101,21 @@
       </AxisValue>
       <AxisValue index="2" Format="3">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="261"/>  <!-- Regular -->
         <Value value="400.0"/>
         <LinkedValue value="700.0"/>
       </AxisValue>
       <AxisValue index="3" Format="3">
         <AxisIndex value="1"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="262"/>  <!-- Regular -->
         <Value value="0.0"/>
         <LinkedValue value="1.0"/>
       </AxisValue>
       <AxisValue index="4" Format="4">
         <!-- AxisCount=2 -->
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="263"/>  <!-- Mediumitalic -->
         <AxisValueRecord index="0">
           <AxisIndex value="0"/>
diff --git a/tests/makeotfexe_data/expected_output/spec/9i-2.ttx b/tests/makeotfexe_data/expected_output/spec/9i-2.ttx
index 23074bb87..d2ca2fcf5 100644
--- a/tests/makeotfexe_data/expected_output/spec/9i-2.ttx
+++ b/tests/makeotfexe_data/expected_output/spec/9i-2.ttx
@@ -16,7 +16,7 @@
     <AxisValueArray>
       <AxisValue index="0" Format="1">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="257"/>  <!-- Regular -->
         <Value value="400.0"/>
       </AxisValue>
diff --git a/tests/makeotfexe_data/expected_output/spec/9i-20.ttx b/tests/makeotfexe_data/expected_output/spec/9i-20.ttx
index 3eed775b4..fc15174be 100644
--- a/tests/makeotfexe_data/expected_output/spec/9i-20.ttx
+++ b/tests/makeotfexe_data/expected_output/spec/9i-20.ttx
@@ -64,7 +64,7 @@
     <AxisValueArray>
       <AxisValue index="0" Format="1">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="257"/>  <!-- Regular -->
         <Value value="400.0"/>
       </AxisValue>
diff --git a/tests/makeotfexe_data/expected_output/spec/9i-21.ttx b/tests/makeotfexe_data/expected_output/spec/9i-21.ttx
index 3eed775b4..fc15174be 100644
--- a/tests/makeotfexe_data/expected_output/spec/9i-21.ttx
+++ b/tests/makeotfexe_data/expected_output/spec/9i-21.ttx
@@ -64,7 +64,7 @@
     <AxisValueArray>
       <AxisValue index="0" Format="1">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="257"/>  <!-- Regular -->
         <Value value="400.0"/>
       </AxisValue>
diff --git a/tests/makeotfexe_data/expected_output/spec/9i-25.ttx b/tests/makeotfexe_data/expected_output/spec/9i-25.ttx
index 2e72179f8..629404981 100644
--- a/tests/makeotfexe_data/expected_output/spec/9i-25.ttx
+++ b/tests/makeotfexe_data/expected_output/spec/9i-25.ttx
@@ -21,7 +21,7 @@
     <AxisValueArray>
       <AxisValue index="0" Format="2">
         <AxisIndex value="0"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="259"/>  <!-- Regular -->
         <NominalValue value="400.0"/>
         <RangeMinValue value="-300.54"/>
@@ -29,7 +29,7 @@
       </AxisValue>
       <AxisValue index="1" Format="1">
         <AxisIndex value="1"/>
-        <Flags value="1"/>
+        <Flags value="2"/>
         <ValueNameID value="260"/>  <!-- Italic -->
         <Value value="1.0"/>
       </AxisValue>
diff --git a/tests/makeotfexe_data/expected_output/spec/9i-4.ttx b/tests/makeotfexe_data/expected_output/spec/9i-4.ttx
index 623716b05..9f34f6828 100644
--- a/tests/makeotfexe_data/expected_output/spec/9i-4.ttx
+++ b/tests/makeotfexe_data/expected_output/spec/9i-4.ttx
@@ -16,7 +16,7 @@
     <AxisValueArray>
       <AxisValue index="0" Format="1">
         <AxisIndex value="0"/>
-        <Flags value="2"/>
+        <Flags value="1"/>
         <ValueNameID value="258"/>  <!-- Regular -->
         <Value value="400.0"/>
       </AxisValue>