diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-03 22:18:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-03 22:18:25 +0000 |
commit | c6bfcca248f6a0ceacc867b2e70068e760a40d86 (patch) | |
tree | 381e83c0c202d556281da2f9fb9a7a1eeca41f50 /Master/texmf-dist/fonts/source/gregoriotex | |
parent | 229d2a84824108e60025d12c971370b90ee01578 (diff) |
gregoriotex (3may16)
git-svn-id: svn://tug.org/texlive/trunk@40872 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/source/gregoriotex')
-rw-r--r-- | Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd (renamed from Master/texmf-dist/fonts/source/gregoriotex/parmesan-base.sfd) | 589 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd | 648 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd | 581 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/gregoriotex/squarize.py | 687 |
4 files changed, 1674 insertions, 831 deletions
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/parmesan-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd index 0e8ec0f6162..0b45b903602 100644 --- a/Master/texmf-dist/fonts/source/gregoriotex/parmesan-base.sfd +++ b/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd @@ -1,7 +1,7 @@ SplineFontDB: 3.0 -FontName: parmesan -FullName: parmesan -FamilyName: parmesan +FontName: granapadano +FullName: granapadano +FamilyName: granapadano Weight: Medium Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter <reuter@ipd.uka.de>\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>> UComments: "2007-4-12: Created." @@ -19,7 +19,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1176402534 -ModificationTime: 1455123162 +ModificationTime: 1457825253 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -37,13 +37,12 @@ OS2Vendor: 'PfEd' MarkAttachClasses: 1 DEI: 91125 Encoding: Custom -Compacted: 1 UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -96 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 19 8 +WinInfo: 0 17 16 BeginPrivate: 0 EndPrivate Grid @@ -59,7 +58,7 @@ Grid 22 -700 l 0 EndSplineSet TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 375 152 +BeginChars: 160 160 StartChar: Punctum Encoding: 0 -1 0 @@ -174,7 +173,7 @@ EndSplineSet Validated: 1 EndChar -StartChar: OriscusReversus +StartChar: DescendensOriscus Encoding: 4 -1 4 Width: 192 Flags: HW @@ -197,7 +196,7 @@ EndSplineSet Validated: 1 EndChar -StartChar: Oriscus +StartChar: AscendensOriscus Encoding: 5 -1 5 Width: 192 Flags: HW @@ -360,7 +359,7 @@ Validated: 33 EndChar StartChar: DivisioMinima -Encoding: 14 -1 12 +Encoding: 12 -1 12 AltUni2: 000050.ffffffff.0 Width: 19 VWidth: 2048 @@ -379,7 +378,7 @@ Validated: 1 EndChar StartChar: DivisioMinor -Encoding: 15 -1 13 +Encoding: 13 -1 13 Width: 19 VWidth: 2048 Flags: HW @@ -397,7 +396,7 @@ Validated: 1 EndChar StartChar: pesdeminutus -Encoding: 17 -1 14 +Encoding: 14 -1 14 Width: 161 Flags: HW HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -418,7 +417,7 @@ Validated: 1 EndChar StartChar: auctusd1 -Encoding: 18 -1 15 +Encoding: 15 -1 15 Width: 161 Flags: HW HStem: -474.265 17.1 -115.165 17.1 243.935 17.1 603.035 17.1 @@ -441,7 +440,7 @@ Validated: 1 EndChar StartChar: auctusa1 -Encoding: 19 -1 16 +Encoding: 16 -1 16 Width: 161 Flags: HW HStem: -473.75 17.1 -114.65 17.1 244.45 17.1 603.55 17.1 @@ -465,7 +464,7 @@ Validated: 1 EndChar StartChar: mdeminutus -Encoding: 20 -1 17 +Encoding: 17 -1 17 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -486,7 +485,7 @@ Validated: 1 EndChar StartChar: Natural -Encoding: 21 -1 18 +Encoding: 18 -1 18 Width: 141 VWidth: 1129 Flags: HW @@ -519,7 +518,7 @@ Validated: 1 EndChar StartChar: FClef -Encoding: 22 -1 19 +Encoding: 19 -1 19 Width: 299 VWidth: 1119 Flags: HW @@ -560,7 +559,7 @@ Validated: 33 EndChar StartChar: CustosDownLong -Encoding: 23 -1 20 +Encoding: 20 -1 20 Width: 76 VWidth: 1160 Flags: HW @@ -583,7 +582,7 @@ Validated: 1 EndChar StartChar: CustosDownShort -Encoding: 24 -1 21 +Encoding: 21 -1 21 Width: 76 VWidth: 1151 Flags: HW @@ -606,7 +605,7 @@ Validated: 1 EndChar StartChar: CustosUpLong -Encoding: 25 -1 22 +Encoding: 22 -1 22 Width: 76 VWidth: 1119 Flags: HW @@ -629,7 +628,7 @@ Validated: 1 EndChar StartChar: CustosUpShort -Encoding: 26 -1 23 +Encoding: 23 -1 23 Width: 76 VWidth: 1128 Flags: HW @@ -652,7 +651,7 @@ Validated: 1 EndChar StartChar: PunctumLineBR -Encoding: 27 -1 24 +Encoding: 24 -1 24 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -673,7 +672,7 @@ Validated: 1 EndChar StartChar: PunctumLineBL -Encoding: 28 -1 25 +Encoding: 25 -1 25 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -694,7 +693,7 @@ Validated: 1 EndChar StartChar: PunctumLineTL -Encoding: 29 -1 26 +Encoding: 26 -1 26 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -716,7 +715,7 @@ Validated: 1 EndChar StartChar: PunctumLineTR -Encoding: 30 -1 27 +Encoding: 27 -1 27 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -738,7 +737,7 @@ Validated: 1 EndChar StartChar: PunctumLineBLBR -Encoding: 31 -1 28 +Encoding: 28 -1 28 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -759,7 +758,7 @@ Validated: 1 EndChar StartChar: base6 -Encoding: 32 -1 29 +Encoding: 29 -1 29 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -782,7 +781,7 @@ Validated: 1 EndChar StartChar: line2 -Encoding: 33 -1 30 +Encoding: 30 -1 30 Width: 22 VWidth: 2048 Flags: HW @@ -800,7 +799,7 @@ Validated: 1 EndChar StartChar: line3 -Encoding: 34 -1 31 +Encoding: 31 -1 31 Width: 22 VWidth: 2048 Flags: HW @@ -818,7 +817,7 @@ Validated: 1 EndChar StartChar: line4 -Encoding: 35 -1 32 +Encoding: 32 -1 32 Width: 22 VWidth: 2048 Flags: HW @@ -836,7 +835,7 @@ Validated: 1 EndChar StartChar: line5 -Encoding: 36 -1 33 +Encoding: 33 -1 33 Width: 22 VWidth: 2048 Flags: HW @@ -854,7 +853,7 @@ Validated: 1 EndChar StartChar: QuilismaLineTR -Encoding: 40 -1 34 +Encoding: 34 -1 34 Width: 161 Flags: HW HStem: -477.6 17.1 -118.5 17.1 240.6 17.1 599.7 17.1 @@ -889,8 +888,8 @@ EndSplineSet Validated: 33 EndChar -StartChar: OriscusLineTR -Encoding: 41 -1 35 +StartChar: AscendensOriscusLineTR +Encoding: 35 -1 35 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -901,7 +900,7 @@ SplineSet 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0 0.0136719 55.9541 1.15332 83.3135 5.71387 100.414 c 0 12.5537 127.774 33.0732 148.294 59.293 148.294 c 0 - 90.0732 148.294 109.455 114.854 140.233 115.234 c 4 + 90.0732 148.294 109.455 114.854 140.233 115.234 c 0 167.571 115.571 167.143 145.714 169.991 151.141 c 1 182.571 150.857 179.714 151.143 192 151.148 c 1 194.839 132.545 192 79.4765 192 69.625 c 0 @@ -914,7 +913,7 @@ Validated: 33 EndChar StartChar: pbase -Encoding: 42 -1 36 +Encoding: 36 -1 36 Width: 161 Flags: HW HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -935,7 +934,7 @@ Validated: 1 EndChar StartChar: idebilis -Encoding: 43 -1 37 +Encoding: 37 -1 37 Width: 97 VWidth: 2048 Flags: HW @@ -959,7 +958,7 @@ Validated: 1 EndChar StartChar: deminutus -Encoding: 44 -1 38 +Encoding: 38 -1 38 Width: 97 VWidth: 2048 Flags: HW @@ -982,7 +981,7 @@ Validated: 1 EndChar StartChar: rdeminutus -Encoding: 45 -1 39 +Encoding: 39 -1 39 Width: 97 VWidth: 2048 Flags: HW @@ -1005,7 +1004,7 @@ Validated: 1 EndChar StartChar: PunctumAuctusLineBL -Encoding: 46 -1 40 +Encoding: 40 -1 40 Width: 141 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1029,7 +1028,7 @@ Validated: 33 EndChar StartChar: auctusa2 -Encoding: 47 -1 41 +Encoding: 41 -1 41 Width: 161 Flags: HW HStem: -473.75 17.1 -114.65 17.1 244.45 17.1 603.55 17.1 @@ -1053,7 +1052,7 @@ Validated: 1 EndChar StartChar: porrectus1 -Encoding: 48 -1 42 +Encoding: 42 -1 42 Width: 490 VWidth: 2048 Flags: HW @@ -1075,7 +1074,7 @@ Validated: 1 EndChar StartChar: porrectus2 -Encoding: 49 -1 43 +Encoding: 43 -1 43 Width: 575 VWidth: 2048 Flags: HW @@ -1097,7 +1096,7 @@ Validated: 1 EndChar StartChar: porrectus3 -Encoding: 50 -1 44 +Encoding: 44 -1 44 Width: 650 VWidth: 2048 Flags: HW @@ -1119,7 +1118,7 @@ Validated: 1 EndChar StartChar: porrectus4 -Encoding: 51 -1 45 +Encoding: 45 -1 45 Width: 740 VWidth: 2048 Flags: HW @@ -1141,7 +1140,7 @@ Validated: 1 EndChar StartChar: porrectus5 -Encoding: 52 -1 46 +Encoding: 46 -1 46 Width: 931 VWidth: 2048 Flags: HW @@ -1163,7 +1162,7 @@ Validated: 1 EndChar StartChar: porrectusflexus1 -Encoding: 53 -1 47 +Encoding: 47 -1 47 Width: 340 VWidth: 2048 Flags: HW @@ -1185,7 +1184,7 @@ Validated: 1 EndChar StartChar: porrectusflexus2 -Encoding: 54 -1 48 +Encoding: 48 -1 48 Width: 428 VWidth: 2048 Flags: HW @@ -1207,7 +1206,7 @@ Validated: 1 EndChar StartChar: porrectusflexus3 -Encoding: 55 -1 49 +Encoding: 49 -1 49 Width: 586 VWidth: 2048 Flags: HW @@ -1229,7 +1228,7 @@ Validated: 1 EndChar StartChar: porrectusflexus4 -Encoding: 56 -1 50 +Encoding: 50 -1 50 Width: 670 VWidth: 2048 Flags: HW @@ -1251,7 +1250,7 @@ Validated: 1 EndChar StartChar: porrectusflexus5 -Encoding: 57 -1 51 +Encoding: 51 -1 51 Width: 931 VWidth: 2048 Flags: HW @@ -1273,7 +1272,7 @@ Validated: 1 EndChar StartChar: PesQuilismaOneNothing -Encoding: 58 -1 52 +Encoding: 52 -1 52 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1315,7 +1314,7 @@ Validated: 1 EndChar StartChar: StrophaAucta -Encoding: 59 -1 53 +Encoding: 53 -1 53 Width: 168 Flags: HW HStem: -472.609 17.1 -113.509 17.1 245.591 17.1 604.691 17.1 @@ -1340,7 +1339,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus -Encoding: 60 -1 54 +Encoding: 54 -1 54 Width: 178 Flags: HW HStem: -472.63 17.1 -113.53 17.1 245.57 17.1 604.67 17.1 @@ -1367,7 +1366,7 @@ Validated: 33 EndChar StartChar: AuctumMora -Encoding: 62 -1 55 +Encoding: 55 -1 55 Width: 71 VWidth: 2679 Flags: HW @@ -1385,7 +1384,7 @@ Validated: 1 EndChar StartChar: VEpisema -Encoding: 64 -1 56 +Encoding: 57 -1 56 Width: 36 VWidth: 1384 Flags: HW @@ -1405,7 +1404,7 @@ Validated: 1 EndChar StartChar: PunctumDeminutus -Encoding: 65 -1 57 +Encoding: 58 -1 57 Width: 97 VWidth: 2048 Flags: HW @@ -1427,7 +1426,7 @@ Validated: 1 EndChar StartChar: hepisema_base -Encoding: 66 -1 58 +Encoding: 59 -1 58 Width: 1 VWidth: 1972 Flags: HW @@ -1444,7 +1443,7 @@ EndSplineSet EndChar StartChar: PesOneNothing -Encoding: 67 -1 59 +Encoding: 60 -1 59 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1472,7 +1471,7 @@ Validated: 1 EndChar StartChar: CustosUpMedium -Encoding: 68 -1 60 +Encoding: 61 -1 60 Width: 76 VWidth: 1124 Flags: HW @@ -1495,7 +1494,7 @@ Validated: 1 EndChar StartChar: CustosDownMedium -Encoding: 69 -1 61 +Encoding: 62 -1 61 Width: 76 VWidth: 1155 Flags: HW @@ -1518,7 +1517,7 @@ Validated: 1 EndChar StartChar: Accentus -Encoding: 70 -1 62 +Encoding: 63 -1 62 Width: 99 VWidth: 1594 Flags: HW @@ -1540,7 +1539,7 @@ Validated: 1 EndChar StartChar: AccentusReversus -Encoding: 71 -1 63 +Encoding: 64 -1 63 Width: 99 VWidth: 1594 Flags: HW @@ -1562,7 +1561,7 @@ Validated: 1 EndChar StartChar: SemicirculusReversus -Encoding: 72 -1 64 +Encoding: 65 -1 64 Width: 125 VWidth: 1583 Flags: HW @@ -1582,7 +1581,7 @@ Validated: 1 EndChar StartChar: Semicirculus -Encoding: 73 -1 65 +Encoding: 66 -1 65 Width: 124 VWidth: 1606 Flags: HW @@ -1602,7 +1601,7 @@ Validated: 1 EndChar StartChar: Circulus -Encoding: 74 -1 66 +Encoding: 67 -1 66 Width: 124 VWidth: 1594 Flags: HW @@ -1625,7 +1624,7 @@ Validated: 1 EndChar StartChar: CClefChange -Encoding: 75 -1 67 +Encoding: 68 -1 67 Width: 143 VWidth: 1107 Flags: W @@ -1654,7 +1653,7 @@ Validated: 33 EndChar StartChar: FClefChange -Encoding: 76 -1 68 +Encoding: 69 -1 68 Width: 299 VWidth: 1119 Flags: W @@ -1695,7 +1694,7 @@ Validated: 33 EndChar StartChar: VEpisema.circumflexus -Encoding: 77 -1 69 +Encoding: 70 -1 69 Width: 108 VWidth: 2048 Flags: HW @@ -1719,7 +1718,7 @@ Validated: 1 EndChar StartChar: PunctumCavum -Encoding: 78 -1 70 +Encoding: 71 -1 70 Width: 161 VWidth: 1139 Flags: HW @@ -1749,7 +1748,7 @@ Validated: 1 EndChar StartChar: LineaPunctum -Encoding: 79 -1 71 +Encoding: 72 -1 71 Width: 258 VWidth: 1139 Flags: HW @@ -1785,7 +1784,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavum -Encoding: 80 -1 72 +Encoding: 73 -1 72 Width: 258 VWidth: 1139 Flags: HW @@ -1829,7 +1828,7 @@ Validated: 1 EndChar StartChar: PunctumSmall -Encoding: 81 -1 73 +Encoding: 74 -1 73 Width: 151 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1850,7 +1849,7 @@ Validated: 1 EndChar StartChar: hepisemaright -Encoding: 83 -1 74 +Encoding: 76 -1 74 Width: 2 VWidth: 1968 Flags: HW @@ -1867,7 +1866,7 @@ EndSplineSet EndChar StartChar: mpdeminutus -Encoding: 84 -1 75 +Encoding: 77 -1 75 Width: 161 Flags: HW HStem: 536.497 15 221.497 15 -93.503 15 -408.503 15 @@ -1888,7 +1887,7 @@ Validated: 1 EndChar StartChar: PunctumDescendens -Encoding: 85 -1 76 +Encoding: 78 -1 76 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1911,7 +1910,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens -Encoding: 86 -1 77 +Encoding: 79 -1 77 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1934,7 +1933,7 @@ Validated: 1 EndChar StartChar: mnbdeminutus -Encoding: 87 -1 78 +Encoding: 80 -1 78 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1955,7 +1954,7 @@ Validated: 1 EndChar StartChar: mnbpdeminutus -Encoding: 88 -1 79 +Encoding: 81 -1 79 Width: 161 Flags: HW HStem: 536.058 15 221.058 15 -93.9416 15 -408.942 15 @@ -1976,7 +1975,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb1 -Encoding: 89 -1 80 +Encoding: 82 -1 80 Width: 340 VWidth: 2048 Flags: HW @@ -1997,7 +1996,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb2 -Encoding: 90 -1 81 +Encoding: 83 -1 81 Width: 428 VWidth: 2048 Flags: HW @@ -2018,7 +2017,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb3 -Encoding: 91 -1 82 +Encoding: 84 -1 82 Width: 586 VWidth: 2048 Flags: HW @@ -2039,7 +2038,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb4 -Encoding: 92 -1 83 +Encoding: 85 -1 83 Width: 670 VWidth: 2048 Flags: HW @@ -2060,7 +2059,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb5 -Encoding: 93 -1 84 +Encoding: 86 -1 84 Width: 931 VWidth: 2048 Flags: HW @@ -2081,7 +2080,7 @@ Validated: 1 EndChar StartChar: p2base -Encoding: 95 -1 85 +Encoding: 88 -1 85 Width: 161 Flags: W HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -2102,7 +2101,7 @@ Validated: 1 EndChar StartChar: msdeminutus -Encoding: 97 -1 86 +Encoding: 89 -1 86 Width: 161 Flags: HW HStem: 536.058 15 221.058 15 -93.9416 15 -408.942 15 @@ -2125,7 +2124,7 @@ Validated: 1 EndChar StartChar: mademinutus -Encoding: 98 -1 87 +Encoding: 90 -1 87 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2148,7 +2147,7 @@ Validated: 1 EndChar StartChar: PunctumCavumHole -Encoding: 99 -1 88 +Encoding: 91 -1 88 Width: 161 VWidth: 1139 Flags: HW @@ -2168,7 +2167,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavumHole -Encoding: 100 -1 89 +Encoding: 92 -1 89 Width: 258 VWidth: 1139 Flags: HW @@ -2188,7 +2187,7 @@ Validated: 1 EndChar StartChar: NaturalHole -Encoding: 101 -1 90 +Encoding: 93 -1 90 Width: 141 VWidth: 1129 Flags: HW @@ -2206,7 +2205,7 @@ Validated: 1 EndChar StartChar: FlatHole -Encoding: 102 -1 91 +Encoding: 94 -1 91 Width: 159 VWidth: 1120 Flags: HW @@ -2225,8 +2224,8 @@ EndSplineSet Validated: 1 EndChar -StartChar: odbase -Encoding: 103 -1 92 +StartChar: DescendensOriscusLineBR +Encoding: 95 -1 92 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -2245,13 +2244,12 @@ SplineSet 158.94 148.294 179.46 127.774 186.3 100.414 c 0 190.86 83.3135 192 55.9541 192 37.7139 c 0 192 24.5596 192 -21.5 192 -42 c 5 - 182.5 -42 179 -42 170 -42 c 5 + 170 -42 l 5 EndSplineSet -Validated: 1 EndChar StartChar: DivisioDominican -Encoding: 104 -1 93 +Encoding: 96 -1 93 Width: 22 VWidth: 2048 Flags: W @@ -2269,7 +2267,7 @@ Validated: 1 EndChar StartChar: DivisioDominicanAlt -Encoding: 105 -1 94 +Encoding: 97 -1 94 Width: 22 VWidth: 2048 Flags: W @@ -2287,7 +2285,7 @@ Validated: 1 EndChar StartChar: Sharp -Encoding: 106 -1 95 +Encoding: 98 -1 95 Width: 258 VWidth: 2048 Flags: W @@ -2350,7 +2348,7 @@ Validated: 1 EndChar StartChar: SharpHole -Encoding: 107 -1 96 +Encoding: 99 -1 96 Width: 258 VWidth: 2048 Flags: W @@ -2368,7 +2366,7 @@ Validated: 1 EndChar StartChar: Linea -Encoding: 108 -1 97 +Encoding: 100 -1 97 Width: 431 VWidth: 2612 Flags: W @@ -2396,7 +2394,7 @@ Validated: 1 EndChar StartChar: RoundBrace -Encoding: 109 -1 98 +Encoding: 101 -1 98 Width: 937 VWidth: 2048 Flags: W @@ -2422,7 +2420,7 @@ Validated: 1 EndChar StartChar: CurlyBrace -Encoding: 110 -1 99 +Encoding: 102 -1 99 Width: 1006 VWidth: 2048 Flags: W @@ -2450,7 +2448,7 @@ Validated: 1 EndChar StartChar: BarBrace -Encoding: 111 -1 100 +Encoding: 103 -1 100 Width: 591 VWidth: 2048 Flags: W @@ -2476,7 +2474,7 @@ Validated: 1 EndChar StartChar: OriscusDeminutus -Encoding: 112 -1 101 +Encoding: 104 -1 101 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -2500,32 +2498,31 @@ EndSplineSet Validated: 33 EndChar -StartChar: OriscusLineBL -Encoding: 113 -1 102 +StartChar: AscendensOriscusLineBL +Encoding: 105 -1 102 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 LayerCount: 2 Fore SplineSet -177.181 151.148 m 4 - 188.58 151.148 192 89.5889 192 71.3486 c 4 - 192 53.1084 190.86 25.749 186.3 8.64844 c 4 - 179.46 -18.7119 158.94 -39.2314 132.721 -39.2314 c 4 - 101.94 -39.2314 82.5586 -5.79199 51.7803 -6.17188 c 4 +177.181 151.148 m 0 + 188.58 151.148 192 89.5889 192 71.3486 c 0 + 192 53.1084 190.86 25.749 186.3 8.64844 c 0 + 179.46 -18.7119 158.94 -39.2314 132.721 -39.2314 c 0 + 101.94 -39.2314 82.5586 -5.79199 51.7803 -6.17188 c 0 24.4424 -6.50879 24.8711 -36.6523 22.0225 -42.0791 c 5 - 9.44238 -41.7949 12.2998 -42.0811 0.0136719 -42.0859 c 5 - -2.8252 -23.4824 0.0136719 29.5859 0.0136719 39.4375 c 4 - 0.0136719 57.6777 2.75977 85.0283 6.18066 102.129 c 4 - 13.0205 129.488 34.6807 150.009 59.7598 150.009 c 4 - 91.6807 150.009 109.92 116.948 140.7 116.948 c 4 - 174.9 116.948 168.061 151.148 177.181 151.148 c 4 + 0.0136719 -42.0859 l 5 + -2.8252 -23.4824 0.0136719 29.5859 0.0136719 39.4375 c 0 + 0.0136719 57.6777 2.75977 85.0283 6.18066 102.129 c 0 + 13.0205 129.488 34.6807 150.009 59.7598 150.009 c 0 + 91.6807 150.009 109.92 116.948 140.7 116.948 c 0 + 174.9 116.948 168.061 151.148 177.181 151.148 c 0 EndSplineSet -Validated: 33 EndChar -StartChar: SalicusOriscus -Encoding: 114 -1 103 +StartChar: AscendensOriscusLineBLTR +Encoding: 106 -1 103 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -2554,7 +2551,7 @@ Validated: 33 EndChar StartChar: hepisemaleft -Encoding: 82 -1 104 +Encoding: 75 -1 104 Width: 1 VWidth: 1968 Flags: HW @@ -2571,7 +2568,7 @@ EndSplineSet EndChar StartChar: RoundBraceDown -Encoding: 130 -1 105 +Encoding: 107 -1 105 Width: 937 Flags: HW LayerCount: 2 @@ -2595,7 +2592,7 @@ Validated: 1 EndChar StartChar: VirgaReversaDescendens_op -Encoding: 131 -1 106 +Encoding: 108 -1 106 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2618,7 +2615,7 @@ Validated: 1 EndChar StartChar: VirgaReversaLongqueueDescendens_op -Encoding: 132 -1 107 +Encoding: 109 -1 107 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2641,7 +2638,7 @@ Validated: 1 EndChar StartChar: VirgaReversaAscendens_op -Encoding: 133 -1 108 +Encoding: 110 -1 108 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2664,7 +2661,7 @@ Validated: 1 EndChar StartChar: VirgaReversaLongqueueAscendens_op -Encoding: 134 -1 109 +Encoding: 111 -1 109 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2687,7 +2684,7 @@ Validated: 1 EndChar StartChar: PunctumDescendens_op -Encoding: 137 -1 110 +Encoding: 112 -1 110 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2711,7 +2708,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens_op -Encoding: 138 -1 111 +Encoding: 113 -1 111 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2734,7 +2731,7 @@ Validated: 1 EndChar StartChar: auctusd1_op -Encoding: 139 -1 112 +Encoding: 114 -1 112 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2758,7 +2755,7 @@ Validated: 1 EndChar StartChar: auctusa1_op -Encoding: 140 -1 113 +Encoding: 115 -1 113 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2782,7 +2779,7 @@ Validated: 1 EndChar StartChar: auctusa2_op -Encoding: 141 -1 114 +Encoding: 116 -1 114 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2806,7 +2803,7 @@ Validated: 1 EndChar StartChar: PunctumAuctusLineBL_op -Encoding: 142 -1 115 +Encoding: 117 -1 115 Width: 141 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2830,7 +2827,7 @@ Validated: 33 EndChar StartChar: pesdeminutus_op -Encoding: 143 -1 116 +Encoding: 118 -1 116 Width: 161 Flags: HW HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -2853,7 +2850,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatum -Encoding: 144 -1 117 +Encoding: 119 -1 117 Width: 178 Flags: HW HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1 @@ -2891,7 +2888,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumHole -Encoding: 145 -1 118 +Encoding: 120 -1 118 Width: 178 Flags: HW HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1 @@ -2916,7 +2913,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumAuctus -Encoding: 146 -1 119 +Encoding: 121 -1 119 Width: 178 Flags: HW HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1 @@ -2956,7 +2953,7 @@ Validated: 33 EndChar StartChar: PunctumCavumInclinatumAuctusHole -Encoding: 147 -1 120 +Encoding: 122 -1 120 Width: 178 Flags: HW HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1 @@ -2980,8 +2977,8 @@ EndSplineSet Validated: 1 EndChar -StartChar: OriscusReversusLineTLBR -Encoding: 148 -1 121 +StartChar: DescendensOriscusLineTLBR +Encoding: 123 -1 121 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -2994,7 +2991,7 @@ SplineSet 192 37.6699 192 37.625 192 37.5801 c 0 192 37.5322 192 37.4854 192 37.4375 c 0 192 27.5859 194.839 -25.4824 192 -44.0859 c 1 - 179.714 -44.0859 182.571 -43.8018 169.991 -44.0859 c 1 + 169.991 -44.0859 l 1 167.143 -38.6592 167.571 -8.50879 140.233 -8.17188 c 0 106.215 -7.75195 94.0938 -41.2314 59.293 -41.2314 c 0 33.0732 -41.2314 12.5537 -20.7119 5.71387 6.64844 c 0 @@ -3002,14 +2999,14 @@ SplineSet 0.0136719 69.4824 l 1 0.0136719 69.625 l 2 0.0136719 79.4766 -2.8252 132.538 0.0136719 151.141 c 1 - 12.2998 151.141 9.44238 150.857 22.0225 151.141 c 1 + 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 1 24.8711 145.714 24.4424 115.571 51.7803 115.234 c 0 85.7969 114.814 97.9199 148.294 132.721 148.294 c 0 EndSplineSet EndChar -StartChar: OriscusReversusLineTL -Encoding: 149 -1 122 +StartChar: DescendensOriscusLineTL +Encoding: 124 -1 122 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -3022,7 +3019,7 @@ SplineSet 34.6807 -40.9463 13.0205 -20.4258 6.18066 6.93359 c 0 2.75977 24.0342 0.0136719 51.3848 0.0136719 69.625 c 0 0.0136719 79.4766 -2.8252 132.545 0.0136719 151.148 c 1 - 12.2998 151.143 9.44238 150.857 22.0225 151.141 c 1 + 22.0225 151.141 0.0136719 151.148 22.0225 151.141 c 1 24.8711 145.714 24.4424 115.571 51.7803 115.234 c 0 82.5586 114.854 101.94 148.294 132.721 148.294 c 0 158.94 148.294 179.46 127.774 186.3 100.414 c 0 @@ -3032,7 +3029,7 @@ EndSplineSet EndChar StartChar: UpperPesOneNothing -Encoding: 63 -1 123 +Encoding: 56 -1 123 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3060,8 +3057,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavum -Encoding: 152 -1 124 +StartChar: AscendensOriscusCavum +Encoding: 125 -1 124 Width: 192 Flags: HW HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628 @@ -3093,8 +3090,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumHole -Encoding: 153 -1 125 +StartChar: AscendensOriscusCavumHole +Encoding: 126 -1 125 Width: 192 Flags: W HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628 @@ -3115,8 +3112,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumReversus -Encoding: 154 -1 126 +StartChar: DescendensOriscusCavum +Encoding: 127 -1 126 Width: 192 Flags: HW HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628 @@ -3148,8 +3145,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumReversusHole -Encoding: 155 -1 127 +StartChar: DescendensOriscusCavumHole +Encoding: 128 -1 127 Width: 192 Flags: HW HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628 @@ -3171,7 +3168,7 @@ EndSplineSet EndChar StartChar: OriscusCavumDeminutus -Encoding: 156 -1 128 +Encoding: 129 -1 128 Width: 192 Flags: HW HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628 @@ -3206,7 +3203,7 @@ EndSplineSet EndChar StartChar: OriscusCavumDeminutusHole -Encoding: 157 -1 129 +Encoding: 130 -1 129 Width: 192 Flags: HW LayerCount: 2 @@ -3227,7 +3224,7 @@ EndSplineSet EndChar StartChar: Virgula.2 -Encoding: 158 -1 130 +Encoding: 131 -1 130 Width: 152 VWidth: 1418 Flags: HW @@ -3245,7 +3242,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.2 -Encoding: 159 -1 131 +Encoding: 132 -1 131 Width: 19 VWidth: 1418 Flags: HW @@ -3262,7 +3259,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.2 -Encoding: 160 -1 132 +Encoding: 133 -1 132 Width: 19 VWidth: 2048 Flags: HW @@ -3279,7 +3276,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.2 -Encoding: 161 -1 133 +Encoding: 134 -1 133 Width: 19 VWidth: 2048 Flags: HW @@ -3296,7 +3293,7 @@ EndSplineSet EndChar StartChar: Virgula.3 -Encoding: 162 -1 134 +Encoding: 135 -1 134 Width: 152 VWidth: 1733 Flags: HW @@ -3314,7 +3311,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.3 -Encoding: 163 -1 135 +Encoding: 136 -1 135 Width: 19 VWidth: 1733 Flags: HW @@ -3331,7 +3328,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.3 -Encoding: 164 -1 136 +Encoding: 137 -1 136 Width: 19 VWidth: 2048 Flags: HW @@ -3348,7 +3345,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.3 -Encoding: 165 -1 137 +Encoding: 138 -1 137 Width: 19 VWidth: 2048 Flags: HW @@ -3365,7 +3362,7 @@ EndSplineSet EndChar StartChar: Virgula.5 -Encoding: 166 -1 138 +Encoding: 139 -1 138 Width: 152 VWidth: 2363 Flags: HW @@ -3383,7 +3380,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.5 -Encoding: 167 -1 139 +Encoding: 140 -1 139 Width: 19 VWidth: 2363 Flags: HW @@ -3400,7 +3397,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.5 -Encoding: 168 -1 140 +Encoding: 141 -1 140 Width: 19 VWidth: 2048 Flags: HW @@ -3417,7 +3414,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.5 -Encoding: 169 -1 141 +Encoding: 142 -1 141 Width: 19 VWidth: 2048 Flags: HW @@ -3434,7 +3431,7 @@ EndSplineSet EndChar StartChar: StrophaAuctaLongtail -Encoding: 94 -1 142 +Encoding: 87 -1 142 Width: 168 Flags: W HStem: -472.609 17.1 -113.509 17.1 245.591 17.1 604.691 17.1 @@ -3458,7 +3455,7 @@ EndSplineSet EndChar StartChar: rqueue -Encoding: 170 -1 143 +Encoding: 143 -1 143 Width: 22 VWidth: 2048 Flags: HW @@ -3466,16 +3463,16 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -22 -14.5 m 13 - 22 3 l 25 +22 -14.5 m 21 + 13.8428 -12.709 4.40723 -12.2783 0 -6.5 c 9 0 3 l 25 - 0 -6.5 l 17 - 4.40723 -12.2783 13.8428 -12.709 22 -14.5 c 13 + 22 3 l 25 + 22 -14.5 l 21 EndSplineSet EndChar StartChar: queuebase -Encoding: 171 -1 144 +Encoding: 144 -1 144 Width: 22 VWidth: 2048 Flags: HW @@ -3493,7 +3490,7 @@ EndSplineSet EndChar StartChar: virgabase -Encoding: 172 -1 145 +Encoding: 145 -1 145 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3514,7 +3511,7 @@ EndSplineSet EndChar StartChar: rvbase -Encoding: 173 -1 146 +Encoding: 146 -1 146 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3536,7 +3533,7 @@ EndSplineSet EndChar StartChar: rvirgabase -Encoding: 174 -1 147 +Encoding: 147 -1 147 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3557,7 +3554,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL -Encoding: 175 -1 148 +Encoding: 148 -1 148 Width: 161 Flags: W HStem: -409 15 -94 15 221 15 536 15 @@ -3578,15 +3575,15 @@ SplineSet EndSplineSet EndChar -StartChar: osbase -Encoding: 176 -1 149 +StartChar: AscendensOriscusLineBLBR +Encoding: 149 -1 149 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 LayerCount: 2 Fore SplineSet -0.0101797 -58 m 5 +0.0101797 -58 m 1 0.0136719 37.7139 l 2 0.0146484 55.9541 1.15332 83.3135 5.71387 100.414 c 0 12.5537 127.774 33.0732 148.294 59.293 148.294 c 0 @@ -3594,48 +3591,248 @@ SplineSet 174.434 115.234 166.453 149.435 176.714 149.435 c 0 188.113 149.435 192 87.8652 192 69.625 c 0 192 -42 l 1 - 182.5 -42 179 -42 170 -42 c 1 + 170 -42 l 1 170 -23.1459 l 1 160.003 -34.142 146.695 -40.9463 132.254 -40.9463 c 0 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0 31.2755 -7.88574 25 -19 22 -29 c 1 22.0119 -58 l 1 - 0.0101797 -58 l 5 + 0.0101797 -58 l 1 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBL +Encoding: 150 -1 150 +Width: 192 +Flags: HW +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +0.0101797 -58 m 1 + 0.0136719 69.625 l 0 + 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0 + 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0 + 82.5605 115.234 101.94 148.294 132.721 148.294 c 0 + 158.94 148.294 179.46 127.774 186.3 100.414 c 0 + 190.86 83.3135 192 55.9541 192 37.7139 c 0 + 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0 + 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0 + 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0 + 45.3152 -40.9463 32.0047 -34.139 22.0068 -23.1387 c 1 + 22.0119 -58 l 1 + 0.0101797 -58 l 1 EndSplineSet EndChar -StartChar: OriscusReversusLineBL -Encoding: 177 -1 150 +StartChar: tmpglyph +Encoding: 151 -1 151 +Width: 22 +VWidth: 2048 +Flags: HW +HStem: 64 32<0 1> +VStem: 0 1<64 96> +LayerCount: 2 +EndChar + +StartChar: AscendensOriscusLineBR +Encoding: 152 -1 152 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 LayerCount: 2 Fore SplineSet -22.0137 -42 m 5 - 13.0137 -42 9.51367 -42 0.0136719 -42 c 5 - 0.0136719 -21.5 0.0136719 24.5596 0.0136719 37.7139 c 0 +169.971 -23.1776 m 1 + 159.977 -34.1551 146.681 -40.9463 132.254 -40.9463 c 0 + 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0 + 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0 + 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0 0.0136719 55.9541 1.15332 83.3135 5.71387 100.414 c 0 12.5537 127.774 33.0732 148.294 59.293 148.294 c 0 90.0732 148.294 109.453 115.234 140.233 115.234 c 0 174.434 115.234 166.453 149.435 176.714 149.435 c 0 188.113 149.435 192 87.8652 192 69.625 c 0 + 192 -42 l 1 + 170 -42 l 1 + 169.971 -23.1776 l 1 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTLBR +Encoding: 153 -1 153 +Width: 192 +Flags: HW +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +0.0136719 151.141 m 5 + 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 1 + 22.0529 131.44 l 1 + 31.7543 141.879 44.6326 148.294 59.293 148.294 c 0 + 90.0732 148.294 109.453 115.234 140.233 115.234 c 0 + 174.434 115.234 166.453 149.435 176.714 149.435 c 0 + 188.113 149.435 192 87.8652 192 69.625 c 0 + 192 -42 l 1 + 170 -42 l 1 + 169.971 -23.1776 l 1 + 159.977 -34.1551 146.681 -40.9463 132.254 -40.9463 c 0 + 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0 + 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0 + 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 4 + 0.0136719 151.141 l 5 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTLTR +Encoding: 154 -1 154 +Width: 192 +Flags: HW +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +0.0136719 151.141 m 1 + 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 1 + 22.0468 131.433 l 1 + 31.7489 141.876 44.6295 148.294 59.293 148.294 c 0 + 90.0732 148.294 109.455 114.854 140.233 115.234 c 0 + 167.571 115.571 167.143 145.714 169.991 151.141 c 5 + 192 151.148 l 5 + 194.839 132.545 192 79.4765 192 69.625 c 0 192 51.3848 189.254 24.0342 185.833 6.93359 c 0 178.993 -20.4258 157.333 -40.9463 132.254 -40.9463 c 0 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0 - 31.3037 -7.88574 25.3428 -15.2842 22.0137 -25 c 1 - 22.0137 -35.5 22.0137 -31.5 22.0137 -42 c 5 + 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0 + 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0 + 0.0136719 151.141 l 1 EndSplineSet EndChar -StartChar: tmpglyph -Encoding: 178 -1 151 -Width: 22 -VWidth: 2048 +StartChar: AscendensOriscusLineTL +Encoding: 155 -1 155 +Width: 192 +Flags: W +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +0.0136719 151.141 m 5 + 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 5 + 21.9791 131.36 l 1 + 31.6889 141.846 44.5954 148.294 59.293 148.294 c 0 + 90.0732 148.294 109.453 115.234 140.233 115.234 c 0 + 174.434 115.234 166.453 149.435 176.714 149.435 c 0 + 188.113 149.435 192 87.8652 192 69.625 c 0 + 192 51.3848 189.254 24.0342 185.833 6.93359 c 0 + 178.993 -20.4258 157.333 -40.9463 132.254 -40.9463 c 0 + 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0 + 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0 + 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0 + 0.0136719 151.141 l 5 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBLBR +Encoding: 156 -1 156 +Width: 192 Flags: HW -HStem: 64 32<0 1> -VStem: 0 1<64 96> +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +0.0136719 69.625 m 4 + 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0 + 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0 + 82.5605 115.234 101.94 148.294 132.721 148.294 c 0 + 158.94 148.294 179.46 127.774 186.3 100.414 c 0 + 190.86 83.3135 192 55.9541 192 37.7139 c 0 + 192 24.5596 192 -21.5 192 -42 c 1 + 182.5 -42 179 -42 170 -42 c 1 + 170 -31.5 170 -35.5 170 -25 c 1 + 166.671 -15.2842 160.71 -7.88574 140.7 -7.88574 c 0 + 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0 + 45.3285 -40.9463 32.0294 -34.1516 22.0346 -23.169 c 1 + 22.0225 -42.0791 l 1 + 0.0136719 -42.0859 l 5 + 0.0136719 69.625 l 4 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBLTR +Encoding: 157 -1 157 +Width: 192 +Flags: HW +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 LayerCount: 2 +Fore +SplineSet +0.0136719 69.625 m 4 + 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0 + 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0 + 82.5605 115.234 101.94 148.294 132.721 148.294 c 0 + 147.398 148.294 160.29 141.864 169.995 131.403 c 1 + 169.991 151.141 l 1 + 192 151.148 l 1 + 192 37.7139 l 0 + 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0 + 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0 + 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0 + 45.3253 -40.9463 32.0234 -34.1485 22.0279 -23.1616 c 1 + 22.0225 -42.0791 l 1 + 0.0136719 -42.0859 l 5 + 0.0136719 69.625 l 4 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineTLTR +Encoding: 158 -1 158 +Width: 192 +Flags: HW +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +192 37.7139 m 4 + 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0 + 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0 + 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0 + 34.6807 -40.9463 13.0205 -20.4258 6.18066 6.93359 c 0 + 2.75977 24.0342 0.0136719 51.3848 0.0136719 69.625 c 0 + 0.0136719 79.4766 -2.8252 132.545 0.0136719 151.148 c 1 + 12.2998 151.143 9.44238 150.857 22.0225 151.141 c 1 + 24.8711 145.714 24.4424 115.571 51.7803 115.234 c 0 + 82.5586 114.854 101.94 148.294 132.721 148.294 c 0 + 147.411 148.294 160.312 141.852 170.02 131.375 c 1 + 169.991 151.141 l 1 + 192 151.148 l 5 + 192 37.7139 l 4 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineTR +Encoding: 159 -1 159 +Width: 192 +Flags: HW +HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 +LayerCount: 2 +Fore +SplineSet +192 37.7139 m 0 + 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0 + 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0 + 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0 + 34.6807 -40.9463 13.0205 -20.4258 6.18066 6.93359 c 0 + 2.75977 24.0342 0.0136719 51.3848 0.0136719 69.625 c 0 + 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0 + 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0 + 82.5605 115.234 101.94 148.294 132.721 148.294 c 0 + 147.428 148.294 160.341 141.838 170.053 131.34 c 1 + 169.991 151.141 l 5 + 192 151.148 l 5 + 192 37.7139 l 0 +EndSplineSet EndChar EndChars EndSplineFont diff --git a/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd index 121ce478174..6f169c8a17d 100644 --- a/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd +++ b/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd @@ -20,7 +20,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1176402534 -ModificationTime: 1455123204 +ModificationTime: 1457825186 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -38,16 +38,17 @@ OS2Vendor: 'PfEd' MarkAttachClasses: 1 DEI: 91125 Encoding: Custom -Compacted: 1 UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -96 AntiAlias: 1 FitToEm: 1 -WinInfo: 19 19 8 +WinInfo: 0 14 13 BeginPrivate: 0 EndPrivate Grid +-1000 159 m 0 + 2000 159 l 0 -1000 194 m 0 2000 194 l 0 18 1300 m 0 @@ -72,7 +73,7 @@ Grid 17.75 -700 l 0 EndSplineSet TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 379 164 +BeginChars: 172 172 StartChar: Punctum Encoding: 0 -1 0 @@ -165,7 +166,7 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusReversus +StartChar: DescendensOriscus Encoding: 4 -1 4 Width: 166 VWidth: 2537 @@ -187,7 +188,7 @@ SplineSet EndSplineSet EndChar -StartChar: Oriscus +StartChar: AscendensOriscus Encoding: 5 -1 5 Width: 166 VWidth: 2537 @@ -346,7 +347,7 @@ Validated: 33 EndChar StartChar: DivisioMinima -Encoding: 14 -1 12 +Encoding: 12 -1 12 AltUni2: 000050.ffffffff.0 Width: 19 VWidth: 2048 @@ -366,7 +367,7 @@ Validated: 1 EndChar StartChar: DivisioMinor -Encoding: 15 -1 13 +Encoding: 13 -1 13 Width: 19 VWidth: 2048 Flags: W @@ -384,7 +385,7 @@ Validated: 1 EndChar StartChar: pesdeminutus -Encoding: 17 -1 14 +Encoding: 14 -1 14 Width: 166 VWidth: 2684 Flags: W @@ -408,7 +409,7 @@ Validated: 1 EndChar StartChar: auctusd1 -Encoding: 18 -1 15 +Encoding: 15 -1 15 Width: 166 VWidth: 2689 Flags: W @@ -431,7 +432,7 @@ Validated: 1 EndChar StartChar: auctusa1 -Encoding: 19 -1 16 +Encoding: 16 -1 16 Width: 166 VWidth: 2421 Flags: W @@ -455,7 +456,7 @@ Validated: 1 EndChar StartChar: mdeminutus -Encoding: 20 -1 17 +Encoding: 17 -1 17 Width: 168 VWidth: 2048 Flags: W @@ -481,7 +482,7 @@ Validated: 1 EndChar StartChar: Natural -Encoding: 21 -1 18 +Encoding: 18 -1 18 Width: 108 Flags: W VStem: 0 25.2002<7.7002 121.4 173.3 323.299> 84 24<-184.013 -35.5 18.5 128.9> @@ -517,7 +518,7 @@ Validated: 1 EndChar StartChar: FClef -Encoding: 22 -1 19 +Encoding: 19 -1 19 Width: 322 VWidth: 2503 Flags: W @@ -555,7 +556,7 @@ Validated: 33 EndChar StartChar: CustosDownLong -Encoding: 23 -1 20 +Encoding: 20 -1 20 Width: 73 VWidth: 2463 Flags: W @@ -576,7 +577,7 @@ Validated: 1 EndChar StartChar: CustosDownShort -Encoding: 24 -1 21 +Encoding: 21 -1 21 Width: 73 VWidth: 2412 Flags: W @@ -598,7 +599,7 @@ Validated: 1 EndChar StartChar: CustosUpLong -Encoding: 25 -1 22 +Encoding: 22 -1 22 Width: 73 VWidth: 2609 Flags: W @@ -621,7 +622,7 @@ Validated: 1 EndChar StartChar: CustosUpShort -Encoding: 26 -1 23 +Encoding: 23 -1 23 Width: 74 VWidth: 2660 Flags: W @@ -643,7 +644,7 @@ Validated: 1 EndChar StartChar: PunctumLineBR -Encoding: 27 -1 24 +Encoding: 24 -1 24 Width: 166 VWidth: 2612 Flags: W @@ -666,7 +667,7 @@ Validated: 1 EndChar StartChar: PunctumLineBL -Encoding: 28 -1 25 +Encoding: 25 -1 25 Width: 166 VWidth: 2612 Flags: W @@ -689,7 +690,7 @@ Validated: 1 EndChar StartChar: PunctumLineTL -Encoding: 29 -1 26 +Encoding: 26 -1 26 Width: 166 VWidth: 2612 Flags: W @@ -712,7 +713,7 @@ Validated: 1 EndChar StartChar: PunctumLineTR -Encoding: 30 -1 27 +Encoding: 27 -1 27 Width: 166 VWidth: 2612 Flags: W @@ -735,7 +736,7 @@ Validated: 1 EndChar StartChar: PunctumLineBLBR -Encoding: 31 -1 28 +Encoding: 28 -1 28 Width: 166 VWidth: 2612 Flags: W @@ -760,7 +761,7 @@ Validated: 1 EndChar StartChar: base6 -Encoding: 32 -1 29 +Encoding: 29 -1 29 Width: 166 VWidth: 2612 Flags: W @@ -785,7 +786,7 @@ Validated: 1 EndChar StartChar: line2 -Encoding: 33 -1 30 +Encoding: 30 -1 30 Width: 18 VWidth: 2048 Flags: W @@ -804,7 +805,7 @@ Validated: 1 EndChar StartChar: line3 -Encoding: 34 -1 31 +Encoding: 31 -1 31 Width: 18 VWidth: 2048 Flags: W @@ -823,7 +824,7 @@ Validated: 1 EndChar StartChar: line4 -Encoding: 35 -1 32 +Encoding: 32 -1 32 Width: 18 VWidth: 2048 Flags: W @@ -841,7 +842,7 @@ Validated: 1 EndChar StartChar: line5 -Encoding: 36 -1 33 +Encoding: 33 -1 33 Width: 18 VWidth: 2048 Flags: W @@ -859,7 +860,7 @@ Validated: 1 EndChar StartChar: QuilismaLineTR -Encoding: 40 -1 34 +Encoding: 34 -1 34 Width: 166 VWidth: 2496 Flags: W @@ -888,32 +889,32 @@ EndSplineSet Validated: 33 EndChar -StartChar: OriscusLineTR -Encoding: 41 -1 35 +StartChar: AscendensOriscusLineTR +Encoding: 35 -1 35 Width: 166 VWidth: 2537 Flags: W -HStem: -37.1504 176.8<74.1705 154.735> -VStem: -0.200195 166.4<-3.28925 139.081> 148.027 17.9728<141.255 159> +HStem: -37.1494 176.799<74.1345 154.636> +VStem: -0.200195 166.201<-3.28828 139.081> 148.027 17.973<141.255 159> LayerCount: 2 Fore SplineSet -148 159 m 5xa0 - 166 159 l 5xa0 - 166.2 13.5498 l 2 - 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0 - 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 +148 159 m 1xa0 + 166 159 l 1xa0 + 166.001 13.5508 l 2 + 166.001 -12.9688 158.201 -37.1494 127.001 -37.1494 c 0 + 105.937 -37.1494 61.2451 -3.34961 38.7998 -3.34961 c 0 9.08496 -3.34961 -0.200195 -29.9844 -0.200195 -55.3496 c 1 - -0.200195 121.45 l 6xc0 - -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 4 - 61.2793 172.15 106.118 139.65 127.2 139.65 c 4 - 135.712 139.65 142.575 141.764 148.027 145.398 c 5 - 148 159 l 5xa0 + -0.200195 121.45 l 2xc0 + -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0 + 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 + 135.712 139.65 142.575 141.764 148.027 145.398 c 1 + 148 159 l 1xa0 EndSplineSet EndChar StartChar: idebilis -Encoding: 43 -1 36 +Encoding: 36 -1 36 Width: 83 VWidth: 2605 Flags: W @@ -936,7 +937,7 @@ Validated: 33 EndChar StartChar: deminutus -Encoding: 44 -1 37 +Encoding: 37 -1 37 Width: 83 VWidth: 2605 Flags: W @@ -959,7 +960,7 @@ Validated: 33 EndChar StartChar: rdeminutus -Encoding: 45 -1 38 +Encoding: 38 -1 38 Width: 83 VWidth: 2605 Flags: W @@ -982,7 +983,7 @@ Validated: 33 EndChar StartChar: PunctumAuctusLineBL -Encoding: 46 -1 39 +Encoding: 39 -1 39 Width: 166 VWidth: 2689 Flags: W @@ -1006,7 +1007,7 @@ Validated: 1 EndChar StartChar: auctusa2 -Encoding: 47 -1 40 +Encoding: 40 -1 40 Width: 166 VWidth: 2421 Flags: W @@ -1030,7 +1031,7 @@ Validated: 1 EndChar StartChar: porrectus1 -Encoding: 48 -1 41 +Encoding: 41 -1 41 Width: 447 VWidth: 2553 Flags: HW @@ -1052,7 +1053,7 @@ EndSplineSet EndChar StartChar: porrectus2 -Encoding: 49 -1 42 +Encoding: 42 -1 42 Width: 547 VWidth: 2575 Flags: HW @@ -1076,7 +1077,7 @@ EndSplineSet EndChar StartChar: porrectus3 -Encoding: 50 -1 43 +Encoding: 43 -1 43 Width: 628 VWidth: 2556 Flags: HW @@ -1101,7 +1102,7 @@ EndSplineSet EndChar StartChar: porrectus4 -Encoding: 51 -1 44 +Encoding: 44 -1 44 Width: 704 VWidth: 2500 Flags: HW @@ -1125,7 +1126,7 @@ EndSplineSet EndChar StartChar: porrectus5 -Encoding: 52 -1 45 +Encoding: 45 -1 45 Width: 849 VWidth: 2048 Flags: HW @@ -1149,7 +1150,7 @@ EndSplineSet EndChar StartChar: porrectusflexus1 -Encoding: 53 -1 46 +Encoding: 46 -1 46 Width: 503 VWidth: 2553 Flags: HW @@ -1172,7 +1173,7 @@ EndSplineSet EndChar StartChar: porrectusflexus2 -Encoding: 54 -1 47 +Encoding: 47 -1 47 Width: 628 VWidth: 2575 Flags: HW @@ -1194,7 +1195,7 @@ EndSplineSet EndChar StartChar: porrectusflexus3 -Encoding: 55 -1 48 +Encoding: 48 -1 48 Width: 628 VWidth: 2556 Flags: HW @@ -1218,7 +1219,7 @@ EndSplineSet EndChar StartChar: porrectusflexus4 -Encoding: 56 -1 49 +Encoding: 49 -1 49 Width: 628 VWidth: 2500 Flags: HW @@ -1241,7 +1242,7 @@ EndSplineSet EndChar StartChar: porrectusflexus5 -Encoding: 57 -1 50 +Encoding: 50 -1 50 Width: 931 VWidth: 2048 Flags: HW @@ -1262,7 +1263,7 @@ EndSplineSet EndChar StartChar: PesQuilismaOneNothing -Encoding: 58 -1 51 +Encoding: 51 -1 51 Width: 166 VWidth: 2496 Flags: HW @@ -1295,7 +1296,7 @@ EndSplineSet EndChar StartChar: StrophaAucta.caeciliae -Encoding: 59 -1 52 +Encoding: 52 -1 52 Width: 151 VWidth: 2686 Flags: W @@ -1318,7 +1319,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus.caeciliae -Encoding: 60 -1 53 +Encoding: 53 -1 53 Width: 185 VWidth: 2048 Flags: W @@ -1342,7 +1343,7 @@ Validated: 33 EndChar StartChar: AuctumMora -Encoding: 62 -1 54 +Encoding: 54 -1 54 Width: 71 VWidth: 2679 Flags: W @@ -1361,7 +1362,7 @@ Validated: 1 EndChar StartChar: VEpisema -Encoding: 64 -1 55 +Encoding: 56 -1 55 Width: 34 VWidth: 2048 Flags: W @@ -1382,7 +1383,7 @@ Validated: 1 EndChar StartChar: PunctumDeminutus -Encoding: 65 -1 56 +Encoding: 57 -1 56 Width: 83 VWidth: 2612 Flags: W @@ -1403,7 +1404,7 @@ Validated: 1 EndChar StartChar: hepisema_base -Encoding: 66 -1 57 +Encoding: 58 -1 57 Width: 1 VWidth: 2044 Flags: HW @@ -1421,7 +1422,7 @@ EndSplineSet EndChar StartChar: CustosUpMedium -Encoding: 67 -1 58 +Encoding: 59 -1 58 Width: 74 VWidth: 2660 Flags: W @@ -1443,7 +1444,7 @@ Validated: 1 EndChar StartChar: CustosDownMedium -Encoding: 68 -1 59 +Encoding: 60 -1 59 Width: 73 VWidth: 2412 Flags: W @@ -1465,7 +1466,7 @@ Validated: 1 EndChar StartChar: Accentus -Encoding: 69 -1 60 +Encoding: 61 -1 60 Width: 6 Flags: W HStem: -56.1992 151.199 @@ -1487,7 +1488,7 @@ Validated: 1 EndChar StartChar: AccentusReversus -Encoding: 70 -1 61 +Encoding: 62 -1 61 Width: 6 Flags: W HStem: -56.1992 151.199 @@ -1509,7 +1510,7 @@ Validated: 1 EndChar StartChar: SemicirculusReversus -Encoding: 71 -1 62 +Encoding: 63 -1 62 Width: 125 VWidth: 1583 Flags: W @@ -1529,7 +1530,7 @@ Validated: 1 EndChar StartChar: Semicirculus -Encoding: 72 -1 63 +Encoding: 64 -1 63 Width: 124 VWidth: 1606 Flags: W @@ -1549,7 +1550,7 @@ Validated: 1 EndChar StartChar: Circulus -Encoding: 73 -1 64 +Encoding: 65 -1 64 Width: 124 VWidth: 1594 Flags: W @@ -1572,7 +1573,7 @@ Validated: 1 EndChar StartChar: CClefChange -Encoding: 74 -1 65 +Encoding: 66 -1 65 Width: 166 VWidth: 2575 Flags: W @@ -1600,7 +1601,7 @@ Validated: 33 EndChar StartChar: FClefChange -Encoding: 75 -1 66 +Encoding: 67 -1 66 Width: 322 VWidth: 2503 Flags: W @@ -1638,7 +1639,7 @@ Validated: 33 EndChar StartChar: VEpisema.circumflexus -Encoding: 76 -1 67 +Encoding: 68 -1 67 Width: 108 VWidth: 2048 Flags: W @@ -1662,7 +1663,7 @@ Validated: 33 EndChar StartChar: PunctumCavum -Encoding: 77 -1 68 +Encoding: 69 -1 68 Width: 166 VWidth: 2612 Flags: W @@ -1690,7 +1691,7 @@ Validated: 33 EndChar StartChar: LineaPunctum -Encoding: 78 -1 69 +Encoding: 70 -1 69 Width: 266 VWidth: 2048 Flags: W @@ -1725,7 +1726,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavum -Encoding: 79 -1 70 +Encoding: 71 -1 70 Width: 266 VWidth: 2048 Flags: W @@ -1767,7 +1768,7 @@ Validated: 33 EndChar StartChar: PunctumSmall -Encoding: 80 -1 71 +Encoding: 72 -1 71 Width: 155 VWidth: 2537 Flags: HW @@ -1789,7 +1790,7 @@ EndSplineSet EndChar StartChar: hepisemaright -Encoding: 82 -1 72 +Encoding: 74 -1 72 Width: 2 VWidth: 2044 Flags: HW @@ -1807,7 +1808,7 @@ EndSplineSet EndChar StartChar: mpdeminutus -Encoding: 83 -1 73 +Encoding: 75 -1 73 Width: 168 VWidth: 2048 Flags: W @@ -1833,7 +1834,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens -Encoding: 84 -1 74 +Encoding: 76 -1 74 Width: 166 VWidth: 1149 Flags: W @@ -1855,7 +1856,7 @@ Validated: 1 EndChar StartChar: PunctumDescendens -Encoding: 85 -1 75 +Encoding: 77 -1 75 Width: 166 VWidth: 1342 Flags: W @@ -1876,7 +1877,7 @@ Validated: 33 EndChar StartChar: mnbdeminutus -Encoding: 86 -1 76 +Encoding: 78 -1 76 Width: 168 VWidth: 2048 Flags: W @@ -1901,7 +1902,7 @@ Validated: 33 EndChar StartChar: mnbpdeminutus -Encoding: 87 -1 77 +Encoding: 79 -1 77 Width: 168 VWidth: 2048 Flags: W @@ -1925,7 +1926,7 @@ Validated: 33 EndChar StartChar: porrectusflexusnb1 -Encoding: 88 -1 78 +Encoding: 80 -1 78 Width: 503 VWidth: 2553 Flags: HW @@ -1945,7 +1946,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb2 -Encoding: 89 -1 79 +Encoding: 81 -1 79 Width: 628 VWidth: 2575 Flags: HW @@ -1965,7 +1966,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb3 -Encoding: 90 -1 80 +Encoding: 82 -1 80 Width: 628 VWidth: 2556 Flags: HW @@ -1986,7 +1987,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb4 -Encoding: 91 -1 81 +Encoding: 83 -1 81 Width: 628 VWidth: 2500 Flags: HW @@ -2006,7 +2007,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb5 -Encoding: 92 -1 82 +Encoding: 84 -1 82 Width: 931 VWidth: 2048 Flags: HW @@ -2025,7 +2026,7 @@ EndSplineSet EndChar StartChar: p2base -Encoding: 94 -1 83 +Encoding: 86 -1 83 Width: 166 VWidth: 2613 Flags: HW @@ -2052,7 +2053,7 @@ EndSplineSet EndChar StartChar: PesOneNothing -Encoding: 95 -1 84 +Encoding: 87 -1 84 Width: 166 VWidth: 2613 Flags: W @@ -2083,7 +2084,7 @@ EndSplineSet EndChar StartChar: msdeminutus -Encoding: 97 -1 85 +Encoding: 88 -1 85 Width: 168 VWidth: 2048 Flags: W @@ -2109,7 +2110,7 @@ Validated: 1 EndChar StartChar: mademinutus -Encoding: 98 -1 86 +Encoding: 89 -1 86 Width: 168 VWidth: 2048 Flags: W @@ -2136,7 +2137,7 @@ Validated: 33 EndChar StartChar: PunctumCavum.caeciliae -Encoding: 99 -1 87 +Encoding: 90 -1 87 Width: 166 VWidth: 2612 Flags: W @@ -2162,7 +2163,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavum.caeciliae -Encoding: 100 -1 88 +Encoding: 91 -1 88 Width: 266 VWidth: 2048 Flags: W @@ -2201,7 +2202,7 @@ Validated: 1 EndChar StartChar: PunctumCavumHole.caeciliae -Encoding: 101 -1 89 +Encoding: 92 -1 89 Width: 166 VWidth: 2612 Flags: W @@ -2220,7 +2221,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavumHole.caeciliae -Encoding: 102 -1 90 +Encoding: 93 -1 90 Width: 266 VWidth: 2048 Flags: W @@ -2238,7 +2239,7 @@ Validated: 1 EndChar StartChar: PunctumCavumHole -Encoding: 103 -1 91 +Encoding: 94 -1 91 Width: 166 VWidth: 2612 Flags: W @@ -2259,7 +2260,7 @@ Validated: 33 EndChar StartChar: LineaPunctumCavumHole -Encoding: 104 -1 92 +Encoding: 95 -1 92 Width: 266 VWidth: 2048 Flags: W @@ -2280,7 +2281,7 @@ Validated: 33 EndChar StartChar: NaturalHole -Encoding: 105 -1 93 +Encoding: 96 -1 93 Width: 108 Flags: W HStem: 1.64062 133.319 @@ -2298,7 +2299,7 @@ Validated: 1 EndChar StartChar: FlatHole -Encoding: 106 -1 94 +Encoding: 97 -1 94 Width: 162 VWidth: 2587 Flags: W @@ -2318,8 +2319,8 @@ EndSplineSet Validated: 1 EndChar -StartChar: odbase -Encoding: 107 -1 95 +StartChar: DescendensOriscusLineBR +Encoding: 98 -1 95 Width: 168 VWidth: 2612 Flags: W @@ -2344,7 +2345,7 @@ Validated: 1 EndChar StartChar: DivisioDominican -Encoding: 108 -1 96 +Encoding: 99 -1 96 Width: 18 VWidth: 2048 Flags: W @@ -2362,7 +2363,7 @@ Validated: 1 EndChar StartChar: DivisioDominicanAlt -Encoding: 109 -1 97 +Encoding: 100 -1 97 Width: 18 VWidth: 2048 Flags: W @@ -2380,7 +2381,7 @@ Validated: 1 EndChar StartChar: Sharp -Encoding: 110 -1 98 +Encoding: 101 -1 98 Width: 258 VWidth: 2048 Flags: W @@ -2444,7 +2445,7 @@ Validated: 1 EndChar StartChar: SharpHole -Encoding: 111 -1 99 +Encoding: 102 -1 99 Width: 258 VWidth: 2048 Flags: W @@ -2463,7 +2464,7 @@ Validated: 1 EndChar StartChar: Linea -Encoding: 112 -1 100 +Encoding: 103 -1 100 Width: 431 VWidth: 2612 Flags: W @@ -2492,7 +2493,7 @@ Validated: 1 EndChar StartChar: RoundBrace -Encoding: 113 -1 101 +Encoding: 104 -1 101 Width: 937 VWidth: 2048 Flags: W @@ -2518,7 +2519,7 @@ Validated: 1 EndChar StartChar: CurlyBrace -Encoding: 114 -1 102 +Encoding: 105 -1 102 Width: 1006 VWidth: 2048 Flags: W @@ -2546,7 +2547,7 @@ Validated: 1 EndChar StartChar: BarBrace -Encoding: 115 -1 103 +Encoding: 106 -1 103 Width: 591 VWidth: 2048 Flags: W @@ -2573,7 +2574,7 @@ Validated: 1 EndChar StartChar: OriscusDeminutus.caeciliae -Encoding: 116 -1 104 +Encoding: 107 -1 104 Width: 168 VWidth: 2612 Flags: W @@ -2596,59 +2597,58 @@ EndSplineSet Validated: 33 EndChar -StartChar: OriscusLineBL -Encoding: 117 -1 105 +StartChar: AscendensOriscusLineBL +Encoding: 108 -1 105 Width: 166 VWidth: 2537 Flags: W -HStem: -37 177<74.049 160.524> -VStem: 0 166<-1.90579 138.793> 0 18<-55 -4.875> +HStem: -3.34961 175.5<18.4364 92.8347> +VStem: 0 166.2<-3.28925 139.081> 0 18<-74 -5.00787> LayerCount: 2 Fore SplineSet -127 140 m 0xc0 - 156 140 166 165 166 190 c 2 - 166 14 l 2xc0 - 166 -13 158 -37 127 -37 c 0 - 106 -37 61 -3 39 -3 c 0 - 30 -3 23 -6 18 -9 c 1 - 18 -55 l 1 - 0 -55 l 1xa0 - -0 4 0 63 0 121 c 0 - -0 160 15 172 39 172 c 0 - 61 172 106 140 127 140 c 0xc0 +18 -74 m 1xa0 + 0 -74 l 1xa0 + 0.000976562 121.45 l 2 + 0.000976562 160.06 15.4004 172.15 38.7998 172.15 c 0 + 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 + 156.411 139.65 166.2 164.545 166.2 190.35 c 1 + 166.2 13.5498 l 2xc0 + 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0 + 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 + 30.2747 -3.34961 23.4312 -5.54191 18.0061 -9.26756 c 1 + 18 -74 l 1xa0 EndSplineSet -Validated: 1 EndChar -StartChar: SalicusOriscus -Encoding: 118 -1 106 +StartChar: AscendensOriscusLineBLTR +Encoding: 109 -1 106 Width: 166 VWidth: 2537 -Flags: HW -HStem: -37.1504 176.8<74.1705 154.735> -VStem: -0.200195 166.4<-3.28925 139.081> 148.027 17.9728<141.255 159> +Flags: W +HStem: -3.34961 175.5<18.4397 92.8347> +VStem: 0 18<-74 -5.00652> 148.027 17.973<141.255 159> LayerCount: 2 Fore SplineSet --0.200195 121.45 m 2xc0 - -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0 +0 121.45 m 2 + 0 160.06 15.4004 172.15 38.7998 172.15 c 0 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 135.712 139.65 142.575 141.764 148.027 145.398 c 1 - 148 159 l 1xa0 - 166 159 l 1xa0 - 166.2 13.5498 l 2 - 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0 + 148 159 l 1 + 166 159 l 1 + 166 13.5498 l 6 + 166 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 30.2783 -3.34961 23.4369 -5.54007 18.0129 -9.26288 c 1 18 -74 l 1 0 -74 l 1 - -0.200195 121.45 l 2xc0 + 0 121.45 l 2 EndSplineSet EndChar StartChar: StrophaAucta -Encoding: 134 -1 107 +Encoding: 110 -1 107 Width: 172 VWidth: 2048 Flags: HW @@ -2670,7 +2670,7 @@ EndSplineSet EndChar StartChar: Stropha -Encoding: 135 -1 108 +Encoding: 111 -1 108 Width: 172 VWidth: 2048 Flags: W @@ -2695,7 +2695,7 @@ Validated: 33 EndChar StartChar: hepisemaleft -Encoding: 81 -1 109 +Encoding: 73 -1 109 Width: 1 VWidth: 2044 Flags: HW @@ -2713,7 +2713,7 @@ EndSplineSet EndChar StartChar: porrectusam11 -Encoding: 136 -1 110 +Encoding: 112 -1 110 Width: 503 VWidth: 2553 Flags: HW @@ -2735,7 +2735,7 @@ EndSplineSet EndChar StartChar: porrectusam12 -Encoding: 137 -1 111 +Encoding: 113 -1 111 Width: 628 VWidth: 2575 Flags: HW @@ -2759,7 +2759,7 @@ EndSplineSet EndChar StartChar: porrectusam13 -Encoding: 138 -1 112 +Encoding: 114 -1 112 Width: 678 VWidth: 2556 Flags: HW @@ -2783,7 +2783,7 @@ EndSplineSet EndChar StartChar: porrectusam14 -Encoding: 139 -1 113 +Encoding: 115 -1 113 Width: 721 VWidth: 2500 Flags: HW @@ -2808,7 +2808,7 @@ EndSplineSet EndChar StartChar: porrectusam15 -Encoding: 140 -1 114 +Encoding: 116 -1 114 Width: 933 VWidth: 2048 Flags: HW @@ -2833,7 +2833,7 @@ EndSplineSet EndChar StartChar: RoundBraceDown -Encoding: 141 -1 115 +Encoding: 117 -1 115 Width: 937 VWidth: 2048 Flags: W @@ -2859,7 +2859,7 @@ Validated: 1 EndChar StartChar: OriscusDeminutus -Encoding: 63 -1 116 +Encoding: 55 -1 116 Width: 168 VWidth: 0 Flags: W @@ -2885,7 +2885,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus -Encoding: 93 -1 117 +Encoding: 85 -1 117 Width: 185 VWidth: 0 Flags: W @@ -2908,7 +2908,7 @@ Validated: 33 EndChar StartChar: VirgaReversaAscendens_op -Encoding: 142 -1 118 +Encoding: 118 -1 118 Width: 166 VWidth: 2684 Flags: W @@ -2936,7 +2936,7 @@ Validated: 1 EndChar StartChar: VirgaReversaLongqueueAscendens_op -Encoding: 143 -1 119 +Encoding: 119 -1 119 Width: 166 VWidth: 2684 Flags: W @@ -2964,7 +2964,7 @@ Validated: 33 EndChar StartChar: VirgaReversaLongqueueDescendens_op -Encoding: 145 -1 120 +Encoding: 121 -1 120 Width: 168 VWidth: 2048 Flags: W @@ -2994,7 +2994,7 @@ Validated: 1 EndChar StartChar: VirgaReversaDescendens_op -Encoding: 144 -1 121 +Encoding: 120 -1 121 Width: 168 VWidth: 2048 Flags: W @@ -3023,7 +3023,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens_op -Encoding: 148 -1 122 +Encoding: 122 -1 122 Width: 166 VWidth: 1149 Flags: W @@ -3048,7 +3048,7 @@ Validated: 1 EndChar StartChar: PunctumDescendens_op -Encoding: 149 -1 123 +Encoding: 123 -1 123 Width: 166 VWidth: 1342 Flags: W @@ -3072,7 +3072,7 @@ Validated: 33 EndChar StartChar: auctusd1_op -Encoding: 150 -1 124 +Encoding: 124 -1 124 Width: 166 VWidth: 2689 Flags: W @@ -3098,7 +3098,7 @@ Validated: 1 EndChar StartChar: auctusa1_op -Encoding: 151 -1 125 +Encoding: 125 -1 125 Width: 166 VWidth: 2421 Flags: W @@ -3125,7 +3125,7 @@ Validated: 1 EndChar StartChar: auctusa2_op -Encoding: 152 -1 126 +Encoding: 126 -1 126 Width: 166 VWidth: 2421 Flags: W @@ -3152,7 +3152,7 @@ Validated: 1 EndChar StartChar: PunctumAuctusLineBL_op -Encoding: 153 -1 127 +Encoding: 127 -1 127 Width: 166 VWidth: 2689 Flags: W @@ -3179,7 +3179,7 @@ Validated: 1 EndChar StartChar: pesdeminutus_op -Encoding: 154 -1 128 +Encoding: 128 -1 128 Width: 166 VWidth: 2684 Flags: W @@ -3206,7 +3206,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatum -Encoding: 155 -1 129 +Encoding: 129 -1 129 Width: 185 VWidth: 2612 Flags: W @@ -3229,7 +3229,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumAuctus -Encoding: 157 -1 130 +Encoding: 131 -1 130 Width: 185 VWidth: 0 Flags: W @@ -3257,7 +3257,7 @@ Validated: 33 EndChar StartChar: PunctumCavumInclinatumAuctusHole -Encoding: 158 -1 131 +Encoding: 132 -1 131 Width: 185 VWidth: 0 Flags: W @@ -3277,7 +3277,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumHole -Encoding: 156 -1 132 +Encoding: 130 -1 132 Width: 185 VWidth: 2612 Flags: W @@ -3295,58 +3295,58 @@ EndSplineSet Validated: 1 EndChar -StartChar: OriscusReversusLineTLBR -Encoding: 159 -1 133 +StartChar: DescendensOriscusLineTLBR +Encoding: 133 -1 133 Width: 166 VWidth: 2537 -Flags: HW -HStem: -37.1504 176.8<11.2647 91.8293> -VStem: -0.200195 166.4<-3.28925 139.081> -0.000198364 17.9728<141.255 159> +Flags: W +HStem: -3.34961 175.5<73.1653 147.56> +VStem: -0 17.9727<141.255 159> 148 18<-74 -5.00648> LayerCount: 2 Fore SplineSet -166.2 121.45 m 2xc0 +165.999 121.45 m 2 166 -74 l 1 148 -74 l 1 147.987 -9.2627 l 1 142.562 -5.54004 135.722 -3.34961 127.2 -3.34961 c 0 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0 - 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2 - -0 159 l 1xa0 - 18 159 l 1xa0 + 7.59961 -37.1504 0 -12.9697 0 13.5498 c 2 + -0 159 l 1 + 18 159 l 1 17.9727 145.398 l 1 23.4248 141.764 30.2881 139.65 38.7998 139.65 c 0 59.8818 139.65 104.721 172.15 127.2 172.15 c 0 - 150.6 172.15 166.2 160.06 166.2 121.45 c 2xc0 + 150.6 172.15 165.999 160.061 165.999 121.45 c 2 EndSplineSet EndChar -StartChar: OriscusReversusLineTL -Encoding: 160 -1 134 +StartChar: DescendensOriscusLineTL +Encoding: 134 -1 134 Width: 166 VWidth: 2537 Flags: HW -HStem: -37.1504 176.8<11.2647 91.8293> -VStem: -0.200195 166.4<-3.28925 139.081> -0.000198364 17.9728<141.255 159> +HStem: -37.1504 176.8<11.3309 91.8296> +VStem: 0 166.2<-3.28925 139.081> 0 17.9727<141.255 159> LayerCount: 2 Fore SplineSet 18 159 m 1xa0 - 17.9727 145.398 l 1 - 23.4248 141.764 30.2881 139.65 38.7998 139.65 c 0 + 18 145 l 1xa0 + 23 141 30.2881 139.65 38.7998 139.65 c 0 59.8818 139.65 104.721 172.15 127.2 172.15 c 0 - 150.6 172.15 166.2 160.06 166.2 121.45 c 2xc0 + 150.6 172.15 166.2 160.06 166.2 121.45 c 2 166.2 -55.3496 l 1 166.2 -29.9844 156.915 -3.34961 127.2 -3.34961 c 0 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0 - 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2 - -0 159 l 1xa0 + 7.59961 -37.1504 0 -12.9697 0 13.5498 c 2xc0 + -0 159 l 1 18 159 l 1xa0 EndSplineSet EndChar StartChar: UpperPesOneNothing -Encoding: 161 -1 135 +Encoding: 135 -1 135 Width: 166 VWidth: 2613 Flags: W @@ -3377,8 +3377,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavum -Encoding: 164 -1 136 +StartChar: AscendensOriscusCavum +Encoding: 136 -1 136 Width: 166 VWidth: 2537 Flags: W @@ -3408,8 +3408,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumHole -Encoding: 165 -1 137 +StartChar: AscendensOriscusCavumHole +Encoding: 137 -1 137 Width: 166 VWidth: 2537 Flags: W @@ -3430,8 +3430,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumReversus -Encoding: 166 -1 138 +StartChar: DescendensOriscusCavum +Encoding: 138 -1 138 Width: 166 VWidth: 2537 Flags: W @@ -3461,8 +3461,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumReversusHole -Encoding: 167 -1 139 +StartChar: DescendensOriscusCavumHole +Encoding: 139 -1 139 Width: 166 VWidth: 2537 Flags: W @@ -3484,7 +3484,7 @@ EndSplineSet EndChar StartChar: OriscusCavumDeminutus -Encoding: 168 -1 140 +Encoding: 140 -1 140 Width: 168 VWidth: 2612 Flags: W @@ -3517,7 +3517,7 @@ EndSplineSet EndChar StartChar: OriscusCavumDeminutusHole -Encoding: 169 -1 141 +Encoding: 141 -1 141 Width: 168 VWidth: 2612 Flags: W @@ -3540,7 +3540,7 @@ EndSplineSet EndChar StartChar: Virgula.2 -Encoding: 170 -1 142 +Encoding: 142 -1 142 Width: 143 VWidth: 1788 Flags: HW @@ -3562,7 +3562,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.2 -Encoding: 171 -1 143 +Encoding: 143 -1 143 Width: 19 VWidth: 1418 Flags: HW @@ -3580,7 +3580,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.2 -Encoding: 172 -1 144 +Encoding: 144 -1 144 Width: 19 VWidth: 2048 Flags: W @@ -3598,7 +3598,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.2 -Encoding: 173 -1 145 +Encoding: 145 -1 145 Width: 19 VWidth: 2048 Flags: W @@ -3616,7 +3616,7 @@ EndSplineSet EndChar StartChar: Virgula.3 -Encoding: 174 -1 146 +Encoding: 146 -1 146 Width: 143 VWidth: 2103 Flags: HW @@ -3638,7 +3638,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.3 -Encoding: 175 -1 147 +Encoding: 147 -1 147 Width: 19 VWidth: 1733 Flags: HW @@ -3656,7 +3656,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.3 -Encoding: 176 -1 148 +Encoding: 148 -1 148 Width: 19 VWidth: 2048 Flags: W @@ -3674,7 +3674,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.3 -Encoding: 177 -1 149 +Encoding: 149 -1 149 Width: 19 VWidth: 2048 Flags: W @@ -3691,7 +3691,7 @@ EndSplineSet EndChar StartChar: Virgula.5 -Encoding: 178 -1 150 +Encoding: 150 -1 150 Width: 143 VWidth: 2733 Flags: HW @@ -3713,7 +3713,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.5 -Encoding: 179 -1 151 +Encoding: 151 -1 151 Width: 19 VWidth: 2363 Flags: HW @@ -3731,7 +3731,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.5 -Encoding: 180 -1 152 +Encoding: 152 -1 152 Width: 19 VWidth: 2048 Flags: W @@ -3748,7 +3748,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.5 -Encoding: 181 -1 153 +Encoding: 153 -1 153 Width: 19 VWidth: 2048 Flags: W @@ -3765,7 +3765,7 @@ EndSplineSet EndChar StartChar: StrophaAuctaLongtail -Encoding: 182 -1 154 +Encoding: 154 -1 154 Width: 172 VWidth: 2048 Flags: HW @@ -3787,7 +3787,7 @@ EndSplineSet EndChar StartChar: rqueue -Encoding: 183 -1 155 +Encoding: 155 -1 155 Width: 18 VWidth: 2048 Flags: HW @@ -3806,7 +3806,7 @@ EndSplineSet EndChar StartChar: queuebase -Encoding: 184 -1 156 +Encoding: 156 -1 156 Width: 18 VWidth: 2048 Flags: HW @@ -3824,7 +3824,7 @@ EndSplineSet EndChar StartChar: virgabase -Encoding: 185 -1 157 +Encoding: 157 -1 157 Width: 166 VWidth: 2637 Flags: HW @@ -3844,7 +3844,7 @@ EndSplineSet EndChar StartChar: rvirgabase -Encoding: 186 -1 158 +Encoding: 158 -1 158 Width: 166 VWidth: 2637 Flags: HW @@ -3864,7 +3864,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL -Encoding: 187 -1 159 +Encoding: 159 -1 159 Width: 166 VWidth: 2637 Flags: HW @@ -3888,7 +3888,7 @@ EndSplineSet EndChar StartChar: rvbase -Encoding: 188 -1 160 +Encoding: 160 -1 160 Width: 166 VWidth: 2637 Flags: HW @@ -3912,7 +3912,7 @@ EndSplineSet EndChar StartChar: tmpglyph -Encoding: 189 -1 161 +Encoding: 161 -1 161 Width: 18 VWidth: 2048 Flags: HW @@ -3921,8 +3921,8 @@ VStem: 0 1<64 96> LayerCount: 2 EndChar -StartChar: OriscusReversusLineBL -Encoding: 190 -1 162 +StartChar: DescendensOriscusLineBL +Encoding: 162 -1 162 Width: 166 VWidth: 2537 Flags: HW @@ -3945,8 +3945,8 @@ SplineSet EndSplineSet EndChar -StartChar: osbase -Encoding: 191 -1 163 +StartChar: AscendensOriscusLineBLBR +Encoding: 163 -1 163 Width: 166 VWidth: 2537 Flags: HW @@ -3955,19 +3955,215 @@ VStem: 0 18.2002<-377.849 -4.93091> 148 18<-53 -32.6729> LayerCount: 2 Fore SplineSet -0 -62 m 5 +0 -62 m 1 0 121 l 2 0 159.61 15.4004 172.15 38.7998 172.15 c 0 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 156.411 139.65 166 164.195 166 190 c 1 - 166 -53 l 1 - 150.333 -53 157.989 -53.0137 148 -53 c 1 - 147.989 -40.0137 148 -52.8076 148 -32.6729 c 1 + 166 -53 l 5 + 148 -53 l 5 + 148 -53 148 -52.8076 148 -32.6729 c 1 142.692 -35.7363 135.586 -37.1504 127.2 -37.1504 c 0 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 30.2247 -3.34961 23.2744 -5.56738 17.834 -9.34668 c 1 17.8938 -62 l 1 - 0 -62 l 5 + 0 -62 l 1 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineBR +Encoding: 164 -1 164 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -37.1504 176.8<74.1752 147.734> +VStem: -0.200195 166.2<-3.34961 139.081> 148 18<-53 -32.1> +LayerCount: 2 +Fore +SplineSet +147.987 -32.1 m 1xa0 + 142.617 -35.3146 135.797 -37.1504 127.2 -37.1504 c 0 + 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 + 9.08496 -3.34961 -0.200195 -29.9844 -0.200195 -55.3496 c 1 + -0.200195 121.45 l 2xc0 + -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0 + 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 + 156.411 139.65 166 164.545 166 190.35 c 1 + 166 -53 l 1 + 148 -53 l 1 + 147.987 -32.1 l 1xa0 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTLBR +Encoding: 165 -1 165 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -3.34961 175.5<7.39664 92.8347> +VStem: 148 18<-53 -32.1> +LayerCount: 2 +Fore +SplineSet +-0 159 m 5 + 8.75293 159 l 1 + 15.581 168.549 26.0288 172.15 38.7998 172.15 c 0 + 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 + 156.411 139.65 166 164.545 166 190.35 c 1 + 166 -53 l 1 + 148 -53 l 1 + 147.987 -32.1 l 1 + 142.617 -35.3146 135.797 -37.1504 127.2 -37.1504 c 0 + 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 + 9.08496 -3.34961 -0 -29.9834 -0 -55.3486 c 1 + -0 159 l 5 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTLTR +Encoding: 166 -1 166 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -37.1504 176.8<74.1705 154.644> +VStem: -0 166<-3.28925 139.65> 147.977 18.0231<141.245 159> +LayerCount: 2 +Fore +SplineSet +166 13.5498 m 2xc0 + 166 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0 + 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 + 9.08496 -3.34961 -0 -29.9844 -0 -55.3496 c 1 + -0 159 l 1xc0 + 8.73101 159.009 l 1 + 15.5875 168.551 26.0328 172.15 38.7998 172.15 c 0 + 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 + 135.686 139.65 142.533 141.751 147.977 145.365 c 1 + 148 159 l 1 + 166 159 l 1xa0 + 166 13.5498 l 2xc0 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTL +Encoding: 167 -1 167 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -3.34961 175.5<7.38633 92.8347> +VStem: -0 166.2<-3.28925 139.65> +LayerCount: 2 +Fore +SplineSet +-0 159 m 1 + 8.73101 159.009 l 1 + 15.5875 168.551 26.0328 172.15 38.7998 172.15 c 0 + 61.2793 172.15 106.118 139.65 127.2 139.65 c 0 + 156.411 139.65 166.2 164.545 166.2 190.35 c 1 + 166.2 13.5498 l 2 + 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0 + 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0 + 9.08496 -3.34961 -0 -29.9844 -0 -55.3496 c 1 + -0 159 l 1 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBLBR +Encoding: 168 -1 168 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -3.34961 175.5<73.1653 147.574> +VStem: 0 18<-74 -32.0938> 148 18<-53 -5.01182> +LayerCount: 2 +Fore +SplineSet +166 -53 m 1 + 148 -53 l 1 + 148.014 -9.28125 l 1 + 142.585 -5.54728 135.736 -3.34961 127.2 -3.34961 c 0 + 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0 + 30.1975 -37.1504 23.3741 -35.3123 18.0025 -32.0938 c 1 + 18 -74 l 5 + 0 -74 l 5 + -0 190.35 l 1 + -0 164.545 9.58887 139.65 38.7998 139.65 c 0 + 59.8818 139.65 104.721 172.15 127.2 172.15 c 0 + 150.6 172.15 166 160.061 166 121.45 c 2 + 166 -53 l 1 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBLTR +Encoding: 169 -1 169 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -37.1504 176.8<18.5863 91.8248> +VStem: 0 18<-74 -32.1039> +LayerCount: 2 +Fore +SplineSet +0 190.35 m 1 + 0 164.545 9.58887 139.65 38.7998 139.65 c 0 + 59.8818 139.65 104.721 172.15 127.2 172.15 c 0 + 139.982 172.15 150.436 168.543 157.292 158.977 c 1 + 166 159 l 1 + 166 -55.3506 l 1 + 166 -29.9854 156.915 -3.34961 127.2 -3.34961 c 0 + 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0 + 30.2066 -37.1504 23.3885 -35.3161 18.0195 -32.1039 c 1 + 18 -74 l 1 + 0 -74 l 1 + 0 190.35 l 1 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineTLTR +Encoding: 170 -1 170 +Width: 166 +VWidth: 2537 +Flags: W +HStem: -37.1504 176.8<11.3528 91.8296> +VStem: -0.000976562 166.001<-3.28925 139.65> -0 18.0174<141.246 159> +LayerCount: 2 +Fore +SplineSet +-0 159 m 1xa0 + 18 159 l 1 + 18.0174 145.369 l 1xa0 + 23.4622 141.752 30.3109 139.65 38.7998 139.65 c 0 + 59.8818 139.65 104.721 172.15 127.2 172.15 c 0 + 139.982 172.15 150.436 168.543 157.292 158.977 c 1 + 166 159 l 1 + 166 -55.3506 l 1 + 166 -29.9854 156.915 -3.34961 127.2 -3.34961 c 0 + 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0 + 7.59961 -37.1504 -0.000976562 -12.9697 -0.000976562 13.5498 c 2xc0 + -0 159 l 1xa0 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineTR +Encoding: 171 -1 171 +Width: 166 +VWidth: 2537 +Flags: HW +HStem: -3.34961 175.5<73.1653 158.625> +VStem: -0.200195 166.2<-3.28925 13.5498> +LayerCount: 2 +Fore +SplineSet +166 159 m 1 + 166 -55.3506 l 1 + 166 -29.9854 156.915 -3.34961 127.2 -3.34961 c 0 + 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0 + 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2 + -0.200195 190.35 l 1 + -0.200195 164.545 9.58887 139.65 38.7998 139.65 c 0 + 59.8818 139.65 104.721 172.15 127.2 172.15 c 0 + 139.982 172.15 150.436 168.543 157.292 158.977 c 1 + 166 159 l 1 EndSplineSet EndChar EndChars diff --git a/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd index 06a5570935c..2ed5eb3be19 100644 --- a/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd +++ b/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd @@ -19,7 +19,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1176402534 -ModificationTime: 1455123251 +ModificationTime: 1457829942 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -37,13 +37,12 @@ OS2Vendor: 'PfEd' MarkAttachClasses: 1 DEI: 91125 Encoding: Custom -Compacted: 1 UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -96 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 19 8 +WinInfo: 144 8 2 BeginPrivate: 0 EndPrivate Grid @@ -57,7 +56,7 @@ Grid 22 -700 l 0 EndSplineSet TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 375 152 +BeginChars: 160 160 StartChar: Punctum Encoding: 0 -1 0 @@ -152,7 +151,7 @@ EndSplineSet Validated: 1 EndChar -StartChar: OriscusReversus +StartChar: DescendensOriscus Encoding: 4 -1 4 Width: 164 VWidth: 2048 @@ -179,7 +178,7 @@ EndSplineSet Validated: 1 EndChar -StartChar: Oriscus +StartChar: AscendensOriscus Encoding: 5 -1 5 Width: 164 VWidth: 2048 @@ -330,7 +329,7 @@ Validated: 33 EndChar StartChar: DivisioMinima -Encoding: 14 -1 12 +Encoding: 12 -1 12 AltUni2: 000050.ffffffff.0 Width: 19 VWidth: 2048 @@ -349,7 +348,7 @@ Validated: 1 EndChar StartChar: DivisioMinor -Encoding: 15 -1 13 +Encoding: 13 -1 13 Width: 19 VWidth: 2048 Flags: HW @@ -367,7 +366,7 @@ Validated: 1 EndChar StartChar: pesdeminutus -Encoding: 17 -1 14 +Encoding: 14 -1 14 Width: 164 VWidth: 2048 Flags: HW @@ -391,7 +390,7 @@ Validated: 33 EndChar StartChar: auctusd1 -Encoding: 18 -1 15 +Encoding: 15 -1 15 Width: 164 VWidth: 2048 Flags: HW @@ -415,7 +414,7 @@ Validated: 33 EndChar StartChar: auctusa1 -Encoding: 19 -1 16 +Encoding: 16 -1 16 Width: 164 VWidth: 2048 Flags: W @@ -439,7 +438,7 @@ Validated: 33 EndChar StartChar: mdeminutus -Encoding: 20 -1 17 +Encoding: 17 -1 17 Width: 186 VWidth: 2048 Flags: HW @@ -461,7 +460,7 @@ Validated: 33 EndChar StartChar: Natural -Encoding: 21 -1 18 +Encoding: 18 -1 18 Width: 201 VWidth: 2048 Flags: HW @@ -487,7 +486,7 @@ Validated: 1 EndChar StartChar: FClef -Encoding: 22 -1 19 +Encoding: 19 -1 19 Width: 321 VWidth: 2048 Flags: HW @@ -523,7 +522,7 @@ Validated: 33 EndChar StartChar: CustosDownLong -Encoding: 23 -1 20 +Encoding: 20 -1 20 Width: 85 VWidth: 2048 Flags: HW @@ -543,7 +542,7 @@ Validated: 33 EndChar StartChar: CustosDownShort -Encoding: 24 -1 21 +Encoding: 21 -1 21 Width: 85 VWidth: 2048 Flags: HW @@ -563,7 +562,7 @@ Validated: 33 EndChar StartChar: CustosUpLong -Encoding: 25 -1 22 +Encoding: 22 -1 22 Width: 85 VWidth: 2048 Flags: HW @@ -583,7 +582,7 @@ Validated: 33 EndChar StartChar: CustosUpShort -Encoding: 26 -1 23 +Encoding: 23 -1 23 Width: 85 VWidth: 2048 Flags: HW @@ -603,7 +602,7 @@ Validated: 33 EndChar StartChar: PunctumLineBR -Encoding: 27 -1 24 +Encoding: 24 -1 24 Width: 164 VWidth: 2048 Flags: HW @@ -624,7 +623,7 @@ Validated: 1 EndChar StartChar: PunctumLineBL -Encoding: 28 -1 25 +Encoding: 25 -1 25 Width: 164 VWidth: 2048 Flags: HW @@ -645,7 +644,7 @@ Validated: 1 EndChar StartChar: PunctumLineTL -Encoding: 29 -1 26 +Encoding: 26 -1 26 Width: 164 VWidth: 2048 Flags: HW @@ -666,7 +665,7 @@ Validated: 33 EndChar StartChar: PunctumLineTR -Encoding: 30 -1 27 +Encoding: 27 -1 27 Width: 164 VWidth: 2048 Flags: HW @@ -687,7 +686,7 @@ Validated: 33 EndChar StartChar: PunctumLineBLBR -Encoding: 31 -1 28 +Encoding: 28 -1 28 Width: 164 VWidth: 2048 Flags: HW @@ -709,7 +708,7 @@ Validated: 33 EndChar StartChar: base6 -Encoding: 32 -1 29 +Encoding: 29 -1 29 Width: 164 VWidth: 2048 Flags: HW @@ -731,7 +730,7 @@ Validated: 33 EndChar StartChar: line2 -Encoding: 33 -1 30 +Encoding: 30 -1 30 Width: 22 VWidth: 2048 Flags: HW @@ -749,7 +748,7 @@ Validated: 1 EndChar StartChar: line3 -Encoding: 34 -1 31 +Encoding: 31 -1 31 Width: 22 VWidth: 2048 Flags: HW @@ -767,7 +766,7 @@ Validated: 1 EndChar StartChar: line4 -Encoding: 35 -1 32 +Encoding: 32 -1 32 Width: 22 VWidth: 2048 Flags: HW @@ -785,7 +784,7 @@ Validated: 1 EndChar StartChar: line5 -Encoding: 36 -1 33 +Encoding: 33 -1 33 Width: 22 VWidth: 2048 Flags: HW @@ -803,7 +802,7 @@ Validated: 1 EndChar StartChar: QuilismaLineTR -Encoding: 40 -1 34 +Encoding: 34 -1 34 Width: 164 VWidth: 2048 Flags: HW @@ -832,8 +831,8 @@ EndSplineSet Validated: 33 EndChar -StartChar: OriscusLineTR -Encoding: 41 -1 35 +StartChar: AscendensOriscusLineTR +Encoding: 35 -1 35 Width: 164 VWidth: 2048 Flags: HW @@ -858,7 +857,7 @@ Validated: 33 EndChar StartChar: pbase -Encoding: 42 -1 36 +Encoding: 36 -1 36 Width: 164 VWidth: 2048 Flags: HW @@ -879,7 +878,7 @@ Validated: 33 EndChar StartChar: idebilis -Encoding: 43 -1 37 +Encoding: 37 -1 37 Width: 110 VWidth: 2048 Flags: HW @@ -901,7 +900,7 @@ Validated: 33 EndChar StartChar: deminutus -Encoding: 44 -1 38 +Encoding: 38 -1 38 Width: 110 VWidth: 2048 Flags: HW @@ -923,7 +922,7 @@ Validated: 33 EndChar StartChar: rdeminutus -Encoding: 45 -1 39 +Encoding: 39 -1 39 Width: 110 VWidth: 2048 Flags: HW @@ -945,7 +944,7 @@ Validated: 33 EndChar StartChar: PunctumAuctusLineBL -Encoding: 46 -1 40 +Encoding: 40 -1 40 Width: 164 VWidth: 2048 Flags: HW @@ -969,7 +968,7 @@ Validated: 33 EndChar StartChar: auctusa2 -Encoding: 47 -1 41 +Encoding: 41 -1 41 Width: 164 VWidth: 2048 Flags: HW @@ -993,7 +992,7 @@ Validated: 33 EndChar StartChar: porrectus1 -Encoding: 48 -1 42 +Encoding: 42 -1 42 Width: 490 VWidth: 2048 Flags: HW @@ -1015,7 +1014,7 @@ Validated: 33 EndChar StartChar: porrectus2 -Encoding: 49 -1 43 +Encoding: 43 -1 43 Width: 575 VWidth: 2048 Flags: HW @@ -1037,7 +1036,7 @@ Validated: 33 EndChar StartChar: porrectus3 -Encoding: 50 -1 44 +Encoding: 44 -1 44 Width: 650 VWidth: 2048 Flags: HW @@ -1059,7 +1058,7 @@ Validated: 33 EndChar StartChar: porrectus4 -Encoding: 51 -1 45 +Encoding: 45 -1 45 Width: 740 VWidth: 2048 Flags: HW @@ -1081,7 +1080,7 @@ Validated: 33 EndChar StartChar: porrectus5 -Encoding: 52 -1 46 +Encoding: 46 -1 46 Width: 931 VWidth: 2048 Flags: HW @@ -1103,7 +1102,7 @@ Validated: 33 EndChar StartChar: porrectusflexus1 -Encoding: 53 -1 47 +Encoding: 47 -1 47 Width: 340 VWidth: 2048 Flags: HW @@ -1125,7 +1124,7 @@ Validated: 33 EndChar StartChar: porrectusflexus2 -Encoding: 54 -1 48 +Encoding: 48 -1 48 Width: 428 VWidth: 2048 Flags: HW @@ -1147,7 +1146,7 @@ Validated: 33 EndChar StartChar: porrectusflexus3 -Encoding: 55 -1 49 +Encoding: 49 -1 49 Width: 586 VWidth: 2048 Flags: HW @@ -1169,7 +1168,7 @@ Validated: 33 EndChar StartChar: porrectusflexus4 -Encoding: 56 -1 50 +Encoding: 50 -1 50 Width: 670 VWidth: 2048 Flags: HW @@ -1191,7 +1190,7 @@ Validated: 33 EndChar StartChar: porrectusflexus5 -Encoding: 57 -1 51 +Encoding: 51 -1 51 Width: 931 VWidth: 2048 Flags: HW @@ -1213,7 +1212,7 @@ Validated: 33 EndChar StartChar: PesQuilismaOneNothing -Encoding: 58 -1 52 +Encoding: 52 -1 52 Width: 164 VWidth: 2048 Flags: HW @@ -1247,7 +1246,7 @@ Validated: 33 EndChar StartChar: StrophaAucta -Encoding: 59 -1 53 +Encoding: 53 -1 53 Width: 164 VWidth: 2048 Flags: HW @@ -1268,7 +1267,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus -Encoding: 60 -1 54 +Encoding: 54 -1 54 Width: 164 VWidth: 2048 Flags: HW @@ -1291,7 +1290,7 @@ Validated: 1 EndChar StartChar: AuctumMora -Encoding: 62 -1 55 +Encoding: 55 -1 55 Width: 71 VWidth: 2679 Flags: HW @@ -1309,7 +1308,7 @@ Validated: 1 EndChar StartChar: VEpisema -Encoding: 64 -1 56 +Encoding: 57 -1 56 Width: 40 VWidth: 2048 Flags: HW @@ -1329,7 +1328,7 @@ Validated: 1 EndChar StartChar: PunctumDeminutus -Encoding: 65 -1 57 +Encoding: 58 -1 57 Width: 110 VWidth: 2048 Flags: HW @@ -1349,7 +1348,7 @@ Validated: 33 EndChar StartChar: hepisema_base -Encoding: 66 -1 58 +Encoding: 59 -1 58 Width: 1 VWidth: 1968 Flags: HW @@ -1366,7 +1365,7 @@ EndSplineSet EndChar StartChar: PesOneNothing -Encoding: 67 -1 59 +Encoding: 60 -1 59 Width: 164 VWidth: 2048 Flags: HW @@ -1391,7 +1390,7 @@ Validated: 33 EndChar StartChar: CustosUpMedium -Encoding: 68 -1 60 +Encoding: 61 -1 60 Width: 85 VWidth: 2048 Flags: HW @@ -1411,7 +1410,7 @@ Validated: 33 EndChar StartChar: CustosDownMedium -Encoding: 69 -1 61 +Encoding: 62 -1 61 Width: 85 VWidth: 2048 Flags: HW @@ -1431,7 +1430,7 @@ Validated: 33 EndChar StartChar: Accentus -Encoding: 70 -1 62 +Encoding: 63 -1 62 Width: 99 VWidth: 1594 Flags: W @@ -1453,7 +1452,7 @@ Validated: 1 EndChar StartChar: AccentusReversus -Encoding: 71 -1 63 +Encoding: 64 -1 63 Width: 99 VWidth: 1594 Flags: W @@ -1475,7 +1474,7 @@ Validated: 1 EndChar StartChar: SemicirculusReversus -Encoding: 72 -1 64 +Encoding: 65 -1 64 Width: 125 VWidth: 1583 Flags: W @@ -1495,7 +1494,7 @@ Validated: 1 EndChar StartChar: Semicirculus -Encoding: 73 -1 65 +Encoding: 66 -1 65 Width: 124 VWidth: 1606 Flags: W @@ -1515,7 +1514,7 @@ Validated: 1 EndChar StartChar: Circulus -Encoding: 74 -1 66 +Encoding: 67 -1 66 Width: 124 VWidth: 1594 Flags: W @@ -1538,7 +1537,7 @@ Validated: 1 EndChar StartChar: CClefChange -Encoding: 75 -1 67 +Encoding: 68 -1 67 Width: 140 VWidth: 2048 Flags: HW @@ -1567,7 +1566,7 @@ Validated: 1 EndChar StartChar: FClefChange -Encoding: 76 -1 68 +Encoding: 69 -1 68 Width: 321 VWidth: 2048 Flags: HW @@ -1603,7 +1602,7 @@ Validated: 33 EndChar StartChar: VEpisema.circumflexus -Encoding: 77 -1 69 +Encoding: 70 -1 69 Width: 108 VWidth: 2048 Flags: W @@ -1627,7 +1626,7 @@ Validated: 33 EndChar StartChar: PunctumCavum -Encoding: 78 -1 70 +Encoding: 71 -1 70 Width: 164 VWidth: 2048 Flags: HW @@ -1654,7 +1653,7 @@ Validated: 1 EndChar StartChar: LineaPunctum -Encoding: 79 -1 71 +Encoding: 72 -1 71 Width: 266 VWidth: 2048 Flags: HW @@ -1688,7 +1687,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavum -Encoding: 80 -1 72 +Encoding: 73 -1 72 Width: 266 VWidth: 2048 Flags: HW @@ -1729,7 +1728,7 @@ Validated: 1 EndChar StartChar: PunctumSmall -Encoding: 81 -1 73 +Encoding: 74 -1 73 Width: 154 VWidth: 2048 Flags: HW @@ -1750,10 +1749,10 @@ Validated: 1 EndChar StartChar: hepisemaright -Encoding: 83 -1 74 +Encoding: 76 -1 74 Width: 2 VWidth: 1968 -Flags: HWO +Flags: HW HStem: -489 15 -174 15 141 15 456 15 LayerCount: 2 Fore @@ -1767,7 +1766,7 @@ EndSplineSet EndChar StartChar: mpdeminutus -Encoding: 84 -1 75 +Encoding: 77 -1 75 Width: 186 VWidth: 2048 Flags: HW @@ -1791,7 +1790,7 @@ Validated: 33 EndChar StartChar: PunctumDescendens -Encoding: 85 -1 76 +Encoding: 78 -1 76 Width: 164 VWidth: 2048 Flags: HW @@ -1814,7 +1813,7 @@ Validated: 33 EndChar StartChar: PunctumAscendens -Encoding: 86 -1 77 +Encoding: 79 -1 77 Width: 164 VWidth: 2048 Flags: HW @@ -1837,7 +1836,7 @@ Validated: 33 EndChar StartChar: mnbdeminutus -Encoding: 87 -1 78 +Encoding: 80 -1 78 Width: 186 VWidth: 2048 Flags: HW @@ -1859,7 +1858,7 @@ Validated: 33 EndChar StartChar: mnbpdeminutus -Encoding: 88 -1 79 +Encoding: 81 -1 79 Width: 186 VWidth: 2048 Flags: HW @@ -1881,7 +1880,7 @@ Validated: 33 EndChar StartChar: porrectusflexusnb1 -Encoding: 89 -1 80 +Encoding: 82 -1 80 Width: 340 VWidth: 2048 Flags: HW @@ -1902,7 +1901,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb2 -Encoding: 90 -1 81 +Encoding: 83 -1 81 Width: 428 VWidth: 2048 Flags: HW @@ -1923,7 +1922,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb3 -Encoding: 91 -1 82 +Encoding: 84 -1 82 Width: 586 VWidth: 2048 Flags: HW @@ -1944,7 +1943,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb4 -Encoding: 92 -1 83 +Encoding: 85 -1 83 Width: 670 VWidth: 2048 Flags: HW @@ -1965,7 +1964,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb5 -Encoding: 93 -1 84 +Encoding: 86 -1 84 Width: 931 VWidth: 2048 Flags: HW @@ -1986,7 +1985,7 @@ Validated: 1 EndChar StartChar: p2base -Encoding: 95 -1 85 +Encoding: 88 -1 85 Width: 164 VWidth: 2048 Flags: W @@ -2007,7 +2006,7 @@ Validated: 33 EndChar StartChar: msdeminutus -Encoding: 97 -1 86 +Encoding: 89 -1 86 Width: 186 VWidth: 2048 Flags: HW @@ -2031,7 +2030,7 @@ Validated: 33 EndChar StartChar: mademinutus -Encoding: 98 -1 87 +Encoding: 90 -1 87 Width: 186 VWidth: 2048 Flags: HW @@ -2055,7 +2054,7 @@ Validated: 33 EndChar StartChar: PunctumCavumHole -Encoding: 99 -1 88 +Encoding: 91 -1 88 Width: 164 VWidth: 2048 Flags: HW @@ -2075,7 +2074,7 @@ Validated: 1 EndChar StartChar: LineaPunctumCavumHole -Encoding: 100 -1 89 +Encoding: 92 -1 89 Width: 266 VWidth: 2048 Flags: HW @@ -2095,7 +2094,7 @@ Validated: 1 EndChar StartChar: FlatHole -Encoding: 101 -1 90 +Encoding: 93 -1 90 Width: 164 VWidth: 2048 Flags: HW @@ -2113,7 +2112,7 @@ Validated: 1 EndChar StartChar: NaturalHole -Encoding: 102 -1 91 +Encoding: 94 -1 91 Width: 201 VWidth: 2048 Flags: HW @@ -2130,8 +2129,8 @@ EndSplineSet Validated: 33 EndChar -StartChar: odbase -Encoding: 103 -1 92 +StartChar: DescendensOriscusLineBR +Encoding: 95 -1 92 Width: 164 VWidth: 2048 Flags: HW @@ -2159,7 +2158,7 @@ Validated: 1 EndChar StartChar: DivisioDominican -Encoding: 104 -1 93 +Encoding: 96 -1 93 Width: 22 VWidth: 2048 Flags: HW @@ -2177,7 +2176,7 @@ Validated: 1 EndChar StartChar: DivisioDominicanAlt -Encoding: 105 -1 94 +Encoding: 97 -1 94 Width: 22 VWidth: 2048 Flags: HW @@ -2195,7 +2194,7 @@ Validated: 1 EndChar StartChar: Sharp -Encoding: 106 -1 95 +Encoding: 98 -1 95 Width: 258 VWidth: 2048 Flags: W @@ -2258,7 +2257,7 @@ Validated: 1 EndChar StartChar: SharpHole -Encoding: 107 -1 96 +Encoding: 99 -1 96 Width: 258 VWidth: 2048 Flags: W @@ -2276,7 +2275,7 @@ Validated: 1 EndChar StartChar: Linea -Encoding: 108 -1 97 +Encoding: 100 -1 97 Width: 431 VWidth: 2612 Flags: W @@ -2304,7 +2303,7 @@ Validated: 1 EndChar StartChar: RoundBrace -Encoding: 109 -1 98 +Encoding: 101 -1 98 Width: 937 VWidth: 2048 Flags: W @@ -2330,7 +2329,7 @@ Validated: 1 EndChar StartChar: CurlyBrace -Encoding: 110 -1 99 +Encoding: 102 -1 99 Width: 1006 VWidth: 2048 Flags: W @@ -2358,7 +2357,7 @@ Validated: 1 EndChar StartChar: BarBrace -Encoding: 111 -1 100 +Encoding: 103 -1 100 Width: 591 VWidth: 2048 Flags: W @@ -2384,7 +2383,7 @@ Validated: 1 EndChar StartChar: OriscusDeminutus -Encoding: 112 -1 101 +Encoding: 104 -1 101 Width: 187 VWidth: 2048 Flags: HW @@ -2412,8 +2411,8 @@ EndSplineSet Validated: 33 EndChar -StartChar: OriscusLineBL -Encoding: 113 -1 102 +StartChar: AscendensOriscusLineBL +Encoding: 105 -1 102 Width: 164 VWidth: 2048 Flags: HW @@ -2440,8 +2439,8 @@ EndSplineSet Validated: 1 EndChar -StartChar: SalicusOriscus -Encoding: 114 -1 103 +StartChar: AscendensOriscusLineBLTR +Encoding: 106 -1 103 Width: 164 VWidth: 2048 Flags: HW @@ -2455,10 +2454,10 @@ SplineSet 41 26 30 21 22 16 c 1 22 -24 l 1 0 -24 l 1 - 0 130 l 5 - 12 144 31 160 52 160 c 4 - 83 160 99 133 118 129 c 4 - 135 126 139 135 142 142 c 5 + 0 130 l 1 + 12 144 31 160 52 160 c 0 + 83 160 99 133 118 129 c 0 + 135 126 139 135 142 142 c 1 142 157 l 5 164 157 l 5 164 22 l 2 @@ -2468,7 +2467,7 @@ Validated: 1 EndChar StartChar: hepisemaleft -Encoding: 82 -1 104 +Encoding: 75 -1 104 Width: 1 VWidth: 1968 Flags: HW @@ -2485,7 +2484,7 @@ EndSplineSet EndChar StartChar: RoundBraceDown -Encoding: 130 -1 105 +Encoding: 107 -1 105 Width: 937 VWidth: 2048 Flags: HW @@ -2511,7 +2510,7 @@ Validated: 1 EndChar StartChar: VirgaReversaAscendens_op -Encoding: 131 -1 106 +Encoding: 108 -1 106 Width: 186 VWidth: 2048 Flags: HW @@ -2535,7 +2534,7 @@ Validated: 33 EndChar StartChar: VirgaReversaLongqueueAscendens_op -Encoding: 132 -1 107 +Encoding: 109 -1 107 Width: 186 VWidth: 2048 Flags: HW @@ -2559,7 +2558,7 @@ Validated: 33 EndChar StartChar: VirgaReversaDescendens_op -Encoding: 133 -1 108 +Encoding: 110 -1 108 Width: 186 VWidth: 2048 Flags: HW @@ -2583,7 +2582,7 @@ Validated: 33 EndChar StartChar: VirgaReversaLongqueueDescendens_op -Encoding: 134 -1 109 +Encoding: 111 -1 109 Width: 186 VWidth: 2048 Flags: HW @@ -2607,7 +2606,7 @@ Validated: 33 EndChar StartChar: PunctumDescendens_op -Encoding: 137 -1 110 +Encoding: 112 -1 110 Width: 164 VWidth: 2048 Flags: HW @@ -2632,7 +2631,7 @@ Validated: 33 EndChar StartChar: PunctumAscendens_op -Encoding: 138 -1 111 +Encoding: 113 -1 111 Width: 164 VWidth: 2048 Flags: HW @@ -2657,7 +2656,7 @@ Validated: 33 EndChar StartChar: auctusd1_op -Encoding: 139 -1 112 +Encoding: 114 -1 112 Width: 164 VWidth: 2048 Flags: HW @@ -2683,7 +2682,7 @@ Validated: 33 EndChar StartChar: auctusa1_op -Encoding: 140 -1 113 +Encoding: 115 -1 113 Width: 164 VWidth: 2048 Flags: HW @@ -2709,7 +2708,7 @@ Validated: 33 EndChar StartChar: auctusa2_op -Encoding: 141 -1 114 +Encoding: 116 -1 114 Width: 164 VWidth: 2048 Flags: HW @@ -2735,7 +2734,7 @@ Validated: 33 EndChar StartChar: PunctumAuctusLineBL_op -Encoding: 142 -1 115 +Encoding: 117 -1 115 Width: 164 VWidth: 2048 Flags: HW @@ -2761,7 +2760,7 @@ Validated: 33 EndChar StartChar: pesdeminutus_op -Encoding: 143 -1 116 +Encoding: 118 -1 116 Width: 164 VWidth: 2048 Flags: HW @@ -2787,7 +2786,7 @@ Validated: 33 EndChar StartChar: PunctumCavumInclinatum -Encoding: 144 -1 117 +Encoding: 119 -1 117 Width: 164 VWidth: 2048 Flags: HW @@ -2810,7 +2809,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumAuctus -Encoding: 146 -1 118 +Encoding: 121 -1 118 Width: 164 VWidth: 2048 Flags: HW @@ -2838,7 +2837,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumHole -Encoding: 145 -1 119 +Encoding: 120 -1 119 Width: 164 VWidth: 2048 Flags: HW @@ -2856,7 +2855,7 @@ Validated: 1 EndChar StartChar: PunctumCavumInclinatumAuctusHole -Encoding: 147 -1 120 +Encoding: 122 -1 120 Width: 164 VWidth: 2048 Flags: HW @@ -2873,8 +2872,8 @@ EndSplineSet Validated: 1 EndChar -StartChar: OriscusReversusLineTLBR -Encoding: 148 -1 121 +StartChar: DescendensOriscusLineTLBR +Encoding: 123 -1 121 Width: 164 VWidth: 2048 Flags: HW @@ -2883,24 +2882,24 @@ VStem: 142 22<-24 21.2824> 0 22<129.591 157> LayerCount: 2 Fore SplineSet -38.2793 -6.6875 m 0 - 18.7393 -6.6875 0 6.09473 0 22 c 2 +38.2793 -6.6875 m 4 + 18.7393 -6.6875 0 6.09473 0 22 c 6 0 157 l 1 22 157 l 1 22 142 l 1 25 135 29 126 46 129 c 0 65 133 81 160 112 160 c 0 133 160 152 144 164 130 c 1 - 164 -24 l 1 - 142 -24 l 1 - 142 16 l 1 - 134 21 123 26 112 26 c 0 - 76.2002 26 73.2949 -6.6875 38.2793 -6.6875 c 0 + 164 -24 l 5 + 142 -24 l 5 + 142 16 l 5 + 134 21 123 26 112 26 c 4 + 76.2002 26 73.2949 -6.6875 38.2793 -6.6875 c 4 EndSplineSet EndChar -StartChar: OriscusReversusLineTL -Encoding: 149 -1 122 +StartChar: DescendensOriscusLineTL +Encoding: 124 -1 122 Width: 164 VWidth: 2048 Flags: HW @@ -2924,7 +2923,7 @@ EndSplineSet EndChar StartChar: UpperPesOneNothing -Encoding: 63 -1 123 +Encoding: 56 -1 123 Width: 186 VWidth: 2048 Flags: HW @@ -2950,8 +2949,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavum -Encoding: 152 -1 124 +StartChar: AscendensOriscusCavum +Encoding: 125 -1 124 Width: 164 VWidth: 2048 Flags: HW @@ -2985,8 +2984,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumHole -Encoding: 153 -1 125 +StartChar: AscendensOriscusCavumHole +Encoding: 126 -1 125 Width: 164 VWidth: 2048 Flags: W @@ -3006,8 +3005,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumReversus -Encoding: 154 -1 126 +StartChar: DescendensOriscusCavum +Encoding: 127 -1 126 Width: 164 VWidth: 2048 Flags: HW @@ -3041,8 +3040,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusCavumReversusHole -Encoding: 155 -1 127 +StartChar: DescendensOriscusCavumHole +Encoding: 128 -1 127 Width: 164 VWidth: 2048 Flags: HW @@ -3063,7 +3062,7 @@ EndSplineSet EndChar StartChar: OriscusCavumDeminutus -Encoding: 156 -1 128 +Encoding: 129 -1 128 Width: 187 VWidth: 2048 Flags: HW @@ -3100,7 +3099,7 @@ EndSplineSet EndChar StartChar: OriscusCavumDeminutusHole -Encoding: 157 -1 129 +Encoding: 130 -1 129 Width: 164 VWidth: 2048 Flags: W @@ -3121,7 +3120,7 @@ EndSplineSet EndChar StartChar: Virgula.2 -Encoding: 158 -1 130 +Encoding: 131 -1 130 Width: 152 VWidth: 1418 Flags: HW @@ -3139,7 +3138,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.2 -Encoding: 159 -1 131 +Encoding: 132 -1 131 Width: 19 VWidth: 1418 Flags: HW @@ -3156,7 +3155,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.2 -Encoding: 160 -1 132 +Encoding: 133 -1 132 Width: 19 VWidth: 2048 Flags: HW @@ -3173,7 +3172,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.2 -Encoding: 161 -1 133 +Encoding: 134 -1 133 Width: 19 VWidth: 2048 Flags: HW @@ -3190,7 +3189,7 @@ EndSplineSet EndChar StartChar: Virgula.3 -Encoding: 162 -1 134 +Encoding: 135 -1 134 Width: 152 VWidth: 1733 Flags: HW @@ -3208,7 +3207,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.3 -Encoding: 163 -1 135 +Encoding: 136 -1 135 Width: 19 VWidth: 1733 Flags: HW @@ -3225,7 +3224,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.3 -Encoding: 164 -1 136 +Encoding: 137 -1 136 Width: 19 VWidth: 2048 Flags: HW @@ -3242,7 +3241,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.3 -Encoding: 165 -1 137 +Encoding: 138 -1 137 Width: 19 VWidth: 2048 Flags: HW @@ -3259,7 +3258,7 @@ EndSplineSet EndChar StartChar: Virgula.5 -Encoding: 166 -1 138 +Encoding: 139 -1 138 Width: 152 VWidth: 2363 Flags: HW @@ -3277,7 +3276,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.5 -Encoding: 167 -1 139 +Encoding: 140 -1 139 Width: 19 VWidth: 2363 Flags: HW @@ -3294,7 +3293,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.5 -Encoding: 168 -1 140 +Encoding: 141 -1 140 Width: 19 VWidth: 2048 Flags: HW @@ -3311,7 +3310,7 @@ EndSplineSet EndChar StartChar: DivisioMaior.5 -Encoding: 169 -1 141 +Encoding: 142 -1 141 Width: 19 VWidth: 2048 Flags: HW @@ -3328,7 +3327,7 @@ EndSplineSet EndChar StartChar: StrophaAuctaLongtail -Encoding: 94 -1 142 +Encoding: 87 -1 142 Width: 164 VWidth: 2048 Flags: W @@ -3348,7 +3347,7 @@ EndSplineSet EndChar StartChar: rqueue -Encoding: 170 -1 143 +Encoding: 143 -1 143 Width: 22 VWidth: 2048 Flags: HW @@ -3365,7 +3364,7 @@ EndSplineSet EndChar StartChar: queuebase -Encoding: 171 -1 144 +Encoding: 144 -1 144 Width: 22 VWidth: 2048 Flags: HW @@ -3383,7 +3382,7 @@ EndSplineSet EndChar StartChar: tmpglyph -Encoding: 172 -1 145 +Encoding: 145 -1 145 Width: 22 VWidth: 2048 Flags: W @@ -3400,7 +3399,7 @@ EndSplineSet EndChar StartChar: virgabase -Encoding: 173 -1 146 +Encoding: 146 -1 146 Width: 164 VWidth: 2048 Flags: HW @@ -3421,7 +3420,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL -Encoding: 174 -1 147 +Encoding: 147 -1 147 Width: 164 VWidth: 2048 Flags: HW @@ -3438,13 +3437,13 @@ SplineSet 0 150 l 1 20 161 49.417 166 82 166 c 24 114.583 166 144 158 164 150 c 1 - 164 -41 l 1 + 164 -41 l 5 141.996 -41 l 5 EndSplineSet EndChar StartChar: rvbase -Encoding: 175 -1 148 +Encoding: 148 -1 148 Width: 164 VWidth: 2048 Flags: HW @@ -3452,22 +3451,22 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -22.0039 -41 m 5 +22.0039 -41 m 1 0 -41 l 1 0 150 l 1 20 158 49.417 166 82 166 c 24 114.583 166 144 161 164 150 c 1 - 164 -20 l 1 - 153.375 -19.875 164 -20 142 -20 c 1 + 164 -20 l 5 + 153.375 -19.875 164 -20 142 -20 c 5 140.625 -12.125 132.583 -1.72852 127 0 c 1 114 8 103.562 9.49707 81.999 9.33301 c 0 51.333 8.66699 22 -4 22.0039 -26.668 c 2 - 22.0039 -41 l 5 + 22.0039 -41 l 1 EndSplineSet EndChar StartChar: rvirgabase -Encoding: 176 -1 149 +Encoding: 149 -1 149 Width: 164 VWidth: 2048 Flags: HW @@ -3487,8 +3486,8 @@ SplineSet EndSplineSet EndChar -StartChar: OriscusReversusLineBL -Encoding: 177 -1 150 +StartChar: DescendensOriscusLineBL +Encoding: 150 -1 150 Width: 164 VWidth: 2048 Flags: HW @@ -3514,15 +3513,15 @@ SplineSet EndSplineSet EndChar -StartChar: osbase -Encoding: 178 -1 151 +StartChar: AscendensOriscusLineBLBR +Encoding: 151 -1 151 Width: 164 VWidth: 2048 Flags: HW LayerCount: 2 Fore SplineSet -0 -27 m 5 +0 -27 m 1 0 129.75 l 1 12 144 30.6465 159.548 51.75 160 c 1 83.25 159.75 98.9385 133.274 118.5 128.75 c 1 @@ -3530,14 +3529,236 @@ SplineSet 142.945 127.485 153.146 131.484 159.5 146.25 c 1 161.23 161.341 158.41 172.99 164 191 c 9 164 -20 l 1 - 153.375 -19.875 164 -20 142 -20 c 1 - 142 -3.91719 l 1 - 136.634 -5.82116 130.788 -6.90644 125.048 -6.90644 c 0 + 164 -20 164 -20 142 -20 c 5 + 142 -4 l 5 + 137 -6 130.788 -6.90644 125.048 -6.90644 c 0 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1 40.6015 25.2549 22 17.4121 22 7.5 c 2 22.0004 -27 l 1 - 0 -27 l 5 + 0 -27 l 1 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineBR +Encoding: 152 -1 152 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +164 -24 m 1 + 142 -24 l 1 + 142 -4 l 1 + 137 -6 130.797 -6.90644 125.048 -6.90644 c 0 + 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1 + 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1 + 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1 + 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 9 + 0 129.75 l 17 + 12 144 30.6465 159.548 51.75 160 c 1 + 83.25 159.75 98.9385 133.274 118.5 128.75 c 1 + 122.907 128.016 127.265 127.485 131.453 127.485 c 0 + 142.945 127.485 153.146 131.484 159.5 146.25 c 1 + 161.23 161.341 158.41 172.99 164 191 c 9 + 164 -24 l 1 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTLBR +Encoding: 153 -1 153 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +0 157 m 1 + 22 157 l 1 + 22 150 l 1 + 31 156 41.007 159.77 51.75 160 c 1 + 83.25 159.75 98.9385 133.274 118.5 128.75 c 1 + 122.907 128.016 127.265 127.485 131.453 127.485 c 0 + 142.945 127.485 153.146 131.484 159.5 146.25 c 1 + 161.23 161.341 158.41 172.99 164 191 c 9 + 164 -24 l 1 + 142 -24 l 1 + 142 -4 l 1 + 137 -6 130.797 -6.90644 125.048 -6.90644 c 0 + 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1 + 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1 + 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1 + 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 9 + 0 157 l 1 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTLTR +Encoding: 154 -1 154 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +164 19.1963 m 4 + 164 5.04004 144.092 -6.90644 125.048 -6.90644 c 0 + 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1 + 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1 + 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1 + 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 9 + 0 157 l 1 + 22 157 l 1 + 22.0022 149.842 l 1 + 31.031 155.81 41.2536 160 52 160 c 0 + 83 160 99 133 118 129 c 0 + 135 126 139 135 142 142 c 1 + 142 157 l 1 + 164 157 l 5 + 164 19.1963 l 4 +EndSplineSet +EndChar + +StartChar: AscendensOriscusLineTL +Encoding: 155 -1 155 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +0 157 m 5 + 22 157 l 1 + 21.998 149.746 l 1 + 30.9114 155.632 41.0127 159.77 51.75 160 c 1 + 83.25 159.75 98.9385 133.274 118.5 128.75 c 1 + 122.907 128.016 127.265 127.485 131.453 127.485 c 0 + 142.945 127.485 153.146 131.484 159.5 146.25 c 1 + 161.23 161.341 158.41 172.99 164 191 c 9 + 164 22.1729 l 17 + 164.202 21.1722 164.299 20.1788 164.299 19.1961 c 0 + 164.299 5.03959 144.092 -6.90644 125.048 -6.90644 c 0 + 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1 + 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1 + 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1 + 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 13 + 0 157 l 5 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBLBR +Encoding: 156 -1 156 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +164 -24 m 5 + 142 -24 l 1 + 142 16 l 1 + 134 21 123 26 112 26 c 0 + 76.2002 26 73.2949 -6.6875 38.2793 -6.6875 c 0 + 32.6358 -6.6875 27.0592 -5.62128 21.9815 -3.72154 c 1 + 22.0004 -27 l 1 + 0 -27 l 1 + 0 191 l 17 + 5.59004 172.99 2.76983 161.341 4.5 146.25 c 1 + 10.8533 131.483 21.0542 127.484 32.546 127.484 c 0 + 36.7338 127.484 41.0931 128.016 45.5 128.75 c 1 + 65.0611 133.274 80.75 159.75 112.25 160 c 1 + 133.353 159.548 152 144 164 129.75 c 13 + 164 -24 l 5 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineBLTR +Encoding: 157 -1 157 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +164 -44.4199 m 21 + 159.675 -31.7529 161.219 -18.3369 158.665 -5.66992 c 1 + 152.665 7.08008 134.579 21.5244 111.665 23.3301 c 1 + 79.2109 21.2725 74.165 -3.66992 45.915 -9.16992 c 1 + 43.6121 -9.56246 41.2501 -9.74922 38.8707 -9.74922 c 0 + 33.1499 -9.74922 27.3282 -8.66969 21.9833 -6.77509 c 1 + 22.0004 -27 l 1 + 0 -27 l 1 + 0 191 l 17 + 5.59004 172.99 2.76983 161.341 4.5 146.25 c 1 + 10.8533 131.483 21.0542 127.484 32.546 127.484 c 0 + 36.7338 127.484 41.0931 128.016 45.5 128.75 c 1 + 65.0611 133.274 80.75 159.75 112.25 160 c 1 + 123.018 159.769 133.146 155.608 142.078 149.695 c 1 + 142 157 l 1 + 164 157 l 5 + 164 -44.4199 l 21 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineTLTR +Encoding: 158 -1 158 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +0 157 m 5 + 22 157 l 1 + 22 142 l 1 + 25 135 29 126 46 129 c 0 + 65 133 81 160 112 160 c 0 + 122.741 160 132.958 155.815 141.983 149.852 c 1 + 142 157 l 1 + 164 157 l 1 + 164 -44.4199 l 17 + 159.675 -31.7529 161.219 -18.3369 158.665 -5.66992 c 1 + 152.665 7.08008 134.579 21.5244 111.665 23.3301 c 1 + 79.2109 21.2725 74.165 -3.66992 45.915 -9.16992 c 1 + 43.6121 -9.56246 41.2501 -9.74922 38.8707 -9.74922 c 0 + 19.8437 -9.74922 -0.000976562 2.19238 -0.000976562 16.3457 c 4 + 0 157 l 5 +EndSplineSet +EndChar + +StartChar: DescendensOriscusLineTR +Encoding: 159 -1 159 +Width: 164 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +164 -44.4199 m 21 + 159.675 -31.7529 161.219 -18.3369 158.665 -5.66992 c 1 + 152.665 7.08008 134.579 21.5244 111.665 23.3301 c 1 + 79.2109 21.2725 74.165 -3.66992 45.915 -9.16992 c 1 + 43.6121 -9.56246 41.2501 -9.74922 38.8707 -9.74922 c 0 + 19.8437 -9.74922 -0.300029 2.19241 -0.300029 16.3455 c 0 + -0.300029 17.3307 -0.20241 18.3267 0 19.3301 c 9 + 0 191 l 17 + 5.59004 172.99 2.76983 161.341 4.5 146.25 c 1 + 10.8533 131.483 21.0542 127.484 32.546 127.484 c 0 + 36.7338 127.484 41.0931 128.016 45.5 128.75 c 1 + 65.0611 133.274 80.75 159.75 112.25 160 c 1 + 123.015 159.769 133.142 155.61 142.072 149.699 c 1 + 142 157 l 1 + 164 157 l 5 + 164 -44.4199 l 21 EndSplineSet EndChar EndChars diff --git a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py index 2f42bfca794..e504b874c1b 100644 --- a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py +++ b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py @@ -78,7 +78,7 @@ AMBITUS = { 5: 'Five', } -GREGORIO_VERSION = '4.1.1' +GREGORIO_VERSION = '4.2.0-beta1' # The unicode character at which we start our numbering: # U+E000 is the start of the BMP Private Use Area @@ -241,11 +241,13 @@ DIRECT_GLYPH_NAMES = [ 'VirgaBaseLineBL', 'Quilisma', 'QuilismaLineTR', - 'Oriscus', - 'OriscusLineBL', - 'OriscusLineTR', - 'OriscusReversus', - 'OriscusReversusLineTL', + 'AscendensOriscus', + 'AscendensOriscusLineBL', + 'AscendensOriscusLineTL', + 'AscendensOriscusLineTR', + 'DescendensOriscus', + 'DescendensOriscusLineBL', + 'DescendensOriscusLineTL', 'PunctumInclinatumAuctus', 'PunctumInclinatumDeminutus', 'VEpisema', @@ -287,15 +289,15 @@ DIRECT_GLYPH_NAMES = [ 'PunctumLineTR', 'PunctumLineBLBR', 'PunctumAuctusLineBL', - 'SalicusOriscus', + 'AscendensOriscusLineBLTR', 'PunctumCavumInclinatum', 'PunctumCavumInclinatumHole', 'PunctumCavumInclinatumAuctus', 'PunctumCavumInclinatumAuctusHole', - 'OriscusCavum', - 'OriscusCavumHole', - 'OriscusCavumReversus', - 'OriscusCavumReversusHole', + 'AscendensOriscusCavum', + 'AscendensOriscusCavumHole', + 'DescendensOriscusCavum', + 'DescendensOriscusCavumHole', 'OriscusCavumDeminutus', 'OriscusCavumDeminutusHole', ] @@ -383,87 +385,106 @@ def get_width(glyphName): return WIDTHS[glyphName] # Shapes -S_PES = 'Pes' -S_UPPER_PES = 'UpperPes' -S_LOWER_PES = 'LowerPes' -S_PES_QUADRATUM = 'PesQuadratum' -S_UPPER_PES_QUADRATUM = 'UpperPesQuadratum' -S_LOWER_PES_QUADRATUM = 'LowerPesQuadratum' -S_PES_QUADRATUM_LONGQUEUE = 'PesQuadratumLongqueue' -S_UPPER_PES_QUADRATUM_LONGQUEUE = 'UpperPesQuadratumLongqueue' -S_LOWER_PES_QUADRATUM_LONGQUEUE = 'LowerPesQuadratumLongqueue' -S_PES_QUADRATUM_OPENQUEUE = 'PesQuadratumOpenqueue' -S_UPPER_PES_QUADRATUM_OPENQUEUE = 'UpperPesQuadratumOpenqueue' -S_LOWER_PES_QUADRATUM_OPENQUEUE = 'LowerPesQuadratumOpenqueue' -S_PES_QUILISMA = 'PesQuilisma' -S_PES_QUASSUS = 'PesQuassus' -S_UPPER_PES_QUASSUS = 'UpperPesQuassus' -S_LOWER_PES_QUASSUS = 'LowerPesQuassus' -S_PES_QUASSUS_LONGQUEUE = 'PesQuassusLongqueue' -S_UPPER_PES_QUASSUS_LONGQUEUE = 'UpperPesQuassusLongqueue' -S_LOWER_PES_QUASSUS_LONGQUEUE = 'LowerPesQuassusLongqueue' -S_PES_QUASSUS_OPENQUEUE = 'PesQuassusOpenqueue' -S_UPPER_PES_QUASSUS_OPENQUEUE = 'UpperPesQuassusOpenqueue' -S_LOWER_PES_QUASSUS_OPENQUEUE = 'LowerPesQuassusOpenqueue' -S_PES_QUILISMA_QUADRATUM = 'PesQuilismaQuadratum' -S_PES_QUILISMA_QUADRATUM_LONGQUEUE = 'PesQuilismaQuadratumLongqueue' -S_PES_QUILISMA_QUADRATUM_OPENQUEUE = 'PesQuilismaQuadratumOpenqueue' -S_FLEXUS = 'Flexus' -S_UPPER_FLEXUS = 'UpperFlexus' -S_LOWER_FLEXUS = 'LowerFlexus' -S_FLEXUS_NOBAR = 'FlexusNobar' -S_FLEXUS_LONGQUEUE = 'FlexusLongqueue' -S_FLEXUS_OPENQUEUE = 'FlexusOpenqueue' -S_FLEXUS_ORISCUS = 'FlexusOriscus' -S_LOWER_FLEXUS_ORISCUS = 'LowerFlexusOriscus' -S_PORRECTUS_FLEXUS = 'PorrectusFlexus' -S_PORRECTUS_FLEXUS_LONGQUEUE = 'PorrectusFlexusLongqueue' -S_PORRECTUS_FLEXUS_NOBAR = 'PorrectusFlexusNobar' -S_PORRECTUS = 'Porrectus' -S_PORRECTUS_LONGQUEUE = 'PorrectusLongqueue' -S_PORRECTUS_NOBAR = 'PorrectusNobar' +S_PES = 'Pes' +S_UPPER_PES = 'UpperPes' +S_LOWER_PES = 'LowerPes' +S_PES_QUADRATUM = 'PesQuadratum' +S_UPPER_PES_QUADRATUM = 'UpperPesQuadratum' +S_LOWER_PES_QUADRATUM = 'LowerPesQuadratum' +S_PES_QUADRATUM_LONGQUEUE = 'PesQuadratumLongqueue' +S_UPPER_PES_QUADRATUM_LONGQUEUE = 'UpperPesQuadratumLongqueue' +S_LOWER_PES_QUADRATUM_LONGQUEUE = 'LowerPesQuadratumLongqueue' +S_PES_QUADRATUM_OPENQUEUE = 'PesQuadratumOpenqueue' +S_UPPER_PES_QUADRATUM_OPENQUEUE = 'UpperPesQuadratumOpenqueue' +S_LOWER_PES_QUADRATUM_OPENQUEUE = 'LowerPesQuadratumOpenqueue' +S_PES_QUILISMA = 'PesQuilisma' +S_PES_QUASSUS = 'PesQuassus' +S_UPPER_PES_QUASSUS = 'UpperPesQuassus' +S_LOWER_PES_QUASSUS = 'LowerPesQuassus' +S_PES_QUASSUS_LONGQUEUE = 'PesQuassusLongqueue' +S_UPPER_PES_QUASSUS_LONGQUEUE = 'UpperPesQuassusLongqueue' +S_LOWER_PES_QUASSUS_LONGQUEUE = 'LowerPesQuassusLongqueue' +S_PES_QUASSUS_OPENQUEUE = 'PesQuassusOpenqueue' +S_UPPER_PES_QUASSUS_OPENQUEUE = 'UpperPesQuassusOpenqueue' +S_LOWER_PES_QUASSUS_OPENQUEUE = 'LowerPesQuassusOpenqueue' +S_PES_QUASSUS_INUSITATUS = 'PesQuassusInusitatus' +S_UPPER_PES_QUASSUS_INUSITATUS = 'UpperPesQuassusInusitatus' +S_LOWER_PES_QUASSUS_INUSITATUS = 'LowerPesQuassusInusitatus' +S_PES_QUASSUS_INUSITATUS_LONGQUEUE = 'PesQuassusInusitatusLongqueue' +S_UPPER_PES_QUASSUS_INUSITATUS_LONGQUEUE = 'UpperPesQuassusInusitatusLongqueue' +S_LOWER_PES_QUASSUS_INUSITATUS_LONGQUEUE = 'LowerPesQuassusInusitatusLongqueue' +S_PES_QUASSUS_INUSITATUS_OPENQUEUE = 'PesQuassusInusitatusOpenqueue' +S_UPPER_PES_QUASSUS_INUSITATUS_OPENQUEUE = 'UpperPesQuassusInusitatusOpenqueue' +S_LOWER_PES_QUASSUS_INUSITATUS_OPENQUEUE = 'LowerPesQuassusInusitatusOpenqueue' +S_PES_QUILISMA_QUADRATUM = 'PesQuilismaQuadratum' +S_PES_QUILISMA_QUADRATUM_LONGQUEUE = 'PesQuilismaQuadratumLongqueue' +S_PES_QUILISMA_QUADRATUM_OPENQUEUE = 'PesQuilismaQuadratumOpenqueue' +S_FLEXUS = 'Flexus' +S_UPPER_FLEXUS = 'UpperFlexus' +S_LOWER_FLEXUS = 'LowerFlexus' +S_FLEXUS_NOBAR = 'FlexusNobar' +S_FLEXUS_LONGQUEUE = 'FlexusLongqueue' +S_FLEXUS_OPENQUEUE = 'FlexusOpenqueue' +S_FLEXUS_ORISCUS = 'FlexusOriscus' +S_UPPER_FLEXUS_ORISCUS = 'UpperFlexusOriscus' +S_LOWER_FLEXUS_ORISCUS = 'LowerFlexusOriscus' +S_FLEXUS_ORISCUS_INUSITATUS = 'FlexusOriscusInusitatus' +S_UPPER_FLEXUS_ORISCUS_INUSITATUS = 'UpperFlexusOriscusInusitatus' +S_LOWER_FLEXUS_ORISCUS_INUSITATUS = 'LowerFlexusOriscusInusitatus' +S_PORRECTUS_FLEXUS = 'PorrectusFlexus' +S_PORRECTUS_FLEXUS_LONGQUEUE = 'PorrectusFlexusLongqueue' +S_PORRECTUS_FLEXUS_NOBAR = 'PorrectusFlexusNobar' +S_PORRECTUS = 'Porrectus' +S_PORRECTUS_LONGQUEUE = 'PorrectusLongqueue' +S_PORRECTUS_NOBAR = 'PorrectusNobar' # for stem length determination only: -S_PORRECTUS_DEMINUTUS_ALT = 'PorrectusDeminutus.alt' -S_TORCULUS = 'Torculus' -S_TORCULUS_RESUPINUS = 'TorculusResupinus' -S_TORCULUS_QUILISMA = 'TorculusQuilisma' -S_TORCULUS_RESUPINUS_QUILISMA = 'TorculusResupinusQuilisma' -S_SCANDICUS = 'Scandicus' -S_ANCUS = 'Ancus' -S_ANCUS_LONGQUEUE = 'AncusLongqueue' -S_ANCUS_OPENQUEUE = 'AncusOpenqueue' -S_VIRGA_STRATA = 'VirgaStrata' -S_SALICUS = 'Salicus' -S_SALICUS_LONGQUEUE = 'SalicusLongqueue' -S_SALICUS_OPENQUEUE = 'SalicusOpenqueue' -S_SALICUS_FLEXUS = 'SalicusFlexus' -S_TORCULUS_LIQUESCENS = 'TorculusLiquescens' -S_TORCULUS_LIQUESCENS_QUILISMA = 'TorculusLiquescensQuilisma' -S_FLEXUS_ORISCUS_SCAPUS = 'FlexusOriscusScapus' -S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE = 'FlexusOriscusScapusLongqueue' -S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE = 'FlexusOriscusScapusOpenqueue' -S_LEADING_PUNCTUM = 'LeadingPunctum' -S_LEADING_QUILISMA = 'LeadingQuilisma' -S_LEADING_ORISCUS = 'LeadingOriscus' -S_PUNCTUM = 'Punctum' -S_UPPER_PUNCTUM = 'UpperPunctum' -S_LOWER_PUNCTUM = 'LowerPunctum' -S_QUILISMA = 'Quilisma' -S_ORISCUS = 'Oriscus' -S_ORISCUS_SCAPUS = 'OriscusScapus' -S_ORISCUS_SCAPUS_LONGQUEUE = 'OriscusScapusLongqueue' -S_ORISCUS_SCAPUS_OPENQUEUE = 'OriscusScapusOpenqueue' -S_ORISCUS_REVERSUS_SCAPUS = 'OriscusScapusReversus' -S_ORISCUS_REVERSUS_SCAPUS_LONGQUEUE= 'OriscusScapusReversusLongqueue' -S_ORISCUS_REVERSUS_SCAPUS_OPENQUEUE= 'OriscusScapusReversusOpenqueue' -S_UPPER_ORISCUS = 'UpperOriscus' -S_LOWER_ORISCUS = 'LowerOriscus' -S_VIRGA = 'Virga' -S_VIRGA_LONGQUEUE = 'VirgaLongqueue' -S_VIRGA_OPENQUEUE = 'VirgaOpenqueue' -S_VIRGA_REVERSA = 'VirgaReversa' -S_VIRGA_REVERSA_LONGQUEUE = 'VirgaReversaLongqueue' -S_VIRGA_REVERSA_OPENQUEUE = 'VirgaReversaOpenqueue' +S_PORRECTUS_DEMINUTUS_ALT = 'PorrectusDeminutus.alt' +S_TORCULUS = 'Torculus' +S_TORCULUS_RESUPINUS = 'TorculusResupinus' +S_TORCULUS_QUILISMA = 'TorculusQuilisma' +S_TORCULUS_RESUPINUS_QUILISMA = 'TorculusResupinusQuilisma' +S_SCANDICUS = 'Scandicus' +S_ANCUS = 'Ancus' +S_ANCUS_LONGQUEUE = 'AncusLongqueue' +S_ANCUS_OPENQUEUE = 'AncusOpenqueue' +S_VIRGA_STRATA = 'VirgaStrata' +S_SALICUS = 'Salicus' +S_SALICUS_LONGQUEUE = 'SalicusLongqueue' +S_SALICUS_OPENQUEUE = 'SalicusOpenqueue' +S_SALICUS_FLEXUS = 'SalicusFlexus' +S_TORCULUS_LIQUESCENS = 'TorculusLiquescens' +S_TORCULUS_LIQUESCENS_QUILISMA = 'TorculusLiquescensQuilisma' +S_FLEXUS_ORISCUS_SCAPUS = 'FlexusOriscusScapus' +S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE = 'FlexusOriscusScapusLongqueue' +S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE = 'FlexusOriscusScapusOpenqueue' +S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS = 'FlexusOriscusScapusInusitatus' +S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE = 'FlexusOriscusScapusInusitatusLongqueue' +S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE = 'FlexusOriscusScapusInusitatusOpenqueue' +S_LEADING_PUNCTUM = 'LeadingPunctum' +S_LEADING_QUILISMA = 'LeadingQuilisma' +S_LEADING_ORISCUS = 'LeadingOriscus' +S_PUNCTUM = 'Punctum' +S_UPPER_PUNCTUM = 'UpperPunctum' +S_LOWER_PUNCTUM = 'LowerPunctum' +S_QUILISMA = 'Quilisma' +S_ASCENDENS_ORISCUS = 'AscendensOriscus' +S_DESCENDENS_ORISCUS = 'DescendensOriscus' +S_ASCENDENS_ORISCUS_SCAPUS = 'AscendensOriscusScapus' +S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE = 'AscendensOriscusScapusLongqueue' +S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE = 'AscendensOriscusScapusOpenqueue' +S_DESCENDENS_ORISCUS_SCAPUS = 'DescendensOriscusScapus' +S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE = 'DescendensOriscusScapusLongqueue' +S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE = 'DescendensOriscusScapusOpenqueue' +S_UPPER_ASCENDENS_ORISCUS = 'UpperAscendensOriscus' +S_UPPER_DESCENDENS_ORISCUS = 'UpperDescendensOriscus' +S_LOWER_ASCENDENS_ORISCUS = 'LowerAscendensOriscus' +S_LOWER_DESCENDENS_ORISCUS = 'LowerDescendensOriscus' +S_VIRGA = 'Virga' +S_VIRGA_LONGQUEUE = 'VirgaLongqueue' +S_VIRGA_OPENQUEUE = 'VirgaOpenqueue' +S_VIRGA_REVERSA = 'VirgaReversa' +S_VIRGA_REVERSA_LONGQUEUE = 'VirgaReversaLongqueue' +S_VIRGA_REVERSA_OPENQUEUE = 'VirgaReversaOpenqueue' # Liquescentiae L_NOTHING = 'Nothing' @@ -593,8 +614,8 @@ STEM_LIQ_FALLBACKS = { STEM_SHAPE_FALLBACKS = { S_VIRGA_REVERSA : S_VIRGA, - S_ORISCUS_SCAPUS : S_VIRGA, - S_ORISCUS_REVERSUS_SCAPUS: S_VIRGA, + S_ASCENDENS_ORISCUS_SCAPUS : S_VIRGA, + S_DESCENDENS_ORISCUS_SCAPUS: S_VIRGA, S_FLEXUS_ORISCUS_SCAPUS: S_FLEXUS, S_PES_QUADRATUM: S_FLEXUS, S_PES_QUASSUS: S_PES_QUADRATUM, @@ -761,18 +782,18 @@ def virga(): 'auctusa2', 'long', S_VIRGA) write_virga(S_VIRGA_REVERSA_OPENQUEUE, L_ASCENDENS, False, 'auctusa2', 'open', S_VIRGA) - write_virga(S_ORISCUS_SCAPUS, L_NOTHING, False, - 'OriscusLineBL', 'short', S_ORISCUS_SCAPUS) - write_virga(S_ORISCUS_SCAPUS_LONGQUEUE, L_NOTHING, False, - 'OriscusLineBL', 'long', S_ORISCUS_SCAPUS) - write_virga(S_ORISCUS_SCAPUS_OPENQUEUE, L_NOTHING, False, - 'OriscusLineBL', 'open', S_ORISCUS_SCAPUS) - write_virga(S_ORISCUS_REVERSUS_SCAPUS, L_NOTHING, False, - 'OriscusReversusLineBL', 'short', S_ORISCUS_REVERSUS_SCAPUS) - write_virga(S_ORISCUS_REVERSUS_SCAPUS_LONGQUEUE, L_NOTHING, False, - 'OriscusReversusLineBL', 'long', S_ORISCUS_REVERSUS_SCAPUS) - write_virga(S_ORISCUS_REVERSUS_SCAPUS_OPENQUEUE, L_NOTHING, False, - 'OriscusReversusLineBL', 'open', S_ORISCUS_REVERSUS_SCAPUS) + write_virga(S_ASCENDENS_ORISCUS_SCAPUS, L_NOTHING, False, + 'AscendensOriscusLineBL', 'short', S_ASCENDENS_ORISCUS_SCAPUS) + write_virga(S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_NOTHING, False, + 'AscendensOriscusLineBL', 'long', S_ASCENDENS_ORISCUS_SCAPUS) + write_virga(S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_NOTHING, False, + 'AscendensOriscusLineBL', 'open', S_ASCENDENS_ORISCUS_SCAPUS) + write_virga(S_DESCENDENS_ORISCUS_SCAPUS, L_NOTHING, False, + 'DescendensOriscusLineBL', 'short', S_DESCENDENS_ORISCUS_SCAPUS) + write_virga(S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_NOTHING, False, + 'DescendensOriscusLineBL', 'long', S_DESCENDENS_ORISCUS_SCAPUS) + write_virga(S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_NOTHING, False, + 'DescendensOriscusLineBL', 'open', S_DESCENDENS_ORISCUS_SCAPUS) def write_deminutus(i, j, length=0, tosimplify=0, firstbar=1): """As the glyph before a deminutus is not the same as a normal glyph, @@ -834,17 +855,17 @@ HEPISEMA_GLYPHS = { 'HEpisemaQuilisma': 'Quilisma', 'HEpisemaQuilismaLineTR': 'QuilismaLineTR', 'HEpisemaHighPes': 'PunctumSmall', - 'HEpisemaOriscus': 'Oriscus', + 'HEpisemaAscendensOriscus': 'AscendensOriscus', 'HEpisemaVirga': 'rvirgabase', 'HEpisemaVirgaBaseLineBL': 'VirgaBaseLineBL', - 'HEpisemaOriscusLineTR': 'OriscusLineTR', + 'HEpisemaAscendensOriscusLineTR': 'AscendensOriscusLineTR', 'HEpisemaPunctumLineBR': 'PunctumLineBR', 'HEpisemaPunctumLineBL': 'PunctumLineBL', 'HEpisemaPunctumLineTL': 'PunctumLineTL', 'HEpisemaPunctumLineTR': 'PunctumLineTR', 'HEpisemaPunctumLineBLBR': 'PunctumLineBLBR', 'HEpisemaPunctumAuctusLineBL': 'PunctumAuctusLineBL', - 'HEpisemaSalicusOriscus': 'SalicusOriscus', + 'HEpisemaAscendensOriscusLineBLTR': 'AscendensOriscusLineBLTR', 'HEpisemaFlat': 'Flat', 'HEpisemaSharp': 'Sharp', 'HEpisemaNatural': 'Natural', @@ -903,19 +924,20 @@ def pes(): write_pes(i, "QuilismaLineTR", S_PES_QUILISMA) precise_message("pes quilisma deminutus") for i in range(1, MAX_INTERVAL+1): - write_pes_deminutus(i, "QuilismaLineTR", S_PES_QUILISMA, - L_DEMINUTUS) + write_pes_deminutus(i, "QuilismaLineTR", S_PES_QUILISMA, L_DEMINUTUS) precise_message("pes quassus deminutus") for i in range(1, MAX_INTERVAL+1): - write_pes_deminutus(i, "OriscusLineTR", S_PES_QUASSUS, + write_pes_deminutus(i, "AscendensOriscusLineTR", S_PES_QUASSUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_pes_deminutus(i, "DescendensOriscusLineTR", + S_PES_QUASSUS_INUSITATUS, L_DEMINUTUS) precise_message("pes initio debilis") for i in range(1, MAX_INTERVAL+1): write_pes_debilis(i, S_PES, L_INITIO_DEBILIS) precise_message("pes initio debilis deminutus") for i in range(1, MAX_INTERVAL+1): - write_pes_debilis_deminutus(i, S_PES, - L_INITIO_DEBILIS_DEMINUTUS) + write_pes_debilis_deminutus(i, S_PES, L_INITIO_DEBILIS_DEMINUTUS) def fusion_pes(): "Creates the fusion pes." @@ -930,8 +952,17 @@ def fusion_pes(): write_pes_deminutus(i, "mpdeminutus", S_LOWER_PES, L_DEMINUTUS) precise_message("fusion pes quassus deminutus") for i in range(1, MAX_INTERVAL+1): - write_pes_deminutus(i, "SalicusOriscus", S_UPPER_PES_QUASSUS, + write_pes_deminutus(i, "AscendensOriscusLineBLTR", S_UPPER_PES_QUASSUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_pes_deminutus(i, "DescendensOriscusLineBLTR", + S_UPPER_PES_QUASSUS_INUSITATUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_pes_deminutus(i, "AscendensOriscusLineTLTR", S_LOWER_PES_QUASSUS, + L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_pes_deminutus(i, "DescendensOriscusLineTLTR", + S_LOWER_PES_QUASSUS_INUSITATUS, L_DEMINUTUS) def write_pes(i, first_glyph, shape, lique=L_NOTHING): "Writes the pes glyphs." @@ -1020,14 +1051,26 @@ def pes_quadratum(): stemshape=S_PES_QUADRATUM, qtype='open') precise_message("pes quassus") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "OriscusLineTR", "VirgaBaseLineBL", + write_pes_quadratum(i, "AscendensOriscusLineTR", "VirgaBaseLineBL", S_PES_QUASSUS, stemshape=S_PES_QUASSUS, qtype='short') for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "OriscusLineTR", "VirgaBaseLineBL", + write_pes_quadratum(i, "AscendensOriscusLineTR", "VirgaBaseLineBL", S_PES_QUASSUS_LONGQUEUE, stemshape=S_PES_QUASSUS, qtype='long') - write_pes_quadratum(1, "OriscusLineTR", "VirgaBaseLineBL", S_PES_QUASSUS_OPENQUEUE, + write_pes_quadratum(1, "AscendensOriscusLineTR", "VirgaBaseLineBL", + S_PES_QUASSUS_OPENQUEUE, stemshape=S_PES_QUASSUS, + qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTR", "VirgaBaseLineBL", + S_PES_QUASSUS_INUSITATUS, stemshape=S_PES_QUASSUS, + qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTR", "VirgaBaseLineBL", + S_PES_QUASSUS_INUSITATUS_LONGQUEUE, + stemshape=S_PES_QUASSUS, qtype='long') + write_pes_quadratum(1, "DescendensOriscusLineTR", "VirgaBaseLineBL", + S_PES_QUASSUS_INUSITATUS_OPENQUEUE, stemshape=S_PES_QUASSUS, qtype='open') precise_message("pes quilisma quadratum") for i in range(1, MAX_INTERVAL+1): @@ -1035,43 +1078,46 @@ def pes_quadratum(): S_PES_QUILISMA_QUADRATUM, stemshape=S_PES_QUILISMA_QUADRATUM, qtype='short') for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "QuilismaLineTR", - "VirgaBaseLineBL", S_PES_QUILISMA_QUADRATUM_LONGQUEUE, + write_pes_quadratum(i, "QuilismaLineTR", "VirgaBaseLineBL", + S_PES_QUILISMA_QUADRATUM_LONGQUEUE, stemshape=S_PES_QUILISMA_QUADRATUM, qtype='long') - write_pes_quadratum(1, "QuilismaLineTR", - "VirgaBaseLineBL", S_PES_QUILISMA_QUADRATUM_OPENQUEUE, + write_pes_quadratum(1, "QuilismaLineTR", "VirgaBaseLineBL", + S_PES_QUILISMA_QUADRATUM_OPENQUEUE, stemshape=S_PES_QUILISMA_QUADRATUM, qtype='open') precise_message("pes auctus ascendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "PunctumLineTR", - "auctusa2", S_PES_QUADRATUM, L_ASCENDENS) + write_pes_quadratum(i, "PunctumLineTR", "auctusa2", S_PES_QUADRATUM, + L_ASCENDENS) precise_message("pes initio debilis auctus ascendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "idebilis", - "auctusa2", S_PES_QUADRATUM, + write_pes_quadratum(i, "idebilis", "auctusa2", S_PES_QUADRATUM, L_INITIO_DEBILIS_ASCENDENS) precise_message("pes quassus auctus ascendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "OriscusLineTR", + write_pes_quadratum(i, "AscendensOriscusLineTR", "auctusa2", S_PES_QUASSUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTR", + "auctusa2", S_PES_QUASSUS_INUSITATUS, L_ASCENDENS) precise_message("pes quilisma auctus ascendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "QuilismaLineTR", - "auctusa2", S_PES_QUILISMA_QUADRATUM, - L_ASCENDENS) + write_pes_quadratum(i, "QuilismaLineTR", "auctusa2", + S_PES_QUILISMA_QUADRATUM, L_ASCENDENS) precise_message("pes auctus descendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "PunctumLineTR", - "PunctumAuctusLineBL", S_PES_QUADRATUM, L_DESCENDENS) + write_pes_quadratum(i, "PunctumLineTR", "PunctumAuctusLineBL", + S_PES_QUADRATUM, L_DESCENDENS) precise_message("pes initio debilis auctus descendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "idebilis", - "PunctumAuctusLineBL", S_PES_QUADRATUM, - L_INITIO_DEBILIS_DESCENDENS) + write_pes_quadratum(i, "idebilis", "PunctumAuctusLineBL", + S_PES_QUADRATUM, L_INITIO_DEBILIS_DESCENDENS) precise_message("pes quassus auctus descendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "OriscusLineTR", - "PunctumAuctusLineBL", S_PES_QUASSUS, L_DESCENDENS) + write_pes_quadratum(i, "AscendensOriscusLineTR", "PunctumAuctusLineBL", + S_PES_QUASSUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTR", "PunctumAuctusLineBL", + S_PES_QUASSUS_INUSITATUS, L_DESCENDENS) precise_message("pes quilisma auctus descendens") for i in range(1, MAX_INTERVAL+1): write_pes_quadratum(i, "QuilismaLineTR", "PunctumAuctusLineBL", @@ -1105,16 +1151,49 @@ def fusion_pes_quadratum(): stemshape=S_LOWER_PES_QUADRATUM, qtype='open') precise_message("fusion pes quassus") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "SalicusOriscus", "VirgaBaseLineBL", + write_pes_quadratum(i, "AscendensOriscusLineBLTR", "VirgaBaseLineBL", S_UPPER_PES_QUASSUS, stemshape=S_UPPER_PES_QUASSUS, qtype='short') for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "SalicusOriscus", "VirgaBaseLineBL", + write_pes_quadratum(i, "AscendensOriscusLineBLTR", "VirgaBaseLineBL", S_UPPER_PES_QUASSUS_LONGQUEUE, stemshape=S_UPPER_PES_QUASSUS, qtype='long') - write_pes_quadratum(1, "SalicusOriscus", "VirgaBaseLineBL", + write_pes_quadratum(1, "AscendensOriscusLineBLTR", "VirgaBaseLineBL", S_UPPER_PES_QUASSUS_OPENQUEUE, stemshape=S_UPPER_PES_QUASSUS, qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineBLTR", "VirgaBaseLineBL", + S_UPPER_PES_QUASSUS_INUSITATUS, + stemshape=S_UPPER_PES_QUASSUS, qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineBLTR", "VirgaBaseLineBL", + S_UPPER_PES_QUASSUS_INUSITATUS_LONGQUEUE, + stemshape=S_UPPER_PES_QUASSUS, qtype='long') + write_pes_quadratum(1, "DescendensOriscusLineBLTR", "VirgaBaseLineBL", + S_UPPER_PES_QUASSUS_INUSITATUS_OPENQUEUE, + stemshape=S_UPPER_PES_QUASSUS, qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "AscendensOriscusLineTLTR", "VirgaBaseLineBL", + S_LOWER_PES_QUASSUS, + stemshape=S_LOWER_PES_QUASSUS, qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "AscendensOriscusLineTLTR", "VirgaBaseLineBL", + S_LOWER_PES_QUASSUS_LONGQUEUE, + stemshape=S_LOWER_PES_QUASSUS, qtype='long') + write_pes_quadratum(1, "AscendensOriscusLineTLTR", "VirgaBaseLineBL", + S_LOWER_PES_QUASSUS_OPENQUEUE, + stemshape=S_LOWER_PES_QUASSUS, qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTLTR", "VirgaBaseLineBL", + S_LOWER_PES_QUASSUS_INUSITATUS, + stemshape=S_LOWER_PES_QUASSUS, qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTLTR", "VirgaBaseLineBL", + S_LOWER_PES_QUASSUS_INUSITATUS_LONGQUEUE, + stemshape=S_LOWER_PES_QUASSUS, qtype='long') + write_pes_quadratum(1, "DescendensOriscusLineTLTR", "VirgaBaseLineBL", + S_LOWER_PES_QUASSUS_INUSITATUS_OPENQUEUE, + stemshape=S_LOWER_PES_QUASSUS, qtype='open') precise_message("fusion pes auctus ascendens") for i in range(1, MAX_INTERVAL+1): write_pes_quadratum(i, "msdeminutus", "auctusa2", @@ -1124,8 +1203,17 @@ def fusion_pes_quadratum(): S_LOWER_PES_QUADRATUM, L_ASCENDENS) precise_message("fusion pes quassus auctus ascendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "SalicusOriscus", "auctusa2", + write_pes_quadratum(i, "AscendensOriscusLineBLTR", "auctusa2", S_UPPER_PES_QUASSUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineBLTR", "auctusa2", + S_UPPER_PES_QUASSUS_INUSITATUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "AscendensOriscusLineTLTR", "auctusa2", + S_LOWER_PES_QUASSUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTLTR", "auctusa2", + S_LOWER_PES_QUASSUS_INUSITATUS, L_ASCENDENS) precise_message("fusion pes auctus descendens") for i in range(1, MAX_INTERVAL+1): write_pes_quadratum(i, "msdeminutus", "PunctumAuctusLineBL", @@ -1135,8 +1223,17 @@ def fusion_pes_quadratum(): S_LOWER_PES_QUADRATUM, L_DESCENDENS) precise_message("fusion pes quassus auctus descendens") for i in range(1, MAX_INTERVAL+1): - write_pes_quadratum(i, "SalicusOriscus", "PunctumAuctusLineBL", + write_pes_quadratum(i, "AscendensOriscusLineBLTR", "PunctumAuctusLineBL", S_UPPER_PES_QUASSUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineBLTR", "PunctumAuctusLineBL", + S_UPPER_PES_QUASSUS_INUSITATUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "AscendensOriscusLineTLTR", "PunctumAuctusLineBL", + S_LOWER_PES_QUASSUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_pes_quadratum(i, "DescendensOriscusLineTLTR", "PunctumAuctusLineBL", + S_LOWER_PES_QUASSUS_INUSITATUS, L_DESCENDENS) def write_pes_quadratum(i, first_glyph, last_glyph, shape, lique=L_NOTHING, stemshape=None, qtype=None): @@ -1145,33 +1242,29 @@ def write_pes_quadratum(i, first_glyph, last_glyph, shape, lique=L_NOTHING, glyph_name = '%s%s%s' % (shape, AMBITUS[i], lique) if copy_existing_glyph(glyph_name): return - if first_glyph == "idebilis": - first_width = get_width('idebilis')-get_width('line2') - elif first_glyph == "PunctumLineTR" or first_glyph == "OriscusLineTR": - if i == 1: - if first_glyph == 'PunctumLineTR': - first_glyph = 'Punctum' - if first_glyph == 'msdeminutus': - first_glyph = 'PunctumLineBL' - if first_glyph == 'base6': - first_glyph = 'PunctumLineTL' - elif first_glyph == 'OriscusLineTR': - first_glyph = 'Oriscus' - elif first_glyph == 'SalicusOriscus': - first_glyph = 'OriscusLineBL' + if i == 1 and first_glyph != 'idebilis' and first_glyph != 'QuilismaLineTR': + if first_glyph == 'PunctumLineTR': + first_glyph = 'Punctum' + elif first_glyph == 'msdeminutus': + first_glyph = 'PunctumLineBL' + elif first_glyph == 'base6': + first_glyph = 'PunctumLineTL' + elif 'OriscusLine' in first_glyph: + if first_glyph.endswith('LineTR'): + first_glyph = first_glyph[:-6] + else: + first_glyph = first_glyph[:-2] - if last_glyph == 'PunctumLineTL': - last_glyph = 'Punctum' - elif last_glyph == 'auctusa2': - last_glyph = 'PunctumAscendens' - elif last_glyph == 'PunctumAuctusLineBL': - last_glyph = 'PunctumDescendens' - elif last_glyph == 'VirgaBaseLineBL': - last_glyph = 'virgabase' + if last_glyph == 'PunctumLineTL': + last_glyph = 'Punctum' + elif last_glyph == 'auctusa2': + last_glyph = 'PunctumAscendens' + elif last_glyph == 'PunctumAuctusLineBL': + last_glyph = 'PunctumDescendens' + elif last_glyph == 'VirgaBaseLineBL': + last_glyph = 'virgabase' - first_width = get_width(first_glyph) - else: - first_width = get_width(first_glyph)-get_width('line2') + first_width = get_width(first_glyph) else: first_width = get_width(first_glyph)-get_width('line2') simple_paste(first_glyph) @@ -1190,7 +1283,7 @@ def virga_strata(): "Creates the virga strata." precise_message("virga strata") for i in range(1, MAX_INTERVAL+1): - write_virga_strata(i, "PunctumLineTR", "OriscusLineBL", + write_virga_strata(i, "PunctumLineTR", "AscendensOriscusLineBL", S_VIRGA_STRATA) def write_virga_strata(i, first_glyph, last_glyph, shape, lique=L_NOTHING): @@ -1202,7 +1295,7 @@ def write_virga_strata(i, first_glyph, last_glyph, shape, lique=L_NOTHING): if i == 1: first_glyph = 'Punctum' first_width = get_width(first_glyph) - last_glyph = 'Oriscus' + last_glyph = 'AscendensOriscus' else: first_width = get_width(first_glyph)-get_width('line2') simple_paste(first_glyph) @@ -1253,17 +1346,17 @@ def draw_salicus(i, j, last_glyph, lique=L_NOTHING, qtype=None): if i == 1 and j == 1 and not deminutus: first_glyph = 'Punctum' first_width = get_width(first_glyph) - middle_glyph = 'Oriscus' + middle_glyph = 'AscendensOriscus' middle_width = get_width(middle_glyph) elif i == 1 and (not deminutus or not glyph_exists('PesQuassusOneDeminutus')): first_glyph = 'Punctum' first_width = get_width(first_glyph) - middle_glyph = 'OriscusLineTR' + middle_glyph = 'AscendensOriscusLineTR' middle_width = get_width(middle_glyph)-get_width('line2') elif j == 1 and not deminutus: first_glyph = 'PunctumLineTR' first_width = get_width(first_glyph)-get_width('line2') - middle_glyph = 'OriscusLineBL' + middle_glyph = 'AscendensOriscusLineBL' middle_width = get_width(middle_glyph) elif (j == 1 and deminutus and glyph_exists('PesQuassusOneDeminutus') and glyph_exists('UpperPesQuassusOneDeminutus')): @@ -1281,7 +1374,7 @@ def draw_salicus(i, j, last_glyph, lique=L_NOTHING, qtype=None): else: first_glyph = 'PunctumLineTR' first_width = get_width(first_glyph)-get_width('line2') - middle_glyph = 'SalicusOriscus' + middle_glyph = 'AscendensOriscusLineBLTR' middle_width = get_width(middle_glyph)-get_width('line2') simple_paste(first_glyph) if i != 1: @@ -1382,29 +1475,50 @@ def flexus(): for i in range(1, MAX_INTERVAL+1): write_flexus(i, "PunctumLineBR", 'PunctumLineTL', S_FLEXUS_NOBAR) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "odbase", 'PunctumLineTL', S_FLEXUS_ORISCUS) + write_flexus(i, "DescendensOriscusLineBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS_INUSITATUS) for i in range(1, MAX_INTERVAL+1): write_flexus(i, "rvbase", 'PunctumLineTL', S_FLEXUS, qtype='short') for i in range(1, MAX_INTERVAL+1): write_flexus(i, "rvbase", 'PunctumLineTL', S_FLEXUS_LONGQUEUE, qtype='long') write_flexus(1, "rvbase", 'PunctumLineTL', S_FLEXUS_OPENQUEUE, qtype='open') for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "osbase", 'PunctumLineTL', - S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='short') + write_flexus(i, "DescendensOriscusLineBLBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS, + qtype='short') for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "osbase", 'PunctumLineTL', + write_flexus(i, "DescendensOriscusLineBLBR", 'PunctumLineTL', S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE, stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long') - write_flexus(1, "osbase", 'PunctumLineTL', S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE, + write_flexus(1, "DescendensOriscusLineBLBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE, + stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS, + stemshape=S_FLEXUS_ORISCUS_SCAPUS, + qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE, + stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long') + write_flexus(1, "AscendensOriscusLineBLBR", 'PunctumLineTL', + S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE, stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='open') precise_message("flexus deminutus") for i in range(1, MAX_INTERVAL+1): write_flexus(i, "mdeminutus", 'PunctumLineTL', S_FLEXUS_NOBAR, L_DEMINUTUS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "odbase", 'deminutus', + write_flexus(i, "DescendensOriscusLineBR", 'deminutus', S_FLEXUS_ORISCUS, L_DEMINUTUS) for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBR", 'deminutus', + S_FLEXUS_ORISCUS_INUSITATUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): write_flexus(i, "mdeminutus", 'PunctumLineTL', S_FLEXUS, L_DEMINUTUS, qtype='short') for i in range(1, MAX_INTERVAL+1): @@ -1417,9 +1531,12 @@ def flexus(): write_flexus(i, "PunctumLineBR", 'auctusa1', S_FLEXUS_NOBAR, L_ASCENDENS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "odbase", 'auctusa1', + write_flexus(i, "DescendensOriscusLineBR", 'auctusa1', S_FLEXUS_ORISCUS, L_ASCENDENS) for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBR", 'auctusa1', + S_FLEXUS_ORISCUS_INUSITATUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): write_flexus(i, "rvbase", 'auctusa1', S_FLEXUS, L_ASCENDENS, qtype='short') for i in range(1, MAX_INTERVAL+1): @@ -1428,24 +1545,40 @@ def flexus(): write_flexus(1, "rvbase", 'auctusa1', S_FLEXUS_OPENQUEUE, L_ASCENDENS, qtype='open') for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "osbase", + write_flexus(i, "DescendensOriscusLineBLBR", 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS, L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='short') for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "osbase", + write_flexus(i, "DescendensOriscusLineBLBR", 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE, L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='long') - write_flexus(1, "osbase", + write_flexus(1, "DescendensOriscusLineBLBR", 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE, L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", + 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS, + L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, + qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", + 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE, + L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, + qtype='long') + write_flexus(1, "AscendensOriscusLineBLBR", + 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE, + L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='open') precise_message("flexus auctus descendens") for i in range(1, MAX_INTERVAL+1): write_flexus(i, "PunctumLineBR", 'auctusd1', S_FLEXUS_NOBAR, L_DESCENDENS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "odbase", 'auctusd1', S_FLEXUS_ORISCUS, + write_flexus(i, "DescendensOriscusLineBR", 'auctusd1', S_FLEXUS_ORISCUS, L_DESCENDENS) for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBR", 'auctusd1', + S_FLEXUS_ORISCUS_INUSITATUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): write_flexus(i, "rvbase", 'auctusd1', S_FLEXUS, L_DESCENDENS, qtype='short') for i in range(1, MAX_INTERVAL+1): @@ -1454,19 +1587,33 @@ def flexus(): write_flexus(1, "rvbase", 'auctusd1', S_FLEXUS_OPENQUEUE, L_DESCENDENS, qtype='open') for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "osbase", + write_flexus(i, "DescendensOriscusLineBLBR", 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS, L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='short') for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "osbase", + write_flexus(i, "DescendensOriscusLineBLBR", 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE, L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long') - write_flexus(1, "osbase", + write_flexus(1, "DescendensOriscusLineBLBR", 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE, L_DESCENDENS, - S_FLEXUS_ORISCUS_SCAPUS, - stemshape=S_FLEXUS_ORISCUS_SCAPUS,qtype='open') + S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS, + qtype='open') + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", + 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS, + L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS, + stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='short') + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", + 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE, + L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS, + stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long') + write_flexus(1, "AscendensOriscusLineBLBR", + 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE, + L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS, + stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='open') def fusion_flexus(): "Creates the fusion flexus." @@ -1475,11 +1622,19 @@ def fusion_flexus(): for i in range(1, MAX_INTERVAL+1): write_flexus(i, "mademinutus", 'PunctumLineTL', S_LOWER_FLEXUS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "rvbase", 'PunctumLineTL', - S_UPPER_FLEXUS) + write_flexus(i, "rvbase", 'PunctumLineTL', S_UPPER_FLEXUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "DescendensOriscusLineBLBR", 'PunctumLineTL', + S_UPPER_FLEXUS_ORISCUS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "OriscusReversusLineTLBR", 'PunctumLineTL', + write_flexus(i, "DescendensOriscusLineTLBR", 'PunctumLineTL', S_LOWER_FLEXUS_ORISCUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", 'PunctumLineTL', + S_UPPER_FLEXUS_ORISCUS_INUSITATUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineTLBR", 'PunctumLineTL', + S_LOWER_FLEXUS_ORISCUS_INUSITATUS) precise_message("fusion flexus deminutus") for i in range(1, MAX_INTERVAL+1): write_flexus(i, "mademinutus", 'deminutus', S_LOWER_FLEXUS, @@ -1488,8 +1643,17 @@ def fusion_flexus(): write_flexus(i, "mdeminutus", 'deminutus', S_UPPER_FLEXUS, L_DEMINUTUS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "OriscusReversusLineTLBR", 'deminutus', + write_flexus(i, "DescendensOriscusLineBLBR", 'deminutus', + S_UPPER_FLEXUS_ORISCUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "DescendensOriscusLineTLBR", 'deminutus', S_LOWER_FLEXUS_ORISCUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", 'deminutus', + S_UPPER_FLEXUS_ORISCUS_INUSITATUS, L_DEMINUTUS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineTLBR", 'deminutus', + S_LOWER_FLEXUS_ORISCUS_INUSITATUS, L_DEMINUTUS) precise_message("fusion flexus auctus ascendens") for i in range(1, MAX_INTERVAL+1): write_flexus(i, "mademinutus", 'auctusa1', S_LOWER_FLEXUS, @@ -1498,8 +1662,17 @@ def fusion_flexus(): write_flexus(i, "rvbase", 'auctusa1', S_UPPER_FLEXUS, L_ASCENDENS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "OriscusReversusLineTLBR", 'auctusa1', + write_flexus(i, "DescendensOriscusLineBLBR", 'auctusa1', + S_UPPER_FLEXUS_ORISCUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "DescendensOriscusLineTLBR", 'auctusa1', S_LOWER_FLEXUS_ORISCUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", 'auctusa1', + S_UPPER_FLEXUS_ORISCUS_INUSITATUS, L_ASCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineTLBR", 'auctusa1', + S_LOWER_FLEXUS_ORISCUS_INUSITATUS, L_ASCENDENS) precise_message("fusion flexus auctus descendens") for i in range(1, MAX_INTERVAL+1): write_flexus(i, "mademinutus", 'auctusd1', S_LOWER_FLEXUS, @@ -1508,8 +1681,17 @@ def fusion_flexus(): write_flexus(i, "rvbase", 'auctusd1', S_UPPER_FLEXUS, L_DESCENDENS) for i in range(1, MAX_INTERVAL+1): - write_flexus(i, "OriscusReversusLineTLBR", 'auctusd1', + write_flexus(i, "DescendensOriscusLineBLBR", 'auctusd1', + S_UPPER_FLEXUS_ORISCUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "DescendensOriscusLineTLBR", 'auctusd1', S_LOWER_FLEXUS_ORISCUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineBLBR", 'auctusd1', + S_UPPER_FLEXUS_ORISCUS_INUSITATUS, L_DESCENDENS) + for i in range(1, MAX_INTERVAL+1): + write_flexus(i, "AscendensOriscusLineTLBR", 'auctusd1', + S_LOWER_FLEXUS_ORISCUS_INUSITATUS, L_DESCENDENS) def write_flexus(i, first_glyph, last_glyph, shape, lique=L_NOTHING, firstglyph_amone=None, lastglyph_amone=None, stemshape=S_FLEXUS, qtype=None): @@ -1541,7 +1723,7 @@ def write_flexus(i, first_glyph, last_glyph, shape, lique=L_NOTHING, else: if qtype: write_left_queue(i, qtype, stemshape, lique) - if i == 1 and first_glyph != 'OriscusReversusLineTLBR': + if i == 1 and first_glyph != 'DescendensOriscusLineTLBR': if last_glyph == 'PunctumLineTL': last_glyph = 'Punctum' elif last_glyph == 'auctusa1': @@ -1551,10 +1733,11 @@ def write_flexus(i, first_glyph, last_glyph, shape, lique=L_NOTHING, if first_glyph == 'PunctumLineBR': first_glyph = 'Punctum' - elif first_glyph == 'odbase': - first_glyph = 'OriscusReversus' - elif first_glyph == 'osbase': - first_glyph = 'OriscusLineBL' + elif 'OriscusLine' in first_glyph: + if first_glyph.endswith('LineBR'): + first_glyph = first_glyph[:-6] + else: + first_glyph = first_glyph[:-2] elif first_glyph == 'VirgaLineBR': first_glyph = 'VirgaReversa' elif first_glyph == 'rvbase': @@ -2300,7 +2483,7 @@ def leading(): for i in range(1, MAX_INTERVAL+1): write_leading(i, 'QuilismaLineTR', S_LEADING_QUILISMA) for i in range(1, MAX_INTERVAL+1): - write_leading(i, 'OriscusLineTR', S_LEADING_ORISCUS) + write_leading(i, 'AscendensOriscusLineTR', S_LEADING_ORISCUS) # lique has a slightly different meaning here def write_leading(i, first_glyph, glyph_type, lique=''): @@ -2316,8 +2499,8 @@ def write_leading(i, first_glyph, glyph_type, lique=''): first_glyph = 'Punctum' elif first_glyph == 'QuilismaLineTR': first_glyph = 'Quilisma' - elif first_glyph == 'OriscusLineTR': - first_glyph = 'Oriscus' + elif first_glyph == 'AscendensOriscusLineTR': + first_glyph = 'AscendensOriscus' length = get_width(first_glyph) + length paste_and_move(first_glyph, 0, -i * FONT_CONFIG['base height']) if i != 1: @@ -2341,35 +2524,86 @@ def fusion(): for i in range(1, MAX_INTERVAL+1): write_fusion_leading(i, 'QuilismaLineTR', S_QUILISMA, L_UP) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, 'OriscusLineTR', S_ORISCUS, L_UP) + write_fusion_leading(i, 'AscendensOriscusLineTR', S_ASCENDENS_ORISCUS, + L_UP) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, 'SalicusOriscus', S_UPPER_ORISCUS, + write_fusion_leading(i, 'DescendensOriscusLineTR', S_DESCENDENS_ORISCUS, L_UP) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, 'SalicusOriscus', - S_ORISCUS_SCAPUS, L_UP, qtype='short', - stemshape=S_FLEXUS_ORISCUS_SCAPUS) + write_fusion_leading(i, 'AscendensOriscusLineBLTR', + S_UPPER_ASCENDENS_ORISCUS, L_UP) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'DescendensOriscusLineBLTR', + S_UPPER_DESCENDENS_ORISCUS, L_UP) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'AscendensOriscusLineTLTR', + S_LOWER_ASCENDENS_ORISCUS, L_UP) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'DescendensOriscusLineTLTR', + S_LOWER_DESCENDENS_ORISCUS, L_UP) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, 'SalicusOriscus', - S_ORISCUS_SCAPUS_LONGQUEUE, L_UP, qtype='long', + write_fusion_leading(i, 'AscendensOriscusLineBLTR', + S_ASCENDENS_ORISCUS_SCAPUS, L_UP, qtype='short', stemshape=S_FLEXUS_ORISCUS_SCAPUS) - write_fusion_leading(1, 'SalicusOriscus', - S_ORISCUS_SCAPUS_OPENQUEUE, L_UP, qtype='open', - stemshape=S_FLEXUS_ORISCUS_SCAPUS) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, 'odbase', S_ORISCUS, L_DOWN) + write_fusion_leading(i, 'AscendensOriscusLineBLTR', + S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_UP, + qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS) + write_fusion_leading(1, 'AscendensOriscusLineBLTR', + S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_UP, + qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, "osbase", S_ORISCUS_SCAPUS, L_DOWN, - qtype='short', stemshape=S_FLEXUS_ORISCUS_SCAPUS) + write_fusion_leading(i, 'DescendensOriscusLineBLTR', + S_DESCENDENS_ORISCUS_SCAPUS, L_UP, qtype='short', + stemshape=S_FLEXUS_ORISCUS_SCAPUS) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, "osbase", S_ORISCUS_SCAPUS_LONGQUEUE, L_DOWN, + write_fusion_leading(i, 'DescendensOriscusLineBLTR', + S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_UP, qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS) - write_fusion_leading(1, "osbase", S_ORISCUS_SCAPUS_OPENQUEUE, L_DOWN, + write_fusion_leading(1, 'DescendensOriscusLineBLTR', + S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_UP, qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS) for i in range(1, MAX_INTERVAL+1): - write_fusion_leading(i, 'OriscusReversusLineTLBR', S_LOWER_ORISCUS, + write_fusion_leading(i, 'AscendensOriscusLineBR', S_ASCENDENS_ORISCUS, L_DOWN) for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'DescendensOriscusLineBR', S_DESCENDENS_ORISCUS, + L_DOWN) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'AscendensOriscusLineBLBR', + S_UPPER_ASCENDENS_ORISCUS, L_DOWN) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'DescendensOriscusLineBLBR', + S_UPPER_DESCENDENS_ORISCUS, L_DOWN) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'AscendensOriscusLineTLBR', + S_LOWER_ASCENDENS_ORISCUS, L_DOWN) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, 'DescendensOriscusLineTLBR', + S_LOWER_DESCENDENS_ORISCUS, L_DOWN) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, "AscendensOriscusLineBLBR", + S_ASCENDENS_ORISCUS_SCAPUS, L_DOWN, qtype='short', + stemshape=S_FLEXUS_ORISCUS_SCAPUS) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, "AscendensOriscusLineBLBR", + S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_DOWN, + qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS) + write_fusion_leading(1, "AscendensOriscusLineBLBR", + S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_DOWN, + qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, "DescendensOriscusLineBLBR", + S_DESCENDENS_ORISCUS_SCAPUS, L_DOWN, qtype='short', + stemshape=S_FLEXUS_ORISCUS_SCAPUS) + for i in range(1, MAX_INTERVAL+1): + write_fusion_leading(i, "DescendensOriscusLineBLBR", + S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_DOWN, + qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS) + write_fusion_leading(1, "DescendensOriscusLineBLBR", + S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_DOWN, + qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS) + for i in range(1, MAX_INTERVAL+1): write_fusion_leading(i, 'PunctumLineBR', S_PUNCTUM, L_DOWN) for i in range(1, MAX_INTERVAL+1): write_fusion_leading(i, 'PunctumLineBLBR', S_UPPER_PUNCTUM, @@ -2393,26 +2627,21 @@ def write_fusion_leading(i, first_glyph, glyph_type, lique, qtype = None, stemsh if copy_existing_glyph(glyph_name): return length = -get_width('line2') - if (i == 1 and first_glyph != 'idebilis' and first_glyph != 'odbase' - and first_glyph != 'OriscusReversusLineTLBR' - and first_glyph != 'osbase'): + if i == 1 and first_glyph != 'idebilis': length = 0.1 if first_glyph == 'PunctumLineTR' or first_glyph == 'PunctumLineBR': first_glyph = 'Punctum' elif first_glyph == 'QuilismaLineTR': first_glyph = 'Quilisma' - elif first_glyph == 'OriscusLineTR': - first_glyph = 'Oriscus' - elif first_glyph == 'OriscusScapusLineTR': - first_glyph = 'OriscusScapus' - elif first_glyph == 'OriscusScapusLongqueueLineTR': - first_glyph = 'OriscusScapusLongqueue' + elif 'Oriscus' in first_glyph and 'Line' in first_glyph: + if first_glyph.endswith('LineTR') or first_glyph.endswith('LineBR'): + first_glyph = first_glyph[:-6] + else: + first_glyph = first_glyph[:-2] elif first_glyph == 'msdeminutus' or first_glyph == 'PunctumLineBLBR': first_glyph = 'PunctumLineBL' elif first_glyph == 'mademinutus' or first_glyph == 'base6': first_glyph = 'PunctumLineTL' - elif first_glyph == 'SalicusOriscus': - first_glyph = 'OriscusLineBL' elif first_glyph == 'VirgaBaseLineBL': first_glyph = 'rvirgabase' length = get_width(first_glyph) + length |