From 26a2616286be1856c9bbff13a0aec414acf46b1b Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Thu, 26 Oct 2017 11:25:06 +0100
Subject: [PATCH] [varLib_test] upldate expected results

We pass the fvar axis order to VariationModel after
https://github.com/fonttools/fonttools/commit/645b7a8355de3e17ef22e2e078ab6123af945c44
---
 Tests/varLib/data/test_results/Build.ttx     | 614 +++++++++----------
 Tests/varLib/data/test_results/BuildMain.ttx | 614 +++++++++----------
 2 files changed, 614 insertions(+), 614 deletions(-)

diff --git a/Tests/varLib/data/test_results/Build.ttx b/Tests/varLib/data/test_results/Build.ttx
index 7b97d7210..efb2e8870 100644
--- a/Tests/varLib/data/test_results/Build.ttx
+++ b/Tests/varLib/data/test_results/Build.ttx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.14">
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.17">
 
   <GDEF>
     <Version value="0x00010003"/>
@@ -9,18 +9,6 @@
         <!-- RegionAxisCount=2 -->
         <!-- RegionCount=5 -->
         <Region index="0">
-          <VarRegionAxis index="0">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="0.0"/>
-            <EndCoord value="0.0"/>
-          </VarRegionAxis>
-          <VarRegionAxis index="1">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="1.0"/>
-            <EndCoord value="1.0"/>
-          </VarRegionAxis>
-        </Region>
-        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
             <PeakCoord value="-1.0"/>
@@ -32,7 +20,7 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
-        <Region index="2">
+        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="0.0"/>
             <PeakCoord value="1.0"/>
@@ -44,6 +32,18 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.0"/>
+            <EndCoord value="0.0"/>
+          </VarRegionAxis>
+          <VarRegionAxis index="1">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
         <Region index="3">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
@@ -91,18 +91,6 @@
         <!-- RegionAxisCount=2 -->
         <!-- RegionCount=5 -->
         <Region index="0">
-          <VarRegionAxis index="0">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="0.0"/>
-            <EndCoord value="0.0"/>
-          </VarRegionAxis>
-          <VarRegionAxis index="1">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="1.0"/>
-            <EndCoord value="1.0"/>
-          </VarRegionAxis>
-        </Region>
-        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
             <PeakCoord value="-1.0"/>
@@ -114,7 +102,7 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
-        <Region index="2">
+        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="0.0"/>
             <PeakCoord value="1.0"/>
@@ -126,6 +114,18 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.0"/>
+            <EndCoord value="0.0"/>
+          </VarRegionAxis>
+          <VarRegionAxis index="1">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
         <Region index="3">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
@@ -162,11 +162,11 @@
         <VarRegionIndex index="3" value="3"/>
         <VarRegionIndex index="4" value="4"/>
         <Item index="0" value="[0, 0, 0, 0, 0]"/>
-        <Item index="1" value="[0, 14, -28, 0, 0]"/>
-        <Item index="2" value="[0, -10, 17, 0, 0]"/>
-        <Item index="3" value="[0, -3, 32, 0, 0]"/>
-        <Item index="4" value="[0, -7, 63, 0, 0]"/>
-        <Item index="5" value="[0, -7, 63, 0, 0]"/>
+        <Item index="1" value="[14, -28, 0, 0, 0]"/>
+        <Item index="2" value="[-10, 17, 0, 0, 0]"/>
+        <Item index="3" value="[-3, 32, 0, 0, 0]"/>
+        <Item index="4" value="[-7, 63, 0, 0, 0]"/>
+        <Item index="5" value="[-7, 63, 0, 0, 0]"/>
       </VarData>
     </VarStore>
   </HVAR>
@@ -182,18 +182,6 @@
         <!-- RegionAxisCount=2 -->
         <!-- RegionCount=5 -->
         <Region index="0">
-          <VarRegionAxis index="0">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="0.0"/>
-            <EndCoord value="0.0"/>
-          </VarRegionAxis>
-          <VarRegionAxis index="1">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="1.0"/>
-            <EndCoord value="1.0"/>
-          </VarRegionAxis>
-        </Region>
-        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
             <PeakCoord value="-1.0"/>
@@ -205,7 +193,7 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
-        <Region index="2">
+        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="0.0"/>
             <PeakCoord value="1.0"/>
@@ -217,6 +205,18 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.0"/>
+            <EndCoord value="0.0"/>
+          </VarRegionAxis>
+          <VarRegionAxis index="1">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
         <Region index="3">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
@@ -252,8 +252,8 @@
         <VarRegionIndex index="2" value="2"/>
         <VarRegionIndex index="3" value="3"/>
         <VarRegionIndex index="4" value="4"/>
-        <Item index="0" value="[0, -4, 13, 0, 0]"/>
-        <Item index="1" value="[0, -2, 8, 0, 0]"/>
+        <Item index="0" value="[-4, 13, 0, 0, 0]"/>
+        <Item index="1" value="[-2, 8, 0, 0, 0]"/>
       </VarData>
     </VarStore>
     <ValueRecord index="0">
@@ -349,29 +349,6 @@
     <version value="1"/>
     <reserved value="0"/>
     <glyphVariations glyph=".notdef">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="4" y="0"/>
-        <delta pt="1" x="11" y="0"/>
-        <delta pt="2" x="-4" y="0"/>
-        <delta pt="3" x="-11" y="0"/>
-        <delta pt="4" x="-4" y="0"/>
-        <delta pt="5" x="11" y="0"/>
-        <delta pt="6" x="4" y="0"/>
-        <delta pt="7" x="-11" y="0"/>
-        <delta pt="8" x="0" y="0"/>
-        <delta pt="9" x="0" y="0"/>
-        <delta pt="10" x="0" y="0"/>
-        <delta pt="11" x="0" y="0"/>
-        <delta pt="12" x="0" y="0"/>
-        <delta pt="13" x="0" y="0"/>
-        <delta pt="14" x="0" y="0"/>
-        <delta pt="15" x="0" y="0"/>
-        <delta pt="16" x="0" y="0"/>
-        <delta pt="17" x="0" y="0"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="0" y="0"/>
@@ -418,6 +395,29 @@
         <delta pt="18" x="0" y="-18"/>
         <delta pt="19" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="4" y="0"/>
+        <delta pt="1" x="11" y="0"/>
+        <delta pt="2" x="-4" y="0"/>
+        <delta pt="3" x="-11" y="0"/>
+        <delta pt="4" x="-4" y="0"/>
+        <delta pt="5" x="11" y="0"/>
+        <delta pt="6" x="4" y="0"/>
+        <delta pt="7" x="-11" y="0"/>
+        <delta pt="8" x="0" y="0"/>
+        <delta pt="9" x="0" y="0"/>
+        <delta pt="10" x="0" y="0"/>
+        <delta pt="11" x="0" y="0"/>
+        <delta pt="12" x="0" y="0"/>
+        <delta pt="13" x="0" y="0"/>
+        <delta pt="14" x="0" y="0"/>
+        <delta pt="15" x="0" y="0"/>
+        <delta pt="16" x="0" y="0"/>
+        <delta pt="17" x="0" y="0"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -484,37 +484,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0041">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="2" y="0"/>
-        <delta pt="1" x="2" y="-9"/>
-        <delta pt="2" x="-4" y="-9"/>
-        <delta pt="3" x="-4" y="-9"/>
-        <delta pt="4" x="-2" y="-9"/>
-        <delta pt="5" x="-2" y="0"/>
-        <delta pt="6" x="2" y="0"/>
-        <delta pt="7" x="-4" y="0"/>
-        <delta pt="8" x="-4" y="0"/>
-        <delta pt="9" x="-4" y="0"/>
-        <delta pt="10" x="-4" y="0"/>
-        <delta pt="11" x="-6" y="8"/>
-        <delta pt="12" x="-10" y="0"/>
-        <delta pt="13" x="-2" y="0"/>
-        <delta pt="14" x="0" y="5"/>
-        <delta pt="15" x="-3" y="-5"/>
-        <delta pt="16" x="5" y="-5"/>
-        <delta pt="17" x="-1" y="5"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="-8"/>
-        <delta pt="20" x="4" y="-8"/>
-        <delta pt="21" x="0" y="-8"/>
-        <delta pt="22" x="0" y="-8"/>
-        <delta pt="23" x="0" y="0"/>
-        <delta pt="24" x="0" y="0"/>
-        <delta pt="25" x="0" y="0"/>
-        <delta pt="26" x="0" y="0"/>
-        <delta pt="27" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="7" y="0"/>
@@ -577,6 +546,37 @@
         <delta pt="26" x="0" y="-23"/>
         <delta pt="27" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="2" y="0"/>
