import gregorio-6.1.0

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

texk/README

@@ -67,7 +67,7 @@ dvisvgm 3.4.3 - checked 11jan25
   https://github.com/mgieseki/dvisvgm
   https://ctan.org/pkg/dvisvgm
 
-gregorio 6.1.0beta2 - checked 18feb25
+gregorio 6.1.0 - checked 28feb25
   https://mirror.ctan.org/support/gregoriotex/
 
 gsftopk - from Paul Vojta's xdvi.

texk/gregorio/ChangeLog

@@ -1,3 +1,8 @@
+2025-02-28  Karl Berry  <karl@freefriends.org>
+
+	* Import gregorio-6.1.0.zip.
+	* version.ac: updated.
+
 2025-02-18  Karl Berry  <karl@freefriends.org>
 
 	* Import gregorio-6.1.0-beta2.zip.

texk/gregorio/TLpatches/TL-Changes

@@ -1,11 +1,11 @@
 Changes applied to the gregorio source tree as obtained from:
-	https://mirrors.ctan.org/support/gregoriotex/gregorio-6.1.0-beta1.zip
+	https://mirrors.ctan.org/support/gregoriotex/gregorio-6.1.0.zip
 
-Update ./version.ac.
+Update ./version.ac to $VER.
 mv gregorio-src gregorio-prev
-zip=`ls ~/tmp/gregorio*zip`
+zip=`ls /tmp/gregorio*zip`
 zipinfo -1 $zip # normally unpacks into gregorio-VERSION
-unzip -q ...
+unzip -q $zip   # if all in a subdir
 mv gregorio-[6789]* gregorio-src
 cd gregorio-src
 

texk/gregorio/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for Gregorio (TeX Live) 6.1.0-beta2.
+# Generated by GNU Autoconf 2.72 for Gregorio (TeX Live) 6.1.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Gregorio (TeX Live)'
 PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='6.1.0-beta2'
-PACKAGE_STRING='Gregorio (TeX Live) 6.1.0-beta2'
+PACKAGE_VERSION='6.1.0'
+PACKAGE_STRING='Gregorio (TeX Live) 6.1.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL='http://gregorio-project.github.io/'
 
@@ -1367,7 +1367,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) 6.1.0-beta2 to adapt to many kinds of systems.
+'configure' configures Gregorio (TeX Live) 6.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1439,7 +1439,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.1.0-beta2:";;
+     short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1560,7 +1560,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Gregorio (TeX Live) configure 6.1.0-beta2
+Gregorio (TeX Live) configure 6.1.0
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2341,7 +2341,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 6.1.0-beta2, which was
+It was created by Gregorio (TeX Live) $as_me 6.1.0, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -9234,7 +9234,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gregorio--tex-live-'
- VERSION='6.1.0-beta2'
+ VERSION='6.1.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16585,7 +16585,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Gregorio (TeX Live) config.lt 6.1.0-beta2
+Gregorio (TeX Live) config.lt 6.1.0
 configured by $0, generated by GNU Autoconf 2.72.
 
 Copyright (C) 2024 Free Software Foundation, Inc.
@@ -18216,7 +18216,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 6.1.0-beta2, which was
+This file was extended by Gregorio (TeX Live) $as_me 6.1.0, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18285,7 +18285,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Gregorio (TeX Live) config.status 6.1.0-beta2
+Gregorio (TeX Live) config.status 6.1.0
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

texk/gregorio/gregorio-src/.gregorio-version

@@ -1,4 +1,4 @@
-6.1.0-beta2
+6.1.0
 2025
 
 *** Do not modify this file. ***

texk/gregorio/gregorio-src/CHANGELOG.md

@@ -2,13 +2,7 @@
 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.1.0-beta2] - 2025-02-17
