Merge branch 'main' of github.com:googlefonts/amstelvar-avar2

googlefonts · Apr 30, 2024 · 6ed4b83 · 6ed4b83
2 parents 4163850 + 26472ed
commit 6ed4b83
Show file tree

Hide file tree

Showing 15 changed files with 126 additions and 103 deletions.
diff --git a/Sources/Roman/AmstelvarA2-Roman_XOPQ310.ufo/glyphs.background/phi.glif b/Sources/Roman/AmstelvarA2-Roman_XOPQ310.ufo/glyphs.background/phi.glif
@@ -4,56 +4,16 @@
   <unicode hex="03C6"/>
   <outline>
     <contour>
-      <point x="678" y="1023" type="move"/>
-      <point x="966" y="1015"/>
-      <point x="1262" y="741"/>
-      <point x="1262" y="525" type="qcurve" smooth="yes"/>
-      <point x="1262" y="273"/>
-      <point x="947" y="-23"/>
-      <point x="694" y="-23" type="qcurve"/>
-    </contour>
-    <contour>
-      <point x="728" y="970" type="move"/>
-      <point x="745" y="33" type="line"/>
-      <point x="750" y="33" type="line"/>
-      <point x="762" y="-460" type="line"/>
-      <point x="601" y="-480" type="line"/>
-      <point x="566" y="-453" type="line"/>
-      <point x="578" y="33" type="line"/>
-      <point x="583" y="33" type="line"/>
-      <point x="593" y="970" type="line"/>
-      <point x="588" y="970" type="line"/>
-      <point x="591" y="1521" type="line"/>
-      <point x="692" y="1534" type="line"/>
-      <point x="727" y="1507" type="line"/>
-      <point x="733" y="970" type="line"/>
-    </contour>
-    <contour>
-      <point x="634" y="-23" type="move"/>
-      <point x="350" y="-15"/>
-      <point x="54" y="259"/>
-      <point x="54" y="475" type="qcurve" smooth="yes"/>
-      <point x="54" y="727"/>
-      <point x="369" y="1023"/>
-      <point x="643" y="1023" type="qcurve"/>
-    </contour>
-    <contour>
-      <point x="643" y="917" type="move"/>
-      <point x="438" y="917"/>
-      <point x="235" y="695"/>
-      <point x="235" y="491" type="qcurve" smooth="yes"/>
-      <point x="235" y="302"/>
-      <point x="430" y="89"/>
-      <point x="634" y="89" type="qcurve"/>
-    </contour>
-    <contour>
-      <point x="694" y="89" type="move"/>
-      <point x="878" y="89"/>
-      <point x="1081" y="311"/>
-      <point x="1081" y="515" type="qcurve" smooth="yes"/>
-      <point x="1081" y="704"/>
-      <point x="886" y="917"/>
-      <point x="678" y="917" type="qcurve"/>
+      <point x="921" y="-480" type="line"/>
+      <point x="896" y="-444" type="line"/>
+      <point x="965" y="30" type="line"/>
+      <point x="972" y="30" type="line"/>
+      <point x="1119" y="1519" type="line"/>
+      <point x="1230" y="1534" type="line"/>
+      <point x="1255" y="1498" type="line"/>
+      <point x="1393" y="30" type="line"/>
+      <point x="1400" y="30" type="line"/>
+      <point x="1478" y="-459" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/Sources/Roman/AmstelvarA2-Roman_XOPQ310.ufo/glyphs/phi.glif b/Sources/Roman/AmstelvarA2-Roman_XOPQ310.ufo/glyphs/phi.glif
@@ -4,20 +4,20 @@
   <unicode hex="03C6"/>
   <outline>
     <contour>