+        <delta pt="1" x="2" y="-9"/>
+        <delta pt="2" x="-4" y="-9"/>
+        <delta pt="3" x="-4" y="-9"/>
+        <delta pt="4" x="-2" y="-9"/>
+        <delta pt="5" x="-2" y="0"/>
+        <delta pt="6" x="2" y="0"/>
+        <delta pt="7" x="-4" y="0"/>
+        <delta pt="8" x="-4" y="0"/>
+        <delta pt="9" x="-4" y="0"/>
+        <delta pt="10" x="-4" y="0"/>
+        <delta pt="11" x="-6" y="8"/>
+        <delta pt="12" x="-10" y="0"/>
+        <delta pt="13" x="-2" y="0"/>
+        <delta pt="14" x="0" y="5"/>
+        <delta pt="15" x="-3" y="-5"/>
+        <delta pt="16" x="5" y="-5"/>
+        <delta pt="17" x="-1" y="5"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="-8"/>
+        <delta pt="20" x="4" y="-8"/>
+        <delta pt="21" x="0" y="-8"/>
+        <delta pt="22" x="0" y="-8"/>
+        <delta pt="23" x="0" y="0"/>
+        <delta pt="24" x="0" y="0"/>
+        <delta pt="25" x="0" y="0"/>
+        <delta pt="26" x="0" y="0"/>
+        <delta pt="27" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -643,74 +643,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0061">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="0" y="-3"/>
-        <delta pt="1" x="0" y="-1"/>
-        <delta pt="2" x="0" y="-3"/>
-        <delta pt="3" x="0" y="-3"/>
-        <delta pt="4" x="0" y="-3"/>
-        <delta pt="5" x="0" y="-3"/>
-        <delta pt="6" x="0" y="-3"/>
-        <delta pt="7" x="0" y="4"/>
-        <delta pt="8" x="0" y="4"/>
-        <delta pt="9" x="2" y="5"/>
-        <delta pt="10" x="6" y="7"/>
-        <delta pt="11" x="1" y="5"/>
-        <delta pt="12" x="0" y="-1"/>
-        <delta pt="13" x="0" y="-6"/>
-        <delta pt="14" x="0" y="-6"/>
-        <delta pt="15" x="-1" y="-6"/>
-        <delta pt="16" x="0" y="-6"/>
-        <delta pt="17" x="0" y="-6"/>
-        <delta pt="18" x="0" y="-5"/>
-        <delta pt="19" x="0" y="-4"/>
-        <delta pt="20" x="0" y="-1"/>
-        <delta pt="21" x="0" y="0"/>
-        <delta pt="22" x="0" y="0"/>
-        <delta pt="23" x="0" y="0"/>
-        <delta pt="24" x="0" y="0"/>
-        <delta pt="25" x="0" y="0"/>
-        <delta pt="26" x="0" y="0"/>
-        <delta pt="27" x="0" y="-1"/>
-        <delta pt="28" x="0" y="-2"/>
-        <delta pt="29" x="0" y="7"/>
-        <delta pt="30" x="0" y="6"/>
-        <delta pt="31" x="0" y="7"/>
-        <delta pt="32" x="0" y="7"/>
-        <delta pt="33" x="0" y="7"/>
-        <delta pt="34" x="0" y="7"/>
-        <delta pt="35" x="0" y="7"/>
-        <delta pt="36" x="0" y="0"/>
-        <delta pt="37" x="0" y="0"/>
-        <delta pt="38" x="0" y="0"/>
-        <delta pt="39" x="0" y="0"/>
-        <delta pt="40" x="0" y="0"/>
-        <delta pt="41" x="0" y="0"/>
-        <delta pt="42" x="0" y="0"/>
-        <delta pt="43" x="0" y="0"/>
-        <delta pt="44" x="0" y="0"/>
-        <delta pt="45" x="0" y="0"/>
-        <delta pt="46" x="0" y="0"/>
-        <delta pt="47" x="0" y="0"/>
-        <delta pt="48" x="0" y="0"/>
-        <delta pt="49" x="0" y="-6"/>
-        <delta pt="50" x="0" y="-7"/>
-        <delta pt="51" x="0" y="-8"/>
-        <delta pt="52" x="0" y="-8"/>
-        <delta pt="53" x="1" y="-8"/>
-        <delta pt="54" x="2" y="-5"/>
-        <delta pt="55" x="4" y="-2"/>
-        <delta pt="56" x="0" y="0"/>
-        <delta pt="57" x="0" y="0"/>
-        <delta pt="58" x="0" y="0"/>
-        <delta pt="59" x="0" y="0"/>
-        <delta pt="60" x="0" y="-1"/>
-        <delta pt="61" x="0" y="0"/>
-        <delta pt="62" x="0" y="0"/>
-        <delta pt="63" x="0" y="0"/>
-        <delta pt="64" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="11" y="-8"/>
@@ -847,6 +779,74 @@
         <delta pt="63" x="0" y="16"/>
         <delta pt="64" x="0" y="3"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="0" y="-3"/>
