From ae191d5e196a0e7e4b414356d525347b3f2874cf Mon Sep 17 00:00:00 2001 From: "Henry So, Jr." Date: Wed, 22 Nov 2017 20:30:52 -0500 Subject: [PATCH 1/2] Added support for dotted barlines. Fixes #1360. --- CHANGELOG.md | 1 + contrib/gabc.vim | 2 +- doc/Command_Index_User.tex | 8 + doc/Command_Index_gregorio.tex | 12 + doc/Command_Index_internal.tex | 4 + doc/GregorioRef.lua | 8 + fonts/granapadano-base.sfd | 642 +++++++++++++++++++------ fonts/greciliae-base.sfd | 704 +++++++++++++++++++++------- fonts/gregorio-base.sfd | 654 ++++++++++++++++++++------ fonts/squarize.py | 2 + src/gabc/gabc-notes-determination.l | 3 + src/gabc/gabc-write.c | 3 + src/gregoriotex/gregoriotex-write.c | 4 + src/struct.h | 5 +- tex/gregoriotex-signs.tex | 56 +++ 15 files changed, 1642 insertions(+), 466 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7953adee7..afd53cebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] - Added support for virgula (gabc: `` `0``) and divisio minima (gabc: `,0`) on the ledger line above the staff (see [#1370](https://github.com/gregorio-project/gregorio/issues/1370)). +- Added support for a dotted bar (gabc: `:?`) (see [#1360](https://github.com/gregorio-project/gregorio/issues/1360)). ## [Unreleased][unreleased] - Fixed issue with Tex Live 2017 latexmk not detecting auto-compiled gabc files as dependencies (see [#1367](https://github.com/gregorio-project/gregorio/issues/1367)). diff --git a/contrib/gabc.vim b/contrib/gabc.vim index db42ecdbd..e2a01e0c2 100644 --- a/contrib/gabc.vim +++ b/contrib/gabc.vim @@ -29,7 +29,7 @@ syn match gabcTextOrNoteMarkup "" contained syn match gabcTextCenter "[{}]" contained syn match gabcFuse "@" contained syn match gabcFuseEnd "\]" contained -syn match gabcBar ":" contained +syn match gabcBar ":?\?" contained syn match gabcBar ";[1-8]\?" contained syn match gabcBar ",[0-8]\?" contained syn match gabcBar "`0\?" contained diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex index 668589b14..a0402a18d 100644 --- a/doc/Command_Index_User.tex +++ b/doc/Command_Index_User.tex @@ -434,6 +434,14 @@ \subsubsection{Staff Lines} & \texttt{invisible} & The staff lines behind an alteration should not be printed (\LaTeX\ default) \end{argtable} +\macroname{\textbackslash gresetlinesbehinddottedbar}{\{\#1\}}{gregoriotex-signs.tex} +Macro for setting whether the staff lines behind a dotted bar should be shown or not. + +\begin{argtable} + \#1 & \texttt{visible} & The staff lines behind a dotted bar should be printed\\ + & \texttt{invisible} & The staff lines behind a dotted bar should not be printed (default) +\end{argtable} + \subsubsection{Score Font} Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Grana Padano (née Parmesan, developed for Lilypond by Juergen Reuter). diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex index 3984be530..e26b89d0a 100644 --- a/doc/Command_Index_gregorio.tex +++ b/doc/Command_Index_gregorio.tex @@ -260,6 +260,15 @@ \section{Gregorio Controls} \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\ \end{argtable} +\macroname{\textbackslash GreDivisioMaiorDotted}{\#1\#2}{gregoriotex-signs.tex} +Macro to typeset a dotted divisio maior. + +\begin{argtable} + \#1 & \texttt{0} & There is no text under the bar.\\ + & \texttt{1} & There is text under the bar.\\ + \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\ +\end{argtable} + \macroname{\textbackslash GreDivisioMinima}{\#1\#2\#3}{gregoriotex-signs.tex} Macro to typeset a divisio minima. @@ -602,6 +611,9 @@ \section{Gregorio Controls} \macroname{\textbackslash GreInDivisioMaior}{\#1\#2}{gregoriotex-signs.tex} Same as \verb=\GreDivisioMaior= except inside a syllable. +\macroname{\textbackslash GreInDivisioMaiorDotted}{\#1\#2}{gregoriotex-signs.tex} +Same as \verb=\GreDivisioMaiorDotted= except inside a syllable. + \macroname{\textbackslash GreInDivisioMinima}{\#1\#2\#3}{gregoriotex-signs.tex} Same as \verb=\GreDivisioMinima= except inside a syllable. diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex index d53786d0f..75732d627 100644 --- a/doc/Command_Index_internal.tex +++ b/doc/Command_Index_internal.tex @@ -840,6 +840,7 @@ \section{Gregorio\TeX{} Controls} & \texttt{6}--\texttt{13} & Dominican bars\\ & \texttt{14} & virgula on ledger line above the staff\\ & \texttt{15} & minima on ledger line above the staff\\ + & \texttt{16} & dotted major\\ \#2 & \texttt{0} & in a syllable containing only this bar\\ & \texttt{1} & in a syllable containing other notes\\ \#3 & \texttt{0} & if there is no text underneath the bar\\ @@ -1652,6 +1653,9 @@ \subsection{Flags} \macroname{\textbackslash ifgre@hidealtlines}{}{gregoriotex-signs.tex} Boolean used to specify whether the staff lines behind an alteration should be hidden. +\macroname{\textbackslash ifgre@hidedottedbarlines}{}{gregoriotex-signs.tex} +Boolean used to specify whether the staff lines behind a dotted bar should be hidden. + \macroname{\textbackslash ifgre@hepisemabridge}{}{gregoriotex-signs.tex} Boolean used to specify whether adjacent horizontal episemata should be joined together. diff --git a/doc/GregorioRef.lua b/doc/GregorioRef.lua index 2bfcbe4a4..32c80d0f6 100644 --- a/doc/GregorioRef.lua +++ b/doc/GregorioRef.lua @@ -133,6 +133,12 @@ local EXCLUDE = { ['DivisioMaior.2'] = true, ['DivisioMaior.3'] = true, ['DivisioMaior.5'] = true, + ['DivisioMaiorDotted.2'] = true, + ['DivisioMaiorDotted.3'] = true, + ['DivisioMaiorDotted.5'] = true, + ['DivisioMaiorDottedBacking.2'] = true, + ['DivisioMaiorDottedBacking.3'] = true, + ['DivisioMaiorDottedBacking.5'] = true, VirgaBaseLineBL = true, } @@ -178,6 +184,8 @@ local GABC = { DivisioDominican = [[,3]], DivisioDominicanAlt = [[,4]], DivisioMaior = [[:]], + DivisioMaiorDotted = [[:?]], + DivisioMaiorDottedBacking = [[\excluded{:?}]], DivisioMinima = [[,]], DivisioMinor = [[;]], FClefChange = [[f3]], diff --git a/fonts/granapadano-base.sfd b/fonts/granapadano-base.sfd index 11045b116..b0eb1f340 100644 --- a/fonts/granapadano-base.sfd +++ b/fonts/granapadano-base.sfd @@ -58,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: 199 199 +BeginChars: 207 207 StartChar: Accentus Encoding: 0 -1 0 @@ -1378,8 +1378,366 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima +StartChar: DivisioMaiorDotted Encoding: 58 -1 58 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +0 -429.001 m 29 + 19 -429 l 29 + 19 -468.997 l 29 + 0 -469.002 l 29 + 0 -429.001 l 29 +0 -349.001 m 25 + 19 -349 l 25 + 19 -388.997 l 25 + 0 -389.002 l 25 + 0 -349.001 l 25 +0 -269.001 m 25 + 19 -269 l 25 + 19 -308.997 l 25 + 0 -309.002 l 25 + 0 -269.001 l 25 +0 -189.001 m 25 + 19 -189 l 25 + 19 -228.997 l 25 + 0 -229.002 l 25 + 0 -189.001 l 25 +0 -109.001 m 25 + 19 -109 l 25 + 19 -148.997 l 25 + 0 -149.002 l 25 + 0 -109.001 l 25 +0 -29.001 m 25 + 19 -29 l 25 + 19 -68.9971 l 25 + 0 -69.002 l 25 + 0 -29.001 l 25 +0 50.999 m 25 + 19 51 l 25 + 19 11.0029 l 25 + 0 10.998 l 25 + 0 50.999 l 25 +0 130.999 m 25 + 19 131 l 25 + 19 91.0029 l 25 + 0 90.998 l 25 + 0 130.999 l 25 +0 210.999 m 25 + 19 211 l 25 + 19 171.003 l 25 + 0 170.998 l 25 + 0 210.999 l 25 +0 290.999 m 25 + 19 291 l 25 + 19 251.003 l 25 + 0 250.998 l 25 + 0 290.999 l 25 +0 370.999 m 25 + 19 371 l 25 + 19 331.003 l 25 + 0 330.998 l 25 + 0 370.999 l 25 +0 450.999 m 25 + 19 451 l 25 + 19 411.003 l 25 + 0 410.998 l 25 + 0 450.999 l 25 +0 530.999 m 25 + 19 531 l 25 + 19 491.003 l 25 + 0 490.998 l 25 + 0 530.999 l 25 +0 610.999 m 25 + 19 611 l 25 + 19 571.003 l 25 + 0 570.998 l 25 + 0 610.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.2 +Encoding: 59 -1 59 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> +LayerCount: 2 +Fore +SplineSet +0 -424.001 m 29 + 19 -424 l 29 + 19 -463.997 l 29 + 0 -464.002 l 29 + 0 -424.001 l 29 +0 -344.001 m 25 + 19 -344 l 25 + 19 -383.997 l 25 + 0 -384.002 l 25 + 0 -344.001 l 25 +0 -264.001 m 25 + 19 -264 l 25 + 19 -303.997 l 25 + 0 -304.002 l 25 + 0 -264.001 l 25 +0 -184.001 m 25 + 19 -184 l 25 + 19 -223.997 l 25 + 0 -224.002 l 25 + 0 -184.001 l 25 +0 -104.001 m 25 + 19 -104 l 25 + 19 -143.997 l 25 + 0 -144.002 l 25 + 0 -104.001 l 25 +0 -24.001 m 25 + 19 -24 l 25 + 19 -63.9971 l 25 + 0 -64.002 l 25 + 0 -24.001 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.3 +Encoding: 60 -1 60 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 235.999> +LayerCount: 2 +Fore +SplineSet +0 293.499 m 25 + 19 293.5 l 25 + 19 253.503 l 25 + 0 253.498 l 25 + 0 293.499 l 25 +0 213.499 m 25 + 19 213.5 l 25 + 19 173.503 l 25 + 0 173.498 l 25 + 0 213.499 l 25 +0 133.499 m 25 + 19 133.5 l 25 + 19 93.5029 l 25 + 0 93.498 l 25 + 0 133.499 l 25 +0 53.499 m 25 + 19 53.5 l 25 + 19 13.5029 l 25 + 0 13.498 l 25 + 0 53.499 l 25 +0 -26.501 m 25 + 19 -26.5 l 25 + 19 -66.4971 l 25 + 0 -66.502 l 25 + 0 -26.501 l 25 +0 -106.501 m 25 + 19 -106.5 l 25 + 19 -146.497 l 25 + 0 -146.502 l 25 + 0 -106.501 l 25 +0 -186.501 m 25 + 19 -186.5 l 25 + 19 -226.497 l 25 + 0 -226.502 l 25 + 0 -186.501 l 25 +0 -266.501 m 25 + 19 -266.5 l 25 + 19 -306.497 l 25 + 0 -306.502 l 25 + 0 -266.501 l 25 +0 -346.501 m 25 + 19 -346.5 l 25 + 19 -386.497 l 25 + 0 -386.502 l 25 + 0 -346.501 l 25 +0 -426.501 m 25 + 19 -426.5 l 25 + 19 -466.497 l 25 + 0 -466.502 l 25 + 0 -426.501 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.5 +Encoding: 61 -1 61 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 865.999> +LayerCount: 2 +Fore +SplineSet +0 928.499 m 25 + 19 928.5 l 25 + 19 888.503 l 25 + 0 888.498 l 25 + 0 928.499 l 25 +0 848.499 m 25 + 19 848.5 l 25 + 19 808.503 l 25 + 0 808.498 l 25 + 0 848.499 l 25 +0 768.499 m 25 + 19 768.5 l 25 + 19 728.503 l 25 + 0 728.498 l 25 + 0 768.499 l 25 +0 688.499 m 25 + 19 688.5 l 25 + 19 648.503 l 25 + 0 648.498 l 25 + 0 688.499 l 25 +0 608.499 m 25 + 19 608.5 l 25 + 19 568.503 l 25 + 0 568.498 l 25 + 0 608.499 l 25 +0 528.499 m 25 + 19 528.5 l 25 + 19 488.503 l 25 + 0 488.498 l 25 + 0 528.499 l 25 +0 448.499 m 25 + 19 448.5 l 25 + 19 408.503 l 25 + 0 408.498 l 25 + 0 448.499 l 25 +0 368.499 m 25 + 19 368.5 l 25 + 19 328.503 l 25 + 0 328.498 l 25 + 0 368.499 l 25 +0 288.499 m 25 + 19 288.5 l 25 + 19 248.503 l 25 + 0 248.498 l 25 + 0 288.499 l 25 +0 208.499 m 25 + 19 208.5 l 25 + 19 168.503 l 25 + 0 168.498 l 25 + 0 208.499 l 25 +0 128.499 m 25 + 19 128.5 l 25 + 19 88.5029 l 25 + 0 88.498 l 25 + 0 128.499 l 25 +0 48.499 m 25 + 19 48.5 l 25 + 19 8.50293 l 25 + 0 8.49805 l 25 + 0 48.499 l 25 +0 -31.501 m 25 + 19 -31.5 l 25 + 19 -71.4971 l 25 + 0 -71.502 l 25 + 0 -31.501 l 25 +0 -111.501 m 25 + 19 -111.5 l 25 + 19 -151.497 l 25 + 0 -151.502 l 25 + 0 -111.501 l 25 +0 -191.501 m 25 + 19 -191.5 l 25 + 19 -231.497 l 25 + 0 -231.502 l 25 + 0 -191.501 l 25 +0 -271.501 m 25 + 19 -271.5 l 25 + 19 -311.497 l 25 + 0 -311.502 l 25 + 0 -271.501 l 25 +0 -351.501 m 25 + 19 -351.5 l 25 + 19 -391.497 l 25 + 0 -391.502 l 25 + 0 -351.501 l 25 +0 -431.501 m 25 + 19 -431.5 l 25 + 19 -471.497 l 25 + 0 -471.502 l 25 + 0 -431.501 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking +Encoding: 62 -1 62 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +-30 630.999 m 25 + 49 631 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 630.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.2 +Encoding: 63 -1 63 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> +LayerCount: 2 +Fore +SplineSet +-30 0.999023 m 25 + 49 1 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 0.999023 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.3 +Encoding: 64 -1 64 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 235.999> +LayerCount: 2 +Fore +SplineSet +-30 315.999 m 25 + 49 316 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 315.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.5 +Encoding: 65 -1 65 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 865.999> +LayerCount: 2 +Fore +SplineSet +-30 945.999 m 25 + 49 946 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 945.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMinima +Encoding: 66 -1 66 AltUni2: 000050.ffffffff.0 Width: 19 VWidth: 2048 @@ -1398,7 +1756,7 @@ Validated: 1 EndChar StartChar: DivisioMinima.2 -Encoding: 59 -1 59 +Encoding: 67 -1 67 Width: 19 VWidth: 1418 Flags: HW @@ -1415,7 +1773,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.3 -Encoding: 60 -1 60 +Encoding: 68 -1 68 Width: 19 VWidth: 1733 Flags: HW @@ -1432,7 +1790,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.5 -Encoding: 61 -1 61 +Encoding: 69 -1 69 Width: 19 VWidth: 2363 Flags: HW @@ -1449,7 +1807,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.6 -Encoding: 62 -1 62 +Encoding: 70 -1 70 Width: 19 VWidth: 2678 Flags: HW @@ -1466,7 +1824,7 @@ EndSplineSet EndChar StartChar: DivisioMinor -Encoding: 63 -1 63 +Encoding: 71 -1 71 Width: 19 VWidth: 2048 Flags: HW @@ -1484,7 +1842,7 @@ Validated: 1 EndChar StartChar: DivisioMinor.2 -Encoding: 64 -1 64 +Encoding: 72 -1 72 Width: 19 VWidth: 2048 Flags: HW @@ -1501,7 +1859,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.3 -Encoding: 65 -1 65 +Encoding: 73 -1 73 Width: 19 VWidth: 2048 Flags: HW @@ -1518,7 +1876,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.5 -Encoding: 66 -1 66 +Encoding: 74 -1 74 Width: 19 VWidth: 2048 Flags: HW @@ -1535,7 +1893,7 @@ EndSplineSet EndChar StartChar: FClef -Encoding: 67 -1 67 +Encoding: 75 -1 75 Width: 299 VWidth: 1119 Flags: HW @@ -1576,7 +1934,7 @@ Validated: 33 EndChar StartChar: FClefChange -Encoding: 68 -1 68 +Encoding: 76 -1 76 Width: 299 VWidth: 1119 Flags: W @@ -1617,7 +1975,7 @@ Validated: 33 EndChar StartChar: Flat -Encoding: 69 -1 69 +Encoding: 77 -1 77 Width: 159 VWidth: 1120 Flags: HW @@ -1647,7 +2005,7 @@ Validated: 1 EndChar StartChar: FlatHole -Encoding: 70 -1 70 +Encoding: 78 -1 78 Width: 159 VWidth: 1120 Flags: HW @@ -1667,7 +2025,7 @@ Validated: 1 EndChar StartChar: hepisemaleft -Encoding: 71 -1 71 +Encoding: 79 -1 79 Width: 1 VWidth: 1968 Flags: HW @@ -1684,7 +2042,7 @@ EndSplineSet EndChar StartChar: hepisemaright -Encoding: 72 -1 72 +Encoding: 80 -1 80 Width: 2 VWidth: 1968 Flags: HW @@ -1701,7 +2059,7 @@ EndSplineSet EndChar StartChar: hepisema_base -Encoding: 73 -1 73 +Encoding: 81 -1 81 Width: 1 VWidth: 1972 Flags: HW @@ -1718,7 +2076,7 @@ EndSplineSet EndChar StartChar: idebilis -Encoding: 74 -1 74 +Encoding: 82 -1 82 Width: 97 VWidth: 2048 Flags: HW @@ -1741,7 +2099,7 @@ EndSplineSet EndChar StartChar: idebilis#Cavum -Encoding: 75 -1 75 +Encoding: 83 -1 83 Width: 97 VWidth: 2048 Flags: HW @@ -1762,7 +2120,7 @@ EndSplineSet EndChar StartChar: line2 -Encoding: 76 -1 76 +Encoding: 84 -1 84 Width: 22 VWidth: 2048 Flags: HW @@ -1780,7 +2138,7 @@ Validated: 1 EndChar StartChar: line3 -Encoding: 77 -1 77 +Encoding: 85 -1 85 Width: 22 VWidth: 2048 Flags: HW @@ -1798,7 +2156,7 @@ Validated: 1 EndChar StartChar: line4 -Encoding: 78 -1 78 +Encoding: 86 -1 86 Width: 22 VWidth: 2048 Flags: W @@ -1815,7 +2173,7 @@ EndSplineSet EndChar StartChar: line5 -Encoding: 79 -1 79 +Encoding: 87 -1 87 Width: 22 VWidth: 2048 Flags: HW @@ -1833,7 +2191,7 @@ Validated: 1 EndChar StartChar: Linea -Encoding: 80 -1 80 +Encoding: 88 -1 88 Width: 431 VWidth: 2612 Flags: W @@ -1861,7 +2219,7 @@ Validated: 1 EndChar StartChar: Linea#Cavum -Encoding: 81 -1 81 +Encoding: 89 -1 89 Width: 431 VWidth: 2612 Flags: HW @@ -1880,7 +2238,7 @@ EndSplineSet EndChar StartChar: LineaPunctum -Encoding: 82 -1 82 +Encoding: 90 -1 90 Width: 258 VWidth: 1139 Flags: HW @@ -1916,7 +2274,7 @@ Validated: 1 EndChar StartChar: LineaPunctum#Cavum -Encoding: 83 -1 83 +Encoding: 91 -1 91 Width: 258 VWidth: 1139 Flags: HW @@ -1937,7 +2295,7 @@ EndSplineSet EndChar StartChar: mademinutus -Encoding: 84 -1 84 +Encoding: 92 -1 92 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -1959,7 +2317,7 @@ EndSplineSet EndChar StartChar: mdeminutus -Encoding: 85 -1 85 +Encoding: 93 -1 93 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -1980,7 +2338,7 @@ Validated: 1 EndChar StartChar: mnbdeminutus -Encoding: 86 -1 86 +Encoding: 94 -1 94 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2001,7 +2359,7 @@ Validated: 1 EndChar StartChar: mnbpdeminutus -Encoding: 87 -1 87 +Encoding: 95 -1 95 Width: 161 Flags: HW HStem: 536.058 15 221.058 15 -93.9416 15 -408.942 15 @@ -2022,7 +2380,7 @@ Validated: 1 EndChar StartChar: mpdeminutus -Encoding: 88 -1 88 +Encoding: 96 -1 96 Width: 161 Flags: HW HStem: 536.497 15 221.497 15 -93.503 15 -408.503 15 @@ -2042,7 +2400,7 @@ EndSplineSet EndChar StartChar: mpdeminutus#Cavum -Encoding: 89 -1 89 +Encoding: 97 -1 97 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -2062,7 +2420,7 @@ EndSplineSet EndChar StartChar: msdeminutus -Encoding: 90 -1 90 +Encoding: 98 -1 98 Width: 161 Flags: HW HStem: 536.058 15 221.058 15 -93.9416 15 -408.942 15 @@ -2084,7 +2442,7 @@ EndSplineSet EndChar StartChar: Natural -Encoding: 91 -1 91 +Encoding: 99 -1 99 Width: 141 VWidth: 1129 Flags: HW @@ -2117,7 +2475,7 @@ Validated: 1 EndChar StartChar: NaturalHole -Encoding: 92 -1 92 +Encoding: 100 -1 100 Width: 141 VWidth: 1129 Flags: HW @@ -2135,7 +2493,7 @@ Validated: 1 EndChar StartChar: OriscusDeminutus -Encoding: 93 -1 93 +Encoding: 101 -1 101 Width: 192 Flags: HW HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1 @@ -2160,7 +2518,7 @@ Validated: 33 EndChar StartChar: OriscusDeminutus#Cavum -Encoding: 94 -1 94 +Encoding: 102 -1 102 Width: 192 Flags: HW LayerCount: 2 @@ -2181,7 +2539,7 @@ EndSplineSet EndChar StartChar: p2base -Encoding: 95 -1 95 +Encoding: 103 -1 103 Width: 161 Flags: W HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -2202,7 +2560,7 @@ Validated: 1 EndChar StartChar: p2base#Cavum -Encoding: 96 -1 96 +Encoding: 104 -1 104 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -2222,7 +2580,7 @@ EndSplineSet EndChar StartChar: pesdeminutus -Encoding: 97 -1 97 +Encoding: 105 -1 105 Width: 161 Flags: HW HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -2242,7 +2600,7 @@ EndSplineSet EndChar StartChar: pesdeminutus_op -Encoding: 98 -1 98 +Encoding: 106 -1 106 Width: 161 Flags: HW HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15 @@ -2265,7 +2623,7 @@ Validated: 1 EndChar StartChar: PesOneNothing -Encoding: 99 -1 99 +Encoding: 107 -1 107 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2293,7 +2651,7 @@ Validated: 1 EndChar StartChar: PesOneNothing#Cavum -Encoding: 100 -1 100 +Encoding: 108 -1 108 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -2322,7 +2680,7 @@ EndSplineSet EndChar StartChar: porrectus1 -Encoding: 101 -1 101 +Encoding: 109 -1 109 Width: 490 VWidth: 2048 Flags: HW @@ -2343,7 +2701,7 @@ EndSplineSet EndChar StartChar: porrectus1#Cavum -Encoding: 102 -1 102 +Encoding: 110 -1 110 Width: 490 VWidth: 2048 Flags: HW @@ -2362,7 +2720,7 @@ EndSplineSet EndChar StartChar: porrectus2 -Encoding: 103 -1 103 +Encoding: 111 -1 111 Width: 575 VWidth: 2048 Flags: HW @@ -2384,7 +2742,7 @@ Validated: 1 EndChar StartChar: porrectus2#Cavum -Encoding: 104 -1 104 +Encoding: 112 -1 112 Width: 575 VWidth: 2048 Flags: HW @@ -2403,7 +2761,7 @@ EndSplineSet EndChar StartChar: porrectus3 -Encoding: 105 -1 105 +Encoding: 113 -1 113 Width: 650 VWidth: 2048 Flags: HW @@ -2425,7 +2783,7 @@ Validated: 1 EndChar StartChar: porrectus3#Cavum -Encoding: 106 -1 106 +Encoding: 114 -1 114 Width: 650 VWidth: 2048 Flags: HW @@ -2444,7 +2802,7 @@ EndSplineSet EndChar StartChar: porrectus4 -Encoding: 107 -1 107 +Encoding: 115 -1 115 Width: 740 VWidth: 2048 Flags: HW @@ -2466,7 +2824,7 @@ Validated: 1 EndChar StartChar: porrectus4#Cavum -Encoding: 108 -1 108 +Encoding: 116 -1 116 Width: 740 VWidth: 2048 Flags: HW @@ -2485,7 +2843,7 @@ EndSplineSet EndChar StartChar: porrectus5 -Encoding: 109 -1 109 +Encoding: 117 -1 117 Width: 931 VWidth: 2048 Flags: HW @@ -2507,7 +2865,7 @@ Validated: 1 EndChar StartChar: porrectus5#Cavum -Encoding: 110 -1 110 +Encoding: 118 -1 118 Width: 931 VWidth: 2048 Flags: HW @@ -2526,7 +2884,7 @@ EndSplineSet EndChar StartChar: porrectusflexus1 -Encoding: 111 -1 111 +Encoding: 119 -1 119 Width: 340 VWidth: 2048 Flags: HW @@ -2548,7 +2906,7 @@ Validated: 1 EndChar StartChar: porrectusflexus1#Cavum -Encoding: 112 -1 112 +Encoding: 120 -1 120 Width: 340 VWidth: 2048 Flags: HW @@ -2567,7 +2925,7 @@ EndSplineSet EndChar StartChar: porrectusflexus2 -Encoding: 113 -1 113 +Encoding: 121 -1 121 Width: 428 VWidth: 2048 Flags: HW @@ -2589,7 +2947,7 @@ Validated: 1 EndChar StartChar: porrectusflexus2#Cavum -Encoding: 114 -1 114 +Encoding: 122 -1 122 Width: 428 VWidth: 2048 Flags: HW @@ -2608,7 +2966,7 @@ EndSplineSet EndChar StartChar: porrectusflexus3 -Encoding: 115 -1 115 +Encoding: 123 -1 123 Width: 586 VWidth: 2048 Flags: HW @@ -2630,7 +2988,7 @@ Validated: 1 EndChar StartChar: porrectusflexus3#Cavum -Encoding: 116 -1 116 +Encoding: 124 -1 124 Width: 586 VWidth: 2048 Flags: HW @@ -2649,7 +3007,7 @@ EndSplineSet EndChar StartChar: porrectusflexus4 -Encoding: 117 -1 117 +Encoding: 125 -1 125 Width: 670 VWidth: 2048 Flags: HW @@ -2671,7 +3029,7 @@ Validated: 1 EndChar StartChar: porrectusflexus4#Cavum -Encoding: 118 -1 118 +Encoding: 126 -1 126 Width: 670 VWidth: 2048 Flags: HW @@ -2690,7 +3048,7 @@ EndSplineSet EndChar StartChar: porrectusflexus5 -Encoding: 119 -1 119 +Encoding: 127 -1 127 Width: 931 VWidth: 2048 Flags: HW @@ -2712,7 +3070,7 @@ Validated: 1 EndChar StartChar: porrectusflexus5#Cavum -Encoding: 120 -1 120 +Encoding: 128 -1 128 Width: 931 VWidth: 2048 Flags: HW @@ -2731,7 +3089,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb1 -Encoding: 121 -1 121 +Encoding: 129 -1 129 Width: 340 VWidth: 2048 Flags: HW @@ -2751,7 +3109,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb1#Cavum -Encoding: 122 -1 122 +Encoding: 130 -1 130 Width: 340 VWidth: 2048 Flags: HW @@ -2770,7 +3128,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb2 -Encoding: 123 -1 123 +Encoding: 131 -1 131 Width: 428 VWidth: 2048 Flags: HW @@ -2791,7 +3149,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb2#Cavum -Encoding: 124 -1 124 +Encoding: 132 -1 132 Width: 428 VWidth: 2048 Flags: HW @@ -2810,7 +3168,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb3 -Encoding: 125 -1 125 +Encoding: 133 -1 133 Width: 586 VWidth: 2048 Flags: HW @@ -2831,7 +3189,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb3#Cavum -Encoding: 126 -1 126 +Encoding: 134 -1 134 Width: 586 VWidth: 2048 Flags: HW @@ -2850,7 +3208,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb4 -Encoding: 127 -1 127 +Encoding: 135 -1 135 Width: 670 VWidth: 2048 Flags: HW @@ -2871,7 +3229,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb4#Cavum -Encoding: 128 -1 128 +Encoding: 136 -1 136 Width: 670 VWidth: 2048 Flags: HW @@ -2890,7 +3248,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb5 -Encoding: 129 -1 129 +Encoding: 137 -1 137 Width: 931 VWidth: 2048 Flags: HW @@ -2911,7 +3269,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb5#Cavum -Encoding: 130 -1 130 +Encoding: 138 -1 138 Width: 931 VWidth: 2048 Flags: HW @@ -2930,7 +3288,7 @@ EndSplineSet EndChar StartChar: Punctum -Encoding: 131 -1 131 +Encoding: 139 -1 139 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -2950,7 +3308,7 @@ EndSplineSet EndChar StartChar: Punctum#Cavum -Encoding: 132 -1 132 +Encoding: 140 -1 140 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -2970,7 +3328,7 @@ EndSplineSet EndChar StartChar: PunctumAscendens -Encoding: 133 -1 133 +Encoding: 141 -1 141 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -2993,7 +3351,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens#Cavum -Encoding: 134 -1 134 +Encoding: 142 -1 142 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3013,7 +3371,7 @@ EndSplineSet EndChar StartChar: PunctumAscendens_op -Encoding: 135 -1 135 +Encoding: 143 -1 143 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3036,7 +3394,7 @@ Validated: 1 EndChar StartChar: PunctumAuctusLineBL -Encoding: 136 -1 136 +Encoding: 144 -1 144 Width: 141 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3060,7 +3418,7 @@ Validated: 33 EndChar StartChar: PunctumAuctusLineBL#Cavum -Encoding: 137 -1 137 +Encoding: 145 -1 145 Width: 141 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3080,7 +3438,7 @@ EndSplineSet EndChar StartChar: PunctumAuctusLineBL_op -Encoding: 138 -1 138 +Encoding: 146 -1 146 Width: 141 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3104,7 +3462,7 @@ Validated: 33 EndChar StartChar: PunctumDeminutus -Encoding: 139 -1 139 +Encoding: 147 -1 147 Width: 97 VWidth: 2048 Flags: HW @@ -3126,7 +3484,7 @@ Validated: 1 EndChar StartChar: PunctumDeminutus#Cavum -Encoding: 140 -1 140 +Encoding: 148 -1 148 Width: 97 VWidth: 2048 Flags: HW @@ -3147,7 +3505,7 @@ EndSplineSet EndChar StartChar: PunctumDescendens -Encoding: 141 -1 141 +Encoding: 149 -1 149 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3170,7 +3528,7 @@ Validated: 1 EndChar StartChar: PunctumDescendens#Cavum -Encoding: 142 -1 142 +Encoding: 150 -1 150 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3190,7 +3548,7 @@ EndSplineSet EndChar StartChar: PunctumDescendens_op -Encoding: 143 -1 143 +Encoding: 151 -1 151 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3214,7 +3572,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumAuctus -Encoding: 144 -1 144 +Encoding: 152 -1 152 Width: 178 Flags: HW HStem: -472.63 17.1 -113.53 17.1 245.57 17.1 604.67 17.1 @@ -3241,7 +3599,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus#Cavum -Encoding: 145 -1 145 +Encoding: 153 -1 153 Width: 178 Flags: HW HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1 @@ -3266,7 +3624,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumDeminutus -Encoding: 146 -1 146 +Encoding: 154 -1 154 Width: 112 VWidth: 1131 Flags: HW @@ -3292,7 +3650,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumDeminutus#Cavum -Encoding: 147 -1 147 +Encoding: 155 -1 155 Width: 112 VWidth: 1131 Flags: HW @@ -3317,7 +3675,7 @@ EndSplineSet EndChar StartChar: PunctumLineBL -Encoding: 148 -1 148 +Encoding: 156 -1 156 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3338,7 +3696,7 @@ Validated: 1 EndChar StartChar: PunctumLineBLBR -Encoding: 149 -1 149 +Encoding: 157 -1 157 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3359,7 +3717,7 @@ Validated: 1 EndChar StartChar: PunctumLineBR -Encoding: 150 -1 150 +Encoding: 158 -1 158 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3380,7 +3738,7 @@ Validated: 1 EndChar StartChar: PunctumLineTL -Encoding: 151 -1 151 +Encoding: 159 -1 159 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3402,7 +3760,7 @@ Validated: 1 EndChar StartChar: PunctumLineTLTR -Encoding: 152 -1 152 +Encoding: 160 -1 160 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3425,7 +3783,7 @@ Validated: 1 EndChar StartChar: PunctumLineTR -Encoding: 153 -1 153 +Encoding: 161 -1 161 Width: 161 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3447,7 +3805,7 @@ Validated: 1 EndChar StartChar: PunctumSmall -Encoding: 154 -1 154 +Encoding: 162 -1 162 Width: 151 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3468,7 +3826,7 @@ Validated: 1 EndChar StartChar: PunctumSmall#Cavum -Encoding: 155 -1 155 +Encoding: 163 -1 163 Width: 151 Flags: HW HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -3488,7 +3846,7 @@ EndSplineSet EndChar StartChar: queue -Encoding: 156 -1 156 +Encoding: 164 -1 164 Width: 22 VWidth: 2048 Flags: HW @@ -3505,7 +3863,7 @@ EndSplineSet EndChar StartChar: queuebase -Encoding: 157 -1 157 +Encoding: 165 -1 165 Width: 22 VWidth: 2048 Flags: HW @@ -3523,7 +3881,7 @@ EndSplineSet EndChar StartChar: Quilisma -Encoding: 158 -1 158 +Encoding: 166 -1 166 Width: 161 Flags: HW HStem: -477.6 17.1 -118.5 17.1 240.6 17.1 599.7 17.1 @@ -3558,7 +3916,7 @@ EndSplineSet EndChar StartChar: Quilisma#Cavum -Encoding: 159 -1 159 +Encoding: 167 -1 167 Width: 161 Flags: HW HStem: -477.6 17.1 -118.5 17.1 240.6 17.1 599.7 17.1 @@ -3593,7 +3951,7 @@ EndSplineSet EndChar StartChar: QuilismaLineTR -Encoding: 160 -1 160 +Encoding: 168 -1 168 Width: 161 Flags: HW HStem: -477.6 17.1 -118.5 17.1 240.6 17.1 599.7 17.1 @@ -3629,7 +3987,7 @@ Validated: 33 EndChar StartChar: QuilismaPesOneNothing -Encoding: 161 -1 161 +Encoding: 169 -1 169 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3671,7 +4029,7 @@ Validated: 1 EndChar StartChar: QuilismaPesOneNothing#Cavum -Encoding: 162 -1 162 +Encoding: 170 -1 170 Width: 161 Flags: HW HStem: -477.6 17.1 -118.5 17.1 240.6 17.1 599.7 17.1 @@ -3715,7 +4073,7 @@ EndSplineSet EndChar StartChar: rdeminutus -Encoding: 163 -1 163 +Encoding: 171 -1 171 Width: 97 VWidth: 2048 Flags: HW @@ -3738,7 +4096,7 @@ Validated: 1 EndChar StartChar: rdeminutus#Cavum -Encoding: 164 -1 164 +Encoding: 172 -1 172 Width: 97 VWidth: 2048 Flags: HW @@ -3759,7 +4117,7 @@ EndSplineSet EndChar StartChar: RoundBrace -Encoding: 165 -1 165 +Encoding: 173 -1 173 Width: 937 VWidth: 2048 Flags: W @@ -3785,7 +4143,7 @@ Validated: 1 EndChar StartChar: RoundBraceDown -Encoding: 166 -1 166 +Encoding: 174 -1 174 Width: 937 Flags: HW LayerCount: 2 @@ -3809,7 +4167,7 @@ Validated: 1 EndChar StartChar: rqueue -Encoding: 167 -1 167 +Encoding: 175 -1 175 Width: 22 VWidth: 2048 Flags: HW @@ -3826,7 +4184,7 @@ EndSplineSet EndChar StartChar: rvbase -Encoding: 168 -1 168 +Encoding: 176 -1 176 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3848,7 +4206,7 @@ EndSplineSet EndChar StartChar: rvirgabase -Encoding: 169 -1 169 +Encoding: 177 -1 177 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -3869,7 +4227,7 @@ EndSplineSet EndChar StartChar: Semicirculus -Encoding: 170 -1 170 +Encoding: 178 -1 178 Width: 124 VWidth: 1606 Flags: HW @@ -3889,7 +4247,7 @@ Validated: 1 EndChar StartChar: SemicirculusReversus -Encoding: 171 -1 171 +Encoding: 179 -1 179 Width: 125 VWidth: 1583 Flags: HW @@ -3909,7 +4267,7 @@ Validated: 1 EndChar StartChar: Sharp -Encoding: 172 -1 172 +Encoding: 180 -1 180 Width: 258 VWidth: 2048 Flags: W @@ -3972,7 +4330,7 @@ Validated: 1 EndChar StartChar: SharpHole -Encoding: 173 -1 173 +Encoding: 181 -1 181 Width: 258 VWidth: 2048 Flags: W @@ -3990,7 +4348,7 @@ Validated: 1 EndChar StartChar: Stropha -Encoding: 174 -1 174 +Encoding: 182 -1 182 Width: 169 Flags: HW HStem: -466.26 17.1 -107.16 17.1 251.94 17.1 611.04 17.1 @@ -4020,7 +4378,7 @@ EndSplineSet EndChar StartChar: Stropha#Cavum -Encoding: 175 -1 175 +Encoding: 183 -1 183 Width: 169 Flags: HW HStem: -466.26 17.1 -107.16 17.1 251.94 17.1 611.04 17.1 @@ -4046,7 +4404,7 @@ EndSplineSet EndChar StartChar: StrophaAucta -Encoding: 176 -1 176 +Encoding: 184 -1 184 Width: 168 Flags: HW HStem: -472.609 17.1 -113.509 17.1 245.591 17.1 604.691 17.1 @@ -4071,7 +4429,7 @@ Validated: 33 EndChar StartChar: StrophaAucta#Cavum -Encoding: 177 -1 177 +Encoding: 185 -1 185 Width: 168 Flags: HW HStem: -466.26 17.1 -107.16 17.1 251.94 17.1 611.04 17.1 @@ -4097,7 +4455,7 @@ EndSplineSet EndChar StartChar: StrophaAuctaLongtail -Encoding: 178 -1 178 +Encoding: 186 -1 186 Width: 168 Flags: HW HStem: -472.609 17.1 -113.509 17.1 245.591 17.1 604.691 17.1 @@ -4121,7 +4479,7 @@ EndSplineSet EndChar StartChar: tmpglyph -Encoding: 179 -1 179 +Encoding: 187 -1 187 Width: 22 VWidth: 2048 Flags: HW @@ -4131,7 +4489,7 @@ LayerCount: 2 EndChar StartChar: UpperPesOneNothing -Encoding: 180 -1 180 +Encoding: 188 -1 188 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -4160,7 +4518,7 @@ EndSplineSet EndChar StartChar: UpperPesOneNothing#Cavum -Encoding: 181 -1 181 +Encoding: 189 -1 189 Width: 161 Flags: W HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -4189,7 +4547,7 @@ EndSplineSet EndChar StartChar: VEpisema -Encoding: 182 -1 182 +Encoding: 190 -1 190 Width: 36 VWidth: 1384 Flags: HW @@ -4209,7 +4567,7 @@ Validated: 1 EndChar StartChar: VEpisema.circumflexus -Encoding: 183 -1 183 +Encoding: 191 -1 191 Width: 108 VWidth: 2048 Flags: HW @@ -4233,7 +4591,7 @@ Validated: 1 EndChar StartChar: virgabase -Encoding: 184 -1 184 +Encoding: 192 -1 192 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -4254,7 +4612,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL -Encoding: 185 -1 185 +Encoding: 193 -1 193 Width: 161 Flags: W HStem: -409 15 -94 15 221 15 536 15 @@ -4276,7 +4634,7 @@ EndSplineSet EndChar StartChar: VirgaReversaAscendens_op -Encoding: 186 -1 186 +Encoding: 194 -1 194 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -4299,7 +4657,7 @@ Validated: 1 EndChar StartChar: VirgaReversaAscendens_op#Cavum -Encoding: 187 -1 187 +Encoding: 195 -1 195 Width: 161 Flags: W HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -4319,7 +4677,7 @@ EndSplineSet EndChar StartChar: VirgaReversaDescendens_op -Encoding: 188 -1 188 +Encoding: 196 -1 196 Width: 161 Flags: HW HStem: -409 15 -94 15 221 15 536 15 @@ -4342,7 +4700,7 @@ Validated: 1 EndChar StartChar: VirgaReversaDescendens_op#Cavum -Encoding: 189 -1 189 +Encoding: 197 -1 197 Width: 161 Flags: W HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1 @@ -4362,7 +4720,7 @@ EndSplineSet EndChar StartChar: VirgaReversaLongqueueAscendens_op -Encoding: 190 -1 190 +Encoding: 198 -1 198 Width: 161 Flags: W HStem: -409 15 -94 15 221 15 536 15 @@ -4384,7 +4742,7 @@ EndSplineSet EndChar StartChar: VirgaReversaLongqueueDescendens_op -Encoding: 191 -1 191 +Encoding: 199 -1 199 Width: 161 Flags: W HStem: -409 15 -94 15 221 15 536 15 @@ -4406,7 +4764,7 @@ EndSplineSet EndChar StartChar: VirgaReversaOpenqueueAscendens_op -Encoding: 192 -1 192 +Encoding: 200 -1 200 Width: 161 Flags: W HStem: -409 15 -94 15 221 15 536 15 @@ -4428,7 +4786,7 @@ EndSplineSet EndChar StartChar: VirgaReversaOpenqueueDescendens_op -Encoding: 193 -1 193 +Encoding: 201 -1 201 Width: 161 Flags: W HStem: -409 15 -94 15 221 15 536 15 @@ -4450,7 +4808,7 @@ EndSplineSet EndChar StartChar: Virgula -Encoding: 194 -1 194 +Encoding: 202 -1 202 Width: 152 VWidth: 2048 Flags: HW @@ -4469,7 +4827,7 @@ Validated: 33 EndChar StartChar: Virgula.2 -Encoding: 195 -1 195 +Encoding: 203 -1 203 Width: 152 VWidth: 1418 Flags: HW @@ -4487,7 +4845,7 @@ EndSplineSet EndChar StartChar: Virgula.3 -Encoding: 196 -1 196 +Encoding: 204 -1 204 Width: 152 VWidth: 1733 Flags: HW @@ -4505,7 +4863,7 @@ EndSplineSet EndChar StartChar: Virgula.5 -Encoding: 197 -1 197 +Encoding: 205 -1 205 Width: 152 VWidth: 2363 Flags: HW @@ -4523,7 +4881,7 @@ EndSplineSet EndChar StartChar: Virgula.6 -Encoding: 198 -1 198 +Encoding: 206 -1 206 Width: 152 VWidth: 2678 Flags: HW diff --git a/fonts/greciliae-base.sfd b/fonts/greciliae-base.sfd index 4349fcbcb..5ee1db6c8 100644 --- a/fonts/greciliae-base.sfd +++ b/fonts/greciliae-base.sfd @@ -20,7 +20,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1176402534 -ModificationTime: 1502068446 +ModificationTime: 1511381860 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -43,7 +43,7 @@ NameList: Adobe Glyph List DisplaySize: -96 AntiAlias: 1 FitToEm: 0 -WinInfo: 192 16 4 +WinInfo: 39 13 6 BeginPrivate: 0 EndPrivate Grid @@ -73,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: 249 249 +BeginChars: 257 257 StartChar: Accentus Encoding: 0 -1 0 @@ -1839,8 +1839,366 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima +StartChar: DivisioMaiorDotted Encoding: 79 -1 79 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +0 -429.001 m 29 + 19 -429 l 29 + 19 -468.997 l 29 + 0 -469.002 l 29 + 0 -429.001 l 29 +0 -349.001 m 25 + 19 -349 l 25 + 19 -388.997 l 25 + 0 -389.002 l 25 + 0 -349.001 l 25 +0 -269.001 m 25 + 19 -269 l 25 + 19 -308.997 l 25 + 0 -309.002 l 25 + 0 -269.001 l 25 +0 -189.001 m 25 + 19 -189 l 25 + 19 -228.997 l 25 + 0 -229.002 l 25 + 0 -189.001 l 25 +0 -109.001 m 25 + 19 -109 l 25 + 19 -148.997 l 25 + 0 -149.002 l 25 + 0 -109.001 l 25 +0 -29.001 m 25 + 19 -29 l 25 + 19 -68.9971 l 25 + 0 -69.002 l 25 + 0 -29.001 l 25 +0 50.999 m 25 + 19 51 l 25 + 19 11.0029 l 25 + 0 10.998 l 25 + 0 50.999 l 25 +0 130.999 m 25 + 19 131 l 25 + 19 91.0029 l 25 + 0 90.998 l 25 + 0 130.999 l 25 +0 210.999 m 25 + 19 211 l 25 + 19 171.003 l 25 + 0 170.998 l 25 + 0 210.999 l 25 +0 290.999 m 25 + 19 291 l 25 + 19 251.003 l 25 + 0 250.998 l 25 + 0 290.999 l 25 +0 370.999 m 25 + 19 371 l 25 + 19 331.003 l 25 + 0 330.998 l 25 + 0 370.999 l 25 +0 450.999 m 25 + 19 451 l 25 + 19 411.003 l 25 + 0 410.998 l 25 + 0 450.999 l 25 +0 530.999 m 25 + 19 531 l 25 + 19 491.003 l 25 + 0 490.998 l 25 + 0 530.999 l 25 +0 610.999 m 25 + 19 611 l 25 + 19 571.003 l 25 + 0 570.998 l 25 + 0 610.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.2 +Encoding: 80 -1 80 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> +LayerCount: 2 +Fore +SplineSet +0 -424.001 m 29 + 19 -424 l 29 + 19 -463.997 l 29 + 0 -464.002 l 29 + 0 -424.001 l 29 +0 -344.001 m 25 + 19 -344 l 25 + 19 -383.997 l 25 + 0 -384.002 l 25 + 0 -344.001 l 25 +0 -264.001 m 25 + 19 -264 l 25 + 19 -303.997 l 25 + 0 -304.002 l 25 + 0 -264.001 l 25 +0 -184.001 m 25 + 19 -184 l 25 + 19 -223.997 l 25 + 0 -224.002 l 25 + 0 -184.001 l 25 +0 -104.001 m 25 + 19 -104 l 25 + 19 -143.997 l 25 + 0 -144.002 l 25 + 0 -104.001 l 25 +0 -24.001 m 25 + 19 -24 l 25 + 19 -63.9971 l 25 + 0 -64.002 l 25 + 0 -24.001 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.3 +Encoding: 81 -1 81 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 235.999> +LayerCount: 2 +Fore +SplineSet +0 293.499 m 25 + 19 293.5 l 25 + 19 253.503 l 25 + 0 253.498 l 25 + 0 293.499 l 25 +0 213.499 m 25 + 19 213.5 l 25 + 19 173.503 l 25 + 0 173.498 l 25 + 0 213.499 l 25 +0 133.499 m 25 + 19 133.5 l 25 + 19 93.5029 l 25 + 0 93.498 l 25 + 0 133.499 l 25 +0 53.499 m 25 + 19 53.5 l 25 + 19 13.5029 l 25 + 0 13.498 l 25 + 0 53.499 l 25 +0 -26.501 m 25 + 19 -26.5 l 25 + 19 -66.4971 l 25 + 0 -66.502 l 25 + 0 -26.501 l 25 +0 -106.501 m 25 + 19 -106.5 l 25 + 19 -146.497 l 25 + 0 -146.502 l 25 + 0 -106.501 l 25 +0 -186.501 m 25 + 19 -186.5 l 25 + 19 -226.497 l 25 + 0 -226.502 l 25 + 0 -186.501 l 25 +0 -266.501 m 25 + 19 -266.5 l 25 + 19 -306.497 l 25 + 0 -306.502 l 25 + 0 -266.501 l 25 +0 -346.501 m 25 + 19 -346.5 l 25 + 19 -386.497 l 25 + 0 -386.502 l 25 + 0 -346.501 l 25 +0 -426.501 m 25 + 19 -426.5 l 25 + 19 -466.497 l 25 + 0 -466.502 l 25 + 0 -426.501 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.5 +Encoding: 82 -1 82 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 865.999> +LayerCount: 2 +Fore +SplineSet +0 928.499 m 25 + 19 928.5 l 25 + 19 888.503 l 25 + 0 888.498 l 25 + 0 928.499 l 25 +0 848.499 m 25 + 19 848.5 l 25 + 19 808.503 l 25 + 0 808.498 l 25 + 0 848.499 l 25 +0 768.499 m 25 + 19 768.5 l 25 + 19 728.503 l 25 + 0 728.498 l 25 + 0 768.499 l 25 +0 688.499 m 25 + 19 688.5 l 25 + 19 648.503 l 25 + 0 648.498 l 25 + 0 688.499 l 25 +0 608.499 m 25 + 19 608.5 l 25 + 19 568.503 l 25 + 0 568.498 l 25 + 0 608.499 l 25 +0 528.499 m 25 + 19 528.5 l 25 + 19 488.503 l 25 + 0 488.498 l 25 + 0 528.499 l 25 +0 448.499 m 25 + 19 448.5 l 25 + 19 408.503 l 25 + 0 408.498 l 25 + 0 448.499 l 25 +0 368.499 m 25 + 19 368.5 l 25 + 19 328.503 l 25 + 0 328.498 l 25 + 0 368.499 l 25 +0 288.499 m 25 + 19 288.5 l 25 + 19 248.503 l 25 + 0 248.498 l 25 + 0 288.499 l 25 +0 208.499 m 25 + 19 208.5 l 25 + 19 168.503 l 25 + 0 168.498 l 25 + 0 208.499 l 25 +0 128.499 m 25 + 19 128.5 l 25 + 19 88.5029 l 25 + 0 88.498 l 25 + 0 128.499 l 25 +0 48.499 m 25 + 19 48.5 l 25 + 19 8.50293 l 25 + 0 8.49805 l 25 + 0 48.499 l 25 +0 -31.501 m 25 + 19 -31.5 l 25 + 19 -71.4971 l 25 + 0 -71.502 l 25 + 0 -31.501 l 25 +0 -111.501 m 25 + 19 -111.5 l 25 + 19 -151.497 l 25 + 0 -151.502 l 25 + 0 -111.501 l 25 +0 -191.501 m 25 + 19 -191.5 l 25 + 19 -231.497 l 25 + 0 -231.502 l 25 + 0 -191.501 l 25 +0 -271.501 m 25 + 19 -271.5 l 25 + 19 -311.497 l 25 + 0 -311.502 l 25 + 0 -271.501 l 25 +0 -351.501 m 25 + 19 -351.5 l 25 + 19 -391.497 l 25 + 0 -391.502 l 25 + 0 -351.501 l 25 +0 -431.501 m 25 + 19 -431.5 l 25 + 19 -471.497 l 25 + 0 -471.502 l 25 + 0 -431.501 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking +Encoding: 83 -1 83 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +-30 630.999 m 25 + 49 631 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 630.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.2 +Encoding: 84 -1 84 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> +LayerCount: 2 +Fore +SplineSet +-30 0.999023 m 25 + 49 1 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 0.999023 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.3 +Encoding: 85 -1 85 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 235.999> +LayerCount: 2 +Fore +SplineSet +-30 315.999 m 25 + 49 316 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 315.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.5 +Encoding: 86 -1 86 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 865.999> +LayerCount: 2 +Fore +SplineSet +-30 945.999 m 25 + 49 946 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 945.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMinima +Encoding: 87 -1 87 AltUni2: 000050.ffffffff.0 Width: 19 VWidth: 2048 @@ -1860,7 +2218,7 @@ Validated: 1 EndChar StartChar: DivisioMinima.2 -Encoding: 80 -1 80 +Encoding: 88 -1 88 Width: 19 VWidth: 1418 Flags: HW @@ -1878,7 +2236,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.3 -Encoding: 81 -1 81 +Encoding: 89 -1 89 Width: 19 VWidth: 1733 Flags: HW @@ -1896,7 +2254,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.5 -Encoding: 82 -1 82 +Encoding: 90 -1 90 Width: 19 VWidth: 2363 Flags: HW @@ -1914,7 +2272,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.6 -Encoding: 83 -1 83 +Encoding: 91 -1 91 Width: 19 VWidth: 2678 Flags: HW @@ -1932,7 +2290,7 @@ EndSplineSet EndChar StartChar: DivisioMinor -Encoding: 84 -1 84 +Encoding: 92 -1 92 Width: 19 VWidth: 2048 Flags: W @@ -1950,7 +2308,7 @@ Validated: 1 EndChar StartChar: DivisioMinor.2 -Encoding: 85 -1 85 +Encoding: 93 -1 93 Width: 19 VWidth: 2048 Flags: W @@ -1968,7 +2326,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.3 -Encoding: 86 -1 86 +Encoding: 94 -1 94 Width: 19 VWidth: 2048 Flags: W @@ -1986,7 +2344,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.5 -Encoding: 87 -1 87 +Encoding: 95 -1 95 Width: 19 VWidth: 2048 Flags: W @@ -2003,7 +2361,7 @@ EndSplineSet EndChar StartChar: FClef -Encoding: 88 -1 88 +Encoding: 96 -1 96 Width: 322 VWidth: 2503 Flags: W @@ -2041,7 +2399,7 @@ Validated: 33 EndChar StartChar: FClefChange -Encoding: 89 -1 89 +Encoding: 97 -1 97 Width: 322 VWidth: 2503 Flags: W @@ -2079,7 +2437,7 @@ Validated: 33 EndChar StartChar: Flat -Encoding: 90 -1 90 +Encoding: 98 -1 98 Width: 162 VWidth: 2587 Flags: W @@ -2107,7 +2465,7 @@ Validated: 1 EndChar StartChar: FlatHole -Encoding: 91 -1 91 +Encoding: 99 -1 99 Width: 162 VWidth: 2587 Flags: W @@ -2128,7 +2486,7 @@ Validated: 1 EndChar StartChar: hepisemaleft -Encoding: 92 -1 92 +Encoding: 100 -1 100 Width: 1 VWidth: 2044 Flags: HW @@ -2146,7 +2504,7 @@ EndSplineSet EndChar StartChar: hepisemaright -Encoding: 93 -1 93 +Encoding: 101 -1 101 Width: 2 VWidth: 2044 Flags: HW @@ -2164,7 +2522,7 @@ EndSplineSet EndChar StartChar: hepisema_base -Encoding: 94 -1 94 +Encoding: 102 -1 102 Width: 1 VWidth: 2044 Flags: HW @@ -2182,7 +2540,7 @@ EndSplineSet EndChar StartChar: idebilis -Encoding: 95 -1 95 +Encoding: 103 -1 103 Width: 83 VWidth: 2605 Flags: W @@ -2205,7 +2563,7 @@ Validated: 33 EndChar StartChar: idebilis#Cavum -Encoding: 96 -1 96 +Encoding: 104 -1 104 Width: 83 VWidth: 2605 Flags: HW @@ -2225,7 +2583,7 @@ EndSplineSet EndChar StartChar: line2 -Encoding: 97 -1 97 +Encoding: 105 -1 105 Width: 18 VWidth: 2048 Flags: HW @@ -2243,7 +2601,7 @@ EndSplineSet EndChar StartChar: line3 -Encoding: 98 -1 98 +Encoding: 106 -1 106 Width: 18 VWidth: 2048 Flags: HW @@ -2261,7 +2619,7 @@ EndSplineSet EndChar StartChar: line4 -Encoding: 99 -1 99 +Encoding: 107 -1 107 Width: 18 VWidth: 2048 Flags: HW @@ -2278,7 +2636,7 @@ EndSplineSet EndChar StartChar: line5 -Encoding: 100 -1 100 +Encoding: 108 -1 108 Width: 18 VWidth: 2048 Flags: HW @@ -2295,7 +2653,7 @@ EndSplineSet EndChar StartChar: Linea -Encoding: 101 -1 101 +Encoding: 109 -1 109 Width: 431 VWidth: 2612 Flags: W @@ -2324,7 +2682,7 @@ Validated: 1 EndChar StartChar: Linea#Cavum -Encoding: 102 -1 102 +Encoding: 110 -1 110 Width: 431 VWidth: 2612 Flags: HW @@ -2344,7 +2702,7 @@ EndSplineSet EndChar StartChar: LineaPunctum -Encoding: 103 -1 103 +Encoding: 111 -1 111 Width: 266 VWidth: 2048 Flags: W @@ -2379,7 +2737,7 @@ Validated: 1 EndChar StartChar: LineaPunctum#Cavum -Encoding: 104 -1 104 +Encoding: 112 -1 112 Width: 266 VWidth: 2048 Flags: W @@ -2400,7 +2758,7 @@ Validated: 33 EndChar StartChar: LineaPunctum#Cavum.caeciliae -Encoding: 105 -1 105 +Encoding: 113 -1 113 Width: 266 VWidth: 2048 Flags: W @@ -2418,7 +2776,7 @@ Validated: 1 EndChar StartChar: mademinutus -Encoding: 106 -1 106 +Encoding: 114 -1 114 Width: 168 VWidth: 2048 Flags: W @@ -2444,7 +2802,7 @@ EndSplineSet EndChar StartChar: mademinutus#Cavum -Encoding: 107 -1 107 +Encoding: 115 -1 115 Width: 168 VWidth: 2048 Flags: W @@ -2466,7 +2824,7 @@ EndSplineSet EndChar StartChar: mdeminutus -Encoding: 108 -1 108 +Encoding: 116 -1 116 Width: 168 VWidth: 2048 Flags: HW @@ -2491,7 +2849,7 @@ EndSplineSet EndChar StartChar: mdeminutus#Cavum -Encoding: 109 -1 109 +Encoding: 117 -1 117 Width: 168 VWidth: 2048 Flags: HW @@ -2512,7 +2870,7 @@ EndSplineSet EndChar StartChar: mnbdeminutus -Encoding: 110 -1 110 +Encoding: 118 -1 118 Width: 168 VWidth: 2048 Flags: HW @@ -2536,7 +2894,7 @@ EndSplineSet EndChar StartChar: mnbdeminutus#Cavum -Encoding: 111 -1 111 +Encoding: 119 -1 119 Width: 168 VWidth: 2048 Flags: HW @@ -2558,7 +2916,7 @@ EndSplineSet EndChar StartChar: mnbpdeminutus -Encoding: 112 -1 112 +Encoding: 120 -1 120 Width: 168 VWidth: 2048 Flags: W @@ -2582,7 +2940,7 @@ Validated: 33 EndChar StartChar: mnbpdeminutus#Cavum -Encoding: 113 -1 113 +Encoding: 121 -1 121 Width: 168 VWidth: 2048 Flags: HW @@ -2603,7 +2961,7 @@ EndSplineSet EndChar StartChar: mpdeminutus -Encoding: 114 -1 114 +Encoding: 122 -1 122 Width: 168 VWidth: 2048 Flags: HW @@ -2628,7 +2986,7 @@ EndSplineSet EndChar StartChar: mpdeminutus#Cavum -Encoding: 115 -1 115 +Encoding: 123 -1 123 Width: 168 VWidth: 2048 Flags: HW @@ -2649,7 +3007,7 @@ EndSplineSet EndChar StartChar: msdeminutus -Encoding: 116 -1 116 +Encoding: 124 -1 124 Width: 168 VWidth: 2048 Flags: W @@ -2675,7 +3033,7 @@ Validated: 1 EndChar StartChar: msdeminutus#Cavum -Encoding: 117 -1 117 +Encoding: 125 -1 125 Width: 168 VWidth: 2048 Flags: HW @@ -2696,7 +3054,7 @@ EndSplineSet EndChar StartChar: Natural -Encoding: 118 -1 118 +Encoding: 126 -1 126 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> @@ -2732,7 +3090,7 @@ Validated: 1 EndChar StartChar: NaturalHole -Encoding: 119 -1 119 +Encoding: 127 -1 127 Width: 108 Flags: W HStem: 1.64062 133.319 @@ -2750,7 +3108,7 @@ Validated: 1 EndChar StartChar: OriscusDeminutus -Encoding: 120 -1 120 +Encoding: 128 -1 128 Width: 168 VWidth: 0 Flags: W @@ -2776,7 +3134,7 @@ Validated: 33 EndChar StartChar: OriscusDeminutus#Cavum -Encoding: 121 -1 121 +Encoding: 129 -1 129 Width: 168 VWidth: 0 Flags: HW @@ -2800,7 +3158,7 @@ EndSplineSet EndChar StartChar: OriscusDeminutus#Cavum.caeciliae -Encoding: 122 -1 122 +Encoding: 130 -1 130 Width: 168 VWidth: 2612 Flags: W @@ -2823,7 +3181,7 @@ EndSplineSet EndChar StartChar: OriscusDeminutus.caeciliae -Encoding: 123 -1 123 +Encoding: 131 -1 131 Width: 168 VWidth: 2612 Flags: W @@ -2847,7 +3205,7 @@ Validated: 33 EndChar StartChar: p2base -Encoding: 124 -1 124 +Encoding: 132 -1 132 Width: 166 VWidth: 2613 Flags: HW @@ -2874,7 +3232,7 @@ EndSplineSet EndChar StartChar: p2base#Cavum -Encoding: 125 -1 125 +Encoding: 133 -1 133 Width: 166 VWidth: 2613 Flags: HW @@ -2899,7 +3257,7 @@ EndSplineSet EndChar StartChar: pesdeminutus -Encoding: 126 -1 126 +Encoding: 134 -1 134 Width: 166 VWidth: 2684 Flags: HW @@ -2922,7 +3280,7 @@ EndSplineSet EndChar StartChar: pesdeminutus#Cavum -Encoding: 127 -1 127 +Encoding: 135 -1 135 Width: 166 VWidth: 2684 Flags: HW @@ -2943,7 +3301,7 @@ EndSplineSet EndChar StartChar: pesdeminutus_op -Encoding: 128 -1 128 +Encoding: 136 -1 136 Width: 166 VWidth: 2684 Flags: W @@ -2970,7 +3328,7 @@ Validated: 1 EndChar StartChar: PesOneNothing -Encoding: 129 -1 129 +Encoding: 137 -1 137 Width: 166 VWidth: 2613 Flags: W @@ -3001,7 +3359,7 @@ EndSplineSet EndChar StartChar: PesOneNothing#Cavum -Encoding: 130 -1 130 +Encoding: 138 -1 138 Width: 166 VWidth: 2613 Flags: HW @@ -3033,7 +3391,7 @@ EndSplineSet EndChar StartChar: porrectus1 -Encoding: 131 -1 131 +Encoding: 139 -1 139 Width: 447 VWidth: 2553 Flags: HW @@ -3055,7 +3413,7 @@ EndSplineSet EndChar StartChar: porrectus1#Cavum -Encoding: 132 -1 132 +Encoding: 140 -1 140 Width: 447 VWidth: 2553 Flags: HW @@ -3075,7 +3433,7 @@ EndSplineSet EndChar StartChar: porrectus2 -Encoding: 133 -1 133 +Encoding: 141 -1 141 Width: 547 VWidth: 2575 Flags: HW @@ -3099,7 +3457,7 @@ EndSplineSet EndChar StartChar: porrectus2#Cavum -Encoding: 134 -1 134 +Encoding: 142 -1 142 Width: 547 VWidth: 2575 Flags: HW @@ -3121,7 +3479,7 @@ EndSplineSet EndChar StartChar: porrectus3 -Encoding: 135 -1 135 +Encoding: 143 -1 143 Width: 628 VWidth: 2556 Flags: HW @@ -3146,7 +3504,7 @@ EndSplineSet EndChar StartChar: porrectus3#Cavum -Encoding: 136 -1 136 +Encoding: 144 -1 144 Width: 628 VWidth: 2556 Flags: HW @@ -3169,7 +3527,7 @@ EndSplineSet EndChar StartChar: porrectus4 -Encoding: 137 -1 137 +Encoding: 145 -1 145 Width: 704 VWidth: 2500 Flags: HW @@ -3193,7 +3551,7 @@ EndSplineSet EndChar StartChar: porrectus4#Cavum -Encoding: 138 -1 138 +Encoding: 146 -1 146 Width: 704 VWidth: 2500 Flags: HW @@ -3215,7 +3573,7 @@ EndSplineSet EndChar StartChar: porrectus5 -Encoding: 139 -1 139 +Encoding: 147 -1 147 Width: 849 VWidth: 2048 Flags: HW @@ -3239,7 +3597,7 @@ EndSplineSet EndChar StartChar: porrectus5#Cavum -Encoding: 140 -1 140 +Encoding: 148 -1 148 Width: 849 VWidth: 2048 Flags: HW @@ -3261,7 +3619,7 @@ EndSplineSet EndChar StartChar: porrectusam11 -Encoding: 141 -1 141 +Encoding: 149 -1 149 Width: 503 VWidth: 2553 Flags: HW @@ -3283,7 +3641,7 @@ EndSplineSet EndChar StartChar: porrectusam11#Cavum -Encoding: 142 -1 142 +Encoding: 150 -1 150 Width: 503 VWidth: 2553 Flags: HW @@ -3303,7 +3661,7 @@ EndSplineSet EndChar StartChar: porrectusam12 -Encoding: 143 -1 143 +Encoding: 151 -1 151 Width: 628 VWidth: 2575 Flags: HW @@ -3327,7 +3685,7 @@ EndSplineSet EndChar StartChar: porrectusam12#Cavum -Encoding: 144 -1 144 +Encoding: 152 -1 152 Width: 628 VWidth: 2575 Flags: HW @@ -3349,7 +3707,7 @@ EndSplineSet EndChar StartChar: porrectusam13 -Encoding: 145 -1 145 +Encoding: 153 -1 153 Width: 678 VWidth: 2556 Flags: HW @@ -3373,7 +3731,7 @@ EndSplineSet EndChar StartChar: porrectusam13#Cavum -Encoding: 146 -1 146 +Encoding: 154 -1 154 Width: 678 VWidth: 2556 Flags: HW @@ -3396,7 +3754,7 @@ EndSplineSet EndChar StartChar: porrectusam14 -Encoding: 147 -1 147 +Encoding: 155 -1 155 Width: 721 VWidth: 2500 Flags: HW @@ -3421,7 +3779,7 @@ EndSplineSet EndChar StartChar: porrectusam14#Cavum -Encoding: 148 -1 148 +Encoding: 156 -1 156 Width: 721 VWidth: 2500 Flags: HW @@ -3443,7 +3801,7 @@ EndSplineSet EndChar StartChar: porrectusam15 -Encoding: 149 -1 149 +Encoding: 157 -1 157 Width: 933 VWidth: 2048 Flags: HW @@ -3468,7 +3826,7 @@ EndSplineSet EndChar StartChar: porrectusam15#Cavum -Encoding: 150 -1 150 +Encoding: 158 -1 158 Width: 933 VWidth: 2048 Flags: HW @@ -3490,7 +3848,7 @@ EndSplineSet EndChar StartChar: porrectusflexus1 -Encoding: 151 -1 151 +Encoding: 159 -1 159 Width: 503 VWidth: 2553 Flags: HW @@ -3513,7 +3871,7 @@ EndSplineSet EndChar StartChar: porrectusflexus1#Cavum -Encoding: 152 -1 152 +Encoding: 160 -1 160 Width: 503 VWidth: 2553 Flags: HW @@ -3533,7 +3891,7 @@ EndSplineSet EndChar StartChar: porrectusflexus2 -Encoding: 153 -1 153 +Encoding: 161 -1 161 Width: 628 VWidth: 2575 Flags: HW @@ -3555,7 +3913,7 @@ EndSplineSet EndChar StartChar: porrectusflexus2#Cavum -Encoding: 154 -1 154 +Encoding: 162 -1 162 Width: 628 VWidth: 2575 Flags: HW @@ -3577,7 +3935,7 @@ EndSplineSet EndChar StartChar: porrectusflexus3 -Encoding: 155 -1 155 +Encoding: 163 -1 163 Width: 628 VWidth: 2556 Flags: HW @@ -3601,7 +3959,7 @@ EndSplineSet EndChar StartChar: porrectusflexus3#Cavum -Encoding: 156 -1 156 +Encoding: 164 -1 164 Width: 628 VWidth: 2556 Flags: HW @@ -3624,7 +3982,7 @@ EndSplineSet EndChar StartChar: porrectusflexus4 -Encoding: 157 -1 157 +Encoding: 165 -1 165 Width: 628 VWidth: 2500 Flags: HW @@ -3647,7 +4005,7 @@ EndSplineSet EndChar StartChar: porrectusflexus4#Cavum -Encoding: 158 -1 158 +Encoding: 166 -1 166 Width: 628 VWidth: 2500 Flags: HW @@ -3669,7 +4027,7 @@ EndSplineSet EndChar StartChar: porrectusflexus5 -Encoding: 159 -1 159 +Encoding: 167 -1 167 Width: 931 VWidth: 2048 Flags: HW @@ -3690,7 +4048,7 @@ EndSplineSet EndChar StartChar: porrectusflexus5#Cavum -Encoding: 160 -1 160 +Encoding: 168 -1 168 Width: 931 VWidth: 2048 Flags: HW @@ -3707,7 +4065,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb1 -Encoding: 161 -1 161 +Encoding: 169 -1 169 Width: 503 VWidth: 2553 Flags: HW @@ -3727,7 +4085,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb1#Cavum -Encoding: 162 -1 162 +Encoding: 170 -1 170 Width: 503 VWidth: 2553 Flags: HW @@ -3747,7 +4105,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb2 -Encoding: 163 -1 163 +Encoding: 171 -1 171 Width: 628 VWidth: 2575 Flags: HW @@ -3767,7 +4125,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb2#Cavum -Encoding: 164 -1 164 +Encoding: 172 -1 172 Width: 628 VWidth: 2575 Flags: HW @@ -3789,7 +4147,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb3 -Encoding: 165 -1 165 +Encoding: 173 -1 173 Width: 628 VWidth: 2556 Flags: HW @@ -3810,7 +4168,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb3#Cavum -Encoding: 166 -1 166 +Encoding: 174 -1 174 Width: 628 VWidth: 2556 Flags: HW @@ -3833,7 +4191,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb4 -Encoding: 167 -1 167 +Encoding: 175 -1 175 Width: 628 VWidth: 2500 Flags: HW @@ -3853,7 +4211,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb4#Cavum -Encoding: 168 -1 168 +Encoding: 176 -1 176 Width: 628 VWidth: 2500 Flags: HW @@ -3875,7 +4233,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb5 -Encoding: 169 -1 169 +Encoding: 177 -1 177 Width: 931 VWidth: 2048 Flags: HW @@ -3894,7 +4252,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb5#Cavum -Encoding: 170 -1 170 +Encoding: 178 -1 178 Width: 931 VWidth: 2048 Flags: HW @@ -3911,7 +4269,7 @@ EndSplineSet EndChar StartChar: Punctum -Encoding: 171 -1 171 +Encoding: 179 -1 179 Width: 166 VWidth: 2612 Flags: HW @@ -3931,7 +4289,7 @@ EndSplineSet EndChar StartChar: Punctum#Cavum -Encoding: 172 -1 172 +Encoding: 180 -1 180 Width: 166 VWidth: 2612 Flags: W @@ -3952,7 +4310,7 @@ Validated: 33 EndChar StartChar: Punctum#Cavum.caeciliae -Encoding: 173 -1 173 +Encoding: 181 -1 181 Width: 166 VWidth: 2612 Flags: W @@ -3971,7 +4329,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens -Encoding: 174 -1 174 +Encoding: 182 -1 182 Width: 166 VWidth: 1149 Flags: W @@ -3993,7 +4351,7 @@ Validated: 1 EndChar StartChar: PunctumAscendens#Cavum -Encoding: 175 -1 175 +Encoding: 183 -1 183 Width: 166 VWidth: 1149 Flags: HW @@ -4014,7 +4372,7 @@ EndSplineSet EndChar StartChar: PunctumAscendens_op -Encoding: 176 -1 176 +Encoding: 184 -1 184 Width: 166 VWidth: 1149 Flags: HW @@ -4038,7 +4396,7 @@ EndSplineSet EndChar StartChar: PunctumAuctusLineBL -Encoding: 177 -1 177 +Encoding: 185 -1 185 Width: 166 VWidth: 2689 Flags: W @@ -4062,7 +4420,7 @@ Validated: 1 EndChar StartChar: PunctumAuctusLineBL#Cavum -Encoding: 178 -1 178 +Encoding: 186 -1 186 Width: 166 VWidth: 2689 Flags: HW @@ -4083,7 +4441,7 @@ EndSplineSet EndChar StartChar: PunctumAuctusLineBL_op -Encoding: 179 -1 179 +Encoding: 187 -1 187 Width: 166 VWidth: 2689 Flags: W @@ -4110,7 +4468,7 @@ Validated: 1 EndChar StartChar: PunctumDeminutus -Encoding: 180 -1 180 +Encoding: 188 -1 188 Width: 83 VWidth: 2612 Flags: W @@ -4131,7 +4489,7 @@ Validated: 1 EndChar StartChar: PunctumDeminutus#Cavum -Encoding: 181 -1 181 +Encoding: 189 -1 189 Width: 83 VWidth: 2612 Flags: HW @@ -4151,7 +4509,7 @@ EndSplineSet EndChar StartChar: PunctumDescendens -Encoding: 182 -1 182 +Encoding: 190 -1 190 Width: 166 VWidth: 1342 Flags: W @@ -4172,7 +4530,7 @@ Validated: 33 EndChar StartChar: PunctumDescendens#Cavum -Encoding: 183 -1 183 +Encoding: 191 -1 191 Width: 166 VWidth: 1342 Flags: HW @@ -4193,7 +4551,7 @@ EndSplineSet EndChar StartChar: PunctumDescendens_op -Encoding: 184 -1 184 +Encoding: 192 -1 192 Width: 166 VWidth: 1342 Flags: W @@ -4217,7 +4575,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus -Encoding: 185 -1 185 +Encoding: 193 -1 193 Width: 185 VWidth: 0 Flags: HW @@ -4239,7 +4597,7 @@ EndSplineSet EndChar StartChar: PunctumInclinatumAuctus#Cavum -Encoding: 186 -1 186 +Encoding: 194 -1 194 Width: 185 VWidth: 0 Flags: W @@ -4259,7 +4617,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumAuctus#Cavum.caeciliae -Encoding: 187 -1 187 +Encoding: 195 -1 195 Width: 185 VWidth: 2048 Flags: HW @@ -4277,7 +4635,7 @@ EndSplineSet EndChar StartChar: PunctumInclinatumAuctus.caeciliae -Encoding: 188 -1 188 +Encoding: 196 -1 196 Width: 185 VWidth: 2048 Flags: W @@ -4301,7 +4659,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumDeminutus -Encoding: 189 -1 189 +Encoding: 197 -1 197 Width: 139 VWidth: 2649 Flags: W @@ -4320,7 +4678,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumDeminutus#Cavum -Encoding: 190 -1 190 +Encoding: 198 -1 198 Width: 139 VWidth: 2649 Flags: HW @@ -4338,7 +4696,7 @@ EndSplineSet EndChar StartChar: PunctumLineBL -Encoding: 191 -1 191 +Encoding: 199 -1 199 Width: 166 VWidth: 2612 Flags: W @@ -4361,7 +4719,7 @@ Validated: 1 EndChar StartChar: PunctumLineBLBR -Encoding: 192 -1 192 +Encoding: 200 -1 200 Width: 166 VWidth: 2612 Flags: HW @@ -4385,7 +4743,7 @@ EndSplineSet EndChar StartChar: PunctumLineBR -Encoding: 193 -1 193 +Encoding: 201 -1 201 Width: 166 VWidth: 2612 Flags: W @@ -4408,7 +4766,7 @@ Validated: 1 EndChar StartChar: PunctumLineTL -Encoding: 194 -1 194 +Encoding: 202 -1 202 Width: 166 VWidth: 2612 Flags: W @@ -4431,7 +4789,7 @@ Validated: 1 EndChar StartChar: PunctumLineTLTR -Encoding: 195 -1 195 +Encoding: 203 -1 203 Width: 166 VWidth: 2612 Flags: W @@ -4456,7 +4814,7 @@ Validated: 1 EndChar StartChar: PunctumLineTR -Encoding: 196 -1 196 +Encoding: 204 -1 204 Width: 166 VWidth: 2612 Flags: W @@ -4479,7 +4837,7 @@ Validated: 1 EndChar StartChar: PunctumSmall -Encoding: 197 -1 197 +Encoding: 205 -1 205 Width: 155 VWidth: 2537 Flags: HW @@ -4501,7 +4859,7 @@ EndSplineSet EndChar StartChar: PunctumSmall#Cavum -Encoding: 198 -1 198 +Encoding: 206 -1 206 Width: 155 VWidth: 2537 Flags: HW @@ -4521,7 +4879,7 @@ EndSplineSet EndChar StartChar: queue -Encoding: 199 -1 199 +Encoding: 207 -1 207 Width: 18 VWidth: 2048 Flags: HW @@ -4540,7 +4898,7 @@ EndSplineSet EndChar StartChar: queuebase -Encoding: 200 -1 200 +Encoding: 208 -1 208 Width: 18 VWidth: 2048 Flags: HW @@ -4558,7 +4916,7 @@ EndSplineSet EndChar StartChar: Quilisma -Encoding: 201 -1 201 +Encoding: 209 -1 209 Width: 166 VWidth: 2496 Flags: HW @@ -4586,7 +4944,7 @@ EndSplineSet EndChar StartChar: Quilisma#Cavum -Encoding: 202 -1 202 +Encoding: 210 -1 210 Width: 166 VWidth: 2496 Flags: HW @@ -4614,7 +4972,7 @@ EndSplineSet EndChar StartChar: QuilismaLineTR -Encoding: 203 -1 203 +Encoding: 211 -1 211 Width: 166 VWidth: 2496 Flags: W @@ -4644,7 +5002,7 @@ Validated: 33 EndChar StartChar: QuilismaPesOneNothing -Encoding: 204 -1 204 +Encoding: 212 -1 212 Width: 166 VWidth: 2496 Flags: HW @@ -4677,7 +5035,7 @@ EndSplineSet EndChar StartChar: QuilismaPesOneNothing#Cavum -Encoding: 205 -1 205 +Encoding: 213 -1 213 Width: 166 VWidth: 2496 Flags: HW @@ -4712,7 +5070,7 @@ EndSplineSet EndChar StartChar: rdeminutus -Encoding: 206 -1 206 +Encoding: 214 -1 214 Width: 83 VWidth: 2605 Flags: W @@ -4735,7 +5093,7 @@ Validated: 33 EndChar StartChar: rdeminutus#Cavum -Encoding: 207 -1 207 +Encoding: 215 -1 215 Width: 83 VWidth: 2605 Flags: HW @@ -4755,7 +5113,7 @@ EndSplineSet EndChar StartChar: RoundBrace -Encoding: 208 -1 208 +Encoding: 216 -1 216 Width: 937 VWidth: 2048 Flags: W @@ -4781,7 +5139,7 @@ Validated: 1 EndChar StartChar: RoundBraceDown -Encoding: 209 -1 209 +Encoding: 217 -1 217 Width: 937 VWidth: 2048 Flags: W @@ -4807,7 +5165,7 @@ Validated: 1 EndChar StartChar: rqueue -Encoding: 210 -1 210 +Encoding: 218 -1 218 Width: 18 VWidth: 2048 Flags: HW @@ -4826,7 +5184,7 @@ EndSplineSet EndChar StartChar: rvbase -Encoding: 211 -1 211 +Encoding: 219 -1 219 Width: 166 VWidth: 2637 Flags: HW @@ -4850,7 +5208,7 @@ EndSplineSet EndChar StartChar: rvirgabase -Encoding: 212 -1 212 +Encoding: 220 -1 220 Width: 166 VWidth: 2637 Flags: HW @@ -4870,7 +5228,7 @@ EndSplineSet EndChar StartChar: Semicirculus -Encoding: 213 -1 213 +Encoding: 221 -1 221 Width: 124 VWidth: 1606 Flags: W @@ -4890,7 +5248,7 @@ Validated: 1 EndChar StartChar: SemicirculusReversus -Encoding: 214 -1 214 +Encoding: 222 -1 222 Width: 125 VWidth: 1583 Flags: W @@ -4910,7 +5268,7 @@ Validated: 1 EndChar StartChar: Sharp -Encoding: 215 -1 215 +Encoding: 223 -1 223 Width: 258 VWidth: 2048 Flags: W @@ -4974,7 +5332,7 @@ Validated: 1 EndChar StartChar: SharpHole -Encoding: 216 -1 216 +Encoding: 224 -1 224 Width: 258 VWidth: 2048 Flags: W @@ -4993,7 +5351,7 @@ Validated: 1 EndChar StartChar: Stropha -Encoding: 217 -1 217 +Encoding: 225 -1 225 Width: 172 VWidth: 2048 Flags: HW @@ -5017,7 +5375,7 @@ EndSplineSet EndChar StartChar: Stropha#Cavum -Encoding: 218 -1 218 +Encoding: 226 -1 226 Width: 172 VWidth: 2048 Flags: HW @@ -5038,7 +5396,7 @@ EndSplineSet EndChar StartChar: Stropha#Cavum.caeciliae -Encoding: 219 -1 219 +Encoding: 227 -1 227 Width: 151 VWidth: 2686 Flags: HW @@ -5059,7 +5417,7 @@ EndSplineSet EndChar StartChar: Stropha.caeciliae -Encoding: 220 -1 220 +Encoding: 228 -1 228 Width: 151 VWidth: 2686 Flags: W @@ -5082,7 +5440,7 @@ Validated: 1 EndChar StartChar: StrophaAucta -Encoding: 221 -1 221 +Encoding: 229 -1 229 Width: 172 VWidth: 2048 Flags: HW @@ -5104,7 +5462,7 @@ EndSplineSet EndChar StartChar: StrophaAucta#Cavum -Encoding: 222 -1 222 +Encoding: 230 -1 230 Width: 172 VWidth: 2048 Flags: HW @@ -5125,7 +5483,7 @@ EndSplineSet EndChar StartChar: StrophaAucta#Cavum.caeciliae -Encoding: 223 -1 223 +Encoding: 231 -1 231 Width: 151 VWidth: 2686 Flags: HW @@ -5147,7 +5505,7 @@ EndSplineSet EndChar StartChar: StrophaAucta.caeciliae -Encoding: 224 -1 224 +Encoding: 232 -1 232 Width: 151 VWidth: 2686 Flags: W @@ -5170,7 +5528,7 @@ Validated: 33 EndChar StartChar: StrophaAuctaLongtail -Encoding: 225 -1 225 +Encoding: 233 -1 233 Width: 172 VWidth: 2048 Flags: HW @@ -5192,7 +5550,7 @@ EndSplineSet EndChar StartChar: StrophaAuctaLongtail#Cavum -Encoding: 226 -1 226 +Encoding: 234 -1 234 Width: 172 VWidth: 2048 Flags: HW @@ -5213,7 +5571,7 @@ EndSplineSet EndChar StartChar: tmpglyph -Encoding: 227 -1 227 +Encoding: 235 -1 235 Width: 18 VWidth: 2048 Flags: HW @@ -5223,7 +5581,7 @@ LayerCount: 2 EndChar StartChar: UpperPesOneNothing -Encoding: 228 -1 228 +Encoding: 236 -1 236 Width: 166 VWidth: 2613 Flags: W @@ -5255,7 +5613,7 @@ EndSplineSet EndChar StartChar: UpperPesOneNothing#Cavum -Encoding: 229 -1 229 +Encoding: 237 -1 237 Width: 166 VWidth: 2613 Flags: W @@ -5287,7 +5645,7 @@ EndSplineSet EndChar StartChar: VEpisema -Encoding: 230 -1 230 +Encoding: 238 -1 238 Width: 34 VWidth: 2048 Flags: W @@ -5308,7 +5666,7 @@ Validated: 1 EndChar StartChar: VEpisema.circumflexus -Encoding: 231 -1 231 +Encoding: 239 -1 239 Width: 108 VWidth: 2048 Flags: W @@ -5332,7 +5690,7 @@ Validated: 33 EndChar StartChar: virgabase -Encoding: 232 -1 232 +Encoding: 240 -1 240 Width: 166 VWidth: 2637 Flags: HW @@ -5354,7 +5712,7 @@ EndSplineSet EndChar StartChar: virgabase#Cavum -Encoding: 233 -1 233 +Encoding: 241 -1 241 Width: 166 VWidth: 2637 Flags: HW @@ -5374,7 +5732,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL -Encoding: 234 -1 234 +Encoding: 242 -1 242 Width: 166 VWidth: 2637 Flags: HW @@ -5398,7 +5756,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL#Cavum -Encoding: 235 -1 235 +Encoding: 243 -1 243 Width: 166 VWidth: 2637 Flags: HW @@ -5418,7 +5776,7 @@ EndSplineSet EndChar StartChar: VirgaReversaAscendens_op -Encoding: 236 -1 236 +Encoding: 244 -1 244 Width: 166 VWidth: 2684 Flags: HW @@ -5445,7 +5803,7 @@ EndSplineSet EndChar StartChar: VirgaReversaAscendens_op#Cavum -Encoding: 237 -1 237 +Encoding: 245 -1 245 Width: 166 VWidth: 2684 Flags: W @@ -5466,7 +5824,7 @@ EndSplineSet EndChar StartChar: VirgaReversaDescendens_op -Encoding: 238 -1 238 +Encoding: 246 -1 246 Width: 168 VWidth: 2048 Flags: HW @@ -5494,7 +5852,7 @@ EndSplineSet EndChar StartChar: VirgaReversaDescendens_op#Cavum -Encoding: 239 -1 239 +Encoding: 247 -1 247 Width: 168 VWidth: 2048 Flags: HW @@ -5515,7 +5873,7 @@ EndSplineSet EndChar StartChar: VirgaReversaLongqueueAscendens_op -Encoding: 240 -1 240 +Encoding: 248 -1 248 Width: 166 VWidth: 2684 Flags: HW @@ -5542,7 +5900,7 @@ EndSplineSet EndChar StartChar: VirgaReversaLongqueueDescendens_op -Encoding: 241 -1 241 +Encoding: 249 -1 249 Width: 168 VWidth: 2048 Flags: HW @@ -5571,7 +5929,7 @@ EndSplineSet EndChar StartChar: VirgaReversaOpenqueueAscendens_op -Encoding: 242 -1 242 +Encoding: 250 -1 250 Width: 166 VWidth: 2684 Flags: HW @@ -5598,7 +5956,7 @@ EndSplineSet EndChar StartChar: VirgaReversaOpenqueueDescendens_op -Encoding: 243 -1 243 +Encoding: 251 -1 251 Width: 168 VWidth: 2048 Flags: W @@ -5627,7 +5985,7 @@ EndSplineSet EndChar StartChar: Virgula -Encoding: 244 -1 244 +Encoding: 252 -1 252 Width: 143 VWidth: 2418 Flags: W @@ -5650,7 +6008,7 @@ Validated: 1 EndChar StartChar: Virgula.2 -Encoding: 245 -1 245 +Encoding: 253 -1 253 Width: 143 VWidth: 1788 Flags: HW @@ -5672,7 +6030,7 @@ EndSplineSet EndChar StartChar: Virgula.3 -Encoding: 246 -1 246 +Encoding: 254 -1 254 Width: 143 VWidth: 2103 Flags: HW @@ -5694,7 +6052,7 @@ EndSplineSet EndChar StartChar: Virgula.5 -Encoding: 247 -1 247 +Encoding: 255 -1 255 Width: 143 VWidth: 2733 Flags: HW @@ -5716,7 +6074,7 @@ EndSplineSet EndChar StartChar: Virgula.6 -Encoding: 248 -1 248 +Encoding: 256 -1 256 Width: 143 VWidth: 3048 Flags: HW diff --git a/fonts/gregorio-base.sfd b/fonts/gregorio-base.sfd index a57c18fa2..cff891198 100644 --- a/fonts/gregorio-base.sfd +++ b/fonts/gregorio-base.sfd @@ -56,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: 206 206 +BeginChars: 214 214 StartChar: Accentus Encoding: 0 -1 0 @@ -1389,8 +1389,366 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima +StartChar: DivisioMaiorDotted Encoding: 59 -1 59 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +0 -429.001 m 29 + 19 -429 l 29 + 19 -468.997 l 29 + 0 -469.002 l 29 + 0 -429.001 l 29 +0 -349.001 m 25 + 19 -349 l 25 + 19 -388.997 l 25 + 0 -389.002 l 25 + 0 -349.001 l 25 +0 -269.001 m 25 + 19 -269 l 25 + 19 -308.997 l 25 + 0 -309.002 l 25 + 0 -269.001 l 25 +0 -189.001 m 25 + 19 -189 l 25 + 19 -228.997 l 25 + 0 -229.002 l 25 + 0 -189.001 l 25 +0 -109.001 m 25 + 19 -109 l 25 + 19 -148.997 l 25 + 0 -149.002 l 25 + 0 -109.001 l 25 +0 -29.001 m 25 + 19 -29 l 25 + 19 -68.9971 l 25 + 0 -69.002 l 25 + 0 -29.001 l 25 +0 50.999 m 25 + 19 51 l 25 + 19 11.0029 l 25 + 0 10.998 l 25 + 0 50.999 l 25 +0 130.999 m 25 + 19 131 l 25 + 19 91.0029 l 25 + 0 90.998 l 25 + 0 130.999 l 25 +0 210.999 m 25 + 19 211 l 25 + 19 171.003 l 25 + 0 170.998 l 25 + 0 210.999 l 25 +0 290.999 m 25 + 19 291 l 25 + 19 251.003 l 25 + 0 250.998 l 25 + 0 290.999 l 25 +0 370.999 m 25 + 19 371 l 25 + 19 331.003 l 25 + 0 330.998 l 25 + 0 370.999 l 25 +0 450.999 m 25 + 19 451 l 25 + 19 411.003 l 25 + 0 410.998 l 25 + 0 450.999 l 25 +0 530.999 m 25 + 19 531 l 25 + 19 491.003 l 25 + 0 490.998 l 25 + 0 530.999 l 25 +0 610.999 m 25 + 19 611 l 25 + 19 571.003 l 25 + 0 570.998 l 25 + 0 610.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.2 +Encoding: 60 -1 60 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> +LayerCount: 2 +Fore +SplineSet +0 -424.001 m 29 + 19 -424 l 29 + 19 -463.997 l 29 + 0 -464.002 l 29 + 0 -424.001 l 29 +0 -344.001 m 25 + 19 -344 l 25 + 19 -383.997 l 25 + 0 -384.002 l 25 + 0 -344.001 l 25 +0 -264.001 m 25 + 19 -264 l 25 + 19 -303.997 l 25 + 0 -304.002 l 25 + 0 -264.001 l 25 +0 -184.001 m 25 + 19 -184 l 25 + 19 -223.997 l 25 + 0 -224.002 l 25 + 0 -184.001 l 25 +0 -104.001 m 25 + 19 -104 l 25 + 19 -143.997 l 25 + 0 -144.002 l 25 + 0 -104.001 l 25 +0 -24.001 m 25 + 19 -24 l 25 + 19 -63.9971 l 25 + 0 -64.002 l 25 + 0 -24.001 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.3 +Encoding: 61 -1 61 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 235.999> +LayerCount: 2 +Fore +SplineSet +0 293.499 m 25 + 19 293.5 l 25 + 19 253.503 l 25 + 0 253.498 l 25 + 0 293.499 l 25 +0 213.499 m 25 + 19 213.5 l 25 + 19 173.503 l 25 + 0 173.498 l 25 + 0 213.499 l 25 +0 133.499 m 25 + 19 133.5 l 25 + 19 93.5029 l 25 + 0 93.498 l 25 + 0 133.499 l 25 +0 53.499 m 25 + 19 53.5 l 25 + 19 13.5029 l 25 + 0 13.498 l 25 + 0 53.499 l 25 +0 -26.501 m 25 + 19 -26.5 l 25 + 19 -66.4971 l 25 + 0 -66.502 l 25 + 0 -26.501 l 25 +0 -106.501 m 25 + 19 -106.5 l 25 + 19 -146.497 l 25 + 0 -146.502 l 25 + 0 -106.501 l 25 +0 -186.501 m 25 + 19 -186.5 l 25 + 19 -226.497 l 25 + 0 -226.502 l 25 + 0 -186.501 l 25 +0 -266.501 m 25 + 19 -266.5 l 25 + 19 -306.497 l 25 + 0 -306.502 l 25 + 0 -266.501 l 25 +0 -346.501 m 25 + 19 -346.5 l 25 + 19 -386.497 l 25 + 0 -386.502 l 25 + 0 -346.501 l 25 +0 -426.501 m 25 + 19 -426.5 l 25 + 19 -466.497 l 25 + 0 -466.502 l 25 + 0 -426.501 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDotted.5 +Encoding: 62 -1 62 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 865.999> +LayerCount: 2 +Fore +SplineSet +0 928.499 m 25 + 19 928.5 l 25 + 19 888.503 l 25 + 0 888.498 l 25 + 0 928.499 l 25 +0 848.499 m 25 + 19 848.5 l 25 + 19 808.503 l 25 + 0 808.498 l 25 + 0 848.499 l 25 +0 768.499 m 25 + 19 768.5 l 25 + 19 728.503 l 25 + 0 728.498 l 25 + 0 768.499 l 25 +0 688.499 m 25 + 19 688.5 l 25 + 19 648.503 l 25 + 0 648.498 l 25 + 0 688.499 l 25 +0 608.499 m 25 + 19 608.5 l 25 + 19 568.503 l 25 + 0 568.498 l 25 + 0 608.499 l 25 +0 528.499 m 25 + 19 528.5 l 25 + 19 488.503 l 25 + 0 488.498 l 25 + 0 528.499 l 25 +0 448.499 m 25 + 19 448.5 l 25 + 19 408.503 l 25 + 0 408.498 l 25 + 0 448.499 l 25 +0 368.499 m 25 + 19 368.5 l 25 + 19 328.503 l 25 + 0 328.498 l 25 + 0 368.499 l 25 +0 288.499 m 25 + 19 288.5 l 25 + 19 248.503 l 25 + 0 248.498 l 25 + 0 288.499 l 25 +0 208.499 m 25 + 19 208.5 l 25 + 19 168.503 l 25 + 0 168.498 l 25 + 0 208.499 l 25 +0 128.499 m 25 + 19 128.5 l 25 + 19 88.5029 l 25 + 0 88.498 l 25 + 0 128.499 l 25 +0 48.499 m 25 + 19 48.5 l 25 + 19 8.50293 l 25 + 0 8.49805 l 25 + 0 48.499 l 25 +0 -31.501 m 25 + 19 -31.5 l 25 + 19 -71.4971 l 25 + 0 -71.502 l 25 + 0 -31.501 l 25 +0 -111.501 m 25 + 19 -111.5 l 25 + 19 -151.497 l 25 + 0 -151.502 l 25 + 0 -111.501 l 25 +0 -191.501 m 25 + 19 -191.5 l 25 + 19 -231.497 l 25 + 0 -231.502 l 25 + 0 -191.501 l 25 +0 -271.501 m 25 + 19 -271.5 l 25 + 19 -311.497 l 25 + 0 -311.502 l 25 + 0 -271.501 l 25 +0 -351.501 m 25 + 19 -351.5 l 25 + 19 -391.497 l 25 + 0 -391.502 l 25 + 0 -351.501 l 25 +0 -431.501 m 25 + 19 -431.5 l 25 + 19 -471.497 l 25 + 0 -471.502 l 25 + 0 -431.501 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking +Encoding: 63 -1 63 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +-30 630.999 m 25 + 49 631 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 630.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.2 +Encoding: 64 -1 64 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> +LayerCount: 2 +Fore +SplineSet +-30 0.999023 m 25 + 49 1 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 0.999023 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.3 +Encoding: 65 -1 65 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 235.999> +LayerCount: 2 +Fore +SplineSet +-30 315.999 m 25 + 49 316 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 315.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedBacking.5 +Encoding: 66 -1 66 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 865.999> +LayerCount: 2 +Fore +SplineSet +-30 945.999 m 25 + 49 946 l 25 + 49 -488.997 l 29 + -30 -489.002 l 29 + -30 945.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMinima +Encoding: 67 -1 67 AltUni2: 000050.ffffffff.0 Width: 19 VWidth: 2048 @@ -1409,7 +1767,7 @@ Validated: 1 EndChar StartChar: DivisioMinima.2 -Encoding: 60 -1 60 +Encoding: 68 -1 68 Width: 19 VWidth: 1418 Flags: HW @@ -1426,7 +1784,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.3 -Encoding: 61 -1 61 +Encoding: 69 -1 69 Width: 19 VWidth: 1733 Flags: HW @@ -1443,7 +1801,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.5 -Encoding: 62 -1 62 +Encoding: 70 -1 70 Width: 19 VWidth: 2363 Flags: HW @@ -1460,7 +1818,7 @@ EndSplineSet EndChar StartChar: DivisioMinima.6 -Encoding: 63 -1 63 +Encoding: 71 -1 71 Width: 19 VWidth: 2678 Flags: HW @@ -1477,7 +1835,7 @@ EndSplineSet EndChar StartChar: DivisioMinor -Encoding: 64 -1 64 +Encoding: 72 -1 72 Width: 19 VWidth: 2048 Flags: HW @@ -1495,7 +1853,7 @@ Validated: 1 EndChar StartChar: DivisioMinor.2 -Encoding: 65 -1 65 +Encoding: 73 -1 73 Width: 19 VWidth: 2048 Flags: HW @@ -1512,7 +1870,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.3 -Encoding: 66 -1 66 +Encoding: 74 -1 74 Width: 19 VWidth: 2048 Flags: HW @@ -1529,7 +1887,7 @@ EndSplineSet EndChar StartChar: DivisioMinor.5 -Encoding: 67 -1 67 +Encoding: 75 -1 75 Width: 19 VWidth: 2048 Flags: HW @@ -1546,7 +1904,7 @@ EndSplineSet EndChar StartChar: FClef -Encoding: 68 -1 68 +Encoding: 76 -1 76 Width: 321 VWidth: 2048 Flags: HW @@ -1582,7 +1940,7 @@ Validated: 33 EndChar StartChar: FClefChange -Encoding: 69 -1 69 +Encoding: 77 -1 77 Width: 321 VWidth: 2048 Flags: HW @@ -1618,7 +1976,7 @@ Validated: 33 EndChar StartChar: Flat -Encoding: 70 -1 70 +Encoding: 78 -1 78 Width: 164 VWidth: 2048 Flags: HW @@ -1643,7 +2001,7 @@ Validated: 1 EndChar StartChar: FlatHole -Encoding: 71 -1 71 +Encoding: 79 -1 79 Width: 164 VWidth: 2048 Flags: HW @@ -1661,7 +2019,7 @@ Validated: 1 EndChar StartChar: hepisemaleft -Encoding: 72 -1 72 +Encoding: 80 -1 80 Width: 1 VWidth: 1968 Flags: HW @@ -1678,7 +2036,7 @@ EndSplineSet EndChar StartChar: hepisemaright -Encoding: 73 -1 73 +Encoding: 81 -1 81 Width: 2 VWidth: 1968 Flags: HW @@ -1695,7 +2053,7 @@ EndSplineSet EndChar StartChar: hepisema_base -Encoding: 74 -1 74 +Encoding: 82 -1 82 Width: 1 VWidth: 1968 Flags: HW @@ -1712,7 +2070,7 @@ EndSplineSet EndChar StartChar: idebilis -Encoding: 75 -1 75 +Encoding: 83 -1 83 Width: 110 VWidth: 2048 Flags: HW @@ -1734,7 +2092,7 @@ Validated: 33 EndChar StartChar: idebilis#Cavum -Encoding: 76 -1 76 +Encoding: 84 -1 84 Width: 110 VWidth: 2048 Flags: HW @@ -1753,7 +2111,7 @@ EndSplineSet EndChar StartChar: line2 -Encoding: 77 -1 77 +Encoding: 85 -1 85 Width: 22 VWidth: 2048 Flags: HW @@ -1771,7 +2129,7 @@ Validated: 1 EndChar StartChar: line3 -Encoding: 78 -1 78 +Encoding: 86 -1 86 Width: 22 VWidth: 2048 Flags: HW @@ -1789,7 +2147,7 @@ Validated: 1 EndChar StartChar: line4 -Encoding: 79 -1 79 +Encoding: 87 -1 87 Width: 22 VWidth: 2048 Flags: HW @@ -1807,7 +2165,7 @@ Validated: 1 EndChar StartChar: line5 -Encoding: 80 -1 80 +Encoding: 88 -1 88 Width: 22 VWidth: 2048 Flags: HW @@ -1825,7 +2183,7 @@ Validated: 1 EndChar StartChar: Linea -Encoding: 81 -1 81 +Encoding: 89 -1 89 Width: 431 VWidth: 2612 Flags: W @@ -1853,7 +2211,7 @@ Validated: 1 EndChar StartChar: Linea#Cavum -Encoding: 82 -1 82 +Encoding: 90 -1 90 Width: 431 VWidth: 2612 Flags: HW @@ -1872,7 +2230,7 @@ EndSplineSet EndChar StartChar: LineaPunctum -Encoding: 83 -1 83 +Encoding: 91 -1 91 Width: 266 VWidth: 2048 Flags: HW @@ -1906,7 +2264,7 @@ Validated: 1 EndChar StartChar: LineaPunctum#Cavum -Encoding: 84 -1 84 +Encoding: 92 -1 92 Width: 266 VWidth: 2048 Flags: HW @@ -1925,7 +2283,7 @@ EndSplineSet EndChar StartChar: mademinutus -Encoding: 85 -1 85 +Encoding: 93 -1 93 Width: 186 VWidth: 2048 Flags: HW @@ -1949,7 +2307,7 @@ Validated: 33 EndChar StartChar: mademinutus#Cavum -Encoding: 86 -1 86 +Encoding: 94 -1 94 Width: 186 VWidth: 2048 Flags: HW @@ -1969,7 +2327,7 @@ EndSplineSet EndChar StartChar: mdeminutus -Encoding: 87 -1 87 +Encoding: 95 -1 95 Width: 186 VWidth: 2048 Flags: HW @@ -1991,7 +2349,7 @@ Validated: 33 EndChar StartChar: mdeminutus#Cavum -Encoding: 88 -1 88 +Encoding: 96 -1 96 Width: 186 VWidth: 2048 Flags: HW @@ -2011,7 +2369,7 @@ EndSplineSet EndChar StartChar: mnbdeminutus -Encoding: 89 -1 89 +Encoding: 97 -1 97 Width: 186 VWidth: 2048 Flags: HW @@ -2032,7 +2390,7 @@ EndSplineSet EndChar StartChar: mnbdeminutus#Cavum -Encoding: 90 -1 90 +Encoding: 98 -1 98 Width: 186 VWidth: 2048 Flags: W @@ -2052,7 +2410,7 @@ EndSplineSet EndChar StartChar: mnbpdeminutus -Encoding: 91 -1 91 +Encoding: 99 -1 99 Width: 186 VWidth: 2048 Flags: HW @@ -2074,7 +2432,7 @@ Validated: 33 EndChar StartChar: mnbpdeminutus#Cavum -Encoding: 92 -1 92 +Encoding: 100 -1 100 Width: 186 VWidth: 2048 Flags: HW @@ -2093,7 +2451,7 @@ EndSplineSet EndChar StartChar: mpdeminutus -Encoding: 93 -1 93 +Encoding: 101 -1 101 Width: 186 VWidth: 2048 Flags: HW @@ -2117,7 +2475,7 @@ Validated: 33 EndChar StartChar: mpdeminutus#Cavum -Encoding: 94 -1 94 +Encoding: 102 -1 102 Width: 186 VWidth: 2048 Flags: HW @@ -2136,7 +2494,7 @@ EndSplineSet EndChar StartChar: msdeminutus -Encoding: 95 -1 95 +Encoding: 103 -1 103 Width: 186 VWidth: 2048 Flags: HW @@ -2160,7 +2518,7 @@ Validated: 33 EndChar StartChar: msdeminutus#Cavum -Encoding: 96 -1 96 +Encoding: 104 -1 104 Width: 186 VWidth: 2048 Flags: HW @@ -2179,7 +2537,7 @@ EndSplineSet EndChar StartChar: Natural -Encoding: 97 -1 97 +Encoding: 105 -1 105 Width: 201 VWidth: 2048 Flags: HW @@ -2205,7 +2563,7 @@ Validated: 1 EndChar StartChar: NaturalHole -Encoding: 98 -1 98 +Encoding: 106 -1 106 Width: 201 VWidth: 2048 Flags: HW @@ -2223,7 +2581,7 @@ Validated: 33 EndChar StartChar: OriscusDeminutus -Encoding: 99 -1 99 +Encoding: 107 -1 107 Width: 187 VWidth: 2048 Flags: HW @@ -2252,7 +2610,7 @@ Validated: 33 EndChar StartChar: OriscusDeminutus#Cavum -Encoding: 100 -1 100 +Encoding: 108 -1 108 Width: 164 VWidth: 2048 Flags: W @@ -2273,7 +2631,7 @@ EndSplineSet EndChar StartChar: p2base -Encoding: 101 -1 101 +Encoding: 109 -1 109 Width: 164 VWidth: 2048 Flags: W @@ -2294,7 +2652,7 @@ Validated: 33 EndChar StartChar: p2base#Cavum -Encoding: 102 -1 102 +Encoding: 110 -1 110 Width: 164 VWidth: 2048 Flags: HW @@ -2313,7 +2671,7 @@ EndSplineSet EndChar StartChar: pesdeminutus -Encoding: 103 -1 103 +Encoding: 111 -1 111 Width: 164 VWidth: 2048 Flags: HW @@ -2337,7 +2695,7 @@ Validated: 33 EndChar StartChar: pesdeminutus#Cavum -Encoding: 104 -1 104 +Encoding: 112 -1 112 Width: 164 VWidth: 2048 Flags: HW @@ -2358,7 +2716,7 @@ EndSplineSet EndChar StartChar: pesdeminutus_op -Encoding: 105 -1 105 +Encoding: 113 -1 113 Width: 164 VWidth: 2048 Flags: HW @@ -2384,7 +2742,7 @@ Validated: 33 EndChar StartChar: PesOneNothing -Encoding: 106 -1 106 +Encoding: 114 -1 114 Width: 164 VWidth: 2048 Flags: HW @@ -2409,7 +2767,7 @@ Validated: 33 EndChar StartChar: PesOneNothing#Cavum -Encoding: 107 -1 107 +Encoding: 115 -1 115 Width: 164 VWidth: 2048 Flags: HW @@ -2435,7 +2793,7 @@ EndSplineSet EndChar StartChar: porrectus1 -Encoding: 108 -1 108 +Encoding: 116 -1 116 Width: 490 VWidth: 2048 Flags: HW @@ -2456,7 +2814,7 @@ EndSplineSet EndChar StartChar: porrectus1#Cavum -Encoding: 109 -1 109 +Encoding: 117 -1 117 Width: 490 VWidth: 2048 Flags: W @@ -2475,7 +2833,7 @@ EndSplineSet EndChar StartChar: porrectus2 -Encoding: 110 -1 110 +Encoding: 118 -1 118 Width: 575 VWidth: 2048 Flags: HW @@ -2496,7 +2854,7 @@ EndSplineSet EndChar StartChar: porrectus2#Cavum -Encoding: 111 -1 111 +Encoding: 119 -1 119 Width: 575 VWidth: 2048 Flags: W @@ -2515,7 +2873,7 @@ EndSplineSet EndChar StartChar: porrectus3 -Encoding: 112 -1 112 +Encoding: 120 -1 120 Width: 650 VWidth: 2048 Flags: HW @@ -2537,7 +2895,7 @@ Validated: 33 EndChar StartChar: porrectus3#Cavum -Encoding: 113 -1 113 +Encoding: 121 -1 121 Width: 650 VWidth: 2048 Flags: HW @@ -2556,7 +2914,7 @@ EndSplineSet EndChar StartChar: porrectus4 -Encoding: 114 -1 114 +Encoding: 122 -1 122 Width: 740 VWidth: 2048 Flags: HW @@ -2578,7 +2936,7 @@ Validated: 33 EndChar StartChar: porrectus4#Cavum -Encoding: 115 -1 115 +Encoding: 123 -1 123 Width: 740 VWidth: 2048 Flags: HW @@ -2597,7 +2955,7 @@ EndSplineSet EndChar StartChar: porrectus5 -Encoding: 116 -1 116 +Encoding: 124 -1 124 Width: 931 VWidth: 2048 Flags: HW @@ -2619,7 +2977,7 @@ Validated: 33 EndChar StartChar: porrectus5#Cavum -Encoding: 117 -1 117 +Encoding: 125 -1 125 Width: 931 VWidth: 2048 Flags: HW @@ -2638,7 +2996,7 @@ EndSplineSet EndChar StartChar: porrectusflexus1 -Encoding: 118 -1 118 +Encoding: 126 -1 126 Width: 340 VWidth: 2048 Flags: HW @@ -2660,7 +3018,7 @@ Validated: 33 EndChar StartChar: porrectusflexus1#Cavum -Encoding: 119 -1 119 +Encoding: 127 -1 127 Width: 340 VWidth: 2048 Flags: HW @@ -2679,7 +3037,7 @@ EndSplineSet EndChar StartChar: porrectusflexus2 -Encoding: 120 -1 120 +Encoding: 128 -1 128 Width: 428 VWidth: 2048 Flags: HW @@ -2701,7 +3059,7 @@ Validated: 33 EndChar StartChar: porrectusflexus2#Cavum -Encoding: 121 -1 121 +Encoding: 129 -1 129 Width: 428 VWidth: 2048 Flags: HW @@ -2720,7 +3078,7 @@ EndSplineSet EndChar StartChar: porrectusflexus3 -Encoding: 122 -1 122 +Encoding: 130 -1 130 Width: 586 VWidth: 2048 Flags: HW @@ -2742,7 +3100,7 @@ Validated: 33 EndChar StartChar: porrectusflexus3#Cavum -Encoding: 123 -1 123 +Encoding: 131 -1 131 Width: 586 VWidth: 2048 Flags: HW @@ -2761,7 +3119,7 @@ EndSplineSet EndChar StartChar: porrectusflexus4 -Encoding: 124 -1 124 +Encoding: 132 -1 132 Width: 670 VWidth: 2048 Flags: HW @@ -2783,7 +3141,7 @@ Validated: 33 EndChar StartChar: porrectusflexus4#Cavum -Encoding: 125 -1 125 +Encoding: 133 -1 133 Width: 670 VWidth: 2048 Flags: HW @@ -2802,7 +3160,7 @@ EndSplineSet EndChar StartChar: porrectusflexus5 -Encoding: 126 -1 126 +Encoding: 134 -1 134 Width: 931 VWidth: 2048 Flags: HW @@ -2824,7 +3182,7 @@ Validated: 33 EndChar StartChar: porrectusflexus5#Cavum -Encoding: 127 -1 127 +Encoding: 135 -1 135 Width: 931 VWidth: 2048 Flags: HW @@ -2843,7 +3201,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb1 -Encoding: 128 -1 128 +Encoding: 136 -1 136 Width: 340 VWidth: 2048 Flags: W @@ -2863,7 +3221,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb1#Cavum -Encoding: 129 -1 129 +Encoding: 137 -1 137 Width: 340 VWidth: 2048 Flags: W @@ -2882,7 +3240,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb2 -Encoding: 130 -1 130 +Encoding: 138 -1 138 Width: 428 VWidth: 2048 Flags: HW @@ -2903,7 +3261,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb2#Cavum -Encoding: 131 -1 131 +Encoding: 139 -1 139 Width: 428 VWidth: 2048 Flags: HW @@ -2922,7 +3280,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb3 -Encoding: 132 -1 132 +Encoding: 140 -1 140 Width: 586 VWidth: 2048 Flags: HW @@ -2943,7 +3301,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb3#Cavum -Encoding: 133 -1 133 +Encoding: 141 -1 141 Width: 586 VWidth: 2048 Flags: HW @@ -2962,7 +3320,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb4 -Encoding: 134 -1 134 +Encoding: 142 -1 142 Width: 670 VWidth: 2048 Flags: HW @@ -2983,7 +3341,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb4#Cavum -Encoding: 135 -1 135 +Encoding: 143 -1 143 Width: 670 VWidth: 2048 Flags: HW @@ -3002,7 +3360,7 @@ EndSplineSet EndChar StartChar: porrectusflexusnb5 -Encoding: 136 -1 136 +Encoding: 144 -1 144 Width: 931 VWidth: 2048 Flags: HW @@ -3023,7 +3381,7 @@ Validated: 1 EndChar StartChar: porrectusflexusnb5#Cavum -Encoding: 137 -1 137 +Encoding: 145 -1 145 Width: 931 VWidth: 2048 Flags: HW @@ -3042,7 +3400,7 @@ EndSplineSet EndChar StartChar: Punctum -Encoding: 138 -1 138 +Encoding: 146 -1 146 Width: 164 VWidth: 2048 Flags: HW @@ -3061,7 +3419,7 @@ EndSplineSet EndChar StartChar: Punctum#Cavum -Encoding: 139 -1 139 +Encoding: 147 -1 147 Width: 164 VWidth: 2048 Flags: HW @@ -3080,7 +3438,7 @@ EndSplineSet EndChar StartChar: PunctumAscendens -Encoding: 140 -1 140 +Encoding: 148 -1 148 Width: 164 VWidth: 2048 Flags: HW @@ -3103,7 +3461,7 @@ Validated: 33 EndChar StartChar: PunctumAscendens#Cavum -Encoding: 141 -1 141 +Encoding: 149 -1 149 Width: 164 VWidth: 2048 Flags: HW @@ -3125,7 +3483,7 @@ EndSplineSet EndChar StartChar: PunctumAscendens_op -Encoding: 142 -1 142 +Encoding: 150 -1 150 Width: 164 VWidth: 2048 Flags: HW @@ -3150,7 +3508,7 @@ Validated: 33 EndChar StartChar: PunctumAuctusLineBL -Encoding: 143 -1 143 +Encoding: 151 -1 151 Width: 164 VWidth: 2048 Flags: HW @@ -3174,7 +3532,7 @@ Validated: 33 EndChar StartChar: PunctumAuctusLineBL_op -Encoding: 144 -1 144 +Encoding: 152 -1 152 Width: 164 VWidth: 2048 Flags: HW @@ -3200,7 +3558,7 @@ Validated: 33 EndChar StartChar: PunctumDeminutus -Encoding: 145 -1 145 +Encoding: 153 -1 153 Width: 110 VWidth: 2048 Flags: HW @@ -3220,7 +3578,7 @@ Validated: 33 EndChar StartChar: PunctumDeminutus#Cavum -Encoding: 146 -1 146 +Encoding: 154 -1 154 Width: 110 VWidth: 2048 Flags: HW @@ -3239,7 +3597,7 @@ EndSplineSet EndChar StartChar: PunctumDescendens -Encoding: 147 -1 147 +Encoding: 155 -1 155 Width: 164 VWidth: 2048 Flags: HW @@ -3262,7 +3620,7 @@ Validated: 33 EndChar StartChar: PunctumDescendens#Cavum -Encoding: 148 -1 148 +Encoding: 156 -1 156 Width: 164 VWidth: 2048 Flags: W @@ -3283,7 +3641,7 @@ EndSplineSet EndChar StartChar: PunctumDescendens_op -Encoding: 149 -1 149 +Encoding: 157 -1 157 Width: 164 VWidth: 2048 Flags: HW @@ -3308,7 +3666,7 @@ Validated: 33 EndChar StartChar: PunctumInclinatumAuctus -Encoding: 150 -1 150 +Encoding: 158 -1 158 Width: 164 VWidth: 2048 Flags: HW @@ -3331,7 +3689,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumAuctus#Cavum -Encoding: 151 -1 151 +Encoding: 159 -1 159 Width: 164 VWidth: 2048 Flags: HW @@ -3349,7 +3707,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumDeminutus -Encoding: 152 -1 152 +Encoding: 160 -1 160 Width: 82 VWidth: 2048 Flags: HW @@ -3367,7 +3725,7 @@ Validated: 1 EndChar StartChar: PunctumInclinatumDeminutus#Cavum -Encoding: 153 -1 153 +Encoding: 161 -1 161 Width: 82 VWidth: 2048 Flags: HW @@ -3384,7 +3742,7 @@ EndSplineSet EndChar StartChar: PunctumLineBL -Encoding: 154 -1 154 +Encoding: 162 -1 162 Width: 164 VWidth: 2048 Flags: HW @@ -3405,7 +3763,7 @@ Validated: 1 EndChar StartChar: PunctumLineBLBR -Encoding: 155 -1 155 +Encoding: 163 -1 163 Width: 164 VWidth: 2048 Flags: HW @@ -3427,7 +3785,7 @@ Validated: 33 EndChar StartChar: PunctumLineBR -Encoding: 156 -1 156 +Encoding: 164 -1 164 Width: 164 VWidth: 2048 Flags: HW @@ -3448,7 +3806,7 @@ Validated: 1 EndChar StartChar: PunctumLineTL -Encoding: 157 -1 157 +Encoding: 165 -1 165 Width: 164 VWidth: 2048 Flags: HW @@ -3469,7 +3827,7 @@ Validated: 33 EndChar StartChar: PunctumLineTLTR -Encoding: 158 -1 158 +Encoding: 166 -1 166 Width: 164 VWidth: 2048 Flags: HW @@ -3491,7 +3849,7 @@ Validated: 33 EndChar StartChar: PunctumLineTR -Encoding: 159 -1 159 +Encoding: 167 -1 167 Width: 164 VWidth: 2048 Flags: HW @@ -3512,7 +3870,7 @@ Validated: 33 EndChar StartChar: PunctumSmall -Encoding: 160 -1 160 +Encoding: 168 -1 168 Width: 154 VWidth: 2048 Flags: HW @@ -3533,7 +3891,7 @@ Validated: 1 EndChar StartChar: PunctumSmall#Cavum -Encoding: 161 -1 161 +Encoding: 169 -1 169 Width: 154 VWidth: 2048 Flags: HW @@ -3552,7 +3910,7 @@ EndSplineSet EndChar StartChar: queue -Encoding: 162 -1 162 +Encoding: 170 -1 170 Width: 22 VWidth: 2048 Flags: HW @@ -3569,7 +3927,7 @@ EndSplineSet EndChar StartChar: queuebase -Encoding: 163 -1 163 +Encoding: 171 -1 171 Width: 22 VWidth: 2048 Flags: HW @@ -3587,7 +3945,7 @@ EndSplineSet EndChar StartChar: Quilisma -Encoding: 164 -1 164 +Encoding: 172 -1 172 Width: 164 VWidth: 2048 Flags: HW @@ -3622,7 +3980,7 @@ Validated: 1 EndChar StartChar: Quilisma#Cavum -Encoding: 165 -1 165 +Encoding: 173 -1 173 Width: 164 VWidth: 2048 Flags: HW @@ -3656,7 +4014,7 @@ EndSplineSet EndChar StartChar: QuilismaLineTR -Encoding: 166 -1 166 +Encoding: 174 -1 174 Width: 164 VWidth: 2048 Flags: HW @@ -3686,7 +4044,7 @@ Validated: 33 EndChar StartChar: QuilismaPesOneNothing -Encoding: 167 -1 167 +Encoding: 175 -1 175 Width: 164 VWidth: 2048 Flags: HW @@ -3719,7 +4077,7 @@ EndSplineSet EndChar StartChar: QuilismaPesOneNothing#Cavum -Encoding: 168 -1 168 +Encoding: 176 -1 176 Width: 164 VWidth: 2048 Flags: HW @@ -3760,7 +4118,7 @@ EndSplineSet EndChar StartChar: rdeminutus -Encoding: 169 -1 169 +Encoding: 177 -1 177 Width: 110 VWidth: 2048 Flags: HW @@ -3782,7 +4140,7 @@ Validated: 33 EndChar StartChar: rdeminutus#Cavum -Encoding: 170 -1 170 +Encoding: 178 -1 178 Width: 110 VWidth: 2048 Flags: HW @@ -3801,7 +4159,7 @@ EndSplineSet EndChar StartChar: RoundBrace -Encoding: 171 -1 171 +Encoding: 179 -1 179 Width: 937 VWidth: 2048 Flags: W @@ -3827,7 +4185,7 @@ Validated: 1 EndChar StartChar: RoundBraceDown -Encoding: 172 -1 172 +Encoding: 180 -1 180 Width: 937 VWidth: 2048 Flags: HW @@ -3853,7 +4211,7 @@ Validated: 1 EndChar StartChar: rqueue -Encoding: 173 -1 173 +Encoding: 181 -1 181 Width: 22 VWidth: 2048 Flags: HW @@ -3870,7 +4228,7 @@ EndSplineSet EndChar StartChar: rvbase -Encoding: 174 -1 174 +Encoding: 182 -1 182 Width: 164 VWidth: 2048 Flags: HW @@ -3893,7 +4251,7 @@ EndSplineSet EndChar StartChar: rvirgabase -Encoding: 175 -1 175 +Encoding: 183 -1 183 Width: 164 VWidth: 2048 Flags: HW @@ -3914,7 +4272,7 @@ EndSplineSet EndChar StartChar: Semicirculus -Encoding: 176 -1 176 +Encoding: 184 -1 184 Width: 124 VWidth: 1606 Flags: W @@ -3934,7 +4292,7 @@ Validated: 1 EndChar StartChar: SemicirculusReversus -Encoding: 177 -1 177 +Encoding: 185 -1 185 Width: 125 VWidth: 1583 Flags: W @@ -3954,7 +4312,7 @@ Validated: 1 EndChar StartChar: Sharp -Encoding: 178 -1 178 +Encoding: 186 -1 186 Width: 258 VWidth: 2048 Flags: W @@ -4017,7 +4375,7 @@ Validated: 1 EndChar StartChar: SharpHole -Encoding: 179 -1 179 +Encoding: 187 -1 187 Width: 258 VWidth: 2048 Flags: W @@ -4035,7 +4393,7 @@ Validated: 1 EndChar StartChar: Stropha -Encoding: 180 -1 180 +Encoding: 188 -1 188 Width: 164 VWidth: 2048 Flags: HW @@ -4055,7 +4413,7 @@ Validated: 33 EndChar StartChar: Stropha#Cavum -Encoding: 181 -1 181 +Encoding: 189 -1 189 Width: 164 VWidth: 2048 Flags: HW @@ -4074,7 +4432,7 @@ EndSplineSet EndChar StartChar: StrophaAucta -Encoding: 182 -1 182 +Encoding: 190 -1 190 Width: 164 VWidth: 2048 Flags: HW @@ -4095,7 +4453,7 @@ Validated: 33 EndChar StartChar: StrophaAucta#Cavum -Encoding: 183 -1 183 +Encoding: 191 -1 191 Width: 164 VWidth: 2048 Flags: HW @@ -4114,7 +4472,7 @@ EndSplineSet EndChar StartChar: StrophaAuctaLongtail -Encoding: 184 -1 184 +Encoding: 192 -1 192 Width: 164 VWidth: 2048 Flags: W @@ -4134,7 +4492,7 @@ EndSplineSet EndChar StartChar: tmpglyph -Encoding: 185 -1 185 +Encoding: 193 -1 193 Width: 22 VWidth: 2048 Flags: W @@ -4151,7 +4509,7 @@ EndSplineSet EndChar StartChar: UpperPesOneNothing -Encoding: 186 -1 186 +Encoding: 194 -1 194 Width: 186 VWidth: 2048 Flags: HW @@ -4178,7 +4536,7 @@ EndSplineSet EndChar StartChar: UpperPesOneNothing#Cavum -Encoding: 187 -1 187 +Encoding: 195 -1 195 Width: 186 VWidth: 2048 Flags: HW @@ -4204,7 +4562,7 @@ EndSplineSet EndChar StartChar: VEpisema -Encoding: 188 -1 188 +Encoding: 196 -1 196 Width: 40 VWidth: 2048 Flags: HW @@ -4224,7 +4582,7 @@ Validated: 1 EndChar StartChar: VEpisema.circumflexus -Encoding: 189 -1 189 +Encoding: 197 -1 197 Width: 108 VWidth: 2048 Flags: W @@ -4248,7 +4606,7 @@ Validated: 33 EndChar StartChar: virgabase -Encoding: 190 -1 190 +Encoding: 198 -1 198 Width: 164 VWidth: 2048 Flags: HW @@ -4269,7 +4627,7 @@ EndSplineSet EndChar StartChar: virgabase#Cavum -Encoding: 191 -1 191 +Encoding: 199 -1 199 Width: 164 VWidth: 2048 Flags: HW @@ -4288,7 +4646,7 @@ EndSplineSet EndChar StartChar: VirgaBaseLineBL -Encoding: 192 -1 192 +Encoding: 200 -1 200 Width: 164 VWidth: 2048 Flags: HW @@ -4311,7 +4669,7 @@ EndSplineSet EndChar StartChar: VirgaReversaAscendens_op -Encoding: 193 -1 193 +Encoding: 201 -1 201 Width: 186 VWidth: 2048 Flags: HW @@ -4334,7 +4692,7 @@ EndSplineSet EndChar StartChar: VirgaReversaAscendens_op#Cavum -Encoding: 194 -1 194 +Encoding: 202 -1 202 Width: 186 VWidth: 2048 Flags: HW @@ -4353,7 +4711,7 @@ EndSplineSet EndChar StartChar: VirgaReversaDescendens_op -Encoding: 195 -1 195 +Encoding: 203 -1 203 Width: 186 VWidth: 2048 Flags: HW @@ -4377,7 +4735,7 @@ Validated: 33 EndChar StartChar: VirgaReversaDescendens_op#Cavum -Encoding: 196 -1 196 +Encoding: 204 -1 204 Width: 186 VWidth: 2048 Flags: HW @@ -4397,7 +4755,7 @@ EndSplineSet EndChar StartChar: VirgaReversaLongqueueAscendens_op -Encoding: 197 -1 197 +Encoding: 205 -1 205 Width: 186 VWidth: 2048 Flags: HW @@ -4420,7 +4778,7 @@ EndSplineSet EndChar StartChar: VirgaReversaLongqueueDescendens_op -Encoding: 198 -1 198 +Encoding: 206 -1 206 Width: 186 VWidth: 2048 Flags: W @@ -4443,7 +4801,7 @@ EndSplineSet EndChar StartChar: VirgaReversaOpenqueueAscendens_op -Encoding: 199 -1 199 +Encoding: 207 -1 207 Width: 186 VWidth: 2048 Flags: HW @@ -4466,7 +4824,7 @@ EndSplineSet EndChar StartChar: VirgaReversaOpenqueueDescendens_op -Encoding: 200 -1 200 +Encoding: 208 -1 208 Width: 186 VWidth: 2048 Flags: W @@ -4489,7 +4847,7 @@ EndSplineSet EndChar StartChar: Virgula -Encoding: 201 -1 201 +Encoding: 209 -1 209 Width: 152 VWidth: 2048 Flags: HW @@ -4508,7 +4866,7 @@ Validated: 33 EndChar StartChar: Virgula.2 -Encoding: 202 -1 202 +Encoding: 210 -1 210 Width: 152 VWidth: 1418 Flags: HW @@ -4526,7 +4884,7 @@ EndSplineSet EndChar StartChar: Virgula.3 -Encoding: 203 -1 203 +Encoding: 211 -1 211 Width: 152 VWidth: 1733 Flags: HW @@ -4544,7 +4902,7 @@ EndSplineSet EndChar StartChar: Virgula.5 -Encoding: 204 -1 204 +Encoding: 212 -1 212 Width: 152 VWidth: 2363 Flags: HW @@ -4562,7 +4920,7 @@ EndSplineSet EndChar StartChar: Virgula.6 -Encoding: 205 -1 205 +Encoding: 213 -1 213 Width: 152 VWidth: 2678 Flags: HW diff --git a/fonts/squarize.py b/fonts/squarize.py index 0beb5f35d..69408fc8f 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -259,6 +259,8 @@ def precise_message(glyph_name): 'DivisioMinima' : False, 'DivisioMinor' : False, 'DivisioMaior' : False, + 'DivisioMaiorDotted' : False, + 'DivisioMaiorDottedBacking' : False, 'PunctumDeminutus' : False, 'AuctumMora' : False, 'Punctum' : True, diff --git a/src/gabc/gabc-notes-determination.l b/src/gabc/gabc-notes-determination.l index 1029a6a08..26932393e 100644 --- a/src/gabc/gabc-notes-determination.l +++ b/src/gabc/gabc-notes-determination.l @@ -1226,6 +1226,9 @@ Z- { :: { add_bar_as_note(B_DIVISIO_FINALIS); } +:\? { + add_bar_as_note(B_DIVISIO_MAIOR_DOTTED); + } r { gregorio_add_cavum(current_note); } diff --git a/src/gabc/gabc-write.c b/src/gabc/gabc-write.c index 28924ef13..a773b8d1c 100644 --- a/src/gabc/gabc-write.c +++ b/src/gabc/gabc-write.c @@ -383,6 +383,9 @@ static void gabc_write_bar(FILE *f, gregorio_bar type) case B_DIVISIO_MINIMA_HIGH: fprintf(f, ",0"); break; + case B_DIVISIO_MAIOR_DOTTED: + fprintf(f, ":?"); + break; default: /* not reachable unless there's a programming error */ /* LCOV_EXCL_START */ diff --git a/src/gregoriotex/gregoriotex-write.c b/src/gregoriotex/gregoriotex-write.c index 072cdf93f..c1e1eaece 100644 --- a/src/gregoriotex/gregoriotex-write.c +++ b/src/gregoriotex/gregoriotex-write.c @@ -1680,6 +1680,9 @@ static void write_bar(FILE *f, const gregorio_score *const score, case B_DIVISIO_MINIMA_HIGH: fprintf(f, "DivisioMinimaHigh"); break; + case B_DIVISIO_MAIOR_DOTTED: + fprintf(f, "DivisioMaiorDotted"); + break; default: /* not reachable unless there's a programming error */ /* LCOV_EXCL_START */ @@ -2593,6 +2596,7 @@ static int gregoriotex_syllable_first_type(gregorio_syllable *syllable) result = 12; break; case B_DIVISIO_MAIOR: + case B_DIVISIO_MAIOR_DOTTED: result = 13; break; case B_DIVISIO_MINOR_D1: diff --git a/src/struct.h b/src/struct.h index 4c21c98f1..144c020f7 100644 --- a/src/struct.h +++ b/src/struct.h @@ -157,7 +157,8 @@ ENUM(gregorio_shape, GREGORIO_SHAPE); E(B_DIVISIO_MINOR_D7) \ E(B_DIVISIO_MINOR_D8) \ E(B_VIRGULA_HIGH) \ - L(B_DIVISIO_MINIMA_HIGH) + E(B_DIVISIO_MINIMA_HIGH) \ + L(B_DIVISIO_MAIOR_DOTTED) ENUM(gregorio_bar, GREGORIO_BAR); /* definition of the signs. You can notice that the values are made so @@ -397,7 +398,7 @@ ENUM(gregorio_ledger_specificity, GREGORIO_LEDGER_SPECIFICITY); typedef struct gregorio_extra_info { char *ad_hoc_space_factor; - ENUM_BITFIELD(gregorio_bar) bar:4; + ENUM_BITFIELD(gregorio_bar) bar:5; ENUM_BITFIELD(gregorio_space) space:4; ENUM_BITFIELD(gregorio_nlba) nlba:2; bool eol_ragged:1; diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 2a10bb4f1..794776e96 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -1791,6 +1791,25 @@ %% macros for the typesetting of bars %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% flag to indicate that lines behind an dotted bar should be hidden +\newif\ifgre@hidedottedbarlines +% default state is to hide them +\gre@hidedottedbarlinestrue + +% macro for manipulating above flag +\def\gresetlinesbehinddottedbar#1{% + \gre@trace{gresetlinesbehinddottedbar{#1}}% + \IfStrEqCase{#1}{% + {visible}% + {\gre@hidedottedbarlinesfalse}% + {invisible}% + {\gre@hidedottedbarlinestrue}% + }[% all other cases + \gre@error{Unrecognized option "#1" for \protect\gresetlinesbehinddottedbar\MessageBreak Possible options are: 'visible' and 'invisible'}% + ]% + \gre@trace@end% +}% + % we define two types of macro for each four bar : when it is inside a syllable, and when it is not \def\GreInVirgula#1#2#3{% @@ -1877,6 +1896,20 @@ \gre@trace@end% }% +\def\GreInDivisioMaiorDotted#1#2{% + \gre@trace{GreInDivisioMaiorDotted{#1}{#2}}% + \gre@writebar{16}{1}{#1}{#2}{0}% + \relax% + \gre@trace@end% +}% + +\def\GreDivisioMaiorDotted#1#2{% + \gre@trace{GreDivisioMaiorDotted{#1}{#2}}% + \gre@writebar{16}{0}{#1}{#2}{0}% + \relax% + \gre@trace@end% +}% + \def\GreDominica#1#2#3{% \gre@trace{GreDominica{#1}{#2}{#3}}% \ifcase#1\or % @@ -2314,6 +2347,29 @@ \gre@skip@temp@four = \csname gre@space@skip@bar@minima\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax% \gre@hskip\gre@skip@temp@four % \fi % + \or % 16 : dotted maior + \ifnum\gre@count@temp@one=1\relax % + \gre@skip@temp@four = \csname gre@space@skip@bar@maior\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax% + \gre@hskip\gre@skip@temp@four % + \GreNoBreak % + \fi % + \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaiorDotted}% + \ifgre@hidedottedbarlines % + \hbox to 0pt{% + {% + \color{grebackgroundcolor}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMaiorDottedBacking}% + }% + \hss % + }% + \fi % + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMaiorDotted}% + #4\relax % + \ifnum\gre@count@temp@one=1\relax % + \GreNoBreak % + \gre@skip@temp@four = \csname gre@space@skip@bar@maior\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax% + \gre@hskip\gre@skip@temp@four % + \fi % \fi % \global\gre@skip@bar@lastskip=\gre@skip@temp@four % \gre@debugmsg{spacing}{Width of bar just printed: \the\wd\gre@box@temp@width}% From 83f2a79fd5f5511bd74ffe9db56f1e4d9a8a3778 Mon Sep 17 00:00:00 2001 From: "Henry So, Jr." Date: Fri, 24 Nov 2017 19:22:01 -0500 Subject: [PATCH 2/2] Fixed the ability to substitute bar glyphs. Part of the implementation for #1360. --- CHANGELOG.md | 2 +- doc/Command_Index_User.tex | 19 +- doc/Command_Index_internal.tex | 32 ++ doc/GregorioRef.lua | 66 ++-- fonts/granapadano-base.sfd | 374 +++++++++++------------ fonts/greciliae-base.sfd | 392 ++++++++++++------------ fonts/gregorio-base.sfd | 542 ++++++++++++--------------------- fonts/squarize.py | 32 +- tex/gregoriotex-main.tex | 48 ++- tex/gregoriotex-signs.lua | 8 +- tex/gregoriotex-signs.tex | 32 +- tex/gregoriotex-syllable.tex | 8 +- tex/gregoriotex.lua | 4 +- 13 files changed, 747 insertions(+), 812 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afd53cebe..17313fe5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] - Added support for virgula (gabc: `` `0``) and divisio minima (gabc: `,0`) on the ledger line above the staff (see [#1370](https://github.com/gregorio-project/gregorio/issues/1370)). -- Added support for a dotted bar (gabc: `:?`) (see [#1360](https://github.com/gregorio-project/gregorio/issues/1360)). +- Added support for a dotted bar (gabc: `:?`) (See [#1360](https://github.com/gregorio-project/gregorio/issues/1360) and [#1387](https://github.com/gregorio-project/gregorio/issues/1387)) ## [Unreleased][unreleased] - Fixed issue with Tex Live 2017 latexmk not detecting auto-compiled gabc files as dependencies (see [#1367](https://github.com/gregorio-project/gregorio/issues/1367)). diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex index a0402a18d..4f8a980a4 100644 --- a/doc/Command_Index_User.tex +++ b/doc/Command_Index_User.tex @@ -490,10 +490,9 @@ \subsubsection{Glyph Alteration} & string & (any other string) The name of the glyph to use. \end{argtable} -\medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then -\texttt{\#3} must start with a dot and all glyphs matching \texttt{\#1} -will be replaced with corresponding glyphs whose names have \texttt{\#3} -appended. +\medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then \texttt{\#3} +must be empty or start with a dot, and all glyphs matching \texttt{\#1} will be +replaced with corresponding glyphs whose names have \texttt{\#3} appended. \medskip If \texttt{\#2} is \texttt{*}, then the substitution is assumed to be available in all score fonts. @@ -511,6 +510,18 @@ \subsubsection{Glyph Alteration} \grechangeglyph{TorculusResupinus*}{*}{.alt} \end{latexcode} +\textbf{Nota Bene:} Because the bar glyphs vary based on number of score lines, +substituting them is more complicated. To cover all numbers of score lines, +you will need to substitute all of the glyphs for the same (like +\texttt{VirgulaTwo} through \texttt{VirgulaSix} for all available virgula +glyphs). For example: + +\medskip To replace all "dotted divisio maior" glyphs with their same-named +variants from the \texttt{gregorio} font, use the following:\par\medskip +\begin{latexcode} + \grechangeglyph{DivisioMaiorDotted*}{gregorio}{} +\end{latexcode} + \macroname{\textbackslash greresetglyph}{\{\#1\}}{gregoriotex-main.tex} Removes a Gregorio\TeX\ score glyph substitution, restoring it back to its original form. diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex index 75732d627..2a76faca3 100644 --- a/doc/Command_Index_internal.tex +++ b/doc/Command_Index_internal.tex @@ -1602,6 +1602,38 @@ \subsection{Character Reference Aliases} \macroname{\textbackslash gre@char@he@...}{\#1}{gregoriotex-chars.tex} A class of macros for the horizontal episema which populates the \verb=\gre@box@hep= box. +\macroname{\textbackslash gre@char@bar@virgula}{}{gregoriotex-main.tex} +Alias that will hold the character for the virgula for the current number of +lines for the staff. + +\macroname{\textbackslash gre@char@bar@virgulahigh}{}{gregoriotex-main.tex} +Alias that will hold the character for the high virgula for the current number +of lines for the staff. + +\macroname{\textbackslash gre@char@bar@divisiominima}{}{gregoriotex-main.tex} +Alias that will hold the character for the divisio minima for the current +number of lines for the staff. + +\macroname{\textbackslash gre@char@bar@divisiominimahigh}{}{gregoriotex-main.tex} +Alias that will hold the character for the high divisio minima for the current +number of lines for the staff. + +\macroname{\textbackslash gre@char@bar@divisiominor}{}{gregoriotex-main.tex} +Alias that will hold the character for the divisio minor for the current +number of lines for the staff. + +\macroname{\textbackslash gre@char@bar@divisiomaior}{}{gregoriotex-main.tex} +Alias that will hold the character for the divisio maior for the current +number of lines for the staff. + +\macroname{\textbackslash gre@char@bar@divisiomaiordotted}{}{gregoriotex-main.tex} +Alias that will hold the character for the dotted divisio maior for the current +number of lines for the staff. + +\macroname{\textbackslash gre@char@bar@divisiomaiordottedbacking}{}{gregoriotex-main.tex} +Alias that will hold the character for the dotted divisio maior backing for the +current number of lines for the staff. + \macroname{\textbackslash gre@nabccharno}{\#1\#2\#3}{gregoriotex-nabc.tex} Prints the nabc glyphs for the given nabc string. diff --git a/doc/GregorioRef.lua b/doc/GregorioRef.lua index 32c80d0f6..d6964dab4 100644 --- a/doc/GregorioRef.lua +++ b/doc/GregorioRef.lua @@ -119,27 +119,27 @@ local EXCLUDE = { QuilismaLineTR = true, VirgaLineBR = true, SalicusOriscus = true, - ['Virgula.2'] = true, - ['Virgula.3'] = true, - ['Virgula.5'] = true, - ['Virgula.6'] = true, - ['DivisioMinima.2'] = true, - ['DivisioMinima.3'] = true, - ['DivisioMinima.5'] = true, - ['DivisioMinima.6'] = true, - ['DivisioMinor.2'] = true, - ['DivisioMinor.3'] = true, - ['DivisioMinor.5'] = true, - ['DivisioMaior.2'] = true, - ['DivisioMaior.3'] = true, - ['DivisioMaior.5'] = true, - ['DivisioMaiorDotted.2'] = true, - ['DivisioMaiorDotted.3'] = true, - ['DivisioMaiorDotted.5'] = true, - ['DivisioMaiorDottedBacking.2'] = true, - ['DivisioMaiorDottedBacking.3'] = true, - ['DivisioMaiorDottedBacking.5'] = true, VirgaBaseLineBL = true, + ['VirgulaTwo'] = true, + ['VirgulaThree'] = true, + ['VirgulaFive'] = true, + ['VirgulaSix'] = true, + ['DivisioMinimaTwo'] = true, + ['DivisioMinimaThree'] = true, + ['DivisioMinimaFive'] = true, + ['DivisioMinimaSix'] = true, + ['DivisioMinorTwo'] = true, + ['DivisioMinorThree'] = true, + ['DivisioMinorFive'] = true, + ['DivisioMaiorTwo'] = true, + ['DivisioMaiorThree'] = true, + ['DivisioMaiorFive'] = true, + ['DivisioMaiorDottedTwo'] = true, + ['DivisioMaiorDottedThree'] = true, + ['DivisioMaiorDottedFive'] = true, + ['DivisioMaiorDottedBackingTwo'] = true, + ['DivisioMaiorDottedBackingThree'] = true, + ['DivisioMaiorDottedBackingFive'] = true, } -- &&& in the following two tables is a placeholder for the cavum shape 'r' @@ -183,11 +183,11 @@ local GABC = { DescendensPunctumInclinatum = [[G&&&0]], DivisioDominican = [[,3]], DivisioDominicanAlt = [[,4]], - DivisioMaior = [[:]], - DivisioMaiorDotted = [[:?]], - DivisioMaiorDottedBacking = [[\excluded{:?}]], - DivisioMinima = [[,]], - DivisioMinor = [[;]], + DivisioMaiorFour = [[:]], + DivisioMaiorDottedFour = [[:?]], + DivisioMaiorDottedBackingFour = [[\excluded{:?}]], + DivisioMinimaFour = [[,]], + DivisioMinorFour = [[;]], FClefChange = [[f3]], FClef = [[f3]], Flat = [[gx]], @@ -266,7 +266,7 @@ local GABC = { VirgaReversa = [[g&&&V]], VirgaReversaLongqueue = [[h&&&V]], VirgaReversaOpenqueue = [[a&&&V]], - Virgula = [[^^^^0060]], + VirgulaFour = [[^^^^0060]], } local GABC_AMBITUS_ONE = { @@ -532,15 +532,21 @@ function GregorioRef.emit_score_glyphs(cs_normal, cs_hollow) local first = true local i, name for i, name in ipairs(glyph_names) do - if not EXCLUDE[name[2]] then - if (name[3] == '' and name[5] == '') or name[3] == '' or only_twos:match(name[3]) - or (GABC_AMBITUS_ONE[name[2]] and ambitus_one:match(name[3])) then + local shape = name[2] + local ambitus = name[3] + if shape:match('^Virgula') or shape:match('^Divisio') then + shape = shape..ambitus + ambitus = '' + end + if not EXCLUDE[shape] then + if (ambitus == '' and name[5] == '') or ambitus == '' or only_twos:match(ambitus) + or (GABC_AMBITUS_ONE[shape] and ambitus_one:match(ambitus)) then if first then first = false else tex.print([[\hline]]) end - emit_score_glyph(name[1], name[2], name[3], name[4], name[5]) + emit_score_glyph(name[1], shape, ambitus, name[4], name[5]) end end end diff --git a/fonts/granapadano-base.sfd b/fonts/granapadano-base.sfd index b0eb1f340..ac2807ff3 100644 --- a/fonts/granapadano-base.sfd +++ b/fonts/granapadano-base.sfd @@ -1309,7 +1309,7 @@ EndSplineSet Validated: 1 EndChar -StartChar: DivisioMaior +StartChar: DivisioMaiorTwo Encoding: 54 -1 54 Width: 19 VWidth: 2048 @@ -1318,16 +1318,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 550.999 m 25 - 19 551 l 25 +0 -79.001 m 29 + 19 -79 l 29 18.9912 -408.997 l 25 - 0 -409.002 l 29 - 0 550.999 l 25 + 0 -409.002 l 25 + 0 -79.001 l 29 EndSplineSet -Validated: 1 EndChar -StartChar: DivisioMaior.2 +StartChar: DivisioMaiorThree Encoding: 55 -1 55 Width: 19 VWidth: 2048 @@ -1336,15 +1335,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 -79.001 m 29 - 19 -79 l 29 +0 235.999 m 29 + 19 236 l 29 18.9912 -408.997 l 25 0 -409.002 l 25 - 0 -79.001 l 29 + 0 235.999 l 29 EndSplineSet EndChar -StartChar: DivisioMaior.3 +StartChar: DivisioMaiorFour Encoding: 56 -1 56 Width: 19 VWidth: 2048 @@ -1353,15 +1352,16 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 235.999 m 29 - 19 236 l 29 +0 550.999 m 25 + 19 551 l 25 18.9912 -408.997 l 25 - 0 -409.002 l 25 - 0 235.999 l 29 + 0 -409.002 l 29 + 0 550.999 l 25 EndSplineSet +Validated: 1 EndChar -StartChar: DivisioMaior.5 +StartChar: DivisioMaiorFive Encoding: 57 -1 57 Width: 19 VWidth: 2048 @@ -1378,93 +1378,11 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted +StartChar: DivisioMaiorDottedTwo Encoding: 58 -1 58 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 550.999> -LayerCount: 2 -Fore -SplineSet -0 -429.001 m 29 - 19 -429 l 29 - 19 -468.997 l 29 - 0 -469.002 l 29 - 0 -429.001 l 29 -0 -349.001 m 25 - 19 -349 l 25 - 19 -388.997 l 25 - 0 -389.002 l 25 - 0 -349.001 l 25 -0 -269.001 m 25 - 19 -269 l 25 - 19 -308.997 l 25 - 0 -309.002 l 25 - 0 -269.001 l 25 -0 -189.001 m 25 - 19 -189 l 25 - 19 -228.997 l 25 - 0 -229.002 l 25 - 0 -189.001 l 25 -0 -109.001 m 25 - 19 -109 l 25 - 19 -148.997 l 25 - 0 -149.002 l 25 - 0 -109.001 l 25 -0 -29.001 m 25 - 19 -29 l 25 - 19 -68.9971 l 25 - 0 -69.002 l 25 - 0 -29.001 l 25 -0 50.999 m 25 - 19 51 l 25 - 19 11.0029 l 25 - 0 10.998 l 25 - 0 50.999 l 25 -0 130.999 m 25 - 19 131 l 25 - 19 91.0029 l 25 - 0 90.998 l 25 - 0 130.999 l 25 -0 210.999 m 25 - 19 211 l 25 - 19 171.003 l 25 - 0 170.998 l 25 - 0 210.999 l 25 -0 290.999 m 25 - 19 291 l 25 - 19 251.003 l 25 - 0 250.998 l 25 - 0 290.999 l 25 -0 370.999 m 25 - 19 371 l 25 - 19 331.003 l 25 - 0 330.998 l 25 - 0 370.999 l 25 -0 450.999 m 25 - 19 451 l 25 - 19 411.003 l 25 - 0 410.998 l 25 - 0 450.999 l 25 -0 530.999 m 25 - 19 531 l 25 - 19 491.003 l 25 - 0 490.998 l 25 - 0 530.999 l 25 -0 610.999 m 25 - 19 611 l 25 - 19 571.003 l 25 - 0 570.998 l 25 - 0 610.999 l 25 -EndSplineSet -EndChar - -StartChar: DivisioMaiorDotted.2 -Encoding: 59 -1 59 -Width: 19 -VWidth: 2048 -Flags: HW HStem: -408.997 329.996 VStem: 0 19<-408.997 -79.001> LayerCount: 2 @@ -1503,8 +1421,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted.3 -Encoding: 60 -1 60 +StartChar: DivisioMaiorDottedThree +Encoding: 59 -1 59 Width: 19 VWidth: 2048 Flags: HW @@ -1565,7 +1483,89 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted.5 +StartChar: DivisioMaiorDottedFour +Encoding: 60 -1 60 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +0 -429.001 m 29 + 19 -429 l 29 + 19 -468.997 l 29 + 0 -469.002 l 29 + 0 -429.001 l 29 +0 -349.001 m 25 + 19 -349 l 25 + 19 -388.997 l 25 + 0 -389.002 l 25 + 0 -349.001 l 25 +0 -269.001 m 25 + 19 -269 l 25 + 19 -308.997 l 25 + 0 -309.002 l 25 + 0 -269.001 l 25 +0 -189.001 m 25 + 19 -189 l 25 + 19 -228.997 l 25 + 0 -229.002 l 25 + 0 -189.001 l 25 +0 -109.001 m 25 + 19 -109 l 25 + 19 -148.997 l 25 + 0 -149.002 l 25 + 0 -109.001 l 25 +0 -29.001 m 25 + 19 -29 l 25 + 19 -68.9971 l 25 + 0 -69.002 l 25 + 0 -29.001 l 25 +0 50.999 m 25 + 19 51 l 25 + 19 11.0029 l 25 + 0 10.998 l 25 + 0 50.999 l 25 +0 130.999 m 25 + 19 131 l 25 + 19 91.0029 l 25 + 0 90.998 l 25 + 0 130.999 l 25 +0 210.999 m 25 + 19 211 l 25 + 19 171.003 l 25 + 0 170.998 l 25 + 0 210.999 l 25 +0 290.999 m 25 + 19 291 l 25 + 19 251.003 l 25 + 0 250.998 l 25 + 0 290.999 l 25 +0 370.999 m 25 + 19 371 l 25 + 19 331.003 l 25 + 0 330.998 l 25 + 0 370.999 l 25 +0 450.999 m 25 + 19 451 l 25 + 19 411.003 l 25 + 0 410.998 l 25 + 0 450.999 l 25 +0 530.999 m 25 + 19 531 l 25 + 19 491.003 l 25 + 0 490.998 l 25 + 0 530.999 l 25 +0 610.999 m 25 + 19 611 l 25 + 19 571.003 l 25 + 0 570.998 l 25 + 0 610.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedFive Encoding: 61 -1 61 Width: 19 VWidth: 2048 @@ -1667,59 +1667,59 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking +StartChar: DivisioMaiorDottedBackingTwo Encoding: 62 -1 62 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 550.999> +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> LayerCount: 2 Fore SplineSet --30 630.999 m 25 - 49 631 l 25 +-30 0.999023 m 25 + 49 1 l 25 49 -488.997 l 29 -30 -489.002 l 29 - -30 630.999 l 25 + -30 0.999023 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.2 +StartChar: DivisioMaiorDottedBackingThree Encoding: 63 -1 63 Width: 19 VWidth: 2048 Flags: HW -HStem: -408.997 329.996 -VStem: 0 19<-408.997 -79.001> +VStem: 0 19<-408.997 235.999> LayerCount: 2 Fore SplineSet --30 0.999023 m 25 - 49 1 l 25 +-30 315.999 m 25 + 49 316 l 25 49 -488.997 l 29 -30 -489.002 l 29 - -30 0.999023 l 25 + -30 315.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.3 +StartChar: DivisioMaiorDottedBackingFour Encoding: 64 -1 64 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 235.999> +VStem: 0 19<-408.997 550.999> LayerCount: 2 Fore SplineSet --30 315.999 m 25 - 49 316 l 25 +-30 630.999 m 25 + 49 631 l 25 49 -488.997 l 29 -30 -489.002 l 29 - -30 315.999 l 25 + -30 630.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.5 +StartChar: DivisioMaiorDottedBackingFive Encoding: 65 -1 65 Width: 19 VWidth: 2048 @@ -1736,27 +1736,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima +StartChar: DivisioMinimaTwo Encoding: 66 -1 66 -AltUni2: 000050.ffffffff.0 -Width: 19 -VWidth: 2048 -Flags: HW -HStem: -409 15 -94 15 221 15 536 15 -LayerCount: 2 -Fore -SplineSet -0 359.128 m 9 - 0.00292969 719.984 l 25 - 18.999 720.021 l 25 - 19 352.431 l 17 - 6.04348 352.565 2.43478 355.609 0 359.128 c 9 -EndSplineSet -Validated: 1 -EndChar - -StartChar: DivisioMinima.2 -Encoding: 67 -1 67 Width: 19 VWidth: 1418 Flags: HW @@ -1772,8 +1753,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.3 -Encoding: 68 -1 68 +StartChar: DivisioMinimaThree +Encoding: 67 -1 67 Width: 19 VWidth: 1733 Flags: HW @@ -1789,7 +1770,26 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.5 +StartChar: DivisioMinimaFour +Encoding: 68 -1 68 +AltUni2: 000050.ffffffff.0 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +0 359.128 m 9 + 0.00292969 719.984 l 25 + 18.999 720.021 l 25 + 19 352.431 l 17 + 6.04348 352.565 2.43478 355.609 0 359.128 c 9 +EndSplineSet +Validated: 1 +EndChar + +StartChar: DivisioMinimaFive Encoding: 69 -1 69 Width: 19 VWidth: 2363 @@ -1806,7 +1806,7 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.6 +StartChar: DivisioMinimaSix Encoding: 70 -1 70 Width: 19 VWidth: 2678 @@ -1823,7 +1823,7 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinor +StartChar: DivisioMinorTwo Encoding: 71 -1 71 Width: 19 VWidth: 2048 @@ -1832,16 +1832,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 -296.375 m 13 - 0 383.125 l 21 - 3.87305 385.802 10.75 386.375 19 386.5 c 13 - 19 -293.375 l 21 - 14.875 -293.5 5 -293.375 0 -296.375 c 13 +0 -157.001 m 25 + 19 -157 l 25 + 18.9912 -330.997 l 29 + 0 -331.002 l 29 + 0 -157.001 l 25 EndSplineSet -Validated: 1 EndChar -StartChar: DivisioMinor.2 +StartChar: DivisioMinorThree Encoding: 72 -1 72 Width: 19 VWidth: 2048 @@ -1850,15 +1849,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 -157.001 m 25 - 19 -157 l 25 - 18.9912 -330.997 l 29 - 0 -331.002 l 29 - 0 -157.001 l 25 +0 78.499 m 25 + 19 78.5 l 25 + 18.9912 -251.497 l 29 + 0 -251.502 l 29 + 0 78.499 l 25 EndSplineSet EndChar -StartChar: DivisioMinor.3 +StartChar: DivisioMinorFour Encoding: 73 -1 73 Width: 19 VWidth: 2048 @@ -1867,15 +1866,16 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 78.499 m 25 - 19 78.5 l 25 - 18.9912 -251.497 l 29 - 0 -251.502 l 29 - 0 78.499 l 25 +0 -296.375 m 13 + 0 383.125 l 21 + 3.87305 385.802 10.75 386.375 19 386.5 c 13 + 19 -293.375 l 21 + 14.875 -293.5 5 -293.375 0 -296.375 c 13 EndSplineSet +Validated: 1 EndChar -StartChar: DivisioMinor.5 +StartChar: DivisioMinorFive Encoding: 74 -1 74 Width: 19 VWidth: 2048 @@ -4807,28 +4807,9 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula +StartChar: VirgulaTwo Encoding: 202 -1 202 Width: 152 -VWidth: 2048 -Flags: HW -HStem: -409 15 -94 15 221 15 536 15 -LayerCount: 2 -Fore -SplineSet -152.337 553.333 m 1 - 152.337 497.678 67 439 0 418.998 c 1 - 46 458 152.5 495.998 120 561.998 c 1 - 124.5 530.998 17 510.498 17 572.998 c 1 - 17 597.998 49 612.998 75 612.998 c 1 - 122.5 613.998 152.337 586.678 152.337 553.333 c 1 -EndSplineSet -Validated: 33 -EndChar - -StartChar: Virgula.2 -Encoding: 203 -1 203 -Width: 152 VWidth: 1418 Flags: HW HStem: -1039 15 -724 15 -409 15 -94 15 @@ -4844,8 +4825,8 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.3 -Encoding: 204 -1 204 +StartChar: VirgulaThree +Encoding: 203 -1 203 Width: 152 VWidth: 1733 Flags: HW @@ -4862,7 +4843,26 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.5 +StartChar: VirgulaFour +Encoding: 204 -1 204 +Width: 152 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +152.337 553.333 m 1 + 152.337 497.678 67 439 0 418.998 c 1 + 46 458 152.5 495.998 120 561.998 c 1 + 124.5 530.998 17 510.498 17 572.998 c 1 + 17 597.998 49 612.998 75 612.998 c 1 + 122.5 613.998 152.337 586.678 152.337 553.333 c 1 +EndSplineSet +Validated: 33 +EndChar + +StartChar: VirgulaFive Encoding: 205 -1 205 Width: 152 VWidth: 2363 @@ -4880,7 +4880,7 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.6 +StartChar: VirgulaSix Encoding: 206 -1 206 Width: 152 VWidth: 2678 diff --git a/fonts/greciliae-base.sfd b/fonts/greciliae-base.sfd index 5ee1db6c8..ba1020bf8 100644 --- a/fonts/greciliae-base.sfd +++ b/fonts/greciliae-base.sfd @@ -1769,60 +1769,60 @@ EndSplineSet Validated: 1 EndChar -StartChar: DivisioMaior +StartChar: DivisioMaiorTwo Encoding: 75 -1 75 Width: 19 VWidth: 2048 Flags: W -VStem: 0 19<-408.997 550.999> +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> LayerCount: 2 Fore SplineSet -0 550.999 m 29 - 19 551 l 25 +0 -79.001 m 29 + 19 -79 l 29 19 -408.997 l 25 0 -409.002 l 25 - 0 550.999 l 29 + 0 -79.001 l 29 EndSplineSet -Validated: 1 EndChar -StartChar: DivisioMaior.2 +StartChar: DivisioMaiorThree Encoding: 76 -1 76 Width: 19 VWidth: 2048 Flags: W -HStem: -408.997 329.996 -VStem: 0 19<-408.997 -79.001> +VStem: 0 19<-408.997 235.999> LayerCount: 2 Fore SplineSet -0 -79.001 m 29 - 19 -79 l 29 +0 235.999 m 29 + 19 236 l 29 19 -408.997 l 25 0 -409.002 l 25 - 0 -79.001 l 29 + 0 235.999 l 29 EndSplineSet EndChar -StartChar: DivisioMaior.3 +StartChar: DivisioMaiorFour Encoding: 77 -1 77 Width: 19 VWidth: 2048 Flags: W -VStem: 0 19<-408.997 235.999> +VStem: 0 19<-408.997 550.999> LayerCount: 2 Fore SplineSet -0 235.999 m 29 - 19 236 l 29 +0 550.999 m 29 + 19 551 l 25 19 -408.997 l 25 0 -409.002 l 25 - 0 235.999 l 29 + 0 550.999 l 29 EndSplineSet +Validated: 1 EndChar -StartChar: DivisioMaior.5 +StartChar: DivisioMaiorFive Encoding: 78 -1 78 Width: 19 VWidth: 2048 @@ -1839,93 +1839,11 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted +StartChar: DivisioMaiorDottedTwo Encoding: 79 -1 79 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 550.999> -LayerCount: 2 -Fore -SplineSet -0 -429.001 m 29 - 19 -429 l 29 - 19 -468.997 l 29 - 0 -469.002 l 29 - 0 -429.001 l 29 -0 -349.001 m 25 - 19 -349 l 25 - 19 -388.997 l 25 - 0 -389.002 l 25 - 0 -349.001 l 25 -0 -269.001 m 25 - 19 -269 l 25 - 19 -308.997 l 25 - 0 -309.002 l 25 - 0 -269.001 l 25 -0 -189.001 m 25 - 19 -189 l 25 - 19 -228.997 l 25 - 0 -229.002 l 25 - 0 -189.001 l 25 -0 -109.001 m 25 - 19 -109 l 25 - 19 -148.997 l 25 - 0 -149.002 l 25 - 0 -109.001 l 25 -0 -29.001 m 25 - 19 -29 l 25 - 19 -68.9971 l 25 - 0 -69.002 l 25 - 0 -29.001 l 25 -0 50.999 m 25 - 19 51 l 25 - 19 11.0029 l 25 - 0 10.998 l 25 - 0 50.999 l 25 -0 130.999 m 25 - 19 131 l 25 - 19 91.0029 l 25 - 0 90.998 l 25 - 0 130.999 l 25 -0 210.999 m 25 - 19 211 l 25 - 19 171.003 l 25 - 0 170.998 l 25 - 0 210.999 l 25 -0 290.999 m 25 - 19 291 l 25 - 19 251.003 l 25 - 0 250.998 l 25 - 0 290.999 l 25 -0 370.999 m 25 - 19 371 l 25 - 19 331.003 l 25 - 0 330.998 l 25 - 0 370.999 l 25 -0 450.999 m 25 - 19 451 l 25 - 19 411.003 l 25 - 0 410.998 l 25 - 0 450.999 l 25 -0 530.999 m 25 - 19 531 l 25 - 19 491.003 l 25 - 0 490.998 l 25 - 0 530.999 l 25 -0 610.999 m 25 - 19 611 l 25 - 19 571.003 l 25 - 0 570.998 l 25 - 0 610.999 l 25 -EndSplineSet -EndChar - -StartChar: DivisioMaiorDotted.2 -Encoding: 80 -1 80 -Width: 19 -VWidth: 2048 -Flags: HW HStem: -408.997 329.996 VStem: 0 19<-408.997 -79.001> LayerCount: 2 @@ -1964,8 +1882,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted.3 -Encoding: 81 -1 81 +StartChar: DivisioMaiorDottedThree +Encoding: 80 -1 80 Width: 19 VWidth: 2048 Flags: HW @@ -2026,7 +1944,89 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted.5 +StartChar: DivisioMaiorDottedFour +Encoding: 81 -1 81 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +0 -429.001 m 29 + 19 -429 l 29 + 19 -468.997 l 29 + 0 -469.002 l 29 + 0 -429.001 l 29 +0 -349.001 m 25 + 19 -349 l 25 + 19 -388.997 l 25 + 0 -389.002 l 25 + 0 -349.001 l 25 +0 -269.001 m 25 + 19 -269 l 25 + 19 -308.997 l 25 + 0 -309.002 l 25 + 0 -269.001 l 25 +0 -189.001 m 25 + 19 -189 l 25 + 19 -228.997 l 25 + 0 -229.002 l 25 + 0 -189.001 l 25 +0 -109.001 m 25 + 19 -109 l 25 + 19 -148.997 l 25 + 0 -149.002 l 25 + 0 -109.001 l 25 +0 -29.001 m 25 + 19 -29 l 25 + 19 -68.9971 l 25 + 0 -69.002 l 25 + 0 -29.001 l 25 +0 50.999 m 25 + 19 51 l 25 + 19 11.0029 l 25 + 0 10.998 l 25 + 0 50.999 l 25 +0 130.999 m 25 + 19 131 l 25 + 19 91.0029 l 25 + 0 90.998 l 25 + 0 130.999 l 25 +0 210.999 m 25 + 19 211 l 25 + 19 171.003 l 25 + 0 170.998 l 25 + 0 210.999 l 25 +0 290.999 m 25 + 19 291 l 25 + 19 251.003 l 25 + 0 250.998 l 25 + 0 290.999 l 25 +0 370.999 m 25 + 19 371 l 25 + 19 331.003 l 25 + 0 330.998 l 25 + 0 370.999 l 25 +0 450.999 m 25 + 19 451 l 25 + 19 411.003 l 25 + 0 410.998 l 25 + 0 450.999 l 25 +0 530.999 m 25 + 19 531 l 25 + 19 491.003 l 25 + 0 490.998 l 25 + 0 530.999 l 25 +0 610.999 m 25 + 19 611 l 25 + 19 571.003 l 25 + 0 570.998 l 25 + 0 610.999 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedFive Encoding: 82 -1 82 Width: 19 VWidth: 2048 @@ -2128,59 +2128,59 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking +StartChar: DivisioMaiorDottedBackingTwo Encoding: 83 -1 83 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 550.999> +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> LayerCount: 2 Fore SplineSet --30 630.999 m 25 - 49 631 l 25 +-30 0.999023 m 25 + 49 1 l 25 49 -488.997 l 29 -30 -489.002 l 29 - -30 630.999 l 25 + -30 0.999023 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.2 +StartChar: DivisioMaiorDottedBackingThree Encoding: 84 -1 84 Width: 19 VWidth: 2048 Flags: HW -HStem: -408.997 329.996 -VStem: 0 19<-408.997 -79.001> +VStem: 0 19<-408.997 235.999> LayerCount: 2 Fore SplineSet --30 0.999023 m 25 - 49 1 l 25 +-30 315.999 m 25 + 49 316 l 25 49 -488.997 l 29 -30 -489.002 l 29 - -30 0.999023 l 25 + -30 315.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.3 +StartChar: DivisioMaiorDottedBackingFour Encoding: 85 -1 85 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 235.999> +VStem: 0 19<-408.997 550.999> LayerCount: 2 Fore SplineSet --30 315.999 m 25 - 49 316 l 25 +-30 630.999 m 25 + 49 631 l 25 49 -488.997 l 29 -30 -489.002 l 29 - -30 315.999 l 25 + -30 630.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.5 +StartChar: DivisioMaiorDottedBackingFive Encoding: 86 -1 86 Width: 19 VWidth: 2048 @@ -2197,28 +2197,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima +StartChar: DivisioMinimaTwo Encoding: 87 -1 87 -AltUni2: 000050.ffffffff.0 -Width: 19 -VWidth: 2048 -Flags: W -HStem: 364.431 318.553 -VStem: 0 19<365.972 682.984> -LayerCount: 2 -Fore -SplineSet -0 371.128 m 13 - 0 682.984 l 29 - 18.999 683.021 l 29 - 19 364.431 l 21 - 6.04395 364.565 2.43457 367.609 0 371.128 c 13 -EndSplineSet -Validated: 1 -EndChar - -StartChar: DivisioMinima.2 -Encoding: 88 -1 88 Width: 19 VWidth: 1418 Flags: HW @@ -2235,8 +2215,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.3 -Encoding: 89 -1 89 +StartChar: DivisioMinimaThree +Encoding: 88 -1 88 Width: 19 VWidth: 1733 Flags: HW @@ -2253,7 +2233,27 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.5 +StartChar: DivisioMinimaFour +Encoding: 89 -1 89 +AltUni2: 000050.ffffffff.0 +Width: 19 +VWidth: 2048 +Flags: W +HStem: 364.431 318.553 +VStem: 0 19<365.972 682.984> +LayerCount: 2 +Fore +SplineSet +0 371.128 m 13 + 0 682.984 l 29 + 18.999 683.021 l 29 + 19 364.431 l 21 + 6.04395 364.565 2.43457 367.609 0 371.128 c 13 +EndSplineSet +Validated: 1 +EndChar + +StartChar: DivisioMinimaFive Encoding: 90 -1 90 Width: 19 VWidth: 2363 @@ -2271,7 +2271,7 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.6 +StartChar: DivisioMinimaSix Encoding: 91 -1 91 Width: 19 VWidth: 2678 @@ -2289,29 +2289,11 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinor +StartChar: DivisioMinorTwo Encoding: 92 -1 92 Width: 19 VWidth: 2048 Flags: W -VStem: 0 19<-293.375 385.622> -LayerCount: 2 -Fore -SplineSet -0 -296.375 m 9 - 0 383.125 l 21 - 3.87305 385.802 10.75 386.375 19 386.5 c 9 - 19 -293.375 l 17 - 14.875 -293.5 5 -293.375 0 -296.375 c 9 -EndSplineSet -Validated: 1 -EndChar - -StartChar: DivisioMinor.2 -Encoding: 93 -1 93 -Width: 19 -VWidth: 2048 -Flags: W HStem: -330.997 173.996 VStem: 0 19<-330.997 -157.001> LayerCount: 2 @@ -2325,8 +2307,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinor.3 -Encoding: 94 -1 94 +StartChar: DivisioMinorThree +Encoding: 93 -1 93 Width: 19 VWidth: 2048 Flags: W @@ -2343,7 +2325,25 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinor.5 +StartChar: DivisioMinorFour +Encoding: 94 -1 94 +Width: 19 +VWidth: 2048 +Flags: W +VStem: 0 19<-293.375 385.622> +LayerCount: 2 +Fore +SplineSet +0 -296.375 m 9 + 0 383.125 l 21 + 3.87305 385.802 10.75 386.375 19 386.5 c 9 + 19 -293.375 l 17 + 14.875 -293.5 5 -293.375 0 -296.375 c 9 +EndSplineSet +Validated: 1 +EndChar + +StartChar: DivisioMinorFive Encoding: 95 -1 95 Width: 19 VWidth: 2048 @@ -5984,32 +5984,9 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula +StartChar: VirgulaTwo Encoding: 252 -1 252 Width: 143 -VWidth: 2418 -Flags: W -HStem: 566.55 84.5<2.23911 67.6846> -VStem: 87.1504 55.8996<442.91 546.716> -LayerCount: 2 -Fore -SplineSet --6.4502 595.15 m 4 - -6.4502 639.87 22.1826 651.05 54.6504 651.05 c 4 - 81.2305 651.05 143.05 627.467 143.05 527.55 c 4 - 143.05 437.417 89.75 380.217 -16.8496 355.95 c 5 - -19.1338 358.234 -22.0498 368.296 -22.0498 371.55 c 4 - -22.0498 373.283 -21.6172 374.583 -20.75 375.45 c 5 - 51.1826 407.518 87.1504 445.65 87.1504 489.85 c 4 - 87.1504 551.21 49.4326 560.818 16.9502 566.55 c 4 - 1.34961 568.283 -6.4502 577.817 -6.4502 595.15 c 4 -EndSplineSet -Validated: 1 -EndChar - -StartChar: Virgula.2 -Encoding: 253 -1 253 -Width: 143 VWidth: 1788 Flags: HW HStem: -63.45 84.5<2.23911 67.6846> @@ -6029,8 +6006,8 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.3 -Encoding: 254 -1 254 +StartChar: VirgulaThree +Encoding: 253 -1 253 Width: 143 VWidth: 2103 Flags: HW @@ -6051,7 +6028,30 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.5 +StartChar: VirgulaFour +Encoding: 254 -1 254 +Width: 143 +VWidth: 2418 +Flags: W +HStem: 566.55 84.5<2.23911 67.6846> +VStem: 87.1504 55.8996<442.91 546.716> +LayerCount: 2 +Fore +SplineSet +-6.4502 595.15 m 4 + -6.4502 639.87 22.1826 651.05 54.6504 651.05 c 4 + 81.2305 651.05 143.05 627.467 143.05 527.55 c 4 + 143.05 437.417 89.75 380.217 -16.8496 355.95 c 5 + -19.1338 358.234 -22.0498 368.296 -22.0498 371.55 c 4 + -22.0498 373.283 -21.6172 374.583 -20.75 375.45 c 5 + 51.1826 407.518 87.1504 445.65 87.1504 489.85 c 4 + 87.1504 551.21 49.4326 560.818 16.9502 566.55 c 4 + 1.34961 568.283 -6.4502 577.817 -6.4502 595.15 c 4 +EndSplineSet +Validated: 1 +EndChar + +StartChar: VirgulaFive Encoding: 255 -1 255 Width: 143 VWidth: 2733 @@ -6073,7 +6073,7 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.6 +StartChar: VirgulaSix Encoding: 256 -1 256 Width: 143 VWidth: 3048 diff --git a/fonts/gregorio-base.sfd b/fonts/gregorio-base.sfd index cff891198..1ab2f81ca 100644 --- a/fonts/gregorio-base.sfd +++ b/fonts/gregorio-base.sfd @@ -19,7 +19,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1176402534 -ModificationTime: 1502068643 +ModificationTime: 1511565160 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -42,7 +42,7 @@ NameList: Adobe Glyph List DisplaySize: -96 AntiAlias: 1 FitToEm: 0 -WinInfo: 144 16 4 +WinInfo: 0 32 8 BeginPrivate: 0 EndPrivate Grid @@ -1320,7 +1320,7 @@ EndSplineSet Validated: 1 EndChar -StartChar: DivisioMaior +StartChar: DivisioMaiorTwo Encoding: 55 -1 55 Width: 19 VWidth: 2048 @@ -1329,16 +1329,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 550.999 m 29 - 19 551 l 25 +0 -79.001 m 29 + 19 -79 l 29 19 -408.997 l 25 0 -409.002 l 25 - 0 550.999 l 29 + 0 -79.001 l 29 EndSplineSet -Validated: 1 EndChar -StartChar: DivisioMaior.2 +StartChar: DivisioMaiorThree Encoding: 56 -1 56 Width: 19 VWidth: 2048 @@ -1347,15 +1346,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 -79.001 m 29 - 19 -79 l 29 +0 235.999 m 29 + 19 236 l 29 19 -408.997 l 25 0 -409.002 l 25 - 0 -79.001 l 29 + 0 235.999 l 29 EndSplineSet EndChar -StartChar: DivisioMaior.3 +StartChar: DivisioMaiorFour Encoding: 57 -1 57 Width: 19 VWidth: 2048 @@ -1364,15 +1363,16 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 235.999 m 29 - 19 236 l 29 +0 550.999 m 29 + 19 551 l 25 19 -408.997 l 25 0 -409.002 l 25 - 0 235.999 l 29 + 0 550.999 l 29 EndSplineSet +Validated: 1 EndChar -StartChar: DivisioMaior.5 +StartChar: DivisioMaiorFive Encoding: 58 -1 58 Width: 19 VWidth: 2048 @@ -1389,133 +1389,36 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMaiorDotted +StartChar: DivisioMaiorDottedTwo Encoding: 59 -1 59 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 550.999> -LayerCount: 2 -Fore -SplineSet -0 -429.001 m 29 - 19 -429 l 29 - 19 -468.997 l 29 - 0 -469.002 l 29 - 0 -429.001 l 29 -0 -349.001 m 25 - 19 -349 l 25 - 19 -388.997 l 25 - 0 -389.002 l 25 - 0 -349.001 l 25 -0 -269.001 m 25 - 19 -269 l 25 - 19 -308.997 l 25 - 0 -309.002 l 25 - 0 -269.001 l 25 -0 -189.001 m 25 - 19 -189 l 25 - 19 -228.997 l 25 - 0 -229.002 l 25 - 0 -189.001 l 25 -0 -109.001 m 25 - 19 -109 l 25 - 19 -148.997 l 25 - 0 -149.002 l 25 - 0 -109.001 l 25 -0 -29.001 m 25 - 19 -29 l 25 - 19 -68.9971 l 25 - 0 -69.002 l 25 - 0 -29.001 l 25 -0 50.999 m 25 - 19 51 l 25 - 19 11.0029 l 25 - 0 10.998 l 25 - 0 50.999 l 25 -0 130.999 m 25 - 19 131 l 25 - 19 91.0029 l 25 - 0 90.998 l 25 - 0 130.999 l 25 -0 210.999 m 25 - 19 211 l 25 - 19 171.003 l 25 - 0 170.998 l 25 - 0 210.999 l 25 -0 290.999 m 25 - 19 291 l 25 - 19 251.003 l 25 - 0 250.998 l 25 - 0 290.999 l 25 -0 370.999 m 25 - 19 371 l 25 - 19 331.003 l 25 - 0 330.998 l 25 - 0 370.999 l 25 -0 450.999 m 25 - 19 451 l 25 - 19 411.003 l 25 - 0 410.998 l 25 - 0 450.999 l 25 -0 530.999 m 25 - 19 531 l 25 - 19 491.003 l 25 - 0 490.998 l 25 - 0 530.999 l 25 -0 610.999 m 25 - 19 611 l 25 - 19 571.003 l 25 - 0 570.998 l 25 - 0 610.999 l 25 -EndSplineSet -EndChar - -StartChar: DivisioMaiorDotted.2 -Encoding: 60 -1 60 -Width: 19 -VWidth: 2048 -Flags: HW HStem: -408.997 329.996 VStem: 0 19<-408.997 -79.001> LayerCount: 2 Fore SplineSet -0 -424.001 m 29 - 19 -424 l 29 +19 176.003 m 25 + 19 -24 l 25 + 0 -24.001 l 25 + 0 175.998 l 25 + 19 176.003 l 25 +19 -463.997 m 29 + 19 -664 l 29 + 0 -664.001 l 25 + 0 -464.002 l 25 19 -463.997 l 29 - 0 -464.002 l 29 - 0 -424.001 l 29 -0 -344.001 m 25 +19 -143.997 m 25 19 -344 l 25 - 19 -383.997 l 25 - 0 -384.002 l 25 0 -344.001 l 25 -0 -264.001 m 25 - 19 -264 l 25 - 19 -303.997 l 25 - 0 -304.002 l 25 - 0 -264.001 l 25 -0 -184.001 m 25 - 19 -184 l 25 - 19 -223.997 l 25 - 0 -224.002 l 25 - 0 -184.001 l 25 -0 -104.001 m 25 - 19 -104 l 25 - 19 -143.997 l 25 0 -144.002 l 25 - 0 -104.001 l 25 -0 -24.001 m 25 - 19 -24 l 25 - 19 -63.9971 l 25 - 0 -64.002 l 25 - 0 -24.001 l 25 + 19 -143.997 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDotted.3 -Encoding: 61 -1 61 +StartChar: DivisioMaiorDottedThree +Encoding: 60 -1 60 Width: 19 VWidth: 2048 Flags: HW @@ -1523,60 +1426,67 @@ VStem: 0 19<-408.997 235.999> LayerCount: 2 Fore SplineSet -0 293.499 m 25 +19 493.503 m 25 19 293.5 l 25 - 19 253.503 l 25 - 0 253.498 l 25 0 293.499 l 25 -0 213.499 m 25 - 19 213.5 l 25 - 19 173.503 l 25 - 0 173.498 l 25 - 0 213.499 l 25 -0 133.499 m 25 - 19 133.5 l 25 - 19 93.5029 l 25 - 0 93.498 l 25 - 0 133.499 l 25 -0 53.499 m 25 - 19 53.5 l 25 - 19 13.5029 l 25 - 0 13.498 l 25 - 0 53.499 l 25 -0 -26.501 m 25 + 0 493.498 l 25 + 19 493.503 l 25 +19 173.503 m 25 19 -26.5 l 25 - 19 -66.4971 l 25 - 0 -66.502 l 25 0 -26.501 l 25 -0 -106.501 m 25 - 19 -106.5 l 25 - 19 -146.497 l 25 - 0 -146.502 l 25 - 0 -106.501 l 25 -0 -186.501 m 25 - 19 -186.5 l 25 - 19 -226.497 l 25 - 0 -226.502 l 25 - 0 -186.501 l 25 -0 -266.501 m 25 - 19 -266.5 l 25 - 19 -306.497 l 25 - 0 -306.502 l 25 - 0 -266.501 l 25 -0 -346.501 m 25 + 0 173.498 l 25 + 19 173.503 l 25 +19 -146.497 m 25 19 -346.5 l 25 - 19 -386.497 l 25 - 0 -386.502 l 25 0 -346.501 l 25 -0 -426.501 m 25 - 19 -426.5 l 25 - 19 -466.497 l 25 + 0 -146.502 l 25 + 19 -146.497 l 25 +19 -466.497 m 29 + 19 -666.5 l 29 + 0 -666.501 l 25 0 -466.502 l 25 - 0 -426.501 l 25 + 19 -466.497 l 29 EndSplineSet EndChar -StartChar: DivisioMaiorDotted.5 +StartChar: DivisioMaiorDottedFour +Encoding: 61 -1 61 +Width: 19 +VWidth: 2048 +Flags: HW +VStem: 0 19<-408.997 550.999> +LayerCount: 2 +Fore +SplineSet +19 811.003 m 25 + 19 611 l 25 + 0 610.999 l 25 + 0 810.998 l 25 + 19 811.003 l 25 +19 -468.997 m 29 + 19 -669 l 29 + 0 -669.001 l 25 + 0 -469.002 l 25 + 19 -468.997 l 29 +19 -148.997 m 25 + 19 -349 l 25 + 0 -349.001 l 25 + 0 -149.002 l 25 + 19 -148.997 l 25 +19 171.003 m 25 + 19 -29 l 25 + 0 -29.001 l 25 + 0 170.998 l 25 + 19 171.003 l 25 +19 491.003 m 25 + 19 291 l 25 + 0 290.999 l 25 + 0 490.998 l 25 + 19 491.003 l 25 +EndSplineSet +EndChar + +StartChar: DivisioMaiorDottedFive Encoding: 62 -1 62 Width: 19 VWidth: 2048 @@ -1585,152 +1495,92 @@ VStem: 0 19<-408.997 865.999> LayerCount: 2 Fore SplineSet -0 928.499 m 25 +19 1128.5 m 25 19 928.5 l 25 - 19 888.503 l 25 - 0 888.498 l 25 0 928.499 l 25 -0 848.499 m 25 - 19 848.5 l 25 - 19 808.503 l 25 - 0 808.498 l 25 - 0 848.499 l 25 -0 768.499 m 25 - 19 768.5 l 25 - 19 728.503 l 25 - 0 728.498 l 25 - 0 768.499 l 25 -0 688.499 m 25 - 19 688.5 l 25 - 19 648.503 l 25 - 0 648.498 l 25 - 0 688.499 l 25 -0 608.499 m 25 + 0 1128.5 l 25 + 19 1128.5 l 25 +19 808.503 m 25 19 608.5 l 25 - 19 568.503 l 25 - 0 568.498 l 25 0 608.499 l 25 -0 528.499 m 25 - 19 528.5 l 25 - 19 488.503 l 25 - 0 488.498 l 25 - 0 528.499 l 25 -0 448.499 m 25 - 19 448.5 l 25 - 19 408.503 l 25 - 0 408.498 l 25 - 0 448.499 l 25 -0 368.499 m 25 - 19 368.5 l 25 - 19 328.503 l 25 - 0 328.498 l 25 - 0 368.499 l 25 -0 288.499 m 25 + 0 808.498 l 25 + 19 808.503 l 25 +19 488.503 m 25 19 288.5 l 25 - 19 248.503 l 25 - 0 248.498 l 25 0 288.499 l 25 -0 208.499 m 25 - 19 208.5 l 25 - 19 168.503 l 25 - 0 168.498 l 25 - 0 208.499 l 25 -0 128.499 m 25 - 19 128.5 l 25 - 19 88.5029 l 25 - 0 88.498 l 25 - 0 128.499 l 25 -0 48.499 m 25 - 19 48.5 l 25 - 19 8.50293 l 25 - 0 8.49805 l 25 - 0 48.499 l 25 -0 -31.501 m 25 + 0 488.498 l 25 + 19 488.503 l 25 +19 168.503 m 25 19 -31.5 l 25 - 19 -71.4971 l 25 - 0 -71.502 l 25 0 -31.501 l 25 -0 -111.501 m 25 - 19 -111.5 l 25 - 19 -151.497 l 25 - 0 -151.502 l 25 - 0 -111.501 l 25 -0 -191.501 m 25 - 19 -191.5 l 25 - 19 -231.497 l 25 - 0 -231.502 l 25 - 0 -191.501 l 25 -0 -271.501 m 25 - 19 -271.5 l 25 - 19 -311.497 l 25 - 0 -311.502 l 25 - 0 -271.501 l 25 -0 -351.501 m 25 + 0 168.498 l 25 + 19 168.503 l 25 +19 -151.497 m 25 19 -351.5 l 25 - 19 -391.497 l 25 - 0 -391.502 l 25 0 -351.501 l 25 -0 -431.501 m 25 - 19 -431.5 l 25 - 19 -471.497 l 25 + 0 -151.502 l 25 + 19 -151.497 l 25 +19 -471.497 m 29 + 19 -671.5 l 29 + 0 -671.501 l 25 0 -471.502 l 25 - 0 -431.501 l 25 + 19 -471.497 l 29 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking +StartChar: DivisioMaiorDottedBackingTwo Encoding: 63 -1 63 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 550.999> +HStem: -408.997 329.996 +VStem: 0 19<-408.997 -79.001> LayerCount: 2 Fore SplineSet --30 630.999 m 25 - 49 631 l 25 - 49 -488.997 l 29 - -30 -489.002 l 29 - -30 630.999 l 25 +-30 200.999 m 25 + 49 201 l 25 + 49 -688.997 l 29 + -30 -689.002 l 29 + -30 200.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.2 +StartChar: DivisioMaiorDottedBackingThree Encoding: 64 -1 64 Width: 19 VWidth: 2048 Flags: HW -HStem: -408.997 329.996 -VStem: 0 19<-408.997 -79.001> +VStem: 0 19<-408.997 235.999> LayerCount: 2 Fore SplineSet --30 0.999023 m 25 - 49 1 l 25 - 49 -488.997 l 29 - -30 -489.002 l 29 - -30 0.999023 l 25 +-30 515.999 m 25 + 49 516 l 25 + 49 -688.997 l 29 + -30 -689.002 l 29 + -30 515.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.3 +StartChar: DivisioMaiorDottedBackingFour Encoding: 65 -1 65 Width: 19 VWidth: 2048 Flags: HW -VStem: 0 19<-408.997 235.999> +VStem: 0 19<-408.997 550.999> LayerCount: 2 Fore SplineSet --30 315.999 m 25 - 49 316 l 25 - 49 -488.997 l 29 - -30 -489.002 l 29 - -30 315.999 l 25 +-30 830.999 m 25 + 49 831 l 25 + 49 -688.997 l 29 + -30 -689.002 l 29 + -30 830.999 l 25 EndSplineSet EndChar -StartChar: DivisioMaiorDottedBacking.5 +StartChar: DivisioMaiorDottedBackingFive Encoding: 66 -1 66 Width: 19 VWidth: 2048 @@ -1739,35 +1589,16 @@ VStem: 0 19<-408.997 865.999> LayerCount: 2 Fore SplineSet --30 945.999 m 25 - 49 946 l 25 - 49 -488.997 l 29 - -30 -489.002 l 29 - -30 945.999 l 25 +-30 1146 m 25 + 49 1146 l 25 + 49 -688.997 l 29 + -30 -689.002 l 29 + -30 1146 l 25 EndSplineSet EndChar -StartChar: DivisioMinima +StartChar: DivisioMinimaTwo Encoding: 67 -1 67 -AltUni2: 000050.ffffffff.0 -Width: 19 -VWidth: 2048 -Flags: HW -HStem: -409 15 -94 15 221 15 536 15 -LayerCount: 2 -Fore -SplineSet -0 359.128 m 9 - 0 719.984 l 29 - 18.999 720.021 l 25 - 19 352.431 l 17 - 6.04348 352.565 2.43478 355.609 0 359.128 c 9 -EndSplineSet -Validated: 1 -EndChar - -StartChar: DivisioMinima.2 -Encoding: 68 -1 68 Width: 19 VWidth: 1418 Flags: HW @@ -1783,8 +1614,8 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.3 -Encoding: 69 -1 69 +StartChar: DivisioMinimaThree +Encoding: 68 -1 68 Width: 19 VWidth: 1733 Flags: HW @@ -1800,7 +1631,26 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.5 +StartChar: DivisioMinimaFour +Encoding: 69 -1 69 +AltUni2: 000050.ffffffff.0 +Width: 19 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +0 359.128 m 9 + 0 719.984 l 29 + 18.999 720.021 l 25 + 19 352.431 l 17 + 6.04348 352.565 2.43478 355.609 0 359.128 c 9 +EndSplineSet +Validated: 1 +EndChar + +StartChar: DivisioMinimaFive Encoding: 70 -1 70 Width: 19 VWidth: 2363 @@ -1817,7 +1667,7 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinima.6 +StartChar: DivisioMinimaSix Encoding: 71 -1 71 Width: 19 VWidth: 2678 @@ -1834,7 +1684,7 @@ SplineSet EndSplineSet EndChar -StartChar: DivisioMinor +StartChar: DivisioMinorTwo Encoding: 72 -1 72 Width: 19 VWidth: 2048 @@ -1843,16 +1693,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 -296.375 m 9 - 0 383.125 l 21 - 3.87305 385.802 10.75 386.375 19 386.5 c 9 - 19 -293.375 l 17 - 14.875 -293.5 5 -293.375 0 -296.375 c 9 +0 -157.001 m 25 + 19 -157 l 25 + 19 -330.997 l 25 + 0 -331.002 l 25 + 0 -157.001 l 25 EndSplineSet -Validated: 1 EndChar -StartChar: DivisioMinor.2 +StartChar: DivisioMinorThree Encoding: 73 -1 73 Width: 19 VWidth: 2048 @@ -1861,15 +1710,15 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 -157.001 m 25 - 19 -157 l 25 - 19 -330.997 l 25 - 0 -331.002 l 25 - 0 -157.001 l 25 +0 78.499 m 25 + 19 78.5 l 25 + 19 -251.497 l 29 + 0 -251.502 l 29 + 0 78.499 l 25 EndSplineSet EndChar -StartChar: DivisioMinor.3 +StartChar: DivisioMinorFour Encoding: 74 -1 74 Width: 19 VWidth: 2048 @@ -1878,15 +1727,16 @@ HStem: -409 15 -94 15 221 15 536 15 LayerCount: 2 Fore SplineSet -0 78.499 m 25 - 19 78.5 l 25 - 19 -251.497 l 29 - 0 -251.502 l 29 - 0 78.499 l 25 +0 -296.375 m 9 + 0 383.125 l 21 + 3.87305 385.802 10.75 386.375 19 386.5 c 9 + 19 -293.375 l 17 + 14.875 -293.5 5 -293.375 0 -296.375 c 9 EndSplineSet +Validated: 1 EndChar -StartChar: DivisioMinor.5 +StartChar: DivisioMinorFive Encoding: 75 -1 75 Width: 19 VWidth: 2048 @@ -4846,28 +4696,9 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula +StartChar: VirgulaTwo Encoding: 209 -1 209 Width: 152 -VWidth: 2048 -Flags: HW -HStem: -409 15 -94 15 221 15 536 15 -LayerCount: 2 -Fore -SplineSet -152 553.333 m 1 - 152 497.678 67 439 0 418.998 c 1 - 46 458 152.5 495.998 120 561.998 c 1 - 124.5 530.998 17 510.498 17 572.998 c 1 - 17 597.998 49 612.998 75 612.998 c 1 - 122.5 613.998 152 586.678 152 553.333 c 1 -EndSplineSet -Validated: 33 -EndChar - -StartChar: Virgula.2 -Encoding: 210 -1 210 -Width: 152 VWidth: 1418 Flags: HW HStem: -1039 15 -724 15 -409 15 -94 15 @@ -4883,8 +4714,8 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.3 -Encoding: 211 -1 211 +StartChar: VirgulaThree +Encoding: 210 -1 210 Width: 152 VWidth: 1733 Flags: HW @@ -4901,7 +4732,26 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.5 +StartChar: VirgulaFour +Encoding: 211 -1 211 +Width: 152 +VWidth: 2048 +Flags: HW +HStem: -409 15 -94 15 221 15 536 15 +LayerCount: 2 +Fore +SplineSet +152 553.333 m 1 + 152 497.678 67 439 0 418.998 c 1 + 46 458 152.5 495.998 120 561.998 c 1 + 124.5 530.998 17 510.498 17 572.998 c 1 + 17 597.998 49 612.998 75 612.998 c 1 + 122.5 613.998 152 586.678 152 553.333 c 1 +EndSplineSet +Validated: 33 +EndChar + +StartChar: VirgulaFive Encoding: 212 -1 212 Width: 152 VWidth: 2363 @@ -4919,7 +4769,7 @@ SplineSet EndSplineSet EndChar -StartChar: Virgula.6 +StartChar: VirgulaSix Encoding: 213 -1 213 Width: 152 VWidth: 2678 diff --git a/fonts/squarize.py b/fonts/squarize.py index 69408fc8f..1c5b504f1 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -255,12 +255,32 @@ def precise_message(glyph_name): 'FClefChange' : False, 'Flat' : False, 'Natural' : False, - 'Virgula' : False, - 'DivisioMinima' : False, - 'DivisioMinor' : False, - 'DivisioMaior' : False, - 'DivisioMaiorDotted' : False, - 'DivisioMaiorDottedBacking' : False, + 'VirgulaTwo' : False, + 'VirgulaThree' : False, + 'VirgulaFour' : False, + 'VirgulaFive' : False, + 'VirgulaSix' : False, + 'DivisioMinimaTwo' : False, + 'DivisioMinimaThree' : False, + 'DivisioMinimaFour' : False, + 'DivisioMinimaFive' : False, + 'DivisioMinimaSix' : False, + 'DivisioMinorTwo' : False, + 'DivisioMinorThree' : False, + 'DivisioMinorFour' : False, + 'DivisioMinorFive' : False, + 'DivisioMaiorTwo' : False, + 'DivisioMaiorThree' : False, + 'DivisioMaiorFour' : False, + 'DivisioMaiorFive' : False, + 'DivisioMaiorDottedTwo' : False, + 'DivisioMaiorDottedThree' : False, + 'DivisioMaiorDottedFour' : False, + 'DivisioMaiorDottedFive' : False, + 'DivisioMaiorDottedBackingTwo' : False, + 'DivisioMaiorDottedBackingThree' : False, + 'DivisioMaiorDottedBackingFour' : False, + 'DivisioMaiorDottedBackingFive' : False, 'PunctumDeminutus' : False, 'AuctumMora' : False, 'Punctum' : True, diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index d399fef38..9705c519d 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -1134,10 +1134,14 @@ \let\gre@pitch@ledger@above\gre@pitch@h % \let\gre@pitch@raresign\gre@pitch@g % \let\gre@pitch@overbrace\gre@pitch@i % - \grechangeglyph{Virgula}{*}{.2}% - \grechangeglyph{Divisio*}{*}{.2}% - \grechangeglyph{VirgulaHigh}{*}{Virgula.3}% - \grechangeglyph{DivisioMinimaHigh}{*}{DivisioMinima.3}% + \let\gre@char@bar@virgula\GreCPVirgulaTwo % + \let\gre@char@bar@virgulahigh\GreCPVirgulaThree % + \let\gre@char@bar@divisiominima\GreCPDivisioMinimaTwo % + \let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaThree % + \let\gre@char@bar@divisiominor\GreCPDivisioMinorTwo % + \let\gre@char@bar@divisiomaior\GreCPDivisioMaiorTwo % + \let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedTwo % + \let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingTwo % \gre@haslinethreefalse % \gre@haslinefourfalse % \gre@haslinefivefalse % @@ -1147,10 +1151,14 @@ \let\gre@pitch@ledger@above\gre@pitch@j % \let\gre@pitch@raresign\gre@pitch@i % \let\gre@pitch@overbrace\gre@pitch@k % - \grechangeglyph{Virgula}{*}{.3}% - \grechangeglyph{Divisio*}{*}{.3}% - \grechangeglyph{VirgulaHigh}{*}{Virgula}% - \grechangeglyph{DivisioMinimaHigh}{*}{DivisioMinima}% + \let\gre@char@bar@virgula\GreCPVirgulaThree % + \let\gre@char@bar@virgulahigh\GreCPVirgulaFour % + \let\gre@char@bar@divisiominima\GreCPDivisioMinimaThree % + \let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaFour % + \let\gre@char@bar@divisiominor\GreCPDivisioMinorThree % + \let\gre@char@bar@divisiomaior\GreCPDivisioMaiorThree % + \let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedThree % + \let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingThree % \gre@haslinethreetrue % \gre@haslinefourfalse % \gre@haslinefivefalse % @@ -1160,10 +1168,14 @@ \let\gre@pitch@ledger@above\gre@pitch@l % \let\gre@pitch@raresign\gre@pitch@k % \let\gre@pitch@overbrace\gre@pitch@m % - \greresetglyph{Virgula}% - \greresetglyph{Divisio*}% - \grechangeglyph{VirgulaHigh}{*}{Virgula.5}% - \grechangeglyph{DivisioMinimaHigh}{*}{DivisioMinima.5}% + \let\gre@char@bar@virgula\GreCPVirgulaFour % + \let\gre@char@bar@virgulahigh\GreCPVirgulaFive % + \let\gre@char@bar@divisiominima\GreCPDivisioMinimaFour % + \let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaFive % + \let\gre@char@bar@divisiominor\GreCPDivisioMinorFour % + \let\gre@char@bar@divisiomaior\GreCPDivisioMaiorFour % + \let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedFour % + \let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingFour % \gre@haslinethreetrue % \gre@haslinefourtrue % \gre@haslinefivefalse % @@ -1173,10 +1185,14 @@ \let\gre@pitch@ledger@above\gre@pitch@n % \let\gre@pitch@raresign\gre@pitch@m % \let\gre@pitch@overbrace\gre@pitch@p % - \grechangeglyph{Virgula}{*}{.5}% - \grechangeglyph{Divisio*}{*}{.5}% - \grechangeglyph{VirgulaHigh}{*}{Virgula.6}% - \grechangeglyph{DivisioMinimaHigh}{*}{DivisioMinima.6}% + \let\gre@char@bar@virgula\GreCPVirgulaFive % + \let\gre@char@bar@virgulahigh\GreCPVirgulaSix % + \let\gre@char@bar@divisiominima\GreCPDivisioMinimaFive % + \let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaSix % + \let\gre@char@bar@divisiominor\GreCPDivisioMinorFive % + \let\gre@char@bar@divisiomaior\GreCPDivisioMaiorFive % + \let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedFive % + \let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingFive % \gre@haslinethreetrue % \gre@haslinefourtrue % \gre@haslinefivetrue % diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 10f0ce227..cf044b7bf 100644 --- a/tex/gregoriotex-signs.lua +++ b/tex/gregoriotex-signs.lua @@ -197,14 +197,14 @@ local offset_cases = { -- standard bar { case = 'BarStandard', - v = [[\gre@vepisemaorrareaux{0}{\GreCPDivisioMinima}{1}{0}{#2}{#3}{#4}]], - h = [[\gre@hepisorlineaux{\GreCPDivisioMinima}{\gre@char@he@barstandard{#4}}{2}{#3}]], + v = [[\gre@vepisemaorrareaux{0}{\gre@char@bar@divisiominima}{1}{0}{#2}{#3}{#4}]], + h = [[\gre@hepisorlineaux{\gre@char@bar@divisiominima}{\gre@char@he@barstandard{#4}}{2}{#3}]], }, -- virgula { case = 'BarVirgula', - v = [[\gre@vepisemaorrareaux{0}{\GreCPVirgula}{1}{0}{#2}{#3}{#4}]], - h = [[\gre@hepisorlineaux{\GreCPVirgula}{\gre@char@he@barvirgula{#4}}{2}{#3}]], + v = [[\gre@vepisemaorrareaux{0}{\gre@char@bar@virgula}{1}{0}{#2}{#3}{#4}]], + h = [[\gre@hepisorlineaux{\gre@char@bar@virgula}{\gre@char@he@barvirgula{#4}}{2}{#3}]], }, -- divisio finalis { diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 794776e96..447713fd6 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -2109,8 +2109,8 @@ \gre@hskip\gre@skip@temp@four % \GreNoBreak % \fi % - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPVirgula}% - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPVirgula}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@virgula}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@virgula}% #4\relax % \ifnum\gre@count@temp@one=1\relax % \GreNoBreak % @@ -2123,8 +2123,8 @@ \gre@hskip\gre@skip@temp@four % \GreNoBreak % \fi % - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinima}% - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMinima}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominima}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominima}% #4\relax % \ifnum\gre@count@temp@one=1\relax % \GreNoBreak % @@ -2137,8 +2137,8 @@ \gre@hskip\gre@skip@temp@four % \GreNoBreak % \fi % - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinor}% - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMinor}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominor}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominor}% #4\relax % \ifnum\gre@count@temp@one=1\relax % \GreNoBreak % @@ -2151,7 +2151,7 @@ \gre@hskip\gre@skip@temp@four % \GreNoBreak % \fi % - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaior}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaior}% \gre@fontchar@divisiomaior % #4\relax % \ifnum\gre@count@temp@one=1\relax % @@ -2322,8 +2322,8 @@ \GreNoBreak % \fi % \GreGlyphHeights{\gre@pitch@ledger@above}{\gre@pitch@ledger@above}% - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPVirgulaHigh}% - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPVirgulaHigh}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@virgulahigh}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@virgulahigh}% \GreAdditionalLine{\GreOCaseBarVirgula}{0}{2}% #4\relax % \ifnum\gre@count@temp@one=1\relax % @@ -2338,8 +2338,8 @@ \GreNoBreak % \fi % \GreGlyphHeights{\gre@pitch@ledger@above}{\gre@pitch@ledger@above}% - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinimaHigh}% - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMinimaHigh}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominimahigh}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominimahigh}% \GreAdditionalLine{\GreOCaseBarStandard}{0}{2}% #4\relax % \ifnum\gre@count@temp@one=1\relax % @@ -2353,17 +2353,17 @@ \gre@hskip\gre@skip@temp@four % \GreNoBreak % \fi % - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaiorDotted}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaiordotted}% \ifgre@hidedottedbarlines % \hbox to 0pt{% {% \color{grebackgroundcolor}% - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMaiorDottedBacking}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiomaiordottedbacking}% }% \hss % }% \fi % - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMaiorDotted}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiomaiordotted}% #4\relax % \ifnum\gre@count@temp@one=1\relax % \GreNoBreak % @@ -2384,9 +2384,9 @@ \def\gre@fontchar@divisiomaior{% \ifnum\gre@stafflinefactor=17\relax % %\gre@calculate@glyphraisevalue{\gre@pitch@bar}{0}{}% bar glyphs are made to be at this height - \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMaior}% + \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiomaior}% \else % - \setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaior}% + \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaior}% % we calculate the raise of the bar \gre@dimen@temp@five=\dimexpr(\gre@dimen@additionalbottomspace % + \gre@space@dimen@spacebeneathtext % diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 8418a57b5..c2c04b096 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -233,16 +233,16 @@ \gre@handleclivisspecialalignment{\gre@font@music\GreCPFlexusTwoDeminutus}{\gre@font@music\GreCPPunctum}{#2}% \or % % case of virgula - \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPVirgula}% + \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@virgula}% \or % % case of divisio minima - \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinima}% + \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominima}% \or % % case of divisio minor - \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinor}% + \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominor}% \or % % case of divisio maior - \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaior}% + \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaior}% \or % % case of dominican bar \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioDominican}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 872edcb78..7832cc6cc 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -1096,8 +1096,8 @@ local function change_score_glyph(glyph_name, font_name, replacement, cavum) cavum = cavum or '' if string.match(glyph_name, '%*') then glyph_name = '^'..glyph_name:gsub('%*', '.*')..'$' - if not string.match(replacement, '^%.') then - err('If a wildcard is supplied for glyph name, replacement must start with a dot.') + if replacement ~= '' and not string.match(replacement, '^%.') then + err('If a wildcard is supplied for glyph name, replacement must be blank or start with a dot.') end local general_font = general_font_for(cavum) local other_font