CTAN sync 202103050300

26 files changed, 29 insertions, 24 deletions

diff --git a/support/gregoriotex/CHANGELOG.md b/support/gregoriotex/CHANGELOG.md
index ca3bf27c8c..3d4fa0b6f1 100644
--- a/support/gregoriotex/CHANGELOG.md
+++ b/support/gregoriotex/CHANGELOG.md
@@ -8,6 +8,11 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][CTAN]
 
 
+## [6.0.0-beta2] - 2021-03-04
+
+
+
+
 ## [6.0.0-beta1] - 2021-02-23
 ### Fixed
 - Fixed some problem in 900_gregorio.xml (Scribus render frame tool).  First, the use of `filecontents` rather than `filecontents*` was leading to a comment header that made it impossible for Gregorio to find the gabc headers in the temporary score file.  Further, some of the indenting (which makes the file more human readable) was leading to errors in the formatting of the created files because they are processed in a way which handles whitespace differently from XML.  See [#1457](https://github.com/gregorio-project/gregorio/issues/1457).
@@ -20,10 +25,10 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - Updated to use iftex package (the sucessor to ifluatex).  See [#1481](https://github.com/gregorio-project/gregorio/issues/1481).
 
 ### Added
-- Default spacings are now designated internal and thus always loaded.  `gsp-sample.tex` is added to the `doc` folder to show users how to create their own custom spacing configuration.  As part of this change, spacing configuration files no longer need to be complete.  Since the default configuration is always loaded at package startup, all needed penalties and spacings will be defined and the user's configuration file need only specify those whose value they wish to customize.  Addresses issues raised in [#1460](https://github.com/gregorio-project/gregorio/issues/1460).  **This is a change to the user interface and warrants a major release.**
+- Default spacings are now designated internal and thus always loaded.  `gsp-sample.tex` is added to the `doc` folder to show users how to create their own custom spacing configuration.  As part of this change, spacing configuration files no longer need to be complete.  Since the default configuration is always loaded at package startup, all needed penalties and spacings will be defined and the user's configuration file need only specify those whose value they wish to customize.  Addresses issues raised in [#1460](https://github.com/gregorio-project/gregorio/issues/1460).
 - Added additional message to verbose output of command-line tool to prevent confusion when a custom Latin vowel convention is found that the internal Latin rules will be used.  See [#1470](https://github.com/gregorio-project/gregorio/issues/1470).
 - Added `$` in gabc text to prevent special interpretation of the character that follows.  See [#1515](https://github.com/gregorio-project/gregorio/issues/1515)
-- GregorioTeX will now look in additional places for scores using.  Users can specify paths to look in using `\gresetgregpath`.  If scores are not found in the current working directory or the list of provided paths, we fall back on kpse to try and find them.  See [#1395](https://github.com/gregorio-project/gregorio/issues/1395).
+- GregorioTeX will now look in additional places for scores.  Users can specify paths to look in using `\gresetgregpath`.  If scores are not found in the current working directory or the list of provided paths, we fall back on kpse to try and find them.  See [#1395](https://github.com/gregorio-project/gregorio/issues/1395).
 - Added the ability to toggle the visibility of the translation and above lines text.  See [user request on mailing list](https://groups.google.com/g/gregorio-users/c/J-V0dkBMevY).
 
 ### Changed
diff --git a/support/gregoriotex/doc/GregorioRef.pdf b/support/gregoriotex/doc/GregorioRef.pdf
index 3d5d6daa66..dd11578426 100644
--- a/support/gregoriotex/doc/GregorioRef.pdf
+++ b/support/gregoriotex/doc/GregorioRef.pdf
diff --git a/support/gregoriotex/doc/GregorioRef.tex b/support/gregoriotex/doc/GregorioRef.tex
index 99e45ef111..399394a32b 100644
--- a/support/gregoriotex/doc/GregorioRef.tex
+++ b/support/gregoriotex/doc/GregorioRef.tex
@@ -183,7 +183,7 @@
 
 		\vspace{1cm}
 
-		\large Version \textbf{6.0.0-beta1}, 23 February 2021 %% PARSE_VERSION_DATE
+		\large Version \textbf{6.0.0-beta2}, 4 March 2021 %% PARSE_VERSION_DATE
 
 		\vspace{1.5cm}
 	\end{center}
diff --git a/support/gregoriotex/fonts/sources/squarize.py b/support/gregoriotex/fonts/sources/squarize.py
index e40cc2ebdf..6f6d860d29 100644
--- a/support/gregoriotex/fonts/sources/squarize.py
+++ b/support/gregoriotex/fonts/sources/squarize.py
@@ -90,7 +90,7 @@ AMBITUS = {
     14 : 'Fourteen',
 }
 
-GREGORIO_VERSION = '6.0.0-beta1'
+GREGORIO_VERSION = '6.0.0-beta2'
 
 # The unicode character at which we start our numbering:
 # U+E000 is the start of the BMP Private Use Area
diff --git a/support/gregoriotex/fonts/truetype/greciliae-hole.ttf b/support/gregoriotex/fonts/truetype/greciliae-hole.ttf
index 27e9c07c65..e2697f686f 100644
--- a/support/gregoriotex/fonts/truetype/greciliae-hole.ttf
+++ b/support/gregoriotex/fonts/truetype/greciliae-hole.ttf
diff --git a/support/gregoriotex/fonts/truetype/greciliae-hollow.ttf b/support/gregoriotex/fonts/truetype/greciliae-hollow.ttf
index d9b1606db9..51d1cccc61 100644
--- a/support/gregoriotex/fonts/truetype/greciliae-hollow.ttf
+++ b/support/gregoriotex/fonts/truetype/greciliae-hollow.ttf
diff --git a/support/gregoriotex/fonts/truetype/greciliae-op-hole.ttf b/support/gregoriotex/fonts/truetype/greciliae-op-hole.ttf
index f6eb693162..c351221ab8 100644
--- a/support/gregoriotex/fonts/truetype/greciliae-op-hole.ttf
+++ b/support/gregoriotex/fonts/truetype/greciliae-op-hole.ttf
diff --git a/support/gregoriotex/fonts/truetype/greciliae-op-hollow.ttf b/support/gregoriotex/fonts/truetype/greciliae-op-hollow.ttf
index 7ca1259bc6..43f1b1b987 100644
--- a/support/gregoriotex/fonts/truetype/greciliae-op-hollow.ttf
+++ b/support/gregoriotex/fonts/truetype/greciliae-op-hollow.ttf
diff --git a/support/gregoriotex/fonts/truetype/greciliae-op.ttf b/support/gregoriotex/fonts/truetype/greciliae-op.ttf
index e818005f9d..6662d09ace 100644
--- a/support/gregoriotex/fonts/truetype/greciliae-op.ttf
+++ b/support/gregoriotex/fonts/truetype/greciliae-op.ttf
diff --git a/support/gregoriotex/fonts/truetype/greciliae.ttf b/support/gregoriotex/fonts/truetype/greciliae.ttf
index c6cdfe0528..3695f6c553 100644
--- a/support/gregoriotex/fonts/truetype/greciliae.ttf
+++ b/support/gregoriotex/fonts/truetype/greciliae.ttf
diff --git a/support/gregoriotex/tex/lualatex/gregoriosyms.sty b/support/gregoriotex/tex/lualatex/gregoriosyms.sty
index 09f61a6ea0..3cc884236a 100644
--- a/support/gregoriotex/tex/lualatex/gregoriosyms.sty
+++ b/support/gregoriotex/tex/lualatex/gregoriosyms.sty
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gregoriosyms}
-		[2021/02/23 v6.0.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+		[2021/03/04 v6.0.0-beta2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
 
 \RequirePackage{iftex}%
 \RequireLuaTeX
@@ -41,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{6.0.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{6.0.0-beta2}% GREGORIO_VERSION - VersionManager.py
 
 \providecommand{\gre@declarefileversion}[2]{\relax}
 
diff --git a/support/gregoriotex/tex/lualatex/gregoriotex.sty b/support/gregoriotex/tex/lualatex/gregoriotex.sty
index 6f8eff2456..3833cfe25b 100644
--- a/support/gregoriotex/tex/lualatex/gregoriotex.sty
+++ b/support/gregoriotex/tex/lualatex/gregoriotex.sty
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{gregoriotex}%
-		[2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+		[2021/03/04 v6.0.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 \RequirePackage{iftex}%
 \RequireLuaTeX
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-chars.tex b/support/gregoriotex/tex/luatex/gregoriotex-chars.tex
index 99c577d7a0..c5a4f4c663 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-chars.tex
+++ b/support/gregoriotex/tex/luatex/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}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
 \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-common.tex b/support/gregoriotex/tex/luatex/gregoriotex-common.tex
index 4801ea8c65..4821ef4744 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-common.tex
+++ b/support/gregoriotex/tex/luatex/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-common.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-common.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 \ifnum\luatexversion<76%
 	\gre@error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}%
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-gsp-default.tex b/support/gregoriotex/tex/luatex/gregoriotex-gsp-default.tex
index a5e8952bd7..457d12c144 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-gsp-default.tex
+++ b/support/gregoriotex/tex/luatex/gregoriotex-gsp-default.tex
@@ -20,7 +20,7 @@
 % this file contains definitions of spaces and penalties
 
 % version check
-\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 
 %% First, the penalties
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-main.tex b/support/gregoriotex/tex/luatex/gregoriotex-main.tex
index c7f0f93506..b2c03fff18 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-main.tex
+++ b/support/gregoriotex/tex/luatex/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{6.0.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{6.0.0-beta2}% GREGORIO_VERSION - VersionManager.py
 
 % first some macros to allow checks for version:
 % Tests that all gregoriotex files are of the same version.
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-nabc.lua b/support/gregoriotex/tex/luatex/gregoriotex-nabc.lua
index deeaf3ba34..3ea7e6d50c 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-nabc.lua
+++ b/support/gregoriotex/tex/luatex/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 6.0.0-beta1
+-- GREGORIO_VERSION 6.0.0-beta2
 
 local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
 
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-nabc.tex b/support/gregoriotex/tex/luatex/gregoriotex-nabc.tex
index fa76832c43..d24a1c033f 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-nabc.tex
+++ b/support/gregoriotex/tex/luatex/gregoriotex-nabc.tex
@@ -19,7 +19,7 @@
 
 % this file contains macros for St. Gall ancient neume support
 
-\gre@declarefileversion{gregoriotex-nabc.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 
 \xdef\gre@nabcfontname{gregall}%
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-signs.lua b/support/gregoriotex/tex/luatex/gregoriotex-signs.lua
index 25a2f85cbe..9db474e98e 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-signs.lua
+++ b/support/gregoriotex/tex/luatex/gregoriotex-signs.lua
@@ -19,7 +19,7 @@
 
 -- this file contains lua functions to support signs used by GregorioTeX.
 
--- GREGORIO_VERSION 6.0.0-beta1
+-- GREGORIO_VERSION 6.0.0-beta2
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-signs.tex b/support/gregoriotex/tex/luatex/gregoriotex-signs.tex
index addcba3178..14d52d32f3 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-signs.tex
+++ b/support/gregoriotex/tex/luatex/gregoriotex-signs.tex
@@ -22,7 +22,7 @@
 
 \def\grebarbracewidth{.58879}%
 
-\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 \def\gre@usestylecommon{%
 	\gre@trace{gre@usestylecommon}%
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-spaces.tex b/support/gregoriotex/tex/luatex/gregoriotex-spaces.tex
index a0fcc077b9..e14fe2a525 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-spaces.tex
+++ b/support/gregoriotex/tex/luatex/gregoriotex-spaces.tex
@@ -19,7 +19,7 @@
 
 % this file contains definitions of spaces
 
-\gre@declarefileversion{gregoriotex-spaces.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for tuning penalties
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-syllable.tex b/support/gregoriotex/tex/luatex/gregoriotex-syllable.tex
index afff36cd64..e732c18a04 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-syllable.tex
+++ b/support/gregoriotex/tex/luatex/gregoriotex-syllable.tex
@@ -19,7 +19,7 @@
 
 % this file contains definitions of the glyphs and the syllables
 
-\gre@declarefileversion{gregoriotex-syllable.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for the typesetting of the different glyphs
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-symbols.lua b/support/gregoriotex/tex/luatex/gregoriotex-symbols.lua
index 19f915f105..fbf772163f 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-symbols.lua
+++ b/support/gregoriotex/tex/luatex/gregoriotex-symbols.lua
@@ -19,7 +19,7 @@
 
 -- this file contains lua functions to support signs used by GregorioTeX.
 
--- GREGORIO_VERSION 6.0.0-beta1
+-- GREGORIO_VERSION 6.0.0-beta2
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn
diff --git a/support/gregoriotex/tex/luatex/gregoriotex-symbols.tex b/support/gregoriotex/tex/luatex/gregoriotex-symbols.tex
index d99afede5d..ecbd253edc 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex-symbols.tex
+++ b/support/gregoriotex/tex/luatex/gregoriotex-symbols.tex
@@ -22,7 +22,7 @@
 \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
 \def\gregoriotex@symbols@loaded{}%
 
-\gre@declarefileversion{gregoriotex-symbols.tex}{6.0.0-beta1}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{6.0.0-beta2}% GREGORIO_VERSION
 
 \RequireLuaModule{gregoriotex}%
 
diff --git a/support/gregoriotex/tex/luatex/gregoriotex.lua b/support/gregoriotex/tex/luatex/gregoriotex.lua
index e16f193552..adb254e200 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex.lua
+++ b/support/gregoriotex/tex/luatex/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 = '6.0.0-beta1' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '6.0.0-beta2' -- GREGORIO_VERSION (comment used by VersionManager.py)
 
 local err, warn, info, log = luatexbase.provides_module({
     name               = "gregoriotex",
-    version            = '6.0.0-beta1', -- GREGORIO_VERSION
+    version            = '6.0.0-beta2', -- GREGORIO_VERSION
     greinternalversion = internalversion,
-    date               = "2021/02/23", -- GREGORIO_DATE_LTX
+    date               = "2021/03/04", -- GREGORIO_DATE_LTX
     description        = "GregorioTeX module.",
     author             = "The Gregorio Project (see CONTRIBUTORS.md)",
     copyright          = "2008-2021 - 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-6_0_0-beta1' -- FILENAME_VERSION
+    real_gregorio_exe = 'gregorio-6_0_0-beta2' -- 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/support/gregoriotex/tex/luatex/gregoriotex.tex b/support/gregoriotex/tex/luatex/gregoriotex.tex
index e50be69975..e089e2a426 100644
--- a/support/gregoriotex/tex/luatex/gregoriotex.tex
+++ b/support/gregoriotex/tex/luatex/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.
-% 		[2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% 		[2021/03/04 v6.0.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 \input iftex.sty
 \RequireLuaTeX%