diff options
author | Karl Berry <karl@freefriends.org> | 2021-03-01 22:34:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-03-01 22:34:12 +0000 |
commit | c96f6fdf629a8983f20ac5c696a4281674c476df (patch) | |
tree | e2d0b8c77d27bc561026d076ee33eaada4ba9346 /Master/texmf-dist/tex/lualatex | |
parent | 1a9973ac21867ce48a6366c4efb5da8ef3af95a7 (diff) |
gregoriotex (1mar21)
git-svn-id: svn://tug.org/texlive/trunk@58016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
-rw-r--r-- | Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty | 17 |
2 files changed, 16 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty index c766dc61bf0..09f61a6ea0a 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-2019 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,13 +19,15 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2019/04/06 v5.2.1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2021/02/23 v6.0.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + +\RequirePackage{iftex}% +\RequireLuaTeX % 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% \RequirePackage{kvoptions}% -\RequirePackage{ifluatex}% \RequirePackage{luatexbase}% \RequirePackage{luaotfload} \RequirePackage{luamplib}% @@ -39,7 +41,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.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.0.0-beta1}% 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 2b6d8770241..6f8eff2456a 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-2019 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,14 +19,17 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2019/04/06 v5.2.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + +\RequirePackage{iftex}% +\RequireLuaTeX % 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% \RequirePackage{xcolor}% +\RequirePackage{luacolor}% \RequirePackage{kvoptions}% -\RequirePackage{ifluatex}% \RequirePackage{graphicx}% for \resizebox \RequirePackage{luatexbase}% \RequirePackage{luaotfload}% @@ -102,22 +105,22 @@ %%%%%%%%% \def\GreItalic#1{% - \textit{#1}% + {\itshape #1}% \relax % } \def\GreSmallCaps#1{% - \textsc{#1}% + {\scshape #1}% \relax % } \def\GreBold#1{% - \textbf{#1}% + {\bfseries #1}% \relax % } \def\GreTypewriter#1{% - \texttt{#1}% + {\ttfamily #1}% \relax % } |