+        <delta pt="1" x="0" y="-1"/>
+        <delta pt="2" x="0" y="-3"/>
+        <delta pt="3" x="0" y="-3"/>
+        <delta pt="4" x="0" y="-3"/>
+        <delta pt="5" x="0" y="-3"/>
+        <delta pt="6" x="0" y="-3"/>
+        <delta pt="7" x="0" y="4"/>
+        <delta pt="8" x="0" y="4"/>
+        <delta pt="9" x="2" y="5"/>
+        <delta pt="10" x="6" y="7"/>
+        <delta pt="11" x="1" y="5"/>
+        <delta pt="12" x="0" y="-1"/>
+        <delta pt="13" x="0" y="-6"/>
+        <delta pt="14" x="0" y="-6"/>
+        <delta pt="15" x="-1" y="-6"/>
+        <delta pt="16" x="0" y="-6"/>
+        <delta pt="17" x="0" y="-6"/>
+        <delta pt="18" x="0" y="-5"/>
+        <delta pt="19" x="0" y="-4"/>
+        <delta pt="20" x="0" y="-1"/>
+        <delta pt="21" x="0" y="0"/>
+        <delta pt="22" x="0" y="0"/>
+        <delta pt="23" x="0" y="0"/>
+        <delta pt="24" x="0" y="0"/>
+        <delta pt="25" x="0" y="0"/>
+        <delta pt="26" x="0" y="0"/>
+        <delta pt="27" x="0" y="-1"/>
+        <delta pt="28" x="0" y="-2"/>
+        <delta pt="29" x="0" y="7"/>
+        <delta pt="30" x="0" y="6"/>
+        <delta pt="31" x="0" y="7"/>
+        <delta pt="32" x="0" y="7"/>
+        <delta pt="33" x="0" y="7"/>
+        <delta pt="34" x="0" y="7"/>
+        <delta pt="35" x="0" y="7"/>
+        <delta pt="36" x="0" y="0"/>
+        <delta pt="37" x="0" y="0"/>
+        <delta pt="38" x="0" y="0"/>
+        <delta pt="39" x="0" y="0"/>
+        <delta pt="40" x="0" y="0"/>
+        <delta pt="41" x="0" y="0"/>
+        <delta pt="42" x="0" y="0"/>
+        <delta pt="43" x="0" y="0"/>
+        <delta pt="44" x="0" y="0"/>
+        <delta pt="45" x="0" y="0"/>
+        <delta pt="46" x="0" y="0"/>
+        <delta pt="47" x="0" y="0"/>
+        <delta pt="48" x="0" y="0"/>
+        <delta pt="49" x="0" y="-6"/>
+        <delta pt="50" x="0" y="-7"/>
+        <delta pt="51" x="0" y="-8"/>
+        <delta pt="52" x="0" y="-8"/>
+        <delta pt="53" x="1" y="-8"/>
+        <delta pt="54" x="2" y="-5"/>
+        <delta pt="55" x="4" y="-2"/>
+        <delta pt="56" x="0" y="0"/>
+        <delta pt="57" x="0" y="0"/>
+        <delta pt="58" x="0" y="0"/>
+        <delta pt="59" x="0" y="0"/>
+        <delta pt="60" x="0" y="-1"/>
+        <delta pt="61" x="0" y="0"/>
+        <delta pt="62" x="0" y="0"/>
+        <delta pt="63" x="0" y="0"/>
+        <delta pt="64" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -987,75 +987,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0024">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="0" y="-7"/>
-        <delta pt="1" x="-1" y="-7"/>
-        <delta pt="2" x="0" y="-3"/>
-        <delta pt="3" x="0" y="-2"/>
-        <delta pt="4" x="0" y="0"/>
-        <delta pt="5" x="0" y="0"/>
-        <delta pt="6" x="0" y="0"/>
-        <delta pt="7" x="0" y="0"/>
-        <delta pt="8" x="0" y="0"/>
-        <delta pt="9" x="0" y="0"/>
-        <delta pt="10" x="0" y="0"/>
-        <delta pt="11" x="0" y="0"/>
-        <delta pt="12" x="0" y="0"/>
-        <delta pt="13" x="0" y="0"/>
-        <delta pt="14" x="2" y="0"/>
-        <delta pt="15" x="0" y="0"/>
-        <delta pt="16" x="0" y="0"/>
-        <delta pt="17" x="-1" y="0"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="0"/>
-        <delta pt="20" x="0" y="0"/>
-        <delta pt="21" x="0" y="0"/>
-        <delta pt="22" x="0" y="0"/>
-        <delta pt="23" x="-1" y="9"/>
-        <delta pt="24" x="0" y="7"/>
-        <delta pt="25" x="0" y="7"/>
-        <delta pt="26" x="0" y="7"/>
-        <delta pt="27" x="0" y="7"/>
-        <delta pt="28" x="-1" y="7"/>
-        <delta pt="29" x="0" y="2"/>
-        <delta pt="30" x="0" y="3"/>
-        <delta pt="31" x="0" y="1"/>
-        <delta pt="32" x="0" y="0"/>
-        <delta pt="33" x="0" y="0"/>
-        <delta pt="34" x="0" y="0"/>
-        <delta pt="35" x="0" y="0"/>
-        <delta pt="36" x="0" y="0"/>
-        <delta pt="37" x="0" y="1"/>
-        <delta pt="38" x="0" y="1"/>
-        <delta pt="39" x="0" y="0"/>
-        <delta pt="40" x="0" y="0"/>
-        <delta pt="41" x="0" y="0"/>
-        <delta pt="42" x="0" y="0"/>
-        <delta pt="43" x="0" y="0"/>
-        <delta pt="44" x="0" y="0"/>
-        <delta pt="45" x="0" y="0"/>
-        <delta pt="46" x="0" y="0"/>
-        <delta pt="47" x="0" y="0"/>
-        <delta pt="48" x="0" y="0"/>
-        <delta pt="49" x="0" y="0"/>
-        <delta pt="50" x="0" y="-6"/>
-        <delta pt="51" x="0" y="-7"/>
-        <delta pt="52" x="0" y="-6"/>
-        <delta pt="53" x="0" y="-7"/>
-        <delta pt="54" x="-4" y="0"/>
-        <delta pt="55" x="4" y="0"/>
-        <delta pt="56" x="4" y="0"/>
-        <delta pt="57" x="-4" y="0"/>
-        <delta pt="58" x="4" y="0"/>
-        <delta pt="59" x="4" y="0"/>
-        <delta pt="60" x="-4" y="0"/>
-        <delta pt="61" x="-4" y="0"/>
-        <delta pt="62" x="0" y="0"/>
-        <delta pt="63" x="0" y="0"/>
-        <delta pt="64" x="0" y="0"/>
-        <delta pt="65" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="-3" y="-28"/>
@@ -1194,6 +1125,75 @@
         <delta pt="64" x="0" y="-19"/>
         <delta pt="65" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="0" y="-7"/>
