texlive[44502] Master/texmf-dist: gregoriotex (25may17)
commits+karl at tug.org
commits+karl at tug.org
Tue Jun 6 23:52:10 CEST 2017
Revision: 44502
http://tug.org/svn/texlive?view=revision&revision=44502
Author: karl
Date: 2017-06-06 23:52:09 +0200 (Tue, 06 Jun 2017)
Log Message:
-----------
gregoriotex (25may17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
trunk/Master/texmf-dist/fonts/source/gregoriotex/README.md
trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh
trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
Added Paths:
-----------
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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}
Modified: trunk/Master/texmf-dist/fonts/source/gregoriotex/README.md
===================================================================
--- trunk/Master/texmf-dist/fonts/source/gregoriotex/README.md 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/fonts/source/gregoriotex/README.md 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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 @@
## 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 @@
* `system`: the appropriate font folder in `$TEXMFLOCAL`
* `user`: the appropriate font folder in `$TEXMFHOME`
* `<dir>`: 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 @@
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.
Modified: trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
===================================================================
--- trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py 2017-06-06 21:52:09 UTC (rev 44502)
@@ -90,7 +90,7 @@
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
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf
===================================================================
--- trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf 2017-06-06 21:52:09 UTC (rev 44502)
Property changes on: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresym.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf
===================================================================
--- trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf 2017-06-06 21:52:09 UTC (rev 44502)
Property changes on: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/parmesan.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh
===================================================================
--- trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh 2017-06-06 21:52:09 UTC (rev 44502)
@@ -37,7 +37,9 @@
$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
Modified: trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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 at 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 at gregoriotexversion{5.0.1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{5.0.2}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre at declarefileversion}[2]{\relax}
Modified: trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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 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%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-chars.tex}{5.0.2}% GREGORIO_VERSION
\def\gre at char@fuse at punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre at char@fuse at quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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-commonx.tex}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-commonx.tex}{5.0.2}% GREGORIO_VERSION
%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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 at gregoriotexversion{5.0.1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{5.0.2}% GREGORIO_VERSION - VersionManager.py
\ifluatex%
\ifnum\luatexversion<76%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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 at atletter']
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -19,7 +19,7 @@
% this file contains macros for St. Gall ancient neume support
-\gre at declarefileversion{gregoriotex-nabc.tex}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-nabc.tex}{5.0.2}% GREGORIO_VERSION
\xdef\gre at nabcfontname{gregall}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -22,7 +22,7 @@
\def\grebarbracewidth{.58879}%
-\gre at declarefileversion{gregoriotex-signs.tex}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-signs.tex}{5.0.2}% GREGORIO_VERSION
\def\gre at usestylecommon{%
\gre at trace{gre at usestylecommon}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -19,7 +19,7 @@
% this file contains definitions of spaces
-\gre at declarefileversion{gregoriotex-spaces.tex}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-spaces.tex}{5.0.2}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -19,7 +19,7 @@
% this file contains definitions of the glyphs and the syllables
-\gre at declarefileversion{gregoriotex-syllable.tex}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-syllable.tex}{5.0.2}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -22,7 +22,7 @@
\ifcsname gregoriotex at symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex at symbols@loaded{}%
-\gre at declarefileversion{gregoriotex-symbols.tex}{5.0.1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-symbols.tex}{5.0.2}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua 2017-06-06 21:52:09 UTC (rev 44502)
@@ -24,13 +24,13 @@
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 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 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 @@
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,10 +930,10 @@
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"
@@ -914,8 +940,7 @@
.."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
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex 2017-06-06 21:51:35 UTC (rev 44501)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex 2017-06-06 21:52:09 UTC (rev 44502)
@@ -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`@}
More information about the tex-live-commits
mailing list