diff options
26 files changed, 150 insertions, 126 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README index 3909c58cb32..c06848efe63 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -61,7 +61,7 @@ dvipsk - maintained here, by us 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? diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog index 820149452de..41464b47f99 100644 --- a/Build/source/texk/gregorio/ChangeLog +++ b/Build/source/texk/gregorio/ChangeLog @@ -1,3 +1,11 @@ +2017-04-15 Akira Kakuto <kakuto@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@fuk.kindai.ac.jp> * Import gregorio-5.0.0-rc1. diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am index 9a73bd15c52..1de6788f0e4 100644 --- a/Build/source/texk/gregorio/Makefile.am +++ b/Build/source/texk/gregorio/Makefile.am @@ -23,9 +23,9 @@ AM_CPPFLAGS = \ $(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 @@ gregorio___FILENAME_VERSION__SOURCES = \ LDADD = $(KPATHSEA_LIBS) -$(gregorio___FILENAME_VERSION__OBJECTS): $(KPATHSEA_DEPEND) +$(gregorio_OBJECTS): $(KPATHSEA_DEPEND) ## Rebuild libkpathsea @KPATHSEA_RULE@ @@ -57,7 +57,7 @@ $(gregorio___FILENAME_VERSION__OBJECTS): $(KPATHSEA_DEPEND) ## 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 diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in index 1c7a4334dd4..7d11a596936 100644 --- a/Build/source/texk/gregorio/Makefile.in +++ b/Build/source/texk/gregorio/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : 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 @@ CONFIG_CLEAN_VPATH_FILES = 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 @@ am_gregorio___FILENAME_VERSION__OBJECTS = \ @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_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -177,8 +175,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@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 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FILENAME_VERSION = @FILENAME_VERSION@ GREGORIO_TREE = @GREGORIO_TREE@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -579,7 +576,7 @@ AM_CPPFLAGS = \ $(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 @@ clean-binPROGRAMS: @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 @@ uninstall-am: uninstall-binPROGRAMS 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. diff --git a/Build/source/texk/gregorio/TLpatches/ChangeLog b/Build/source/texk/gregorio/TLpatches/ChangeLog index 0f1c561b40c..0b330593611 100644 --- a/Build/source/texk/gregorio/TLpatches/ChangeLog +++ b/Build/source/texk/gregorio/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2017-04-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import gregorio-5.0.0. + 2017-04-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import gregorio-5.0.0-rc1. diff --git a/Build/source/texk/gregorio/TLpatches/TL-Changes b/Build/source/texk/gregorio/TLpatches/TL-Changes index bd769204560..fbe6c652bb4 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.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 diff --git a/Build/source/texk/gregorio/config_.h.in b/Build/source/texk/gregorio/config_.h.in index 3f8ed63e3b1..875e70578b0 100644 --- a/Build/source/texk/gregorio/config_.h.in +++ b/Build/source/texk/gregorio/config_.h.in @@ -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 diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure index 0fadd1bfb27..7f06391b730 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.0.0-rc1. +# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.0.0. # # 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.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@tug.org' PACKAGE_URL='http://gregorio-project.github.io/' @@ -724,7 +724,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -FILENAME_VERSION target_alias host_alias build_alias @@ -1331,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.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 @@ fi 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 @@ fi 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 @@ 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.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,13 +2709,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ 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= @@ -8054,7 +8046,7 @@ fi # 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 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@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 @@ 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.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 @@ _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.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\\" diff --git a/Build/source/texk/gregorio/configure.ac b/Build/source/texk/gregorio/configure.ac index 6ad22262c21..faf7a68017e 100644 --- a/Build/source/texk/gregorio/configure.ac +++ b/Build/source/texk/gregorio/configure.ac @@ -10,9 +10,6 @@ dnl with or without modifications, as long as this notice is preserved. dnl m4_include([version.ac])[] dnl define gregorio_version AC_INIT([Gregorio (TeX Live)], gregorio_version, [tex-k@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]) diff --git a/Build/source/texk/gregorio/gregorio-src/.gregorio-version b/Build/source/texk/gregorio/gregorio-src/.gregorio-version index f38f1af9d13..2c3056690d1 100644 --- a/Build/source/texk/gregorio/gregorio-src/.gregorio-version +++ b/Build/source/texk/gregorio/gregorio-src/.gregorio-version @@ -1,4 +1,4 @@ -5.0.0-rc1 +5.0.0 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md index 2dc1f97fe37..525346efa03 100644 --- a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md +++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md @@ -5,24 +5,13 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [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 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - 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. diff --git a/Build/source/texk/gregorio/gregorio-src/README.md b/Build/source/texk/gregorio/gregorio-src/README.md index 5a89e8418a5..9aad3e22fd8 100644 --- a/Build/source/texk/gregorio/gregorio-src/README.md +++ b/Build/source/texk/gregorio/gregorio-src/README.md @@ -22,6 +22,10 @@ You need a recent and working [TeXLive](https://www.tug.org/texlive/), on top of - 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). diff --git a/Build/source/texk/gregorio/gregorio-src/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac index e7d1c97fc26..9c7ce0b0b8d 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.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 @@ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug@<:@=sanitize,coverage@:>@] 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 diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine index a1fb7c72d06..2c2642dd8c4 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine +++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine @@ -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" diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine new file mode 100644 index 00000000000..6da782ed7b4 --- /dev/null +++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine @@ -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" diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am index 9ca1bdb5f9d..60a7212ad88 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am +++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am @@ -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 diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command index 758b3d010c7..065871932ee 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command +++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command @@ -29,6 +29,15 @@ else 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 diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex index c768db685f3..0bd6bcff49d 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex @@ -733,42 +733,6 @@ Indicates that the syllable which follows begins a EUOUAE block. & \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. diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex index e72551dd12c..0b7fc789bae 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex @@ -285,14 +285,6 @@ argument. \#2 & string & Relative or absolute path to the score.\\ \end{argtable} -\macroname{\textbackslash gre@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@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 @@ Workhorse function behind \verb=\grecommentary=. \#2 & string & the new commentary content\\ \end{argtable} +\macroname{\textbackslash gre@printcommentary}{}{gregoriotex-main.tex} +Computes the true ``raise'' and prints the commentary contained in +\verb=\gre@box@commentary=. + \macroname{\textbackslash gre@atletter}{}{gregoriotex-main.tex} A Lua\TeX\ catcode table which makes sure that Lua\TeX\ treats `@‘ corectly. @@ -896,6 +892,44 @@ Macro for raising a bug error when some calculation goes awry and comes up with \macroname{\textbackslash gre@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@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@dimen@clefwidth@bol=), respectively. This is the ``global'' value, +used to initialize \verb=\gre@bolshiftcleftypelocal= at the start of a score. + +\macroname{\textbackslash gre@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@dimen@clefwidth@bol=), respectively. This is the ``local'' value, +used in the actual computation. + +\macroname{\textbackslash gre@update@clefwidth@largest}{\#1}{gregoriotex-spaces.tex} +Updates the ``largest'' clef width, used when \verb=\gre@bolshiftcleftypelocal= +is \texttt{1}. + +\begin{argtable} + \#1 & distance & The new value to use for the ``largest'' clef width.\\ +\end{argtable} + +\macroname{\textbackslash gre@update@clefwidth@current}{\#1}{gregoriotex-spaces.tex} +Updates the ``current'' clef width, used when \verb=\gre@bolshiftcleftypelocal= +is \texttt{2}. + +\begin{argtable} + \#1 & distance & The new value to use for the ``current'' clef width.\\ +\end{argtable} + +\macroname{\textbackslash gre@update@clefwidth@forced}{\#1}{gregoriotex-spaces.tex} +Updates the ``forced'' clef width, used when \verb=\gre@bolshiftcleftypelocal= +is \texttt{3}. + +\begin{argtable} + \#1 & distance & The new value to use for the ``forced'' clef width.\\ +\end{argtable} + \macroname{\textbackslash gre@calculate@bolshift}{\#1\#2}{gregoriotex-spaces.tex} Macro used in \verb=\GreSyllable=. Sets \verb=\gre@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 @@ Macro to save the additional vertical spaces associated with the line (\texttt{a \macroname{\textbackslash gre@restore@additionalspaces}{}{gregoriotex-spaces.tex} Macro to restore the additional vertical spaces associated with the line from their saved values. +\macroname{\textbackslash gre@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. diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf Binary files differindex 3d0c15ddc53..066f7e38064 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf Binary files differindex fd56d462e53..acd45bb06eb 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex index 0c90fa12bb7..3d4ac18e21b 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex @@ -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} diff --git a/Build/source/texk/gregorio/gregorio-src/src/Makefile.am b/Build/source/texk/gregorio/gregorio-src/src/Makefile.am index 58e3f47617b..8055a6d708c 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/Makefile.am +++ b/Build/source/texk/gregorio/gregorio-src/src/Makefile.am @@ -19,8 +19,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/gabc -I$(top_srcdir)/src/ 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 @@ gregorio___FILENAME_VERSION__SOURCES = \ @MK@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 @@ if HAVE_RC 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 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 23387b923e5..064be87b7b6 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,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 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 diff --git a/Build/source/texk/gregorio/gregorio.test b/Build/source/texk/gregorio/gregorio.test index 90ab42db148..f8daa762d22 100755 --- a/Build/source/texk/gregorio/gregorio.test +++ b/Build/source/texk/gregorio/gregorio.test @@ -10,12 +10,7 @@ export TEXMFCNF 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-$FILENAME_VERSION +gregorio=gregorio failed= diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac index 3ded13ba0f5..6213123d31d 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.0.0-rc1]) +m4_define([gregorio_version], [5.0.0]) |