+        <delta pt="1" x="-1" y="-7"/>
+        <delta pt="2" x="0" y="-3"/>
+        <delta pt="3" x="0" y="-2"/>
+        <delta pt="4" x="0" y="0"/>
+        <delta pt="5" x="0" y="0"/>
+        <delta pt="6" x="0" y="0"/>
+        <delta pt="7" x="0" y="0"/>
+        <delta pt="8" x="0" y="0"/>
+        <delta pt="9" x="0" y="0"/>
+        <delta pt="10" x="0" y="0"/>
+        <delta pt="11" x="0" y="0"/>
+        <delta pt="12" x="0" y="0"/>
+        <delta pt="13" x="0" y="0"/>
+        <delta pt="14" x="2" y="0"/>
+        <delta pt="15" x="0" y="0"/>
+        <delta pt="16" x="0" y="0"/>
+        <delta pt="17" x="-1" y="0"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="0"/>
+        <delta pt="20" x="0" y="0"/>
+        <delta pt="21" x="0" y="0"/>
+        <delta pt="22" x="0" y="0"/>
+        <delta pt="23" x="-1" y="9"/>
+        <delta pt="24" x="0" y="7"/>
+        <delta pt="25" x="0" y="7"/>
+        <delta pt="26" x="0" y="7"/>
+        <delta pt="27" x="0" y="7"/>
+        <delta pt="28" x="-1" y="7"/>
+        <delta pt="29" x="0" y="2"/>
+        <delta pt="30" x="0" y="3"/>
+        <delta pt="31" x="0" y="1"/>
+        <delta pt="32" x="0" y="0"/>
+        <delta pt="33" x="0" y="0"/>
+        <delta pt="34" x="0" y="0"/>
+        <delta pt="35" x="0" y="0"/>
+        <delta pt="36" x="0" y="0"/>
+        <delta pt="37" x="0" y="1"/>
+        <delta pt="38" x="0" y="1"/>
+        <delta pt="39" x="0" y="0"/>
+        <delta pt="40" x="0" y="0"/>
+        <delta pt="41" x="0" y="0"/>
+        <delta pt="42" x="0" y="0"/>
+        <delta pt="43" x="0" y="0"/>
+        <delta pt="44" x="0" y="0"/>
+        <delta pt="45" x="0" y="0"/>
+        <delta pt="46" x="0" y="0"/>
+        <delta pt="47" x="0" y="0"/>
+        <delta pt="48" x="0" y="0"/>
+        <delta pt="49" x="0" y="0"/>
+        <delta pt="50" x="0" y="-6"/>
+        <delta pt="51" x="0" y="-7"/>
+        <delta pt="52" x="0" y="-6"/>
+        <delta pt="53" x="0" y="-7"/>
+        <delta pt="54" x="-4" y="0"/>
+        <delta pt="55" x="4" y="0"/>
+        <delta pt="56" x="4" y="0"/>
+        <delta pt="57" x="-4" y="0"/>
+        <delta pt="58" x="4" y="0"/>
+        <delta pt="59" x="4" y="0"/>
+        <delta pt="60" x="-4" y="0"/>
+        <delta pt="61" x="-4" y="0"/>
+        <delta pt="62" x="0" y="0"/>
+        <delta pt="63" x="0" y="0"/>
+        <delta pt="64" x="0" y="0"/>
+        <delta pt="65" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -1336,75 +1336,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0024.nostroke">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="0" y="-7"/>
-        <delta pt="1" x="-1" y="-7"/>
-        <delta pt="2" x="-1" y="-6"/>
-        <delta pt="3" x="-1" y="-5"/>
-        <delta pt="4" x="-1" y="-4"/>
-        <delta pt="5" x="0" y="0"/>
-        <delta pt="6" x="0" y="0"/>
-        <delta pt="7" x="0" y="0"/>
-        <delta pt="8" x="0" y="0"/>
-        <delta pt="9" x="0" y="0"/>
-        <delta pt="10" x="0" y="0"/>
-        <delta pt="11" x="0" y="0"/>
-        <delta pt="12" x="0" y="0"/>
-        <delta pt="13" x="0" y="0"/>
-        <delta pt="14" x="2" y="0"/>
-        <delta pt="15" x="0" y="0"/>
-        <delta pt="16" x="0" y="0"/>
-        <delta pt="17" x="-1" y="0"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="0"/>
-        <delta pt="20" x="0" y="0"/>
-        <delta pt="21" x="0" y="0"/>
-        <delta pt="22" x="0" y="0"/>
-        <delta pt="23" x="-1" y="9"/>
-        <delta pt="24" x="0" y="7"/>
-        <delta pt="25" x="0" y="7"/>
-        <delta pt="26" x="0" y="7"/>
-        <delta pt="27" x="0" y="7"/>
-        <delta pt="28" x="0" y="7"/>
-        <delta pt="29" x="1" y="2"/>
-        <delta pt="30" x="1" y="4"/>
-        <delta pt="31" x="1" y="2"/>
-        <delta pt="32" x="0" y="0"/>
-        <delta pt="33" x="0" y="0"/>
-        <delta pt="34" x="0" y="0"/>
-        <delta pt="35" x="0" y="0"/>
-        <delta pt="36" x="0" y="0"/>
-        <delta pt="37" x="0" y="1"/>
-        <delta pt="38" x="0" y="1"/>
-        <delta pt="39" x="0" y="0"/>
-        <delta pt="40" x="0" y="0"/>
-        <delta pt="41" x="0" y="0"/>
-        <delta pt="42" x="0" y="0"/>
-        <delta pt="43" x="0" y="0"/>
-        <delta pt="44" x="0" y="0"/>
-        <delta pt="45" x="0" y="0"/>
-        <delta pt="46" x="0" y="0"/>
-        <delta pt="47" x="0" y="0"/>
-        <delta pt="48" x="0" y="0"/>
-        <delta pt="49" x="0" y="0"/>
-        <delta pt="50" x="0" y="-6"/>
-        <delta pt="51" x="0" y="-7"/>
-        <delta pt="52" x="0" y="-6"/>
-        <delta pt="53" x="0" y="-7"/>
-        <delta pt="54" x="-4" y="4"/>
-        <delta pt="55" x="4" y="4"/>
-        <delta pt="56" x="4" y="0"/>
-        <delta pt="57" x="-4" y="0"/>
-        <delta pt="58" x="0" y="0"/>
-        <delta pt="59" x="0" y="-4"/>
-        <delta pt="60" x="-7" y="-4"/>
-        <delta pt="61" x="-7" y="0"/>
-        <delta pt="62" x="0" y="0"/>
-        <delta pt="63" x="0" y="0"/>
-        <delta pt="64" x="0" y="0"/>
-        <delta pt="65" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="-3" y="-28"/>
@@ -1543,6 +1474,75 @@
         <delta pt="64" x="0" y="-19"/>
         <delta pt="65" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="0" y="-7"/>
+        <delta pt="1" x="-1" y="-7"/>
+        <delta pt="2" x="-1" y="-6"/>
+        <delta pt="3" x="-1" y="-5"/>
+        <delta pt="4" x="-1" y="-4"/>
+        <delta pt="5" x="0" y="0"/>
+        <delta pt="6" x="0" y="0"/>
+        <delta pt="7" x="0" y="0"/>
+        <delta pt="8" x="0" y="0"/>
+        <delta pt="9" x="0" y="0"/>
+        <delta pt="10" x="0" y="0"/>
+        <delta pt="11" x="0" y="0"/>
+        <delta pt="12" x="0" y="0"/>
+        <delta pt="13" x="0" y="0"/>
+        <delta pt="14" x="2" y="0"/>
+        <delta pt="15" x="0" y="0"/>
+        <delta pt="16" x="0" y="0"/>
+        <delta pt="17" x="-1" y="0"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="0"/>
+        <delta pt="20" x="0" y="0"/>
+        <delta pt="21" x="0" y="0"/>
+        <delta pt="22" x="0" y="0"/>
+        <delta pt="23" x="-1" y="9"/>
+        <delta pt="24" x="0" y="7"/>
+        <delta pt="25" x="0" y="7"/>
+        <delta pt="26" x="0" y="7"/>
+        <delta pt="27" x="0" y="7"/>
+        <delta pt="28" x="0" y="7"/>
+        <delta pt="29" x="1" y="2"/>
+        <delta pt="30" x="1" y="4"/>
+        <delta pt="31" x="1" y="2"/>
+        <delta pt="32" x="0" y="0"/>
+        <delta pt="33" x="0" y="0"/>
+        <delta pt="34" x="0" y="0"/>
+        <delta pt="35" x="0" y="0"/>
+        <delta pt="36" x="0" y="0"/>
+        <delta pt="37" x="0" y="1"/>
+        <delta pt="38" x="0" y="1"/>
+        <delta pt="39" x="0" y="0"/>
+        <delta pt="40" x="0" y="0"/>
+        <delta pt="41" x="0" y="0"/>
+        <delta pt="42" x="0" y="0"/>
+        <delta pt="43" x="0" y="0"/>
+        <delta pt="44" x="0" y="0"/>
+        <delta pt="45" x="0" y="0"/>
+        <delta pt="46" x="0" y="0"/>
+        <delta pt="47" x="0" y="0"/>
+        <delta pt="48" x="0" y="0"/>
+        <delta pt="49" x="0" y="0"/>
+        <delta pt="50" x="0" y="-6"/>
+        <delta pt="51" x="0" y="-7"/>
+        <delta pt="52" x="0" y="-6"/>
+        <delta pt="53" x="0" y="-7"/>
+        <delta pt="54" x="-4" y="4"/>
+        <delta pt="55" x="4" y="4"/>
+        <delta pt="56" x="4" y="0"/>
+        <delta pt="57" x="-4" y="0"/>
+        <delta pt="58" x="0" y="0"/>
+        <delta pt="59" x="0" y="-4"/>
+        <delta pt="60" x="-7" y="-4"/>
+        <delta pt="61" x="-7" y="0"/>
+        <delta pt="62" x="0" y="0"/>
+        <delta pt="63" x="0" y="0"/>
+        <delta pt="64" x="0" y="0"/>
+        <delta pt="65" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
diff --git a/Tests/varLib/data/test_results/BuildMain.ttx b/Tests/varLib/data/test_results/BuildMain.ttx
index 9c455aeb6..ce6d04ec3 100644
--- a/Tests/varLib/data/test_results/BuildMain.ttx
+++ b/Tests/varLib/data/test_results/BuildMain.ttx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.8">
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.17">
 
   <GlyphOrder>
     <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
