diff --git a/.gregorio-version b/.gregorio-version index c4309493e..c1186c124 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -5.1.0-rc1 +5.1.0 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/CHANGELOG.md b/CHANGELOG.md index 92d07df88..5743336a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] +## [5.1.0] - 2018-03-11 + + ## [5.1.0-rc1] - 2018-02-18 ### Added - Added support for virgula (gabc: `` `0``) and divisio minima (gabc: `,0`) on the ledger line above the staff (see [#1370](https://github.com/gregorio-project/gregorio/issues/1370)). diff --git a/configure.ac b/configure.ac index 392d3b51e..19767019d 100644 --- a/configure.ac +++ b/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 . -AC_INIT([gregorio],[5.1.0-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="5_1_0-rc1" +AC_INIT([gregorio],[5.1.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="5_1_0" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index 9ee239d12..374233661 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -182,7 +182,7 @@ \vspace{1cm} - \large Version \textbf{5.1.0-rc1}, 18 February 2018 %% PARSE_VERSION_DATE + \large Version \textbf{5.1.0}, 11 March 2018 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index e66fcf3e2..be9f036d2 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -90,7 +90,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '5.1.0-rc1' +GREGORIO_VERSION = '5.1.0' # The unicode character at which we start our numbering: # U+E000 is the start of the BMP Private Use Area diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj index 9186ea066..f62f9433e 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -603,7 +603,7 @@ USE_HFS+_COMPRESSION VERSION - 5.1.0-rc1 + 5.1.0 TYPE 0 diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index 87fe39e4a..4d20d0356 100755 --- a/macosx/douninstall.sh +++ b/macosx/douninstall.sh @@ -20,7 +20,7 @@ GREFONTDIR="$TEXMFLOCAL/fonts/truetype/public/gregoriotex" GREFONTSOURCE="$TEXMFLOCAL/fonts/source/gregoriotex" GREDOCDIR="$TEXMFLOCAL/doc/luatex/gregoriotex" -rm "$BINDIR/gregorio-5_1_0-rc1" # FILENAME_VERSION +rm "$BINDIR/gregorio-5_1_0" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 53f5b4218..4993f2f62 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2018/02/18 v5.1.0-rc1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2018/03/11 v5.1.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX % If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts. \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% @@ -39,7 +39,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregoriotexversion{5.1.0-rc1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.1.0}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index ecd2dc2a5..8524a65b8 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -17,7 +17,7 @@ % You should have received a copy of the GNU General Public License % along with Gregorio. If not, see . -\gre@declarefileversion{gregoriotex-chars.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{5.1.0}% GREGORIO_VERSION \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}% \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}% diff --git a/tex/gregoriotex-common.tex b/tex/gregoriotex-common.tex index ae387838a..2ea8ebc4d 100644 --- a/tex/gregoriotex-common.tex +++ b/tex/gregoriotex-common.tex @@ -17,7 +17,7 @@ % You should have received a copy of the GNU General Public License % along with Gregorio. If not, see . -\gre@declarefileversion{gregoriotex-commonx.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-commonx.tex}{5.1.0}% GREGORIO_VERSION %%%%%%%%% diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index acbaa20a6..60560904e 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -21,7 +21,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregoriotexversion{5.1.0-rc1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.1.0}% GREGORIO_VERSION - VersionManager.py \ifluatex% \ifnum\luatexversion<76% diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 09593504a..84be1e1c7 100644 --- a/tex/gregoriotex-nabc.lua +++ b/tex/gregoriotex-nabc.lua @@ -20,7 +20,7 @@ -- this file contains lua functions used by GregorioTeX St. Gall ancient -- neume support when called with LuaTeX. --- GREGORIO_VERSION 5.1.0-rc1 +-- GREGORIO_VERSION 5.1.0 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 432f9ce8b..530b0e7a8 100644 --- a/tex/gregoriotex-nabc.tex +++ b/tex/gregoriotex-nabc.tex @@ -19,7 +19,7 @@ % this file contains macros for St. Gall ancient neume support -\gre@declarefileversion{gregoriotex-nabc.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{5.1.0}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index acde6cdc1..8376dc7c2 100644 --- a/tex/gregoriotex-signs.lua +++ b/tex/gregoriotex-signs.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 5.1.0-rc1 +-- GREGORIO_VERSION 5.1.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 12f2487eb..4aacabdde 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{5.1.0}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 431c10983..085fd38a6 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -19,7 +19,7 @@ % this file contains definitions of spaces -\gre@declarefileversion{gregoriotex-spaces.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{5.1.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 9fe8f1ace..fd5f5bb3f 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -19,7 +19,7 @@ % this file contains definitions of the glyphs and the syllables -\gre@declarefileversion{gregoriotex-syllable.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{5.1.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 18bdc294b..a91721917 100644 --- a/tex/gregoriotex-symbols.lua +++ b/tex/gregoriotex-symbols.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 5.1.0-rc1 +-- GREGORIO_VERSION 5.1.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index d78c9f786..04088e5e5 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -22,7 +22,7 @@ \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% \def\gregoriotex@symbols@loaded{}% -\gre@declarefileversion{gregoriotex-symbols.tex}{5.1.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{5.1.0}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 37a8e2dc1..5bd712b86 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after, gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '5.1.0-rc1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '5.1.0' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '5.1.0-rc1', -- GREGORIO_VERSION + version = '5.1.0', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2018/02/18", -- GREGORIO_DATE_LTX + date = "2018/03/11", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2017 - The Gregorio Project", @@ -146,7 +146,7 @@ local function gregorio_exe() local exe_version -- first look for one with the exact version - real_gregorio_exe = 'gregorio-5_1_0-rc1' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-5_1_0' -- FILENAME_VERSION local cmd = string.format("%s -o %%s %s", real_gregorio_exe, test_snippet_filename) exe_version = get_prog_output(cmd, '*line') diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index e785624ab..3cf3459f2 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2018/02/18 v5.1.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2018/03/11 v5.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX % If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away \ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi% diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 461ac2aac..56bdc9827 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -21,7 +21,7 @@ % This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does. -% [2018/02/18 v5.1.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2018/03/11 v5.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 58d4ec500..113be63af 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 5,1,0,21 -PRODUCTVERSION 5,1,0,21 +FILEVERSION 5,1,0,30 +PRODUCTVERSION 5,1,0,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "5.1.0-rc1" + VALUE "FileVersion", "5.1.0" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "5.1.0-rc1" + VALUE "ProductVersion", "5.1.0" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 50eb25933..c8b2b8030 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=5.1.0-rc1 +AppVersion=5.1.0 DefaultDirName={pf}\gregorio DefaultGroupName=gregorio SetupIconFile=gregorio.ico @@ -49,7 +49,7 @@ Name: "{app}\texmf\doc\luatex\gregoriotex\examples" [Files] ; PARSE_VERSION_FILE_NEXTLINE -Source: "../src/gregorio-5_1_0-rc1.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-5_1_0.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";