diff --git a/.gregorio-version b/.gregorio-version index 765eeb2da..8563ecbae 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -5.2.0 +5.2.1 2019 *** Do not modify this file. *** diff --git a/CHANGELOG.md b/CHANGELOG.md index cf9be0d7d..89d74a76d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/). -## [Unreleased][CTAN] +## [5.2.1] - 2019-04-06 ### Fixed - Project names with quotes in them no longer cause GregorioTeX to not be able to find the executable. See [#1416](https://github.com/gregorio-project/gregorio/issues/1416). - Eliminated implicit casting from float to integer in string formatting (something no longer allowed in Lua 5.3) diff --git a/configure.ac b/configure.ac index 3f01d77c3..2d2de951d 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.2.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="5_2_0" +AC_INIT([gregorio],[5.2.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="5_2_1" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/ctan-o-mat.config b/ctan-o-mat.config index 0e4a1c57a..d5c42e1e2 100644 --- a/ctan-o-mat.config +++ b/ctan-o-mat.config @@ -20,7 +20,7 @@ % This field contains the version of the package. % The value is optional. % The value is restricted to 32 characters. -\version{v5.2.0} % GREGORIO_VERSION +\version{v5.2.1} % GREGORIO_VERSION % ------------------------------------------------------------------------- % This field contains the name of the author(s). % The value is optional. diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index b18a5be79..9749772bd 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -183,7 +183,7 @@ \vspace{1cm} - \large Version \textbf{5.2.0}, 10 March 2019 %% PARSE_VERSION_DATE + \large Version \textbf{5.2.1}, 6 April 2019 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index d3c05bd97..7a57a827f 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -90,7 +90,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '5.2.0' +GREGORIO_VERSION = '5.2.1' # 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 bc349c5f4..977246264 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -603,7 +603,7 @@ USE_HFS+_COMPRESSION VERSION - 5.2.0 + 5.2.1 TYPE 0 diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index d52990db0..85e80ad61 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_2_0" # FILENAME_VERSION +rm "$BINDIR/gregorio-5_2_1" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 5e7ceca81..6945f2efc 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2019/03/10 v5.2.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2019/04/06 v5.2.1 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.2.0}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.2.1}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index d97ba6e7f..e10d48189 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.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{5.2.1}% 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 3b5303bff..1e582a511 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.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-commonx.tex}{5.2.1}% GREGORIO_VERSION %%%%%%%%% diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index 36604eb87..a6de4df54 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.2.0}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.2.1}% GREGORIO_VERSION - VersionManager.py \ifluatex% \ifnum\luatexversion<76% diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 1e27e7ae3..8eb1b3e15 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.2.0 +-- GREGORIO_VERSION 5.2.1 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 149238c97..2fae53ecf 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.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{5.2.1}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 40248812e..c52a25b11 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.2.0 +-- GREGORIO_VERSION 5.2.1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 9054a0f7d..fd800a358 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{5.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{5.2.1}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index e96847864..b483680e1 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.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{5.2.1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index dc58f325e..b00f90ae4 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.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{5.2.1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 2b5f7387e..8e9f0a319 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.2.0 +-- GREGORIO_VERSION 5.2.1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index 6c30d30a9..11a33845d 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.2.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{5.2.1}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 059f613f4..f3ad902b5 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.2.0' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '5.2.1' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '5.2.0', -- GREGORIO_VERSION + version = '5.2.1', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2019/03/10", -- GREGORIO_DATE_LTX + date = "2019/04/06", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2019 - 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_2_0' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-5_2_1' -- 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 89e16dbf9..6bdd7c98f 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2019/03/10 v5.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2019/04/06 v5.2.1 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 3afc4d4b9..b16c3c2b2 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. -% [2019/03/10 v5.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2019/04/06 v5.2.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index e3fbd0e18..06f463bea 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,2,0,30 -PRODUCTVERSION 5,2,0,30 +FILEVERSION 5,2,1,30 +PRODUCTVERSION 5,2,1,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "5.2.0" + VALUE "FileVersion", "5.2.1" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "5.2.0" + VALUE "ProductVersion", "5.2.1" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 94dbc5601..912a79bd0 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=5.2.0 +AppVersion=5.2.1 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_2_0.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-5_2_1.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";