gregoriotex (12mar18)

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

13 files changed, 201 insertions, 43 deletions

diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
index 24f52e401d8..661b6108259 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
@@ -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.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{5.1.0}% GREGORIO_VERSION
 
 \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
 \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
@@ -83,6 +83,8 @@
 \gre@def@char@he{flat}{Flat}%
 \gre@def@char@he{sharp}{Sharp}%
 \gre@def@char@he{natural}{Natural}%
+\gre@def@char@he{barstandard}{BarStandard}%
+\gre@def@char@he{barvirgula}{BarVirgula}%
 
 \def\gre@fontchar@flat{\gre@font@music\GreCPFlat}%
 \def\gre@fontchar@flathole{\gre@font@music\GreCPFlatHole}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
index e10e347c7d0..f758bfb434a 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
@@ -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.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-commonx.tex}{5.1.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 543d8fd52e0..602d1b853b6 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
@@ -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.0.2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{5.1.0}% GREGORIO_VERSION - VersionManager.py
 
 \ifluatex%
 	\ifnum\luatexversion<76%
@@ -171,6 +171,9 @@
 %% basic start
 %%%%%%%%%%%%%%%
 
+% Used for marking a gabc file read as a dependency
+\newread\gre@read@temp
+
 \def\gre@pitch@a{3}%
 \def\gre@pitch@b{4}%
 \def\gre@pitch@c{5}%
@@ -1131,8 +1134,14 @@
 		\let\gre@pitch@ledger@above\gre@pitch@h %
 		\let\gre@pitch@raresign\gre@pitch@g %
 		\let\gre@pitch@overbrace\gre@pitch@i %
-		\grechangeglyph{Virgula}{*}{.2}%
-		\grechangeglyph{Divisio*}{*}{.2}%
+		\let\gre@char@bar@virgula\GreCPVirgulaTwo %
+		\let\gre@char@bar@virgulahigh\GreCPVirgulaThree %
+		\let\gre@char@bar@divisiominima\GreCPDivisioMinimaTwo %
+		\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaThree %
+		\let\gre@char@bar@divisiominor\GreCPDivisioMinorTwo %
+		\let\gre@char@bar@divisiomaior\GreCPDivisioMaiorTwo %
+		\let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedTwo %
+		\let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingTwo %
 		\gre@haslinethreefalse %
 		\gre@haslinefourfalse %
 		\gre@haslinefivefalse %
@@ -1142,8 +1151,14 @@
 		\let\gre@pitch@ledger@above\gre@pitch@j %
 		\let\gre@pitch@raresign\gre@pitch@i %
 		\let\gre@pitch@overbrace\gre@pitch@k %
-		\grechangeglyph{Virgula}{*}{.3}%
-		\grechangeglyph{Divisio*}{*}{.3}%
+		\let\gre@char@bar@virgula\GreCPVirgulaThree %
+		\let\gre@char@bar@virgulahigh\GreCPVirgulaFour %
+		\let\gre@char@bar@divisiominima\GreCPDivisioMinimaThree %
+		\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaFour %
+		\let\gre@char@bar@divisiominor\GreCPDivisioMinorThree %
+		\let\gre@char@bar@divisiomaior\GreCPDivisioMaiorThree %
+		\let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedThree %
+		\let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingThree %
 		\gre@haslinethreetrue %
 		\gre@haslinefourfalse %
 		\gre@haslinefivefalse %
@@ -1153,8 +1168,14 @@
 		\let\gre@pitch@ledger@above\gre@pitch@l %
 		\let\gre@pitch@raresign\gre@pitch@k %
 		\let\gre@pitch@overbrace\gre@pitch@m %
-		\greresetglyph{Virgula}%
-		\greresetglyph{Divisio*}%
+		\let\gre@char@bar@virgula\GreCPVirgulaFour %
+		\let\gre@char@bar@virgulahigh\GreCPVirgulaFive %
+		\let\gre@char@bar@divisiominima\GreCPDivisioMinimaFour %
+		\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaFive %
+		\let\gre@char@bar@divisiominor\GreCPDivisioMinorFour %
+		\let\gre@char@bar@divisiomaior\GreCPDivisioMaiorFour %
+		\let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedFour %
+		\let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingFour %
 		\gre@haslinethreetrue %
 		\gre@haslinefourtrue %
 		\gre@haslinefivefalse %
@@ -1164,8 +1185,14 @@
 		\let\gre@pitch@ledger@above\gre@pitch@n %
 		\let\gre@pitch@raresign\gre@pitch@m %
 		\let\gre@pitch@overbrace\gre@pitch@p %
-		\grechangeglyph{Virgula}{*}{.5}%
-		\grechangeglyph{Divisio*}{*}{.5}%
+		\let\gre@char@bar@virgula\GreCPVirgulaFive %
+		\let\gre@char@bar@virgulahigh\GreCPVirgulaSix %
+		\let\gre@char@bar@divisiominima\GreCPDivisioMinimaFive %
+		\let\gre@char@bar@divisiominimahigh\GreCPDivisioMinimaSix %
+		\let\gre@char@bar@divisiominor\GreCPDivisioMinorFive %
+		\let\gre@char@bar@divisiomaior\GreCPDivisioMaiorFive %
+		\let\gre@char@bar@divisiomaiordotted\GreCPDivisioMaiorDottedFive %
+		\let\gre@char@bar@divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingFive %
 		\gre@haslinethreetrue %
 		\gre@haslinefourtrue %
 		\gre@haslinefivetrue %
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
index a296e53f682..84be1e1c79a 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
@@ -20,7 +20,7 @@
 -- this file contains lua functions used by GregorioTeX St. Gall ancient
 -- neume support when called with LuaTeX.
 
--- GREGORIO_VERSION 5.0.2
+-- GREGORIO_VERSION 5.1.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 6d0cae8d7d6..27210ce87d1 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
@@ -19,7 +19,7 @@
 
 % this file contains macros for St. Gall ancient neume support
 
-\gre@declarefileversion{gregoriotex-nabc.tex}{5.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{5.1.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 807d306f279..8376dc7c28f 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
@@ -19,7 +19,7 @@
 
 -- this file contains lua functions to support signs used by GregorioTeX.
 
--- GREGORIO_VERSION 5.0.2
+-- GREGORIO_VERSION 5.1.0
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn
@@ -197,12 +197,14 @@ local offset_cases = {
   -- standard bar
   {
     case = 'BarStandard',
-    v = [[\gre@vepisemaorrareaux{0}{\GreCPDivisioMinima}{1}{0}{#2}{#3}{#4}]],
+    v = [[\gre@vepisemaorrareaux{0}{\gre@char@bar@divisiominima}{1}{0}{#2}{#3}{#4}]],
+    h = [[\gre@hepisorlineaux{\gre@char@bar@divisiominima}{\gre@char@he@barstandard{#4}}{2}{#3}]],
   },
   -- virgula
   {
     case = 'BarVirgula',
-    v = [[\gre@vepisemaorrareaux{0}{\GreCPVirgula}{1}{0}{#2}{#3}{#4}]],
+    v = [[\gre@vepisemaorrareaux{0}{\gre@char@bar@virgula}{1}{0}{#2}{#3}{#4}]],
+    h = [[\gre@hepisorlineaux{\gre@char@bar@virgula}{\gre@char@he@barvirgula{#4}}{2}{#3}]],
   },
   -- divisio finalis
   {
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
index cdefa4477e0..ba17bac02b0 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
@@ -22,7 +22,7 @@
 
 \def\grebarbracewidth{.58879}%
 
-\gre@declarefileversion{gregoriotex-signs.tex}{5.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{5.1.0}% GREGORIO_VERSION
 
 \def\gre@usestylecommon{%
 	\gre@trace{gre@usestylecommon}%
@@ -451,10 +451,14 @@
 	\gre@trace@end%
 }%
 
+\newif\ifgre@in@custos %
+\gre@in@custosfalse %
+
 % custos just typesets a custos, useful for before the key changes for example
 % #1 is the height
 \def\GreCustos#1#2{%
 	\gre@trace{GreCustos{#1}{#2}}%
+	\gre@in@custostrue %
 	\GreNoBreak %
 	\ifdim\gre@skip@bar@lastskip=0pt\else % we're after a bar:
 		\kern-\gre@skip@bar@lastskip %
@@ -505,6 +509,7 @@
 	\fi %
 	\directlua{gregoriotex.adjust_line_height(\gre@insidediscretionary)}%
 	\relax %
+	\gre@in@custosfalse %
 	\gre@trace@end%
 }%
 
@@ -522,6 +527,7 @@
 \edef\gre@nextcustosalteration{}%
 \def\GreNextCustos#1#2{%
 	\gre@trace{GreNextCustos{#1}{#2}}%
+	\gre@in@custostrue %
 	\gre@debugmsg{custos}{nextcustos = #1,#2}%
 	\ifnum\gre@insidediscretionary=0\relax %
 		\gre@debugmsg{custos}{not discretionary}%
@@ -561,6 +567,7 @@
 		\fi %
 	\fi %
 	\relax%
+	\gre@in@custosfalse %
 	\gre@trace@end%
 }%
 
@@ -1784,6 +1791,25 @@
 %% macros for the typesetting of bars
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+% flag to indicate that lines behind an dotted bar should be hidden
+\newif\ifgre@hidedottedbarlines
+% default state is to hide them
+\gre@hidedottedbarlinestrue
+
+% macro for manipulating above flag
+\def\gresetlinesbehinddottedbar#1{%
+	\gre@trace{gresetlinesbehinddottedbar{#1}}%
+	\IfStrEqCase{#1}{%
+		{visible}%
+			{\gre@hidedottedbarlinesfalse}%
+		{invisible}%
+			{\gre@hidedottedbarlinestrue}%
+		}[% all other cases
+			\gre@error{Unrecognized option "#1" for \protect\gresetlinesbehinddottedbar\MessageBreak Possible options are: 'visible' and 'invisible'}%
+		]%
+	\gre@trace@end%
+}%
+
 % we define two types of macro for each four bar : when it is inside a syllable, and when it is not
 
 \def\GreInVirgula#1#2#3{%
@@ -1800,6 +1826,20 @@
 	\gre@trace@end%
 }%
 
+\def\GreInVirgulaHigh#1#2#3{%
+	\gre@trace{GreInVirgulaHigh{#1}{#2}{#3}}%
+	\gre@writebar{14}{1}{#1}{#2}{#3}%
+	\relax%
+	\gre@trace@end%
+}%
+
+\def\GreVirgulaHigh#1#2#3{%
+	\gre@trace{GreVirgulaHigh{#1}{#2}{#3}}%
+	\gre@writebar{14}{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}%
@@ -1814,6 +1854,20 @@
 	\gre@trace@end%
 }%
 
+\def\GreInDivisioMinimaHigh#1#2#3{%
+	\gre@trace{GreInDivisioMinimaHigh{#1}{#2}{#3}}%
+	\gre@writebar{15}{1}{#1}{#2}{#3}%
+	\relax%
+	\gre@trace@end%
+}%
+
+\def\GreDivisioMinimaHigh#1#2#3{%
+	\gre@trace{GreDivisioMinimaHigh{#1}{#2}{#3}}%
+	\gre@writebar{15}{0}{#1}{#2}{#3}%
+	\relax%
+	\gre@trace@end%
+}%
+
 \def\GreInDivisioMinor#1#2{%
 	\gre@trace{GreInDivisioMinor{#1}{#2}}%
 	\gre@writebar{2}{1}{#1}{#2}{0}%
@@ -1842,6 +1896,20 @@
 	\gre@trace@end%
 }%
 
+\def\GreInDivisioMaiorDotted#1#2{%
+	\gre@trace{GreInDivisioMaiorDotted{#1}{#2}}%
+	\gre@writebar{16}{1}{#1}{#2}{0}%
+	\relax%
+	\gre@trace@end%
+}%
+
+\def\GreDivisioMaiorDotted#1#2{%
+	\gre@trace{GreDivisioMaiorDotted{#1}{#2}}%
+	\gre@writebar{16}{0}{#1}{#2}{0}%
+	\relax%
+	\gre@trace@end%
+}%
+
 \def\GreDominica#1#2#3{%
 	\gre@trace{GreDominica{#1}{#2}{#3}}%
 	\ifcase#1\or %
@@ -2004,7 +2072,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
+%% 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
 %% 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)
@@ -2041,8 +2109,8 @@
 			\gre@hskip\gre@skip@temp@four %
 			\GreNoBreak %
 		\fi %
-		\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPVirgula}%
-		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPVirgula}%
+		\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@virgula}%
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@virgula}%
 		#4\relax %
 		\ifnum\gre@count@temp@one=1\relax %
 			\GreNoBreak %
@@ -2055,8 +2123,8 @@
 			\gre@hskip\gre@skip@temp@four %
 			\GreNoBreak %
 		\fi %
-		\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinima}%
-		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMinima}%
+		\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominima}%
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominima}%
 		#4\relax %
 		\ifnum\gre@count@temp@one=1\relax %
 			\GreNoBreak %
@@ -2069,8 +2137,8 @@
 			\gre@hskip\gre@skip@temp@four %
 			\GreNoBreak %
 		\fi %
-		\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinor}%
-		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMinor}%
+		\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominor}%
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominor}%
 		#4\relax %
 		\ifnum\gre@count@temp@one=1\relax %
 			\GreNoBreak %
@@ -2083,7 +2151,7 @@
 			\gre@hskip\gre@skip@temp@four %
 			\GreNoBreak %
 		\fi %
-		\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaior}%
+		\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaior}%
 		\gre@fontchar@divisiomaior %
 		#4\relax %
 		\ifnum\gre@count@temp@one=1\relax %
@@ -2247,6 +2315,61 @@
 			\gre@skip@temp@four = \csname gre@space@skip@bar@dominican\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
 			\gre@hskip\gre@skip@temp@four %
 		\fi %
+	\or % 14 : high virgula
+		\ifnum\gre@count@temp@one=1\relax %
+			\gre@skip@temp@four = \csname gre@space@skip@bar@virgula\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@virgulahigh}%
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@virgulahigh}%
+		\GreAdditionalLine{\GreOCaseBarVirgula}{0}{2}%
+		#4\relax %
+		\ifnum\gre@count@temp@one=1\relax %
+			\GreNoBreak %
+			\gre@skip@temp@four = \csname gre@space@skip@bar@virgula\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
+			\gre@hskip\gre@skip@temp@four %
+		\fi %
+	\or % 15 : high minima
+		\ifnum\gre@count@temp@one=1\relax %
+			\gre@skip@temp@four = \csname gre@space@skip@bar@minima\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@divisiominimahigh}%
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiominimahigh}%
+		\GreAdditionalLine{\GreOCaseBarStandard}{0}{2}%
+		#4\relax %
+		\ifnum\gre@count@temp@one=1\relax %
+			\GreNoBreak %
+			\gre@skip@temp@four = \csname gre@space@skip@bar@minima\gre@bar@space@suffix{#2}{#3}{#5}\endcsname\relax%
+			\gre@hskip\gre@skip@temp@four %
+		\fi %
+	\or % 16 : dotted maior
+		\ifnum\gre@count@temp@one=1\relax %
+			\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 %
+			\GreNoBreak %
+		\fi %
+		\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaiordotted}%
+		\ifgre@hidedottedbarlines %
+			\hbox to 0pt{%
+				{%
+					\color{grebackgroundcolor}%
+					\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiomaiordottedbacking}%
+				}%
+				\hss %
+			}%
+		\fi %
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiomaiordotted}%
+		#4\relax %
+		\ifnum\gre@count@temp@one=1\relax %
+			\GreNoBreak %
+			\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 %
 	\fi %
 	\global\gre@skip@bar@lastskip=\gre@skip@temp@four %
 	\gre@debugmsg{spacing}{Width of bar just printed: \the\wd\gre@box@temp@width}%
@@ -2261,9 +2384,9 @@
 \def\gre@fontchar@divisiomaior{%
 	\ifnum\gre@stafflinefactor=17\relax %
 		%\gre@calculate@glyphraisevalue{\gre@pitch@bar}{0}{}% bar glyphs are made to be at this height
-		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\GreCPDivisioMaior}%
+		\raise\gre@dimen@glyphraisevalue\hbox{\gre@font@music\gre@char@bar@divisiomaior}%
 	\else %
-		\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaior}%
+		\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaior}%
 		% we calculate the raise of the bar
 		\gre@dimen@temp@five=\dimexpr(\gre@dimen@additionalbottomspace %
 			+ \gre@space@dimen@spacebeneathtext %
@@ -2404,7 +2527,9 @@
 	\ifnum#4=0\relax %
 		\gre@newglyphcommon %
 	\fi %
-	\global\gre@dimen@lastglyphwidth=\wd\gre@box@temp@width %
+	\ifgre@in@custos\else\relax %
+		\global\gre@dimen@lastglyphwidth=\wd\gre@box@temp@width %
+	\fi %
 	% the three next lines are a trick to get the additional lines below the glyphs
 	\gre@skip@temp@one = \gre@dimen@lastglyphwidth\relax%
 	\kern\gre@skip@temp@one %
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
index d9ebdf7b0cc..69dc1d9e5fb 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
@@ -19,7 +19,7 @@
 
 % this file contains definitions of spaces
 
-\gre@declarefileversion{gregoriotex-spaces.tex}{5.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{5.1.0}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for tuning penalties
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
index 72dda80d495..751a8e77db2 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
@@ -19,7 +19,7 @@
 
 % this file contains definitions of the glyphs and the syllables
 
-\gre@declarefileversion{gregoriotex-syllable.tex}{5.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{5.1.0}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for the typesetting of the different glyphs
@@ -233,16 +233,16 @@
 		\gre@handleclivisspecialalignment{\gre@font@music\GreCPFlexusTwoDeminutus}{\gre@font@music\GreCPPunctum}{#2}%
 	\or %
 		% case of virgula
-		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPVirgula}%
+		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@virgula}%
 	\or %
 		% case of divisio minima
-		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinima}%
+		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominima}%
 	\or %
 		% case of divisio minor
-		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMinor}%
+		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiominor}%
 	\or %
 		% case of divisio maior
-		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioMaior}%
+		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\gre@char@bar@divisiomaior}%
 	\or %
 		% case of dominican bar
 		\global\setbox\gre@box@temp@width=\hbox{\gre@font@music\GreCPDivisioDominican}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
index 6041cd113d7..a91721917c6 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
@@ -19,7 +19,7 @@
 
 -- this file contains lua functions to support signs used by GregorioTeX.
 
--- GREGORIO_VERSION 5.0.2
+-- GREGORIO_VERSION 5.1.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 e7fda265431..0abf5cc9643 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
@@ -22,7 +22,7 @@
 \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
 \def\gregoriotex@symbols@loaded{}%
 
-\gre@declarefileversion{gregoriotex-symbols.tex}{5.0.2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{5.1.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 abb26638701..5bd712b8634 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
@@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after,
 gregoriotex = gregoriotex or {}
 local gregoriotex = gregoriotex
 
-local internalversion = '5.0.2' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '5.1.0' -- GREGORIO_VERSION (comment used by VersionManager.py)
 
 local err, warn, info, log = luatexbase.provides_module({
     name               = "gregoriotex",
-    version            = '5.0.2', -- GREGORIO_VERSION
+    version            = '5.1.0', -- GREGORIO_VERSION
     greinternalversion = internalversion,
-    date               = "2017/05/24", -- GREGORIO_DATE_LTX
+    date               = "2018/03/11", -- GREGORIO_DATE_LTX
     description        = "GregorioTeX module.",
     author             = "The Gregorio Project (see CONTRIBUTORS.md)",
     copyright          = "2008-2017 - The Gregorio Project",
@@ -146,7 +146,7 @@ local function gregorio_exe()
     local exe_version
 
     -- first look for one with the exact version
-    real_gregorio_exe = 'gregorio-5_0_2' -- FILENAME_VERSION
+    real_gregorio_exe = 'gregorio-5_1_0' -- FILENAME_VERSION
     local cmd = string.format("%s -o %%s %s", real_gregorio_exe,
         test_snippet_filename)
     exe_version = get_prog_output(cmd, '*line')
@@ -901,6 +901,8 @@ local function include_score(input_file, force_gabccompile, allow_deprecated)
   -- open the gabc file for reading so that LuaTeX records input from it
   -- when the -recorder option is used; do this here so that this happens
   -- on every run
+  tex.sprint(catcode_at_letter, string.format(
+      [[\openin\gre@read@temp=%s\relax\closein\gre@read@temp]], gabc_file))
   local gabc = io.open(gabc_file, 'r')
   if gabc == nil then
     err("\n Unable to open %s", gabc_file)
@@ -1094,8 +1096,8 @@ local function change_score_glyph(glyph_name, font_name, replacement, cavum)
   cavum = cavum or ''
   if string.match(glyph_name, '%*') then
     glyph_name = '^'..glyph_name:gsub('%*', '.*')..'$'
-    if not string.match(replacement, '^%.') then
-      err('If a wildcard is supplied for glyph name, replacement must start with a dot.')
+    if replacement ~= '' and not string.match(replacement, '^%.') then
+      err('If a wildcard is supplied for glyph name, replacement must be blank or start with a dot.')
     end
     local general_font = general_font_for(cavum)
     local other_font
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
index 9da3b585607..48eb762f559 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
@@ -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.
-% 		[2017/05/24 v5.0.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% 		[2018/03/11 v5.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 
 \edef\greoldcatcode{\the\catcode`@}