gregoriotex (17apr17)

git-svn-id: svn://tug.org/texlive/trunk@43897 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 53 insertions, 77 deletions

diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
index 55424ff2913..e36ed7e8c9a 100644
--- a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
+++ b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
@@ -1,6 +1,6 @@
 %GregorioTeX file.
 %
-% Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2008-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gregoriosyms}
-		[2016/08/18 v4.1.5 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+		[2017/04/16 v5.0.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%
@@ -30,6 +30,7 @@
 \RequirePackage{luaotfload}
 \RequirePackage{luamplib}%
 \RequirePackage{xstring}%
+\RequirePackage{xcolor}%
 
 \newluatexcatcodetable\gre@atletter %
 \setluatexcatcodetable\gre@atletter{%
@@ -38,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@gregorioversion{4.1.5}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{5.0.1}% GREGORIO_VERSION - VersionManager.py
 
 \providecommand{\gre@declarefileversion}[2]{\relax}
 
@@ -58,50 +59,22 @@
 
 \ProcessKeyvalOptions*
 
-\def\gre@debugmsg#1#2{%
-	\IfStrEq{\gre@debug}{}{}%
-		%false
-		{\IfStrEq{#1}{all}%
-			%true
-			{\gre@error{Debug error: ‘all’ is not a permitted keyword}}%
-			%false
-			{\IfStrEq{\gre@debug}{all}%
-				%true
-				{\gre@typeout{GregorioTeX debug: (#1) #2}}%
-				%false
-				{\IfSubStr{\gre@debug}{#1}%
-					%true
-					{\gre@typeout{GregorioTeX debug: (#1) #2}}%
-					%false
-					{\relax}%
-				}%
-			}%
-		}%
-}%
-
-% Macro to handle deprecated macros.
-% #1 - the deprecated macro
-% #2 - the correct macro to use
-\def\gre@deprecated#1#2{%
-	\ifgre@allowdeprecated%
-		\gre@warning{#1\space is deprecated.\MessageBreak Use #2\space instead}%
-	\else%
-		\gre@error{#1\space is deprecated.\MessageBreak Use #2\space instead}%
-	\fi%
-	\relax%
-}%
+\input gregoriotex-common.tex
 
-\def\gre@obsolete#1#2{%
-	\gre@error{#1\space is obsolete.\MessageBreak Use #2\space instead}%
-	\relax%
-}%
-\AtBeginDocument{\IfStrEq{\gre@debug}{}{}{\typeout{GregorioTeX is in debug mode}\typeout{\gre@debug\space messages will be printed to the log.}}}%
 
 \long\def\gre@iflatex#1{#1}
+\long\def\gre@ifnotlatex#1{}
 \input gregoriotex-symbols.tex
 
-\xdef\gre@gregoriotexluaversion{\directlua{tex.write(gregoriotex.get_gregorioversion())}}%
+\xdef\gre@gregoriotexluaversion{\directlua{tex.write(gregoriotex.get_gregoriotexluaversion())}}%
 
 % Test to make sure that gregoriotex.lua is of the same version.
-\IfStrEq*{\gre@gregoriotexluaversion}{\gre@gregorioversion}{}{%else
-		\gre@error{uncoherent file versions: gregoriosyms.sty is in version \number\gre@gregorioversion \space\space while gregoriotex.lua is in version \gre@gregoriotexluaversion}}%
+\IfStrEq*{\gre@gregoriotexluaversion}{\gre@gregoriotexversion}{}{%else
+		\gre@error{uncoherent file versions: gregoriosyms.sty is in version \number\gre@gregoriotexversion \space\space while gregoriotex.lua is in version \gre@gregoriotexluaversion}}%
+
+%%%%%%%%%
+%% Color definitions
+%%%%%%%%%
+
+\definecolor{grebackgroundcolor}{RGB}{255,255,255}%
+\definecolor{gregoriocolor}{RGB}{229,53,44}%
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
index 30d81613aa2..48369c84acf 100644
--- a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
+++ b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
@@ -1,6 +1,6 @@
 %GregorioTeX LaTeX style.
 %
-% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{gregoriotex}%
-		[2016/08/18 v4.1.5 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+		[2017/04/16 v5.0.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%
@@ -48,36 +48,54 @@
 \SetupKeyvalOptions{prefix=gre@}
 \DeclareStringOption{debug}[all]
 
+% This option allows the user to transform all deprecation messages
+% into errors.  Allowing one to determine if the TeX file is compliant
+% with future versions of gregoriotex. To enable, use gregoriotex with
+% this option: allowdeprecated=false
+\DeclareBoolOption[true]{allowdeprecated}
+
+% Define these at first to do nothing because they need to manipulate
+% flags which are declared in the package.
+\DeclareVoidOption{nevercompile}{}
+\DeclareVoidOption{forcecompile}{}
+\DeclareVoidOption{autocompile}{}
+
+\ProcessKeyvalOptions*
+
 \let\gre@strip@pt\strip@pt
 
 \long\def\gre@iflatex#1{#1}
+\long\def\gre@ifnotlatex#1{}
 \input gregoriotex-main.tex
 
-%% We declare and process some additional options after loading the package (instead of at the beginning) because the options manipulate flags which are declared in the package.
+% Now redefine these after loading the package because the options
+% manipulate flags which are declared in the package.
+\let\gre@nevercompile\undefined
+\let\gre@forcecompile\undefined
+\let\gre@autocompile\undefined
 
 % These options control the global behavior of \includescore.  The default, forceinclude, is the old behavior (no attempt to compile the score with gregorio is made, it is simply included as is).  forcecompile is at the opposite end of the spectrum: all scores are compiled through gregorio at time of inclusion.  autocompile strikes a balance by checking to see if the score needs to be recompiled and only doing so if it needs it (see the definition of \includescore in gregoriotex.tex for more details).
 \DeclareVoidOption{nevercompile}{\gresetcompilegabc{never}}
 \DeclareVoidOption{forcecompile}{\gresetcompilegabc{force}}
 \DeclareVoidOption{autocompile}{\gresetcompilegabc{auto}}
 
-\ExecuteOptions{nevercompile}
-
-% This option allows the user to transform all deprecation messages
-% into errors.  Allowing one to determine if the TeX file is compliant
-% with future versions of gregoriotex. To enable, use gregoriotex with
-% this option: allowdeprecated=false
-\DeclareBoolOption[true]{allowdeprecated}
+\ExecuteOptions{autocompile}
 
 \ProcessKeyvalOptions*
 
+% we need to do this again because we processed the keyval options again
+\gre@fixdebug%
+
 % we hide lines only under LaTeX
 \gresetlinesbehindalteration{invisible}
 \gresetlinesbehindpunctumcavum{invisible}
 
-%% We now redefine some things in a more LaTeX friendly way.
+%%%%%%%%%
+%% Color definitions
+%%%%%%%%%
 
 \definecolor{grebackgroundcolor}{RGB}{255,255,255}%
-\definecolor{gregoriocolor}{RGB}{229,53,44}
+\definecolor{gregoriocolor}{RGB}{229,53,44}%
 
 %%%%%%%%%
 %% LaTeX specific definitions for fonts
@@ -119,23 +137,6 @@
 	\gre@changestyle{normalstafflines}{\color[named]{#1}}[\relax]%
 }
 
-\def\grecoloredlines#1#2#3{%OBSOLETE
-	\gre@obsolete{\protect\grecoloredlines}{\protect\gresetlinecolor}%
-}
-
-\def\greredlines{%OBSOLETE
-	\gre@obsolete{\protect\greredlines}{\protect\gresetlinecolor{gregoriocolor}}%
-	\relax %
-}
-
-\let\redlines\greredlines%OBSOLETE
-
-\def\grenormallines{%OBSOLETE
-	\gre@obsolete{\protect\grenormallines}{\protect\gresetlinecolor{black}}%
-	\relax %
-}
-
-\let\normallines\grenormallines%OBSOLETE
 
 %%%%%%%%%%%%%%%%%%%%
 %% Formatting environments
@@ -145,10 +146,6 @@
 	{\begingroup\fontsize{40}{40}\selectfont}%
 	{\endgroup}%
 
-\newenvironment{gre@style@biginitial}%%% DEPRECATED for removal in 5.0
-	{\begingroup\fontsize{80}{80}\selectfont}%%% DEPRECATED for removal in 5.0
-	{\endgroup}%%% DEPRECATED for removal in 5.0
-
 \newenvironment{gre@style@translation}%
 	{\begingroup\itshape}%
 	{\endgroup}%
@@ -210,9 +207,15 @@
 	{\@@italiccorr\endgroup}%
 
 \newenvironment{gre@style@nabc}%
-	{\begingroup\color{red}}%
+	{\begingroup\color{gregoriocolor}}%
 	{\endgroup}%
 
 \def\gre@changestyle#1#2[#3]{%
 	\renewenvironment{gre@style@#1}{\begingroup#2}{#3\endgroup}%
 }%
+
+%%%%%%%%%%%%%%%
+%% Default Mode Numbering style
+%%%%%%%%%%%%%%%
+
+\gresetmodenumbersystem{roman-minuscule}%