texlive[58132] branches/branch2020.0/Master/texmf-dist: revert
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 4 23:26:51 CET 2021
Revision: 58132
http://tug.org/svn/texlive?view=revision&revision=58132
Author: karl
Date: 2021-03-04 23:26:49 +0100 (Thu, 04 Mar 2021)
Log Message:
-----------
revert gregoriotex in branch to previous version, 5.2.1
Modified Paths:
--------------
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/examples/main-lualatex.tex
branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/convertsfdtottf.py
branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gregall.sfd
branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gresgmodern.sfd
branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf
branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
branches/branch2020.0/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh
branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,7 +1,7 @@
% !TEX root = GregorioRef.tex
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,7 +1,7 @@
% !TEX root = GregorioRef.tex
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -94,7 +94,7 @@
\subsubsection{Including scores}
\macroname{\textbackslash gregorioscore}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Macro for including scores. Works on both gabc and gtex files.
+Macro for including scores. Works on both gabc and tex files.
\begin{argtable}
\#1 & \texttt{n} & Optional. \#2 will be included as is. \\
@@ -150,16 +150,6 @@
compile the gabc file into a gtex file. This is similar to
\texttt{[a]} except the gabc is compiled every time.
-\macroname{\textbackslash gresetgregpath}{\{\#1\}}{gregoriotex-main.tex}
-Set a list of additional directories which should be searched for scores. Directories may be absolute or relative, but must end with a slash (\verb=/=) and enclosed in braces (\verb={}=), even if there is only one additional directory. For example, to look in a directory called “Scores” which is alongside the main project directory, one could use the following:
-
-\begin{latexcode}
- \gresetgregpath{{../Scores/}}
-\end{latexcode}
-
-Note that these directories are not searched recursively. If you want to include subdirectories, then each subdirectory must be included individually.
-
-
\macroname{\textbackslash gresetcompilegabc}{\{\#1\}}{gregoriotex-main.tex}
A macro to change the behavior of the way Gregorio\TeX\ includes scores. This is similar to using the package options \verb=[forcecompile]=, \verb=[autocompile]=, and \verb=[nevercompile]=, but does not necessarly apply to the entire document.
@@ -176,17 +166,17 @@
\medskip This macro can be combined in the same document with different arguments to
switch between different behaviors: \par\medskip
\begin{latexcode}
- \usepackage{gregoriotex} % [autocompile] is the default.
+ \usepackage{gregoriotex} % [nevercompile] is the default.
----
+ \gregorioscore{TecumPrincipium} % gabc never compiled.
+ \gregorioscore[f]{TecumPrincipium} % gabc always compiled.
+ \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
+
+ \gresetcompilegabc{auto}
\gregorioscore{TecumPrincipium} % gabc auto compiled.
\gregorioscore[n]{TecumPrincipium} % gabc never compiled.
\gregorioscore[f]{TecumPrincipium} % gabc always compiled.
- \gresetcompilegabc{never}
- \gregorioscore{TecumPrincipium} % gabc never compiled.
- \gregorioscore[f]{TecumPrincipium} % gabc always compiled.
- \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
-
\gresetcompilegabc{force}
\gregorioscore{TecumPrincipium} % gabc always compiled.
\gregorioscore[n]{TecumPrincipium} % gabc never compiled.
@@ -261,6 +251,17 @@
\subsubsection{Fine Tuning Dimensions}
In addition to providing control over the overall size of your scores, Gregorio\TeX\ allows you to fine tune the spacings around and between the various elements using the following functions.
+\macroname{\textbackslash grecreatedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
+Macro to create one of Gregorio\TeX’s distances. Used to initialize distances in a space configuration file. For an example of such a file, please see \textit{gsp-default.tex}, which contains the default spacing configuration for Gregorio\TeX.
+
+\begin{argtable}
+ \#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.
+\end{argtable}
+
\macroname{\textbackslash grechangedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
Macro to change one of Gregorio\TeX’s distances. This function will check to make sure the distance you are trying to change exists first.
@@ -321,7 +322,7 @@
\end{argtable}
\macroname{\textbackslash greloadspaceconf}{\{\#1\}}{gregoriotex-spaces.tex}
-Macro to load a space configuration file. Space configuration file names have the format \verb=gsp-identifier.tex= and must be in the same directory as your project or in your texmf directory. See \verb=gsp-sample.tex= for an example file.
+Macro to load a space configuration file. Space configuration file names have the format \verb=gsp-identifier.tex= and must be in the same directory as your project or in your texmf directory.
\begin{argtable}
\#1 & string & The identifier of the space configuration file.
@@ -329,13 +330,13 @@
Example:\par\medskip
\begin{latexcode}
- % loads gregoriotex-gsp-default.tex, the default configuration file
+ % loads gsp-default.tex, the default configuration file
\greloadspaceconf{default}
% loads a custom configuration called gsp-myspaces.tex
\greloadspaceconf{myspaces}
\end{latexcode}
-\macroname{\textbackslash greconffactor}{}{gregoriotex-gsp-default.tex}
+\macroname{\textbackslash greconffactor}{}{gsp-default.tex}
A count which indicates the staff size that a space configuration file is designed for. Each space configuration file must have this value set as Gregorio\TeX\ will compare it to the current staff size to determine if the configuration file being loaded needs to be rescaled.
\macroname{\textbackslash gresetlineheightexpansion}{\{\#1\}}{gregoriotex-main.tex}
@@ -399,14 +400,7 @@
system should act as if the ledger line exists (\texttt{1}) or not
(\texttt{0}).
-\macroname{\textbackslash gresetnoteadditionalspacelinestext}{\{\#1\}}{gregoriotex-main.tex}
-Macro which determines how much additional space between the notes and the lyrics for really low notes.
-\begin{argtable}
- \#1 & \texttt{automatic} & additional space between the notes and the lyrics is computed automatically (default)\\
- & \texttt{manual} & additional space between the notes and the lyrics is based on the user setting of \texttt{noteadditionalspacelinestext} (a spacing adjustable using \verb=\grechangedim=)
-\end{argtable}
-
\subsubsection{Staff Lines}
\macroname{\textbackslash gresetlinecolor}{\{\#1\}}{gregoriotex.sty \textup{and} gregoriotex.tex}
@@ -467,8 +461,6 @@
& \texttt{granapadano} & Use the Grana Padano font.\\
\end{argtable}
-\textbf{Nota Bene:} The Gregorio and Grana Padano fonts are not included by default in a basic installation. To get them you need to download and install them from the \verb=supp-fonts-##.zip= file (where \#\# is the version number of your release). See \url{https://github.com/gregorio-project/gregorio/releases} for the list of releases.
-
\macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex}
This function is the same as above, with a third argument to scale the font. The fonts shipped with Gregorio do not need to use this function, but some custom fonts do. Note that you cannot use this to scale glyphs up or down, as they would not be placed correctly on the staff.
@@ -927,23 +919,7 @@
& \texttt{invisible} & Lyrics are not visible.\\
\end{argtable}
-\macroname{\textbackslash gresettranslation}{\{\#1\}}{gregoriotex-main.tex}
-Sets the visibility of the translations.
-\begin{argtable}
- \#1 & \texttt{visible} & Translations are visible (default).\\
- & \texttt{invisible} & Translations are not visible.\\
-\end{argtable}
-
-\macroname{\textbackslash gresetabovelinestext}{\{\#1\}}{gregoriotex-main.tex}
-Sets the visibility of the above lines text.
-
-\begin{argtable}
- \#1 & \texttt{visible} & Above lines text are visible (default).\\
- & \texttt{invisible} & Above lines text 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.
@@ -988,8 +964,8 @@
Macro to specify which line of the annotation should be used to determine its starting placement (i.e. before \texttt{annotationraise} is applied).
\begin{argtable}
- \#1 & \texttt{topline} & Annotation placement is determined by the first line (default)\\
- & \texttt{bottomline} & annotation placement is determined by the last line\\
+ \#1 & \texttt{firstline} & Annotation placement is determined by the first line (default)\\
+ & \texttt{lastline} & annotation placement is determined by the last line\\
\end{argtable}
\macroname{\textbackslash gresetannotationvalign}{\{\#1\}}{gregoriotex-main.tex}
@@ -1024,7 +1000,7 @@
\verb=<pr>= tags with no specified protrusion factor. A protrusion factor of 0
means no protrusion and 1 means full protrusion. Any floating-point value from
0 to 1 is allowed. All of these global protrusion factors may be set in
-a spacing configuration file (gsp-*.tex) or in the project \TeX\ file.
+gsp-default.tex or in your own \TeX\ files.
\begin{argtable}
\#1 & \texttt{,} & Sets the automatic protrusion factor for a comma at
@@ -1418,8 +1394,10 @@
\end{gcount}
\begin{gcount}{noteadditionalspacelinestextthreshold}
-The number of low notes which will add space between the lines and the lyrics. For instance, with a threshold of
-\texttt{2}, every note below \texttt{c} will add space for each pitch needed below \texttt{c}, accounting for the various signs.
+The number of low notes which will add on the
+\texttt{noteadditionalspacelinestext} space. For instance, with a threshold of
+\texttt{2}, every note below \texttt{c} will add {noteadditionalspacelinestext}
+space for each pitch needed below \texttt{c}, accounting for the various signs.
\end{gcount}
\subsection{Distances}\label{distances}
@@ -1634,10 +1612,6 @@
pitches above.
\end{gdimension}
-\begin{gdimension}{uprightpunctuminclinatumshift}
-Space after after a non-punctum inclinatum and before the upright punctum inclinatum.
-\end{gdimension}
-
\begin{gdimension}{maximumspacewithoutdash}
Maximal space between two syllables for which we consider a dash is not needed.
\end{gdimension}
@@ -1725,6 +1699,11 @@
The space between the lines and the bottom of the text.
\end{gdimension}
+\begin{gdimension}{noteadditionalspacelinestext}
+The space added between the lines and the bottom of the text for every pitch
+below the \texttt{noteadditionalspacelinestextthreshold}.
+\end{gdimension}
+
\begin{gdimension}{spacebeneathtext}
The space beneath the text.
\end{gdimension}
@@ -1867,7 +1846,7 @@
Spaces around bars when they are typeset inside a syllable. The \verb=@short=
suffix for virgula and divisio minima indicates the space used when the notes
-surrounding the bar are strictly lower than \texttt{g} (in a four-line score).
+surrounding the bar are strictly lower than \texttt{g} (in a four-line score).
For divisio minimis, the \verb=@short= suffix is for notes lower than
\texttt{h}. When applied to ``high'' positions (on the ledger line above
the staff), the \verb=@short= distances will be used for up to two pitches
@@ -1879,12 +1858,6 @@
\begin{gdimension}{bar at virgula@short}
\end{gdimension}
-\begin{gdimension}{bar at virgulaparen}
-\end{gdimension}
-
-\begin{gdimension}{bar at virgulaparen@short}
-\end{gdimension}
-
\begin{gdimension}{bar at minimis}
\end{gdimension}
@@ -1897,12 +1870,6 @@
\begin{gdimension}{bar at minima@short}
\end{gdimension}
-\begin{gdimension}{bar at minimaparen}
-\end{gdimension}
-
-\begin{gdimension}{bar at minimaparen@short}
-\end{gdimension}
-
\begin{gdimension}{bar at minor}
\end{gdimension}
@@ -1923,12 +1890,6 @@
\begin{gdimension}{bar at virgula@standalone at text@short}
\end{gdimension}
-\begin{gdimension}{bar at virgulaparen@standalone at text}
-\end{gdimension}
-
-\begin{gdimension}{bar at virgulaparen@standalone at text@short}
-\end{gdimension}
-
\begin{gdimension}{bar at minimis@standalone at text}
\end{gdimension}
@@ -1941,12 +1902,6 @@
\begin{gdimension}{bar at minima@standalone at text@short}
\end{gdimension}
-\begin{gdimension}{bar at minimaparen@standalone at text}
-\end{gdimension}
-
-\begin{gdimension}{bar at minimaparen@standalone at text@short}
-\end{gdimension}
-
\begin{gdimension}{bar at minor@standalone at text}
\end{gdimension}
@@ -1970,12 +1925,6 @@
\begin{gdimension}{bar at virgula@standalone at notext@short}
\end{gdimension}
-\begin{gdimension}{bar at virgulaparen@standalone at notext}
-\end{gdimension}
-
-\begin{gdimension}{bar at virgulaparen@standalone at notext@short}
-\end{gdimension}
-
\begin{gdimension}{bar at minimis@standalone at notext}
\end{gdimension}
@@ -1988,12 +1937,6 @@
\begin{gdimension}{bar at minima@standalone at notext@short}
\end{gdimension}
-\begin{gdimension}{bar at minimaparen@standalone at notext}
-\end{gdimension}
-
-\begin{gdimension}{bar at minimaparen@standalone at notext@short}
-\end{gdimension}
-
\begin{gdimension}{bar at minor@standalone at notext}
\end{gdimension}
@@ -2086,7 +2029,7 @@
The widow penalty (determines how important it is to prevent widows from occurring).
\end{gcount}
-\macroname{emergencystretch}{}{gregoriotex-gsp-default.tex}
+\macroname{emergencystretch}{}{gsp-default.tex}
The value of the last ditch stretch for overfull boxes. This should be set using \verb=\grechangedim=.
Default: \verb=\emergencystretch=
@@ -2095,27 +2038,27 @@
The end after bar penalty.
\end{gcount}
-\begin{gcount}{endafterbaraltpenalty}{}{gregoriotex-gsp-default.tex}
+\begin{gcount}{endafterbaraltpenalty}{}{gsp-default.tex}
The alternate end after bar penalty (used when there is no text under the bar).
\end{gcount}
-\begin{gcount}{endofelementpenalty}{}{gregoriotex-gsp-default.tex}
+\begin{gcount}{endofelementpenalty}{}{gsp-default.tex}
The end of element penalty.
\end{gcount}
-\begin{gcount}{endofsyllablepenalty}{}{gregoriotex-gsp-default.tex}
+\begin{gcount}{endofsyllablepenalty}{}{gsp-default.tex}
The end of element penalty.
\end{gcount}
-\begin{gcount}{endofwordpenalty}{}{gregoriotex-gsp-default.tex}
+\begin{gcount}{endofwordpenalty}{}{gsp-default.tex}
The end of element penalty.
\end{gcount}
-\begin{gcount}{hyphenpenalty}{}{gregoriotex-gsp-default.tex}
+\begin{gcount}{hyphenpenalty}{}{gsp-default.tex}
The hyphen penalty.
\end{gcount}
-\begin{gcount}{nobreakpenalty}{}{gregoriotex-gsp-default.tex}
+\begin{gcount}{nobreakpenalty}{}{gsp-default.tex}
Penalty to prevent a line break.
\end{gcount}
@@ -2127,7 +2070,7 @@
The penalty applied after the final element of a score.
\end{gcount}
-\macroname{looseness}{}{gregoriotex-gsp-default.tex}
+\macroname{looseness}{}{gsp-default.tex}
The \TeX\ looseness within a score.
Default: \verb=\looseness=
@@ -2136,12 +2079,12 @@
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}{}{gregoriotex-gsp-default.tex}
+\macroname{pretolerance}{}{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)]
-\textit{Nota bene:} For more details on why this is necessary see the comments in gregoriotex-gsp-default.tex.
+\textit{Nota bene:} For more details on why this is necessary see the comments in gsp-default.tex.
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,7 +1,7 @@
% !TEX root = GregorioRef.tex
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -118,7 +118,7 @@
& \texttt{1} & this syllable is the end of a word\\
\#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
- \#7 & pair of integers & a pair containing alignment type and alteration type of the next glyph\\
+ \#7 & & alignment type of the first next glyph\\
\#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
\#9 & \TeX\ code & The bar line (usually a \textit{writebar} call).
\end{argtable}
@@ -291,28 +291,6 @@
& \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
\end{argtable}
-\macroname{\textbackslash GreDivisioMinimaParen}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized divisio minima.
-
-\begin{argtable}
- \#1 & \texttt{0} & There is no text under the bar.\\
- & \texttt{1} & There is text under the bar.\\
- \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
- \#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
- & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioMinimaParenHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized divisio minima on the ledger line above the staff.
-
-\begin{argtable}
- \#1 & \texttt{0} & There is no text under the bar.\\
- & \texttt{1} & There is text under the bar.\\
- \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
- \#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
- & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
-\end{argtable}
-
\macroname{\textbackslash GreDivisioMinimis}{\#1\#2\#3}{gregoriotex-signs.tex}
Macro to typeset a divisio ``minimis'' (eighth bar).
@@ -324,7 +302,7 @@
& \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
\end{argtable}
-\macroname{\textbackslash GreDivisioMinimisHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDivisioMinimaHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
Macro to typeset a divisio ``minimis'' (eighth bar) on the ledger line above the staff.
\begin{argtable}
@@ -486,8 +464,10 @@
\macroname{\textbackslash GreFirstSyllableInitial}{\#1}{gregoriotex-syllable.tex}
A macro which is called with the first letter of the first syllable which is
-not the initial of the score. If there is no initial (\verb=\gresetinitiallines{0}= has been called), the
-first letter of the syllable will be passed. Otherwise, the \emph{second} letter will be passed.
+not the initial of the score. If the \texttt{initial-style} is \texttt{0}, the
+first letter of the syllable will be passed. If the \texttt{initial-style} is
+\texttt{1} or \texttt{2}, the \emph{second} letter will be passed. This macro
+may be redefined to style the first letter appropriately.
\begin{argtable}
\#1 & string & The first letter of the first syllable which is not the
@@ -516,18 +496,6 @@
\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
-\macroname{\textbackslash GreFlatParen}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized flat.
-
-\begin{argtable}
- \#1 & integer & Height number of the flat.\\
- \#2 & \texttt{0} & The flat is not part of the clef.\\
- & \texttt{1} & The flat is part of the clef.\\
- \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
- \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
- \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
\macroname{\textbackslash GreForceHyphen}{}{gregoriotex-syllable.tex}
Macro that indicates that a hyphen should be forced (if enabled) after the given syllable.
@@ -674,18 +642,6 @@
\macroname{\textbackslash GreInDivisioMinimaHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
Same as \verb=\GreDivisioMinimaHigh= except inside a syllable.
-\macroname{\textbackslash GreInDivisioMinimaParen}{\#1\#2\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinimaParen= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMinimaParenHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinimaParenHigh= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMinimis}{\#1\#2\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinimis= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMinimisHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinimisHigh= except inside a syllable.
-
\macroname{\textbackslash GreInDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
Same as \verb=\GreDivisioMinor= except inside a syllable.
@@ -707,12 +663,6 @@
\macroname{\textbackslash GreInVirgulaHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
Same as \verb=\GreVirgulaHigh= except inside a syllable.
-\macroname{\textbackslash GreInVirgulaParen}{\#1\#2\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreVirgulaParen= except inside a syllable.
-
-\macroname{\textbackslash GreInVirgulaParenHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreVirgulaParenHigh= except inside a syllable.
-
\macroname{\textbackslash GreItalic}{\#1}{gregoriotex.sty or gregoriotex.tex}
Makes argument (a string) italic. Accesses \LaTeX\ \verb=\textit= or
Plain \TeX\ \verb=\it= as appropriate. Corresponds to ``<i></i>'' tags
@@ -796,18 +746,6 @@
\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
-\macroname{\textbackslash GreNaturalParen}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized natural.
-
-\begin{argtable}
- \#1 & integer & Height number of the natural.\\
- \#2 & \texttt{0} & The natural is not part of the clef.\\
- & \texttt{1} & The natural is part of the clef (doesn't happen).\\
- \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
- \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
- \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
\macroname{\textbackslash GreNewLine}{}{gregoriotex-main.tex}
Macro to call if you want to go to the next line.
@@ -1066,18 +1004,6 @@
\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
-\macroname{\textbackslash GreSharpParen}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized sharp.
-
-\begin{argtable}
- \#1 & integer & Height number of the sharp.\\
- \#2 & \texttt{0} & The sharp is not part of the clef.\\
- & \texttt{1} & The sharp is part of the clef (doesn't happen).\\
- \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
- \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
- \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
\macroname{\textbackslash GreSmallCaps}{\#1}{gregoriotex.sty and gregoriotex.tex}
Makes argument small capitals. Accesses \LaTeX\ \verb=\textsc= or
Plain \TeX\ \verb=\sc= as appropriate Corresponds to ``<sc></sc>'' tags
@@ -1130,7 +1056,7 @@
& \texttt{1} & this syllable is the end of a word\\
\#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
- \#7 & pair of integers & a pair containing alignment type and alteration type of the next glyph\\
+ \#7 & & alignment type of the first next glyph\\
\#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
\#9 & Gregorio\TeX\ glyphs & all the notes
\end{argtable}
@@ -1236,28 +1162,6 @@
& \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
\end{argtable}
-\macroname{\textbackslash GreVirgulaParen}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized virgula.
-
-\begin{argtable}
- \#1 & \texttt{0} & There is no text under the bar.\\
- & \texttt{1} & There is text under the bar.\\
- \#2 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
- \#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
- & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
-\end{argtable}
-
-\macroname{\textbackslash GreVirgulaParenHigh}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset a parenthesized virgula on the ledger line above the staff.
-
-\begin{argtable}
- \#1 & \texttt{0} & There is no text under the bar.\\
- & \texttt{1} & There is text under the bar.\\
- \#2 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
- \#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
- & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
-\end{argtable}
-
\macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}
Macro to typeset argument in the translation position.
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,7 +1,7 @@
% !TEX root = GregorioRef.tex
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -25,8 +25,6 @@
document and are listed here for programmer documentation purposes
only.
-Sometimes it is necessary to temporarily change some register or macro for the purpose of some particular operation and then restore it to its previous value. In those case we define a \verb=\gre at saved@<moment>...= register or macro associated with it (\eg \verb=\gre at dimen@constantglyphraise= is saved just before a discretionary to \verb=\gre at saved@prediscretionary at dimen@constantglyphraise= and restored from it afterwards). These registers/macros are not listed in this documentation.
-
\macroname{\textbackslash gre at error}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
Prints an error to the \TeX\ output log.
@@ -76,12 +74,6 @@
\macroname{\textbackslash gre at loadgregoriofont}{}{gregoriotex-main.tex}
Loads the chosen font for the neumes at the correct size.
-\macroname{\textbackslash gre at maketable}{\#1}{gregoriotex-main.tex}
-Helper to convert a \TeX\ list into a Lua table. Used to pass \verb=\gre at input@path= to Lua.
-
-\macroname{\textbackslash gre at input@path}{}{gregoriotex-main.tex}
-Macro holding the list of directories to be searched for scores. \verb=\input at path= gets aliased to this list when inside \verb=\gregorioscore=.
-
\macroname{\textbackslash gre at calculate@constantglyphraise}{}{gregoriotex-spaces.tex}
Macro to calculate \verb=\gre at constantglyphraise=
@@ -222,7 +214,7 @@
\#2 & integer & the factor the distances are to be put into\\
\end{argtable}
-\macroname{\textbackslash gre at calculate@nextbegindifference}{\#1\#2\#3\#4\#5\#6}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre at calculate@nextbegindifference}{\#1\#2\#3\#4\#5}{gregoriotex-spaces.tex}
Macro to calculate \texttt{nextbegindifference}.
\begin{argtable}
@@ -230,8 +222,9 @@
\#2 & string & the first letters of the next syllable\\
\#3 & string & the middle letters of the next syllable (the vowel in Latin, the whole syllable in English)\\
\#4 & string & the end letters of the next syllable\\
- \#5 & integer & the type of notes alignment. See \Nameref{notesalign}.\\
- \#6 & integer & the type of alteration. See \Nameref{alterationtype}.\\
+ \#5 & $0 \le$ integer $\le 19$ & the type of notes alignment. See \Nameref{notesalign}.\\
+ & $20 \le$ integer $\le 39$ & Same as below 20 except there is a flat before the notes. Subtract 20 to get the type of notes alignment.\\
+ & $40 \le$ integer $\le 59$ & Same as below 20 except there is a natural before the notes. Subtract 40 to get the type of notes alignment.
\end{argtable}
\macroname{\textbackslash gre at strip@pt}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
@@ -566,6 +559,9 @@
\macroname{\textbackslash gre at lastoflinecount}{}{gregoriotex-main.tex}
Count to track where on the line we are. Values are \texttt{0} (we are not near the end of a line), \texttt{1} (we’re at the last syllable of the line), and \texttt{2} (we just set the last syllable of the line and so are at the first syllable of a new line).
+\macroname{\textbackslash gre at savedlastoflinecount}{}{gregoriotex-main.tex}
+A spot to save the \verb=\gre at lastoflinecount= so we can change it temporarily and revert to the saved value later.
+
\macroname{\textbackslash gre at newlinecommon}{\#1\#2}{gregoriotex-main.tex}
The macro which needs to be called each time a new lines is started.
@@ -614,6 +610,9 @@
\macroname{\textbackslash gre at opening@syllabletext}{}{gregoriotex-syllable.tex}
Macro that stores the computed \TeX\ code for rendering the text of the first syllable.
+\macroname{\textbackslash gre at exhyphencharsave}{}{gregoriotex-main.tex}
+Macro for saving the ex hyphen character so that it can be restored at the end of the score.
+
\macroname{\textbackslash gre at factor}{}{gregoriotex-main.tex}
Count which stores the current staff size.
@@ -635,12 +634,11 @@
\#1 & Note alignment type & See \ref{notesalign}\\
\end{argtable}
-\macroname{\textbackslash gre at calculate@nextnotesaligncenter}{\#1\#2}{gregoriotex-syllable.tex}
+\macroname{\textbackslash gre at calculate@nextnotesaligncenter}{\#1}{gregoriotex-syllable.tex}
Same as previous, but for the next syllable.
\begin{argtable}
\#1 & Note alignment type & See \ref{notesalign}\\
- \#1 & Alteration type & See \ref{alterationtype}\\
\end{argtable}
\macroname{\textbackslash gre at calculate@simplenotesaligncenter}{\#1\#2}{gregoriotex-syllable.tex}
@@ -847,10 +845,6 @@
& \texttt{16} & dotted major\\
& \texttt{17} & minimis (eighth bar)\\
& \texttt{18} & minimis (eighth bar) on ledger line above the staff\\
- & \texttt{19} & parenthesized virgula\\
- & \texttt{20} & parenthesized minima\\
- & \texttt{21} & parenthesized virgula on ledger line above the staff\\
- & \texttt{22} & parenthesized minima on ledger line above the staff\\
\#2 & \texttt{0} & in a syllable containing only this bar\\
& \texttt{1} & in a syllable containing other notes\\
\#3 & \texttt{0} & if there is no text underneath the bar\\
@@ -1050,10 +1044,6 @@
& \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
& \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
& \texttt{22} & Half-space. \\
- & \texttt{23} & Space between two puncta inclinata on a unison. \\
- & \texttt{24} & Space before a right-leaning puncta inclinatum when the pitch is ascending (up to 4 pitches away). \\
- & \texttt{25} & Space before a left-leaning puncta inclinatum when the pitch is descending (up to 4 pitches away). \\
- & \texttt{26} & Space after after a non-punctum inclinatum and before the upright punctum inclinatum. \\
\end{argtable}
\macroname{\textbackslash gre at nabcfontname}{}{gregoriotex-main.tex}
@@ -1105,6 +1095,19 @@
\#2 & \TeX\ code & Code to perform when \emph{not} rewriting the syllable\\
\end{argtable}
+\macroname{\textbackslash gre at save@endsyllablepart}{}{gregoriotex-syllable.tex}
+Control sequence aliased to the carry-over syllable part to be moved to the next syllable.
+
+\macroname{\textbackslash gre at save@fixedtextformat}{\#1}{gregoriotex-syllable.tex}
+Control sequence aliased to the fixed text format for the carry-over syllable part to be moved to the next syllable.
+
+\begin{argtable}
+ \#1 & string & The carry-over syllable part, as with \verb=\gre at fixednexttextformat=\\
+\end{argtable}
+
+\macroname{\textbackslash gre at save@pointandclick}{}{gregoriotex-syllable.tex}
+Control sequence aliased to the line:char:column of the point-and-click link for the carry-over syllable part to be moved to the next syllable\\
+
\macroname{\textbackslash gre at push@endsyllable}{\#1}{gregoriotex-syllable.tex}
Sets the save aliases to push the end-syllable part of the current syllable to the next syllable if necessary.
@@ -1209,7 +1212,7 @@
\macroname{\textbackslash gre at pitch@clefbottom}{}{gregoriotex-spaces.tex}
The pitch of the lowest point of the current clef.
-\macroname{\textbackslash gre at save@clefextrema}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre at saveclefextrema}{\#1\#2}{gregoriotex-signs.tex}
Computes the pitches of the lowest and highest points of a clef and saves them
into \verb=\gre at pitch@cleftop= and \verb=\gre at pitch@clefbottom=.
@@ -1251,14 +1254,13 @@
& \texttt{granapadano} & Use the Grana Padano font.\\
\end{argtable}
-\macroname{\textbackslash gre at syllable@end}{\#1\#2\#3\#4}{gregoriotex-syllable.tex}
+\macroname{\textbackslash gre at syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex}
Macro to make a few checks and call the right macros between \verb=\endbeforebar=, \verb=\endofword=, \verb=\endofsyllable=.
\begin{argtable}
- \#1 & integer & the type of notes alignment of next syllable, from \#7 of \verb=\GreSyllable=. See \Nameref{notesalign}.\\
- \#2 & integer & the type of alteration of next syllable, from \#7 of \verb=\GreSyllable=. See \Nameref{alterationtype}.\\
- \#3 & string & next syllable text\\
- \#4 & \texttt{0} & this syllable is not the end of a word\\
+ \#1 & & next syllable type (\#7 of \verb=\GreSyllable=)\\
+ \#2 & string & next syllable text\\
+ \#3 & \texttt{0} & this syllable is not the end of a word\\
& \texttt{1} & this syllable is the end of a word\\
\end{argtable}
@@ -1376,7 +1378,7 @@
\begin{argtable}
\#1 & 0 & bar is not the end of a word\\
& 1 & bar is the end of a word\\
- \#2 & integer & alteration type of the first glyph in the next syllable. See \Nameref{alterationtype}\\
+ \#2 & integer & alignment type of the first glyph in the next syllable. See \Nameref{notesalign}\\
\end{argtable}
\macroname{\textbackslash gre at newlinearg}{}{gregoriotex-syllable.tex}
@@ -1385,6 +1387,9 @@
\macroname{\textbackslash gre at newlinecommondelayed}{}{gregoriotex-syllable.tex}
Macro used in place of \verb=\gre at newlinecommon= when the line break must be delayed.
+\macroname{\textbackslash gre at newlinecommonsaved}{}{gregoriotex-syllable.tex}
+Macro for storing original behavior of \verb=\gre at newlinecommon= so that it can be restored after the delayed line break takes effect.
+
\macroname{\textbackslash gre at punctum@mora}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
Macro to typeset a punctum mora.
@@ -1446,22 +1451,6 @@
File handle used to mark auto-compiled gabc files as dependencies for tools
like latexmk.
-\macroname{\textbackslash gre at arg@oftwo at first}{\#1\#2}{gregoriotex-syllable.tex}
-Evaluates to the first of its arguments.
-
-\begin{argtable}
- \#1 & any & the first argument\\
- \#2 & any & the second argument\\
-\end{argtable}
-
-\macroname{\textbackslash gre at arg@oftwo at second}{\#1\#2}{gregoriotex-syllable.tex}
-Evaluates to the second of its arguments.
-
-\begin{argtable}
- \#1 & any & the first argument\\
- \#2 & any & the second argument\\
-\end{argtable}
-
\subsection{Auxiliary File}
Gregorio\TeX\ creates its own auxiliary file (extension \texttt{gaux}) which it uses to store information between successive typesetting runs. This allows for such features as the dynamic interline spacing. The following functions are used to interact with that auxiliary file.
@@ -1519,12 +1508,6 @@
\macroname{\textbackslash gre at fontchar@flathole}{}{gregoriotex-chars.tex}
The flat hole character (\ie, the character needed to prevent lines from showing through the center of the flat).
-\macroname{\textbackslash gre at fontchar@flatparen}{}{gregoriotex-chars.tex}
-The parenthesized flat character.
-
-\macroname{\textbackslash gre at fontchar@flatparenhole}{}{gregoriotex-chars.tex}
-The parenthesized flat hole character (\ie, the character needed to prevent lines from showing through the center of the flat).
-
\macroname{\textbackslash gre at fontchar@natural}{}{gregoriotex-chars.tex}
The natural character.
@@ -1531,12 +1514,6 @@
\macroname{\textbackslash gre at fontchar@naturalhole}{}{gregoriotex-chars.tex}
The natural hole character (\ie, the character needed to prevent lines from showing through the center of the natural).
-\macroname{\textbackslash gre at fontchar@naturalparen}{}{gregoriotex-chars.tex}
-The parenthesized natural character.
-
-\macroname{\textbackslash gre at fontchar@naturalparenhole}{}{gregoriotex-chars.tex}
-The parenthesized natural hole character (\ie, the character needed to prevent lines from showing through the center of the natural).
-
\macroname{\textbackslash gre at fontchar@sharp}{}{gregoriotex-chars.tex}
The sharp character.
@@ -1543,12 +1520,6 @@
\macroname{\textbackslash gre at fontchar@sharphole}{}{gregoriotex-chars.tex}
The sharp hole character (\ie, the character needed to prevent lines from showing through the center of the sharp).
-\macroname{\textbackslash gre at fontchar@sharpparen}{}{gregoriotex-chars.tex}
-The parenthesized sharp character.
-
-\macroname{\textbackslash gre at fontchar@sharpparenhole}{}{gregoriotex-chars.tex}
-The parenthesized sharp hole character (\ie, the character needed to prevent lines from showing through the center of the sharp).
-
\macroname{\textbackslash gre at fontchar@incclef}{}{gregoriotex-chars.tex}
The \texttt{c}-clef which appears in the middle of a line.
@@ -1643,14 +1614,6 @@
Alias that will hold the character for the high virgula for the current number
of lines for the staff.
-\macroname{\textbackslash gre at char@bar at virgulaparen}{}{gregoriotex-main.tex}
-Alias that will hold the character for the parenthesized virgula for the current
-number of lines for the staff.
-
-\macroname{\textbackslash gre at char@bar at virgulaparenhigh}{}{gregoriotex-main.tex}
-Alias that will hold the character for the parenthesized high virgula for the
-current number of lines for the staff.
-
\macroname{\textbackslash gre at char@bar at divisiominimis}{}{gregoriotex-main.tex}
Alias that will hold the character for the divisio ``minimis'' (eighth bar) for
the current number of lines for the staff.
@@ -1667,14 +1630,6 @@
Alias that will hold the character for the high divisio minima for the current
number of lines for the staff.
-\macroname{\textbackslash gre at char@bar at divisiominimaparen}{}{gregoriotex-main.tex}
-Alias that will hold the character for the parenthesized divisio minima for the
-current number of lines for the staff.
-
-\macroname{\textbackslash gre at char@bar at divisiominimaparenhigh}{}{gregoriotex-main.tex}
-Alias that will hold the character for the parenthesized high divisio minima for
-the current number of lines for the staff.
-
\macroname{\textbackslash gre at char@bar at divisiominor}{}{gregoriotex-main.tex}
Alias that will hold the character for the divisio minor for the current
number of lines for the staff.
@@ -1943,6 +1898,9 @@
\macroname{\textbackslash ifgre at disablevepisema}{}{gregoriotex-signs.tex}
Boolean to disable the printing of vertical episemata.
+\macroname{\textbackslash ifgre at lastendswithmorasave}{}{gregoriotex-syllable.tex}
+Boolean for saving \verb=\ifgre at lastendswithmora= for later restoration.
+
\macroname{\textbackslash gre at lasteuouaeindex}{}{gregoriotex-main.tex}
Count which keeps track of the most recent euouae area.
@@ -1985,12 +1943,6 @@
\macroname{\textbackslash ifgre at showlyrics}{}{gregoriotex-syllable.tex}
Boolean indicating whether the lyrics should be shown.
-\macroname{\textbackslash ifgre at showtranslation}{}{gregoriotex-main.tex}
-Boolean indicating whether the translation should be shown.
-
-\macroname{\textbackslash ifgre at showabovelinestext}{}{gregoriotex-main.tex}
-Boolean indicating whether the above lines text should be shown.
-
\macroname{\textbackslash gre at initiallines}{}{gregoriotex-syllable.tex}
Number of lines the initial takes up. Currently limited to 0, 1, or 2. Not currently a count, but will be changed to one in 5.0.
@@ -2003,10 +1955,6 @@
\macroname{\textbackslash ifgre at evaluatingnextsyllable}{}{gregoriotex-syllable.tex}
Boolean indicating that some aspect of the next syllable is being evaluated in advance.
-\macroname{\textbackslash ifgre at noteadditionalspacelinestext}{}{gregoriotex-main.tex}
-Boolean indicating that the additional space needed between the notes and the lyrics due to really low notes should follow the user setting of noteadditionalspacelinestext (as opposed to being calculated automatically, the default).
-
-
\subsection{Boxes}
Boxes are used to store elements of the score before they are printed for the purposes of reusing them and/or measuring them in order to determine their appropriate placement.
@@ -2063,20 +2011,6 @@
\subsection{Distances}
-
-\macroname{\textbackslash gre at createdim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
-Macro to create one of Gregorio\TeX’s distances. Used to initialize distances in \textit{gregoriotex-gsp-default.tex}.
-
-\begin{argtable}
- \#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.
-\end{argtable}
-
-
-
All of the distances listed in \nameref{distances} have an internal associated
with them, of the form of \verb=\gre at space@*@*=, which stores the value of the
distance (in string representation). The first wildcard is either
@@ -2085,6 +2019,10 @@
These additional distances are calculated by Gregorio based on the values for the user customizable distances and what may be going on in the score at the time of their use.
+In some cases it is necessary to temporarily manipulate some of these distances for the purpose of some particular operation and then restore them to their previous values. In that case the distance will have a \verb=\gre at saved@...= register associated with it (\eg \verb=\gre at dimen@constantglyphraise= is saved to and restored from \verb=\gre at saved@dimen at constantglyphraise=).
+
+We also have save registries for \verb=\baselineskip=, \verb=\lineskip=, \verb=\lineskiplimit=, \verb=\parskip=, and \verb=\parfillskip= so that we can modify the way line breaking decisions are handled inside a score without affecting the rest of the document.
+
\macroname{\textbackslash gre at dimen@morawidth}{}{gregoriotex-spaces.tex}
Width of a punctum mora (reinitialized at each score, lazily recomputed).
@@ -2293,6 +2231,58 @@
\macroname{\textbackslash gre at restorepenalties}{}{gregoriotex-spaces.tex}
Macro called at the end of the score to restore the text penalties.
+\macroname{\textbackslash gre at brokenpenaltysave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the broken penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at clubpenaltysave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the club penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at widowpenaltysave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the widow penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at emergencystretchsave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the emergency stretch so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at endafterbarpenaltysave}{}{gregoriotex-main.tex}
+A place to save the current value of the end after bar penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at endafterbaraltpenaltysave}{}{gregoriotex-main.tex}
+A place to save the current value of the alternate end after bar penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at endofelementpenaltysave}{}{gregoriotex-main.tex}
+A place to save the current value of the end of element penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at endofsyllablepenaltysave}{}{gregoriotex-main.tex}
+A place to save the current value of the end of syllable penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at endofwordpenaltysave}{}{gregoriotex-main.tex}
+A place to save the current value of the end of word penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at exhyphenpenaltysave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the ex hyphen penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at hyphenpenaltysave}{}{gregoriotex-main.tex \textup{and} gregoriotex-spaces.tex}
+A place to save the current value of the hyphen penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at nobreakpenaltysave}{}{gregoriotex-main.tex}
+A place to save the current value of the no break penalty so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at doublehyphendemeritssave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the double hyphen demerits so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at finalhyphendemeritssave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the final hyphen demerits so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at loosenesssave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the looseness so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at tolerancesave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the tolerance so that we can change it temporarily and then restore it later.
+
+\macroname{\textbackslash gre at pretolerancesave}{}{gregoriotex-spaces.tex}
+A place to save the current value of the pretolerance so that we can change it temporarily and then restore it later.
+
+
\subsection{Backwards compatibility}
Depending on version of Lua\TeX / \LaTeX, some primitives have different names
We define the following local aliases to account for this eventuality.
@@ -2365,26 +2355,10 @@
\texttt{12} & divisio minor\\
\texttt{13} & divisio maior\\
\texttt{14} & dominican bar\\
- \texttt{15} & parenthesized virgula\\
- \texttt{16} & parenthesized divisio minima\\
- \texttt{17} & divisio finalis\\
- \texttt{18} & no note
+ \texttt{15} & divisio finalis\\
+ \texttt{16} & no note
\end{tabulary}
-\subsection{Alteration Type}\label{alterationtype}
-\rowcolors{1}{lightgray}{lightgray}
-\begin{tabulary}{\textwidth}{cL}
- \multicolumn{2}{c}{Integer with the following possibilities:} \\
- \hline
- \texttt{0} & no alteration\\
- \texttt{1} & flat\\
- \texttt{2} & natural\\
- \texttt{3} & sharp\\
- \texttt{4} & parenthesized flat\\
- \texttt{5} & parenthesized natural\\
- \texttt{6} & parenthesized sharp
- \end{tabulary}
-
\subsection{Note Offset Specifier}\label{NoteOffset}
\definecolor{shadecolor}{named}{lightgray}%
\begin{shaded*}%
@@ -2419,9 +2393,7 @@
\item[TorcResDebilisNonAuctusSecondAnyWide] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of at least two
\item[FinalLineaPunctum] linea punctum (cavum) as last note
\item[BarStandard] standard bar
- \item[BarParen] parenthesized bar
\item[BarVirgula] virgula
- \item[BarVirgulaParen] parenthesized virgula
\item[BarDivisioFinalis] divisio finalis
\item[TorcResQuilismaNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of at least two
\item[TorcResOriscusNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of at least two
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,7 +1,7 @@
% !TEX root = GregorioRef.tex
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -91,6 +91,7 @@
\end{lstlisting}
\item[author] The author of the piece, if known; of course, the author of most traditional chant is not known.
\item[language] The language of the lyrics.
+\item[oriscus-orientation] If \texttt{legacy}, the orientation of an unconnected oriscus must be set manually.
\item[mode] The mode of the piece. This should normally be an Arabic
number between 1 and 8, but may be any text required for unusual
cases. The mode number will be converted to roman numerals and
@@ -244,11 +245,6 @@
and should be placed after the parenthesized notes section for the last
syllable of a given word.
-The special character \texttt{\$} is an ``escape'' character which causes the
-character which follows it to lose any special meaning. This can be used to
-insert parentheses in text (\ie, use \texttt{\$(}). In order to put a
-\texttt{\$} itself in text, escape it (\ie, use \texttt{\$\$}).
-
There are several markup-like codes that may be inserted into syllable text. We divide these into three categories: style tags, syllable controls, and other.
\paragraph{Style Tags}
@@ -495,7 +491,7 @@
g(g) g<sp>~~</sp>(g~) g<(g<) g>(g>) go(go) go<sp>~~</sp>(go~) gw(gw)
gv(gv) gV(gV) gs(gs) gs<(gs<) g=(g=)
( ) (z) ( )
- gr(gr) gR(gR) gr0(gr0) G(G) G0(G0) G1(G1) G<sp>~~</sp>(G~) G>(G>) Gr(Gr) gx(gx)
+ gr(gr) gR(gR) gr0(gr0) G(G) G0(G0) G1(G1) G~(G~) G>(G>) Gr(Gr) gx(gx)
g#(g#) gy(gy)
( )
}
@@ -1047,7 +1043,7 @@
Here, note, glyph, and element refer to how Gregorio understands the score.
-\subsubsection{Macros}\label{usemacros}
+\subsubsection{Macros}
Macros may be defined using the \texttt{def-m}\textit{n} headers, where
\textit{n} is 0--9, as described in the \nameref{headers} section above. Then
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,4 +1,4 @@
--- Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+-- Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
-- This file is part of Gregorio.
--
@@ -124,10 +124,6 @@
['VirgulaThree'] = true,
['VirgulaFive'] = true,
['VirgulaSix'] = true,
- ['VirgulaParenTwo'] = true,
- ['VirgulaParenThree'] = true,
- ['VirgulaParenFive'] = true,
- ['VirgulaParenSix'] = true,
['DivisioMinimisTwo'] = true,
['DivisioMinimisThree'] = true,
['DivisioMinimisFive'] = true,
@@ -136,10 +132,6 @@
['DivisioMinimaThree'] = true,
['DivisioMinimaFive'] = true,
['DivisioMinimaSix'] = true,
- ['DivisioMinimaParenTwo'] = true,
- ['DivisioMinimaParenThree'] = true,
- ['DivisioMinimaParenFive'] = true,
- ['DivisioMinimaParenSix'] = true,
['DivisioMinorTwo'] = true,
['DivisioMinorThree'] = true,
['DivisioMinorFive'] = true,
@@ -199,7 +191,6 @@
DivisioMaiorDottedFour = [[:?]],
DivisioMaiorDottedBackingFour = [[\excluded{:?}]],
DivisioMinimaFour = [[,]],
- DivisioMinimaParenFour = [[,?]],
DivisioMinimisFour = [[\textasciicircum{}]],
DivisioMinorFour = [[;]],
FClefChange = [[f3]],
@@ -206,8 +197,6 @@
FClef = [[f3]],
Flat = [[gx]],
FlatHole = [[\excluded{gx}]],
- FlatParen = [[gx?]],
- FlatParenHole = [[\excluded{gx?}]],
Flexus = [[g&&&e]],
FlexusLongqueue = [[h&&&f]],
FlexusNobar = [[@h&&&f]],
@@ -224,8 +213,6 @@
LineaPunctum = [[g&&&R]],
Natural = [[gy]],
NaturalHole = [[\excluded{gy}]],
- NaturalParen = [[gy?]],
- NaturalParenHole = [[\excluded{gy?}]],
OblatusAscendensOriscus = [[g&&&o1]],
OblatusDescendensOriscus = [[g&&&o0]],
OblatusFlexusOriscus = [[g&&&oe]],
@@ -268,8 +255,6 @@
SemicirculusReversus = [[\excluded{g}r5]],
Sharp = [[g\#{}]],
SharpHole = [[\excluded{g\#{}}]],
- SharpParen = [[g\#{}?]],
- SharpParenHole = [[\excluded{g\#{}?}]],
StansPunctumInclinatum = [[G2&&&]],
StrophaAucta = [[g&&&s>]],
StrophaAuctaLongtail = [[h&&&s>]],
@@ -288,7 +273,6 @@
VirgaReversaLongqueue = [[h&&&V]],
VirgaReversaOpenqueue = [[a&&&V]],
VirgulaFour = [[^^^^0060]],
- VirgulaParenFour = [[^^^^0060?]],
}
local GABC_AMBITUS_ONE = {
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
% !TEX program = LuaLaTeX+se
%
-% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -139,7 +139,7 @@
{\endtabularx\bigskip}
\makeatletter%
-\NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gregoriotex-gsp-default.tex}}{%
+\NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gsp-default.tex}}{%
\gre at rubberpermit{#1}%
\ifgre at rubber%
@@ -149,7 +149,7 @@
\fi%
}
-\NewDocumentEnvironment{gcount}{m}{\macroname{#1}{}{gregoriotex-gsp-default.tex}}{%
+\NewDocumentEnvironment{gcount}{m}{\macroname{#1}{}{gsp-default.tex}}{%
Default: \expandafter$\expandafter\the\csname gre at space@count@#1\endcsname$
}
@@ -183,7 +183,7 @@
\vspace{1cm}
- \large Version \textbf{6.0.0-beta1}, 23 February 2021 %% PARSE_VERSION_DATE
+ \large Version \textbf{5.2.1}, 6 April 2019 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
Modified: branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/examples/main-lualatex.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/examples/main-lualatex.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/doc/luatex/gregoriotex/examples/main-lualatex.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,47 +1,47 @@
% !TEX program = LuaLaTeX+se
-% Simple template for using Gregorio scores in a LuaLaTeX document.
+% This is a simple template for a LuaLaTeX document using gregorio scores.
-\documentclass{scrartcl} % set document class: manual at https://ctan.org/pkg/koma-script
+\documentclass[11pt]{article} % use larger type; default would be 10pt
-% Load packages:
-\usepackage[osf,p]{libertine} % set font
-\usepackage{gregoriotex} % enable Gregorio score inclusion
-\usepackage[latin]{babel} % set language
+% usual packages loading:
+\usepackage{fontspec}
+\usepackage{graphicx} % support the \includegraphics command and options
+\usepackage{geometry} % See geometry.pdf to learn the layout options. There are lots.
+\geometry{a4paper} % or letterpaper (US) or a5paper or....
+\usepackage{gregoriotex} % for gregorio score inclusion
+\usepackage{fullpage} % to reduce the margins
+\usepackage{libertine} % Decent (free) font for Gregorian, but should be changed if you have high standards
-\setkomafont{section}{\normalfont\centering\huge\scshape} % section heading style
-\setcounter{secnumdepth}{-\maxdimen} % remove section numbering
+\begin{document}
+% The title:
+\begin{center}\begin{huge}\textsc{Populus Sion}\end{huge}\end{center}
-% Set the space around the initial:
-% See http://gregorio-project.github.io/gregoriotex/details.html for more details and options
+% Here we set the space around the initial.
+% Please report to http://gregorio-project.github.io/gregoriotex/details.html for more details and options
\grechangedim{beforeinitialshift}{2.2mm}{scalable}
\grechangedim{afterinitialshift}{2.2mm}{scalable}
-% Set the initial font (change 43 for a larger size):
+% Here we set the initial font. Change 43 if you want a bigger initial.
\grechangestyle{initial}{\fontsize{43}{43}\selectfont}%
-% Make staff lines red; remove for black:
+% We set red lines here, comment it if you want black ones.
\gresetlinecolor{gregoriocolor}
-% Use the "commentary" field of the score in the top right corner:
-\gresetheadercapture{commentary}{grecommentary}{string}
-
-% Format annotation above initial
+% We set VII above the initial manually
\grechangestyle{annotation}{\small\bfseries}
+\greannotation{Intr.}
+\greannotation{\textsc{vii}}
-\begin{document}
+% We use the "commentary" field of the score in the top right corner:
+\gresetheadercapture{commentary}{grecommentary}{string}
-\section{Populus Sion}
-
-% Add VII above the initial manually:
-\greannotation{Intr.} % first line
-\greannotation{\textsc{vii}} % second line
-
-% Include the score; the file must be in the same directory:
+% and finally we include the scores. The file must be in the same directory as this one.
\gregorioscore[a]{PopulusSion}
-\section{Factus est}
+\bigskip
+\begin{center}\begin{huge}\textsc{Factus Est}\end{huge}\end{center}
\gregorioscore[a]{FactusEst}
Modified: branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/convertsfdtottf.py
===================================================================
--- branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/convertsfdtottf.py 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/convertsfdtottf.py 2021-03-04 22:26:49 UTC (rev 58132)
@@ -7,7 +7,7 @@
Python fontforge script to convert from fontforge's native sfd
to a TrueType font (ttf).
- Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
This file is part of Gregorio.
Modified: branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
===================================================================
--- branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd 2021-03-04 22:26:49 UTC (rev 58132)
@@ -3,7 +3,7 @@
FullName: greciliae
FamilyName: greciliae
Weight: Medium
-Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
+Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
UComments: "2007-4-12: Created."
Version: 1.2
ItalicAngle: 0
@@ -20,7 +20,7 @@
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1176402534
-ModificationTime: 1572105938
+ModificationTime: 1533916122
OS2TypoAscent: 0
OS2TypoAOffset: 1
OS2TypoDescent: 0
@@ -43,8 +43,7 @@
DisplaySize: -96
AntiAlias: 1
FitToEm: 0
-WidthSeparation: 150
-WinInfo: 161 23 6
+WinInfo: 138 23 6
BeginPrivate: 0
EndPrivate
Grid
@@ -72,7 +71,7 @@
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: 284 284
+BeginChars: 266 266
StartChar: Accentus
Encoding: 0 -1 0
@@ -2288,280 +2287,10 @@
EndSplineSet
EndChar
-StartChar: DivisioMinimaParenTwo
+StartChar: DivisioMinorTwo
Encoding: 92 -1 92
-Width: 259
-VWidth: 1418
-Flags: W
-VStem: 0 18<-162.059 -50.513> 120 19<-264.028 52.9844> 241 18<-162.059 -50.513>
-CounterMasks: 1 e0
-LayerCount: 2
-Fore
-SplineSet
-181 -275.569 m 5
- 181 -275.569 241 -191.333 241 -106.29 c 4
- 241 -21.2354 181.001 63.0215 181.001 63.0215 c 5
- 181.001 63.0215 182.476 65.5684 184 66.5215 c 28
- 185.727 67.6006 189.001 68.0215 189.001 68.0215 c 5
- 189.001 68.0215 259 -18.0322 259 -106.29 c 4
- 259 -194.537 189 -280.569 189 -280.569 c 5
- 189 -280.569 185.727 -280.148 184 -279.069 c 28
- 182.476 -278.116 181 -275.569 181 -275.569 c 5
-78 -275.569 m 5
- 78 -275.569 76.5244 -278.116 75 -279.069 c 28
- 73.2734 -280.148 70 -280.569 70 -280.569 c 5
- 70 -280.569 0 -194.537 0 -106.29 c 4
- 0 -18.0322 69.999 68.0215 69.999 68.0215 c 5
- 69.999 68.0215 73.2734 67.6006 75 66.5215 c 28
- 76.5244 65.5684 77.999 63.0215 77.999 63.0215 c 5
- 77.999 63.0215 18 -21.2354 18 -106.29 c 4
- 18 -191.333 78 -275.569 78 -275.569 c 5
-120 -258.872 m 9
- 120 52.9844 l 25
- 138.999 53.0215 l 25
- 139 -265.569 l 17
- 126.044 -265.435 122.435 -262.391 120 -258.872 c 9
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimaParenThree
-Encoding: 93 -1 93
-Width: 251
-VWidth: 1733
-Flags: W
-VStem: -8 18<152.941 264.487> 112 19<50.9717 367.984> 233 18<152.941 264.487>
-CounterMasks: 1 e0
-LayerCount: 2
-Fore
-SplineSet
-173 39.4307 m 1
- 173 39.4307 233 123.667 233 208.71 c 0
- 233 293.765 173.001 378.021 173.001 378.021 c 1
- 173.001 378.021 174.476 380.568 176 381.521 c 24
- 177.727 382.601 181.001 383.021 181.001 383.021 c 1
- 181.001 383.021 251 296.968 251 208.71 c 0
- 251 120.463 181 34.4307 181 34.4307 c 1
- 181 34.4307 177.727 34.8516 176 35.9307 c 24
- 174.476 36.8838 173 39.4307 173 39.4307 c 1
-70 39.4307 m 1
- 70 39.4307 68.5244 36.8838 67 35.9307 c 24
- 65.2734 34.8516 62 34.4307 62 34.4307 c 1
- 62 34.4307 -8 120.463 -8 208.71 c 0
- -8 296.968 61.999 383.021 61.999 383.021 c 1
- 61.999 383.021 65.2734 382.601 67 381.521 c 24
- 68.5244 380.568 69.999 378.021 69.999 378.021 c 1
- 69.999 378.021 10 293.765 10 208.71 c 0
- 10 123.667 70 39.4307 70 39.4307 c 1
-112 56.1279 m 9
- 112 367.984 l 25
- 130.999 368.021 l 25
- 131 49.4307 l 17
- 118.044 49.5654 114.435 52.6094 112 56.1279 c 9
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimaParenFour
-Encoding: 94 -1 94
-Width: 251
-VWidth: 2048
-Flags: W
-VStem: -8 18<467.941 579.487> 112 19<365.972 682.984> 233 18<467.941 579.487>
-CounterMasks: 1 e0
-LayerCount: 2
-Fore
-SplineSet
-173 354.431 m 1
- 173 354.431 233 438.667 233 523.71 c 0
- 233 608.765 173.001 693.021 173.001 693.021 c 1
- 173.001 693.021 174.476 695.568 176 696.521 c 24
- 177.727 697.601 181.001 698.021 181.001 698.021 c 1
- 181.001 698.021 251 611.968 251 523.71 c 0
- 251 435.463 181 349.431 181 349.431 c 1
- 181 349.431 177.727 349.852 176 350.931 c 24
- 174.476 351.884 173 354.431 173 354.431 c 1
-70 354.431 m 1
- 70 354.431 68.5244 351.884 67 350.931 c 24
- 65.2734 349.852 62 349.431 62 349.431 c 1
- 62 349.431 -8 435.463 -8 523.71 c 0
- -8 611.968 61.999 698.021 61.999 698.021 c 1
- 61.999 698.021 65.2734 697.601 67 696.521 c 24
- 68.5244 695.568 69.999 693.021 69.999 693.021 c 1
- 69.999 693.021 10 608.765 10 523.71 c 0
- 10 438.667 70 354.431 70 354.431 c 1
-112 371.128 m 9
- 112 682.984 l 25
- 130.999 683.021 l 25
- 131 364.431 l 17
- 118.044 364.565 114.435 367.609 112 371.128 c 9
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimaParenFive
-Encoding: 95 -1 95
-Width: 251
-VWidth: 2363
-Flags: W
-VStem: -8 18<782.941 894.487> 112 19<680.972 997.984> 233 18<782.941 894.487>
-CounterMasks: 1 e0
-LayerCount: 2
-Fore
-SplineSet
-173 669.431 m 1
- 173 669.431 233 753.667 233 838.71 c 0
- 233 923.765 173.001 1008.02 173.001 1008.02 c 1
- 173.001 1008.02 174.476 1010.57 176 1011.52 c 24
- 177.727 1012.6 181.001 1013.02 181.001 1013.02 c 1
- 181.001 1013.02 251 926.968 251 838.71 c 0
- 251 750.463 181 664.431 181 664.431 c 1
- 181 664.431 177.727 664.852 176 665.931 c 24
- 174.476 666.884 173 669.431 173 669.431 c 1
-70 669.431 m 1
- 70 669.431 68.5244 666.884 67 665.931 c 24
- 65.2734 664.852 62 664.431 62 664.431 c 1
- 62 664.431 -8 750.463 -8 838.71 c 0
- -8 926.968 61.999 1013.02 61.999 1013.02 c 1
- 61.999 1013.02 65.2734 1012.6 67 1011.52 c 24
- 68.5244 1010.57 69.999 1008.02 69.999 1008.02 c 1
- 69.999 1008.02 10 923.765 10 838.71 c 0
- 10 753.667 70 669.431 70 669.431 c 1
-112 686.128 m 9
- 112 997.984 l 25
- 130.999 998.021 l 25
- 131 679.431 l 17
- 118.044 679.565 114.435 682.609 112 686.128 c 9
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimaParenSix
-Encoding: 96 -1 96
-Width: 259
-VWidth: 2678
-Flags: W
-VStem: 0 18<1097.94 1209.49> 120 19<995.972 1312.98> 241 18<1097.94 1209.49>
-CounterMasks: 1 e0
-LayerCount: 2
-Fore
-SplineSet
-181 984.431 m 1
- 181 984.431 241 1068.67 241 1153.71 c 0
- 241 1238.76 181.001 1323.02 181.001 1323.02 c 1
- 181.001 1323.02 182.476 1325.57 184 1326.52 c 24
- 185.727 1327.6 189.001 1328.02 189.001 1328.02 c 1
- 189.001 1328.02 259 1241.97 259 1153.71 c 0
- 259 1065.46 189 979.431 189 979.431 c 1
- 189 979.431 185.727 979.852 184 980.931 c 24
- 182.476 981.884 181 984.431 181 984.431 c 1
-78 984.431 m 1
- 78 984.431 76.5244 981.884 75 980.931 c 24
- 73.2734 979.852 70 979.431 70 979.431 c 1
- 70 979.431 0 1065.46 0 1153.71 c 0
- 0 1241.97 69.999 1328.02 69.999 1328.02 c 1
- 69.999 1328.02 73.2734 1327.6 75 1326.52 c 24
- 76.5244 1325.57 77.999 1323.02 77.999 1323.02 c 1
- 77.999 1323.02 18 1238.76 18 1153.71 c 0
- 18 1068.67 78 984.431 78 984.431 c 1
-120 1001.13 m 9
- 120 1312.98 l 25
- 138.999 1313.02 l 25
- 139 994.431 l 17
- 126.044 994.565 122.435 997.609 120 1001.13 c 9
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimisTwo
-Encoding: 97 -1 97
Width: 19
-VWidth: 1533
-Flags: HW
-HStem: 284.431 318.553
-VStem: 0 19<285.972 602.984>
-LayerCount: 2
-Fore
-SplineSet
-0 0.12793 m 13
- 0 167.984 l 25
- 18.999 168.021 l 25
- 19 -6.56934 l 21
- 6.04395 -6.43457 2.43457 -3.39062 0 0.12793 c 13
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimisThree
-Encoding: 98 -1 98
-Width: 19
-VWidth: 1733
-Flags: HW
-HStem: 49.431 318.553
-VStem: 0 19<50.972 367.984>
-LayerCount: 2
-Fore
-SplineSet
-0 315.128 m 13
- 0 482.984 l 25
- 18.999 483.021 l 25
- 19 308.431 l 21
- 6.04395 308.565 2.43457 311.609 0 315.128 c 13
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimisFour
-Encoding: 99 -1 99
-Width: 19
VWidth: 2048
-Flags: HW
-HStem: 364.431 318.553
-VStem: 0 19<365.972 682.984>
-LayerCount: 2
-Fore
-SplineSet
-0 630.128 m 13
- 0 797.984 l 25
- 18.999 798.021 l 25
- 19 623.431 l 21
- 6.04395 623.565 2.43457 626.609 0 630.128 c 13
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimisFive
-Encoding: 100 -1 100
-Width: 19
-VWidth: 2363
-Flags: HW
-HStem: 679.431 318.553
-VStem: 0 19<680.972 997.984>
-LayerCount: 2
-Fore
-SplineSet
-0 945.128 m 13
- 0 1112.98 l 25
- 18.999 1113.02 l 25
- 19 938.431 l 21
- 6.04395 938.565 2.43457 941.609 0 945.128 c 13
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinimisSix
-Encoding: 101 -1 101
-Width: 19
-VWidth: 2678
-Flags: HW
-HStem: 994.431 318.553
-VStem: 0 19<995.972 1312.98>
-LayerCount: 2
-Fore
-SplineSet
-0 1260.13 m 13
- 0 1427.98 l 25
- 18.999 1428.02 l 25
- 19 1253.43 l 21
- 6.04395 1253.56 2.43457 1256.61 0 1260.13 c 13
-EndSplineSet
-EndChar
-
-StartChar: DivisioMinorTwo
-Encoding: 102 -1 102
-Width: 19
-VWidth: 2048
Flags: W
HStem: -330.997 173.996
VStem: 0 19<-330.997 -157.001>
@@ -2577,7 +2306,7 @@
EndChar
StartChar: DivisioMinorThree
-Encoding: 103 -1 103
+Encoding: 93 -1 93
Width: 19
VWidth: 2048
Flags: W
@@ -2595,7 +2324,7 @@
EndChar
StartChar: DivisioMinorFour
-Encoding: 104 -1 104
+Encoding: 94 -1 94
Width: 19
VWidth: 2048
Flags: W
@@ -2613,7 +2342,7 @@
EndChar
StartChar: DivisioMinorFive
-Encoding: 105 -1 105
+Encoding: 95 -1 95
Width: 19
VWidth: 2048
Flags: W
@@ -2630,7 +2359,7 @@
EndChar
StartChar: FClef
-Encoding: 106 -1 106
+Encoding: 96 -1 96
Width: 322
VWidth: 2503
Flags: W
@@ -2668,7 +2397,7 @@
EndChar
StartChar: FClefChange
-Encoding: 107 -1 107
+Encoding: 97 -1 97
Width: 322
VWidth: 2503
Flags: W
@@ -2706,7 +2435,7 @@
EndChar
StartChar: Flat
-Encoding: 108 -1 108
+Encoding: 98 -1 98
Width: 162
VWidth: 2587
Flags: W
@@ -2734,7 +2463,7 @@
EndChar
StartChar: FlatHole
-Encoding: 109 -1 109
+Encoding: 99 -1 99
Width: 162
VWidth: 2587
Flags: W
@@ -2754,73 +2483,8 @@
Validated: 1
EndChar
-StartChar: FlatParen
-Encoding: 110 -1 110
-Width: 364
-VWidth: 2587
-Flags: W
-HStem: -47.4492 60.7002<164.901 261.809>
-VStem: 0 18<11.9414 123.487> 100.825 24.0498<59.035 321.285> 247.075 15.5996<18.0513 121.851> 346 18<11.9414 123.487>
-LayerCount: 2
-Fore
-SplineSet
-286 -101.569 m 5
- 286 -101.569 346 -17.333 346 67.71 c 4
- 346 152.765 286.001 237.021 286.001 237.021 c 5
- 286.001 237.021 287.476 239.568 289 240.521 c 28
- 290.727 241.601 294.001 242.021 294.001 242.021 c 5
- 294.001 242.021 364 155.968 364 67.71 c 4
- 364 -20.5371 294 -106.569 294 -106.569 c 5
- 294 -106.569 290.727 -106.148 289 -105.069 c 28
- 287.476 -104.116 286 -101.569 286 -101.569 c 5
-78 -101.569 m 5
- 78 -101.569 76.5244 -104.116 75 -105.069 c 28
- 73.2734 -106.148 70 -106.569 70 -106.569 c 5
- 70 -106.569 0 -20.5371 0 67.71 c 4
- 0 155.968 69.999 242.021 69.999 242.021 c 5
- 69.999 242.021 73.2734 241.601 75 240.521 c 28
- 76.5244 239.568 77.999 237.021 77.999 237.021 c 5
- 77.999 237.021 18 152.765 18 67.71 c 4
- 18 -17.333 78 -101.569 78 -101.569 c 5
-146.975 179.05 m 1
- 209.245 179.05 262.675 136.151 262.675 107.551 c 0
- 262.675 -5.11621 262.242 -47.4492 261.375 -47.4492 c 0
- 197.242 -47.4492 145.675 -27.082 106.675 13.6514 c 1
- 102.775 112.452 100.825 127.185 100.825 211.848 c 0
- 100.825 240.067 101.042 267.502 101.475 294.151 c 0
- 101.475 312.351 105.808 321.451 114.475 321.451 c 0
- 121.408 321.451 124.875 312.784 124.875 295.451 c 2
- 122.275 73.0508 l 1
- 157.808 33.1836 191.607 13.251 223.675 13.251 c 0
- 239.275 13.251 247.075 21.0508 247.075 36.6514 c 0
- 247.075 64.7314 237.428 74.0947 191.175 101.85 c 2
- 146.975 126.55 l 1
- 146.975 179.05 l 1
-EndSplineSet
-EndChar
-
-StartChar: FlatParenHole
-Encoding: 111 -1 111
-Width: 364
-VWidth: 2587
-Flags: W
-HStem: 7.58594 128.413
-VStem: 116.035 137.28
-LayerCount: 2
-Fore
-SplineSet
-116.035 73.3662 m 1
- 116.002 135.999 l 25
- 143.204 132.215 l 1
- 191.825 105.045 l 2
- 242.703 74.5137 253.315 64.2148 253.315 33.3262 c 0
- 253.315 16.166 244.735 7.58594 227.575 7.58594 c 0
- 192.301 7.58594 116.035 73.3662 116.035 73.3662 c 1
-EndSplineSet
-EndChar
-
StartChar: hepisemaleft
-Encoding: 112 -1 112
+Encoding: 100 -1 100
Width: 1
VWidth: 2044
Flags: HW
@@ -2838,7 +2502,7 @@
EndChar
StartChar: hepisemaright
-Encoding: 113 -1 113
+Encoding: 101 -1 101
Width: 2
VWidth: 2044
Flags: HW
@@ -2856,7 +2520,7 @@
EndChar
StartChar: hepisema_base
-Encoding: 114 -1 114
+Encoding: 102 -1 102
Width: 1
VWidth: 2044
Flags: HW
@@ -2874,7 +2538,7 @@
EndChar
StartChar: idebilis
-Encoding: 115 -1 115
+Encoding: 103 -1 103
Width: 83
VWidth: 2605
Flags: W
@@ -2897,7 +2561,7 @@
EndChar
StartChar: idebilis#Cavum
-Encoding: 116 -1 116
+Encoding: 104 -1 104
Width: 83
VWidth: 2605
Flags: HW
@@ -2917,7 +2581,7 @@
EndChar
StartChar: line2
-Encoding: 117 -1 117
+Encoding: 105 -1 105
Width: 18
VWidth: 2048
Flags: HW
@@ -2935,7 +2599,7 @@
EndChar
StartChar: line3
-Encoding: 118 -1 118
+Encoding: 106 -1 106
Width: 18
VWidth: 2048
Flags: HW
@@ -2953,7 +2617,7 @@
EndChar
StartChar: line4
-Encoding: 119 -1 119
+Encoding: 107 -1 107
Width: 18
VWidth: 2048
Flags: HW
@@ -2970,7 +2634,7 @@
EndChar
StartChar: line5
-Encoding: 120 -1 120
+Encoding: 108 -1 108
Width: 18
VWidth: 2048
Flags: HW
@@ -2987,7 +2651,7 @@
EndChar
StartChar: Linea
-Encoding: 121 -1 121
+Encoding: 109 -1 109
Width: 431
VWidth: 2612
Flags: W
@@ -3016,7 +2680,7 @@
EndChar
StartChar: Linea#Cavum
-Encoding: 122 -1 122
+Encoding: 110 -1 110
Width: 431
VWidth: 2612
Flags: HW
@@ -3036,7 +2700,7 @@
EndChar
StartChar: LineaPunctum
-Encoding: 123 -1 123
+Encoding: 111 -1 111
Width: 266
VWidth: 2048
Flags: W
@@ -3071,7 +2735,7 @@
EndChar
StartChar: LineaPunctum#Cavum
-Encoding: 124 -1 124
+Encoding: 112 -1 112
Width: 266
VWidth: 2048
Flags: W
@@ -3092,7 +2756,7 @@
EndChar
StartChar: LineaPunctum#Cavum.caeciliae
-Encoding: 125 -1 125
+Encoding: 113 -1 113
Width: 266
VWidth: 2048
Flags: W
@@ -3110,7 +2774,7 @@
EndChar
StartChar: mademinutus
-Encoding: 126 -1 126
+Encoding: 114 -1 114
Width: 168
VWidth: 2048
Flags: W
@@ -3136,7 +2800,7 @@
EndChar
StartChar: mademinutus#Cavum
-Encoding: 127 -1 127
+Encoding: 115 -1 115
Width: 168
VWidth: 2048
Flags: W
@@ -3158,7 +2822,7 @@
EndChar
StartChar: mdeminutus
-Encoding: 128 -1 128
+Encoding: 116 -1 116
Width: 168
VWidth: 2048
Flags: HW
@@ -3183,7 +2847,7 @@
EndChar
StartChar: mdeminutus#Cavum
-Encoding: 129 -1 129
+Encoding: 117 -1 117
Width: 168
VWidth: 2048
Flags: HW
@@ -3204,7 +2868,7 @@
EndChar
StartChar: mnbdeminutus
-Encoding: 130 -1 130
+Encoding: 118 -1 118
Width: 168
VWidth: 2048
Flags: HW
@@ -3228,7 +2892,7 @@
EndChar
StartChar: mnbdeminutus#Cavum
-Encoding: 131 -1 131
+Encoding: 119 -1 119
Width: 168
VWidth: 2048
Flags: HW
@@ -3250,7 +2914,7 @@
EndChar
StartChar: mnbpdeminutus
-Encoding: 132 -1 132
+Encoding: 120 -1 120
Width: 168
VWidth: 2048
Flags: W
@@ -3274,7 +2938,7 @@
EndChar
StartChar: mnbpdeminutus#Cavum
-Encoding: 133 -1 133
+Encoding: 121 -1 121
Width: 168
VWidth: 2048
Flags: HW
@@ -3295,7 +2959,7 @@
EndChar
StartChar: mpdeminutus
-Encoding: 134 -1 134
+Encoding: 122 -1 122
Width: 168
VWidth: 2048
Flags: HW
@@ -3320,7 +2984,7 @@
EndChar
StartChar: mpdeminutus#Cavum
-Encoding: 135 -1 135
+Encoding: 123 -1 123
Width: 168
VWidth: 2048
Flags: HW
@@ -3341,7 +3005,7 @@
EndChar
StartChar: msdeminutus
-Encoding: 136 -1 136
+Encoding: 124 -1 124
Width: 168
VWidth: 2048
Flags: W
@@ -3367,7 +3031,7 @@
EndChar
StartChar: msdeminutus#Cavum
-Encoding: 137 -1 137
+Encoding: 125 -1 125
Width: 168
VWidth: 2048
Flags: HW
@@ -3388,7 +3052,7 @@
EndChar
StartChar: Natural
-Encoding: 138 -1 138
+Encoding: 126 -1 126
Width: 108
Flags: W
VStem: 0 25.2002<7.7002 121.4 173.3 323.299> 84 24<-184.013 -35.5 18.5 128.9>
@@ -3424,7 +3088,7 @@
EndChar
StartChar: NaturalHole
-Encoding: 139 -1 139
+Encoding: 127 -1 127
Width: 108
Flags: W
HStem: 1.64062 133.319
@@ -3441,78 +3105,8 @@
Validated: 1
EndChar
-StartChar: NaturalParen
-Encoding: 140 -1 140
-Width: 310
-Flags: W
-VStem: 0 18<11.9414 123.487> 101 25.2002<7.7002 121.4 173.3 323.299> 185 24<-184.013 -35.5 18.5 128.9> 292 18<11.9414 123.487>
-LayerCount: 2
-Fore
-SplineSet
-232 -101.569 m 5
- 232 -101.569 292 -17.333 292 67.71 c 4
- 292 152.765 232.001 237.021 232.001 237.021 c 5
- 232.001 237.021 233.476 239.568 235 240.521 c 28
- 236.727 241.601 240.001 242.021 240.001 242.021 c 5
- 240.001 242.021 310 155.968 310 67.71 c 4
- 310 -20.5371 240 -106.569 240 -106.569 c 5
- 240 -106.569 236.727 -106.148 235 -105.069 c 28
- 233.476 -104.116 232 -101.569 232 -101.569 c 5
-78 -101.569 m 5
- 78 -101.569 76.5244 -104.116 75 -105.069 c 28
- 73.2734 -106.148 70 -106.569 70 -106.569 c 5
- 70 -106.569 0 -20.5371 0 67.71 c 4
- 0 155.968 69.999 242.021 69.999 242.021 c 5
- 69.999 242.021 73.2734 241.601 75 240.521 c 28
- 76.5244 239.568 77.999 237.021 77.999 237.021 c 5
- 77.999 237.021 18 152.765 18 67.71 c 4
- 18 -17.333 78 -101.569 78 -101.569 c 5
-101 320.9 m 1
- 105 322.5 109.199 323.3 113.6 323.3 c 0
- 118 323.3 122.2 322.5 126.2 320.9 c 1
- 126.2 232.1 l 1
- 125 173.3 l 1
- 155 178.1 l 2
- 171.8 181.301 186.2 182.9 198.2 182.9 c 0
- 202.199 182.9 204.6 180.899 205.4 176.9 c 2
- 209 -178.3 l 1
- 205.8 -182.3 202.199 -184.3 198.2 -184.3 c 0
- 197.399 -184.3 192.6 -182.7 183.8 -179.5 c 1
- 184.601 -178.699 185 -145.9 185 -81.0996 c 2
- 185 -35.5 l 1
- 113 -47.5 l 1
- 107.399 -46.6992 104.2 -43.5 103.4 -37.9004 c 1
- 103.4 92.9004 l 1
- 102.2 214.1 l 1
- 101 300.5 l 1
- 101 320.9 l 1
-187.4 128.9 m 1
- 125 119.3 l 2
- 124.199 119.3 123.8 82.0996 123.8 7.7002 c 1
- 187.4 18.5 l 1
- 187.4 128.9 l 1
-EndSplineSet
-EndChar
-
-StartChar: NaturalParenHole
-Encoding: 141 -1 141
-Width: 310
-Flags: W
-HStem: 1.64062 133.319
-VStem: 120.62 69.96<13.5195 124.399>
-LayerCount: 2
-Fore
-SplineSet
-120.62 1.64062 m 5
- 121.94 124.399 l 6
- 190.58 134.96 l 5
- 190.58 13.5195 l 1
- 120.62 1.64062 l 5
-EndSplineSet
-EndChar
-
StartChar: OriscusDeminutus
-Encoding: 142 -1 142
+Encoding: 128 -1 128
Width: 168
VWidth: 0
Flags: W
@@ -3538,7 +3132,7 @@
EndChar
StartChar: OriscusDeminutus#Cavum
-Encoding: 143 -1 143
+Encoding: 129 -1 129
Width: 168
VWidth: 0
Flags: HW
@@ -3562,7 +3156,7 @@
EndChar
StartChar: OriscusDeminutus#Cavum.caeciliae
-Encoding: 144 -1 144
+Encoding: 130 -1 130
Width: 168
VWidth: 2612
Flags: W
@@ -3585,7 +3179,7 @@
EndChar
StartChar: OriscusDeminutus.caeciliae
-Encoding: 145 -1 145
+Encoding: 131 -1 131
Width: 168
VWidth: 2612
Flags: W
@@ -3609,7 +3203,7 @@
EndChar
StartChar: p2base
-Encoding: 146 -1 146
+Encoding: 132 -1 132
Width: 166
VWidth: 2613
Flags: HW
@@ -3636,7 +3230,7 @@
EndChar
StartChar: p2base#Cavum
-Encoding: 147 -1 147
+Encoding: 133 -1 133
Width: 166
VWidth: 2613
Flags: HW
@@ -3661,7 +3255,7 @@
EndChar
StartChar: pesdeminutus
-Encoding: 148 -1 148
+Encoding: 134 -1 134
Width: 166
VWidth: 2684
Flags: HW
@@ -3684,7 +3278,7 @@
EndChar
StartChar: pesdeminutus#Cavum
-Encoding: 149 -1 149
+Encoding: 135 -1 135
Width: 166
VWidth: 2684
Flags: HW
@@ -3705,7 +3299,7 @@
EndChar
StartChar: pesdeminutus_op
-Encoding: 150 -1 150
+Encoding: 136 -1 136
Width: 166
VWidth: 2684
Flags: W
@@ -3732,7 +3326,7 @@
EndChar
StartChar: PesOneNothing
-Encoding: 151 -1 151
+Encoding: 137 -1 137
Width: 166
VWidth: 2613
Flags: W
@@ -3763,7 +3357,7 @@
EndChar
StartChar: PesOneNothing#Cavum
-Encoding: 152 -1 152
+Encoding: 138 -1 138
Width: 166
VWidth: 2613
Flags: HW
@@ -3795,7 +3389,7 @@
EndChar
StartChar: porrectus1
-Encoding: 153 -1 153
+Encoding: 139 -1 139
Width: 447
VWidth: 2553
Flags: HW
@@ -3817,7 +3411,7 @@
EndChar
StartChar: porrectus1#Cavum
-Encoding: 154 -1 154
+Encoding: 140 -1 140
Width: 447
VWidth: 2553
Flags: HW
@@ -3837,7 +3431,7 @@
EndChar
StartChar: porrectus2
-Encoding: 155 -1 155
+Encoding: 141 -1 141
Width: 547
VWidth: 2575
Flags: HW
@@ -3861,7 +3455,7 @@
EndChar
StartChar: porrectus2#Cavum
-Encoding: 156 -1 156
+Encoding: 142 -1 142
Width: 547
VWidth: 2575
Flags: HW
@@ -3883,7 +3477,7 @@
EndChar
StartChar: porrectus3
-Encoding: 157 -1 157
+Encoding: 143 -1 143
Width: 628
VWidth: 2556
Flags: HW
@@ -3908,7 +3502,7 @@
EndChar
StartChar: porrectus3#Cavum
-Encoding: 158 -1 158
+Encoding: 144 -1 144
Width: 628
VWidth: 2556
Flags: HW
@@ -3931,7 +3525,7 @@
EndChar
StartChar: porrectus4
-Encoding: 159 -1 159
+Encoding: 145 -1 145
Width: 704
VWidth: 2500
Flags: HW
@@ -3955,7 +3549,7 @@
EndChar
StartChar: porrectus4#Cavum
-Encoding: 160 -1 160
+Encoding: 146 -1 146
Width: 704
VWidth: 2500
Flags: HW
@@ -3977,7 +3571,7 @@
EndChar
StartChar: porrectus5
-Encoding: 161 -1 161
+Encoding: 147 -1 147
Width: 849
VWidth: 2048
Flags: HW
@@ -4001,7 +3595,7 @@
EndChar
StartChar: porrectus5#Cavum
-Encoding: 162 -1 162
+Encoding: 148 -1 148
Width: 849
VWidth: 2048
Flags: HW
@@ -4023,7 +3617,7 @@
EndChar
StartChar: porrectusam11
-Encoding: 163 -1 163
+Encoding: 149 -1 149
Width: 503
VWidth: 2553
Flags: HW
@@ -4045,7 +3639,7 @@
EndChar
StartChar: porrectusam11#Cavum
-Encoding: 164 -1 164
+Encoding: 150 -1 150
Width: 503
VWidth: 2553
Flags: HW
@@ -4065,7 +3659,7 @@
EndChar
StartChar: porrectusam12
-Encoding: 165 -1 165
+Encoding: 151 -1 151
Width: 628
VWidth: 2575
Flags: HW
@@ -4089,7 +3683,7 @@
EndChar
StartChar: porrectusam12#Cavum
-Encoding: 166 -1 166
+Encoding: 152 -1 152
Width: 628
VWidth: 2575
Flags: HW
@@ -4111,7 +3705,7 @@
EndChar
StartChar: porrectusam13
-Encoding: 167 -1 167
+Encoding: 153 -1 153
Width: 678
VWidth: 2556
Flags: HW
@@ -4135,7 +3729,7 @@
EndChar
StartChar: porrectusam13#Cavum
-Encoding: 168 -1 168
+Encoding: 154 -1 154
Width: 678
VWidth: 2556
Flags: HW
@@ -4158,7 +3752,7 @@
EndChar
StartChar: porrectusam14
-Encoding: 169 -1 169
+Encoding: 155 -1 155
Width: 721
VWidth: 2500
Flags: HW
@@ -4183,7 +3777,7 @@
EndChar
StartChar: porrectusam14#Cavum
-Encoding: 170 -1 170
+Encoding: 156 -1 156
Width: 721
VWidth: 2500
Flags: HW
@@ -4205,7 +3799,7 @@
EndChar
StartChar: porrectusam15
-Encoding: 171 -1 171
+Encoding: 157 -1 157
Width: 933
VWidth: 2048
Flags: HW
@@ -4230,7 +3824,7 @@
EndChar
StartChar: porrectusam15#Cavum
-Encoding: 172 -1 172
+Encoding: 158 -1 158
Width: 933
VWidth: 2048
Flags: HW
@@ -4252,7 +3846,7 @@
EndChar
StartChar: porrectusflexus1
-Encoding: 173 -1 173
+Encoding: 159 -1 159
Width: 503
VWidth: 2553
Flags: HW
@@ -4275,7 +3869,7 @@
EndChar
StartChar: porrectusflexus1#Cavum
-Encoding: 174 -1 174
+Encoding: 160 -1 160
Width: 503
VWidth: 2553
Flags: HW
@@ -4295,7 +3889,7 @@
EndChar
StartChar: porrectusflexus2
-Encoding: 175 -1 175
+Encoding: 161 -1 161
Width: 628
VWidth: 2575
Flags: HW
@@ -4317,7 +3911,7 @@
EndChar
StartChar: porrectusflexus2#Cavum
-Encoding: 176 -1 176
+Encoding: 162 -1 162
Width: 628
VWidth: 2575
Flags: HW
@@ -4339,7 +3933,7 @@
EndChar
StartChar: porrectusflexus3
-Encoding: 177 -1 177
+Encoding: 163 -1 163
Width: 628
VWidth: 2556
Flags: HW
@@ -4363,7 +3957,7 @@
EndChar
StartChar: porrectusflexus3#Cavum
-Encoding: 178 -1 178
+Encoding: 164 -1 164
Width: 628
VWidth: 2556
Flags: HW
@@ -4386,7 +3980,7 @@
EndChar
StartChar: porrectusflexus4
-Encoding: 179 -1 179
+Encoding: 165 -1 165
Width: 628
VWidth: 2500
Flags: HW
@@ -4409,7 +4003,7 @@
EndChar
StartChar: porrectusflexus4#Cavum
-Encoding: 180 -1 180
+Encoding: 166 -1 166
Width: 628
VWidth: 2500
Flags: HW
@@ -4431,7 +4025,7 @@
EndChar
StartChar: porrectusflexus5
-Encoding: 181 -1 181
+Encoding: 167 -1 167
Width: 931
VWidth: 2048
Flags: HW
@@ -4452,7 +4046,7 @@
EndChar
StartChar: porrectusflexus5#Cavum
-Encoding: 182 -1 182
+Encoding: 168 -1 168
Width: 931
VWidth: 2048
Flags: HW
@@ -4469,7 +4063,7 @@
EndChar
StartChar: porrectusflexusnb1
-Encoding: 183 -1 183
+Encoding: 169 -1 169
Width: 503
VWidth: 2553
Flags: HW
@@ -4489,7 +4083,7 @@
EndChar
StartChar: porrectusflexusnb1#Cavum
-Encoding: 184 -1 184
+Encoding: 170 -1 170
Width: 503
VWidth: 2553
Flags: HW
@@ -4509,7 +4103,7 @@
EndChar
StartChar: porrectusflexusnb2
-Encoding: 185 -1 185
+Encoding: 171 -1 171
Width: 628
VWidth: 2575
Flags: HW
@@ -4529,7 +4123,7 @@
EndChar
StartChar: porrectusflexusnb2#Cavum
-Encoding: 186 -1 186
+Encoding: 172 -1 172
Width: 628
VWidth: 2575
Flags: HW
@@ -4551,7 +4145,7 @@
EndChar
StartChar: porrectusflexusnb3
-Encoding: 187 -1 187
+Encoding: 173 -1 173
Width: 628
VWidth: 2556
Flags: HW
@@ -4572,7 +4166,7 @@
EndChar
StartChar: porrectusflexusnb3#Cavum
-Encoding: 188 -1 188
+Encoding: 174 -1 174
Width: 628
VWidth: 2556
Flags: HW
@@ -4595,7 +4189,7 @@
EndChar
StartChar: porrectusflexusnb4
-Encoding: 189 -1 189
+Encoding: 175 -1 175
Width: 628
VWidth: 2500
Flags: HW
@@ -4615,7 +4209,7 @@
EndChar
StartChar: porrectusflexusnb4#Cavum
-Encoding: 190 -1 190
+Encoding: 176 -1 176
Width: 628
VWidth: 2500
Flags: HW
@@ -4637,7 +4231,7 @@
EndChar
StartChar: porrectusflexusnb5
-Encoding: 191 -1 191
+Encoding: 177 -1 177
Width: 931
VWidth: 2048
Flags: HW
@@ -4656,7 +4250,7 @@
EndChar
StartChar: porrectusflexusnb5#Cavum
-Encoding: 192 -1 192
+Encoding: 178 -1 178
Width: 931
VWidth: 2048
Flags: HW
@@ -4673,7 +4267,7 @@
EndChar
StartChar: Punctum
-Encoding: 193 -1 193
+Encoding: 179 -1 179
Width: 166
VWidth: 2612
Flags: HW
@@ -4693,7 +4287,7 @@
EndChar
StartChar: Punctum#Cavum
-Encoding: 194 -1 194
+Encoding: 180 -1 180
Width: 166
VWidth: 2612
Flags: W
@@ -4714,7 +4308,7 @@
EndChar
StartChar: Punctum#Cavum.caeciliae
-Encoding: 195 -1 195
+Encoding: 181 -1 181
Width: 166
VWidth: 2612
Flags: W
@@ -4733,7 +4327,7 @@
EndChar
StartChar: PunctumAscendens
-Encoding: 196 -1 196
+Encoding: 182 -1 182
Width: 166
VWidth: 1149
Flags: W
@@ -4755,7 +4349,7 @@
EndChar
StartChar: PunctumAscendens#Cavum
-Encoding: 197 -1 197
+Encoding: 183 -1 183
Width: 166
VWidth: 1149
Flags: HW
@@ -4776,7 +4370,7 @@
EndChar
StartChar: PunctumAscendens_op
-Encoding: 198 -1 198
+Encoding: 184 -1 184
Width: 166
VWidth: 1149
Flags: HW
@@ -4800,7 +4394,7 @@
EndChar
StartChar: PunctumAuctusLineBL
-Encoding: 199 -1 199
+Encoding: 185 -1 185
Width: 166
VWidth: 2689
Flags: W
@@ -4824,7 +4418,7 @@
EndChar
StartChar: PunctumAuctusLineBL#Cavum
-Encoding: 200 -1 200
+Encoding: 186 -1 186
Width: 166
VWidth: 2689
Flags: HW
@@ -4845,7 +4439,7 @@
EndChar
StartChar: PunctumAuctusLineBL_op
-Encoding: 201 -1 201
+Encoding: 187 -1 187
Width: 166
VWidth: 2689
Flags: W
@@ -4872,7 +4466,7 @@
EndChar
StartChar: PunctumDeminutus
-Encoding: 202 -1 202
+Encoding: 188 -1 188
Width: 83
VWidth: 2612
Flags: W
@@ -4893,7 +4487,7 @@
EndChar
StartChar: PunctumDeminutus#Cavum
-Encoding: 203 -1 203
+Encoding: 189 -1 189
Width: 83
VWidth: 2612
Flags: HW
@@ -4913,7 +4507,7 @@
EndChar
StartChar: PunctumDescendens
-Encoding: 204 -1 204
+Encoding: 190 -1 190
Width: 166
VWidth: 1342
Flags: W
@@ -4934,7 +4528,7 @@
EndChar
StartChar: PunctumDescendens#Cavum
-Encoding: 205 -1 205
+Encoding: 191 -1 191
Width: 166
VWidth: 1342
Flags: HW
@@ -4955,7 +4549,7 @@
EndChar
StartChar: PunctumDescendens_op
-Encoding: 206 -1 206
+Encoding: 192 -1 192
Width: 166
VWidth: 1342
Flags: W
@@ -4979,7 +4573,7 @@
EndChar
StartChar: PunctumInclinatumAuctus
-Encoding: 207 -1 207
+Encoding: 193 -1 193
Width: 185
VWidth: 0
Flags: HW
@@ -5001,7 +4595,7 @@
EndChar
StartChar: PunctumInclinatumAuctus#Cavum
-Encoding: 208 -1 208
+Encoding: 194 -1 194
Width: 185
VWidth: 0
Flags: W
@@ -5021,7 +4615,7 @@
EndChar
StartChar: PunctumInclinatumAuctus#Cavum.caeciliae
-Encoding: 209 -1 209
+Encoding: 195 -1 195
Width: 185
VWidth: 2048
Flags: HW
@@ -5039,7 +4633,7 @@
EndChar
StartChar: PunctumInclinatumAuctus.caeciliae
-Encoding: 210 -1 210
+Encoding: 196 -1 196
Width: 185
VWidth: 2048
Flags: W
@@ -5063,7 +4657,7 @@
EndChar
StartChar: PunctumInclinatumDeminutus
-Encoding: 211 -1 211
+Encoding: 197 -1 197
Width: 139
VWidth: 2649
Flags: W
@@ -5082,7 +4676,7 @@
EndChar
StartChar: PunctumInclinatumDeminutus#Cavum
-Encoding: 212 -1 212
+Encoding: 198 -1 198
Width: 139
VWidth: 2649
Flags: HW
@@ -5100,7 +4694,7 @@
EndChar
StartChar: PunctumLineBL
-Encoding: 213 -1 213
+Encoding: 199 -1 199
Width: 166
VWidth: 2612
Flags: W
@@ -5123,7 +4717,7 @@
EndChar
StartChar: PunctumLineBLBR
-Encoding: 214 -1 214
+Encoding: 200 -1 200
Width: 166
VWidth: 2612
Flags: HW
@@ -5147,7 +4741,7 @@
EndChar
StartChar: PunctumLineBR
-Encoding: 215 -1 215
+Encoding: 201 -1 201
Width: 166
VWidth: 2612
Flags: W
@@ -5170,7 +4764,7 @@
EndChar
StartChar: PunctumLineTL
-Encoding: 216 -1 216
+Encoding: 202 -1 202
Width: 166
VWidth: 2612
Flags: W
@@ -5193,7 +4787,7 @@
EndChar
StartChar: PunctumLineTLTR
-Encoding: 217 -1 217
+Encoding: 203 -1 203
Width: 166
VWidth: 2612
Flags: W
@@ -5218,7 +4812,7 @@
EndChar
StartChar: PunctumLineTR
-Encoding: 218 -1 218
+Encoding: 204 -1 204
Width: 166
VWidth: 2612
Flags: W
@@ -5241,7 +4835,7 @@
EndChar
StartChar: PunctumSmall
-Encoding: 219 -1 219
+Encoding: 205 -1 205
Width: 155
VWidth: 2537
Flags: HW
@@ -5263,7 +4857,7 @@
EndChar
StartChar: PunctumSmall#Cavum
-Encoding: 220 -1 220
+Encoding: 206 -1 206
Width: 155
VWidth: 2537
Flags: HW
@@ -5283,7 +4877,7 @@
EndChar
StartChar: queue
-Encoding: 221 -1 221
+Encoding: 207 -1 207
Width: 18
VWidth: 2048
Flags: HW
@@ -5302,7 +4896,7 @@
EndChar
StartChar: queuebase
-Encoding: 222 -1 222
+Encoding: 208 -1 208
Width: 18
VWidth: 2048
Flags: HW
@@ -5320,7 +4914,7 @@
EndChar
StartChar: Quilisma
-Encoding: 223 -1 223
+Encoding: 209 -1 209
Width: 166
VWidth: 2496
Flags: HW
@@ -5348,7 +4942,7 @@
EndChar
StartChar: Quilisma#Cavum
-Encoding: 224 -1 224
+Encoding: 210 -1 210
Width: 166
VWidth: 2496
Flags: HW
@@ -5376,7 +4970,7 @@
EndChar
StartChar: QuilismaLineTR
-Encoding: 225 -1 225
+Encoding: 211 -1 211
Width: 166
VWidth: 2496
Flags: W
@@ -5406,7 +5000,7 @@
EndChar
StartChar: QuilismaPesOneNothing
-Encoding: 226 -1 226
+Encoding: 212 -1 212
Width: 166
VWidth: 2496
Flags: HW
@@ -5439,7 +5033,7 @@
EndChar
StartChar: QuilismaPesOneNothing#Cavum
-Encoding: 227 -1 227
+Encoding: 213 -1 213
Width: 166
VWidth: 2496
Flags: HW
@@ -5474,7 +5068,7 @@
EndChar
StartChar: rdeminutus
-Encoding: 228 -1 228
+Encoding: 214 -1 214
Width: 83
VWidth: 2605
Flags: W
@@ -5497,7 +5091,7 @@
EndChar
StartChar: rdeminutus#Cavum
-Encoding: 229 -1 229
+Encoding: 215 -1 215
Width: 83
VWidth: 2605
Flags: HW
@@ -5517,7 +5111,7 @@
EndChar
StartChar: RoundBrace
-Encoding: 230 -1 230
+Encoding: 216 -1 216
Width: 937
VWidth: 2048
Flags: W
@@ -5543,7 +5137,7 @@
EndChar
StartChar: RoundBraceDown
-Encoding: 231 -1 231
+Encoding: 217 -1 217
Width: 937
VWidth: 2048
Flags: W
@@ -5569,7 +5163,7 @@
EndChar
StartChar: rqueue
-Encoding: 232 -1 232
+Encoding: 218 -1 218
Width: 18
VWidth: 2048
Flags: HW
@@ -5588,7 +5182,7 @@
EndChar
StartChar: rvbase
-Encoding: 233 -1 233
+Encoding: 219 -1 219
Width: 166
VWidth: 2637
Flags: HW
@@ -5612,7 +5206,7 @@
EndChar
StartChar: rvirgabase
-Encoding: 234 -1 234
+Encoding: 220 -1 220
Width: 166
VWidth: 2637
Flags: HW
@@ -5632,7 +5226,7 @@
EndChar
StartChar: Semicirculus
-Encoding: 235 -1 235
+Encoding: 221 -1 221
Width: 124
VWidth: 1606
Flags: W
@@ -5652,7 +5246,7 @@
EndChar
StartChar: SemicirculusReversus
-Encoding: 236 -1 236
+Encoding: 222 -1 222
Width: 125
VWidth: 1583
Flags: W
@@ -5672,7 +5266,7 @@
EndChar
StartChar: Sharp
-Encoding: 237 -1 237
+Encoding: 223 -1 223
Width: 258
VWidth: 2048
Flags: W
@@ -5736,7 +5330,7 @@
EndChar
StartChar: Sharp.modern
-Encoding: 238 -1 238
+Encoding: 224 -1 224
Width: 162
Flags: W
VStem: 38.5 25.667<-193.491 -47.9297 9.49219 116.571 173.699 319.097> 98 25.5<-182.085 -38.8672 18.4727 125.112 182.473 330.499>
@@ -5794,7 +5388,7 @@
EndChar
StartChar: SharpHole
-Encoding: 239 -1 239
+Encoding: 225 -1 225
Width: 258
VWidth: 2048
Flags: W
@@ -5813,7 +5407,7 @@
EndChar
StartChar: SharpHole.modern
-Encoding: 240 -1 240
+Encoding: 226 -1 226
Width: 162
Flags: HW
VStem: 38.5 25.667<-193.491 -47.9297 9.49219 116.571 173.699 319.097> 98 25.5<-182.085 -38.8672 18.4727 125.112 182.473 330.499>
@@ -5828,235 +5422,8 @@
EndSplineSet
EndChar
-StartChar: SharpParen
-Encoding: 241 -1 241
-Width: 428
-VWidth: 2048
-Flags: W
-VStem: 0 18<11.9414 123.487> 410 18<11.9414 123.487>
-LayerCount: 2
-Fore
-SplineSet
-350 -101.569 m 5
- 350 -101.569 410 -17.333 410 67.71 c 4
- 410 152.765 350.001 237.021 350.001 237.021 c 5
- 350.001 237.021 351.476 239.568 353 240.521 c 28
- 354.727 241.601 358.001 242.021 358.001 242.021 c 5
- 358.001 242.021 428 155.968 428 67.71 c 4
- 428 -20.5371 358 -106.569 358 -106.569 c 5
- 358 -106.569 354.727 -106.148 353 -105.069 c 28
- 351.476 -104.116 350 -101.569 350 -101.569 c 5
-78 -101.569 m 5
- 78 -101.569 76.5244 -104.116 75 -105.069 c 28
- 73.2734 -106.148 70 -106.569 70 -106.569 c 5
- 70 -106.569 0 -20.5371 0 67.71 c 4
- 0 155.968 69.999 242.021 69.999 242.021 c 5
- 69.999 242.021 73.2734 241.601 75 240.521 c 28
- 76.5244 239.568 77.999 237.021 77.999 237.021 c 5
- 77.999 237.021 18 152.765 18 67.71 c 4
- 18 -17.333 78 -101.569 78 -101.569 c 5
-85.2998 183 m 0
- 85.2998 189.6 91.9004 196.2 98.5 196.2 c 0
- 99.5996 196.2 105.1 195.1 108.4 190.7 c 2
- 186.5 93.9004 l 1
- 197.5 107.1 l 1
- 143.6 175.3 l 2
- 141.4 177.5 140.3 179.7 140.3 183 c 0
- 140.3 189.6 146.9 196.2 153.5 196.2 c 0
- 154.6 196.2 160.1 195.1 163.4 190.7 c 2
- 214 128 l 1
- 264.6 190.7 l 2
- 267.9 195.1 273.4 196.2 274.5 196.2 c 0
- 281.1 196.2 287.7 189.6 287.7 183 c 0
- 287.7 179.7 286.6 177.5 284.4 175.3 c 2
- 230.5 107.1 l 1
- 241.5 93.9004 l 1
- 319.6 190.7 l 2
- 322.9 195.1 328.4 196.2 329.5 196.2 c 0
- 336.1 196.2 342.7 189.6 342.7 183 c 0
- 342.7 179.7 341.6 177.5 339.4 175.3 c 2
- 258 73 l 1
- 339.4 -29.2998 l 2
- 341.6 -31.5 342.7 -33.7002 342.7 -37 c 0
- 342.7 -43.5996 336.1 -50.2002 329.5 -50.2002 c 0
- 328.4 -50.2002 322.9 -49.0996 319.6 -44.7002 c 2
- 241.5 52.0996 l 1
- 230.5 38.9004 l 1
- 284.4 -29.2998 l 2
- 286.6 -31.5 287.7 -33.7002 287.7 -37 c 0
- 287.7 -43.5996 281.1 -50.2002 274.5 -50.2002 c 0
- 273.4 -50.2002 267.9 -49.0996 264.6 -44.7002 c 2
- 214 18 l 1
- 163.4 -44.7002 l 2
- 160.1 -49.0996 154.6 -50.2002 153.5 -50.2002 c 0
- 146.9 -50.2002 140.3 -43.5996 140.3 -37 c 0
- 140.3 -33.7002 141.4 -31.5 143.6 -29.2998 c 2
- 197.5 38.9004 l 1
- 186.5 52.0996 l 1
- 108.4 -44.7002 l 2
- 105.1 -49.0996 99.5996 -50.2002 98.5 -50.2002 c 0
- 91.9004 -50.2002 85.2998 -43.5996 85.2998 -37 c 0
- 85.2998 -33.7002 86.4004 -31.5 88.5996 -29.2998 c 2
- 170 73 l 1
- 88.5996 175.3 l 2
- 86.4004 177.5 85.2998 179.7 85.2998 183 c 0
-214 58.7002 m 1
- 225 73 l 1
- 214 87.2998 l 1
- 203 73 l 1
- 214 58.7002 l 1
-EndSplineSet
-EndChar
-
-StartChar: SharpParen.modern
-Encoding: 242 -1 242
-Width: 332
-Flags: HW
-VStem: 0 18<11.9414 123.487> 123.5 25.667<-193.491 -47.9297 9.49219 116.571 173.699 319.097> 183 25.5<-182.085 -38.8672 18.4727 125.112 182.473 330.499> 314 18<11.9414 123.487>
-LayerCount: 2
-Fore
-SplineSet
-254 -101.569 m 1
- 254 -101.569 314 -17.333 314 67.71 c 0
- 314 152.765 254.001 237.021 254.001 237.021 c 1
- 254.001 237.021 255.476 239.568 257 240.521 c 24
- 258.727 241.601 262.001 242.021 262.001 242.021 c 1
- 262.001 242.021 332 155.968 332 67.71 c 0
- 332 -20.5371 262 -106.569 262 -106.569 c 1
- 262 -106.569 258.727 -106.148 257 -105.069 c 24
- 255.476 -104.116 254 -101.569 254 -101.569 c 1
-78 -101.569 m 5
- 78 -101.569 76.5244 -104.116 75 -105.069 c 28
- 73.2734 -106.148 70 -106.569 70 -106.569 c 5
- 70 -106.569 0 -20.5371 0 67.71 c 4
- 0 155.968 69.999 242.021 69.999 242.021 c 5
- 69.999 242.021 73.2734 241.601 75 240.521 c 28
- 76.5244 239.568 77.999 237.021 77.999 237.021 c 5
- 77.999 237.021 18 152.765 18 67.71 c 4
- 18 -17.333 78 -101.569 78 -101.569 c 5
-183 179.006 m 0
- 183.3 307.7 l 1
- 183.3 328.101 l 1
- 187.3 329.7 191.499 330.5 195.899 330.5 c 0
- 200.3 330.5 204.5 329.7 208.5 328.101 c 1
- 208.5 182.473 l 0
- 237 186.301 l 1
- 242 182.25 245.5 181.69 247 174.19 c 1
- 248 159.19 243.5 143.69 237.5 132.434 c 1
- 208.5 128.192 l 0
- 208.5 18.4727 l 0
- 237 23.0508 l 1
- 242 19 245.5 18.9404 247 11.4404 c 1
- 248 -3.55957 243.5 -19.5596 237.5 -30.8164 c 1
- 208.5 -34.8076 l 0
- 208.501 -179.7 l 1
- 204.501 -181.3 199.301 -182.1 194.9 -182.1 c 0
- 190.5 -182.1 187.301 -181.3 183.301 -179.7 c 1
- 183.301 -159.3 l 1
- 183.5 -38.8672 l 0
- 148.5 -43.8506 l 0
- 148.2 -107.3 l 1
- 148.2 -191.101 l 1
- 144.2 -192.7 140 -193.5 135.6 -193.5 c 0
- 131.199 -193.5 127 -192.7 123 -191.101 c 1
- 123.5 -47.9297 l 0
- 95 -53.0078 l 1
- 90 -48.957 86.5 -47.3975 85 -39.8975 c 1
- 84 -24.8975 88.5 -9.39746 94.5 1.85938 c 1
- 123.5 5.85059 l 0
- 123.5 116.571 l 0
- 95 111.992 l 1
- 90 116.043 86.5 116.603 85 124.103 c 1
- 84 139.103 88.5 154.603 94.5 165.859 c 1
- 123.5 169.851 l 0
- 124 316.7 l 1
- 128 318.3 132.199 319.1 136.6 319.1 c 0
- 141 319.1 145.2 318.3 149.2 316.7 c 1
- 149.2 232.899 l 1
- 149 173.699 l 1
- 183 179.006 l 0
-123.5 5.85059 m 0
-149.167 9.49219 m 0
- 183.167 14.6846 l 0
- 183.167 125.112 l 0
- 149.25 119.892 l 0
- 149.167 9.49219 l 0
-EndSplineSet
-EndChar
-
-StartChar: SharpParenHole
-Encoding: 243 -1 243
-Width: 428
-VWidth: 2048
-Flags: W
-HStem: 57.2705 31.459
-VStem: 201.9 24.1992
-LayerCount: 2
-Fore
-SplineSet
-214 57.2705 m 1
- 201.9 73 l 1
- 214 88.7295 l 1
- 226.1 73 l 1
- 214 57.2705 l 1
-EndSplineSet
-EndChar
-
-StartChar: SharpParenHole.modern
-Encoding: 244 -1 244
-Width: 332
-Flags: W
-HStem: 9.49219 115.62
-VStem: 149.167 34<14.6846 119.892>
-LayerCount: 2
-Fore
-SplineSet
-149.167 9.49219 m 0
- 149.25 119.892 l 0
- 183.167 125.112 l 0
- 183.167 14.6846 l 0
- 149.167 9.49219 l 0
-EndSplineSet
-EndChar
-
-StartChar: StansPunctumInclinatum
-Encoding: 245 -1 245
-Width: 185
-VWidth: 2612
-Flags: HW
-HStem: -59.373 255.694
-VStem: -0.0930023 185.306
-LayerCount: 2
-Fore
-SplineSet
-185.568 68 m 1
- 93 -59.918 l 1
- -0.31543 68 l 1
- 93 196.93 l 1
- 185.568 68 l 1
-EndSplineSet
-EndChar
-
-StartChar: StansPunctumInclinatum#Cavum
-Encoding: 246 -1 246
-Width: 185
-VWidth: 2612
-Flags: HW
-HStem: -21.0186 178.986
-VStem: 27.7031 129.714
-LayerCount: 2
-Fore
-SplineSet
-157.664 68 m 5
- 93 -21.3965 l 1
- 27.5449 68 l 5
- 93 158.397 l 1
- 157.664 68 l 5
-EndSplineSet
-EndChar
-
StartChar: Stropha
-Encoding: 247 -1 247
+Encoding: 227 -1 227
Width: 172
VWidth: 2048
Flags: HW
@@ -6080,7 +5447,7 @@
EndChar
StartChar: Stropha#Cavum
-Encoding: 248 -1 248
+Encoding: 228 -1 228
Width: 172
VWidth: 2048
Flags: HW
@@ -6101,7 +5468,7 @@
EndChar
StartChar: Stropha#Cavum.caeciliae
-Encoding: 249 -1 249
+Encoding: 229 -1 229
Width: 151
VWidth: 2686
Flags: HW
@@ -6122,7 +5489,7 @@
EndChar
StartChar: Stropha.caeciliae
-Encoding: 250 -1 250
+Encoding: 230 -1 230
Width: 151
VWidth: 2686
Flags: W
@@ -6145,7 +5512,7 @@
EndChar
StartChar: StrophaAucta
-Encoding: 251 -1 251
+Encoding: 231 -1 231
Width: 172
VWidth: 2048
Flags: HW
@@ -6167,7 +5534,7 @@
EndChar
StartChar: StrophaAucta#Cavum
-Encoding: 252 -1 252
+Encoding: 232 -1 232
Width: 172
VWidth: 2048
Flags: HW
@@ -6188,7 +5555,7 @@
EndChar
StartChar: StrophaAucta#Cavum.caeciliae
-Encoding: 253 -1 253
+Encoding: 233 -1 233
Width: 151
VWidth: 2686
Flags: HW
@@ -6210,7 +5577,7 @@
EndChar
StartChar: StrophaAucta.caeciliae
-Encoding: 254 -1 254
+Encoding: 234 -1 234
Width: 151
VWidth: 2686
Flags: W
@@ -6233,7 +5600,7 @@
EndChar
StartChar: StrophaAuctaLongtail
-Encoding: 255 -1 255
+Encoding: 235 -1 235
Width: 172
VWidth: 2048
Flags: HW
@@ -6255,7 +5622,7 @@
EndChar
StartChar: StrophaAuctaLongtail#Cavum
-Encoding: 256 -1 256
+Encoding: 236 -1 236
Width: 172
VWidth: 2048
Flags: HW
@@ -6276,7 +5643,7 @@
EndChar
StartChar: tmpglyph
-Encoding: 257 -1 257
+Encoding: 237 -1 237
Width: 18
VWidth: 2048
Flags: HW
@@ -6286,7 +5653,7 @@
EndChar
StartChar: UpperPesOneNothing
-Encoding: 258 -1 258
+Encoding: 238 -1 238
Width: 166
VWidth: 2613
Flags: W
@@ -6318,7 +5685,7 @@
EndChar
StartChar: UpperPesOneNothing#Cavum
-Encoding: 259 -1 259
+Encoding: 239 -1 239
Width: 166
VWidth: 2613
Flags: W
@@ -6350,7 +5717,7 @@
EndChar
StartChar: VEpisema
-Encoding: 260 -1 260
+Encoding: 240 -1 240
Width: 34
VWidth: 2048
Flags: W
@@ -6371,7 +5738,7 @@
EndChar
StartChar: VEpisema.circumflexus
-Encoding: 261 -1 261
+Encoding: 241 -1 241
Width: 108
VWidth: 2048
Flags: W
@@ -6395,7 +5762,7 @@
EndChar
StartChar: virgabase
-Encoding: 262 -1 262
+Encoding: 242 -1 242
Width: 166
VWidth: 2637
Flags: HW
@@ -6417,7 +5784,7 @@
EndChar
StartChar: virgabase#Cavum
-Encoding: 263 -1 263
+Encoding: 243 -1 243
Width: 166
VWidth: 2637
Flags: HW
@@ -6437,7 +5804,7 @@
EndChar
StartChar: VirgaBaseLineBL
-Encoding: 264 -1 264
+Encoding: 244 -1 244
Width: 166
VWidth: 2637
Flags: HW
@@ -6461,7 +5828,7 @@
EndChar
StartChar: VirgaBaseLineBL#Cavum
-Encoding: 265 -1 265
+Encoding: 245 -1 245
Width: 166
VWidth: 2637
Flags: HW
@@ -6481,7 +5848,7 @@
EndChar
StartChar: VirgaReversaAscendens_op
-Encoding: 266 -1 266
+Encoding: 246 -1 246
Width: 166
VWidth: 2684
Flags: HW
@@ -6508,7 +5875,7 @@
EndChar
StartChar: VirgaReversaAscendens_op#Cavum
-Encoding: 267 -1 267
+Encoding: 247 -1 247
Width: 166
VWidth: 2684
Flags: W
@@ -6529,7 +5896,7 @@
EndChar
StartChar: VirgaReversaDescendens_op
-Encoding: 268 -1 268
+Encoding: 248 -1 248
Width: 168
VWidth: 2048
Flags: HW
@@ -6557,7 +5924,7 @@
EndChar
StartChar: VirgaReversaDescendens_op#Cavum
-Encoding: 269 -1 269
+Encoding: 249 -1 249
Width: 168
VWidth: 2048
Flags: HW
@@ -6578,7 +5945,7 @@
EndChar
StartChar: VirgaReversaLongqueueAscendens_op
-Encoding: 270 -1 270
+Encoding: 250 -1 250
Width: 166
VWidth: 2684
Flags: HW
@@ -6605,7 +5972,7 @@
EndChar
StartChar: VirgaReversaLongqueueDescendens_op
-Encoding: 271 -1 271
+Encoding: 251 -1 251
Width: 168
VWidth: 2048
Flags: HW
@@ -6634,7 +6001,7 @@
EndChar
StartChar: VirgaReversaOpenqueueAscendens_op
-Encoding: 272 -1 272
+Encoding: 252 -1 252
Width: 166
VWidth: 2684
Flags: HW
@@ -6661,7 +6028,7 @@
EndChar
StartChar: VirgaReversaOpenqueueDescendens_op
-Encoding: 273 -1 273
+Encoding: 253 -1 253
Width: 168
VWidth: 2048
Flags: W
@@ -6690,7 +6057,7 @@
EndChar
StartChar: VirgulaTwo
-Encoding: 274 -1 274
+Encoding: 254 -1 254
Width: 143
VWidth: 1788
Flags: HW
@@ -6712,7 +6079,7 @@
EndChar
StartChar: VirgulaThree
-Encoding: 275 -1 275
+Encoding: 255 -1 255
Width: 143
VWidth: 2103
Flags: HW
@@ -6734,7 +6101,7 @@
EndChar
StartChar: VirgulaFour
-Encoding: 276 -1 276
+Encoding: 256 -1 256
Width: 143
VWidth: 2418
Flags: W
@@ -6757,7 +6124,7 @@
EndChar
StartChar: VirgulaFive
-Encoding: 277 -1 277
+Encoding: 257 -1 257
Width: 143
VWidth: 2733
Flags: HW
@@ -6779,7 +6146,7 @@
EndChar
StartChar: VirgulaSix
-Encoding: 278 -1 278
+Encoding: 258 -1 258
Width: 143
VWidth: 3048
Flags: HW
@@ -6800,204 +6167,130 @@
EndSplineSet
EndChar
-StartChar: VirgulaParenTwo
-Encoding: 279 -1 279
-Width: 340
-VWidth: 1788
+StartChar: StansPunctumInclinatum
+Encoding: 259 -1 259
+Width: 185
+VWidth: 2612
Flags: HW
-HStem: -63.45 84.5<116.239 181.685>
-VStem: 201.15 55.8996<-187.09 -83.284>
+HStem: -59.373 255.694
+VStem: -0.0930023 185.306
LayerCount: 2
Fore
SplineSet
-107.55 -34.8496 m 4
- 107.55 9.87012 136.183 21.0498 168.65 21.0498 c 4
- 195.23 21.0498 257.05 -2.5332 257.05 -102.45 c 4
- 257.05 -192.583 203.75 -249.783 97.1504 -274.05 c 5
- 94.8662 -271.766 91.9502 -261.704 91.9502 -258.45 c 4
- 91.9502 -256.717 92.3828 -255.417 93.25 -254.55 c 5
- 165.183 -222.482 201.15 -184.35 201.15 -140.15 c 4
- 201.15 -78.79 163.433 -69.1816 130.95 -63.4502 c 4
- 115.35 -61.7168 107.55 -52.1826 107.55 -34.8496 c 4
-262 -275.569 m 1
- 262 -275.569 322 -191.333 322 -106.29 c 0
- 322 -21.2354 262.001 63.0215 262.001 63.0215 c 1
- 262.001 63.0215 263.476 65.5684 265 66.5215 c 24
- 266.727 67.6006 270.001 68.0215 270.001 68.0215 c 1
- 270.001 68.0215 340 -18.0322 340 -106.29 c 0
- 340 -194.537 270 -280.569 270 -280.569 c 1
- 270 -280.569 266.727 -280.148 265 -279.069 c 24
- 263.476 -278.116 262 -275.569 262 -275.569 c 1
-78 -275.569 m 1
- 78 -275.569 76.5244 -278.116 75 -279.069 c 24
- 73.2734 -280.148 70 -280.569 70 -280.569 c 1
- 70 -280.569 0 -194.537 0 -106.29 c 0
- 0 -18.0322 69.999 68.0215 69.999 68.0215 c 1
- 69.999 68.0215 73.2734 67.6006 75 66.5215 c 24
- 76.5244 65.5684 77.999 63.0215 77.999 63.0215 c 1
- 77.999 63.0215 18 -21.2354 18 -106.29 c 0
- 18 -191.333 78 -275.569 78 -275.569 c 1
+185.568 68 m 1
+ 93 -59.918 l 1
+ -0.31543 68 l 1
+ 93 196.93 l 1
+ 185.568 68 l 1
EndSplineSet
EndChar
-StartChar: VirgulaParenThree
-Encoding: 280 -1 280
-Width: 340
-VWidth: 2103
+StartChar: StansPunctumInclinatum#Cavum
+Encoding: 260 -1 260
+Width: 185
+VWidth: 2612
Flags: HW
-HStem: -63.45 84.5<116.239 181.685>
-VStem: 201.15 55.8996<-187.09 -83.284>
+HStem: -21.0186 178.986
+VStem: 27.7031 129.714
LayerCount: 2
Fore
SplineSet
-262 39.4307 m 1
- 262 39.4307 322 123.667 322 208.71 c 0
- 322 293.765 262.001 378.021 262.001 378.021 c 1
- 262.001 378.021 263.476 380.568 265 381.521 c 24
- 266.727 382.601 270.001 383.021 270.001 383.021 c 1
- 270.001 383.021 340 296.968 340 208.71 c 0
- 340 120.463 270 34.4307 270 34.4307 c 1
- 270 34.4307 266.727 34.8516 265 35.9307 c 24
- 263.476 36.8838 262 39.4307 262 39.4307 c 1
-78 39.4307 m 1
- 78 39.4307 76.5244 36.8838 75 35.9307 c 24
- 73.2734 34.8516 70 34.4307 70 34.4307 c 1
- 70 34.4307 0 120.463 0 208.71 c 0
- 0 296.968 69.999 383.021 69.999 383.021 c 1
- 69.999 383.021 73.2734 382.601 75 381.521 c 24
- 76.5244 380.568 77.999 378.021 77.999 378.021 c 1
- 77.999 378.021 18 293.765 18 208.71 c 0
- 18 123.667 78 39.4307 78 39.4307 c 1
-107.55 280.15 m 4
- 107.55 324.87 136.183 336.05 168.65 336.05 c 0
- 195.23 336.05 257.05 312.467 257.05 212.55 c 0
- 257.05 122.417 203.75 65.2168 97.1504 40.9502 c 1
- 94.8662 43.2344 91.9502 53.2959 91.9502 56.5498 c 0
- 91.9502 58.2832 92.3828 59.583 93.25 60.4502 c 1
- 165.183 92.5176 201.15 130.65 201.15 174.85 c 0
- 201.15 236.21 163.433 245.818 130.95 251.55 c 0
- 115.35 253.283 107.55 262.817 107.55 280.15 c 4
+157.664 68 m 5
+ 93 -21.3965 l 1
+ 27.5449 68 l 5
+ 93 158.397 l 1
+ 157.664 68 l 5
EndSplineSet
EndChar
-StartChar: VirgulaParenFour
-Encoding: 281 -1 281
-Width: 340
-VWidth: 2418
+StartChar: DivisioMinimisTwo
+Encoding: 261 -1 261
+Width: 19
+VWidth: 1533
Flags: HW
-HStem: -63.45 84.5<116.239 181.685>
-VStem: 201.15 55.8996<-187.09 -83.284>
+HStem: 284.431 318.553
+VStem: 0 19<285.972 602.984>
LayerCount: 2
Fore
SplineSet
-262 354.431 m 1
- 262 354.431 322 438.667 322 523.71 c 0
- 322 608.765 262.001 693.021 262.001 693.021 c 1
- 262.001 693.021 263.476 695.568 265 696.521 c 24
- 266.727 697.601 270.001 698.021 270.001 698.021 c 1
- 270.001 698.021 340 611.968 340 523.71 c 0
- 340 435.463 270 349.431 270 349.431 c 1
- 270 349.431 266.727 349.852 265 350.931 c 24
- 263.476 351.884 262 354.431 262 354.431 c 1
-78 354.431 m 1
- 78 354.431 76.5244 351.884 75 350.931 c 24
- 73.2734 349.852 70 349.431 70 349.431 c 1
- 70 349.431 0 435.463 0 523.71 c 0
- 0 611.968 69.999 698.021 69.999 698.021 c 1
- 69.999 698.021 73.2734 697.601 75 696.521 c 24
- 76.5244 695.568 77.999 693.021 77.999 693.021 c 1
- 77.999 693.021 18 608.765 18 523.71 c 0
- 18 438.667 78 354.431 78 354.431 c 1
-107.55 595.15 m 4
- 107.55 639.87 136.183 651.05 168.65 651.05 c 0
- 195.23 651.05 257.05 627.467 257.05 527.55 c 0
- 257.05 437.417 203.75 380.217 97.1504 355.95 c 1
- 94.8662 358.234 91.9502 368.296 91.9502 371.55 c 0
- 91.9502 373.283 92.3828 374.583 93.25 375.45 c 1
- 165.183 407.518 201.15 445.65 201.15 489.85 c 0
- 201.15 551.21 163.433 560.818 130.95 566.55 c 4
- 115.35 568.283 107.55 577.817 107.55 595.15 c 4
+0 0.12793 m 13
+ 0 167.984 l 25
+ 18.999 168.021 l 25
+ 19 -6.56934 l 21
+ 6.04395 -6.43457 2.43457 -3.39062 0 0.12793 c 13
EndSplineSet
EndChar
-StartChar: VirgulaParenFive
-Encoding: 282 -1 282
-Width: 340
-VWidth: 2733
+StartChar: DivisioMinimisThree
+Encoding: 262 -1 262
+Width: 19
+VWidth: 1733
Flags: HW
-HStem: -63.45 84.5<116.239 181.685>
-VStem: 201.15 55.8996<-187.09 -83.284>
+HStem: 49.431 318.553
+VStem: 0 19<50.972 367.984>
LayerCount: 2
Fore
SplineSet
-262 669.431 m 1
- 262 669.431 322 753.667 322 838.71 c 0
- 322 923.765 262.001 1008.02 262.001 1008.02 c 1
- 262.001 1008.02 263.476 1010.57 265 1011.52 c 24
- 266.727 1012.6 270.001 1013.02 270.001 1013.02 c 1
- 270.001 1013.02 340 926.968 340 838.71 c 0
- 340 750.463 270 664.431 270 664.431 c 1
- 270 664.431 266.727 664.852 265 665.931 c 24
- 263.476 666.884 262 669.431 262 669.431 c 1
-78 669.431 m 1
- 78 669.431 76.5244 666.884 75 665.931 c 24
- 73.2734 664.852 70 664.431 70 664.431 c 1
- 70 664.431 0 750.463 0 838.71 c 0
- 0 926.968 69.999 1013.02 69.999 1013.02 c 1
- 69.999 1013.02 73.2734 1012.6 75 1011.52 c 24
- 76.5244 1010.57 77.999 1008.02 77.999 1008.02 c 1
- 77.999 1008.02 18 923.765 18 838.71 c 0
- 18 753.667 78 669.431 78 669.431 c 1
-107.55 910.15 m 4
- 107.55 954.87 136.183 966.05 168.65 966.05 c 0
- 195.23 966.05 257.05 942.467 257.05 842.55 c 0
- 257.05 752.417 203.75 695.217 97.1504 670.95 c 1
- 94.8662 673.234 91.9502 683.296 91.9502 686.55 c 0
- 91.9502 688.283 92.3828 689.583 93.25 690.45 c 1
- 165.183 722.518 201.15 760.65 201.15 804.85 c 0
- 201.15 866.21 163.433 875.818 130.95 881.55 c 0
- 115.35 883.283 107.55 892.817 107.55 910.15 c 4
+0 315.128 m 13
+ 0 482.984 l 25
+ 18.999 483.021 l 25
+ 19 308.431 l 21
+ 6.04395 308.565 2.43457 311.609 0 315.128 c 13
EndSplineSet
EndChar
-StartChar: VirgulaParenSix
-Encoding: 283 -1 283
-Width: 340
-VWidth: 3048
+StartChar: DivisioMinimisFour
+Encoding: 263 -1 263
+Width: 19
+VWidth: 2048
Flags: HW
-HStem: -63.45 84.5<116.239 181.685>
-VStem: 201.15 55.8996<-187.09 -83.284>
+HStem: 364.431 318.553
+VStem: 0 19<365.972 682.984>
LayerCount: 2
Fore
SplineSet
-262 984.431 m 1
- 262 984.431 322 1068.67 322 1153.71 c 0
- 322 1238.76 262.001 1323.02 262.001 1323.02 c 1
- 262.001 1323.02 263.476 1325.57 265 1326.52 c 24
- 266.727 1327.6 270.001 1328.02 270.001 1328.02 c 1
- 270.001 1328.02 340 1241.97 340 1153.71 c 0
- 340 1065.46 270 979.431 270 979.431 c 1
- 270 979.431 266.727 979.852 265 980.931 c 24
- 263.476 981.884 262 984.431 262 984.431 c 1
-78 984.431 m 1
- 78 984.431 76.5244 981.884 75 980.931 c 24
- 73.2734 979.852 70 979.431 70 979.431 c 1
- 70 979.431 0 1065.46 0 1153.71 c 0
- 0 1241.97 69.999 1328.02 69.999 1328.02 c 1
- 69.999 1328.02 73.2734 1327.6 75 1326.52 c 24
- 76.5244 1325.57 77.999 1323.02 77.999 1323.02 c 1
- 77.999 1323.02 18 1238.76 18 1153.71 c 0
- 18 1068.67 78 984.431 78 984.431 c 1
-107.55 1225.15 m 4
- 107.55 1269.87 136.183 1281.05 168.65 1281.05 c 0
- 195.23 1281.05 257.05 1257.47 257.05 1157.55 c 0
- 257.05 1067.42 203.75 1010.22 97.1504 985.95 c 1
- 94.8662 988.234 91.9502 998.296 91.9502 1001.55 c 0
- 91.9502 1003.28 92.3828 1004.58 93.25 1005.45 c 1
- 165.183 1037.52 201.15 1075.65 201.15 1119.85 c 0
- 201.15 1181.21 163.433 1190.82 130.95 1196.55 c 0
- 115.35 1198.28 107.55 1207.82 107.55 1225.15 c 4
+0 630.128 m 13
+ 0 797.984 l 25
+ 18.999 798.021 l 25
+ 19 623.431 l 21
+ 6.04395 623.565 2.43457 626.609 0 630.128 c 13
EndSplineSet
EndChar
+
+StartChar: DivisioMinimisFive
+Encoding: 264 -1 264
+Width: 19
+VWidth: 2363
+Flags: HW
+HStem: 679.431 318.553
+VStem: 0 19<680.972 997.984>
+LayerCount: 2
+Fore
+SplineSet
+0 945.128 m 13
+ 0 1112.98 l 25
+ 18.999 1113.02 l 25
+ 19 938.431 l 21
+ 6.04395 938.565 2.43457 941.609 0 945.128 c 13
+EndSplineSet
+EndChar
+
+StartChar: DivisioMinimisSix
+Encoding: 265 -1 265
+Width: 19
+VWidth: 2678
+Flags: HW
+HStem: 994.431 318.553
+VStem: 0 19<995.972 1312.98>
+LayerCount: 2
+Fore
+SplineSet
+0 1260.13 m 13
+ 0 1427.98 l 25
+ 18.999 1428.02 l 25
+ 19 1253.43 l 21
+ 6.04395 1253.56 2.43457 1256.61 0 1260.13 c 13
+EndSplineSet
+EndChar
EndChars
EndSplineFont
Modified: branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gregall.sfd
===================================================================
--- branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gregall.sfd 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gregall.sfd 2021-03-04 22:26:49 UTC (rev 58132)
@@ -3,7 +3,7 @@
FullName: gregall
FamilyName: gregall
Weight: Book
-Copyright: gregall font, created with FontForge.\nCopyright (C) 2014-2021 Jakub Jelinek <jakub at redhat.com>\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to u!
se, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT,!
INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright: gregall font, created with FontForge.\nCopyright (C) 2014-2019 Jakub Jelinek <jakub at redhat.com>\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to u!
se, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT,!
INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE.
Version: 0.1
ItalicAngle: 0
UnderlinePosition: -100
Modified: branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gresgmodern.sfd
===================================================================
--- branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gresgmodern.sfd 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/gresgmodern.sfd 2021-03-04 22:26:49 UTC (rev 58132)
@@ -3,7 +3,7 @@
FullName: gresgmodern
FamilyName: gresgmodern
Weight: Normal
-Copyright: (c) 2011 Association Saint-Benoit, Notre-Dame de Bellaigue, FR 63330 VIRLET\n\n(c) 2014-2021 Jakub Jelinek <jakub at redhat.com>\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na c!
opy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING A!
NY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright: (c) 2011 Association Saint-Benoit, Notre-Dame de Bellaigue, FR 63330 VIRLET\n\n(c) 2014-2019 Jakub Jelinek <jakub at redhat.com>\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na c!
opy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING A!
NY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE.
Version: 0.3
ItalicAngle: 0
UnderlinePosition: -150
Modified: branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
===================================================================
--- branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/squarize.py 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/fonts/source/gregoriotex/squarize.py 2021-03-04 22:26:49 UTC (rev 58132)
@@ -6,7 +6,7 @@
"""
Python fontforge script to build a square notation font.
- Copyright (C) 2013-2021 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2013-2019 The Gregorio Project (see CONTRIBUTORS.md)
This file is part of Gregorio.
@@ -90,7 +90,7 @@
14 : 'Fourteen',
}
-GREGORIO_VERSION = '6.0.0-beta1'
+GREGORIO_VERSION = '5.2.1'
# The unicode character at which we start our numbering:
# U+E000 is the start of the BMP Private Use Area
@@ -254,27 +254,12 @@
'CClefChange' : False,
'FClefChange' : False,
'Flat' : False,
- 'FlatHole' : False,
- 'FlatParen' : False,
- 'FlatParenHole' : False,
'Natural' : False,
- 'NaturalHole' : False,
- 'NaturalParen' : False,
- 'NaturalParenHole' : False,
- 'Sharp' : False,
- 'SharpHole' : False,
- 'SharpParen' : False,
- 'SharpParenHole' : False,
'VirgulaTwo' : False,
'VirgulaThree' : False,
'VirgulaFour' : False,
'VirgulaFive' : False,
'VirgulaSix' : False,
- 'VirgulaParenTwo' : False,
- 'VirgulaParenThree' : False,
- 'VirgulaParenFour' : False,
- 'VirgulaParenFive' : False,
- 'VirgulaParenSix' : False,
'DivisioMinimisTwo' : False,
'DivisioMinimisThree' : False,
'DivisioMinimisFour' : False,
@@ -285,11 +270,6 @@
'DivisioMinimaFour' : False,
'DivisioMinimaFive' : False,
'DivisioMinimaSix' : False,
- 'DivisioMinimaParenTwo' : False,
- 'DivisioMinimaParenThree' : False,
- 'DivisioMinimaParenFour' : False,
- 'DivisioMinimaParenFive' : False,
- 'DivisioMinimaParenSix' : False,
'DivisioMinorTwo' : False,
'DivisioMinorThree' : False,
'DivisioMinorFour' : False,
@@ -343,8 +323,12 @@
'SemicirculusReversus' : False,
'PunctumAscendens' : True,
'PunctumDescendens' : True,
+ 'FlatHole' : False,
+ 'NaturalHole' : False,
'DivisioDominican' : False,
'DivisioDominicanAlt' : False,
+ 'Sharp' : False,
+ 'SharpHole' : False,
'Linea' : True,
'RoundBrace' : False,
'CurlyBrace' : False,
@@ -1114,13 +1098,8 @@
'HEpisemaFlat': 'Flat',
'HEpisemaSharp': 'Sharp',
'HEpisemaNatural': 'Natural',
- 'HEpisemaBarStandard': 'DivisioMinimaTwo',
- 'HEpisemaBarVirgula': 'VirgulaTwo',
- 'HEpisemaBarParen': 'DivisioMinimaParenTwo',
- 'HEpisemaBarVirgulaParen': 'VirgulaParenTwo',
- 'HEpisemaFlatParen': 'FlatParen',
- 'HEpisemaSharpParen': 'SharpParen',
- 'HEpisemaNaturalParen': 'NaturalParen',
+ 'HEpisemaBarStandard': 'DivisioMinima',
+ 'HEpisemaBarVirgula': 'Virgula',
}
def hepisema():
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
===================================================================
(Binary files differ)
Modified: branches/branch2020.0/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh
===================================================================
--- branches/branch2020.0/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh 2021-03-04 22:26:49 UTC (rev 58132)
@@ -8,7 +8,6 @@
$RM tex/luatex/gregoriotex/gregoriotex-chars.tex
$RM tex/luatex/gregoriotex/gregoriotex-common.tex
-$RM tex/luatex/gregoriotex/gregoriotex-gsp-default.tex
$RM tex/luatex/gregoriotex/gregoriotex-main.tex
$RM tex/luatex/gregoriotex/gregoriotex-nabc.tex
$RM tex/luatex/gregoriotex/gregoriotex-signs.tex
@@ -16,6 +15,7 @@
$RM tex/luatex/gregoriotex/gregoriotex-syllable.tex
$RM tex/luatex/gregoriotex/gregoriotex-symbols.tex
$RM tex/luatex/gregoriotex/gregoriotex.tex
+$RM tex/luatex/gregoriotex/gsp-default.tex
$RM tex/luatex/gregoriotex/gregoriotex-nabc.lua
$RM tex/luatex/gregoriotex/gregoriotex-signs.lua
$RM tex/luatex/gregoriotex/gregoriotex-symbols.lua
@@ -46,7 +46,6 @@
$RM doc/luatex/gregoriotex/Gabc.tex
$RM doc/luatex/gregoriotex/GregorioNabcRef.tex
$RM doc/luatex/gregoriotex/GregorioRef.tex
-$RM doc/luatex/gregoriotex/gsp-sample.tex
$RM doc/luatex/gregoriotex/GregorioRef.lua
$RM doc/luatex/gregoriotex/factus.gabc
$RM doc/luatex/gregoriotex/omnes.gabc
@@ -72,9 +71,6 @@
$RM fonts/source/gregoriotex/gregall.sfd
$RM fonts/source/gregoriotex/gresgmodern.sfd
$RM fonts/source/gregoriotex/fonts_README.md
-$RM fonts/source/gregoriotex/grelaon.sfd
-$RM fonts/source/gregoriotex/stemsschemas.py
-$RM fonts/source/gregoriotex/simplify.py
$RM fonts/source/gregoriotex/granapadano-base.sfd
$RM fonts/source/gregoriotex/greciliae-base.sfd
$RM fonts/source/gregoriotex/gregorio-base.sfd
Modified: branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,15 +19,13 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
- [2021/02/23 v6.0.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2019/04/06 v5.2.1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
-\RequirePackage{iftex}%
-\RequireLuaTeX
-
% 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 at symbols@loaded\endcsname\endinput\fi%
\RequirePackage{kvoptions}%
+\RequirePackage{ifluatex}%
\RequirePackage{luatexbase}%
\RequirePackage{luaotfload}
\RequirePackage{luamplib}%
@@ -41,7 +39,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre at gregoriotexversion{6.0.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{5.2.1}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre at declarefileversion}[2]{\relax}
Modified: branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX LaTeX style.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,17 +19,14 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
- [2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2019/04/06 v5.2.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
-\RequirePackage{iftex}%
-\RequireLuaTeX
-
% 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 at symbols@loaded\endcsname\gre at error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi%
\RequirePackage{xcolor}%
-\RequirePackage{luacolor}%
\RequirePackage{kvoptions}%
+\RequirePackage{ifluatex}%
\RequirePackage{graphicx}% for \resizebox
\RequirePackage{luatexbase}%
\RequirePackage{luaotfload}%
@@ -105,22 +102,22 @@
%%%%%%%%%
\def\GreItalic#1{%
- {\itshape #1}%
+ \textit{#1}%
\relax %
}
\def\GreSmallCaps#1{%
- {\scshape #1}%
+ \textsc{#1}%
\relax %
}
\def\GreBold#1{%
- {\bfseries #1}%
+ \textbf{#1}%
\relax %
}
\def\GreTypewriter#1{%
- {\ttfamily #1}%
+ \texttt{#1}%
\relax %
}
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,5 +1,5 @@
# Vowel rule file for Gregorio
-# Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-\gre at declarefileversion{gregoriotex-chars.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-chars.tex}{5.2.1}% GREGORIO_VERSION
\def\gre at char@fuse at punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre at char@fuse at quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
@@ -83,26 +83,15 @@
\gre at def@char at he{flat}{Flat}%
\gre at def@char at he{sharp}{Sharp}%
\gre at def@char at he{natural}{Natural}%
-\gre at def@char at he{flatparen}{FlatParen}%
-\gre at def@char at he{sharpparen}{SharpParen}%
-\gre at def@char at he{naturalparen}{NaturalParen}%
\gre at def@char at he{barstandard}{BarStandard}%
-\gre at def@char at he{barparen}{BarParen}%
\gre at def@char at he{barvirgula}{BarVirgula}%
-\gre at def@char at he{barvirgulaparen}{BarVirgulaParen}%
\def\gre at fontchar@flat{\gre at font@music\GreCPFlat}%
\def\gre at fontchar@flathole{\gre at font@music\GreCPFlatHole}%
-\def\gre at fontchar@flatparen{\gre at font@music\GreCPFlatParen}%
-\def\gre at fontchar@flatparenhole{\gre at font@music\GreCPFlatParenHole}%
\def\gre at fontchar@natural{\gre at font@music\GreCPNatural}%
\def\gre at fontchar@naturalhole{\gre at font@music\GreCPNaturalHole}%
-\def\gre at fontchar@naturalparen{\gre at font@music\GreCPNaturalParen}%
-\def\gre at fontchar@naturalparenhole{\gre at font@music\GreCPNaturalParenHole}%
\def\gre at fontchar@sharp{\gre at font@music\GreCPSharp}%
\def\gre at fontchar@sharphole{\gre at font@music\GreCPSharpHole}%
-\def\gre at fontchar@sharpparen{\gre at font@music\GreCPSharpParen}%
-\def\gre at fontchar@sharpparenhole{\gre at font@music\GreCPSharpParenHole}%
\def\gre at fontchar@cclef{\gre at font@music\GreCPCClef}%
\def\gre at fontchar@fclef{\gre at font@music\GreCPFClef}%
\def\gre at fontchar@incclef{\gre at font@music\GreCPCClefChange}%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX common file (stuff needed by both gregoriotex and gregoriosyms)
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -17,11 +17,8 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-\gre at declarefileversion{gregoriotex-common.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-commonx.tex}{5.2.1}% GREGORIO_VERSION
-\ifnum\luatexversion<76%
- \gre at error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}%
-\fi%
%%%%%%%%%
%% Debugging
@@ -71,27 +68,15 @@
% #2 - the correct macro to use
\def\gre at deprecated#1#2{%
\ifgre at allowdeprecated%
- \ifx&%
- \gre at warning{#1\space is deprecated and marked for removal}%
- \else%
- \gre at warning{#1\space is deprecated.\MessageBreak Use #2\space instead}%
- \fi%
+ \gre at warning{#1\space is deprecated.\MessageBreak Use #2\space instead}%
\else%
- \ifx&%
- \gre at error{#1\space is deprecated and marked for removal}%
- \else%
- \gre at error{#1\space is deprecated.\MessageBreak Use #2\space instead}%
- \fi%
+ \gre at error{#1\space is deprecated.\MessageBreak Use #2\space instead}%
\fi%
\relax%
}%
\def\gre at obsolete#1#2{%
- \ifx&%
- \gre at error{#1\space is obsolete and no longer has any effect}%
- \else%
- \gre at error{#1\space is obsolete.\MessageBreak Use #2\space instead}%
- \fi%
+ \gre at error{#1\space is obsolete.\MessageBreak Use #2\space instead}%
\relax%
}%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX main file.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -21,8 +21,18 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre at gregoriotexversion{6.0.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{5.2.1}% GREGORIO_VERSION - VersionManager.py
+\ifluatex%
+ \ifnum\luatexversion<76%
+ \gre at error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}%
+ \fi%
+\else%
+ \gre at error{Error: this document must be compiled with LuaTeX (lualatex)}%
+\fi%
+
+
+
% first some macros to allow checks for version:
% Tests that all gregoriotex files are of the same version.
% #1 is the name of the file
@@ -621,6 +631,16 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% macros for the score reference (unused)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\grescorereference#1{% OBSOLETE
+ \gre at error{\protect\grescorereference\space is obsolete.\MessageBreak It does nothing; stop using it.}%
+ \relax %
+}%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting the things above the initial
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -730,28 +750,14 @@
% - typeset the text above the lines if relevant, and making sure we execute it only once
% - not do anything else
-\newif\ifgre at showabovelinestext%
-\gre at showabovelinestexttrue%
-
-\def\gresetabovelinestext#1{%
- \IfStrEqCase{#1}{%
- {visible}{\gre at showabovelinestexttrue}%
- {invisible}{\gre at showabovelinestextfalse}%
- }[% all other cases
- \gre at error{Unknown option, "#1" for \protect\gresetabovelinestext\MessageBreak Possible options are: 'visible' and 'invisible'}%
- ]%
-}%
-
\xdef\gre at currenttextabovelines{}%
\def\GreSetTextAboveLines#1{%
- \ifgre at showabovelinestext%
- \gdef\gre at currenttextabovelines{%
- \gre at typesettextabovelines{#1}{0}%
- \gdef\gre at currenttextabovelines{}%
- \relax %
- }%
- \fi%
+ \gdef\gre at currenttextabovelines{%
+ \gre at typesettextabovelines{#1}{0}%
+ \gdef\gre at currenttextabovelines{}%
+ \relax %
+ }%
}%
% typesets the text or nabc neumes above the line
@@ -1031,45 +1037,29 @@
]%
}%
-\newif\ifgre at showtranslation%
-\gre at showtranslationtrue%
-
-\def\gresettranslation#1{%
- \IfStrEqCase{#1}{%
- {visible}{\gre at showtranslationtrue}%
- {invisible}{\gre at showtranslationfalse}%
- }[% all other cases
- \gre at error{Unknown option, "#1" for \protect\gresettranslation\MessageBreak Possible options are: 'visible' and 'invisible'}%
- ]%
-}%
-
\def\GreWriteTranslation#1{%
- \ifgre at showtranslation%
- \ifgre at translationcentering %
- \setbox\gre at box@temp at width=\hbox{#1}%
- \gre at dimen@temp at five=\dimexpr((\wd\gre at box@syllabletext - \wd\gre at box@temp at width) / 2)\relax%
- \gre at mark@translation %
- \kern\gre at dimen@temp at five %
- \raise\gre at space@dimen at spacebeneathtext\hbox to 0pt{\vbox to 0pt{\vss\hbox to 0pt{\gre at style@translation#1\endgre at style@translation\hss}}}%
- \kern-\gre at dimen@temp at five %
- \else %
- \gre at mark@translation %
- \raise\gre at space@dimen at spacebeneathtext\hbox to 0pt{\vbox to 0pt{\vss\hbox to 0pt{\gre at style@translation#1\endgre at style@translation\hss}}}%
- \fi %
- \fi%
+ \ifgre at translationcentering %
+ \setbox\gre at box@temp at width=\hbox{#1}%
+ \gre at dimen@temp at five=\dimexpr((\wd\gre at box@syllabletext - \wd\gre at box@temp at width) / 2)\relax%
+ \gre at mark@translation %
+ \kern\gre at dimen@temp at five %
+ \raise\gre at space@dimen at spacebeneathtext\hbox to 0pt{\vbox to 0pt{\vss\hbox to 0pt{\gre at style@translation#1\endgre at style@translation\hss}}}%
+ \kern-\gre at dimen@temp at five %
+ \else %
+ \gre at mark@translation %
+ \raise\gre at space@dimen at spacebeneathtext\hbox to 0pt{\vbox to 0pt{\vss\hbox to 0pt{\gre at style@translation#1\endgre at style@translation\hss}}}%
+ \fi %
}%
\def\GreWriteTranslationWithCenterBeginning#1{%
- \ifgre at showtranslation%
- \ifgre at breakintranslation\else%
- \GreBeginNLBArea{0}{1}%
- \fi %
- \gre at attr@center=1\relax %
- \gre at mark@translation %
- \raise\gre at space@dimen at spacebeneathtext\hbox to 0pt{\kern 0pt\vbox to 0pt{\vss\hbox to 0pt{\gre at style@translation#1\endgre at style@translation\hss}}\kern 0pt}%
- \unsetluatexattribute{\gre at attr@center}%
- \relax %
- \fi%
+ \ifgre at breakintranslation\else%
+ \GreBeginNLBArea{0}{1}%
+ \fi %
+ \gre at attr@center=1\relax %
+ \gre at mark@translation %
+ \raise\gre at space@dimen at spacebeneathtext\hbox to 0pt{\kern 0pt\vbox to 0pt{\vss\hbox to 0pt{\gre at style@translation#1\endgre at style@translation\hss}}\kern 0pt}%
+ \unsetluatexattribute{\gre at attr@center}%
+ \relax %
}%
\newif\ifgre at mustdotranslationcenterend%
@@ -1076,10 +1066,8 @@
\gre at mustdotranslationcenterendfalse%
\def\GreTranslationCenterEnd{%
- \ifgre at showtranslation%
- \gre at mustdotranslationcenterendtrue%
- \relax %
- \fi%
+ \gre at mustdotranslationcenterendtrue%
+ \relax %
}%
\def\gre at dotranslationcenterend{%
@@ -1126,19 +1114,6 @@
]%
}%
-\newif\ifgre at noteadditionalspacelinestext%
-\def\gresetnoteadditionalspacelinestext#1{%
- \IfStrEqCase{#1}{%
- {automatic}%
- {\gre at noteadditionalspacelinestextfalse}%
- {manual}%
- {\gre at noteadditionalspacelinestexttrue}%
- }[% all other cases
- \gre at error{Unrecognized option "#1" for \protect\gresetnoteadditionalspacelinestext\MessageBreak Possible options are: 'automatic' and 'manual'}%
- ]%
-}%
-\gresetnoteadditionalspacelinestext{automatic}%default setting
-
% gre at attr@dash (see its definition in gregorio-syllable) is 0 when we are in a score, and unset when we are not
\newif\ifgre at beginningofscore%
@@ -1161,14 +1136,10 @@
\let\gre at pitch@overbrace\gre at pitch@i %
\let\gre at char@bar at virgula\GreCPVirgulaTwo %
\let\gre at char@bar at virgulahigh\GreCPVirgulaThree %
- \let\gre at char@bar at virgulaparen\GreCPVirgulaParenTwo %
- \let\gre at char@bar at virgulaparenhigh\GreCPVirgulaParenThree %
\let\gre at char@bar at divisiominimis\GreCPDivisioMinimisTwo %
\let\gre at char@bar at divisiominimishigh\GreCPDivisioMinimisThree %
\let\gre at char@bar at divisiominima\GreCPDivisioMinimaTwo %
\let\gre at char@bar at divisiominimahigh\GreCPDivisioMinimaThree %
- \let\gre at char@bar at divisiominimaparen\GreCPDivisioMinimaParenTwo %
- \let\gre at char@bar at divisiominimaparenhigh\GreCPDivisioMinimaParenThree %
\let\gre at char@bar at divisiominor\GreCPDivisioMinorTwo %
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorTwo %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedTwo %
@@ -1184,14 +1155,10 @@
\let\gre at pitch@overbrace\gre at pitch@k %
\let\gre at char@bar at virgula\GreCPVirgulaThree %
\let\gre at char@bar at virgulahigh\GreCPVirgulaFour %
- \let\gre at char@bar at virgulaparen\GreCPVirgulaParenThree %
- \let\gre at char@bar at virgulaparenhigh\GreCPVirgulaParenFour %
\let\gre at char@bar at divisiominimis\GreCPDivisioMinimisThree %
\let\gre at char@bar at divisiominimishigh\GreCPDivisioMinimisFour %
\let\gre at char@bar at divisiominima\GreCPDivisioMinimaThree %
\let\gre at char@bar at divisiominimahigh\GreCPDivisioMinimaFour %
- \let\gre at char@bar at divisiominimaparen\GreCPDivisioMinimaParenThree %
- \let\gre at char@bar at divisiominimaparenhigh\GreCPDivisioMinimaParenFour %
\let\gre at char@bar at divisiominor\GreCPDivisioMinorThree %
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorThree %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedThree %
@@ -1207,14 +1174,10 @@
\let\gre at pitch@overbrace\gre at pitch@m %
\let\gre at char@bar at virgula\GreCPVirgulaFour %
\let\gre at char@bar at virgulahigh\GreCPVirgulaFive %
- \let\gre at char@bar at virgulaparen\GreCPVirgulaParenFour %
- \let\gre at char@bar at virgulaparenhigh\GreCPVirgulaParenFive %
\let\gre at char@bar at divisiominimis\GreCPDivisioMinimisFour %
\let\gre at char@bar at divisiominimishigh\GreCPDivisioMinimisFive %
\let\gre at char@bar at divisiominima\GreCPDivisioMinimaFour %
\let\gre at char@bar at divisiominimahigh\GreCPDivisioMinimaFive %
- \let\gre at char@bar at divisiominimaparen\GreCPDivisioMinimaParenFour %
- \let\gre at char@bar at divisiominimaparenhigh\GreCPDivisioMinimaParenFive %
\let\gre at char@bar at divisiominor\GreCPDivisioMinorFour %
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorFour %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedFour %
@@ -1230,14 +1193,10 @@
\let\gre at pitch@overbrace\gre at pitch@p %
\let\gre at char@bar at virgula\GreCPVirgulaFive %
\let\gre at char@bar at virgulahigh\GreCPVirgulaSix %
- \let\gre at char@bar at virgulaparen\GreCPVirgulaParenFive %
- \let\gre at char@bar at virgulaparenhigh\GreCPVirgulaParenSix %
\let\gre at char@bar at divisiominimis\GreCPDivisioMinimisFive %
\let\gre at char@bar at divisiominimishigh\GreCPDivisioMinimisSix %
\let\gre at char@bar at divisiominima\GreCPDivisioMinimaFive %
\let\gre at char@bar at divisiominimahigh\GreCPDivisioMinimaSix %
- \let\gre at char@bar at divisiominimaparen\GreCPDivisioMinimaParenFive %
- \let\gre at char@bar at divisiominimaparenhigh\GreCPDivisioMinimaParenSix %
\let\gre at char@bar at divisiominor\GreCPDivisioMinorFive %
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorFive %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedFive %
@@ -1283,6 +1242,8 @@
\gre at computespaces%
\gre at cancelpenalties %
\gre at attr@dash=0\relax %
+ \xdef\gre at exhyphencharsave{\the\exhyphenchar}%
+ \exhyphenchar=-1\relax %
\gre at generatelines %
\noindent%
\gre at calculate@additionalspaces{#2}{#3}{#4}{#5}%
@@ -1333,6 +1294,7 @@
\gre at removetranslationspace %
\gre at normalinitial %
\gre at restorepenalties %
+ \exhyphenchar=\gre at exhyphencharsave %
\gre at dimen@temp at one=0pt\relax%
\gre at dimen@temp at two=0pt\relax%
\gre at dimen@temp at three=0pt\relax%
@@ -1585,10 +1547,6 @@
%% 20: space between a punctum inclinatum and a "no-bar" glyph two pitches above
%% 21: space between a punctum inclinatum and a "no-bar" glyph three or four pitches above
%% 22: half-space
-%% 23: Space between two puncta inclinata on a unison
-%% 24: Space before a right-leaning puncta inclinatum when the pitch is ascending (up to 4 pitches away)
-%% 25: Space before a left-leaning puncta inclinatum when the pitch is descending (up to 4 pitches away)
-%% 26: Space after after a non-punctum inclinatum and before the upright punctum inclinatum
\def\gre at get@spaceskip#1{%
\gre at trace{gre at get@spaceskip{#1}}%
\ifcase#1%
@@ -1644,7 +1602,7 @@
\or% case 25
\gre at skip@temp at four = \gre at space@skip at ascendingpunctuminclinatumdescendingshift\relax%
\or% case 26
- \gre at skip@temp at four = \gre at space@skip at uprightpunctuminclinatumshift\relax%
+ \gre at skip@temp at four = \gre at space@skip at unisonpunctuminclinatumshift\relax%
\else%
\gre at error{Unrecognized spaceskip #1}%
\fi%
@@ -1667,13 +1625,13 @@
% 2: no line break area due to <nlba> tag
\xdef\gre at nlbstate{0}%
-\newcount\gre at saved@prenlba at nobreakpenalty%
-\newcount\gre at saved@prenlba at endofwordpenalty%
-\newcount\gre at saved@prenlba at endofsyllablepenalty%
-\newcount\gre at saved@prenlba at endafterbarpenalty%
-\newcount\gre at saved@prenlba at endafterbaraltpenalty%
-\newcount\gre at saved@prenlba at endofelementpenalty%
-\newcount\gre at saved@prenlba at hyphenpenalty%
+\newcount\gre at nobreakpenaltysave%
+\newcount\gre at endofwordpenaltysave%
+\newcount\gre at endofsyllablepenaltysave%
+\newcount\gre at endafterbarpenaltysave%
+\newcount\gre at endafterbaraltpenaltysave%
+\newcount\gre at endofelementpenaltysave%
+%\newcount\gre at 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{%
@@ -1690,25 +1648,20 @@
\fi %
\fi %
\ifnum\gre at nlbinitialstate=0\relax %
- \global\gre at saved@prenlba at nobreakpenalty=\gre at space@count at nobreakpenalty\relax %
+ \global\gre at nobreakpenaltysave=\gre at space@count at nobreakpenalty\relax %
+ \global\gre at endofwordpenaltysave=\gre at space@count at endofwordpenalty\relax %
+ \global\gre at endofsyllablepenaltysave=\gre at space@count at endofsyllablepenalty\relax %
+ \global\gre at endafterbarpenaltysave=\gre at space@count at endafterbarpenalty\relax %
+ \global\gre at endafterbaraltpenaltysave=\gre at space@count at endafterbaraltpenalty\relax %
+ \global\gre at endofelementpenaltysave=\gre at space@count at endofelementpenalty\relax %
+ \global\gre at hyphenpenaltysave=\gre at space@count at hyphenpenalty\relax %
+ %
\global\gre at space@count at nobreakpenalty=10001\relax %
- %
- \global\gre at saved@prenlba at endofwordpenalty=\gre at space@count at endofwordpenalty\relax %
\global\gre at space@count at endofwordpenalty=10001\relax %
- %
- \global\gre at saved@prenlba at endofsyllablepenalty=\gre at space@count at endofsyllablepenalty\relax %
\global\gre at space@count at endofsyllablepenalty=10001\relax %
- %
- \global\gre at saved@prenlba at endafterbarpenalty=\gre at space@count at endafterbarpenalty\relax %
\global\gre at space@count at endafterbarpenalty=10001\relax %
- %
- \global\gre at saved@prenlba at endafterbaraltpenalty=\gre at space@count at endafterbaraltpenalty\relax %
\global\gre at space@count at endafterbaraltpenalty=10001\relax %
- %
- \global\gre at saved@prenlba at endofelementpenalty=\gre at space@count at endofelementpenalty\relax %
\global\gre at space@count at endofelementpenalty=10001\relax %
- %
- \global\gre at saved@prenlba at hyphenpenalty=\gre at space@count at hyphenpenalty\relax %
\global\gre at space@count at hyphenpenalty=10001\relax %
\fi %
}%
@@ -1729,13 +1682,13 @@
% if gre at nlbstate is not 0, then nothing should happend
\ifnum\gre at nlbstate=0\relax %
\ifnum\gre at nlbinitialstate=0\else %
- \global\gre at space@count at nobreakpenalty=\gre at saved@prenlba at nobreakpenalty\relax %
- \global\gre at space@count at endofwordpenalty=\gre at saved@prenlba at endofwordpenalty\relax %
- \global\gre at space@count at endofsyllablepenalty=\gre at saved@prenlba at endofsyllablepenalty\relax %
- \global\gre at space@count at endafterbarpenalty=\gre at saved@prenlba at endafterbarpenalty\relax %
- \global\gre at space@count at endafterbaraltpenalty=\gre at saved@prenlba at endafterbaraltpenalty\relax %
- \global\gre at space@count at endofelementpenalty=\gre at saved@prenlba at endofelementpenalty\relax %
- \global\gre at space@count at hyphenpenalty=\gre at saved@prenlba at hyphenpenalty\relax %
+ \global\gre at space@count at nobreakpenalty=\gre at nobreakpenaltysave\relax %
+ \global\gre at space@count at endofwordpenalty=\gre at endofwordpenaltysave\relax %
+ \global\gre at space@count at endofsyllablepenalty=\gre at endofsyllablepenaltysave\relax %
+ \global\gre at space@count at endafterbarpenalty=\gre at endafterbarpenaltysave\relax %
+ \global\gre at space@count at endafterbaraltpenalty=\gre at endafterbaraltpenaltysave\relax %
+ \global\gre at space@count at endofelementpenalty=\gre at endofelementpenaltysave\relax %
+ \global\gre at space@count at hyphenpenalty=\gre at hyphenpenaltysave\relax %
\ifcase #1\relax % 0
\gre at penalty{\the\gre at space@count at endofelementpenalty}%
\or % 1
@@ -1816,34 +1769,25 @@
\gre at trace@end%
}%
-%% font calibration distances
-\newdimen\gre at dimen@stafflinethicknessbase%
-\newdimen\gre at dimen@glyphraisebase%
-\newdimen\gre at dimen@interstafflinedistancebase%
-\newdimen\gre at dimen@inclinatumonlinemoravshiftbase%
-\newdimen\gre at dimen@inclinatumonlinemorahshiftbase%
-\newdimen\gre at dimen@inclinatumofflinemorahshiftbase%
-
\def\gre at setgregoriofontscaled[#1]#2#3{%
\gre at trace{gre at setgregoriofontscaled[#1]{#2}{#3}}%
- \if\relax\detokenize{#1}\relax %
- \xdef\gre at gregoriofontname{#2}%
- \expandafter\xdef\csname gre at fontfactor@#2\endcsname{#3}%
- \gre at loadgregoriofont%
- \gdef\GreCPVirgaReversaAscendensOnDLine##1{##1}%
- \else %
- \xdef\gre at gregoriofontname{#2-#1}%
- \expandafter\xdef\csname gre at fontfactor@#2-#1\endcsname{#3}%
- \gre at loadgregoriofont%
- \gdef\GreCPVirgaReversaAscendensOnDLine##1{\GreCPVirgaReversaLongqueueAscendens}%
- \fi %
- % currently all fonts use the same calibration distances
- \gre at dimen@stafflinethicknessbase=1500sp\relax %
- \gre at dimen@glyphraisebase=-22000sp\relax%
- \gre at dimen@interstafflinedistancebase=30000sp\relax%
- \gre at dimen@inclinatumonlinemoravshiftbase=4500sp\relax%
- \gre at dimen@inclinatumonlinemorahshiftbase=3700sp\relax%
- \gre at dimen@inclinatumofflinemorahshiftbase=2500sp\relax%
+ \IfStrEq{#2}{parmesan}{%%% OBSOLETE
+ \gre at obsolete{'parmesan' font}{'granapadano' font}%%% OBSOLETE
+ }{%%% OBSOLETE
+ % keep this section
+ \if\relax\detokenize{#1}\relax %
+ \xdef\gre at gregoriofontname{#2}%
+ \expandafter\xdef\csname gre at fontfactor@#2\endcsname{#3}%
+ \gre at loadgregoriofont%
+ \gdef\GreCPVirgaReversaAscendensOnDLine##1{##1}%
+ \else %
+ \xdef\gre at gregoriofontname{#2-#1}%
+ \expandafter\xdef\csname gre at fontfactor@#2-#1\endcsname{#3}%
+ \gre at loadgregoriofont%
+ \gdef\GreCPVirgaReversaAscendensOnDLine##1{\GreCPVirgaReversaLongqueueAscendens}%
+ \fi %
+ }%%% OBSOLETE
+ \relax %
\gre at trace@end%
}%
@@ -1896,6 +1840,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\grechangestyle#1#2{%
+ \IfStrEq{#1}{biginitial}{\gre at obsolete{biginitial style}{initial style}}{}%%% OBSOLETE
\@ifnextchar[{\gre at changestyle{#1}{#2}}{\gre at changestyle{#1}{#2}[\relax]}%
}%
@@ -1932,20 +1877,6 @@
%% score including
%%%%%%%%%%%%%%%%%%%
-
-\def\gre at maketable#1{\ifx\relax#1\else,"#1"\expandafter\gre at maketable\fi}
-
-\def\gresetgregpath#1{%
- \def\gre at input@path{#1}%
- \directlua{
- gre_input_path = {""\expandafter\gre at maketable\gre at input@path\relax}
- }
-}
-
-\ifx\gre at input@path\@undefined
- \let\gre at input@path\input at path
-\fi
-
% Flag to track compilation behavior
% 0 = never compile (default)
% 1 = auto compile (compile outdated scores and those lacking a compiled version)
@@ -1979,8 +1910,6 @@
% This forces gregoriotex to recompile the gabc file.
\def\gre at gregorioscore#1{%
- \begingroup%
- \let\input at path\gre at input@path%
\ifcase\gre at compilegabc% case 0, never compile
\gre at debugmsg{compile}{Refusing to compile #1}%
\input #1%
@@ -1992,7 +1921,6 @@
\directlua{gregoriotex.include_score([[#1]], true, \gre at allowdeprecated@asboolean)}%
\fi%
\relax%
- \endgroup%
}%
% The internal macro called when \gregorioscore is called with the optional argument. Behavior is determined by the value of the argument:
@@ -2000,8 +1928,6 @@
% a - perform the checks to see if the score needs to be recompiled and do so only if necessary
% f - force the compilation of the score before including it
\def\gre at gregorioscore@option[#1]#2{%
- \begingroup%
- \let\input at path\gre at input@path%
\ifx #1n\relax%
\gre at debugmsg{compile}{Override not compiling #2}%
\input #2%
@@ -2019,7 +1945,6 @@
\fi%
\fi%
\relax%
- \endgroup%
}%
% The main macro used by the user to input scores into the document.
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
--GregorioTeX Nabc Lua file.
--
---Copyright (C) 2014-2021 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2014-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -20,7 +20,7 @@
-- this file contains lua functions used by GregorioTeX St. Gall ancient
-- neume support when called with LuaTeX.
--- GREGORIO_VERSION 6.0.0-beta1
+-- GREGORIO_VERSION 5.2.1
local catcode_at_letter = luatexbase.catcodetables['gre at atletter']
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2014-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2014-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,7 +19,7 @@
% this file contains macros for St. Gall ancient neume support
-\gre at declarefileversion{gregoriotex-nabc.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-nabc.tex}{5.2.1}% GREGORIO_VERSION
\xdef\gre at nabcfontname{gregall}%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
--GregorioTeX Signs Lua support file.
--
---Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 6.0.0-beta1
+-- GREGORIO_VERSION 5.2.1
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
@@ -211,18 +211,6 @@
case = 'BarDivisioFinalis',
v = [[\gre at vepisemaorrareaux{0}{\gre at fontchar@divisiofinalis}{1}{0}{#2}{#3}{#4}]],
},
- -- parenthesized bar
- {
- case = 'BarParen',
- v = [[\gre at vepisemaorrareaux{0}{\gre at char@bar at divisiominimaparen}{1}{0}{#2}{#3}{#4}]],
- h = [[\gre at hepisorlineaux{\gre at char@bar at divisiominimaparen}{\gre at char@he at barparen{#4}}{2}{#3}]],
- },
- -- parenthesized virgula
- {
- case = 'BarVirgulaParen',
- v = [[\gre at vepisemaorrareaux{0}{\gre at char@bar at virgulaparen}{1}{0}{#2}{#3}{#4}]],
- h = [[\gre at hepisorlineaux{\gre at char@bar at virgulaparen}{\gre at char@he at barvirgulaparen{#4}}{2}{#3}]],
- },
-- second note of a non-auctus torculus resupinus starting with a quilisma,
-- with a first and second ambitus of at least two
{
@@ -464,27 +452,9 @@
-- natural
{
case = 'Natural',
- v = [[\gre at vepisemaorrareaux{0}{\GreCPNatural}{1}{0}{#2}{#3}{#4}]],
+ v = [[\gre at vepisemaorrareaux{0}{\GreCPNatual}{1}{0}{#2}{#3}{#4}]],
h = [[\gre at hepisorlineaux{\GreCPNatural}{\gre at char@he at natural{#4}}{2}{#3}]],
},
- -- parenthesized flat
- {
- case = 'FlatParen',
- v = [[\gre at vepisemaorrareaux{0}{\GreCPFlatParen}{1}{0}{#2}{#3}{#4}]],
- h = [[\gre at hepisorlineaux{\GreCPFlatParen}{\gre at char@he at flatparen{#4}}{2}{#3}]],
- },
- -- parenthesized sharp
- {
- case = 'SharpParen',
- v = [[\gre at vepisemaorrareaux{0}{\GreCPSharpParen}{1}{0}{#2}{#3}{#4}]],
- h = [[\gre at hepisorlineaux{\GreCPSharpParen}{\gre at char@he at sharpparen{#4}}{2}{#3}]],
- },
- -- parenthesized natural
- {
- case = 'NaturalParen',
- v = [[\gre at vepisemaorrareaux{0}{\GreCPNaturalParen}{1}{0}{#2}{#3}{#4}]],
- h = [[\gre at hepisorlineaux{\GreCPNaturalParen}{\gre at char@he at naturalparen{#4}}{2}{#3}]],
- },
}
local function emit_offset_macros()
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -22,7 +22,7 @@
\def\grebarbracewidth{.58879}%
-\gre at declarefileversion{gregoriotex-signs.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-signs.tex}{5.2.1}% GREGORIO_VERSION
\def\gre at usestylecommon{%
\gre at trace{gre at usestylecommon}%
@@ -238,8 +238,8 @@
\gre at trace@end%
}
-\def\gre at save@clefextrema#1#2{%
- \gre at trace{gre at save@clefextrema{#1}{#2}}%
+\def\gre at saveclefextrema#1#2{%
+ \gre at trace{gre at saveclefextrema{#1}{#2}}%
% compute the clef extrema
\ifcase#1\or % first at 1
\global\let\gre at pitch@cleftop\gre at pitch@e %
@@ -308,7 +308,7 @@
\def\GreInitialClefPosition#1#2{%
\gre at trace{GreInitialClefPosition{#1}{#2}}%
\ifgre at showclef %
- \gre at save@clefextrema{#1}{#2}%
+ \gre at saveclefextrema{#1}{#2}%
\fi %
\gre at trace@end%
}%
@@ -325,7 +325,7 @@
%% #8: if 3, it means that we must not put a flat after the secondary clef, otherwise it's the height of the flat
\def\gre at typeclef#1#2#3#4#5#6#7#8{%
\gre at trace{gre at typeclef{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}%
- \gre at save@clefextrema{#2}{#7}%
+ \gre at saveclefextrema{#2}{#7}%
\gre at boxclef{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}%
\ifcase#3%
\gre at update@clefwidth at current{\wd\gre at box@temp at width}%
@@ -1210,12 +1210,12 @@
% here we shift a bit left in the case where we have a punctum inclinatum on a line
\ifnum#4=1\relax %
\ifgre at isonaline %
- \gre at dimen@temp at three=\dimexpr(\gre at dimen@inclinatumonlinemorahshiftbase * \gre at factor)\relax %
+ \gre at dimen@temp at three=\dimexpr(3700sp * \gre at factor)\relax %
\kern-\gre at dimen@temp at three %
- \gre at dimen@temp at three=\dimexpr(\gre at dimen@inclinatumonlinemoravshiftbase * \gre at factor)\relax%
+ \gre at dimen@temp at three=\dimexpr(4500sp * \gre at factor)\relax%
\advance\gre at dimen@glyphraisevalue by -\gre at dimen@temp at three %
\else %
- \gre at dimen@temp at three=\dimexpr(\gre at dimen@inclinatumofflinemorahshiftbase * \gre at factor)\relax %
+ \gre at dimen@temp at three=\dimexpr(2500sp * \gre at factor)\relax %
\advance\gre at dimen@glyphraisevalue by -\gre at dimen@temp at three %
\fi %
\fi %
@@ -1538,7 +1538,6 @@
\setbox\gre at box@temp at sign=\hbox{\gre at font@music#2}%
% we set tempwidth to half a punctum malus half the sign width, so that the centers are aligned
\gre at dimen@temp at two=\wd\gre at box@temp at sign %
- \gre at debugmsg{general}{gre at dimen@temp at two = \the\gre at dimen@temp at two}%
\ifcase#4%
%case of hepisema
\raise \gre at dimen@glyphraisevalue \copy\gre at box@temp at sign %
@@ -1841,34 +1840,6 @@
\gre at trace@end%
}%
-\def\GreInVirgulaParen#1#2#3{%
- \gre at trace{GreInVirgulaParen{#1}{#2}{#3}}%
- \gre at writebar{19}{1}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
-\def\GreVirgulaParen#1#2#3{%
- \gre at trace{GreVirgulaParen{#1}{#2}{#3}}%
- \gre at writebar{19}{0}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
-\def\GreInVirgulaParenHigh#1#2#3{%
- \gre at trace{GreInVirgulaParenHigh{#1}{#2}{#3}}%
- \gre at writebar{21}{1}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
-\def\GreVirgulaParenHigh#1#2#3{%
- \gre at trace{GreVirgulaParenHigh{#1}{#2}{#3}}%
- \gre at writebar{21}{0}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
\def\GreInDivisioMinimis#1#2#3{%
\gre at trace{GreInDivisioMinimis{#1}{#2}{#3}}%
\gre at writebar{17}{1}{#1}{#2}{#3}%
@@ -1925,34 +1896,6 @@
\gre at trace@end%
}%
-\def\GreInDivisioMinimaParen#1#2#3{%
- \gre at trace{GreInDivisioMinimaParen{#1}{#2}{#3}}%
- \gre at writebar{20}{1}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
-\def\GreDivisioMinimaParen#1#2#3{%
- \gre at trace{GreDivisioMinimaParen{#1}{#2}{#3}}%
- \gre at writebar{20}{0}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
-\def\GreInDivisioMinimaParenHigh#1#2#3{%
- \gre at trace{GreInDivisioMinimaHigh{#1}{#2}{#3}}%
- \gre at writebar{22}{1}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
-\def\GreDivisioMinimaParenHigh#1#2#3{%
- \gre at trace{GreDivisioMinimaHigh{#1}{#2}{#3}}%
- \gre at writebar{22}{0}{#1}{#2}{#3}%
- \relax%
- \gre at trace@end%
-}%
-
\def\GreInDivisioMinor#1#2{%
\gre at trace{GreInDivisioMinor{#1}{#2}}%
\gre at writebar{2}{1}{#1}{#2}{0}%
@@ -2157,15 +2100,7 @@
\newskip\gre at skip@bar at lastskip% skip after last bar
%a macro to write a bar
-%% 1: the type of the bar : 0 for virgula, 1 for minima, 2 for minor,
-%% 3 for major, 4 for finalis, 5 for the last finalis,
-%% 6 to 13 for dominican bars, 14 for high virgula,
-%% 15 for high minima, 16 for dotted maior,
-%% 17 for minimis, 18 for high minimis,
-%% 19 for parenthesized virgula,
-%% 20 for parenthesized minima,
-%% 21 for high parenthesized virgula,
-%% 22 for high parenthesized minima,
+%% 1: the type of the bar : 0 for virgula, 1 for minima 2 for minor, 3 for major, 4 for finalis and 5 for the last finalis, 6 to 13 for dominican bars, 14 for high virgula, 15 for high minima, 16 for dotted maior, 17 for minimis, 18 for high minimis
%% 2: is 0 if it is in a syllable containing only this bar, 1 otherwise
%% 3: is 0 if there's no text under the bar or 1 if there is text under the bar
%% 4: macros that may happen before the skip after the bar (typically GreVEpisema)
@@ -2493,66 +2428,6 @@
\gre at skip@temp at four = \csname gre at space@skip at bar@minimis\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
\gre at hskip\gre at skip@temp at four %
\fi %
- \or % 19 : parenthesized virgula
- \ifnum\gre at count@temp at one=1\relax %
- \gre at skip@temp at four = \csname gre at space@skip at bar@virgulaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \GreNoBreak %
- \fi %
- \setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at virgulaparen}%
- \raise\gre at dimen@glyphraisevalue\hbox{\gre at font@music\gre at char@bar at virgulaparen}%
- #4\relax %
- \ifnum\gre at count@temp at one=1\relax %
- \GreNoBreak %
- \gre at skip@temp at four = \csname gre at space@skip at bar@virgulaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \fi %
- \or % 20 : parenthesized minima
- \ifnum\gre at count@temp at one=1\relax %
- \gre at skip@temp at four = \csname gre at space@skip at bar@minimaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \GreNoBreak %
- \fi %
- \setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at divisiominimaparen}%
- \raise\gre at dimen@glyphraisevalue\hbox{\gre at font@music\gre at char@bar at divisiominimaparen}%
- #4\relax %
- \ifnum\gre at count@temp at one=1\relax %
- \GreNoBreak %
- \gre at skip@temp at four = \csname gre at space@skip at bar@minimaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \fi %
- \or % 21 : parenthesized high virgula
- \ifnum\gre at count@temp at one=1\relax %
- \gre at skip@temp at four = \csname gre at space@skip at bar@virgulaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \GreNoBreak %
- \fi %
- \GreGlyphHeights{\gre at pitch@ledger at above}{\gre at pitch@ledger at above}%
- \setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at virgulaparenhigh}%
- \raise\gre at dimen@glyphraisevalue\hbox{\gre at font@music\gre at char@bar at virgulaparenhigh}%
- \GreAdditionalLine{\GreOCaseBarVirgulaParen}{0}{2}%
- #4\relax %
- \ifnum\gre at count@temp at one=1\relax %
- \GreNoBreak %
- \gre at skip@temp at four = \csname gre at space@skip at bar@virgulaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \fi %
- \or % 22 : parenthesized high minima
- \ifnum\gre at count@temp at one=1\relax %
- \gre at skip@temp at four = \csname gre at space@skip at bar@minimaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \GreNoBreak %
- \fi %
- \GreGlyphHeights{\gre at pitch@ledger at above}{\gre at pitch@ledger at above}%
- \setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at divisiominimaparenhigh}%
- \raise\gre at dimen@glyphraisevalue\hbox{\gre at font@music\gre at char@bar at divisiominimaparenhigh}%
- \GreAdditionalLine{\GreOCaseBarParen}{0}{2}%
- #4\relax %
- \ifnum\gre at count@temp at one=1\relax %
- \GreNoBreak %
- \gre at skip@temp at four = \csname gre at space@skip at bar@minimaparen\gre at bar@space at suffix{#2}{#3}{#5}\endcsname\relax%
- \gre at hskip\gre at skip@temp at four %
- \fi %
\fi %
\global\gre at skip@bar at lastskip=\gre at skip@temp at four %
\gre at debugmsg{spacing}{Width of bar just printed: \the\wd\gre at box@temp at width}%
@@ -2595,7 +2470,7 @@
%macro to end a line with a divisio finalis
\def\GreFinalDivisioFinalis#1{%
\gre at trace{GreFinalDivisioFinalis{#1}}%
- \GreBarSyllable{\GreSetThisSyllable{}{}{}{}{}}{}{}{1}{\GreSetNextSyllable{}{}{}{}{}\GreLastOfLine}{}{{16}{0}}{}{%
+ \GreBarSyllable{\GreSetThisSyllable{}{}{}{}{}}{}{}{1}{\GreSetNextSyllable{}{}{}{}{}\GreLastOfLine}{}{16}{}{%
\ifgre at newbarspacing\else %
\gre at hskip\gre at space@skip at bar@finalfinalis %
\GreNoBreak %
@@ -2611,7 +2486,7 @@
%macro to end a line with a divisio maior
\def\GreFinalDivisioMaior#1{%
\gre at trace{GreFinalDivisioMaior{#1}}%
- \GreBarSyllable{\GreSetThisSyllable{}{}{}{}{}}{}{}{1}{\GreSetNextSyllable{}{}{}{}{}\GreLastOfLine}{}{{16}{0}}{}{%
+ \GreBarSyllable{\GreSetThisSyllable{}{}{}{}{}}{}{}{1}{\GreSetNextSyllable{}{}{}{}{}\GreLastOfLine}{}{16}{}{%
\GreLastOfScore %
\GreDivisioMaior{0}{}%
#1%
@@ -2676,13 +2551,16 @@
\gre at trace{gre at fillhole{#1}{#2}}%
\ifgre at boxing\else %
\global\gre at count@lastglyphiscavum=1\relax %
- \setbox\gre at box@temp at sign=\hbox to 0pt {%
- {\color{grebackgroundcolor}#1}%
- \rule{0pt}{0pt}% this trick prevents the color from leaking out of this box
- \hss}%
- \luacolorProcessBox\gre at box@temp at sign%
+ \setbox\gre at box@temp at sign=\hbox{#1}%
\ifcase#2\raise \gre at dimen@glyphraisevalue\fi%
- \copy\gre at box@temp at sign%
+ \hbox to 0pt{%
+ {%
+ \color{grebackgroundcolor}%
+ \copy\gre at box@temp at sign %
+ }%
+ %\pdfliteral{}% this is a ugly hack for old versions of LuaTeX to work
+ \hss %
+ }%
\GreNoBreak %
\fi %
\relax %
@@ -2753,15 +2631,6 @@
\gre at trace@end%
}%
-% Same as the one before, but for parenthesized flats.
-
-\def\GreFlatParen#1#2#3#4#5{%
- \gre at trace{GreFlatParen{#1}{#2}{#3}{#4}{#5}}%
- \gre at alteration{#1}{\gre at fontchar@flatparen}{\gre at fontchar@flatparenhole}{#2}{#3}{#4}{#5}%
- \relax%
- \gre at trace@end%
-}%
-
% Same as the one before, but for naturals.
\def\GreNatural#1#2#3#4#5{%
@@ -2771,15 +2640,6 @@
\gre at trace@end%
}%
-% Same as the one before, but for parenthesized naturals.
-
-\def\GreNaturalParen#1#2#3#4#5{%
- \gre at trace{GreNaturalParen{#1}{#2}{#3}{#4}{#5}}%
- \gre at alteration{#1}{\gre at fontchar@naturalparen}{\gre at fontchar@naturalparenhole}{#2}{#3}{#4}{#5}%
- \relax%
- \gre at trace@end%
-}%
-
% Same as the one before, but for sharps.
\def\GreSharp#1#2#3#4#5{%
@@ -2789,15 +2649,6 @@
\gre at trace@end%
}%
-% Same as the one before, but for sharps.
-
-\def\GreSharpParen#1#2#3#4#5{%
- \gre at trace{GreSharpParem{#1}{#2}{#3}{#4}{#5}}%
- \gre at alteration{#1}{\gre at fontchar@sharpparen}{\gre at fontchar@sharpparenhole}{#2}{#3}{#4}{#5}%
- \relax%
- \gre at trace@end%
-}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for typesetting punctum cavum
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,7 +19,7 @@
% this file contains definitions of spaces
-\gre at declarefileversion{gregoriotex-spaces.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-spaces.tex}{5.2.1}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
@@ -35,73 +35,56 @@
-\newcount\gre at saved@prescore at hyphenpenalty%
-\newcount\gre at saved@prescore at exhyphenpenalty%
-\newcount\gre at saved@prescore at exhyphenchar%
-\newcount\gre at saved@prescore at doublehyphendemerits%
-\newcount\gre at saved@prescore at finalhyphendemerits%
-\newcount\gre at saved@prescore at brokenpenalty%
-\newcount\gre at saved@prescore at looseness%
-\newcount\gre at saved@prescore at tolerance%
-\newcount\gre at saved@prescore at pretolerance%
-\newskip\gre at saved@prescore at emergencystretch%
-\newcount\gre at saved@prescore at widowpenalty%
-\newcount\gre at saved@prescore at clubpenalty%
-\newskip\gre at saved@prescore at parskip%
-\newskip\gre at saved@prescore at lineskip%
-\newskip\gre at saved@prescore at baselineskip%
-\newskip\gre at saved@prescore at lineskiplimit%
+\newcount\gre at hyphenpenaltysave%
+\newcount\gre at exhyphenpenaltysave%
+\newcount\gre at doublehyphendemeritssave%
+\newcount\gre at finalhyphendemeritssave%
+\newcount\gre at brokenpenaltysave%
+\newcount\gre at loosenesssave%
+\newcount\gre at tolerancesave%
+\newcount\gre at pretolerancesave%
+\newskip\gre at emergencystretchsave%
+\newcount\gre at widowpenaltysave%
+\newcount\gre at clubpenaltysave%
+\newskip\gre at saved@parskip%
+\newskip\gre at saved@lineskip%
+\newskip\gre at saved@baselineskip%
+\newskip\gre at saved@lineskiplimit%
%% The following macros cancel some useless penalties, and reinstates them
%% at the end of a score
\def\gre at cancelpenalties{%
\gre at trace{gre at cancelpenalties}%
- \global\gre at saved@prescore at hyphenpenalty=\hyphenpenalty\relax %
+ \global\gre at hyphenpenaltysave=\hyphenpenalty\relax %
+ \global\gre at exhyphenpenaltysave=\exhyphenpenalty\relax %
+ \global\gre at doublehyphendemeritssave=\doublehyphendemerits\relax %
+ \global\gre at finalhyphendemeritssave=\finalhyphendemerits\relax %
+ \global\gre at brokenpenaltysave=\brokenpenalty\relax %
+ \global\gre at loosenesssave=\looseness\relax %
+ \global\gre at tolerancesave=\tolerance\relax %
+ \global\gre at pretolerancesave=\pretolerance\relax %
+ \global\gre at emergencystretchsave=\emergencystretch\relax %
+ \global\gre at widowpenaltysave=\widowpenalty\relax %
+ \global\gre at clubpenaltysave=\clubpenalty\relax %
+ %
+ \global\gre at saved@parskip=\parskip%
+ \global\gre at saved@lineskip=\lineskip%
+ \global\gre at saved@baselineskip=\baselineskip%
+ \global\gre at saved@lineskiplimit=\lineskiplimit%
\hyphenpenalty=\gre at space@count at hyphenpenalty %
- %
- \global\gre at saved@prescore at exhyphenpenalty=\exhyphenpenalty\relax %
\exhyphenpenalty=\gre at space@count at hyphenpenalty %
- %
- \global\gre at saved@prescore at exhyphenchar=\exhyphenchar\relax %
- \exhyphenchar=-1\relax%
- %
- \global\gre at saved@prescore at doublehyphendemerits=\doublehyphendemerits\relax %
\doublehyphendemerits=0\relax %
- %
- \global\gre at saved@prescore at finalhyphendemerits=\finalhyphendemerits\relax %
\finalhyphendemerits=0\relax %
- %
- \global\gre at saved@prescore at brokenpenalty=\brokenpenalty\relax %
\brokenpenalty=\gre at space@count at brokenpenalty %
- %
- \global\gre at saved@prescore at looseness=\looseness\relax %
\looseness=\gre at space@count at looseness %
- %
- \global\gre at saved@prescore at tolerance=\tolerance\relax %
\tolerance=\gre at space@count at tolerance %
- %
- \global\gre at saved@prescore at pretolerance=\pretolerance\relax %
\pretolerance=\gre at space@count at pretolerance %
- %
- \global\gre at saved@prescore at emergencystretch=\emergencystretch\relax %
\emergencystretch=\gre at space@skip at emergencystretch\relax %
- %
- \global\gre at saved@prescore at widowpenalty=\widowpenalty\relax %
\widowpenalty=\gre at space@count at widowpenalty %
- %
- \global\gre at saved@prescore at clubpenalty=\clubpenalty\relax %
\clubpenalty=\gre at space@count at clubpenalty %
- %
- \global\gre at saved@prescore at parskip=\parskip%
\parskip=\gre at space@skip at parskip%
- %
- \global\gre at saved@prescore at lineskip=\lineskip%
\lineskip=\gre at space@skip at lineskip%
- %
- \global\gre at saved@prescore at baselineskip=\baselineskip%
\baselineskip=\gre at space@skip at baselineskip%
- %
- \global\gre at saved@prescore at lineskiplimit=\lineskiplimit%
\lineskiplimit=\gre at space@skip at lineskiplimit%
\gre at trace@end%
}%
@@ -108,22 +91,21 @@
\def\gre at restorepenalties{%
\gre at trace{gre at restorepenalties}%
- \hyphenpenalty=\gre at saved@prescore at hyphenpenalty %
- \exhyphenpenalty=\gre at saved@prescore at exhyphenpenalty %
- \exhyphenchar=\gre at saved@prescore at exhyphenchar %
- \doublehyphendemerits=\gre at saved@prescore at doublehyphendemerits %
- \finalhyphendemerits=\gre at saved@prescore at finalhyphendemerits %
- \brokenpenalty=\gre at saved@prescore at brokenpenalty %
- \looseness=\gre at saved@prescore at looseness %
- \tolerance=\gre at saved@prescore at tolerance %
- \pretolerance=\gre at saved@prescore at pretolerance %
- \emergencystretch=\gre at saved@prescore at emergencystretch %
- \widowpenalty=\gre at saved@prescore at widowpenalty %
- \clubpenalty=\gre at saved@prescore at clubpenalty %
- \parskip=\gre at saved@prescore at parskip%
- \lineskip=\gre at saved@prescore at lineskip%
- \baselineskip=\gre at saved@prescore at baselineskip%
- \lineskiplimit=\gre at saved@prescore at lineskiplimit%
+ \hyphenpenalty=\gre at hyphenpenaltysave %
+ \exhyphenpenalty=\gre at exhyphenpenaltysave %
+ \doublehyphendemerits=\gre at doublehyphendemeritssave %
+ \finalhyphendemerits=\gre at finalhyphendemeritssave %
+ \brokenpenalty=\gre at brokenpenaltysave %
+ \looseness=\gre at loosenesssave %
+ \tolerance=\gre at tolerancesave %
+ \pretolerance=\gre at pretolerancesave %
+ \emergencystretch=\gre at emergencystretchsave %
+ \widowpenalty=\gre at widowpenaltysave %
+ \clubpenalty=\gre at clubpenaltysave %
+ \parskip=\gre at saved@parskip%
+ \lineskip=\gre at saved@lineskip%
+ \baselineskip=\gre at saved@baselineskip%
+ \lineskiplimit=\gre at saved@lineskiplimit%
\gre at trace@end%
}%
@@ -132,7 +114,7 @@
%% macros for the typesetting of spaces
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Independent default distances are defined in gregoriotex-gsp-default.tex. The distances defined here are calculated from those distances.
+% Independent default distances are defined in gsp-default.tex. The distances defined here are calculated from those distances.
%%%%%%%%%%%%%%%%%
%% Global distances
@@ -166,29 +148,35 @@
% Messing with the staff line thickness directly is messy, so we provide the following interface to make life easier on the user:
% stafflineheight is the height of a staff line
-% = gre at dimen@stafflinethicknessbase * stafflinefactor
+% = 1500 * stafflinefactor
\newdimen\gre at dimen@stafflineheight\relax%
\def\gre at calculate@stafflineheight{%
\gre at trace{gre at calculate@stafflineheight}%
- \global\gre at dimen@stafflineheight=\dimexpr(\gre at dimen@stafflinethicknessbase * \gre at stafflinefactor)\relax %
+ \global\gre at dimen@stafflineheight=\dimexpr(1500 sp * \gre at stafflinefactor)\relax %
\gre at trace@end%
}%
% interstafflinespace is the space between two lines of staff
-% = (gre at dimen@interstafflinedistancebase + gre at dimen@stafflinethicknessbase) * gre at factor - gre at dimen@stafflinethicknessbase * gre at stafflinefactor
+% = (30000 - (stafflineheight/gre at factor - 1500)) * gre at factor = 31500 * gre at factor - stafflineheight
\newdimen\gre at dimen@interstafflinespace\relax%
\def\gre at calculate@interstafflinespace{%
\gre at trace{gre at calculate@interstafflinespace}%
- \global\gre at dimen@interstafflinespace=\dimexpr((\gre at dimen@interstafflinedistancebase + \gre at dimen@stafflinethicknessbase) * \gre at factor - \gre at dimen@stafflinethicknessbase * \gre at stafflinefactor)\relax%
+ \global\gre at dimen@interstafflinespace=\dimexpr((31500sp * \gre at factor) %
+ - \gre at dimen@stafflineheight)\relax%
\gre at trace@end%
}%
% a distance to help place glyphs when the lines are not their default thickness
-% = gre at dimen@stafflinethicknessbase * (gre at stafflinefactor - gre at factor) / 2
+% = (stafflineheight/gre at factor - 1500sp)/2 * gre at factor
\newdimen\gre at dimen@stafflinediff\relax%
\def\gre at calculate@stafflinediff{%
\gre at trace{gre at calculate@stafflinediff}%
- \global\gre at dimen@stafflinediff = \dimexpr( \gre at dimen@stafflinethicknessbase * (\gre at stafflinefactor - \gre at factor) / 2 )\relax%
+ \global\gre at dimen@stafflinediff = \dimexpr(%
+ ( ( ( \gre at dimen@stafflineheight %
+ / \gre at factor)%
+ - 1500sp)%
+ / 2)%
+ * \gre at factor)\relax%
\gre at trace@end%
}%
@@ -199,7 +187,7 @@
\newif\ifgre at scale@stafflinefactor%
\gre at scale@stafflinefactortrue
-% a macro for setting the thickness of the staff lines. The changes to stafflinefactor will be automatically picked up when the staff lines are redrawn
+% a macro for setting the thickness of the staff lines. This changes the stafflinefactor and then adjusts the spaces that are affected by the thicker staff lines.
\def\grechangestafflinethickness#1{%
\xdef\gre at stafflinefactor{#1}%
\relax %
@@ -211,7 +199,7 @@
% to calculate that, we take the bottom of the third line : it is at 200 in the fonts, and it must be at grespacelinestext + grespacebeneathtext + 2*greinterstafflinespace + 2*grestafflineheight + translationheight
\def\gre at calculate@constantglyphraise{%
\gre at trace{gre at calculate@constantglyphraise}%
- \global\gre at dimen@constantglyphraise = \dimexpr((\gre at dimen@glyphraisebase * \gre at factor) %
+ \global\gre at dimen@constantglyphraise = \dimexpr((-22000 sp * \gre at factor) %
+ \gre at dimen@additionalbottomspace %
+ \gre at space@dimen at spacebeneathtext %
+ \gre at space@dimen at spacelinestext %
@@ -575,9 +563,10 @@
\hbox to \gre at dimen@temp at four{#2\hss}%
}%
-\def\gresethyphenprotrusion#1{% OBSOLETE
- \gre at obsolete{\protect\gresethyphenprotrusion{percentage}}{\protect\gresetprotrusionfactor{eolhyphen}{factor}}% OBSOLETE
-}% OBSOLETE
+\def\gresethyphenprotrusion#1{% DEPRECATED for removal in 5.1
+ \gre at deprecated{\protect\gresethyphenprotrusion{percentage}}{\protect\gresetprotrusionfactor{eolhyphen}{factor}}% DEPRECATED for removal in 5.1
+ \gresetprotrusionfactor{eolhyphen}{\directlua{tex.print(string.format(string.char(37)..'g', #1 / 100.0))}}% DEPRECATED for removal in 5.1
+}% DEPRECATED for removal in 5.1
% dimen keeping the shift computed with next function
\newdimen\gre at dimen@eolshift
@@ -805,7 +794,7 @@
\fi%
\fi%
\global\advance\gre at count@temp at three by -8 %
- \global\gre at dimen@glyphraisevalue = \dimexpr(((\gre at dimen@interstafflinedistancebase + \gre at dimen@stafflinethicknessbase) / 2 ) * \gre at factor * \gre at count@temp at three)\relax %
+ \global\gre at dimen@glyphraisevalue = \dimexpr(15750 sp * \gre at factor * \gre at count@temp at three)\relax %
\ifcase#2 %
\or\or\or%3: if it is a vertical episema on a line, we shift it a bit higher, so that it's more beautiful
\ifgre at isonaline%
@@ -909,6 +898,16 @@
% the one taken into account for above lines nabc height
\newdimen\gre at dimen@additionaltopspacenabc\relax%
+% backup demensions for the previous
+\newdimen\gre at saved@dimen at additionalbottomspace\relax%
+\newdimen\gre at saved@dimen at additionaltopspace\relax%
+\newdimen\gre at saved@dimen at additionaltopspacealt\relax%
+\newdimen\gre at saved@dimen at additionaltopspacenabc\relax%
+\newdimen\gre at saved@dimen at currenttranslationheight\relax%
+\newdimen\gre at saved@dimen at textlower\relax%
+\newdimen\gre at saved@dimen at currentabovelinestextheight\relax%
+\newdimen\gre at saved@dimen at constantglyphraise\relax%
+
\newcount\gre at space@count at additionaltopspacethreshold\relax%
\gre at space@count at additionaltopspacethreshold=2
@@ -940,40 +939,29 @@
\gre at trace@end%
}%
-% some backup demensions for use around discretionaries
-\newdimen\gre at saved@prediscretionary at dimen@additionalbottomspace\relax%
-\newdimen\gre at saved@prediscretionary at dimen@additionaltopspace\relax%
-\newdimen\gre at saved@prediscretionary at dimen@additionaltopspacealt\relax%
-\newdimen\gre at saved@prediscretionary at dimen@additionaltopspacenabc\relax%
-\newdimen\gre at saved@prediscretionary at dimen@currenttranslationheight\relax%
-\newdimen\gre at saved@prediscretionary at dimen@textlower\relax%
-\newdimen\gre at saved@prediscretionary at dimen@currentabovelinestextheight\relax%
-\newdimen\gre at saved@prediscretionary at dimen@constantglyphraise\relax%
-
-
\def\gre at save@additionalspaces{%
\gre at trace{gre at save@additionalspaces}%
- \global\gre at saved@prediscretionary at dimen@additionalbottomspace=\gre at dimen@additionalbottomspace\relax%
- \global\gre at saved@prediscretionary at dimen@additionaltopspace=\gre at dimen@additionaltopspace\relax%
- \global\gre at saved@prediscretionary at dimen@additionaltopspacealt=\gre at dimen@additionaltopspacealt\relax%
- \global\gre at saved@prediscretionary at dimen@additionaltopspacenabc=\gre at dimen@additionaltopspacenabc\relax%
- \global\gre at saved@prediscretionary at dimen@currenttranslationheight=\gre at dimen@currenttranslationheight\relax%
- \global\gre at saved@prediscretionary at dimen@textlower=\gre at dimen@textlower\relax%
- \global\gre at saved@prediscretionary at dimen@currentabovelinestextheight=\gre at dimen@currentabovelinestextheight\relax%
- \global\gre at saved@prediscretionary at dimen@constantglyphraise=\gre at dimen@constantglyphraise\relax%
+ \global\gre at saved@dimen at additionalbottomspace=\gre at dimen@additionalbottomspace\relax%
+ \global\gre at saved@dimen at additionaltopspace=\gre at dimen@additionaltopspace\relax%
+ \global\gre at saved@dimen at additionaltopspacealt=\gre at dimen@additionaltopspacealt\relax%
+ \global\gre at saved@dimen at additionaltopspacenabc=\gre at dimen@additionaltopspacenabc\relax%
+ \global\gre at saved@dimen at currenttranslationheight=\gre at dimen@currenttranslationheight\relax%
+ \global\gre at saved@dimen at textlower=\gre at dimen@textlower\relax%
+ \global\gre at saved@dimen at currentabovelinestextheight=\gre at dimen@currentabovelinestextheight\relax%
+ \global\gre at saved@dimen at constantglyphraise=\gre at dimen@constantglyphraise\relax%
\gre at trace@end%
}%
\def\gre at restore@additionalspaces{%
\gre at trace{gre at restore@additionalspaces}%
- \global\gre at dimen@additionalbottomspace=\gre at saved@prediscretionary at dimen@additionalbottomspace\relax%
- \global\gre at dimen@additionaltopspace=\gre at saved@prediscretionary at dimen@additionaltopspace\relax%
- \global\gre at dimen@additionaltopspacealt=\gre at saved@prediscretionary at dimen@additionaltopspacealt\relax%
- \global\gre at dimen@additionaltopspacenabc=\gre at saved@prediscretionary at dimen@additionaltopspacenabc\relax%
- \global\gre at dimen@currenttranslationheight=\gre at saved@prediscretionary at dimen@currenttranslationheight\relax%
- \global\gre at dimen@textlower=\gre at saved@prediscretionary at dimen@textlower\relax%
- \global\gre at dimen@currentabovelinestextheight=\gre at saved@prediscretionary at dimen@currentabovelinestextheight\relax%
- \global\gre at dimen@constantglyphraise=\gre at saved@prediscretionary at dimen@constantglyphraise\relax%
+ \global\gre at dimen@additionalbottomspace=\gre at saved@dimen at additionalbottomspace\relax%
+ \global\gre at dimen@additionaltopspace=\gre at saved@dimen at additionaltopspace\relax%
+ \global\gre at dimen@additionaltopspacealt=\gre at saved@dimen at additionaltopspacealt\relax%
+ \global\gre at dimen@additionaltopspacenabc=\gre at saved@dimen at additionaltopspacenabc\relax%
+ \global\gre at dimen@currenttranslationheight=\gre at saved@dimen at currenttranslationheight\relax%
+ \global\gre at dimen@textlower=\gre at saved@dimen at textlower\relax%
+ \global\gre at dimen@currentabovelinestextheight=\gre at saved@dimen at currentabovelinestextheight\relax%
+ \global\gre at dimen@constantglyphraise=\gre at saved@dimen at constantglyphraise\relax%
\gre at trace@end%
}%
@@ -989,7 +977,7 @@
\gre at num@max{#1}{\gre at pitch@cleftop}%
\gre at count@temp at one=\numexpr(\gre at count@temp at one - \gre at pitch@adjust at top - \gre at space@count at additionaltopspacethreshold)\relax %
\ifnum\gre at count@temp at one>0\relax %
- \global\gre at dimen@additionaltopspace=\dimexpr(((\gre at dimen@interstafflinedistancebase + \gre at dimen@stafflinethicknessbase) / 2 ) * \gre at count@temp at one * \gre at factor)\relax %
+ \global\gre at dimen@additionaltopspace=\dimexpr(15750 sp * \gre at count@temp at one * \gre at factor)\relax %
\else %
\global\gre at dimen@additionaltopspace=0 sp%
\fi %
@@ -996,7 +984,7 @@
\gre at num@max{#1}{\gre at pitch@cleftop}%
\gre at count@temp at one=\numexpr(\gre at count@temp at one - \gre at pitch@adjust at top - \gre at space@count at additionaltopspacealtthreshold)\relax %
\ifnum\gre at count@temp at one>0\relax %
- \global\gre at dimen@additionaltopspacealt=\dimexpr(((\gre at dimen@interstafflinedistancebase + \gre at dimen@stafflinethicknessbase) / 2 ) * \gre at count@temp at one * \gre at factor)\relax %
+ \global\gre at dimen@additionaltopspacealt=\dimexpr(15750 sp * \gre at count@temp at one * \gre at factor)\relax %
\else %
\global\gre at dimen@additionaltopspacealt=0 sp%
\fi %
@@ -1003,7 +991,7 @@
\gre at num@max{#1}{\gre at pitch@cleftop}%
\gre at count@temp at one=\numexpr(\gre at count@temp at one - \gre at pitch@adjust at top - \gre at space@count at additionaltopspacenabcthreshold)\relax %
\ifnum\gre at count@temp at one>0\relax %
- \global\gre at dimen@additionaltopspacenabc=\dimexpr(((\gre at dimen@interstafflinedistancebase + \gre at dimen@stafflinethicknessbase) / 2 ) * \gre at count@temp at one * \gre at factor)\relax %
+ \global\gre at dimen@additionaltopspacenabc=\dimexpr(15750 sp * \gre at count@temp at one * \gre at factor)\relax %
\else %
\global\gre at dimen@additionaltopspacenabc=0 sp%
\fi %
@@ -1010,11 +998,7 @@
\gre at num@min{#2}{\gre at pitch@clefbottom}%
\gre at count@temp at one=\numexpr(\gre at pitch@adjust at bottom - \gre at count@temp at one)\relax %
\ifnum\gre at count@temp at one>0\relax %
- \ifgre at noteadditionalspacelinestext%
- \global\gre at dimen@additionalbottomspace=\dimexpr(\gre at space@dimen at noteadditionalspacelinestext * \gre at count@temp at one)\relax%
- \else%
- \global\gre at dimen@additionalbottomspace=\dimexpr(((\gre at dimen@interstafflinedistancebase + \gre at dimen@stafflinethicknessbase) / 2 ) * \gre at factor * \gre at count@temp at one)\relax%
- \fi%
+ \global\gre at dimen@additionalbottomspace=\dimexpr(\gre at space@dimen at noteadditionalspacelinestext * \gre at count@temp at one)\relax %
\else %
\global\gre at dimen@additionalbottomspace=0 sp%
\fi %
@@ -1044,7 +1028,7 @@
\def\gre at calculate@textaligncenter#1#2#3#4{%
\gre at trace{gre at calculate@textaligncenter{#1}{#2}{#3}{#4}}%
\ifnum#4=0\relax%
- \gre at widthof{\gre at saved@syllable at fixedtextformat{#1}\gre at fixedtextformat{#2#3}}%
+ \gre at widthof{\gre at save@fixedtextformat{#1}\gre at fixedtextformat{#2#3}}%
\else %
\gre at widthof{\gre at fixedtextformat{#1}\gre at fixednexttextformat{#2#3}}%
\fi %
@@ -1116,9 +1100,8 @@
%% 3 : the middle letters of the next syllable
%% 4 : the end letters of the next syllable
%% 5 : the type of notes alignment
-%% 6 : alteration type (see gre at calculate@nextnotesaligncenter)
-\def\gre at calculate@nextbegindifference#1#2#3#4#5#6{%
- \gre at trace{gre at calculate@nextbegindifference{#1}{#2}{#3}{#4}{#5}{#6}}%
+\def\gre at calculate@nextbegindifference#1#2#3#4#5{%
+ \gre at trace{gre at calculate@nextbegindifference{#1}{#2}{#3}{#4}{#5}}%
\ifnum\gre at lastoflinecount=1\relax %
\global\gre at skip@nextbegindifference=0pt\relax%
\else %
@@ -1129,7 +1112,7 @@
\global\gre at skip@nextbegindifference=-\gre at dimen@textaligncenter\relax%
% caution: calculate at nextnotesaligncenter needs a properly set \gre at dimen@textaligncenter
% (corresponding to the text align center of the next syllable)
- \gre at calculate@nextnotesaligncenter{#5}{#6}% idem
+ \gre at calculate@nextnotesaligncenter{#5}% idem
\global\advance\gre at skip@nextbegindifference by \the\gre at dimen@notesaligncenter\relax%
\global\gre at dimen@textaligncenter=\gre at dimen@temp at two %
\global\gre at dimen@notesaligncenter=\gre at dimen@temp at four %
@@ -1193,7 +1176,7 @@
%
%In the new algorithm the bar and the text are set independently of each other based purely on the positions of the corresponding element in the previous and next syllable
% #1 is #4 from \GreBarSyllable (1 if bar is end of word, 0 if not)
-% #2 is #7:2 from \GreBarSyllable (alteration type of first next glyph)
+% #2 is #7 from \GreBarSyllable (alignment type of first next glyph)
\def\gre at calculate@barposition#1#2{%
\gre at trace{gre at calculate@barposition{#1}{#2}}%
% we start by finding the distance between the text and notes of the previous and the next syllable (as if this syllable didn't exist, for the moment)
@@ -1401,7 +1384,7 @@
\global\gre at skip@adjustednextbegindifference=\gre at skip@nextbegindifference %
% gre at skip@alterationshift is 0 or the punctum mora shift
\global\gre at skip@alterationshift=0pt\relax %
- \ifnum#1>0\ifnum\gre at insidediscretionary=0\relax % next is a flat, we're not in a clef change
+ \ifnum#1>19\ifnum\gre at insidediscretionary=0\relax % next is a flat, we're not in a clef change
\advance\gre at skip@adjustednextbegindifference by -\gre at space@dimen at alterationadjustmentbar %
\global\gre at skip@alterationshift=\gre at space@dimen at alterationadjustmentbar\relax %
\gre at debugmsg{barspacing}{adjustment for alteration: \gre at space@dimen at alterationadjustmentbar}%
@@ -1565,7 +1548,7 @@
%% This macro creates one dim (#1), setting its value to #2 and sets whether it should scale when the \gre at factor changes (#3, scalable or fixed). Checks that #1 can accept the kind of distance given in #2.
%% 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 at checklength%
-\def\gre at createdim#1#2#3{%
+\def\grecreatedim#1#2#3{%
\csname newif\expandafter\endcsname\csname ifgre at scale@#1\endcsname%
\IfStrEqCase{#3}{%
{scalable}%
@@ -1575,7 +1558,7 @@
{inherited}%
{\grescaledim{#1}{false}}%
}[% all other cases
- \gre at error{Unrecognized option "#3" for \protect\gre at createdim\MessageBreak Possible options are: 'scalable' and 'fixed' and 'inherited'}%
+ \gre at error{Unrecognized option "#3" for \protect\grecreatedim\MessageBreak Possible options are: 'scalable' and 'fixed'}%
]%
\gre at dimension{#1}{#2}{#3}%
}%
@@ -1616,16 +1599,31 @@
% all other cases
}[\gre at error{Unrecognized option "#3" for \protect\grechangedim\MessageBreak Possible options are: 'scalable', 'fixed', and 'inherited'}]%
\gre at dimension{#1}{#2}{#3}%
- %If we are calling grechangedim from a space configuration file (greconffactor is not 0)
- % and the space configuration file is designed for a \gre at factor other than the current
- % one, then we need to rescale the distance being changed.
- \ifnum\greconffactor=0\else%
- \ifnum\the\gre at factor=\greconffactor\else%
- \gre at changeonedimenfactor{#1}{\greconffactor}{\gre at factor} %
- \fi%
- \fi%
\else%
- \gre at error{#1 is not a recognized distance.}%
+ \IfStrEqCase{#1}{% OBSOLETE
+ {spacearoundsmallbars}% OBSOLETE
+ {% OBSOLETE
+ \gre at obsolete{spacearoundsmallbars}{bar at virgula or bar at minima}% OBSOLETE
+ }% OBSOLETE
+ {spacearoundminor}% OBSOLETE
+ {% OBSOLETE
+ \gre at obsolete{spacearoundminor}{bar at minor}% OBSOLETE
+ }% OBSOLETE
+ {spacearoundmaior}% OBSOLETE
+ {% OBSOLETE
+ \gre at obsolete{spacearoundmaior}{bar at maior}% OBSOLETE
+ }% OBSOLETE
+ {spacearoundfinalis}% OBSOLETE
+ {% OBSOLETE
+ \gre at obsolete{spacearoundfinalis}{bar at finalis}% OBSOLETE
+ }% OBSOLETE
+ {spacebeforefinalfinalis}% OBSOLETE
+ {% OBSOLETE
+ \gre at obsolete{spacebeforfinalfinalis}{bar at finalfinalis}% OBSOLETE
+ }% OBSOLETE
+ }[% OBSOLETE
+ \gre at error{#1 is not a recognized distance.}% keep this line
+ ]% OBSOLETE
\fi%
}%
@@ -1804,24 +1802,13 @@
\newcount\greconffactor%
\def\greloadspaceconf#1{%
- \IfStrEq{#1}{default}{% load default spacings
- \ifx\@onlypreamble\@notprerr%
- \gre at debugmsg{preamble}{Not in preamble}%
- \makeatletter%
- \else%
- \gre at debugmsg{preamble}{In preamble}%
- \fi%
- \input gregoriotex-gsp-default.tex%
- \gre at changedimenfactor{\greconffactor}{\gre at factor}%
- \ifx\@onlypreamble\@notprerr%
- \makeatother%
- \fi%
- }{% load a custom spacing
- \input gsp-#1.tex\relax %
- \ifnum\greconffactor=0\relax%
- \gre at error{gsp-#1.tex does not have an assigned staff size.\MessageBreak Please edit it to define \protect\greconffactor}%
- \fi %
- }
+ \input gsp-#1.tex\relax %
+ \ifnum\greconffactor=0\relax%
+ \gre at error{gsp-#1.tex does not have an assigned staff size.\MessageBreak Please edit it to define \protect\greconffactor}%
+ \fi %
+ \ifnum\the\gre at factor=\greconffactor\else %If the space configuration file is designed for a \gre at factor other than the current one, then we need to rescale the distances.
+ \gre at changedimenfactor{\greconffactor}{\gre at factor} %
+ \fi%
\greconffactor=0%
\relax %
}%
@@ -1909,13 +1896,11 @@
% Math
\gre at rubberpermit{#1}%
\ifgre at rubber%
- \gre at debugmsg{gsp}{scaling a rubber}%
% if we have a rubber allowed length we create a temporary skip
\let\gre at scaledist\gre at skip@temp at one%
\edef\gre at convert{\csname gre at space@skip@#1\endcsname}%
\gre at scaledist=\glueexpr(\gre at convert * \number#3 / \number#2)\relax %
\else%
- \gre at debugmsg{gsp}{scaling a fixed distance}%
% otherwise we create a temporary dimen
\let\gre at scaledist\gre at dimen@temp at one%
\edef\gre at convert{\csname gre at space@dimen@#1\endcsname}%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,7 +19,7 @@
% this file contains definitions of the glyphs and the syllables
-\gre at declarefileversion{gregoriotex-syllable.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-syllable.tex}{5.2.1}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
@@ -180,54 +180,77 @@
% this function is quite simple, it just sets \gre at box@temp at width with a box of the good width, watch the next function for the complete thing
% we define the different alignments possible, of course they depend on the font
% the first 10 (0-9) possible values are the same as in glyph
-% see the cases below
+%% 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
+%% 2: porrectus : has a special align center
+%% 3: initio-debilis : same as 1 but the first note is much smaller
+%% 4: case of a glyph starting with a quilisma
+%% 5: case of a glyph starting with an oriscus
+%% 6: case of a punctum inclinatum
+%% 7: case of a stropha
+%% 8: flexus with an ambitus of one
+%% 9: flexus deminutus
+%% 10: virgula
+%% 11: divisio minima
+%% 12: divisio minor
+%% 13: divisio maior
+%% 14: dominican bar
+%% 15 : divisio finalis
+%% 16 : no note
% there is a tricky here : if notesaligncenter is not 0, it means that there is a flat before, so we simply add notes aligncenter
% #2 is 0 if we are in the context of current syllable, 1 if we are in the context of next syllable
\def\gre at calculate@simplenotesaligncenter#1#2{%
\gre at trace{gre at calculate@simplenotesaligncenter{#1}{#2}}%
- \ifcase#1% 0: punctum
- % one-note glyph or more than two notes glyph except porrectus : here
- % we must put the aligncenter in the middle of the first note
+ \ifcase#1%
+ %case of punctum
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPPunctum}%
- \or% 1: flexus
- % two notes glyph (podatus is considered as a one-note glyph) : here
- % we put the aligncenter in the middle of the glyph
+ \or%
+ %case of flexus
\gre at handleclivisspecialalignment{\gre at font@music\GreCPPesQuadratumLongqueueThreeNothing}{\gre at font@music\GreCPPunctum}{#2}%
- \or% 2: porrectus
- % we consider it to have the same alignment as punctum
+ \or%
+ %case of porrectus (we consider it to have the same alignment as punctum)
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPPunctum}%
- \or% 3: initio debilis
- % same as 1 but the first note is much smaller
+ \or%
+ %case of a initio debilis
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPPunctumDeminutus}%
- \or% 4: glyph starting with a quilisma
+ \or %
+ %case of a quilisma
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPQuilisma}%
- \or% 5: glyph starting with an oriscus
+ \or %
+ %case of an oriscus
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPAscendensOriscus}%
- \or% 6: punctum inclinatum
+ \or %
+ %case of a punctum inclinatum
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPDescendensPunctumInclinatum}%
- \or% 7: stropha
+ \or %
+ %case of a stropha
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPStropha}%
- \or% 8: flexus with ambitus of one
+ \or %
+ % case of flexus with ambitus of one
\gre at handleclivisspecialalignment{\gre at font@music\GreCPPesQuadratumLongqueueOneNothing}{\gre at font@music\GreCPPunctum}{#2}%
- \or% 9: flexus deminutus
+ \or %
+ % case of flexus deminutus
\gre at handleclivisspecialalignment{\gre at font@music\GreCPFlexusTwoDeminutus}{\gre at font@music\GreCPPunctum}{#2}%
- \or% 10: virgula
+ \or %
+ % case of virgula
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at virgula}%
- \or% 11: divisio minima
+ \or %
+ % case of divisio minima
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at divisiominima}%
- \or% 12: divisio minor
+ \or %
+ % case of divisio minor
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at divisiominor}%
- \or% 13: divisio maior
+ \or %
+ % case of divisio maior
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at divisiomaior}%
- \or% 14: dominican bar
+ \or %
+ % case of dominican bar
\global\setbox\gre at box@temp at width=\hbox{\gre at font@music\GreCPDivisioDominican}%
- \or% 15: parenthesized virgula
- \global\setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at virgulaparen}%
- \or% 16: parenthesized divisio minima
- \global\setbox\gre at box@temp at width=\hbox{\gre at font@music\gre at char@bar at divisiominimaparen}%
- \or% 17: divisio finalis
+ \or %
+ % case of divisiofinalis
\global\setbox\gre at box@temp at width=\hbox{\gre at fontchar@divisiofinalis}%
- \or% 18: no note
+ \or %
+ % case of no note
\ifgre at newbarspacing%
\global\setbox\gre at box@temp at width=\hbox{}%
\else%
@@ -303,33 +326,36 @@
\gre at trace@end%
}%
-% this is the function that we call when we try to determine the next aligncenter of the notes.
-% #1 is the note type
-% #2 is the alteration style : 0 = none, 1 = flat, 2 = natural, 3 = sharp,
-% 4 = parenthesized flat, 5 = parenthesized natural,
-% 6 = parenthesized flat
-\def\gre at calculate@nextnotesaligncenter#1#2{%
- \gre at trace{gre at calculate@nextnotesaligncenter{#1}{#2}}%
- \gre at calculate@simplenotesaligncenter{#1}{1}%
- \gre at dimen@temp at five=\dimexpr(\wd\gre at box@temp at width / 2)\relax %
- \ifcase#2\relax% 0 - none
- \or % 1 - flat
- \setbox\gre at box@temp at width=\hbox{\gre at fontchar@flat}%
- \or % 2 - natural
- \setbox\gre at box@temp at width=\hbox{\gre at fontchar@natural}%
- \or % 3 - sharp
- \setbox\gre at box@temp at width=\hbox{\gre at fontchar@sharp}%
- \or % 4 - parenthesized flat
- \setbox\gre at box@temp at width=\hbox{\gre at fontchar@flatparen}%
- \or % 5 - parenthesized natural
- \setbox\gre at box@temp at width=\hbox{\gre at fontchar@naturalparen}%
- \or % 6 - parenthesized sharp
- \setbox\gre at box@temp at width=\hbox{\gre at fontchar@sharpparen}%
- \fi %
- \ifnum#2>0\relax %
+% this is the function that we call when we try to determine the next aligncenter of the notes. In this case we call this function with normal arguments if there is no flat nor natural ; we call it with argument + 20 if there is a flat and argument + 40 if there is a natural, +60 with a sharp
+\def\gre at calculate@nextnotesaligncenter#1{%
+ \gre at trace{gre at calculate@nextnotesaligncenter{#1}}%
+ \ifnum#1<20\relax %
+ \gre at calculate@simplenotesaligncenter{#1}{1}%
+ \gre at dimen@temp at five=\dimexpr(\wd\gre at box@temp at width / 2)\relax %
+ \global\gre at dimen@notesaligncenter=\gre at dimen@temp at five %
+ \else %\ifnum#1<20
+ \gre at count@temp at three=#1 %
+ \ifnum#1<40\relax%
+ \advance\gre at count@temp at three by -20\relax %
+ \gre at calculate@simplenotesaligncenter{\gre at count@temp at three}{1}%
+ \gre at dimen@temp at five=\dimexpr(\wd\gre at box@temp at width / 2)\relax %
+ \setbox\gre at box@temp at width=\hbox{\gre at fontchar@flat}%
+ \else%\ifnum#1<40
+ \ifnum#1<60\relax%
+ \advance\gre at count@temp at three by -40\relax %
+ \gre at calculate@simplenotesaligncenter{\gre at count@temp at three}{1}%
+ \gre at dimen@temp at five=\dimexpr(\wd\gre at box@temp at width / 2)\relax %
+ \setbox\gre at box@temp at width=\hbox{\gre at fontchar@natural}%
+ \else%\ifnum#1<60
+ \advance\gre at count@temp at three by -60\relax %
+ \gre at calculate@simplenotesaligncenter{\gre at count@temp at three}{1}%
+ \gre at dimen@temp at five=\dimexpr(\wd\gre at box@temp at width / 2)\relax %
+ \setbox\gre at box@temp at width=\hbox{\gre at fontchar@sharp}%
+ \fi%
+ \fi %
\advance\gre at dimen@temp at five by \dimexpr(\wd\gre at box@temp at width+\gre at space@dimen at alterationspace)\relax %
+ \global\gre at dimen@notesaligncenter=\gre at dimen@temp at five %
\fi %
- \global\gre at dimen@notesaligncenter=\gre at dimen@temp at five %
\relax %
\gre at trace@end%
}%
@@ -371,8 +397,8 @@
\global\gre at count@lastglyphiscavum=0\relax %
\global\gre at firstglyphtrue%
\global\gre at boxingtrue%
- \let\ifgre at saved@prenotes at lastendswithmora\ifgre at lastendswithmora%
- \xdef\gre at saved@prenotes at lastoflinecount{\number\gre at lastoflinecount\relax }%
+ \let\ifgre at lastendswithmorasave\ifgre at lastendswithmora%
+ \xdef\gre at savedlastoflinecount{\number\gre at lastoflinecount\relax }%
\ifgre at shownotes%
\setbox\gre at box@syllablenotes=\hbox{#1}%
\else%
@@ -380,6 +406,7 @@
\fi%
\gre at debugmsg{spacing}{Width of notes: \the\wd\gre at box@syllablenotes}%
\global\gre at boxingfalse%
+ \global\gre at lastoflinecount=\gre at savedlastoflinecount\relax %
\global\gre at firstglyphtrue%
% now gre at lastendswithmora is true if this syllable ends with a
% punctum mora, but we still want to keep gre at lastendswithmora if we
@@ -392,8 +419,7 @@
\else %
\gre at thisendswithmorafalse %
\fi %
- \let\ifgre at lastendswithmora\ifgre at saved@prenotes at lastendswithmora%
- \global\gre at lastoflinecount=\gre at saved@prenotes at lastoflinecount\relax %
+ \let\ifgre at lastendswithmora\ifgre at lastendswithmorasave %
\global\gre at count@lastglyphiscavum=0\relax %
\global\gre at skip@bar at lastskip=0pt\relax %
\global\gre at endofscorefalse %
@@ -747,18 +773,18 @@
\gre at trace@end%
}%
-\let\gre at saved@syllable at endsyllablepart\gre at nothing\relax %
-\let\gre at saved@syllable at fixedtextformat\gre at textnormal\relax %
-\let\gre at saved@syllable at pointandclick\gre at nothing\relax %
+\let\gre at save@endsyllablepart\gre at nothing\relax %
+\let\gre at save@fixedtextformat\gre at textnormal\relax %
+\let\gre at save@pointandclick\gre at nothing\relax %
\def\gre at push@endsyllable#1{%
\gre at trace{gre at push@endsyllable{#1}}%
- \let\gre at saved@syllable at endsyllablepart\gre at nothing\relax %
- \let\gre at saved@syllable at fixedtextformat\gre at textnormal\relax %
- \let\gre at saved@syllable at pointandclick\gre at nothing\relax %
+ \let\gre at save@endsyllablepart\gre at nothing\relax %
+ \let\gre at save@fixedtextformat\gre at textnormal\relax %
+ \let\gre at save@pointandclick\gre at nothing\relax %
\gre at if@rewritesyllable{%
- \let\gre at saved@syllable at endsyllablepart\gre at endsyllablepart\relax %
- \let\gre at saved@syllable at fixedtextformat\gre at fixedtextformat\relax %
- \xdef\gre at saved@syllable at pointandclick{#1}%
+ \let\gre at save@endsyllablepart\gre at endsyllablepart\relax %
+ \let\gre at save@fixedtextformat\gre at fixedtextformat\relax %
+ \xdef\gre at save@pointandclick{#1}%
}{}%
\relax %
\gre at trace@end%
@@ -766,15 +792,15 @@
\def\gre at emit@syllabletext#1{%
\gre at trace{gre at emit@syllabletext{#1}}%
- \ifx\gre at saved@syllable at endsyllablepart\gre at nothing %
+ \ifx\gre at save@endsyllablepart\gre at nothing %
\gre at fixedtextformat{#1}%
\else %
- \ifx\gre at saved@syllable at fixedtextformat\gre at fixedtextformat %
+ \ifx\gre at save@fixedtextformat\gre at fixedtextformat %
\gre at debugmsg{syllablerewriting}{merging format when prepending previous last syllable part}%
- \gre at fixedtextformat{\gre at pointandclick{\gre at saved@syllable at endsyllablepart}{\gre at saved@syllable at pointandclick}#1}%
+ \gre at fixedtextformat{\gre at pointandclick{\gre at save@endsyllablepart}{\gre at save@pointandclick}#1}%
\else %
\gre at debugmsg{syllablerewriting}{prepending previous last syllable part}%
- \gre at saved@syllable at fixedtextformat{\gre at pointandclick{\gre at saved@syllable at endsyllablepart}{\gre at saved@syllable at pointandclick}}%
+ \gre at save@fixedtextformat{\gre at pointandclick{\gre at save@endsyllablepart}{\gre at save@pointandclick}}%
\gre at fixedtextformat{#1}%
\fi %
\fi %
@@ -807,9 +833,6 @@
\gre at textclearedtrue%
}%
-\def\gre at arg@oftwo at first#1#2{#1}%
-\def\gre at arg@oftwo at second#1#2{#2}%
-
%% general macro : it will typeset the syllable : arguments are :
% #1 : macro setting the letters of this syllable
% #2 : reserved (unused)
@@ -820,7 +843,7 @@
% the three next parameters are to put an hyphen if necessary, they can be empty for end of words
% #5 : macros setting next syllable letters of the next syllable
% #6 : the line:char:column for a textedit link
-% #7 : alignment type of the first next glyph (this is a pair: alignment type and alteration type)
+% #7 : alignment type of the first next glyph
% #8 : other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments
%% with a special option for #7 : if it is a bar, we don't put a space at the end
%% at the end we wall \greendofword or \gre at endofsyllable with #7, to reduce the space in case of a flat or natural
@@ -855,7 +878,7 @@
#1%
\gre at firstglyphtrue%
\gre at dimen@bolextra = 0pt\relax%
- \gre at calculate@textaligncenter{\gre at saved@syllable at endsyllablepart}{\gre at firstsyllablepart}{\gre at middlesyllablepart}{0}% we first get the width between the alignment point and the end of the syllable
+ \gre at calculate@textaligncenter{\gre at save@endsyllablepart}{\gre at firstsyllablepart}{\gre at middlesyllablepart}{0}% we first get the width between the alignment point and the end of the syllable
\gre at syllablenotes{#9}% we put the notes in a box, so that we have the width of it
% now we calculate the begin difference, that is to say \gre at dimen@notesaligncenter - \gre at dimen@textaligncenter
\gre at dimen@begindifference=\dimexpr(\gre at dimen@notesaligncenter - \gre at dimen@textaligncenter)\relax %
@@ -904,7 +927,7 @@
% by default, gre at attr@dash will be 2
\gre at attr@dash=2\relax %
#5%
- \gre at calculate@nextbegindifference{\gre at emit@endsyllablepartfornextsyllable}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart}}{\gre at evaluatenextsyllable{\gre at nextmiddlesyllablepart}}{\gre at evaluatenextsyllable{\gre at nextendsyllablepart}}#7%
+ \gre at calculate@nextbegindifference{\gre at emit@endsyllablepartfornextsyllable}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart}}{\gre at evaluatenextsyllable{\gre at nextmiddlesyllablepart}}{\gre at evaluatenextsyllable{\gre at nextendsyllablepart}}{#7}%
\gre at unsetfixednexttextformat %
\ifgre at showlyrics%
\setbox\gre at box@syllabletext=\hbox{%
@@ -924,14 +947,13 @@
\gre at calculate@enddifference{\wd\gre at box@syllablenotes}{\wd\gre at box@syllabletext}{\gre at dimen@textaligncenter}{\gre at dimen@notesaligncenter}{1}%
% gre at count@temp at one holds 0 if next is a not bar, 1 if it is
\gre at count@temp at one=0%
- \ifnum\gre at arg@oftwo at second#7=0\relax %
- \ifnum\gre at arg@oftwo at first#7>9\relax %
+ \ifnum#7>9\relax %
+ \ifnum#7<20\relax %
\gre at count@temp at one=1\relax %
+ \else %
+ \gre at count@temp at one=2\relax %
\fi %
- \else %
- \gre at count@temp at one=2\relax %
\fi %
- \gre at debugmsg{spacing}{ gre at count@temp at one = \the\gre at count@temp at one}%
\gre at calculate@syllablefinalskip{#4}{\gre at count@temp at one}%
\ifcase#4 %
% we enter here if the end of word is 0, so we must determine if we need to type a dash here
@@ -991,7 +1013,7 @@
\fi%
\fi %
% recomputing end difference and final skip with the final hyphen
- \gre at calculate@nextbegindifference{\gre at emit@endsyllablepartfornextsyllable}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart}}{\gre at evaluatenextsyllable{\gre at nextmiddlesyllablepart}}{\gre at evaluatenextsyllable{\gre at nextendsyllablepart}}#7%
+ \gre at calculate@nextbegindifference{\gre at emit@endsyllablepartfornextsyllable}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart}}{\gre at evaluatenextsyllable{\gre at nextmiddlesyllablepart}}{\gre at evaluatenextsyllable{\gre at nextendsyllablepart}}{#7}%
\gre at calculate@enddifference{\wd\gre at box@syllablenotes}{\wd\gre at box@syllabletext}{\gre at dimen@textaligncenter}{\gre at dimen@notesaligncenter}{0}%
\gre at calculate@syllablefinalskip{#4}{\gre at count@temp at one}%
\else %
@@ -1062,7 +1084,7 @@
\GreNoBreak %
\fi%
% we call end of syllable
- \gre at syllable@end#7{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart\gre at nextmiddlesyllablepart\gre at nextendsyllablepart}}{#4}%
+ \gre at syllable@end{#7}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart\gre at nextmiddlesyllablepart\gre at nextendsyllablepart}}{#4}%
\gre at push@endsyllable{#6}\relax %
\global\gre at dimen@notesaligncenter=0pt\relax% very important, see flat and natural
\gre at unsetfixedtextformat %
@@ -1101,16 +1123,15 @@
%% @desc Macro to make a few checks and call the right macros between
%% \endbeforebar, \endofword, \endofsyllable
-%% @arg#1 next syllable alignment type (#7:1 of \GreSyllable)
-%% @arg#2 next syllable alteration type (#7:2 of \GreSyllable)
-%% @arg#3 next syllable text
-%% @arg#4 end of word or not (#4 of \GreSyllable)
-\def\gre at syllable@end#1#2#3#4{%
- \gre at trace{gre at syllable@end{#1}{#2}{#3}{#4}}%
+%% @arg#1 next syllable type (#7 of \GreSyllable)
+%% @arg#2 next syllable text
+%% @arg#3 end of word or not (#4 of \GreSyllable)
+\def\gre at syllable@end#1#2#3{%
+ \gre at trace{gre at syllable@end{#1}{#2}{#3}}%
% gre at count@temp at one holds 0 if next is a not bar, 1 if it is
\gre at count@temp at one=0%
- \ifnum#2=0\relax %
- \ifnum#1>9\relax %
+ \ifnum#1>9\relax %
+ \ifnum#1<20\relax %
\gre at count@temp at one=1%
\fi %
\fi %
@@ -1120,7 +1141,7 @@
\gre at endofsyllable{0}{1}{1}%
\else %
% otherwise we call it with 1 only if there is no letters after (we can see it with nextbegindifference)
- \setbox\gre at box@temp at width=\hbox{#3}%
+ \setbox\gre at box@temp at width=\hbox{#2}%
\ifdim\wd\gre at box@temp at width=0pt\relax%
\gre at endofsyllable{0}{1}{1}%
\else %
@@ -1131,8 +1152,8 @@
\ifnum\gre at lastoflinecount=1\relax %
\global\gre at lastoflinecount=2\relax %
\fi %
- \gre at debugmsg{syllablespacing}{ calling endofsyllable with #4}%
- \gre at endofsyllable{1}{#4}{0}%
+ \gre at debugmsg{syllablespacing}{ calling endofsyllable with #3}%
+ \gre at endofsyllable{1}{#3}{0}%
\fi %
\gre at trace@end%
}
@@ -1222,7 +1243,6 @@
%a macro to typeset a syllable with only a bar inside
\def\GreBarSyllable#1#2#3#4#5#6#7#8#9{%
- \gre at trace{GreBarSyllable{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}%
\gre at textclearedfalse%
\gre at debugmsg{general}{}%
\gre at debugmsg{general}{New bar syllable}%
@@ -1235,7 +1255,7 @@
% there are two different cases that have almost nothing in common : the case where there is something written under the bar, and the case where there is nothing.
% first of all we need to calculate previousenddifference, begindifference, enddifference and nextbegindifference.
#1%
- \gre at calculate@textaligncenter{\gre at saved@syllable at endsyllablepart}{\gre at firstsyllablepart}{\gre at middlesyllablepart}{0}%
+ \gre at calculate@textaligncenter{\gre at save@endsyllablepart}{\gre at firstsyllablepart}{\gre at middlesyllablepart}{0}%
\ifgre at showlyrics%
\setbox\gre at box@syllabletext=\hbox{%
\IfSubStr{\gre at debug}{,barspacing,}%
@@ -1252,7 +1272,7 @@
\setbox\gre at box@syllabletext=\box\voidb at x%
\fi%
\gre at debugmsg{barspacing}{Width of bar text: \the\wd\gre at box@syllabletext}%
- \global\let\gre at saved@prelinedelay at newlinecommon\gre at newlinecommon %
+ \global\let\gre at newlinecommonsaved\gre at newlinecommon %
\global\let\gre at newlinecommon\gre at newlinecommondelayed %
\xdef\gre at newlinearg{-1}%
\gre at syllablenotes{#9}%
@@ -1261,7 +1281,7 @@
\gre at dimen@begindifference=\dimexpr(\gre at dimen@notesaligncenter - \gre at dimen@textaligncenter)\relax%
\gre at calculate@enddifference{\wd\gre at box@syllablenotes}{\wd\gre at box@syllabletext}{\gre at dimen@textaligncenter}{\gre at dimen@notesaligncenter}{1}%
#5%
- \gre at calculate@nextbegindifference{\gre at emit@endsyllablepartfornextsyllable}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart}}{\gre at evaluatenextsyllable{\gre at nextmiddlesyllablepart}}{\gre at evaluatenextsyllable{\gre at nextendsyllablepart}}#7%
+ \gre at calculate@nextbegindifference{\gre at emit@endsyllablepartfornextsyllable}{\gre at evaluatenextsyllable{\gre at nextfirstsyllablepart}}{\gre at evaluatenextsyllable{\gre at nextmiddlesyllablepart}}{\gre at evaluatenextsyllable{\gre at nextendsyllablepart}}{#7}%
\gre at unsetfixednexttextformat %
\gre at debugmsg{barspacing}{previousenddifference: \the\gre at dimen@previousenddifference}%
\gre at debugmsg{barspacing}{begindifference: \the\gre at dimen@begindifference}%
@@ -1271,7 +1291,7 @@
%
% New bar spacing algorithm
%
- \gre at calculate@barposition{#4}{\gre at arg@oftwo at second#7}%
+ \gre at calculate@barposition{#4}{#7}%
\ifgre at textcleared%
\gre at clearsyllable{bar}%
\fi%
@@ -1315,7 +1335,7 @@
{\raise 12pt\hbox to 0pt{\rule{0.4pt}{12pt}\hss}}%
{}% do nothing if not debugging
\fi%
- \global\let\gre at newlinecommon\gre at saved@prelinedelay at newlinecommon %
+ \global\let\gre at newlinecommon\gre at newlinecommonsaved %
\GreNoBreak%
% get into position to place the penalty
\ifdim\gre at dimen@enddifference < 0pt\relax%
@@ -1398,7 +1418,7 @@
\gre at clearsyllable{bar}%
\fi%
% then we check if there is something to write
- \global\let\gre at newlinecommon\gre at saved@prelinedelay at newlinecommon %
+ \global\let\gre at newlinecommon\gre at newlinecommonsaved %
\gre at debugmsg{ifdim}{ wd(gre at box@syllabletext) = 0pt}%
\ifdim\wd\gre at box@syllabletext = 0 pt\relax %
% the most difficult case : when there is nothing to write
@@ -1524,7 +1544,6 @@
\gre at localrightbox{}%
\fi\fi %
\relax%
- \gre at trace@end%
}
\newif\ifgre at newbarspacing%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
--GregorioTeX Symbols Lua support file.
--
---Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2016-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 6.0.0-beta1
+-- GREGORIO_VERSION 5.2.1
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -22,7 +22,7 @@
\ifcsname gregoriotex at symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex at symbols@loaded{}%
-\gre at declarefileversion{gregoriotex-symbols.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-symbols.tex}{5.2.1}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
--GregorioTeX Lua file.
--
---Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -24,16 +24,16 @@
gregoriotex = gregoriotex or {}
local gregoriotex = gregoriotex
-local internalversion = '6.0.0-beta1' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '5.2.1' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '6.0.0-beta1', -- GREGORIO_VERSION
+ version = '5.2.1', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2021/02/23", -- GREGORIO_DATE_LTX
+ date = "2019/04/06", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
- copyright = "2008-2021 - The Gregorio Project",
+ copyright = "2008-2019 - The Gregorio Project",
license = "GPLv3+",
})
@@ -146,7 +146,7 @@
local exe_version
-- first look for one with the exact version
- real_gregorio_exe = 'gregorio-6_0_0-beta1' -- FILENAME_VERSION
+ real_gregorio_exe = 'gregorio-5_2_1' -- FILENAME_VERSION
local cmd = string.format([[%s -o "%%s" "%s"]], real_gregorio_exe,
test_snippet_filename)
exe_version = get_prog_output(cmd, '*line')
@@ -769,10 +769,11 @@
string.find(os.getenv("PATH"),";",1,true)
if onwindows then
sep = "\\"
+ dirpath = string.match(file_withdir, "(.*)"..sep)
else
sep = "/"
+ dirpath = string.match(file_withdir, "(.*)"..sep)
end
- dirpath = string.match(file_withdir, "(.*)"..sep)
if dirpath then -- dirpath is nil if current directory
filename = "^"..file_withdir:match(".*/".."(.*)").."%-%d+_%d+_%d+[-%a%d]*%.gtex$"
for a in lfs.dir(dirpath) do
@@ -853,37 +854,6 @@
end
end
-local function locate_file(filename)
- local result
- if not gre_input_path then
- gre_input_path = {""}
- end
- for i,k in pairs(gre_input_path) do
- log("Looking in %s", k)
- if lfs.isfile(k .. filename) then
- result = k..filename
- if result == filename then
- log("Found %s directly", filename)
- else
- log("Found %s in %s", filename, k)
- end
- break
- end
- end
- if not result then
- result = kpse.find_file(filename)
- if result then
- log("Found %s at\n%s using kpsewhich", filename, result)
- if string.match(result," ") then
- warn("%s contains a space in the path\nTeX will likely complain about this", filename)
- end
- else
- log("Cannot find %s", filename)
- end
- end
- return result
-end
-
local function include_score(input_file, force_gabccompile, allow_deprecated)
if string.match(input_file, "[#%%]") then
err("GABC filename contains invalid character(s): # %%\n"
@@ -902,17 +872,15 @@
end
local cleaned_filename = input_name:gsub("[%s%+%&%*%?$@:;!\"\'`]", "-")
- local gabc_filename = string.format("%s%s.gabc", file_dir, input_name)
- local gabc_file = locate_file(gabc_filename)
- local gtex_filename = string.format("%s%s-%s.gtex", file_dir, cleaned_filename,
+ local gabc_file = string.format("%s%s.gabc", file_dir, input_name)
+ local gtex_file = string.format("%s%s-%s.gtex", file_dir, cleaned_filename,
internalversion:gsub("%.", "_"))
- local gtex_file = locate_file(gtex_filename)
local glog_file = string.format("%s%s-%s.glog", file_dir, cleaned_filename,
internalversion:gsub("%.", "_"))
- if not gtex_file then
+ if not lfs.isfile(gtex_file) then
clean_old_gtex_files(file_dir..cleaned_filename)
- log("The file %s does not exist. Will use gabc file", gtex_filename)
- if gabc_file then
+ log("The file %s does not exist. Searching for a gabc file", gtex_file)
+ if lfs.isfile(gabc_file) then
local gabc = io.open(gabc_file, 'r')
if gabc == nil then
err("\n Unable to open %s", gabc_file)
@@ -920,18 +888,14 @@
else
gabc:close()
end
- compile_gabc(gabc_file, gtex_filename, glog_file, allow_deprecated)
- tex.print(string.format([[\input %s\relax]], gtex_filename))
+ compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
+ tex.print(string.format([[\input %s\relax]], gtex_file))
return
else
- err("The file %s does not exist", gabc_filename)
+ err("The file %s does not exist.", gabc_file)
return
end
end
- if not gabc_file then
- tex.print(string.format([[\input %s\relax]], gtex_file))
- return
- end
local gtex_timestamp = lfs.attributes(gtex_file).modification
local gabc_timestamp = lfs.attributes(gabc_file).modification
-- open the gabc file for reading so that LuaTeX records input from it
@@ -966,7 +930,7 @@
local f = io.open(snippet_filename, '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:write('name:direct-gabc;\n'..(header or '')..'\n%%\n'..gabc:gsub('\\par ', '\n'))
f:close()
local cmd = string.format([[%s -W %s-o "%%s" -l "%s" "%s"]], gregorio_exe(),
deprecated, snippet_logname, snippet_filename)
@@ -995,10 +959,8 @@
end
glog:close()
end
- if not (debug_types_activated['snippet'] or debug_types_activated['all']) then
- os.remove(snippet_filename)
- os.remove(snippet_logname)
- end
+ os.remove(snippet_filename)
+ os.remove(snippet_logname)
end
local function get_gregoriotexluaversion()
Modified: branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex 2021-03-04 22:18:41 UTC (rev 58131)
+++ branches/branch2020.0/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex 2021-03-04 22:26:49 UTC (rev 58132)
@@ -1,6 +1,6 @@
% GregorioTeX boostrap file for Plain TeX
%
-% Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -21,14 +21,13 @@
% 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.
-% [2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2019/04/06 v5.2.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
-\input iftex.sty
-\RequireLuaTeX%
\edef\greoldcatcode{\the\catcode`@}
\catcode`\@=11
+\input ifluatex.sty%
\input luatexbase.sty%
\input luamplib.sty%
\input luaotfload.sty%
More information about the tex-live-commits
mailing list.