Skip to content

Commit

Permalink
manually fixing conflicts with remote
Browse files Browse the repository at this point in the history
  • Loading branch information
@gferreira
gferreira committed May 2, 2024
2 parents 232fe8e + 969dced commit 29e7929
Show file tree
Hide file tree
Showing 2,246 changed files with 603 additions and 105,098 deletions.
66 changes: 66 additions & 0 deletions Sources/Italic/AmstelvarA2-Italic_XOPQ310.ufo/glyphs.background/Q_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,72 @@
<glyph name="Q" format="2">
<advance width="1528"/>
<unicode hex="0051"/>
<anchor x="1289.0" y="0" name="bottom"/>
<anchor x="1289.0" y="1500" name="top"/>
<outline>
<contour>
<point x="560" y="867" type="qcurve" smooth="yes"/>
<point x="645" y="1193"/>
<point x="1146" y="1562"/>
<point x="1419" y="1519" type="qcurve" smooth="yes"/>
<point x="1710" y="1473"/>
<point x="1968" y="996"/>
<point x="1888" y="656" type="qcurve" smooth="yes"/>
<point x="1802" y="290"/>
<point x="1288" y="-35"/>
<point x="1025" y="5" type="qcurve" smooth="yes"/>
<point x="756" y="46"/>
<point x="472" y="529"/>
</contour>
<contour>
<point x="741" y="849" type="qcurve" smooth="yes"/>
<point x="668" y="559"/>
<point x="837" y="149"/>
<point x="1053" y="117" type="qcurve" smooth="yes"/>
<point x="1295" y="81"/>
<point x="1627" y="353"/>
<point x="1701" y="666" type="qcurve" smooth="yes"/>
<point x="1769" y="953"/>
<point x="1605" y="1351"/>
<point x="1387" y="1384" type="qcurve" smooth="yes"/>
<point x="1164" y="1418"/>
<point x="818" y="1158"/>
</contour>
<contour>
<point x="839" y="-3" type="qcurve"/>
<point x="1548" y="-315" type="line" smooth="yes"/>
<point x="1610" y="-342"/>
<point x="1732" y="-250"/>
<point x="1766" y="-199" type="qcurve"/>
<point x="1839" y="-262" type="line"/>
<point x="1792" y="-359"/>
<point x="1635" y="-480"/>
<point x="1518" y="-463" type="qcurve"/>
<point x="803" y="-142" type="line"/>
<point x="751" y="-134"/>
<point x="644" y="-162"/>
<point x="585" y="-205" type="qcurve"/>
<point x="534" y="-134" type="line"/>
<point x="596" y="-57"/>
<point x="753" y="5"/>
</contour>
<contour>
<point x="777" y="-53" type="line"/>
<point x="883" y="75"/>
<point x="1001" y="207"/>
<point x="1093" y="312" type="qcurve" smooth="yes"/>
<point x="1100" y="320"/>
<point x="1111" y="332"/>
<point x="1123" y="344" type="qcurve"/>
<point x="1148" y="334"/>
<point x="1196" y="298"/>
<point x="1208" y="285" type="qcurve"/>
<point x="1199" y="272"/>
<point x="1186" y="256"/>
<point x="1177" y="246" type="qcurve" smooth="yes"/>
<point x="1086" y="153"/>
<point x="963" y="28"/>
<point x="858" y="-88" type="qcurve"/>
</contour>
</outline>
</glyph>
8 changes: 4 additions & 4 deletions Sources/Italic/AmstelvarA2-Italic_XOPQ310.ufo/glyphs/Q_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<point x="754.2802101576183" y="5"/>
</contour>
<contour>
<point x="792.2802101576183" y="-30" type="line"/>
<point x="884.2802101576183" y="75"/>
<point x="774" y="-52" type="line"/>
<point x="866" y="53"/>
<point x="1002.2802101576183" y="207"/>
<point x="1094.2802101576183" y="312" type="qcurve" smooth="yes"/>
<point x="1101.2802101576183" y="320"/>
Expand All @@ -66,8 +66,8 @@
<point x="1187.2802101576183" y="256"/>
<point x="1178.2802101576183" y="246" type="qcurve" smooth="yes"/>
<point x="1087.2802101576183" y="153"/>
<point x="964.2802101576183" y="28"/>
<point x="873.2802101576183" y="-65" type="qcurve"/>
<point x="946" y="6"/>
<point x="855" y="-87" type="qcurve"/>
</contour>
</outline>
</glyph>
6 changes: 3 additions & 3 deletions Sources/Italic/AmstelvarA2-Italic_XOPQ310.ufo/glyphs/ampersand.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<point x="262" y="102"/>
<point x="405" y="102" type="qcurve" smooth="yes"/>
<point x="563" y="102"/>
<point x="803" y="274"/>
<point x="804" y="274"/>
<point x="875" y="450" type="qcurve" smooth="yes"/>
<point x="994" y="743" type="line"/>
<point x="1146" y="719" type="line"/>
<point x="1004" y="769" type="line"/>
<point x="1165" y="762" type="line"/>
<point x="1035" y="478"/>
<point x="942" y="172"/>
<point x="981" y="40" type="qcurve"/>
Expand Down
5 changes: 5 additions & 0 deletions Sources/Italic/AmstelvarA2-Italic_XOPQ4.ufo/glyphs/O_E_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@
<point x="1074" y="1382" type="line"/>
<point x="1039" y="1362" type="line"/>
<point x="924" y="783" type="line"/>
<<<<<<< HEAD
<point x="802" y="135" type="line"/>
<point x="840" y="108" type="line"/>
=======
<point x="799" y="135" type="line"/>
<point x="836" y="108" type="line"/>
>>>>>>> 969dced04fc7c70de17d7db25b8b2f2b6955a6fc
<point x="1356" y="108" type="line"/>
<point x="1437" y="378" type="line"/>
<point x="1537" y="378" type="line"/>
Expand Down
4 changes: 2 additions & 2 deletions Sources/Italic/AmstelvarA2-Italic_XOPQ4.ufo/glyphs/ampersand.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<point x="857" y="278"/>
<point x="933" y="450" type="qcurve"/>
<point x="1073" y="769" type="line"/>
<point x="1081" y="762" type="line"/>
<point x="836" y="218"/>
<point x="1083" y="768" type="line"/>
<point x="838" y="224"/>
<point x="824" y="190"/>
<point x="915" y="5" type="qcurve"/>
</contour>
Expand Down
29 changes: 29 additions & 0 deletions Sources/Italic/AmstelvarA2-Italic_XSHL0.ufo/glyphs/O_E_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<unicode hex="0152"/>
<outline>
<contour>
<<<<<<< HEAD
<point x="103" y="846" type="qcurve" smooth="yes"/>
<point x="188" y="1172"/>
<point x="692" y="1534"/>
Expand All @@ -30,6 +31,34 @@
<point x="572" y="-17" type="qcurve" smooth="yes"/>
<point x="287" y="27"/>
<point x="15" y="508"/>
=======
<point x="103.0" y="846.0" type="qcurve" smooth="yes"/>
<point x="188.0" y="1172.0"/>
<point x="692.0" y="1534.0"/>
<point x="968.0" y="1519.0" type="qcurve"/>
<point x="1117.0" y="1511.0"/>
<point x="1338.0" y="1500.0"/>
<point x="1399.0" y="1500.0" type="qcurve" smooth="yes"/>
<point x="2003.0" y="1500.0" type="line"/>
<point x="1965.0" y="1152.0" type="line"/>
<point x="1866.0" y="1152.0" type="line"/>
<point x="1859.0" y="1382.0" type="line"/>
<point x="1406.0" y="1382.0" type="line"/>
<point x="1371.0" y="1362.0" type="line"/>
<point x="1256.0" y="783.0" type="line"/>
<point x="1134" y="135" type="line"/>
<point x="1172" y="108" type="line"/>
<point x="1688.0" y="108.0" type="line"/>
<point x="1779.0" y="378.0" type="line"/>
<point x="1879.0" y="378.0" type="line"/>
<point x="1790.0" y="0.0" type="line"/>
<point x="1055.0" y="0.0" type="line" smooth="yes"/>
<point x="962.0" y="0.0"/>
<point x="682.0" y="-34.0"/>
<point x="572.0" y="-17.0" type="qcurve" smooth="yes"/>
<point x="287.0" y="27.0"/>
<point x="15.0" y="508.0"/>
>>>>>>> 969dced04fc7c70de17d7db25b8b2f2b6955a6fc
</contour>
<contour>
<point x="290" y="849" type="qcurve" smooth="yes"/>
Expand Down
4 changes: 2 additions & 2 deletions Sources/Italic/AmstelvarA2-Italic_XSHL0.ufo/glyphs/Q_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<point x="296" y="5"/>
</contour>
<contour>
<point x="334" y="-30" type="line"/>
<point x="320" y="-53" type="line"/>
<point x="426" y="75"/>
<point x="544" y="207"/>
<point x="636" y="312" type="qcurve" smooth="yes"/>
Expand All @@ -67,7 +67,7 @@
<point x="720" y="246" type="qcurve" smooth="yes"/>
<point x="629" y="153"/>
<point x="506" y="28"/>
<point x="415" y="-65" type="qcurve"/>
<point x="401" y="-88" type="qcurve"/>
</contour>
</outline>
</glyph>
6 changes: 3 additions & 3 deletions Sources/Italic/AmstelvarA2-Italic_XSHL0.ufo/glyphs/ampersand.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<point x="262" y="102"/>
<point x="405" y="102" type="qcurve" smooth="yes"/>
<point x="563" y="102"/>
<point x="803" y="274"/>
<point x="804" y="274"/>
<point x="875" y="450" type="qcurve" smooth="yes"/>
<point x="994" y="743" type="line"/>
<point x="1146" y="719" type="line"/>
<point x="1004" y="769" type="line"/>
<point x="1165" y="762" type="line"/>
<point x="1035" y="478"/>
<point x="942" y="172"/>
<point x="981" y="40" type="qcurve"/>
Expand Down
29 changes: 29 additions & 0 deletions Sources/Italic/AmstelvarA2-Italic_XSHU144.ufo/glyphs/O_E_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<unicode hex="0152"/>
<outline>
<contour>
<<<<<<< HEAD
<point x="103" y="846" type="qcurve" smooth="yes"/>
<point x="188" y="1172"/>
<point x="692" y="1534"/>
Expand All @@ -30,6 +31,34 @@
<point x="572" y="-17" type="qcurve" smooth="yes"/>
<point x="287" y="27"/>
<point x="15" y="508"/>
=======
<point x="103.0" y="846.0" type="qcurve" smooth="yes"/>
<point x="188.0" y="1172.0"/>
<point x="692.0" y="1534.0"/>
<point x="968.0" y="1519.0" type="qcurve"/>
<point x="1117.0" y="1511.0"/>
<point x="1338.0" y="1500.0"/>
<point x="1399.0" y="1500.0" type="qcurve" smooth="yes"/>
<point x="2003.0" y="1500.0" type="line"/>
<point x="1965.0" y="1152.0" type="line"/>
<point x="1866.0" y="1152.0" type="line"/>
<point x="1859.0" y="1382.0" type="line"/>
<point x="1406.0" y="1382.0" type="line"/>
<point x="1371.0" y="1362.0" type="line"/>
<point x="1256.0" y="783.0" type="line"/>
<point x="1134" y="135" type="line"/>
<point x="1172" y="108" type="line"/>
<point x="1688.0" y="108.0" type="line"/>
<point x="1779.0" y="378.0" type="line"/>
<point x="1879.0" y="378.0" type="line"/>
<point x="1790.0" y="0.0" type="line"/>
<point x="1055.0" y="0.0" type="line" smooth="yes"/>
<point x="962.0" y="0.0"/>
<point x="682.0" y="-34.0"/>
<point x="572.0" y="-17.0" type="qcurve" smooth="yes"/>
<point x="287.0" y="27.0"/>
<point x="15.0" y="508.0"/>
>>>>>>> 969dced04fc7c70de17d7db25b8b2f2b6955a6fc
</contour>
<contour>
<point x="290" y="849" type="qcurve" smooth="yes"/>
Expand Down
4 changes: 2 additions & 2 deletions Sources/Italic/AmstelvarA2-Italic_XSHU144.ufo/glyphs/Q_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<point x="296" y="5"/>
</contour>
<contour>
<point x="334" y="-30" type="line"/>
<point x="320" y="-53" type="line"/>
<point x="426" y="75"/>
<point x="544" y="207"/>
<point x="636" y="312" type="qcurve" smooth="yes"/>
Expand All @@ -67,7 +67,7 @@
<point x="720" y="246" type="qcurve" smooth="yes"/>
<point x="629" y="153"/>
<point x="506" y="28"/>
<point x="415" y="-65" type="qcurve"/>
<point x="401" y="-88" type="qcurve"/>
</contour>
</outline>
</glyph>
4 changes: 2 additions & 2 deletions Sources/Italic/AmstelvarA2-Italic_XSHU2.ufo/glyphs/Q_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<point x="296" y="5"/>
</contour>
<contour>
<point x="334" y="-30" type="line"/>
<point x="320" y="-53" type="line"/>
<point x="426" y="75"/>
<point x="544" y="207"/>
<point x="636" y="312" type="qcurve" smooth="yes"/>
Expand All @@ -67,7 +67,7 @@
<point x="720" y="246" type="qcurve" smooth="yes"/>
<point x="629" y="153"/>
<point x="506" y="28"/>
<point x="415" y="-65" type="qcurve"/>
<point x="401" y="-88" type="qcurve"/>
</contour>
</outline>
</glyph>
6 changes: 3 additions & 3 deletions Sources/Italic/AmstelvarA2-Italic_XSHU2.ufo/glyphs/ampersand.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<point x="262" y="102"/>
<point x="405" y="102" type="qcurve" smooth="yes"/>
<point x="563" y="102"/>
<point x="803" y="274"/>
<point x="804" y="274"/>
<point x="875" y="450" type="qcurve" smooth="yes"/>
<point x="994" y="743" type="line"/>
<point x="1146" y="719" type="line"/>
<point x="1004" y="769" type="line"/>
<point x="1165" y="762" type="line"/>
<point x="1035" y="478"/>
<point x="942" y="172"/>
<point x="981" y="40" type="qcurve"/>
Expand Down
6 changes: 4 additions & 2 deletions Sources/Italic/AmstelvarA2-Italic_XSVF0.ufo/glyphs/Q_.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<unicode hex="0051"/>
<anchor x="832.0" y="0" name="bottom"/>
<anchor x="832.0" y="1500" name="top"/>
<anchor x="832.0" y="0" name="bottom"/>
<anchor x="832.0" y="1500" name="top"/>
<outline>
<contour>
<point x="103" y="867" type="qcurve" smooth="yes"/>
Expand Down Expand Up @@ -52,7 +54,7 @@
<point x="296" y="5"/>
</contour>
<contour>
<point x="334" y="-30" type="line"/>
<point x="320" y="-53" type="line"/>
<point x="426" y="75"/>
<point x="544" y="207"/>
<point x="636" y="312" type="qcurve" smooth="yes"/>
Expand All @@ -67,7 +69,7 @@
<point x="720" y="246" type="qcurve" smooth="yes"/>
<point x="629" y="153"/>
<point x="506" y="28"/>
<point x="415" y="-65" type="qcurve"/>
<point x="401" y="-88" type="qcurve"/>
</contour>
</outline>
</glyph>
6 changes: 3 additions & 3 deletions Sources/Italic/AmstelvarA2-Italic_XSVF0.ufo/glyphs/ampersand.glif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<point x="262" y="102"/>
<point x="405" y="102" type="qcurve" smooth="yes"/>
<point x="563" y="102"/>
<point x="803" y="274"/>
<point x="804" y="274"/>
<point x="875" y="450" type="qcurve" smooth="yes"/>
<point x="994" y="743" type="line"/>
<point x="1146" y="719" type="line"/>
<point x="1004" y="769" type="line"/>
<point x="1165" y="762" type="line"/>
<point x="1035" y="478"/>
<point x="942" y="172"/>
<point x="981" y="40" type="qcurve"/>
Expand Down
1 change: 1 addition & 0 deletions Sources/Italic/AmstelvarA2-Italic_XSVF0.ufo/lib.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5744,6 +5744,7 @@
<string>yu-i</string>
<string>yu-l.bgr</string>
<string>zero.prop</string>
<string>dieresistonoscomb.case</string>
</array>
<key>tnCurvePalet</key>
<dict>
Expand Down
Loading

0 comments on commit 29e7929

Please sign in to comment.