diff options
30 files changed, 36 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex index e14eb66559b..99c985f9ec3 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex @@ -938,9 +938,9 @@ Macro to set how the text of the lyrics aligns with the alignment point of its r & \texttt{firstletter} & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\ \end{argtable} -\textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file. Out of the box, Gregorio\TeX\ explicitly supports only Latin and English, but the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results. +\textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file. Out of the box, Gregorio\TeX\ explicitly supports Latin, English, Church Slavonic and Hungarian. Polish, Czech, and Slovak are supported as aliases for Church Slavonic. Furthermore the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results. -You can also define your own languages in \texttt{gregorio-vowels.dat}. If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions). +You can also define your own languages in \texttt{gregorio-vowels.dat} (see \nameref{customvowels} for details). If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions). Finally, in cases where you want some sort of exceptional alignment, you can force Gregorio to consider a particular part of the syllable to be the ``vowel'' by enclosing it in curly braces (``\{'' and ``\}'') in your gabc file. Curly braces only affect alignment when using vowel centering. Syllable centering will always use the entire syllable, and firstletter centering will always use the first character of the syllable --- regardless of curly braces in the gabc file. @@ -1366,7 +1366,7 @@ For a full description of how to make use of the ancient notation capabilities o Macro to set the font to be used for the ancient notation. \begin{argtable} - \#1 & string & the name of the font\\ + \#1 & string & the name of the font, either \texttt{gregall}, \texttt{grelaon}, or \texttt{gresgmodern}\\ \#2 & integer & point size at which the font should be loaded\\ \end{argtable} diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex index 2e70a2701d6..3de2b367821 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex @@ -388,6 +388,8 @@ If no vowel is found, the notes are centered around the whole syllable. If you are using a language for which built-in language rules do not exist and the fallbacks are insufficient, then you may wish to provide your own set of vowel detection rules. This can be done with a special file:\verb=gregorio-vowels.dat=. See \nameref{customvowels} for information about how to create and use this file. +Languages which are currently supported are Latin, English, Church Slavonic and Hungarian. Polish, Czech, and Slovak are supported as aliases for Church Slavonic. All of these languages can be specified by name (in which case both titlecase and lowercase names are recognized) and by using their ISO 639 (-1 two-letter, -2/T three-letter, or -2/B three-letter) standard abbreviations. + \subsection{Notation --- Note Syntax}\label{notesyntax} @@ -1101,6 +1103,8 @@ for the specified language. It must be followed by the language name, enclosed in square brackets, and a semicolon. The language specified applies until the next language statement. +When choosing the name for your language, it is preferable that you use the ISO 639-1 standard (two-letter) code. All other names should be listed as aliases (see above). If you plan to submit your vowel detection rules for inclusion in the Gregorio source, then this will be required. + \item[vowel] The \texttt{vowel} keyword indicates that the characters which follow, @@ -1138,9 +1142,11 @@ the syllabic consonants \emph{l} and \emph{r} in Czech. By way of example, here is a vowel file that works for English: \begin{lstlisting}[autogobble] -alias [english] to [English]; +alias [english] to [en]; +alias [English] to [en]; +alias [eng] to [en]; -language [English]; +language [en]; vowel aàáAÀÁ; vowel eèéëEÈÉË; diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf Binary files differindex 77e8c05ebca..08d750889ee 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf Binary files differindex d77f77ce8c8..3628fc10529 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex index 6473ceaa733..dc897c77032 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex @@ -183,7 +183,7 @@ \vspace{1cm} - \large Version \textbf{5.2.0}, 10 March 2019 %% PARSE_VERSION_DATE + \large Version \textbf{5.2.1}, 6 April 2019 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py index d3c05bd9751..7a57a827f67 100644 --- a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py +++ b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py @@ -90,7 +90,7 @@ AMBITUS = { 14 : 'Fourteen', } -GREGORIO_VERSION = '5.2.0' +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 diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf Binary files differindex 092955c655f..8ab9d28b23e 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf Binary files differindex c39f276e63f..fd32d093c1a 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf Binary files differindex bb53d20fefa..3c97f9dd359 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf Binary files differindex 78742f3e101..10089f020f0 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf Binary files differindex 53affc54b88..128f7a9f178 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf Binary files differindex 34aa6653a8e..b4ceda6c17d 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf Binary files differindex 601fd05bc98..a5bc576a8ad 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf Binary files differindex d5e8cabb51c..0a041c5d18b 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf Binary files differindex 09338d604dd..320e43e0813 100644 --- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf +++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty index f37d3377275..c766dc61bf0 100644 --- a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty +++ b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2019/03/10 v5.2.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2019/04/06 v5.2.1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX % If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts. \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% @@ -39,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@gregoriotexversion{5.2.0}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.2.1}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty index c82f2ced4d4..2b6d8770241 100644 --- a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty +++ b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2019/03/10 v5.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2019/04/06 v5.2.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX % If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away \ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex index 1b27903acf6..5b0c83ee4e3 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex @@ -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@declarefileversion{gregoriotex-chars.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{5.2.1}% GREGORIO_VERSION \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}% \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex index 661c6aca18d..3e63e95ab47 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex @@ -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@declarefileversion{gregoriotex-commonx.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-commonx.tex}{5.2.1}% GREGORIO_VERSION %%%%%%%%% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex index 6c429a70808..95b463c90c1 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex @@ -21,7 +21,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregoriotexversion{5.2.0}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.2.1}% GREGORIO_VERSION - VersionManager.py \ifluatex% \ifnum\luatexversion<76% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua index 1e27e7ae3bf..8eb1b3e155a 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua @@ -20,7 +20,7 @@ -- this file contains lua functions used by GregorioTeX St. Gall ancient -- neume support when called with LuaTeX. --- GREGORIO_VERSION 5.2.0 +-- GREGORIO_VERSION 5.2.1 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex index 63b7dd3695a..11949b5a7c9 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex @@ -19,7 +19,7 @@ % this file contains macros for St. Gall ancient neume support -\gre@declarefileversion{gregoriotex-nabc.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{5.2.1}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua index 40248812ef8..c52a25b1133 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 5.2.0 +-- GREGORIO_VERSION 5.2.1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex index 7f496414bf4..b5f68ebbcd3 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{5.2.1}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex index b4d1f5609a4..c9a0df14f6e 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex @@ -19,7 +19,7 @@ % this file contains definitions of spaces -\gre@declarefileversion{gregoriotex-spaces.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{5.2.1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex index b88e43f8ba5..137a6f901fa 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex @@ -19,7 +19,7 @@ % this file contains definitions of the glyphs and the syllables -\gre@declarefileversion{gregoriotex-syllable.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{5.2.1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua index 2b5f7387ebf..8e9f0a31948 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 5.2.0 +-- GREGORIO_VERSION 5.2.1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex index d2f744b5b6f..61478295e06 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex @@ -22,7 +22,7 @@ \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% \def\gregoriotex@symbols@loaded{}% -\gre@declarefileversion{gregoriotex-symbols.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{5.2.1}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua index 93fe9298b5e..f3ad902b5a3 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua @@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after, gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '5.2.0' -- 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 = '5.2.0', -- GREGORIO_VERSION + version = '5.2.1', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2019/03/10", -- GREGORIO_DATE_LTX + date = "2019/04/06", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2019 - The Gregorio Project", @@ -146,14 +146,14 @@ local function gregorio_exe() local exe_version -- first look for one with the exact version - real_gregorio_exe = 'gregorio-5_2_0' -- FILENAME_VERSION - local cmd = string.format("%s -o %%s %s", real_gregorio_exe, + 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') if not exe_version then -- look for suffix-less executable real_gregorio_exe = 'gregorio' - cmd = string.format("%s -o %%s %s", real_gregorio_exe, + cmd = string.format([[%s -o "%%s" "%s"]], real_gregorio_exe, test_snippet_filename) exe_version = get_prog_output(cmd, '*line') end @@ -547,7 +547,7 @@ local function post_linebreak(h, groupcode, glyphes) h, line = remove(h, line) else linenum = linenum + 1 - debugmessage('linesglues', 'line %d: %s factor %d%%', linenum, glue_sign_name[line.glue_sign], line.glue_set*100) + debugmessage('linesglues', 'line %d: %s factor %.0f%%', linenum, glue_sign_name[line.glue_sign], line.glue_set*100) centerstartnode = nil line_id = nil line_top = nil @@ -932,7 +932,7 @@ local function direct_gabc(gabc, header, allow_deprecated) gabc = gabc:match('^()%s*$') and '' or gabc:match('^%s*(.*%S)') f:write('name:direct-gabc;\n'..(header or '')..'\n%%\n'..gabc:gsub('\\par ', '\n')) f:close() - local cmd = string.format('%s -W %s-o %%s -l %s %s', gregorio_exe(), + local cmd = string.format([[%s -W %s-o "%%s" -l "%s" "%s"]], gregorio_exe(), deprecated, snippet_logname, snippet_filename) local content = get_prog_output(cmd, '*a') if content == nil then diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex index 9ea76f4b883..a00003eba27 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex @@ -21,7 +21,7 @@ % This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does. -% [2019/03/10 v5.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2019/04/06 v5.2.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} |