diff --git a/.gregorio-version b/.gregorio-version
index 70b19a306..b8c2ad701 100644
--- a/.gregorio-version
+++ b/.gregorio-version
@@ -1,4 +1,4 @@
-4.1.3
+4.1.4
*** Do not modify this file. ***
Use VersionManager.py to change the version.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d1322412..ac269b510 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
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/).
+## [4.1.4] - 2016-05-29
+### Fixed
+- Package conflict with luatex-ja also affected the custos. Have now fixed that problem too. See [this thread](http://www.mail-archive.com/gregorio-users@gna.org/msg03520.html).
+
## [4.1.3] - 2016-05-26
### Fixed
- Package conflict with luatex-ja has been resolved. Notes and lyrics should now appear in documents which use the luatex-ja package. See [#1107](https://github.com/gregorio-project/gregorio/issues/1107).
diff --git a/configure.ac b/configure.ac
index e8f36a51c..ae522daf4 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],[4.1.3],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="4_1_3"
+AC_INIT([gregorio],[4.1.4],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="4_1_4"
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 ef654345a..5c92fcf14 100644
--- a/doc/GregorioRef.tex
+++ b/doc/GregorioRef.tex
@@ -152,7 +152,7 @@
\vspace{1cm}
- \large Version \textbf{4.1.3}, 26 May 2016 %% PARSE_VERSION_DATE
+ \large Version \textbf{4.1.4}, 29 May 2016 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
diff --git a/fonts/squarize.py b/fonts/squarize.py
index 9ce6d400e..43ee0a3c2 100644
--- a/fonts/squarize.py
+++ b/fonts/squarize.py
@@ -78,7 +78,7 @@
5: 'Five',
}
-GREGORIO_VERSION = '4.1.3'
+GREGORIO_VERSION = '4.1.4'
# 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 a4bb2251d..f74ec055a 100755
--- a/macosx/Gregorio.pkgproj
+++ b/macosx/Gregorio.pkgproj
@@ -564,7 +564,7 @@
OVERWRITE_PERMISSIONS
VERSION
- 4.1.3
+ 4.1.4
UUID
74692645-8112-42EB-8FFC-2CBE2CEDE9FB
diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty
index cf7659934..734b63681 100644
--- a/tex/gregoriosyms.sty
+++ b/tex/gregoriosyms.sty
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
- [2016/05/26 v4.1.3 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2016/05/29 v4.1.4 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%
@@ -38,7 +38,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre@gregorioversion{4.1.3}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.4}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre@declarefileversion}[2]{\relax}
diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex
index 98d01c39b..394bc24bc 100644
--- a/tex/gregoriotex-chars.tex
+++ b/tex/gregoriotex-chars.tex
@@ -18,7 +18,7 @@
% along with Gregorio. If not, see .
\gre@debugmsg{general}{Loading gregoriotex-chars.tex}%
-\gre@declarefileversion{gregoriotex-chars.tex}{4.1.3}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{4.1.4}% 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-main.tex b/tex/gregoriotex-main.tex
index 2f6ce6caa..a7de83afe 100644
--- a/tex/gregoriotex-main.tex
+++ b/tex/gregoriotex-main.tex
@@ -143,7 +143,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre@gregorioversion{4.1.3}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.1.4}% 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 5dfb0c321..ff6899932 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 4.1.3
+-- GREGORIO_VERSION 4.1.4
local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex
index 404a93c2f..22195ebda 100644
--- a/tex/gregoriotex-nabc.tex
+++ b/tex/gregoriotex-nabc.tex
@@ -20,7 +20,7 @@
% this file contains macros for St. Gall ancient neume support
\gre@debugmsg{general}{Loading gregoriotex-nabc.tex}%
-\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.3}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.4}% GREGORIO_VERSION
\xdef\gre@nabcfontname{gregall}%
diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua
index ac9f8f5a2..334ea6ca2 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 4.1.3
+-- GREGORIO_VERSION 4.1.4
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex
index 43338f94b..20312211a 100644
--- a/tex/gregoriotex-signs.tex
+++ b/tex/gregoriotex-signs.tex
@@ -23,7 +23,7 @@
\def\grebarbracewidth{.58879}%
\gre@debugmsg{general}{Loading gregoriotex-signs.tex}%
-\gre@declarefileversion{gregoriotex-signs.tex}{4.1.3}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{4.1.4}% GREGORIO_VERSION
\def\gre@usestylecommon{%
\ifgre@usestylefont\else %
@@ -396,7 +396,7 @@
\gre@additionaltopcustoslineend %
\fi\fi %
\fi %
- \raise \gre@dimen@glyphraisevalue\relax%
+ \raise \gre@dimen@glyphraisevalue%
\copy\gre@box@temp@width %
}%
\fi %
diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex
index f4efa6ba8..fe6ea9a32 100644
--- a/tex/gregoriotex-spaces.tex
+++ b/tex/gregoriotex-spaces.tex
@@ -20,7 +20,7 @@
% this file contains definitions of spaces
\gre@debugmsg{general}{Loading gregoriotex-spaces.tex}%
-\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.3}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.4}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex
index d078aae0a..cd32bf7df 100644
--- a/tex/gregoriotex-syllable.tex
+++ b/tex/gregoriotex-syllable.tex
@@ -20,7 +20,7 @@
% this file contains definitions of the glyphs and the syllables
\gre@debugmsg{general}{Loading gregoriotex-syllable.tex}%
-\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.3}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.4}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua
index 711712bbf..848470876 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 4.1.3
+-- GREGORIO_VERSION 4.1.4
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex
index 110fecd4d..28a541e1c 100644
--- a/tex/gregoriotex-symbols.tex
+++ b/tex/gregoriotex-symbols.tex
@@ -23,7 +23,7 @@
\def\gregoriotex@symbols@loaded{}%
\gre@debugmsg{general}{Loading gregoriotex-symbols.tex}%
-\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.3}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.4}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua
index 41a08c70b..0685eae1d 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 = '4.1.3' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '4.1.4' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '4.1.3', -- GREGORIO_VERSION
+ version = '4.1.4', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2016/05/26", -- GREGORIO_DATE_LTX
+ date = "2016/05/29", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2015 - The Gregorio Project",
diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty
index 2c2eec094..e71e72450 100644
--- a/tex/gregoriotex.sty
+++ b/tex/gregoriotex.sty
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
- [2016/05/26 v4.1.3 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2016/05/29 v4.1.4 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 1c36b1efa..ae9741b6a 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.
-% [2016/05/26 v4.1.3 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2016/05/29 v4.1.4 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\edef\greoldcatcode{\the\catcode`@}
diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc
index 4cdf018fb..501af717d 100644
--- a/windows/gregorio-resources.rc
+++ b/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 4,1,3,30
-PRODUCTVERSION 4,1,3,30
+FILEVERSION 4,1,4,30
+PRODUCTVERSION 4,1,4,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "4.1.3"
+ VALUE "FileVersion", "4.1.4"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "4.1.3"
+ VALUE "ProductVersion", "4.1.4"
END
END
diff --git a/windows/gregorio.iss b/windows/gregorio.iss
index 56a29edee..03535b08a 100644
--- a/windows/gregorio.iss
+++ b/windows/gregorio.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=gregorio
-AppVersion=4.1.3
+AppVersion=4.1.4
DefaultDirName={pf}\gregorio
DefaultGroupName=gregorio
SetupIconFile=gregorio.ico