Merge branch 'release-3.0' into diagnostictools

* release-3.0:
  Fix for gregorio-project#347, manually applied from fe14cc1
  Added a change log for the fix for gregorio-project#246.
  Reset the grefirstisalteration counter to 0 at the start of a syllable. Fixes gregorio-project#246.

CHANGELOG.md

@@ -5,6 +5,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][ureleased]
 ### Fixed
 - Torculus followed by a non-liquescent note is now parsed correctly (see [#284](https://github.com/gregorio-project/gregorio/issues/284).
+- Spacing after a syllable with an flat, sharp, or natural is now correct (see [#246](https://github.com/gregorio-project/gregorio/issues/246).
 
 ## [3.0.0-rc2] - 2015-04-14
 - Clarified post installation options for Windows installer.  What was the "Install Fonts" option is now labeled to indicate that this also adds GregorioTeX files to the texmf tree.

tex/gregoriotex-syllable.tex

@@ -430,6 +430,7 @@
 %% at the end we wall \greendofword or \greendofsyllable with #7, to reduce the space in case of a flat or natural
 \def\gresyllable#1#2#3#4#5#6#7#8#9{%
   \gre@debug{New syllable}%
+  \global\grefirstisalteration=0\relax %
   \ifnum\gre@englishcentering=1\relax %
     \gdef\gre@firstsyllablepart{}%
     \gdef\gre@middlesyllablepart{#1#2#3}%
@@ -491,7 +492,6 @@
       \fi % \ifdim\gre@dimen@enddifference>0pt
       \ifnum\grefirstisalteration=1\relax %
         \advance\gre@skip@temp@one by \gre@skip@beforealterationspace %
-        \global\grefirstisalteration=0\relax %
       \fi % \ifnum\grefirstisalteration=1
       \gre@debug{ifdim temp@skip@one > 0pt}%
       \ifdim\gre@skip@temp@one>0pt %

tex/gregoriotex.tex

@@ -530,7 +530,7 @@
   \greabovelinestextstyle{%
     \gre@debug{Raise alt text: \gre@dimen@abovelinestextraise}%
     \global\gre@dimen@temp@five=\gre@dimen@abovelinestextraise\relax%
-  } %
+  }%
   \gre@debug{Raise alt text: \the\gre@dimen@temp@five}%
   \advance\gre@dimen@temp@five by 4\gre@dimen@stafflineheight %
   \advance\gre@dimen@temp@five by 4\gre@dimen@interstafflinespace %