gregoriotex (22aug16)

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

39 files changed, 222 insertions, 41 deletions

diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
index 78705d2bf61..7c5cd65747a 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
@@ -1,5 +1,23 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \begin{landscape}
 
 \section{Font Glyph Tables}\label{glyphtable}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
index e1e4fac9ede..418b53414d6 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
@@ -1,5 +1,23 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \section{User Controls}
 
 These functions are available to the user to customize elements of the
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
index c61e16809bd..973fd307daf 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
@@ -1,5 +1,23 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \section{Gregorio Controls}
 
 These functions are the ones written by gregorio to the gtex file.
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
index 9a2ae64deb9..d8fa5d33d83 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
@@ -1,5 +1,23 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \section{Gregorio\TeX{} Controls}
 
 These functions are the ones used by Gregorio\TeX{} internally as it
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
index 27ef298188b..a3680cd715b 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
@@ -1,5 +1,23 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \section{The GABC File}
 
 gabc is a simple notation based exclusively on ASCII characters that
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
index 3f007307978..8eb60496aa1 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
index 836e75db56b..6b69c7ef28f 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
@@ -1,5 +1,22 @@
 % !TEX program = LuaLaTeX+se
-
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \documentclass[a4paper]{article}
 \usepackage{color}
 \usepackage[margin=1cm]{geometry}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
index bcc35a9bb69..2e7d06dd5be 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
@@ -1,3 +1,20 @@
+-- Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+--
+-- This file is part of Gregorio.
+--
+-- Gregorio is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- Gregorio is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+
 local P = lpeg.P
 local R = lpeg.R
 local C = lpeg.C
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
index f961ed429a5..c1c252c01e4 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
index 71dd41d9dfb..dcd96d1dc2f 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
@@ -1,4 +1,22 @@
 % !TEX program = LuaLaTeX+se
+%
+% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+%
+% This file is part of Gregorio.
+%
+% Gregorio is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Gregorio is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+%
 \documentclass[12pt,a4paper]{article}
 \usepackage[titletoc,toc,title]{appendix}
 \usepackage{fontspec}
@@ -32,7 +50,6 @@
 \usepackage{url}
 \usepackage{tabulary}
 \usepackage{tabularx}
-\usepackage{adjustbox}
 \usepackage{xparse}
 
 \usepackage{makeidx}
@@ -43,6 +60,7 @@
 \definecolor{green}{HTML}{0c700c}
 \definecolor{myred}{HTML}{FF3333}
 