@@ -612,18 +612,6 @@
         <!-- RegionAxisCount=2 -->
         <!-- RegionCount=5 -->
         <Region index="0">
-          <VarRegionAxis index="0">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="0.0"/>
-            <EndCoord value="0.0"/>
-          </VarRegionAxis>
-          <VarRegionAxis index="1">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="1.0"/>
-            <EndCoord value="1.0"/>
-          </VarRegionAxis>
-        </Region>
-        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
             <PeakCoord value="-1.0"/>
@@ -635,7 +623,7 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
-        <Region index="2">
+        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="0.0"/>
             <PeakCoord value="1.0"/>
@@ -647,6 +635,18 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.0"/>
+            <EndCoord value="0.0"/>
+          </VarRegionAxis>
+          <VarRegionAxis index="1">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
         <Region index="3">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
@@ -694,18 +694,6 @@
         <!-- RegionAxisCount=2 -->
         <!-- RegionCount=5 -->
         <Region index="0">
-          <VarRegionAxis index="0">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="0.0"/>
-            <EndCoord value="0.0"/>
-          </VarRegionAxis>
-          <VarRegionAxis index="1">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="1.0"/>
-            <EndCoord value="1.0"/>
-          </VarRegionAxis>
-        </Region>
-        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
             <PeakCoord value="-1.0"/>
@@ -717,7 +705,7 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
-        <Region index="2">
+        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="0.0"/>
             <PeakCoord value="1.0"/>
@@ -729,6 +717,18 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.0"/>
+            <EndCoord value="0.0"/>
+          </VarRegionAxis>
+          <VarRegionAxis index="1">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
         <Region index="3">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
@@ -765,11 +765,11 @@
         <VarRegionIndex index="3" value="3"/>
         <VarRegionIndex index="4" value="4"/>
         <Item index="0" value="[0, 0, 0, 0, 0]"/>
-        <Item index="1" value="[0, 14, -28, 0, 0]"/>
-        <Item index="2" value="[0, -10, 17, 0, 0]"/>
-        <Item index="3" value="[0, -3, 32, 0, 0]"/>
-        <Item index="4" value="[0, -7, 63, 0, 0]"/>
-        <Item index="5" value="[0, -7, 63, 0, 0]"/>
+        <Item index="1" value="[14, -28, 0, 0, 0]"/>
+        <Item index="2" value="[-10, 17, 0, 0, 0]"/>
+        <Item index="3" value="[-3, 32, 0, 0, 0]"/>
+        <Item index="4" value="[-7, 63, 0, 0, 0]"/>
+        <Item index="5" value="[-7, 63, 0, 0, 0]"/>
       </VarData>
     </VarStore>
   </HVAR>
@@ -785,18 +785,6 @@
         <!-- RegionAxisCount=2 -->
         <!-- RegionCount=5 -->
         <Region index="0">
-          <VarRegionAxis index="0">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="0.0"/>
-            <EndCoord value="0.0"/>
-          </VarRegionAxis>
-          <VarRegionAxis index="1">
-            <StartCoord value="0.0"/>
-            <PeakCoord value="1.0"/>
-            <EndCoord value="1.0"/>
-          </VarRegionAxis>
-        </Region>
-        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
             <PeakCoord value="-1.0"/>
@@ -808,7 +796,7 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
-        <Region index="2">
+        <Region index="1">
           <VarRegionAxis index="0">
             <StartCoord value="0.0"/>
             <PeakCoord value="1.0"/>
@@ -820,6 +808,18 @@
             <EndCoord value="0.0"/>
           </VarRegionAxis>
         </Region>
+        <Region index="2">
+          <VarRegionAxis index="0">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="0.0"/>
+            <EndCoord value="0.0"/>
+          </VarRegionAxis>
+          <VarRegionAxis index="1">
+            <StartCoord value="0.0"/>
+            <PeakCoord value="1.0"/>
+            <EndCoord value="1.0"/>
+          </VarRegionAxis>
+        </Region>
         <Region index="3">
           <VarRegionAxis index="0">
             <StartCoord value="-1.0"/>
@@ -855,8 +855,8 @@
         <VarRegionIndex index="2" value="2"/>
         <VarRegionIndex index="3" value="3"/>
         <VarRegionIndex index="4" value="4"/>
-        <Item index="0" value="[0, -4, 13, 0, 0]"/>
-        <Item index="1" value="[0, -2, 8, 0, 0]"/>
+        <Item index="0" value="[-4, 13, 0, 0, 0]"/>
+        <Item index="1" value="[-2, 8, 0, 0, 0]"/>
       </VarData>
     </VarStore>
     <ValueRecord index="0">
@@ -966,29 +966,6 @@
     <version value="1"/>
     <reserved value="0"/>
     <glyphVariations glyph=".notdef">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="4" y="0"/>
-        <delta pt="1" x="11" y="0"/>
-        <delta pt="2" x="-4" y="0"/>
-        <delta pt="3" x="-11" y="0"/>
-        <delta pt="4" x="-4" y="0"/>
-        <delta pt="5" x="11" y="0"/>
-        <delta pt="6" x="4" y="0"/>
-        <delta pt="7" x="-11" y="0"/>
-        <delta pt="8" x="0" y="0"/>
-        <delta pt="9" x="0" y="0"/>
-        <delta pt="10" x="0" y="0"/>
-        <delta pt="11" x="0" y="0"/>
-        <delta pt="12" x="0" y="0"/>
-        <delta pt="13" x="0" y="0"/>
-        <delta pt="14" x="0" y="0"/>
-        <delta pt="15" x="0" y="0"/>
-        <delta pt="16" x="0" y="0"/>
-        <delta pt="17" x="0" y="0"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="0" y="0"/>
@@ -1035,6 +1012,29 @@
         <delta pt="18" x="0" y="-18"/>
         <delta pt="19" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="4" y="0"/>
+        <delta pt="1" x="11" y="0"/>
+        <delta pt="2" x="-4" y="0"/>
+        <delta pt="3" x="-11" y="0"/>
+        <delta pt="4" x="-4" y="0"/>
+        <delta pt="5" x="11" y="0"/>
+        <delta pt="6" x="4" y="0"/>
+        <delta pt="7" x="-11" y="0"/>
+        <delta pt="8" x="0" y="0"/>
+        <delta pt="9" x="0" y="0"/>
+        <delta pt="10" x="0" y="0"/>
+        <delta pt="11" x="0" y="0"/>
+        <delta pt="12" x="0" y="0"/>
+        <delta pt="13" x="0" y="0"/>
+        <delta pt="14" x="0" y="0"/>
+        <delta pt="15" x="0" y="0"/>
+        <delta pt="16" x="0" y="0"/>
+        <delta pt="17" x="0" y="0"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -1101,37 +1101,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0041">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="2" y="0"/>
-        <delta pt="1" x="2" y="-9"/>
-        <delta pt="2" x="-4" y="-9"/>
-        <delta pt="3" x="-4" y="-9"/>
-        <delta pt="4" x="-2" y="-9"/>
-        <delta pt="5" x="-2" y="0"/>
-        <delta pt="6" x="2" y="0"/>
-        <delta pt="7" x="-4" y="0"/>
-        <delta pt="8" x="-4" y="0"/>
-        <delta pt="9" x="-4" y="0"/>
-        <delta pt="10" x="-4" y="0"/>
-        <delta pt="11" x="-6" y="8"/>
-        <delta pt="12" x="-10" y="0"/>
-        <delta pt="13" x="-2" y="0"/>
-        <delta pt="14" x="0" y="5"/>
-        <delta pt="15" x="-3" y="-5"/>
-        <delta pt="16" x="5" y="-5"/>
-        <delta pt="17" x="-1" y="5"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="-8"/>
-        <delta pt="20" x="4" y="-8"/>
-        <delta pt="21" x="0" y="-8"/>
-        <delta pt="22" x="0" y="-8"/>
-        <delta pt="23" x="0" y="0"/>
-        <delta pt="24" x="0" y="0"/>
-        <delta pt="25" x="0" y="0"/>
-        <delta pt="26" x="0" y="0"/>
-        <delta pt="27" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="7" y="0"/>
@@ -1194,6 +1163,37 @@
         <delta pt="26" x="0" y="-23"/>
         <delta pt="27" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="2" y="0"/>
