texlive[74361] Build/source/texk: import gregorio-6.1.0
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 1 00:31:40 CET 2025
Revision: 74361
https://tug.org/svn/texlive?view=revision&revision=74361
Author: karl
Date: 2025-03-01 00:31:39 +0100 (Sat, 01 Mar 2025)
Log Message:
-----------
import gregorio-6.1.0
Modified Paths:
--------------
trunk/Build/source/texk/README
trunk/Build/source/texk/gregorio/ChangeLog
trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
trunk/Build/source/texk/gregorio/configure
trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version
trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py
trunk/Build/source/texk/gregorio/gregorio-src/build.sh
trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/ftdetect/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/syntax/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/examples/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/fonts/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-hole.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-hollow.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-op-hole.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-op-hollow.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-op.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/gregall.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/grelaon.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/gresgmodern.ttf
trunk/Build/source/texk/gregorio/gregorio-src/fonts/squarize.py
trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
trunk/Build/source/texk/gregorio/gregorio-src/tex/Makefile.in
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriosyms.sty
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-chars.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-common.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-gsp-default.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-main.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.lua
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.lua
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-spaces.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-syllable.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.lua
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.tex
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.lua
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.sty
trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.tex
trunk/Build/source/texk/gregorio/version.ac
Added Paths:
-----------
trunk/Build/source/texk/gregorio/gregorio-src/macosx/
trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.in
Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/README 2025-02-28 23:31:39 UTC (rev 74361)
@@ -67,7 +67,7 @@
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.
Modified: trunk/Build/source/texk/gregorio/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/ChangeLog 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/ChangeLog 2025-02-28 23:31:39 UTC (rev 74361)
@@ -1,3 +1,8 @@
+2025-02-28 Karl Berry <karl at freefriends.org>
+
+ * Import gregorio-6.1.0.zip.
+ * version.ac: updated.
+
2025-02-18 Karl Berry <karl at freefriends.org>
* Import gregorio-6.1.0-beta2.zip.
Modified: trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/TL-Changes 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/TLpatches/TL-Changes 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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
Modified: trunk/Build/source/texk/gregorio/configure
===================================================================
--- trunk/Build/source/texk/gregorio/configure 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/configure 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 at tug.org>.
#
@@ -614,8 +614,8 @@
# 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 at tug.org'
PACKAGE_URL='http://gregorio-project.github.io/'
@@ -1367,7 +1367,7 @@
# 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 @@
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 @@
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 @@
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 @@
# 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 @@
Report bugs to <bug-libtool at 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 @@
# 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 @@
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\\"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version 2025-02-28 23:31:39 UTC (rev 74361)
@@ -1,4 +1,4 @@
-6.1.0-beta2
+6.1.0
2025
*** Do not modify this file. ***
Modified: trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 @@
- 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
Modified: trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md 2025-02-28 23:31:39 UTC (rev 74361)
@@ -69,11 +69,11 @@
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,8 +86,19 @@
### 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 at googlegroups.com.
+
### Make a pull request
Once you are ready to contribute code:
@@ -95,5 +106,5 @@
* 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)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 @@
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 @@
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
Modified: trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md 2025-02-28 23:31:39 UTC (rev 74361)
@@ -2,10 +2,14 @@
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.
## 6.0
Modified: trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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):
Modified: trunk/Build/source/texk/gregorio/gregorio-src/build.sh
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/build.sh 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/build.sh 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 @@
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 @@
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 @@
esac
ARCHFLAGS="$ARCHFLAGS"
CFLAGS="-arch $ARCH -g -O2 $CFLAGS"
- LDFLAGS="-arch $ARCH $LDFLAGS"
+ LDFLAGS="-arch $ARCH $LDFLAGS"
fi
Modified: trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2025-02-28 23:31:39 UTC (rev 74361)
@@ -16,8 +16,8 @@
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],[6.1.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="6_1_0-beta2"
+AC_INIT([gregorio],[6.1.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="6_1_0"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
@@ -58,8 +58,6 @@
AX_CHECK_LINK_FLAG([-fPIE], [LDFLAGS+=" -fPIE"])
AX_CHECK_LINK_FLAG([-pie], [LDFLAGS+=" -pie"])
-AC_HEADER_STDC
-
gl_FUNC_REALPATH_WORKS
dnl linux has integer types in stdint.h, solaris, vms in inttypes.h
@@ -116,6 +114,34 @@
])
AC_SUBST(GREGORIO_EXE_SUFFIX)
+# AC_CANONICAL_HOST is needed to access the 'host_os' variable
+AC_CANONICAL_HOST
+
+build_linux=no
+build_windows=no
+build_mac=no
+
+# Detect the target system
+case "${host_os}" in
+ linux*)
+ build_linux=yes
+ ;;
+ cygwin*|mingw*)
+ build_windows=yes
+ ;;
+ darwin*)
+ build_mac=yes
+ ;;
+ *)
+ AC_MSG_ERROR(["OS $host_os is not supported"])
+ ;;
+esac
+
+# Pass the conditionals to automake
+AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
+AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
+AM_CONDITIONAL([MACOSX], [test "$build_mac" = "yes"])
+
AC_CONFIG_HEADERS([src/config_.h])
AC_CONFIG_FILES([
Makefile
@@ -129,5 +155,6 @@
doc/Makefile
tex/Makefile
fonts/Makefile
+ macosx/Makefile
])
AC_OUTPUT
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -219,12 +219,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/ftdetect/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/ftdetect/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/ftdetect/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -161,12 +161,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/syntax/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/syntax/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/vim/syntax/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -161,12 +161,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -183,7 +183,7 @@
\vspace{1cm}
- \large Version \textbf{6.1.0-beta2}, 17 February 2025 %% PARSE_VERSION_DATE
+ \large Version \textbf{6.1.0}, 28 February 2025 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\gresetlinecolor{gregoriocolor}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -161,12 +161,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/examples/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/examples/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/examples/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -161,12 +161,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/fonts/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/fonts/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -161,12 +161,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-hole.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-hollow.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-op-hole.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-op-hollow.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae-op.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/greciliae.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/gregall.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/grelaon.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/gresgmodern.ttf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/fonts/squarize.py
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/fonts/squarize.py 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/fonts/squarize.py 2025-02-28 23:31:39 UTC (rev 74361)
@@ -89,7 +89,7 @@
14 : 'Fourteen',
}
-GREGORIO_VERSION = '6.1.0-beta2'
+GREGORIO_VERSION = '6.1.0'
# The unicode character at which we start our numbering:
# U+E000 is the start of the BMP Private Use Area
Modified: trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh 2025-02-28 23:31:39 UTC (rev 74361)
@@ -65,6 +65,11 @@
# uninstall script generation and any existing uninstall script will be left
# alone.
+# 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 specify the files to be
+# installed by their relative locations in the repository.
+cd "${0%/*}"
+
VERSION=`head -1 .gregorio-version`
FILEVERSION=`echo $VERSION | sed 's/\./_/g'`
Added: trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.am (rev 0)
+++ trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.am 2025-02-28 23:31:39 UTC (rev 74361)
@@ -0,0 +1,85 @@
+# Copyright (C) 2006-2025 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/>.
+
+MACOSX_TOP := $(shell pwd)
+MACOSX_BUILD := $(MACOSX_TOP)/build
+MACOSX_RESOURCES := $(MACOSX_TOP)/Resources
+HTMLPREFIX := "https://github.com/gregorio-project/gregorio/blob/v"$(VERSION)"/"
+
+$(MACOSX_BUILD) :
+ mkdir -p $(MACOSX_BUILD)
+
+Gregorio : $(MACOSX_BUILD)
+ mkdir -p $(MACOSX_BUILD)/Gregorio
+ cp $(TOP)/*.md $(MACOSX_BUILD)/Gregorio
+
+$(MACOSX_RESOURCES) :
+ mkdir -p $(MACOSX_RESOURCES)
+
+Resources/COPYING.html : $(MACOSX_RESOURCES)
+ pandoc -s $(TOP)/COPYING.md -f markdown -t html --metadata title="COPYING" -o $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|(href=.)([A-Z]+.md.)|\1$(HTMLPREFIX)\2|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|\(C\)|\©|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|©|\©|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|--|\—|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|“|\“|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|”|\”|g" $(MACOSX_RESOURCES)/COPYING.html
+
+Resources/README.html : $(MACOSX_RESOURCES)
+ pandoc -s $(TOP)/README.md -f markdown -t html --metadata title="README" -o $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|(href=.)([A-Z]+.md.)|\1$(HTMLPREFIX)\2|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|\(C\)|\©|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|©|\©|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|--|\—|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|“|\“|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|”|\”|g" $(MACOSX_RESOURCES)/README.html
+
+resources : Resources/COPYING.html Resources/README.html
+
+examples : Gregorio
+ mkdir -p $(MACOSX_BUILD)/Gregorio/examples
+ cp $(TOP)/examples/*.tex $(MACOSX_BUILD)/Gregorio/examples/
+ cp $(TOP)/examples/*.gabc $(MACOSX_BUILD)/Gregorio/examples/
+
+mac-doc : Gregorio
+ mkdir -p $(MACOSX_BUILD)/Gregorio/doc
+ cp $(TOP)/doc/*.tex $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/*.lua $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/*.gabc $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/*.pdf $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/doc_README.md $(MACOSX_BUILD)/Gregorio/doc/
+ cp -r $(TOP)/contrib/ $(MACOSX_BUILD)/Gregorio/contrib
+ find $(MACOSX_BUILD)/Gregorio/contrib -name 'Makefile*' -delete
+
+payload : $(MACOSX_BUILD) mac-doc examples
+ $(MAKE) -C .. DESTDIR=$(MACOSX_BUILD) install
+ AUTO_UNINSTALL=true $(TOP)/install-gtex.sh dir:$(MACOSX_BUILD)/tmp/gregorio
+ rm $(MACOSX_BUILD)/tmp/gregorio/fonts/source/gregoriotex/gregorio-base.sfd
+ rm $(MACOSX_BUILD)/tmp/gregorio/fonts/source/gregoriotex/granapadano-base.sfd
+
+%.pkg : %.pkgproj payload resources
+ packagesbuild $<
+ mv $(MACOSX_BUILD)/$@ $(MACOSX_TOP)
+
+dist-macosx : Gregorio.pkg Uninstall-Gregorio.pkg
+ mv Gregorio.pkg Gregorio-$(VERSION).pkg
+ mv Uninstall-Gregorio.pkg Uninstall-Gregorio-$(VERSION).pkg
+
+clean-local :
+ rm -rf $(MACOSX_BUILD)
+ rm -rf $(MACOSX_RESOURCES)
+ rm -f *.pkg
Property changes on: trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.in (rev 0)
+++ trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -0,0 +1,521 @@
+# Makefile.in generated by automake 1.17 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (C) 2006-2025 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/>.
+VPATH = @srcdir@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = macosx
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
+ $(top_srcdir)/m4/ax_check_link_flag.m4 \
+ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/nocrash.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config_.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FILENAME_VERSION = @FILENAME_VERSION@
+GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KPSE_CFLAGS = @KPSE_CFLAGS@
+KPSE_LIBS = @KPSE_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MK = @MK@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RC = @RC@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
+am__tar = @am__tar@
+am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MACOSX_TOP := $(shell pwd)
+MACOSX_BUILD := $(MACOSX_TOP)/build
+MACOSX_RESOURCES := $(MACOSX_TOP)/Resources
+HTMLPREFIX := "https://github.com/gregorio-project/gregorio/blob/v"$(VERSION)"/"
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign macosx/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign macosx/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-local \
+ cscopelist-am ctags-am distclean distclean-generic distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+$(MACOSX_BUILD) :
+ mkdir -p $(MACOSX_BUILD)
+
+Gregorio : $(MACOSX_BUILD)
+ mkdir -p $(MACOSX_BUILD)/Gregorio
+ cp $(TOP)/*.md $(MACOSX_BUILD)/Gregorio
+
+$(MACOSX_RESOURCES) :
+ mkdir -p $(MACOSX_RESOURCES)
+
+Resources/COPYING.html : $(MACOSX_RESOURCES)
+ pandoc -s $(TOP)/COPYING.md -f markdown -t html --metadata title="COPYING" -o $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|(href=.)([A-Z]+.md.)|\1$(HTMLPREFIX)\2|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|\(C\)|\©|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|©|\©|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|--|\—|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|“|\“|g" $(MACOSX_RESOURCES)/COPYING.html
+ sed -i -E "s|”|\”|g" $(MACOSX_RESOURCES)/COPYING.html
+
+Resources/README.html : $(MACOSX_RESOURCES)
+ pandoc -s $(TOP)/README.md -f markdown -t html --metadata title="README" -o $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|(href=.)([A-Z]+.md.)|\1$(HTMLPREFIX)\2|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|\(C\)|\©|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|©|\©|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|--|\—|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|“|\“|g" $(MACOSX_RESOURCES)/README.html
+ sed -i -E "s|”|\”|g" $(MACOSX_RESOURCES)/README.html
+
+resources : Resources/COPYING.html Resources/README.html
+
+examples : Gregorio
+ mkdir -p $(MACOSX_BUILD)/Gregorio/examples
+ cp $(TOP)/examples/*.tex $(MACOSX_BUILD)/Gregorio/examples/
+ cp $(TOP)/examples/*.gabc $(MACOSX_BUILD)/Gregorio/examples/
+
+mac-doc : Gregorio
+ mkdir -p $(MACOSX_BUILD)/Gregorio/doc
+ cp $(TOP)/doc/*.tex $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/*.lua $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/*.gabc $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/*.pdf $(MACOSX_BUILD)/Gregorio/doc/
+ cp $(TOP)/doc/doc_README.md $(MACOSX_BUILD)/Gregorio/doc/
+ cp -r $(TOP)/contrib/ $(MACOSX_BUILD)/Gregorio/contrib
+ find $(MACOSX_BUILD)/Gregorio/contrib -name 'Makefile*' -delete
+
+payload : $(MACOSX_BUILD) mac-doc examples
+ $(MAKE) -C .. DESTDIR=$(MACOSX_BUILD) install
+ AUTO_UNINSTALL=true $(TOP)/install-gtex.sh dir:$(MACOSX_BUILD)/tmp/gregorio
+ rm $(MACOSX_BUILD)/tmp/gregorio/fonts/source/gregoriotex/gregorio-base.sfd
+ rm $(MACOSX_BUILD)/tmp/gregorio/fonts/source/gregoriotex/granapadano-base.sfd
+
+%.pkg : %.pkgproj payload resources
+ packagesbuild $<
+ mv $(MACOSX_BUILD)/$@ $(MACOSX_TOP)
+
+dist-macosx : Gregorio.pkg Uninstall-Gregorio.pkg
+ mv Gregorio.pkg Gregorio-$(VERSION).pkg
+ mv Uninstall-Gregorio.pkg Uninstall-Gregorio-$(VERSION).pkg
+
+clean-local :
+ rm -rf $(MACOSX_BUILD)
+ rm -rf $(MACOSX_RESOURCES)
+ rm -f *.pkg
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Property changes on: trunk/Build/source/texk/gregorio/gregorio-src/macosx/Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c 2025-02-28 23:31:39 UTC (rev 74361)
@@ -375,12 +375,20 @@
if (error_file_name) {
gregorio_check_file_access(write, error_file_name, ERROR,
gregorio_exit(1));
- error_file = freopen(error_file_name, "a", stderr);
+ /* First test if we can open error_file_name for writing, so
+ that if there is an error, we can still write the message
+ to stderr. */
+ error_file = fopen(error_file_name, "w");
if (!error_file) {
fprintf(stderr, "error: can't open file %s for writing\n",
error_file_name);
gregorio_exit(1);
}
+ fclose(error_file);
+ error_file = freopen(error_file_name, "w", stderr);
+ if (!error_file) {
+ gregorio_exit(1);
+ }
}
optind = 1;
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/Makefile.in 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/Makefile.in 2025-02-28 23:31:39 UTC (rev 74361)
@@ -161,12 +161,10 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_EXE_SUFFIX = @GREGORIO_EXE_SUFFIX@
-GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriosyms.sty
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriosyms.sty 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriosyms.sty 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
- [2025/02/17 v6.1.0-beta2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2025/02/28 v6.1.0 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 at gregoriotexversion{6.1.0-beta2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{6.1.0}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre at declarefileversion}[2]{\relax}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-chars.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-chars.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-chars.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 at declarefileversion{gregoriotex-chars.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-chars.tex}{6.1.0}% GREGORIO_VERSION
\def\gre at char@fuse at punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre at char@fuse at quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-common.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-common.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-common.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 at declarefileversion{gregoriotex-common.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-common.tex}{6.1.0}% GREGORIO_VERSION
\ifnum\luatexversion<76%
\gre at error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}%
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-gsp-default.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-gsp-default.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-gsp-default.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -20,7 +20,7 @@
% this file contains definitions of spaces and penalties
% version check
-\gre at declarefileversion{gregoriotex-gsp-default.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-gsp-default.tex}{6.1.0}% GREGORIO_VERSION
%% First, the penalties
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-main.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-main.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-main.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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 at gregoriotexversion{6.1.0-beta2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{6.1.0}% GREGORIO_VERSION - VersionManager.py
% first some macros to allow checks for version:
% Tests that all gregoriotex files are of the same version.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.lua
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.lua 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.lua 2025-02-28 23:31:39 UTC (rev 74361)
@@ -20,7 +20,7 @@
-- this file contains lua functions used by GregorioTeX St. Gall ancient
-- neume support when called with LuaTeX.
--- GREGORIO_VERSION 6.1.0-beta2
+-- GREGORIO_VERSION 6.1.0
local catcode_at_letter = luatexbase.catcodetables['gre at atletter']
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-nabc.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
% this file contains macros for St. Gall ancient neume support
-\gre at declarefileversion{gregoriotex-nabc.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-nabc.tex}{6.1.0}% GREGORIO_VERSION
\xdef\gre at nabcfontname{gregall}%
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.lua
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.lua 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.lua 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 6.1.0-beta2
+-- GREGORIO_VERSION 6.1.0
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-signs.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -22,7 +22,7 @@
\def\grebarbracewidth{.58879}%
-\gre at declarefileversion{gregoriotex-signs.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-signs.tex}{6.1.0}% GREGORIO_VERSION
\def\gre at usestylecommon{%
\gre at trace{gre at usestylecommon}%
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-spaces.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-spaces.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-spaces.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
% this file contains definitions of spaces
-\gre at declarefileversion{gregoriotex-spaces.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-spaces.tex}{6.1.0}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-syllable.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-syllable.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-syllable.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
% this file contains definitions of the glyphs and the syllables
-\gre at declarefileversion{gregoriotex-syllable.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-syllable.tex}{6.1.0}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.lua
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.lua 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.lua 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 6.1.0-beta2
+-- GREGORIO_VERSION 6.1.0
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex-symbols.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -22,7 +22,7 @@
\ifcsname gregoriotex at symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex at symbols@loaded{}%
-\gre at declarefileversion{gregoriotex-symbols.tex}{6.1.0-beta2}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-symbols.tex}{6.1.0}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.lua
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.lua 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.lua 2025-02-28 23:31:39 UTC (rev 74361)
@@ -24,13 +24,13 @@
gregoriotex = gregoriotex or {}
local gregoriotex = gregoriotex
-local internalversion = '6.1.0-beta2' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '6.1.0' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '6.1.0-beta2', -- GREGORIO_VERSION
+ version = '6.1.0', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2025/02/17", -- GREGORIO_DATE_LTX
+ date = "2025/02/28", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2025 - The Gregorio Project",
@@ -103,7 +103,7 @@
local base_output_dir = 'tmp-gre'
local function set_base_output_dir(new_dirname)
- base_output_dir = new_dirname
+ base_output_dir = lfs.normalize(new_dirname)
end
local space_below_staff = 5
@@ -139,9 +139,8 @@
local abovelinestext_mark = 2
log("marker whatsit id is %d", marker_whatsit_id)
-local function get_prog_output(cmd, fmt)
- cmd = string.format(cmd, tmpname)
- local rc = os.execute(cmd)
+local function get_prog_output(cmd, tmpname, fmt)
+ local rc = os.spawn(cmd)
local content = nil
if rc == 0 then
local f = io.open(tmpname, 'r');
@@ -163,16 +162,14 @@
local exe_version
-- first look for one with the exact version
- real_gregorio_exe = 'gregorio-6_1_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')
+ real_gregorio_exe = 'gregorio-6_1_0' -- FILENAME_VERSION
+ local cmd = {real_gregorio_exe, '-o', tmpname, test_snippet_filename}
+ exe_version = get_prog_output(cmd, tmpname, '*line')
if not exe_version then
-- look for suffix-less executable
real_gregorio_exe = 'gregorio'
- cmd = string.format([[%s -o "%%s" "%s"]], real_gregorio_exe,
- test_snippet_filename)
- exe_version = get_prog_output(cmd, '*line')
+ cmd = {real_gregorio_exe, '-o', tmpname, test_snippet_filename}
+ exe_version = get_prog_output(cmd, tmpname, '*line')
end
if not exe_version or string.match(exe_version,"%d+%.%d+%.")
~= string.match(internalversion,"%d+%.%d+%.") then
@@ -392,19 +389,18 @@
end
end
end
+
+ local basepath = tex.jobname
if outputdir and lfs.isdir(outputdir) then
- auxname = outputdir..'/'..tex.jobname..'.gaux'
- tmpname = outputdir..'/'..tex.jobname..'.gtmp'
- test_snippet_filename = outputdir..'/'..tex.jobname..'.test.gsnippet'
- snippet_filename = outputdir..'/'..tex.jobname..'.gsnippet'
- snippet_logname = outputdir..'/'..tex.jobname..'.gsniplog'
- else
- auxname = tex.jobname..'.gaux'
- tmpname = tex.jobname..'.gtmp'
- test_snippet_filename = tex.jobname..'.test.gsnippet'
- snippet_filename = tex.jobname..'.gsnippet'
- snippet_logname = tex.jobname..'.gsniplog'
+ basepath = outputdir..'/'..basepath
end
+ basepath = lfs.normalize(basepath)
+
+ auxname = basepath..'.gaux'
+ tmpname = basepath..'.gtmp'
+ test_snippet_filename = basepath..'.test.gsnippet'
+ snippet_filename = basepath..'.gsnippet'
+ snippet_logname = basepath..'.gsniplog'
-- to get latexmk to realize the aux file is a dependency
texio.write_nl('('..auxname..')')
@@ -1088,71 +1084,48 @@
return path
end
--- Recursive directory creation a la mkdir -p. Unlike lfs.mkdir, this will
--- create missing intermediate directories, and will not fail if the
--- destination directory already exists.
--- It assumes that the directory separator is '/' and that the path is valid
--- for the OS it's running on, e.g. no trailing slashes on windows -- it's up
--- to the caller to ensure this!
-function lfs.rmkdir(path)
- path = lfs.normalize(path)
- if lfs.exists(path) then
- return true
- end
- if lfs.dirname(path) == path then
- -- We're being asked to create the root directory!
- return nil,"rmkdir: unable to create root directory"
- end
- local r,err = lfs.rmkdir(lfs.dirname(path))
- if not r then
- return nil,err.." (creating "..path..")"
- end
- return lfs.mkdir(path)
-end
--- end https://github.com/ToxicFrog/luautil/blob/master/lfs.lua
-
-local function clean_old_gtex_files(file_withdir)
- local filename = ""
- local dirpath = ""
- local sep = ""
- local onwindows = os.type == "windows" or
- string.find(os.getenv("PATH"),";",1,true)
- if onwindows then
- sep = "\\"
- else
- sep = "/"
- end
- dirpath = string.match(file_withdir, "(.*)"..sep)
- if dirpath then -- dirpath is nil if current directory
- filename = "^"..file_withdir:match(".*/".."(.*)").."%-%d+_%d+_%d+[-%a%d]*%.gtex$"
- if lfs.exists(dirpath) then
- for a in lfs.dir(dirpath) do
+local function delete_versioned_files(dir, base, ext)
+ -- Assume that dir is either empty (current directory) or ends with separator
+ filename = "^"..base.."%-%d+_%d+_%d+[-%a%d]*%."..ext.."$"
+ if dir ~= "" then
+ if lfs.exists(dir) then
+ for a in lfs.dir(dir) do
+ a = lfs.normalize(a)
if a:match(filename) then
- os.remove(dirpath..sep..a)
+ info("Deleting old file %s", dir..a)
+ os.remove(dir..a)
end
end
end
else
- filename = "^"..file_withdir.."%-%d+_%d+_%d+[-%a%d]*%.gtex$"
for a in lfs.dir(lfs.currentdir()) do
- if a:match(filename) then os.remove(a) end
+ a = lfs.normalize(a)
+ if a:match(filename) then
+ info("Deleting old file %s", a)
+ os.remove(a)
+ end
end
end
end
+function table.extend(x, y)
+ table.move(y, 1, #y, #x+1, x)
+end
+
local function compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
info("compiling the score %s...", gabc_file)
- local extra_args = ''
+ local cmd = {gregorio_exe()}
if tex.count['gre at generate@pointandclick'] == 1 then
- extra_args = extra_args..' -p'
+ table.insert(cmd, '-p')
end
if not allow_deprecated then
- extra_args = extra_args..' -D'
+ table.insert(cmd, '-D')
end
- local cmd = string.format('%s %s -W -o %s -l %s "%s" 2> %s', gregorio_exe(),
- extra_args, gtex_file, glog_file, gabc_file, glog_file)
- res = os.execute(cmd)
+ table.extend(cmd, {'-W', '-o', gtex_file, '-l', glog_file, gabc_file})
+ info("running: %s", table.concat(cmd, ' '))
+ res = os.spawn(cmd)
+
if res == nil then
err("\nSomething went wrong when executing\n '%s'.\n"
.."shell-escape mode may not be activated. Try\n\n"
@@ -1159,50 +1132,44 @@
.."%s --shell-escape %s.tex\n\n"
.."See the documentation of Gregorio or your TeX\n"
.."distribution to automatize it.",
- cmd, tex.formatname, tex.jobname)
+ table.concat(cmd, ' '), tex.formatname, tex.jobname)
elseif res ~= 0 then
- local glog = io.open(glog_file, 'a+')
+ err("\nSomething went wrong when executing\n '%s'",
+ table.concat(cmd, ' '))
+ else
+ -- Open glog_file for writing so that the LuaTeX recorder knows that gregorio wrote to it.
+ local glog = io.open(glog_file, 'a')
if glog == nil then
- err("\n Unable to open %s", glog_file)
+ warn("\n Unable to open %s for writing. If another program depends on %s, latexmk may not recognize the dependency", glog_file, glog_file)
else
- local size = glog:seek('end')
- if size > 0 then
- glog:seek('set')
- local line
- for line in glog:lines() do
- warn(line)
- end
- end
glog:close()
end
- err("\nAn error occured when compiling the score file\n"
- .."'%s' with %s.\nPlease check your score file.", gabc_file,
- gregorio_exe())
- else
- -- The next few lines would open the gtex file for writing so that LuaTeX records the fact that gregorio has written to it
- -- when the -recorder option is used.
- -- However, in restricted \write18 mode, the gtex file might not be writable. Since we're the sole consumer of the gtex file, it should be okay not to record the write.
- local gtex = io.open(gtex_file, 'a')
- if gtex == nil then
- warn("\n Unable to open %s for writing. If another program depends on %s, latexmk may not recognize the dependency.", gtex_file, gtex_file)
- else
- gtex:close()
- end
- local glog = io.open(glog_file, 'a+')
+ -- Copy the contents of glog_file into warnings.
+ glog = io.open(glog_file, 'r')
if glog == nil then
- err("\n Unable to open %s", glog_file)
+ err("\n Unable to open %s for reading", glog_file)
else
- local size = glog:seek('end')
- if size > 0 then
- glog:seek('set')
- local line
- for line in glog:lines() do
- warn(line)
- end
- warn("*** end of warnings for %s ***", gabc_file)
+ for line in glog:lines() do
+ warn(line)
end
glog:close()
end
+
+ if res ~= 0 then
+ err("\nAn error occured when compiling the score file\n"
+ .."'%s' with %s.\nPlease check your score file.", gabc_file,
+ gregorio_exe())
+ else
+ -- The next few lines would open the gtex file for writing so that LuaTeX records the fact that gregorio has written to it
+ -- when the -recorder option is used.
+ -- However, in restricted \write18 mode, the gtex file might not be writable. Since we're the sole consumer of the gtex file, it should be okay not to record the write.
+ local gtex = io.open(gtex_file, 'a')
+ if gtex == nil then
+ warn("\n Unable to open %s for writing. If another program depends on %s, latexmk may not recognize the dependency.", gtex_file, gtex_file)
+ else
+ gtex:close()
+ end
+ end
end
end
@@ -1212,6 +1179,7 @@
gre_input_path = {""}
end
for i,k in pairs(gre_input_path) do
+ k = lfs.normalize(k)
log("Looking in %s", k)
if lfs.isfile(k .. filename) then
result = k..filename
@@ -1237,119 +1205,107 @@
return result
end
-local function include_score(input_file, force_gabccompile, allow_deprecated)
- if string.match(input_file, "[#%%]") then
+local function include_score(gabc_file, force_gabccompile, allow_deprecated)
+ gabc_file = lfs.normalize(gabc_file)
+
+ if string.match(gabc_file, "[#%%]") then
err("GABC filename contains invalid character(s): # %%\n"
- .."Rename the file and retry: %s", input_file)
+ .."Rename the file and retry: %s", gabc_file)
end
- local has_extention = false
- local file_dir,input_name
+ local gabc_dir, base
local extensions = {['gabc']=true, ['gtex']=true, ['tex']=true}
- if extensions[string.match(input_file, "([^%.\\/]*)$")] then
- has_extention = true
- end
- if has_extention then
- file_dir,input_name = string.match(input_file, "(.-)([^\\/]-)%.?[^%.\\/]*$")
+ if extensions[string.match(gabc_file, "([^%./]*)$")] then
+ gabc_dir, base = string.match(gabc_file, "(.-)([^/]-)%.?[^%./]*$")
else
- file_dir,input_name = string.match(input_file, "(.-)([^\\/]*)$")
+ gabc_dir, base = string.match(gabc_file, "(.-)([^/]*)$")
end
+ local base_cleaned = base:gsub("[%s%+%&%*%?$@:;!\"\'`]", "-")
- local cleaned_filename = input_name:gsub("[%s%+%&%*%?$@:;!\"\'`]", "-")
- local gabc_filename = string.format("%s%s.gabc", file_dir, input_name)
- local gabc_file = locate_file(gabc_filename)
- local gtex_filename = string.format("%s%s-%s.gtex", file_dir, cleaned_filename,
- internalversion:gsub("%.", "_"))
- local gtex_file = locate_file(gtex_filename)
- local glog_file = string.format("%s%s-%s.glog", file_dir, cleaned_filename,
- internalversion:gsub("%.", "_"))
- if not gtex_file then
- clean_old_gtex_files(file_dir..cleaned_filename)
- log("The file %s does not exist. Will use gabc file", gtex_filename)
- if gabc_file then
- local gabc = io.open(gabc_file, 'r')
- if gabc == nil then
- err("\n Unable to open %s", gabc_file)
- return
- else
- gabc:close()
+ -- Find gabc file
+ gabc_file = string.format("%s%s.gabc", gabc_dir, base)
+ local gabc_found = locate_file(gabc_file)
+ if gabc_found then
+ gabc_found = lfs.normalize(gabc_found)
+ end
+
+ -- Set up output directory
+ local output_dir = base_output_dir..'/'..gabc_dir
+ output_dir = string.explode(output_dir, '/')
+ for i, _ in ipairs(output_dir) do
+ if output_dir[i] == '..' then output_dir[i] = 'dotdot' end
+ end
+ output_dir = table.concat(output_dir, '/')
+ info('Output directory: %s', output_dir)
+ if not lfs.exists(output_dir) then
+ local ok, message = lfs.mkdirp(output_dir)
+ if not ok then
+ info('Could not create directory %s: %s', output_dir, message)
+ end
+ end
+
+ -- Choose output filenames
+ gtex_file = string.format("%s%s-%s.gtex", output_dir, base_cleaned,
+ internalversion:gsub("%.", "_"))
+ glog_file = string.format("%s%s-%s.glog", output_dir, base_cleaned,
+ internalversion:gsub("%.", "_"))
+
+ -- Decide if we need to recompile
+ local needs_compile = false
+ if gabc_found then
+ if lfs.exists(gtex_file) then
+ local gtex_timestamp = lfs.attributes(gtex_file).modification
+ local gabc_timestamp = lfs.attributes(gabc_found).modification
+ if gtex_timestamp < gabc_timestamp then
+ log("%s has been modified and %s needs to be updated. Recompiling the gabc file", gabc_found, gtex_file)
+ needs_compile = true
end
- local sep = ""
- local onwindows = os.type == "windows" or
- string.find(os.getenv("PATH"),";",1,true)
- if onwindows then
- sep = "\\"
- else
- sep = "/"
- end
- local output_dir = base_output_dir..sep..file_dir
- info(output_dir)
- if not lfs.exists(output_dir) then
- if not lfs.exists(base_output_dir) then
- lfs.mkdir(base_output_dir)
- end
- local err,message = lfs.rmkdir(output_dir)
- if not err then
- info(message)
- end
- end
- gtex_filename = string.format("%s%s-%s.gtex", output_dir, cleaned_filename,
- internalversion:gsub("%.", "_"))
- glog_file = string.format("%s%s-%s.glog", output_dir, cleaned_filename,
- internalversion:gsub("%.", "_"))
- compile_gabc(gabc_file, gtex_filename, glog_file, allow_deprecated)
- gtex_filename = lfs.normalize(gtex_filename)
- tex.print(string.format([[\input %s\relax]], gtex_filename))
- return
else
- err("The file %s does not exist", gabc_filename)
+ log("The file %s does not exist. Compiling gabc file", gtex_file)
+ needs_compile = true
+ end
+ else
+ if lfs.exists(gtex_file) then
+ log("The file %s does not exist. Using gtex file", gabc_file)
+ else
+ err("The file %s does not exist", gabc_file)
return
end
end
- if not gabc_file then
- gtex_file = lfs.normalize(gtex_file)
- tex.print(string.format([[\input %s\relax]], gtex_file))
- return
+ if needs_compile then
+ -- Delete old gtex files.
+ -- Before version 6.1, gtex files were stored in gabc_dir
+ delete_versioned_files(gabc_dir, base_cleaned, 'gtex')
+ delete_versioned_files(gabc_dir, base_cleaned, 'glog')
+ -- Since version 6.1, gtex files are stored in output_dir
+ delete_versioned_files(output_dir, base_cleaned, 'gtex')
+ delete_versioned_files(output_dir, base_cleaned, 'glog')
+
+ local gabc = io.open(gabc_found, 'r')
+ if gabc == nil then
+ err("\n Unable to open %s", gabc_found)
+ return
+ else
+ gabc:close()
+ end
+ compile_gabc(gabc_found, gtex_file, glog_file, allow_deprecated)
end
- local gtex_timestamp = lfs.attributes(gtex_file).modification
- local gabc_timestamp = lfs.attributes(gabc_file).modification
- -- open the gabc file for reading so that LuaTeX records input from it
- -- when the -recorder option is used; do this here so that this happens
- -- on every run
- tex.sprint(catcode_at_letter, string.format(
- [[\openin\gre at read@temp=%s\relax\closein\gre at read@temp]], gabc_file))
- local gabc = io.open(gabc_file, 'r')
- if gabc == nil then
- err("\n Unable to open %s", gabc_file)
- else
- gabc:close()
- end
- if gtex_timestamp < gabc_timestamp then
- log("%s has been modified and %s needs to be updated. Recompiling the gabc file.", gabc_file, gtex_file)
- compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
- elseif force_gabccompile then
- compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
- end
- gtex_file = lfs.normalize(gtex_file)
+
+ -- Input the gtex file
tex.print(string.format([[\input %s\relax]], gtex_file))
- return
end
local function direct_gabc(gabc, header, allow_deprecated)
info('Processing gabc snippet...')
- local deprecated
- if allow_deprecated then
- deprecated = ''
- else
- deprecated = '-D '
- end
local f = io.open(snippet_filename, 'w')
-- trims spaces on both ends (trim6 from http://lua-users.org/wiki/StringTrim)
gabc = gabc:match('^()%s*$') and '' or gabc:match('^%s*(.*%S)')
f:write('name:direct-gabc;\n'..(header or '')..'\n%%\n'..gabc:gsub('\\par', '\n'))
f:close()
- local cmd = string.format([[%s -W %s-o "%%s" -l "%s" "%s"]], gregorio_exe(),
- deprecated, snippet_logname, snippet_filename)
- local content = get_prog_output(cmd, '*a')
+ cmd = {gregorio_exe(), '-W'}
+ if allow_deprecated then table.insert(cmd, '-D') end
+ table.extend(cmd, {'-o', tmpname, '-l', snippet_logname, snippet_filename})
+ info('Running %s', table.concat(cmd, ' '))
+ local content = get_prog_output(cmd, tmpname, '*a')
if content == nil then
err("\nSomething went wrong when executing\n %s\n"
.."shell-escape mode may not be activated. Try\n\n"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.sty
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.sty 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.sty 2025-02-28 23:31:39 UTC (rev 74361)
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
- [2025/02/17 v6.1.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2025/02/28 v6.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\RequirePackage{iftex}%
\RequireLuaTeX
Modified: trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.tex 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/gregorio-src/tex/gregoriotex.tex 2025-02-28 23:31:39 UTC (rev 74361)
@@ -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.
-% [2025/02/17 v6.1.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2025/02/28 v6.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\input iftex.sty
\RequireLuaTeX%
Modified: trunk/Build/source/texk/gregorio/version.ac
===================================================================
--- trunk/Build/source/texk/gregorio/version.ac 2025-02-28 22:15:35 UTC (rev 74360)
+++ trunk/Build/source/texk/gregorio/version.ac 2025-02-28 23:31:39 UTC (rev 74361)
@@ -9,4 +9,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [6.1.0-beta2])
+m4_define([gregorio_version], [6.1.0])
More information about the tex-live-commits
mailing list.