From 5009227ae2e9fdc2a1fff3a0596e6958fb738eb3 Mon Sep 17 00:00:00 2001 From: "Fr. Samuel Springuel" Date: Thu, 4 Mar 2021 13:36:37 -0500 Subject: [PATCH] Update Version number No changes since beta1. This version number change is at the request of the CTAN folks. It is needed for their system to change the uploaded files to include the sources for TeX Live. --- .gregorio-version | 2 +- CHANGELOG.md | 5 +++++ configure.ac | 4 ++-- ctan-o-mat.config | 2 +- doc/GregorioRef.tex | 2 +- fonts/squarize.py | 2 +- macosx/Gregorio.pkgproj | 2 +- macosx/douninstall.sh | 2 +- tex/gregoriosyms.sty | 4 ++-- tex/gregoriotex-chars.tex | 2 +- tex/gregoriotex-common.tex | 2 +- tex/gregoriotex-gsp-default.tex | 2 +- tex/gregoriotex-main.tex | 2 +- tex/gregoriotex-nabc.lua | 2 +- tex/gregoriotex-nabc.tex | 2 +- tex/gregoriotex-signs.lua | 2 +- tex/gregoriotex-signs.tex | 2 +- tex/gregoriotex-spaces.tex | 2 +- tex/gregoriotex-syllable.tex | 2 +- tex/gregoriotex-symbols.lua | 2 +- tex/gregoriotex-symbols.tex | 2 +- tex/gregoriotex.lua | 8 ++++---- tex/gregoriotex.sty | 2 +- tex/gregoriotex.tex | 2 +- windows/gregorio-resources.rc | 8 ++++---- windows/gregorio.iss | 4 ++-- 26 files changed, 39 insertions(+), 34 deletions(-) diff --git a/.gregorio-version b/.gregorio-version index 0f8d479f..cf7147b8 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -6.0.0-beta1 +6.0.0-beta2 2021 *** Do not modify this file. *** diff --git a/CHANGELOG.md b/CHANGELOG.md index 02ad95d5..3d4fa0b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][CTAN] +## [6.0.0-beta2] - 2021-03-04 + + + + ## [6.0.0-beta1] - 2021-02-23 ### Fixed - Fixed some problem in 900_gregorio.xml (Scribus render frame tool). First, the use of `filecontents` rather than `filecontents*` was leading to a comment header that made it impossible for Gregorio to find the gabc headers in the temporary score file. Further, some of the indenting (which makes the file more human readable) was leading to errors in the formatting of the created files because they are processed in a way which handles whitespace differently from XML. See [#1457](https://github.com/gregorio-project/gregorio/issues/1457). diff --git a/configure.ac b/configure.ac index dec8a89d..df5efce4 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],[6.0.0-beta1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="6_0_0-beta1" +AC_INIT([gregorio],[6.0.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="6_0_0-beta2" 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 c0e11959..ca07a4ca 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{v6.0.0-beta1} % GREGORIO_VERSION +\version{v6.0.0-beta2} % 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 8f9ddce3..5152a930 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -183,7 +183,7 @@ \vspace{1cm} - \large Version \textbf{6.0.0-beta1}, 23 February 2021 %% PARSE_VERSION_DATE + \large Version \textbf{6.0.0-beta2}, 4 March 2021 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index e40cc2eb..6f6d860d 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -90,7 +90,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '6.0.0-beta1' +GREGORIO_VERSION = '6.0.0-beta2' # 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 bf69b116..c49a666d 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -603,7 +603,7 @@ USE_HFS+_COMPRESSION VERSION - 6.0.0-beta1 + 6.0.0-beta2 TYPE 0 diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index 444e5c6e..b8d2cc4d 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-6_0_0-beta1" # FILENAME_VERSION +rm "$BINDIR/gregorio-6_0_0-beta2" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 198a4c89..890defb5 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2021/02/23 v6.0.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2021/03/04 v6.0.0-beta2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX \RequirePackage{iftex}% \RequireLuaTeX @@ -41,7 +41,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{6.0.0-beta1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.0.0-beta2}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index c6163e22..87f39e7f 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}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{6.0.0-beta2}% 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 ed9ea193..f0153183 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-common.tex}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-common.tex}{6.0.0-beta2}% GREGORIO_VERSION \ifnum\luatexversion<76% \gre@error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}% diff --git a/tex/gregoriotex-gsp-default.tex b/tex/gregoriotex-gsp-default.tex index a5940f75..6300db14 100644 --- a/tex/gregoriotex-gsp-default.tex +++ b/tex/gregoriotex-gsp-default.tex @@ -20,7 +20,7 @@ % this file contains definitions of spaces and penalties % version check -\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0-beta2}% GREGORIO_VERSION %% First, the penalties diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index b9367947..b91fc5fa 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{6.0.0-beta1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.0.0-beta2}% 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 deeaf3ba..3ea7e6d5 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 6.0.0-beta1 +-- GREGORIO_VERSION 6.0.0-beta2 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index d663d763..54d2e666 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}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{6.0.0-beta2}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 25a2f85c..9db474e9 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 6.0.0-beta1 +-- GREGORIO_VERSION 6.0.0-beta2 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index ad13dc1e..d719b693 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0-beta2}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 301c2c16..35f49f11 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}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{6.0.0-beta2}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 89346623..d211559e 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}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{6.0.0-beta2}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 19f915f1..fbf77216 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 6.0.0-beta1 +-- GREGORIO_VERSION 6.0.0-beta2 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index e274ea22..d18c8b3e 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}{6.0.0-beta1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{6.0.0-beta2}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index e16f1935..adb254e2 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 = '6.0.0-beta1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '6.0.0-beta2' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '6.0.0-beta1', -- GREGORIO_VERSION + version = '6.0.0-beta2', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2021/02/23", -- GREGORIO_DATE_LTX + date = "2021/03/04", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2021 - 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-6_0_0-beta1' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-6_0_0-beta2' -- 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 6d008a8b..a781d2f1 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2021/03/04 v6.0.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \RequirePackage{iftex}% \RequireLuaTeX diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 06b95581..13247427 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. -% [2021/02/23 v6.0.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2021/03/04 v6.0.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \input iftex.sty \RequireLuaTeX% diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 2995f3aa..112d3692 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 6,0,0,11 -PRODUCTVERSION 6,0,0,11 +FILEVERSION 6,0,0,12 +PRODUCTVERSION 6,0,0,12 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "6.0.0-beta1" + VALUE "FileVersion", "6.0.0-beta2" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "6.0.0-beta1" + VALUE "ProductVersion", "6.0.0-beta2" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 4b2441d5..0a499f65 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=6.0.0-beta1 +AppVersion=6.0.0-beta2 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-6_0_0-beta1.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-6_0_0-beta2.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";