texlive[41309] Build/source/texk: gregorio 4.1.4
commits+kakuto at tug.org
commits+kakuto at tug.org
Tue Jun 7 14:39:59 CEST 2016
Revision: 41309
http://tug.org/svn/texlive?view=revision&revision=41309
Author: kakuto
Date: 2016-06-07 14:39:58 +0200 (Tue, 07 Jun 2016)
Log Message:
-----------
gregorio 4.1.4
Modified Paths:
--------------
trunk/Build/source/texk/README
trunk/Build/source/texk/gregorio/ChangeLog
trunk/Build/source/texk/gregorio/configure
trunk/Build/source/texk/gregorio/configure.ac
trunk/Build/source/texk/gregorio/gregorio-PATCHES/ChangeLog
trunk/Build/source/texk/gregorio/gregorio-PATCHES/TL-Changes
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/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
trunk/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
trunk/Build/source/texk/gregorio/version.ac
Added Paths:
-----------
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
Removed Paths:
-------------
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_1.pdf
trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_1.pdf
Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/README 2016-06-07 12:39:58 UTC (rev 41309)
@@ -61,7 +61,7 @@
dvisvgm 1.15.1 - checked 20apr16
http://dvisvgm.bplaced.net/Downloads
-gregorio 4.1.1 - checked 11mar16
+gregorio 4.1.4 - checked 07jun16
https://github.com/gregorio-project/gregorio/releases/
gsftopk - from Paul Vojta's xdvi?
Modified: trunk/Build/source/texk/gregorio/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/ChangeLog 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/ChangeLog 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,3 +1,18 @@
+2016-05-30 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-4.1.4.
+ * version.ac, configure.ac: Adapted.
+
+2016-05-27 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-4.1.3.
+ * version.ac, configure.ac: Adapted.
+
+2016-05-21 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-4.1.2.
+ * version.ac, configure.ac: Adapted.
+
2016-03-11 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import gregorio-4.1.1.
Modified: trunk/Build/source/texk/gregorio/configure
===================================================================
--- trunk/Build/source/texk/gregorio/configure 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/configure 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 4.1.1.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 4.1.4.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Gregorio (TeX Live)'
PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='4.1.1'
-PACKAGE_STRING='Gregorio (TeX Live) 4.1.1'
+PACKAGE_VERSION='4.1.4'
+PACKAGE_STRING='Gregorio (TeX Live) 4.1.4'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL='http://gregorio-project.github.io/'
@@ -1331,7 +1331,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) 4.1.1 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 4.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,7 +1402,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Gregorio (TeX Live) 4.1.1:";;
+ short | recursive ) echo "Configuration of Gregorio (TeX Live) 4.1.4:";;
esac
cat <<\_ACEOF
@@ -1522,7 +1522,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Gregorio (TeX Live) configure 4.1.1
+Gregorio (TeX Live) configure 4.1.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2178,7 +2178,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 4.1.1, which was
+It was created by Gregorio (TeX Live) $as_me 4.1.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-FILENAME_VERSION="4_1_1"
+FILENAME_VERSION="4_1_4"
cat >>confdefs.h <<_ACEOF
@@ -7871,7 +7871,7 @@
# Define the identity of the package.
PACKAGE='gregorio--tex-live-'
- VERSION='4.1.1'
+ VERSION='4.1.4'
cat >>confdefs.h <<_ACEOF
@@ -14255,7 +14255,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Gregorio (TeX Live) config.lt 4.1.1
+Gregorio (TeX Live) config.lt 4.1.4
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15842,7 +15842,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 4.1.1, which was
+This file was extended by Gregorio (TeX Live) $as_me 4.1.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15909,7 +15909,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Gregorio (TeX Live) config.status 4.1.1
+Gregorio (TeX Live) config.status 4.1.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/gregorio/configure.ac
===================================================================
--- trunk/Build/source/texk/gregorio/configure.ac 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/configure.ac 2016-06-07 12:39:58 UTC (rev 41309)
@@ -9,7 +9,7 @@
dnl
m4_include([version.ac])[] dnl define gregorio_version
AC_INIT([Gregorio (TeX Live)], gregorio_version, [tex-k at tug.org], [gregorio--tex-live-], [http://gregorio-project.github.io/])
-FILENAME_VERSION="4_1_1"
+FILENAME_VERSION="4_1_4"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
AC_PREREQ([2.65])
Modified: trunk/Build/source/texk/gregorio/gregorio-PATCHES/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-PATCHES/ChangeLog 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-PATCHES/ChangeLog 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,3 +1,15 @@
+2016-05-30 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-4.1.4.
+
+2016-05-27 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-4.1.3.
+
+2016-05-21 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-4.1.2.
+
2016-03-11 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import gregorio-4.1.1.
Modified: trunk/Build/source/texk/gregorio/gregorio-PATCHES/TL-Changes
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-PATCHES/TL-Changes 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-PATCHES/TL-Changes 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,5 +1,5 @@
-Changes applied to the gregorio-4.1.1 tree as obtained from:
- https://github.com/gregorio-project/gregorio/releases/tag/v4.1.1/
+Changes applied to the gregorio-4.1.4 tree as obtained from:
+ https://github.com/gregorio-project/gregorio/releases/tag/v4.1.4/
Remove:
Makefile.in
@@ -7,8 +7,7 @@
build-aux/
configure
contrib/Makefile.in
- contrib/TeXShop/._.DS_Store
- contrib/TeXShop/.DS_STORE
+ contrib/TeXShop/Makefile.in
doc/Makefile.in
examples/Makefile.in
fonts/
Modified: trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,4 +1,4 @@
-4.1.1
+4.1.4
*** Do not modify this file. ***
Use VersionManager.py to change the version.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2016-06-07 12:39:58 UTC (rev 41309)
@@ -2,9 +2,21 @@
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][unreleased]
+## [4.1.4] - 2016-05-29
+### Fixed
+- Package conflict with luatex-ja also affected the custos. Have now fixed that problem too. See [this thread](http://www.mail-archive.com/gregorio-users@gna.org/msg03520.html).
+## [4.1.3] - 2016-05-26
+### Fixed
+- Package conflict with luatex-ja has been resolved. Notes and lyrics should now appear in documents which use the luatex-ja package. See [#1107](https://github.com/gregorio-project/gregorio/issues/1107).
+
+## [4.1.2] - 2016-05-08
+### Changed
+- The parmesan font is now called granapadano. If you were using `\gresetgregoriofont{parmesan}`, you should now use `\gresetgregoriofont{granapadano}`. See [#1075](https://github.com/gregorio-project/gregorio/issues/1075).
+- GregorioTeX is now compatible with TeXLive 2016
+
+
## [4.1.1] - 2016-03-10
### Fixed
- Custos now shouldn't go right of the staff lines (was visible only in edge cases, see [#990](https://github.com/gregorio-project/gregorio/issues/990)).
@@ -259,7 +271,7 @@
- `\gresethyphen{force}` forces GregorioTeX to put a hyphen between each syllable in a polysyllabic word. `\gresethyphen{auto}` restores behavior to normal.
- Support for custom vowel centering rules. Put a file called `gregorio-vowels.dat` into your project directory or into a directory accessible from TEXMF and add the header `language: name;` to your gabc file. The `gregorio-vowels.dat` file describes how vowels are to be located in the *name* language. See GregorioRef for details.
- `\gresetlinecolor` takes a named color as an argument. As a result, the red staff lines can be made consistent with the text, even when the user changes `gregoriocolor` with `\gresetlinecolor{gregoriocolor}`. Addresses [#21787 on the old tracker](https://gna.org/bugs/index.php?21787).
-- Package option `deprecated=false`. Causes all deprecated commands to raise an error and halt TeX.
+- Package option `allowdeprecated=false`. Causes all deprecated commands to raise an error and halt TeX.
- The ability to add LilyPond-like point-and-click textedit links into the PDF file to aid with debugging scores. This must be explicitly enabled and **should be turned off** when producing files for distribution as it embeds path information into the output. To enable this, you must pass the `-p` option to gregorio when compiling gabc files and add `\gresetpointandclick{on}` before including the score. It may be toggled back off with `\gresetpointandclick{off}`. See GregorioRef for details (for the change request, see [#528](https://github.com/gregorio-project/gregorio/issues/528)).
- New score fonts with glyphs unique to Dominican chant. These fonts replace the epiphonus and the augmented liquescents with corresponding figures from Dominican liturgical books. To use the new fonts, pass the `[op]` option to the `\gresetgregoriofont` command (i.e., `\gresetgregoriofont[op]{greciliae}`). See GregorioRef for details (for the change request, see [#1](https://github.com/gregorio-project/gregorio/issues/1)).
- Support for "punctum cavum inclinatum" and "punctum cavum inclinatum auctus" figures. The gabc for these are `(Gr)` and `(Gr<)`, where `G` is the capitalized pitch letter.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,5 +1,5 @@
# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
-#
+#
# This file is part of Gregorio.
#
# Gregorio is free software: you can redistribute it and/or modify
@@ -28,3 +28,9 @@
make -C fonts fonts
export TOP_LEVEL_MAKE = true
+
+gregoriotex.tds.zip: dist install-gtex.sh
+ ./install-gtex.sh tds
+
+ctan: dist gregoriotex.tds.zip build-ctan.sh
+ ./build-ctan.sh
Modified: trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md 2016-06-07 12:39:58 UTC (rev 41309)
@@ -2,8 +2,27 @@
This file contains instructions to upgrade to a new release of Gregorio.
-## Unreleased
+## 4.1.2
+### Changes to texmf tree
+
+To better comply with the TeXLive directory structure, the location of `gregoriotex.sty` and `gregoriosyms.sty` have changed.
+
+*Linux and other users installing from source:* `install-gtex.sh` should remove the old versions before installing the new one.
+
+*Mac users installing via pkg installer:* The installer does not attempt to remove the old versions before installing the new ones. Please run Uninstall-Gregorio.pkg before installing 4.2 to ensure that the old versions don't cause any problems.
+
+*Windows users:* Your installer already should remove old versions of GregorioTeX before installing the new ones.
+
+As always, please file a bug report if you have any problems with the update process.
+
+
+### Parmesan font renamed to Grana Padano
+
+To avoid conflicts with the LilyPond Parmesan font, the Gregorio Parmesan font is now called Grana Padano. If you were using `\gresetgregoriofont{parmesan}`, you should now use `\gresetgregoriofont{granapadano}`.
+
+## 4.1.1
+
### Vertical spacings
High notes are now taken into account in vertical spacings. If you would like to come back to the old way, use `\grechangecount{additionaltopspacethreshold}{6}`. High notes also influence vertical placement of alt text. If you would like to come back to the old way, give a high value to `\grechangecount{additionaltopspacealtthreshold}{6}`.
@@ -137,7 +156,7 @@
- `\grescaledim`: This function now takes two arguments. The second should be `yes`, `true`, `on`, or `scalable` to acheive the old behavior.
-Additionally a new package option has been added. This option, `deprecated=false`, is helpful if you wish to ensure that your TeX file is compliant with the new naming system. This option causes all deprecated commands to raise an error, halting TeX, thus allowing you to actively find all deprecated commands and update them in your TeX file.
+Additionally a new package option has been added. This option, `allowdeprecated=false`, is helpful if you wish to ensure that your TeX file is compliant with the new naming system. This option causes all deprecated commands to raise an error, halting TeX, thus allowing you to actively find all deprecated commands and update them in your TeX file.
### Barred letters
Modified: trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2016-06-07 12:39:58 UTC (rev 41309)
@@ -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],[4.1.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="4_1_1"
+AC_INIT([gregorio],[4.1.4],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="4_1_4"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
@@ -105,6 +105,7 @@
src/Makefile
examples/Makefile
contrib/Makefile
+ contrib/TeXShop/Makefile
doc/Makefile
tex/Makefile
fonts/Makefile
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am 2016-06-07 12:39:58 UTC (rev 41309)
@@ -15,4 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md TeXShop system-setup.command system-setup.bat config-texworks.command
+SUBDIRS = TeXShop
+
+EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md system-setup.command system-setup.bat config-texworks.command
Added: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am (rev 0)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am 2016-06-07 12:39:58 UTC (rev 41309)
@@ -0,0 +1,18 @@
+# Copyright (C) 2006-2015 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/>.
+
+EXTRA_DIST = auto-configure.command LuaLaTeX+se.engine
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess 2016-06-07 12:39:58 UTC (rev 41309)
@@ -11,11 +11,11 @@
# -- use latin1 character set instead of utf8
# -- update macro and variable names (with "gre" prefix) as needed
# -- add 'redlines'
-# --
+# --
#
# v0.1
# Copyright (C) 2008 Richard Chonak <chonak at yahoo.com>
-#
+#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
my $GABCFILE = $ARGV[0];
my $GABCNAME = $GABCFILE;
$GABCNAME =~ s/.gabc//;
-my $SCORENAME;
+my $SCORENAME;
my $ANNOTATION;
my $REFERENCE;
my $OFFICEPART;
@@ -122,10 +122,10 @@
#### WRITE TEX WRAPPER FILE ####
open (TEXWRAP,">".$SCOREWRAPTEX) or die "Cannot write file $SCOREWRAPTEX\n";
-print TEXWRAP @TEMPLATELINES;
+print TEXWRAP @TEMPLATELINES;
close (TEXWRAP);
-#### RUN GREGORIO, LATEX, AND KPDF ####
+#### RUN LATEX ####
my $PDFFILE = $SCOREWRAPTEX;
$PDFFILE =~ s/tex$/pdf/;
my $AUXFILE = $SCOREWRAPTEX;
@@ -138,6 +138,8 @@
unlink $PDFFILE;
do_cmd("$TEXCOMPILER $SCOREWRAPTEX");
+# Run twice to calculate line heights.
+do_cmd("$TEXCOMPILER $SCOREWRAPTEX");
unlink $AUXFILE;
unlink $GAUXFILE;
@@ -157,7 +159,7 @@
sub do_cmd {
my $CMD = $_[0];
#debugging print "Doing command: \n $CMD\n\n";
- system ($CMD) == 0
+ system ($CMD) == 0
or die "\n\nSystem command failed: $CMD : $?\n";
};
@@ -168,7 +170,6 @@
\documentclass[12pt, letterpaper]{article}
\usepackage{fullpage}
\usepackage[T1]{fontenc}
-\usepackage[utf8]{luainputenc}
\usepackage{palatino}
\usepackage[autocompile,allowdeprecated=false]{gregoriotex}
\pagestyle{empty}
@@ -180,4 +181,3 @@
\end{document}
-
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat 2016-06-07 12:39:58 UTC (rev 41309)
@@ -113,8 +113,8 @@
gregorio.ttf ^
gregorio-op.ttf ^
gresym.ttf ^
-parmesan.ttf ^
-parmesan-op.ttf ^
+granapadano.ttf ^
+granapadano-op.ttf ^
gregall.ttf ^
gregsmodern.ttf
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command 2016-06-07 12:39:58 UTC (rev 41309)
@@ -141,8 +141,8 @@
gregorio.ttf
gregorio-op.ttf
gresym.ttf
-parmesan.ttf
-parmesan-op.ttf
+granapadano.ttf
+granapadano-op.ttf
gregall.ttf
gregsmodern.ttf"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex 2016-06-07 12:39:58 UTC (rev 41309)
@@ -7,7 +7,7 @@
\subsection{Score Font Glyphs}
The following table lists all of the score glyphs available in the greciliae,
-gregorio, and parmesan fonts, and any variant glyphs contained within. If a
+gregorio, and granapadano fonts, and any variant glyphs contained within. If a
variant glyph is unavailable in a given font, it will be listed as
{\itshape\small N/A} under the appropriate column. Some of the glyphs listed
are representative of sets of glyphs differentiated by the ambitus of the
@@ -28,11 +28,11 @@
{\scriptsize\bfseries Sample gabc}&%
{\scriptsize\bfseries greciliae}&%
{\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}&%
+ {\scriptsize\bfseries granapadano}&%
{\scriptsize\bfseries Name}&%
{\scriptsize\bfseries greciliae}&%
{\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}\\
+ {\scriptsize\bfseries granapadano}\\
\hline
\endfirsthead
&&&&&\multicolumn{4}{c}{\bfseries Variants}\\
@@ -41,25 +41,25 @@
{\scriptsize\bfseries Sample gabc}&%
{\scriptsize\bfseries greciliae}&%
{\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}&%
+ {\scriptsize\bfseries granapadano}&%
{\scriptsize\bfseries Name}&%
{\scriptsize\bfseries greciliae}&%
{\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}\\
+ {\scriptsize\bfseries granapadano}\\
\hline
\endhead
\directlua{GregorioRef.emit_score_glyphs(#1)}
\end{longtable}
}%
-\ScoreFontTable{'greciliae','gregorio','parmesan'}
+\ScoreFontTable{'greciliae','gregorio','granapadano'}
\subsection{Dominican Score Font Glyphs}
The following table lists all of the score glyphs available in the Dominican
-versions of the greciliae, gregorio, and parmesan fonts in the same vein as
+versions of the greciliae, gregorio, and granapadano fonts in the same vein as
the prior table.
-\ScoreFontTable{'greciliaeOp','gregorioOp','parmesanOp'}
+\ScoreFontTable{'greciliaeOp','gregorioOp','granapadanoOp'}
\subsection{Extra Glyphs}\label{subsec:greextra}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex 2016-06-07 12:39:58 UTC (rev 41309)
@@ -381,7 +381,7 @@
\subsubsection{Score Font}
-Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Parmesan (developed for Lilypond by Juergen Reuter).
+Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Grana Padano (née Parmesan, developed for Lilypond by Juergen Reuter).
\macroname{\textbackslash gresetgregoriofont}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
Set the font used for the neumes. The optional argument \texttt{[\#1]}
@@ -395,7 +395,7 @@
& \texttt{op} & Use the alternate Dominican font/rule set.\\
\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
& \texttt{gregorio} & Use the Gregorio font.\\
- & \texttt{parmesan} & Use the Parmesan font.\\
+ & \texttt{granapadano} & Use the Grana Padano font.\\
\end{argtable}
\macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex}
@@ -680,7 +680,7 @@
\textbf{Nota Bene:} The same rules apply for \#1 as in \verb=\gresetspecial=.
\macroname{\textbackslash gretilde}{}{gregoriotex-main.tex}
-Macro to print $\sim$. This macro is set using the above for \texttt{<sp>~</sp>}.
+Macro to print $\sim$. This macro is set using the above for \texttt{<sp>$\sim$</sp>}.
@@ -719,7 +719,7 @@
\footnotemark[1]\textit{Special:} By default, \texttt{additionalstafflines} inherits its properties from \texttt{normalstafflines}. To decouple these environments, you must manually change \texttt{additionalstafflines} using \texttt{\textbackslash grechangestyle}.
\renewcommand{\thefootnote}{\arabic{footnote}}\breakabletrue
-\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex}
+\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\optional{\#3}]}{gregoriotex.sty \textup{and} gregoriotex.tex}
Command to change styling of a score element.
\begin{argtable}
@@ -749,7 +749,7 @@
\subsubsection{Text Elements}
While the gabc headers provide support for some of the text elements commonly found on chant scores, Gregorio\TeX\ provides the following functions to allow you to enter and control those elements with a greater degree of precision than the gabc headers.
-\macroname{\textbackslash greannotation}{[\#1]\{\#2\}}{gregoriotex-main.tex}
+\macroname{\textbackslash greannotation}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
Macro to add annotations (the text which appears above the initial) to a score. While a single call of the function does not support multiple lines, successive calls to the function will be added to the annotation as a new line below what is already there.
\begin{argtable}
@@ -761,7 +761,7 @@
\textbf{Nota Bene:} The first argument does not affect the alignment of lines already in the annotation, only the way the new line aligns with the existing lines as a whole.
-\macroname{\textbackslash grecommentary}{[\optional{\#2}]\{\#1\}}{gregoriotex-main.tex}
+\macroname{\textbackslash grecommentary}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
Macro to add commentary (the text flush right at the top, usually a scripture reference) to a score. While a single call of this function does not support multiple lines, successive calls to the function will add a new line to the commentary directly below the previous.
\begin{argtable}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1076,7 +1076,7 @@
& \texttt{op} & Use the alternate Dominican font/rule set.\\
\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
& \texttt{gregorio} & Use the Gregorio font.\\
- & \texttt{parmesan} & Use the Parmesan font.\\
+ & \texttt{granapadano} & Use the Grana Padano font.\\
\end{argtable}
\macroname{\textbackslash gre at syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex}
@@ -1179,7 +1179,7 @@
& \texttt{op} & Use the alternate Dominican font/rule set.\\
\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
& \texttt{gregorio} & Use the Gregorio font.\\
- & \texttt{parmesan} & Use the Parmesan font.\\
+ & \texttt{granapadano} & Use the Grana Padano font.\\
\#3 & integer & the scaling factor\\
\end{argtable}
@@ -1253,7 +1253,7 @@
The font for the default initial format in Plain \TeX.
\macroname{\textbackslash gre at fontfactor@...}{}{gregoriotex-main.tex}
-Macro holding the factor at which the font is loaded. There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, parmesan, \etc).
+Macro holding the factor at which the font is loaded. There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, granapadano, \etc).
\subsection{Character Reference Aliases}
Deleted: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_1.pdf
===================================================================
(Binary files differ)
Added: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
===================================================================
(Binary files differ)
Index: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf 2016-06-07 12:39:58 UTC (rev 41309)
Property changes on: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua 2016-06-07 12:39:58 UTC (rev 41309)
@@ -234,11 +234,11 @@
GregorioRef = {}
-function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
+function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano)
local common_glyphs = {}
local greciliae = {}
local gregorio = {}
- local parmesan = {}
+ local granapadano = {}
local function index_font(csname, variants, common)
local glyphs = font.fonts[font.id(csname)].resources.unicodes
@@ -264,7 +264,7 @@
index_font(cs_greciliae, greciliae, common_glyphs)
index_font(cs_gregorio, gregorio)
- index_font(cs_parmesan, parmesan)
+ index_font(cs_granapadano, granapadano)
local function maybe_emit_glyph(csname, variants, name, variant)
local cp = variants[name]
@@ -307,10 +307,10 @@
end
tex.sprint(string.format(
[[{\scriptsize %s{\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&{\%s\char%d}&{\%s\char%d}&]],
- fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_parmesan, char
+ fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_granapadano, char
))
local emitted = false, i, variant
- for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], parmesan[name]}) do
+ for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], granapadano[name]}) do
if emitted then
tex.sprint([[\nopagebreak&&&&&]])
else
@@ -319,7 +319,7 @@
tex.sprint(string.format([[{\scriptsize %s}]], variant))
maybe_emit_glyph('greciliae', greciliae, name, variant)
maybe_emit_glyph('gregorio', gregorio, name, variant)
- maybe_emit_glyph('parmesan', parmesan, name, variant)
+ maybe_emit_glyph('granapadano', granapadano, name, variant)
tex.print([[\\]])
end
if not emitted then
Added: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
===================================================================
(Binary files differ)
Index: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf 2016-06-07 12:39:58 UTC (rev 41309)
Property changes on: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex 2016-06-07 12:39:58 UTC (rev 41309)
@@ -107,10 +107,10 @@
% for the character tables
\font\greciliae = {name:greciliae} at 1000000 sp\relax
\font\gregorio = {name:gregorio} at 1000000 sp\relax
-\font\parmesan = {name:parmesan} at 1000000 sp\relax
+\font\granapadano = {name:granapadano} at 1000000 sp\relax
\font\greciliaeOp = {name:greciliae-op} at 1000000 sp\relax
\font\gregorioOp = {name:gregorio-op} at 1000000 sp\relax
-\font\parmesanOp = {name:parmesan-op} at 1000000 sp\relax
+\font\granapadanoOp = {name:granapadano-op} at 1000000 sp\relax
\font\greextra = {name:greextra} at 12 pt\relax
\newcommand{\excluded}[1]{{\tiny\itshape #1}}
@@ -152,7 +152,7 @@
\vspace{1cm}
- \large Version \textbf{4.1.1}, 10 March 2016 %% PARSE_VERSION_DATE
+ \large Version \textbf{4.1.4}, 29 May 2016 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am 2016-06-07 12:39:58 UTC (rev 41309)
@@ -26,34 +26,34 @@
# I know these rules look wrong, but they must not depend on anything that
# gets generated or make distcheck will fail.
-GregorioRef- at FILENAME_VERSION@.pdf: $(SRCFILES)
+GregorioRef.pdf: $(SRCFILES)
$(MAKE) $(AM_MAKEFLAGS) -C ../src gregorio
../src/gregorio -o factus.gtex $(<D)/factus.gabc
TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -recorder -pdf \
-pdflatex='lualatex --shell-escape %O %S' \
- -jobname=GregorioRef- at FILENAME_VERSION@ $<
+ -jobname=GregorioRef $<
-GregorioNabcRef- at FILENAME_VERSION@.pdf: $(NABCSRCFILES)
+GregorioNabcRef.pdf: $(NABCSRCFILES)
$(MAKE) $(AM_MAKEFLAGS) -C ../src gregorio
../src/gregorio -o veni.gtex $(<D)/veni.gabc
TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -recorder -pdf \
-pdflatex='lualatex --shell-escape %O %S' \
- -jobname=GregorioNabcRef- at FILENAME_VERSION@ $<
+ -jobname=GregorioNabcRef $<
-doc: GregorioRef-$(FILENAME_VERSION).pdf GregorioNabcRef-$(FILENAME_VERSION).pdf
+doc: GregorioRef.pdf GregorioNabcRef.pdf
pdf-local: doc
distclean-local:
- latexmk -quiet -c -f -jobname=GregorioRef- at FILENAME_VERSION@ GregorioRef.tex
- latexmk -quiet -c -f -jobname=GregorioNabcRef- at FILENAME_VERSION@ GregorioNabcRef.tex
+ latexmk -quiet -c -f -jobname=GregorioRef GregorioRef.tex
+ latexmk -quiet -c -f -jobname=GregorioNabcRef GregorioNabcRef.tex
rm -rf _minted* *.gtex *.aux *.gaux
EXTRA_DIST = $(SRCFILES) $(NABCSRCFILES) \
- GregorioRef- at FILENAME_VERSION@.pdf \
- GregorioNabcRef- at FILENAME_VERSION@.pdf
+ GregorioRef.pdf \
+ GregorioNabcRef.pdf
maintainer-clean-local:
rm -rf GregorioRef*.pdf
Modified: trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
-#
+#
# This file is part of Gregorio.
#
# Gregorio is free software: you can redistribute it and/or modify
@@ -57,20 +57,40 @@
# Creates a TDS-ready archive named gregoriotex.tds.zip
#
-TEXFILES=(tex/*.tex tex/gregorio*.sty tex/*.lua tex/*.dat)
-TTFFILES=(gregorio.ttf greciliae.ttf parmesan.ttf gregorio-op.ttf
- greciliae-op.ttf parmesan-op.ttf greextra.ttf gregall.ttf
+VERSION=`head -1 .gregorio-version`
+FILEVERSION=`echo $VERSION | sed 's/\./_/g'`
+
+TEXFILES=(tex/gregoriotex*.tex tex/gsp-default.tex tex/gregoriotex*.lua
+ tex/*.dat)
+LATEXFILES=(tex/gregorio*.sty)
+TTFFILES=(gregorio.ttf greciliae.ttf granapadano.ttf gregorio-op.ttf
+ greciliae-op.ttf granapadano-op.ttf greextra.ttf gregall.ttf
gresgmodern.ttf)
-DOCFILES=(fonts/README.md)
-FONTSRCFILES=(gregorio-base.sfd parmesan-base.sfd greciliae-base.sfd
+DOCFILES=(doc/Appendix*.tex doc/Command*.tex doc/Gabc.tex
+ doc/*Ref.tex doc/*Ref.lua doc/*.gabc
+ doc/Gregorio*Ref.pdf)
+EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc
+ examples/main-lualatex.tex examples/debugging.tex)
+FONTSRCFILES=(gregorio-base.sfd granapadano-base.sfd greciliae-base.sfd
greextra.sfd squarize.py convertsfdtottf.py gregall.sfd
- gresgmodern.sfd)
+ gresgmodern.sfd README.md)
+# Files which have been eliminated, or whose installation location have been
+# changed. We will remove existing versions of these files in the target texmf
+# tree before installing.
+LEGACYFILES=(tex/luatex/gregoriotex/gregoriotex.sty
+ tex/luatex/gregoriotex/gregoriosyms.sty
+ tex/luatex/gregoriotex/gregoriotex-ictus.tex
+ fonts/truetype/public/gregoriotex/parmesan.ttf
+ fonts/truetype/public/gregoriotex/parmesan-op.ttf
+ fonts/source/gregoriotex/parmesan-base.sfd)
NAME=${NAME:-gregoriotex}
FORMAT=${FORMAT:-luatex}
+LATEXFORMAT=${LATEXFORMAT:-lualatex}
TEXHASH=${TEXHASH:-texhash}
KPSEWHICH=${KPSEWHICH:-kpsewhich}
CP=${CP:-cp}
+RM=${RM:-rm}
TTFFILES=("${TTFFILES[@]/#/fonts/}")
FONTSRCFILES=("${FONTSRCFILES[@]/#/fonts/}")
@@ -138,10 +158,24 @@
$CP "$@" "$dir" || die
}
+function find_and_remove {
+ for files in $1; do
+ target="${TEXMFROOT}/${files}"
+ if [ -e "$target" ]; then
+ $RM -f "$target"
+ fi
+ done
+}
+
+echo "Removing old files"
+find_and_remove "${LEGACYFILES[@]}"
+
echo "Installing in '${TEXMFROOT}'."
install_to "${TEXMFROOT}/tex/${FORMAT}/${NAME}" "${TEXFILES[@]}"
+install_to "${TEXMFROOT}/tex/${LATEXFORMAT}/${NAME}" "${LATEXFILES[@]}"
install_to "${TEXMFROOT}/fonts/truetype/public/${NAME}" "${TTFFILES[@]}"
install_to "${TEXMFROOT}/doc/${FORMAT}/${NAME}" "${DOCFILES[@]}"
+install_to "${TEXMFROOT}/doc/${FORMAT}/${NAME}/examples" "${EXAMPLEFILES[@]}"
install_to "${TEXMFROOT}/fonts/source/${NAME}" "${FONTSRCFILES[@]}"
if [ "$arg" = 'tds' ]
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c 2016-06-07 12:39:58 UTC (rev 41309)
@@ -27,8 +27,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -161,7 +161,15 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -353,7 +361,7 @@
/* Begin user sect3 */
-#define gabc_notes_determination_wrap() 1
+#define gabc_notes_determination_wrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -367,6 +375,9 @@
int gabc_notes_determination_lineno = 1;
extern char *gabc_notes_determination_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr gabc_notes_determination_text
static yyconst flex_int32_t yy_nxt[][256] =
@@ -10393,6 +10404,9 @@
static yy_state_type yy_get_previous_state (void );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
static void yy_fatal_error (yyconst char msg[] );
/* Done after the current pattern has been matched and before the
@@ -11165,7 +11179,7 @@
-#line 11169 "gabc/gabc-notes-determination-l.c"
+#line 11183 "gabc/gabc-notes-determination-l.c"
#define INITIAL 0
#define texverbnote 1
@@ -11216,11 +11230,11 @@
FILE *gabc_notes_determination_get_in (void );
-void gabc_notes_determination_set_in (FILE * in_str );
+void gabc_notes_determination_set_in (FILE * _in_str );
FILE *gabc_notes_determination_get_out (void );
-void gabc_notes_determination_set_out (FILE * out_str );
+void gabc_notes_determination_set_out (FILE * _out_str );
yy_size_t gabc_notes_determination_get_leng (void );
@@ -11228,7 +11242,7 @@
int gabc_notes_determination_get_lineno (void );
-void gabc_notes_determination_set_lineno (int line_number );
+void gabc_notes_determination_set_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -11242,6 +11256,10 @@
#endif
#endif
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
@@ -11266,7 +11284,12 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -11353,7 +11376,7 @@
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
#define YY_RULE_SETUP \
@@ -11363,9 +11386,9 @@
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
if ( !(yy_init) )
{
@@ -11396,9 +11419,9 @@
{
#line 677 "gabc/gabc-notes-determination.l"
-#line 11400 "gabc/gabc-notes-determination-l.c"
+#line 11423 "gabc/gabc-notes-determination-l.c"
- while ( 1 ) /* loops until end-of-file is reached */
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@@ -12662,7 +12685,7 @@
#line 1313 "gabc/gabc-notes-determination.l"
ECHO;
YY_BREAK
-#line 12666 "gabc/gabc-notes-determination-l.c"
+#line 12689 "gabc/gabc-notes-determination-l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(texverbnote):
case YY_STATE_EOF(texverbglyph):
@@ -12823,9 +12846,9 @@
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ char *source = (yytext_ptr);
+ yy_size_t number_to_move, i;
int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -12854,7 +12877,7 @@
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+ number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -12957,8 +12980,8 @@
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
yy_current_state = (yy_start);
@@ -12987,8 +13010,8 @@
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
+ int yy_is_jam;
+ char *yy_cp = (yy_c_buf_p);
yy_current_state = yy_NUL_trans[yy_current_state];
yy_is_jam = (yy_current_state == 0);
@@ -13005,6 +13028,10 @@
return yy_is_jam ? 0 : yy_current_state;
}
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (void)
@@ -13154,7 +13181,7 @@
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination__create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = (yy_size_t)size;
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
@@ -13309,7 +13336,7 @@
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1;
+ num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
(yy_buffer_stack) = (struct yy_buffer_state**)gabc_notes_determination_alloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
@@ -13326,7 +13353,7 @@
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
+ yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)gabc_notes_determination_realloc
@@ -13434,7 +13461,7 @@
static void yy_fatal_error (yyconst char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
+ (void) fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@@ -13500,29 +13527,29 @@
}
/** Set the current line number.
- * @param line_number
+ * @param _line_number line number
*
*/
-void gabc_notes_determination_set_lineno (int line_number )
+void gabc_notes_determination_set_lineno (int _line_number )
{
- gabc_notes_determination_lineno = line_number;
+ gabc_notes_determination_lineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
*
* @see gabc_notes_determination__switch_to_buffer
*/
-void gabc_notes_determination_set_in (FILE * in_str )
+void gabc_notes_determination_set_in (FILE * _in_str )
{
- gabc_notes_determination_in = in_str ;
+ gabc_notes_determination_in = _in_str ;
}
-void gabc_notes_determination_set_out (FILE * out_str )
+void gabc_notes_determination_set_out (FILE * _out_str )
{
- gabc_notes_determination_out = out_str ;
+ gabc_notes_determination_out = _out_str ;
}
int gabc_notes_determination_get_debug (void)
@@ -13530,9 +13557,9 @@
return gabc_notes_determination__flex_debug;
}
-void gabc_notes_determination_set_debug (int bdebug )
+void gabc_notes_determination_set_debug (int _bdebug )
{
- gabc_notes_determination__flex_debug = bdebug ;
+ gabc_notes_determination__flex_debug = _bdebug ;
}
static int yy_init_globals (void)
@@ -13600,7 +13627,8 @@
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
- register int i;
+
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -13609,7 +13637,7 @@
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
@@ -13619,11 +13647,12 @@
void *gabc_notes_determination_alloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return (void *) malloc( size );
}
void *gabc_notes_determination_realloc (void * ptr, yy_size_t size )
{
+
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -13636,7 +13665,7 @@
void gabc_notes_determination_free (void * ptr )
{
- free( (char *) ptr ); /* see gabc_notes_determination_realloc() for (char *) cast */
+ free( (char *) ptr ); /* see gabc_notes_determination_realloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c 2016-06-07 12:39:58 UTC (rev 41309)
@@ -27,8 +27,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -161,7 +161,15 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -353,7 +361,7 @@
/* Begin user sect3 */
-#define gabc_score_determination_wrap() 1
+#define gabc_score_determination_wrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -367,11 +375,17 @@
int gabc_score_determination_lineno = 1;
extern char *gabc_score_determination_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr gabc_score_determination_text
static yy_state_type yy_get_previous_state (void );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
static void yy_fatal_error (yyconst char msg[] );
/* Done after the current pattern has been matched and before the
@@ -430,7 +444,7 @@
} ;
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
@@ -462,7 +476,7 @@
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[46] =
+static yyconst YY_CHAR yy_meta[46] =
{ 0,
1, 1, 2, 2, 1, 1, 3, 3, 4, 5,
1, 6, 1, 7, 8, 1, 6, 3, 3, 6,
@@ -471,7 +485,7 @@
4, 9, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_base[313] =
+static yyconst flex_uint32_t yy_base[313] =
{ 0,
0, 43, 48, 50, 82, 118, 39, 50, 41, 42,
635, 634, 57, 62, 64, 66, 633, 632, 646, 651,
@@ -549,7 +563,7 @@
291, 291
} ;
-static yyconst flex_int32_t yy_nxt[697] =
+static yyconst flex_uint32_t yy_nxt[697] =
{ 0,
20, 20, 21, 20, 20, 20, 22, 20, 20, 20,
20, 23, 24, 20, 20, 20, 23, 20, 20, 25,
@@ -813,7 +827,7 @@
for (a) single-line values, ending with a semicolon at end of line or a
double semicolon, (b) multi-line values, which end at a double
semicolon. */
-#line 817 "gabc/gabc-score-determination-l.c"
+#line 831 "gabc/gabc-score-determination-l.c"
#define INITIAL 0
#define attribute 1
@@ -854,11 +868,11 @@
FILE *gabc_score_determination_get_in (void );
-void gabc_score_determination_set_in (FILE * in_str );
+void gabc_score_determination_set_in (FILE * _in_str );
FILE *gabc_score_determination_get_out (void );
-void gabc_score_determination_set_out (FILE * out_str );
+void gabc_score_determination_set_out (FILE * _out_str );
yy_size_t gabc_score_determination_get_leng (void );
@@ -866,7 +880,7 @@
int gabc_score_determination_get_lineno (void );
-void gabc_score_determination_set_lineno (int line_number );
+void gabc_score_determination_set_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -880,6 +894,10 @@
#endif
#endif
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
@@ -904,7 +922,12 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -991,7 +1014,7 @@
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
#define YY_RULE_SETUP \
@@ -1004,9 +1027,9 @@
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
if ( !(yy_init) )
{
@@ -1037,9 +1060,9 @@
{
#line 108 "gabc/gabc-score-determination.l"
-#line 1041 "gabc/gabc-score-determination-l.c"
+#line 1064 "gabc/gabc-score-determination-l.c"
- while ( 1 ) /* loops until end-of-file is reached */
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@@ -1056,7 +1079,7 @@
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1723,7 +1746,7 @@
#line 432 "gabc/gabc-score-determination.l"
ECHO;
YY_BREAK
-#line 1727 "gabc/gabc-score-determination-l.c"
+#line 1750 "gabc/gabc-score-determination-l.c"
case YY_END_OF_BUFFER:
{
@@ -1864,9 +1887,9 @@
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ char *source = (yytext_ptr);
+ yy_size_t number_to_move, i;
int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1895,7 +1918,7 @@
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+ number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -1998,8 +2021,8 @@
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
yy_current_state = (yy_start);
yy_current_state += YY_AT_BOL();
@@ -2006,7 +2029,7 @@
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -2031,10 +2054,10 @@
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
+ int yy_is_jam;
+ char *yy_cp = (yy_c_buf_p);
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -2052,6 +2075,10 @@
return yy_is_jam ? 0 : yy_current_state;
}
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (void)
@@ -2203,7 +2230,7 @@
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination__create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = (yy_size_t)size;
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
@@ -2358,7 +2385,7 @@
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1;
+ num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
(yy_buffer_stack) = (struct yy_buffer_state**)gabc_score_determination_alloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
@@ -2375,7 +2402,7 @@
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
+ yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)gabc_score_determination_realloc
@@ -2483,7 +2510,7 @@
static void yy_fatal_error (yyconst char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
+ (void) fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@@ -2549,29 +2576,29 @@
}
/** Set the current line number.
- * @param line_number
+ * @param _line_number line number
*
*/
-void gabc_score_determination_set_lineno (int line_number )
+void gabc_score_determination_set_lineno (int _line_number )
{
- gabc_score_determination_lineno = line_number;
+ gabc_score_determination_lineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
*
* @see gabc_score_determination__switch_to_buffer
*/
-void gabc_score_determination_set_in (FILE * in_str )
+void gabc_score_determination_set_in (FILE * _in_str )
{
- gabc_score_determination_in = in_str ;
+ gabc_score_determination_in = _in_str ;
}
-void gabc_score_determination_set_out (FILE * out_str )
+void gabc_score_determination_set_out (FILE * _out_str )
{
- gabc_score_determination_out = out_str ;
+ gabc_score_determination_out = _out_str ;
}
int gabc_score_determination_get_debug (void)
@@ -2579,9 +2606,9 @@
return gabc_score_determination__flex_debug;
}
-void gabc_score_determination_set_debug (int bdebug )
+void gabc_score_determination_set_debug (int _bdebug )
{
- gabc_score_determination__flex_debug = bdebug ;
+ gabc_score_determination__flex_debug = _bdebug ;
}
static int yy_init_globals (void)
@@ -2649,7 +2676,8 @@
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
- register int i;
+
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -2658,7 +2686,7 @@
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
@@ -2668,11 +2696,12 @@
void *gabc_score_determination_alloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return (void *) malloc( size );
}
void *gabc_score_determination_realloc (void * ptr, yy_size_t size )
{
+
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -2685,7 +2714,7 @@
void gabc_score_determination_free (void * ptr )
{
- free( (char *) ptr ); /* see gabc_score_determination_realloc() for (char *) cast */
+ free( (char *) ptr ); /* see gabc_score_determination_realloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h 2016-06-07 12:39:58 UTC (rev 41309)
@@ -12,8 +12,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -115,7 +115,15 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -201,12 +209,15 @@
/* Begin user sect3 */
-#define gabc_score_determination_wrap() 1
+#define gabc_score_determination_wrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
extern int gabc_score_determination_lineno;
extern char *gabc_score_determination_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr gabc_score_determination_text
#ifdef YY_HEADER_EXPORT_START_CONDITIONS
@@ -249,11 +260,11 @@
FILE *gabc_score_determination_get_in (void );
-void gabc_score_determination_set_in (FILE * in_str );
+void gabc_score_determination_set_in (FILE * _in_str );
FILE *gabc_score_determination_get_out (void );
-void gabc_score_determination_set_out (FILE * out_str );
+void gabc_score_determination_set_out (FILE * _out_str );
yy_size_t gabc_score_determination_get_leng (void );
@@ -261,7 +272,7 @@
int gabc_score_determination_get_lineno (void );
-void gabc_score_determination_set_lineno (int line_number );
+void gabc_score_determination_set_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -289,7 +300,12 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Number of entries by which start-condition stack grows. */
@@ -325,6 +341,6 @@
#line 432 "gabc/gabc-score-determination.l"
-#line 329 "gabc/gabc-score-determination-l.h"
+#line 345 "gabc/gabc-score-determination-l.h"
#undef gabc_score_determination_IN_HEADER
#endif /* gabc_score_determination_HEADER_H */
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c 2016-06-07 12:39:58 UTC (rev 41309)
@@ -210,7 +210,7 @@
dump plain text dump (for debugging purpose)\n\
\n\
See <" PACKAGE_URL "> for general documentation,\n\
-GregorioRef-" FILENAME_VERSION ".pdf and GregorioNabcRef-" FILENAME_VERSION ".pdf for full documentation.\
+GregorioRef.pdf and GregorioNabcRef.pdf for full documentation.\
\n"));
}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c 2016-06-07 12:39:58 UTC (rev 41309)
@@ -27,8 +27,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -161,7 +161,15 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -353,7 +361,7 @@
/* Begin user sect3 */
-#define gregorio_vowel_rulefile_wrap() 1
+#define gregorio_vowel_rulefile_wrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -367,11 +375,17 @@
int gregorio_vowel_rulefile_lineno = 1;
extern char *gregorio_vowel_rulefile_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr gregorio_vowel_rulefile_text
static yy_state_type yy_get_previous_state (void );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
static int yy_get_next_buffer (void );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
static void yy_fatal_error (yyconst char msg[] );
/* Done after the current pattern has been matched and before the
@@ -404,7 +418,7 @@
0, 3, 0, 4, 0, 0, 1, 0, 5, 0
} ;
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
2, 2, 4, 1, 1, 1, 1, 1, 1, 1,
@@ -436,7 +450,7 @@
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[32] =
+static yyconst YY_CHAR yy_meta[32] =
{ 0,
1, 2, 3, 3, 2, 2, 2, 1, 4, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -444,7 +458,7 @@
1
} ;
-static yyconst flex_int32_t yy_base[78] =
+static yyconst flex_uint32_t yy_base[78] =
{ 0,
0, 30, 60, 66, 72, 0, 94, 102, 92, 139,
139, 139, 0, 139, 74, 80, 68, 0, 69, 58,
@@ -468,7 +482,7 @@
70, 70, 70, 70, 70, 70, 70
} ;
-static yyconst flex_int32_t yy_nxt[171] =
+static yyconst flex_uint32_t yy_nxt[171] =
{ 0,
70, 11, 12, 11, 13, 70, 14, 40, 40, 15,
70, 70, 34, 30, 40, 40, 16, 70, 70, 17,
@@ -583,7 +597,7 @@
-#line 587 "vowel/vowel-rules-l.c"
+#line 601 "vowel/vowel-rules-l.c"
#define INITIAL 0
#define chars 1
@@ -619,11 +633,11 @@
FILE *gregorio_vowel_rulefile_get_in (void );
-void gregorio_vowel_rulefile_set_in (FILE * in_str );
+void gregorio_vowel_rulefile_set_in (FILE * _in_str );
FILE *gregorio_vowel_rulefile_get_out (void );
-void gregorio_vowel_rulefile_set_out (FILE * out_str );
+void gregorio_vowel_rulefile_set_out (FILE * _out_str );
yy_size_t gregorio_vowel_rulefile_get_leng (void );
@@ -631,7 +645,7 @@
int gregorio_vowel_rulefile_get_lineno (void );
-void gregorio_vowel_rulefile_set_lineno (int line_number );
+void gregorio_vowel_rulefile_set_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -645,6 +659,10 @@
#endif
#endif
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
@@ -669,7 +687,12 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -756,7 +779,7 @@
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
#define YY_RULE_SETUP \
@@ -766,9 +789,9 @@
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
if ( !(yy_init) )
{
@@ -800,9 +823,9 @@
#line 75 "vowel/vowel-rules.l"
-#line 804 "vowel/vowel-rules-l.c"
+#line 827 "vowel/vowel-rules-l.c"
- while ( 1 ) /* loops until end-of-file is reached */
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@@ -818,7 +841,7 @@
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -944,7 +967,7 @@
#line 94 "vowel/vowel-rules.l"
ECHO;
YY_BREAK
-#line 948 "vowel/vowel-rules-l.c"
+#line 971 "vowel/vowel-rules-l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(chars):
case YY_STATE_EOF(lang):
@@ -1090,9 +1113,9 @@
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ char *source = (yytext_ptr);
+ yy_size_t number_to_move, i;
int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1121,7 +1144,7 @@
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+ number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -1224,14 +1247,14 @@
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1256,10 +1279,10 @@
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
+ int yy_is_jam;
+ char *yy_cp = (yy_c_buf_p);
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1277,6 +1300,10 @@
return yy_is_jam ? 0 : yy_current_state;
}
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (void)
@@ -1426,7 +1453,7 @@
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile__create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = (yy_size_t)size;
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
@@ -1581,7 +1608,7 @@
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1;
+ num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
(yy_buffer_stack) = (struct yy_buffer_state**)gregorio_vowel_rulefile_alloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
@@ -1598,7 +1625,7 @@
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
+ yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)gregorio_vowel_rulefile_realloc
@@ -1706,7 +1733,7 @@
static void yy_fatal_error (yyconst char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
+ (void) fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@@ -1772,29 +1799,29 @@
}
/** Set the current line number.
- * @param line_number
+ * @param _line_number line number
*
*/
-void gregorio_vowel_rulefile_set_lineno (int line_number )
+void gregorio_vowel_rulefile_set_lineno (int _line_number )
{
- gregorio_vowel_rulefile_lineno = line_number;
+ gregorio_vowel_rulefile_lineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
*
* @see gregorio_vowel_rulefile__switch_to_buffer
*/
-void gregorio_vowel_rulefile_set_in (FILE * in_str )
+void gregorio_vowel_rulefile_set_in (FILE * _in_str )
{
- gregorio_vowel_rulefile_in = in_str ;
+ gregorio_vowel_rulefile_in = _in_str ;
}
-void gregorio_vowel_rulefile_set_out (FILE * out_str )
+void gregorio_vowel_rulefile_set_out (FILE * _out_str )
{
- gregorio_vowel_rulefile_out = out_str ;
+ gregorio_vowel_rulefile_out = _out_str ;
}
int gregorio_vowel_rulefile_get_debug (void)
@@ -1802,9 +1829,9 @@
return gregorio_vowel_rulefile__flex_debug;
}
-void gregorio_vowel_rulefile_set_debug (int bdebug )
+void gregorio_vowel_rulefile_set_debug (int _bdebug )
{
- gregorio_vowel_rulefile__flex_debug = bdebug ;
+ gregorio_vowel_rulefile__flex_debug = _bdebug ;
}
static int yy_init_globals (void)
@@ -1872,7 +1899,8 @@
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
- register int i;
+
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -1881,7 +1909,7 @@
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
@@ -1891,11 +1919,12 @@
void *gregorio_vowel_rulefile_alloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return (void *) malloc( size );
}
void *gregorio_vowel_rulefile_realloc (void * ptr, yy_size_t size )
{
+
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -1908,7 +1937,7 @@
void gregorio_vowel_rulefile_free (void * ptr )
{
- free( (char *) ptr ); /* see gregorio_vowel_rulefile_realloc() for (char *) cast */
+ free( (char *) ptr ); /* see gregorio_vowel_rulefile_realloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h 2016-06-07 12:39:58 UTC (rev 41309)
@@ -12,8 +12,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -115,7 +115,15 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -201,12 +209,15 @@
/* Begin user sect3 */
-#define gregorio_vowel_rulefile_wrap() 1
+#define gregorio_vowel_rulefile_wrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
extern int gregorio_vowel_rulefile_lineno;
extern char *gregorio_vowel_rulefile_text;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr gregorio_vowel_rulefile_text
#ifdef YY_HEADER_EXPORT_START_CONDITIONS
@@ -244,11 +255,11 @@
FILE *gregorio_vowel_rulefile_get_in (void );
-void gregorio_vowel_rulefile_set_in (FILE * in_str );
+void gregorio_vowel_rulefile_set_in (FILE * _in_str );
FILE *gregorio_vowel_rulefile_get_out (void );
-void gregorio_vowel_rulefile_set_out (FILE * out_str );
+void gregorio_vowel_rulefile_set_out (FILE * _out_str );
yy_size_t gregorio_vowel_rulefile_get_leng (void );
@@ -256,7 +267,7 @@
int gregorio_vowel_rulefile_get_lineno (void );
-void gregorio_vowel_rulefile_set_lineno (int line_number );
+void gregorio_vowel_rulefile_set_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -284,7 +295,12 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Number of entries by which start-condition stack grows. */
@@ -320,6 +336,6 @@
#line 94 "vowel/vowel-rules.l"
-#line 324 "vowel/vowel-rules-l.h"
+#line 340 "vowel/vowel-rules-l.h"
#undef gregorio_vowel_rulefile_IN_HEADER
#endif /* gregorio_vowel_rulefile_HEADER_H */
Modified: trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc 2016-06-07 12:39:58 UTC (rev 41309)
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 4,1,1,30
-PRODUCTVERSION 4,1,1,30
+FILEVERSION 4,1,4,30
+PRODUCTVERSION 4,1,4,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "4.1.1"
+ VALUE "FileVersion", "4.1.4"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "4.1.1"
+ VALUE "ProductVersion", "4.1.4"
END
END
Modified: trunk/Build/source/texk/gregorio/version.ac
===================================================================
--- trunk/Build/source/texk/gregorio/version.ac 2016-06-07 10:56:55 UTC (rev 41308)
+++ trunk/Build/source/texk/gregorio/version.ac 2016-06-07 12:39:58 UTC (rev 41309)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [4.1.1])
+m4_define([gregorio_version], [4.1.4])
More information about the tex-live-commits
mailing list