From 983ed156eba9abc0d1903d4780e439775f83076d Mon Sep 17 00:00:00 2001 From: "Fr. Samuel Springuel" Date: Wed, 26 Feb 2025 09:18:53 -0500 Subject: [PATCH] Update version number --- .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 623d0674..4ea3515f 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -6.1.0-beta2 +6.1.0-rc1 2025 *** Do not modify this file. *** diff --git a/CHANGELOG.md b/CHANGELOG.md index c9e27dc7..289c52a8 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.1.0-rc1] - 2025-02-26 + + + + ## [6.1.0-beta2] - 2025-02-17 ### Fixed - Multiple Scribus render frames were all using the same file name, which would result in the same score appearing in all render frames. This change makes the score files use an available Scribus variable to force multiple file names. diff --git a/configure.ac b/configure.ac index eb9fee2d..85f55c21 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.1.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="6_1_0-beta2" +AC_INIT([gregorio],[6.1.0-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="6_1_0-rc1" 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 eeac54b4..79451c48 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.1.0-beta2} % GREGORIO_VERSION +\version{v6.1.0-rc1} % 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 ea7f9c51..c063cdd6 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -183,7 +183,7 @@ \vspace{1cm} - \large Version \textbf{6.1.0-beta2}, 17 February 2025 %% PARSE_VERSION_DATE + \large Version \textbf{6.1.0-rc1}, 26 February 2025 %% PARSE_VERSION_DATE \vspace{1.5cm} \gresetlinecolor{gregoriocolor} diff --git a/fonts/squarize.py b/fonts/squarize.py index 68a63d20..412d8594 100755 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -89,7 +89,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '6.1.0-beta2' +GREGORIO_VERSION = '6.1.0-rc1' # 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 c6d97850..9efd6dce 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -603,7 +603,7 @@ USE_HFS+_COMPRESSION VERSION - 6.1.0-beta2 + 6.1.0-rc1 TYPE 0 diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index 01cb646d..5a56dcf9 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_1_0-beta2" # FILENAME_VERSION +rm "$BINDIR/gregorio-6_1_0-rc1" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 3a5ad14a..367eca66 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2025/02/17 v6.1.0-beta2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2025/02/26 v6.1.0-rc1 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.1.0-beta2}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.1.0-rc1}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index f869c77e..f5f40e88 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{6.1.0-rc1}% 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 2e6771c0..c9b65e6f 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-common.tex}{6.1.0-rc1}% 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 ae7d65b4..fca41ce8 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.1.0-rc1}% GREGORIO_VERSION %% First, the penalties diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index 272cceb8..56330368 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.1.0-beta2}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.1.0-rc1}% 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 74c46dfb..669a7b86 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.1.0-beta2 +-- GREGORIO_VERSION 6.1.0-rc1 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index e270dabe..df0360c7 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{6.1.0-rc1}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 9168aa9c..851b2bda 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.1.0-beta2 +-- GREGORIO_VERSION 6.1.0-rc1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 228194a2..fdbf57d9 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{6.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{6.1.0-rc1}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 8311811f..838ab070 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{6.1.0-rc1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 787eb5d8..096d53df 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{6.1.0-rc1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index dc322871..77ce8620 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.1.0-beta2 +-- GREGORIO_VERSION 6.1.0-rc1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index cea41d78..f829477f 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.1.0-beta2}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{6.1.0-rc1}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 95b62092..6b18e4bf 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.1.0-beta2' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '6.1.0-rc1' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '6.1.0-beta2', -- GREGORIO_VERSION + version = '6.1.0-rc1', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2025/02/17", -- GREGORIO_DATE_LTX + date = "2025/02/26", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2025 - The Gregorio Project", @@ -162,7 +162,7 @@ local function gregorio_exe() local exe_version -- first look for one with the exact version - real_gregorio_exe = 'gregorio-6_1_0-beta2' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-6_1_0-rc1' -- FILENAME_VERSION local cmd = {real_gregorio_exe, '-o', tmpname, test_snippet_filename} exe_version = get_prog_output(cmd, tmpname, '*line') if not exe_version then diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index ae5dbff0..61fe6b1f 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2025/02/17 v6.1.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2025/02/26 v6.1.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \RequirePackage{iftex}% \RequireLuaTeX diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 653a40b4..93c24d09 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. -% [2025/02/17 v6.1.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2025/02/26 v6.1.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \input iftex.sty \RequireLuaTeX% diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index baf85fe6..a05d0fc4 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,1,0,12 -PRODUCTVERSION 6,1,0,12 +FILEVERSION 6,1,0,21 +PRODUCTVERSION 6,1,0,21 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "6.1.0-beta2" + VALUE "FileVersion", "6.1.0-rc1" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "6.1.0-beta2" + VALUE "ProductVersion", "6.1.0-rc1" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 444a1773..3b3e7c67 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=6.1.0-beta2 +AppVersion=6.1.0-rc1 DefaultDirName={commonpf}\gregorio DefaultGroupName=gregorio SetupIconFile=gregorio.ico @@ -47,7 +47,7 @@ Name: "{app}\texmf\doc\luatex\gregoriotex\examples" [Files] ; PARSE_VERSION_FILE_NEXTLINE -Source: "../src/gregorio-6_1_0-beta2.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-6_1_0-rc1.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";