summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-12 21:56:46 +0000
committerKarl Berry <karl@freefriends.org>2019-03-12 21:56:46 +0000
commit96d1e7c5c030fb7fe3372362584f416be862c351 (patch)
tree7c9ebc5a7154d659e54d766e3e6e645877becaa8 /Master/texmf-dist/tex/luatex
parent2d7d658f747fa6401c8784dfb3bc9be079986f25 (diff)
gregoriotex (12mar19)
git-svn-id: svn://tug.org/texlive/trunk@50357 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat52
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex14
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex64
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex22
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua12
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex4
-rw-r--r--Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex24
15 files changed, 173 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat b/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat
index 464c643285d..f02943994c8 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregorio-vowels.dat
@@ -1,5 +1,5 @@
# Vowel rule file for Gregorio
-# Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
@@ -27,13 +27,15 @@
# brackets, the "to" keyword, the name of the target language in square
# brackets, and a semicolon. For best performance, aliases should precede the
# language they are aliasing.
-alias [english] to [English];
+alias [english] to [en];
+alias [English] to [en];
+alias [eng] to [en];
# The "language" keyword indicates that the rules which follow are for the
# specified language. It must be followed by the language name enclosed in
# square brackets and a semicolon. The language specified applies until the
# next language statement.
-language [English];
+language [en];
# The "vowel" keyword indicates that the characters which follow, until the
# next semicolon, should be considered vowels. There may be multiple "vowel"
@@ -75,14 +77,38 @@ suffix we We wE WE;
# and "r" in Czech.
secondary w W;
-alias [polish] to [Polish];
-alias [Polish] to [Slavic];
-alias [czech] to [Czech];
-alias [Czech] to [Slavic];
-alias [slovak] to [Slovak];
-alias [Slovak] to [Slavic];
+alias [polish] to [pl];
+alias [Polish] to [pl];
+alias [pol] to [pl];
+alias [pl] to [cu];
-language [Slavic];
+alias [czech] to [cs];
+alias [Czech] to [cs];
+alias [ces] to [cs];
+alias [cze] to [cs];
+alias [cs] to [cu];
+
+alias [slovak] to [sk];
+alias [Slovak] to [sk];
+alias [slk] to [sk];
+alias [slo] to [sk];
+alias [sk] to [cu];
+
+alias [Slavic] to [cu];
+alias [slavic] to [cu];
+alias [Church Slavic] to [cu];
+alias [church slavic] to [cu];
+alias [Church Slavonic] to [cu];
+alias [church slavonic] to [cu];
+alias [Old Church Slavonic] to [cu];
+alias [old church slavonic] to [cu];
+alias [Old Slavonic] to [cu];
+alias [old slavonic] to [cu];
+alias [Old Bulgarian] to [cu];
+alias [old bulgarian] to [cu];
+alias [chu] to [cu];
+
+language [cu];
vowel aàáâąAÀÁÂĄ;
vowel eèéêëěęEÈÉÊËĚĘ;
@@ -97,9 +123,11 @@ secondary l L ĺ Ĺ;
secondary r R ŕ Ŕ;
secondary m M;
-alias [hungarian] to [Hungarian];
+alias [hungarian] to [hu];
+alias [Hungarian] to [hu];
+alias [hun] to [hu];
-language [Hungarian];
+language [hu];
vowel aáAÁ;
vowel éeëÉEË;
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
index 553eae77cc7..1b27903acf6 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -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@declarefileversion{gregoriotex-chars.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{5.2.0}% GREGORIO_VERSION
\def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
index de7159f5130..661c6aca18d 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
@@ -1,6 +1,6 @@
%GregorioTeX common file (stuff needed by both gregoriotex and gregoriosyms)
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -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@declarefileversion{gregoriotex-commonx.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-commonx.tex}{5.2.0}% GREGORIO_VERSION
%%%%%%%%%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
index c5aad43ffa5..6c429a70808 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
@@ -1,6 +1,6 @@
%GregorioTeX main file.
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -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@gregoriotexversion{5.1.1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{5.2.0}% GREGORIO_VERSION - VersionManager.py
\ifluatex%
\ifnum\luatexversion<76%
@@ -1136,6 +1136,8 @@
\let\gre@pitch@overbrace\gre@pitch@i %
\let\gre@char@bar@virgula\GreCPVirgulaTwo %
\let\gre@char@bar@virgulahigh\GreCPVirgulaThree %
+ \let\gre@char@bar@divisiominimis\GreCPDivisioMinimisTwo %
+ \let\gre@char@bar@divisiominimishigh\GreCPDivisioMinimisThree %
\let\gre@char@bar@divisiominima\GreCPDivisioMinimaTwo %
\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaThree %
\let\gre@char@bar@divisiominor\GreCPDivisioMinorTwo %
@@ -1153,6 +1155,8 @@
\let\gre@pitch@overbrace\gre@pitch@k %
\let\gre@char@bar@virgula\GreCPVirgulaThree %
\let\gre@char@bar@virgulahigh\GreCPVirgulaFour %
+ \let\gre@char@bar@divisiominimis\GreCPDivisioMinimisThree %
+ \let\gre@char@bar@divisiominimishigh\GreCPDivisioMinimisFour %
\let\gre@char@bar@divisiominima\GreCPDivisioMinimaThree %
\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaFour %
\let\gre@char@bar@divisiominor\GreCPDivisioMinorThree %
@@ -1170,6 +1174,8 @@
\let\gre@pitch@overbrace\gre@pitch@m %
\let\gre@char@bar@virgula\GreCPVirgulaFour %
\let\gre@char@bar@virgulahigh\GreCPVirgulaFive %
+ \let\gre@char@bar@divisiominimis\GreCPDivisioMinimisFour %
+ \let\gre@char@bar@divisiominimishigh\GreCPDivisioMinimisFive %
\let\gre@char@bar@divisiominima\GreCPDivisioMinimaFour %
\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaFive %
\let\gre@char@bar@divisiominor\GreCPDivisioMinorFour %
@@ -1187,6 +1193,8 @@
\let\gre@pitch@overbrace\gre@pitch@p %
\let\gre@char@bar@virgula\GreCPVirgulaFive %
\let\gre@char@bar@virgulahigh\GreCPVirgulaSix %
+ \let\gre@char@bar@divisiominimis\GreCPDivisioMinimisFive %
+ \let\gre@char@bar@divisiominimishigh\GreCPDivisioMinimisSix %
\let\gre@char@bar@divisiominima\GreCPDivisioMinimaFive %
\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaSix %
\let\gre@char@bar@divisiominor\GreCPDivisioMinorFive %
@@ -1593,6 +1601,8 @@
\gre@skip@temp@four = \gre@space@skip@descendingpunctuminclinatumascendingshift\relax%
\or% case 25
\gre@skip@temp@four = \gre@space@skip@ascendingpunctuminclinatumdescendingshift\relax%
+ \or% case 26
+ \gre@skip@temp@four = \gre@space@skip@unisonpunctuminclinatumshift\relax%
\else%
\gre@error{Unrecognized spaceskip #1}%
\fi%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
index 9a6a30f0daa..1e27e7ae3bf 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
@@ -1,6 +1,6 @@
--GregorioTeX Nabc Lua file.
--
---Copyright (C) 2014-2018 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2014-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -20,7 +20,7 @@
-- this file contains lua functions used by GregorioTeX St. Gall ancient
-- neume support when called with LuaTeX.
--- GREGORIO_VERSION 5.1.1
+-- GREGORIO_VERSION 5.2.0
local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
index 5e766902c03..63b7dd3695a 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2014-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2014-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,7 +19,7 @@
% this file contains macros for St. Gall ancient neume support
-\gre@declarefileversion{gregoriotex-nabc.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{5.2.0}% GREGORIO_VERSION
\xdef\gre@nabcfontname{gregall}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
index e1955d2857f..40248812ef8 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
@@ -1,6 +1,6 @@
--GregorioTeX Signs Lua support file.
--
---Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 5.1.1
+-- GREGORIO_VERSION 5.2.0
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
index 1ba0cb81450..7f496414bf4 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -22,7 +22,7 @@
\def\grebarbracewidth{.58879}%
-\gre@declarefileversion{gregoriotex-signs.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{5.2.0}% GREGORIO_VERSION
\def\gre@usestylecommon{%
\gre@trace{gre@usestylecommon}%
@@ -1840,6 +1840,34 @@
\gre@trace@end%
}%
+\def\GreInDivisioMinimis#1#2#3{%
+ \gre@trace{GreInDivisioMinimis{#1}{#2}{#3}}%
+ \gre@writebar{17}{1}{#1}{#2}{#3}%
+ \relax%
+ \gre@trace@end%
+}%
+
+\def\GreDivisioMinimis#1#2#3{%
+ \gre@trace{GreDivisioMinimis{#1}{#2}{#3}}%
+ \gre@writebar{17}{0}{#1}{#2}{#3}%
+ \relax%
+ \gre@trace@end%
+}%
+
+\def\GreInDivisioMinimisHigh#1#2#3{%
+ \gre@trace{GreInDivisioMinimisHigh{#1}{#2}{#3}}%
+ \gre@writebar{18}{1}{#1}{#2}{#3}%
+ \relax%
+ \gre@trace@end%
+}%
+
+\def\GreDivisioMinimisHigh#1#2#3{%
+ \gre@trace{GreDivisioMinimisHigh{#1}{#2}{#3}}%
+ \gre@writebar{18}{0}{#1}{#2}{#3}%
+ \relax%
+ \gre@trace@end%
+}%
+
\def\GreInDivisioMinima#1#2#3{%
\gre@trace{GreInDivisioMinima{#1}{#2}{#3}}%
\gre@writebar{1}{1}{#1}{#2}{#3}%
@@ -2072,7 +2100,7 @@
\newskip\gre@skip@bar@lastskip% skip after last bar
%a macro to write a bar
-%% 1: the type of the bar : 0 for virgula, 1 for minima 2 for minor, 3 for major, 4 for finalis and 5 for the last finalis, 6 to 13 for dominican bars, 14 for high virgula, 15 for high minima
+%% 1: the type of the bar : 0 for virgula, 1 for minima 2 for minor, 3 for major, 4 for finalis and 5 for the last finalis, 6 to 13 for dominican bars, 14 for high virgula, 15 for high minima, 16 for dotted maior, 17 for minimis, 18 for high minimis
%% 2: is 0 if it is in a syllable containing only this bar, 1 otherwise
%% 3: is 0 if there's no text under the bar or 1 if there is text under the bar
%% 4: macros that may happen before the skip after the bar (typically GreVEpisema)
@@ -2370,6 +2398,36 @@
\gre@skip@temp@four = \csname gre@space@skip@bar@maior\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
\gre@hskip\gre@skip@temp@four %
\fi %
+ \or % 17 : minimis
+ \ifnum\gre@count@temp@one=1\relax %
+ \gre@skip@temp@four = \csname gre@space@skip@bar@minimis\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
+ \gre@hskip\gre@skip@temp@four %
+ \GreNoBreak %
+ \fi %
+ \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominimis}%
+ \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominimis}%
+ #4\relax %
+ \ifnum\gre@count@temp@one=1\relax %
+ \GreNoBreak %
+ \gre@skip@temp@four = \csname gre@space@skip@bar@minimis\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
+ \gre@hskip\gre@skip@temp@four %
+ \fi %
+ \or % 18 : high minimis
+ \ifnum\gre@count@temp@one=1\relax %
+ \gre@skip@temp@four = \csname gre@space@skip@bar@minimis\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
+ \gre@hskip\gre@skip@temp@four %
+ \GreNoBreak %
+ \fi %
+ \GreGlyphHeights{\gre@pitch@ledger@above}{\gre@pitch@ledger@above}%
+ \setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominimishigh}%
+ \raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominimishigh}%
+ \GreAdditionalLine{\GreOCaseBarStandard}{0}{2}%
+ #4\relax %
+ \ifnum\gre@count@temp@one=1\relax %
+ \GreNoBreak %
+ \gre@skip@temp@four = \csname gre@space@skip@bar@minimis\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
+ \gre@hskip\gre@skip@temp@four %
+ \fi %
\fi %
\global\gre@skip@bar@lastskip=\gre@skip@temp@four %
\gre@debugmsg{spacing}{Width of bar just printed: \the\wd\gre@box@temp@width}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
index 7ea9e72c352..b4d1f5609a4 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,7 +19,7 @@
% this file contains definitions of spaces
-\gre@declarefileversion{gregoriotex-spaces.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{5.2.0}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
@@ -2137,6 +2137,12 @@
\ifgre@scale@bar@virgula@short%
\gre@changeonedimenfactor{bar@virgula@short}{#1}{#2}%
\fi%
+ \ifgre@scale@bar@minimis%
+ \gre@changeonedimenfactor{bar@minimis}{#1}{#2}%
+ \fi%
+ \ifgre@scale@bar@minimis@short%
+ \gre@changeonedimenfactor{bar@minimis@short}{#1}{#2}%
+ \fi%
\ifgre@scale@bar@minima%
\gre@changeonedimenfactor{bar@minima}{#1}{#2}%
\fi%
@@ -2164,6 +2170,12 @@
\ifgre@scale@bar@virgula@standalone@text@short%
\gre@changeonedimenfactor{bar@virgula@standalone@text@short}{#1}{#2}%
\fi%
+ \ifgre@scale@bar@minimis@standalone@text%
+ \gre@changeonedimenfactor{bar@minimis@standalone@text}{#1}{#2}%
+ \fi%
+ \ifgre@scale@bar@minimis@standalone@text@short%
+ \gre@changeonedimenfactor{bar@minimis@standalone@text@short}{#1}{#2}%
+ \fi%
\ifgre@scale@bar@minima@standalone@text%
\gre@changeonedimenfactor{bar@minima@standalone@text}{#1}{#2}%
\fi%
@@ -2188,6 +2200,12 @@
\ifgre@scale@bar@virgula@standalone@notext@short%
\gre@changeonedimenfactor{bar@virgula@standalone@notext@short}{#1}{#2}%
\fi%
+ \ifgre@scale@bar@minimis@standalone@notext%
+ \gre@changeonedimenfactor{bar@minimis@standalone@notext}{#1}{#2}%
+ \fi%
+ \ifgre@scale@bar@minimis@standalone@notext@short%
+ \gre@changeonedimenfactor{bar@minimis@standalone@notext@short}{#1}{#2}%
+ \fi%
\ifgre@scale@bar@minima@standalone@notext%
\gre@changeonedimenfactor{bar@minima@standalone@notext}{#1}{#2}%
\fi%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
index 47fd42f10fe..b88e43f8ba5 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -19,7 +19,7 @@
% this file contains definitions of the glyphs and the syllables
-\gre@declarefileversion{gregoriotex-syllable.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{5.2.0}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
index 3c8c7236f1d..2b5f7387ebf 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
@@ -1,6 +1,6 @@
--GregorioTeX Symbols Lua support file.
--
---Copyright (C) 2016-2018 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2016-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 5.1.1
+-- GREGORIO_VERSION 5.2.0
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
index 4efeb38e858..d2f744b5b6f 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -22,7 +22,7 @@
\ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex@symbols@loaded{}%
-\gre@declarefileversion{gregoriotex-symbols.tex}{5.1.1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{5.2.0}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
index ff2006ebf28..93fe9298b5e 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
@@ -1,6 +1,6 @@
--GregorioTeX Lua file.
--
---Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
--
--This file is part of Gregorio.
--
@@ -24,16 +24,16 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after,
gregoriotex = gregoriotex or {}
local gregoriotex = gregoriotex
-local internalversion = '5.1.1' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '5.2.0' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '5.1.1', -- GREGORIO_VERSION
+ version = '5.2.0', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2018/03/25", -- GREGORIO_DATE_LTX
+ date = "2019/03/10", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
- copyright = "2008-2018 - The Gregorio Project",
+ copyright = "2008-2019 - The Gregorio Project",
license = "GPLv3+",
})
@@ -146,7 +146,7 @@ local function gregorio_exe()
local exe_version
-- first look for one with the exact version
- real_gregorio_exe = 'gregorio-5_1_1' -- FILENAME_VERSION
+ real_gregorio_exe = 'gregorio-5_2_0' -- FILENAME_VERSION
local cmd = string.format("%s -o %%s %s", real_gregorio_exe,
test_snippet_filename)
exe_version = get_prog_output(cmd, '*line')
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
index 478cf4e99f1..9ea76f4b883 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
@@ -1,6 +1,6 @@
% GregorioTeX boostrap file for Plain TeX
%
-% Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -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.
-% [2018/03/25 v5.1.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2019/03/10 v5.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\edef\greoldcatcode{\the\catcode`@}
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
index 38ea573b586..53f8f380d53 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
@@ -1,6 +1,6 @@
%GregorioTeX file.
%
-% Copyright (C) 2010-2018 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2010-2019 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
@@ -165,19 +165,19 @@
% puncta inclinata %
%%%%%%%%%%%%%%%%%%%%
%
-% space between two punctum inclinatum
+% space between two descending punctum inclinatum
\grecreatedim{punctuminclinatumshift}{-0.03918 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
-% space between two unison punctum inclinatum
+% space between two descending or ascending punctum inclinatum at the unison
\grecreatedim{punctuminclinatumunisonshift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}%
-% space before puncta inclinata
+% space before descending puncta inclinata
\grecreatedim{beforepunctainclinatashift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}%
-% space between a punctum inclinatum and a punctum inclinatum deminutus
+% space between a descending punctum inclinatum and a punctum inclinatum deminutus
\grecreatedim{punctuminclinatumanddebilisshift}{-0.02278 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
% space between two punctum inclinatum deminutus
\grecreatedim{punctuminclinatumdebilisshift}{-0.00728 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
-% space between puncta inclinata, larger ambitus (range=3rd)
+% space between descending puncta inclinata, larger ambitus (range=3rd)
\grecreatedim{punctuminclinatumbigshift}{0.07565 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
-% space between puncta inclinata, larger ambitus (range=4th or 5th)
+% space between descending puncta inclinata, larger ambitus (range=4th or 5th)
\grecreatedim{punctuminclinatummaxshift}{0.17865 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
% space between two ascending punctum inclinatum
\grecreatedim{ascendingpunctuminclinatumshift}{-0.03918 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
@@ -203,6 +203,8 @@
\grecreatedim{descendingpunctuminclinatumascendingshift}{-0.07918 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
% space between two ascending punctum inclinatum glyphs in an descent
\grecreatedim{ascendingpunctuminclinatumdescendingshift}{-0.07918 cm plus 0.0009 cm minus 0.0009 cm}{scalable}%
+% space between two unison punctum inclinatum glyphs (at the unison)
+\grecreatedim{unisonpunctuminclinatumshift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}%
%
%%%%%%%%
@@ -212,8 +214,10 @@
% bars inside syllables
%
\grecreatedim{bar@virgula}{0.1823 cm plus 0.22787 cm minus 0.00469 cm}{scalable}%
-% short versions are when the notes are very low (virgula and minima only)
+% short versions are when the notes are very low (virgula, minima, and minimis only)
\grecreatedim{bar@virgula@short}{0.13 cm plus 0.05 cm minus 0.00469 cm}{scalable}%
+\grecreatedim{bar@minimis}{0.1823 cm plus 0.22787 cm minus 0.00469 cm}{scalable}%
+\grecreatedim{bar@minimis@short}{0.12 cm plus 0.05 cm minus 0.00469 cm}{scalable}%
\grecreatedim{bar@minima}{0.1823 cm plus 0.22787 cm minus 0.00469 cm}{scalable}%
\grecreatedim{bar@minima@short}{0.12 cm plus 0.05 cm minus 0.00469 cm}{scalable}%
\grecreatedim{bar@minor}{0.1823 cm plus 0.22787 cm minus 0.00469 cm}{scalable}%
@@ -229,6 +233,8 @@
%
\grecreatedim{bar@virgula@standalone@text}{0.2323 cm}{scalable}%
\grecreatedim{bar@virgula@standalone@text@short}{0.19 cm}{scalable}%
+\grecreatedim{bar@minimis@standalone@text}{0.2323 cm}{scalable}%
+\grecreatedim{bar@minimis@standalone@text@short}{0.19 cm}{scalable}%
\grecreatedim{bar@minima@standalone@text}{0.2323 cm}{scalable}%
\grecreatedim{bar@minima@standalone@text@short}{0.19 cm}{scalable}%
\grecreatedim{bar@minor@standalone@text}{0.2323 cm}{scalable}%
@@ -242,6 +248,8 @@
%
\grecreatedim{bar@virgula@standalone@notext}{0.2 cm}{scalable}%
\grecreatedim{bar@virgula@standalone@notext@short}{0.19 cm}{scalable}%
+\grecreatedim{bar@minimis@standalone@notext}{0.2 cm}{scalable}%
+\grecreatedim{bar@minimis@standalone@notext@short}{0.19 cm}{scalable}%
\grecreatedim{bar@minima@standalone@notext}{0.2 cm}{scalable}%
\grecreatedim{bar@minima@standalone@notext@short}{0.19 cm}{scalable}%
\grecreatedim{bar@minor@standalone@notext}{0.2323 cm}{scalable}%