Merge pull request #1164 from gregorio-project/fix-1137-1147

fix #1137

CHANGELOG.md

@@ -8,6 +8,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - 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)).
 
 ## [4.2.0-rc1] - 2016-05-31
 ### Fixed

tex/gregoriotex-spaces.tex

@@ -1009,8 +1009,11 @@
   \gre@debugmsg{barspacing}{allocated text space: \the\gre@skip@text@allocation}%
   \gre@debugmsg{barspacing}{allocated notes space: \the\gre@skip@bar@allocation}%
   % now we check the bar width
-  \gre@debugmsg{barspacing}{bar width: \the\wd\gre@box@syllablenotes}%
   \gre@skip@bar@requirement = \wd\gre@box@syllablenotes\relax%
+  \ifdim\gre@skip@bar@requirement=0pt\relax % no notes
+    \gre@skip@bar@requirement=\gre@space@skip@interwordspacenotes %
+  \fi %
+  \gre@debugmsg{barspacing}{bar width: \the\gre@skip@bar@requirement}%
   \ifdim\gre@skip@bar@allocation < \gre@skip@bar@requirement\relax%
     \advance\gre@skip@text@allocation by \glueexpr(\gre@skip@bar@requirement - \gre@skip@bar@allocation)\relax%
     \gre@skip@bar@allocation = \gre@skip@bar@requirement\relax%