gregorio 4.1.0-beta3

git-svn-id: svn://tug.org/texlive/trunk@39657 c570f23f-e606-0410-a88d-b1316a301751

29 files changed, 200 insertions, 85 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index bdaf6d5d9d6..fea6dcba928 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -62,7 +62,7 @@ dvipsk - maintained here, by us
 dvisvgm 1.14.2 - checked 20jan16
   http://dvisvgm.bplaced.net/Downloads
 
-gregorio 4.1.0-beta2 - checked 09feb16
+gregorio 4.1.0-beta3 - checked 10feb16
   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 f0dcfadc008..b8d4a59c73e 100644
--- a/Build/source/texk/gregorio/ChangeLog
+++ b/Build/source/texk/gregorio/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-10  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import gregorio-4.1.0-beta3.
+	* version.ac: Adapted.
+
 2016-02-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import gregorio-4.1.0-beta2.
diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure
index 3ac42a85fb5..fb907b69e23 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) 4.1.0-beta2.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 4.1.0-beta3.
 #
 # 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='4.1.0-beta2'
-PACKAGE_STRING='Gregorio (TeX Live) 4.1.0-beta2'
+PACKAGE_VERSION='4.1.0-beta3'
+PACKAGE_STRING='Gregorio (TeX Live) 4.1.0-beta3'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -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) 4.1.0-beta2 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 4.1.0-beta3 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) 4.1.0-beta2:";;
+     short | recursive ) echo "Configuration of Gregorio (TeX Live) 4.1.0-beta3:";;
    esac
   cat <<\_ACEOF
 
@@ -1520,7 +1520,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Gregorio (TeX Live) configure 4.1.0-beta2
+Gregorio (TeX Live) configure 4.1.0-beta3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2176,7 +2176,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 4.1.0-beta2, which was
+It was created by Gregorio (TeX Live) $as_me 4.1.0-beta3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7862,7 +7862,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gregorio--tex-live-'
- VERSION='4.1.0-beta2'
+ VERSION='4.1.0-beta3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14246,7 +14246,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Gregorio (TeX Live) config.lt 4.1.0-beta2
+Gregorio (TeX Live) config.lt 4.1.0-beta3
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15833,7 +15833,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 4.1.0-beta2, which was
+This file was extended by Gregorio (TeX Live) $as_me 4.1.0-beta3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15899,7 +15899,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 4.1.0-beta2
+Gregorio (TeX Live) config.status 4.1.0-beta3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog b/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog
index fc18710396c..a789f0431a5 100644
--- a/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog
+++ b/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-10  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import gregorio-4.1.0-beta3.
+
 2016-02-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import gregorio-4.1.0-beta2.
diff --git a/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes b/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes
index ec45fa8ca1c..67e083a1dc3 100644
--- a/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes
+++ b/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the gregorio-4.1.0-beta2 tree as obtained from:
-	https://github.com/gregorio-project/gregorio/releases/tag/v4.1.0-beta2/
+Changes applied to the gregorio-4.1.0-beta3 tree as obtained from:
+	https://github.com/gregorio-project/gregorio/releases/tag/v4.1.0-beta3/
 
 Remove:
 	Makefile.in
diff --git a/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md
new file mode 100644
index 00000000000..cd621b2a872
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md
diff --git a/Build/source/texk/gregorio/gregorio-src/._VersionManager.py b/Build/source/texk/gregorio/gregorio-src/._VersionManager.py
new file mode 100644
index 00000000000..cd621b2a872
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/._VersionManager.py
diff --git a/Build/source/texk/gregorio/gregorio-src/.gregorio-version b/Build/source/texk/gregorio/gregorio-src/.gregorio-version
index e708a2f0559..409c908fa2e 100644
--- a/Build/source/texk/gregorio/gregorio-src/.gregorio-version
+++ b/Build/source/texk/gregorio/gregorio-src/.gregorio-version
@@ -1,4 +1,4 @@
-4.1.0-beta2
+4.1.0-beta3
 
 *** 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 f4628803fd8..2c60b1d7c2e 100644
