diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-03 22:18:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-03 22:18:25 +0000 |
commit | c6bfcca248f6a0ceacc867b2e70068e760a40d86 (patch) | |
tree | 381e83c0c202d556281da2f9fb9a7a1eeca41f50 /Master/texmf-dist/tex/lualatex | |
parent | 229d2a84824108e60025d12c971370b90ee01578 (diff) |
gregoriotex (3may16)
git-svn-id: svn://tug.org/texlive/trunk@40872 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
-rw-r--r-- | Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty | 68 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty | 137 |
2 files changed, 99 insertions, 106 deletions
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty index 622f3b1470f..dc8c20446e8 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} - [2016/03/10 v4.1.1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2016/04/27 v4.2.0-beta1 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,15 +30,16 @@ \RequirePackage{luaotfload} \RequirePackage{luamplib}% \RequirePackage{xstring}% +\RequirePackage{xcolor}% \newluatexcatcodetable\gre@atletter % \setluatexcatcodetable\gre@atletter{% - \catcode`\@=11 % + \catcode`\@=11 % }% % 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.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.2.0-beta1}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} @@ -59,41 +60,41 @@ \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}% - }% - }% - }% + \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% + \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% }% \def\gre@obsolete#1#2{% - \gre@error{#1\space is obsolete.\MessageBreak Use #2\space instead}% - \relax% + \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.}}}% @@ -104,4 +105,11 @@ % 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}}% + \gre@error{uncoherent file versions: gregoriosyms.sty is in version \number\gre@gregorioversion \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 aadc23ec90e..7fcdd0187cb 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}% - [2016/03/10 v4.1.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2016/04/27 v4.2.0-beta1 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% @@ -38,11 +38,11 @@ \def\gre@bug#1{\PackageError{GregorioTeX}{#1 !! This is a bug in Gregorio. Please report it at https://github.com/gregorio-project/gregorio/issues}{}}% \def\gre@typeout{\typeout} \long\def\gre@metapost#1{{% - \gre@localleftbox{}% - \gre@localrightbox{}% - \begin{mplibcode} - #1 - \end{mplibcode}% + \gre@localleftbox{}% + \gre@localrightbox{}% + \begin{mplibcode} + #1 + \end{mplibcode}% }}% \SetupKeyvalOptions{prefix=gre@} @@ -74,145 +74,130 @@ \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 %%%%%%%%% \def\GreItalic#1{% - \textit{#1}% - \relax % + \textit{#1}% + \relax % } \def\GreSmallCaps#1{% - \textsc{#1}% - \relax % + \textsc{#1}% + \relax % } \def\GreBold#1{% - \textbf{#1}% - \relax % + \textbf{#1}% + \relax % } \def\GreTypewriter#1{% - \texttt{#1}% - \relax % + \texttt{#1}% + \relax % } \def\GreUnderline#1{% - \underline{#1}% - \relax % + \underline{#1}% + \relax % } \def\GreColored#1{% - {% - \color{gregoriocolor}#1% - }% + {% + \color{gregoriocolor}#1% + }% } \def\gresetlinecolor#1{% - \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 % + \gre@changestyle{normalstafflines}{\color[named]{#1}}[\relax]% } -\let\normallines\grenormallines%OBSOLETE %%%%%%%%%%%%%%%%%%%% %% Formatting environments %%%%%%%%%%%%%%%%%%%% \newenvironment{gre@style@initial}% - {\begingroup\fontsize{40}{40}\selectfont}% - {\endgroup}% + {\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 + {\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}% + {\begingroup\itshape}% + {\endgroup}% \newenvironment{gre@style@abovelinestext}% - {\begingroup\small\itshape}% - {\endgroup}% + {\begingroup\small\itshape}% + {\endgroup}% \newenvironment{gre@style@normalstafflines}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@additionalstafflines}% - {\begingroup\begin{gre@style@normalstafflines}}% - {\end{gre@style@normalstafflines}\endgroup}% + {\begingroup\begin{gre@style@normalstafflines}}% + {\end{gre@style@normalstafflines}\endgroup}% \newenvironment{gre@style@lowchoralsign}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@highchoralsign}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@firstsyllableinitial}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@firstsyllable}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@firstword}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@modeline}% - {\begingroup\begin{scshape}\begin{bfseries}}% - {\end{bfseries}\end{scshape}\endgroup}% + {\begingroup\begin{scshape}\begin{bfseries}}% + {\end{bfseries}\end{scshape}\endgroup}% \newenvironment{gre@style@modemodifier}% - {\begingroup\begin{bfseries}\itshape\@@italiccorr}% - {\@@italiccorr\end{bfseries}\endgroup}% + {\begingroup\begin{bfseries}\itshape\@@italiccorr}% + {\@@italiccorr\end{bfseries}\endgroup}% \newenvironment{gre@style@modedifferentia}% - {\begingroup\begin{bfseries}}% - {\end{bfseries}\endgroup}% + {\begingroup\begin{bfseries}}% + {\end{bfseries}\endgroup}% \newenvironment{gre@style@annotation}% - {\begingroup}% - {\endgroup}% + {\begingroup}% + {\endgroup}% \newenvironment{gre@style@commentary}% - {\begingroup\footnotesize\itshape}% - {\endgroup}% + {\begingroup\footnotesize\itshape}% + {\endgroup}% \newenvironment{gre@style@elision}% - {\begingroup\small\itshape\@@italiccorr}% - {\@@italiccorr\endgroup}% + {\begingroup\small\itshape\@@italiccorr}% + {\@@italiccorr\endgroup}% \newenvironment{gre@style@nabc}% - {\begingroup\color{red}}% - {\endgroup}% + {\begingroup\color{gregoriocolor}}% + {\endgroup}% \def\gre@changestyle#1#2[#3]{% - \renewenvironment{gre@style@#1}{\begingroup#2}{#3\endgroup}% + \renewenvironment{gre@style@#1}{\begingroup#2}{#3\endgroup}% }% |