summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-12-19 03:28:00 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-12-19 03:28:00 +0000
commit71ad6e34fa27933974fb63f17b86011853b0373c (patch)
treeccc6e6b624b53619fac9200b0bbb3b6438433da6
parent8d5b768ad222f0da858e40a8491b1334758631b8 (diff)
gregorio 5.2.1 (same as 5.2.0 except for vesrsion number)
git-svn-id: svn://tug.org/texlive/trunk@53185 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/README6
-rw-r--r--Build/source/texk/gregorio/ChangeLog5
-rw-r--r--Build/source/texk/gregorio/TLpatches/ChangeLog4
-rw-r--r--Build/source/texk/gregorio/TLpatches/TL-Changes4
-rwxr-xr-xBuild/source/texk/gregorio/configure22
-rw-r--r--Build/source/texk/gregorio/gregorio-src/CHANGELOG.md6
-rw-r--r--Build/source/texk/gregorio/gregorio-src/configure.ac4
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc8
-rw-r--r--Build/source/texk/gregorio/version.ac2
10 files changed, 39 insertions, 24 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index dd265813069..8a6bfbc8c0c 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -64,11 +64,11 @@ dvipos - maintained here, by us
dvipsk - maintained here, by us
-dvisvgm 2.6.3 - checked 10mar19
+dvisvgm 2.8.2 - checked 10dec19
https://dvisvgm.de/Downloads/
-gregorio 5.2.0 - checked 11mar19
- CTAN/support/gregoriotex/gregorio-5.2.0.zip
+gregorio 5.2.1 - checked 19dec19
+ CTAN/support/gregoriotex/gregorio-5.2.1.zip
gsftopk - from Paul Vojta's xdvi?
diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog
index f96adebb3af..a9a3559218d 100644
--- a/Build/source/texk/gregorio/ChangeLog
+++ b/Build/source/texk/gregorio/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-19 Akira Kakuto <kakuto@w32tex.org>
+
+ * Import gregorio-5.2.1.
+ * version.ac: Adapted.
+
2019-03-11 Akira Kakuto <kakuto@w32tex.org>
* Import gregorio-5.2.0.
diff --git a/Build/source/texk/gregorio/TLpatches/ChangeLog b/Build/source/texk/gregorio/TLpatches/ChangeLog
index e19286ba737..32d5f69325d 100644
--- a/Build/source/texk/gregorio/TLpatches/ChangeLog
+++ b/Build/source/texk/gregorio/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-19 Akira Kakuto <kakuto@w32tex.org>
+
+ Import gregorio-5.2.1.
+
2019-03-11 Akira Kakuto <kakuto@w32tex.org>
Import gregorio-5.2.0.
diff --git a/Build/source/texk/gregorio/TLpatches/TL-Changes b/Build/source/texk/gregorio/TLpatches/TL-Changes
index af995d0accb..6351e374f22 100644
--- a/Build/source/texk/gregorio/TLpatches/TL-Changes
+++ b/Build/source/texk/gregorio/TLpatches/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the gregorio-5.2.0 tree as obtained from:
- CTAN/support/gregoriotex/gregorio-5.2.0.zip
+Changes applied to the gregorio-5.2.1 tree as obtained from:
+ CTAN/support/gregoriotex/gregorio-5.2.1.zip
Remove:
Makefile.in
diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure
index fad9fe44fa6..eacfee74592 100755
--- a/Build/source/texk/gregorio/configure
+++ b/Build/source/texk/gregorio/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.2.0.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.2.1.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Gregorio (TeX Live)'
PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='5.2.0'
-PACKAGE_STRING='Gregorio (TeX Live) 5.2.0'
+PACKAGE_VERSION='5.2.1'
+PACKAGE_STRING='Gregorio (TeX Live) 5.2.1'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL='http://gregorio-project.github.io/'
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Gregorio (TeX Live) 5.2.0 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 5.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1401,7 +1401,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.2.0:";;
+ short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.2.1:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Gregorio (TeX Live) configure 5.2.0
+Gregorio (TeX Live) configure 5.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Gregorio (TeX Live) $as_me 5.2.0, which was
+It was created by Gregorio (TeX Live) $as_me 5.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8048,7 +8048,7 @@ fi
# Define the identity of the package.
PACKAGE='gregorio--tex-live-'
- VERSION='5.2.0'
+ VERSION='5.2.1'
cat >>confdefs.h <<_ACEOF
@@ -14468,7 +14468,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-Gregorio (TeX Live) config.lt 5.2.0
+Gregorio (TeX Live) config.lt 5.2.1
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16057,7 +16057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Gregorio (TeX Live) $as_me 5.2.0, which was
+This file was extended by Gregorio (TeX Live) $as_me 5.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16124,7 +16124,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Gregorio (TeX Live) config.status 5.2.0
+Gregorio (TeX Live) config.status 5.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
index a349d63ef86..89d74a76d61 100644
--- a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
+++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
@@ -2,6 +2,12 @@
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/).
+## [5.2.1] - 2019-04-06
+### Fixed
+- Project names with quotes in them no longer cause GregorioTeX to not be able to find the executable. See [#1416](https://github.com/gregorio-project/gregorio/issues/1416).
+- Eliminated implicit casting from float to integer in string formatting (something no longer allowed in Lua 5.3)
+
+
## [5.2.0] - 2019-03-10
### Fixed
- `latin` is now supported as a valid language name. This brings Latin into line with other languages where both titlecased and lowercased version of the language name (e.g. `English` and `english`) are both allowed.
diff --git a/Build/source/texk/gregorio/gregorio-src/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac
index 3f01d77c3e3..2d2de951df4 100644
--- a/Build/source/texk/gregorio/gregorio-src/configure.ac
+++ b/Build/source/texk/gregorio/gregorio-src/configure.ac
@@ -16,8 +16,8 @@ dnl
dnl You should have received a copy of the GNU General Public License
dnl along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([gregorio],[5.2.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_2_0"
+AC_INIT([gregorio],[5.2.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="5_2_1"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
index 283553adfb4..ad622dc5b9b 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
@@ -198,7 +198,7 @@ for %%G in (%files%) do (
set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- otfinfo --font-version !loc! >> %output% 2>&1
+ otfinfo --font-version "!loc!" >> %output% 2>&1
)
)
diff --git a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
index e3fbd0e1808..06f463bea07 100644
--- a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
+++ b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 5,2,0,30
-PRODUCTVERSION 5,2,0,30
+FILEVERSION 5,2,1,30
+PRODUCTVERSION 5,2,1,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "5.2.0"
+ VALUE "FileVersion", "5.2.1"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "5.2.0"
+ VALUE "ProductVersion", "5.2.1"
END
END
diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac
index ba99c084ef8..ce90b2672d6 100644
--- a/Build/source/texk/gregorio/version.ac
+++ b/Build/source/texk/gregorio/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [5.2.0])
+m4_define([gregorio_version], [5.2.1])