-      <point x="912" y="-480" type="line"/>
-      <point x="887" y="-444" type="line"/>
-      <point x="895" y="25" type="line"/>
-      <point x="902" y="25" type="line"/>
-      <point x="912" y="955" type="line"/>
-      <point x="905" y="955" type="line"/>
-      <point x="910" y="1519" type="line"/>
-      <point x="1331" y="1534" type="line"/>
-      <point x="1466" y="1498" type="line"/>
-      <point x="1471" y="955" type="line"/>
-      <point x="1464" y="955" type="line"/>
-      <point x="1473" y="25" type="line"/>
-      <point x="1480" y="25" type="line"/>
-      <point x="1489" y="-459" type="line"/>
+      <point x="922" y="-480" type="line"/>
+      <point x="897" y="-444" type="line"/>
+      <point x="965" y="25" type="line"/>
+      <point x="972" y="25" type="line"/>
+      <point x="1070" y="955" type="line"/>
+      <point x="1063" y="955" type="line"/>
+      <point x="1120" y="1519" type="line"/>
+      <point x="1231" y="1534" type="line"/>
+      <point x="1256" y="1498" type="line"/>
+      <point x="1306" y="955" type="line"/>
+      <point x="1299" y="955" type="line"/>
+      <point x="1393" y="25" type="line"/>
+      <point x="1400" y="25" type="line"/>
+      <point x="1479" y="-459" type="line"/>
     </contour>
     <contour>
       <point x="1188" y="-22" type="qcurve"/>

diff --git a/Sources/Roman/AmstelvarA2-Roman_XOPQ4.ufo/glyphs.background/contents.plist b/Sources/Roman/AmstelvarA2-Roman_XOPQ4.ufo/glyphs.background/contents.plist
@@ -82,6 +82,8 @@
     <string>mu.glif</string>
     <key>omega</key>
     <string>omega.glif</string>
+    <key>phi</key>
+    <string>phi.glif</string>
     <key>quotedblbase</key>
     <string>quotedblbase.glif</string>
     <key>quotedblleft</key>

diff --git a/Sources/Roman/AmstelvarA2-Roman_XOPQ4.ufo/glyphs.background/phi.glif b/Sources/Roman/AmstelvarA2-Roman_XOPQ4.ufo/glyphs.background/phi.glif
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="phi" format="2">
+  <advance width="985"/>
+  <unicode hex="03C6"/>
+  <outline>
+    <contour>
+      <point x="492" y="-480" type="line"/>
+      <point x="487" y="-475" type="line"/>
+      <point x="487" y="25" type="line"/>
+      <point x="476" y="25" type="line"/>
+      <point x="423" y="1519" type="line"/>
+      <point x="534" y="1534" type="line"/>
+      <point x="559" y="1498" type="line"/>
+      <point x="511" y="25" type="line"/>
+      <point x="499" y="25" type="line"/>
+      <point x="500" y="-478" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/Sources/Roman/AmstelvarA2-Roman_XOPQ4.ufo/glyphs/phi.glif b/Sources/Roman/AmstelvarA2-Roman_XOPQ4.ufo/glyphs/phi.glif
@@ -6,17 +6,17 @@
     <contour>
       <point x="492" y="-480" type="line"/>
       <point x="487" y="-475" type="line"/>
-      <point x="480" y="25" type="line"/>
-      <point x="475" y="25" type="line"/>
-      <point x="439" y="967" type="line"/>
-      <point x="429" y="967" type="line"/>
-      <point x="425" y="1519" type="line"/>
-      <point x="536" y="1534" type="line"/>
-      <point x="561" y="1498" type="line"/>
-      <point x="551" y="967" type="line"/>
-      <point x="545" y="967" type="line"/>
-      <point x="513" y="25" type="line"/>
-      <point x="509" y="25" type="line"/>
+      <point x="487" y="25" type="line"/>
+      <point x="476" y="25" type="line"/>
+      <point x="452" y="967" type="line"/>
+      <point x="442" y="967" type="line"/>
+      <point x="423" y="1519" type="line"/>
+      <point x="534" y="1534" type="line"/>
+      <point x="559" y="1498" type="line"/>
+      <point x="541" y="967" type="line"/>
+      <point x="535" y="967" type="line"/>
+      <point x="511" y="25" type="line"/>
+      <point x="499" y="25" type="line"/>
       <point x="500" y="-479" type="line"/>
     </contour>
     <contour>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs.background/contents.plist b/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs.background/contents.plist
