From da20eead6fb5f5ab988cc642ced2573073a2743a Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Tue, 9 Oct 2018 11:49:10 -0700 Subject: cyrillic --- src/Inter-UI-Black.ufo/glyphs/O_megacyrillic.glif | 59 ++- src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif | 55 +- .../glyphs/O_megacyrillic.glif | 59 ++- .../glyphs/omegacyrillic.glif | 47 +- src/Inter-UI-Italic.ufo/glyphs/O_megacyrillic.glif | 63 +-- src/Inter-UI-Italic.ufo/glyphs/omegacyrillic.glif | 61 +-- src/Inter-UI-Italic.ufo/glyphs/shacyrillic.glif | 22 +- .../glyphs/O_megacyrillic.glif | 83 ++- src/Inter-UI-Regular.ufo/glyphs/omegacyrillic.glif | 77 ++- src/Inter-UI-Regular.ufo/glyphs/shacyrillic.glif | 22 +- src/Inter-UI.glyphs | 574 +++++++++------------ 11 files changed, 522 insertions(+), 600 deletions(-) (limited to 'src') diff --git a/src/Inter-UI-Black.ufo/glyphs/O_megacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/O_megacyrillic.glif index f25f603b4..820920ee8 100644 --- a/src/Inter-UI-Black.ufo/glyphs/O_megacyrillic.glif +++ b/src/Inter-UI-Black.ufo/glyphs/O_megacyrillic.glif @@ -1,30 +1,24 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -32,20 +26,25 @@ - - - - - - - - - - + + + + + + + + + + + + com.schriftgestaltung.Glyphs.glyph.leftMetricsKey + H + com.schriftgestaltung.Glyphs.glyph.rightMetricsKey + H com.schriftgestaltung.hints @@ -56,7 +55,7 @@ origin 0.0 - 12.0 + 2.0 stem -2 @@ -76,7 +75,7 @@ origin 0.0 - 12.0 + 2.0 stem -2 diff --git a/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif index dc0e6afca..dab7a7a4e 100644 --- a/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif +++ b/src/Inter-UI-Black.ufo/glyphs/omegacyrillic.glif @@ -4,44 +4,39 @@ - - - - - - - - - - - + - - - - - - + + + + + + + + + + - + - + - - - - - - - - - + + + + + + + + + + @@ -60,7 +55,7 @@ origin 0.0 - 12.0 + 2.0 stem -2 @@ -80,7 +75,7 @@ origin 0.0 - 12.0 + 2.0 stem -2 diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/O_megacyrillic.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/O_megacyrillic.glif index 4d5e629fb..c89c2cd47 100644 --- a/src/Inter-UI-BlackItalic.ufo/glyphs/O_megacyrillic.glif +++ b/src/Inter-UI-BlackItalic.ufo/glyphs/O_megacyrillic.glif @@ -1,30 +1,24 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -32,16 +26,25 @@ - - - - - - - - - - + + + + + + + + + + + + + + com.schriftgestaltung.Glyphs.glyph.leftMetricsKey + H + com.schriftgestaltung.Glyphs.glyph.rightMetricsKey + H + + diff --git a/src/Inter-UI-BlackItalic.ufo/glyphs/omegacyrillic.glif b/src/Inter-UI-BlackItalic.ufo/glyphs/omegacyrillic.glif index 3ce60fe26..40ee0acb1 100644 --- a/src/Inter-UI-BlackItalic.ufo/glyphs/omegacyrillic.glif +++ b/src/Inter-UI-BlackItalic.ufo/glyphs/omegacyrillic.glif @@ -4,26 +4,20 @@ - - - - - - - - - - - + - - - - - - + + + + + + + + + + @@ -33,15 +27,16 @@ - - - - - - - - - + + + + + + + + + + diff --git a/src/Inter-UI-Italic.ufo/glyphs/O_megacyrillic.glif b/src/Inter-UI-Italic.ufo/glyphs/O_megacyrillic.glif index 6b384a3c5..39a1c0f0f 100644 --- a/src/Inter-UI-Italic.ufo/glyphs/O_megacyrillic.glif +++ b/src/Inter-UI-Italic.ufo/glyphs/O_megacyrillic.glif @@ -4,44 +4,47 @@ - - - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + com.schriftgestaltung.Glyphs.glyph.leftMetricsKey + H + com.schriftgestaltung.Glyphs.glyph.rightMetricsKey + H + + diff --git a/src/Inter-UI-Italic.ufo/glyphs/omegacyrillic.glif b/src/Inter-UI-Italic.ufo/glyphs/omegacyrillic.glif index c9eace6d9..cbebd1e4e 100644 --- a/src/Inter-UI-Italic.ufo/glyphs/omegacyrillic.glif +++ b/src/Inter-UI-Italic.ufo/glyphs/omegacyrillic.glif @@ -4,44 +4,39 @@ - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Inter-UI-Italic.ufo/glyphs/shacyrillic.glif b/src/Inter-UI-Italic.ufo/glyphs/shacyrillic.glif index 844d54520..a5e6b19b2 100644 --- a/src/Inter-UI-Italic.ufo/glyphs/shacyrillic.glif +++ b/src/Inter-UI-Italic.ufo/glyphs/shacyrillic.glif @@ -1,21 +1,21 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/src/Inter-UI-Regular.ufo/glyphs/O_megacyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/O_megacyrillic.glif index f02997d6f..b2cbfb8d5 100644 --- a/src/Inter-UI-Regular.ufo/glyphs/O_megacyrillic.glif +++ b/src/Inter-UI-Regular.ufo/glyphs/O_megacyrillic.glif @@ -4,48 +4,47 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + com.schriftgestaltung.Glyphs.glyph.leftMetricsKey + H + com.schriftgestaltung.Glyphs.glyph.rightMetricsKey + H com.schriftgestaltung.hints @@ -56,14 +55,14 @@ origin 0.0 - 12.0 + 2.0 stem -2 target 0.0 - 3.0 + 26.0 type Stem @@ -76,7 +75,7 @@ origin 0.0 - 8.0 + 31.0 stem -2 @@ -98,14 +97,14 @@ origin 0.0 - 9.0 + 32.0 stem -2 target 0.0 - 6.0 + 29.0 type Stem @@ -118,14 +117,14 @@ origin 0.0 - 0.0 + 23.0 stem -2 target - 1.0 - 6.0 + 0.0 + 20.0 type Stem @@ -137,15 +136,15 @@ 0 origin - 1.0 0.0 + 14.0 stem -2 target - 1.0 - 15.0 + 0.0 + 11.0 type Stem @@ -158,14 +157,14 @@ origin 0.0 - 12.0 + 2.0 stem -2 target 0.0 - 3.0 + 26.0 type TTStem @@ -178,7 +177,7 @@ origin 0.0 - 8.0 + 31.0 stem -2 diff --git a/src/Inter-UI-Regular.ufo/glyphs/omegacyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/omegacyrillic.glif index 2091b4c56..5882b72e4 100644 --- a/src/Inter-UI-Regular.ufo/glyphs/omegacyrillic.glif +++ b/src/Inter-UI-Regular.ufo/glyphs/omegacyrillic.glif @@ -4,44 +4,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -60,14 +55,14 @@ origin 0.0 - 12.0 + 2.0 stem -2 target 0.0 - 3.0 + 26.0 type Stem @@ -80,14 +75,14 @@ origin 0.0 - 9.0 + 32.0 stem -2 target 0.0 - 6.0 + 29.0 type Stem @@ -100,14 +95,14 @@ origin 0.0 - 0.0 + 23.0 stem -2 target - 1.0 - 6.0 + 0.0 + 20.0 type Stem @@ -119,15 +114,15 @@ 0 origin - 1.0 0.0 + 14.0 stem -2 target - 1.0 - 15.0 + 0.0 + 11.0 type Stem @@ -140,14 +135,14 @@ origin 0.0 - 12.0 + 2.0 stem -2 target 0.0 - 3.0 + 26.0 type TTStem diff --git a/src/Inter-UI-Regular.ufo/glyphs/shacyrillic.glif b/src/Inter-UI-Regular.ufo/glyphs/shacyrillic.glif index 213d943a7..99985eeba 100644 --- a/src/Inter-UI-Regular.ufo/glyphs/shacyrillic.glif +++ b/src/Inter-UI-Regular.ufo/glyphs/shacyrillic.glif @@ -1,21 +1,21 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/src/Inter-UI.glyphs b/src/Inter-UI.glyphs index f3a2fef2e..1cef60565 100644 --- a/src/Inter-UI.glyphs +++ b/src/Inter-UI.glyphs @@ -181551,7 +181551,7 @@ interface.gridadjust.original = "{'width': 1557, 'leftMargin': 174, 'rightMargin }, { glyphname = shacyrillic; -lastChange = "2018-10-09 02:53:58 +0000"; +lastChange = "2018-10-09 18:44:12 +0000"; layers = ( { anchors = ( @@ -181600,21 +181600,21 @@ paths = ( closed = 1; nodes = ( "216 0 LINE", -"2080 0 LINE", -"2080 1536 LINE", -"1804 1536 LINE", -"1804 220 LINE", -"1288 220 LINE", -"1288 1536 LINE", -"1012 1536 LINE", -"1012 220 LINE", -"492 220 LINE", -"492 1536 LINE", +"2084 0 LINE", +"2084 1536 LINE", +"1848 1536 LINE", +"1848 220 LINE", +"1268 220 LINE", +"1268 1536 LINE", +"1032 1536 LINE", +"1032 220 LINE", +"452 220 LINE", +"452 1536 LINE", "216 1536 LINE" ); } ); -width = 2296; +width = 2300; }, { anchors = ( @@ -181680,21 +181680,21 @@ paths = ( closed = 1; nodes = ( "88 0 LINE", -"1952 0 LINE", -"2208 1536 LINE", -"1932 1536 LINE", -"1712 220 LINE", -"1196 220 LINE", -"1416 1536 LINE", -"1140 1536 LINE", -"920 220 LINE", -"400 220 LINE", -"620 1536 LINE", +"1956 0 LINE", +"2212 1536 LINE", +"1976 1536 LINE", +"1756 220 LINE", +"1176 220 LINE", +"1396 1536 LINE", +"1160 1536 LINE", +"940 220 LINE", +"360 220 LINE", +"580 1536 LINE", "344 1536 LINE" ); } ); -width = 2296; +width = 2300; }, { anchors = ( @@ -326443,7 +326443,7 @@ interface.gridadjust.original = "{'width': 718, 'leftMargin': 131, 'rightMargin' }, { glyphname = omegacyrillic; -lastChange = "2018-10-09 02:59:27 +0000"; +lastChange = "2018-10-09 18:45:08 +0000"; layers = ( { anchors = ( @@ -326459,29 +326459,29 @@ position = "{2188, 1744}"; hints = ( { horizontal = 1; -origin = "{0, 12}"; -target = "{0, 3}"; +origin = "{0, 2}"; +target = "{0, 26}"; type = Stem; }, { -origin = "{0, 9}"; -target = "{0, 6}"; +origin = "{0, 32}"; +target = "{0, 29}"; type = Stem; }, { -origin = "{0, 0}"; -target = "{1, 6}"; +origin = "{0, 23}"; +target = "{0, 20}"; type = Stem; }, { -origin = "{1, 0}"; -target = "{1, 15}"; +origin = "{0, 14}"; +target = "{0, 11}"; type = Stem; }, { horizontal = 1; -origin = "{0, 12}"; -target = "{0, 3}"; +origin = "{0, 2}"; +target = "{0, 26}"; type = TTStem; options = 4; } @@ -326491,47 +326491,39 @@ paths = ( { closed = 1; nodes = ( -"988 480 LINE SMOOTH", -"988 284 OFFCURVE", -"868 192 OFFCURVE", -"712 192 CURVE SMOOTH", -"584 192 OFFCURVE", -"492 284 OFFCURVE", -"492 480 CURVE SMOOTH", -"492 1536 LINE", -"216 1536 LINE", -"216 480 LINE SMOOTH", "216 140 OFFCURVE", "428 -28 OFFCURVE", "712 -28 CURVE SMOOTH", -"996 -28 OFFCURVE", -"1208 140 OFFCURVE", -"1208 480 CURVE SMOOTH", -"1208 1536 LINE", -"988 1536 LINE" -); -}, -{ -closed = 1; -nodes = ( -"1756 480 LINE SMOOTH", -"1756 284 OFFCURVE", -"1652 192 OFFCURVE", -"1512 192 CURVE SMOOTH", -"1364 192 OFFCURVE", -"1264 284 OFFCURVE", -"1264 480 CURVE SMOOTH", -"1264 1536 LINE", -"1044 1536 LINE", -"1044 480 LINE SMOOTH", -"1044 140 OFFCURVE", -"1240 -28 OFFCURVE", +"888 -28 OFFCURVE", +"1036 36 OFFCURVE", +"1124 164 CURVE", +"1204 36 OFFCURVE", +"1344 -28 OFFCURVE", "1512 -28 CURVE SMOOTH", "1808 -28 OFFCURVE", "2032 140 OFFCURVE", "2032 480 CURVE SMOOTH", "2032 1536 LINE", -"1756 1536 LINE" +"1796 1536 LINE", +"1796 480 LINE SMOOTH", +"1796 284 OFFCURVE", +"1652 192 OFFCURVE", +"1512 192 CURVE SMOOTH", +"1364 192 OFFCURVE", +"1244 284 OFFCURVE", +"1244 480 CURVE SMOOTH", +"1244 1536 LINE", +"1008 1536 LINE", +"1008 480 LINE SMOOTH", +"1008 284 OFFCURVE", +"868 192 OFFCURVE", +"712 192 CURVE SMOOTH", +"584 192 OFFCURVE", +"452 284 OFFCURVE", +"452 480 CURVE SMOOTH", +"452 1536 LINE", +"216 1536 LINE", +"216 480 LINE SMOOTH" ); } ); @@ -326551,13 +326543,13 @@ position = "{2584, 1788}"; hints = ( { horizontal = 1; -origin = "{0, 12}"; +origin = "{0, 2}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 12}"; +origin = "{0, 2}"; type = Anchor; options = 4; } @@ -326567,47 +326559,39 @@ paths = ( { closed = 1; nodes = ( -"1072 736 LINE SMOOTH", -"1072 512 OFFCURVE", -"1022 384 OFFCURVE", -"856 384 CURVE SMOOTH", -"702 384 OFFCURVE", -"660 524 OFFCURVE", -"660 736 CURVE SMOOTH", -"660 1536 LINE", -"140 1536 LINE", -"140 736 LINE SMOOTH", "140 240 OFFCURVE", -"434 -28 OFFCURVE", +"436 -28 OFFCURVE", "856 -28 CURVE SMOOTH", -"1234 -28 OFFCURVE", -"1496 244 OFFCURVE", -"1496 736 CURVE SMOOTH", -"1496 1536 LINE", -"1072 1536 LINE" -); -}, -{ -closed = 1; -nodes = ( +"1052 -28 OFFCURVE", +"1216 44 OFFCURVE", +"1328 184 CURVE", +"1440 44 OFFCURVE", +"1600 -28 OFFCURVE", +"1800 -28 CURVE SMOOTH", +"2220 -28 OFFCURVE", +"2504 244 OFFCURVE", +"2504 736 CURVE SMOOTH", +"2504 1536 LINE", +"1984 1536 LINE", "1984 736 LINE SMOOTH", "1984 512 OFFCURVE", -"1946 384 OFFCURVE", +"1948 384 OFFCURVE", "1800 384 CURVE SMOOTH", -"1634 384 OFFCURVE", +"1636 384 OFFCURVE", "1588 512 OFFCURVE", "1588 736 CURVE SMOOTH", "1588 1536 LINE", -"1168 1536 LINE", -"1168 736 LINE SMOOTH", -"1168 244 OFFCURVE", -"1414 -28 OFFCURVE", -"1800 -28 CURVE SMOOTH", -"2218 -28 OFFCURVE", -"2504 244 OFFCURVE", -"2504 736 CURVE SMOOTH", -"2504 1536 LINE", -"1984 1536 LINE" +"1072 1536 LINE", +"1072 736 LINE SMOOTH", +"1072 512 OFFCURVE", +"1024 384 OFFCURVE", +"856 384 CURVE SMOOTH", +"704 384 OFFCURVE", +"660 524 OFFCURVE", +"660 736 CURVE SMOOTH", +"660 1536 LINE", +"140 1536 LINE", +"140 736 LINE SMOOTH" ); } ); @@ -326629,47 +326613,39 @@ paths = ( { closed = 1; nodes = ( -"940 480 LINE SMOOTH", -"907 284 OFFCURVE", -"772 192 OFFCURVE", -"616 192 CURVE SMOOTH", -"488 192 OFFCURVE", -"411 284 OFFCURVE", -"444 480 CURVE SMOOTH", -"620 1536 LINE", -"344 1536 LINE", -"168 480 LINE SMOOTH", -"111 140 OFFCURVE", -"295 -28 OFFCURVE", +"112 140 OFFCURVE", +"296 -28 OFFCURVE", "580 -28 CURVE SMOOTH", -"863 -28 OFFCURVE", -"1103 140 OFFCURVE", -"1160 480 CURVE SMOOTH", -"1336 1536 LINE", -"1116 1536 LINE" -); -}, -{ -closed = 1; -nodes = ( -"1708 480 LINE SMOOTH", -"1675 284 OFFCURVE", -"1556 192 OFFCURVE", -"1416 192 CURVE SMOOTH", -"1268 192 OFFCURVE", -"1183 284 OFFCURVE", -"1216 480 CURVE SMOOTH", -"1392 1536 LINE", -"1172 1536 LINE", -"996 480 LINE SMOOTH", -"939 140 OFFCURVE", -"1107 -28 OFFCURVE", +"756 -28 OFFCURVE", +"916 36 OFFCURVE", +"1024 164 CURVE", +"1084 36 OFFCURVE", +"1212 -28 OFFCURVE", "1380 -28 CURVE SMOOTH", -"1675 -28 OFFCURVE", -"1927 140 OFFCURVE", +"1676 -28 OFFCURVE", +"1928 140 OFFCURVE", "1984 480 CURVE SMOOTH", "2160 1536 LINE", -"1884 1536 LINE" +"1924 1536 LINE", +"1748 480 LINE SMOOTH", +"1716 284 OFFCURVE", +"1556 192 OFFCURVE", +"1416 192 CURVE SMOOTH", +"1268 192 OFFCURVE", +"1164 284 OFFCURVE", +"1196 480 CURVE SMOOTH", +"1372 1536 LINE", +"1136 1536 LINE", +"960 480 LINE SMOOTH", +"928 284 OFFCURVE", +"772 192 OFFCURVE", +"616 192 CURVE SMOOTH", +"488 192 OFFCURVE", +"372 284 OFFCURVE", +"404 480 CURVE SMOOTH", +"580 1536 LINE", +"344 1536 LINE", +"168 480 LINE SMOOTH" ); } ); @@ -326691,29 +326667,20 @@ paths = ( { closed = 1; nodes = ( -"1068 736 LINE SMOOTH", -"1032 512 OFFCURVE", -"960 384 OFFCURVE", -"796 384 CURVE SMOOTH", -"640 384 OFFCURVE", -"622 524 OFFCURVE", -"656 736 CURVE SMOOTH", -"788 1536 LINE", -"268 1536 LINE", -"136 736 LINE SMOOTH", -"55 240 OFFCURVE", +"56 240 OFFCURVE", "304 -28 OFFCURVE", "728 -28 CURVE SMOOTH", -"1104 -28 OFFCURVE", -"1411 244 OFFCURVE", -"1492 736 CURVE SMOOTH", -"1624 1536 LINE", -"1200 1536 LINE" -); -}, -{ -closed = 1; -nodes = ( +"924 -28 OFFCURVE", +"1096 44 OFFCURVE", +"1232 184 CURVE", +"1320 44 OFFCURVE", +"1472 -28 OFFCURVE", +"1672 -28 CURVE SMOOTH", +"2088 -28 OFFCURVE", +"2420 244 OFFCURVE", +"2500 736 CURVE SMOOTH", +"2632 1536 LINE", +"2112 1536 LINE", "1980 736 LINE SMOOTH", "1944 512 OFFCURVE", "1884 384 OFFCURVE", @@ -326722,16 +326689,17 @@ nodes = ( "1548 512 OFFCURVE", "1584 736 CURVE SMOOTH", "1716 1536 LINE", -"1296 1536 LINE", -"1164 736 LINE SMOOTH", -"1083 244 OFFCURVE", -"1284 -28 OFFCURVE", -"1672 -28 CURVE SMOOTH", -"2088 -28 OFFCURVE", -"2419 244 OFFCURVE", -"2500 736 CURVE SMOOTH", -"2632 1536 LINE", -"2112 1536 LINE" +"1200 1536 LINE", +"1068 736 LINE SMOOTH", +"1032 512 OFFCURVE", +"960 384 OFFCURVE", +"796 384 CURVE SMOOTH", +"640 384 OFFCURVE", +"624 524 OFFCURVE", +"656 736 CURVE SMOOTH", +"788 1536 LINE", +"268 1536 LINE", +"136 736 LINE SMOOTH" ); } ); @@ -326750,13 +326718,13 @@ interface.gridadjust.original = "{'width': 2140, 'leftMargin': 169, 'rightMargin }, { glyphname = Omegacyrillic; -lastChange = "2018-09-27 00:56:25 +0000"; +lastChange = "2018-10-09 18:46:43 +0000"; layers = ( { anchors = ( { name = top; -position = "{1260, 2148}"; +position = "{1248, 2304}"; }, { name = top0315; @@ -326766,41 +326734,41 @@ position = "{2500, 2148}"; hints = ( { horizontal = 1; -origin = "{0, 12}"; -target = "{0, 3}"; +origin = "{0, 2}"; +target = "{0, 26}"; type = Stem; }, { horizontal = 1; -origin = "{0, 8}"; +origin = "{0, 31}"; target = down; type = TopGhost; }, { -origin = "{0, 9}"; -target = "{0, 6}"; +origin = "{0, 32}"; +target = "{0, 29}"; type = Stem; }, { -origin = "{0, 0}"; -target = "{1, 6}"; +origin = "{0, 23}"; +target = "{0, 20}"; type = Stem; }, { -origin = "{1, 0}"; -target = "{1, 15}"; +origin = "{0, 14}"; +target = "{0, 11}"; type = Stem; }, { horizontal = 1; -origin = "{0, 12}"; -target = "{0, 3}"; +origin = "{0, 2}"; +target = "{0, 26}"; type = TTStem; options = 4; }, { horizontal = 1; -origin = "{0, 8}"; +origin = "{0, 31}"; type = Anchor; options = 4; } @@ -326810,47 +326778,39 @@ paths = ( { closed = 1; nodes = ( -"1124 544 LINE SMOOTH", -"1124 312 OFFCURVE", -"988 200 OFFCURVE", -"800 200 CURVE SMOOTH", -"644 200 OFFCURVE", -"496 312 OFFCURVE", -"496 544 CURVE SMOOTH", -"496 2048 LINE", -"248 2048 LINE", -"248 544 LINE SMOOTH", "248 160 OFFCURVE", "480 -28 OFFCURVE", "800 -28 CURVE SMOOTH", -"1120 -28 OFFCURVE", -"1356 160 OFFCURVE", -"1356 544 CURVE SMOOTH", -"1356 2048 LINE", -"1124 2048 LINE" -); -}, -{ -closed = 1; -nodes = ( -"2004 544 LINE SMOOTH", -"2004 312 OFFCURVE", +"988 -28 OFFCURVE", +"1148 36 OFFCURVE", +"1248 168 CURVE", +"1340 36 OFFCURVE", +"1488 -28 OFFCURVE", +"1672 -28 CURVE SMOOTH", +"1992 -28 OFFCURVE", +"2248 160 OFFCURVE", +"2248 544 CURVE SMOOTH", +"2248 2048 LINE", +"2000 2048 LINE", +"2000 544 LINE SMOOTH", +"2000 312 OFFCURVE", "1844 200 OFFCURVE", "1672 200 CURVE SMOOTH", "1500 200 OFFCURVE", "1372 312 OFFCURVE", "1372 544 CURVE SMOOTH", "1372 2048 LINE", -"1144 2048 LINE", -"1144 544 LINE SMOOTH", -"1144 160 OFFCURVE", -"1360 -28 OFFCURVE", -"1672 -28 CURVE SMOOTH", -"1992 -28 OFFCURVE", -"2248 160 OFFCURVE", -"2248 544 CURVE SMOOTH", -"2248 2048 LINE", -"2004 2048 LINE" +"1124 2048 LINE", +"1124 544 LINE SMOOTH", +"1124 312 OFFCURVE", +"988 200 OFFCURVE", +"800 200 CURVE SMOOTH", +"644 200 OFFCURVE", +"496 312 OFFCURVE", +"496 544 CURVE SMOOTH", +"496 2048 LINE", +"248 2048 LINE", +"248 544 LINE SMOOTH" ); } ); @@ -326860,7 +326820,7 @@ width = 2496; anchors = ( { name = top; -position = "{1468, 2368}"; +position = "{1472, 2180}"; }, { name = top0315; @@ -326870,13 +326830,13 @@ position = "{2960, 2368}"; hints = ( { horizontal = 1; -origin = "{0, 12}"; +origin = "{0, 2}"; target = up; type = BottomGhost; }, { horizontal = 1; -origin = "{0, 12}"; +origin = "{0, 2}"; type = Anchor; options = 4; } @@ -326886,29 +326846,20 @@ paths = ( { closed = 1; nodes = ( -"1200 728 LINE SMOOTH", -"1200 516 OFFCURVE", -"1128 400 OFFCURVE", -"952 400 CURVE SMOOTH", -"756 400 OFFCURVE", -"688 520 OFFCURVE", -"688 728 CURVE SMOOTH", -"688 1988 LINE", -"132 1988 LINE", -"132 728 LINE SMOOTH", "132 244 OFFCURVE", "480 -28 OFFCURVE", "952 -28 CURVE SMOOTH", -"1344 -28 OFFCURVE", -"1640 244 OFFCURVE", -"1640 728 CURVE SMOOTH", -"1640 1988 LINE", -"1200 1988 LINE" -); -}, -{ -closed = 1; -nodes = ( +"1168 -28 OFFCURVE", +"1352 52 OFFCURVE", +"1476 204 CURVE", +"1604 52 OFFCURVE", +"1792 -28 OFFCURVE", +"2008 -28 CURVE SMOOTH", +"2472 -28 OFFCURVE", +"2816 244 OFFCURVE", +"2816 728 CURVE SMOOTH", +"2816 2048 LINE", +"2260 2048 LINE", "2260 728 LINE SMOOTH", "2260 516 OFFCURVE", "2196 400 OFFCURVE", @@ -326916,27 +326867,28 @@ nodes = ( "1824 400 OFFCURVE", "1748 516 OFFCURVE", "1748 728 CURVE SMOOTH", -"1748 1988 LINE", -"1308 1988 LINE", -"1308 728 LINE SMOOTH", -"1308 244 OFFCURVE", -"1612 -28 OFFCURVE", -"2008 -28 CURVE SMOOTH", -"2472 -28 OFFCURVE", -"2808 244 OFFCURVE", -"2808 728 CURVE SMOOTH", -"2808 1988 LINE", -"2260 1988 LINE" +"1748 2048 LINE", +"1200 2048 LINE", +"1200 728 LINE SMOOTH", +"1200 516 OFFCURVE", +"1128 400 OFFCURVE", +"952 400 CURVE SMOOTH", +"756 400 OFFCURVE", +"688 520 OFFCURVE", +"688 728 CURVE SMOOTH", +"688 2048 LINE", +"132 2048 LINE", +"132 728 LINE SMOOTH" ); } ); -width = 2940; +width = 2948; }, { anchors = ( { name = top; -position = "{1488, 2148}"; +position = "{1500, 2304}"; }, { name = top0315; @@ -326948,47 +326900,39 @@ paths = ( { closed = 1; nodes = ( -"1088 544 LINE SMOOTH", -"1048 312 OFFCURVE", -"892 200 OFFCURVE", -"704 200 CURVE SMOOTH", -"548 200 OFFCURVE", -"420 312 OFFCURVE", -"460 544 CURVE SMOOTH", -"708 2048 LINE", -"460 2048 LINE", -"212 544 LINE SMOOTH", "148 160 OFFCURVE", "348 -28 OFFCURVE", "668 -28 CURVE SMOOTH", -"988 -28 OFFCURVE", -"1256 160 OFFCURVE", -"1320 544 CURVE SMOOTH", -"1568 2048 LINE", -"1336 2048 LINE" -); -}, -{ -closed = 1; -nodes = ( -"1968 544 LINE SMOOTH", -"1928 312 OFFCURVE", +"856 -28 OFFCURVE", +"1024 36 OFFCURVE", +"1144 168 CURVE", +"1216 36 OFFCURVE", +"1356 -28 OFFCURVE", +"1540 -28 CURVE SMOOTH", +"1860 -28 OFFCURVE", +"2148 160 OFFCURVE", +"2208 544 CURVE SMOOTH", +"2460 2048 LINE", +"2212 2048 LINE", +"1960 544 LINE SMOOTH", +"1924 312 OFFCURVE", "1748 200 OFFCURVE", "1576 200 CURVE SMOOTH", "1404 200 OFFCURVE", "1296 312 OFFCURVE", -"1336 544 CURVE SMOOTH", +"1332 544 CURVE SMOOTH", "1584 2048 LINE", -"1356 2048 LINE", -"1108 544 LINE SMOOTH", -"1044 160 OFFCURVE", -"1228 -28 OFFCURVE", -"1540 -28 CURVE SMOOTH", -"1860 -28 OFFCURVE", -"2148 160 OFFCURVE", -"2212 544 CURVE SMOOTH", -"2460 2048 LINE", -"2216 2048 LINE" +"1336 2048 LINE", +"1084 544 LINE SMOOTH", +"1048 312 OFFCURVE", +"892 200 OFFCURVE", +"704 200 CURVE SMOOTH", +"548 200 OFFCURVE", +"420 312 OFFCURVE", +"456 544 CURVE SMOOTH", +"708 2048 LINE", +"460 2048 LINE", +"208 544 LINE SMOOTH" ); } ); @@ -326998,7 +326942,7 @@ width = 2496; anchors = ( { name = top; -position = "{1732, 2368}"; +position = "{1704, 2180}"; }, { name = top0315; @@ -327010,29 +326954,20 @@ paths = ( { closed = 1; nodes = ( -"1192 728 LINE SMOOTH", -"1160 516 OFFCURVE", -"1068 400 OFFCURVE", -"892 400 CURVE SMOOTH", -"696 400 OFFCURVE", -"648 520 OFFCURVE", -"680 728 CURVE SMOOTH", -"888 1988 LINE", -"332 1988 LINE", -"124 728 LINE SMOOTH", "44 244 OFFCURVE", "348 -28 OFFCURVE", "820 -28 CURVE SMOOTH", -"1212 -28 OFFCURVE", -"1552 244 OFFCURVE", -"1632 728 CURVE SMOOTH", -"1840 1988 LINE", -"1400 1988 LINE" -); -}, -{ -closed = 1; -nodes = ( +"1036 -28 OFFCURVE", +"1232 52 OFFCURVE", +"1384 204 CURVE", +"1484 52 OFFCURVE", +"1660 -28 OFFCURVE", +"1876 -28 CURVE SMOOTH", +"2340 -28 OFFCURVE", +"2728 244 OFFCURVE", +"2808 728 CURVE SMOOTH", +"3028 2048 LINE", +"2472 2048 LINE", "2252 728 LINE SMOOTH", "2220 516 OFFCURVE", "2136 400 OFFCURVE", @@ -327040,23 +326975,26 @@ nodes = ( "1764 400 OFFCURVE", "1708 516 OFFCURVE", "1740 728 CURVE SMOOTH", -"1948 1988 LINE", -"1508 1988 LINE", -"1300 728 LINE SMOOTH", -"1220 244 OFFCURVE", -"1480 -28 OFFCURVE", -"1876 -28 CURVE SMOOTH", -"2340 -28 OFFCURVE", -"2720 244 OFFCURVE", -"2800 728 CURVE SMOOTH", -"3008 1988 LINE", -"2460 1988 LINE" +"1960 2048 LINE", +"1412 2048 LINE", +"1192 728 LINE SMOOTH", +"1160 516 OFFCURVE", +"1068 400 OFFCURVE", +"892 400 CURVE SMOOTH", +"696 400 OFFCURVE", +"648 520 OFFCURVE", +"680 728 CURVE SMOOTH", +"900 2048 LINE", +"344 2048 LINE", +"124 728 LINE SMOOTH" ); } ); -width = 2940; +width = 2948; } ); +leftMetricsKey = H; +rightMetricsKey = H; unicode = 0460; userData = { interface.gridadjust.original = "{'width': 2471, 'leftMargin': 210, 'rightMargin': 195}"; -- cgit v1.2.3