diff --git a/.gregorio-version b/.gregorio-version index 365a3c734..e1eb41352 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -4.2.0-rc3 +4.2.0 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/configure.ac b/configure.ac index 6e4911afb..81aaa70b9 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],[4.2.0-rc3],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="4_2_0-rc3" +AC_INIT([gregorio],[4.2.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="4_2_0" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/contrib/gregorio-scribus.lua b/contrib/gregorio-scribus.lua index c8a4c3f6f..540a40e40 100644 --- a/contrib/gregorio-scribus.lua +++ b/contrib/gregorio-scribus.lua @@ -22,7 +22,7 @@ This program allows gregorio to be integrated in Scribus. require"lfs" -local gregoriobin = 'gregorio-4_2_0-rc3' -- FILENAME_VERSION +local gregoriobin = 'gregorio-4_2_0' -- FILENAME_VERSION local lualatexbin = "lualatex" local function basename(name) diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index 383acae7a..7e0fae377 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -179,7 +179,7 @@ \vspace{1cm} - \large Version \textbf{4.2.0-rc3}, 22 August 2016 %% PARSE_VERSION_DATE + \large Version \textbf{4.2.0}, 23 September 2016 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index 544f7117a..1f2dca1e7 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -78,7 +78,7 @@ 5: 'Five', } -GREGORIO_VERSION = '4.2.0-rc3' +GREGORIO_VERSION = '4.2.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 8395a4046..46b08ffa7 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -564,7 +564,7 @@ OVERWRITE_PERMISSIONS VERSION - 4.2.0-rc3 + 4.2.0 UUID 74692645-8112-42EB-8FFC-2CBE2CEDE9FB diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index 296a5c519..6f6ba0739 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-4_2_0-rc3" # FILENAME_VERSION +rm "$BINDIR/gregorio-4_2_0" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index f08cee0b6..2301b9b42 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2016/08/22 v4.2.0-rc3 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2016/09/23 v4.2.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{4.2.0-rc3}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{4.2.0}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index e48cddbb0..cf2676e7c 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -18,7 +18,7 @@ % along with Gregorio. If not, see . \gre@debugmsg{general}{Loading gregoriotex-chars.tex}% -\gre@declarefileversion{gregoriotex-chars.tex}{4.2.0-rc3}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{4.2.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-main.tex b/tex/gregoriotex-main.tex index 1a8b0ffaf..335d435ac 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -159,7 +159,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{4.2.0-rc3}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{4.2.0}% GREGORIO_VERSION - VersionManager.py % first some macros to allow checks for version: % Tests that all gregoriotex files are of the same version. diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 8952746dd..848e73ebc 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 4.2.0-rc3 +-- GREGORIO_VERSION 4.2.0 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 193c50be8..610becc4a 100644 --- a/tex/gregoriotex-nabc.tex +++ b/tex/gregoriotex-nabc.tex @@ -20,7 +20,7 @@ % this file contains macros for St. Gall ancient neume support \gre@debugmsg{general}{Loading gregoriotex-nabc.tex}% -\gre@declarefileversion{gregoriotex-nabc.tex}{4.2.0-rc3}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{4.2.0}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index ccebb655d..5e64bd67e 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 4.2.0-rc3 +-- GREGORIO_VERSION 4.2.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 22e1025f6..fa30f66b1 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -23,7 +23,7 @@ \def\grebarbracewidth{.58879}% \gre@debugmsg{general}{Loading gregoriotex-signs.tex}% -\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0-rc3}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{4.2.0}% GREGORIO_VERSION \def\gre@usestylecommon{% \ifgre@usestylefont\else % diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 603c6f666..f9b9b8f1d 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -20,7 +20,7 @@ % this file contains definitions of spaces \gre@debugmsg{general}{Loading gregoriotex-spaces.tex}% -\gre@declarefileversion{gregoriotex-spaces.tex}{4.2.0-rc3}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{4.2.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index d6b0fec2e..f55fe3f71 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -20,7 +20,7 @@ % this file contains definitions of the glyphs and the syllables \gre@debugmsg{general}{Loading gregoriotex-syllable.tex}% -\gre@declarefileversion{gregoriotex-syllable.tex}{4.2.0-rc3}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{4.2.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 7517e92d9..2b8e251c1 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 4.2.0-rc3 +-- GREGORIO_VERSION 4.2.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index 6853f9dfc..987ef3e74 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -23,7 +23,7 @@ \def\gregoriotex@symbols@loaded{}% \gre@debugmsg{general}{Loading gregoriotex-symbols.tex}% -\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0-rc3}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{4.2.0}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index d071d4abc..cbfd7cf04 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -24,20 +24,20 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after, gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '4.2.0-rc3' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '4.2.0' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '4.2.0-rc3', -- GREGORIO_VERSION + version = '4.2.0', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2016/08/22", -- GREGORIO_DATE_LTX + date = "2016/09/23", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2016 - The Gregorio Project", license = "GPLv3+", }) -local gregorio_exe = 'gregorio-4_2_0-rc3' -- FILENAME_VERSION +local gregorio_exe = 'gregorio-4_2_0' -- FILENAME_VERSION gregoriotex.module = { err = err, warn = warn, info = info, log = log } diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index b57f22f9a..fdd395381 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2016/08/22 v4.2.0-rc3 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2016/09/23 v4.2.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 450040274..d21401f3f 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. -% [2016/08/22 v4.2.0-rc3 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2016/09/23 v4.2.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 547651a0b..9ce686a53 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 4,2,0,23 -PRODUCTVERSION 4,2,0,23 +FILEVERSION 4,2,0,30 +PRODUCTVERSION 4,2,0,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "4.2.0-rc3" + VALUE "FileVersion", "4.2.0" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "4.2.0-rc3" + VALUE "ProductVersion", "4.2.0" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index a9f1e551f..6d1c2ed06 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=4.2.0-rc3 +AppVersion=4.2.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-4_2_0-rc3.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-4_2_0.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";