@@ -18,6 +18,8 @@
     <string>gamma.glif</string>
     <key>nu</key>
     <string>nu.glif</string>
+    <key>phi</key>
+    <string>phi.glif</string>
     <key>xi</key>
     <string>xi.glif</string>
     <key>zeta</key>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs.background/phi.glif b/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs.background/phi.glif
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="phi" format="2">
+  <advance width="1337"/>
+  <unicode hex="03C6"/>
+  <outline>
+    <contour>
+      <point x="601" y="-480" type="line"/>
+      <point x="576" y="-444" type="line"/>
+      <point x="585" y="30" type="line"/>
+      <point x="592" y="30" type="line"/>
+      <point x="399" y="1519" type="line"/>
+      <point x="910" y="1534" type="line"/>
+      <point x="935" y="1498" type="line"/>
+      <point x="743" y="30" type="line"/>
+      <point x="750" y="30" type="line"/>
+      <point x="758" y="-459" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs/kappa.glif b/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs/kappa.glif
@@ -14,17 +14,17 @@
       <point x="343" y="21" type="line"/>
     </contour>
     <contour>
-      <point x="333" y="109" type="line"/>
+      <point x="323" y="109" type="line"/>
       <point x="175" y="460" type="line"/>
       <point x="473" y="861" type="line" smooth="yes"/>
       <point x="551" y="965"/>
       <point x="698" y="1010"/>
       <point x="977" y="1010" type="qcurve"/>
       <point x="1002" y="974" type="line"/>
       <point x="988" y="832" type="line"/>
-      <point x="955" y="832"/>
-      <point x="893" y="829"/>
-      <point x="843" y="764" type="qcurve" smooth="yes"/>
+      <point x="931" y="832"/>
+      <point x="865" y="806"/>
+      <point x="833" y="764" type="qcurve" smooth="yes"/>
     </contour>
     <contour>
       <point x="864" y="-8" type="line"/>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs/phi.glif b/Sources/Roman/AmstelvarA2-Roman_YOPQ204.ufo/glyphs/phi.glif
@@ -8,13 +8,13 @@
       <point x="577" y="-444" type="line"/>
       <point x="585" y="25" type="line"/>
       <point x="592" y="25" type="line"/>
-      <point x="602" y="955" type="line"/>
-      <point x="595" y="955" type="line"/>
-      <point x="600" y="1519" type="line"/>
-      <point x="711" y="1534" type="line"/>
-      <point x="736" y="1498" type="line"/>
-      <point x="741" y="955" type="line"/>
-      <point x="734" y="955" type="line"/>
+      <point x="482" y="955" type="line"/>
+      <point x="475" y="955" type="line"/>
+      <point x="400" y="1519" type="line"/>
+      <point x="911" y="1534" type="line"/>
+      <point x="936" y="1498" type="line"/>
+      <point x="861" y="955" type="line"/>
+      <point x="854" y="955" type="line"/>
       <point x="743" y="25" type="line"/>
       <point x="750" y="25" type="line"/>
       <point x="759" y="-459" type="line"/>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ4.ufo/glyphs.background/contents.plist b/Sources/Roman/AmstelvarA2-Roman_YOPQ4.ufo/glyphs.background/contents.plist
@@ -52,6 +52,8 @@
     <string>kappa.glif</string>
     <key>omega</key>
     <string>omega.glif</string>
