summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/lualatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-10 21:27:24 +0000
committerKarl Berry <karl@freefriends.org>2016-05-10 21:27:24 +0000
commit18e100730bd2e086a899a55f7423e028f07e90b9 (patch)
treea8a1e68d59e61256ebffadbe060ee834a29f60af /Master/texmf-dist/tex/lualatex
parent8a59bef2d86da7bbe2ffd977865b0e011b4175aa (diff)
gregoriotex (10may16)
git-svn-id: svn://tug.org/texlive/trunk@41008 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
-rw-r--r--Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty12
-rw-r--r--Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty27
2 files changed, 23 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
index dc8c20446e8..2765f3f627a 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/04/27 v4.2.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2016/05/08 v4.1.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%
@@ -30,7 +30,6 @@
\RequirePackage{luaotfload}
\RequirePackage{luamplib}%
\RequirePackage{xstring}%
-\RequirePackage{xcolor}%
\newluatexcatcodetable\gre@atletter %
\setluatexcatcodetable\gre@atletter{%
@@ -39,7 +38,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.2.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.2}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre@declarefileversion}[2]{\relax}
@@ -106,10 +105,3 @@
% 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}}%
-
-%%%%%%%%%
-%% 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 7fcdd0187cb..3282197823d 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/04/27 v4.2.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2016/05/08 v4.1.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%
@@ -74,12 +74,10 @@
\gresetlinesbehindalteration{invisible}
\gresetlinesbehindpunctumcavum{invisible}
-%%%%%%%%%
-%% Color definitions
-%%%%%%%%%
+%% We now redefine some things in a more LaTeX friendly way.
\definecolor{grebackgroundcolor}{RGB}{255,255,255}%
-\definecolor{gregoriocolor}{RGB}{229,53,44}%
+\definecolor{gregoriocolor}{RGB}{229,53,44}
%%%%%%%%%
%% LaTeX specific definitions for fonts
@@ -121,6 +119,23 @@
\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
@@ -195,7 +210,7 @@
{\@@italiccorr\endgroup}%
\newenvironment{gre@style@nabc}%
- {\begingroup\color{gregoriocolor}}%
+ {\begingroup\color{red}}%
{\endgroup}%
\def\gre@changestyle#1#2[#3]{%