+\usepackage{adjustbox} % must be after xcolor
 \usepackage{minted} % must be after xcolor
 \makeatletter
 \@ifpackagelater{minted}{2013/12/21}{%
@@ -152,7 +170,7 @@
 
 		\vspace{1cm}
 
-		\large Version \textbf{4.1.4}, 29 May 2016 %% PARSE_VERSION_DATE
+		\large Version \textbf{4.1.5}, 18 August 2016 %% PARSE_VERSION_DATE
 
 		\vspace{1.5cm}
 	\end{center}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/README.md b/Master/texmf-dist/doc/luatex/gregoriotex/README.md
new file mode 100644
index 00000000000..4bbd40f2dab
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/README.md
@@ -0,0 +1,19 @@
+Documentation for gregorio and gregoriotex
+==========================================
+
+This folder contains the source files of a manual is primarily intended for
+developers. Users should not expect to find an indepth guide on using gregorio.
+
+You can find a compiled PDF version in the files of each [Gregorio release](https://github.com/gregorio-project/gregorio/releases).
+
+Developers can use this manual as a reference for information on the
+internal workings of gregorio.
+
+## Building
+
+To compile the pdf you must have
+ * an up-to-date [TeXLive](https://www.tug.org/texlive/) system, with at least the `luatex` bundle and `latexmk`
+ * the [Linux Libertine](http://www.linuxlibertine.org/index.php?id=1&L=1) and [Inconsolata](http://www.levien.com/type/myfonts/inconsolata.html) fonts (distributed by TeXLive too)
+ * the [`pygments` library](http://pygments.org/)
+
+Once you have run `./configure` in the main directory, run `make doc` in this directory.
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd
index dc36aea19aa..b02eff6dc13 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd
+++ b/Master/texmf-dist/fonts/source/gregoriotex/granapadano-base.sfd
@@ -3,7 +3,7 @@ FontName: granapadano
 FullName: granapadano
 FamilyName: granapadano
 Weight: Medium
-Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter <reuter@ipd.uka.de>\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
+Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter <reuter@ipd.uka.de>\nCopyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
 UComments: "2007-4-12: Created." 
 Version: 1.0
 ItalicAngle: 0
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
index 121ce478174..6fb436cfb67 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
+++ b/Master/texmf-dist/fonts/source/gregoriotex/greciliae-base.sfd
@@ -3,7 +3,7 @@ FontName: greciliae
 FullName: greciliae
 FamilyName: greciliae
 Weight: Medium
-Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
+Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
 UComments: "2007-4-12: Created." 
 Version: 1.2
 ItalicAngle: 0
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd b/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd
index 06a5570935c..7eac03af50d 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd
+++ b/Master/texmf-dist/fonts/source/gregoriotex/gregorio-base.sfd
@@ -3,7 +3,7 @@ FontName: gregorio
 FullName: gregorio
 FamilyName: gregorio
 Weight: Medium
-Copyright: Font named "gregorio"\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
+Copyright: Font named "gregorio"\nCopyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
 UComments: "2007-4-12: Created." 
 Version: 1.2
 ItalicAngle: 0
diff --git a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
index 43ee0a3c2de..55ae74b6f9b 100644
--- a/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
+++ b/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
@@ -78,7 +78,7 @@ AMBITUS = {
     5: 'Five',
 }
 
-GREGORIO_VERSION = '4.1.4'
+GREGORIO_VERSION = '4.1.5'
 
 # The unicode character at which we start our numbering:
 # U+E000 is the start of the BMP Private Use Area
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf
index d88604903ab..73cea910f01 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano-op.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf
index 9d5674298c1..13a8db2e4a9 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/granapadano.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
index 43d7724228a..9f274c9c59f 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
index 7689d5b59aa..2c3a4772362 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
index daaab66819b..b38d7e6070f 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/greextra.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
index c5c15064ba5..058018cd6b5 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf
index 7a4c5070c1b..078ccc45cb9 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio-op.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf
index 2dd2587cef2..07ac82e33f3 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregorio.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
index c01224b6daf..1319b383ae7 100644
--- a/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
diff --git a/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty b/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
index dd60c289d76..55424ff2913 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gregoriosyms}
-		[2016/05/29 v4.1.4 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+		[2016/08/18 v4.1.5 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%
@@ -38,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.1.4}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.5}% 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 8037b198865..30d81613aa2 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{gregoriotex}%
-		[2016/05/29 v4.1.4 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+		[2016/08/18 v4.1.5 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%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
index 7e756fa4c22..1dd96ed6bff 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -18,7 +18,7 @@
 % along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
 \gre@debugmsg{general}{Loading gregoriotex-chars.tex}%
-\gre@declarefileversion{gregoriotex-chars.tex}{4.1.4}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{4.1.5}% 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-main.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
index 28ec6eb1e73..bca81c6860e 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -143,7 +143,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.1.4}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.5}% GREGORIO_VERSION - VersionManager.py
 
 % first some macros to allow checks for version:
 % Tests that all gregoriotex files are of the same version.
@@ -403,7 +403,7 @@
 	% we then place that box inside one of 0 width so that our cursor doesn't move when we place the commentary
 	\ifvoid\gre@box@commentary\else%
 		\gre@debugmsg{commentary}{I am printing a commentary box}%
-		\raise\gre@dimen@commentarytrueraise\hbox to 0pt{\hbox to \gre@dimen@linewidth{\hfill\box\gre@box@commentary}}%
+		\raise\gre@dimen@commentarytrueraise\hbox to 0pt{\hbox to \gre@dimen@linewidth{\hfill\box\gre@box@commentary}\hss}%
 	\fi%
 	\gre@debugmsg{annotation}{Time to calculate the true raise.}%
 	\gre@calculate@annotationtrueraise %
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
index ff6899932c2..14abe5637e4 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2014-2016 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 4.1.4
+-- GREGORIO_VERSION 4.1.5
 
 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 c66d13df732..6c4934b9ef4 100644
--- a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
+++ b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
@@ -20,7 +20,7 @@
 % this file contains macros for St. Gall ancient neume support
 
 \gre@debugmsg{general}{Loading gregoriotex-nabc.tex}%
-\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.4}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.5}% 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 334ea6ca287..12c9465bde0 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 4.1.4
+-- GREGORIO_VERSION 4.1.5
 
 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 42c8a09a616..ef99b7cdeeb 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -23,7 +23,7 @@
 \def\grebarbracewidth{.58879}%
 
 \gre@debugmsg{general}{Loading gregoriotex-signs.tex}%
-\gre@declarefileversion{gregoriotex-signs.tex}{4.1.4}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{4.1.5}% GREGORIO_VERSION
 
 \def\gre@usestylecommon{%
 	\ifgre@usestylefont\else %
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
index e1355af430f..f95a73d9174 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -20,7 +20,7 @@
 % this file contains definitions of spaces
 
 \gre@debugmsg{general}{Loading gregoriotex-spaces.tex}%
-\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.4}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.5}% 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 86319507ef3..40588a3705e 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -20,7 +20,7 @@
 % this file contains definitions of the glyphs and the syllables
 
 \gre@debugmsg{general}{Loading gregoriotex-syllable.tex}%
-\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.4}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.5}% 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 8484708767b..afa9f015248 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 4.1.4
+-- GREGORIO_VERSION 4.1.5
 
 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 fad12e92104..23155baa182 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -23,7 +23,7 @@
 \def\gregoriotex@symbols@loaded{}%
 
 \gre@debugmsg{general}{Loading gregoriotex-symbols.tex}%
