summaryrefslogtreecommitdiff
path: root/Build/source/texk/gregorio/gregorio-src
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-15 21:00:07 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-15 21:00:07 +0000
commit0dc292de52a3c273ade8e8eb97aa078ac2ea705f (patch)
tree3a093e56006d8fa644f364264293ec69b261aef4 /Build/source/texk/gregorio/gregorio-src
parent974de1d33abc6e3305f29e3f9e9ccf63809be26a (diff)
gregorio-5.0.0
git-svn-id: svn://tug.org/texlive/trunk@43809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src')
-rw-r--r--Build/source/texk/gregorio/gregorio-src/.gregorio-version2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/CHANGELOG.md16
-rw-r--r--Build/source/texk/gregorio/gregorio-src/README.md4
-rw-r--r--Build/source/texk/gregorio/gregorio-src/configure.ac15
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine8
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaTeX+se.engine8
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command9
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex36
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex58
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdfbin484860 -> 484758 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdfbin751469 -> 750324 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/Makefile.am8
-rw-r--r--Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc8
15 files changed, 105 insertions, 71 deletions
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
index 3d0c15ddc53..066f7e38064 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
index fd56d462e53..acd45bb06eb 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
Binary files differ
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