texlive[43809] Build/source/texk: gregorio-5.0.0
commits+kakuto at tug.org
commits+kakuto at tug.org
Sat Apr 15 23:00:07 CEST 2017
Revision: 43809
http://tug.org/svn/texlive?view=revision&revision=43809
Author: kakuto
Date: 2017-04-15 23:00:07 +0200 (Sat, 15 Apr 2017)
Log Message:
-----------
gregorio-5.0.0
Modified Paths:
--------------
trunk/Build/source/texk/README
trunk/Build/source/texk/gregorio/ChangeLog
trunk/Build/source/texk/gregorio/Makefile.am
trunk/Build/source/texk/gregorio/Makefile.in
trunk/Build/source/texk/gregorio/TLpatches/ChangeLog
trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
trunk/Build/source/texk/gregorio/config_.h.in
trunk/Build/source/texk/gregorio/configure
trunk/Build/source/texk/gregorio/configure.ac
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/README.md
trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
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/src/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
trunk/Build/source/texk/gregorio/gregorio.test
trunk/Build/source/texk/gregorio/version.ac
Added Paths:
-----------
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine
Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/README 2017-04-15 21:00:07 UTC (rev 43809)
@@ -61,7 +61,7 @@
dvisvgm 2.1.3 - checked 21feb17
http://dvisvgm.bplaced.net/Downloads
-gregorio 5.0.0-rc1 - checked 06apr17
+gregorio 5.0.0 - checked 15apr17
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 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/ChangeLog 2017-04-15 21:00:07 UTC (rev 43809)
@@ -1,3 +1,11 @@
+2017-04-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * Import gregorio-5.0.0.
+ * configure.ac (FILENAME_VERSION): no need to define for TL.
+ * gregorio.test (gregorio): do not use $FILENAME_VERSION.
+ * Makefile.am (bin_PROGRAMS): just "gregorio" (same as TL'16).
+ (gregorio.log): likewise.
+
2017-04-06 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Import gregorio-5.0.0-rc1.
Modified: trunk/Build/source/texk/gregorio/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/Makefile.am 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/Makefile.am 2017-04-15 21:00:07 UTC (rev 43809)
@@ -23,9 +23,9 @@
$(KPATHSEA_INCLUDES) -D_GNU_SOURCE -DUSE_KPSE
AM_CFLAGS = $(WARNING_CFLAGS)
-bin_PROGRAMS = gregorio-$(FILENAME_VERSION)
+bin_PROGRAMS = gregorio
-gregorio___FILENAME_VERSION__SOURCES = \
+gregorio_SOURCES = \
@GREGORIO_TREE@/src/characters.c \
@GREGORIO_TREE@/src/gregorio-utils.c \
@GREGORIO_TREE@/src/messages.c \
@@ -49,7 +49,7 @@
LDADD = $(KPATHSEA_LIBS)
-$(gregorio___FILENAME_VERSION__OBJECTS): $(KPATHSEA_DEPEND)
+$(gregorio_OBJECTS): $(KPATHSEA_DEPEND)
## Rebuild libkpathsea
@KPATHSEA_RULE@
@@ -57,7 +57,7 @@
## TESTS
AM_TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'; export GREGORIO_TREE;
TESTS = gregorio.test
-gregorio.log: gregorio-$(FILENAME_VERSION)$(EXEEXT)
+gregorio.log: gregorio$(EXEEXT)
EXTRA_DIST += $(TESTS)
DISTCLEANFILES = factus.gtex veni.gtex
Modified: trunk/Build/source/texk/gregorio/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/Makefile.in 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/Makefile.in 2017-04-15 21:00:07 UTC (rev 43809)
@@ -88,7 +88,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = gregorio-$(FILENAME_VERSION)$(EXEEXT)
+bin_PROGRAMS = gregorio$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -113,8 +113,7 @@
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
-am_gregorio___FILENAME_VERSION__OBJECTS = \
- @GREGORIO_TREE@/src/characters.$(OBJEXT) \
+am_gregorio_OBJECTS = @GREGORIO_TREE@/src/characters.$(OBJEXT) \
@GREGORIO_TREE@/src/gregorio-utils.$(OBJEXT) \
@GREGORIO_TREE@/src/messages.$(OBJEXT) \
@GREGORIO_TREE@/src/sha1.$(OBJEXT) \
@@ -134,11 +133,10 @@
@GREGORIO_TREE@/src/vowel/vowel.$(OBJEXT) \
@GREGORIO_TREE@/src/vowel/vowel-rules-l.$(OBJEXT) \
@GREGORIO_TREE@/src/vowel/vowel-rules-y.$(OBJEXT)
-gregorio___FILENAME_VERSION__OBJECTS = \
- $(am_gregorio___FILENAME_VERSION__OBJECTS)
-gregorio___FILENAME_VERSION__LDADD = $(LDADD)
+gregorio_OBJECTS = $(am_gregorio_OBJECTS)
+gregorio_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
-gregorio___FILENAME_VERSION__DEPENDENCIES = $(am__DEPENDENCIES_1)
+gregorio_DEPENDENCIES = $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -177,8 +175,8 @@
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(gregorio___FILENAME_VERSION__SOURCES)
-DIST_SOURCES = $(gregorio___FILENAME_VERSION__SOURCES)
+SOURCES = $(gregorio_SOURCES)
+DIST_SOURCES = $(gregorio_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -465,7 +463,6 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-FILENAME_VERSION = @FILENAME_VERSION@
GREGORIO_TREE = @GREGORIO_TREE@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -579,7 +576,7 @@
$(KPATHSEA_INCLUDES) -D_GNU_SOURCE -DUSE_KPSE
AM_CFLAGS = $(WARNING_CFLAGS)
-gregorio___FILENAME_VERSION__SOURCES = \
+gregorio_SOURCES = \
@GREGORIO_TREE@/src/characters.c \
@GREGORIO_TREE@/src/gregorio-utils.c \
@GREGORIO_TREE@/src/messages.c \
@@ -799,9 +796,9 @@
@GREGORIO_TREE@/src/vowel/$(am__dirstamp) \
@GREGORIO_TREE@/src/vowel/$(DEPDIR)/$(am__dirstamp)
-gregorio-$(FILENAME_VERSION)$(EXEEXT): $(gregorio___FILENAME_VERSION__OBJECTS) $(gregorio___FILENAME_VERSION__DEPENDENCIES) $(EXTRA_gregorio___FILENAME_VERSION__DEPENDENCIES)
- @rm -f gregorio-$(FILENAME_VERSION)$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(gregorio___FILENAME_VERSION__OBJECTS) $(gregorio___FILENAME_VERSION__LDADD) $(LIBS)
+gregorio$(EXEEXT): $(gregorio_OBJECTS) $(gregorio_DEPENDENCIES) $(EXTRA_gregorio_DEPENDENCIES)
+ @rm -f gregorio$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gregorio_OBJECTS) $(gregorio_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1400,10 +1397,10 @@
dist-hook:
cd "$(distdir)" && rm -rf $(NEVER_DIST)
-$(gregorio___FILENAME_VERSION__OBJECTS): $(KPATHSEA_DEPEND)
+$(gregorio_OBJECTS): $(KPATHSEA_DEPEND)
@KPATHSEA_RULE@
-gregorio.log: gregorio-$(FILENAME_VERSION)$(EXEEXT)
+gregorio.log: gregorio$(EXEEXT)
# 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.
Modified: trunk/Build/source/texk/gregorio/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/ChangeLog 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/TLpatches/ChangeLog 2017-04-15 21:00:07 UTC (rev 43809)
@@ -1,3 +1,7 @@
+2017-04-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import gregorio-5.0.0.
+
2017-04-06 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import gregorio-5.0.0-rc1.
Modified: trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/TL-Changes 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/TLpatches/TL-Changes 2017-04-15 21:00:07 UTC (rev 43809)
@@ -1,5 +1,5 @@
-Changes applied to the gregorio-5.0.0-rc1 tree as obtained from:
- https://github.com/gregorio-project/gregorio/releases/download/v5.0.0-rc1
+Changes applied to the gregorio-5.0.0 tree as obtained from:
+ https://github.com/gregorio-project/gregorio/releases/download/v5.0.0
Remove:
Makefile.in
Modified: trunk/Build/source/texk/gregorio/config_.h.in
===================================================================
--- trunk/Build/source/texk/gregorio/config_.h.in 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/config_.h.in 2017-04-15 21:00:07 UTC (rev 43809)
@@ -9,9 +9,6 @@
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* version suitable for file names */
-#undef FILENAME_VERSION
-
/* Define to 1 if realpath() can malloc memory, always gives an absolute path,
and handles trailing slash correctly. */
#undef FUNC_REALPATH_WORKS
Modified: trunk/Build/source/texk/gregorio/configure
===================================================================
--- trunk/Build/source/texk/gregorio/configure 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/configure 2017-04-15 21:00:07 UTC (rev 43809)
@@ -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.0.0-rc1.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.0.0.
#
# 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='5.0.0-rc1'
-PACKAGE_STRING='Gregorio (TeX Live) 5.0.0-rc1'
+PACKAGE_VERSION='5.0.0'
+PACKAGE_STRING='Gregorio (TeX Live) 5.0.0'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL='http://gregorio-project.github.io/'
@@ -724,7 +724,6 @@
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-FILENAME_VERSION
target_alias
host_alias
build_alias
@@ -1331,7 +1330,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) 5.0.0-rc1 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 5.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,7 +1401,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.0.0-rc1:";;
+ short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.0.0:";;
esac
cat <<\_ACEOF
@@ -1522,7 +1521,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Gregorio (TeX Live) configure 5.0.0-rc1
+Gregorio (TeX Live) configure 5.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2361,7 +2360,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 5.0.0-rc1, which was
+It was created by Gregorio (TeX Live) $as_me 5.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2710,15 +2709,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-FILENAME_VERSION="5_0_0-rc1"
-cat >>confdefs.h <<_ACEOF
-#define FILENAME_VERSION "$FILENAME_VERSION"
-_ACEOF
-
-
-
ac_aux_dir=
for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do
if test -f "$ac_dir/install-sh"; then
@@ -8054,7 +8046,7 @@
# Define the identity of the package.
PACKAGE='gregorio--tex-live-'
- VERSION='5.0.0-rc1'
+ VERSION='5.0.0'
cat >>confdefs.h <<_ACEOF
@@ -14474,7 +14466,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Gregorio (TeX Live) config.lt 5.0.0-rc1
+Gregorio (TeX Live) config.lt 5.0.0
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16061,7 +16053,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 5.0.0-rc1, which was
+This file was extended by Gregorio (TeX Live) $as_me 5.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16128,7 +16120,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 5.0.0-rc1
+Gregorio (TeX Live) config.status 5.0.0
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 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/configure.ac 2017-04-15 21:00:07 UTC (rev 43809)
@@ -10,9 +10,6 @@
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="5_0_0-rc1"
-AC_SUBST(FILENAME_VERSION)
-AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([gregorio-src/src/gregorio-utils.c])
AC_CONFIG_AUX_DIR([../../build-aux])
Modified: trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version 2017-04-15 21:00:07 UTC (rev 43809)
@@ -1,4 +1,4 @@
-5.0.0-rc1
+5.0.0
*** 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 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2017-04-15 21:00:07 UTC (rev 43809)
@@ -5,24 +5,13 @@
## [Unreleased][unreleased]
-## [5.0.0-rc1] - 2017-04-04
+## [5.0.0] - 2017-04-15
### Fixed
- The printing of the commentary box is no longer tied to the printing of the inital. As a result it is now possible to have a score which has a commentary but not an initial. See [this thread on the user list](http://www.mail-archive.com/gregorio-users@gna.org/msg03911.html).
- Elisions after a vowel centering prefix will no longer cause the center to be placed on the vowel in the prefix. Since prefixes are unvoiced vowels, this makes more sense than the previous behavior. As usual, you may use the manual centering features to force the centering where you want if this does not produce what you want. See [#1320](https://github.com/gregorio-project/gregorio/issues/1320).
- Dynmanic line spacing when a clef change occurs at the end of a line is fixed so that the line after the clef change is spaced appropriately. See [#1285](https://github.com/gregorio-project/gregorio/issues/1285).
- Spaces in the filename of a score no longer cause Gregoriotex to fail. See [#1224](https://github.com/gregorio-project/gregorio/issues/1224).
-
-## [5.0.0-beta2] - 2017-02-24
-### Fixed
- Glyphs for pes quadratum shapes with initio debilis are no longer missing. Use `-fqg` to engrave them. See [#1310](https://github.com/gregorio-project/gregorio/issues/1310).
-
-### Changed
-- The default behaviour of `\gregorioscore` has been changed to autocompile.
-- When the note after an oriscus is at the same pitch, the oriscus direction now depends on the first non-unison, non-oriscus note after the oriscus (see [#1179](https://github.com/gregorio-project/gregorio/issues/1179)).
-- 6 new St. Gall neume glyphs have been added to the `gregall` font and glyph for nabc `to!ciG` has been changed (see [#1303](https://github.com/gregorio-project/gregorio/issues/1303), [#1305](https://github.com/gregorio-project/gregorio/issues/1305), [#1313](https://github.com/gregorio-project/gregorio/issues/1313), [#1314](https://github.com/gregorio-project/gregorio/issues/1314), [#1315](https://github.com/gregorio-project/gregorio/issues/1315)).
-
-## [5.0.0-beta1] - 2017-01-31
-### Fixed
- Horizontal episemata bridge spaces more correctly. As mentioned earlier, you can prevent this by appending `2` to the `_` on the note before the space you do not want bridged. See [#1216](https://github.com/gregorio-project/gregorio/issues/1216).
- A rising note after an oriscus flexus will no longer generate a porrectus (see [#1220](https://github.com/gregorio-project/gregorio/issues/1220)).
- The Scribus external tool script now uses latexmk in order to handle the multi-pass features of Gregorio (see [#1236](https://github.com/gregorio-project/gregorio/issues/1236)).
@@ -32,6 +21,9 @@
- A pes whose second note is an oriscus now obeys the oriscus orientation rules (see [#1272](https://github.com/gregorio-project/gregorio/issues/1272))
### Changed
+- The default behaviour of `\gregorioscore` has been changed to autocompile.
+- When the note after an oriscus is at the same pitch, the oriscus direction now depends on the first non-unison, non-oriscus note after the oriscus (see [#1179](https://github.com/gregorio-project/gregorio/issues/1179)).
+- 6 new St. Gall neume glyphs have been added to the `gregall` font and glyph for nabc `to!ciG` has been changed (see [#1303](https://github.com/gregorio-project/gregorio/issues/1303), [#1305](https://github.com/gregorio-project/gregorio/issues/1305), [#1313](https://github.com/gregorio-project/gregorio/issues/1313), [#1314](https://github.com/gregorio-project/gregorio/issues/1314), [#1315](https://github.com/gregorio-project/gregorio/issues/1315)).
- Notes are now left-aligned as if all clefs had the same width as the largest clef in the score. You can get previous behavior back with `\grebolshiftcleftype{current}`, or temporary force alignment until the end of a score with `\grelocalbolshiftcleftype`. See Documentation of these functions and [#1189](https://github.com/gregorio-project/gregorio/issues/1189).
- A clef change immediately before a line break `(z)` will now typeset the new clef at the beginning of the next line. An explicit custos `(z0)` immediately before such a clef change (or separated by only a bar) will be suppressed. See [#1190](https://github.com/gregorio-project/gregorio/issues/1190).
- Ledger lines are now extended through notes on either side of a ledger line that crosses a stem, as long as the notes are within the same "element." If the algorithm doesn't produce the result you want, you can use `[oll:0]` to suppress an over-the-staff ledger line on a note, `[ull:0]` to suppress an under-the-staff ledger line on a note, `[oll:1]` to force an over-the-line ledger line on a note, or [ull:1] to force an under-the-staff ledger line on a note. Please note that other forms of `[oll:...]` and `[ull:...]` can interfere with these new settings. See [UPGRADE.md](UPGRADE.md) and [#1215](https://github.com/gregorio-project/gregorio/issues/1215) for details.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/README.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/README.md 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/README.md 2017-04-15 21:00:07 UTC (rev 43809)
@@ -22,6 +22,10 @@
- Switch to TeXLive 2015 (which uses an earlier version of `luaotfload`) to build the docs.
- Upgrade your `luaotfload` to a more recent version (v2.8 or later).
+## Building for inclusion in TeXLive
+
+When building gregorio for inclusion in TeXLive, the gregorio executable must not have the version number prefix that is used for other builds. To make this happen, run `configure` with the `--disable-version-in-exe` option, and the generated Makefile will create a gregorio executable without the version number prefix (i.e., the executable will simply be named `gregorio`).
+
## Documentation
You can find documentation and useful links in the [documentation](doc/), on [the main website](http://gregorio-project.github.io/) and on [a wiki](http://gregoriochant.org).
Modified: trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2017-04-15 21:00:07 UTC (rev 43809)
@@ -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],[5.0.0-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_0_0-rc1"
+AC_INIT([gregorio],[5.0.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="5_0_0"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
@@ -104,6 +104,17 @@
CPPFLAGS+=" -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 "
])
+AC_ARG_ENABLE([version-in-exe], AS_HELP_STRING([--disable-version-in-exe], [Disable version in executable name.]), [
+ AS_IF([test "x$enableval" != "xno"], [
+ GREGORIO_EXE_SUFFIX="-$FILENAME_VERSION"
+ ], [
+ GREGORIO_EXE_SUFFIX=""
+ ])
+], [
+ GREGORIO_EXE_SUFFIX="-$FILENAME_VERSION"
+])
+AC_SUBST(GREGORIO_EXE_SUFFIX)
+
AC_CONFIG_HEADERS([src/config_.h])
AC_CONFIG_FILES([
Makefile
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine 2017-04-15 21:00:07 UTC (rev 43809)
@@ -1,4 +1,8 @@
-#!/bin/tcsh
+#!/bin/bash
-set path= ($path /usr/texbin /usr/local/bin)
+if [[ -n ${2:+x} ]]; then
+ echo "I will add $2 to the input path"
+ export TEXINPUTS="$2//:"
+ export LUAINPUTS="$2//:"
+fi
lualatex --shell-escape -file-line-error -synctex=1 "$1"
Added: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine (rev 0)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine 2017-04-15 21:00:07 UTC (rev 43809)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ -n ${2:+x} ]]; then
+ echo "I will add $2 to the input path"
+ export TEXINPUTS="$2//:"
+ export LUAINPUTS="$2//:"
+fi
+luatex --shell-escape -file-line-error -synctex=1 "$1"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am 2017-04-15 21:00:07 UTC (rev 43809)
@@ -15,4 +15,4 @@
# 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
+EXTRA_DIST = auto-configure.command LuaLaTeX+se.engine LuaTeX+se.engine
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command 2017-04-15 21:00:07 UTC (rev 43809)
@@ -29,6 +29,15 @@
echo "Please try running the Gregorio intaller again"
exit 1
fi
+SOURCE="/Users/Shared/Gregorio/contrib/TeXShop/LuaTeX+se.engine"
+if [ -e "$SOURCE" ]; then
+ echo "Copying LuaTeX+se.engine into TeXShop configuration"
+ cp "$SOURCE" "$ENGINEDIR"
+else
+ echo "Cannot find LuaTeX+se.engine"
+ echo "Please try running the Gregorio intaller again"
+ exit 1
+fi
echo "Configuration complete"
exit 0
Modified: trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex 2017-04-15 21:00:07 UTC (rev 43809)
@@ -733,42 +733,6 @@
& \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
\end{argtable}
-\macroname{\textbackslash GreAscendensOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset an ascending oriscus cavum (the oriscus points at a higher note).
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GreDescendensOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a descending oriscus cavum (the oriscus points at a lower note).
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GreOriscusCavumDeminutus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a reverse oriscus cavum with a deminutus tail.
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
\macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
Macro to typeset a round brace above the lines.
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 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex 2017-04-15 21:00:07 UTC (rev 43809)
@@ -285,14 +285,6 @@
\#2 & string & Relative or absolute path to the score.\\
\end{argtable}
-\macroname{\textbackslash gre at gabcsnippet}{\#1}{gregoriotex-main.tex}
-Macro that handles \verb=\gabcsnippet= calls when they do not have an
-optional argument.
-
-\begin{argtable}
- \#1 & string & Snippet of gabc code.\\
-\end{argtable}
-
\macroname{\textbackslash gre at writemode}{\#1\#2\#3}{gregoriotex-main.tex}
Macro that writes its arguments with \verb=\greannotation=. This
macro is typically called by \verb=\GreMode= in the gtex file.
@@ -878,6 +870,10 @@
\#2 & string & the new commentary content\\
\end{argtable}
+\macroname{\textbackslash gre at printcommentary}{}{gregoriotex-main.tex}
+Computes the true ``raise'' and prints the commentary contained in
+\verb=\gre at box@commentary=.
+
\macroname{\textbackslash gre at atletter}{}{gregoriotex-main.tex}
A Lua\TeX\ catcode table which makes sure that Lua\TeX\ treats `@‘ corectly.
@@ -896,6 +892,44 @@
\macroname{\textbackslash gre at changestyle}{\#1\#2[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex}
Workhorse function behind \verb=\grechangestyle=. Necessary because the internals of the definition are slightly different in \LaTeX\ and Plain \TeX.
+\macroname{\textbackslash gre at bolshiftcleftypeglobal}{}{gregoriotex-spaces.tex}
+Takes on the value \texttt{1}, \texttt{2}, or \texttt{3} depending on whether
+to calculate the beginning-of-line shift based on the largest, current, or
+forced clef width (\ie, directly use the value stored in
+\verb=\gre at dimen@clefwidth at bol=), respectively. This is the ``global'' value,
+used to initialize \verb=\gre at bolshiftcleftypelocal= at the start of a score.
+
+\macroname{\textbackslash gre at bolshiftcleftypelocal}{}{gregoriotex-spaces.tex}
+Takes on the value \texttt{1}, \texttt{2}, or \texttt{3} depending on whether
+to calculate the beginning-of-line shift based on the largest, current, or
+forced clef width (\ie, directly use the value stored in
+\verb=\gre at dimen@clefwidth at bol=), respectively. This is the ``local'' value,
+used in the actual computation.
+
+\macroname{\textbackslash gre at update@clefwidth at largest}{\#1}{gregoriotex-spaces.tex}
+Updates the ``largest'' clef width, used when \verb=\gre at bolshiftcleftypelocal=
+is \texttt{1}.
+
+\begin{argtable}
+ \#1 & distance & The new value to use for the ``largest'' clef width.\\
+\end{argtable}
+
+\macroname{\textbackslash gre at update@clefwidth at current}{\#1}{gregoriotex-spaces.tex}
+Updates the ``current'' clef width, used when \verb=\gre at bolshiftcleftypelocal=
+is \texttt{2}.
+
+\begin{argtable}
+ \#1 & distance & The new value to use for the ``current'' clef width.\\
+\end{argtable}
+
+\macroname{\textbackslash gre at update@clefwidth at forced}{\#1}{gregoriotex-spaces.tex}
+Updates the ``forced'' clef width, used when \verb=\gre at bolshiftcleftypelocal=
+is \texttt{3}.
+
+\begin{argtable}
+ \#1 & distance & The new value to use for the ``forced'' clef width.\\
+\end{argtable}
+
\macroname{\textbackslash gre at calculate@bolshift}{\#1\#2}{gregoriotex-spaces.tex}
Macro used in \verb=\GreSyllable=. Sets \verb=\gre at skip@bolshift= to the left kern that should appear at the beginning of a line in case of a forced linebreak. The goal of this left kern is to have all lines aligned on notes. This shift is applied to the right before every syllable and then to the left after placing an empty box. At the beginning of the line the shift to the right is ignored by \TeX\ as leading white space, but the shift left is not because of the presence of the “character” of the empty box.
@@ -1397,6 +1431,14 @@
\macroname{\textbackslash gre at restore@additionalspaces}{}{gregoriotex-spaces.tex}
Macro to restore the additional vertical spaces associated with the line from their saved values.
+\macroname{\textbackslash gre at clearsyllable}{\#1}{gregoriotex-spaces.tex}
+Prevents the current syllable from overlapping with the previous syllable.
+
+\begin{argtable}
+ \#1 & bar & the current syllable is a bar syllable.\\
+ & note & the current syllable is a note syllable.\\
+\end{argtable}
+
\subsection{Auxiliary File}
Gregorio\TeX\ creates its own auxiliary file (extension \texttt{gaux}) which it uses to store information between successive typesetting runs. This allows for such features as the dynamic interline spacing. The following functions are used to interact with that auxiliary file.
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 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex 2017-04-15 21:00:07 UTC (rev 43809)
@@ -177,7 +177,7 @@
\vspace{1cm}
- \large Version \textbf{5.0.0-rc1}, 4 April 2017 %% PARSE_VERSION_DATE
+ \large Version \textbf{5.0.0}, 15 April 2017 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am 2017-04-15 21:00:07 UTC (rev 43809)
@@ -19,8 +19,8 @@
AM_CFLAGS = $(KPSE_CFLAGS)
LDADD = $(KPSE_LIBS)
-bin_PROGRAMS = gregorio-$(FILENAME_VERSION)
-gregorio___FILENAME_VERSION__SOURCES = \
+bin_PROGRAMS = gregorio$(GREGORIO_EXE_SUFFIX)
+gregorio__GREGORIO_EXE_SUFFIX__SOURCES = \
gregorio-utils.c characters.c characters.h messages.c messages.h struct.c \
struct.h struct_iter.h enum_generator.h unicode.c unicode.h sha1.c sha1.h \
support.c support.h config.h bool.h plugins.h utf8strings.h dump/dump.c \
@@ -47,7 +47,7 @@
@MK at endif
# gabc files
-gregorio___FILENAME_VERSION__SOURCES += \
+gregorio__GREGORIO_EXE_SUFFIX__SOURCES += \
gabc/gabc-elements-determination.c gabc/gabc-write.c \
gabc/gabc-glyphs-determination.c gabc/gabc.h \
gabc/gabc-score-determination.h gabc/gabc-score-determination.c \
@@ -72,7 +72,7 @@
gregorio-resources.o: ../windows/gregorio-resources.rc ../windows/gregorio.ico
$(RC) $(RCFLAGS) $< -o $@
-gregorio___FILENAME_VERSION__SOURCES += ../windows/gregorio-resources.rc ../windows/gregorio.ico
+gregorio__GREGORIO_EXE_SUFFIX__SOURCES += ../windows/gregorio-resources.rc ../windows/gregorio.ico
LDADD += gregorio-resources.o
endif
Modified: trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc 2017-04-15 21:00:07 UTC (rev 43809)
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 5,0,0,21
-PRODUCTVERSION 5,0,0,21
+FILEVERSION 5,0,0,30
+PRODUCTVERSION 5,0,0,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "5.0.0-rc1"
+ VALUE "FileVersion", "5.0.0"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "5.0.0-rc1"
+ VALUE "ProductVersion", "5.0.0"
END
END
Modified: trunk/Build/source/texk/gregorio/gregorio.test
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio.test 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/gregorio.test 2017-04-15 21:00:07 UTC (rev 43809)
@@ -10,13 +10,8 @@
DOCSRC=$srcdir/$GREGORIO_TREE/doc
-#
-# Does FILENAME_VERSION have a value here? If it does, the
-# next line is not needed
-FILENAME_VERSION=5_0_0-rc1
+gregorio=gregorio
-gregorio=gregorio-$FILENAME_VERSION
-
failed=
echo "*** gregorio --version" \
Modified: trunk/Build/source/texk/gregorio/version.ac
===================================================================
--- trunk/Build/source/texk/gregorio/version.ac 2017-04-15 20:32:45 UTC (rev 43808)
+++ trunk/Build/source/texk/gregorio/version.ac 2017-04-15 21:00:07 UTC (rev 43809)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [5.0.0-rc1])
+m4_define([gregorio_version], [5.0.0])
More information about the tex-live-commits
mailing list