+    <key>phi</key>
+    <string>phi.glif</string>
     <key>quotedblbase</key>
     <string>quotedblbase.glif</string>
     <key>quotedblleft</key>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ4.ufo/glyphs.background/phi.glif b/Sources/Roman/AmstelvarA2-Roman_YOPQ4.ufo/glyphs.background/phi.glif
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<glyph name="phi" format="2">
+  <advance width="1370"/>
+  <unicode hex="03C6"/>
+  <outline>
+    <contour>
+      <point x="604" y="-480" type="line"/>
+      <point x="579" y="-444" type="line"/>
+      <point x="587" y="-14" type="line"/>
+      <point x="607" y="-16" type="line"/>
+      <point x="663" y="1530" type="line"/>
+      <point x="674" y="1534" type="line"/>
+      <point x="677" y="1528" type="line"/>
+      <point x="733" y="-16" type="line"/>
+      <point x="752" y="-13" type="line"/>
+      <point x="761" y="-459" type="line"/>
+    </contour>
+  </outline>
+</glyph>
diff --git a/Sources/Roman/AmstelvarA2-Roman_YOPQ4.ufo/glyphs/phi.glif b/Sources/Roman/AmstelvarA2-Roman_YOPQ4.ufo/glyphs/phi.glif
@@ -6,17 +6,17 @@
     <contour>
       <point x="604" y="-480" type="line"/>
       <point x="579" y="-444" type="line"/>
-      <point x="600" y="-17" type="line"/>
-      <point x="612" y="-17" type="line"/>
-      <point x="651" y="1018" type="line"/>
-      <point x="651" y="1018" type="line"/>
-      <point x="662" y="1531" type="line"/>
-      <point x="672" y="1534" type="line"/>
-      <point x="677" y="1523" type="line"/>
-      <point x="687" y="1018" type="line"/>
-      <point x="687" y="1018" type="line"/>
-      <point x="727" y="-17" type="line"/>
-      <point x="739" y="-17" type="line"/>
+      <point x="587" y="-17" type="line"/>
+      <point x="607" y="-17" type="line"/>
+      <point x="644" y="1018" type="line"/>
+      <point x="644" y="1018" type="line"/>
+      <point x="663" y="1530" type="line"/>
+      <point x="674" y="1534" type="line"/>
+      <point x="677" y="1528" type="line"/>
+      <point x="695" y="1018" type="line"/>
+      <point x="695" y="1018" type="line"/>
+      <point x="733" y="-17" type="line"/>
+      <point x="752" y="-17" type="line"/>
       <point x="761" y="-459" type="line"/>
     </contour>
     <contour>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YSHL0.ufo/glyphs/alpha.glif b/Sources/Roman/AmstelvarA2-Roman_YSHL0.ufo/glyphs/alpha.glif
@@ -16,7 +16,7 @@
       <point x="874" y="754"/>
       <point x="904" y="544" type="qcurve"/>
       <point x="914" y="544" type="line"/>
-      <point x="1017" y="150"/>
+      <point x="1037" y="90"/>
       <point x="1088" y="29"/>
       <point x="1144" y="29" type="qcurve" smooth="yes"/>
       <point x="1218" y="29" type="line"/>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YSHL0.ufo/glyphs/iota.glif b/Sources/Roman/AmstelvarA2-Roman_YSHL0.ufo/glyphs/iota.glif
@@ -14,10 +14,10 @@
       <point x="319" y="1000" type="line"/>
       <point x="344" y="964" type="line"/>
       <point x="322" y="266" type="line"/>
-      <point x="322" y="170"/>
-      <point x="387" y="109"/>
-      <point x="430" y="109" type="qcurve"/>
-      <point x="520" y="109" type="line"/>
+      <point x="322" y="90"/>
+      <point x="387" y="29"/>
+      <point x="430" y="29" type="qcurve"/>
+      <point x="520" y="29" type="line"/>
       <point x="520" y="29" type="line"/>
     </contour>
   </outline>

diff --git a/Sources/Roman/AmstelvarA2-Roman_YSHL0.ufo/glyphs/mu.glif b/Sources/Roman/AmstelvarA2-Roman_YSHL0.ufo/glyphs/mu.glif
@@ -23,7 +23,7 @@
       <point x="967" y="1000" type="line"/>
       <point x="992" y="964" type="line"/>
       <point x="969" y="265" type="line"/>
-      <point x="969" y="176"/>
+      <point x="969" y="106"/>
       <point x="1029" y="28"/>
       <point x="1078" y="29" type="qcurve" smooth="yes"/>
       <point x="1147" y="29" type="line"/>