From f9a711de58ce886e55f254d2a876714624dcdfb4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 Jun 2017 21:52:09 +0000 Subject: gregoriotex (25may17) git-svn-id: svn://tug.org/texlive/trunk@44502 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/luatex/gregoriotex/GregorioNabcRef.pdf | Bin 484850 -> 484860 bytes .../doc/luatex/gregoriotex/GregorioRef.pdf | Bin 750341 -> 750347 bytes .../doc/luatex/gregoriotex/GregorioRef.tex | 2 +- .../texmf-dist/fonts/source/gregoriotex/README.md | 10 +-- .../fonts/source/gregoriotex/squarize.py | 2 +- .../truetype/public/gregoriotex/greciliae-hole.ttf | Bin 1050548 -> 1050548 bytes .../public/gregoriotex/greciliae-hollow.ttf | Bin 1730980 -> 1730980 bytes .../public/gregoriotex/greciliae-op-hole.ttf | Bin 1050632 -> 1050632 bytes .../public/gregoriotex/greciliae-op-hollow.ttf | Bin 1763980 -> 1763980 bytes .../truetype/public/gregoriotex/greciliae-op.ttf | Bin 1071412 -> 1071412 bytes .../truetype/public/gregoriotex/greciliae.ttf | Bin 1038600 -> 1038600 bytes .../fonts/truetype/public/gregoriotex/greextra.ttf | Bin 24748 -> 24748 bytes .../fonts/truetype/public/gregoriotex/gregall.ttf | Bin 153012 -> 153012 bytes .../fonts/truetype/public/gregoriotex/grelaon.ttf | Bin 185700 -> 185700 bytes .../truetype/public/gregoriotex/gresgmodern.ttf | Bin 200972 -> 200972 bytes .../fonts/truetype/public/gregoriotex/gresym.ttf | Bin 0 -> 19528 bytes .../fonts/truetype/public/gregoriotex/parmesan.ttf | Bin 0 -> 924556 bytes .../scripts/gregoriotex/uninstall-gtex.sh | 2 + .../tex/lualatex/gregoriotex/gregoriosyms.sty | 4 +- .../tex/lualatex/gregoriotex/gregoriotex.sty | 2 +- .../tex/luatex/gregoriotex/gregoriotex-chars.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex-common.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex-main.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex-nabc.lua | 2 +- .../tex/luatex/gregoriotex/gregoriotex-nabc.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex-signs.lua | 2 +- .../tex/luatex/gregoriotex/gregoriotex-signs.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex-spaces.tex | 2 +- .../luatex/gregoriotex/gregoriotex-syllable.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex-symbols.lua | 2 +- .../tex/luatex/gregoriotex/gregoriotex-symbols.tex | 2 +- .../tex/luatex/gregoriotex/gregoriotex.lua | 77 ++++++++++++++------- .../tex/luatex/gregoriotex/gregoriotex.tex | 2 +- 33 files changed, 75 insertions(+), 48 deletions(-) create mode 100644 Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf create mode 100644 Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf index 1bc18a0099f..fed58ad7713 100644 Binary files a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf and b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf differ diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf index d58c3b2ab0f..fafc860c950 100644 Binary files a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf and b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf differ diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex index a79a05d2c8f..8932a0b42dd 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex @@ -177,7 +177,7 @@ \vspace{1cm} - \large Version \textbf{5.0.1}, 16 April 2017 %% PARSE_VERSION_DATE + \large Version \textbf{5.0.2}, 24 May 2017 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/Master/texmf-dist/fonts/source/gregoriotex/README.md b/Master/texmf-dist/fonts/source/gregoriotex/README.md index 5d8250ce77d..934e1b16ebe 100644 --- a/Master/texmf-dist/fonts/source/gregoriotex/README.md +++ b/Master/texmf-dist/fonts/source/gregoriotex/README.md @@ -1,10 +1,10 @@ # Gregorian Chant Fonts -Gregorio uses .ttf fonts to represent the various glyphs in Gregorian chant. While there are hundreds of unique glyphs when you look at the entire body of Gregorian chant, these glyphs are usually composites of a relitively small number of components. Rather than manage the huge number of glyphs, therefore, this project maintains the smaller component set for its fonts and then assembles these components into the various glyphs as part of the build process. This minimizes the work load for the developers while still enabling customization at the glyph (rather than the component) level within documents created with Gregorio. +Gregorio uses .ttf fonts to represent the various glyphs in Gregorian chant. While there are hundreds of unique glyphs when you look at the entire body of Gregorian chant, these glyphs are usually composites of a relatively small number of components. Rather than manage the huge number of glyphs, therefore, this project maintains the smaller component set for its fonts and then assembles these components into the various glyphs as part of the build process. This minimizes the work load for the developers while still enabling customization at the glyph (rather than the component) level within documents created with Gregorio. Currently there are three fonts maintained as part of this project: - * Greciliae, an adaptation of [Caeciliae](http://marello.org/caeciliae/) for use with Gregoiro + * Greciliae, an adaptation of [Caeciliae](http://marello.org/caeciliae/) for use with Gregorio * Gregorio, the original font produced as part of this project * Grana Padano, an adaptation of Parmesan from [Lilypond](http://www.lilypond.org/index.html) @@ -21,7 +21,7 @@ Gregorio and Grana Padano (in all their varieties) are distributed separately in ## Font generation The fonts are distributed pre-built, but if you really need to compile them: - + * install [fontforge](http://fontforge.github.io) with python extension * run `make fonts` (Greciliae only) or `make really-all-fonts` (all three fonts) in this directory (using the `-j` argument can save you some time here) * then you can test them directly, or install them (see next section) @@ -36,7 +36,7 @@ Greciliae is installed automatically by all the normal installation methods (see * `system`: the appropriate font folder in `$TEXMFLOCAL` * `user`: the appropriate font folder in `$TEXMFHOME` * ``: the name of an alternate texmf root directory you want to use - + Additionally, if you are building from a git clone, `install-gtex.sh` and `install_supp_fonts.lua` will install all the fonts you have built, not just the ones they are normally distributed with. **Note:** All the above methods assume you only need to access the fonts from within a TeX document. If you want to use the fonts in other programs, then you will need to consult the documentation appropriate to your platform and manually move, copy, or link the fonts to the necessary location. @@ -72,4 +72,4 @@ and are published here with the consent of these two institutions, which we than Support for Gregoria has been dropped. -[Gregoria](http://www.anatoletype.net/projects/gregoria) cannot be used by Gregorio directly (although it was the primary goal of Gregorio when it was created). As the font is not free, it's not possible to use the same process as [caeciliae](http://marello.org/caeciliae/), because it would require to distribute a modified version. +[Gregoria](http://www.anatoletype.net/projects/gregoria) cannot be used by Gregorio directly (although it was the primary goal of Gregorio when it was created). As the font is not free, it's not possible to use the same process as [Caeciliae](http://marello.org/caeciliae/), because it would require the distribution of a modified version. diff --git a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py index a24c8fa3c3b..425ffe41133 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.0.1' +GREGORIO_VERSION = '5.0.2' # 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 index 7e0effcc5ce..c11abf1940d 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf index 5b4f001aeb0..27bc1e3d7a9 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf differ 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 index b15975d2aa3..3ec8c8385b3 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf differ 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 index 319d046a113..f180d1e7f3e 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf index bfe90a57a61..0388b30911a 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf index e9bba08974d..7970d583881 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf index 2d47c959cac..c70ca8e4fcf 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf index 75d2c09c08b..ce3233fd4ce 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf index f0023ae8fb6..1d3ab027f09 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf index b331dc00f37..17f7fca4135 100644 Binary files a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf new file mode 100644 index 00000000000..75c750bf8e4 Binary files /dev/null and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf differ diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf new file mode 100644 index 00000000000..25488a77a53 Binary files /dev/null and b/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf differ diff --git a/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh b/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh index 8f49241b56a..24318acb662 100644 --- a/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh +++ b/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh @@ -37,7 +37,9 @@ $RM fonts/truetype/public/gregoriotex/greextra.ttf $RM fonts/truetype/public/gregoriotex/gregall.ttf $RM fonts/truetype/public/gregoriotex/grelaon.ttf $RM fonts/truetype/public/gregoriotex/gresgmodern.ttf +$RM fonts/truetype/public/gregoriotex/gresym.ttf $RM fonts/truetype/public/gregoriotex/parmesan-op.ttf +$RM fonts/truetype/public/gregoriotex/parmesan.ttf rmdir -p fonts/truetype/public/gregoriotex 2> /dev/null || true $RM doc/luatex/gregoriotex/Appendix_Font_Tables.tex diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty index e36ed7e8c9a..2ecd7d3d0d7 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} - [2017/04/16 v5.0.1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2017/05/24 v5.0.2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX % If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts. \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% @@ -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.0.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.0.2}% 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 48369c84acf..16542223c48 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}% - [2017/04/16 v5.0.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2017/05/24 v5.0.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX % If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away \ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex index 35563162d76..24f52e401d8 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 . -\gre@declarefileversion{gregoriotex-chars.tex}{5.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{5.0.2}% 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 70760e53d88..e10e347c7d0 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 . -\gre@declarefileversion{gregoriotex-commonx.tex}{5.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-commonx.tex}{5.0.2}% 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 a9e7492452c..543d8fd52e0 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.0.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.0.2}% 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 108bdc6f185..a296e53f682 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.0.1 +-- GREGORIO_VERSION 5.0.2 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex index cd1a66f2821..6d0cae8d7d6 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.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{5.0.2}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua index c0cea8782c4..807d306f279 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.0.1 +-- GREGORIO_VERSION 5.0.2 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 f75dc7af463..cdefa4477e0 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.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{5.0.2}% 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 2fdcf1b864a..d9ebdf7b0cc 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.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{5.0.2}% 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 22c5dea2e24..72dda80d495 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.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{5.0.2}% 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 574babd4414..6041cd113d7 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.0.1 +-- GREGORIO_VERSION 5.0.2 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex index 5112d2b23e6..e7fda265431 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.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{5.0.2}% 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 e87bbc553e0..abb26638701 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.0.1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '5.0.2' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '5.0.1', -- GREGORIO_VERSION + version = '5.0.2', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2017/04/16", -- GREGORIO_DATE_LTX + date = "2017/05/24", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2017 - The Gregorio Project", @@ -84,6 +84,8 @@ local new_score_last_syllables = nil local state_hashes = nil local new_state_hashes = nil local auxname = nil +local tmpname = nil +local test_snippet_filename = nil local snippet_filename = nil local snippet_logname = nil @@ -120,33 +122,53 @@ local translation_mark = 1 local abovelinestext_mark = 2 log("marker whatsit id is %d", marker_whatsit_id) +local function get_prog_output(cmd, fmt) + cmd = string.format(cmd, tmpname) + local rc = os.execute(cmd) + local content = nil + if rc == 0 then + local f = io.open(tmpname, 'r'); + if f then + content = f:read(fmt) + f:close() + end + end + os.remove(tmpname) + return content +end + local function gregorio_exe() if real_gregorio_exe == nil then + local tmp_gabcfile = io.open(test_snippet_filename, 'w') + tmp_gabcfile:write("name:test;\n%%\n(c4)(g)\n") + tmp_gabcfile:close() + local exe_version -- first look for one with the exact version - real_gregorio_exe = 'gregorio-5_0_1' -- FILENAME_VERSION - exe_version = io.popen(real_gregorio_exe..' --version', 'r') - if exe_version then - exe_version = exe_version:read("*line") - end + real_gregorio_exe = 'gregorio-5_0_2' -- 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' - exe_version = io.popen(real_gregorio_exe..' --version', 'r') - exe_version = exe_version:read("*line") - if not exe_version or string.match(exe_version,"%d+%.%d+%.") - ~= string.match(internalversion,"%d+%.%d+%.") then - real_gregorio_exe = nil - err("Unable to find gregorio executable.\n".. - "shell-escape mode may not be activated. Try\n\n".. - "%s --shell-escape %s.tex\n\n".. - "See the documentation of Gregorio or your TeX\n".. - "distribution to automatize it.", - tex.formatname, tex.jobname) - end + cmd = string.format("%s -o %%s %s", real_gregorio_exe, + test_snippet_filename) + exe_version = get_prog_output(cmd, '*line') + end + if not exe_version or string.match(exe_version,"%d+%.%d+%.") + ~= string.match(internalversion,"%d+%.%d+%.") then + real_gregorio_exe = nil + err("Unable to find gregorio executable.\n".. + "shell-escape mode may not be activated. Try\n\n".. + "%s --shell-escape %s.tex\n\n".. + "See the documentation of Gregorio or your TeX\n".. + "distribution to automatize it.", + tex.formatname, tex.jobname) end + os.remove(test_snippet_filename) log("will use %s", real_gregorio_exe) end @@ -334,10 +356,14 @@ local function init(arg, enable_height_computation) end if outputdir and lfs.isdir(outputdir) then auxname = outputdir..'/'..tex.jobname..'.gaux' + tmpname = outputdir..'/'..tex.jobname..'.gtmp' + test_snippet_filename = outputdir..'/'..tex.jobname..'.test.gsnippet' snippet_filename = outputdir..'/'..tex.jobname..'.gsnippet' snippet_logname = outputdir..'/'..tex.jobname..'.gsniplog' else auxname = tex.jobname..'.gaux' + tmpname = tex.jobname..'.gtmp' + test_snippet_filename = tex.jobname..'.test.gsnippet' snippet_filename = tex.jobname..'.gsnippet' snippet_logname = tex.jobname..'.gsniplog' end @@ -904,18 +930,17 @@ 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-S -l %s %s', gregorio_exe(), deprecated, - snippet_logname, snippet_filename) - local p = io.popen(cmd, 'r') - if p == nil then + 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 err("\nSomething went wrong when executing\n %s\n" .."shell-escape mode may not be activated. Try\n\n" .."%s --shell-escape %s.tex\n\n" .."See the documentation of Gregorio or your TeX\n" .."distribution to automatize it.", cmd, tex.formatname, tex.jobname) else - tex.print(p:read("*a"):explode('\n')) - p:close() + tex.print(content:explode('\n')) end local glog = io.open(snippet_logname, 'a+') if glog == nil then diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex index 43d1cc7b9a0..9da3b585607 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. -% [2017/04/16 v5.0.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2017/05/24 v5.0.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} -- cgit v1.2.3