+## [6.1.0] - 2025-02-28
 ### Fixed
 - Multiple Scribus render frames were all using the same file name, which would result in the same score appearing in all render frames.  This change makes the score files use an available Scribus variable to force multiple file names.
 - When kpsewhich cannot write to a particular location, it generates an error which is directed to stderr but not to our glog file.  This created an undocumented error when trying to write to a gtex file to a bad location.  We now capture stderr output produced when compiling scores and redirect it to our glog file so that the error is properly recorded.  Fixes [#1541](https://github.com/gregorio-project/gregorio/issues/1541).
@@ -20,12 +14,14 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - When fancyhdr and GregorioTeX are used together, GregorioTeX's disabling of hyphenation and its `post_linebreak` modification of the `post_linebreak_filter` interfere with multiline headers.  Using the `fancyhdr/before` and `fancyhdr/after` hooks we temporarily reenable hyphenation and disable our `post_linebreak` modification while headers and footers are being processed in the middle of a score.  See [#1603](https://github.com/gregorio-project/gregorio/issues/1603).
 - Fixed a bug that could cause a hyphen to appear on the wrong line. See [#1319](https://github.com/gregorio-project/gregorio/issues/1319).
 - Fixed the placement of above-lines text (`<alt>`) relative to a note above the staff or when the number of staff lines is not 4. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613) and [#1614](https://github.com/gregorio-project/gregorio/issues/1614).
-- Fixed a bug where the above-lines text (`<alt>`) could collid with a note above the staff. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613).
+- Fixed a bug where the above-lines text (`<alt>`) could collide with a note above the staff. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613).
 - Fixed a bug that could cause the clef and staff to be printed too high. See [#1503](https://github.com/gregorio-project/gregorio/issues/1503).
 
 ### Changed
-- Modified gregorio to append to the log file specified as an argument and to send early messages to it.  See [#1541](https://github.com/gregorio-project/gregorio/issues/1541).
+- Modified gregorio to write to the log file specified as an argument and to send all messages to it (except errors about opening the log file itself).  See [#1541](https://github.com/gregorio-project/gregorio/issues/1541) and [#1628](https://github.com/gregorio-project/gregorio/issues/1628).
 - Defined an output directory for gtex and glog files.  Default is `tmp-gre`.  This can be changed using `\gresetoutputdir{...}`.  Fixes [#1393](https://github.com/gregorio-project/gregorio/issues/1393), [#1542](https://github.com/gregorio-project/gregorio/issues/1542), and [#1571](https://github.com/gregorio-project/gregorio/issues/1571).
+- GregorioTeX no longer searches for and reuses existing gtex files using kpathsea; it only looks in the output directory.
+- If gtex or glog files from other versions of gregorio are found either in the same directory as the gabc file or in the output directory, they are deleted.
 - gabc.vim has been expanded into a proper vim plugin.
 
 ### Added

texk/gregorio/gregorio-src/CONTRIBUTING.md

@@ -69,11 +69,11 @@ TeX code must use LuaTeX (more than TeX + eTeX + Omega + PDFTeX) primitives as m
 
 Before submitting a change, please run the tests in [gregorio-test](gregorio-project/gregorio-test) against your resulting code.
 
-When your changes are significant, please provide a test demonstrating the change. See [test documentation](https://github.com/gregorio-project/gregorio-test/blob/master/README.md).
+When your changes are significant, please provide a test demonstrating the change. See [test documentation](https://github.com/gregorio-project/gregorio-test/blob/master/README.md) for more information on how the test repository is organized and used.
 
 If your change breaks some of the existing tests, then please either fix the existing tests or propose the new results be accepted as more "correct" than the old ones.
 
-If you are submitting a new or modified test, please create a new branch in the test repository (preferably with a name which matches the name of the branch your changes are on in the main repository) where you can make these changes.  Then create a pull request in the test repository which explains your changes and make sure to reference the corresponding pull request in the main repository.  This way those reveiwing your changes can also see what you expect the new test results to be.
+If you are submitting a new or modified test, please create a new branch in the test repository (preferably with a name which matches the name of the branch your changes are on in the main repository) where you can make these changes.  Please make separate commits showing both the before and after behavior of the test(s).  Then create a pull request in the test repository which explains your changes and make sure to reference the corresponding pull request in the main repository.  This way those reveiwing your changes can also see what you expect the new test results to be.
 
 ### Documentation
 
@@ -86,7 +86,18 @@ You must also document it in the right places:
 
 ### Git Workflow
 
-The Gregorio team is following the [classical Github workflow](https://guides.github.com/introduction/flow/). More precisely it follows what is sometimes described as "[Gitflow Worflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)", keeping the same branch naming convention.
+The Gregorio team is following the [classical Github workflow](https://guides.github.com/introduction/flow/). More precisely it follows what is sometimes described as "[Gitflow Worflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)", with some minor modifications to account for the release constraints of TeX Live.  Our longterm branches are as follows:
+
+1. `master`
+This branch contains the current stable release.  No commits should be made directly to this branch, only merges from a release or hotfix branch (see below).
+2. `ctan`
+This branch is a development branch used for changes which are compatible with the executable that has been uploaded to CTAN (and is present in the current year's TeX Live).  Pull requests for bugfixes and features which do not affect the executable (and which do not require a major version change) should be made against this branch.  Releases from this branch can be made at any time.
+3. `develop`
+This is the primary development branch for significant changes to the package.  All changes to the executable are automatically considered significant, even if they are only a bugfix.  Releases from this branch can only be made during the TeX Live pretest (generally during February each year).
+
+We also reserve short-term branch names of the patterns `release-vx.y` and `hotfix-vx.y.z`.  Names of this sort are reserved for preparing releases.  Only PRs for blocking bugs should be submitted against these branches.
+
+Individual bugfixes and features should be developed on their own branch and then a PR submitted in the main repository against the appropriate branch.  New contributors should fork the repository on GitHub under your own username and use branches created there to create PRs against the main repository.  If you don't have a GitHub account (they are free) and don't want to create one, you can submit a patch file to the developers' mailing list: gregorio-devel@googlegroups.com.
 
 ### Make a pull request
 
@@ -95,5 +106,5 @@ Once you are ready to contribute code:
  * fork the repository and checkout your fork
  * create a new branch for the pull request you want to make
  * commit your changes to this new branch
- * make a pull request from this new branch to the relevant branch (usually `develop`)
+ * make a pull request from this new branch to the relevant branch (see above)
  * the Gregorio developers will inspect and comment your pull request, and finally merge it (or not)

texk/gregorio/gregorio-src/Makefile.am

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = src examples tex contrib fonts doc
+SUBDIRS = src examples tex contrib fonts doc macosx
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -25,22 +25,26 @@ EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS.md \
 
 MAINTAINERCLEANFILES = gregoriotex.ctan.zip
 
+VERSION := $(shell ./VersionManager.py --get-current)
+TOP := $(shell pwd)
+export TOP
+
 export TOP_LEVEL_MAKE = true
 
 gregorio:
-	make -C src all
+	$(MAKE) -C src all
 
 fonts: make-fonts
 make-fonts:
-	make -C fonts fonts
+	$(MAKE) -C fonts fonts
 
 clean-fonts:
-	make -C fonts clean-fonts
+	$(MAKE) -C fonts clean-fonts
 
 doc: pdf
 clean-pdf: clean-doc
 clean-doc:
-	make -C doc clean-doc
+	$(MAKE) -C doc clean-doc
 
 gregoriotex.tds.zip: dist-zip install-gtex.sh
 	./install-gtex.sh tds
@@ -50,3 +54,14 @@ ctan: gregoriotex.tds.zip build-ctan.sh
 
 dist-hook:
 	rm -rf $(distdir)/windows
+
+if MACOSX
+dist-macosx: gregorio doc fonts
+	$(MAKE) -C macosx dist-macosx
+else
+dist-macosx:
+	@echo "macOS packages can only be built on Mac systems."
+endif
+
+clean-macosx:
+	$(MAKE) -C macosx clean-local

texk/gregorio/gregorio-src/UPGRADE.md

@@ -2,9 +2,13 @@
 
 This file contains instructions to upgrade to a new release of Gregorio.  These instructions are cumulative; meaning that you should apply the instructions from all versions between the one you are upgrading from and the current version.
 
-## [Unreleased][develop]
+## 6.1
 
-Initial letters that are 2 lines high used to require manual linebreaks (`z`), but no longer do. The alignment of 2-line initial letters has changed slightly and may need to be adjusted.
+### Multiline initials
+
+Initial letters that are 2 lines high used to require manual linebreaks (`z`), but no longer do. The alignment of 2-line initial letters has changed slightly and may need to be adjusted.  Further, initials can now span over an arbitrary number of lines.
+
+### Soft alterations
 
 GABC now has some new alterations: soft flat (`X`) and sharp (`##`), which appear when there is no previous flat or sharp (respectively) in effect, and soft natural (`Y`), which appears when there is a previous flat or sharp in effect. A new option `\gresetalterationeffect` determines what the "effect" of an alteration is. It defaults to `line`, meaning that an alteration's effect extends to the end of the line. Thus, for Dominican chant, type a soft flat (`X`) in front of _every_ note that is to be sung a half-step flat; naturals should also be soft (`Y`), but only naturals that cancel flats need to be typed.
 

texk/gregorio/gregorio-src/VersionManager.py

@@ -87,6 +87,9 @@
                    "tex/gregoriotex-signs.lua",
                    "tex/gregoriotex-symbols.tex",
                    "contrib/TeXShop/Makefile.am",
+                   "contrib/vim/Makefile.am",
+                   "contrib/vim/ftdetect/Makefile.am",
+                   "contrib/vim/syntax/Makefile.am",
                    "contrib/900_gregorio.xml",
                    "contrib/Makefile.am",
                    "contrib/gabc.lang",
@@ -165,6 +168,7 @@
                    "windows/gregorio.iss",
                    "windows/install.lua",
                    "windows/uninstall.lua",
+                   "macosx/Makefile.am",
                   ]
 
 def strtobool(val):

texk/gregorio/gregorio-src/build.sh

@@ -13,7 +13,13 @@
 #      --jobs=     : the number of jobs to run simultaneously in the make step
 #      --force=    : force autoreconf
 #      {other)     : anything else is passed to configure verbatim
-
+
+# Before we do anything we make sure our working directory is the top level of the
+# repository (where this script is located).  This allows us to call this script from
+# other folders and still have it work.
+cd "${0%/*}"
+
+
 # try to find bash, in case the standard shell is not capable of
 # handling the generated configure's += variable assignments
 if which bash >/dev/null
@@ -33,7 +39,7 @@ then
   export MAKE
   echo "You have a GNU-make installed as gmake; I will use that"
 else
-  echo "I can't find a GNU-make; I'll try to use make and hope that works." 
+  echo "I can't find a GNU-make; I'll try to use make and hope that works."
   echo "If it doesn't, please install GNU-make."
 fi
 
@@ -67,22 +73,29 @@ if [ "$MINGWCROSS" = "TRUE" ]
 then
   MINGWBUILD=$HOSTTYPE-$OSTYPE
   MINGWSTR=mingw32
+  PREFIX=/usr/
   if [ -d /usr/mingw32 ]; then
     MINGWSTR=mingw32
+    PREFIX=/usr/
   elif [ -d /usr/i386-mingw32msvc ]; then
-      MINGWSTR=i386-mingw32msvc
+    MINGWSTR=i386-mingw32msvc
+    PREFIX=/usr/
   elif [ -d /usr/i586-mingw32msvc ]; then
-        MINGWSTR=i586-mingw32msvc
+    MINGWSTR=i586-mingw32msvc
+    PREFIX=/usr/
+  elif [ -d /opt/local/i686-w64-mingw32 ]; then
+    MINGWSTR=i686-w64-mingw32
+    PREFIX=/opt/local/
   fi
   OLDPATH=$PATH
   PATH=/usr/$MINGWSTR/bin:$PATH
   CFLAGS="-mtune=pentiumpro -msse2 -g -O2 $CFLAGS"
-  LDFLAGS="-Wl,--large-address-aware $CFLAGS"
+  LDFLAGS="-static -Wl,--large-address-aware $CFLAGS"
   ARCHFLAGS="--target=\"$MINGWSTR\" \
     --with-gnu-ld \
     --host=$MINGWSTR \
     --build=$MINGWBUILD \
-    --prefix=/usr/$MINGWSTR"
+    --prefix=$PREFIX$MINGWSTR"
 elif [ "$MACCROSS" = "TRUE" ]
 then
   # make sure that architecture parameter is valid
@@ -92,7 +105,7 @@ then
   esac
   ARCHFLAGS="$ARCHFLAGS"
   CFLAGS="-arch $ARCH -g -O2 $CFLAGS"
-  LDFLAGS="-arch $ARCH $LDFLAGS" 
+  LDFLAGS="-arch $ARCH $LDFLAGS"
 fi