Skip to content

Commit

Permalink
Update Version number and consolidate CHANGELOG entries
Browse files Browse the repository at this point in the history
  • Loading branch information
rpspringuel committed Apr 15, 2017
1 parent 229aac3 commit f0b722c
Show file tree
Hide file tree
Showing 24 changed files with 36 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .gregorio-version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
5.0.0-rc1
5.0.0

*** Do not modify this file. ***
Use VersionManager.py to change the version.
16 changes: 4 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]/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)).
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/>.

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=""
Expand Down
2 changes: 1 addition & 1 deletion doc/GregorioRef.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion fonts/squarize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion macosx/Gregorio.pkgproj
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>5.0.0-rc1</string><!--GREGORIO_VERSION-->
<string>5.0.0</string><!--GREGORIO_VERSION-->
</dict>
<key>UUID</key>
<string>74692645-8112-42EB-8FFC-2CBE2CEDE9FB</string>
Expand Down
2 changes: 1 addition & 1 deletion macosx/douninstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tex/gregoriosyms.sty
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-chars.tex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.

\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}}%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-common.tex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.

\gre@declarefileversion{gregoriotex-commonx.tex}{5.0.0-rc1}% GREGORIO_VERSION
\gre@declarefileversion{gregoriotex-commonx.tex}{5.0.0}% GREGORIO_VERSION


%%%%%%%%%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-main.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-nabc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-nabc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-signs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-signs.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-spaces.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-syllable.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-symbols.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex-symbols.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}%

Expand Down
8 changes: 4 additions & 4 deletions tex/gregoriotex.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex.sty
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion tex/gregoriotex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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`@}
Expand Down
8 changes: 4 additions & 4 deletions windows/gregorio-resources.rc
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
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
BLOCK "040904E4"
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

Expand Down
4 changes: 2 additions & 2 deletions windows/gregorio.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Setup]
AppName=gregorio
AppVersion=5.0.0-rc1
AppVersion=5.0.0
DefaultDirName={pf}\gregorio
DefaultGroupName=gregorio
SetupIconFile=gregorio.ico
Expand Down Expand Up @@ -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}";
Expand Down

0 comments on commit f0b722c

Please sign in to comment.