Merge branch 'release-5.0' into hyphen_height

* release-5.0:
  Remove note about luaotfload bug
  Prevented the change of \gre@diment@lastglyphwidth by a custos alteration. Fixes gregorio-project#1379.
  Added note about package ordering as related to microtype. Fixes gregorio-project#1364.
  Switched to tex.sprint since it's not the last tex print call in the function.
  Opened auto-compiled gabc files in TeX so opening is recorded correctly. Fixes gregorio-project#1367.
  Update references to gna.org

CHANGELOG.md

@@ -3,7 +3,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/).
 
 ## [Unreleased][unreleased]
-
+- Fixed issue with Tex Live 2017 latexmk not detecting auto-compiled gabc files as dependencies (see [#1367](https://github.com/gregorio-project/gregorio/issues/1367)).
+- Added note about loading microtype after gregoriotex (see [#1364](https://github.com/gregorio-project/gregorio/issues/1364)).
+- Fixed issue where an altered note (glyph) throws off the position of an episema in the glyph that immediately precedes it (see [#1379](https://github.com/gregorio-project/gregorio/issues/1379)).
 
 ## [5.0.2] - 2017-05-24
 - Worked around an issue discovered during the TeX Live 2017 pre-test.  See [#1362](https://github.com/gregorio-project/gregorio/issues/1362).

CONTRIBUTING.md

@@ -6,7 +6,7 @@ You can report a bug and request a new feature on the [bug tracker](https://gith
 
 Please search for existing issues before reporting a new one.
 
-Please do not use the issue tracker for personal support requests, instead use the mailing-list (https://gna.org/mail/?group=gregorio) or IRC: #gregorio on freenode.
+Please do not use the issue tracker for personal support requests, instead use the mailing-list (https://groups.google.com/forum/#!forum/gregorio-users) or IRC: #gregorio on freenode.
 
 ### Report a bug
 

README.md

@@ -16,12 +16,6 @@ You can also try it online [here](http://dev.illuminarepublications.com/gregorio
 
 You need a recent and working [TeXLive](https://www.tug.org/texlive/), on top of which you just need to install latest [Gregorio release](https://github.com/gregorio-project/gregorio/releases). See [the website](http://gregorio-project.github.io/installation.html) for more details.
 
-**Note:** Due to a bug in the v2.7-fix-3 release of `luaotfload` the documentation cannot be built against TeXLive 2016 if you have that version of `luaotfload` (see [#1188](https://github.com/gregorio-project/gregorio/issues/1188)).  The result is that users should do one of the following:
-
-- Install from the distribution tar ball where the documentation is already built (recommended for those installing a stable release).
-- Switch to TeXLive 2015 (which uses an earlier version of `luaotfload`) to build the docs.
-- Upgrade your `luaotfload` to a more recent version (v2.8 or later).
-
 ## Building for inclusion in TeXLive
 
 When building gregorio for inclusion in TeXLive, the gregorio executable must not have the version number suffix that is used for other builds.  To make this happen, run `configure` with the `--disable-version-in-exe` option, and the generated Makefile will create a gregorio executable without the version number suffix (i.e., the executable will simply be named `gregorio`).

contrib/README.md

@@ -23,7 +23,7 @@ under Windows).
 After that you can insert a render frame using Gregorio, and simply
 typing gabc (`right-click->edit sources`).
 
-For more details see [the website](http://home.gna.org/gregorio/scribus).
+For more details see [the website](http://gregorio-project.github.io/introduction-scribus.html).
 
 ## Syllabation checker
 

contrib/system-setup.bat

@@ -237,7 +237,7 @@ echo.
 echo system-setup.log created and saved in a temporary location.
 echo Upon exiting this script, the log will be opened in Notepad for you.
 echo Please save the file to a convenient location and email it to
-echo gregorio-users@gna.org as part of your bug report.
+echo gregorio-users@googlegroups.com as part of your bug report.
 echo.
 echo You can also create an issue at
 echo http://github.org/gregorio-project/gregorio/issues

contrib/system-setup.command

@@ -221,8 +221,8 @@ echo "" >> $OUTPUT
 echo ""
 echo ""
 echo "system-setup.log created and saved the working directory from which you"
-echo "ran this script.  Please email it to gregorio-users@gna.org as part of"
-echo "your bug report."
+echo "ran this script.  Please email it to gregorio-users@googlegroups.com as"
+echo "part of your bug report."
 echo ""
 echo "You can also create an issue at "
 echo "http://github.org/gregorio-project/gregorio/issues"

debian/build-deb.sh

@@ -4,7 +4,7 @@
 # it can be useful.
 
 DEBFULLNAME='Gregorio Builder'
-DEBEMAIL='gregorio-devel@gna.org'
+DEBEMAIL='gregorio-devel@googlegroups.com'
 DEBVERSION='UNRELEASED'
 
 until [ -z "$1" ]; do

debian/manpage.xml

@@ -218,7 +218,7 @@ and docbook-xsl in your Build-Depends control field.
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>http://home.gna.org/gregorio for a complete description of the formats.</para>
+    <para>http://gregorio-project.github.io/index.html for a complete description of the formats.</para>
 
   </refsect1>
 </refentry>

doc/Command_Index_User.tex

@@ -80,6 +80,12 @@ \subsection{Using the Package}
 
 If you only need the special symbols which Gregorio\TeX\ contains, and not the ability to include scores or musical glyphs, then you can load \texttt{gregoriosyms} instead of \texttt{gregoriotex}.  It supports all of the above options except those specifically related to scores.  \textbf{You should not try to load both packages}.
 
+\subsubsection{Gregorio\TeX{} and \texttt{microtype}}
+
+If you are using the \texttt{microtype} package or a package that itself uses
+\texttt{microtype}, please load it after \texttt{gregoriotex}.  If you load
+\texttt{microtype} before \texttt{gregoriotex}, you may receive an error about
+an ``undefined control sequence'' if you use certain Gregorio\TeX{} features.
 
 \subsection{Commands}
 

doc/Command_Index_internal.tex

@@ -1439,6 +1439,10 @@ \section{Gregorio\TeX{} Controls}
       & note & the current syllable is a note syllable.\\
 \end{argtable}
 
+\macroname{\textbackslash gre@read@temp}{}{gregoriotex-main.tex}
+File handle used to mark auto-compiled gabc files as dependencies for tools
+like latexmk.
+
 \subsection{Auxiliary File}
 Gregorio\TeX\ creates its own auxiliary file (extension \texttt{gaux}) which it uses to store information between successive typesetting runs.  This allows for such features as the dynamic interline spacing.  The following functions are used to interact with that auxiliary file.
 
@@ -1709,6 +1713,9 @@ \subsection{Flags}
 \macroname{\textbackslash gre@insidediscretionary}{}{gregoriotex-signs.tex}
 Macro which indicates whether we are currently inside a discretionary (\texttt{1}) or not (\texttt{0}).  Cannot be converted to a \TeX\ boolean because it’s value needs to be passed to Lua.
 
+\macroname{\textbackslash ifgre@in@custos}{}{gregoriotex-signs.tex}
+Boolean which indicates whether typesetting is currently in the context of a custos.
+
 \macroname{\textbackslash ifgre@isonaline}{}{gregoriotex-syllable.tex}
 Boolean which indicates whether the current note is on a line or not (used to adjust the height of some symbols so they won’t print on a line).
 

examples/PopulusSion.gabc

@@ -16,7 +16,7 @@ style: modern;
 
 %%
 
-% The syntax in this part is called gabc. Please refer to http://home.gna.org/gregorio/gabc/#basis
+% The syntax in this part is called gabc. Please refer to http://gregorio-project.github.io/gabc/index.html
 
 Pó(c3eh/hi)pu(h)lus(h) Si(hi)on,(hgh.) *(;) ec(hihi)ce(e.) Dó(e.f!gwhhi)mi(h){n}us(h) vé(hi)ni(ig//ih)et(h.) (,) ad(iv./hig) sal(fe~)ván(ghg)das(fg) gen(e_f_e_)tes(e.) :(:)
 

tex/gregoriotex-main.tex

@@ -171,6 +171,9 @@
 %% basic start
 %%%%%%%%%%%%%%%
 
+% Used for marking a gabc file read as a dependency
+\newread\gre@read@temp
+
 \def\gre@pitch@a{3}%
 \def\gre@pitch@b{4}%
 \def\gre@pitch@c{5}%

tex/gregoriotex-signs.tex

@@ -451,10 +451,14 @@
   \gre@trace@end%
 }%
 
+\newif\ifgre@in@custos %
+\gre@in@custosfalse %
+
 % custos just typesets a custos, useful for before the key changes for example
 % #1 is the height
 \def\GreCustos#1#2{%
   \gre@trace{GreCustos{#1}{#2}}%
+  \gre@in@custostrue %
   \GreNoBreak %
   \ifdim\gre@skip@bar@lastskip=0pt\else % we're after a bar:
     \kern-\gre@skip@bar@lastskip %
@@ -505,6 +509,7 @@
   \fi %
   \directlua{gregoriotex.adjust_line_height(\gre@insidediscretionary)}%
   \relax %
+  \gre@in@custosfalse %
   \gre@trace@end%
 }%
 
@@ -522,6 +527,7 @@
 \edef\gre@nextcustosalteration{}%
 \def\GreNextCustos#1#2{%
   \gre@trace{GreNextCustos{#1}{#2}}%
+  \gre@in@custostrue %
   \gre@debugmsg{custos}{nextcustos = #1,#2}%
   \ifnum\gre@insidediscretionary=0\relax %
     \gre@debugmsg{custos}{not discretionary}%
@@ -561,6 +567,7 @@
     \fi %
   \fi %
   \relax%
+  \gre@in@custosfalse %
   \gre@trace@end%
 }%
 
@@ -2404,7 +2411,9 @@
   \ifnum#4=0\relax %
     \gre@newglyphcommon %
   \fi %
-  \global\gre@dimen@lastglyphwidth=\wd\gre@box@temp@width %
+  \ifgre@in@custos\else\relax %
+    \global\gre@dimen@lastglyphwidth=\wd\gre@box@temp@width %
+  \fi %
   % the three next lines are a trick to get the additional lines below the glyphs
   \gre@skip@temp@one = \gre@dimen@lastglyphwidth\relax%
   \kern\gre@skip@temp@one %

tex/gregoriotex.lua

@@ -901,6 +901,8 @@ local function include_score(input_file, force_gabccompile, allow_deprecated)
   -- open the gabc file for reading so that LuaTeX records input from it
   -- when the -recorder option is used; do this here so that this happens
   -- on every run
+  tex.sprint(catcode_at_letter, string.format(
+      [[\openin\gre@read@temp=%s\relax\closein\gre@read@temp]], gabc_file))
   local gabc = io.open(gabc_file, 'r')
   if gabc == nil then
     err("\n Unable to open %s", gabc_file)

windows/gregorio.iss

@@ -9,7 +9,7 @@ SolidCompression=yes
 LicenseFile=../COPYING.md
 AppCopyright=Copyright (C) 2006-2017 The Gregorio Project
 AppComments=Software for engraving Gregorian Chant scores.
-AppContact=gregorio-devel@gna.org
+AppContact=gregorio-devel@googlegroups.com
 AppPublisher=The Gregorio Project
 AppPublisherURL=https://github.com/gregorio-project/gregorio
 AppReadmeFile=https://github.com/gregorio-project/gregorio