gregorio-6.0.0-beta2

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

texk/gregorio/ChangeLog

@@ -1,3 +1,8 @@
+2021-03-04  Karl Berry  <karl@tug.org>
+
+	* Import gregorio-6.0.0-beta2.
+	* version.ac: Adapted.
+
 2019-12-19  Akira Kakuto  <kakuto@w32tex.org>
 
 	* Import gregorio-5.2.1.

texk/gregorio/TLpatches/TL-Changes

@@ -1,5 +1,5 @@
-Changes applied to the gregorio-5.2.1 tree as obtained from:
-	CTAN/support/gregoriotex/gregorio-5.2.1.zip
+Changes applied to the gregorio source tree as obtained from:
+	CTAN/support/gregoriotex/gregorio-6.2.2-beta2.zip
 
 Remove:
 	Makefile.in
@@ -10,3 +10,4 @@ Remove:
 	contrib/TeXShop/Makefile.in
 	src/Makefile.in
 	src/config_.h.in
+	doc/ examples/ fonts/ tex/

texk/gregorio/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.2.1.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 6.0.0-beta2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Gregorio (TeX Live)'
 PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='5.2.1'
-PACKAGE_STRING='Gregorio (TeX Live) 5.2.1'
+PACKAGE_VERSION='6.0.0-beta2'
+PACKAGE_STRING='Gregorio (TeX Live) 6.0.0-beta2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL='http://gregorio-project.github.io/'
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Gregorio (TeX Live) 5.2.1 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 6.0.0-beta2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.2.1:";;
+     short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.0.0-beta2:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Gregorio (TeX Live) configure 5.2.1
+Gregorio (TeX Live) configure 6.0.0-beta2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Gregorio (TeX Live) $as_me 5.2.1, which was
+It was created by Gregorio (TeX Live) $as_me 6.0.0-beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8043,7 +8043,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gregorio--tex-live-'
- VERSION='5.2.1'
+ VERSION='6.0.0-beta2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14463,7 +14463,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Gregorio (TeX Live) config.lt 5.2.1
+Gregorio (TeX Live) config.lt 6.0.0-beta2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16052,7 +16052,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Gregorio (TeX Live) $as_me 5.2.1, which was
+This file was extended by Gregorio (TeX Live) $as_me 6.0.0-beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16119,7 +16119,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Gregorio (TeX Live) config.status 5.2.1
+Gregorio (TeX Live) config.status 6.0.0-beta2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

texk/gregorio/configure.ac

@@ -1,7 +1,7 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright 2016 Karl Berry <tex-live@tug.org>
+dnl   Copyright 2016-2021 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder

texk/gregorio/gregorio-src/CHANGELOG.md

@@ -2,6 +2,43 @@
 All notable changes to this project will be documented in this file.
 As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/).
 
