diff --git a/.gregorio-version b/.gregorio-version index 4ea3515f..02a7f3c0 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -6.1.0-rc1 +6.1.0 2025 *** Do not modify this file. *** diff --git a/CHANGELOG.md b/CHANGELOG.md index 289c52a8..4a5365c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +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][develop] - - -## [Unreleased][CTAN] - - -## [6.1.0-rc1] - 2025-02-26 - - - - -## [6.1.0-beta2] - 2025-02-17 +## [6.1.0] - 2025-02-28 ### 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. - When kpsewhich cannot write to a particular location, it generates an error which is directed to stderr but not to our glog file. This created an undocumented error when trying to write to a gtex file to a bad location. We now capture stderr output produced when compiling scores and redirect it to our glog file so that the error is properly recorded. Fixes [#1541](https://github.com/gregorio-project/gregorio/issues/1541). diff --git a/UPGRADE.md b/UPGRADE.md index 336e0b3b..6e3dfc67 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -2,9 +2,13 @@ This file contains instructions to upgrade to a new release of Gregorio. These instructions are cumulative; meaning that you should apply the instructions from all versions between the one you are upgrading from and the current version. -## [Unreleased][develop] +## 6.1 -Initial letters that are 2 lines high used to require manual linebreaks (`z`), but no longer do. The alignment of 2-line initial letters has changed slightly and may need to be adjusted. +### Multiline initials + +Initial letters that are 2 lines high used to require manual linebreaks (`z`), but no longer do. The alignment of 2-line initial letters has changed slightly and may need to be adjusted. Further, initials can now span over an arbitrary number of lines. + +### Soft alterations GABC now has some new alterations: soft flat (`X`) and sharp (`##`), which appear when there is no previous flat or sharp (respectively) in effect, and soft natural (`Y`), which appears when there is a previous flat or sharp in effect. A new option `\gresetalterationeffect` determines what the "effect" of an alteration is. It defaults to `line`, meaning that an alteration's effect extends to the end of the line. Thus, for Dominican chant, type a soft flat (`X`) in front of _every_ note that is to be sung a half-step flat; naturals should also be soft (`Y`), but only naturals that cancel flats need to be typed. diff --git a/configure.ac b/configure.ac index 85f55c21..795ff476 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-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="6_1_0-rc1" +AC_INIT([gregorio],[6.1.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="6_1_0" 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 79451c48..c821f393 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-rc1} % GREGORIO_VERSION +\version{v6.1.0} % 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 c063cdd6..962f5a5c 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -183,7 +183,7 @@ \vspace{1cm} - \large Version \textbf{6.1.0-rc1}, 26 February 2025 %% PARSE_VERSION_DATE + \large Version \textbf{6.1.0}, 28 February 2025 %% PARSE_VERSION_DATE \vspace{1.5cm} \gresetlinecolor{gregoriocolor} diff --git a/fonts/squarize.py b/fonts/squarize.py index 412d8594..1f3dc151 100755 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -89,7 +89,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '6.1.0-rc1' +GREGORIO_VERSION = '6.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 9efd6dce..650c3cf1 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -603,7 +603,7 @@ USE_HFS+_COMPRESSION VERSION - 6.1.0-rc1 + 6.1.0 TYPE 0 diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index 5a56dcf9..d8b59b12 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-rc1" # FILENAME_VERSION +rm "$BINDIR/gregorio-6_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 367eca66..cc02d339 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2025/02/26 v6.1.0-rc1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2025/02/28 v6.1.0 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-rc1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.1.0}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index f5f40e88..9fec533d 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{6.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 c9b65e6f..6a487796 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-common.tex}{6.1.0}% 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 fca41ce8..95a4c763 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.1.0}% GREGORIO_VERSION %% First, the penalties diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index 56330368..88492dd4 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-rc1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.1.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 669a7b86..d7e525dc 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-rc1 +-- GREGORIO_VERSION 6.1.0 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index df0360c7..b82875dc 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{6.1.0}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 851b2bda..e1b45e02 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-rc1 +-- GREGORIO_VERSION 6.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 fdbf57d9..0bb11e2e 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{6.1.0}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 838ab070..4ce1ad51 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{6.1.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 096d53df..e151d7ee 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{6.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 77ce8620..d8d2a7b6 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-rc1 +-- GREGORIO_VERSION 6.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 f829477f..cf9bec11 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-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{6.1.0}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 6b18e4bf..f90cb4e1 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-rc1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '6.1.0' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '6.1.0-rc1', -- GREGORIO_VERSION + version = '6.1.0', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2025/02/26", -- GREGORIO_DATE_LTX + date = "2025/02/28", -- 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-rc1' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-6_1_0' -- 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 61fe6b1f..9f7f5d9d 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2025/02/26 v6.1.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2025/02/28 v6.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \RequirePackage{iftex}% \RequireLuaTeX diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 93c24d09..d8278144 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/26 v6.1.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2025/02/28 v6.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \input iftex.sty \RequireLuaTeX% diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index a05d0fc4..96a1cf08 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,21 -PRODUCTVERSION 6,1,0,21 +FILEVERSION 6,1,0,30 +PRODUCTVERSION 6,1,0,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "6.1.0-rc1" + VALUE "FileVersion", "6.1.0" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "6.1.0-rc1" + VALUE "ProductVersion", "6.1.0" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 3b3e7c67..86d4a2a3 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=6.1.0-rc1 +AppVersion=6.1.0 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-rc1.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-6_1_0.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";