+        <delta pt="1" x="2" y="-9"/>
+        <delta pt="2" x="-4" y="-9"/>
+        <delta pt="3" x="-4" y="-9"/>
+        <delta pt="4" x="-2" y="-9"/>
+        <delta pt="5" x="-2" y="0"/>
+        <delta pt="6" x="2" y="0"/>
+        <delta pt="7" x="-4" y="0"/>
+        <delta pt="8" x="-4" y="0"/>
+        <delta pt="9" x="-4" y="0"/>
+        <delta pt="10" x="-4" y="0"/>
+        <delta pt="11" x="-6" y="8"/>
+        <delta pt="12" x="-10" y="0"/>
+        <delta pt="13" x="-2" y="0"/>
+        <delta pt="14" x="0" y="5"/>
+        <delta pt="15" x="-3" y="-5"/>
+        <delta pt="16" x="5" y="-5"/>
+        <delta pt="17" x="-1" y="5"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="-8"/>
+        <delta pt="20" x="4" y="-8"/>
+        <delta pt="21" x="0" y="-8"/>
+        <delta pt="22" x="0" y="-8"/>
+        <delta pt="23" x="0" y="0"/>
+        <delta pt="24" x="0" y="0"/>
+        <delta pt="25" x="0" y="0"/>
+        <delta pt="26" x="0" y="0"/>
+        <delta pt="27" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -1260,74 +1260,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0061">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="0" y="-3"/>
-        <delta pt="1" x="0" y="-1"/>
-        <delta pt="2" x="0" y="-3"/>
-        <delta pt="3" x="0" y="-3"/>
-        <delta pt="4" x="0" y="-3"/>
-        <delta pt="5" x="0" y="-3"/>
-        <delta pt="6" x="0" y="-3"/>
-        <delta pt="7" x="0" y="4"/>
-        <delta pt="8" x="0" y="4"/>
-        <delta pt="9" x="2" y="5"/>
-        <delta pt="10" x="6" y="7"/>
-        <delta pt="11" x="1" y="5"/>
-        <delta pt="12" x="0" y="-1"/>
-        <delta pt="13" x="0" y="-6"/>
-        <delta pt="14" x="0" y="-6"/>
-        <delta pt="15" x="-1" y="-6"/>
-        <delta pt="16" x="0" y="-6"/>
-        <delta pt="17" x="0" y="-6"/>
-        <delta pt="18" x="0" y="-5"/>
-        <delta pt="19" x="0" y="-4"/>
-        <delta pt="20" x="0" y="-1"/>
-        <delta pt="21" x="0" y="0"/>
-        <delta pt="22" x="0" y="0"/>
-        <delta pt="23" x="0" y="0"/>
-        <delta pt="24" x="0" y="0"/>
-        <delta pt="25" x="0" y="0"/>
-        <delta pt="26" x="0" y="0"/>
-        <delta pt="27" x="0" y="-1"/>
-        <delta pt="28" x="0" y="-2"/>
-        <delta pt="29" x="0" y="7"/>
-        <delta pt="30" x="0" y="6"/>
-        <delta pt="31" x="0" y="7"/>
-        <delta pt="32" x="0" y="7"/>
-        <delta pt="33" x="0" y="7"/>
-        <delta pt="34" x="0" y="7"/>
-        <delta pt="35" x="0" y="7"/>
-        <delta pt="36" x="0" y="0"/>
-        <delta pt="37" x="0" y="0"/>
-        <delta pt="38" x="0" y="0"/>
-        <delta pt="39" x="0" y="0"/>
-        <delta pt="40" x="0" y="0"/>
-        <delta pt="41" x="0" y="0"/>
-        <delta pt="42" x="0" y="0"/>
-        <delta pt="43" x="0" y="0"/>
-        <delta pt="44" x="0" y="0"/>
-        <delta pt="45" x="0" y="0"/>
-        <delta pt="46" x="0" y="0"/>
-        <delta pt="47" x="0" y="0"/>
-        <delta pt="48" x="0" y="0"/>
-        <delta pt="49" x="0" y="-6"/>
-        <delta pt="50" x="0" y="-7"/>
-        <delta pt="51" x="0" y="-8"/>
-        <delta pt="52" x="0" y="-8"/>
-        <delta pt="53" x="1" y="-8"/>
-        <delta pt="54" x="2" y="-5"/>
-        <delta pt="55" x="4" y="-2"/>
-        <delta pt="56" x="0" y="0"/>
-        <delta pt="57" x="0" y="0"/>
-        <delta pt="58" x="0" y="0"/>
-        <delta pt="59" x="0" y="0"/>
-        <delta pt="60" x="0" y="-1"/>
-        <delta pt="61" x="0" y="0"/>
-        <delta pt="62" x="0" y="0"/>
-        <delta pt="63" x="0" y="0"/>
-        <delta pt="64" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="11" y="-8"/>
@@ -1464,6 +1396,74 @@
         <delta pt="63" x="0" y="16"/>
         <delta pt="64" x="0" y="3"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="0" y="-3"/>