--- a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
+++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
@@ -5,6 +5,18 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 
 
+## [4.1.0-beta3] - 2016-02-09
+### Fixed
+- Missing file from manifests and system-setup scripts has been added (new bug in 4.1.0-beta2)
+
+### Changed
+- Command line output (help message, version message, error handling) has been improved, see [#891](https://github.com/gregorio-project/gregorio/issues/891)
+- Windows installer no longer copies the executable into the TeX bin directory.  Instead it has the option to add its own bin directory to PATH.
+- `system-setup.sh` has become `system-setup.command` so that it is double click executable on Mac.
+- Post install options for Windows installer have been simplified.  There are no longer separate options for MiKTeX and TeXLive.  Instead the installer will determine which you have itself and act accordingly.
+- Windows installer will check more locations for old installations to remove.
+
+
 ## [4.1.0-beta2] - 2016-02-08
 ### Fixed
 - When a flat on a ledger line (`bx` or `lx`) was preceding a note also on a ledger line, the ledger line was partially visible inside the flat, see [#882](https://github.com/gregorio-project/gregorio/issues/882).
@@ -16,7 +28,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - When a syllable is preceeded by a punctum mora, gregorio now ignores the punctum mora in the spacing of the syllables by default, and also adds a custom space (defaulting to 0). You can change this behavior with `\gresetshiftaftermora{}`, see GregorioRef for its arguments. To balance the output, space before a punctum mora has been made slightly thinner, more in line with old Solesmes books. (For the change requests, see [#795](https://github.com/gregorio-project/gregorio/issues/795) and [#871](https://github.com/gregorio-project/gregorio/issues/871)).
 - The `--admin` option is removed from the `initexmf` call for MiKTeX installations, allowing the installer to work better on Windows 10.
 - MiKTeX installations no longer copy files into TEXMFLOCAL but instead registers the texmf folder which the installer creates with MiKTeX, allowing it to use those files in place.  See [#884](https://github.com/gregorio-project/gregorio/issues/884)
-- Added an uninstall script which will run as part of the uninstall action and will remove the Gregorio executable and TeX files from their copied locations (at least using the `unins000.exe` file which is created in the program directory when the program is installed, I haven't tested using the Add/Remove Programs feature built into Windows).
+- Windows installer now contains an uninstall script which will run as part of the uninstall action and thus should remove the Gregorio executable and TeX files from their copied locations (leaving a clean post-uninstall system).
 
 ### Added
 - A new algorithm for placing bar syllables has been added.  The goal of the new algorithm is to place the bar line exactly between the notes which surround it and do the same with the text associated with the bar line.  It also implements a limit, `maxbaroffset`, which prevents the bar line and its text from getting too far apart.  This algorithm can be activated with `\gresetbarspacing{new}`.  Testing is not yet complete and it may still contain bugs.  See [#767](https://github.com/gregorio-project/gregorio/issues/767).
diff --git a/Build/source/texk/gregorio/gregorio-src/VersionManager.py b/Build/source/texk/gregorio/gregorio-src/VersionManager.py
index 50422bc7884..78935159f8a 100644
--- a/Build/source/texk/gregorio/gregorio-src/VersionManager.py
+++ b/Build/source/texk/gregorio/gregorio-src/VersionManager.py
@@ -51,10 +51,14 @@ GREGORIO_FILES = ["configure.ac",
                   "tex/gregoriotex.tex",
                   "tex/gregoriotex-chars.tex",
                   "tex/gregoriotex-signs.tex",
+                  "tex/gregoriotex-signs.lua",
                   "tex/gregoriotex-spaces.tex",
                   "tex/gregoriotex-symbols.tex",
+                  "tex/gregoriotex-symbols.lua",
                   "tex/gregoriotex-syllable.tex",
                   "tex/gregoriotex-main.tex",
+                  "tex/gregoriotex-nabc.tex",
+                  "tex/gregoriotex-nabc.lua",
                   "tex/gregoriosyms.sty",
                   "fonts/squarize.py",
                  ]
diff --git a/Build/source/texk/gregorio/gregorio-src/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac
index 5db9cd0d130..acc41db0793 100644
--- a/Build/source/texk/gregorio/gregorio-src/configure.ac
+++ b/Build/source/texk/gregorio/gregorio-src/configure.ac
@@ -2,7 +2,7 @@ dnl Gregorio
 dnl Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
 dnl
 dnl This file is part of Gregorio.
-dnl 
+dnl
 dnl Gregorio is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation, either version 3 of the License, or
@@ -16,9 +16,10 @@ 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],[4.1.0-beta2],[gregorio-devel@gna.org])
-FILENAME_VERSION="4_1_0-beta2"
+AC_INIT([gregorio],[4.1.0-beta3],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="4_1_0-beta3"
 AC_SUBST(FILENAME_VERSION)
+AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""
 AC_SUBST(MK)
 AC_PREREQ(2.59)
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/._Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/._Makefile.am
new file mode 100644
index 00000000000..cd621b2a872
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/._Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.bat b/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.bat
new file mode 100644
index 00000000000..6adb72ec537
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.bat
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.command b/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.command
new file mode 100644
index 00000000000..14f037e2011
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.command
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
index e6f542dfec3..d4919a81fae 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/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 = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md TeXShop system-setup.sh system-setup.bat config-texworks.command
+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
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 755b8e9c210..8927080765d 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
@@ -90,22 +90,23 @@ echo. >> %output%
 echo ####	GregorioTeX Locations >> %output%

 echo. >> %output%

 

-set files=gregoriotex.sty ^

+set files=gregorio-vowels.dat ^

 gregoriosyms.sty ^

-gregoriotex.tex ^

-gregoriotex-main.tex ^

 gregoriotex-chars.tex ^

+gregoriotex-main.tex ^

 gregoriotex-ictus.tex ^

-gregoriotex-signs.tex ^

+gregoriotex-nabc.lua ^

+gregoriotex-nabc.tex ^

 gregoriotex-signs.lua ^

-gregoriotex-symbols.tex ^

+gregoriotex-signs.tex ^

 gregoriotex-spaces.tex ^

 gregoriotex-syllable.tex ^

-gregoriotex-nabc.tex ^

-gregoriotex-nabc.lua ^

+gregoriotex-symbols.lua ^

+gregoriotex-symbols.tex ^

 gregoriotex.lua ^

+gregoriotex.sty ^

+gregoriotex.tex ^

 gsp-default.tex ^

-gregorio-vowels.dat ^

 greciliae.ttf ^

 greciliae-op.ttf ^

 greextra.ttf ^

diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.sh b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
index 3c320d0927c..3280154b333 100755..100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.sh
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
@@ -1,6 +1,40 @@
 #!/usr/bin/env bash
 
-HERE=`pwd`
+# This script generates a log detailing information about your computer.
+# You can run it by double clicking on it on a Mac.
+# On Linux this behavior is controlled by a preference.  See http://askubuntu.com/questions/286621/how-do-i-run-executable-scripts-in-nautilus for details.
+# If prompted, you need to select "Run in Terminal" to see the output.
+
+#This trap combination allows the window to linger long enough for the user to
+#inspect the output, but still get closed when all is said and done.
+function quit {
+    read -n1 -r -p "Press any key to close window." key
+    if $mac; then
+        osascript -e 'tell application "Terminal" to close front window' > /dev/null 2>&1 &
+    else
+        exit
+    fi
+}
+
+trap quit EXIT
+
+case "$(uname -s)" in
+    Darwin)
+        echo 'Mac OS X detected'
+        mac=true
+        ;;
+    Linux)
+        echo 'Linux detected'
+        mac=false
+        ;;
+    *)
+        echo 'Unsupported OS detected'
+        exit 1
+        ;;
+esac
+
+
+HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 OUTPUT=$HERE/system-setup.log
 
 echo "Gregorio Unix Setup Diagnostic Tool"
@@ -84,22 +118,23 @@ echo "" >> $OUTPUT
 echo "####	GregorioTeX Locations" >> $OUTPUT
 echo "" >> $OUTPUT
 
-files="gregoriotex.sty
+files="gregorio-vowels.dat
 gregoriosyms.sty
-gregoriotex.tex
-gregoriotex-main.tex
 gregoriotex-chars.tex
+gregoriotex-main.tex
 gregoriotex-ictus.tex
-gregoriotex-signs.tex
+gregoriotex-nabc.lua
+gregoriotex-nabc.tex
 gregoriotex-signs.lua
-gregoriotex-symbols.tex
+gregoriotex-signs.tex
 gregoriotex-spaces.tex
 gregoriotex-syllable.tex
-gregoriotex-nabc.tex
-gregoriotex-nabc.lua
+gregoriotex-symbols.lua
+gregoriotex-symbols.tex
 gregoriotex.lua
+gregoriotex.sty
+gregoriotex.tex
 gsp-default.tex
-gregorio-vowels.dat
 greciliae.ttf
 greciliae-op.ttf
 greextra.ttf
@@ -138,4 +173,6 @@ echo ""
 echo "You can also create an issue at "
 echo "http://github.org/gregorio-project/gregorio/issues"
 echo "and copy-paste the content of this file into the description."
-echo "" 
+echo ""
+exit 0
+
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta2.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta3.pdf
index 839e08d8824..51564c9754e 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta2.pdf
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta3.pdf
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta2.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta2.pdf
deleted file mode 100644
index 45e8bb07687..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta2.pdf
+++ /dev/null
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta3.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta3.pdf
new file mode 100644
index 00000000000..ae826264761
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta3.pdf
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
index 0f666bf5656..ff6df09c4dd 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
@@ -152,7 +152,7 @@
 
 		\vspace{1cm}
 
-		\large Version \textbf{4.1.0-beta2}, 8 February 2016 %% PARSE_VERSION_DATE
+		\large Version \textbf{4.1.0-beta3}, 9 February 2016 %% PARSE_VERSION_DATE
 
 		\vspace{1.5cm}
 	\end{center}
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/._Makefile.am b/Build/source/texk/gregorio/gregorio-src/examples/._Makefile.am
new file mode 100644
index 00000000000..cd621b2a872
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/examples/._Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/._debugging.tex b/Build/source/texk/gregorio/gregorio-src/examples/._debugging.tex
new file mode 100644
index 00000000000..ea5fb3922eb
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/examples/._debugging.tex
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am b/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am
index 2d75dfa24ea..72230adc3ad 100644
--- a/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/examples/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=PopulusSion.gabc main-lualatex.tex FactusEst.gabc
+EXTRA_DIST=PopulusSion.gabc main-lualatex.tex FactusEst.gabc debugging.tex
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/debugging.tex b/Build/source/texk/gregorio/gregorio-src/examples/debugging.tex
new file mode 100644
index 00000000000..9aeee8d0558
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/examples/debugging.tex
@@ -0,0 +1,10 @@
+% !TEX program = LuaLaTeX+se
+\documentclass{article}
+
+\usepackage[debug]{gregoriotex}
+
+\listfiles
+
+\begin{document}
+Debugging document
+\end{document}
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c b/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
index f0781804b12..b7b51bf1c4c 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
@@ -5,7 +5,7 @@
  * 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
@@ -161,54 +161,65 @@ static char *get_output_filename(char *fbasename, const char *extension)
     return output_filename;
 }
 
-/*
- * the type definitions of the function to read a score from a file, and to
- * write a score to a file. Necessary for the libtool stuff... 
- */
-
 static void print_licence(void)
 {
-    printf("\n\
-Tools for manipulation of gregorian chant files\n\
-Copyright (C) 2006-2015 Gregorio project authors (see CONTRIBUTORS.md)\n\
+    printf("Gregorio: Gregorian chant score engraving.\n\
+%s\n\
 \n\
 This program is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
 the Free Software Foundation, either version 3 of the License, or\n\
 (at your option) any later version.\n\
-\n");
+\n", copyright);
     printf("This program is distributed in the hope that it will be useful,\n\
 but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
 GNU General Public License for more details.\n\
 \n\
 You should have received a copy of the GNU General Public License\n\
-along with this program.  If not, see <http://www.gnu.org/licenses/>.\n\n");
+along with this program.  If not, see <http://www.gnu.org/licenses/>.\n\
+");
 }
 
 static void print_usage(char *name)
 {
-    printf(_("\nUsage :\n%s [OPTION] {file}\n  where OPTION is :\n\
-\t-o file    writes output to specified file\n\
-\t-S         writes output to stdout\n\
-\t-F format  specifies output file format (default: gtex)\n\
-\t-l file    writes messages output to specified file (default: stderr)\n\
-\t-f format  specifies input file format (default: gabc)\n\
-\t-s         reads input from stdin\n\
-\t-p         generate point-and-click information\n\
-\t-h         displays this message\n\
-\t-V         displays %s version\n"), name, name);
-    printf(_("\t-L         displays licence\n\
-\t-v         verbose mode\n\
-\t-W         displays all warnings\n\
+    printf(_("Usage: %s [OPTION]... [-s | INPUT_FILE]\n\
+\nEngrave Gregorian chant scores, convert a gabc file to GregorioTeX.\n\n\
+Options:\n\
+  -o, --output-file FILE    write output to FILE,\n\
+                            default is basename(INPUT_FILE).FORMAT\n\
+  -S, --stdout              write output to stdout\n\
+  -s, --stdin               read input from stdin\n\
+  -l, --messages-file FILE  output messages to FILE (default: stderr)\n\
+  -F, --output-format FORMAT\n\
+                            specify output format (default: gtex)\n"), name);
+printf(_("  -f, --input-format FORMAT\n\
+                            specify input format (default: gabc)\n\
+  -p, --point-and-click     generate Lilypond point and click information\n\
+  -h, --help                print this help message\n\
+  -V, --version             print version and exit\n"));
+    printf(_("\
+  -L, --license             print licence\n\
+  -v, --verbose             verbose mode\n\
+  -W, --all-warnings        output warnings\n\
+  -d, --debug               output debug information\n\
+\n\
+Formats:\n\
+  gabc      gabc\n\
+  gtex      GregorioTeX\n\
+  dump      plain text dump (for debugging purpose)\n\
 \n\
-available formats are:\n\
-\t gabc      gabc\n\
-\t gtex      GregorioTeX\n\
-\t dump      simple text dump (for debugging purpose)\n\
+See <" PACKAGE_URL "> for general documentation,\n\
+GregorioRef-" FILENAME_VERSION ".pdf and GregorioNabcRef-" FILENAME_VERSION ".pdf for full documentation.\
 \n"));
 }
 
+static void print_short_usage(char *name)
+{
+    fprintf(stderr, "Usage: %s [OPTION]... [-s | INPUT_FILE]\n\
+Try '%s --help' for more information.\n", name, name);
+}
+
 static void check_input_clobber(char *input_file_name, char *output_file_name)
 {
     if (input_file_name && output_file_name) {
@@ -316,6 +327,7 @@ int main(int argc, char **argv)
     bool point_and_click = false;
     char *point_and_click_filename = NULL;
     bool debug = false;
+    bool must_print_short_usage = false;
     int option_index = 0;
     static struct option long_options[] = {
         {"output-file", 1, 0, 'o'},
@@ -337,7 +349,8 @@ int main(int argc, char **argv)
     gregorio_support_init("gregorio", argv[0]);
 
     if (argc == 1) {
-        print_usage(argv[0]);
+        fprintf(stderr, "%s: missing file operand.\n", argv[0]);
+        print_short_usage(argv[0]);
         gregorio_exit(0);
     }
     setlocale(LC_CTYPE, "C");
@@ -353,11 +366,13 @@ int main(int argc, char **argv)
                 fprintf(stderr,
                         "warning: several output files declared, %s taken\n",
                         output_file_name);
+                must_print_short_usage = true;
                 break;
             }
             if (output_file) {  /* means that stdout is defined */
                 fprintf(stderr,
                         "warning: can't write to file and stdout, writing on stdout\n");
+                must_print_short_usage = true;
                 break;
             }
             output_file_name = optarg;
@@ -367,10 +382,12 @@ int main(int argc, char **argv)
                 fprintf(stderr,
                         "warning: can't write to file and stdout, writing on %s\n",
                         output_file_name);
+                must_print_short_usage = true;
                 break;
             }
             if (output_file) {  /* means that stdout is defined */
-                fprintf(stderr, "warning: option used two times: %c\n", c);
+                fprintf(stderr, "warning: option used several times: %c\n", c);
+                must_print_short_usage = true;
                 break;
             }
             output_file = stdout;
@@ -379,6 +396,7 @@ int main(int argc, char **argv)
             if (output_format) {
                 fprintf(stderr,
                         "warning: several output formats declared, first taken\n");
+                must_print_short_usage = true;
                 break;
             }
             if (!strcmp(optarg, GABC_STR)) {
@@ -394,6 +412,7 @@ int main(int argc, char **argv)
                 break;
             } else {
                 fprintf(stderr, "error: unknown output format: %s\n", optarg);
+                print_short_usage(argv[0]);
                 gregorio_exit(1);
             }
             break;
@@ -402,6 +421,7 @@ int main(int argc, char **argv)
                 fprintf(stderr,
                         "warning: several error files declared, %s taken\n",
                         error_file_name);
+                must_print_short_usage = true;
                 break;
             }
             error_file_name = optarg;
@@ -411,6 +431,7 @@ int main(int argc, char **argv)
                 gregorio_set_error_out(error_file);
                 fprintf(stderr,
                         "warning: several output formats declared, first taken\n");
+                must_print_short_usage = true;
                 break;
             }
             if (!strcmp(optarg, GABC_STR)) {
@@ -418,6 +439,7 @@ int main(int argc, char **argv)
                 break;
             } else {
                 fprintf(stderr, "error: unknown input format: %s\n", optarg);
+                print_short_usage(argv[0]);
                 gregorio_exit(1);
             }
             break;
@@ -426,7 +448,8 @@ int main(int argc, char **argv)
              * we use getopt_long */
             assert(!input_file_name);
             if (input_file) { /* means that stdin is defined */
-                fprintf(stderr, "warning: option used two times: %c\n", c);
+                fprintf(stderr, "warning: option used several times: %c\n", c);
+                must_print_short_usage = true;
                 break;
             }
             input_file = stdin;
@@ -441,7 +464,8 @@ int main(int argc, char **argv)
             break;
         case 'v':
             if (verb_mode && verb_mode != VERBOSITY_WARNING) {
-                fprintf(stderr, "warning: verbose option passed two times\n");
+                fprintf(stderr, "warning: verbose option passed several times\n");
+                must_print_short_usage = true;
                 break;
             }
             verb_mode = VERBOSITY_INFO;
@@ -449,7 +473,8 @@ int main(int argc, char **argv)
         case 'W':
             if (verb_mode == VERBOSITY_WARNING) {
                 fprintf(stderr,
-                        "warning: all-warnings option passed two times\n");
+                        "warning: all-warnings option passed several times\n");
+                must_print_short_usage = true;
                 break;
             }
             if (verb_mode != VERBOSITY_INFO) {
@@ -463,7 +488,8 @@ int main(int argc, char **argv)
         case 'p':
             if (point_and_click) {
                 fprintf(stderr,
-                        "warning: point-and-click option passed two times\n");
+                        "warning: point-and-click option passed several times\n");
+                must_print_short_usage = true;
                 break;
             }
             point_and_click = true;
@@ -471,17 +497,20 @@ int main(int argc, char **argv)
         case 'd':
             if (debug) {
                 fprintf(stderr,
-                        "warning: debug option passed two times\n");
+                        "warning: debug option passed several times\n");
+                must_print_short_usage = true;
                 break;
             }
             debug = true;
             break;
         case '?':
+            must_print_short_usage = true;
             break;
         default:
             /* not reachable unless there's a programming error */
             /* LCOV_EXCL_START */
             gregorio_fail2(main, "unknown option: %c", c);
+            print_short_usage(argv[0]);
             gregorio_exit(1);
             break;
             /* LCOV_EXCL_STOP */
@@ -489,8 +518,8 @@ int main(int argc, char **argv)
     } /* end of while */
     if (optind == argc) {
         if (!input_file) { /* input not undefined (could be stdin) */
-            fprintf(stderr, "error: no input file specified\n");
-            print_usage(argv[0]);
+            fprintf(stderr, "%s: missing file operand.\n", argv[0]);
+            print_short_usage(argv[0]);
             gregorio_exit(1);
         }
     } else {
@@ -498,12 +527,14 @@ int main(int argc, char **argv)
         output_basename = get_base_filename(input_file_name);
         if (input_file) {
             fprintf(stderr,
-                    "warning: can't read from stdin and a file, reading from file %s\n",
+                    "warning: can't read from both stdin and a file, reading from %s\n",
                     input_file_name);
             input_file = NULL;
+            must_print_short_usage = true;
         }
     }
     if (optind < argc) {
+        must_print_short_usage = true;
         fprintf(stderr, "ignored arguments:");
         for (; optind < argc; ++optind) {
             fprintf(stderr, " %s", argv[optind]);
@@ -511,6 +542,11 @@ int main(int argc, char **argv)
         fprintf(stderr, "\n");
     }
 
+    if (must_print_short_usage) {
+        print_short_usage(argv[0]);
+        fprintf(stderr, "Proceeding anyway...\n");
+    }
+
     gregorio_set_debug_messages(debug);
 
     if (!input_format) {
@@ -544,11 +580,13 @@ int main(int argc, char **argv)
                 /* not reachable unless there's a programming error */
                 /* LCOV_EXCL_START */
                 fprintf(stderr, "error: unsupported format");
+                print_short_usage(argv[0]);
                 gregorio_exit(1);
                 /* LCOV_EXCL_STOP */
             }
         }
     }
+
     if (output_basename) {
         free(output_basename);
     }
diff --git a/Build/source/texk/gregorio/gregorio-src/src/support.c b/Build/source/texk/gregorio/gregorio-src/src/support.c
index e533d0ac310..d96d772808a 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/support.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/support.c
@@ -103,12 +103,15 @@ void gregorio_support_init(const char *const program USED_FOR_KPSE,
 void gregorio_print_version(const char *copyright)
 {
 #ifdef USE_KPSE
-    printf("Gregorio version %s (%s).\n%s\n", GREGORIO_VERSION,
+    printf("Gregorio %s (%s).\n%s\n", GREGORIO_VERSION,
             kpathsea_version_string, copyright);
 #else
-    printf("Gregorio version %s.\n%s\n", GREGORIO_VERSION,
+    printf("Gregorio %s.\n%s\n", GREGORIO_VERSION,
             copyright);
 #endif
+    printf("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n");
 }
 
 #ifdef USE_KPSE
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 bcdd703c213..85327e248d5 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     4,1,0,12
-PRODUCTVERSION  4,1,0,12
+FILEVERSION     4,1,0,13
+PRODUCTVERSION  4,1,0,13
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Gregorio project"
       VALUE "FileDescription", "Gregorio"
-      VALUE "FileVersion", "4.1.0-beta2"
+      VALUE "FileVersion", "4.1.0-beta3"
       VALUE "InternalName", "gregorio"
       VALUE "LegalCopyright", "See COPYING in the installation directory."
       VALUE "OriginalFilename", "gregorio.exe"
       VALUE "ProductName", "Gregorio"
-      VALUE "ProductVersion", "4.1.0-beta2"
+      VALUE "ProductVersion", "4.1.0-beta3"
     END
   END
 
diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac
index 57a426832d7..290cc4fa987 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], [4.1.0-beta2])
+m4_define([gregorio_version], [4.1.0-beta3])