diff --git a/.gregorio-version b/.gregorio-version index a67c7ddf6..cede49349 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -3.0.1 +3.0.2 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/CHANGELOG.md b/CHANGELOG.md index 41a1acfbd..da4e7e855 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ 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/). +## [3.0.2] - 2015-06-01 +### Fixed +- Prevented the default small font of the above lines text from leaking into the lyrics. ## [3.0.1] - 2015-05-17 ### Fixed diff --git a/configure.ac b/configure.ac index 9bbc295bf..828e111c4 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,8 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -AC_INIT([gregorio],[3.0.1],[gregorio-devel@gna.org]) -FILENAME_VERSION="3_0_1" +AC_INIT([gregorio],[3.0.2],[gregorio-devel@gna.org]) +FILENAME_VERSION="3_0_2" AC_SUBST(FILENAME_VERSION) AC_PREREQ(2.59) AC_CONFIG_SRCDIR([src/gregorio-utils.c]) diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index dc1619080..d6dd0fca3 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -72,7 +72,7 @@ \vspace{1cm} - \large Version \textbf{3.0.1}, 17/05/15 %% PARSE_VERSION_DATE + \large Version \textbf{3.0.2}, 01/06/15 %% PARSE_VERSION_DATE \vspace{1cm} diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj index 7762ae46d..0c129297b 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -547,7 +547,7 @@ OVERWRITE_PERMISSIONS VERSION - 3.0.1 + 3.0.2 UUID 74692645-8112-42EB-8FFC-2CBE2CEDE9FB diff --git a/plugins/gregoriotex/gregoriotex.h b/plugins/gregoriotex/gregoriotex.h index 4e98b3965..62e53c09d 100644 --- a/plugins/gregoriotex/gregoriotex.h +++ b/plugins/gregoriotex/gregoriotex.h @@ -19,7 +19,7 @@ #ifndef GREGORIOTEX_H #define GREGORIOTEX_H -#define GREGORIO_VERSION "3.0.1" +#define GREGORIO_VERSION "3.0.2" #define NO_FUSION 0 #define FUSION 1 diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index 21e9792ed..46453152d 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -1,4 +1,4 @@ -\gre@declarefileversion{gregoriotex-chars.tex}{3.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{3.0.2}% GREGORIO_VERSION \def\gregoriocharoffset#1{\the\numexpr 161 + #1 \relax} \def\gregoriostylecharoffset#1{\the\numexpr 66 + #1 \relax} diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index a4ef8b917..7bebd09f6 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -17,7 +17,7 @@ % this file contains definitions of signs (bar, episemus, punctum, alterations) -\gre@declarefileversion{gregoriotex-signs.tex}{3.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{3.0.2}% GREGORIO_VERSION \def\greusestylecommon{% \ifnum\greusestylefont=0\relax % diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 00845aaec..448e9bbfb 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -16,7 +16,7 @@ % this file contains definitions of spaces -\gre@declarefileversion{gregoriotex-spaces.tex}{3.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{3.0.2}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index d01c92aa7..9ff8cd56a 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -16,7 +16,7 @@ % this file contains definitions of the glyphs and the syllables -\gre@declarefileversion{gregoriotex-syllable.tex}{3.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{3.0.2}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index 9fb4e4c10..93b06caa0 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -16,7 +16,7 @@ % this file contains definitions of the symbols -\gre@declarefileversion{gregoriotex-symbols.tex}{3.0.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{3.0.2}% GREGORIO_VERSION % a temp counter \newcount\gretempfactor % diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 9554853d0..9a944dc98 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -21,13 +21,13 @@ local hpack, traverse_id, has_attribute, count, remove, insert_after, copy = nod gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '3.0.1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '3.0.2' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '3.0.1', -- GREGORIO_VERSION + version = '3.0.2', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2015/05/17", -- GREGORIO_DATE_LTX + date = "2015/06/01", -- 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 31f98f420..5a287e3ad 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -16,7 +16,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriotex}% - [2015/05/17 v3.0.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2015/06/01 v3.0.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \RequirePackage{xcolor} \input gregoriotex.tex @@ -107,7 +107,7 @@ \let\normallines\grenormallines \def\greabovelinestextstyle#1{% - \small\textit{#1}% + {\small\textit{#1}}% \relax % } diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 530981560..3ba68af1a 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -75,7 +75,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{3.0.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{3.0.2}% 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/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index c22d72ab3..21211d054 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "3.0.1" + VALUE "FileVersion", "3.0.2" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "3.0.1" + VALUE "ProductVersion", "3.0.2" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 7a215b106..daccc2b09 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=3.0.1 +AppVersion=3.0.2 DefaultDirName={pf}\gregorio DefaultGroupName=gregorio SetupIconFile=gregorio.ico @@ -53,7 +53,7 @@ Source: "../README.md"; DestDir: "{app}"; Source: "../CONTRIBUTORS.md"; DestDir: "{app}"; Source: "../UPGRADE.md"; DestDir: "{app}"; ; PARSE_VERSION_FILE_NEXTLINE -Source: "../doc/GregorioRef-3_0_1.pdf"; DestDir: "{app}"; +Source: "../doc/GregorioRef-3_0_2.pdf"; DestDir: "{app}"; Source: "../COPYING.md"; DestDir: "{app}"; Source: "../contrib/900_gregorio.xml"; DestDir: "{app}\contrib"; Source: "../contrib/system-setup.bat"; DestDir: "{app}";