summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-10 21:27:24 +0000
committerKarl Berry <karl@freefriends.org>2016-05-10 21:27:24 +0000
commit18e100730bd2e086a899a55f7423e028f07e90b9 (patch)
treea8a1e68d59e61256ebffadbe060ee834a29f60af /Master
parent8a59bef2d86da7bbe2ffd977865b0e011b4175aa (diff)
gregoriotex (10may16)
git-svn-id: svn://tug.org/texlive/trunk@41008 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex171
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex40
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex63
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdfbin0 -> 279402 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdfbin280390 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex1
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdfbin0 -> 675857 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdfbin712227 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua100
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex13
-rw-r--r--Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex10
-rw-r--r--Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd583
-rw-r--r--Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd648
-rw-r--r--Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd581
-rw-r--r--Master/texmf-dist/fonts/source/gregoriotex/squarize.py687
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttfbin1190560 -> 1143908 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttfbin1201976 -> 1154816 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttfbin1047512 -> 1007208 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttfbin1015316 -> 976532 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttfbin24748 -> 24748 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttfbin140096 -> 140096 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttfbin1071964 -> 1024560 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttfbin1058480 -> 1011708 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttfbin184740 -> 184740 bytes
-rw-r--r--Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty12
-rw-r--r--Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty27
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex24
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex362
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex2
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua18
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex192
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex260
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex169
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex5
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua331
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex50
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex58
39 files changed, 1705 insertions, 2706 deletions
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
index ae1dbd80222..e1e4fac9ede 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
@@ -234,8 +234,7 @@ Macro to create one of Gregorio\TeX’s distances. Used to initialize distances
\#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\
\#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
\#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
- & \texttt{scalable} & Distance will scale when staff size is changed.\\
- & \texttt{inherited} & Distance will inherit its value from another distance. When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance.
+ & \texttt{scalable} & Distance will scale when staff size is changed.
\end{argtable}
\macroname{\textbackslash grechangedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
@@ -245,8 +244,7 @@ Macro to change one of Gregorio\TeX’s distances. This function will check to
\#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\
\#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
\#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
- & \texttt{scalable} & Distance will scale when staff size is changed.\\
- & \texttt{inherited} & Distance will inherit its value from another distance. When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance.
+ & \texttt{scalable} & Distance will scale when staff size is changed.
\end{argtable}
\macroname{\textbackslash grescaledim}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
@@ -261,10 +259,10 @@ Macro to turn on or off scaling with the staff size for a particular distance.
\textbf{Nota bene:} This macro also can be used to change whether or not the staff line thickness scales with the staff size by specifying \texttt{stafflinefactor} for the first argument.
\macroname{\textbackslash grechangecount}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
-Macro to change one of Gregorio\TeX’s counts or penalities (numeric values).
+Macro to change one of Gregorio\TeX’s counts (numeric values).
\begin{argtable}
- \#1 & string & The name of the count to be changed. See \nameref{counts} and \nameref{penalties} below.\\
+ \#1 & string & The name of the count to be changed. See \nameref{counts} below.\\
\#2 & integer & The new value.\\
\end{argtable}
@@ -711,7 +709,8 @@ Different elements of an include score have different styles applied. These ele
\stylename{modedifferentia} & the rendered annotation from the \texttt{mode-differentia: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textbf{bold}}\\
\stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{bold small capitals}}}\\
\stylename{modemodifier} & the rendered annotation from the \texttt{mode-modifier: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textit{\textbf{bold italics}}}\\
- \stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor}\\
+ \stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor} (\LaTeX)\\
+ && none (Plain \TeX)\\
\stylename{normalstafflines} & Full length staff lines & none\\
\stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
\end{tabular}
@@ -781,7 +780,7 @@ Macro to add an illuminated initial.
\textbf{Nota Bene:} Usually the argument of this command should be an \verb=\includegraphics= command, but you may use what ever you want as the illuminated initial.
-\macroname{\textbackslash gresetinitiallines}{\{\#1\}}{gregoriotex-syllable.tex}
+\macroname{\textbackslash gresetinitiallines}{\#1}{gregoriotex-syllable.tex}
Sets the number of lines the score initial requires.
\begin{argtable}
@@ -790,7 +789,7 @@ Sets the number of lines the score initial requires.
\textbf{Nota Bene:} As currently implemented, you cannot set an initial which is larger than 2 lines and in order to do so you must set manual line breaks in the gabc for the first two lines.
-\macroname{\textbackslash gresetmodenumbersystem}{\{\#1\}}{gregoriotex-main.tex}
+\macroname{\textbackslash gresetmodenumbersystem}{\#1}{gregoriotex-main.tex}
Sets the number system used for the mode number.
\begin{argtable}
@@ -799,15 +798,6 @@ Sets the number system used for the mode number.
& \texttt{arabic} & Use Arabic numerals.\\
\end{argtable}
-\macroname{\textbackslash gresetlyrics}{\{\#1\}}{gregoriotex-syllable.tex}
-Sets the visibility of the lyrics.
-
-\begin{argtable}
- \#1 & \texttt{visible} & Lyrics are visible (default).\\
- & \texttt{invisible} & Lyrics are not visible.\\
-\end{argtable}
-
-
\subsubsection{Text Alignment}
Gregorio\TeX\ allows you to manipulate the global alignment behavior of some text elements using the following commands.
@@ -905,15 +895,6 @@ Macro to determine whether line breaks are allowed inside a translation.
& \texttt{prohibit} & Line breaks are prohibited, the entire translation should appear on one line
\end{argtable}
-\macroname{\textbackslash gresetcustosalteration}{\{\#1\}}{gregoriotex-signs.tex}
-Macro for setting whether an alteration (flat, sharp, or natural) should be
-rendered before a custos or not.
-
-\begin{argtable}
- \#1 & \texttt{visible} & The custos alteration should be printed (default)\\
- & \texttt{invisible} & The custos alteration should not be printed
-\end{argtable}
-
\macroname{\textbackslash greseteolcustos}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break.
@@ -958,21 +939,6 @@ Macro to determine whether the last line of the score should be justified or not
& \texttt{ragged} & Set the last line ragged (default)
\end{argtable}
-\macroname{\textbackslash gresetunbreakablesyllablenote}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-syllable.tex}
-Configures how notes should be kept together on line breaks.
-
-\begin{argtable}
- \#1 & integer & The minimum number of notes in the syllable before the
- syllable may be broken across lines. Defaults to
- \getgrecount{unbreakabletotalnotes}.\\
- \#2 & integer & The minimum number of notes at the start of a syllable that
- must be kept together when the syllable is broken across
- lines. Defaults to \getgrecount{unbreakableinitialnotes}.\\
- \#3 & integer & The minimum number of notes at the end of a syllable that
- must be kept together when the syllable is broken across
- lines. Defaults to \getgrecount{unbreakablefinalnotes}.\\
-\end{argtable}
-
\subsubsection{Bar spacing}
@@ -1000,16 +966,6 @@ Macro to activate the new bar spacing algorithm. The new algorithm attempts to
\subsubsection{Sign printing}
-\macroname{\textbackslash gresetnotes}{\{\#1\}}{gregoriotex-syllable.tex}
-Sets the visibility of the notes.
-
-\begin{argtable}
- \#1 & \texttt{visible} & Notes are visible (default).\\
- & \texttt{invisible} & Notes are not visible.\\
-\end{argtable}
-
-\textbf{Nota Bene:} If the notes are set to be invisible, then bar lines, rythmic signs, and the like will also be invisible. However, the staff lines and clefs will still show up (since their visibility is controlled by other settings).
-
\macroname{\textbackslash greprintsigns}{\{\#1\}\{\#2\}}{gregoriotex-signs.tex}
Macro to prevent rythmic signs from printing (all signs are printed by default):
@@ -1019,7 +975,7 @@ Macro to prevent rythmic signs from printing (all signs are printed by default):
& \texttt{mora} & sets the printing of punctum mora and auctum duplex\\
& \texttt{all} & set the printing of all of these\\
\#2 & \texttt{enable} & enable the printing\\
- & \texttt{disable} & disable the printing\\
+ & \texttt{disable} & disable the priting\\
\end{argtable}
Note that punctum mora and auctum duplex have an influence on spacings, so removing them will have an impact on that matter.
@@ -1193,18 +1149,22 @@ Macro to set the font to be used for the ancient notation.
Each of the following counts controls some aspect of the configuration of the Gregorio\TeX\ score. They are changed using \verb=\grechangecount=, documented above.
-\begin{gcount}{additionaltopspacethreshold}
+\macroname{additionaltopspacethreshold}{}{gsp-default.tex}
+
The threshold above which we start accounting notes above lines for additional
vertical space. For instance with a threshold of \texttt{2}, notes with a pitch
of \texttt{k} and \texttt{l} will not interfere with the space above lines.
Set it to a high value if you don't want high notes to interfere with space
above lines.
-\end{gcount}
-\begin{gcount}{additionaltopspacealtthreshold}
+Default: \texttt{2}
+
+\macroname{additionaltopspacealtthreshold}{}{gsp-default.tex}
+
Same as \texttt{additionaltopspacethreshold} but setting the threshold for
notes taken into account with above lines text vertical placement.
-\end{gcount}
+
+Default: \texttt{0}
\subsection{Distances}\label{distances}
@@ -1330,11 +1290,7 @@ Space between notes of a bistropha or tristrophae.
\end{gdimension}
\begin{gdimension}{punctuminclinatumshift}
-Space between two descending puncta inclinata.
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatumunisonshift}
-Space between two unison puncta inclinata.
+Space between two punctum inclinatum.
\end{gdimension}
\begin{gdimension}{beforepunctainclinatashift}
@@ -1342,8 +1298,7 @@ Space before puncta inclinata.
\end{gdimension}
\begin{gdimension}{punctuminclinatumanddebilisshift}
-Space between a punctum inclinatum and a punctum inclinatum deminutus,
-descending.
+Space between a punctum inclinatum and a punctum inclinatum deminutus.
\end{gdimension}
\begin{gdimension}{punctuminclinatumdebilisshift}
@@ -1351,11 +1306,11 @@ Space between two punctum inclinatum deminutus.
\end{gdimension}
\begin{gdimension}{punctuminclinatumbigshift}
-Space between descending puncta inclinata, larger ambitus (range=3rd).
+Space between puncta inclinata, larger ambitus (range=3rd).
\end{gdimension}
\begin{gdimension}{punctuminclinatummaxshift}
-Space between descending puncta inclinata, larger ambitus (range=4th or 5th).
+Space between puncta inclinata, larger ambitus (range=4th or 5th).
\end{gdimension}
\begin{gdimension}{ascendingpunctuminclinatumshift}
@@ -1597,7 +1552,7 @@ Vertical distance to place a punctum mora for the second note in a porrectus (or
Distance to place a ``rare'' sign above the top space in a score.
\end{gdimension}
-\subsubsection{Bar distances}
+\subsubsection*{Bar distances}
\begin{gdimension}{bar@finalfinalis}
This space is added before the final divisio final of a score (old bar spacing algorithm only).
@@ -1729,74 +1684,87 @@ Same as \texttt{maxbaroffsettextleft@eol} but when the center of the text goes r
\subsection{Penalties}\label{penalties}
-Penalties are used by \TeX\ to determine where line and page breaks should occur. Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores. With the exception of \texttt{emergencystretch} (which should be changed using \verb=\grechangedim=) these should be changed using \verb=\grechangecount=, described above.
+Penalties are used by \TeX\ to determine where line and page breaks should occur. Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores.
-\begin{gcount}{brokenpenalty}
+\macroname{\textbackslash grebrokenpenalty}{}{gsp-default.tex}
The vertical penalty inserted after a break on a clef change.
-\end{gcount}
-\begin{gcount}{clubpenalty}
+Default: 0
+
+\macroname{\textbackslash greclubpenalty}{}{gsp-default.tex}
The club penalty (determines how important it is to prevent orphans from occurring).
-\end{gcount}
-\begin{gcount}{widowpenalty}
+Default: 0
+
+\macroname{\textbackslash grewidowpenalty}{}{gsp-default.tex}
The widow penalty (determines how important it is to prevent widows from occurring).
-\end{gcount}
-\macroname{emergencystretch}{}{gsp-default.tex}
-The value of the last ditch stretch for overfull boxes. This should be set using \verb=\grechangedim=.
+Default: 0
+
+\macroname{\textbackslash greemergencystretch}{}{gsp-default.tex}
+The value of the last ditch stretch for overfull boxes.
Default: \verb=\emergencystretch=
-\begin{gcount}{endafterbarpenalty}
+\macroname{\textbackslash greendafterbarpenalty}{}{gsp-default.tex}
The end after bar penalty.
-\end{gcount}
-\begin{gcount}{endafterbaraltpenalty}{}{gsp-default.tex}
+Default: $-200$
+
+\macroname{\textbackslash greendafterbaraltpenalty}{}{gsp-default.tex}
The alternate end after bar penalty (used when there is no text under the bar).
-\end{gcount}
-\begin{gcount}{endofelementpenalty}{}{gsp-default.tex}
+Default: $-200$
+
+\macroname{\textbackslash greendofelementpenalty}{}{gsp-default.tex}
The end of element penalty.
-\end{gcount}
-\begin{gcount}{endofsyllablepenalty}{}{gsp-default.tex}
+Default: $-50$
+
+\macroname{\textbackslash greendofsyllablepenalty}{}{gsp-default.tex}
The end of element penalty.
-\end{gcount}
-\begin{gcount}{endofwordpenalty}{}{gsp-default.tex}
+Default: $-50$
+
+\macroname{\textbackslash greendofwordpenalty}{}{gsp-default.tex}
The end of element penalty.
-\end{gcount}
-\begin{gcount}{hyphenpenalty}{}{gsp-default.tex}
+Default: $-100$
+
+\macroname{\textbackslash grehyphenpenalty}{}{gsp-default.tex}
The hyphen penalty.
-\end{gcount}
-\begin{gcount}{nobreakpenalty}{}{gsp-default.tex}
+Default: $-200$
+
+\macroname{\textbackslash grenobreakpenalty}{}{gsp-default.tex}
Penalty to prevent a line break.
-\end{gcount}
-\begin{gcount}{newlinepenalty}
+Default: 10001
+
+\macroname{\textbackslash grenewlinepenalty}{}{gsp-default.tex}
Penalty to force a line break.
-\end{gcount}
-\begin{gcount}{finalpenalty}
+Default: $-10001$
+
+\macroname{\textbackslash grefinalpenalty}{}{gsp-default.tex}
The penalty applied after the final element of a score.
-\end{gcount}
-\macroname{looseness}{}{gsp-default.tex}
+Default: $0$
+
+\macroname{\textbackslash grelooseness}{}{gsp-default.tex}
The \TeX\ looseness within a score.
Default: \verb=\looseness=
-\begin{gcount}{tolerance}
+\macroname{\textbackslash gretolerance}{}{gsp-default.tex}
The \TeX\ tolerance within a score. See \url{https://en.wikibooks.org/wiki/TeX/tolerance} for an explanation of what tolerance is.
-\end{gcount}
-\macroname{pretolerance}{}{gsp-default.tex}
+Default: 9000
+
+\macroname{\textbackslash grepretolerance}{}{gsp-default.tex}
The \TeX\ pretolerance within a score. See \url{https://en.wikibooks.org/wiki/TeX/pretolerance} for an explanation of what pretolerance is.
-Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (versions after, and including, 0.80)]
+Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (versions after, and including, 0.80)
\textit{Nota bene:} For more details on why this is necessary see the comments in gsp-default.tex.
@@ -1805,8 +1773,11 @@ Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (version
\subsection{Colors}\label{colors}
+Colors are strictly a \LaTeX\ phenomena as currently implemented. All
+commands which change a color will raise a warning in Plain \TeX, but will not alter the document.
+
All colors can be redefined using \verb=\definecolor=. See the
-\verb=xcolor= (\LaTeX) or \verb=color= (Plain\TeX) package for documentation.
+\verb=xcolor= package for documentation.
Example:\par\medskip
\begin{latexcode}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
index 2ffa06181cb..c61e16809bd 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
@@ -61,14 +61,13 @@ Macro to typeset the additional line above or below the staff.
\#3 & integer & Set horizontal episema (0), horizontal episema under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
\end{argtable}
-\macroname{\textbackslash GreAdHocSpaceEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex}
+\macroname{\textbackslash GreAdHocSpaceEndOfElement}{\#1\#2}{gregoriotex-main.tex}
Macro to end an element with an ad-hoc space.
\begin{argtable}
\#1 & float & The factor to scale the default space for use as an ad-hoc space.\\
\#2 & \texttt{0} & Space is breakable.\\
& \texttt{1} & Space is unbreakable.\\
- \#3 & integer & The number of notes in the syllable prior to this macro.\\
\end{argtable}
\macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
@@ -176,10 +175,7 @@ Typesets a custos.
\begin{argtable}
\#1 & integer & Height number of custos.\\
- \#2 & \texttt{Flat} & The custos should have a flat.\\
- & \texttt{Natural} & The custos should have a natural.\\
- & \texttt{Sharp} & The custos should have a sharp.\\
- & \textit{empty} & The custos should not have an alteration.\\
+ \#2 & integer & Indicate if the custo is the last of the score.\\
\end{argtable}
\macroname{\textbackslash GreDagger}{}{gregoriotex-symbols.tex}
@@ -277,7 +273,7 @@ Macro to mark the end of a EUOUAE block.
& \texttt{3} & before bar
\end{argtable}
-\macroname{\textbackslash GreEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex}
+\macroname{\textbackslash GreEndOfElement}{\#1\#2}{gregoriotex-main.tex}
Macro to end elements.
\begin{argtable}
@@ -288,7 +284,6 @@ Macro to end elements.
& \texttt{4} & Ad-hoc space.\\
\#2 & \texttt{0} & Space is breakable.\\
& \texttt{1} & Space is unbreakable.\\
- \#3 & integer & The number of notes in the syllable prior to this macro.\\
\end{argtable}
\macroname{\textbackslash GreEndNLBArea}{\#1\#2}{gregoriotex-main.tex}
@@ -332,15 +327,11 @@ Macro to end a glyph without ending the element.
& \texttt{22} & Half-space. \\
\end{argtable}
-\macroname{\textbackslash GreFinalCustos}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreFinalCustos}{\#1}{gregoriotex-signs.tex}
Typesets a custos after the final bar in a score.
\begin{argtable}
\#1 & integer & Height number of custos.\\
- \#2 & \texttt{Flat} & The custos should have a flat.\\
- & \texttt{Natural} & The custos should have a natural.\\
- & \texttt{Sharp} & The custos should have a sharp.\\
- & \textit{empty} & The custos should not have an alteration.\\
\end{argtable}
\macroname{\textbackslash GreFinalDivisioFinalis}{\#1}{gregoriotex-signs.tex}
@@ -424,7 +415,7 @@ Macro to typeset a glyph.
\begin{argtable}
\#1 & character & the character that it must call\\
\#2 & integer & The number for where the glyph is located. \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
- \#3 & \TeX\ code & code to set the next custos (using \verb=\GreNextCustos=)\\
+ \#3 & integer & height number of the next note\\
\#4 & \texttt{0} & One-note glyph or more than two notes glyph except porrectus: \ie, we must put the aligncenter in the middle of the first note\\
& \texttt{1} & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\
& \texttt{2} & Porrectus: has a special align center.\\
@@ -639,16 +630,12 @@ Macro to call if you want to go to the next line.
\macroname{\textbackslash GreNewParLine}{}{gregoriotex-main.tex}
Same as \verb=\GreNewLine= except line is not justified.
-\macroname{\textbackslash GreNextCustos}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreNextCustos}{\#1}{gregoriotex-signs.tex}
Sets the pitch to use for the next custos if it were to happen at the point
where this macro is called.
\begin{argtable}
\#1 & integer & Height number of the custos.\\
- \#2 & \texttt{Flat} & The custos should have a flat.\\
- & \texttt{Natural} & The custos should have a natural.\\
- & \texttt{Sharp} & The custos should have a sharp.\\
- & \textit{empty} & The custos should not have an alteration.\\
\end{argtable}
\macroname{\textbackslash GreNextSyllableBeginsEUOUAE}{\#1\#2}{gregoriotex-syllable.tex}
@@ -660,8 +647,8 @@ Indicates that the syllable which follows begins a EUOUAE block.
& \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
\end{argtable}
-\macroname{\textbackslash GreAscendensOriscus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset an ascending oriscus cavum (the oriscus points at a higher note).
+\macroname{\textbackslash GreOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset an oriscus cavum (the oriscus points at a higher note).
\begin{argtable}
\#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
@@ -672,8 +659,8 @@ Macro to typeset an ascending oriscus cavum (the oriscus points at a higher note
\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
\end{argtable}
-\macroname{\textbackslash GreDescendensOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a descending oriscus cavum (the oriscus points at a lower note).
+\macroname{\textbackslash GreOriscusCavumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a reverse oriscus cavum (the oriscus points at a lower note).
\begin{argtable}
\#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
@@ -976,13 +963,6 @@ Macro to typeset the syllable.
\#9 & Gregorio\TeX\ glyphs & all the notes
\end{argtable}
-\macroname{\textbackslash GreSyllableNoteCount}{\#1}{gregoriotex-syllable.tex}
-Indicates the number of notes in the current syllable.
-
-\begin{argtable}
- \#1 & integer & The number of notes in the current syllable.\\
-\end{argtable}
-
\macroname{\textbackslash GreTranslationCenterEnd}{}{gregoriotex-main.tex}
Macro to end the centering of the translation text.
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
index 17798653673..9a2ae64deb9 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
@@ -48,11 +48,6 @@ Macro that handles obsolescence errors.
\#2 & string & name of the correct macro to use\\
\end{argtable}
-\macroname{\textbackslash gre@allowdeprecated@asboolean}{}{gregoriotex-main.tex}
-Macro that evaluates \texttt{true} or \texttt{false} depending on whether
-deprecated usage is allowed. This is used to pass the value of
-\verb=\ifgre@allowdeprecated= to Lua.
-
\macroname{\textbackslash gre@loadgregoriofont}{}{gregoriotex-main.tex}
Loads the chosen font for the neumes at the correct size.
@@ -430,22 +425,8 @@ Macro to pick the appropriate custos character.
\#1 & integer & height of the custos character to be placed\\
\end{argtable}
-\macroname{\textbackslash gre@nextcustospitch}{}{gregoriotex-signs.tex}
-Macro that saves the next custos pitch (height).
-
-\macroname{\textbackslash gre@nextcustosalteration}{}{gregoriotex-signs.tex}
-Macro that saves the next custos alteration.
-
-\macroname{\textbackslash gre@custosalteration}{\#1\#2}{gregoriotex-signs.tex}
-Typesets the alteration for a custos, if enabled.
-
-\begin{argtable}
- \#1 & integer & The pitch (height number) of the custos.\\
- \#2 & \texttt{Flat} & The custos should have a flat.\\
- & \texttt{Natural} & The custos should have a natural.\\
- & \texttt{Sharp} & The custos should have a sharp.\\
- & \textit{empty} & The custos should not have an alteration.\\
-\end{argtable}
+\macroname{\textbackslash gre@nextcustos}{}{gregoriotex-signs.tex}
+Macro that saves the next custos height.
\macroname{\textbackslash gre@beginnotes}{}{gregoriotex-main.tex}
Macro to draw the staff lines. Comes after the initial but before the clef.
@@ -1069,9 +1050,6 @@ The pitch of a rare sign (semicirculus, \etc).
\macroname{\textbackslash gre@pitch@dummy}{}{gregoriotex-main.tex}
A meaningless (don't-care) pitch.
-\macroname{\textbackslash gre@pitch@nominal}{}{gregoriotex-main.tex}
-A pitch guaranteed to be in the staff.
-
\macroname{\textbackslash gre@pointandclick}{\#1\#2}{gregoriotex-main.tex}
Macro to generate the point-and-click links.
@@ -1081,10 +1059,7 @@ Macro to generate the point-and-click links.
\end{argtable}
\macroname{\textbackslash gre@prefix}{}{gregoriotex-spaces.tex}
-Either \texttt{skip} or \texttt{dimen} according to the distance being set or changed at the given moment.
-
-\macroname{\textbackslash gre@prefixII}{}{gregoriotex-spaces.tex}
-Same as \verb=\gre@prefix=. Used when we were dealing with two distances simultaneously.
+Either ``skip’’ or ``dimen’’ according to the distance being set or changed at the given moment.
\macroname{\textbackslash gre@rubberpermit}{\#1}{gregoriotex-spaces.tex}
Determines whether the given distance is allowed to take a rubber length.
@@ -1139,7 +1114,7 @@ Alias for \verb=\luatexlocalrightbox= or \verb=\localrightbox=, depending on \La
Alias for \verb=\resizebox=.
\macroname{\textbackslash gre@dimension}{}{gregoriotex-spaces.tex}
-Workhorse function for setting distances in \verb=\grecreatedim= and \verb=\grechangedim=.
+Workhorse function behind \verb=\grecreatedim= and \verb=\grechangedim=.
\macroname{\textbackslash gre@setstafflines}{\#1}{gregoriotex-main.tex}
Sets the number of staff lines.
@@ -1546,17 +1521,11 @@ Count which indicates whether the point-and-click functionality should be implem
\macroname{\textbackslash gre@variableheightexpansion}{}{gregoriotex-main.tex}
Count to indicated if the spacing between lines should be variable (\texttt{1}) or fixed (\texttt{0}). Not a boolean because it needs to be readable by Lua.
-\macroname{\textbackslash ifgre@usecustosalteration}{}{gregoriotex-signs.tex}
-Boolean which indicates whether alterations should be printed for custodes.
-
\macroname{\textbackslash ifgre@blockeolcustos}{}{gregoriotex-main.tex}
Boolean which indicates whether the custos at the end of the line should be blocked.
\macroname{\textbackslash ifgre@blockeolcustosbeforeeuouae}{}{gregoriotex-main.tex}
Boolean which indicates whether the custos at the end of the line should be blocked if a EUOUAE block immediately follows.
-\macroname{\textbackslash ifgre@blockeolcustos}{}{gregoriotex-main.tex}
-Boolean which indicates whether the custos at the end of the line should be blocked.
-
\macroname{\textbackslash ifgre@raggedbreakbeforeeuouae}{}{gregoriotex-main.tex}
Boolean which indicates whether an automatic line break immediately before a EUOUAE block should be ragged.
@@ -1650,30 +1619,6 @@ Boolean indicating that the current syllable had a forced center in the gabc whi
\macroname{\textbackslash ifgre@nextforcedcentering}{}{gregoriotex-syllable.tex}
Boolean indicating that the next syllable had a forced center in the gabc which is to be respected.
-\macroname{\textbackslash ifgre@unbreakableendofelement}{}{gregoriotex-main.tex}
-Boolean used by \verb=\GreEndOfElement= to store whether the line may be broken at that point.
-
-\macroname{\textbackslash gre@count@syllablenotes}{}{gregoriotex-syllable.tex}
-Count containing the number of notes in the syllable.
-
-\macroname{\textbackslash gre@count@unbreakabletotalnotes}{}{gregoriotex-syllable.tex}
-Count containing the minimum number of notes in the syllable before the syllable
-may be broken across lines.
-
-\macroname{\textbackslash gre@count@unbreakableinitialnotes}{}{gregoriotex-syllable.tex}
-Count containing the minimum number of notes at the start of a syllable that
-must be kept together when the syllable is broken across lines.
-
-\macroname{\textbackslash gre@count@unbreakablefinalnotes}{}{gregoriotex-syllable.tex}
-Count containing the minimum number of notes at the end of a syllable that must
-be kept together when the syllable is broken across lines.
-
-\macroname{\textbackslash ifgre@shownotes}{}{gregoriotex-syllable.tex}
-Boolean indicating whether the notes should be shown.
-
-\macroname{\textbackslash ifgre@showlyrics}{}{gregoriotex-syllable.tex}
-Boolean indicating whether the lyrics should be shown.
-
\subsection{Boxes}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf
new file mode 100644
index 00000000000..7f5603ecb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf
deleted file mode 100644
index a23fc2db5a1..00000000000
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
index 3e648537460..836e75db56b 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
@@ -6,6 +6,7 @@
\usepackage{fontspec}
\usepackage{luacode}
\usepackage{multicol}
+\usepackage{fixltx2e}
\usepackage{hyperref}
\usepackage{color}
\usepackage[allowdeprecated=false]{gregoriotex}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf
new file mode 100644
index 00000000000..d7d482dc8df
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf
deleted file mode 100644
index 90cf661bbcd..00000000000
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
index 3f6e7e88099..bcc35a9bb69 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
@@ -27,8 +27,6 @@ local EXCLUDE = {
['.notdef'] = true,
['.null'] = true,
nonmarkingreturn = true,
- AscendensOriscusLineBLTR = true,
- AscendensOriscusLineTR = true,
PunctumAuctusLineBL = true,
PunctumLineBLBR = true,
PunctumLineBR = true,
@@ -36,8 +34,7 @@ local EXCLUDE = {
PunctumSmall = true,
FlexusLineBL = true,
FlexusAmOneLineBL = true,
- DescendensOriscusLineTR = true,
- DescendensOriscusLineBLTR = true,
+ OriscusLineTR = true,
QuilismaLineTR = true,
VirgaLineBR = true,
SalicusOriscus = true,
@@ -61,14 +58,6 @@ local GABC = {
AccentusReversus = [[\excluded{g}r2]],
Ancus = [[gec]],
AncusLongqueue = [[hfd]],
- AscendensOriscusCavum = [[go1r]],
- AscendensOriscusCavumHole = [[\excluded{gor}]],
- AscendensOriscus = [[go1]],
- AscendensOriscusLineBL = [[\excluded{e}@go1]],
- AscendensOriscusLineTL = [[\excluded{i}@go1]],
- AscendensOriscusScapus = [[gO1]],
- AscendensOriscusScapusLongqueue = [[hO1]],
- AscendensOriscusScapusOpenqueue = [[aO1]],
AuctumMora = [[\excluded{g}.]],
BarBrace = [[\excluded{,}\_]],
CClef = [[c3]],
@@ -81,84 +70,84 @@ local GABC = {
CustosUpLong = [[f+]],
CustosUpMedium = [[a+]],
CustosUpShort = [[g+]],
- DescendensOriscusCavum = [[go0r]],
- DescendensOriscusCavumHole = [[\excluded{go0r}]],
- DescendensOriscus = [[go0]],
- DescendensOriscusLineBL = [[\excluded{e}@go0]],
- DescendensOriscusLineTL = [[\excluded{i}@go0]],
- DescendensOriscusScapus = [[gO0]],
- DescendensOriscusScapusLongqueue = [[hO0]],
- DescendensOriscusScapusOpenqueue = [[aO0]],
DivisioDominican = [[,3]],
DivisioDominicanAlt = [[,4]],
DivisioMaior = [[:]],
DivisioMinima = [[,]],
DivisioMinor = [[;]],
- FClefChange = [[f3]],
FClef = [[f3]],
+ FClefChange = [[f3]],
Flat = [[gx]],
FlatHole = [[\excluded{gx}]],
Flexus = [[ge]],
FlexusLongqueue = [[hf]],
FlexusNobar = [[@hf]],
FlexusOriscus = [[goe]],
- FlexusOriscusInusitatus = [[go1e]],
FlexusOriscusScapus = [[gOe]],
- FlexusOriscusScapusInusitatus = [[gO1e]],
- FlexusOriscusScapusInusitatusLongqueue = [[hO1f]],
FlexusOriscusScapusLongqueue = [[hOf]],
LeadingOriscus = [[go\excluded{igig}]],
LeadingPunctum = [[g\excluded{igig}]],
LeadingQuilisma = [[gw\excluded{igig}]],
Linea = [[g=]],
+ LineaPunctum = [[gR]],
LineaPunctumCavum = [[gr0]],
LineaPunctumCavumHole = [[\excluded{gr0}]],
- LineaPunctum = [[gR]],
Natural = [[gy]],
NaturalHole = [[\excluded{gy}]],
- Oriscus = [[go]], -- for Deminutus
- OriscusCavum = [[gor]], -- for Deminutus
+ Oriscus = [[go1]],
+ OriscusCavum = [[go1r]],
+ OriscusCavumDeminutus = [[gor\~{}]],
OriscusCavumDeminutusHole = [[\excluded{gor\~{}}]],
+ OriscusCavumHole = [[\excluded{gor}]],
+ OriscusCavumReversus = [[go0r]],
+ OriscusCavumReversusHole = [[\excluded{go0r}]],
+ OriscusLineBL = [[\excluded{e}@go]],
+ OriscusReversus = [[go0]],
+ OriscusReversusLineTL = [[\excluded{i}@go]],
+ OriscusScapus = [[gO1]],
+ OriscusScapusLongqueue = [[hO1]],
+ OriscusScapusOpenqueue = [[aO1]],
+ OriscusScapusReversus = [[gO0]],
+ OriscusScapusReversusLongqueue = [[hO0]],
+ OriscusScapusReversusOpenqueue = [[aO0]],
Pes = [[gi]],
PesQuadratum = [[gqi]],
PesQuadratumLongqueue = [[hqj]],
PesQuassus = [[goi]],
- PesQuassusInusitatus = [[go0i]],
- PesQuassusInusitatusLongqueue = [[ho0j]],
PesQuassusLongqueue = [[hoj]],
PesQuilisma = [[gwi]],
PesQuilismaQuadratum = [[gWi]],
PesQuilismaQuadratumLongqueue = [[hWj]],
+ Porrectus = [[geg]],
PorrectusFlexus = [[gege]],
PorrectusFlexusNobar = [[\excluded{e}gege]],
- Porrectus = [[geg]],
PorrectusLongqueue = [[hfh]],
PorrectusNobar = [[@geg]],
+ Punctum = [[g]],
PunctumCavum = [[gr]],
PunctumCavumHole = [[\excluded{gr}]],
+ PunctumCavumInclinatum = [[Gr]],
PunctumCavumInclinatumAuctus = [[Gr>]],
PunctumCavumInclinatumAuctusHole = [[\excluded{Gr>}]],
- PunctumCavumInclinatum = [[Gr]],
PunctumCavumInclinatumHole = [[\excluded{Gr}]],
- Punctum = [[g]],
- PunctumInclinatumAuctus = [[G>]],
PunctumInclinatum = [[G]],
+ PunctumInclinatumAuctus = [[G>]],
PunctumLineBL = [[\excluded{e}@g]],
PunctumLineTL = [[\excluded{i}@g]],
Quilisma = [[gw]],
- RoundBraceDown = '[ub:1;6mm]',
RoundBrace = '[ob:1;6mm]',
- SalicusFlexus = [[giOki]],
+ RoundBraceDown = '[ub:1;6mm]',
Salicus = [[giOk]],
+ SalicusFlexus = [[giOki]],
SalicusLongqueue = [[hjOl]],
Scandicus = [[gik]],
Semicirculus = [[\excluded{g}r4]],
SemicirculusReversus = [[\excluded{g}r5]],
Sharp = [[g\#{}]],
SharpHole = [[\excluded{g\#{}}]],
+ Stropha = [[gs]],
StrophaAucta = [[gs>]],
StrophaAuctaLongtail = [[hs>]],
- Stropha = [[gs]],
Torculus = [[gig]],
TorculusLiquescens = [[gige]],
TorculusLiquescensQuilisma = [[gwige]],
@@ -190,60 +179,41 @@ local GABC_AMBITUS_ONE = {
local GABC_FUSE = {
Upper = {
Punctum = [[\excluded{e}@]],
- AscendensOriscus = [[\excluded{e}@]],
- DescendensOriscus = [[\excluded{e}@]],
+ Oriscus = [[\excluded{e}@]],
Pes = [[\excluded{e}@]],
PesQuadratum = [[\excluded{e}@]],
PesQuadratumLongqueue = [[\excluded{f}@]],
PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bq[ll:0]c]] },
PesQuassus = [[\excluded{e}@]],
- PesQuassusInusitatus = [[\excluded{e}@]],
- PesQuassusInusitatusLongqueue = [[\excluded{f}@]],
- PesQuassusInusitatusOpenqueue = { [[\excluded{a}@]], [[bo0[ll:0]c]] },
PesQuassusLongqueue = [[\excluded{f}@]],
PesQuassusOpenqueue = { [[\excluded{a}@]], [[bo[ll:0]c]] },
Flexus = [[\excluded{e}@]],
- FlexusOriscus = [[\excluded{e}@]],
- FlexusOriscusInusitatus = [[\excluded{e}@]],
},
Lower = {
Punctum = [[\excluded{i}@]],
- AscendensOriscus = [[\excluded{i}@]],
- DescendensOriscus = [[\excluded{i}@]],
+ Oriscus = [[\excluded{i}@]],
Pes = [[\excluded{i}@]],
PesQuadratum = [[\excluded{i}@]],
PesQuadratumLongqueue = [[\excluded{j}@]],
PesQuadratumOpenqueue = [[\excluded{b}@]],
PesQuassus = [[\excluded{i}@]],
- PesQuassusInusitatus = [[\excluded{i}@]],
- PesQuassusInusitatusLongqueue = [[\excluded{j}@]],
- PesQuassusInusitatusOpenqueue = [[\excluded{b}@]],
- PesQuassusLongqueue = [[\excluded{j}@]],
- PesQuassusOpenqueue = [[\excluded{b}@]],
Flexus = [[\excluded{i}@]],
FlexusOriscus = [[\excluded{i}@]],
- FlexusOriscusInusitatus = [[\excluded{i}@]],
},
Up = {
Punctum = [[\excluded{@ij}]],
- AscendensOriscus = [[\excluded{@ij}]],
- AscendensOriscusScapus = [[\excluded{@ij}]],
- AscendensOriscusScapusLongqueue = [[\excluded{@jk}]],
- DescendensOriscus = [[\excluded{@ij}]],
- DescendensOriscusScapus = [[\excluded{@ij}]],
- DescendensOriscusScapusLongqueue = [[\excluded{@jk}]],
+ Oriscus = [[\excluded{@ij}]],
+ OriscusScapus = [[\excluded{@ij}]],
+ OriscusScapusLongqueue = [[\excluded{@jk}]],
Quilisma = [[\excluded{@ij}]],
Flexus = [[\excluded{@gi}]],
FlexusNobar = [[\excluded{@hj}]],
},
Down = {
Punctum = [[\excluded{@eg}]],
- AscendensOriscus = [[\excluded{@eg}]],
- AscendensOriscusScapus = [[\excluded{@eg}]],
- AscendensOriscusScapusLongqueue = [[\excluded{@eg}]],
- DescendensOriscus = [[\excluded{@eg}]],
- DescendensOriscusScapus = [[\excluded{@eg}]],
- DescendensOriscusScapusLongqueue = [[\excluded{@eg}]],
+ Oriscus = [[\excluded{@eg}]],
+ OriscusScapus = [[\excluded{@eg}]],
+ OriscusScapusLongqueue = [[\excluded{@eg}]],
VirgaReversa = [[\excluded{@eg}]],
VirgaReversaLongqueue = [[\excluded{@fg}]],
},
@@ -366,8 +336,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano
local post_word_liquescentia = P'Nothing' + P'Deminutus' + P'Ascendens' +
P'Descendens'
local liquescentia = post_word_liquescentia + P'Up' + P'Down'
- local word = ((majuscule * minuscule^0) - fusion - ambitus - debilis -
- post_word_liquescentia) + ((P'Ascendens' + P'Descendens') * P'Oriscus')
+ local word = (majuscule * minuscule^0) - fusion - ambitus - debilis -
+ post_word_liquescentia
local liquescence = debilis^-1 * liquescentia^-1
local pattern = C(fusion^-1) * C(word^1) * C(ambitus^0) * C(debilis^-1) *
C(liquescentia^-1) * -1
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
index 406769c2064..dea7bb727c4 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
@@ -87,7 +87,7 @@
\ifbreakable%
\filbreak%
\else%
- \global\breakabletrue%
+ \breakabletrue%
\fi%
\makebox[\linewidth]{\ttfamily\bfseries #1#2%
\hspace{\fill}\normalfont\itshape #3}%
@@ -132,20 +132,11 @@
\fi%
}
-\NewDocumentEnvironment{gcount}{m}{\macroname{#1}{}{gsp-default.tex}}{%
-
- Default: \expandafter$\expandafter\the\csname gre@space@count@#1\endcsname$
-}
-
\newcommand{\writemode}[3]{%
\gre@style@modeline #1\endgre@style@modeline %
\gre@style@modemodifier #2\endgre@style@modemodifier %
\gre@style@modedifferentia #3\endgre@style@modedifferentia %
}
-
-\newcommand{\getgrecount}[1]{%
- \the\csname gre@count@#1\endcsname%
-}
\makeatother
\setlength{\parindent}{0mm} % Default is 15pt
@@ -161,7 +152,7 @@
\vspace{1cm}
- \large Version \textbf{4.2.0-beta1}, 27 April 2016 %% PARSE_VERSION_DATE
+ \large Version \textbf{4.1.2}, 8 May 2016 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex b/Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex
new file mode 100644
index 00000000000..9aeee8d0558
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex
@@ -0,0 +1,10 @@
+% !TEX program = LuaLaTeX+se
+\documentclass{article}
+
+\usepackage[debug]{gregoriotex}
+
+\listfiles
+
+\begin{document}
+Debugging document
+\end{document}
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd
index 0b45b903602..dc36aea19aa 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd
+++ b/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd
@@ -19,7 +19,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1176402534
-ModificationTime: 1457825253
+ModificationTime: 1455123162
OS2TypoAscent: 0
OS2TypoAOffset: 1
OS2TypoDescent: 0
@@ -37,12 +37,13 @@ OS2Vendor: 'PfEd'
MarkAttachClasses: 1
DEI: 91125
Encoding: Custom
+Compacted: 1
UnicodeInterp: none
NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 0 17 16
+WinInfo: 0 19 8
BeginPrivate: 0
EndPrivate
Grid
@@ -58,7 +59,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: 160 160
+BeginChars: 375 152
StartChar: Punctum
Encoding: 0 -1 0
@@ -173,7 +174,7 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscus
+StartChar: OriscusReversus
Encoding: 4 -1 4
Width: 192
Flags: HW
@@ -196,7 +197,7 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: AscendensOriscus
+StartChar: Oriscus
Encoding: 5 -1 5
Width: 192
Flags: HW
@@ -359,7 +360,7 @@ Validated: 33
EndChar
StartChar: DivisioMinima
-Encoding: 12 -1 12
+Encoding: 14 -1 12
AltUni2: 000050.ffffffff.0
Width: 19
VWidth: 2048
@@ -378,7 +379,7 @@ Validated: 1
EndChar
StartChar: DivisioMinor
-Encoding: 13 -1 13
+Encoding: 15 -1 13
Width: 19
VWidth: 2048
Flags: HW
@@ -396,7 +397,7 @@ Validated: 1
EndChar
StartChar: pesdeminutus
-Encoding: 14 -1 14
+Encoding: 17 -1 14
Width: 161
Flags: HW
HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15
@@ -417,7 +418,7 @@ Validated: 1
EndChar
StartChar: auctusd1
-Encoding: 15 -1 15
+Encoding: 18 -1 15
Width: 161
Flags: HW
HStem: -474.265 17.1 -115.165 17.1 243.935 17.1 603.035 17.1
@@ -440,7 +441,7 @@ Validated: 1
EndChar
StartChar: auctusa1
-Encoding: 16 -1 16
+Encoding: 19 -1 16
Width: 161
Flags: HW
HStem: -473.75 17.1 -114.65 17.1 244.45 17.1 603.55 17.1
@@ -464,7 +465,7 @@ Validated: 1
EndChar
StartChar: mdeminutus
-Encoding: 17 -1 17
+Encoding: 20 -1 17
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -485,7 +486,7 @@ Validated: 1
EndChar
StartChar: Natural
-Encoding: 18 -1 18
+Encoding: 21 -1 18
Width: 141
VWidth: 1129
Flags: HW
@@ -518,7 +519,7 @@ Validated: 1
EndChar
StartChar: FClef
-Encoding: 19 -1 19
+Encoding: 22 -1 19
Width: 299
VWidth: 1119
Flags: HW
@@ -559,7 +560,7 @@ Validated: 33
EndChar
StartChar: CustosDownLong
-Encoding: 20 -1 20
+Encoding: 23 -1 20
Width: 76
VWidth: 1160
Flags: HW
@@ -582,7 +583,7 @@ Validated: 1
EndChar
StartChar: CustosDownShort
-Encoding: 21 -1 21
+Encoding: 24 -1 21
Width: 76
VWidth: 1151
Flags: HW
@@ -605,7 +606,7 @@ Validated: 1
EndChar
StartChar: CustosUpLong
-Encoding: 22 -1 22
+Encoding: 25 -1 22
Width: 76
VWidth: 1119
Flags: HW
@@ -628,7 +629,7 @@ Validated: 1
EndChar
StartChar: CustosUpShort
-Encoding: 23 -1 23
+Encoding: 26 -1 23
Width: 76
VWidth: 1128
Flags: HW
@@ -651,7 +652,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBR
-Encoding: 24 -1 24
+Encoding: 27 -1 24
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -672,7 +673,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBL
-Encoding: 25 -1 25
+Encoding: 28 -1 25
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -693,7 +694,7 @@ Validated: 1
EndChar
StartChar: PunctumLineTL
-Encoding: 26 -1 26
+Encoding: 29 -1 26
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -715,7 +716,7 @@ Validated: 1
EndChar
StartChar: PunctumLineTR
-Encoding: 27 -1 27
+Encoding: 30 -1 27
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -737,7 +738,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBLBR
-Encoding: 28 -1 28
+Encoding: 31 -1 28
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -758,7 +759,7 @@ Validated: 1
EndChar
StartChar: base6
-Encoding: 29 -1 29
+Encoding: 32 -1 29
Width: 161
Flags: HW
HStem: -476.55 17.1 -117.45 17.1 241.65 17.1 600.75 17.1
@@ -781,7 +782,7 @@ Validated: 1
EndChar
StartChar: line2
-Encoding: 30 -1 30
+Encoding: 33 -1 30
Width: 22
VWidth: 2048
Flags: HW
@@ -799,7 +800,7 @@ Validated: 1
EndChar
StartChar: line3
-Encoding: 31 -1 31
+Encoding: 34 -1 31
Width: 22
VWidth: 2048
Flags: HW
@@ -817,7 +818,7 @@ Validated: 1
EndChar
StartChar: line4
-Encoding: 32 -1 32
+Encoding: 35 -1 32
Width: 22
VWidth: 2048
Flags: HW
@@ -835,7 +836,7 @@ Validated: 1
EndChar
StartChar: line5
-Encoding: 33 -1 33
+Encoding: 36 -1 33
Width: 22
VWidth: 2048
Flags: HW
@@ -853,7 +854,7 @@ Validated: 1
EndChar
StartChar: QuilismaLineTR
-Encoding: 34 -1 34
+Encoding: 40 -1 34
Width: 161
Flags: HW
HStem: -477.6 17.1 -118.5 17.1 240.6 17.1 599.7 17.1
@@ -888,8 +889,8 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: AscendensOriscusLineTR
-Encoding: 35 -1 35
+StartChar: OriscusLineTR
+Encoding: 41 -1 35
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
@@ -900,7 +901,7 @@ SplineSet
3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0
0.0136719 55.9541 1.15332 83.3135 5.71387 100.414 c 0
12.5537 127.774 33.0732 148.294 59.293 148.294 c 0
- 90.0732 148.294 109.455 114.854 140.233 115.234 c 0
+ 90.0732 148.294 109.455 114.854 140.233 115.234 c 4
167.571 115.571 167.143 145.714 169.991 151.141 c 1
182.571 150.857 179.714 151.143 192 151.148 c 1
194.839 132.545 192 79.4765 192 69.625 c 0
@@ -913,7 +914,7 @@ Validated: 33
EndChar
StartChar: pbase
-Encoding: 36 -1 36
+Encoding: 42 -1 36
Width: 161
Flags: HW
HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15
@@ -934,7 +935,7 @@ Validated: 1
EndChar
StartChar: idebilis
-Encoding: 37 -1 37
+Encoding: 43 -1 37
Width: 97
VWidth: 2048
Flags: HW
@@ -958,7 +959,7 @@ Validated: 1
EndChar
StartChar: deminutus
-Encoding: 38 -1 38
+Encoding: 44 -1 38
Width: 97
VWidth: 2048
Flags: HW
@@ -981,7 +982,7 @@ Validated: 1
EndChar
StartChar: rdeminutus
-Encoding: 39 -1 39
+Encoding: 45 -1 39
Width: 97
VWidth: 2048
Flags: HW
@@ -1004,7 +1005,7 @@ Validated: 1
EndChar
StartChar: PunctumAuctusLineBL
-Encoding: 40 -1 40
+Encoding: 46 -1 40
Width: 141
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1028,7 +1029,7 @@ Validated: 33
EndChar
StartChar: auctusa2
-Encoding: 41 -1 41
+Encoding: 47 -1 41
Width: 161
Flags: HW
HStem: -473.75 17.1 -114.65 17.1 244.45 17.1 603.55 17.1
@@ -1052,7 +1053,7 @@ Validated: 1
EndChar
StartChar: porrectus1
-Encoding: 42 -1 42
+Encoding: 48 -1 42
Width: 490
VWidth: 2048
Flags: HW
@@ -1074,7 +1075,7 @@ Validated: 1
EndChar
StartChar: porrectus2
-Encoding: 43 -1 43
+Encoding: 49 -1 43
Width: 575
VWidth: 2048
Flags: HW
@@ -1096,7 +1097,7 @@ Validated: 1
EndChar
StartChar: porrectus3
-Encoding: 44 -1 44
+Encoding: 50 -1 44
Width: 650
VWidth: 2048
Flags: HW
@@ -1118,7 +1119,7 @@ Validated: 1
EndChar
StartChar: porrectus4
-Encoding: 45 -1 45
+Encoding: 51 -1 45
Width: 740
VWidth: 2048
Flags: HW
@@ -1140,7 +1141,7 @@ Validated: 1
EndChar
StartChar: porrectus5
-Encoding: 46 -1 46
+Encoding: 52 -1 46
Width: 931
VWidth: 2048
Flags: HW
@@ -1162,7 +1163,7 @@ Validated: 1
EndChar
StartChar: porrectusflexus1
-Encoding: 47 -1 47
+Encoding: 53 -1 47
Width: 340
VWidth: 2048
Flags: HW
@@ -1184,7 +1185,7 @@ Validated: 1
EndChar
StartChar: porrectusflexus2
-Encoding: 48 -1 48
+Encoding: 54 -1 48
Width: 428
VWidth: 2048
Flags: HW
@@ -1206,7 +1207,7 @@ Validated: 1
EndChar
StartChar: porrectusflexus3
-Encoding: 49 -1 49
+Encoding: 55 -1 49
Width: 586
VWidth: 2048
Flags: HW
@@ -1228,7 +1229,7 @@ Validated: 1
EndChar
StartChar: porrectusflexus4
-Encoding: 50 -1 50
+Encoding: 56 -1 50
Width: 670
VWidth: 2048
Flags: HW
@@ -1250,7 +1251,7 @@ Validated: 1
EndChar
StartChar: porrectusflexus5
-Encoding: 51 -1 51
+Encoding: 57 -1 51
Width: 931
VWidth: 2048
Flags: HW
@@ -1272,7 +1273,7 @@ Validated: 1
EndChar
StartChar: PesQuilismaOneNothing
-Encoding: 52 -1 52
+Encoding: 58 -1 52
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1314,7 +1315,7 @@ Validated: 1
EndChar
StartChar: StrophaAucta
-Encoding: 53 -1 53
+Encoding: 59 -1 53
Width: 168
Flags: HW
HStem: -472.609 17.1 -113.509 17.1 245.591 17.1 604.691 17.1
@@ -1339,7 +1340,7 @@ Validated: 33
EndChar
StartChar: PunctumInclinatumAuctus
-Encoding: 54 -1 54
+Encoding: 60 -1 54
Width: 178
Flags: HW
HStem: -472.63 17.1 -113.53 17.1 245.57 17.1 604.67 17.1
@@ -1366,7 +1367,7 @@ Validated: 33
EndChar
StartChar: AuctumMora
-Encoding: 55 -1 55
+Encoding: 62 -1 55
Width: 71
VWidth: 2679
Flags: HW
@@ -1384,7 +1385,7 @@ Validated: 1
EndChar
StartChar: VEpisema
-Encoding: 57 -1 56
+Encoding: 64 -1 56
Width: 36
VWidth: 1384
Flags: HW
@@ -1404,7 +1405,7 @@ Validated: 1
EndChar
StartChar: PunctumDeminutus
-Encoding: 58 -1 57
+Encoding: 65 -1 57
Width: 97
VWidth: 2048
Flags: HW
@@ -1426,7 +1427,7 @@ Validated: 1
EndChar
StartChar: hepisema_base
-Encoding: 59 -1 58
+Encoding: 66 -1 58
Width: 1
VWidth: 1972
Flags: HW
@@ -1443,7 +1444,7 @@ EndSplineSet
EndChar
StartChar: PesOneNothing
-Encoding: 60 -1 59
+Encoding: 67 -1 59
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1471,7 +1472,7 @@ Validated: 1
EndChar
StartChar: CustosUpMedium
-Encoding: 61 -1 60
+Encoding: 68 -1 60
Width: 76
VWidth: 1124
Flags: HW
@@ -1494,7 +1495,7 @@ Validated: 1
EndChar
StartChar: CustosDownMedium
-Encoding: 62 -1 61
+Encoding: 69 -1 61
Width: 76
VWidth: 1155
Flags: HW
@@ -1517,7 +1518,7 @@ Validated: 1
EndChar
StartChar: Accentus
-Encoding: 63 -1 62
+Encoding: 70 -1 62
Width: 99
VWidth: 1594
Flags: HW
@@ -1539,7 +1540,7 @@ Validated: 1
EndChar
StartChar: AccentusReversus
-Encoding: 64 -1 63
+Encoding: 71 -1 63
Width: 99
VWidth: 1594
Flags: HW
@@ -1561,7 +1562,7 @@ Validated: 1
EndChar
StartChar: SemicirculusReversus
-Encoding: 65 -1 64
+Encoding: 72 -1 64
Width: 125
VWidth: 1583
Flags: HW
@@ -1581,7 +1582,7 @@ Validated: 1
EndChar
StartChar: Semicirculus
-Encoding: 66 -1 65
+Encoding: 73 -1 65
Width: 124
VWidth: 1606
Flags: HW
@@ -1601,7 +1602,7 @@ Validated: 1
EndChar
StartChar: Circulus
-Encoding: 67 -1 66
+Encoding: 74 -1 66
Width: 124
VWidth: 1594
Flags: HW
@@ -1624,7 +1625,7 @@ Validated: 1
EndChar
StartChar: CClefChange
-Encoding: 68 -1 67
+Encoding: 75 -1 67
Width: 143
VWidth: 1107
Flags: W
@@ -1653,7 +1654,7 @@ Validated: 33
EndChar
StartChar: FClefChange
-Encoding: 69 -1 68
+Encoding: 76 -1 68
Width: 299
VWidth: 1119
Flags: W
@@ -1694,7 +1695,7 @@ Validated: 33
EndChar
StartChar: VEpisema.circumflexus
-Encoding: 70 -1 69
+Encoding: 77 -1 69
Width: 108
VWidth: 2048
Flags: HW
@@ -1718,7 +1719,7 @@ Validated: 1
EndChar
StartChar: PunctumCavum
-Encoding: 71 -1 70
+Encoding: 78 -1 70
Width: 161
VWidth: 1139
Flags: HW
@@ -1748,7 +1749,7 @@ Validated: 1
EndChar
StartChar: LineaPunctum
-Encoding: 72 -1 71
+Encoding: 79 -1 71
Width: 258
VWidth: 1139
Flags: HW
@@ -1784,7 +1785,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavum
-Encoding: 73 -1 72
+Encoding: 80 -1 72
Width: 258
VWidth: 1139
Flags: HW
@@ -1828,7 +1829,7 @@ Validated: 1
EndChar
StartChar: PunctumSmall
-Encoding: 74 -1 73
+Encoding: 81 -1 73
Width: 151
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1849,7 +1850,7 @@ Validated: 1
EndChar
StartChar: hepisemaright
-Encoding: 76 -1 74
+Encoding: 83 -1 74
Width: 2
VWidth: 1968
Flags: HW
@@ -1866,7 +1867,7 @@ EndSplineSet
EndChar
StartChar: mpdeminutus
-Encoding: 77 -1 75
+Encoding: 84 -1 75
Width: 161
Flags: HW
HStem: 536.497 15 221.497 15 -93.503 15 -408.503 15
@@ -1887,7 +1888,7 @@ Validated: 1
EndChar
StartChar: PunctumDescendens
-Encoding: 78 -1 76
+Encoding: 85 -1 76
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1910,7 +1911,7 @@ Validated: 1
EndChar
StartChar: PunctumAscendens
-Encoding: 79 -1 77
+Encoding: 86 -1 77
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1933,7 +1934,7 @@ Validated: 1
EndChar
StartChar: mnbdeminutus
-Encoding: 80 -1 78
+Encoding: 87 -1 78
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -1954,7 +1955,7 @@ Validated: 1
EndChar
StartChar: mnbpdeminutus
-Encoding: 81 -1 79
+Encoding: 88 -1 79
Width: 161
Flags: HW
HStem: 536.058 15 221.058 15 -93.9416 15 -408.942 15
@@ -1975,7 +1976,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb1
-Encoding: 82 -1 80
+Encoding: 89 -1 80
Width: 340
VWidth: 2048
Flags: HW
@@ -1996,7 +1997,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb2
-Encoding: 83 -1 81
+Encoding: 90 -1 81
Width: 428
VWidth: 2048
Flags: HW
@@ -2017,7 +2018,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb3
-Encoding: 84 -1 82
+Encoding: 91 -1 82
Width: 586
VWidth: 2048
Flags: HW
@@ -2038,7 +2039,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb4
-Encoding: 85 -1 83
+Encoding: 92 -1 83
Width: 670
VWidth: 2048
Flags: HW
@@ -2059,7 +2060,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb5
-Encoding: 86 -1 84
+Encoding: 93 -1 84
Width: 931
VWidth: 2048
Flags: HW
@@ -2080,7 +2081,7 @@ Validated: 1
EndChar
StartChar: p2base
-Encoding: 88 -1 85
+Encoding: 95 -1 85
Width: 161
Flags: W
HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15
@@ -2101,7 +2102,7 @@ Validated: 1
EndChar
StartChar: msdeminutus
-Encoding: 89 -1 86
+Encoding: 97 -1 86
Width: 161
Flags: HW
HStem: 536.058 15 221.058 15 -93.9416 15 -408.942 15
@@ -2124,7 +2125,7 @@ Validated: 1
EndChar
StartChar: mademinutus
-Encoding: 90 -1 87
+Encoding: 98 -1 87
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2147,7 +2148,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumHole
-Encoding: 91 -1 88
+Encoding: 99 -1 88
Width: 161
VWidth: 1139
Flags: HW
@@ -2167,7 +2168,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavumHole
-Encoding: 92 -1 89
+Encoding: 100 -1 89
Width: 258
VWidth: 1139
Flags: HW
@@ -2187,7 +2188,7 @@ Validated: 1
EndChar
StartChar: NaturalHole
-Encoding: 93 -1 90
+Encoding: 101 -1 90
Width: 141
VWidth: 1129
Flags: HW
@@ -2205,7 +2206,7 @@ Validated: 1
EndChar
StartChar: FlatHole
-Encoding: 94 -1 91
+Encoding: 102 -1 91
Width: 159
VWidth: 1120
Flags: HW
@@ -2224,8 +2225,8 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscusLineBR
-Encoding: 95 -1 92
+StartChar: odbase
+Encoding: 103 -1 92
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
@@ -2244,12 +2245,13 @@ SplineSet
158.94 148.294 179.46 127.774 186.3 100.414 c 0
190.86 83.3135 192 55.9541 192 37.7139 c 0
192 24.5596 192 -21.5 192 -42 c 5
- 170 -42 l 5
+ 182.5 -42 179 -42 170 -42 c 5
EndSplineSet
+Validated: 1
EndChar
StartChar: DivisioDominican
-Encoding: 96 -1 93
+Encoding: 104 -1 93
Width: 22
VWidth: 2048
Flags: W
@@ -2267,7 +2269,7 @@ Validated: 1
EndChar
StartChar: DivisioDominicanAlt
-Encoding: 97 -1 94
+Encoding: 105 -1 94
Width: 22
VWidth: 2048
Flags: W
@@ -2285,7 +2287,7 @@ Validated: 1
EndChar
StartChar: Sharp
-Encoding: 98 -1 95
+Encoding: 106 -1 95
Width: 258
VWidth: 2048
Flags: W
@@ -2348,7 +2350,7 @@ Validated: 1
EndChar
StartChar: SharpHole
-Encoding: 99 -1 96
+Encoding: 107 -1 96
Width: 258
VWidth: 2048
Flags: W
@@ -2366,7 +2368,7 @@ Validated: 1
EndChar
StartChar: Linea
-Encoding: 100 -1 97
+Encoding: 108 -1 97
Width: 431
VWidth: 2612
Flags: W
@@ -2394,7 +2396,7 @@ Validated: 1
EndChar
StartChar: RoundBrace
-Encoding: 101 -1 98
+Encoding: 109 -1 98
Width: 937
VWidth: 2048
Flags: W
@@ -2420,7 +2422,7 @@ Validated: 1
EndChar
StartChar: CurlyBrace
-Encoding: 102 -1 99
+Encoding: 110 -1 99
Width: 1006
VWidth: 2048
Flags: W
@@ -2448,7 +2450,7 @@ Validated: 1
EndChar
StartChar: BarBrace
-Encoding: 103 -1 100
+Encoding: 111 -1 100
Width: 591
VWidth: 2048
Flags: W
@@ -2474,7 +2476,7 @@ Validated: 1
EndChar
StartChar: OriscusDeminutus
-Encoding: 104 -1 101
+Encoding: 112 -1 101
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
@@ -2498,31 +2500,32 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: AscendensOriscusLineBL
-Encoding: 105 -1 102
+StartChar: OriscusLineBL
+Encoding: 113 -1 102
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
LayerCount: 2
Fore
SplineSet
-177.181 151.148 m 0
- 188.58 151.148 192 89.5889 192 71.3486 c 0
- 192 53.1084 190.86 25.749 186.3 8.64844 c 0
- 179.46 -18.7119 158.94 -39.2314 132.721 -39.2314 c 0
- 101.94 -39.2314 82.5586 -5.79199 51.7803 -6.17188 c 0
+177.181 151.148 m 4
+ 188.58 151.148 192 89.5889 192 71.3486 c 4
+ 192 53.1084 190.86 25.749 186.3 8.64844 c 4
+ 179.46 -18.7119 158.94 -39.2314 132.721 -39.2314 c 4
+ 101.94 -39.2314 82.5586 -5.79199 51.7803 -6.17188 c 4
24.4424 -6.50879 24.8711 -36.6523 22.0225 -42.0791 c 5
- 0.0136719 -42.0859 l 5
- -2.8252 -23.4824 0.0136719 29.5859 0.0136719 39.4375 c 0
- 0.0136719 57.6777 2.75977 85.0283 6.18066 102.129 c 0
- 13.0205 129.488 34.6807 150.009 59.7598 150.009 c 0
- 91.6807 150.009 109.92 116.948 140.7 116.948 c 0
- 174.9 116.948 168.061 151.148 177.181 151.148 c 0
+ 9.44238 -41.7949 12.2998 -42.0811 0.0136719 -42.0859 c 5
+ -2.8252 -23.4824 0.0136719 29.5859 0.0136719 39.4375 c 4
+ 0.0136719 57.6777 2.75977 85.0283 6.18066 102.129 c 4
+ 13.0205 129.488 34.6807 150.009 59.7598 150.009 c 4
+ 91.6807 150.009 109.92 116.948 140.7 116.948 c 4
+ 174.9 116.948 168.061 151.148 177.181 151.148 c 4
EndSplineSet
+Validated: 33
EndChar
-StartChar: AscendensOriscusLineBLTR
-Encoding: 106 -1 103
+StartChar: SalicusOriscus
+Encoding: 114 -1 103
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
@@ -2551,7 +2554,7 @@ Validated: 33
EndChar
StartChar: hepisemaleft
-Encoding: 75 -1 104
+Encoding: 82 -1 104
Width: 1
VWidth: 1968
Flags: HW
@@ -2568,7 +2571,7 @@ EndSplineSet
EndChar
StartChar: RoundBraceDown
-Encoding: 107 -1 105
+Encoding: 130 -1 105
Width: 937
Flags: HW
LayerCount: 2
@@ -2592,7 +2595,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaDescendens_op
-Encoding: 108 -1 106
+Encoding: 131 -1 106
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2615,7 +2618,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaLongqueueDescendens_op
-Encoding: 109 -1 107
+Encoding: 132 -1 107
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2638,7 +2641,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaAscendens_op
-Encoding: 110 -1 108
+Encoding: 133 -1 108
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2661,7 +2664,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaLongqueueAscendens_op
-Encoding: 111 -1 109
+Encoding: 134 -1 109
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2684,7 +2687,7 @@ Validated: 1
EndChar
StartChar: PunctumDescendens_op
-Encoding: 112 -1 110
+Encoding: 137 -1 110
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2708,7 +2711,7 @@ Validated: 1
EndChar
StartChar: PunctumAscendens_op
-Encoding: 113 -1 111
+Encoding: 138 -1 111
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2731,7 +2734,7 @@ Validated: 1
EndChar
StartChar: auctusd1_op
-Encoding: 114 -1 112
+Encoding: 139 -1 112
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2755,7 +2758,7 @@ Validated: 1
EndChar
StartChar: auctusa1_op
-Encoding: 115 -1 113
+Encoding: 140 -1 113
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2779,7 +2782,7 @@ Validated: 1
EndChar
StartChar: auctusa2_op
-Encoding: 116 -1 114
+Encoding: 141 -1 114
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2803,7 +2806,7 @@ Validated: 1
EndChar
StartChar: PunctumAuctusLineBL_op
-Encoding: 117 -1 115
+Encoding: 142 -1 115
Width: 141
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -2827,7 +2830,7 @@ Validated: 33
EndChar
StartChar: pesdeminutus_op
-Encoding: 118 -1 116
+Encoding: 143 -1 116
Width: 161
Flags: HW
HStem: 536.228 15 221.228 15 -93.7716 15 -408.772 15
@@ -2850,7 +2853,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatum
-Encoding: 119 -1 117
+Encoding: 144 -1 117
Width: 178
Flags: HW
HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1
@@ -2888,7 +2891,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumHole
-Encoding: 120 -1 118
+Encoding: 145 -1 118
Width: 178
Flags: HW
HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1
@@ -2913,7 +2916,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumAuctus
-Encoding: 121 -1 119
+Encoding: 146 -1 119
Width: 178
Flags: HW
HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1
@@ -2953,7 +2956,7 @@ Validated: 33
EndChar
StartChar: PunctumCavumInclinatumAuctusHole
-Encoding: 122 -1 120
+Encoding: 147 -1 120
Width: 178
Flags: HW
HStem: -476.247 17.1 -117.147 17.1 241.953 17.1 601.053 17.1
@@ -2977,8 +2980,8 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscusLineTLBR
-Encoding: 123 -1 121
+StartChar: OriscusReversusLineTLBR
+Encoding: 148 -1 121
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
@@ -2991,7 +2994,7 @@ SplineSet
192 37.6699 192 37.625 192 37.5801 c 0
192 37.5322 192 37.4854 192 37.4375 c 0
192 27.5859 194.839 -25.4824 192 -44.0859 c 1
- 169.991 -44.0859 l 1
+ 179.714 -44.0859 182.571 -43.8018 169.991 -44.0859 c 1
167.143 -38.6592 167.571 -8.50879 140.233 -8.17188 c 0
106.215 -7.75195 94.0938 -41.2314 59.293 -41.2314 c 0
33.0732 -41.2314 12.5537 -20.7119 5.71387 6.64844 c 0
@@ -2999,14 +3002,14 @@ SplineSet
0.0136719 69.4824 l 1
0.0136719 69.625 l 2
0.0136719 79.4766 -2.8252 132.538 0.0136719 151.141 c 1
- 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 1
+ 12.2998 151.141 9.44238 150.857 22.0225 151.141 c 1
24.8711 145.714 24.4424 115.571 51.7803 115.234 c 0
85.7969 114.814 97.9199 148.294 132.721 148.294 c 0
EndSplineSet
EndChar
-StartChar: DescendensOriscusLineTL
-Encoding: 124 -1 122
+StartChar: OriscusReversusLineTL
+Encoding: 149 -1 122
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
@@ -3019,7 +3022,7 @@ SplineSet
34.6807 -40.9463 13.0205 -20.4258 6.18066 6.93359 c 0
2.75977 24.0342 0.0136719 51.3848 0.0136719 69.625 c 0
0.0136719 79.4766 -2.8252 132.545 0.0136719 151.148 c 1
- 22.0225 151.141 0.0136719 151.148 22.0225 151.141 c 1
+ 12.2998 151.143 9.44238 150.857 22.0225 151.141 c 1
24.8711 145.714 24.4424 115.571 51.7803 115.234 c 0
82.5586 114.854 101.94 148.294 132.721 148.294 c 0
158.94 148.294 179.46 127.774 186.3 100.414 c 0
@@ -3029,7 +3032,7 @@ EndSplineSet
EndChar
StartChar: UpperPesOneNothing
-Encoding: 56 -1 123
+Encoding: 63 -1 123
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -3057,8 +3060,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusCavum
-Encoding: 125 -1 124
+StartChar: OriscusCavum
+Encoding: 152 -1 124
Width: 192
Flags: HW
HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628
@@ -3090,8 +3093,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusCavumHole
-Encoding: 126 -1 125
+StartChar: OriscusCavumHole
+Encoding: 153 -1 125
Width: 192
Flags: W
HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628
@@ -3112,8 +3115,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusCavum
-Encoding: 127 -1 126
+StartChar: OriscusCavumReversus
+Encoding: 154 -1 126
Width: 192
Flags: HW
HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628
@@ -3145,8 +3148,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusCavumHole
-Encoding: 128 -1 127
+StartChar: OriscusCavumReversusHole
+Encoding: 155 -1 127
Width: 192
Flags: HW
HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628
@@ -3168,7 +3171,7 @@ EndSplineSet
EndChar
StartChar: OriscusCavumDeminutus
-Encoding: 129 -1 128
+Encoding: 156 -1 128
Width: 192
Flags: HW
HStem: -305.023 11.628 -60.8351 11.628 183.353 11.628 427.541 11.628
@@ -3203,7 +3206,7 @@ EndSplineSet
EndChar
StartChar: OriscusCavumDeminutusHole
-Encoding: 130 -1 129
+Encoding: 157 -1 129
Width: 192
Flags: HW
LayerCount: 2
@@ -3224,7 +3227,7 @@ EndSplineSet
EndChar
StartChar: Virgula.2
-Encoding: 131 -1 130
+Encoding: 158 -1 130
Width: 152
VWidth: 1418
Flags: HW
@@ -3242,7 +3245,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.2
-Encoding: 132 -1 131
+Encoding: 159 -1 131
Width: 19
VWidth: 1418
Flags: HW
@@ -3259,7 +3262,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.2
-Encoding: 133 -1 132
+Encoding: 160 -1 132
Width: 19
VWidth: 2048
Flags: HW
@@ -3276,7 +3279,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.2
-Encoding: 134 -1 133
+Encoding: 161 -1 133
Width: 19
VWidth: 2048
Flags: HW
@@ -3293,7 +3296,7 @@ EndSplineSet
EndChar
StartChar: Virgula.3
-Encoding: 135 -1 134
+Encoding: 162 -1 134
Width: 152
VWidth: 1733
Flags: HW
@@ -3311,7 +3314,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.3
-Encoding: 136 -1 135
+Encoding: 163 -1 135
Width: 19
VWidth: 1733
Flags: HW
@@ -3328,7 +3331,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.3
-Encoding: 137 -1 136
+Encoding: 164 -1 136
Width: 19
VWidth: 2048
Flags: HW
@@ -3345,7 +3348,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.3
-Encoding: 138 -1 137
+Encoding: 165 -1 137
Width: 19
VWidth: 2048
Flags: HW
@@ -3362,7 +3365,7 @@ EndSplineSet
EndChar
StartChar: Virgula.5
-Encoding: 139 -1 138
+Encoding: 166 -1 138
Width: 152
VWidth: 2363
Flags: HW
@@ -3380,7 +3383,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.5
-Encoding: 140 -1 139
+Encoding: 167 -1 139
Width: 19
VWidth: 2363
Flags: HW
@@ -3397,7 +3400,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.5
-Encoding: 141 -1 140
+Encoding: 168 -1 140
Width: 19
VWidth: 2048
Flags: HW
@@ -3414,7 +3417,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.5
-Encoding: 142 -1 141
+Encoding: 169 -1 141
Width: 19
VWidth: 2048
Flags: HW
@@ -3431,7 +3434,7 @@ EndSplineSet
EndChar
StartChar: StrophaAuctaLongtail
-Encoding: 87 -1 142
+Encoding: 94 -1 142
Width: 168
Flags: W
HStem: -472.609 17.1 -113.509 17.1 245.591 17.1 604.691 17.1
@@ -3455,7 +3458,7 @@ EndSplineSet
EndChar
StartChar: rqueue
-Encoding: 143 -1 143
+Encoding: 170 -1 143
Width: 22
VWidth: 2048
Flags: HW
@@ -3463,16 +3466,16 @@ HStem: -409 15 -94 15 221 15 536 15
LayerCount: 2
Fore
SplineSet
-22 -14.5 m 21
- 13.8428 -12.709 4.40723 -12.2783 0 -6.5 c 9
- 0 3 l 25
+22 -14.5 m 13
22 3 l 25
- 22 -14.5 l 21
+ 0 3 l 25
+ 0 -6.5 l 17
+ 4.40723 -12.2783 13.8428 -12.709 22 -14.5 c 13
EndSplineSet
EndChar
StartChar: queuebase
-Encoding: 144 -1 144
+Encoding: 171 -1 144
Width: 22
VWidth: 2048
Flags: HW
@@ -3490,7 +3493,7 @@ EndSplineSet
EndChar
StartChar: virgabase
-Encoding: 145 -1 145
+Encoding: 172 -1 145
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -3511,7 +3514,7 @@ EndSplineSet
EndChar
StartChar: rvbase
-Encoding: 146 -1 146
+Encoding: 173 -1 146
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -3533,7 +3536,7 @@ EndSplineSet
EndChar
StartChar: rvirgabase
-Encoding: 147 -1 147
+Encoding: 174 -1 147
Width: 161
Flags: HW
HStem: -409 15 -94 15 221 15 536 15
@@ -3554,7 +3557,7 @@ EndSplineSet
EndChar
StartChar: VirgaBaseLineBL
-Encoding: 148 -1 148
+Encoding: 175 -1 148
Width: 161
Flags: W
HStem: -409 15 -94 15 221 15 536 15
@@ -3575,15 +3578,15 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusLineBLBR
-Encoding: 149 -1 149
+StartChar: osbase
+Encoding: 176 -1 149
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
LayerCount: 2
Fore
SplineSet
-0.0101797 -58 m 1
+0.0101797 -58 m 5
0.0136719 37.7139 l 2
0.0146484 55.9541 1.15332 83.3135 5.71387 100.414 c 0
12.5537 127.774 33.0732 148.294 59.293 148.294 c 0
@@ -3591,248 +3594,48 @@ SplineSet
174.434 115.234 166.453 149.435 176.714 149.435 c 0
188.113 149.435 192 87.8652 192 69.625 c 0
192 -42 l 1
- 170 -42 l 1
+ 182.5 -42 179 -42 170 -42 c 1
170 -23.1459 l 1
160.003 -34.142 146.695 -40.9463 132.254 -40.9463 c 0
100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0
31.2755 -7.88574 25 -19 22 -29 c 1
22.0119 -58 l 1
- 0.0101797 -58 l 1
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBL
-Encoding: 150 -1 150
-Width: 192
-Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-0.0101797 -58 m 1
- 0.0136719 69.625 l 0
- 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0
- 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0
- 82.5605 115.234 101.94 148.294 132.721 148.294 c 0
- 158.94 148.294 179.46 127.774 186.3 100.414 c 0
- 190.86 83.3135 192 55.9541 192 37.7139 c 0
- 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0
- 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0
- 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0
- 45.3152 -40.9463 32.0047 -34.139 22.0068 -23.1387 c 1
- 22.0119 -58 l 1
- 0.0101797 -58 l 1
+ 0.0101797 -58 l 5
EndSplineSet
EndChar
-StartChar: tmpglyph
-Encoding: 151 -1 151
-Width: 22
-VWidth: 2048
-Flags: HW
-HStem: 64 32<0 1>
-VStem: 0 1<64 96>
-LayerCount: 2
-EndChar
-
-StartChar: AscendensOriscusLineBR
-Encoding: 152 -1 152
+StartChar: OriscusReversusLineBL
+Encoding: 177 -1 150
Width: 192
Flags: HW
HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
LayerCount: 2
Fore
SplineSet
-169.971 -23.1776 m 1
- 159.977 -34.1551 146.681 -40.9463 132.254 -40.9463 c 0
- 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0
- 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0
- 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0
+22.0137 -42 m 5
+ 13.0137 -42 9.51367 -42 0.0136719 -42 c 5
+ 0.0136719 -21.5 0.0136719 24.5596 0.0136719 37.7139 c 0
0.0136719 55.9541 1.15332 83.3135 5.71387 100.414 c 0
12.5537 127.774 33.0732 148.294 59.293 148.294 c 0
90.0732 148.294 109.453 115.234 140.233 115.234 c 0
174.434 115.234 166.453 149.435 176.714 149.435 c 0
188.113 149.435 192 87.8652 192 69.625 c 0
- 192 -42 l 1
- 170 -42 l 1
- 169.971 -23.1776 l 1
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTLBR
-Encoding: 153 -1 153
-Width: 192
-Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-0.0136719 151.141 m 5
- 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 1
- 22.0529 131.44 l 1
- 31.7543 141.879 44.6326 148.294 59.293 148.294 c 0
- 90.0732 148.294 109.453 115.234 140.233 115.234 c 0
- 174.434 115.234 166.453 149.435 176.714 149.435 c 0
- 188.113 149.435 192 87.8652 192 69.625 c 0
- 192 -42 l 1
- 170 -42 l 1
- 169.971 -23.1776 l 1
- 159.977 -34.1551 146.681 -40.9463 132.254 -40.9463 c 0
- 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0
- 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0
- 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 4
- 0.0136719 151.141 l 5
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTLTR
-Encoding: 154 -1 154
-Width: 192
-Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-0.0136719 151.141 m 1
- 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 1
- 22.0468 131.433 l 1
- 31.7489 141.876 44.6295 148.294 59.293 148.294 c 0
- 90.0732 148.294 109.455 114.854 140.233 115.234 c 0
- 167.571 115.571 167.143 145.714 169.991 151.141 c 5
- 192 151.148 l 5
- 194.839 132.545 192 79.4765 192 69.625 c 0
192 51.3848 189.254 24.0342 185.833 6.93359 c 0
178.993 -20.4258 157.333 -40.9463 132.254 -40.9463 c 0
100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0
- 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0
- 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0
- 0.0136719 151.141 l 1
+ 31.3037 -7.88574 25.3428 -15.2842 22.0137 -25 c 1
+ 22.0137 -35.5 22.0137 -31.5 22.0137 -42 c 5
EndSplineSet
EndChar
-StartChar: AscendensOriscusLineTL
-Encoding: 155 -1 155
-Width: 192
-Flags: W
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-0.0136719 151.141 m 5
- 22.0225 151.141 0.0136719 151.141 22.0225 151.141 c 5
- 21.9791 131.36 l 1
- 31.6889 141.846 44.5954 148.294 59.293 148.294 c 0
- 90.0732 148.294 109.453 115.234 140.233 115.234 c 0
- 174.434 115.234 166.453 149.435 176.714 149.435 c 0
- 188.113 149.435 192 87.8652 192 69.625 c 0
- 192 51.3848 189.254 24.0342 185.833 6.93359 c 0
- 178.993 -20.4258 157.333 -40.9463 132.254 -40.9463 c 0
- 100.333 -40.9463 82.0938 -7.88574 51.3135 -7.88574 c 0
- 17.1133 -7.88574 23.9531 -42.0859 14.833 -42.0859 c 0
- 3.43359 -42.0859 0.0136719 19.4736 0.0136719 37.7139 c 0
- 0.0136719 151.141 l 5
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBLBR
-Encoding: 156 -1 156
-Width: 192
-Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-0.0136719 69.625 m 4
- 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0
- 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0
- 82.5605 115.234 101.94 148.294 132.721 148.294 c 0
- 158.94 148.294 179.46 127.774 186.3 100.414 c 0
- 190.86 83.3135 192 55.9541 192 37.7139 c 0
- 192 24.5596 192 -21.5 192 -42 c 1
- 182.5 -42 179 -42 170 -42 c 1
- 170 -31.5 170 -35.5 170 -25 c 1
- 166.671 -15.2842 160.71 -7.88574 140.7 -7.88574 c 0
- 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0
- 45.3285 -40.9463 32.0294 -34.1516 22.0346 -23.169 c 1
- 22.0225 -42.0791 l 1
- 0.0136719 -42.0859 l 5
- 0.0136719 69.625 l 4
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBLTR
-Encoding: 157 -1 157
-Width: 192
-Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-0.0136719 69.625 m 4
- 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0
- 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0
- 82.5605 115.234 101.94 148.294 132.721 148.294 c 0
- 147.398 148.294 160.29 141.864 169.995 131.403 c 1
- 169.991 151.141 l 1
- 192 151.148 l 1
- 192 37.7139 l 0
- 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0
- 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0
- 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0
- 45.3253 -40.9463 32.0234 -34.1485 22.0279 -23.1616 c 1
- 22.0225 -42.0791 l 1
- 0.0136719 -42.0859 l 5
- 0.0136719 69.625 l 4
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineTLTR
-Encoding: 158 -1 158
-Width: 192
-Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
-LayerCount: 2
-Fore
-SplineSet
-192 37.7139 m 4
- 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0
- 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0
- 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0
- 34.6807 -40.9463 13.0205 -20.4258 6.18066 6.93359 c 0
- 2.75977 24.0342 0.0136719 51.3848 0.0136719 69.625 c 0
- 0.0136719 79.4766 -2.8252 132.545 0.0136719 151.148 c 1
- 12.2998 151.143 9.44238 150.857 22.0225 151.141 c 1
- 24.8711 145.714 24.4424 115.571 51.7803 115.234 c 0
- 82.5586 114.854 101.94 148.294 132.721 148.294 c 0
- 147.411 148.294 160.312 141.852 170.02 131.375 c 1
- 169.991 151.141 l 1
- 192 151.148 l 5
- 192 37.7139 l 4
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineTR
-Encoding: 159 -1 159
-Width: 192
+StartChar: tmpglyph
+Encoding: 178 -1 151
+Width: 22
+VWidth: 2048
Flags: HW
-HStem: -473.822 17.1 -114.722 17.1 244.378 17.1 603.478 17.1
+HStem: 64 32<0 1>
+VStem: 0 1<64 96>
LayerCount: 2
-Fore
-SplineSet
-192 37.7139 m 0
- 192 19.4736 188.58 -42.0859 177.181 -42.0859 c 0
- 168.061 -42.0859 174.9 -7.88574 140.7 -7.88574 c 0
- 109.92 -7.88574 91.6807 -40.9463 59.7598 -40.9463 c 0
- 34.6807 -40.9463 13.0205 -20.4258 6.18066 6.93359 c 0
- 2.75977 24.0342 0.0136719 51.3848 0.0136719 69.625 c 0
- 0.0136719 87.8652 3.90039 149.435 15.2998 149.435 c 0
- 25.5605 149.435 17.5801 115.234 51.7803 115.234 c 0
- 82.5605 115.234 101.94 148.294 132.721 148.294 c 0
- 147.428 148.294 160.341 141.838 170.053 131.34 c 1
- 169.991 151.141 l 5
- 192 151.148 l 5
- 192 37.7139 l 0
-EndSplineSet
EndChar
EndChars
EndSplineFont
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
index 6f169c8a17d..121ce478174 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
+++ b/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
@@ -20,7 +20,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1176402534
-ModificationTime: 1457825186
+ModificationTime: 1455123204
OS2TypoAscent: 0
OS2TypoAOffset: 1
OS2TypoDescent: 0
@@ -38,17 +38,16 @@ OS2Vendor: 'PfEd'
MarkAttachClasses: 1
DEI: 91125
Encoding: Custom
+Compacted: 1
UnicodeInterp: none
NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 0 14 13
+WinInfo: 19 19 8
BeginPrivate: 0
EndPrivate
Grid
--1000 159 m 0
- 2000 159 l 0
-1000 194 m 0
2000 194 l 0
18 1300 m 0
@@ -73,7 +72,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: 172 172
+BeginChars: 379 164
StartChar: Punctum
Encoding: 0 -1 0
@@ -166,7 +165,7 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscus
+StartChar: OriscusReversus
Encoding: 4 -1 4
Width: 166
VWidth: 2537
@@ -188,7 +187,7 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscus
+StartChar: Oriscus
Encoding: 5 -1 5
Width: 166
VWidth: 2537
@@ -347,7 +346,7 @@ Validated: 33
EndChar
StartChar: DivisioMinima
-Encoding: 12 -1 12
+Encoding: 14 -1 12
AltUni2: 000050.ffffffff.0
Width: 19
VWidth: 2048
@@ -367,7 +366,7 @@ Validated: 1
EndChar
StartChar: DivisioMinor
-Encoding: 13 -1 13
+Encoding: 15 -1 13
Width: 19
VWidth: 2048
Flags: W
@@ -385,7 +384,7 @@ Validated: 1
EndChar
StartChar: pesdeminutus
-Encoding: 14 -1 14
+Encoding: 17 -1 14
Width: 166
VWidth: 2684
Flags: W
@@ -409,7 +408,7 @@ Validated: 1
EndChar
StartChar: auctusd1
-Encoding: 15 -1 15
+Encoding: 18 -1 15
Width: 166
VWidth: 2689
Flags: W
@@ -432,7 +431,7 @@ Validated: 1
EndChar
StartChar: auctusa1
-Encoding: 16 -1 16
+Encoding: 19 -1 16
Width: 166
VWidth: 2421
Flags: W
@@ -456,7 +455,7 @@ Validated: 1
EndChar
StartChar: mdeminutus
-Encoding: 17 -1 17
+Encoding: 20 -1 17
Width: 168
VWidth: 2048
Flags: W
@@ -482,7 +481,7 @@ Validated: 1
EndChar
StartChar: Natural
-Encoding: 18 -1 18
+Encoding: 21 -1 18
Width: 108
Flags: W
VStem: 0 25.2002<7.7002 121.4 173.3 323.299> 84 24<-184.013 -35.5 18.5 128.9>
@@ -518,7 +517,7 @@ Validated: 1
EndChar
StartChar: FClef
-Encoding: 19 -1 19
+Encoding: 22 -1 19
Width: 322
VWidth: 2503
Flags: W
@@ -556,7 +555,7 @@ Validated: 33
EndChar
StartChar: CustosDownLong
-Encoding: 20 -1 20
+Encoding: 23 -1 20
Width: 73
VWidth: 2463
Flags: W
@@ -577,7 +576,7 @@ Validated: 1
EndChar
StartChar: CustosDownShort
-Encoding: 21 -1 21
+Encoding: 24 -1 21
Width: 73
VWidth: 2412
Flags: W
@@ -599,7 +598,7 @@ Validated: 1
EndChar
StartChar: CustosUpLong
-Encoding: 22 -1 22
+Encoding: 25 -1 22
Width: 73
VWidth: 2609
Flags: W
@@ -622,7 +621,7 @@ Validated: 1
EndChar
StartChar: CustosUpShort
-Encoding: 23 -1 23
+Encoding: 26 -1 23
Width: 74
VWidth: 2660
Flags: W
@@ -644,7 +643,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBR
-Encoding: 24 -1 24
+Encoding: 27 -1 24
Width: 166
VWidth: 2612
Flags: W
@@ -667,7 +666,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBL
-Encoding: 25 -1 25
+Encoding: 28 -1 25
Width: 166
VWidth: 2612
Flags: W
@@ -690,7 +689,7 @@ Validated: 1
EndChar
StartChar: PunctumLineTL
-Encoding: 26 -1 26
+Encoding: 29 -1 26
Width: 166
VWidth: 2612
Flags: W
@@ -713,7 +712,7 @@ Validated: 1
EndChar
StartChar: PunctumLineTR
-Encoding: 27 -1 27
+Encoding: 30 -1 27
Width: 166
VWidth: 2612
Flags: W
@@ -736,7 +735,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBLBR
-Encoding: 28 -1 28
+Encoding: 31 -1 28
Width: 166
VWidth: 2612
Flags: W
@@ -761,7 +760,7 @@ Validated: 1
EndChar
StartChar: base6
-Encoding: 29 -1 29
+Encoding: 32 -1 29
Width: 166
VWidth: 2612
Flags: W
@@ -786,7 +785,7 @@ Validated: 1
EndChar
StartChar: line2
-Encoding: 30 -1 30
+Encoding: 33 -1 30
Width: 18
VWidth: 2048
Flags: W
@@ -805,7 +804,7 @@ Validated: 1
EndChar
StartChar: line3
-Encoding: 31 -1 31
+Encoding: 34 -1 31
Width: 18
VWidth: 2048
Flags: W
@@ -824,7 +823,7 @@ Validated: 1
EndChar
StartChar: line4
-Encoding: 32 -1 32
+Encoding: 35 -1 32
Width: 18
VWidth: 2048
Flags: W
@@ -842,7 +841,7 @@ Validated: 1
EndChar
StartChar: line5
-Encoding: 33 -1 33
+Encoding: 36 -1 33
Width: 18
VWidth: 2048
Flags: W
@@ -860,7 +859,7 @@ Validated: 1
EndChar
StartChar: QuilismaLineTR
-Encoding: 34 -1 34
+Encoding: 40 -1 34
Width: 166
VWidth: 2496
Flags: W
@@ -889,32 +888,32 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: AscendensOriscusLineTR
-Encoding: 35 -1 35
+StartChar: OriscusLineTR
+Encoding: 41 -1 35
Width: 166
VWidth: 2537
Flags: W
-HStem: -37.1494 176.799<74.1345 154.636>
-VStem: -0.200195 166.201<-3.28828 139.081> 148.027 17.973<141.255 159>
+HStem: -37.1504 176.8<74.1705 154.735>
+VStem: -0.200195 166.4<-3.28925 139.081> 148.027 17.9728<141.255 159>
LayerCount: 2
Fore
SplineSet
-148 159 m 1xa0
- 166 159 l 1xa0
- 166.001 13.5508 l 2
- 166.001 -12.9688 158.201 -37.1494 127.001 -37.1494 c 0
- 105.937 -37.1494 61.2451 -3.34961 38.7998 -3.34961 c 0
+148 159 m 5xa0
+ 166 159 l 5xa0
+ 166.2 13.5498 l 2
+ 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
+ 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
9.08496 -3.34961 -0.200195 -29.9844 -0.200195 -55.3496 c 1
- -0.200195 121.45 l 2xc0
- -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0
- 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
- 135.712 139.65 142.575 141.764 148.027 145.398 c 1
- 148 159 l 1xa0
+ -0.200195 121.45 l 6xc0
+ -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 4
+ 61.2793 172.15 106.118 139.65 127.2 139.65 c 4
+ 135.712 139.65 142.575 141.764 148.027 145.398 c 5
+ 148 159 l 5xa0
EndSplineSet
EndChar
StartChar: idebilis
-Encoding: 36 -1 36
+Encoding: 43 -1 36
Width: 83
VWidth: 2605
Flags: W
@@ -937,7 +936,7 @@ Validated: 33
EndChar
StartChar: deminutus
-Encoding: 37 -1 37
+Encoding: 44 -1 37
Width: 83
VWidth: 2605
Flags: W
@@ -960,7 +959,7 @@ Validated: 33
EndChar
StartChar: rdeminutus
-Encoding: 38 -1 38
+Encoding: 45 -1 38
Width: 83
VWidth: 2605
Flags: W
@@ -983,7 +982,7 @@ Validated: 33
EndChar
StartChar: PunctumAuctusLineBL
-Encoding: 39 -1 39
+Encoding: 46 -1 39
Width: 166
VWidth: 2689
Flags: W
@@ -1007,7 +1006,7 @@ Validated: 1
EndChar
StartChar: auctusa2
-Encoding: 40 -1 40
+Encoding: 47 -1 40
Width: 166
VWidth: 2421
Flags: W
@@ -1031,7 +1030,7 @@ Validated: 1
EndChar
StartChar: porrectus1
-Encoding: 41 -1 41
+Encoding: 48 -1 41
Width: 447
VWidth: 2553
Flags: HW
@@ -1053,7 +1052,7 @@ EndSplineSet
EndChar
StartChar: porrectus2
-Encoding: 42 -1 42
+Encoding: 49 -1 42
Width: 547
VWidth: 2575
Flags: HW
@@ -1077,7 +1076,7 @@ EndSplineSet
EndChar
StartChar: porrectus3
-Encoding: 43 -1 43
+Encoding: 50 -1 43
Width: 628
VWidth: 2556
Flags: HW
@@ -1102,7 +1101,7 @@ EndSplineSet
EndChar
StartChar: porrectus4
-Encoding: 44 -1 44
+Encoding: 51 -1 44
Width: 704
VWidth: 2500
Flags: HW
@@ -1126,7 +1125,7 @@ EndSplineSet
EndChar
StartChar: porrectus5
-Encoding: 45 -1 45
+Encoding: 52 -1 45
Width: 849
VWidth: 2048
Flags: HW
@@ -1150,7 +1149,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexus1
-Encoding: 46 -1 46
+Encoding: 53 -1 46
Width: 503
VWidth: 2553
Flags: HW
@@ -1173,7 +1172,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexus2
-Encoding: 47 -1 47
+Encoding: 54 -1 47
Width: 628
VWidth: 2575
Flags: HW
@@ -1195,7 +1194,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexus3
-Encoding: 48 -1 48
+Encoding: 55 -1 48
Width: 628
VWidth: 2556
Flags: HW
@@ -1219,7 +1218,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexus4
-Encoding: 49 -1 49
+Encoding: 56 -1 49
Width: 628
VWidth: 2500
Flags: HW
@@ -1242,7 +1241,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexus5
-Encoding: 50 -1 50
+Encoding: 57 -1 50
Width: 931
VWidth: 2048
Flags: HW
@@ -1263,7 +1262,7 @@ EndSplineSet
EndChar
StartChar: PesQuilismaOneNothing
-Encoding: 51 -1 51
+Encoding: 58 -1 51
Width: 166
VWidth: 2496
Flags: HW
@@ -1296,7 +1295,7 @@ EndSplineSet
EndChar
StartChar: StrophaAucta.caeciliae
-Encoding: 52 -1 52
+Encoding: 59 -1 52
Width: 151
VWidth: 2686
Flags: W
@@ -1319,7 +1318,7 @@ Validated: 33
EndChar
StartChar: PunctumInclinatumAuctus.caeciliae
-Encoding: 53 -1 53
+Encoding: 60 -1 53
Width: 185
VWidth: 2048
Flags: W
@@ -1343,7 +1342,7 @@ Validated: 33
EndChar
StartChar: AuctumMora
-Encoding: 54 -1 54
+Encoding: 62 -1 54
Width: 71
VWidth: 2679
Flags: W
@@ -1362,7 +1361,7 @@ Validated: 1
EndChar
StartChar: VEpisema
-Encoding: 56 -1 55
+Encoding: 64 -1 55
Width: 34
VWidth: 2048
Flags: W
@@ -1383,7 +1382,7 @@ Validated: 1
EndChar
StartChar: PunctumDeminutus
-Encoding: 57 -1 56
+Encoding: 65 -1 56
Width: 83
VWidth: 2612
Flags: W
@@ -1404,7 +1403,7 @@ Validated: 1
EndChar
StartChar: hepisema_base
-Encoding: 58 -1 57
+Encoding: 66 -1 57
Width: 1
VWidth: 2044
Flags: HW
@@ -1422,7 +1421,7 @@ EndSplineSet
EndChar
StartChar: CustosUpMedium
-Encoding: 59 -1 58
+Encoding: 67 -1 58
Width: 74
VWidth: 2660
Flags: W
@@ -1444,7 +1443,7 @@ Validated: 1
EndChar
StartChar: CustosDownMedium
-Encoding: 60 -1 59
+Encoding: 68 -1 59
Width: 73
VWidth: 2412
Flags: W
@@ -1466,7 +1465,7 @@ Validated: 1
EndChar
StartChar: Accentus
-Encoding: 61 -1 60
+Encoding: 69 -1 60
Width: 6
Flags: W
HStem: -56.1992 151.199
@@ -1488,7 +1487,7 @@ Validated: 1
EndChar
StartChar: AccentusReversus
-Encoding: 62 -1 61
+Encoding: 70 -1 61
Width: 6
Flags: W
HStem: -56.1992 151.199
@@ -1510,7 +1509,7 @@ Validated: 1
EndChar
StartChar: SemicirculusReversus
-Encoding: 63 -1 62
+Encoding: 71 -1 62
Width: 125
VWidth: 1583
Flags: W
@@ -1530,7 +1529,7 @@ Validated: 1
EndChar
StartChar: Semicirculus
-Encoding: 64 -1 63
+Encoding: 72 -1 63
Width: 124
VWidth: 1606
Flags: W
@@ -1550,7 +1549,7 @@ Validated: 1
EndChar
StartChar: Circulus
-Encoding: 65 -1 64
+Encoding: 73 -1 64
Width: 124
VWidth: 1594
Flags: W
@@ -1573,7 +1572,7 @@ Validated: 1
EndChar
StartChar: CClefChange
-Encoding: 66 -1 65
+Encoding: 74 -1 65
Width: 166
VWidth: 2575
Flags: W
@@ -1601,7 +1600,7 @@ Validated: 33
EndChar
StartChar: FClefChange
-Encoding: 67 -1 66
+Encoding: 75 -1 66
Width: 322
VWidth: 2503
Flags: W
@@ -1639,7 +1638,7 @@ Validated: 33
EndChar
StartChar: VEpisema.circumflexus
-Encoding: 68 -1 67
+Encoding: 76 -1 67
Width: 108
VWidth: 2048
Flags: W
@@ -1663,7 +1662,7 @@ Validated: 33
EndChar
StartChar: PunctumCavum
-Encoding: 69 -1 68
+Encoding: 77 -1 68
Width: 166
VWidth: 2612
Flags: W
@@ -1691,7 +1690,7 @@ Validated: 33
EndChar
StartChar: LineaPunctum
-Encoding: 70 -1 69
+Encoding: 78 -1 69
Width: 266
VWidth: 2048
Flags: W
@@ -1726,7 +1725,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavum
-Encoding: 71 -1 70
+Encoding: 79 -1 70
Width: 266
VWidth: 2048
Flags: W
@@ -1768,7 +1767,7 @@ Validated: 33
EndChar
StartChar: PunctumSmall
-Encoding: 72 -1 71
+Encoding: 80 -1 71
Width: 155
VWidth: 2537
Flags: HW
@@ -1790,7 +1789,7 @@ EndSplineSet
EndChar
StartChar: hepisemaright
-Encoding: 74 -1 72
+Encoding: 82 -1 72
Width: 2
VWidth: 2044
Flags: HW
@@ -1808,7 +1807,7 @@ EndSplineSet
EndChar
StartChar: mpdeminutus
-Encoding: 75 -1 73
+Encoding: 83 -1 73
Width: 168
VWidth: 2048
Flags: W
@@ -1834,7 +1833,7 @@ Validated: 1
EndChar
StartChar: PunctumAscendens
-Encoding: 76 -1 74
+Encoding: 84 -1 74
Width: 166
VWidth: 1149
Flags: W
@@ -1856,7 +1855,7 @@ Validated: 1
EndChar
StartChar: PunctumDescendens
-Encoding: 77 -1 75
+Encoding: 85 -1 75
Width: 166
VWidth: 1342
Flags: W
@@ -1877,7 +1876,7 @@ Validated: 33
EndChar
StartChar: mnbdeminutus
-Encoding: 78 -1 76
+Encoding: 86 -1 76
Width: 168
VWidth: 2048
Flags: W
@@ -1902,7 +1901,7 @@ Validated: 33
EndChar
StartChar: mnbpdeminutus
-Encoding: 79 -1 77
+Encoding: 87 -1 77
Width: 168
VWidth: 2048
Flags: W
@@ -1926,7 +1925,7 @@ Validated: 33
EndChar
StartChar: porrectusflexusnb1
-Encoding: 80 -1 78
+Encoding: 88 -1 78
Width: 503
VWidth: 2553
Flags: HW
@@ -1946,7 +1945,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexusnb2
-Encoding: 81 -1 79
+Encoding: 89 -1 79
Width: 628
VWidth: 2575
Flags: HW
@@ -1966,7 +1965,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexusnb3
-Encoding: 82 -1 80
+Encoding: 90 -1 80
Width: 628
VWidth: 2556
Flags: HW
@@ -1987,7 +1986,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexusnb4
-Encoding: 83 -1 81
+Encoding: 91 -1 81
Width: 628
VWidth: 2500
Flags: HW
@@ -2007,7 +2006,7 @@ EndSplineSet
EndChar
StartChar: porrectusflexusnb5
-Encoding: 84 -1 82
+Encoding: 92 -1 82
Width: 931
VWidth: 2048
Flags: HW
@@ -2026,7 +2025,7 @@ EndSplineSet
EndChar
StartChar: p2base
-Encoding: 86 -1 83
+Encoding: 94 -1 83
Width: 166
VWidth: 2613
Flags: HW
@@ -2053,7 +2052,7 @@ EndSplineSet
EndChar
StartChar: PesOneNothing
-Encoding: 87 -1 84
+Encoding: 95 -1 84
Width: 166
VWidth: 2613
Flags: W
@@ -2084,7 +2083,7 @@ EndSplineSet
EndChar
StartChar: msdeminutus
-Encoding: 88 -1 85
+Encoding: 97 -1 85
Width: 168
VWidth: 2048
Flags: W
@@ -2110,7 +2109,7 @@ Validated: 1
EndChar
StartChar: mademinutus
-Encoding: 89 -1 86
+Encoding: 98 -1 86
Width: 168
VWidth: 2048
Flags: W
@@ -2137,7 +2136,7 @@ Validated: 33
EndChar
StartChar: PunctumCavum.caeciliae
-Encoding: 90 -1 87
+Encoding: 99 -1 87
Width: 166
VWidth: 2612
Flags: W
@@ -2163,7 +2162,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavum.caeciliae
-Encoding: 91 -1 88
+Encoding: 100 -1 88
Width: 266
VWidth: 2048
Flags: W
@@ -2202,7 +2201,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumHole.caeciliae
-Encoding: 92 -1 89
+Encoding: 101 -1 89
Width: 166
VWidth: 2612
Flags: W
@@ -2221,7 +2220,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavumHole.caeciliae
-Encoding: 93 -1 90
+Encoding: 102 -1 90
Width: 266
VWidth: 2048
Flags: W
@@ -2239,7 +2238,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumHole
-Encoding: 94 -1 91
+Encoding: 103 -1 91
Width: 166
VWidth: 2612
Flags: W
@@ -2260,7 +2259,7 @@ Validated: 33
EndChar
StartChar: LineaPunctumCavumHole
-Encoding: 95 -1 92
+Encoding: 104 -1 92
Width: 266
VWidth: 2048
Flags: W
@@ -2281,7 +2280,7 @@ Validated: 33
EndChar
StartChar: NaturalHole
-Encoding: 96 -1 93
+Encoding: 105 -1 93
Width: 108
Flags: W
HStem: 1.64062 133.319
@@ -2299,7 +2298,7 @@ Validated: 1
EndChar
StartChar: FlatHole
-Encoding: 97 -1 94
+Encoding: 106 -1 94
Width: 162
VWidth: 2587
Flags: W
@@ -2319,8 +2318,8 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscusLineBR
-Encoding: 98 -1 95
+StartChar: odbase
+Encoding: 107 -1 95
Width: 168
VWidth: 2612
Flags: W
@@ -2345,7 +2344,7 @@ Validated: 1
EndChar
StartChar: DivisioDominican
-Encoding: 99 -1 96
+Encoding: 108 -1 96
Width: 18
VWidth: 2048
Flags: W
@@ -2363,7 +2362,7 @@ Validated: 1
EndChar
StartChar: DivisioDominicanAlt
-Encoding: 100 -1 97
+Encoding: 109 -1 97
Width: 18
VWidth: 2048
Flags: W
@@ -2381,7 +2380,7 @@ Validated: 1
EndChar
StartChar: Sharp
-Encoding: 101 -1 98
+Encoding: 110 -1 98
Width: 258
VWidth: 2048
Flags: W
@@ -2445,7 +2444,7 @@ Validated: 1
EndChar
StartChar: SharpHole
-Encoding: 102 -1 99
+Encoding: 111 -1 99
Width: 258
VWidth: 2048
Flags: W
@@ -2464,7 +2463,7 @@ Validated: 1
EndChar
StartChar: Linea
-Encoding: 103 -1 100
+Encoding: 112 -1 100
Width: 431
VWidth: 2612
Flags: W
@@ -2493,7 +2492,7 @@ Validated: 1
EndChar
StartChar: RoundBrace
-Encoding: 104 -1 101
+Encoding: 113 -1 101
Width: 937
VWidth: 2048
Flags: W
@@ -2519,7 +2518,7 @@ Validated: 1
EndChar
StartChar: CurlyBrace
-Encoding: 105 -1 102
+Encoding: 114 -1 102
Width: 1006
VWidth: 2048
Flags: W
@@ -2547,7 +2546,7 @@ Validated: 1
EndChar
StartChar: BarBrace
-Encoding: 106 -1 103
+Encoding: 115 -1 103
Width: 591
VWidth: 2048
Flags: W
@@ -2574,7 +2573,7 @@ Validated: 1
EndChar
StartChar: OriscusDeminutus.caeciliae
-Encoding: 107 -1 104
+Encoding: 116 -1 104
Width: 168
VWidth: 2612
Flags: W
@@ -2597,58 +2596,59 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: AscendensOriscusLineBL
-Encoding: 108 -1 105
+StartChar: OriscusLineBL
+Encoding: 117 -1 105
Width: 166
VWidth: 2537
Flags: W
-HStem: -3.34961 175.5<18.4364 92.8347>
-VStem: 0 166.2<-3.28925 139.081> 0 18<-74 -5.00787>
+HStem: -37 177<74.049 160.524>
+VStem: 0 166<-1.90579 138.793> 0 18<-55 -4.875>
LayerCount: 2
Fore
SplineSet
-18 -74 m 1xa0
- 0 -74 l 1xa0
- 0.000976562 121.45 l 2
- 0.000976562 160.06 15.4004 172.15 38.7998 172.15 c 0
- 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
- 156.411 139.65 166.2 164.545 166.2 190.35 c 1
- 166.2 13.5498 l 2xc0
- 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
- 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
- 30.2747 -3.34961 23.4312 -5.54191 18.0061 -9.26756 c 1
- 18 -74 l 1xa0
+127 140 m 0xc0
+ 156 140 166 165 166 190 c 2
+ 166 14 l 2xc0
+ 166 -13 158 -37 127 -37 c 0
+ 106 -37 61 -3 39 -3 c 0
+ 30 -3 23 -6 18 -9 c 1
+ 18 -55 l 1
+ 0 -55 l 1xa0
+ -0 4 0 63 0 121 c 0
+ -0 160 15 172 39 172 c 0
+ 61 172 106 140 127 140 c 0xc0
EndSplineSet
+Validated: 1
EndChar
-StartChar: AscendensOriscusLineBLTR
-Encoding: 109 -1 106
+StartChar: SalicusOriscus
+Encoding: 118 -1 106
Width: 166
VWidth: 2537
-Flags: W
-HStem: -3.34961 175.5<18.4397 92.8347>
-VStem: 0 18<-74 -5.00652> 148.027 17.973<141.255 159>
+Flags: HW
+HStem: -37.1504 176.8<74.1705 154.735>
+VStem: -0.200195 166.4<-3.28925 139.081> 148.027 17.9728<141.255 159>
LayerCount: 2
Fore
SplineSet
-0 121.45 m 2
- 0 160.06 15.4004 172.15 38.7998 172.15 c 0
+-0.200195 121.45 m 2xc0
+ -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0
61.2793 172.15 106.118 139.65 127.2 139.65 c 0
135.712 139.65 142.575 141.764 148.027 145.398 c 1
- 148 159 l 1
- 166 159 l 1
- 166 13.5498 l 6
- 166 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
+ 148 159 l 1xa0
+ 166 159 l 1xa0
+ 166.2 13.5498 l 2
+ 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
30.2783 -3.34961 23.4369 -5.54007 18.0129 -9.26288 c 1
18 -74 l 1
0 -74 l 1
- 0 121.45 l 2
+ -0.200195 121.45 l 2xc0
EndSplineSet
EndChar
StartChar: StrophaAucta
-Encoding: 110 -1 107
+Encoding: 134 -1 107
Width: 172
VWidth: 2048
Flags: HW
@@ -2670,7 +2670,7 @@ EndSplineSet
EndChar
StartChar: Stropha
-Encoding: 111 -1 108
+Encoding: 135 -1 108
Width: 172
VWidth: 2048
Flags: W
@@ -2695,7 +2695,7 @@ Validated: 33
EndChar
StartChar: hepisemaleft
-Encoding: 73 -1 109
+Encoding: 81 -1 109
Width: 1
VWidth: 2044
Flags: HW
@@ -2713,7 +2713,7 @@ EndSplineSet
EndChar
StartChar: porrectusam11
-Encoding: 112 -1 110
+Encoding: 136 -1 110
Width: 503
VWidth: 2553
Flags: HW
@@ -2735,7 +2735,7 @@ EndSplineSet
EndChar
StartChar: porrectusam12
-Encoding: 113 -1 111
+Encoding: 137 -1 111
Width: 628
VWidth: 2575
Flags: HW
@@ -2759,7 +2759,7 @@ EndSplineSet
EndChar
StartChar: porrectusam13
-Encoding: 114 -1 112
+Encoding: 138 -1 112
Width: 678
VWidth: 2556
Flags: HW
@@ -2783,7 +2783,7 @@ EndSplineSet
EndChar
StartChar: porrectusam14
-Encoding: 115 -1 113
+Encoding: 139 -1 113
Width: 721
VWidth: 2500
Flags: HW
@@ -2808,7 +2808,7 @@ EndSplineSet
EndChar
StartChar: porrectusam15
-Encoding: 116 -1 114
+Encoding: 140 -1 114
Width: 933
VWidth: 2048
Flags: HW
@@ -2833,7 +2833,7 @@ EndSplineSet
EndChar
StartChar: RoundBraceDown
-Encoding: 117 -1 115
+Encoding: 141 -1 115
Width: 937
VWidth: 2048
Flags: W
@@ -2859,7 +2859,7 @@ Validated: 1
EndChar
StartChar: OriscusDeminutus
-Encoding: 55 -1 116
+Encoding: 63 -1 116
Width: 168
VWidth: 0
Flags: W
@@ -2885,7 +2885,7 @@ Validated: 33
EndChar
StartChar: PunctumInclinatumAuctus
-Encoding: 85 -1 117
+Encoding: 93 -1 117
Width: 185
VWidth: 0
Flags: W
@@ -2908,7 +2908,7 @@ Validated: 33
EndChar
StartChar: VirgaReversaAscendens_op
-Encoding: 118 -1 118
+Encoding: 142 -1 118
Width: 166
VWidth: 2684
Flags: W
@@ -2936,7 +2936,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaLongqueueAscendens_op
-Encoding: 119 -1 119
+Encoding: 143 -1 119
Width: 166
VWidth: 2684
Flags: W
@@ -2964,7 +2964,7 @@ Validated: 33
EndChar
StartChar: VirgaReversaLongqueueDescendens_op
-Encoding: 121 -1 120
+Encoding: 145 -1 120
Width: 168
VWidth: 2048
Flags: W
@@ -2994,7 +2994,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaDescendens_op
-Encoding: 120 -1 121
+Encoding: 144 -1 121
Width: 168
VWidth: 2048
Flags: W
@@ -3023,7 +3023,7 @@ Validated: 1
EndChar
StartChar: PunctumAscendens_op
-Encoding: 122 -1 122
+Encoding: 148 -1 122
Width: 166
VWidth: 1149
Flags: W
@@ -3048,7 +3048,7 @@ Validated: 1
EndChar
StartChar: PunctumDescendens_op
-Encoding: 123 -1 123
+Encoding: 149 -1 123
Width: 166
VWidth: 1342
Flags: W
@@ -3072,7 +3072,7 @@ Validated: 33
EndChar
StartChar: auctusd1_op
-Encoding: 124 -1 124
+Encoding: 150 -1 124
Width: 166
VWidth: 2689
Flags: W
@@ -3098,7 +3098,7 @@ Validated: 1
EndChar
StartChar: auctusa1_op
-Encoding: 125 -1 125
+Encoding: 151 -1 125
Width: 166
VWidth: 2421
Flags: W
@@ -3125,7 +3125,7 @@ Validated: 1
EndChar
StartChar: auctusa2_op
-Encoding: 126 -1 126
+Encoding: 152 -1 126
Width: 166
VWidth: 2421
Flags: W
@@ -3152,7 +3152,7 @@ Validated: 1
EndChar
StartChar: PunctumAuctusLineBL_op
-Encoding: 127 -1 127
+Encoding: 153 -1 127
Width: 166
VWidth: 2689
Flags: W
@@ -3179,7 +3179,7 @@ Validated: 1
EndChar
StartChar: pesdeminutus_op
-Encoding: 128 -1 128
+Encoding: 154 -1 128
Width: 166
VWidth: 2684
Flags: W
@@ -3206,7 +3206,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatum
-Encoding: 129 -1 129
+Encoding: 155 -1 129
Width: 185
VWidth: 2612
Flags: W
@@ -3229,7 +3229,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumAuctus
-Encoding: 131 -1 130
+Encoding: 157 -1 130
Width: 185
VWidth: 0
Flags: W
@@ -3257,7 +3257,7 @@ Validated: 33
EndChar
StartChar: PunctumCavumInclinatumAuctusHole
-Encoding: 132 -1 131
+Encoding: 158 -1 131
Width: 185
VWidth: 0
Flags: W
@@ -3277,7 +3277,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumHole
-Encoding: 130 -1 132
+Encoding: 156 -1 132
Width: 185
VWidth: 2612
Flags: W
@@ -3295,58 +3295,58 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscusLineTLBR
-Encoding: 133 -1 133
+StartChar: OriscusReversusLineTLBR
+Encoding: 159 -1 133
Width: 166
VWidth: 2537
-Flags: W
-HStem: -3.34961 175.5<73.1653 147.56>
-VStem: -0 17.9727<141.255 159> 148 18<-74 -5.00648>
+Flags: HW
+HStem: -37.1504 176.8<11.2647 91.8293>
+VStem: -0.200195 166.4<-3.28925 139.081> -0.000198364 17.9728<141.255 159>
LayerCount: 2
Fore
SplineSet
-165.999 121.45 m 2
+166.2 121.45 m 2xc0
166 -74 l 1
148 -74 l 1
147.987 -9.2627 l 1
142.562 -5.54004 135.722 -3.34961 127.2 -3.34961 c 0
104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
- 7.59961 -37.1504 0 -12.9697 0 13.5498 c 2
- -0 159 l 1
- 18 159 l 1
+ 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2
+ -0 159 l 1xa0
+ 18 159 l 1xa0
17.9727 145.398 l 1
23.4248 141.764 30.2881 139.65 38.7998 139.65 c 0
59.8818 139.65 104.721 172.15 127.2 172.15 c 0
- 150.6 172.15 165.999 160.061 165.999 121.45 c 2
+ 150.6 172.15 166.2 160.06 166.2 121.45 c 2xc0
EndSplineSet
EndChar
-StartChar: DescendensOriscusLineTL
-Encoding: 134 -1 134
+StartChar: OriscusReversusLineTL
+Encoding: 160 -1 134
Width: 166
VWidth: 2537
Flags: HW
-HStem: -37.1504 176.8<11.3309 91.8296>
-VStem: 0 166.2<-3.28925 139.081> 0 17.9727<141.255 159>
+HStem: -37.1504 176.8<11.2647 91.8293>
+VStem: -0.200195 166.4<-3.28925 139.081> -0.000198364 17.9728<141.255 159>
LayerCount: 2
Fore
SplineSet
18 159 m 1xa0
- 18 145 l 1xa0
- 23 141 30.2881 139.65 38.7998 139.65 c 0
+ 17.9727 145.398 l 1
+ 23.4248 141.764 30.2881 139.65 38.7998 139.65 c 0
59.8818 139.65 104.721 172.15 127.2 172.15 c 0
- 150.6 172.15 166.2 160.06 166.2 121.45 c 2
+ 150.6 172.15 166.2 160.06 166.2 121.45 c 2xc0
166.2 -55.3496 l 1
166.2 -29.9844 156.915 -3.34961 127.2 -3.34961 c 0
104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
- 7.59961 -37.1504 0 -12.9697 0 13.5498 c 2xc0
- -0 159 l 1
+ 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2
+ -0 159 l 1xa0
18 159 l 1xa0
EndSplineSet
EndChar
StartChar: UpperPesOneNothing
-Encoding: 135 -1 135
+Encoding: 161 -1 135
Width: 166
VWidth: 2613
Flags: W
@@ -3377,8 +3377,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusCavum
-Encoding: 136 -1 136
+StartChar: OriscusCavum
+Encoding: 164 -1 136
Width: 166
VWidth: 2537
Flags: W
@@ -3408,8 +3408,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusCavumHole
-Encoding: 137 -1 137
+StartChar: OriscusCavumHole
+Encoding: 165 -1 137
Width: 166
VWidth: 2537
Flags: W
@@ -3430,8 +3430,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusCavum
-Encoding: 138 -1 138
+StartChar: OriscusCavumReversus
+Encoding: 166 -1 138
Width: 166
VWidth: 2537
Flags: W
@@ -3461,8 +3461,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusCavumHole
-Encoding: 139 -1 139
+StartChar: OriscusCavumReversusHole
+Encoding: 167 -1 139
Width: 166
VWidth: 2537
Flags: W
@@ -3484,7 +3484,7 @@ EndSplineSet
EndChar
StartChar: OriscusCavumDeminutus
-Encoding: 140 -1 140
+Encoding: 168 -1 140
Width: 168
VWidth: 2612
Flags: W
@@ -3517,7 +3517,7 @@ EndSplineSet
EndChar
StartChar: OriscusCavumDeminutusHole
-Encoding: 141 -1 141
+Encoding: 169 -1 141
Width: 168
VWidth: 2612
Flags: W
@@ -3540,7 +3540,7 @@ EndSplineSet
EndChar
StartChar: Virgula.2
-Encoding: 142 -1 142
+Encoding: 170 -1 142
Width: 143
VWidth: 1788
Flags: HW
@@ -3562,7 +3562,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.2
-Encoding: 143 -1 143
+Encoding: 171 -1 143
Width: 19
VWidth: 1418
Flags: HW
@@ -3580,7 +3580,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.2
-Encoding: 144 -1 144
+Encoding: 172 -1 144
Width: 19
VWidth: 2048
Flags: W
@@ -3598,7 +3598,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.2
-Encoding: 145 -1 145
+Encoding: 173 -1 145
Width: 19
VWidth: 2048
Flags: W
@@ -3616,7 +3616,7 @@ EndSplineSet
EndChar
StartChar: Virgula.3
-Encoding: 146 -1 146
+Encoding: 174 -1 146
Width: 143
VWidth: 2103
Flags: HW
@@ -3638,7 +3638,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.3
-Encoding: 147 -1 147
+Encoding: 175 -1 147
Width: 19
VWidth: 1733
Flags: HW
@@ -3656,7 +3656,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.3
-Encoding: 148 -1 148
+Encoding: 176 -1 148
Width: 19
VWidth: 2048
Flags: W
@@ -3674,7 +3674,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.3
-Encoding: 149 -1 149
+Encoding: 177 -1 149
Width: 19
VWidth: 2048
Flags: W
@@ -3691,7 +3691,7 @@ EndSplineSet
EndChar
StartChar: Virgula.5
-Encoding: 150 -1 150
+Encoding: 178 -1 150
Width: 143
VWidth: 2733
Flags: HW
@@ -3713,7 +3713,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.5
-Encoding: 151 -1 151
+Encoding: 179 -1 151
Width: 19
VWidth: 2363
Flags: HW
@@ -3731,7 +3731,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.5
-Encoding: 152 -1 152
+Encoding: 180 -1 152
Width: 19
VWidth: 2048
Flags: W
@@ -3748,7 +3748,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.5
-Encoding: 153 -1 153
+Encoding: 181 -1 153
Width: 19
VWidth: 2048
Flags: W
@@ -3765,7 +3765,7 @@ EndSplineSet
EndChar
StartChar: StrophaAuctaLongtail
-Encoding: 154 -1 154
+Encoding: 182 -1 154
Width: 172
VWidth: 2048
Flags: HW
@@ -3787,7 +3787,7 @@ EndSplineSet
EndChar
StartChar: rqueue
-Encoding: 155 -1 155
+Encoding: 183 -1 155
Width: 18
VWidth: 2048
Flags: HW
@@ -3806,7 +3806,7 @@ EndSplineSet
EndChar
StartChar: queuebase
-Encoding: 156 -1 156
+Encoding: 184 -1 156
Width: 18
VWidth: 2048
Flags: HW
@@ -3824,7 +3824,7 @@ EndSplineSet
EndChar
StartChar: virgabase
-Encoding: 157 -1 157
+Encoding: 185 -1 157
Width: 166
VWidth: 2637
Flags: HW
@@ -3844,7 +3844,7 @@ EndSplineSet
EndChar
StartChar: rvirgabase
-Encoding: 158 -1 158
+Encoding: 186 -1 158
Width: 166
VWidth: 2637
Flags: HW
@@ -3864,7 +3864,7 @@ EndSplineSet
EndChar
StartChar: VirgaBaseLineBL
-Encoding: 159 -1 159
+Encoding: 187 -1 159
Width: 166
VWidth: 2637
Flags: HW
@@ -3888,7 +3888,7 @@ EndSplineSet
EndChar
StartChar: rvbase
-Encoding: 160 -1 160
+Encoding: 188 -1 160
Width: 166
VWidth: 2637
Flags: HW
@@ -3912,7 +3912,7 @@ EndSplineSet
EndChar
StartChar: tmpglyph
-Encoding: 161 -1 161
+Encoding: 189 -1 161
Width: 18
VWidth: 2048
Flags: HW
@@ -3921,8 +3921,8 @@ VStem: 0 1<64 96>
LayerCount: 2
EndChar
-StartChar: DescendensOriscusLineBL
-Encoding: 162 -1 162
+StartChar: OriscusReversusLineBL
+Encoding: 190 -1 162
Width: 166
VWidth: 2537
Flags: HW
@@ -3945,8 +3945,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusLineBLBR
-Encoding: 163 -1 163
+StartChar: osbase
+Encoding: 191 -1 163
Width: 166
VWidth: 2537
Flags: HW
@@ -3955,215 +3955,19 @@ VStem: 0 18.2002<-377.849 -4.93091> 148 18<-53 -32.6729>
LayerCount: 2
Fore
SplineSet
-0 -62 m 1
+0 -62 m 5
0 121 l 2
0 159.61 15.4004 172.15 38.7998 172.15 c 0
61.2793 172.15 106.118 139.65 127.2 139.65 c 0
156.411 139.65 166 164.195 166 190 c 1
- 166 -53 l 5
- 148 -53 l 5
- 148 -53 148 -52.8076 148 -32.6729 c 1
+ 166 -53 l 1
+ 150.333 -53 157.989 -53.0137 148 -53 c 1
+ 147.989 -40.0137 148 -52.8076 148 -32.6729 c 1
142.692 -35.7363 135.586 -37.1504 127.2 -37.1504 c 0
106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
30.2247 -3.34961 23.2744 -5.56738 17.834 -9.34668 c 1
17.8938 -62 l 1
- 0 -62 l 1
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineBR
-Encoding: 164 -1 164
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -37.1504 176.8<74.1752 147.734>
-VStem: -0.200195 166.2<-3.34961 139.081> 148 18<-53 -32.1>
-LayerCount: 2
-Fore
-SplineSet
-147.987 -32.1 m 1xa0
- 142.617 -35.3146 135.797 -37.1504 127.2 -37.1504 c 0
- 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
- 9.08496 -3.34961 -0.200195 -29.9844 -0.200195 -55.3496 c 1
- -0.200195 121.45 l 2xc0
- -0.200195 160.06 15.4004 172.15 38.7998 172.15 c 0
- 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
- 156.411 139.65 166 164.545 166 190.35 c 1
- 166 -53 l 1
- 148 -53 l 1
- 147.987 -32.1 l 1xa0
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTLBR
-Encoding: 165 -1 165
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -3.34961 175.5<7.39664 92.8347>
-VStem: 148 18<-53 -32.1>
-LayerCount: 2
-Fore
-SplineSet
--0 159 m 5
- 8.75293 159 l 1
- 15.581 168.549 26.0288 172.15 38.7998 172.15 c 0
- 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
- 156.411 139.65 166 164.545 166 190.35 c 1
- 166 -53 l 1
- 148 -53 l 1
- 147.987 -32.1 l 1
- 142.617 -35.3146 135.797 -37.1504 127.2 -37.1504 c 0
- 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
- 9.08496 -3.34961 -0 -29.9834 -0 -55.3486 c 1
- -0 159 l 5
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTLTR
-Encoding: 166 -1 166
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -37.1504 176.8<74.1705 154.644>
-VStem: -0 166<-3.28925 139.65> 147.977 18.0231<141.245 159>
-LayerCount: 2
-Fore
-SplineSet
-166 13.5498 m 2xc0
- 166 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
- 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
- 9.08496 -3.34961 -0 -29.9844 -0 -55.3496 c 1
- -0 159 l 1xc0
- 8.73101 159.009 l 1
- 15.5875 168.551 26.0328 172.15 38.7998 172.15 c 0
- 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
- 135.686 139.65 142.533 141.751 147.977 145.365 c 1
- 148 159 l 1
- 166 159 l 1xa0
- 166 13.5498 l 2xc0
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTL
-Encoding: 167 -1 167
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -3.34961 175.5<7.38633 92.8347>
-VStem: -0 166.2<-3.28925 139.65>
-LayerCount: 2
-Fore
-SplineSet
--0 159 m 1
- 8.73101 159.009 l 1
- 15.5875 168.551 26.0328 172.15 38.7998 172.15 c 0
- 61.2793 172.15 106.118 139.65 127.2 139.65 c 0
- 156.411 139.65 166.2 164.545 166.2 190.35 c 1
- 166.2 13.5498 l 2
- 166.2 -12.9697 158.4 -37.1504 127.2 -37.1504 c 0
- 106.136 -37.1504 61.2451 -3.34961 38.7998 -3.34961 c 0
- 9.08496 -3.34961 -0 -29.9844 -0 -55.3496 c 1
- -0 159 l 1
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBLBR
-Encoding: 168 -1 168
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -3.34961 175.5<73.1653 147.574>
-VStem: 0 18<-74 -32.0938> 148 18<-53 -5.01182>
-LayerCount: 2
-Fore
-SplineSet
-166 -53 m 1
- 148 -53 l 1
- 148.014 -9.28125 l 1
- 142.585 -5.54728 135.736 -3.34961 127.2 -3.34961 c 0
- 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
- 30.1975 -37.1504 23.3741 -35.3123 18.0025 -32.0938 c 1
- 18 -74 l 5
- 0 -74 l 5
- -0 190.35 l 1
- -0 164.545 9.58887 139.65 38.7998 139.65 c 0
- 59.8818 139.65 104.721 172.15 127.2 172.15 c 0
- 150.6 172.15 166 160.061 166 121.45 c 2
- 166 -53 l 1
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBLTR
-Encoding: 169 -1 169
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -37.1504 176.8<18.5863 91.8248>
-VStem: 0 18<-74 -32.1039>
-LayerCount: 2
-Fore
-SplineSet
-0 190.35 m 1
- 0 164.545 9.58887 139.65 38.7998 139.65 c 0
- 59.8818 139.65 104.721 172.15 127.2 172.15 c 0
- 139.982 172.15 150.436 168.543 157.292 158.977 c 1
- 166 159 l 1
- 166 -55.3506 l 1
- 166 -29.9854 156.915 -3.34961 127.2 -3.34961 c 0
- 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
- 30.2066 -37.1504 23.3885 -35.3161 18.0195 -32.1039 c 1
- 18 -74 l 1
- 0 -74 l 1
- 0 190.35 l 1
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineTLTR
-Encoding: 170 -1 170
-Width: 166
-VWidth: 2537
-Flags: W
-HStem: -37.1504 176.8<11.3528 91.8296>
-VStem: -0.000976562 166.001<-3.28925 139.65> -0 18.0174<141.246 159>
-LayerCount: 2
-Fore
-SplineSet
--0 159 m 1xa0
- 18 159 l 1
- 18.0174 145.369 l 1xa0
- 23.4622 141.752 30.3109 139.65 38.7998 139.65 c 0
- 59.8818 139.65 104.721 172.15 127.2 172.15 c 0
- 139.982 172.15 150.436 168.543 157.292 158.977 c 1
- 166 159 l 1
- 166 -55.3506 l 1
- 166 -29.9854 156.915 -3.34961 127.2 -3.34961 c 0
- 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
- 7.59961 -37.1504 -0.000976562 -12.9697 -0.000976562 13.5498 c 2xc0
- -0 159 l 1xa0
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineTR
-Encoding: 171 -1 171
-Width: 166
-VWidth: 2537
-Flags: HW
-HStem: -3.34961 175.5<73.1653 158.625>
-VStem: -0.200195 166.2<-3.28925 13.5498>
-LayerCount: 2
-Fore
-SplineSet
-166 159 m 1
- 166 -55.3506 l 1
- 166 -29.9854 156.915 -3.34961 127.2 -3.34961 c 0
- 104.755 -3.34961 59.8643 -37.1504 38.7998 -37.1504 c 0
- 7.59961 -37.1504 -0.200195 -12.9697 -0.200195 13.5498 c 2
- -0.200195 190.35 l 1
- -0.200195 164.545 9.58887 139.65 38.7998 139.65 c 0
- 59.8818 139.65 104.721 172.15 127.2 172.15 c 0
- 139.982 172.15 150.436 168.543 157.292 158.977 c 1
- 166 159 l 1
+ 0 -62 l 5
EndSplineSet
EndChar
EndChars
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd
index 2ed5eb3be19..06a5570935c 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd
+++ b/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd
@@ -19,7 +19,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1176402534
-ModificationTime: 1457829942
+ModificationTime: 1455123251
OS2TypoAscent: 0
OS2TypoAOffset: 1
OS2TypoDescent: 0
@@ -37,12 +37,13 @@ OS2Vendor: 'PfEd'
MarkAttachClasses: 1
DEI: 91125
Encoding: Custom
+Compacted: 1
UnicodeInterp: none
NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 144 8 2
+WinInfo: 0 19 8
BeginPrivate: 0
EndPrivate
Grid
@@ -56,7 +57,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: 160 160
+BeginChars: 375 152
StartChar: Punctum
Encoding: 0 -1 0
@@ -151,7 +152,7 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscus
+StartChar: OriscusReversus
Encoding: 4 -1 4
Width: 164
VWidth: 2048
@@ -178,7 +179,7 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: AscendensOriscus
+StartChar: Oriscus
Encoding: 5 -1 5
Width: 164
VWidth: 2048
@@ -329,7 +330,7 @@ Validated: 33
EndChar
StartChar: DivisioMinima
-Encoding: 12 -1 12
+Encoding: 14 -1 12
AltUni2: 000050.ffffffff.0
Width: 19
VWidth: 2048
@@ -348,7 +349,7 @@ Validated: 1
EndChar
StartChar: DivisioMinor
-Encoding: 13 -1 13
+Encoding: 15 -1 13
Width: 19
VWidth: 2048
Flags: HW
@@ -366,7 +367,7 @@ Validated: 1
EndChar
StartChar: pesdeminutus
-Encoding: 14 -1 14
+Encoding: 17 -1 14
Width: 164
VWidth: 2048
Flags: HW
@@ -390,7 +391,7 @@ Validated: 33
EndChar
StartChar: auctusd1
-Encoding: 15 -1 15
+Encoding: 18 -1 15
Width: 164
VWidth: 2048
Flags: HW
@@ -414,7 +415,7 @@ Validated: 33
EndChar
StartChar: auctusa1
-Encoding: 16 -1 16
+Encoding: 19 -1 16
Width: 164
VWidth: 2048
Flags: W
@@ -438,7 +439,7 @@ Validated: 33
EndChar
StartChar: mdeminutus
-Encoding: 17 -1 17
+Encoding: 20 -1 17
Width: 186
VWidth: 2048
Flags: HW
@@ -460,7 +461,7 @@ Validated: 33
EndChar
StartChar: Natural
-Encoding: 18 -1 18
+Encoding: 21 -1 18
Width: 201
VWidth: 2048
Flags: HW
@@ -486,7 +487,7 @@ Validated: 1
EndChar
StartChar: FClef
-Encoding: 19 -1 19
+Encoding: 22 -1 19
Width: 321
VWidth: 2048
Flags: HW
@@ -522,7 +523,7 @@ Validated: 33
EndChar
StartChar: CustosDownLong
-Encoding: 20 -1 20
+Encoding: 23 -1 20
Width: 85
VWidth: 2048
Flags: HW
@@ -542,7 +543,7 @@ Validated: 33
EndChar
StartChar: CustosDownShort
-Encoding: 21 -1 21
+Encoding: 24 -1 21
Width: 85
VWidth: 2048
Flags: HW
@@ -562,7 +563,7 @@ Validated: 33
EndChar
StartChar: CustosUpLong
-Encoding: 22 -1 22
+Encoding: 25 -1 22
Width: 85
VWidth: 2048
Flags: HW
@@ -582,7 +583,7 @@ Validated: 33
EndChar
StartChar: CustosUpShort
-Encoding: 23 -1 23
+Encoding: 26 -1 23
Width: 85
VWidth: 2048
Flags: HW
@@ -602,7 +603,7 @@ Validated: 33
EndChar
StartChar: PunctumLineBR
-Encoding: 24 -1 24
+Encoding: 27 -1 24
Width: 164
VWidth: 2048
Flags: HW
@@ -623,7 +624,7 @@ Validated: 1
EndChar
StartChar: PunctumLineBL
-Encoding: 25 -1 25
+Encoding: 28 -1 25
Width: 164
VWidth: 2048
Flags: HW
@@ -644,7 +645,7 @@ Validated: 1
EndChar
StartChar: PunctumLineTL
-Encoding: 26 -1 26
+Encoding: 29 -1 26
Width: 164
VWidth: 2048
Flags: HW
@@ -665,7 +666,7 @@ Validated: 33
EndChar
StartChar: PunctumLineTR
-Encoding: 27 -1 27
+Encoding: 30 -1 27
Width: 164
VWidth: 2048
Flags: HW
@@ -686,7 +687,7 @@ Validated: 33
EndChar
StartChar: PunctumLineBLBR
-Encoding: 28 -1 28
+Encoding: 31 -1 28
Width: 164
VWidth: 2048
Flags: HW
@@ -708,7 +709,7 @@ Validated: 33
EndChar
StartChar: base6
-Encoding: 29 -1 29
+Encoding: 32 -1 29
Width: 164
VWidth: 2048
Flags: HW
@@ -730,7 +731,7 @@ Validated: 33
EndChar
StartChar: line2
-Encoding: 30 -1 30
+Encoding: 33 -1 30
Width: 22
VWidth: 2048
Flags: HW
@@ -748,7 +749,7 @@ Validated: 1
EndChar
StartChar: line3
-Encoding: 31 -1 31
+Encoding: 34 -1 31
Width: 22
VWidth: 2048
Flags: HW
@@ -766,7 +767,7 @@ Validated: 1
EndChar
StartChar: line4
-Encoding: 32 -1 32
+Encoding: 35 -1 32
Width: 22
VWidth: 2048
Flags: HW
@@ -784,7 +785,7 @@ Validated: 1
EndChar
StartChar: line5
-Encoding: 33 -1 33
+Encoding: 36 -1 33
Width: 22
VWidth: 2048
Flags: HW
@@ -802,7 +803,7 @@ Validated: 1
EndChar
StartChar: QuilismaLineTR
-Encoding: 34 -1 34
+Encoding: 40 -1 34
Width: 164
VWidth: 2048
Flags: HW
@@ -831,8 +832,8 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: AscendensOriscusLineTR
-Encoding: 35 -1 35
+StartChar: OriscusLineTR
+Encoding: 41 -1 35
Width: 164
VWidth: 2048
Flags: HW
@@ -857,7 +858,7 @@ Validated: 33
EndChar
StartChar: pbase
-Encoding: 36 -1 36
+Encoding: 42 -1 36
Width: 164
VWidth: 2048
Flags: HW
@@ -878,7 +879,7 @@ Validated: 33
EndChar
StartChar: idebilis
-Encoding: 37 -1 37
+Encoding: 43 -1 37
Width: 110
VWidth: 2048
Flags: HW
@@ -900,7 +901,7 @@ Validated: 33
EndChar
StartChar: deminutus
-Encoding: 38 -1 38
+Encoding: 44 -1 38
Width: 110
VWidth: 2048
Flags: HW
@@ -922,7 +923,7 @@ Validated: 33
EndChar
StartChar: rdeminutus
-Encoding: 39 -1 39
+Encoding: 45 -1 39
Width: 110
VWidth: 2048
Flags: HW
@@ -944,7 +945,7 @@ Validated: 33
EndChar
StartChar: PunctumAuctusLineBL
-Encoding: 40 -1 40
+Encoding: 46 -1 40
Width: 164
VWidth: 2048
Flags: HW
@@ -968,7 +969,7 @@ Validated: 33
EndChar
StartChar: auctusa2
-Encoding: 41 -1 41
+Encoding: 47 -1 41
Width: 164
VWidth: 2048
Flags: HW
@@ -992,7 +993,7 @@ Validated: 33
EndChar
StartChar: porrectus1
-Encoding: 42 -1 42
+Encoding: 48 -1 42
Width: 490
VWidth: 2048
Flags: HW
@@ -1014,7 +1015,7 @@ Validated: 33
EndChar
StartChar: porrectus2
-Encoding: 43 -1 43
+Encoding: 49 -1 43
Width: 575
VWidth: 2048
Flags: HW
@@ -1036,7 +1037,7 @@ Validated: 33
EndChar
StartChar: porrectus3
-Encoding: 44 -1 44
+Encoding: 50 -1 44
Width: 650
VWidth: 2048
Flags: HW
@@ -1058,7 +1059,7 @@ Validated: 33
EndChar
StartChar: porrectus4
-Encoding: 45 -1 45
+Encoding: 51 -1 45
Width: 740
VWidth: 2048
Flags: HW
@@ -1080,7 +1081,7 @@ Validated: 33
EndChar
StartChar: porrectus5
-Encoding: 46 -1 46
+Encoding: 52 -1 46
Width: 931
VWidth: 2048
Flags: HW
@@ -1102,7 +1103,7 @@ Validated: 33
EndChar
StartChar: porrectusflexus1
-Encoding: 47 -1 47
+Encoding: 53 -1 47
Width: 340
VWidth: 2048
Flags: HW
@@ -1124,7 +1125,7 @@ Validated: 33
EndChar
StartChar: porrectusflexus2
-Encoding: 48 -1 48
+Encoding: 54 -1 48
Width: 428
VWidth: 2048
Flags: HW
@@ -1146,7 +1147,7 @@ Validated: 33
EndChar
StartChar: porrectusflexus3
-Encoding: 49 -1 49
+Encoding: 55 -1 49
Width: 586
VWidth: 2048
Flags: HW
@@ -1168,7 +1169,7 @@ Validated: 33
EndChar
StartChar: porrectusflexus4
-Encoding: 50 -1 50
+Encoding: 56 -1 50
Width: 670
VWidth: 2048
Flags: HW
@@ -1190,7 +1191,7 @@ Validated: 33
EndChar
StartChar: porrectusflexus5
-Encoding: 51 -1 51
+Encoding: 57 -1 51
Width: 931
VWidth: 2048
Flags: HW
@@ -1212,7 +1213,7 @@ Validated: 33
EndChar
StartChar: PesQuilismaOneNothing
-Encoding: 52 -1 52
+Encoding: 58 -1 52
Width: 164
VWidth: 2048
Flags: HW
@@ -1246,7 +1247,7 @@ Validated: 33
EndChar
StartChar: StrophaAucta
-Encoding: 53 -1 53
+Encoding: 59 -1 53
Width: 164
VWidth: 2048
Flags: HW
@@ -1267,7 +1268,7 @@ Validated: 33
EndChar
StartChar: PunctumInclinatumAuctus
-Encoding: 54 -1 54
+Encoding: 60 -1 54
Width: 164
VWidth: 2048
Flags: HW
@@ -1290,7 +1291,7 @@ Validated: 1
EndChar
StartChar: AuctumMora
-Encoding: 55 -1 55
+Encoding: 62 -1 55
Width: 71
VWidth: 2679
Flags: HW
@@ -1308,7 +1309,7 @@ Validated: 1
EndChar
StartChar: VEpisema
-Encoding: 57 -1 56
+Encoding: 64 -1 56
Width: 40
VWidth: 2048
Flags: HW
@@ -1328,7 +1329,7 @@ Validated: 1
EndChar
StartChar: PunctumDeminutus
-Encoding: 58 -1 57
+Encoding: 65 -1 57
Width: 110
VWidth: 2048
Flags: HW
@@ -1348,7 +1349,7 @@ Validated: 33
EndChar
StartChar: hepisema_base
-Encoding: 59 -1 58
+Encoding: 66 -1 58
Width: 1
VWidth: 1968
Flags: HW
@@ -1365,7 +1366,7 @@ EndSplineSet
EndChar
StartChar: PesOneNothing
-Encoding: 60 -1 59
+Encoding: 67 -1 59
Width: 164
VWidth: 2048
Flags: HW
@@ -1390,7 +1391,7 @@ Validated: 33
EndChar
StartChar: CustosUpMedium
-Encoding: 61 -1 60
+Encoding: 68 -1 60
Width: 85
VWidth: 2048
Flags: HW
@@ -1410,7 +1411,7 @@ Validated: 33
EndChar
StartChar: CustosDownMedium
-Encoding: 62 -1 61
+Encoding: 69 -1 61
Width: 85
VWidth: 2048
Flags: HW
@@ -1430,7 +1431,7 @@ Validated: 33
EndChar
StartChar: Accentus
-Encoding: 63 -1 62
+Encoding: 70 -1 62
Width: 99
VWidth: 1594
Flags: W
@@ -1452,7 +1453,7 @@ Validated: 1
EndChar
StartChar: AccentusReversus
-Encoding: 64 -1 63
+Encoding: 71 -1 63
Width: 99
VWidth: 1594
Flags: W
@@ -1474,7 +1475,7 @@ Validated: 1
EndChar
StartChar: SemicirculusReversus
-Encoding: 65 -1 64
+Encoding: 72 -1 64
Width: 125
VWidth: 1583
Flags: W
@@ -1494,7 +1495,7 @@ Validated: 1
EndChar
StartChar: Semicirculus
-Encoding: 66 -1 65
+Encoding: 73 -1 65
Width: 124
VWidth: 1606
Flags: W
@@ -1514,7 +1515,7 @@ Validated: 1
EndChar
StartChar: Circulus
-Encoding: 67 -1 66
+Encoding: 74 -1 66
Width: 124
VWidth: 1594
Flags: W
@@ -1537,7 +1538,7 @@ Validated: 1
EndChar
StartChar: CClefChange
-Encoding: 68 -1 67
+Encoding: 75 -1 67
Width: 140
VWidth: 2048
Flags: HW
@@ -1566,7 +1567,7 @@ Validated: 1
EndChar
StartChar: FClefChange
-Encoding: 69 -1 68
+Encoding: 76 -1 68
Width: 321
VWidth: 2048
Flags: HW
@@ -1602,7 +1603,7 @@ Validated: 33
EndChar
StartChar: VEpisema.circumflexus
-Encoding: 70 -1 69
+Encoding: 77 -1 69
Width: 108
VWidth: 2048
Flags: W
@@ -1626,7 +1627,7 @@ Validated: 33
EndChar
StartChar: PunctumCavum
-Encoding: 71 -1 70
+Encoding: 78 -1 70
Width: 164
VWidth: 2048
Flags: HW
@@ -1653,7 +1654,7 @@ Validated: 1
EndChar
StartChar: LineaPunctum
-Encoding: 72 -1 71
+Encoding: 79 -1 71
Width: 266
VWidth: 2048
Flags: HW
@@ -1687,7 +1688,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavum
-Encoding: 73 -1 72
+Encoding: 80 -1 72
Width: 266
VWidth: 2048
Flags: HW
@@ -1728,7 +1729,7 @@ Validated: 1
EndChar
StartChar: PunctumSmall
-Encoding: 74 -1 73
+Encoding: 81 -1 73
Width: 154
VWidth: 2048
Flags: HW
@@ -1749,10 +1750,10 @@ Validated: 1
EndChar
StartChar: hepisemaright
-Encoding: 76 -1 74
+Encoding: 83 -1 74
Width: 2
VWidth: 1968
-Flags: HW
+Flags: HWO
HStem: -489 15 -174 15 141 15 456 15
LayerCount: 2
Fore
@@ -1766,7 +1767,7 @@ EndSplineSet
EndChar
StartChar: mpdeminutus
-Encoding: 77 -1 75
+Encoding: 84 -1 75
Width: 186
VWidth: 2048
Flags: HW
@@ -1790,7 +1791,7 @@ Validated: 33
EndChar
StartChar: PunctumDescendens
-Encoding: 78 -1 76
+Encoding: 85 -1 76
Width: 164
VWidth: 2048
Flags: HW
@@ -1813,7 +1814,7 @@ Validated: 33
EndChar
StartChar: PunctumAscendens
-Encoding: 79 -1 77
+Encoding: 86 -1 77
Width: 164
VWidth: 2048
Flags: HW
@@ -1836,7 +1837,7 @@ Validated: 33
EndChar
StartChar: mnbdeminutus
-Encoding: 80 -1 78
+Encoding: 87 -1 78
Width: 186
VWidth: 2048
Flags: HW
@@ -1858,7 +1859,7 @@ Validated: 33
EndChar
StartChar: mnbpdeminutus
-Encoding: 81 -1 79
+Encoding: 88 -1 79
Width: 186
VWidth: 2048
Flags: HW
@@ -1880,7 +1881,7 @@ Validated: 33
EndChar
StartChar: porrectusflexusnb1
-Encoding: 82 -1 80
+Encoding: 89 -1 80
Width: 340
VWidth: 2048
Flags: HW
@@ -1901,7 +1902,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb2
-Encoding: 83 -1 81
+Encoding: 90 -1 81
Width: 428
VWidth: 2048
Flags: HW
@@ -1922,7 +1923,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb3
-Encoding: 84 -1 82
+Encoding: 91 -1 82
Width: 586
VWidth: 2048
Flags: HW
@@ -1943,7 +1944,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb4
-Encoding: 85 -1 83
+Encoding: 92 -1 83
Width: 670
VWidth: 2048
Flags: HW
@@ -1964,7 +1965,7 @@ Validated: 1
EndChar
StartChar: porrectusflexusnb5
-Encoding: 86 -1 84
+Encoding: 93 -1 84
Width: 931
VWidth: 2048
Flags: HW
@@ -1985,7 +1986,7 @@ Validated: 1
EndChar
StartChar: p2base
-Encoding: 88 -1 85
+Encoding: 95 -1 85
Width: 164
VWidth: 2048
Flags: W
@@ -2006,7 +2007,7 @@ Validated: 33
EndChar
StartChar: msdeminutus
-Encoding: 89 -1 86
+Encoding: 97 -1 86
Width: 186
VWidth: 2048
Flags: HW
@@ -2030,7 +2031,7 @@ Validated: 33
EndChar
StartChar: mademinutus
-Encoding: 90 -1 87
+Encoding: 98 -1 87
Width: 186
VWidth: 2048
Flags: HW
@@ -2054,7 +2055,7 @@ Validated: 33
EndChar
StartChar: PunctumCavumHole
-Encoding: 91 -1 88
+Encoding: 99 -1 88
Width: 164
VWidth: 2048
Flags: HW
@@ -2074,7 +2075,7 @@ Validated: 1
EndChar
StartChar: LineaPunctumCavumHole
-Encoding: 92 -1 89
+Encoding: 100 -1 89
Width: 266
VWidth: 2048
Flags: HW
@@ -2094,7 +2095,7 @@ Validated: 1
EndChar
StartChar: FlatHole
-Encoding: 93 -1 90
+Encoding: 101 -1 90
Width: 164
VWidth: 2048
Flags: HW
@@ -2112,7 +2113,7 @@ Validated: 1
EndChar
StartChar: NaturalHole
-Encoding: 94 -1 91
+Encoding: 102 -1 91
Width: 201
VWidth: 2048
Flags: HW
@@ -2129,8 +2130,8 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: DescendensOriscusLineBR
-Encoding: 95 -1 92
+StartChar: odbase
+Encoding: 103 -1 92
Width: 164
VWidth: 2048
Flags: HW
@@ -2158,7 +2159,7 @@ Validated: 1
EndChar
StartChar: DivisioDominican
-Encoding: 96 -1 93
+Encoding: 104 -1 93
Width: 22
VWidth: 2048
Flags: HW
@@ -2176,7 +2177,7 @@ Validated: 1
EndChar
StartChar: DivisioDominicanAlt
-Encoding: 97 -1 94
+Encoding: 105 -1 94
Width: 22
VWidth: 2048
Flags: HW
@@ -2194,7 +2195,7 @@ Validated: 1
EndChar
StartChar: Sharp
-Encoding: 98 -1 95
+Encoding: 106 -1 95
Width: 258
VWidth: 2048
Flags: W
@@ -2257,7 +2258,7 @@ Validated: 1
EndChar
StartChar: SharpHole
-Encoding: 99 -1 96
+Encoding: 107 -1 96
Width: 258
VWidth: 2048
Flags: W
@@ -2275,7 +2276,7 @@ Validated: 1
EndChar
StartChar: Linea
-Encoding: 100 -1 97
+Encoding: 108 -1 97
Width: 431
VWidth: 2612
Flags: W
@@ -2303,7 +2304,7 @@ Validated: 1
EndChar
StartChar: RoundBrace
-Encoding: 101 -1 98
+Encoding: 109 -1 98
Width: 937
VWidth: 2048
Flags: W
@@ -2329,7 +2330,7 @@ Validated: 1
EndChar
StartChar: CurlyBrace
-Encoding: 102 -1 99
+Encoding: 110 -1 99
Width: 1006
VWidth: 2048
Flags: W
@@ -2357,7 +2358,7 @@ Validated: 1
EndChar
StartChar: BarBrace
-Encoding: 103 -1 100
+Encoding: 111 -1 100
Width: 591
VWidth: 2048
Flags: W
@@ -2383,7 +2384,7 @@ Validated: 1
EndChar
StartChar: OriscusDeminutus
-Encoding: 104 -1 101
+Encoding: 112 -1 101
Width: 187
VWidth: 2048
Flags: HW
@@ -2411,8 +2412,8 @@ EndSplineSet
Validated: 33
EndChar
-StartChar: AscendensOriscusLineBL
-Encoding: 105 -1 102
+StartChar: OriscusLineBL
+Encoding: 113 -1 102
Width: 164
VWidth: 2048
Flags: HW
@@ -2439,8 +2440,8 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: AscendensOriscusLineBLTR
-Encoding: 106 -1 103
+StartChar: SalicusOriscus
+Encoding: 114 -1 103
Width: 164
VWidth: 2048
Flags: HW
@@ -2454,10 +2455,10 @@ SplineSet
41 26 30 21 22 16 c 1
22 -24 l 1
0 -24 l 1
- 0 130 l 1
- 12 144 31 160 52 160 c 0
- 83 160 99 133 118 129 c 0
- 135 126 139 135 142 142 c 1
+ 0 130 l 5
+ 12 144 31 160 52 160 c 4
+ 83 160 99 133 118 129 c 4
+ 135 126 139 135 142 142 c 5
142 157 l 5
164 157 l 5
164 22 l 2
@@ -2467,7 +2468,7 @@ Validated: 1
EndChar
StartChar: hepisemaleft
-Encoding: 75 -1 104
+Encoding: 82 -1 104
Width: 1
VWidth: 1968
Flags: HW
@@ -2484,7 +2485,7 @@ EndSplineSet
EndChar
StartChar: RoundBraceDown
-Encoding: 107 -1 105
+Encoding: 130 -1 105
Width: 937
VWidth: 2048
Flags: HW
@@ -2510,7 +2511,7 @@ Validated: 1
EndChar
StartChar: VirgaReversaAscendens_op
-Encoding: 108 -1 106
+Encoding: 131 -1 106
Width: 186
VWidth: 2048
Flags: HW
@@ -2534,7 +2535,7 @@ Validated: 33
EndChar
StartChar: VirgaReversaLongqueueAscendens_op
-Encoding: 109 -1 107
+Encoding: 132 -1 107
Width: 186
VWidth: 2048
Flags: HW
@@ -2558,7 +2559,7 @@ Validated: 33
EndChar
StartChar: VirgaReversaDescendens_op
-Encoding: 110 -1 108
+Encoding: 133 -1 108
Width: 186
VWidth: 2048
Flags: HW
@@ -2582,7 +2583,7 @@ Validated: 33
EndChar
StartChar: VirgaReversaLongqueueDescendens_op
-Encoding: 111 -1 109
+Encoding: 134 -1 109
Width: 186
VWidth: 2048
Flags: HW
@@ -2606,7 +2607,7 @@ Validated: 33
EndChar
StartChar: PunctumDescendens_op
-Encoding: 112 -1 110
+Encoding: 137 -1 110
Width: 164
VWidth: 2048
Flags: HW
@@ -2631,7 +2632,7 @@ Validated: 33
EndChar
StartChar: PunctumAscendens_op
-Encoding: 113 -1 111
+Encoding: 138 -1 111
Width: 164
VWidth: 2048
Flags: HW
@@ -2656,7 +2657,7 @@ Validated: 33
EndChar
StartChar: auctusd1_op
-Encoding: 114 -1 112
+Encoding: 139 -1 112
Width: 164
VWidth: 2048
Flags: HW
@@ -2682,7 +2683,7 @@ Validated: 33
EndChar
StartChar: auctusa1_op
-Encoding: 115 -1 113
+Encoding: 140 -1 113
Width: 164
VWidth: 2048
Flags: HW
@@ -2708,7 +2709,7 @@ Validated: 33
EndChar
StartChar: auctusa2_op
-Encoding: 116 -1 114
+Encoding: 141 -1 114
Width: 164
VWidth: 2048
Flags: HW
@@ -2734,7 +2735,7 @@ Validated: 33
EndChar
StartChar: PunctumAuctusLineBL_op
-Encoding: 117 -1 115
+Encoding: 142 -1 115
Width: 164
VWidth: 2048
Flags: HW
@@ -2760,7 +2761,7 @@ Validated: 33
EndChar
StartChar: pesdeminutus_op
-Encoding: 118 -1 116
+Encoding: 143 -1 116
Width: 164
VWidth: 2048
Flags: HW
@@ -2786,7 +2787,7 @@ Validated: 33
EndChar
StartChar: PunctumCavumInclinatum
-Encoding: 119 -1 117
+Encoding: 144 -1 117
Width: 164
VWidth: 2048
Flags: HW
@@ -2809,7 +2810,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumAuctus
-Encoding: 121 -1 118
+Encoding: 146 -1 118
Width: 164
VWidth: 2048
Flags: HW
@@ -2837,7 +2838,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumHole
-Encoding: 120 -1 119
+Encoding: 145 -1 119
Width: 164
VWidth: 2048
Flags: HW
@@ -2855,7 +2856,7 @@ Validated: 1
EndChar
StartChar: PunctumCavumInclinatumAuctusHole
-Encoding: 122 -1 120
+Encoding: 147 -1 120
Width: 164
VWidth: 2048
Flags: HW
@@ -2872,8 +2873,8 @@ EndSplineSet
Validated: 1
EndChar
-StartChar: DescendensOriscusLineTLBR
-Encoding: 123 -1 121
+StartChar: OriscusReversusLineTLBR
+Encoding: 148 -1 121
Width: 164
VWidth: 2048
Flags: HW
@@ -2882,24 +2883,24 @@ VStem: 142 22<-24 21.2824> 0 22<129.591 157>
LayerCount: 2
Fore
SplineSet
-38.2793 -6.6875 m 4
- 18.7393 -6.6875 0 6.09473 0 22 c 6
+38.2793 -6.6875 m 0
+ 18.7393 -6.6875 0 6.09473 0 22 c 2
0 157 l 1
22 157 l 1
22 142 l 1
25 135 29 126 46 129 c 0
65 133 81 160 112 160 c 0
133 160 152 144 164 130 c 1
- 164 -24 l 5
- 142 -24 l 5
- 142 16 l 5
- 134 21 123 26 112 26 c 4
- 76.2002 26 73.2949 -6.6875 38.2793 -6.6875 c 4
+ 164 -24 l 1
+ 142 -24 l 1
+ 142 16 l 1
+ 134 21 123 26 112 26 c 0
+ 76.2002 26 73.2949 -6.6875 38.2793 -6.6875 c 0
EndSplineSet
EndChar
-StartChar: DescendensOriscusLineTL
-Encoding: 124 -1 122
+StartChar: OriscusReversusLineTL
+Encoding: 149 -1 122
Width: 164
VWidth: 2048
Flags: HW
@@ -2923,7 +2924,7 @@ EndSplineSet
EndChar
StartChar: UpperPesOneNothing
-Encoding: 56 -1 123
+Encoding: 63 -1 123
Width: 186
VWidth: 2048
Flags: HW
@@ -2949,8 +2950,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusCavum
-Encoding: 125 -1 124
+StartChar: OriscusCavum
+Encoding: 152 -1 124
Width: 164
VWidth: 2048
Flags: HW
@@ -2984,8 +2985,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusCavumHole
-Encoding: 126 -1 125
+StartChar: OriscusCavumHole
+Encoding: 153 -1 125
Width: 164
VWidth: 2048
Flags: W
@@ -3005,8 +3006,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusCavum
-Encoding: 127 -1 126
+StartChar: OriscusCavumReversus
+Encoding: 154 -1 126
Width: 164
VWidth: 2048
Flags: HW
@@ -3040,8 +3041,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusCavumHole
-Encoding: 128 -1 127
+StartChar: OriscusCavumReversusHole
+Encoding: 155 -1 127
Width: 164
VWidth: 2048
Flags: HW
@@ -3062,7 +3063,7 @@ EndSplineSet
EndChar
StartChar: OriscusCavumDeminutus
-Encoding: 129 -1 128
+Encoding: 156 -1 128
Width: 187
VWidth: 2048
Flags: HW
@@ -3099,7 +3100,7 @@ EndSplineSet
EndChar
StartChar: OriscusCavumDeminutusHole
-Encoding: 130 -1 129
+Encoding: 157 -1 129
Width: 164
VWidth: 2048
Flags: W
@@ -3120,7 +3121,7 @@ EndSplineSet
EndChar
StartChar: Virgula.2
-Encoding: 131 -1 130
+Encoding: 158 -1 130
Width: 152
VWidth: 1418
Flags: HW
@@ -3138,7 +3139,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.2
-Encoding: 132 -1 131
+Encoding: 159 -1 131
Width: 19
VWidth: 1418
Flags: HW
@@ -3155,7 +3156,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.2
-Encoding: 133 -1 132
+Encoding: 160 -1 132
Width: 19
VWidth: 2048
Flags: HW
@@ -3172,7 +3173,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.2
-Encoding: 134 -1 133
+Encoding: 161 -1 133
Width: 19
VWidth: 2048
Flags: HW
@@ -3189,7 +3190,7 @@ EndSplineSet
EndChar
StartChar: Virgula.3
-Encoding: 135 -1 134
+Encoding: 162 -1 134
Width: 152
VWidth: 1733
Flags: HW
@@ -3207,7 +3208,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.3
-Encoding: 136 -1 135
+Encoding: 163 -1 135
Width: 19
VWidth: 1733
Flags: HW
@@ -3224,7 +3225,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.3
-Encoding: 137 -1 136
+Encoding: 164 -1 136
Width: 19
VWidth: 2048
Flags: HW
@@ -3241,7 +3242,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.3
-Encoding: 138 -1 137
+Encoding: 165 -1 137
Width: 19
VWidth: 2048
Flags: HW
@@ -3258,7 +3259,7 @@ EndSplineSet
EndChar
StartChar: Virgula.5
-Encoding: 139 -1 138
+Encoding: 166 -1 138
Width: 152
VWidth: 2363
Flags: HW
@@ -3276,7 +3277,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinima.5
-Encoding: 140 -1 139
+Encoding: 167 -1 139
Width: 19
VWidth: 2363
Flags: HW
@@ -3293,7 +3294,7 @@ EndSplineSet
EndChar
StartChar: DivisioMinor.5
-Encoding: 141 -1 140
+Encoding: 168 -1 140
Width: 19
VWidth: 2048
Flags: HW
@@ -3310,7 +3311,7 @@ EndSplineSet
EndChar
StartChar: DivisioMaior.5
-Encoding: 142 -1 141
+Encoding: 169 -1 141
Width: 19
VWidth: 2048
Flags: HW
@@ -3327,7 +3328,7 @@ EndSplineSet
EndChar
StartChar: StrophaAuctaLongtail
-Encoding: 87 -1 142
+Encoding: 94 -1 142
Width: 164
VWidth: 2048
Flags: W
@@ -3347,7 +3348,7 @@ EndSplineSet
EndChar
StartChar: rqueue
-Encoding: 143 -1 143
+Encoding: 170 -1 143
Width: 22
VWidth: 2048
Flags: HW
@@ -3364,7 +3365,7 @@ EndSplineSet
EndChar
StartChar: queuebase
-Encoding: 144 -1 144
+Encoding: 171 -1 144
Width: 22
VWidth: 2048
Flags: HW
@@ -3382,7 +3383,7 @@ EndSplineSet
EndChar
StartChar: tmpglyph
-Encoding: 145 -1 145
+Encoding: 172 -1 145
Width: 22
VWidth: 2048
Flags: W
@@ -3399,7 +3400,7 @@ EndSplineSet
EndChar
StartChar: virgabase
-Encoding: 146 -1 146
+Encoding: 173 -1 146
Width: 164
VWidth: 2048
Flags: HW
@@ -3420,7 +3421,7 @@ EndSplineSet
EndChar
StartChar: VirgaBaseLineBL
-Encoding: 147 -1 147
+Encoding: 174 -1 147
Width: 164
VWidth: 2048
Flags: HW
@@ -3437,13 +3438,13 @@ SplineSet
0 150 l 1
20 161 49.417 166 82 166 c 24
114.583 166 144 158 164 150 c 1
- 164 -41 l 5
+ 164 -41 l 1
141.996 -41 l 5
EndSplineSet
EndChar
StartChar: rvbase
-Encoding: 148 -1 148
+Encoding: 175 -1 148
Width: 164
VWidth: 2048
Flags: HW
@@ -3451,22 +3452,22 @@ HStem: -409 15 -94 15 221 15 536 15
LayerCount: 2
Fore
SplineSet
-22.0039 -41 m 1
+22.0039 -41 m 5
0 -41 l 1
0 150 l 1
20 158 49.417 166 82 166 c 24
114.583 166 144 161 164 150 c 1
- 164 -20 l 5
- 153.375 -19.875 164 -20 142 -20 c 5
+ 164 -20 l 1
+ 153.375 -19.875 164 -20 142 -20 c 1
140.625 -12.125 132.583 -1.72852 127 0 c 1
114 8 103.562 9.49707 81.999 9.33301 c 0
51.333 8.66699 22 -4 22.0039 -26.668 c 2
- 22.0039 -41 l 1
+ 22.0039 -41 l 5
EndSplineSet
EndChar
StartChar: rvirgabase
-Encoding: 149 -1 149
+Encoding: 176 -1 149
Width: 164
VWidth: 2048
Flags: HW
@@ -3486,8 +3487,8 @@ SplineSet
EndSplineSet
EndChar
-StartChar: DescendensOriscusLineBL
-Encoding: 150 -1 150
+StartChar: OriscusReversusLineBL
+Encoding: 177 -1 150
Width: 164
VWidth: 2048
Flags: HW
@@ -3513,15 +3514,15 @@ SplineSet
EndSplineSet
EndChar
-StartChar: AscendensOriscusLineBLBR
-Encoding: 151 -1 151
+StartChar: osbase
+Encoding: 178 -1 151
Width: 164
VWidth: 2048
Flags: HW
LayerCount: 2
Fore
SplineSet
-0 -27 m 1
+0 -27 m 5
0 129.75 l 1
12 144 30.6465 159.548 51.75 160 c 1
83.25 159.75 98.9385 133.274 118.5 128.75 c 1
@@ -3529,236 +3530,14 @@ SplineSet
142.945 127.485 153.146 131.484 159.5 146.25 c 1
161.23 161.341 158.41 172.99 164 191 c 9
164 -20 l 1
- 164 -20 164 -20 142 -20 c 5
- 142 -4 l 5
- 137 -6 130.788 -6.90644 125.048 -6.90644 c 0
+ 153.375 -19.875 164 -20 142 -20 c 1
+ 142 -3.91719 l 1
+ 136.634 -5.82116 130.788 -6.90644 125.048 -6.90644 c 0
122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1
89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1
40.6015 25.2549 22 17.4121 22 7.5 c 2
22.0004 -27 l 1
- 0 -27 l 1
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineBR
-Encoding: 152 -1 152
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-164 -24 m 1
- 142 -24 l 1
- 142 -4 l 1
- 137 -6 130.797 -6.90644 125.048 -6.90644 c 0
- 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1
- 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1
- 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1
- 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 9
- 0 129.75 l 17
- 12 144 30.6465 159.548 51.75 160 c 1
- 83.25 159.75 98.9385 133.274 118.5 128.75 c 1
- 122.907 128.016 127.265 127.485 131.453 127.485 c 0
- 142.945 127.485 153.146 131.484 159.5 146.25 c 1
- 161.23 161.341 158.41 172.99 164 191 c 9
- 164 -24 l 1
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTLBR
-Encoding: 153 -1 153
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-0 157 m 1
- 22 157 l 1
- 22 150 l 1
- 31 156 41.007 159.77 51.75 160 c 1
- 83.25 159.75 98.9385 133.274 118.5 128.75 c 1
- 122.907 128.016 127.265 127.485 131.453 127.485 c 0
- 142.945 127.485 153.146 131.484 159.5 146.25 c 1
- 161.23 161.341 158.41 172.99 164 191 c 9
- 164 -24 l 1
- 142 -24 l 1
- 142 -4 l 1
- 137 -6 130.797 -6.90644 125.048 -6.90644 c 0
- 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1
- 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1
- 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1
- 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 9
- 0 157 l 1
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTLTR
-Encoding: 154 -1 154
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-164 19.1963 m 4
- 164 5.04004 144.092 -6.90644 125.048 -6.90644 c 0
- 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1
- 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1
- 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1
- 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 9
- 0 157 l 1
- 22 157 l 1
- 22.0022 149.842 l 1
- 31.031 155.81 41.2536 160 52 160 c 0
- 83 160 99 133 118 129 c 0
- 135 126 139 135 142 142 c 1
- 142 157 l 1
- 164 157 l 5
- 164 19.1963 l 4
-EndSplineSet
-EndChar
-
-StartChar: AscendensOriscusLineTL
-Encoding: 155 -1 155
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-0 157 m 5
- 22 157 l 1
- 21.998 149.746 l 1
- 30.9114 155.632 41.0127 159.77 51.75 160 c 1
- 83.25 159.75 98.9385 133.274 118.5 128.75 c 1
- 122.907 128.016 127.265 127.485 131.453 127.485 c 0
- 142.945 127.485 153.146 131.484 159.5 146.25 c 1
- 161.23 161.341 158.41 172.99 164 191 c 9
- 164 22.1729 l 17
- 164.202 21.1722 164.299 20.1788 164.299 19.1961 c 0
- 164.299 5.03959 144.092 -6.90644 125.048 -6.90644 c 0
- 122.667 -6.90644 120.304 -6.71969 118.001 -6.32715 c 1
- 89.751 -0.827148 84.7041 24.1152 52.251 26.1729 c 1
- 29.3369 24.3672 11.251 9.92285 5.25098 -2.82715 c 1
- 2.69727 -15.4941 4.32519 -28.9102 0 -41.5771 c 13
- 0 157 l 5
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBLBR
-Encoding: 156 -1 156
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-164 -24 m 5
- 142 -24 l 1
- 142 16 l 1
- 134 21 123 26 112 26 c 0
- 76.2002 26 73.2949 -6.6875 38.2793 -6.6875 c 0
- 32.6358 -6.6875 27.0592 -5.62128 21.9815 -3.72154 c 1
- 22.0004 -27 l 1
- 0 -27 l 1
- 0 191 l 17
- 5.59004 172.99 2.76983 161.341 4.5 146.25 c 1
- 10.8533 131.483 21.0542 127.484 32.546 127.484 c 0
- 36.7338 127.484 41.0931 128.016 45.5 128.75 c 1
- 65.0611 133.274 80.75 159.75 112.25 160 c 1
- 133.353 159.548 152 144 164 129.75 c 13
- 164 -24 l 5
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineBLTR
-Encoding: 157 -1 157
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-164 -44.4199 m 21
- 159.675 -31.7529 161.219 -18.3369 158.665 -5.66992 c 1
- 152.665 7.08008 134.579 21.5244 111.665 23.3301 c 1
- 79.2109 21.2725 74.165 -3.66992 45.915 -9.16992 c 1
- 43.6121 -9.56246 41.2501 -9.74922 38.8707 -9.74922 c 0
- 33.1499 -9.74922 27.3282 -8.66969 21.9833 -6.77509 c 1
- 22.0004 -27 l 1
- 0 -27 l 1
- 0 191 l 17
- 5.59004 172.99 2.76983 161.341 4.5 146.25 c 1
- 10.8533 131.483 21.0542 127.484 32.546 127.484 c 0
- 36.7338 127.484 41.0931 128.016 45.5 128.75 c 1
- 65.0611 133.274 80.75 159.75 112.25 160 c 1
- 123.018 159.769 133.146 155.608 142.078 149.695 c 1
- 142 157 l 1
- 164 157 l 5
- 164 -44.4199 l 21
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineTLTR
-Encoding: 158 -1 158
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-0 157 m 5
- 22 157 l 1
- 22 142 l 1
- 25 135 29 126 46 129 c 0
- 65 133 81 160 112 160 c 0
- 122.741 160 132.958 155.815 141.983 149.852 c 1
- 142 157 l 1
- 164 157 l 1
- 164 -44.4199 l 17
- 159.675 -31.7529 161.219 -18.3369 158.665 -5.66992 c 1
- 152.665 7.08008 134.579 21.5244 111.665 23.3301 c 1
- 79.2109 21.2725 74.165 -3.66992 45.915 -9.16992 c 1
- 43.6121 -9.56246 41.2501 -9.74922 38.8707 -9.74922 c 0
- 19.8437 -9.74922 -0.000976562 2.19238 -0.000976562 16.3457 c 4
- 0 157 l 5
-EndSplineSet
-EndChar
-
-StartChar: DescendensOriscusLineTR
-Encoding: 159 -1 159
-Width: 164
-VWidth: 2048
-Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
-LayerCount: 2
-Fore
-SplineSet
-164 -44.4199 m 21
- 159.675 -31.7529 161.219 -18.3369 158.665 -5.66992 c 1
- 152.665 7.08008 134.579 21.5244 111.665 23.3301 c 1
- 79.2109 21.2725 74.165 -3.66992 45.915 -9.16992 c 1
- 43.6121 -9.56246 41.2501 -9.74922 38.8707 -9.74922 c 0
- 19.8437 -9.74922 -0.300029 2.19241 -0.300029 16.3455 c 0
- -0.300029 17.3307 -0.20241 18.3267 0 19.3301 c 9
- 0 191 l 17
- 5.59004 172.99 2.76983 161.341 4.5 146.25 c 1
- 10.8533 131.483 21.0542 127.484 32.546 127.484 c 0
- 36.7338 127.484 41.0931 128.016 45.5 128.75 c 1
- 65.0611 133.274 80.75 159.75 112.25 160 c 1
- 123.015 159.769 133.142 155.61 142.072 149.699 c 1
- 142 157 l 1
- 164 157 l 5
- 164 -44.4199 l 21
+ 0 -27 l 5
EndSplineSet
EndChar
EndChars
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
index e504b874c1b..a7196ceb932 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
+++ b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
@@ -78,7 +78,7 @@ AMBITUS = {
5: 'Five',
}
-GREGORIO_VERSION = '4.2.0-beta1'
+GREGORIO_VERSION = '4.1.2'
# The unicode character at which we start our numbering:
# U+E000 is the start of the BMP Private Use Area
@@ -241,13 +241,11 @@ DIRECT_GLYPH_NAMES = [
'VirgaBaseLineBL',
'Quilisma',
'QuilismaLineTR',
- 'AscendensOriscus',
- 'AscendensOriscusLineBL',
- 'AscendensOriscusLineTL',
- 'AscendensOriscusLineTR',
- 'DescendensOriscus',
- 'DescendensOriscusLineBL',
- 'DescendensOriscusLineTL',
+ 'Oriscus',
+ 'OriscusLineBL',
+ 'OriscusLineTR',
+ 'OriscusReversus',
+ 'OriscusReversusLineTL',
'PunctumInclinatumAuctus',
'PunctumInclinatumDeminutus',
'VEpisema',
@@ -289,15 +287,15 @@ DIRECT_GLYPH_NAMES = [
'PunctumLineTR',
'PunctumLineBLBR',
'PunctumAuctusLineBL',
- 'AscendensOriscusLineBLTR',
+ 'SalicusOriscus',
'PunctumCavumInclinatum',
'PunctumCavumInclinatumHole',
'PunctumCavumInclinatumAuctus',
'PunctumCavumInclinatumAuctusHole',
- 'AscendensOriscusCavum',
- 'AscendensOriscusCavumHole',
- 'DescendensOriscusCavum',
- 'DescendensOriscusCavumHole',
+ 'OriscusCavum',
+ 'OriscusCavumHole',
+ 'OriscusCavumReversus',
+ 'OriscusCavumReversusHole',
'OriscusCavumDeminutus',
'OriscusCavumDeminutusHole',
]
@@ -385,106 +383,87 @@ def get_width(glyphName):
return WIDTHS[glyphName]
# Shapes
-S_PES = 'Pes'
-S_UPPER_PES = 'UpperPes'
-S_LOWER_PES = 'LowerPes'
-S_PES_QUADRATUM = 'PesQuadratum'
-S_UPPER_PES_QUADRATUM = 'UpperPesQuadratum'
-S_LOWER_PES_QUADRATUM = 'LowerPesQuadratum'
-S_PES_QUADRATUM_LONGQUEUE = 'PesQuadratumLongqueue'
-S_UPPER_PES_QUADRATUM_LONGQUEUE = 'UpperPesQuadratumLongqueue'
-S_LOWER_PES_QUADRATUM_LONGQUEUE = 'LowerPesQuadratumLongqueue'
-S_PES_QUADRATUM_OPENQUEUE = 'PesQuadratumOpenqueue'
-S_UPPER_PES_QUADRATUM_OPENQUEUE = 'UpperPesQuadratumOpenqueue'
-S_LOWER_PES_QUADRATUM_OPENQUEUE = 'LowerPesQuadratumOpenqueue'
-S_PES_QUILISMA = 'PesQuilisma'
-S_PES_QUASSUS = 'PesQuassus'
-S_UPPER_PES_QUASSUS = 'UpperPesQuassus'
-S_LOWER_PES_QUASSUS = 'LowerPesQuassus'
-S_PES_QUASSUS_LONGQUEUE = 'PesQuassusLongqueue'
-S_UPPER_PES_QUASSUS_LONGQUEUE = 'UpperPesQuassusLongqueue'
-S_LOWER_PES_QUASSUS_LONGQUEUE = 'LowerPesQuassusLongqueue'
-S_PES_QUASSUS_OPENQUEUE = 'PesQuassusOpenqueue'
-S_UPPER_PES_QUASSUS_OPENQUEUE = 'UpperPesQuassusOpenqueue'
-S_LOWER_PES_QUASSUS_OPENQUEUE = 'LowerPesQuassusOpenqueue'
-S_PES_QUASSUS_INUSITATUS = 'PesQuassusInusitatus'
-S_UPPER_PES_QUASSUS_INUSITATUS = 'UpperPesQuassusInusitatus'
-S_LOWER_PES_QUASSUS_INUSITATUS = 'LowerPesQuassusInusitatus'
-S_PES_QUASSUS_INUSITATUS_LONGQUEUE = 'PesQuassusInusitatusLongqueue'
-S_UPPER_PES_QUASSUS_INUSITATUS_LONGQUEUE = 'UpperPesQuassusInusitatusLongqueue'
-S_LOWER_PES_QUASSUS_INUSITATUS_LONGQUEUE = 'LowerPesQuassusInusitatusLongqueue'
-S_PES_QUASSUS_INUSITATUS_OPENQUEUE = 'PesQuassusInusitatusOpenqueue'
-S_UPPER_PES_QUASSUS_INUSITATUS_OPENQUEUE = 'UpperPesQuassusInusitatusOpenqueue'
-S_LOWER_PES_QUASSUS_INUSITATUS_OPENQUEUE = 'LowerPesQuassusInusitatusOpenqueue'
-S_PES_QUILISMA_QUADRATUM = 'PesQuilismaQuadratum'
-S_PES_QUILISMA_QUADRATUM_LONGQUEUE = 'PesQuilismaQuadratumLongqueue'
-S_PES_QUILISMA_QUADRATUM_OPENQUEUE = 'PesQuilismaQuadratumOpenqueue'
-S_FLEXUS = 'Flexus'
-S_UPPER_FLEXUS = 'UpperFlexus'
-S_LOWER_FLEXUS = 'LowerFlexus'
-S_FLEXUS_NOBAR = 'FlexusNobar'
-S_FLEXUS_LONGQUEUE = 'FlexusLongqueue'
-S_FLEXUS_OPENQUEUE = 'FlexusOpenqueue'
-S_FLEXUS_ORISCUS = 'FlexusOriscus'
-S_UPPER_FLEXUS_ORISCUS = 'UpperFlexusOriscus'
-S_LOWER_FLEXUS_ORISCUS = 'LowerFlexusOriscus'
-S_FLEXUS_ORISCUS_INUSITATUS = 'FlexusOriscusInusitatus'
-S_UPPER_FLEXUS_ORISCUS_INUSITATUS = 'UpperFlexusOriscusInusitatus'
-S_LOWER_FLEXUS_ORISCUS_INUSITATUS = 'LowerFlexusOriscusInusitatus'
-S_PORRECTUS_FLEXUS = 'PorrectusFlexus'
-S_PORRECTUS_FLEXUS_LONGQUEUE = 'PorrectusFlexusLongqueue'
-S_PORRECTUS_FLEXUS_NOBAR = 'PorrectusFlexusNobar'
-S_PORRECTUS = 'Porrectus'
-S_PORRECTUS_LONGQUEUE = 'PorrectusLongqueue'
-S_PORRECTUS_NOBAR = 'PorrectusNobar'
+S_PES = 'Pes'
+S_UPPER_PES = 'UpperPes'
+S_LOWER_PES = 'LowerPes'
+S_PES_QUADRATUM = 'PesQuadratum'
+S_UPPER_PES_QUADRATUM = 'UpperPesQuadratum'
+S_LOWER_PES_QUADRATUM = 'LowerPesQuadratum'
+S_PES_QUADRATUM_LONGQUEUE = 'PesQuadratumLongqueue'
+S_UPPER_PES_QUADRATUM_LONGQUEUE = 'UpperPesQuadratumLongqueue'
+S_LOWER_PES_QUADRATUM_LONGQUEUE = 'LowerPesQuadratumLongqueue'
+S_PES_QUADRATUM_OPENQUEUE = 'PesQuadratumOpenqueue'
+S_UPPER_PES_QUADRATUM_OPENQUEUE = 'UpperPesQuadratumOpenqueue'
+S_LOWER_PES_QUADRATUM_OPENQUEUE = 'LowerPesQuadratumOpenqueue'
+S_PES_QUILISMA = 'PesQuilisma'
+S_PES_QUASSUS = 'PesQuassus'
+S_UPPER_PES_QUASSUS = 'UpperPesQuassus'
+S_LOWER_PES_QUASSUS = 'LowerPesQuassus'
+S_PES_QUASSUS_LONGQUEUE = 'PesQuassusLongqueue'
+S_UPPER_PES_QUASSUS_LONGQUEUE = 'UpperPesQuassusLongqueue'
+S_LOWER_PES_QUASSUS_LONGQUEUE = 'LowerPesQuassusLongqueue'
+S_PES_QUASSUS_OPENQUEUE = 'PesQuassusOpenqueue'
+S_UPPER_PES_QUASSUS_OPENQUEUE = 'UpperPesQuassusOpenqueue'
+S_LOWER_PES_QUASSUS_OPENQUEUE = 'LowerPesQuassusOpenqueue'
+S_PES_QUILISMA_QUADRATUM = 'PesQuilismaQuadratum'
+S_PES_QUILISMA_QUADRATUM_LONGQUEUE = 'PesQuilismaQuadratumLongqueue'
+S_PES_QUILISMA_QUADRATUM_OPENQUEUE = 'PesQuilismaQuadratumOpenqueue'
+S_FLEXUS = 'Flexus'
+S_UPPER_FLEXUS = 'UpperFlexus'
+S_LOWER_FLEXUS = 'LowerFlexus'
+S_FLEXUS_NOBAR = 'FlexusNobar'
+S_FLEXUS_LONGQUEUE = 'FlexusLongqueue'
+S_FLEXUS_OPENQUEUE = 'FlexusOpenqueue'
+S_FLEXUS_ORISCUS = 'FlexusOriscus'
+S_LOWER_FLEXUS_ORISCUS = 'LowerFlexusOriscus'
+S_PORRECTUS_FLEXUS = 'PorrectusFlexus'
+S_PORRECTUS_FLEXUS_LONGQUEUE = 'PorrectusFlexusLongqueue'
+S_PORRECTUS_FLEXUS_NOBAR = 'PorrectusFlexusNobar'
+S_PORRECTUS = 'Porrectus'
+S_PORRECTUS_LONGQUEUE = 'PorrectusLongqueue'
+S_PORRECTUS_NOBAR = 'PorrectusNobar'
# for stem length determination only:
-S_PORRECTUS_DEMINUTUS_ALT = 'PorrectusDeminutus.alt'
-S_TORCULUS = 'Torculus'
-S_TORCULUS_RESUPINUS = 'TorculusResupinus'
-S_TORCULUS_QUILISMA = 'TorculusQuilisma'
-S_TORCULUS_RESUPINUS_QUILISMA = 'TorculusResupinusQuilisma'
-S_SCANDICUS = 'Scandicus'
-S_ANCUS = 'Ancus'
-S_ANCUS_LONGQUEUE = 'AncusLongqueue'
-S_ANCUS_OPENQUEUE = 'AncusOpenqueue'
-S_VIRGA_STRATA = 'VirgaStrata'
-S_SALICUS = 'Salicus'
-S_SALICUS_LONGQUEUE = 'SalicusLongqueue'
-S_SALICUS_OPENQUEUE = 'SalicusOpenqueue'
-S_SALICUS_FLEXUS = 'SalicusFlexus'
-S_TORCULUS_LIQUESCENS = 'TorculusLiquescens'
-S_TORCULUS_LIQUESCENS_QUILISMA = 'TorculusLiquescensQuilisma'
-S_FLEXUS_ORISCUS_SCAPUS = 'FlexusOriscusScapus'
-S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE = 'FlexusOriscusScapusLongqueue'
-S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE = 'FlexusOriscusScapusOpenqueue'
-S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS = 'FlexusOriscusScapusInusitatus'
-S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE = 'FlexusOriscusScapusInusitatusLongqueue'
-S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE = 'FlexusOriscusScapusInusitatusOpenqueue'
-S_LEADING_PUNCTUM = 'LeadingPunctum'
-S_LEADING_QUILISMA = 'LeadingQuilisma'
-S_LEADING_ORISCUS = 'LeadingOriscus'
-S_PUNCTUM = 'Punctum'
-S_UPPER_PUNCTUM = 'UpperPunctum'
-S_LOWER_PUNCTUM = 'LowerPunctum'
-S_QUILISMA = 'Quilisma'
-S_ASCENDENS_ORISCUS = 'AscendensOriscus'
-S_DESCENDENS_ORISCUS = 'DescendensOriscus'
-S_ASCENDENS_ORISCUS_SCAPUS = 'AscendensOriscusScapus'
-S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE = 'AscendensOriscusScapusLongqueue'
-S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE = 'AscendensOriscusScapusOpenqueue'
-S_DESCENDENS_ORISCUS_SCAPUS = 'DescendensOriscusScapus'
-S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE = 'DescendensOriscusScapusLongqueue'
-S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE = 'DescendensOriscusScapusOpenqueue'
-S_UPPER_ASCENDENS_ORISCUS = 'UpperAscendensOriscus'
-S_UPPER_DESCENDENS_ORISCUS = 'UpperDescendensOriscus'
-S_LOWER_ASCENDENS_ORISCUS = 'LowerAscendensOriscus'
-S_LOWER_DESCENDENS_ORISCUS = 'LowerDescendensOriscus'
-S_VIRGA = 'Virga'
-S_VIRGA_LONGQUEUE = 'VirgaLongqueue'
-S_VIRGA_OPENQUEUE = 'VirgaOpenqueue'
-S_VIRGA_REVERSA = 'VirgaReversa'
-S_VIRGA_REVERSA_LONGQUEUE = 'VirgaReversaLongqueue'
-S_VIRGA_REVERSA_OPENQUEUE = 'VirgaReversaOpenqueue'
+S_PORRECTUS_DEMINUTUS_ALT = 'PorrectusDeminutus.alt'
+S_TORCULUS = 'Torculus'
+S_TORCULUS_RESUPINUS = 'TorculusResupinus'
+S_TORCULUS_QUILISMA = 'TorculusQuilisma'
+S_TORCULUS_RESUPINUS_QUILISMA = 'TorculusResupinusQuilisma'
+S_SCANDICUS = 'Scandicus'
+S_ANCUS = 'Ancus'
+S_ANCUS_LONGQUEUE = 'AncusLongqueue'
+S_ANCUS_OPENQUEUE = 'AncusOpenqueue'
+S_VIRGA_STRATA = 'VirgaStrata'
+S_SALICUS = 'Salicus'
+S_SALICUS_LONGQUEUE = 'SalicusLongqueue'
+S_SALICUS_OPENQUEUE = 'SalicusOpenqueue'
+S_SALICUS_FLEXUS = 'SalicusFlexus'
+S_TORCULUS_LIQUESCENS = 'TorculusLiquescens'
+S_TORCULUS_LIQUESCENS_QUILISMA = 'TorculusLiquescensQuilisma'
+S_FLEXUS_ORISCUS_SCAPUS = 'FlexusOriscusScapus'
+S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE = 'FlexusOriscusScapusLongqueue'
+S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE = 'FlexusOriscusScapusOpenqueue'
+S_LEADING_PUNCTUM = 'LeadingPunctum'
+S_LEADING_QUILISMA = 'LeadingQuilisma'
+S_LEADING_ORISCUS = 'LeadingOriscus'
+S_PUNCTUM = 'Punctum'
+S_UPPER_PUNCTUM = 'UpperPunctum'
+S_LOWER_PUNCTUM = 'LowerPunctum'
+S_QUILISMA = 'Quilisma'
+S_ORISCUS = 'Oriscus'
+S_ORISCUS_SCAPUS = 'OriscusScapus'
+S_ORISCUS_SCAPUS_LONGQUEUE = 'OriscusScapusLongqueue'
+S_ORISCUS_SCAPUS_OPENQUEUE = 'OriscusScapusOpenqueue'
+S_ORISCUS_REVERSUS_SCAPUS = 'OriscusScapusReversus'
+S_ORISCUS_REVERSUS_SCAPUS_LONGQUEUE= 'OriscusScapusReversusLongqueue'
+S_ORISCUS_REVERSUS_SCAPUS_OPENQUEUE= 'OriscusScapusReversusOpenqueue'
+S_UPPER_ORISCUS = 'UpperOriscus'
+S_LOWER_ORISCUS = 'LowerOriscus'
+S_VIRGA = 'Virga'
+S_VIRGA_LONGQUEUE = 'VirgaLongqueue'
+S_VIRGA_OPENQUEUE = 'VirgaOpenqueue'
+S_VIRGA_REVERSA = 'VirgaReversa'
+S_VIRGA_REVERSA_LONGQUEUE = 'VirgaReversaLongqueue'
+S_VIRGA_REVERSA_OPENQUEUE = 'VirgaReversaOpenqueue'
# Liquescentiae
L_NOTHING = 'Nothing'
@@ -614,8 +593,8 @@ STEM_LIQ_FALLBACKS = {
STEM_SHAPE_FALLBACKS = {
S_VIRGA_REVERSA : S_VIRGA,
- S_ASCENDENS_ORISCUS_SCAPUS : S_VIRGA,
- S_DESCENDENS_ORISCUS_SCAPUS: S_VIRGA,
+ S_ORISCUS_SCAPUS : S_VIRGA,
+ S_ORISCUS_REVERSUS_SCAPUS: S_VIRGA,
S_FLEXUS_ORISCUS_SCAPUS: S_FLEXUS,
S_PES_QUADRATUM: S_FLEXUS,
S_PES_QUASSUS: S_PES_QUADRATUM,
@@ -782,18 +761,18 @@ def virga():
'auctusa2', 'long', S_VIRGA)
write_virga(S_VIRGA_REVERSA_OPENQUEUE, L_ASCENDENS, False,
'auctusa2', 'open', S_VIRGA)
- write_virga(S_ASCENDENS_ORISCUS_SCAPUS, L_NOTHING, False,
- 'AscendensOriscusLineBL', 'short', S_ASCENDENS_ORISCUS_SCAPUS)
- write_virga(S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_NOTHING, False,
- 'AscendensOriscusLineBL', 'long', S_ASCENDENS_ORISCUS_SCAPUS)
- write_virga(S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_NOTHING, False,
- 'AscendensOriscusLineBL', 'open', S_ASCENDENS_ORISCUS_SCAPUS)
- write_virga(S_DESCENDENS_ORISCUS_SCAPUS, L_NOTHING, False,
- 'DescendensOriscusLineBL', 'short', S_DESCENDENS_ORISCUS_SCAPUS)
- write_virga(S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_NOTHING, False,
- 'DescendensOriscusLineBL', 'long', S_DESCENDENS_ORISCUS_SCAPUS)
- write_virga(S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_NOTHING, False,
- 'DescendensOriscusLineBL', 'open', S_DESCENDENS_ORISCUS_SCAPUS)
+ write_virga(S_ORISCUS_SCAPUS, L_NOTHING, False,
+ 'OriscusLineBL', 'short', S_ORISCUS_SCAPUS)
+ write_virga(S_ORISCUS_SCAPUS_LONGQUEUE, L_NOTHING, False,
+ 'OriscusLineBL', 'long', S_ORISCUS_SCAPUS)
+ write_virga(S_ORISCUS_SCAPUS_OPENQUEUE, L_NOTHING, False,
+ 'OriscusLineBL', 'open', S_ORISCUS_SCAPUS)
+ write_virga(S_ORISCUS_REVERSUS_SCAPUS, L_NOTHING, False,
+ 'OriscusReversusLineBL', 'short', S_ORISCUS_REVERSUS_SCAPUS)
+ write_virga(S_ORISCUS_REVERSUS_SCAPUS_LONGQUEUE, L_NOTHING, False,
+ 'OriscusReversusLineBL', 'long', S_ORISCUS_REVERSUS_SCAPUS)
+ write_virga(S_ORISCUS_REVERSUS_SCAPUS_OPENQUEUE, L_NOTHING, False,
+ 'OriscusReversusLineBL', 'open', S_ORISCUS_REVERSUS_SCAPUS)
def write_deminutus(i, j, length=0, tosimplify=0, firstbar=1):
"""As the glyph before a deminutus is not the same as a normal glyph,
@@ -855,17 +834,17 @@ HEPISEMA_GLYPHS = {
'HEpisemaQuilisma': 'Quilisma',
'HEpisemaQuilismaLineTR': 'QuilismaLineTR',
'HEpisemaHighPes': 'PunctumSmall',
- 'HEpisemaAscendensOriscus': 'AscendensOriscus',
+ 'HEpisemaOriscus': 'Oriscus',
'HEpisemaVirga': 'rvirgabase',
'HEpisemaVirgaBaseLineBL': 'VirgaBaseLineBL',
- 'HEpisemaAscendensOriscusLineTR': 'AscendensOriscusLineTR',
+ 'HEpisemaOriscusLineTR': 'OriscusLineTR',
'HEpisemaPunctumLineBR': 'PunctumLineBR',
'HEpisemaPunctumLineBL': 'PunctumLineBL',
'HEpisemaPunctumLineTL': 'PunctumLineTL',
'HEpisemaPunctumLineTR': 'PunctumLineTR',
'HEpisemaPunctumLineBLBR': 'PunctumLineBLBR',
'HEpisemaPunctumAuctusLineBL': 'PunctumAuctusLineBL',
- 'HEpisemaAscendensOriscusLineBLTR': 'AscendensOriscusLineBLTR',
+ 'HEpisemaSalicusOriscus': 'SalicusOriscus',
'HEpisemaFlat': 'Flat',
'HEpisemaSharp': 'Sharp',
'HEpisemaNatural': 'Natural',
@@ -924,20 +903,19 @@ def pes():
write_pes(i, "QuilismaLineTR", S_PES_QUILISMA)
precise_message("pes quilisma deminutus")
for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "QuilismaLineTR", S_PES_QUILISMA, L_DEMINUTUS)
+ write_pes_deminutus(i, "QuilismaLineTR", S_PES_QUILISMA,
+ L_DEMINUTUS)
precise_message("pes quassus deminutus")
for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "AscendensOriscusLineTR", S_PES_QUASSUS,
+ write_pes_deminutus(i, "OriscusLineTR", S_PES_QUASSUS,
L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "DescendensOriscusLineTR",
- S_PES_QUASSUS_INUSITATUS, L_DEMINUTUS)
precise_message("pes initio debilis")
for i in range(1, MAX_INTERVAL+1):
write_pes_debilis(i, S_PES, L_INITIO_DEBILIS)
precise_message("pes initio debilis deminutus")
for i in range(1, MAX_INTERVAL+1):
- write_pes_debilis_deminutus(i, S_PES, L_INITIO_DEBILIS_DEMINUTUS)
+ write_pes_debilis_deminutus(i, S_PES,
+ L_INITIO_DEBILIS_DEMINUTUS)
def fusion_pes():
"Creates the fusion pes."
@@ -952,17 +930,8 @@ def fusion_pes():
write_pes_deminutus(i, "mpdeminutus", S_LOWER_PES, L_DEMINUTUS)
precise_message("fusion pes quassus deminutus")
for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "AscendensOriscusLineBLTR", S_UPPER_PES_QUASSUS,
+ write_pes_deminutus(i, "SalicusOriscus", S_UPPER_PES_QUASSUS,
L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "DescendensOriscusLineBLTR",
- S_UPPER_PES_QUASSUS_INUSITATUS, L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "AscendensOriscusLineTLTR", S_LOWER_PES_QUASSUS,
- L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_deminutus(i, "DescendensOriscusLineTLTR",
- S_LOWER_PES_QUASSUS_INUSITATUS, L_DEMINUTUS)
def write_pes(i, first_glyph, shape, lique=L_NOTHING):
"Writes the pes glyphs."
@@ -1051,26 +1020,14 @@ def pes_quadratum():
stemshape=S_PES_QUADRATUM, qtype='open')
precise_message("pes quassus")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTR", "VirgaBaseLineBL",
+ write_pes_quadratum(i, "OriscusLineTR", "VirgaBaseLineBL",
S_PES_QUASSUS,
stemshape=S_PES_QUASSUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTR", "VirgaBaseLineBL",
+ write_pes_quadratum(i, "OriscusLineTR", "VirgaBaseLineBL",
S_PES_QUASSUS_LONGQUEUE,
stemshape=S_PES_QUASSUS, qtype='long')
- write_pes_quadratum(1, "AscendensOriscusLineTR", "VirgaBaseLineBL",
- S_PES_QUASSUS_OPENQUEUE, stemshape=S_PES_QUASSUS,
- qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTR", "VirgaBaseLineBL",
- S_PES_QUASSUS_INUSITATUS, stemshape=S_PES_QUASSUS,
- qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTR", "VirgaBaseLineBL",
- S_PES_QUASSUS_INUSITATUS_LONGQUEUE,
- stemshape=S_PES_QUASSUS, qtype='long')
- write_pes_quadratum(1, "DescendensOriscusLineTR", "VirgaBaseLineBL",
- S_PES_QUASSUS_INUSITATUS_OPENQUEUE,
+ write_pes_quadratum(1, "OriscusLineTR", "VirgaBaseLineBL", S_PES_QUASSUS_OPENQUEUE,
stemshape=S_PES_QUASSUS, qtype='open')
precise_message("pes quilisma quadratum")
for i in range(1, MAX_INTERVAL+1):
@@ -1078,46 +1035,43 @@ def pes_quadratum():
S_PES_QUILISMA_QUADRATUM,
stemshape=S_PES_QUILISMA_QUADRATUM, qtype='short')
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "QuilismaLineTR", "VirgaBaseLineBL",
- S_PES_QUILISMA_QUADRATUM_LONGQUEUE,
+ write_pes_quadratum(i, "QuilismaLineTR",
+ "VirgaBaseLineBL", S_PES_QUILISMA_QUADRATUM_LONGQUEUE,
stemshape=S_PES_QUILISMA_QUADRATUM, qtype='long')
- write_pes_quadratum(1, "QuilismaLineTR", "VirgaBaseLineBL",
- S_PES_QUILISMA_QUADRATUM_OPENQUEUE,
+ write_pes_quadratum(1, "QuilismaLineTR",
+ "VirgaBaseLineBL", S_PES_QUILISMA_QUADRATUM_OPENQUEUE,
stemshape=S_PES_QUILISMA_QUADRATUM, qtype='open')
precise_message("pes auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "PunctumLineTR", "auctusa2", S_PES_QUADRATUM,
- L_ASCENDENS)
+ write_pes_quadratum(i, "PunctumLineTR",
+ "auctusa2", S_PES_QUADRATUM, L_ASCENDENS)
precise_message("pes initio debilis auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "idebilis", "auctusa2", S_PES_QUADRATUM,
+ write_pes_quadratum(i, "idebilis",
+ "auctusa2", S_PES_QUADRATUM,
L_INITIO_DEBILIS_ASCENDENS)
precise_message("pes quassus auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTR",
+ write_pes_quadratum(i, "OriscusLineTR",
"auctusa2", S_PES_QUASSUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTR",
- "auctusa2", S_PES_QUASSUS_INUSITATUS, L_ASCENDENS)
precise_message("pes quilisma auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "QuilismaLineTR", "auctusa2",
- S_PES_QUILISMA_QUADRATUM, L_ASCENDENS)
+ write_pes_quadratum(i, "QuilismaLineTR",
+ "auctusa2", S_PES_QUILISMA_QUADRATUM,
+ L_ASCENDENS)
precise_message("pes auctus descendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "PunctumLineTR", "PunctumAuctusLineBL",
- S_PES_QUADRATUM, L_DESCENDENS)
+ write_pes_quadratum(i, "PunctumLineTR",
+ "PunctumAuctusLineBL", S_PES_QUADRATUM, L_DESCENDENS)
precise_message("pes initio debilis auctus descendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "idebilis", "PunctumAuctusLineBL",
- S_PES_QUADRATUM, L_INITIO_DEBILIS_DESCENDENS)
+ write_pes_quadratum(i, "idebilis",
+ "PunctumAuctusLineBL", S_PES_QUADRATUM,
+ L_INITIO_DEBILIS_DESCENDENS)
precise_message("pes quassus auctus descendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTR", "PunctumAuctusLineBL",
- S_PES_QUASSUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTR", "PunctumAuctusLineBL",
- S_PES_QUASSUS_INUSITATUS, L_DESCENDENS)
+ write_pes_quadratum(i, "OriscusLineTR",
+ "PunctumAuctusLineBL", S_PES_QUASSUS, L_DESCENDENS)
precise_message("pes quilisma auctus descendens")
for i in range(1, MAX_INTERVAL+1):
write_pes_quadratum(i, "QuilismaLineTR", "PunctumAuctusLineBL",
@@ -1151,49 +1105,16 @@ def fusion_pes_quadratum():
stemshape=S_LOWER_PES_QUADRATUM, qtype='open')
precise_message("fusion pes quassus")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineBLTR", "VirgaBaseLineBL",
+ write_pes_quadratum(i, "SalicusOriscus", "VirgaBaseLineBL",
S_UPPER_PES_QUASSUS,
stemshape=S_UPPER_PES_QUASSUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineBLTR", "VirgaBaseLineBL",
+ write_pes_quadratum(i, "SalicusOriscus", "VirgaBaseLineBL",
S_UPPER_PES_QUASSUS_LONGQUEUE,
stemshape=S_UPPER_PES_QUASSUS, qtype='long')
- write_pes_quadratum(1, "AscendensOriscusLineBLTR", "VirgaBaseLineBL",
+ write_pes_quadratum(1, "SalicusOriscus", "VirgaBaseLineBL",
S_UPPER_PES_QUASSUS_OPENQUEUE,
stemshape=S_UPPER_PES_QUASSUS, qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineBLTR", "VirgaBaseLineBL",
- S_UPPER_PES_QUASSUS_INUSITATUS,
- stemshape=S_UPPER_PES_QUASSUS, qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineBLTR", "VirgaBaseLineBL",
- S_UPPER_PES_QUASSUS_INUSITATUS_LONGQUEUE,
- stemshape=S_UPPER_PES_QUASSUS, qtype='long')
- write_pes_quadratum(1, "DescendensOriscusLineBLTR", "VirgaBaseLineBL",
- S_UPPER_PES_QUASSUS_INUSITATUS_OPENQUEUE,
- stemshape=S_UPPER_PES_QUASSUS, qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTLTR", "VirgaBaseLineBL",
- S_LOWER_PES_QUASSUS,
- stemshape=S_LOWER_PES_QUASSUS, qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTLTR", "VirgaBaseLineBL",
- S_LOWER_PES_QUASSUS_LONGQUEUE,
- stemshape=S_LOWER_PES_QUASSUS, qtype='long')
- write_pes_quadratum(1, "AscendensOriscusLineTLTR", "VirgaBaseLineBL",
- S_LOWER_PES_QUASSUS_OPENQUEUE,
- stemshape=S_LOWER_PES_QUASSUS, qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTLTR", "VirgaBaseLineBL",
- S_LOWER_PES_QUASSUS_INUSITATUS,
- stemshape=S_LOWER_PES_QUASSUS, qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTLTR", "VirgaBaseLineBL",
- S_LOWER_PES_QUASSUS_INUSITATUS_LONGQUEUE,
- stemshape=S_LOWER_PES_QUASSUS, qtype='long')
- write_pes_quadratum(1, "DescendensOriscusLineTLTR", "VirgaBaseLineBL",
- S_LOWER_PES_QUASSUS_INUSITATUS_OPENQUEUE,
- stemshape=S_LOWER_PES_QUASSUS, qtype='open')
precise_message("fusion pes auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
write_pes_quadratum(i, "msdeminutus", "auctusa2",
@@ -1203,17 +1124,8 @@ def fusion_pes_quadratum():
S_LOWER_PES_QUADRATUM, L_ASCENDENS)
precise_message("fusion pes quassus auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineBLTR", "auctusa2",
+ write_pes_quadratum(i, "SalicusOriscus", "auctusa2",
S_UPPER_PES_QUASSUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineBLTR", "auctusa2",
- S_UPPER_PES_QUASSUS_INUSITATUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTLTR", "auctusa2",
- S_LOWER_PES_QUASSUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTLTR", "auctusa2",
- S_LOWER_PES_QUASSUS_INUSITATUS, L_ASCENDENS)
precise_message("fusion pes auctus descendens")
for i in range(1, MAX_INTERVAL+1):
write_pes_quadratum(i, "msdeminutus", "PunctumAuctusLineBL",
@@ -1223,17 +1135,8 @@ def fusion_pes_quadratum():
S_LOWER_PES_QUADRATUM, L_DESCENDENS)
precise_message("fusion pes quassus auctus descendens")
for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineBLTR", "PunctumAuctusLineBL",
+ write_pes_quadratum(i, "SalicusOriscus", "PunctumAuctusLineBL",
S_UPPER_PES_QUASSUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineBLTR", "PunctumAuctusLineBL",
- S_UPPER_PES_QUASSUS_INUSITATUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "AscendensOriscusLineTLTR", "PunctumAuctusLineBL",
- S_LOWER_PES_QUASSUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_pes_quadratum(i, "DescendensOriscusLineTLTR", "PunctumAuctusLineBL",
- S_LOWER_PES_QUASSUS_INUSITATUS, L_DESCENDENS)
def write_pes_quadratum(i, first_glyph, last_glyph, shape, lique=L_NOTHING,
stemshape=None, qtype=None):
@@ -1242,29 +1145,33 @@ def write_pes_quadratum(i, first_glyph, last_glyph, shape, lique=L_NOTHING,
glyph_name = '%s%s%s' % (shape, AMBITUS[i], lique)
if copy_existing_glyph(glyph_name):
return
- if i == 1 and first_glyph != 'idebilis' and first_glyph != 'QuilismaLineTR':
- if first_glyph == 'PunctumLineTR':
- first_glyph = 'Punctum'
- elif first_glyph == 'msdeminutus':
- first_glyph = 'PunctumLineBL'
- elif first_glyph == 'base6':
- first_glyph = 'PunctumLineTL'
- elif 'OriscusLine' in first_glyph:
- if first_glyph.endswith('LineTR'):
- first_glyph = first_glyph[:-6]
- else:
- first_glyph = first_glyph[:-2]
+ if first_glyph == "idebilis":
+ first_width = get_width('idebilis')-get_width('line2')
+ elif first_glyph == "PunctumLineTR" or first_glyph == "OriscusLineTR":
+ if i == 1:
+ if first_glyph == 'PunctumLineTR':
+ first_glyph = 'Punctum'
+ if first_glyph == 'msdeminutus':
+ first_glyph = 'PunctumLineBL'
+ if first_glyph == 'base6':
+ first_glyph = 'PunctumLineTL'
+ elif first_glyph == 'OriscusLineTR':
+ first_glyph = 'Oriscus'
+ elif first_glyph == 'SalicusOriscus':
+ first_glyph = 'OriscusLineBL'
- if last_glyph == 'PunctumLineTL':
- last_glyph = 'Punctum'
- elif last_glyph == 'auctusa2':
- last_glyph = 'PunctumAscendens'
- elif last_glyph == 'PunctumAuctusLineBL':
- last_glyph = 'PunctumDescendens'
- elif last_glyph == 'VirgaBaseLineBL':
- last_glyph = 'virgabase'
+ if last_glyph == 'PunctumLineTL':
+ last_glyph = 'Punctum'
+ elif last_glyph == 'auctusa2':
+ last_glyph = 'PunctumAscendens'
+ elif last_glyph == 'PunctumAuctusLineBL':
+ last_glyph = 'PunctumDescendens'
+ elif last_glyph == 'VirgaBaseLineBL':
+ last_glyph = 'virgabase'
- first_width = get_width(first_glyph)
+ first_width = get_width(first_glyph)
+ else:
+ first_width = get_width(first_glyph)-get_width('line2')
else:
first_width = get_width(first_glyph)-get_width('line2')
simple_paste(first_glyph)
@@ -1283,7 +1190,7 @@ def virga_strata():
"Creates the virga strata."
precise_message("virga strata")
for i in range(1, MAX_INTERVAL+1):
- write_virga_strata(i, "PunctumLineTR", "AscendensOriscusLineBL",
+ write_virga_strata(i, "PunctumLineTR", "OriscusLineBL",
S_VIRGA_STRATA)
def write_virga_strata(i, first_glyph, last_glyph, shape, lique=L_NOTHING):
@@ -1295,7 +1202,7 @@ def write_virga_strata(i, first_glyph, last_glyph, shape, lique=L_NOTHING):
if i == 1:
first_glyph = 'Punctum'
first_width = get_width(first_glyph)
- last_glyph = 'AscendensOriscus'
+ last_glyph = 'Oriscus'
else:
first_width = get_width(first_glyph)-get_width('line2')
simple_paste(first_glyph)
@@ -1346,17 +1253,17 @@ def draw_salicus(i, j, last_glyph, lique=L_NOTHING, qtype=None):
if i == 1 and j == 1 and not deminutus:
first_glyph = 'Punctum'
first_width = get_width(first_glyph)
- middle_glyph = 'AscendensOriscus'
+ middle_glyph = 'Oriscus'
middle_width = get_width(middle_glyph)
elif i == 1 and (not deminutus or not glyph_exists('PesQuassusOneDeminutus')):
first_glyph = 'Punctum'
first_width = get_width(first_glyph)
- middle_glyph = 'AscendensOriscusLineTR'
+ middle_glyph = 'OriscusLineTR'
middle_width = get_width(middle_glyph)-get_width('line2')
elif j == 1 and not deminutus:
first_glyph = 'PunctumLineTR'
first_width = get_width(first_glyph)-get_width('line2')
- middle_glyph = 'AscendensOriscusLineBL'
+ middle_glyph = 'OriscusLineBL'
middle_width = get_width(middle_glyph)
elif (j == 1 and deminutus and glyph_exists('PesQuassusOneDeminutus') and
glyph_exists('UpperPesQuassusOneDeminutus')):
@@ -1374,7 +1281,7 @@ def draw_salicus(i, j, last_glyph, lique=L_NOTHING, qtype=None):
else:
first_glyph = 'PunctumLineTR'
first_width = get_width(first_glyph)-get_width('line2')
- middle_glyph = 'AscendensOriscusLineBLTR'
+ middle_glyph = 'SalicusOriscus'
middle_width = get_width(middle_glyph)-get_width('line2')
simple_paste(first_glyph)
if i != 1:
@@ -1475,50 +1382,29 @@ def flexus():
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "PunctumLineBR", 'PunctumLineTL', S_FLEXUS_NOBAR)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS_INUSITATUS)
+ write_flexus(i, "odbase", 'PunctumLineTL', S_FLEXUS_ORISCUS)
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "rvbase", 'PunctumLineTL', S_FLEXUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "rvbase", 'PunctumLineTL', S_FLEXUS_LONGQUEUE, qtype='long')
write_flexus(1, "rvbase", 'PunctumLineTL', S_FLEXUS_OPENQUEUE, qtype='open')
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS,
- qtype='short')
+ write_flexus(i, "osbase", 'PunctumLineTL',
+ S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR", 'PunctumLineTL',
+ write_flexus(i, "osbase", 'PunctumLineTL',
S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE,
stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long')
- write_flexus(1, "DescendensOriscusLineBLBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE,
- stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS,
- stemshape=S_FLEXUS_ORISCUS_SCAPUS,
- qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE,
- stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long')
- write_flexus(1, "AscendensOriscusLineBLBR", 'PunctumLineTL',
- S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE,
+ write_flexus(1, "osbase", 'PunctumLineTL', S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE,
stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='open')
precise_message("flexus deminutus")
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "mdeminutus", 'PunctumLineTL',
S_FLEXUS_NOBAR, L_DEMINUTUS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBR", 'deminutus',
+ write_flexus(i, "odbase", 'deminutus',
S_FLEXUS_ORISCUS, L_DEMINUTUS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBR", 'deminutus',
- S_FLEXUS_ORISCUS_INUSITATUS, L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "mdeminutus", 'PunctumLineTL',
S_FLEXUS, L_DEMINUTUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
@@ -1531,12 +1417,9 @@ def flexus():
write_flexus(i, "PunctumLineBR", 'auctusa1',
S_FLEXUS_NOBAR, L_ASCENDENS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBR", 'auctusa1',
+ write_flexus(i, "odbase", 'auctusa1',
S_FLEXUS_ORISCUS, L_ASCENDENS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBR", 'auctusa1',
- S_FLEXUS_ORISCUS_INUSITATUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "rvbase",
'auctusa1', S_FLEXUS, L_ASCENDENS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
@@ -1545,40 +1428,24 @@ def flexus():
write_flexus(1, "rvbase",
'auctusa1', S_FLEXUS_OPENQUEUE, L_ASCENDENS, qtype='open')
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR",
+ write_flexus(i, "osbase",
'auctusa1', S_FLEXUS_ORISCUS_SCAPUS,
L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR",
+ write_flexus(i, "osbase",
'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE,
L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='long')
- write_flexus(1, "DescendensOriscusLineBLBR",
+ write_flexus(1, "osbase",
'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE, L_ASCENDENS,
stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR",
- 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS,
- L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS,
- qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR",
- 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE,
- L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS,
- qtype='long')
- write_flexus(1, "AscendensOriscusLineBLBR",
- 'auctusa1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE,
- L_ASCENDENS, stemshape = S_FLEXUS_ORISCUS_SCAPUS, qtype='open')
precise_message("flexus auctus descendens")
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "PunctumLineBR", 'auctusd1', S_FLEXUS_NOBAR,
L_DESCENDENS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBR", 'auctusd1', S_FLEXUS_ORISCUS,
+ write_flexus(i, "odbase", 'auctusd1', S_FLEXUS_ORISCUS,
L_DESCENDENS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBR", 'auctusd1',
- S_FLEXUS_ORISCUS_INUSITATUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "rvbase", 'auctusd1', S_FLEXUS,
L_DESCENDENS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
@@ -1587,33 +1454,19 @@ def flexus():
write_flexus(1, "rvbase",
'auctusd1', S_FLEXUS_OPENQUEUE, L_DESCENDENS, qtype='open')
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR",
+ write_flexus(i, "osbase",
'auctusd1', S_FLEXUS_ORISCUS_SCAPUS,
L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS,
stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='short')
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR",
+ write_flexus(i, "osbase",
'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_LONGQUEUE,
L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS,
stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long')
- write_flexus(1, "DescendensOriscusLineBLBR",
+ write_flexus(1, "osbase",
'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_OPENQUEUE, L_DESCENDENS,
- S_FLEXUS_ORISCUS_SCAPUS, stemshape=S_FLEXUS_ORISCUS_SCAPUS,
- qtype='open')
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR",
- 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS,
- L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS,
- stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='short')
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR",
- 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_LONGQUEUE,
- L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS,
- stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='long')
- write_flexus(1, "AscendensOriscusLineBLBR",
- 'auctusd1', S_FLEXUS_ORISCUS_SCAPUS_INUSITATUS_OPENQUEUE,
- L_DESCENDENS, S_FLEXUS_ORISCUS_SCAPUS,
- stemshape=S_FLEXUS_ORISCUS_SCAPUS, qtype='open')
+ S_FLEXUS_ORISCUS_SCAPUS,
+ stemshape=S_FLEXUS_ORISCUS_SCAPUS,qtype='open')
def fusion_flexus():
"Creates the fusion flexus."
@@ -1622,19 +1475,11 @@ def fusion_flexus():
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "mademinutus", 'PunctumLineTL', S_LOWER_FLEXUS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "rvbase", 'PunctumLineTL', S_UPPER_FLEXUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR", 'PunctumLineTL',
- S_UPPER_FLEXUS_ORISCUS)
+ write_flexus(i, "rvbase", 'PunctumLineTL',
+ S_UPPER_FLEXUS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineTLBR", 'PunctumLineTL',
+ write_flexus(i, "OriscusReversusLineTLBR", 'PunctumLineTL',
S_LOWER_FLEXUS_ORISCUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR", 'PunctumLineTL',
- S_UPPER_FLEXUS_ORISCUS_INUSITATUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineTLBR", 'PunctumLineTL',
- S_LOWER_FLEXUS_ORISCUS_INUSITATUS)
precise_message("fusion flexus deminutus")
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "mademinutus", 'deminutus', S_LOWER_FLEXUS,
@@ -1643,17 +1488,8 @@ def fusion_flexus():
write_flexus(i, "mdeminutus", 'deminutus', S_UPPER_FLEXUS,
L_DEMINUTUS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR", 'deminutus',
- S_UPPER_FLEXUS_ORISCUS, L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineTLBR", 'deminutus',
+ write_flexus(i, "OriscusReversusLineTLBR", 'deminutus',
S_LOWER_FLEXUS_ORISCUS, L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR", 'deminutus',
- S_UPPER_FLEXUS_ORISCUS_INUSITATUS, L_DEMINUTUS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineTLBR", 'deminutus',
- S_LOWER_FLEXUS_ORISCUS_INUSITATUS, L_DEMINUTUS)
precise_message("fusion flexus auctus ascendens")
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "mademinutus", 'auctusa1', S_LOWER_FLEXUS,
@@ -1662,17 +1498,8 @@ def fusion_flexus():
write_flexus(i, "rvbase", 'auctusa1', S_UPPER_FLEXUS,
L_ASCENDENS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR", 'auctusa1',
- S_UPPER_FLEXUS_ORISCUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineTLBR", 'auctusa1',
+ write_flexus(i, "OriscusReversusLineTLBR", 'auctusa1',
S_LOWER_FLEXUS_ORISCUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR", 'auctusa1',
- S_UPPER_FLEXUS_ORISCUS_INUSITATUS, L_ASCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineTLBR", 'auctusa1',
- S_LOWER_FLEXUS_ORISCUS_INUSITATUS, L_ASCENDENS)
precise_message("fusion flexus auctus descendens")
for i in range(1, MAX_INTERVAL+1):
write_flexus(i, "mademinutus", 'auctusd1', S_LOWER_FLEXUS,
@@ -1681,17 +1508,8 @@ def fusion_flexus():
write_flexus(i, "rvbase", 'auctusd1', S_UPPER_FLEXUS,
L_DESCENDENS)
for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineBLBR", 'auctusd1',
- S_UPPER_FLEXUS_ORISCUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "DescendensOriscusLineTLBR", 'auctusd1',
+ write_flexus(i, "OriscusReversusLineTLBR", 'auctusd1',
S_LOWER_FLEXUS_ORISCUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineBLBR", 'auctusd1',
- S_UPPER_FLEXUS_ORISCUS_INUSITATUS, L_DESCENDENS)
- for i in range(1, MAX_INTERVAL+1):
- write_flexus(i, "AscendensOriscusLineTLBR", 'auctusd1',
- S_LOWER_FLEXUS_ORISCUS_INUSITATUS, L_DESCENDENS)
def write_flexus(i, first_glyph, last_glyph, shape, lique=L_NOTHING,
firstglyph_amone=None, lastglyph_amone=None, stemshape=S_FLEXUS, qtype=None):
@@ -1723,7 +1541,7 @@ def write_flexus(i, first_glyph, last_glyph, shape, lique=L_NOTHING,
else:
if qtype:
write_left_queue(i, qtype, stemshape, lique)
- if i == 1 and first_glyph != 'DescendensOriscusLineTLBR':
+ if i == 1 and first_glyph != 'OriscusReversusLineTLBR':
if last_glyph == 'PunctumLineTL':
last_glyph = 'Punctum'
elif last_glyph == 'auctusa1':
@@ -1733,11 +1551,10 @@ def write_flexus(i, first_glyph, last_glyph, shape, lique=L_NOTHING,
if first_glyph == 'PunctumLineBR':
first_glyph = 'Punctum'
- elif 'OriscusLine' in first_glyph:
- if first_glyph.endswith('LineBR'):
- first_glyph = first_glyph[:-6]
- else:
- first_glyph = first_glyph[:-2]
+ elif first_glyph == 'odbase':
+ first_glyph = 'OriscusReversus'
+ elif first_glyph == 'osbase':
+ first_glyph = 'OriscusLineBL'
elif first_glyph == 'VirgaLineBR':
first_glyph = 'VirgaReversa'
elif first_glyph == 'rvbase':
@@ -2483,7 +2300,7 @@ def leading():
for i in range(1, MAX_INTERVAL+1):
write_leading(i, 'QuilismaLineTR', S_LEADING_QUILISMA)
for i in range(1, MAX_INTERVAL+1):
- write_leading(i, 'AscendensOriscusLineTR', S_LEADING_ORISCUS)
+ write_leading(i, 'OriscusLineTR', S_LEADING_ORISCUS)
# lique has a slightly different meaning here
def write_leading(i, first_glyph, glyph_type, lique=''):
@@ -2499,8 +2316,8 @@ def write_leading(i, first_glyph, glyph_type, lique=''):
first_glyph = 'Punctum'
elif first_glyph == 'QuilismaLineTR':
first_glyph = 'Quilisma'
- elif first_glyph == 'AscendensOriscusLineTR':
- first_glyph = 'AscendensOriscus'
+ elif first_glyph == 'OriscusLineTR':
+ first_glyph = 'Oriscus'
length = get_width(first_glyph) + length
paste_and_move(first_glyph, 0, -i * FONT_CONFIG['base height'])
if i != 1:
@@ -2524,85 +2341,34 @@ def fusion():
for i in range(1, MAX_INTERVAL+1):
write_fusion_leading(i, 'QuilismaLineTR', S_QUILISMA, L_UP)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineTR', S_ASCENDENS_ORISCUS,
- L_UP)
+ write_fusion_leading(i, 'OriscusLineTR', S_ORISCUS, L_UP)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineTR', S_DESCENDENS_ORISCUS,
+ write_fusion_leading(i, 'SalicusOriscus', S_UPPER_ORISCUS,
L_UP)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineBLTR',
- S_UPPER_ASCENDENS_ORISCUS, L_UP)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineBLTR',
- S_UPPER_DESCENDENS_ORISCUS, L_UP)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineTLTR',
- S_LOWER_ASCENDENS_ORISCUS, L_UP)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineTLTR',
- S_LOWER_DESCENDENS_ORISCUS, L_UP)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineBLTR',
- S_ASCENDENS_ORISCUS_SCAPUS, L_UP, qtype='short',
+ write_fusion_leading(i, 'SalicusOriscus',
+ S_ORISCUS_SCAPUS, L_UP, qtype='short',
stemshape=S_FLEXUS_ORISCUS_SCAPUS)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineBLTR',
- S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_UP,
- qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- write_fusion_leading(1, 'AscendensOriscusLineBLTR',
- S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_UP,
- qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineBLTR',
- S_DESCENDENS_ORISCUS_SCAPUS, L_UP, qtype='short',
+ write_fusion_leading(i, 'SalicusOriscus',
+ S_ORISCUS_SCAPUS_LONGQUEUE, L_UP, qtype='long',
stemshape=S_FLEXUS_ORISCUS_SCAPUS)
+ write_fusion_leading(1, 'SalicusOriscus',
+ S_ORISCUS_SCAPUS_OPENQUEUE, L_UP, qtype='open',
+ stemshape=S_FLEXUS_ORISCUS_SCAPUS)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineBLTR',
- S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_UP,
- qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- write_fusion_leading(1, 'DescendensOriscusLineBLTR',
- S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_UP,
- qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineBR', S_ASCENDENS_ORISCUS,
- L_DOWN)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineBR', S_DESCENDENS_ORISCUS,
- L_DOWN)
+ write_fusion_leading(i, 'odbase', S_ORISCUS, L_DOWN)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineBLBR',
- S_UPPER_ASCENDENS_ORISCUS, L_DOWN)
+ write_fusion_leading(i, "osbase", S_ORISCUS_SCAPUS, L_DOWN,
+ qtype='short', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineBLBR',
- S_UPPER_DESCENDENS_ORISCUS, L_DOWN)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'AscendensOriscusLineTLBR',
- S_LOWER_ASCENDENS_ORISCUS, L_DOWN)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, 'DescendensOriscusLineTLBR',
- S_LOWER_DESCENDENS_ORISCUS, L_DOWN)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, "AscendensOriscusLineBLBR",
- S_ASCENDENS_ORISCUS_SCAPUS, L_DOWN, qtype='short',
- stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, "AscendensOriscusLineBLBR",
- S_ASCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_DOWN,
+ write_fusion_leading(i, "osbase", S_ORISCUS_SCAPUS_LONGQUEUE, L_DOWN,
qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- write_fusion_leading(1, "AscendensOriscusLineBLBR",
- S_ASCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_DOWN,
+ write_fusion_leading(1, "osbase", S_ORISCUS_SCAPUS_OPENQUEUE, L_DOWN,
qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, "DescendensOriscusLineBLBR",
- S_DESCENDENS_ORISCUS_SCAPUS, L_DOWN, qtype='short',
- stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- for i in range(1, MAX_INTERVAL+1):
- write_fusion_leading(i, "DescendensOriscusLineBLBR",
- S_DESCENDENS_ORISCUS_SCAPUS_LONGQUEUE, L_DOWN,
- qtype='long', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
- write_fusion_leading(1, "DescendensOriscusLineBLBR",
- S_DESCENDENS_ORISCUS_SCAPUS_OPENQUEUE, L_DOWN,
- qtype='open', stemshape=S_FLEXUS_ORISCUS_SCAPUS)
+ write_fusion_leading(i, 'OriscusReversusLineTLBR', S_LOWER_ORISCUS,
+ L_DOWN)
for i in range(1, MAX_INTERVAL+1):
write_fusion_leading(i, 'PunctumLineBR', S_PUNCTUM, L_DOWN)
for i in range(1, MAX_INTERVAL+1):
@@ -2627,21 +2393,26 @@ def write_fusion_leading(i, first_glyph, glyph_type, lique, qtype = None, stemsh
if copy_existing_glyph(glyph_name):
return
length = -get_width('line2')
- if i == 1 and first_glyph != 'idebilis':
+ if (i == 1 and first_glyph != 'idebilis' and first_glyph != 'odbase'
+ and first_glyph != 'OriscusReversusLineTLBR'
+ and first_glyph != 'osbase'):
length = 0.1
if first_glyph == 'PunctumLineTR' or first_glyph == 'PunctumLineBR':
first_glyph = 'Punctum'
elif first_glyph == 'QuilismaLineTR':
first_glyph = 'Quilisma'
- elif 'Oriscus' in first_glyph and 'Line' in first_glyph:
- if first_glyph.endswith('LineTR') or first_glyph.endswith('LineBR'):
- first_glyph = first_glyph[:-6]
- else:
- first_glyph = first_glyph[:-2]
+ elif first_glyph == 'OriscusLineTR':
+ first_glyph = 'Oriscus'
+ elif first_glyph == 'OriscusScapusLineTR':
+ first_glyph = 'OriscusScapus'
+ elif first_glyph == 'OriscusScapusLongqueueLineTR':
+ first_glyph = 'OriscusScapusLongqueue'
elif first_glyph == 'msdeminutus' or first_glyph == 'PunctumLineBLBR':
first_glyph = 'PunctumLineBL'
elif first_glyph == 'mademinutus' or first_glyph == 'base6':
first_glyph = 'PunctumLineTL'
+ elif first_glyph == 'SalicusOriscus':
+ first_glyph = 'OriscusLineBL'
elif first_glyph == 'VirgaBaseLineBL':
first_glyph = 'rvirgabase'
length = get_width(first_glyph) + length
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf
index f8a234eedbb..3c6391889ad 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf
index 429502e861e..9a47f6cb606 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
index 76336f44e4a..0012fb867ef 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
index c494e2baee3..041dafe8536 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
index 7b44706a6c2..fee3dc17113 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
index eadbd34e93b..2a632e61f19 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf
index adf85281242..e45e152bfd3 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf
index b3b46d97b97..ac7a7461343 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
index da277c6898d..3f6b7195d25 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
Binary files differ
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
index dc8c20446e8..2765f3f627a 100644
--- a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
+++ b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
- [2016/04/27 v4.2.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2016/05/08 v4.1.2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
% If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts.
\ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
@@ -30,7 +30,6 @@
\RequirePackage{luaotfload}
\RequirePackage{luamplib}%
\RequirePackage{xstring}%
-\RequirePackage{xcolor}%
\newluatexcatcodetable\gre@atletter %
\setluatexcatcodetable\gre@atletter{%
@@ -39,7 +38,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre@gregorioversion{4.2.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.2}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre@declarefileversion}[2]{\relax}
@@ -106,10 +105,3 @@
% Test to make sure that gregoriotex.lua is of the same version.
\IfStrEq*{\gre@gregoriotexluaversion}{\gre@gregorioversion}{}{%else
\gre@error{uncoherent file versions: gregoriosyms.sty is in version \number\gre@gregorioversion \space\space while gregoriotex.lua is in version \gre@gregoriotexluaversion}}%
-
-%%%%%%%%%
-%% Color definitions
-%%%%%%%%%
-
-\definecolor{grebackgroundcolor}{RGB}{255,255,255}%
-\definecolor{gregoriocolor}{RGB}{229,53,44}%
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
index 7fcdd0187cb..3282197823d 100644
--- a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
+++ b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
- [2016/04/27 v4.2.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2016/05/08 v4.1.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
% If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away
\ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi%
@@ -74,12 +74,10 @@
\gresetlinesbehindalteration{invisible}
\gresetlinesbehindpunctumcavum{invisible}
-%%%%%%%%%
-%% Color definitions
-%%%%%%%%%
+%% We now redefine some things in a more LaTeX friendly way.
\definecolor{grebackgroundcolor}{RGB}{255,255,255}%
-\definecolor{gregoriocolor}{RGB}{229,53,44}%
+\definecolor{gregoriocolor}{RGB}{229,53,44}
%%%%%%%%%
%% LaTeX specific definitions for fonts
@@ -121,6 +119,23 @@
\gre@changestyle{normalstafflines}{\color[named]{#1}}[\relax]%
}
+\def\grecoloredlines#1#2#3{%OBSOLETE
+ \gre@obsolete{\protect\grecoloredlines}{\protect\gresetlinecolor}%
+}
+
+\def\greredlines{%OBSOLETE
+ \gre@obsolete{\protect\greredlines}{\protect\gresetlinecolor{gregoriocolor}}%
+ \relax %
+}
+
+\let\redlines\greredlines%OBSOLETE
+
+\def\grenormallines{%OBSOLETE
+ \gre@obsolete{\protect\grenormallines}{\protect\gresetlinecolor{black}}%
+ \relax %
+}
+
+\let\normallines\grenormallines%OBSOLETE
%%%%%%%%%%%%%%%%%%%%
%% Formatting environments
@@ -195,7 +210,7 @@
{\@@italiccorr\endgroup}%
\newenvironment{gre@style@nabc}%
- {\begingroup\color{gregoriocolor}}%
+ {\begingroup\color{red}}%
{\endgroup}%
\def\gre@changestyle#1#2[#3]{%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
index 5303a304c01..ea7f8d31031 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
@@ -18,7 +18,7 @@
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
\gre@debugmsg{general}{Loading gregoriotex-chars.tex}%
-\gre@declarefileversion{gregoriotex-chars.tex}{4.2.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{4.1.2}% GREGORIO_VERSION
\def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
@@ -61,7 +61,7 @@
\gre@def@char@he{punctum@line@bl}{PunctumLineBL}%
\gre@def@char@he{punctum@line@blbr}{PunctumLineBLBR}%
\gre@def@char@he{punctumauctus@line@bl}{PunctumAuctusLineBL}%
-\gre@def@char@he{salicus@oriscus}{AscendensOriscusLineBLTR}%
+\gre@def@char@he{salicus@oriscus}{SalicusOriscus}%
\gre@def@char@he{flexus}{FlexusDeminutus}%
\gre@def@char@he{initio}{Debilis}%
\gre@def@char@he{virga}{Virga}%
@@ -74,8 +74,8 @@
\gre@def@char@he@porr{porrectusfl}{PorrectusFlexus}%
\gre@def@char@he{quilisma}{Quilisma}%
\gre@def@char@he{quilisma@line@tr}{QuilismaLineTR}%
-\gre@def@char@he{oriscus}{AscendensOriscus}%
-\gre@def@char@he{oriscus@line@tr}{AscendensOriscusLineTR}%
+\gre@def@char@he{oriscus}{Oriscus}%
+\gre@def@char@he{oriscus@line@tr}{OriscusLineTR}%
\gre@def@char@he{smallpunctum}{HighPes}% "smallpunctum" is the top punctum in a pes
\gre@def@char@he{flat}{Flat}%
\gre@def@char@he{sharp}{Sharp}%
@@ -183,3 +183,19 @@
\gre@error{Unrecognized option "#1" for \protect\gresetglyphstyle\MessageBreak Possible options are: 'default', 'medicaea', 'hufnagel' and 'mensural'}%
]%
}%
+
+\def\greusedefaultstyle{%OBSOLETE
+ \gre@obsolete{\protect\greusedefaultstyle}{\protect\gresetglyphstyle{default}}%
+}%
+
+\def\greusemedicaeastyle{%OBSOLETE
+ \gre@obsolete{\protect\greusemedicaeastyle}{\protect\gresetglyphstyle{medicaea}}%
+}%
+
+\def\greusehufnagelstyle{%OBSOLETE
+ \gre@obsolete{\protect\greusehufnagelstyle}{\protect\gresetglyphstyle{hufnagel}}%
+}%
+
+\def\greusemensuralstyle{%OBSOLETE
+ \gre@obsolete{\protect\greusemensuralstyle}{\protect\gresetglyphstyle{mensural}}%
+}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
index 2655ae1da1a..2aa37d47d79 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
@@ -38,11 +38,11 @@
%true
{\gre@error{Debug error: ‘all’ is not a permitted keyword}}%
%false
- {\IfStrEq{\gre@debug}{,all,}%
+ {\IfStrEq{\gre@debug}{all}%
%true
{\gre@typeout{GregorioTeX debug: (#1) #2}}%
%false
- {\IfSubStr{\gre@debug}{,#1,}%
+ {\IfSubStr{\gre@debug}{#1}%
%true
{\gre@typeout{GregorioTeX debug: (#1) #2}}%
%false
@@ -52,21 +52,6 @@
}%
}%
-\AtBeginDocument{%
- \IfStrEq{\gre@debug}{}%
- {}%
- {%
- \directlua{gregoriotex.set_debug_string([[\gre@debug]])}%
- \typeout{GregorioTeX is in debug mode}%
- \typeout{\gre@debug\space messages will be printed to the log.}%
- {% we're starting a group in order to localize \exploregroups
- \exploregroups%
- \StrRemoveBraces{\gre@debug}[\gre@debug]%
- \xdef\gre@debug{,\gre@debug,}%
- }%
- }%
-}%
-
\gre@debugmsg{general}{Loading gregoriotex-main.tex}%
% Macro to handle deprecated macros.
@@ -89,6 +74,8 @@
\def\gre@nothing{}%
+\AtBeginDocument{\IfStrEq{\gre@debug}{}{}{\directlua{gregoriotex.set_debug_string([[\gre@debug]])}\typeout{GregorioTeX is in debug mode}\typeout{\gre@debug\space messages will be printed to the log.}}}%
+
%%%%%%%%%%%%%%%
%% Backwards Compatibility
%%%%%%%%%%%%%%%
@@ -156,7 +143,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre@gregorioversion{4.2.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.2}% GREGORIO_VERSION - VersionManager.py
% first some macros to allow checks for version:
% Tests that all gregoriotex files are of the same version.
@@ -245,7 +232,6 @@
\let\gre@pitch@overbraceglyph\gre@pitch@g %
\let\gre@pitch@bar\gre@pitch@g %
\let\gre@pitch@dummy\gre@pitch@g %
-\let\gre@pitch@nominal\gre@pitch@e %
% factor is the factor with which you open you font (the number after the at). It will decide almost everything (spaces, etc.), so it is particularly important.
% it is set to the default value : 17 (the value that makes it look like a standard graduale)
@@ -430,6 +416,10 @@
\gre@debugmsg{initial}{Fill initial box a}%
\setbox\gre@box@initial=\hbox{\gre@style@initial\gre@fixedtextformat{#1}\endgre@style@initial}%
\fi%
+ \ifx\gre@empty@initialformat\greinitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greinitialformat}{\protect\grechangestyle{initial}}% OBSOLETE
+ \fi% OBSOLETE
\gre@debugmsg{ifdim}{ manualinitialwidth = 0pt}%
\ifdim\gre@space@dimen@manualinitialwidth=0 pt\relax%
\global\gre@dimen@initialwidth=\wd\gre@box@initial %
@@ -437,6 +427,10 @@
\gre@style@initial%
\global\gre@dimen@initialwidth=\gre@space@dimen@manualinitialwidth\relax%
\endgre@style@initial%
+ \ifx\gre@empty@initialformat\greinitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greinitialformat}{\protect\grechangestyle{initial}}% OBSOLETE
+ \fi% OBSOLETE
\fi%
\gre@debugmsg{ifdim}{ wd(gre@box@annotation) > initialwidth}%
\ifdim\wd\gre@box@annotation>\gre@dimen@initialwidth\relax%
@@ -448,23 +442,13 @@
\gre@style@initial%
\global\gre@dimen@temp@four = \gre@space@dimen@beforeinitialshift\relax%
\endgre@style@initial%
+ \ifx\gre@empty@initialformat\greinitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greinitialformat}{\protect\grechangestyle{initial}}% OBSOLETE
+ \fi% OBSOLETE
\else %
\ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
- \gre@warning{%
- biginitial style is deprecated, but since you are\MessageBreak %
- allowing deprecated usage, Gregorio will continue\MessageBreak %
- to use your biginitial style as it did before.\MessageBreak %
- However, in upcoming version 5.0, Gregorio will\MessageBreak %
- only support one initial style for both big and\MessageBreak %
- small initials. Consider disabling deprecated\MessageBreak %
- usage by passing the [allowdeprecated=false]\MessageBreak %
- package option, which will then require you to\MessageBreak %
- set the initial style before the appropriate\MessageBreak %
- scores to style all initials: set the initial\MessageBreak %
- style for a big initial before a score with a big\MessageBreak %
- initial and back for a small initial afterwards.\MessageBreak %
- (See UPGRADE.md for more information)\MessageBreak %
- ...}%%% DEPRECATED for removal in 5.0
+ \gre@warning{biginitial style is deprecated, but the old\MessageBreak behavior will be used since deprecated usage is\MessageBreak currently enabled. This behavior will disappear\MessageBreak in 5.0, so consider disabling deprecated usage\MessageBreak and switching to the initial style instead. (See\MessageBreak UPGRADE.md for more information)}%%% DEPRECATED for removal in 5.0
\fi%%% DEPRECATED for removal in 5.0
\advance\gre@dimen@temp@five by \dimexpr(-\gre@dimen@additionalbottomspace %
- \gre@space@dimen@spacebeneathtext %
@@ -482,6 +466,10 @@
\setbox\gre@box@initial=\hbox{\gre@style@initial\gre@fixedtextformat{#1}\endgre@style@initial}% keep this line
\fi%%% DEPRECATED for removal in 5.0
\fi%
+ \ifx\gre@empty@biginitialformat\grebiginitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}% OBSOLETE
+ \fi% OBSOLETE
\gre@debugmsg{ifdim}{ manualinitialwidth = 0pt}%
\ifdim\gre@space@dimen@manualinitialwidth=0 pt\relax%
\global\gre@dimen@initialwidth=\wd\gre@box@initial %
@@ -495,6 +483,10 @@
\global\gre@dimen@initialwidth=\gre@space@dimen@manualinitialwidth\relax% keep this line
\endgre@style@initial% keep this line
\fi%%% DEPRECATED for removal in 5.0
+ \ifx\gre@empty@biginitialformat\grebiginitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}% OBSOLETE
+ \fi% OBSOLETE
\fi%
\gre@debugmsg{ifdim}{ wd(GreAboveinitialfirstbox) > initialwidth}%
\ifdim\wd\gre@box@annotation>\gre@dimen@initialwidth\relax%
@@ -510,19 +502,23 @@
\global\gre@dimen@temp@four = \gre@space@dimen@beforeinitialshift\relax% keep this line
\endgre@style@initial% keep this line
\fi%%% DEPRECATED for removal in 5.0
+ \ifx\gre@empty@biginitialformat\grebiginitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}% OBSOLETE
+ \fi% OBSOLETE
\fi %
\hskip\gre@dimen@temp@four %
\global\advance\gre@dimen@initialwidth by \gre@dimen@temp@four %
\gre@debugmsg{annotation}{Ready to place initial.}%
- \ifgre@showlyrics%
- \box\gre@box@initial%
- \else%
- \kern\wd\gre@box@initial%
- \fi%
+ \box\gre@box@initial%
\ifnum\gre@biginitial=0\relax%
\gre@style@initial%
\global\gre@dimen@temp@four = \gre@space@dimen@afterinitialshift\relax%
\endgre@style@initial%
+ \ifx\gre@empty@initialformat\greinitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greinitialformat}{\protect\grechangestyle{initial}}% OBSOLETE
+ \fi% OBSOLETE
\else%
\ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
\gre@style@biginitial%%% DEPRECATED for removal in 5.0
@@ -533,6 +529,10 @@
\global\gre@dimen@temp@four = \gre@space@dimen@afterinitialshift\relax% keep this line
\endgre@style@initial% keep this line
\fi%%% DEPRECATED for removal in 5.0
+ \ifx\gre@empty@biginitialformat\grebiginitialformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}% OBSOLETE
+ \fi% OBSOLETE
\fi%
\hskip\gre@dimen@temp@four %
\global\advance\gre@dimen@initialwidth by \gre@dimen@temp@four%
@@ -663,15 +663,44 @@
}%
+\def\gresetfirstlineaboveinitial#1#2{%OBSOLETE
+ \gre@obsolete{\protect\gresetfirstlineaboveinitial}{\protect\greannotation}%
+}%
+
+\def\gresetfirstannotation#1{%OBSOLETE
+ \gre@obsolete{\protect\gresetfirstannotation}{\protect\greannotation}%
+}%
+
+\let\setfirstannotation\gresetfirstannotation%OBSOLETE
+
+\def\gresetsecondannotation#1{%OBSOLETE
+ \gre@obsolete{\protect\gresetsecondannotation}{\protect\greannotation}%
+}%
+
+\let\setsecondannotation\gresetsecondannotation%OBSOLETE
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the score reference (unused)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\grescorereference#1{% OBSOLETE
- \gre@error{\protect\grescorereference\space is obsolete.\MessageBreak It does nothing; stop using it.}%
+\def\grescorereference#1{% DEPRECATED by 4.1
+ \ifgre@allowdeprecated%
+ \gre@warning{\protect\grescorereference\space is deprecated.\MessageBreak It does nothing; stop using it.}%
+ \else%
+ \gre@error{\protect\grescorereference\space is deprecated.\MessageBreak It does nothing; stop using it.}%
+ \fi%
\relax %
}%
+\def\GreScoreReference#1{%OBSOLETE
+ \gre@error{\protect\GreScoreReference\space is obsolete.\MessageBreak It does nothing; stop using it.}%
+ \relax%
+}%
+
+\def\scorereference#1{%OBSOLETE
+ \gre@error{\protect\scorereference\space is obsolete.\MessageBreak It does nothing; stop using it.}%
+}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting the things above the initial
@@ -751,16 +780,30 @@
\fi%
}
+\def\commentary#1{%OBSOLETE
+ \gre@obsolete{\protect\commentary}{\protect\grecommentary}%
+}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macro for putting text above lines for annotations and the like
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% format for text above the lines
+\def\greabovelinestextstyle#1{% OBSOLETE
+ \relax %
+}%
+\let\gre@empty@abovelinestextstyle\greabovelinestextstyle%
+
% set space above the text lines - almost the same as for the translation
\def\gre@addspaceabove{%
\gre@style@abovelinestext%
\global\gre@dimen@currentabovelinestextheight=\gre@space@dimen@abovelinestextheight\relax%
\gre@generatelines %
\endgre@style@abovelinestext%
+ \ifx\gre@empty@abovelinestextstyle\greabovelinestextstyle% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greabovelinestextstyle}{\protect\grechangestyle{abovelinestext}}% OBSOLETE
+ \fi% OBSOLETE
\relax %
}%
@@ -790,6 +833,10 @@
\gre@style@abovelinestext%
\gre@debugmsg{spacing}{Raise alt text: \gre@space@dimen@abovelinestextraise}%
\endgre@style@abovelinestext%
+ \ifx\gre@empty@abovelinestextstyle\greabovelinestextstyle% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greabovelinestextstyle}{\protect\grechangestyle{abovelinestext}}% OBSOLETE
+ \fi% OBSOLETE
\gre@dimen@temp@five=\dimexpr(4\gre@dimen@stafflineheight %
+ 4\gre@dimen@interstafflinespace %
+ \gre@space@dimen@spacebeneathtext %
@@ -801,6 +848,10 @@
\gre@mark@abovelinestext %
\gre@debugmsg{spacing}{Raise alt text: \the\gre@dimen@temp@five}%
\leavevmode\raise\gre@dimen@temp@five\hbox to 0pt{\gre@style@abovelinestext#1\endgre@style@abovelinestext\hss}%
+ \ifx\gre@empty@abovelinestextstyle\greabovelinestextstyle% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\greabovelinestextstyle}{\protect\grechangestyle{abovelinestext}}% OBSOLETE
+ \fi% OBSOLETE
\relax %
}%
@@ -823,6 +874,14 @@
]%
}
+\def\greremovelines{%OBSOLETE
+ \gre@obsolete{\protect\greremovelines}{\protect\gresetlines{invisible}}%
+}%
+
+\def\gredonotremovelines{%OBSOLETE
+ \gre@obsolete{\protect\gredonotremovelines}{\protect\gresetlines{visible}}%
+}%
+
%% macro that draws the stafflines on the first line, it is different from others due to the initial that can take some place, without lines
\def\gre@drawfirstlines{%
\advance\gre@dimen@stafflinewidth by -\gre@dimen@initialwidth\relax%
@@ -831,6 +890,10 @@
\hbox to 0pt{%
\vbox{%
\gre@style@normalstafflines%
+ \ifx\gre@empty@normalstafflinesformat\grenormalstafflinesformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grenormalstafflinesformat}{\protect\grechangestyle{normalstafflines}}% OBSOLETE
+ \fi% OBSOLETE
\vskip\gre@dimen@currentabovelinestextheight\relax%
\vskip\gre@dimen@additionaltopspace\relax%
\ifgre@showlines %
@@ -892,6 +955,10 @@
\setbox\gre@box@lines=\hbox to 0pt{%
\vbox{%
\gre@style@normalstafflines%
+ \ifx\gre@empty@normalstafflinesformat\grenormalstafflinesformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grenormalstafflinesformat}{\protect\grechangestyle{normalstafflines}}% OBSOLETE
+ \fi% OBSOLETE
\vskip\glueexpr(\gre@dimen@additionaltopspace+\gre@space@skip@spaceabovelines+\gre@dimen@currentabovelinestextheight)\relax%
\ifgre@showlines %
\hrule height \gre@dimen@stafflineheight width \gre@dimen@stafflinewidth\relax%
@@ -993,6 +1060,10 @@
]%
}%
+\def\setgretranslationcenteringscheme#1{%OBSOLETE
+ \gre@obsolete{\protect\setgretranslationcenteringscheme}{\protect\gresettranslationcentering}%
+}%
+
\newif\ifgre@breakintranslation%
\gre@breakintranslationfalse%
@@ -1008,6 +1079,10 @@
]%
}%
+\def\gresetnlbintranslation#1{%OBSOLETE
+ \gre@obsolete{\protect\gresetnlbintranslation}{\protect\gresetbreakintranslation}%
+}%
+
\def\GreWriteTranslation#1{%
\ifgre@translationcentering %
\setbox\gre@box@temp@width=\hbox{#1}%
@@ -1015,10 +1090,18 @@
\gre@mark@translation %
\kern\gre@dimen@temp@five %
\raise\gre@space@dimen@spacebeneathtext\hbox to 0pt{\vbox to 0pt{\vss\hbox to 0pt{\gre@style@translation#1\endgre@style@translation\hss}}}%
+ \ifx\gre@empty@translationformat\gretranslationformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\gretranslationformat}{\protect\grechangestyle{translation}}% OBSOLETE
+ \fi% OBSOLETE
\kern-\gre@dimen@temp@five %
\else %
\gre@mark@translation %
\raise\gre@space@dimen@spacebeneathtext\hbox to 0pt{\vbox to 0pt{\vss\hbox to 0pt{\gre@style@translation#1\endgre@style@translation\hss}}}%
+ \ifx\gre@empty@translationformat\gretranslationformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\gretranslationformat}{\protect\grechangestyle{translation}}% OBSOLETE
+ \fi% OBSOLETE
\fi %
}%
@@ -1029,6 +1112,10 @@
\gre@attr@center=1\relax %
\gre@mark@translation %
\raise\gre@space@dimen@spacebeneathtext\hbox to 0pt{\kern 0pt\vbox to 0pt{\vss\hbox to 0pt{\gre@style@translation#1\endgre@style@translation\hss}}\kern 0pt}%
+ \ifx\gre@empty@translationformat\gretranslationformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\gretranslationformat}{\protect\grechangestyle{translation}}% OBSOLETE
+ \fi% OBSOLETE
\unsetluatexattribute{\gre@attr@center}%
\relax %
}%
@@ -1163,7 +1250,8 @@
\global\setluatexattribute\gre@attr@glyph@id{0}%
\xdef\gre@gabcname{#6}%
\gre@setstafflines{#7}%
- \global\let\gre@opening@initialstyle\gre@initiallines\relax % DEPRECATED for removal in 5.0
+ \global\let\gre@save@englishcentering\gre@lyriccentering\relax % OBSOLETE
+ \global\let\gre@opening@initialstyle\gre@initiallines\relax % DEPRECATED by 4.1
\ifgre@justifylastline%
\xdef\gre@save@parfillskip{\the\parfillskip}%
\parfillskip=0pt plus 0pt minus 0pt\relax%
@@ -1244,13 +1332,14 @@
\ifgre@justifylastline%
\parfillskip=\gre@save@parfillskip\relax%
\fi %
+ \global\let\gre@lyriccentering\gre@save@englishcentering\relax % OBSOLETE
\global\setluatexattribute\gre@attr@glyph@id{0}%
\relax%
}%
% macro called at the end of a bar (old bar spacing algorithm only).
\def\gre@endafterbar#1{%
- \gre@penalty{\the\gre@space@count@endafterbarpenalty }\relax %
+ \gre@penalty{\greendafterbarpenalty }\relax %
\ifnum#1=1\relax %
\gre@debugmsg{ifdim}{ enddifference > 0pt}%
\ifdim\gre@dimen@enddifference > 0 pt\relax%
@@ -1273,7 +1362,7 @@
\fi %
\fi %
\fi %
- %\gre@penalty{\the\gre@space@count@endafterbarpenalty }\relax
+ %\gre@penalty{\greendafterbarpenalty }\relax
%\global\gre@dimen@enddifference=0pt
\relax %
}%
@@ -1338,6 +1427,13 @@
]%
}%
+\def\gredisableeolshifts{%OBSOLETE
+ \gre@obsolete{\protect\gredisableeolshifts}{\protect\greseteolshifts{disable}}%
+}%
+
+\def\greenableeolshifts{%OBSOLETE
+ \gre@obsolete{\protect\greenableeolshifts}{\protect\greseteolshifts{enable}}%
+}%
% Flag indicating if we block the custos. We just block custos at the end of a score, to prevent a bug.
\newif\ifgre@blockeolcustos%
@@ -1386,13 +1482,17 @@
}%
\gresetbreakbeforeeuouae{justified}%
-\def\GreAdHocSpaceEndOfElement#1#2#3{%
+% macro to suppress the custos
+\def\greblockcustos{%OBSOLETE
+ \gre@obsolete{\protect\greblockcustos}{\protect\greseteolcustos{manual}}%
+}%
+
+\def\GreAdHocSpaceEndOfElement#1#2{%
\gre@skip@temp@four = \gre@space@skip@interelementspace\relax %
\directlua{gregoriotex.scale_space(#1)}%
- \GreEndOfElement{4}{#2}{#3}%
+ \GreEndOfElement{4}{#2}%
}%
-\newif\ifgre@unbreakableendofelement %
% macro to end elements, #1 is the type of space, it can be :
%% 0: default space
%% 1: larger space
@@ -1400,30 +1500,11 @@
%% 3: zero-width space
%% 4: custom space
% #2 is if the space is unbreakable (1) or not (0)
-% #3 is the number of notes emitted in this syllable before this macro
-\def\GreEndOfElement#1#2#3{%
- \ifnum\gre@count@syllablenotes<\gre@count@unbreakabletotalnotes\relax %
- \gre@unbreakableendofelementtrue %
+\def\GreEndOfElement#1#2{%
+ \ifnum #2=0\relax %
+ \gre@penalty{\greendofelementpenalty}%
\else %
- \ifnum#3<\gre@count@unbreakableinitialnotes\relax %
- \gre@unbreakableendofelementtrue %
- \else %
- \ifnum\numexpr\gre@count@syllablenotes-#3\relax<%
- \gre@count@unbreakablefinalnotes\relax %
- \gre@unbreakableendofelementtrue %
- \else %
- \ifnum#2=1\relax %
- \gre@unbreakableendofelementtrue %
- \else %
- \gre@unbreakableendofelementfalse %
- \fi %
- \fi %
- \fi %
- \fi %
- \ifgre@unbreakableendofelement %
\GreNoBreak %
- \else %
- \gre@penalty{\the\gre@space@count@endofelementpenalty}%
\fi %
\ifcase#1%
\gre@skip@temp@four = \gre@space@skip@interelementspace\relax%
@@ -1440,7 +1521,7 @@
\or% case 4
\gre@hskip\gre@skip@temp@four %
\fi%
- \ifgre@unbreakableendofelement %
+ \ifnum #2=1\relax %
\GreNoBreak %
\fi %
\relax%
@@ -1519,10 +1600,6 @@
\gre@skip@temp@four = \gre@space@skip@ascendinginclinatumtonobarmaxshift\relax%
\or% case 22
\gre@skip@temp@four = \gre@space@skip@halfspace\relax%
- \or% case 23
- \gre@skip@temp@four = \gre@space@skip@punctuminclinatumunisonshift\relax%
- \else%
- \gre@error{Unrecognized spaceskip #1}%
\fi%
}%
@@ -1542,13 +1619,6 @@
% 2: no line break area due to <nlba> tag
\xdef\gre@nlbstate{0}%
-\newcount\gre@nobreakpenaltysave%
-\newcount\gre@endofwordpenaltysave%
-\newcount\gre@endofsyllablepenaltysave%
-\newcount\gre@endafterbarpenaltysave%
-\newcount\gre@endafterbaraltpenaltysave%
-\newcount\gre@endofelementpenaltysave%
-%\newcount\gre@hyphenpenaltysave% in gregoriotex-spaces.tex
% first argument is if if the nlba is starting in neumes or not
% second argument is if it is called from translation centering or not
\def\GreBeginNLBArea#1#2{%
@@ -1565,21 +1635,20 @@
\fi %
\fi %
\ifnum\gre@nlbinitialstate=0\relax %
- \global\gre@nobreakpenaltysave=\gre@space@count@nobreakpenalty\relax %
- \global\gre@endofwordpenaltysave=\gre@space@count@endofwordpenalty\relax %
- \global\gre@endofsyllablepenaltysave=\gre@space@count@endofsyllablepenalty\relax %
- \global\gre@endafterbarpenaltysave=\gre@space@count@endafterbarpenalty\relax %
- \global\gre@endafterbaraltpenaltysave=\gre@space@count@endafterbaraltpenalty\relax %
- \global\gre@endofelementpenaltysave=\gre@space@count@endofelementpenalty\relax %
- \global\gre@hyphenpenaltysave=\gre@space@count@hyphenpenalty\relax %
- %
- \global\gre@space@count@nobreakpenalty=10001\relax %
- \global\gre@space@count@endofwordpenalty=10001\relax %
- \global\gre@space@count@endofsyllablepenalty=10001\relax %
- \global\gre@space@count@endafterbarpenalty=10001\relax %
- \global\gre@space@count@endafterbaraltpenalty=10001\relax %
- \global\gre@space@count@endofelementpenalty=10001\relax %
- \global\gre@space@count@hyphenpenalty=10001\relax %
+ \xdef\gre@nobreakpenaltysave{\grenobreakpenalty }%
+ \xdef\grenobreakpenalty{10001}%
+ \xdef\gre@endofwordpenaltysave{\greendofwordpenalty }%
+ \xdef\greendofwordpenalty{10001}%
+ \xdef\gre@endofsyllablepenaltysave{\greendofsyllablepenalty }%
+ \xdef\greendofsyllablepenalty{10001}%
+ \xdef\gre@endafterbarpenaltysave{\greendafterbarpenalty }%
+ \xdef\greendafterbarpenalty{10001}%
+ \xdef\gre@endafterbaraltpenaltysave{\greendafterbaraltpenalty }%
+ \xdef\greendafterbaraltpenalty{10001}%
+ \xdef\gre@endofelementpenaltysave{\greendofelementpenalty }%
+ \xdef\greendofelementpenalty{10001}%
+ \xdef\gre@hyphenpenaltysave{\grehyphenpenalty }%
+ \xdef\grehyphenpenalty{10001}%
\fi %
}%
@@ -1599,17 +1668,17 @@
% if gre@nlbstate is not 0, then nothing should happend
\ifnum\gre@nlbstate=0\relax %
\ifnum\gre@nlbinitialstate=0\else %
- \global\gre@space@count@nobreakpenalty=\gre@nobreakpenaltysave\relax %
- \global\gre@space@count@endofwordpenalty=\gre@endofwordpenaltysave\relax %
- \global\gre@space@count@endofsyllablepenalty=\gre@endofsyllablepenaltysave\relax %
- \global\gre@space@count@endafterbarpenalty=\gre@endafterbarpenaltysave\relax %
- \global\gre@space@count@endafterbaraltpenalty=\gre@endafterbaraltpenaltysave\relax %
- \global\gre@space@count@endofelementpenalty=\gre@endofelementpenaltysave\relax %
- \global\gre@space@count@hyphenpenalty=\gre@hyphenpenaltysave\relax %
+ \xdef\grenobreakpenalty{\gre@nobreakpenaltysave }%
+ \xdef\greendofwordpenalty{\gre@endofwordpenaltysave}%
+ \xdef\greendofsyllablepenalty{\gre@endofsyllablepenaltysave}%
+ \xdef\greendafterbarpenalty{\gre@endafterbarpenaltysave}%
+ \xdef\greendafterbaraltpenalty{\gre@endafterbaraltpenaltysave}%
+ \xdef\greendofelementpenalty{\gre@endofelementpenaltysave}%
+ \xdef\grehyphenpenalty{\gre@hyphenpenaltysave}%
\ifcase #1\relax % 0
- \gre@penalty{\the\gre@space@count@endofelementpenalty}%
+ \gre@penalty{\greendofelementpenalty}%
\or % 1
- \gre@penalty{\the\gre@space@count@endofsyllablepenalty}%
+ \gre@penalty{\greendofsyllablepenalty}%
\or % 2
% end of score, no penalty needs to be added
\or % 3
@@ -1728,6 +1797,38 @@
\relax%
}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% The following style functions are defined for backwards compatibility. They will eventually be removed.
+\def\greinitialformat#1{% OBSOLETE
+ \relax %
+}
+\let\gre@empty@initialformat\greinitialformat
+
+\def\grebiginitialformat#1{% OBSOLETE
+ \relax %
+}
+\let\gre@empty@biginitialformat\grebiginitialformat
+
+\def\gretranslationformat#1{% OBSOLETE
+ \relax %
+}%
+\let\gre@empty@translationformat\gretranslationformat
+
+\def\grenormalstafflinesformat{% OBSOLETE
+ \relax %
+}%
+\let\gre@empty@normalstafflinesformat\grenormalstafflinesformat
+
+\def\greadditionalstafflinesformat{% OBSOLETE
+ \relax %
+}%
+\let\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\GreSetStaffLinesFormat#1{%OBSOLETE
+ \gre@obsolete{\protect\GreSetStaffLinesFormat}{\protect\grechangestyle{normalstafflines}}%
+}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Master function for changing element formats
@@ -1756,6 +1857,10 @@
\relax %
}%
+\def\setgrefactor#1{%OBSOLETE
+ \gre@obsolete{\protect\setgrefactor}{\protect\grechangestaffsize}%
+}%
+
%%%%%%%%%%%%%%%%%%%
%% headers
%%%%%%%%%%%%%%%%%%%
@@ -1788,7 +1893,24 @@
]%
}%
-\def\gre@allowdeprecated@asboolean{\ifgre@allowdeprecated true\else false\fi}%
+
+% User macro to force gregriotex to recompile gabc files. Useful for when there
+% are changes to gregoriotex but the GREGORIOTEX API VERSION is not changed.
+\def\forcecompilegabc{%OBSOLETE
+ \gre@obsolete{\protect\forcecompilegabc}{\protect\gresetcompilegabc{force}}%
+}%
+
+% User macro to let gregoriotex auto recompile gabc files as necessary.
+% Intended to be used in the main tex file to revert the previous macro.
+\def\autocompilegabc{%OBSOLETE
+ \gre@obsolete{\protect\autocompilegabc}{\protect\gresetcompilegabc{auto}}%
+}%
+
+% User macro to force score inclusion without compilation.
+\def\nevercompilegabc{%OBSOLETE
+ \gre@obsolete{\protect\nevercompilegabc}{\protect\gresetcompilegabc{never}}%
+}
+
% Internal marco which includes a score when \gregorioscore is called without the optional argument. Behavior is determined by the value of \gre@compilegabc flag.
%
@@ -1809,10 +1931,10 @@
\input #1%
\or% case 1, auto compile
\gre@debugmsg{compile}{Auto compile #1}%
- \directlua{gregoriotex.include_score([[#1]], nil, \gre@allowdeprecated@asboolean)}%
+ \directlua{gregoriotex.include_score([[#1]], nil)}%
\or% case 2, force compile
\gre@debugmsg{compile}{Forced to compile #1}%
- \directlua{gregoriotex.include_score([[#1]], true, \gre@allowdeprecated@asboolean)}%
+ \directlua{gregoriotex.include_score([[#1]], true)}%
\fi%
\relax%
}%
@@ -1828,11 +1950,11 @@
\else%
\ifx #1f\relax%
\gre@debugmsg{compile}{Override force compiling #2}%
- \directlua{gregoriotex.include_score([[#2]], true, \gre@allowdeprecated@asboolean)}%
+ \directlua{gregoriotex.include_score([[#2]], true)}%
\else%
\ifx #1a\relax%
\gre@debugmsg{compile}{Override auto compiling #2}%
- \directlua{gregoriotex.include_score([[#2]], nil, \gre@allowdeprecated@asboolean)}%
+ \directlua{gregoriotex.include_score([[#2]], nil)}%
\else%
\gre@error{Unrecognized option "#1" for \protect\includescore\MessageBreak Possible options are: 'f', 'a', and 'n'}%
\fi%
@@ -1843,6 +1965,10 @@
% The main macro used by the user to input scores into the document.
+\def\includescore{%OBSOLETE
+ \gre@obsolete{\protect\includescore}{\protect\gregorioscore}%
+}%
+
\def\gregorioscore{\@ifnextchar[{\gre@gregorioscore@option}%
{\gre@gregorioscore}%
}%
@@ -1864,16 +1990,16 @@
% Macros for compiling short snippets of GABC directly expressed in TeX
-\long\def\gre@gabcsnippet@option[#1]#2{%%% DEPRECATED for removal in 5.0
+\long\def\gre@gabcsnippet@option[#1]#2{%%% DEPRECATED by 4.1
\gre@deprecated{\protect\gabcsnippet with initial-style argument}{\protect\gresetinitiallines}%
- \directlua{gregoriotex.direct_gabc("\luatexluaescapestring{\unexpanded\expandafter{#2}}", "initial-style: #1;", \gre@allowdeprecated@asboolean)}%
+ \directlua{gregoriotex.direct_gabc("\luatexluaescapestring{\unexpanded\expandafter{#2}}", "initial-style: #1;")}%
}%
\long\def\gre@gabcsnippet#1{%
- \directlua{gregoriotex.direct_gabc("\luatexluaescapestring{\unexpanded\expandafter{#1}}", nil, \gre@allowdeprecated@asboolean)}%
+ \directlua{gregoriotex.direct_gabc("\luatexluaescapestring{\unexpanded\expandafter{#1}}")}%
}%
-%%% \gre@gabcsnipper@option is DEPRECATED for removal in 5.0
+%%% \gre@gabcsnipper@option is DEPRECATED by 4.1
\def\gabcsnippet{\@ifnextchar[{\gre@gabcsnippet@option}{\gre@gabcsnippet}}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1909,6 +2035,14 @@
]%
}%
+\def\GreUseNormalHyphen{%OBSOLETE
+ \gre@obsolete{\protect\GreUseNormalHyphen}{\protect\greseteolhyphen{normal}}%
+}%
+
+\def\GreUseZeroHyphen{%OBSOLETE
+ \gre@obsolete{\protect\GreUseZeroHyphen}{\protect\greseteolhyphen{zero}}%
+}%
+
% macro to force hyphenation of all syllables.
\newif\ifgre@forcehyphen\gre@forcehyphenfalse%
\def\gresethyphen#1{%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
index 125acc458b4..589c2915524 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
@@ -20,7 +20,7 @@
-- this file contains lua functions used by GregorioTeX St. Gall ancient
-- neume support when called with LuaTeX.
--- GREGORIO_VERSION 4.2.0-beta1
+-- GREGORIO_VERSION 4.1.2
local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
index 15d18920417..7f4b7a08f36 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
@@ -20,7 +20,7 @@
% this file contains macros for St. Gall ancient neume support
\gre@debugmsg{general}{Loading gregoriotex-nabc.tex}%
-\gre@declarefileversion{gregoriotex-nabc.tex}{4.2.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.2}% GREGORIO_VERSION
\xdef\gre@nabcfontname{gregall}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
index 17879fe855b..d7064f22fd4 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 4.2.0-beta1
+-- GREGORIO_VERSION 4.1.2
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
@@ -135,8 +135,8 @@ local offset_cases = {
-- oriscus as last note
{
case = 'FinalOriscus',
- v = [[\gre@vepisemaorrareaux{0}{\GreCPAscendensOriscus}{0}{0}{#2}{#3}{#4}]],
- h = [[\gre@hepisorlineaux{\GreCPAscendensOriscus}{\gre@char@he@oriscus{#4}}{2}{#3}]],
+ v = [[\gre@vepisemaorrareaux{0}{\GreCPOriscus}{0}{0}{#2}{#3}{#4}]],
+ h = [[\gre@hepisorlineaux{\GreCPOriscus}{\gre@char@he@oriscus{#4}}{2}{#3}]],
},
-- second-to-last note, with a second ambitus of one, when last note is a
-- standard punctum (like the second note of ghg)
@@ -155,7 +155,7 @@ local offset_cases = {
-- oriscus as first note, disconnected from next note
{
case = 'InitialOriscus',
- v = [[\gre@vepisemaorrareaux{0}{\GreCPDescendensOriscus}{0}{0}{#2}{#3}{#4}]],
+ v = [[\gre@vepisemaorrareaux{0}{\GreCPOriscusReversus}{0}{0}{#2}{#3}{#4}]],
h = [[\gre@hepisorlineaux{0}{\gre@char@he@oriscus{#4}}{0}{#3}]],
},
-- quilisma as first note, disconnected from next note
@@ -370,7 +370,7 @@ local offset_cases = {
-- oriscus as first note, connected to next higher note
{
case = 'InitialConnectedOriscus',
- v = [[\gre@vepisemaorrareaux{0}{\GreCPAscendensOriscusLineTR}{0}{0}{#2}{#3}{#4}]],
+ v = [[\gre@vepisemaorrareaux{0}{\GreCPOriscusLineTR}{0}{0}{#2}{#3}{#4}]],
h = [[\gre@hepisorlineaux{0}{\gre@char@he@oriscus@line@tr{#4}}{0}{#3}]],
},
-- punctum as last note, connected to prior higher note
@@ -407,13 +407,13 @@ local offset_cases = {
-- least two
{
case = 'SalicusOriscusWide',
- v = [[\gre@vepisemaorrareaux{\GreCPVirgaStrataThreeNothing}{\GreCPAscendensOriscusLineBLTR}{3}{0}{#2}{#3}{#4}]],
+ v = [[\gre@vepisemaorrareaux{\GreCPVirgaStrataThreeNothing}{\GreCPSalicusOriscus}{3}{0}{#2}{#3}{#4}]],
h = [[\gre@hepisorlineaux{\GreCPVirgaStrataThreeNothing}{\gre@char@he@salicus@oriscus{#4}}{4}{#3}]],
},
-- "oriscus" as the middle note of a salicus with a second ambitus of one
{
case = 'SalicusOriscusOne',
- v = [[\gre@vepisemaorrareaux{\GreCPVirgaStrataOneNothing}{\GreCPAscendensOriscus}{3}{0}{#2}{#3}{#4}]],
+ v = [[\gre@vepisemaorrareaux{\GreCPVirgaStrataOneNothing}{\GreCPOriscus}{3}{0}{#2}{#3}{#4}]],
h = [[\gre@hepisorlineaux{\GreCPVirgaStrataOneNothing}{\gre@char@he@salicus@oriscus{#4}}{4}{#3}]],
},
-- punctum fused to the next note
@@ -431,8 +431,8 @@ local offset_cases = {
-- oriscus fused to the next note
{
case = 'LeadingOriscus',
- v = [[\gre@vepisemaorrareaux{0}{\GreCPAscendensOriscus}{0}{0}{#2}{#3}{#4}]],
- h = [[\gre@hepisorlineaux{\GreCPAscendensOriscusTwoUp}{\gre@char@he@oriscus{#4}}{2}{#3}]],
+ v = [[\gre@vepisemaorrareaux{0}{\GreCPOriscus}{0}{0}{#2}{#3}{#4}]],
+ h = [[\gre@hepisorlineaux{\GreCPOriscusTwoUp}{\gre@char@he@oriscus{#4}}{2}{#3}]],
},
-- flat
{
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
index b008290faa0..f1c863c330a 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
@@ -23,7 +23,7 @@
\def\grebarbracewidth{.58879}%
\gre@debugmsg{general}{Loading gregoriotex-signs.tex}%
-\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{4.1.2}% GREGORIO_VERSION
\def\gre@usestylecommon{%
\ifgre@usestylefont\else %
@@ -143,6 +143,14 @@
}%
+\def\greremoveclef{% OBSOLETE
+ \gre@obsolete{\protect\greremoveclef}{\protect\gresetclef{invisible}}%
+}%
+
+\def\grenormalclef{% OBSOLETE
+ \gre@obsolete{\protect\grenormalclef}{\protect\gresetclef{visible}}%
+}%
+
%% marcro to define the clef that will appear at the beginning of the lines
% the first argument is the type : f or c, and the second is the height
% the third argument is whether we must type a space after or not (0 if not, 1 if yes)
@@ -302,53 +310,28 @@
\gre@skip@temp@four = \gre@space@skip@clefchangespace\relax%
\gre@hskip\gre@skip@temp@four %
\else %
- \ifdim\gre@skip@bar@lastskip=0pt\else % we're after a bar:
- % here it means that there is a bar before the clef, so we skip the difference between the normal space and the space around bars with clef changes
- \gre@skip@temp@four = -\gre@space@skip@spacearoundclefbars\relax%
- \gre@hskip\gre@skip@temp@four %
- \fi %
+ % here it means that there is a bar before the clef, so we skip the difference between the normal space and the space around bars with clef changes
+ \gre@skip@temp@four = -\gre@space@skip@spacearoundclefbars\relax%
+ \gre@hskip\gre@skip@temp@four %
\fi %
- \GreNoBreak %
\gre@typeclef{#1}{#2}{1}{0}{#4}{#5}{#6}{#7}%
- \ifnum\gre@insidediscretionary=0\relax %
- \gre@skip@temp@four = \gre@space@skip@clefchangespace\relax%
- \else %
- \gre@skip@temp@four = \gre@space@skip@interwordspacenotes\relax%
- \fi %
+ \gre@skip@temp@four = \gre@space@skip@clefchangespace\relax%
\gre@hskip\gre@skip@temp@four %
- \GreNoBreak %
\relax%
}%
% custos just typesets a custos, useful for before the key changes for example
% #1 is the height
-\def\GreCustos#1#2{%
- \GreNoBreak %
+% #2 is indicating if the custo ends the line
+\def\GreCustos#1{%
\ifdim\gre@skip@bar@lastskip=0pt\else % we're after a bar:
\kern-\gre@skip@bar@lastskip %
- \GreNoBreak %
- \fi %
- \ifgre@firstglyph% we check if it is the first glyph
- \global\gre@firstglyphfalse%
- \ifnum\gre@insidediscretionary=0\else %
- \gre@skip@temp@four=\gre@space@skip@interwordspacenotes %
- \kern\gre@skip@temp@four%
- \GreNoBreak %
- \fi %
- \else%
- \ifgre@endofscore %
- \gre@skip@temp@four=\gre@space@skip@spacebeforeeolcustos %
- \else %
- \gre@skip@temp@four=\gre@space@skip@spacebeforeinlinecustos %
- \fi %
- \kern\gre@skip@temp@four%
- \GreNoBreak %
\fi %
- \gre@custosalteration{#1}{#2}%
- \GreNoBreak%
+ \gre@skip@temp@four = \gre@space@skip@spacebeforeinlinecustos\relax%
+ \kern\gre@skip@temp@four%
\gre@calculate@glyphraisevalue{#1}{0}{}%
%here we need some tricks to draw the line before the custos (for the color)
- \setbox\gre@box@temp@width=\hbox{\gre@pickcustos{#1}{1}}%
+ \setbox\gre@box@temp@width=\hbox{\gre@pickcustos{#1}}%
\gre@dimen@temp@three=\wd\gre@box@temp@width %
\ifgre@showlines %
\ifnum#1<\gre@pitch@belowstaff\relax %
@@ -371,26 +354,26 @@
\kern\gre@skip@bar@lastskip %
\GreNoBreak %
\fi %
- \directlua{gregoriotex.adjust_line_height(\gre@insidediscretionary)}%
\relax %
}%
% typesets a custos for the end of the score
-\def\GreFinalCustos#1#2{%
+\def\GreFinalCustos#1{%
+ \GreNoBreak%
+ \gre@dimen@temp@four = \glueexpr(\gre@space@skip@spacebeforeeolcustos)\relax%
+ \kern\gre@dimen@temp@four %
\GreNoBreak%
- \GreCustos{#1}{#2}%
+ \GreCustos{#1}%
\gre@endofglyphcommon %
}
% the argument is the height
-\edef\gre@nextcustospitch{\gre@pitch@dummy}%
-\edef\gre@nextcustosalteration{}%
-\def\GreNextCustos#1#2{%
- \gre@debugmsg{custos}{nextcustos = #1,#2}%
+\edef\gre@nextcustos{\gre@pitch@dummy}%
+\def\GreNextCustos#1{%
+ \gre@debugmsg{custos}{nextcustos = #1}%
\ifnum\gre@insidediscretionary=0\relax %
\gre@debugmsg{custos}{not discretionary}%
- \edef\gre@nextcustospitch{#1}%
- \edef\gre@nextcustosalteration{#2}%
+ \edef\gre@nextcustos{#1}%
\ifgre@blockeolcustos\else%
\gre@debugmsg{custos}{not blocked}%
\gre@calculate@glyphraisevalue{#1}{0}{}%
@@ -398,19 +381,12 @@
\setbox\gre@box@temp@width=\hbox{%
% we type a hskip and the we type the custos
\gre@hskip\gre@space@skip@spacebeforeeolcustos\relax %
- \gre@custosalteration{#1}{#2}%
- \GreNoBreak%
- \raise \gre@dimen@glyphraisevalue\relax%
- \hbox{%
- \gre@pickcustos{#1}{2}\relax %
- }%
+ \gre@pickcustos{#1}\relax %
}%
\gre@dimen@temp@three=\wd\gre@box@temp@width %
% we make \wd\gre@box@temp@sign contain the width of a custos
\setbox\gre@box@temp@sign=\hbox{%
- \gre@custosalteration{#1}{#2}%
- \GreNoBreak%
- \gre@pickcustos{#1}{0}\relax %
+ \gre@pickcustos{#1}\relax %
}%
\gre@localrightbox{%
\ifgre@showlines %
@@ -420,6 +396,7 @@
\gre@additionaltopcustoslineend %
\fi\fi %
\fi %
+ \raise \gre@dimen@glyphraisevalue\relax%
\copy\gre@box@temp@width %
}%
\fi %
@@ -439,6 +416,10 @@
\raise\gre@dimen@temp@five %
\hbox to 0pt{%
\gre@style@additionalstafflines %
+ \ifx\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat% OBSOLETE
+ \else % OBSOLETE
+ \gre@obsolete{\protect\greadditionalstafflinesformat}{\protect\grechangestyle{additionalstafflinesformat}}% OBSOLETE
+ \fi% OBSOLETE
\kern\gre@dimen@temp@three %
\gre@dimen@temp@five=\dimexpr(\wd\gre@box@temp@sign + \gre@space@dimen@additionalcustoslineswidth)\relax%
\kern-\gre@dimen@temp@five %
@@ -459,6 +440,10 @@
\raise\gre@dimen@temp@five %
\hbox to 0pt{%
\gre@style@additionalstafflines %
+ \ifx\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat% OBSOLETE
+ \else % OBSOLETE
+ \gre@obsolete{\protect\greadditionalstafflinesformat}{\protect\grechangestyle{additionalstafflinesformat}}% OBSOLETE
+ \fi% OBSOLETE
\kern\gre@dimen@temp@three %
\gre@dimen@temp@five=\dimexpr(\wd\gre@box@temp@sign+\gre@space@dimen@additionalcustoslineswidth)\relax%
\kern-\gre@dimen@temp@five %
@@ -481,6 +466,10 @@
\raise\gre@dimen@temp@five %
\hbox to 0pt{%
\gre@style@additionalstafflines %
+ \ifx\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat% OBSOLETE
+ \else % OBSOLETE
+ \gre@obsolete{\protect\greadditionalstafflinesformat}{\protect\grechangestyle{additionalstafflinesformat}}% OBSOLETE
+ \fi% OBSOLETE
\hss %
\kern\gre@dimen@temp@three %
\gre@dimen@temp@five=\dimexpr((\gre@space@dimen@additionalcustoslineswidth*2)+\wd\gre@box@temp@sign)\relax %
@@ -501,6 +490,10 @@
\raise\gre@dimen@temp@five %
\hbox to 0pt{%
\gre@style@additionalstafflines %
+ \ifx\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat% OBSOLETE
+ \else % OBSOLETE
+ \gre@obsolete{\protect\greadditionalstafflinesformat}{\protect\grechangestyle{additionalstafflinesformat}}% OBSOLETE
+ \fi% OBSOLETE
\hss %
\kern\gre@dimen@temp@three %
\gre@dimen@temp@five=\dimexpr((\gre@space@dimen@additionalcustoslineswidth*2)+\wd\gre@box@temp@sign)\relax %
@@ -511,34 +504,7 @@
\relax %
}%
-\newif\ifgre@usecustosalteration%
-\gre@usecustosalterationtrue%
-\def\gresetcustosalteration#1{%
- \IfStrEqCase{#1}{%
- {visible}{\gre@usecustosalterationtrue}%
- {invisible}{\gre@usecustosalterationfalse}%
- }[% all other cases
- \gre@error{Unrecognized option "#1" for \protect\gresetcustosalteration\MessageBreak Possible options are: 'visible' and 'invisible'}%
- ]%
-}%
-\def\gre@custosalteration#1#2{%
- \ifgre@usecustosalteration %
- \IfStrEq{#2}{}{}{\csname Gre#2\endcsname{#1}{0}{}{}{}}%
- \fi %
-}%
-
-% #2 is 0 for measurement only, 1 in the normal case, 2 for the right box
-\def\gre@pickcustos#1#2{%
- % set attributes to adjust the line height for the pitch of the custos
- \ifcase#2% 0
- \or % 1
- \global\advance\gre@attr@glyph@id by 1\relax %
- \GreGlyphHeights{#1}{#1}%
- \or % 2
- \ifgre@eolshiftsenabled %
- \GreGlyphHeights{#1}{#1}%
- \fi %
- \fi %
+\def\gre@pickcustos#1{%
\ifcase#1%
\or\or%
\or\gre@fontchar@custostopmiddle %
@@ -966,7 +932,7 @@
\gre@savepos %
\kern.5\wd\gre@box@temp@sign %
\fi %
- \directlua{gregoriotex.save_length(#1, #3)}%
+ \directlua{gregoriotex.var_brace_note_pos(#1, #3)}%
\fi %
\relax %
}%
@@ -1074,6 +1040,11 @@
\relax %
}%
+\gdef\grelowchoralsignstyle#1{\relax}% OBSOLETE
+\let\gre@empty@lowchoralsignstyle\grelowchoralsignstyle%
+\gdef\grehighchoralsignstyle#1{\relax}% OBSOLETE
+\let\gre@empty@highchoralsignstyle\grehighchoralsignstyle%
+
% quite simple function: #1 is the height, #2 is the string, #3 is #2 of punctum mora, #4 is #3 of punctum mora
% #3 is 1 if it must be a bit higher
\def\GreLowChoralSign#1#2#3{%
@@ -1087,12 +1058,20 @@
\gre@calculate@glyphraisevalue{#1}{10}{}%
\fi %
\raise\gre@dimen@glyphraisevalue\hbox{\gre@style@lowchoralsign#2\endgre@style@lowchoralsign}%
+ \ifx\gre@empty@lowchoralsignstyle\grelowchoralsignstyle% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grelowchoralsignstyle}{\protect\grechangestyle{lowchoralsign}}% OBSOLETE
+ \fi% OBSOLETE
\relax %
}%
\def\GreHighChoralSign#1#2#3{%
\GreNoBreak %
\gre@vepisemaorrare{#1}{#3}{}{3}{\gre@style@highchoralsign#2\endgre@style@highchoralsign}%
+ \ifx\gre@empty@highchoralsignstyle\grehighchoralsignstyle% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\grehighchoralsignstyle}{\protect\grechangestyle{highchoralsign}}% OBSOLETE
+ \fi% OBSOLETE
\relax %
}%
@@ -1342,6 +1321,10 @@
\ifgre@boxing\else %
\xdef\gre@dimen@savedglyphraise{\the\gre@dimen@glyphraisevalue}%
\gre@style@additionalstafflines %
+ \ifx\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat% OBSOLETE
+ \else % OBSOLETE
+ \gre@obsolete{\protect\greadditionalstafflinesformat}{\protect\grechangestyle{additionalstafflinesformat}}% OBSOLETE
+ \fi% OBSOLETE
\gre@hepisorline{\gre@pitch@dummy}{#1}{#2}{#3}{f}{}{}%
\endgre@style@additionalstafflines%
\gre@dimen@glyphraisevalue=\gre@dimen@savedglyphraise\relax%
@@ -1365,6 +1348,10 @@
\ifgre@showlines %
\xdef\gre@dimen@savedglyphraise{\the\gre@dimen@glyphraisevalue}%
\gre@style@additionalstafflines %
+ \ifx\gre@empty@additionalstafflinesformat\greadditionalstafflinesformat% OBSOLETE
+ \else % OBSOLETE
+ \gre@obsolete{\protect\greadditionalstafflinesformat}{\protect\grechangestyle{additionalstafflinesformat}}% OBSOLETE
+ \fi% OBSOLETE
\gre@drawadditionalline{#1}{#2}{#3}{#4}{#5}{#6}%
\endgre@style@additionalstafflines%
\gre@dimen@glyphraisevalue=\gre@dimen@savedglyphraise\relax%
@@ -1480,6 +1467,14 @@
\newif\ifgre@hepisemabridge
\gre@hepisemabridgetrue
+\def\AddHEpisemusBridges{%OBSOLETE
+ \gre@obsolete{\protect\AddHEpisemusBridges}{\protect\gresethepisema{bridge}}%
+}%
+
+\def\RemoveHEpisemusBridges{%OBSOLETE
+ \gre@obsolete{\protect\RemoveHEpisemusBridges}{\protect\gresethepisema{break}}%
+}%
+
\def\gresethepisema#1{%
\IfStrEqCase{#1}{%
{bridge}%
@@ -1989,7 +1984,6 @@
\gre@debugmsg{spacing}{Last bar space: \the\gre@skip@temp@four}%
\global\gre@dimen@lastglyphwidth=\wd\gre@box@temp@width %
\directlua{gregoriotex.adjust_line_height(\gre@insidediscretionary)}%
- \global\gre@firstglyphfalse %
\relax%
}%
@@ -2066,6 +2060,14 @@
]%
}%
+\def\GreHidePCLines{%OBSOLETE
+ \gre@obsolete{\protect\GreHidePCLines}{\protect\gresetlinesbehindpunctumcavum{invisible}}%
+}%
+
+\def\GreDontHidePCLines{%OBSOLETE
+ \gre@obsolete{\protect\GreDontHidePCLines}{\protect\gresetlinesbehindpunctumcavum{visible}}%
+}%
+
% flag to indicate that lines behind an alteration should be hidden
\newif\ifgre@hidealtlines
% default state is to not hide them
@@ -2083,6 +2085,14 @@
]%
}%
+\def\GreHideAltLines{%OBSOLETE
+ \gre@obsolete{\protect\GreHideAltLines}{\protect\gresetlinesbehindalteration{invisible}}%
+}%
+
+\def\GreDontHideAltLines{%OBSOLETE
+ \gre@obsolete{\protect\GreDontHideAltLines}{\protect\gresetlinesbehindalteration{visible}}%
+}%
+
% is last glyph a cavum?
\newcount\gre@count@lastglyphiscavum
% 0 if no
@@ -2213,6 +2223,14 @@
}%
+\def\UseAlternatePunctumCavum{%OBSOLETE
+ \gre@obsolete{\protect\UseAlternatePunctumCavum}{\protect\gresetpunctumcavum{alternate}}%
+}%
+
+\def\UseNormalPunctumCavum{%OBSOLETE
+ \gre@obsolete{\protect\UseNormalPunctumCavum}{\protect\gresetpunctumcavum{normal}}%
+}%
+
\def\gre@char@cavum#1#2#3#4#5#6#7#8{%
\setbox\gre@box@temp@width=\hbox{#7}%
\global\gre@dimen@lastglyphwidth=\wd\gre@box@temp@width %
@@ -2248,14 +2266,14 @@
{\gre@font@music\GreCPPunctumCavumInclinatumAuctus}{\gre@font@music\GreCPPunctumCavumInclinatumAuctusHole}%
}%
-\def\GreAscendensOriscusCavum#1#2#3#4#5#6{%
+\def\GreOriscusCavum#1#2#3#4#5#6{%
\gre@char@cavum{#1}{#2}{#3}{#4}{#5}{#6}%
- {\gre@font@music\GreCPAscendensOriscusCavum}{\gre@font@music\GreCPAscendensOriscusCavumHole}%
+ {\gre@font@music\GreCPOriscusCavum}{\gre@font@music\GreCPOriscusCavumHole}%
}%
-\def\GreDescendensOriscusCavum#1#2#3#4#5#6{%
+\def\GreOriscusCavumAuctus#1#2#3#4#5#6{%
\gre@char@cavum{#1}{#2}{#3}{#4}{#5}{#6}%
- {\gre@font@music\GreCPDescendensOriscusCavum}{\gre@font@music\GreCPDescendensOriscusCavumHole}%
+ {\gre@font@music\GreCPOriscusCavumReversus}{\gre@font@music\GreCPOriscusCavumReversusHole}%
}%
\def\GreOriscusCavumDeminutus#1#2#3#4#5#6{%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
index d46efe02a3a..675dcdf39d5 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
@@ -20,7 +20,7 @@
% this file contains definitions of spaces
\gre@debugmsg{general}{Loading gregoriotex-spaces.tex}%
-\gre@declarefileversion{gregoriotex-spaces.tex}{4.2.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.2}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
@@ -29,51 +29,38 @@
%% The following macros enable users to tune penalties used in Gregorio
% macro to force a break on a new line
-\def\GreForceBreak{\gre@penalty{\the\gre@space@count@newlinepenalty}}%
+\def\GreForceBreak{\gre@penalty{\grenewlinepenalty}}%
% macro to prevent a line break
-\def\GreNoBreak{\gre@penalty{\the\gre@space@count@nobreakpenalty}}%
+\def\GreNoBreak{\gre@penalty{\grenobreakpenalty}}%
-
-\newcount\gre@hyphenpenaltysave%
-\newcount\gre@exhyphenpenaltysave%
-\newcount\gre@doublehyphendemeritssave%
-\newcount\gre@finalhyphendemeritssave%
-\newcount\gre@brokenpenaltysave%
-\newcount\gre@loosenesssave%
-\newcount\gre@tolerancesave%
-\newcount\gre@pretolerancesave%
-\newskip\gre@emergencystretchsave%
-\newcount\gre@widowpenaltysave%
-\newcount\gre@clubpenaltysave%
%% The following macros cancel some useless penalties, and reinstates them
%% at the end of a score
\def\gre@cancelpenalties{%
- \global\gre@hyphenpenaltysave=\hyphenpenalty\relax %
- \global\gre@exhyphenpenaltysave=\exhyphenpenalty\relax %
- \global\gre@doublehyphendemeritssave=\doublehyphendemerits\relax %
- \global\gre@finalhyphendemeritssave=\finalhyphendemerits\relax %
- \global\gre@brokenpenaltysave=\brokenpenalty\relax %
- \global\gre@loosenesssave=\looseness\relax %
- \global\gre@tolerancesave=\tolerance\relax %
- \global\gre@pretolerancesave=\pretolerance\relax %
- \global\gre@emergencystretchsave=\emergencystretch\relax %
- \global\gre@widowpenaltysave=\widowpenalty\relax %
- \global\gre@clubpenaltysave=\clubpenalty\relax %
- %
- \hyphenpenalty=\gre@space@count@hyphenpenalty %
- \exhyphenpenalty=\gre@space@count@hyphenpenalty %
+ \xdef\gre@hyphenpenaltysave{\the\hyphenpenalty }%
+ \xdef\gre@exhyphenpenaltysave{\the\exhyphenpenalty }%
+ \xdef\gre@doublehyphendemeritssave{\the\doublehyphendemerits }%
+ \xdef\gre@finalhyphendemeritssave{\the\finalhyphendemerits }%
+ \xdef\gre@brokenpenaltysave{\the\brokenpenalty }%
+ \hyphenpenalty=\grehyphenpenalty\relax %
+ \exhyphenpenalty=\grehyphenpenalty\relax %
\doublehyphendemerits=0\relax %
\finalhyphendemerits=0\relax %
- \brokenpenalty=\gre@space@count@brokenpenalty %
- \looseness=\gre@space@count@looseness %
- \tolerance=\gre@space@count@tolerance %
- \pretolerance=\gre@space@count@pretolerance %
- \emergencystretch=\gre@space@skip@emergencystretch\relax %
- \widowpenalty=\gre@space@count@widowpenalty %
- \clubpenalty=\gre@space@count@clubpenalty %
+ \brokenpenalty=\grebrokenpenalty\relax %
+ \xdef\gre@loosenesssave{\the\looseness}%
+ \xdef\gre@tolerancesave{\the\tolerance}%
+ \xdef\gre@pretolerancesave{\the\pretolerance}%
+ \xdef\gre@emergencystretchsave{\the\emergencystretch}%
+ \xdef\gre@widowpenaltysave{\the\widowpenalty}%
+ \xdef\gre@clubpenaltysave{\the\clubpenalty}%
+ \looseness=\grelooseness %
+ \tolerance=\gretolerance %
+ \pretolerance=\grepretolerance %
+ \emergencystretch=\greemergencystretch %
+ \widowpenalty=\grewidowpenalty %
+ \clubpenalty=\greclubpenalty %
}%
\def\gre@restorepenalties{%
@@ -162,6 +149,9 @@
\relax %
}%
+\def\setstafflinethickness{%OBSOLETE
+ \gre@obsolete{\protect\setstafflinethickness}{\protect\grechangestafflinethickness}%
+}%
%constantglyphraise is the space between the 0 of the gregorian fonts and the effective 0 of the TeX score
\newdimen\gre@dimen@constantglyphraise\relax%
@@ -441,7 +431,7 @@
% The maximum value is wd(custos) + spacebeforeeolcustos
% Were the eolshift larger than this the lyrics would stick out
% into the margin
- \setbox\gre@box@temp@width=\hbox{\gre@pickcustos{\gre@pitch@g}{0}}%
+ \setbox\gre@box@temp@width=\hbox{\gre@pickcustos{\gre@pitch@g}}%
\gre@skip@temp@three = \glueexpr(\wd\gre@box@temp@width+\gre@space@skip@spacebeforeeolcustos)\relax%
\gre@debugmsg{eolshift}{custos + space before custos = \the\gre@skip@temp@three}%
% pick the smaller of the two values calculated above
@@ -455,10 +445,6 @@
\else%
\global\gre@dimen@eolshift=0pt\relax%
\fi %
- % if the notes are not visible, then there's no shifting allowed.
- \ifgre@shownotes\else%
- \global\gre@dimen@eolshift=0pt\relax%
- \fi%
\gre@debugmsg{eolshift}{eolshift: \the\gre@dimen@eolshift}%
\relax %
}
@@ -819,6 +805,10 @@
\gre@generatelines %
\gre@calculate@constantglyphraise %
\endgre@style@translation%
+ \ifx\gre@empty@translationformat\gretranslationformat% OBSOLETE
+ \else% OBSOLETE
+ \gre@obsolete{\protect\gretranslationformat}{\protect\grechangestyle{translation}}% OBSOLETE
+ \fi% OBSOLETE
\relax %
}%
@@ -1183,20 +1173,25 @@
%% Note: the distances created by this function are stored as strings, not skip or dimension registers. This allows the user to specify a distance in em or ex units even though the font parameters may not be the same at the time the distance is specified and the time the distance is used.
\newif\ifgre@checklength%
\def\grecreatedim#1#2#3{%
+ \gre@dimension{#1}{#2}%
\csname newif\expandafter\endcsname\csname ifgre@scale@#1\endcsname%
\IfStrEqCase{#3}{%
+ {1}%
+ {\gre@obsolete{A numerical (1) last argument for \protect\grecreatedim}{'scalable'}}%
+ {0}%
+ {\gre@obsolete{A numerical (0) last argument for \protect\grecreatedim}{'fixed'}}%
{scalable}%
{\grescaledim{#1}{true}}%
{fixed}%
{\grescaledim{#1}{false}}%
- {inherited}%
- {\grescaledim{#1}{false}}%
}[% all other cases
\gre@error{Unrecognized option "#3" for \protect\grecreatedim\MessageBreak Possible options are: 'scalable' and 'fixed'}%
]%
- \gre@dimension{#1}{#2}{#3}%
}%
+\def\gresetdim{%OBSOLETE
+ \gre@obsolete{\protect\gresetdim}{\protect\grecreatedim}%
+}%
% a macro for changing a dimension. Unlike \grecreatedim, this function won’t create a new distance, just change an existing one.
\def\grechangedim#1#2#3{%
@@ -1211,28 +1206,18 @@
\fi%
\ifcsname gre@space@\gre@prefix @#1\endcsname%
\gre@debugmsg{spacing}{It does exist.}%
+ \gre@dimension{#1}{#2}%
\IfStrEqCase{#3}{%
+ {1}%
+ {\gre@obsolete{A numerical (1) last argument for \protect\grechangedim}{'scalable'}}%
+ {0}%
+ {\gre@obsolete{A numerical (0) last argument for \protect\grechangedim}{'fixed'}}%
{scalable}%
{\grescaledim{#1}{true}}%
{fixed}%
{\grescaledim{#1}{false}}%
- {inherited}%
- {%
- \gre@rubberpermit{#2}%
- \ifgre@rubber%
- \def\gre@prefixII{skip}%
- \else%
- \def\gre@prefixII{dimen}%
- \fi%
- \ifcsname gre@space@\gre@prefixII @#2\endcsname%
- \grescaledim{#1}{false}%
- \else%
- \gre@error{'#1' cannot inherit from '#2'\MessageBreak Please make sure '#2' is a valid GregorioTeX distance}%
- \fi%
- }%
% all other cases
- }[\gre@error{Unrecognized option "#3" for \protect\grechangedim\MessageBreak Possible options are: 'scalable', 'fixed', and 'inherited'}]%
- \gre@dimension{#1}{#2}{#3}%
+ }[\gre@error{Unrecognized option "#3" for \protect\grechangedim\MessageBreak Possible options are: 'scalable' and 'fixed'}]%
\else%
\IfStrEqCase{#1}{% DEPRECATED
{spacearoundsmallbars}% DEPRECATED
@@ -1273,101 +1258,63 @@
}
% The common internals for \grecreatedim and \grechangedim.
-\def\gre@dimension#1#2#3{%
- \IfStrEq{#3}{inherited}{%
- \gre@debugmsg{spacing}{setting inherited distance}%
- \gre@rubberpermit{#1}%
- \ifgre@rubber%
- \def\gre@prefix{skip}%
+\def\gre@dimension#1#2{%
+ \gre@checklengthfalse%
+ %check if #2 is a rubber length (contains plus and/or minus)
+ \IfSubStr{#2}{plus}{\gre@checklengthtrue}{\relax}%
+ \IfSubStr{#2}{minus}{\gre@checklengthtrue}{\relax}%
+ %if #1 is one of the distances which cannot be rubber.
+ \gre@rubberpermit{#1}%
+ % do we try to assign a rubber to one where it's not permitted?
+ \ifgre@rubber%
+ \def\gre@prefix{skip}%
+ \else%
+ \ifgre@checklength%
+ \gre@error{#1 cannot be a rubber length.}%
\else%
\def\gre@prefix{dimen}%
\fi%
- \gre@rubberpermit{#2}%
- \ifgre@rubber%
- \def\gre@prefixII{skip}%
- \else%
- \def\gre@prefixII{dimen}%
- \fi%
- \expandafter\edef\csname gre@space@\gre@prefix @#1\endcsname{\expandafter\unexpanded{\csname gre@space@\gre@prefixII @#2\endcsname}}%
- }{%
- \gre@rubberpermit{#2}%
- \ifgre@rubber%
- \def\gre@prefixII{skip}%
- \else%
- \def\gre@prefixII{dimen}%
- \fi%
- \ifcsname gre@space@\gre@prefixII @#2\endcsname%
- \gre@error{'#1' cannot be '#3' and depend on '#2' at the same time\MessageBreak Either use 'inherited' in the third argument\MessageBreak or give an actual distance in the second}%
- \fi%
- \gre@checklengthfalse%
- %check if #2 is a rubber length (contains plus and/or minus)
- \IfSubStr{#2}{plus}{\gre@checklengthtrue}{\relax}%
- \IfSubStr{#2}{minus}{\gre@checklengthtrue}{\relax}%
- %if #1 is one of the distances which cannot be rubber.
- \gre@rubberpermit{#1}%
- % do we try to assign a rubber to one where it's not permitted?
- \ifgre@rubber%
- \def\gre@prefix{skip}%
- \else%
- \ifgre@checklength%
- \gre@error{#1 cannot be a rubber length.}%
- \else%
- \def\gre@prefix{dimen}%
+ \fi%
+ % special check for bar@rubber
+ \IfStrEq*{#1}{bar@rubber}%
+ {%
+ \gre@skip@temp@one = #2\relax%
+ \ifdim\gre@skip@temp@one=0pt\relax\else%
+ \gre@error{bar@rubber cannot have a non-zero base}%
\fi%
- \fi%
- % special check for bar@rubber
- \IfStrEq*{#1}{bar@rubber}%
- {%
- \gre@skip@temp@one = #2\relax%
- \ifdim\gre@skip@temp@one=0pt\relax\else%
- \gre@error{bar@rubber cannot have a non-zero base}%
- \fi%
- }{}%
- \expandafter\edef\csname gre@space@\gre@prefix @#1\endcsname{#2}%
- \relax %
- }%
+ }{}%
+ \expandafter\edef\csname gre@space@\gre@prefix @#1\endcsname{#2}%
+ \relax %
}
%a macro to use if all you want to do is turn on or off the scaling for a particular distance
\def\grescaledim#1#2{%
- \ifcsname ifgre@scale@#1\endcsname%
- \IfStrEqCase{#2}{%
- {true}%
- {\csname gre@scale@#1true\endcsname}%
- {yes}%
- {\grescaledim{true}}%
- {on}%
- {\grescaledim{true}}%
- {scalable}%
- {\grescaledim{true}}%
- }[% all other cases
- \csname gre@scale@#1false\endcsname%
- ]%
- \else%
- \gre@error{Unrecognized distance "#1" in \protect\grescaledim}%
- \fi%
+ \IfStrEqCase{#2}{%
+ {true}%
+ {\csname gre@scale@#1true\endcsname}%
+ {yes}%
+ {\grescaledim{true}}%
+ {on}%
+ {\grescaledim{true}}%
+ {scalable}%
+ {\grescaledim{true}}%
+ }[% all other cases
+ \csname gre@scale@#1false\endcsname%
+ ]%
}
-\newcount\gre@space@count@newlinepenalty%
-\newcount\gre@space@count@nobreakpenalty%
-\newcount\gre@space@count@endofwordpenalty%
-\newcount\gre@space@count@endofsyllablepenalty%
-\newcount\gre@space@count@endafterbarpenalty%
-\newcount\gre@space@count@endafterbaraltpenalty%
-\newcount\gre@space@count@finalpenalty%
-\newcount\gre@space@count@endofelementpenalty%
-\newcount\gre@space@count@hyphenpenalty%
-\newcount\gre@space@count@brokenpenalty%
-\newcount\gre@space@count@looseness%
-\newcount\gre@space@count@tolerance%
-\newcount\gre@space@count@pretolerance%
-\newcount\gre@space@count@widowpenalty%
-\newcount\gre@space@count@clubpenalty%
+\def\grenoscaledim#1{%OBSOLETE
+ \gre@obsolete{\protect\grenoscaledim}{\protect\grescaledim{...}{no}}%
+}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% space configuration loading
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\GreLoadSpaceConf#1{%OBSOLETE
+ \gre@obsolete{\protect\GreLoadSpaceConf}{\protect\greloadspaceconf}%
+}%
+
\newcount\greconffactor%
\def\greloadspaceconf#1{%
\input gsp-#1.tex\relax %
@@ -1842,3 +1789,36 @@
\fi%
\relax %
}%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Some Macros for changing the spacing around the initial
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%Seeing as these are the distances that people will want to change the most often,
+%we give them their own set of macros to make that easier.
+
+% To change the spacing between annotations.
+%First argument is distance, second is whether it should scale when \gre@factor changes.
+\def\setaboveinitialseparation#1#2{%OBSOLETE
+ \gre@obsolete{\protect\setaboveinitialseparation}{\protect\grechangedim\{annotationseparation\}}%
+}%
+
+
+%To change the space after the initial
+%First argument is distance, second is whether it should scale when \gre@factor changes.
+\def\setspaceafterinitial#1#2{%OBSOLETE
+ \gre@obsolete{\protect\setspaceafterinitial}{\protect\grechangedim{afterinitialshift}}%
+}
+
+%To change the space before the initial
+%First argument is distance, second is whether it should scale when \gre@factor changes.
+\def\setspacebeforeinitial#1#2{%OBSOLETE
+ \gre@obsolete{\protect\setspacebeforeinitial}{\protect\grechangedim{beforeinitialshift}}%
+}%
+
+
+%To change all the distances associated with the initial.
+%First three arguments are distances, last is whether they should scale when \gre@factor changes.
+\def\setinitialspacing#1#2#3#4{%OBSOLETE
+ \gre@obsolete{\protect\setinitialspacing}{\protect\grechangedim{beforeinitialshift}, \protect\grechangedim{manualinitialwidth}, and \protect\grechangedim{afterinitialshift}}%
+}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
index b8afe707735..e6f46024296 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
@@ -20,7 +20,7 @@
% this file contains definitions of the glyphs and the syllables
\gre@debugmsg{general}{Loading gregoriotex-syllable.tex}%
-\gre@declarefileversion{gregoriotex-syllable.tex}{4.2.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.2}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
@@ -103,7 +103,7 @@
\global\gre@lastendswithmorafalse %
\ifgre@boxing\else\ifgre@firstin@euouae %
\ifgre@raggedbreakbeforeeuouae %
- \directlua{gregoriotex.save_euouae(\the\gre@lasteuouaeindex,2)}%
+ \directlua{gregoriotex.save_pos(\the\gre@lasteuouaeindex,2)}%
\fi %
\gre@firstin@euouaefalse %
\fi\fi %
@@ -112,7 +112,7 @@
\def\gre@endofglyphcommon{%
\ifgre@endofscore %
- \gre@penalty{\the\gre@space@count@finalpenalty}%
+ \gre@penalty{\grefinalpenalty}%
\gre@localleftbox{}%
\gre@localrightbox{}%
\fi %
@@ -132,7 +132,7 @@
% macro to typeset the glyph. attributes are :
% #1: character : the character that it must call
% #2: height : the height it must be raised : can be negative (must be calculated by a preprocessor)
-% #3: typesets the next custos
+% #3: height of the next note : we define the custos with that
% #4: type : the type of glyph, to determine the aligncenter; can be :
%%%%%%%% 0 : one-note glyph or more than two notes glyph except porrectus : here we must put the aligncenter in the middle of the first note
%%%%%%%% 1 : two notes glyph (podatus is considered as a one-note glyph) : here we put the aligncenter in the middle of the glyph
@@ -160,7 +160,7 @@
\raise\gre@dimen@glyphraisevalue\relax%
\copy\gre@box@temp@width%
\ifgre@endofscore\else\ifgre@boxing\else %
- #3%
+ \GreNextCustos{#3}%
\fi\fi %
\ifgre@firstglyph% we check if it is the first glyph
\gre@calculate@notesaligncenter{#4}%
@@ -212,7 +212,7 @@
\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPQuilisma}%
\or %
%case of an oriscus
- \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPAscendensOriscus}%
+ \global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPOriscus}%
\or %
%case of a punctum inclinatum
\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPPunctumInclinatum}%
@@ -348,30 +348,6 @@
% box that we will use to determine the width of the notes, to determine wether we typeset a - or not after the letters
\newbox\gre@box@syllablenotes%
-\newif\ifgre@showlyrics%
-\gre@showlyricstrue%
-
-\def\gresetlyrics#1{%
- \IfStrEqCase{#1}{%
- {visible}{\gre@showlyricstrue}%
- {invisible}{\gre@showlyricsfalse}%
- }[% all other cases
- \gre@error{Unknown option, "#1" for \protect\gresetlyrics\MessageBreak Possible options are: 'visible' and 'invisible'}%
- ]%
-}%
-
-\newif\ifgre@shownotes%
-\gre@shownotestrue%
-
-\def\gresetnotes#1{%
- \IfStrEqCase{#1}{%
- {visible}{\gre@shownotestrue}%
- {invisible}{\gre@shownotesfalse}%
- }[% all other cases
- \gre@error{Unknown option, "#1" for \protect\gresetnotes\MessageBreak Possible options are: 'visible' and 'invisible'}%
- ]%
-}%
-
% Macro used to fill \gre@box@syllablenotes with everything contained in #1. This
% saves and restores a few values so that when really typesetting #1 in \GreSyllable,
% the result is identical.
@@ -383,11 +359,7 @@
\global\gre@boxingtrue%
\let\ifgre@lastendswithmorasave\ifgre@lastendswithmora%
\xdef\gre@savedlastoflinecount{\number\gre@lastoflinecount\relax }%
- \ifgre@shownotes%
- \setbox\gre@box@syllablenotes=\hbox{#1}%
- \else%
- \setbox\gre@box@syllablenotes=\box\voidb@x%
- \fi%
+ \setbox\gre@box@syllablenotes=\hbox{#1}%
\gre@debugmsg{spacing}{Width of notes: \the\wd\gre@box@syllablenotes}%
\global\gre@boxingfalse%
\global\gre@lastoflinecount=\gre@savedlastoflinecount\relax %
@@ -622,6 +594,13 @@
\xdef\gre@lyriccentering{1}%
+\def\englishcentering{%OBSOLETE
+ \gre@obsolete{\protect\englishcentering}{\protect\gresetlyriccentering{syllable}}%
+}%
+
+\def\defaultcentering{%OBSOLETE
+ \gre@obsolete{\protect\defaultcentering}{\protect\gresetlyriccentering{vowel} }%
+}%
%% options about clivis centering scheme. Clivis are usually aligned by their
%% center, which is different from most neumes. Gregorio has three modes:
@@ -648,6 +627,17 @@
]%
}%
+\def\clivisalignmentalways{%OBSOLETE
+ \gre@obsolete{\protect\clivisalignmentalways}{\protect\gresetclivisalignment{always}}%
+}%
+
+\def\clivisalignmentnever{%OBSOLETE
+ \gre@obsolete{\protect\clivisalignmentnever}{\protect\gresetclivisalignment{never}}%
+}%
+
+\def\clivisalignmentspecial{%OBSOLETE
+ \gre@obsolete{\protect\clivisalignmentspecial}{\protect\gresetclivisalignment{special}}%
+}%
\newif\ifgre@forceemptyfirstsyllablehyphen%
\gre@forceemptyfirstsyllablehyphentrue%
@@ -671,24 +661,6 @@
\newif\ifgre@possibleluahyphenafterthissyllable
\gre@possibleluahyphenafterthissyllablefalse
-\newcount\gre@count@unbreakabletotalnotes %
-\newcount\gre@count@unbreakableinitialnotes %
-\newcount\gre@count@unbreakablefinalnotes %
-% #1 : minimum notes in the syllable before the syllable may be split across lines
-% #2 : minimum notes to keep together at the start of a syllable
-% #3 : minimum notes to keep together at the end of a syllable
-\def\gresetunbreakablesyllablenotes#1#2#3{%
- \gre@count@unbreakabletotalnotes=\number#1\relax %
- \gre@count@unbreakableinitialnotes=\number#2\relax %
- \gre@count@unbreakablefinalnotes=\number#3\relax %
-}%
-\gresetunbreakablesyllablenotes{10}{4}{4}%
-
-\newcount\gre@count@syllablenotes %
-\def\GreSyllableNoteCount#1{%
- \gre@count@syllablenotes=\number#1\relax %
-}%
-
%% general macro : it will typeset the syllable : arguments are :
% #1 : macro setting the letters of this syllable
% #2 : reserved (unused)
@@ -767,11 +739,7 @@
#5%
\gre@calculate@nextbegindifference{\gre@nextfirstsyllablepart}{\gre@nextmiddlesyllablepart}{\gre@nextendsyllablepart}{#7}%
\gre@unsetfixednexttextformat %
- \ifgre@showlyrics%
- \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart}{#6}}}%
- \else%
- \setbox\gre@box@syllabletext=\box\voidb@x%
- \fi%
+ \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart}{#6}}}%
\gre@calculate@enddifference{\wd\gre@box@syllablenotes}{\wd\gre@box@syllabletext}{\gre@dimen@textaligncenter}{\gre@dimen@notesaligncenter}{1}%
% gre@count@temp@one holds 0 if next is a not bar, 1 if it is
\gre@count@temp@one=0%
@@ -807,17 +775,9 @@
\gre@debugmsg{hyphen}{Showing the hyphen}%
% if it's the last syllable of line, the hyphen will be \GreHyph
\ifnum\gre@lastoflinecount=1\relax %
- \ifgre@showlyrics%
- \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart#3{\GreHyph}\relax}{#6}}}%
- \else%
- \setbox\gre@box@syllabletext=\box\voidb@x%
- \fi%
+ \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart#3{\GreHyph}\relax}{#6}}}%
\else %
- \ifgre@showlyrics%
- \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart#3{-}}{#6}}}%
- \else%
- \setbox\gre@box@syllabletext=\box\voidb@x%
- \fi%
+ \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart#3{-}}{#6}}}%
\fi %
% recomputing end difference and final skip with the final hyphen
\gre@calculate@enddifference{\wd\gre@box@syllablenotes}{\wd\gre@box@syllabletext}{\gre@dimen@textaligncenter}{\gre@dimen@notesaligncenter}{0}%
@@ -827,11 +787,7 @@
\gre@debugmsg{hyphen}{No hyphen}%
\gre@attr@dash=1\relax % in this particular case where it is not the end of a word and we haven't put a dash, we set potentital dash to 1
% we rebuild this box, in order it to have the attribute
- \ifgre@showlyrics%
- \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart}{#6}}}%
- \else%
- \setbox\gre@box@syllabletext=\box\voidb@x%
- \fi%
+ \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart}{#6}}}%
\global\gre@possibleluahyphenafterthissyllabletrue %
\fi %
\fi%
@@ -856,9 +812,7 @@
% here we need to unset \gre@attr@dash for the typesetting of notes
\gre@attr@dash=0\relax %
\GreNoBreak % no line breaks between text and notes
- \ifgre@shownotes%
- #9% we do that instead of \unhbox\Syllablnotes, because it would not set the \localrightbox
- \fi%
+ #9% we do that instead of \unhbox\Syllablnotes, because it would not set the \localrightbox
\GreNoBreak % no line breaks between notes and end of syllable skips
\gre@debugmsg{ifdim}{ enddifference < 0pt}%
\ifdim\gre@dimen@enddifference <0pt\relax%
@@ -885,7 +839,7 @@
\gre@usemanualeolcustos %
\fi %
\ifgre@raggedbreakbeforeeuouae %
- \directlua{gregoriotex.save_euouae(#1,1)}%
+ \directlua{gregoriotex.save_pos(#1,1)}%
\ifcase#2\ifcase\directlua{gregoriotex.is_ypos_different(#1)}\relax%
\gre@newlinecommon{1}{1}%
\fi\fi %
@@ -954,14 +908,14 @@
\fi%
\ifnum#3=1\relax %
\GreNoBreak %
- \gre@debugmsg{syllablespacing}{ set penalty \the\gre@space@count@nobreakpenalty}%
+ \gre@debugmsg{syllablespacing}{ set penalty \grenobreakpenalty}%
\else %
\ifnum#2=1\relax %
- \gre@penalty{\the\gre@space@count@endofwordpenalty}%
- \gre@debugmsg{syllablespacing}{ set penalty \the\gre@space@count@endofwordpenalty}%
+ \gre@penalty{\greendofwordpenalty}%
+ \gre@debugmsg{syllablespacing}{ set penalty \greendofwordpenalty}%
\else %
- \gre@penalty{\the\gre@space@count@endofsyllablepenalty}%
- \gre@debugmsg{syllablespacing}{ set penalty \the\gre@space@count@endofsyllablepenalty}%
+ \gre@penalty{\greendofsyllablepenalty}%
+ \gre@debugmsg{syllablespacing}{ set penalty \greendofsyllablepenalty}%
\fi %
\fi %
\ifgre@eolshiftsenabled%
@@ -1024,11 +978,7 @@
% first of all we need to calculate previousenddifference, begindifference, enddifference and nextbegindifference.
#1%
\gre@calculate@textaligncenter{\gre@firstsyllablepart}{\gre@middlesyllablepart}{0}%
- \ifgre@showlyrics%
- \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart}{#6}}}%
- \else%
- \setbox\gre@box@syllabletext=\box\voidb@x%
- \fi%
+ \setbox\gre@box@syllabletext=\hbox{\gre@fixedtextformat{\gre@pointandclick{\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart}{#6}}}%
\gre@debugmsg{barspacing}{Width of bar text: \the\wd\gre@box@syllabletext}%
\global\let\gre@newlinecommonsaved\gre@newlinecommon %
\global\let\gre@newlinecommon\gre@newlinecommondelayed %
@@ -1079,9 +1029,7 @@
\kern\dimexpr(\gre@dimen@enddifference% move from end of text to end of bar line
-\wd\gre@box@syllablenotes)\relax % back up from end of bar line to beginning
\GreNoBreak%
- \ifgre@shownotes%
- #9%
- \fi%
+ #9%
\global\let\gre@newlinecommon\gre@newlinecommonsaved %
\GreNoBreak%
% get into position to place the penalty
@@ -1104,17 +1052,14 @@
\ifnum\gre@newlinearg=-1\else %
\gre@count@temp@one=1\relax %
\fi %
- \ifnum\gre@lastoflinecount=1\relax %
- \gre@count@temp@one=1\relax %
- \fi %
\ifgre@endofscore %
\gre@count@temp@one=1\relax %
- \fi %
+ \fi %
% if no end of line or end of score
\ifnum\gre@count@temp@one=0\relax %
% add the penalty
- \gre@debugmsg{barspacing}{after bar penalty: \the\gre@space@count@endafterbarpenalty}%
- \gre@penalty{\the\gre@space@count@endafterbarpenalty}%
+ \gre@debugmsg{barspacing}{after bar penalty: \greendafterbarpenalty}%
+ \gre@penalty{\greendafterbarpenalty}%
\ifgre@eolshiftsenabled%
%If the above penalties don't result in a line break, then we need to undo the eolshift to prevent the next syllable from overlapping with this one. If the line break did occur, then this shift will occur at the beginning of a line and thus will be ignored automatically by TeX.
\kern \dimexpr(\gre@dimen@eolshift)\relax%
@@ -1138,13 +1083,11 @@
\else %
\ifgre@endofscore %
\gre@localleftbox{}%
- \gre@debugmsg{barspacing}{after bar penalty: \gre@space@count@endafterbarpenalty}%
- \gre@penalty{\the\gre@space@count@finalpenalty}%
+ \gre@debugmsg{barspacing}{after bar penalty: \greendafterbarpenalty}%
+ \gre@penalty{\grefinalpenalty}%
\else %
- \ifnum\gre@newlinearg=-1\else %
- \gre@debugmsg{barspacing}{calling new line with argument: \gre@newlinearg}%
- \gre@newlinecommon{\gre@newlinearg}{1}%
- \fi %
+ \gre@debugmsg{barspacing}{calling new line with argument: \gre@newlinearg}%
+ \gre@newlinecommon{\gre@newlinearg}{1}%
\fi %
\fi%
\else%
@@ -1206,10 +1149,8 @@
\gre@dotranslationcenterend %
\gre@mustdotranslationcenterendfalse%
\fi %
- \ifgre@shownotes%
- #9\relax %
- \fi%
- \gre@penalty{\the\gre@space@count@endafterbaraltpenalty }% TODO: isn't it a bit buggy?
+ #9\relax %
+ \gre@penalty{\greendafterbaraltpenalty }% TODO: isn't it a bit buggy?
% end of same code as syllable
\ifnum\gre@lastoflinecount=1\relax %
\global\gre@lastoflinecount=2\relax %
@@ -1252,9 +1193,7 @@
\kern\gre@skip@temp@one %
\gre@skip@temp@one = -\gre@dimen@begindifference\relax%
\kern\gre@skip@temp@one %
- \ifgre@shownotes%
- #9%
- \fi%
+ #9%
\gre@debugmsg{ifdim}{ enddifference < 0pt}%
\ifdim\gre@dimen@enddifference <0pt\relax%
%% important, else we are not really at the end of the syllable
@@ -1318,10 +1257,10 @@
}%
\gresetinitiallines{1}% default to one-line initials
-\def\GreSetInitialStyle#1{%%% DEPRECATED for removal in 5.0
- \gre@deprecated{initial-style gabc header}{\protect\gresetinitiallines}%%% DEPRECATED for removal in 5.0
- \def\gre@opening@initialstyle{#1}%%% DEPRECATED for removal in 5.0
-}%%% DEPRECATED for removal in 5.0
+\def\GreSetInitialStyle#1{%%% DEPRECATED by 4.1
+ \gre@deprecated{initial-style gabc header}{\protect\gresetinitiallines}%%% DEPRECATED by 4.1
+ \def\gre@opening@initialstyle{#1}%%% DEPRECATED by 4.1
+}%%% DEPRECATED by 4.1
%% sets the first syllable text
%% #1 - Initial
@@ -1331,7 +1270,7 @@
%% #5 - Three syllable parts where there is no separated initial
%% #6 - Extra macros to run if there is an initial
\def\GreSetFirstSyllableText#1#2#3#4#5#6{%
- %%% DEPRECATED for removal in 5.0: When \gre@opening@initialstyle is removed, use \gre@initiallines directly in the following line
+ %%% DEPRECATED by 4.1: When \gre@opening@initialstyle is removed, use \gre@initiallines directly in the following line
\ifcase\gre@opening@initialstyle\relax % no initial
\gre@noinitial %
\gre@setfirstsyllabletext#5{#1}{#2#3}{}%
@@ -1354,7 +1293,7 @@
\gre@usemanualeolcustos %
\or % 1 - forced on
\gre@useautoeolcustos %
- \GreNextCustos{\gre@nextcustospitch}{\gre@nextcustosalteration}%
+ \GreNextCustos{\gre@nextcustos}%
\fi %
}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
index 633e1397f6e..1b8416053d7 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 4.2.0-beta1
+-- GREGORIO_VERSION 4.1.2
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
index 7b56622e351..f92e00b10b7 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
@@ -23,7 +23,7 @@
\def\gregoriotex@symbols@loaded{}%
\gre@debugmsg{general}{Loading gregoriotex-symbols.tex}%
-\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.2}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
@@ -193,6 +193,9 @@
\fi%
}%
+\def\gresep#1#2{%OBSOLETE
+ \gre@obsolete{\protect\gresep}{\protect\greseparator}%
+}
%%%%%%%%%%%
%% Ornamentation
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
index e00885a3ca5..72775a0a8c1 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
@@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after,
gregoriotex = gregoriotex or {}
local gregoriotex = gregoriotex
-local internalversion = '4.2.0-beta1' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '4.1.2' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '4.2.0-beta1', -- GREGORIO_VERSION
+ version = '4.1.2', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2016/04/27", -- GREGORIO_DATE_LTX
+ date = "2016/05/08", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2015 - The Gregorio Project",
@@ -68,14 +68,11 @@ local line_heights = nil
local new_line_heights = nil
local score_heights = nil
local new_score_heights = nil
-local saved_positions = nil
-local saved_lengths = nil
-local new_saved_lengths = nil
-local saved_newline_before_euouae = nil
-local new_saved_newline_before_euouae = nil
+local var_brace_positions = nil
+local new_var_brace_positions = nil
+local pos_saves = nil
+local new_pos_saves = nil
local auxname = nil
-local snippet_filename = nil
-local snippet_logname = nil
local space_below_staff = 5
local space_above_staff = 13
@@ -137,35 +134,7 @@ local function keys_changed(tab1, tab2)
return false
end
-local function saved_computations_changed(tab1, tab2)
- local score_ids = {}
- local id,_
- for id,_ in pairs(tab1) do
- score_ids[id] = true
- end
- for id,_ in pairs(tab2) do
- score_ids[id] = true
- end
- for id,_ in pairs(score_ids) do
- local inner1 = tab1[id]
- local inner2 = tab2[id]
- if inner1 == nil or inner2 == nil then return true end
- local keys = {}
- local index
- for index,_ in pairs(inner1) do
- keys[index] = true
- end
- for index,_ in pairs(inner2) do
- keys[index] = true
- end
- for index,_ in pairs(keys) do
- if inner1[index] ~= inner2[index] then return true end
- end
- end
- return false
-end
-
-local function is_greaux_write_needed()
+local function heights_changed()
local id, tab
for id, tab in pairs(new_line_heights) do
if keys_changed(tab, line_heights[id]) then return true end
@@ -173,24 +142,30 @@ local function is_greaux_write_needed()
for id, tab in pairs(line_heights) do
if keys_changed(tab, new_line_heights[id]) then return true end
end
- if saved_computations_changed(saved_lengths, new_saved_lengths) then
- return true
+ for id, tab in pairs(new_var_brace_positions) do
+ if keys_changed(tab, var_brace_positions[id]) then return true end
end
- if saved_computations_changed(saved_newline_before_euouae, new_saved_newline_before_euouae) then
- return true
+ for id, tab in pairs(var_brace_positions) do
+ if keys_changed(tab, new_var_brace_positions[id]) then return true end
+ end
+ for id, tab in pairs(new_pos_saves) do
+ if keys_changed(tab, pos_saves[id]) then return true end
+ end
+ for id, tab in pairs(pos_saves) do
+ if keys_changed(tab, new_pos_saves[id]) then return true end
end
return false
end
local function write_greaux()
- if is_greaux_write_needed() then
+ if heights_changed() then
-- only write this if heights change; since table ordering is not
-- predictable, this ensures a steady state if the heights are unchanged.
local aux = io.open(auxname, 'w')
if aux then
log("Writing %s", auxname)
aux:write('return {\n ["line_heights"]={\n')
- local id, tab, id2, line, value
+ local id, tab, id2, line
for id, tab in pairs(new_line_heights) do
aux:write(string.format(' ["%s"]={\n', id))
for id2, line in pairs(tab) do
@@ -199,26 +174,25 @@ local function write_greaux()
end
aux:write(' },\n')
end
- aux:write(' },\n ["saved_lengths"]={\n')
- for id, tab in pairs(new_saved_lengths) do
+ aux:write(' },\n ["var_brace_positions"]={\n')
+ for id, tab in pairs(new_var_brace_positions) do
aux:write(string.format(' ["%s"]={\n', id))
- for id2, value in pairs(tab) do
- if value ~= nil then
- aux:write(string.format(' [%d]=%d,\n', id2, value))
+ for id2, line in pairs(tab) do
+ if line[1] ~= nil and line[2] ~= nil then
+ aux:write(string.format(' [%d]={%d,%d},\n', id2, line[1],
+ line[2]))
end
end
aux:write(' },\n')
end
- aux:write(' },\n ["saved_newline_before_euouae"]={\n')
- for id, tab in pairs(new_saved_newline_before_euouae) do
+ aux:write(' },\n ["pos_saves"]={\n')
+ for id, tab in pairs(new_pos_saves) do
aux:write(string.format(' ["%s"]={\n', id))
- for id2, value in pairs(tab) do
- if value ~= nil then
- if value then
- aux:write(string.format(' [%d]=true,\n', id2))
- else
- aux:write(string.format(' [%d]=false,\n', id2))
- end
+ for id2, line in pairs(tab) do
+ if line[1] ~= nil and line[2] ~= nil and line[3] ~= nil and
+ line[4] ~= nil then
+ aux:write(string.format(' [%d]={%d,%d,%d,%d},\n', id2, line[1],
+ line[2], line[3], line[4]))
end
end
aux:write(' },\n')
@@ -247,12 +221,8 @@ local function init(arg, enable_height_computation)
end
if outputdir and lfs.isdir(outputdir) then
auxname = outputdir..'/'..tex.jobname..'.gaux'
- snippet_filename = outputdir..'/'..tex.jobname..'.gsnippet'
- snippet_logname = outputdir..'/'..tex.jobname..'.gsniplog'
else
auxname = tex.jobname..'.gaux'
- snippet_filename = tex.jobname..'.gsnippet'
- snippet_logname = tex.jobname..'.gsniplog'
end
-- to get latexmk to realize the aux file is a dependency
@@ -261,12 +231,12 @@ local function init(arg, enable_height_computation)
log("Reading %s", auxname)
local score_info = dofile(auxname)
line_heights = score_info.line_heights or {}
- saved_lengths = score_info.saved_lengths or {}
- saved_newline_before_euouae = score_info.saved_newline_before_euouae or {}
+ var_brace_positions = score_info.var_brace_positions or {}
+ pos_saves = score_info.pos_saves or {}
else
line_heights = {}
- saved_lengths = {}
- saved_newline_before_euouae = {}
+ var_brace_positions = {}
+ pos_saves = {}
end
if enable_height_computation then
@@ -292,9 +262,8 @@ local function init(arg, enable_height_computation)
'line heights. Remove or undefine \\greskipheightcomputation to '..
'resume height computation.')
end
- saved_positions = {}
- new_saved_lengths = {}
- new_saved_newline_before_euouae = {}
+ new_var_brace_positions = {}
+ new_pos_saves = {}
end
-- node factory
@@ -558,43 +527,19 @@ local function clean_old_gtex_files(file_withdir)
end
end
-local function compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
+local function compile_gabc(gabc_file, gtex_file)
info("compiling the score %s...", gabc_file)
local extra_args = ''
if tex.count['gre@generate@pointandclick'] == 1 then
- extra_args = extra_args..' -p'
- end
- if not allow_deprecated then
- extra_args = extra_args..' -D'
+ extra_args = ' -p'
end
- local cmd = string.format("gregorio %s -W -o %s -l %s %s",
- extra_args, gtex_file, glog_file, gabc_file)
- res = os.execute(cmd)
+ res = os.execute(string.format("gregorio %s -o %s %s", extra_args, gtex_file, gabc_file))
if res == nil then
- err("\nSomething went wrong when executing\n '%s'.\n"
- .."shell-escape mode may not be activated. Try\n\n"
- .."%s --shell-escape %s.tex\n\n"
- .."See the documentation of gregorio or your TeX\n"
- .."distribution to automatize it.",
- cmd, tex.formatname, tex.jobname)
+ err("\nSomething went wrong when executing\n 'gregorio -o %s %s'.\n"
+ .."shell-escape mode may not be activated. Try\n\n%s --shell-escape %s.tex\n\nSee the documentation of gregorio or your TeX\ndistribution to automatize it.", gtex_file, gabc_file, tex.formatname, tex.jobname)
elseif res ~= 0 then
- local glog = io.open(glog_file, 'a+')
- if glog == nil then
- err("\n Unable to open %s", glog_file)
- else
- local size = glog:seek('end')
- if size > 0 then
- glog:seek('set')
- local line
- for line in glog:lines() do
- warn(line)
- end
- end
- glog:close()
- end
- err("\nAn error occured when compiling the score file\n"
- .."'%s' with gregorio.\nPlease check your score file.", gabc_file)
+ err("\nAn error occured when compiling the score file\n'%s' with gregorio.\nPlease check your score file.", gabc_file)
else
-- open the gtex file for writing so that LuaTeX records output to it
-- when the -recorder option is used
@@ -604,25 +549,10 @@ local function compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
else
gtex:close()
end
- local glog = io.open(glog_file, 'a+')
- if glog == nil then
- err("\n Unable to open %s", glog_file)
- else
- local size = glog:seek('end')
- if size > 0 then
- glog:seek('set')
- local line
- for line in glog:lines() do
- warn(line)
- end
- warn("*** end of warnings for %s ***", gabc_file)
- end
- glog:close()
- end
end
end
-local function include_score(input_file, force_gabccompile, allow_deprecated)
+local function include_score(input_file, force_gabccompile)
local file_root
if string.match(input_file:sub(-5), '%.gtex') then
file_root = input_file:sub(1,-6)
@@ -634,7 +564,6 @@ local function include_score(input_file, force_gabccompile, allow_deprecated)
file_root = input_file
end
local gtex_file = file_root.."-"..internalversion:gsub("%.", "_")..".gtex"
- local glog_file = file_root.."-"..internalversion:gsub("%.", "_")..".glog"
local gabc_file = file_root..".gabc"
if not lfs.isfile(gtex_file) then
clean_old_gtex_files(file_root)
@@ -647,7 +576,7 @@ local function include_score(input_file, force_gabccompile, allow_deprecated)
else
gabc:close()
end
- compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
+ compile_gabc(gabc_file, gtex_file)
tex.print(string.format([[\input %s\relax]], gtex_file))
return
else
@@ -668,57 +597,29 @@ local function include_score(input_file, force_gabccompile, allow_deprecated)
end
if gtex_timestamp < gabc_timestamp then
log("%s has been modified and %s needs to be updated. Recompiling the gabc file.", gabc_file, gtex_file)
- compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
+ compile_gabc(gabc_file, gtex_file)
elseif force_gabccompile then
- compile_gabc(gabc_file, gtex_file, glog_file)
+ compile_gabc(gabc_file, gtex_file)
end
tex.print(string.format([[\input %s\relax]], gtex_file))
return
end
-local function direct_gabc(gabc, header, allow_deprecated)
- info('Processing gabc snippet...')
- local deprecated
- if allow_deprecated then
- deprecated = ''
- else
- deprecated = '-D '
- end
- local f = io.open(snippet_filename, 'w')
+local function direct_gabc(gabc, header)
+ tmpname = os.tmpname()
+ local f = io.open(tmpname, 'w')
-- trims spaces on both ends (trim6 from http://lua-users.org/wiki/StringTrim)
gabc = gabc:match('^()%s*$') and '' or gabc:match('^%s*(.*%S)')
f:write('name:direct-gabc;\n'..(header or '')..'\n%%\n'..gabc:gsub('\\par ', '\n'))
f:close()
- local cmd = string.format('gregorio -W %s-S -l %s %s', deprecated, snippet_logname,
- snippet_filename)
- local p = io.popen(cmd, 'r')
+ local p = io.popen('gregorio -S '..tmpname, 'r')
if p == nil then
- err("\nSomething went wrong when executing\n %s\n"
- .."shell-escape mode may not be activated. Try\n\n"
- .."%s --shell-escape %s.tex\n\n"
- .."See the documentation of gregorio or your TeX\n"
- .."distribution to automatize it.", cmd, tex.formatname, tex.jobname)
- else
- tex.print(p:read("*a"):explode('\n'))
- p:close()
+ err("\nSomething went wrong when executing\n gregorio -S "..tmpname..".\n"
+ .."shell-escape mode may not be activated. Try\n\n%s --shell-escape %s.tex\n\nSee the documentation of gregorio or your TeX\ndistribution to automatize it.", tex.formatname, tex.jobname)
end
- local glog = io.open(snippet_logname, 'a+')
- if glog == nil then
- err("\n Unable to open %s", snippet_logname)
- else
- local size = glog:seek('end')
- if size > 0 then
- glog:seek('set')
- local line
- for line in glog:lines() do
- warn(line)
- end
- warn("*** end of warnings/errors processing snippet ***")
- end
- glog:close()
- end
- os.remove(snippet_filename)
- os.remove(snippet_logname)
+ tex.print(p:read("*a"):explode('\n'))
+ p:close()
+ os.remove(tmpname)
end
local function get_gregorioversion()
@@ -978,97 +879,64 @@ local function adjust_line_height(inside_discretionary)
end
end
-local function prep_save_position(index, fn)
- if saved_positions[cur_score_id] == nil then
- saved_positions[cur_score_id] = {}
- end
- saved_positions[cur_score_id][index] = { fn = fn }
-end
-
-local function save_position(index, which)
- tex.print(catcode_at_letter, string.format([[\luatexlatelua{gregoriotex.late_save_position('%s', %d, %d, \number\gre@lastxpos, \number\gre@lastypos)}]], cur_score_id, index, which))
+local function var_brace_note_pos(brace, start_end)
+ tex.print(catcode_at_letter, string.format([[\luatexlatelua{gregoriotex.late_brace_note_pos('%s', %d, %d, \number\gre@lastxpos)}]], cur_score_id, brace, start_end))
end
-local function late_save_position(score_id, index, which, xpos, ypos)
- info('saving %s, %d [%d] (%d,%d)', score_id, index, which, xpos, ypos)
- local pos = saved_positions[score_id][index]
- if pos == nil then
- err('Attempting to use unprepared position save slot %d', index)
- return
- end
- --[[
- if pos.fn == nil then
- err('Attempting to reuse position save slot %d', index)
- return
+local function late_brace_note_pos(score_id, brace, start_end, pos)
+ if new_var_brace_positions[score_id] == nil then
+ new_var_brace_positions[score_id] = {}
end
- --]]
- pos['x'..which] = xpos
- pos['y'..which] = ypos
- if pos.x1 ~= nil and pos.y1 ~= nil and pos.x2 ~= nil and pos.y2 ~= nil then
- pos.fn(score_id, index, pos)
- --pos.fn = nil
+ if new_var_brace_positions[score_id][brace] == nil then
+ new_var_brace_positions[score_id][brace] = {}
end
+ new_var_brace_positions[score_id][brace][start_end] = pos
end
-local function compute_saved_length(score_id, index, pos)
- if new_saved_lengths[score_id] == nil then
- new_saved_lengths[score_id] = {}
- end
- new_saved_lengths[score_id][index] = pos.x2 - pos.x1
- info('computed length for %s, %d: %d', score_id, index,
- new_saved_lengths[score_id][index])
-end
-
-local function save_length(index, which)
- if which == 1 then
- prep_save_position(index, compute_saved_length)
+local function var_brace_len(brace)
+ if var_brace_positions[cur_score_id] ~= nil then
+ if var_brace_positions[cur_score_id][brace] ~= nil then
+ local posend = var_brace_positions[cur_score_id][brace][2]
+ local posstart = var_brace_positions[cur_score_id][brace][1]
+ if posend > posstart then
+ tex.print(string.format('%dsp', posend - posstart))
+ else
+ warn('Dynamically sized braces spanning multiple lines unsupported, using length 2mm.')
+ tex.print('2mm')
+ end
+ return
+ end
end
- save_position(index, which)
+ tex.print('2mm')
end
-local function compute_saved_newline_before_euouae(score_id, index, pos)
- if new_saved_newline_before_euouae[score_id] == nil then
- new_saved_newline_before_euouae[score_id] = {}
- end
- new_saved_newline_before_euouae[score_id][index] = pos.y2 ~= pos.y1
- info('computed euouae for %s, %d: %s', score_id, index,
- new_saved_newline_before_euouae[score_id][index])
+local function save_pos(index, which)
+ tex.print(catcode_at_letter, string.format([[\gre@savepos\luatexlatelua{gregoriotex.late_save_pos('%s', %d, %d, \number\gre@lastxpos, \number\gre@lastypos)}]], cur_score_id, index, which))
end
-local function save_euouae(index, which)
- if which == 1 then
- prep_save_position(index, compute_saved_newline_before_euouae)
+local function late_save_pos(score_id, index, which, xpos, ypos)
+ if new_pos_saves[score_id] == nil then
+ new_pos_saves[score_id] = {}
end
- tex.sprint(catcode_at_letter, [[\gre@savepos]])
- save_position(index, which)
-end
-
-local function var_brace_len(brace)
- if saved_lengths[cur_score_id] ~= nil then
- local length = saved_lengths[cur_score_id][brace]
- if saved_lengths[cur_score_id][brace] ~= nil then
- if length > 0 then
- tex.print(string.format('%dsp', length))
- return
- else
- warn('Dynamically sized signs spanning multiple lines unsupported, using length 2mm.')
- end
- end
+ if new_pos_saves[score_id][index] == nil then
+ new_pos_saves[score_id][index] = {}
end
- tex.print('2mm')
+ new_pos_saves[score_id][index][(2 * which) - 1] = xpos
+ new_pos_saves[score_id][index][2 * which] = ypos
end
-- this function is meant to be used from \ifcase; prints 0 for true and 1 for false
local function is_ypos_different(index)
- if saved_newline_before_euouae[cur_score_id] ~= nil then
- local newline_before_euouae =
- saved_newline_before_euouae[cur_score_id][index]
- if newline_before_euouae then
+ if pos_saves[cur_score_id] ~= nil then
+ local saved_pos = pos_saves[cur_score_id][index]
+ if saved_pos == nil or saved_pos[2] == saved_pos[4] then
+ tex.sprint([[\number1\relax ]])
+ else
tex.sprint([[\number0\relax ]])
- return
end
+ else
+ tex.sprint([[\number1\relax ]])
end
- tex.sprint([[\number1\relax ]])
end
local function width_to_bp(width, value_if_star)
@@ -1162,7 +1030,8 @@ gregoriotex.font_size = font_size
gregoriotex.direct_gabc = direct_gabc
gregoriotex.adjust_line_height = adjust_line_height
gregoriotex.var_brace_len = var_brace_len
-gregoriotex.save_length = save_length
+gregoriotex.var_brace_note_pos = var_brace_note_pos
+gregoriotex.late_brace_note_pos = late_brace_note_pos
gregoriotex.mark_translation = mark_translation
gregoriotex.mark_abovelinestext = mark_abovelinestext
gregoriotex.width_to_bp = width_to_bp
@@ -1171,11 +1040,11 @@ gregoriotex.rotation = rotation
gregoriotex.scale_space = scale_space
gregoriotex.set_header_capture = set_header_capture
gregoriotex.capture_header = capture_header
+gregoriotex.save_pos = save_pos
+gregoriotex.late_save_pos = late_save_pos
gregoriotex.is_ypos_different = is_ypos_different
-gregoriotex.save_euouae = save_euouae
gregoriotex.mode_part = mode_part
gregoriotex.set_debug_string = set_debug_string
-gregoriotex.late_save_position = late_save_position
dofile(kpse.find_file('gregoriotex-nabc.lua', 'lua'))
dofile(kpse.find_file('gregoriotex-signs.lua', 'lua'))
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
index 73bb165e3ec..666b5b667bb 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
@@ -21,7 +21,7 @@
% This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does.
-% [2016/04/27 v4.2.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2016/05/08 v4.1.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\edef\greoldcatcode{\the\catcode`@}
@@ -33,7 +33,6 @@
\input luaotfload.sty%
\input graphicx.tex % for \resizebox
\input xstring.sty%
-\input color.sty%
\def\gre@error#1{\begingroup%
\def\MessageBreak{^^J}%
@@ -92,14 +91,6 @@
\long\def\gre@iflatex#1{}%
\input gregoriotex-main.tex
-
-%%%%%%%%%
-%% Color definitions
-%%%%%%%%%
-
-\definecolor{grebackgroundcolor}{RGB}{255,255,255}%
-\definecolor{gregoriocolor}{RGB}{229,53,44}%
-
%%%%%%%%%
%% PlainTeX specific definitions for fonts
%%%%%%%%%
@@ -124,19 +115,19 @@
\relax %
}%
-\def\GreColored#1{%
- {%
- \color{gregoriocolor}#1%
- }%
-}%
-
-% Note since underlining don’t exist in PlainTeX, we need the following command to maintain compatibility with LaTeX, but all it does is raise a warning.
+% Note since underlining and coloring don’t exist in PlainTeX, but we need the following commands to maintain compatibility with LaTeX.
\def\GreUnderline#1{%
\gre@warning{Underlining cannot be done in PlainTeX}%
{#1}%
\relax %
}%
+\def\GreColored#1{%
+ \gre@warning{Text color cannot be changed in PlainTeX}%
+ {#1}%
+ \relax %
+}%
+
%%%%%%%%%%%%%%%
%% Line color
%%%%%%%%%%%%%%%
@@ -144,9 +135,26 @@
% Colors don't work in PlainTeX, but we need these functions for interoperability with LaTeX.
\def\gresetlinecolor#1{%
- \gre@changestyle{normalstafflines}{\color{#1}}[\relax]%
+ \gre@warning{Line color cannot be changed in PlainTeX}%
+ \relax%
+}
+
+
+\def\grecoloredlines#1#2#3{%OBSOLETE
+ \gre@obsolete{\protect\grecoloredlines}{\protect\gresetlinecolor}%
+}
+
+\def\greredlines{%OBSOLETE
+ \gre@obsolete{\protect\greredlines}{\protect\gresetlinecolor{gregoriocolor}}%
+}
+
+\let\redlines\greredlines%OBSOLETE
+
+\def\grenormallines{%OBSOLETE
+ \gre@obsolete{\protect\grenormallines}{\protect\gresetlinecolor{black}}%
}
+\let\normallines\grenormallines%OBSOLETE
%%%%%%%%%%%%%%%%%%%%
%% Formatting environments
@@ -273,13 +281,13 @@
\def\gre@style@nabc{%
\begingroup%
- \color{gregoriocolor}%
+ \relax% we do nothing since colors are not implemented in PlainTeX
}
\def\endgre@style@nabc{\endgroup}%
\def\gre@changestyle#1#2[#3]{%
- \expandafter\gdef\csname gre@style@#1\endcsname{\begingroup#2}%
- \expandafter\gdef\csname endgre@style@#1\endcsname{#3\endgroup}%
+ \gdef\csname gre@style@#1\endcsname{\begingroup#2}%
+ \gdef\csname endgre@style@#1\endcsname{#3\endgroup}%
}%
\catcode`\@=\greoldcatcode
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
index 0426e613ced..b29e1cb6258 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
@@ -22,50 +22,51 @@
%% First, the penalties
% penalty to force a break on a new line
-\grechangecount{newlinepenalty}{-10001}%
+\xdef\grenewlinepenalty{-10001}%
% penalty to prevent a line break
-\grechangecount{nobreakpenalty}{10001}%
+\xdef\grenobreakpenalty{10001}%
% penalty at the end of a syllable which is the end of a word
-\grechangecount{endofwordpenalty}{-100}%
+\xdef\greendofwordpenalty{-100}%
% penalty at the end of a syllable which is not the end of a word
-\grechangecount{endofsyllablepenalty}{-50}%
+\xdef\greendofsyllablepenalty{-50}%
% penalty at the end of a syllable which is just a bar, with something printed
% under it
-\grechangecount{endafterbarpenalty}{-200}%
+\xdef\greendafterbarpenalty{-200}%
% penalty right after a bar with nothing printed
-\grechangecount{endafterbaraltpenalty}{-200}%
+\xdef\greendafterbaraltpenalty{-200}%
% penalty at the end of the score
-\grechangecount{finalpenalty}{0}%
+\xdef\grefinalpenalty{0}%
% penalty at the end of a breakable neumatic element (typically at a space
% between elements)
-\grechangecount{endofelementpenalty}{-50}%
+\xdef\greendofelementpenalty{-50}%
% hyphenpenalty will be used in discretionaries, in Gregorio this is used for
% a bar with clef change for example. It also set \exhyphenpenalty. It should
-% be close to endafterbarpenalty
-\grechangecount{hyphenpenalty}{-200}%
+% be close to \greendafterbarpenalty
+\xdef\grehyphenpenalty{-200}%
% broken penalty is the vertical penalty inserted after a break on a clef change
% I'm not sure it should be set, but it might be useful...
-\grechangecount{brokenpenalty}{0}%
+\xdef\grebrokenpenalty{0}%
%% These macro enable the tuning of linepenalty, tolerance, pretolerance
%% and emergencystretch
-\grechangecount{looseness}{-1}%
-\grechangecount{tolerance}{9000}%
+\def\grelooseness{-1}%
+\def\gretolerance{9000}%
% Workaround for bug 842 (http://tracker.luatex.org/view.php?id=842)
% see http://tug.org/pipermail/luatex/2013-July/004516.html
% The idea is that we use discretionaries (explicit hyphens, though more than hyphens in our case) for clef changes, and we need to give them a special penalty, which is not taken into account if pretolerance is > -1 on LuaTeX < 0.80. For a more detailed explanation see http://tug.org/pipermail/luatex/2013-July/004516.html.
\ifnum\the\luatexversion < 78\relax %
- \grechangecount{pretolerance}{-1}%
+ \global\def\grepretolerance{-1}%
\else %
- \grechangecount{pretolerance}{\the\pretolerance}%
+ \global\def\grepretolerance{\pretolerance}%
\fi %
-\grecreatedim{emergencystretch}{\the\emergencystretch}{scalable}%
+\def\greemergencystretch{\emergencystretch}%
% By default, we don't care if a line of score is alone on the page,
% if you think it is bad, you can modify the two following values. Assigning
% 10000 to them will prevent all orphaned lines (this will certainly improve
% some spacings a lot).
-\grechangecount{widowpenalty}{0}%
-\grechangecount{clubpenalty}{0}%
+\def\grewidowpenalty{0}%
+\def\greclubpenalty{0}%
+
%%%%%%%%%%%%%%%%%%%
@@ -108,7 +109,7 @@
% space between elements which has the size of a note
\grecreatedim{glyphspace}{0.21877 cm plus 0.01822 cm minus 0.01822 cm}{scalable}%
% space before in-line custos
-\grecreatedim{spacebeforeinlinecustos}{0.10938 cm plus 0.01822 cm minus 0.00911 cm}{scalable}%
+\grecreatedim{spacebeforeinlinecustos}{0 cm plus 0 cm minus 0 cm}{scalable}%
% space before end-of-line custos
\grecreatedim{spacebeforeeolcustos}{0.3 cm plus 0 cm minus 0 cm}{scalable}%
% space before punctum mora and augmentum duplex
@@ -130,11 +131,12 @@
% stretching added in the case where the text of two syllables of the same word are
% separated with an automatic hyphen
\grecreatedim{intersyllablespacestretchhyphen}{0cm plus 0.05cm}{scalable}%
-% minimal space between letters of different words.
-\grecreatedim{interwordspacetext}{1ex plus 0.15cm minus 0.05cm}{fixed}%
+% minimal space between letters of different words. Makes sense to have
+% the same plus and minus as interwordspacenotes.
+\grecreatedim{interwordspacetext}{0.38 cm plus 0.15 cm minus 0.05 cm}{scalable}%
% Versions of interword spaces for euouae blocks
\grecreatedim{interwordspacenotes@euouae}{0.19 cm plus 0.1 cm minus 0.05 cm}{scalable}%
-\grecreatedim{interwordspacetext@euouae}{0.8ex plus 01.cm minus 0.05cm}{fixed}%
+\grecreatedim{interwordspacetext@euouae}{0.27 cm plus 0.1 cm minus 0.05 cm}{scalable}%
% versions of note spaces when the first note of the second syllable is an alteration
% those are used in euouae blocks
\grecreatedim{interwordspacenotes@alteration}{0.1 cm plus 0.07 cm minus 0.01 cm}{scalable}%
@@ -150,8 +152,6 @@
%
% space between two punctum inclinatum
\grecreatedim{punctuminclinatumshift}{-0.03918 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
-% space between two unison punctum inclinatum
-\grecreatedim{punctuminclinatumunisonshift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}%
% space before puncta inclinata
\grecreatedim{beforepunctainclinatashift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}%
% space between a punctum inclinatum and a punctum inclinatum deminutus
@@ -223,14 +223,14 @@
%
% minimal space between letters of different syllable texts for text around bars
% (new bar spacing algorithm only)
-\grecreatedim{interwordspacetext@bars}{0.7ex}{fixed}%
+\grecreatedim{interwordspacetext@bars}{0.15 cm}{scalable}%
% minimal space between letters of different syllable texts for text around bars,
% euouae context
-\grecreatedim{interwordspacetext@bars@euouae}{0.7ex}{fixed}%
-\grecreatedim{interwordspacetext@bars@notext}{1ex}{fixed}%
+\grecreatedim{interwordspacetext@bars@euouae}{0.15 cm}{scalable}%
+\grecreatedim{interwordspacetext@bars@notext}{0.4 cm}{scalable}%
% minimal space between letters of different syllable texts for text around bars,
% euouae context
-\grecreatedim{interwordspacetext@bars@notext@euouae}{0.7ex}{fixed}%
+\grecreatedim{interwordspacetext@bars@notext@euouae}{0.3 cm}{scalable}%
% rubber length that will be added around bars in new bar spacing algorithm
\grecreatedim{bar@rubber}{0 cm plus 0.22787 cm minus 0.02 cm}{scalable}%
% additional space that will appear around bars that are preceded by a custos and followed by a key.
@@ -280,7 +280,7 @@
% space at the beginning of the lines if there is no clef
\grecreatedim{noclefspace}{0.1 cm}{scalable}%
% space around a clef change
-\grecreatedim{clefchangespace}{0.27345 cm plus 0.14584 cm minus 0.01367 cm}{scalable}%
+\grecreatedim{clefchangespace}{0.01768 cm plus 0.00175 cm minus 0.01768 cm}{scalable}%
% When \gre@clivisalignment is 2, this distance is the maximum length of the consonants after vowels for which the clivis will be aligned on its center.
\grecreatedim{clivisalignmentmin}{0.3 cm}{scalable}%