+        <delta pt="1" x="0" y="-1"/>
+        <delta pt="2" x="0" y="-3"/>
+        <delta pt="3" x="0" y="-3"/>
+        <delta pt="4" x="0" y="-3"/>
+        <delta pt="5" x="0" y="-3"/>
+        <delta pt="6" x="0" y="-3"/>
+        <delta pt="7" x="0" y="4"/>
+        <delta pt="8" x="0" y="4"/>
+        <delta pt="9" x="2" y="5"/>
+        <delta pt="10" x="6" y="7"/>
+        <delta pt="11" x="1" y="5"/>
+        <delta pt="12" x="0" y="-1"/>
+        <delta pt="13" x="0" y="-6"/>
+        <delta pt="14" x="0" y="-6"/>
+        <delta pt="15" x="-1" y="-6"/>
+        <delta pt="16" x="0" y="-6"/>
+        <delta pt="17" x="0" y="-6"/>
+        <delta pt="18" x="0" y="-5"/>
+        <delta pt="19" x="0" y="-4"/>
+        <delta pt="20" x="0" y="-1"/>
+        <delta pt="21" x="0" y="0"/>
+        <delta pt="22" x="0" y="0"/>
+        <delta pt="23" x="0" y="0"/>
+        <delta pt="24" x="0" y="0"/>
+        <delta pt="25" x="0" y="0"/>
+        <delta pt="26" x="0" y="0"/>
+        <delta pt="27" x="0" y="-1"/>
+        <delta pt="28" x="0" y="-2"/>
+        <delta pt="29" x="0" y="7"/>
+        <delta pt="30" x="0" y="6"/>
+        <delta pt="31" x="0" y="7"/>
+        <delta pt="32" x="0" y="7"/>
+        <delta pt="33" x="0" y="7"/>
+        <delta pt="34" x="0" y="7"/>
+        <delta pt="35" x="0" y="7"/>
+        <delta pt="36" x="0" y="0"/>
+        <delta pt="37" x="0" y="0"/>
+        <delta pt="38" x="0" y="0"/>
+        <delta pt="39" x="0" y="0"/>
+        <delta pt="40" x="0" y="0"/>
+        <delta pt="41" x="0" y="0"/>
+        <delta pt="42" x="0" y="0"/>
+        <delta pt="43" x="0" y="0"/>
+        <delta pt="44" x="0" y="0"/>
+        <delta pt="45" x="0" y="0"/>
+        <delta pt="46" x="0" y="0"/>
+        <delta pt="47" x="0" y="0"/>
+        <delta pt="48" x="0" y="0"/>
+        <delta pt="49" x="0" y="-6"/>
+        <delta pt="50" x="0" y="-7"/>
+        <delta pt="51" x="0" y="-8"/>
+        <delta pt="52" x="0" y="-8"/>
+        <delta pt="53" x="1" y="-8"/>
+        <delta pt="54" x="2" y="-5"/>
+        <delta pt="55" x="4" y="-2"/>
+        <delta pt="56" x="0" y="0"/>
+        <delta pt="57" x="0" y="0"/>
+        <delta pt="58" x="0" y="0"/>
+        <delta pt="59" x="0" y="0"/>
+        <delta pt="60" x="0" y="-1"/>
+        <delta pt="61" x="0" y="0"/>
+        <delta pt="62" x="0" y="0"/>
+        <delta pt="63" x="0" y="0"/>
+        <delta pt="64" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -1604,75 +1604,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0024">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="0" y="-7"/>
-        <delta pt="1" x="-1" y="-7"/>
-        <delta pt="2" x="0" y="-3"/>
-        <delta pt="3" x="0" y="-2"/>
-        <delta pt="4" x="0" y="0"/>
-        <delta pt="5" x="0" y="0"/>
-        <delta pt="6" x="0" y="0"/>
-        <delta pt="7" x="0" y="0"/>
-        <delta pt="8" x="0" y="0"/>
-        <delta pt="9" x="0" y="0"/>
-        <delta pt="10" x="0" y="0"/>
-        <delta pt="11" x="0" y="0"/>
-        <delta pt="12" x="0" y="0"/>
-        <delta pt="13" x="0" y="0"/>
-        <delta pt="14" x="2" y="0"/>
-        <delta pt="15" x="0" y="0"/>
-        <delta pt="16" x="0" y="0"/>
-        <delta pt="17" x="-1" y="0"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="0"/>
-        <delta pt="20" x="0" y="0"/>
-        <delta pt="21" x="0" y="0"/>
-        <delta pt="22" x="0" y="0"/>
-        <delta pt="23" x="-1" y="9"/>
-        <delta pt="24" x="0" y="7"/>
-        <delta pt="25" x="0" y="7"/>
-        <delta pt="26" x="0" y="7"/>
-        <delta pt="27" x="0" y="7"/>
-        <delta pt="28" x="-1" y="7"/>
-        <delta pt="29" x="0" y="2"/>
-        <delta pt="30" x="0" y="3"/>
-        <delta pt="31" x="0" y="1"/>
-        <delta pt="32" x="0" y="0"/>
-        <delta pt="33" x="0" y="0"/>
-        <delta pt="34" x="0" y="0"/>
-        <delta pt="35" x="0" y="0"/>
-        <delta pt="36" x="0" y="0"/>
-        <delta pt="37" x="0" y="1"/>
-        <delta pt="38" x="0" y="1"/>
-        <delta pt="39" x="0" y="0"/>
-        <delta pt="40" x="0" y="0"/>
-        <delta pt="41" x="0" y="0"/>
-        <delta pt="42" x="0" y="0"/>
-        <delta pt="43" x="0" y="0"/>
-        <delta pt="44" x="0" y="0"/>
-        <delta pt="45" x="0" y="0"/>
-        <delta pt="46" x="0" y="0"/>
-        <delta pt="47" x="0" y="0"/>
-        <delta pt="48" x="0" y="0"/>
-        <delta pt="49" x="0" y="0"/>
-        <delta pt="50" x="0" y="-6"/>
-        <delta pt="51" x="0" y="-7"/>
-        <delta pt="52" x="0" y="-6"/>
-        <delta pt="53" x="0" y="-7"/>
-        <delta pt="54" x="-4" y="0"/>
-        <delta pt="55" x="4" y="0"/>
-        <delta pt="56" x="4" y="0"/>
-        <delta pt="57" x="-4" y="0"/>
-        <delta pt="58" x="4" y="0"/>
-        <delta pt="59" x="4" y="0"/>
-        <delta pt="60" x="-4" y="0"/>
-        <delta pt="61" x="-4" y="0"/>
-        <delta pt="62" x="0" y="0"/>
-        <delta pt="63" x="0" y="0"/>
-        <delta pt="64" x="0" y="0"/>
-        <delta pt="65" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="-3" y="-28"/>
@@ -1811,6 +1742,75 @@
         <delta pt="64" x="0" y="-19"/>
         <delta pt="65" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="0" y="-7"/>
+        <delta pt="1" x="-1" y="-7"/>
+        <delta pt="2" x="0" y="-3"/>
+        <delta pt="3" x="0" y="-2"/>
+        <delta pt="4" x="0" y="0"/>
+        <delta pt="5" x="0" y="0"/>
+        <delta pt="6" x="0" y="0"/>
+        <delta pt="7" x="0" y="0"/>
+        <delta pt="8" x="0" y="0"/>
+        <delta pt="9" x="0" y="0"/>
+        <delta pt="10" x="0" y="0"/>
+        <delta pt="11" x="0" y="0"/>
+        <delta pt="12" x="0" y="0"/>
+        <delta pt="13" x="0" y="0"/>
+        <delta pt="14" x="2" y="0"/>
+        <delta pt="15" x="0" y="0"/>
+        <delta pt="16" x="0" y="0"/>
+        <delta pt="17" x="-1" y="0"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="0"/>
+        <delta pt="20" x="0" y="0"/>
+        <delta pt="21" x="0" y="0"/>
+        <delta pt="22" x="0" y="0"/>
+        <delta pt="23" x="-1" y="9"/>
+        <delta pt="24" x="0" y="7"/>
+        <delta pt="25" x="0" y="7"/>
+        <delta pt="26" x="0" y="7"/>
+        <delta pt="27" x="0" y="7"/>
+        <delta pt="28" x="-1" y="7"/>
+        <delta pt="29" x="0" y="2"/>
+        <delta pt="30" x="0" y="3"/>
+        <delta pt="31" x="0" y="1"/>
+        <delta pt="32" x="0" y="0"/>
+        <delta pt="33" x="0" y="0"/>
+        <delta pt="34" x="0" y="0"/>
+        <delta pt="35" x="0" y="0"/>
+        <delta pt="36" x="0" y="0"/>
+        <delta pt="37" x="0" y="1"/>
+        <delta pt="38" x="0" y="1"/>
+        <delta pt="39" x="0" y="0"/>
+        <delta pt="40" x="0" y="0"/>
+        <delta pt="41" x="0" y="0"/>
+        <delta pt="42" x="0" y="0"/>
+        <delta pt="43" x="0" y="0"/>
+        <delta pt="44" x="0" y="0"/>
+        <delta pt="45" x="0" y="0"/>
+        <delta pt="46" x="0" y="0"/>
+        <delta pt="47" x="0" y="0"/>
+        <delta pt="48" x="0" y="0"/>
+        <delta pt="49" x="0" y="0"/>
+        <delta pt="50" x="0" y="-6"/>
+        <delta pt="51" x="0" y="-7"/>
+        <delta pt="52" x="0" y="-6"/>
+        <delta pt="53" x="0" y="-7"/>
+        <delta pt="54" x="-4" y="0"/>
+        <delta pt="55" x="4" y="0"/>
+        <delta pt="56" x="4" y="0"/>
+        <delta pt="57" x="-4" y="0"/>
+        <delta pt="58" x="4" y="0"/>
+        <delta pt="59" x="4" y="0"/>
+        <delta pt="60" x="-4" y="0"/>
+        <delta pt="61" x="-4" y="0"/>
+        <delta pt="62" x="0" y="0"/>
+        <delta pt="63" x="0" y="0"/>
+        <delta pt="64" x="0" y="0"/>
+        <delta pt="65" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>
@@ -1953,75 +1953,6 @@
       </tuple>
     </glyphVariations>
     <glyphVariations glyph="uni0024.nostroke">