+## [Unreleased][develop]
+
+
+## [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).
+- `spacelinestext` is now based on the lyric font size instead of being a fixed distance.  As a result, large lyrics should no longer overlap with low notes.  See [#1261](https://github.com/gregorio-project/gregorio/issues/1261).
+- Added parenthesized figures for virgula (gabc: `` `?``), divisio minima (gabc: ` ,?`), flat (gabc: `x?`), natural (gabc: `y?`), and sharp (gabc: `#?`).  See [#1475](https://github.com/gregorio-project/gregorio/issues/1475).
+- Staff line thickness is now set in gsp-default.tex.  This corrects a problem with the staff lines changing thickness when the default spacing configuration is loaded while the staff size is something other than the default (17).  See [#1461](https://github.com/gregorio-project/gregorio/issues/1461).
+- Corrected interaction issues between text styles and ligatures.  The LaTeX commands like `\textit` insert italics correction, preventing ligatures being formed between their arguments if two occur sequentially.  On the other hand the switches like `\itshape` do not.  Since gregorio breaks up syllables around the vowel and then applies the formating commands to each part, this behavior showed up.  We switch to using the switches to avoid this (except for underlining, for which a switch does not exist).  We also fix this for color tags by loading `luacolor` which changes how the `\color` tag is implemented to allow ligatures to span groups.  See [#1444](https://github.com/gregorio-project/gregorio/issues/1444).
+- A reuse of a save register led to the `\hyphenpenalty` not being restored correctly at the end of the score.  All save registers are now clearly identified by when they are used so as to make it harder to accidentally use the wrong one.  See [posts on mailing list](https://groups.google.com/g/gregorio-users/c/u3LmnGYnhwU).
+- Fixed an overly specific find/replace in snippets that that led to `\par` being able to slip into the snippet file under certain circumstances (and there by causing compilation to fail).  See [#1497](https://github.com/gregorio-project/gregorio/issues/1497).
+- 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).
+- 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.  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
+- The space between a non-punctum inclinatum and the upright punctum inclinatum is renamed to uprightpunctuminclinatumshift.  This helps to better distinguish it from punctuminclinatumunisonshift (the space between two consecutive ascending or descending puncta inclinata on the same line).  See [#1507](https://github.com/gregorio-project/gregorio/issues/1507).
+- `noteadditionalspacelinestext` now calculates the actual amount of additional space needed by low notes.  To enable the old behavior (when `noteadditionalspacelinestext` is set by the user), use `\gresetnoteadditionalspacelinestext{manual}`.  See [#1521](https://github.com/gregorio-project/gregorio/issues/1521) and [#1526](https://github.com/gregorio-project/gregorio/pull/1526).
+
+### Removed
+- `\gresethyphenprotrusion{percentage}`, supplanted by `\gresetprotrusionfactor{eolhyphen}{factor}`.  Note that the value the new command takes is a factor rather than a percentage.
+
+
 ## [5.2.1] - 2019-04-06
 ### Fixed
 - Project names with quotes in them no longer cause GregorioTeX to not be able to find the executable.  See [#1416](https://github.com/gregorio-project/gregorio/issues/1416).

texk/gregorio/gregorio-src/COPYING.md

@@ -1,6 +1,6 @@
 #License of Gregorio
 
-The program Gregorio is Copyright (C) 2007-2019 The Gregorio Project,
+The program Gregorio is Copyright (C) 2007-2021 The Gregorio Project,
 see [CONTRIBUTORS.md](CONTRIBUTORS.md) for authors. It is distributed
 under the GPLv3 license, printed below.
 

texk/gregorio/gregorio-src/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

texk/gregorio/gregorio-src/README.md

@@ -10,7 +10,7 @@ Create a [LaTeX](http://en.wikipedia.org/wiki/LaTeX) file that will produce the
 
 Compile the LaTeX file with LuaLaTeX, you get your score in PDF! You can change the LaTeX file to include other scores, create booklets, books, etc.
 
-You can also try it online [here](http://dev.illuminarepublications.com/gregorio/).
+You can also try it online [here](http://dev.illuminarepublications.com/).
 
 ## Installation
 

texk/gregorio/gregorio-src/UPGRADE.md

@@ -4,8 +4,16 @@ This file contains instructions to upgrade to a new release of Gregorio.  These
 
 ## Unreleased
 
+### Upright punctum inclinatum
+
 Gregorio will now use an "upright" punctum inclinatum shape for a series of unison punctum inclinatum notes over a given syllable.  When there is a single punctum inclinatum, Gregorio will use a heuristic to choose a shape.  In any of these cases, if the result is not satisfactory, especially in context with nearby syllables, you may select a different shape by using `0` (for the descending shape) or `1` (for the ascending shape) after the capitalized letter indicating the punctum inclinatum.  Forced selection of the upright shape is also possible by using `2` after the capitalized letter indicating the punctum inclinatum.
 
+### GABC escape character
+
+In GABC text, the dollar sign (`$`) is now an "escape character" which prevents any special interpretation of the single character which follows the `$`.  This allows you to put things like parentheses in text (use `$(`), but it also prevents other special interpretation of the character that follows (e.g., `$:` prevents auto-protrusion for the colon and `$-` prevents hyphenation handling of the dash).  In order to send a `$` to TeX, use `$$` to escape the dollar sign.
+
+If you had used the `$` for some reason in your GABC text, this change will break your score.  You will need to change all `$` in your text to `$$` to retain the old behavior.
+
 ## 5.1
 
 No additional steps are needed to upgrade from 5.0 to 5.1.
@@ -285,7 +293,7 @@ The `gregorio` executable now uses the `.gtex` extension by default (instead of
 
 ### Custom spacings
 
-If you are using custom spacings, please update the values of `interwordspacetext`, `intersyllablespacenotes` and `interwordspacenotes` to match their new definitions (in the comments in `gsp-default.tex`). Also note that `alterationspace` is now fixed and cannot take `plus` or `minus` values.
+If you are using custom spacings, please update the values of `interwordspacetext`, `intersyllablespacenotes` and `interwordspacenotes` to match their new definitions (in the comments in `gsp-sample.tex`). Also note that `alterationspace` is now fixed and cannot take `plus` or `minus` values.
 
 ### Euouae blocks
 
@@ -447,7 +455,7 @@ In version 2.4.2, an early version of the feature to auto-compile gabc score was
 
 ### Custom dimension changes
 
-If you use custom space definitions (`gsp-foo.tex`), the format have changed, and you must rewrite it completely. See the new `gsp-default.tex` for an example, and GregorioRef.pdf for documentation.
+If you use custom space definitions (`gsp-foo.tex`), the format have changed, and you must rewrite it completely. See the new `gsp-sample.tex` for an example, and GregorioRef.pdf for documentation.
 
 ### Color definition
 

texk/gregorio/gregorio-src/VersionManager.py

@@ -5,7 +5,7 @@
 
     See VersionUpdate.py -h for help
 
-    Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
+    Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
 
     This file is part of Gregorio.
 
@@ -65,14 +65,15 @@
                   "tex/gregoriotex-nabc.lua",
                   "tex/gregoriosyms.sty",
                   "tex/gregoriotex-common.tex",
+                  "tex/gregoriotex-gsp-default.tex",
                   "fonts/squarize.py",
                  ]
 COPYRIGHT_FILES = ["install-gtex.sh",
                    "build-ctan.sh",
                    "ctan_upload.sh",
                    "tex/gregoriotex-signs.tex",
                    "tex/gregorio-vowels.dat",
-                   "tex/gsp-default.tex",
+                   "tex/gregoriotex-gsp-default.tex",
                    "tex/gregoriotex-nabc.lua",
                    "tex/gregoriotex-symbols.lua",
                    "tex/gregoriotex-chars.tex",
@@ -109,6 +110,7 @@
                    "doc/Gabc.tex",
                    "doc/GregorioRef.lua",
                    "doc/Appendix_Font_Tables.tex",
+                   "doc/gsp-sample.tex",
                    "VersionManager.py",
                    "coverage.sh",
                    "COPYING.md",

texk/gregorio/gregorio-src/configure.ac

@@ -1,5 +1,5 @@
 dnl Gregorio
-dnl Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+dnl Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 dnl
 dnl This file is part of Gregorio.
 dnl
@@ -16,8 +16,8 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gregorio],[5.2.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_2_1"
+AC_INIT([gregorio],[6.0.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="6_0_0-beta2"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""

texk/gregorio/gregorio-src/contrib/900_gregorio.xml

@@ -3,7 +3,7 @@
  XML file for using gregorio inside scribus.
  Copyright (C) 2009 Pierre Couderc <pierre@couderc.eu>.
  Copyright (C) 2010 Elie Roux <elie.roux@telecom-bretagne.eu>
- Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -36,22 +36,19 @@
     </empty-frame-text>
     <!-- you can change the basic headers here -->
     <preamble>
-		    \documentclass[$scribus_grefontsize$]{extarticle}
-		    \usepackage[paperwidth=$scribus_realwidth$ pt,
-		                paperheight=$scribus_realheight$ pt,
-          					left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
+        \documentclass[$scribus_grefontsize$]{extarticle}
+		\usepackage[paperwidth=$scribus_realwidth$ pt, paperheight=$scribus_realheight$ pt,	left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
         \usepackage[autocompile]{gregoriotex}
-        \usepackage{filecontents}
-    		\title{Scribus-Latex-File}
-    		$scribus_additionalgreheaders$
-    		\author{Scribus}
-		    \pagestyle{empty}
-    		\setlength{\textwidth}{$scribus_realwidth$ pt}
+        \title{Scribus-Latex-File}
+    	$scribus_additionalgreheaders$
+    	\author{Scribus}
+		\pagestyle{empty}
+    	\setlength{\textwidth}{$scribus_realwidth$ pt}
 
-        \begin{filecontents}{scribus_file-score.gabc}
-    </preamble>
+        \begin{filecontents*}[overwrite]{scribus_file-score.gabc}
+</preamble> <!-- this line's indentation is purposefully off because of the way that scribus interprets the preamble section -->
     <postamble>
-        \end{filecontents}
+        \end{filecontents*}
 
         \begin{document}
         $scribus_greconf$

texk/gregorio/gregorio-src/contrib/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

texk/gregorio/gregorio-src/contrib/checkSyllabation.py

@@ -5,7 +5,7 @@
 
     See checkSyllabation.py -h for help
 
-    Copyright (C) 2016-2019 Elie Roux
+    Copyright (C) 2016-2021 Elie Roux
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of
     this software and associated documentation files (the "Software"), to deal in

texk/gregorio/gregorio-src/contrib/gabc.lang

@@ -2,7 +2,7 @@
 <!--
 
  Author: Elie Roux <elie.roux@telecom-bretagne.fr>
- Copyright (C) 2008-2019 Elie Roux <elie.roux@telecom-bretagne.fr>
+ Copyright (C) 2008-2021 Elie Roux <elie.roux@telecom-bretagne.fr>
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

texk/gregorio/gregorio-src/contrib/gabc.vim

@@ -12,11 +12,13 @@ syn match gabcAttributeEnd ";"
 syn match gabcNoteError "." contained
 syn match gabcBasicNote "[a-np]" contained
 syn match gabcBasicNote "[A-NP][012]\?" contained
-syn match gabcNoteShape "[\<\>~xy#vVwWqQR\-Ss\.+]" contained
+syn match gabcNoteShape "[\<\>~vVwWqQR\-Ss\.+]" contained
+syn match gabcNoteShape "[xy#]?\?" contained
 syn match gabcNoteShape "_[0-5]*" contained
 syn match gabcNoteShape "[oO'\.][01]\?" contained
 syn match gabcNoteShape "r[0-8]\?" contained
 syn match gabcClef "[cf]b\?[1-5]" contained
+syn match gabcTextMarkup "$." contained
 syn match gabcTextMarkup "</\?e>" contained
 syn match gabcTextMarkup "</\?b>" contained
 syn match gabcTextMarkup "</\?i>" contained
@@ -32,13 +34,15 @@ syn match gabcFuseEnd "\]" contained
 syn match gabcBar ":?\?" contained
 syn match gabcBar ";[1-8]\?" contained
 syn match gabcBar ",[0-8]\?" contained
-syn match gabcBar "[`^]0\?" contained
+syn match gabcBar "[,`]?\?0\?" contained
+syn match gabcBar "[,`]0?" contained
+syn match gabcBar "\^0\?" contained
 syn match gabcSpace "[! ]" contained
 syn match gabcSpace "/0\?" contained
 syn match gabcSpace "z[-+0]\?" contained
 syn match gabcSpace "Z[-+]\?" contained
 syn match gabcSpace "/\[[^\]]*\]" contained extend
-syn match gabcCommand "@\@<!\[[^\]]*\]" contained extend
+syn match gabcCommand "@\@<!\[\($.\|[^\]]\)*\]" contained extend
 syn match gabcCommand "[{}]" contained extend
 syn match gabcBracket "\[\[" contained
 syn match gabcBracket "\]\]" contained