From 01646ba86ea5dc12418945a175f10f2cd8ececbf Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Sun, 7 Aug 2016 21:34:23 -0600 Subject: [PATCH 01/10] Reach the translation glyph node by traverse_id() LuaTeX-ja prepends custom whatsit nodes to store e.g. text direction, breaking hard-coded paths like startnode.head.next.head.next.head in the center_translation() function. This patch uses node.travese_id() to find our desired nodes instead. Fixes #1180 --- tex/gregoriotex.lua | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 0685eae1d..ddeb62823 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -307,6 +307,13 @@ local function dump_nodes(head) log('--end dump--') end +-- helper function for center_translation() +local function get_first_node_by_id(id, head) + for n in traverse_id(id, head) do + return n + end +end + local function center_translation(startnode, endnode, ratio, sign, order) -- total width between beginning the two centering points local total_width = node.dimensions(ratio, sign, order, startnode, endnode) @@ -321,12 +328,23 @@ local function center_translation(startnode, endnode, ratio, sign, order) -- \kern 0pt -- } -- + -- While normally we could use startnode.head.next.head.next.head + -- to reach the translation (glyph node), packages such as LuaTeX-ja + -- may have, for example, prepended a whatsit node to each list + -- to store e.g. text direction, moving our translation glyph node to + -- startnode.head.next.next.head.next.next.head.next instead. + -- + -- To avoid unpleasant surprises, let's search for each desired node + -- by its type: + local vlistnode = get_first_node_by_id(vlist, startnode.head) + local hlistnode = get_first_node_by_id(hlist, vlistnode.head) + local glyphnode = get_first_node_by_id(glyph, hlistnode.head) -- hence translation width is: - local trans_width = node.dimensions(startnode.head.next.head.next.head) + local trans_width = node.dimensions(glyphnode) -- now we must transform the kern 0pt into kern Xpt and kern -Xpt where X is: local X = (total_width - trans_width) / 2 - startnode.head.kern = X - startnode.head.next.next.kern = -X + vlistnode.prev.kern = X + vlistnode.next.kern = -X end local debug_types_activated = {['linesglues'] = false} From 081f1920a6c7ae84caeb8ae0168dccc7bf2dda2f Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Thu, 18 Aug 2016 10:30:49 -0400 Subject: [PATCH 02/10] Fix issue with custom spaces It would appear that skips which are rescaled in Lua no longer have that change implicitly communicated back to TeX so I've added an explicit call. This fixes the issues with custom spacings not working in TeXLive 2016. --- tex/gregoriotex.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index ddeb62823..8ddc0f1bf 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -983,6 +983,7 @@ end local function scale_space(factor) local skip = tex.getskip('gre@skip@temp@four') skip.width = skip.width * factor + tex.setskip('gre@skip@temp@four',skip) -- should skip.stretch and skip.shink also be scaled? end From 5e97d2d918f9d695bea24d02c10db7015e386246 Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Thu, 18 Aug 2016 10:33:59 -0400 Subject: [PATCH 03/10] CHANGELOG entries --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac269b510..9caceab3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ 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.5] - 2016-08-18 +### Fixed +- Use node.travese_id() to find our desired nodes when doing translation centering across syllables, thereby preventing a conflict with other packages which insert nodes (such as luatex-ja). See [#1180](https://github.com/gregorio-project/gregorio/issues/1180). +- Explicitly communicate the rescaling of `\gre@skip@temp@four` back to TeX, thereby fixing the problem with custom spacings. See [#1199](https://github.com/gregorio-project/gregorio/issues/1199). + ## [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). From acc45864630f251e5189022b0fd3b9ed4630a895 Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Thu, 18 Aug 2016 10:34:34 -0400 Subject: [PATCH 04/10] Update Version number --- .gregorio-version | 2 +- configure.ac | 4 ++-- doc/GregorioRef.tex | 2 +- fonts/squarize.py | 2 +- macosx/Gregorio.pkgproj | 2 +- tex/gregoriosyms.sty | 4 ++-- tex/gregoriotex-chars.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 | 6 +++--- tex/gregoriotex.sty | 2 +- tex/gregoriotex.tex | 2 +- windows/gregorio-resources.rc | 8 ++++---- windows/gregorio.iss | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.gregorio-version b/.gregorio-version index b8c2ad701..5d5198118 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -4.1.4 +4.1.5 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/configure.ac b/configure.ac index ae522daf4..8a873cf07 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.4],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="4_1_4" +AC_INIT([gregorio],[4.1.5],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="4_1_5" 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 5c92fcf14..67c95823e 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -152,7 +152,7 @@ \vspace{1cm} - \large Version \textbf{4.1.4}, 29 May 2016 %% PARSE_VERSION_DATE + \large Version \textbf{4.1.5}, 18 August 2016 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/squarize.py b/fonts/squarize.py index 43ee0a3c2..55ae74b6f 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -78,7 +78,7 @@ 5: 'Five', } -GREGORIO_VERSION = '4.1.4' +GREGORIO_VERSION = '4.1.5' # 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 f74ec055a..dd70ff087 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -564,7 +564,7 @@ OVERWRITE_PERMISSIONS VERSION - 4.1.4 + 4.1.5 UUID 74692645-8112-42EB-8FFC-2CBE2CEDE9FB diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 734b63681..cd00fa428 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2016/05/29 v4.1.4 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2016/08/18 v4.1.5 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.4}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.1.5}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index 394bc24bc..305bf55f4 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.4}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{4.1.5}% 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 a7de83afe..8e81d18ac 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.4}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.1.5}% 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 ff6899932..bfe14b532 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.4 +-- GREGORIO_VERSION 4.1.5 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 22195ebda..50e8b6165 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.4}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.5}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 334ea6ca2..12c9465bd 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.4 +-- GREGORIO_VERSION 4.1.5 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 20312211a..10dbf820a 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.4}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{4.1.5}% GREGORIO_VERSION \def\gre@usestylecommon{% \ifgre@usestylefont\else % diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index fe6ea9a32..39dd080aa 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.4}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.5}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index cd32bf7df..933c40bb5 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.4}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.5}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 848470876..afa9f0152 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.4 +-- GREGORIO_VERSION 4.1.5 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index 28a541e1c..f98ab4901 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.4}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.5}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 8ddc0f1bf..ce0f4225b 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.4' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '4.1.5' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '4.1.4', -- GREGORIO_VERSION + version = '4.1.5', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2016/05/29", -- GREGORIO_DATE_LTX + date = "2016/08/18", -- 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 e71e72450..bd919070c 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2016/05/29 v4.1.4 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2016/08/18 v4.1.5 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 ae9741b6a..7c435f70c 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/29 v4.1.4 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2016/08/18 v4.1.5 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 501af717d..6dbc2b3e9 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,4,30 -PRODUCTVERSION 4,1,4,30 +FILEVERSION 4,1,5,30 +PRODUCTVERSION 4,1,5,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "4.1.4" + VALUE "FileVersion", "4.1.5" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "4.1.4" + VALUE "ProductVersion", "4.1.5" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 03535b08a..e71c32c49 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=4.1.4 +AppVersion=4.1.5 DefaultDirName={pf}\gregorio DefaultGroupName=gregorio SetupIconFile=gregorio.ico From cd194eae9699255b0fd040a01681c1f8cebfbd34 Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Tue, 16 Aug 2016 16:32:33 -0400 Subject: [PATCH 05/10] Cherry pick ca8b226 --- tex/gregoriotex.tex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 7c435f70c..41d1527c6 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -31,8 +31,9 @@ \input luatexbase.sty% \input luamplib.sty% \input luaotfload.sty% -\input graphicx.tex % for \resizebox \input xstring.sty% +\input color.tex% +\input graphicx.tex % for \resizebox \def\gre@error#1{\begingroup% \def\MessageBreak{^^J}% From 7b9647fdcf823bd8c9c503471f95c5b9ca8c0304 Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Tue, 16 Aug 2016 20:56:25 -0400 Subject: [PATCH 06/10] Load PlainTeX version of xstring Like color and graphicx, the PlainTeX version of xstring is .tex not .sty --- tex/gregoriotex.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index 41d1527c6..8df92e1d2 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -31,7 +31,7 @@ \input luatexbase.sty% \input luamplib.sty% \input luaotfload.sty% -\input xstring.sty% +\input xstring.tex% \input color.tex% \input graphicx.tex % for \resizebox From a0b18a10f63900cff1b43a1aa08d9e8f4175e495 Mon Sep 17 00:00:00 2001 From: "Henry So, Jr" Date: Wed, 10 Aug 2016 20:05:15 -0400 Subject: [PATCH 07/10] Cherry pick 54bc8b8 --- CHANGELOG.md | 15 ++++++++------- tex/gregoriotex-main.tex | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9caceab3d..d88512621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Use node.travese_id() to find our desired nodes when doing translation centering across syllables, thereby preventing a conflict with other packages which insert nodes (such as luatex-ja). See [#1180](https://github.com/gregorio-project/gregorio/issues/1180). - Explicitly communicate the rescaling of `\gre@skip@temp@four` back to TeX, thereby fixing the problem with custom spacings. See [#1199](https://github.com/gregorio-project/gregorio/issues/1199). +- With thanks to Claudio Beccari (@OldClaudio), adding a commentary no longer generates a bad `\hbox` during TeX processing (see [#1202](https://github.com/gregorio-project/gregorio/issues/1202)). ## [4.1.4] - 2016-05-29 ### Fixed @@ -120,13 +121,13 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - `\grescorereference` ### Removed -- `\GreSetStaffLinesFormat`, supplanted by `\grechangeformat{normalstafflines}...` -- `\greinitialformat`, if you were redefining this command, use `\grechangeformat{initial}...` instead -- `\grebiginitialformat`, if you were redefining this command, use `\grechangeformat{biginitial}...` instead -- `\gretranslationformat`, if you were redefining this command, use `\grechangeformat{translation}...` instead -- `\greabovelinestextstyle`, if you were redefining this command, use `\grechangeformat{abovelinestext}...` instead -- `\grelowchoralsignstyle`, if you were redefining this command, use `\grechangeformat{lowchoralsign}...` instead -- `\grehighchoralsignstyle`, if you were redefining this command, use `\grechangeformat{highchoralsign}...` instead +- `\GreSetStaffLinesFormat`, supplanted by `\grechangestyle{normalstafflines}...` +- `\greinitialformat`, if you were redefining this command, use `\grechangestyle{initial}...` instead +- `\grebiginitialformat`, if you were redefining this command, use `\grechangestyle{biginitial}...` instead +- `\gretranslationformat`, if you were redefining this command, use `\grechangestyle{translation}...` instead +- `\greabovelinestextstyle`, if you were redefining this command, use `\grechangestyle{abovelinestext}...` instead +- `\grelowchoralsignstyle`, if you were redefining this command, use `\grechangestyle{lowchoralsign}...` instead +- `\grehighchoralsignstyle`, if you were redefining this command, use `\grechangestyle{highchoralsign}...` instead - `\setaboveinitialseparation`, supplanted by `\grechangedim{annotationseparation}...` - `\scorereference` - `\GreScoreReference` diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index 8e81d18ac..cd1b1c379 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -403,7 +403,7 @@ % we then place that box inside one of 0 width so that our cursor doesn't move when we place the commentary \ifvoid\gre@box@commentary\else% \gre@debugmsg{commentary}{I am printing a commentary box}% - \raise\gre@dimen@commentarytrueraise\hbox to 0pt{\hbox to \gre@dimen@linewidth{\hfill\box\gre@box@commentary}}% + \raise\gre@dimen@commentarytrueraise\hbox to 0pt{\hbox to \gre@dimen@linewidth{\hfill\box\gre@box@commentary}\hss}% \fi% \gre@debugmsg{annotation}{Time to calculate the true raise.}% \gre@calculate@annotationtrueraise % From 7ad0c3d633aa7e1634a96186f3b4258cc80d8cb2 Mon Sep 17 00:00:00 2001 From: "Br. Samuel Springuel" Date: Fri, 15 Jul 2016 08:53:11 -0400 Subject: [PATCH 08/10] Change package loading order to account for TeXLive 2016 --- doc/GregorioRef.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index 67c95823e..a2453f4a0 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -32,7 +32,6 @@ \usepackage{url} \usepackage{tabulary} \usepackage{tabularx} -\usepackage{adjustbox} \usepackage{xparse} \usepackage{makeidx} @@ -43,6 +42,7 @@ \definecolor{green}{HTML}{0c700c} \definecolor{myred}{HTML}{FF3333} +\usepackage{adjustbox} % must be after xcolor \usepackage{minted} % must be after xcolor \makeatletter \@ifpackagelater{minted}{2013/12/21}{% From 0de960c720e260096cc7b53396b5c4f7b9b79888 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 23 Jun 2016 21:28:03 +0200 Subject: [PATCH 09/10] Bump Copyright year. --- COPYING.md | 2 +- Makefile.am | 2 +- configure.ac | 2 +- contrib/Makefile.am | 2 +- contrib/TeXShop/Makefile.am | 2 +- debian/copyright | 6 +++--- doc/Makefile.am | 2 +- examples/Makefile.am | 2 +- fonts/Makefile.am | 2 +- fonts/granapadano-base.sfd | 2 +- fonts/greciliae-base.sfd | 2 +- fonts/gregorio-base.sfd | 2 +- src/Makefile.am | 2 +- src/characters.c | 2 +- src/characters.h | 2 +- src/dump/dump.c | 2 +- src/enum_generator.h | 2 +- src/gabc/gabc-score-determination.l | 2 +- src/gregorio-utils.c | 2 +- src/gregoriotex/gregoriotex.h | 2 +- src/messages.c | 2 +- src/messages.h | 2 +- src/plugins.h | 2 +- src/unicode.c | 2 +- src/unicode.h | 2 +- tex/Makefile.am | 2 +- tex/gregoriosyms.sty | 2 +- tex/gregoriotex-chars.tex | 2 +- tex/gregoriotex-main.tex | 2 +- tex/gregoriotex-nabc.lua | 2 +- tex/gregoriotex-signs.tex | 2 +- tex/gregoriotex-spaces.tex | 2 +- tex/gregoriotex-syllable.tex | 2 +- tex/gregoriotex-symbols.tex | 2 +- tex/gregoriotex.lua | 4 ++-- tex/gregoriotex.sty | 2 +- tex/gsp-default.tex | 2 +- windows/gregorio.iss | 2 +- windows/install.lua | 2 +- windows/uninstall.lua | 2 +- 40 files changed, 43 insertions(+), 43 deletions(-) diff --git a/COPYING.md b/COPYING.md index e4e2580e9..431860c68 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,6 +1,6 @@ #License of Gregorio -The program Gregorio is (C) 2007-2015 The Gregorio project, see +The program Gregorio is (C) 2007-2016 The Gregorio project, see [CONTRIBUTORS.md](CONTRIBUTORS.md) for authors. It is distributed under the GPLv3 license, printed below. diff --git a/Makefile.am b/Makefile.am index b91d1f8af..93a05f0ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/configure.ac b/configure.ac index 8a873cf07..98cda63a7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Gregorio -dnl Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +dnl Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) dnl dnl This file is part of Gregorio. dnl diff --git a/contrib/Makefile.am b/contrib/Makefile.am index fbccca9ca..b25741fea 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/contrib/TeXShop/Makefile.am b/contrib/TeXShop/Makefile.am index ea3b5da6e..7c96f2e89 100644 --- a/contrib/TeXShop/Makefile.am +++ b/contrib/TeXShop/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/debian/copyright b/debian/copyright index 56ff5380c..7151d1871 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,15 +4,15 @@ Upstream-Contact: Elie Roux Source: https://github.com/gregorio-project/gregorio/releases Files: * -Copyright: 2008-2015 The Gregorio Project +Copyright: 2008-2016 The Gregorio Project License: GPL-3+ Files: fonts/gregorio* -Copyright: 2008-2015 The Gregorio Project +Copyright: 2008-2016 The Gregorio Project License: GPL-3font+ Files: fonts/granapadano* -Copyright: 2008-2015 Juergen Reuter, the Gregorio Project +Copyright: 2008-2016 Juergen Reuter, the Gregorio Project License: GPL-3font+ Files: fonts/greciliae* diff --git a/doc/Makefile.am b/doc/Makefile.am index 42a58014f..17aad60ab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/examples/Makefile.am b/examples/Makefile.am index 72230adc3..31a942218 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/fonts/Makefile.am b/fonts/Makefile.am index 166d9ef0e..de158b383 100644 --- a/fonts/Makefile.am +++ b/fonts/Makefile.am @@ -1,7 +1,7 @@ ## This makefile is made to build to fonts from the sfd, it won't be useful for ## the average user. -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/fonts/granapadano-base.sfd b/fonts/granapadano-base.sfd index dc36aea19..b02eff6dc 100644 --- a/fonts/granapadano-base.sfd +++ b/fonts/granapadano-base.sfd @@ -3,7 +3,7 @@ FontName: granapadano FullName: granapadano FamilyName: granapadano Weight: Medium -Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter \nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> +Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter \nCopyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> UComments: "2007-4-12: Created." Version: 1.0 ItalicAngle: 0 diff --git a/fonts/greciliae-base.sfd b/fonts/greciliae-base.sfd index 121ce4781..6fb436cfb 100644 --- a/fonts/greciliae-base.sfd +++ b/fonts/greciliae-base.sfd @@ -3,7 +3,7 @@ FontName: greciliae FullName: greciliae FamilyName: greciliae Weight: Medium -Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL +Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL UComments: "2007-4-12: Created." Version: 1.2 ItalicAngle: 0 diff --git a/fonts/gregorio-base.sfd b/fonts/gregorio-base.sfd index 06a557093..7eac03af5 100644 --- a/fonts/gregorio-base.sfd +++ b/fonts/gregorio-base.sfd @@ -3,7 +3,7 @@ FontName: gregorio FullName: gregorio FamilyName: gregorio Weight: Medium -Copyright: Font named "gregorio"\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> +Copyright: Font named "gregorio"\nCopyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> UComments: "2007-4-12: Created." Version: 1.2 ItalicAngle: 0 diff --git a/src/Makefile.am b/src/Makefile.am index df996ee02..279f17d42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/src/characters.c b/src/characters.c index 51c68b51f..b82e25e80 100644 --- a/src/characters.c +++ b/src/characters.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX. * This file contains functions that deal with lyrics and styles. * - * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/characters.h b/src/characters.h index 32cea8740..01fa80180 100644 --- a/src/characters.h +++ b/src/characters.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the lyric handling data structures and entry points. * - * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/dump/dump.c b/src/dump/dump.c index c394acf3f..db7e5a5f0 100644 --- a/src/dump/dump.c +++ b/src/dump/dump.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX. * This file provides functions to dump out Gregorio structures. * - * Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/enum_generator.h b/src/enum_generator.h index e6c6ae104..7ea576e1c 100644 --- a/src/enum_generator.h +++ b/src/enum_generator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-score-determination.l b/src/gabc/gabc-score-determination.l index a660443dc..1abd4c294 100644 --- a/src/gabc/gabc-score-determination.l +++ b/src/gabc/gabc-score-determination.l @@ -4,7 +4,7 @@ * This file implements the score lexer. * * Gregorio score determination in gabc input. - * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gregorio-utils.c b/src/gregorio-utils.c index d143fe505..119a9d1e9 100644 --- a/src/gregorio-utils.c +++ b/src/gregorio-utils.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements the command line interface of Gregorio. * - * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gregoriotex/gregoriotex.h b/src/gregoriotex/gregoriotex.h index 65c2caaeb..3a2ca07bd 100644 --- a/src/gregoriotex/gregoriotex.h +++ b/src/gregoriotex/gregoriotex.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes GregorioTeX writing data structures and entry points. * - * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/messages.c b/src/messages.c index 0aada3b80..5cbf5dd1c 100644 --- a/src/messages.c +++ b/src/messages.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains functions for logging messages, warnings, and errors. * - * Copyright (C) 2009-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2009-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/messages.h b/src/messages.h index 7b0282946..bb87d6b14 100644 --- a/src/messages.h +++ b/src/messages.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the message logging functions. * - * Copyright (C) 2009-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2009-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/plugins.h b/src/plugins.h index 3363d491b..bdfb4fa05 100644 --- a/src/plugins.h +++ b/src/plugins.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the "main" entry points for reading and writing data. * - * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/unicode.c b/src/unicode.c index 82b581eea..1cc381d2a 100644 --- a/src/unicode.c +++ b/src/unicode.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains functions providing UTF-8 support. * - * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/unicode.h b/src/unicode.h index 7af434a28..0d0d5aac1 100644 --- a/src/unicode.h +++ b/src/unicode.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the UTF-8 support functions. * - * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/tex/Makefile.am b/tex/Makefile.am index 273f4f33f..2f622500a 100644 --- a/tex/Makefile.am +++ b/tex/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index cd00fa428..6438269b3 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index 305bf55f4..08492abfb 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index cd1b1c379..46ef40890 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -1,6 +1,6 @@ %GregorioTeX main file. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index bfe14b532..14abe5637 100644 --- a/tex/gregoriotex-nabc.lua +++ b/tex/gregoriotex-nabc.lua @@ -1,6 +1,6 @@ --GregorioTeX Nabc Lua file. -- ---Copyright (C) 2014-2015 The Gregorio Project (see CONTRIBUTORS.md) +--Copyright (C) 2014-2016 The Gregorio Project (see CONTRIBUTORS.md) -- --This file is part of Gregorio. -- diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 10dbf820a..bd6ccd57c 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 39dd080aa..4552f5a98 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 933c40bb5..c64a7956b 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index f98ab4901..51a3de0bc 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index ce0f4225b..6f15499f3 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -1,6 +1,6 @@ --GregorioTeX Lua file. -- ---Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md) +--Copyright (C) 2008-2016 The Gregorio Project (see CONTRIBUTORS.md) -- --This file is part of Gregorio. -- @@ -33,7 +33,7 @@ local err, warn, info, log = luatexbase.provides_module({ date = "2016/08/18", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", - copyright = "2008-2015 - The Gregorio Project", + copyright = "2008-2016 - The Gregorio Project", license = "GPLv3+", }) diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index bd919070c..fbbbe78e2 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -1,6 +1,6 @@ %GregorioTeX LaTeX style. % -% Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/tex/gsp-default.tex b/tex/gsp-default.tex index 2c2af57a8..7fabe050f 100644 --- a/tex/gsp-default.tex +++ b/tex/gsp-default.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2010-2015 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2010-2016 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/windows/gregorio.iss b/windows/gregorio.iss index e71c32c49..83d3cfbc1 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -7,7 +7,7 @@ SetupIconFile=gregorio.ico Compression=lzma2 SolidCompression=yes LicenseFile=../COPYING.md -AppCopyright=Copyright (C) 2006-2015 The Gregorio Project +AppCopyright=Copyright (C) 2006-2016 The Gregorio Project AppComments=Software for engraving Gregorian Chant scores. AppContact=gregorio-devel@gna.org AppPublisher=The Gregorio Project diff --git a/windows/install.lua b/windows/install.lua index 959227d38..2359fcd38 100644 --- a/windows/install.lua +++ b/windows/install.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua --[[ Gregorio Windows automatic installation script. -Copyright (C) 2010-2015 Gregorio Project authors +Copyright (C) 2010-2016 Gregorio Project authors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/windows/uninstall.lua b/windows/uninstall.lua index 4f543c4cb..5d88fab26 100644 --- a/windows/uninstall.lua +++ b/windows/uninstall.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua --[[ Gregorio Windows automatic installation script. -Copyright (C) 2010-2015 Gregorio Project authors +Copyright (C) 2010-2016 Gregorio Project authors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 14f957b9ee470a10b103d88ee64403bb9d04eaf0 Mon Sep 17 00:00:00 2001 From: "Henry So, Jr" Date: Fri, 29 Jul 2016 22:15:38 -0400 Subject: [PATCH 10/10] Cherry pick fc54014 --- doc/Appendix_Font_Tables.tex | 18 ++++++++++++++++++ doc/Command_Index_User.tex | 18 ++++++++++++++++++ doc/Command_Index_gregorio.tex | 18 ++++++++++++++++++ doc/Command_Index_internal.tex | 18 ++++++++++++++++++ doc/Gabc.tex | 18 ++++++++++++++++++ doc/GregorioNabcRef.tex | 19 ++++++++++++++++++- doc/GregorioRef.lua | 17 +++++++++++++++++ doc/GregorioRef.tex | 18 ++++++++++++++++++ install-gtex.sh | 4 +--- macosx/create_package.sh | 7 ++++--- windows/gregorio.iss | 13 +++++-------- 11 files changed, 153 insertions(+), 15 deletions(-) diff --git a/doc/Appendix_Font_Tables.tex b/doc/Appendix_Font_Tables.tex index 1b15e5059..3f72113fa 100644 --- a/doc/Appendix_Font_Tables.tex +++ b/doc/Appendix_Font_Tables.tex @@ -1,5 +1,23 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \begin{landscape} \section{Font Glyph Tables}\label{glyphtable} diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex index a78f17976..63105e1f0 100644 --- a/doc/Command_Index_User.tex +++ b/doc/Command_Index_User.tex @@ -1,5 +1,23 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \section{User Controls} These functions are available to the user to customize elements of the diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex index 9319935f3..5f7f89830 100644 --- a/doc/Command_Index_gregorio.tex +++ b/doc/Command_Index_gregorio.tex @@ -1,5 +1,23 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \section{Gregorio Controls} These functions are the ones written by gregorio to the gtex file. diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex index e4aae155d..6d40555a8 100644 --- a/doc/Command_Index_internal.tex +++ b/doc/Command_Index_internal.tex @@ -1,5 +1,23 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \section{Gregorio\TeX{} Controls} These functions are the ones used by Gregorio\TeX{} internally as it diff --git a/doc/Gabc.tex b/doc/Gabc.tex index 2afcf8723..4e5d168cd 100644 --- a/doc/Gabc.tex +++ b/doc/Gabc.tex @@ -1,5 +1,23 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \section{The GABC File} gabc is a simple notation based exclusively on ASCII characters that diff --git a/doc/GregorioNabcRef.tex b/doc/GregorioNabcRef.tex index 744e0fbd0..e635bf8a6 100644 --- a/doc/GregorioNabcRef.tex +++ b/doc/GregorioNabcRef.tex @@ -1,5 +1,22 @@ % !TEX program = LuaLaTeX+se - +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \documentclass[a4paper]{article} \usepackage{color} \usepackage[margin=1cm]{geometry} diff --git a/doc/GregorioRef.lua b/doc/GregorioRef.lua index bcc35a9bb..2e7d06dd5 100644 --- a/doc/GregorioRef.lua +++ b/doc/GregorioRef.lua @@ -1,3 +1,20 @@ +-- Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +-- +-- This file is part of Gregorio. +-- +-- Gregorio is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- Gregorio is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with Gregorio. If not, see . + local P = lpeg.P local R = lpeg.R local C = lpeg.C diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index a2453f4a0..e8c1d16b9 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -1,4 +1,22 @@ % !TEX program = LuaLaTeX+se +% +% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md) +% +% This file is part of Gregorio. +% +% Gregorio is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Gregorio is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Gregorio. If not, see . +% \documentclass[12pt,a4paper]{article} \usepackage[titletoc,toc,title]{appendix} \usepackage{fontspec} diff --git a/install-gtex.sh b/install-gtex.sh index 8501843a4..fe1c18878 100755 --- a/install-gtex.sh +++ b/install-gtex.sh @@ -66,9 +66,7 @@ LATEXFILES=(tex/gregorio*.sty) TTFFILES=(gregorio.ttf greciliae.ttf granapadano.ttf gregorio-op.ttf greciliae-op.ttf granapadano-op.ttf greextra.ttf gregall.ttf gresgmodern.ttf) -DOCFILES=(doc/Appendix*.tex doc/Command*.tex doc/Gabc.tex - doc/*Ref.tex doc/*Ref.lua doc/*.gabc - doc/Gregorio*Ref.pdf) +DOCFILES=(doc/*.tex doc/*.lua doc/*.gabc doc/*.pdf doc/README.md) EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc examples/main-lualatex.tex examples/debugging.tex) FONTSRCFILES=(gregorio-base.sfd granapadano-base.sfd greciliae-base.sfd diff --git a/macosx/create_package.sh b/macosx/create_package.sh index e65a9b7e7..0668ebadd 100755 --- a/macosx/create_package.sh +++ b/macosx/create_package.sh @@ -74,9 +74,10 @@ else make doc cd .. cp doc/*.tex $EXTRASDIR/doc/ - cp doc/*-*.pdf $EXTRASDIR/doc/ - cp doc/*.md $EXTRASDIR/doc/ + cp doc/*.lua $EXTRASDIR/doc/ cp doc/*.gabc $EXTRASDIR/doc/ + cp doc/*.pdf $EXTRASDIR/doc/ + cp doc/README.md $EXTRASDIR/doc/ cp -r contrib/ $EXTRASDIR/contrib find $EXTRASDIR/contrib -name 'Makefile*' -delete cp examples/*.tex $EXTRASDIR/examples/ @@ -129,4 +130,4 @@ if $clean; then cd $HERE rm -rf build/ rm -rf Resources/ -fi \ No newline at end of file +fi diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 83d3cfbc1..17c35ca4e 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -57,8 +57,8 @@ Source: "../CHANGELOG.md"; DestDir: "{app}"; Source: "../README.md"; DestDir: "{app}"; Source: "../CONTRIBUTORS.md"; DestDir: "{app}"; Source: "../UPGRADE.md"; DestDir: "{app}"; -Source: "../doc/Gregorio*Ref.pdf"; DestDir: "{app}"; -Source: "../doc/Gregorio*Ref.pdf"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*.pdf"; DestDir: "{app}"; +Source: "../doc/*.pdf"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; Source: "../COPYING.md"; DestDir: "{app}"; Source: "../contrib/system-setup.bat"; DestDir: "{app}"; Source: "../contrib/*"; DestDir: "{app}\contrib"; Excludes: "Makefile*,TeXShop\*,*.command"; @@ -74,13 +74,10 @@ Source: "../fonts/*.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriote Source: "../fonts/*.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; Source: "../fonts/*.py"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; Source: "../fonts/README.md"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../README.md"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/Appendix*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/Command*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/Gabc.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/*Ref.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/*Ref.lua"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*.lua"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; Source: "../doc/*.gabc"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/README.md"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; [InstallDelete] Type: files; Name: "{app}\gregorio.exe"