From f0b722c3eee64ac5cfc7cb9e95a94029f0d78308 Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Sat, 15 Apr 2017 09:21:38 -0400 Subject: [PATCH] Update Version number and consolidate CHANGELOG entries --- .gregorio-version | 2 +- CHANGELOG.md | 16 ++++------------ configure.ac | 4 ++-- 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-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 ++-- 24 files changed, 36 insertions(+), 44 deletions(-) diff --git a/.gregorio-version b/.gregorio-version index f38f1af9d..2c3056690 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -5.0.0-rc1 +5.0.0 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dc1f97fe..525346efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,24 +5,13 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] -## [5.0.0-rc1] - 2017-04-04 +## [5.0.0] - 2017-04-15 ### Fixed - The printing of the commentary box is no longer tied to the printing of the inital. As a result it is now possible to have a score which has a commentary but not an initial. See [this thread on the user list](http://www.mail-archive.com/gregorio-users@gna.org/msg03911.html). - Elisions after a vowel centering prefix will no longer cause the center to be placed on the vowel in the prefix. Since prefixes are unvoiced vowels, this makes more sense than the previous behavior. As usual, you may use the manual centering features to force the centering where you want if this does not produce what you want. See [#1320](https://github.com/gregorio-project/gregorio/issues/1320). - Dynmanic line spacing when a clef change occurs at the end of a line is fixed so that the line after the clef change is spaced appropriately. See [#1285](https://github.com/gregorio-project/gregorio/issues/1285). - Spaces in the filename of a score no longer cause Gregoriotex to fail. See [#1224](https://github.com/gregorio-project/gregorio/issues/1224). - -## [5.0.0-beta2] - 2017-02-24 -### Fixed - Glyphs for pes quadratum shapes with initio debilis are no longer missing. Use `-fqg` to engrave them. See [#1310](https://github.com/gregorio-project/gregorio/issues/1310). - -### Changed -- The default behaviour of `\gregorioscore` has been changed to autocompile. -- When the note after an oriscus is at the same pitch, the oriscus direction now depends on the first non-unison, non-oriscus note after the oriscus (see [#1179](https://github.com/gregorio-project/gregorio/issues/1179)). -- 6 new St. Gall neume glyphs have been added to the `gregall` font and glyph for nabc `to!ciG` has been changed (see [#1303](https://github.com/gregorio-project/gregorio/issues/1303), [#1305](https://github.com/gregorio-project/gregorio/issues/1305), [#1313](https://github.com/gregorio-project/gregorio/issues/1313), [#1314](https://github.com/gregorio-project/gregorio/issues/1314), [#1315](https://github.com/gregorio-project/gregorio/issues/1315)). - -## [5.0.0-beta1] - 2017-01-31 -### Fixed - Horizontal episemata bridge spaces more correctly. As mentioned earlier, you can prevent this by appending `2` to the `_` on the note before the space you do not want bridged. See [#1216](https://github.com/gregorio-project/gregorio/issues/1216). - A rising note after an oriscus flexus will no longer generate a porrectus (see [#1220](https://github.com/gregorio-project/gregorio/issues/1220)). - The Scribus external tool script now uses latexmk in order to handle the multi-pass features of Gregorio (see [#1236](https://github.com/gregorio-project/gregorio/issues/1236)). @@ -32,6 +21,9 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - A pes whose second note is an oriscus now obeys the oriscus orientation rules (see [#1272](https://github.com/gregorio-project/gregorio/issues/1272)) ### Changed +- The default behaviour of `\gregorioscore` has been changed to autocompile. +- When the note after an oriscus is at the same pitch, the oriscus direction now depends on the first non-unison, non-oriscus note after the oriscus (see [#1179](https://github.com/gregorio-project/gregorio/issues/1179)). +- 6 new St. Gall neume glyphs have been added to the `gregall` font and glyph for nabc `to!ciG` has been changed (see [#1303](https://github.com/gregorio-project/gregorio/issues/1303), [#1305](https://github.com/gregorio-project/gregorio/issues/1305), [#1313](https://github.com/gregorio-project/gregorio/issues/1313), [#1314](https://github.com/gregorio-project/gregorio/issues/1314), [#1315](https://github.com/gregorio-project/gregorio/issues/1315)). - Notes are now left-aligned as if all clefs had the same width as the largest clef in the score. You can get previous behavior back with `\grebolshiftcleftype{current}`, or temporary force alignment until the end of a score with `\grelocalbolshiftcleftype`. See Documentation of these functions and [#1189](https://github.com/gregorio-project/gregorio/issues/1189). - A clef change immediately before a line break `(z)` will now typeset the new clef at the beginning of the next line. An explicit custos `(z0)` immediately before such a clef change (or separated by only a bar) will be suppressed. See [#1190](https://github.com/gregorio-project/gregorio/issues/1190). - Ledger lines are now extended through notes on either side of a ledger line that crosses a stem, as long as the notes are within the same "element." If the algorithm doesn't produce the result you want, you can use `[oll:0]` to suppress an over-the-staff ledger line on a note, `[ull:0]` to suppress an under-the-staff ledger line on a note, `[oll:1]` to force an over-the-line ledger line on a note, or [ull:1] to force an under-the-staff ledger line on a note. Please note that other forms of `[oll:...]` and `[ull:...]` can interfere with these new settings. See [UPGRADE.md](UPGRADE.md) and [#1215](https://github.com/gregorio-project/gregorio/issues/1215) for details. diff --git a/configure.ac b/configure.ac index 3cc64e877..ef4a258be 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.0.0-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="5_0_0-rc1" +AC_INIT([gregorio],[5.0.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="5_0_0" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index fcc50a185..e4647245f 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -177,7 +177,7 @@ \vspace{1cm} - \large Version \textbf{5.0.0-rc1}, 4 April 2017 %% PARSE_VERSION_DATE + \large Version \textbf{5.0.0}, 15 April 2017 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index 48c8fe469..ce01f927f 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -90,7 +90,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '5.0.0-rc1' +GREGORIO_VERSION = '5.0.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 33a777929..ce5ce1528 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -564,7 +564,7 @@ OVERWRITE_PERMISSIONS VERSION - 5.0.0-rc1 + 5.0.0 UUID 74692645-8112-42EB-8FFC-2CBE2CEDE9FB diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index 72db5663a..d0d629845 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_0_0-rc1" # FILENAME_VERSION +rm "$BINDIR/gregorio-5_0_0" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 250a61d1e..103c8fd38 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2017/04/04 v5.0.0-rc1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2017/04/15 v5.0.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{5.0.0-rc1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.0.0}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index 90188cbc7..e79dcc00c 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.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{5.0.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 cc6c29815..6faf0d08d 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.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-commonx.tex}{5.0.0}% GREGORIO_VERSION %%%%%%%%% diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index 7721b631d..676344944 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.0.0-rc1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{5.0.0}% GREGORIO_VERSION - VersionManager.py \ifluatex% \ifnum\luatexversion<76% diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 38a2f7fd3..6c1413dec 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.0.0-rc1 +-- GREGORIO_VERSION 5.0.0 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 36acf6a50..3b46a6672 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.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{5.0.0}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 521c910c4..b64e1af61 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.0.0-rc1 +-- GREGORIO_VERSION 5.0.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index d5ff950fc..23e0ee402 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{5.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{5.0.0}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index e55109752..7c8c82363 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.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{5.0.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 29da9fa4b..9e8866180 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.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{5.0.0}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 6d7475e01..05fb6b464 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.0.0-rc1 +-- GREGORIO_VERSION 5.0.0 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index fdb3d6162..1e4c515e4 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.0.0-rc1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{5.0.0}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index ac75ef2a0..c704a58be 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.0.0-rc1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '5.0.0' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '5.0.0-rc1', -- GREGORIO_VERSION + version = '5.0.0', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2017/04/04", -- GREGORIO_DATE_LTX + date = "2017/04/15", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2017 - The Gregorio Project", @@ -125,7 +125,7 @@ local function gregorio_exe() local exe_version -- first look for one with the exact version - real_gregorio_exe = 'gregorio-5_0_0-rc1' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-5_0_0' -- FILENAME_VERSION exe_version = io.popen(real_gregorio_exe..' --version', 'r') exe_version = exe_version:read("*line") if not exe_version then diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index 730b98e61..727e7efa8 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2017/04/04 v5.0.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2017/04/15 v5.0.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 d0a16de3b..f5780f6d9 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. -% [2017/04/04 v5.0.0-rc1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2017/04/15 v5.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 23387b923..064be87b7 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,0,0,21 -PRODUCTVERSION 5,0,0,21 +FILEVERSION 5,0,0,30 +PRODUCTVERSION 5,0,0,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "5.0.0-rc1" + VALUE "FileVersion", "5.0.0" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "5.0.0-rc1" + VALUE "ProductVersion", "5.0.0" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 73d14c4e8..7057221b7 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=5.0.0-rc1 +AppVersion=5.0.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-5_0_0-rc1.exe"; DestDir: "{app}\bin"; +Source: "../src/gregorio-5_0_0.exe"; DestDir: "{app}\bin"; Source: "gregorio.ico"; DestDir: "{app}"; Source: "install.lua"; DestDir: "{app}"; Source: "uninstall.lua"; DestDir: "{app}";