-\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.4}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.5}% 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 0685eae1d78..6f15499f3ac 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+--Copyright (C) 2008-2016 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 = '4.1.4' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '4.1.5' -- GREGORIO_VERSION (comment used by VersionManager.py)
 
 local err, warn, info, log = luatexbase.provides_module({
     name               = "gregoriotex",
-    version            = '4.1.4', -- GREGORIO_VERSION
+    version            = '4.1.5', -- GREGORIO_VERSION
     greinternalversion = internalversion,
-    date               = "2016/05/29", -- GREGORIO_DATE_LTX
+    date               = "2016/08/18", -- GREGORIO_DATE_LTX
     description        = "GregorioTeX module.",
     author             = "The Gregorio Project (see CONTRIBUTORS.md)",
-    copyright          = "2008-2015 - The Gregorio Project",
+    copyright          = "2008-2016 - The Gregorio Project",
     license            = "GPLv3+",
 })
 
@@ -307,6 +307,13 @@ local function dump_nodes(head)
   log('--end dump--')
 end
 
+-- helper function for center_translation()
+local function get_first_node_by_id(id, head)
+  for n in traverse_id(id, head) do
+    return n
+  end
+end
+
 local function center_translation(startnode, endnode, ratio, sign, order)
   -- total width between beginning the two centering points
   local total_width = node.dimensions(ratio, sign, order, startnode, endnode)
@@ -321,12 +328,23 @@ local function center_translation(startnode, endnode, ratio, sign, order)
   --    \kern 0pt
   --  }
   --
+  -- While normally we could use startnode.head.next.head.next.head
+  -- to reach the translation (glyph node), packages such as LuaTeX-ja
+  -- may have, for example, prepended a whatsit node to each list
+  -- to store e.g. text direction, moving our translation glyph node to
+  -- startnode.head.next.next.head.next.next.head.next instead.
+  --
+  -- To avoid unpleasant surprises, let's search for each desired node
+  -- by its type:
+  local vlistnode = get_first_node_by_id(vlist, startnode.head)
+  local hlistnode = get_first_node_by_id(hlist, vlistnode.head)
+  local glyphnode = get_first_node_by_id(glyph, hlistnode.head)
   -- hence translation width is:
-  local trans_width = node.dimensions(startnode.head.next.head.next.head)
+  local trans_width = node.dimensions(glyphnode)
   -- now we must transform the kern 0pt into kern Xpt and kern -Xpt where X is:
   local X = (total_width - trans_width) / 2
-  startnode.head.kern = X
-  startnode.head.next.next.kern = -X
+  vlistnode.prev.kern = X
+  vlistnode.next.kern = -X
 end
 
 local debug_types_activated = {['linesglues'] = false}
@@ -965,6 +983,7 @@ end
 local function scale_space(factor)
   local skip = tex.getskip('gre@skip@temp@four')
   skip.width = skip.width * factor
+  tex.setskip('gre@skip@temp@four',skip)
   -- should skip.stretch and skip.shink also be scaled?
 end
 
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
index 5135f8497ea..bc148ea9b84 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.
-% 		[2016/05/29 v4.1.4 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% 		[2016/08/18 v4.1.5 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 
 \edef\greoldcatcode{\the\catcode`@}
@@ -31,8 +31,9 @@
 \input luatexbase.sty%
 \input luamplib.sty%
 \input luaotfload.sty%
+\input xstring.tex%
+\input color.tex%
 \input graphicx.tex % for \resizebox
-\input xstring.sty%
 
 \def\gre@error#1{\begingroup%
 \def\MessageBreak{^^J}%
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex
index b29e1cb6258..aa7606bb2d9 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2010-2016 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %