Merge commit 'f790c50299dcbf2d919e4459de8668ce6c269b19' into doc_fix

* commit 'f790c50299dcbf2d919e4459de8668ce6c269b19': (35 commits) Specifically noted which spaces may be altered by grechangenextscorelinedim. Added the ability to change a dimension for a given line in a score. Fixes gregorio-project#1156. 1144: fix doc typos oops document spaces doc, fix small bug, Implemented distance check for notes around virgula and divisio minima. do not use alterationsadjustment on clef change, reduce it greciliae: fix small problem of joining line height doc fix gregorio-project#1169 attempt to fix gregorio-project#1146 TeX part of gregorio-project#1144 Extended the nearness check to the first two notes of podatus, clivis, and porrectus. gregorio-project#1138: TeX and doc gregorio-project#1138: change default case gregorio-project#1137: fix case of podatus Added an argument to \GreSetInitialClef indicating whether the first note is near the clef. Part of the implementation for gregorio-project#1138. fix gregorio-project#1137 Add documentation for recent Nabc vertical placement changes. ...
rpspringuel · Jul 4, 2016 · 2c5f0b4 · 2c5f0b4
2 parents dc843dd + f790c50
commit 2c5f0b4
Show file tree

Hide file tree

Showing 49 changed files with 728 additions and 276 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,22 @@ 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/).
 
 [Unreleased][unreleased]
+### Fixed
+- A two-line initial on a two-line score no longer generates an error (see [#1139](https://github.com/gregorio-project/gregorio/issues/1139)).
+- Staff lines after a two-line initial should now be sized correctly in a more consistent way (see [#1141](https://github.com/gregorio-project/gregorio/issues/1141)).
+- Space at the end of line was not always correct when a line is cut in the middle of a word (see [#1155](https://github.com/gregorio-project/gregorio/issues/1155)).
+- In rare cases, the very last bar or glyph of a score could appear alone at the beginning of the final line (see [#1152](https://github.com/gregorio-project/gregorio/issues/1152)).
+- In cases of a syllable without note, the space between notes of the previous and next syllables was sometimes not enough (see [#1137](https://github.com/gregorio-project/gregorio/issues/1137)).
+- `moraadjustment` and `moraadjustmentbar` did not scale when changing factor, they do now.
+
+### Added
+- Some vertical spaces can now be adjusted for a particular line in a score.  Use `\grechangenextscorelinedim` prior to including the score to set the desired values.  `spaceabovelines`, `spacebeneathtext`, and `spacelinestext` may be changed with this command.  See GregorioRef and [#1156](https://github.com/gregorio-project/gregorio/issues/1156) for details.
 
+### Changed
+- When the clef and the first note are at a reasonable vertical distance, `shortspaceafterlineclef` is used instead of `spaceafterlineclef` (make them equal if you don't want this feature). This is used only on the first line, when there is an initial on one line. See [#1138](https://github.com/gregorio-project/gregorio/issues/1138).
+- When an alteration follows a bar, it is not completely taken into consideration in the new bar spacing algorithm (similarly to the punctum mora), this behavior can be tuned with the newly introduced space `alterationadjustmentbar`. See [#1146](https://github.com/gregorio-project/gregorio/issues/1146).
+- Very small improvement in the design of the porrectus auctus and torculus resupinus auctus (see [#1169](https://github.com/gregorio-project/gregorio/issues/1169)).
+- When the notes around a virgula or divisio minima are lower than two spaces below the top staff line, the spaces used are new shorter spaces with a `@short` prefix. To cancel this feature, make them the same as their normal version. See [#1144](https://github.com/gregorio-project/gregorio/issues/1144).
 
 ## [4.2.0-rc1] - 2016-05-31
 ### Fixed

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,15 +4,15 @@ Upstream-Contact: Elie Roux <elie.roux@telecom-bretagne.eu>
 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/Command_Index_User.tex b/doc/Command_Index_User.tex
@@ -249,6 +249,18 @@ \subsubsection{Fine Tuning Dimensions}
   & \texttt{inherited} & Distance will inherit its value from another distance.  When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance.
 \end{argtable}
 
+\macroname{\textbackslash grechangenextscorelinedim}{\{\#1\}\{\#2\}\{\#3\}\{\#4\}}{gregoriotex-spaces.tex}
+Changes one of Gregorio\TeX’s distances for a given line in the next included score.  This works with \texttt{spaceabovelines}, \texttt{spacebeneathtext}, and \texttt{spacelinestext}.
+
+\begin{argtable}
+  \#1 & integer & The number of the line in the next score to be adjusted.\\
+  \#2 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
+  \#3 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
+  \#4 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
+  & \texttt{scalable} & Distance will scale when staff size is changed.\\
+  & \texttt{inherited} & Distance will inherit its value from another distance.  When this argument is used, then \#3 should be the name of another Gregorio\TeX\ distance.
+\end{argtable}
+
 \macroname{\textbackslash grescaledim}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
 Macro to turn on or off scaling with the staff size for a particular distance.
 
@@ -1222,6 +1234,12 @@ \subsection{Counts}\label{counts}
 notes taken into account with above lines text vertical placement.
 \end{gcount}
 
+\begin{gcount}{additionaltopspacenabcthreshold}
+Same as \texttt{additionaltopspacethreshold} but setting the threshold for
+notes taken into account with above lines nabc neume vertical placement
+baseline.
+\end{gcount}
+
 \subsection{Distances}\label{distances}
 
 Each of the following distances controls some aspect of the spacing of the Gregorio\TeX\ score.  They are changed using \verb=\grechangedim=, documented above.  If the distance permits a rubber value, then the default value will indicate the stretch and shrink (even if they are zero by default).  Distances whose default value does not include a stretch or shrink may not take a rubber value.
@@ -1644,14 +1662,22 @@ \subsubsection{Bar distances}
 This space is added before the final divisio final of a score (old bar spacing algorithm only).
 \end{gdimension}
 
-Spaces around bars when they are typeset inside a syllable:
+Spaces around bars when they are typeset inside a syllable. The \verb=@short= suffix for virgula
+and divisio minima indicates the space used when the notes surrounding the bar are strictly lower
+than \texttt{g} (in a four-line score).
 
 \begin{gdimension}{bar@virgula}
 \end{gdimension}
 
+\begin{gdimension}{bar@virgula@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minima}
 \end{gdimension}
 
+\begin{gdimension}{bar@minima@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minor}
 \end{gdimension}
 
@@ -1669,9 +1695,15 @@ \subsubsection{Bar distances}
 \begin{gdimension}{bar@virgula@standalone@text}
 \end{gdimension}
 
+\begin{gdimension}{bar@virgula@standalone@text@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minima@standalone@text}
 \end{gdimension}
 
+\begin{gdimension}{bar@minima@standalone@text@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minor@standalone@text}
 \end{gdimension}
 
@@ -1692,9 +1724,15 @@ \subsubsection{Bar distances}
 \begin{gdimension}{bar@virgula@standalone@notext}
 \end{gdimension}
 
+\begin{gdimension}{bar@virgula@standalone@notext@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minima@standalone@notext}
 \end{gdimension}
 
+\begin{gdimension}{bar@minima@standalone@notext@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minor@standalone@notext}
 \end{gdimension}
 
@@ -1768,6 +1806,9 @@ \subsubsection{Bar distances}
 Same as \texttt{maxbaroffsettextleft@eol} but when the center of the text goes right of the center of the bar.
 \end{gdimension}
 
+\begin{gdimension}{alterationadjustmentbar}
+In the case of an alteration after a bar, the alteration will go a bit left of this value. This can be compared to \texttt{moraadjustmentbar}.
+\end{gdimension}
 
 \subsection{Penalties}\label{penalties}
 Penalties are used by \TeX\ to determine where line and page breaks should occur.  Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores.  With the exception of \texttt{emergencystretch} (which should be changed using \verb=\grechangedim=) these should be changed using \verb=\grechangecount=, described above.

diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex
@@ -212,13 +212,15 @@ \section{Gregorio Controls}
   \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
 \end{argtable}
 
-\macroname{\textbackslash GreDivisioMinima}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDivisioMinima}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro to typeset a divisio minima.
 
 \begin{argtable}
   \#1 & \texttt{0} & There is no text under the bar.\\
   & \texttt{1} & There is text under the bar.\\
   \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
+  \#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
+  & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
 \end{argtable}
 
 \macroname{\textbackslash GreDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
@@ -541,7 +543,7 @@ \section{Gregorio Controls}
 \macroname{\textbackslash GreInDivisioMaior}{\#1\#2}{gregoriotex-signs.tex}
 Same as \verb=\GreDivisioMaior= except inside a syllable.
 
-\macroname{\textbackslash GreInDivisioMinima}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDivisioMinima}{\#1\#2\#3}{gregoriotex-signs.tex}
 Same as \verb=\GreDivisioMinima= except inside a syllable.
 
 \macroname{\textbackslash GreInDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
@@ -550,7 +552,7 @@ \section{Gregorio Controls}
 \macroname{\textbackslash GreInDominica}{\#1\#2\#3}{gregoriotex-signs.tex}
 Same as \verb=\GreDominica= except inside a syllable.
 
-\macroname{\textbackslash GreInVirgula}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInVirgula}{\#1\#2\#3}{gregoriotex-signs.tex}
 Same as \verb=\GreVirgula= except inside a syllable.
 
 \macroname{\textbackslash GreItalic}{\#1}{gregoriotex.sty or gregoriotex.tex}
@@ -639,6 +641,9 @@ \section{Gregorio Controls}
 \macroname{\textbackslash GreNewParLine}{}{gregoriotex-main.tex}
 Same as \verb=\GreNewLine= except line is not justified.
 
+\macroname{\textbackslash GreFinalNewLine}{}{gregoriotex-main.tex}
+Handles a new line after the final bar.  This currently just advances \verb=\gre@knownline= in order to prevent a potential error message with a two-line initial on a two-line score.
+
 \macroname{\textbackslash GreNextCustos}{\#1\#2}{gregoriotex-signs.tex}
 Sets the pitch to use for the next custos if it were to happen at the point
 where this macro is called.
@@ -852,7 +857,7 @@ \section{Gregorio Controls}
   \#1 & character & The initial letter of the score.\\
 \end{argtable}
 
-\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro for writing initial clef.
 
 \begin{argtable}
@@ -862,6 +867,7 @@ \section{Gregorio Controls}
   \#4 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
   \#5 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
   \#6 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
+  \#7 & integer & \texttt{0} if clef and first note are far enough to use a shorter space, 1 otherwise.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-main.tex}
@@ -878,6 +884,14 @@ \section{Gregorio Controls}
   \#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
 \end{argtable}
 
+\macroname{\textbackslash GreSetNabcAboveLines}{\#1}{gregoriotex-main.tex}
+Macro to place argument containing Nabc neumes above the lines and empty
+\verb=\gre@currenttextabovelines= when done.
+
+\begin{argtable}
+  \#1 & string & Nabc neumes to be placed above the lines.\\
+\end{argtable}
+
 \macroname{\textbackslash GreSetNextSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
 Macro to set the text of the next syllable for spacing purposes.
 
@@ -1055,13 +1069,15 @@ \section{Gregorio Controls}
   \#2 & string  & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
-\macroname{\textbackslash GreVirgula}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreVirgula}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro to typeset a virgula.
 
 \begin{argtable}
   \#1 & \texttt{0} & There is no text under the bar.\\
   & \texttt{1} & There is text under the bar.\\
   \#2 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
+  \#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
+  & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
 \end{argtable}
 
 \macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}

diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex
@@ -521,8 +521,14 @@ \section{Gregorio\TeX{} Controls}
 \macroname{\textbackslash gre@currenttextabovelines}{}{gregoriotex-main.tex}
 Macro for storing the text which needs to be placed above the lines.
 
-\macroname{\textbackslash gre@typesettextabovelines}{\#1}{gregoriotex-main.tex}
-Macro for typesetting the text above the lines.
+\macroname{\textbackslash gre@typesettextabovelines}{\#1\#2}{gregoriotex-main.tex}
+Macro for typesetting the text or nabc neumes above the lines.
+
+\begin{argtable}
+  \#1 & string & Text to be typeset\\
+  \#2 & \texttt{0} & Use alt text above the lines vertical spacing\\
+  & \texttt{1} & Use nabc neumes above the lines vertical spacing\\
+\end{argtable}
 
 \macroname{\textbackslash gre@dotranslationcenterend}{}{gregoriotex-main.tex}
 Macro to typeset a centered translation.
@@ -764,7 +770,7 @@ \section{Gregorio\TeX{} Controls}
   \#6 & integer & if \texttt{3}, it means that we must not put a flat after the secondary clef, otherwise it’s the height of the flat\\
 \end{argtable}
 
-\macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex}
 Macro which typesets the clef.
 
 \begin{argtable}
@@ -773,7 +779,8 @@ \section{Gregorio\TeX{} Controls}
   \#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
   & \texttt{1} & we must use small clef characters (inside a line)\\
   \#4 & \texttt{0} & no extra space is needed after the clef\\
-  & \texttt{}1 & we must type a space after the clef\\
+  & \texttt{1} & we must type a normal space after the clef\\
+  & \texttt{2} & we must type a short space after the clef\\
   \#5 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
   \#6 & character & the type of the secondary clef: c or f\\
   \#7 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
@@ -806,7 +813,7 @@ \section{Gregorio\TeX{} Controls}
 \macroname{\textbackslash gre@widthof}{\#1}{gregoriotex-main.tex}
 Macro for calculating the width of its argument and storing it in \verb=\gre@dimen@temp@three=.
 
-\macroname{\textbackslash gre@writebar}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@writebar}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to write a bar.
 
 \begin{argtable}
@@ -821,6 +828,8 @@ \section{Gregorio\TeX{} Controls}
   \#3 & \texttt{0} & if there is no text underneath the bar\\
   & \texttt{1} & if there is text underneath the bar\\
   \#4 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
+  \#5 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
+  & \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@@arg}{}{gregoriotex-syllable.tex}
@@ -1200,6 +1209,11 @@ \section{Gregorio\TeX{} Controls}
 \macroname{\textbackslash gre@dimension}{}{gregoriotex-spaces.tex}
 Workhorse function for setting distances in \verb=\grecreatedim= and \verb=\grechangedim=.
 
+\macroname{\textbackslash gre@changedimforline}{\#1\#2\#3}{gregoriotex-spaces.tex}
+Saves the current value of the dimension and then changes it.  The arguments
+are the same as \verb=\grechangedim=.  Used to temporarily change the dimension
+for a given line, which is restored at the next beginning of the next line.
+
 \macroname{\textbackslash gre@setstafflines}{\#1}{gregoriotex-main.tex}
 Sets the number of staff lines.
 
@@ -1224,12 +1238,16 @@ \section{Gregorio\TeX{} Controls}
   \#1 & integer & The number to typeset\\
 \end{argtable}
 
-\macroname{\textbackslash gre@bar@space@suffix}{\#1\#2}{gregoriotex-symbols.tex}
+\macroname{\textbackslash gre@bar@space@suffix}{\#1\#2\#3}{gregoriotex-symbols.tex}
 Macro used to select the corresct suffix of the \verb=bar@x= spaces.
 
 \begin{argtable}
   \#1 & \texttt{0} & emits nothing\\
-  & \texttt{1} emits \texttt{text}\\
+  & \texttt{1} emits \verb=@standalone=\\
+  \#2 & \texttt{0} & emits \verb=@notext= (only if standalone)\\
+  & \texttt{1} emits \verb=@text= (only if standalone)\\
+  \#3 & \texttt{0} & emits nothing\\
+  & \texttt{1} emits \verb=@short=\\
 \end{argtable}
 
 \macroname{\textbackslash gre@drawadditionalline}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
@@ -1880,6 +1898,9 @@ \subsection{Distances}
 \macroname{\textbackslash gre@skip@nextbegindifference}{}{gregoriotex-spaces.tex}
 The difference between the start of the notes and the start of the text for the next syllable.  Positive when when text begins first, negative in other case.
 
+\macroname{\textbackslash gre@dimen@adjustednextbegindifference}{}{gregoriotex-spaces.tex}
+Only used in new bar spacing algorithm. It is \verb=grebegindifference= adjusted with \verb=alterationadjustmentbar= if relevant.
+
 \macroname{\textbackslash gre@dimen@begindifference}{}{gregoriotex-spaces.tex}
 The difference between the start of the notes and the start of the text for the current syllable.  Positive when when text begins first, negative in other case.  This means that \verb=\kern\gre@dimen@begindifference= will take you from the start of the notes to the start of the text.
 

diff --git 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.
 #
@@ -30,7 +30,7 @@ GregorioRef.pdf: $(SRCFILES)
 	$(MAKE) $(AM_MAKEFLAGS) -C ../src gregorio
 	../src/gregorio -o factus.gtex $(<D)/factus.gabc
 	TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
-		 TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -recorder -pdf \
+		 TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -f -recorder -pdf \
 		 -interaction=nonstopmode -halt-on-error \
 		 -pdflatex='lualatex --shell-escape %O %S' \
 		 -jobname=GregorioRef $< || rm $@

diff --git 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
@@ -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.
 #