Merge commit '63fffd12247217b4cd9ff203c41b406ba2c1f3dd' into feature/…

…miktex

* commit '63fffd12247217b4cd9ff203c41b406ba2c1f3dd':
  update doc
  more final adjustments (mainly reverting pes changes)
  final small adjustments
  fix documentation
  document upgrade
  document GrePunctumMora, fix bug
  more options, tune spaces
  make it actually work
  lower second note of porretus with ambitus one (closer to the Graduale)
  first attempt
  more adjustments
  more adaptations, mostly revert pes ambitus one
  document
  attempt to fix gregorio-project#858

CHANGELOG.md

@@ -5,6 +5,8 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 ### Changed
 - Stem length for virgas, flexus, pes quadratum, etc. are now tunable, and have been reviewed, see [#803](https://github.com/gregorio-project/gregorio/issues/803).
+- Height of the porrectus have been altered (first note moved up, second also moved up when second ambitus is more than one) so that they are more coherent with the punctum height. The porrectus stroke drawings have also been slightly altered to be slightly thinner and sharper around the bottom note (see [#858](https://github.com/gregorio-project/gregorio/issues/858)).
+- When a syllable is preceeded by a punctum mora, gregorio now ignores the punctum mora in the spacing of the syllables by default, and also adds a custom space (defaulting to 0). You can change this behavior with `\gresetshiftaftermora{}`, see GregorioRef for its arguments. To balance the output, space before a punctum mora has been made slightly thinner, more in line with old Solesmes books. (For the change requests, see [#795](https://github.com/gregorio-project/gregorio/issues/795) and [#871](https://github.com/gregorio-project/gregorio/issues/871)).
 - The `--admin` option is removed from the `initexmf` call for MiKTeX installations, allowing the installer to work better on Windows 10.
 - MiKTeX installations no longer copy files into TEXMFLOCAL but instead registers the texmf folder which the installer creates with MiKTeX, allowing it to use those files in place.  See [#884](https://github.com/gregorio-project/gregorio/issues/884)
 - Added an uninstall script which will run as part of the uninstall action and will remove the Gregorio executable and TeX files from their copied locations (at least using the `unins000.exe` file which is created in the program directory when the program is installed, I haven't tested using the Add/Remove Programs feature built into Windows).
@@ -37,7 +39,6 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - Headers not recognized by gregorio, rather than inducing an error, are now simply accepted by gregorio.  Most of the old "standard" headers, like `book` and `manuscript-location`, are now handled in this way and thus are no longer limited to one instance.  See GregorioRef for details.
 - `mode` will now be converted to Roman numerals in lower case so that it shows up as small capitals using the default `modeline` style.  See [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#756](https://github.com/gregorio-project/gregorio/issues/756)).
 - `\grecommentary` is now less restrictive about where it occurs and need not occur directly before the score anymore.
-- When a bar is preceeded by a punctum mora, gregorio now ignores the punctum mora in the bar horizontal placement by default, and also adds a custom space (defaulting to 0). You can change this behavior with `\gresetbarshiftaftermora{}`, see GregorioRef for its arguments (for the change request, see [#795](https://github.com/gregorio-project/gregorio/issues/795)).
 
 ### Added
 - Support for two-, three-, and five-line staves.  Set the `staff-lines` header to `2`, `3`, or `5`.  For all values of `staff-lines`, the note below the staff remains 'c'.  The two new notes above the staff (for a five-line staff) are `n` and `p`.  See [#429](https://github.com/gregorio-project/gregorio/issues/429).

UPGRADE.md

@@ -20,6 +20,14 @@ Since the `biginitial` style will disappear with Gregorio 5.0, please consider d
 
 When the next syllable starts with an alteration, the minimal space between notes of the current syllable and notes of the current syllable is handled by the new spaces `intersyllablespacenotes@alteration` and `interwordspacenotes@alteration`. Set them in your custom spacings file if needed.
 
+When a syllable ends with a punctum mora, Gregorio 4.1 doesn't consider the punctum mora completely in horizontal spacing. This can result in next syllable being closer. To balance the output, `spacebeforesigns` has been made shorter. If you want to go back to the old behavior, use:
+
+- `\gresetshiftaftermora{never}` if you want to remove it completely
+- `\gresetshiftaftermora{barsonly}` if you want to remove it for non-bar syllables but keep it for bar syllables
+- `\grechangedim{spacebeforesigns}{0.05469 cm plus 0.00455 cm minus 0.00455 cm}{scalable}` to go back to the old spacing before punctum mora
+
+The `\gresetshiftaftermora` macro can take other arguments for controlling how this should work, see GregorioRef for details.
+
 ### Horizontal episemata on high and low notes
 
 Prior to version 4.1, Gregorio reserved space between notes at the `c` and `k` heights and their horizontal episemata for a "ledger line" that might appear between them.  However, if the ledger line did not appear, the episema would appear to be too far from the note.

doc/Command_Index_User.tex

@@ -915,13 +915,14 @@ \subsubsection{End of Line Behavior}
 
 \subsubsection{Bar spacing}
 
-\macroname{\textbackslash gresetbarshiftaftermora}{\{\#1\}}{gregoriotex-signs.tex}
-Macro to change the behaviour for bars following a punctum mora. The argument changes the cases in which punctum mora are ignored in bar horizontal placement:
+\macroname{\textbackslash gresetshiftaftermora}{\{\#1\}}{gregoriotex-signs.tex}
+Macro to change the behaviour for separation between notes of two syllables when the first ends with a punctum mora. The argument changes the cases in which punctum mora are ignored in space computation:
 
 \begin{argtable}
   \#1 & \texttt{always} & punctum mora are always ignored (default)\\
-  & \texttt{notextonly} & punctum mora are ignored in bars inside syllables, and in bars having their own syllable without text\\
-  & \texttt{insideonly} & punctum mora are ignored only in bars inside syllables\\
+  & \texttt{barsonly} & punctum mora are ignored before bars\\
+  & \texttt{notextonly} & punctum mora are ignored before bars inside syllables, or bars having their own syllable without text\\
+  & \texttt{insideonly} & punctum mora are ignored only before bars inside syllables\\
   & \texttt{never} & punctum mora are never ignored\\
 \end{argtable}
 
@@ -1153,9 +1154,14 @@ \subsection{Distances}\label{distances}
 Space before punctum mora and augmentum duplex.
 \end{gdimension}
 
-\begin{gdimension}{barmoraadjustment}
-When a bar is shifted left because of a preceding punctum mora, this space is
-also added. Use it to make the bar a bit further from the punctum mora if you want.
+\begin{gdimension}{moraadjustment}
+When a syllable (bar or not) is shifted left because of a preceding punctum
+mora, this space is also added. Use it to make the syllable a bit further from
+the punctum mora if you want.
+\end{gdimension}
+
+\begin{gdimension}{moraadjustmentbar}
+Same as previous one but specific to cases where puntum mora precedes a bar.
 \end{gdimension}
 
 \begin{gdimension}{spaceaftersigns}

doc/Command_Index_gregorio.tex

@@ -722,9 +722,10 @@ \section{Gregorio Controls}
 
 \begin{argtable}
   \#1 & integer & Height number of punctum mora.\\
-  \#2 & \texttt{1} & Go back to end of punctum.\\
+  \#2 & \texttt{0} & General case.\\
+  & \texttt{1} & Make the punctum mora zero width.\\
   & \texttt{2} & Shift left width of 1 punctum.\\
-  & \texttt{3} & Shift left width of 1 punctum and ambitus of 1.\\
+  & \texttt{3} & Shift left width of 1 punctum if last ambitus is 1.\\
   \#3 & \texttt{0} & Punctum mora does not occur before last note of podatus, porrectus, or torculus resupinus.\\
   & \texttt{1} & Punctum mora occurs before last note of podatus, porrectus, or torculus resupinus.\\
   \#4 & \texttt{0} & No punctum inclinatum.\\

doc/Command_Index_internal.tex

@@ -717,7 +717,7 @@ \section{Gregorio\TeX{} Controls}
   \#4 & character & the type of the secondary clef: c or f\\
   \#5 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
   \#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}	
+\end{argtable}
 
 \macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-signs.tex}
 Macro which typesets the clef.
@@ -733,7 +733,7 @@ \section{Gregorio\TeX{} Controls}
   \#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)\\
   \#8 & 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}	
+\end{argtable}
 
 \macroname{\textbackslash gre@typesingleclef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro which typesets a single clef.
@@ -744,7 +744,7 @@ \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 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
-\end{argtable}	
+\end{argtable}
 
 \macroname{\textbackslash gre@updateleftbox}{}{gregoriotex-main.tex}
 Macro to update the box printed a the left end of every line (the one which holds the staff lines).
@@ -1401,7 +1401,7 @@ \subsection{Flags}
 Boolean that tells us if the current glyph is the first glyph or not.
 
 \macroname{\textbackslash gre@attr@dash}{}{gregoriotex-main.tex}
-A Lua\TeX\ attribute which indicates whether a syllable takes a dash if it ends a line.  
+A Lua\TeX\ attribute which indicates whether a syllable takes a dash if it ends a line.
 
 \macroname{\textbackslash gre@attr@center}{}{gregoriotex-main.tex}
 A Lua\TeX\ attribute which indicates the type of translation centering.
@@ -1424,8 +1424,11 @@ \subsection{Flags}
 \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).
 
-\macroname{\textbackslash ifgre@lastispunctum}{}{gregoriotex-syllable.tex}
-Boolean which indicates if the most recent note was a punctum mora.
+\macroname{\textbackslash ifgre@lastendswithmora}{}{gregoriotex-syllable.tex}
+Boolean which indicates if the previous syllable ends with a punctum mora (set glyph by glyph, do not rely on it when typesetting glyph).
+
+\macroname{\textbackslash ifgre@thisendswithmora}{}{gregoriotex-syllable.tex}
+Same as previous one but for current syllable.
 
 \macroname{\textbackslash ifgre@lastispunctumsave}{}{gregoriotex-signs.tex}
 Boolean for storing \verb=\ifgre@lastispunctum= so that it can be restored later.
@@ -1621,7 +1624,7 @@ \subsection{Distances}
 Dimension representing the width of the initial (and the space after).
 
 \macroname{\textbackslash gre@dimen@currentabovelinestextheight}{}{gregoriotex-spaces.tex}
-Dimension representing the space allocated above the lines for text.	
+Dimension representing the space allocated above the lines for text.
 
 \macroname{\textbackslash gre@dimen@staffheight}{}{gregoriotex-spaces.tex}
 The total height of the staff including the width of the lines and the spaces between them.