-      <tuple>
-        <coord axis="cntr" value="1.0"/>
-        <delta pt="0" x="0" y="-7"/>
-        <delta pt="1" x="-1" y="-7"/>
-        <delta pt="2" x="-1" y="-6"/>
-        <delta pt="3" x="-1" y="-5"/>
-        <delta pt="4" x="-1" y="-4"/>
-        <delta pt="5" x="0" y="0"/>
-        <delta pt="6" x="0" y="0"/>
-        <delta pt="7" x="0" y="0"/>
-        <delta pt="8" x="0" y="0"/>
-        <delta pt="9" x="0" y="0"/>
-        <delta pt="10" x="0" y="0"/>
-        <delta pt="11" x="0" y="0"/>
-        <delta pt="12" x="0" y="0"/>
-        <delta pt="13" x="0" y="0"/>
-        <delta pt="14" x="2" y="0"/>
-        <delta pt="15" x="0" y="0"/>
-        <delta pt="16" x="0" y="0"/>
-        <delta pt="17" x="-1" y="0"/>
-        <delta pt="18" x="0" y="0"/>
-        <delta pt="19" x="0" y="0"/>
-        <delta pt="20" x="0" y="0"/>
-        <delta pt="21" x="0" y="0"/>
-        <delta pt="22" x="0" y="0"/>
-        <delta pt="23" x="-1" y="9"/>
-        <delta pt="24" x="0" y="7"/>
-        <delta pt="25" x="0" y="7"/>
-        <delta pt="26" x="0" y="7"/>
-        <delta pt="27" x="0" y="7"/>
-        <delta pt="28" x="0" y="7"/>
-        <delta pt="29" x="1" y="2"/>
-        <delta pt="30" x="1" y="4"/>
-        <delta pt="31" x="1" y="2"/>
-        <delta pt="32" x="0" y="0"/>
-        <delta pt="33" x="0" y="0"/>
-        <delta pt="34" x="0" y="0"/>
-        <delta pt="35" x="0" y="0"/>
-        <delta pt="36" x="0" y="0"/>
-        <delta pt="37" x="0" y="1"/>
-        <delta pt="38" x="0" y="1"/>
-        <delta pt="39" x="0" y="0"/>
-        <delta pt="40" x="0" y="0"/>
-        <delta pt="41" x="0" y="0"/>
-        <delta pt="42" x="0" y="0"/>
-        <delta pt="43" x="0" y="0"/>
-        <delta pt="44" x="0" y="0"/>
-        <delta pt="45" x="0" y="0"/>
-        <delta pt="46" x="0" y="0"/>
-        <delta pt="47" x="0" y="0"/>
-        <delta pt="48" x="0" y="0"/>
-        <delta pt="49" x="0" y="0"/>
-        <delta pt="50" x="0" y="-6"/>
-        <delta pt="51" x="0" y="-7"/>
-        <delta pt="52" x="0" y="-6"/>
-        <delta pt="53" x="0" y="-7"/>
-        <delta pt="54" x="-4" y="4"/>
-        <delta pt="55" x="4" y="4"/>
-        <delta pt="56" x="4" y="0"/>
-        <delta pt="57" x="-4" y="0"/>
-        <delta pt="58" x="0" y="0"/>
-        <delta pt="59" x="0" y="-4"/>
-        <delta pt="60" x="-7" y="-4"/>
-        <delta pt="61" x="-7" y="0"/>
-        <delta pt="62" x="0" y="0"/>
-        <delta pt="63" x="0" y="0"/>
-        <delta pt="64" x="0" y="0"/>
-        <delta pt="65" x="0" y="0"/>
-      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <delta pt="0" x="-3" y="-28"/>
@@ -2160,6 +2091,75 @@
         <delta pt="64" x="0" y="-19"/>
         <delta pt="65" x="0" y="0"/>
       </tuple>
+      <tuple>
+        <coord axis="cntr" value="1.0"/>
+        <delta pt="0" x="0" y="-7"/>
+        <delta pt="1" x="-1" y="-7"/>
+        <delta pt="2" x="-1" y="-6"/>
+        <delta pt="3" x="-1" y="-5"/>
+        <delta pt="4" x="-1" y="-4"/>
+        <delta pt="5" x="0" y="0"/>
+        <delta pt="6" x="0" y="0"/>
+        <delta pt="7" x="0" y="0"/>
+        <delta pt="8" x="0" y="0"/>
+        <delta pt="9" x="0" y="0"/>
+        <delta pt="10" x="0" y="0"/>
+        <delta pt="11" x="0" y="0"/>
+        <delta pt="12" x="0" y="0"/>
+        <delta pt="13" x="0" y="0"/>
+        <delta pt="14" x="2" y="0"/>
+        <delta pt="15" x="0" y="0"/>
+        <delta pt="16" x="0" y="0"/>
+        <delta pt="17" x="-1" y="0"/>
+        <delta pt="18" x="0" y="0"/>
+        <delta pt="19" x="0" y="0"/>
+        <delta pt="20" x="0" y="0"/>
+        <delta pt="21" x="0" y="0"/>
+        <delta pt="22" x="0" y="0"/>
+        <delta pt="23" x="-1" y="9"/>
+        <delta pt="24" x="0" y="7"/>
+        <delta pt="25" x="0" y="7"/>
+        <delta pt="26" x="0" y="7"/>
+        <delta pt="27" x="0" y="7"/>
+        <delta pt="28" x="0" y="7"/>
+        <delta pt="29" x="1" y="2"/>
+        <delta pt="30" x="1" y="4"/>
+        <delta pt="31" x="1" y="2"/>
+        <delta pt="32" x="0" y="0"/>
+        <delta pt="33" x="0" y="0"/>
+        <delta pt="34" x="0" y="0"/>
+        <delta pt="35" x="0" y="0"/>
+        <delta pt="36" x="0" y="0"/>
+        <delta pt="37" x="0" y="1"/>
+        <delta pt="38" x="0" y="1"/>
+        <delta pt="39" x="0" y="0"/>
+        <delta pt="40" x="0" y="0"/>
+        <delta pt="41" x="0" y="0"/>
+        <delta pt="42" x="0" y="0"/>
+        <delta pt="43" x="0" y="0"/>
+        <delta pt="44" x="0" y="0"/>
+        <delta pt="45" x="0" y="0"/>
+        <delta pt="46" x="0" y="0"/>
+        <delta pt="47" x="0" y="0"/>
+        <delta pt="48" x="0" y="0"/>
+        <delta pt="49" x="0" y="0"/>
+        <delta pt="50" x="0" y="-6"/>
+        <delta pt="51" x="0" y="-7"/>
+        <delta pt="52" x="0" y="-6"/>
+        <delta pt="53" x="0" y="-7"/>
+        <delta pt="54" x="-4" y="4"/>
+        <delta pt="55" x="4" y="4"/>
+        <delta pt="56" x="4" y="0"/>
+        <delta pt="57" x="-4" y="0"/>
+        <delta pt="58" x="0" y="0"/>
+        <delta pt="59" x="0" y="-4"/>
+        <delta pt="60" x="-7" y="-4"/>
+        <delta pt="61" x="-7" y="0"/>
+        <delta pt="62" x="0" y="0"/>
+        <delta pt="63" x="0" y="0"/>
+        <delta pt="64" x="0" y="0"/>
+        <delta pt="65" x="0" y="0"/>
+      </tuple>
       <tuple>
         <coord axis="wght" value="-1.0"/>
         <coord axis="cntr" value="1.0"/>