Multiline initial

.editorconfig

@@ -8,5 +8,5 @@ indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 
-[*.{py,c,h}]
+[*.{py,c,h,l,y}]
 indent_size = 4

.gitignore

@@ -104,7 +104,7 @@ auto/
 *.deb
 
 #gregorio specific
-doc/_minted-*
+doc/_minted*
 fonts/*.ttf
 *.greaux
 *.gz
@@ -127,3 +127,4 @@ ctan
 *.pyg
 .agignore
 *.orig
+compile_commands.json

CHANGELOG.md

@@ -2,13 +2,24 @@
 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][CTAN]
+## [Unreleased][develop]
 ### Fixed
 - Multiple Scribus render frames were all using the same file name, which would result in the same score appearing in all render frames.  This change makes the score files use an available Scribus variable to force multiple file names.
 - When kpsewhich cannot write to a particular location, it generates an error which is directed to stderr but not to our glog file.  This created an undocumented error when trying to write to a gtex file to a bad location.  We now capture stderr output produced when compiling scores and redirect it to our glog file so that the error is properly recorded.  Fixes [#1541](https://github.com/gregorio-project/gregorio/issues/1541).
+- Fixed the interaction between hyphens and styles.  See [#1538](https://github.com/gregorio-project/gregorio/issues/1538).
+- Fixed the loss of ongoing styles when a syllable starts with a forced center.  See [#1551](https://github.com/gregorio-project/gregorio/issues/1551).
+- Fixed first syllables of one letter with a style causing a segfault.  See [#1585](https://github.com/gregorio-project/gregorio/issues/1585).
+- Fixed a bug that caused a custos to sometimes change into a clef. See [#1373](https://github.com/gregorio-project/gregorio/issues/1373).
 
 ### Changed
 - Defined an output directory for gtex and glog files.  Default is `tmp-gre`.  This can be changed using `\gresetoutputdir{...}`.  Fixes [#1393](https://github.com/gregorio-project/gregorio/issues/1393), [#1542](https://github.com/gregorio-project/gregorio/issues/1542), and [#1571](https://github.com/gregorio-project/gregorio/issues/1571).
+- gabc.vim has been expanded into a proper vim plugin.
+
+### Added
+- Added a configurable setting `\gresetunisonbreakbehavior` to control automatic line breaks between unison notes above a syllable.  Defaults to `breakable` for backwards compatibility, but may be set to `unbreakable` if that behavior is desired.  See [#1504](https://github.com/gregorio-project/gregorio/issues/1504).
+- Added the ability to fuse upwards to a virga.  See [#1558](https://github.com/gregorio-project/gregorio/issues/1558)
+- Added the ability to use the "stroke" form of a clivis instead of the default two-notes form by specifying `[shape:stroke]` after the clivis to change.  See [#1558](https://github.com/gregorio-project/gregorio/issues/1558)
+
 
 ## [6.0.0] - 2021-03-13
 ### Fixed

configure.ac

@@ -123,6 +123,9 @@ AC_CONFIG_FILES([
     examples/Makefile
     contrib/Makefile
     contrib/TeXShop/Makefile
+    contrib/vim/Makefile
+    contrib/vim/ftdetect/Makefile
+    contrib/vim/syntax/Makefile
     doc/Makefile
     tex/Makefile
     fonts/Makefile

def_check.sh

@@ -13,6 +13,17 @@
 
 HERE=`pwd`
 
+if sed --version 2&> /dev/null; then
+  SED=sed
+elif gsed --version 2&> /dev/null; then
+  SED=gsed
+else
+  echo "I can't find GNU sed."
+  echo "Please install it and try again."
+  return 1
+fi
+
+
 TEXFILE=$HERE/tex.txt
 CFILE=$HERE/c.txt
 DIFFFILE=$HERE/diff.txt
@@ -26,30 +37,30 @@ grep -hE '\\let\\Gre.*' *.tex *.sty >> $TEXFILE
 grep -h '\\gredefsymbol{Gre.*' *.tex *.sty >> $TEXFILE
 
 #remove deprecated code
-sed -i.temp 's:.*OBSOLETE.*::' $TEXFILE
-sed -i.temp 's:.*DEPRECATED.*::' $TEXFILE
+$SED -i.temp 's:.*OBSOLETE.*::' $TEXFILE
+$SED -i.temp 's:.*DEPRECATED.*::' $TEXFILE
 
 #Isolate function names
-sed -i.temp 's:Gre:\
+$SED -i.temp 's:Gre:\
 Gre:g' $TEXFILE
-sed -i.temp '/Gre/!d' $TEXFILE
-sed -i.temp 's:\(Gre[a-zA-Z]*\).*:\1:' $TEXFILE
+$SED -i.temp '/Gre/!d' $TEXFILE
+$SED -i.temp 's:\(Gre[a-zA-Z]*\).*:\1:' $TEXFILE
 
 #remove bar lines (these names are assembled piecemeal, not whole)
-sed -i.temp 's:^GreDivisioFinalis$::' $TEXFILE
-sed -i.temp 's:^GreDivisioMaior$::' $TEXFILE
-sed -i.temp 's:^GreDivisioMinima$::' $TEXFILE
-sed -i.temp 's:^GreDivisioMinor$::' $TEXFILE
-sed -i.temp 's:^GreDominica$::' $TEXFILE
-sed -i.temp 's:^GreVirgula$::' $TEXFILE
-sed -i.temp 's:^GreFinalDivisioFinalis$::' $TEXFILE
-sed -i.temp 's:^GreFinalDivisioMaior$::' $TEXFILE
-sed -i.temp 's:^GreInDivisioFinalis$::' $TEXFILE
-sed -i.temp 's:^GreInDivisioMaior$::' $TEXFILE
-sed -i.temp 's:^GreInDivisioMinima$::' $TEXFILE
-sed -i.temp 's:^GreInDivisioMinor$::' $TEXFILE
-sed -i.temp 's:^GreInDominica$::' $TEXFILE
-sed -i.temp 's:^GreInVirgula$::' $TEXFILE
+$SED -i.temp 's:^GreDivisioFinalis$::' $TEXFILE
+$SED -i.temp 's:^GreDivisioMaior$::' $TEXFILE
+$SED -i.temp 's:^GreDivisioMinima$::' $TEXFILE
+$SED -i.temp 's:^GreDivisioMinor$::' $TEXFILE
+$SED -i.temp 's:^GreDominica$::' $TEXFILE
+$SED -i.temp 's:^GreVirgula$::' $TEXFILE
+$SED -i.temp 's:^GreFinalDivisioFinalis$::' $TEXFILE
+$SED -i.temp 's:^GreFinalDivisioMaior$::' $TEXFILE
+$SED -i.temp 's:^GreInDivisioFinalis$::' $TEXFILE
+$SED -i.temp 's:^GreInDivisioMaior$::' $TEXFILE
+$SED -i.temp 's:^GreInDivisioMinima$::' $TEXFILE
+$SED -i.temp 's:^GreInDivisioMinor$::' $TEXFILE
+$SED -i.temp 's:^GreInDominica$::' $TEXFILE
+$SED -i.temp 's:^GreInVirgula$::' $TEXFILE
 
 
 #label file
@@ -68,20 +79,20 @@ grep -hE '\\\\Gre.*' gabc-notes-determination.l >> $CFILE
 grep -hE '\\\\Gre.*' gabc-score-determination.y >> $CFILE
 
 #remove deprecated code
-sed -i.temp 's:.*OBSOLETE.*::' $CFILE
-sed -i.temp 's:.*DEPRECATED.*::' $CFILE
+$SED -i.temp 's:.*OBSOLETE.*::' $CFILE
+$SED -i.temp 's:.*DEPRECATED.*::' $CFILE
 
 #Isolate function names
-sed -i.temp 's:Gre:\
+$SED -i.temp 's:Gre:\
 Gre:g' $CFILE
-sed -i.temp '/Gre/!d' $CFILE
-sed -i.temp 's:\(Gre[a-zA-Z]*\).*:\1:' $CFILE
+$SED -i.temp '/Gre/!d' $CFILE
+$SED -i.temp 's:\(Gre[a-zA-Z]*\).*:\1:' $CFILE
 
 #remove prefixes of assembled function names
-sed -i.temp 's:^Gre$::' $CFILE
-sed -i.temp 's:^GreCP$::' $CFILE
-sed -i.temp 's:^GreFinal$::' $CFILE
-sed -i.temp 's:^GreIn$::' $CFILE
+$SED -i.temp 's:^Gre$::' $CFILE
+$SED -i.temp 's:^GreCP$::' $CFILE
+$SED -i.temp 's:^GreFinal$::' $CFILE
+$SED -i.temp 's:^GreIn$::' $CFILE
 
 #label file
 echo "00 Macros Written by C" >> $CFILE

doc/Command_Index_User.tex

@@ -902,14 +902,20 @@ \subsubsection{Text Elements}
 
 \textbf{Nota Bene:} Usually the argument of this command should be an \verb=\includegraphics= command, but you may use what ever you want as the illuminated initial.
 
-\macroname{\textbackslash gresetinitiallines}{\{\#1\}}{gregoriotex-syllable.tex}
+\macroname{\textbackslash gresetinitiallines}{\{\#1\}}{gregoriotex-main.tex}
 Sets the number of lines the score initial requires.
 
 \begin{argtable}
   \#1 & number & The number of lines required by the initial.  If \texttt{0}, the score will have no separated initial.\\
 \end{argtable}
 
-\textbf{Nota Bene:} As currently implemented, you cannot set an initial which is larger than 2 lines and in order to do so you must set manual line breaks in the gabc for the first two lines.
+\macroname{\textbackslash gresetinitialend}{\{\#1\}}{gregoriotex-main.tex}
+Indicates how the end of the initial is indicated in the gabc.
+
+\begin{argtable}
+  \#1 & \texttt{manual} & Every line that is next to the initial is ended with a \texttt{z} or \texttt{Z} in the gabc\\
+  & \texttt{semi-manual} & Only the last line that is next to the initial is ended with a \texttt{z} or \texttt{Z} in the gabc
+\end{argtable}
 
 \macroname{\textbackslash gresetmodenumbersystem}{\{\#1\}}{gregoriotex-main.tex}
 Sets the number system used for the mode number.
@@ -1179,6 +1185,19 @@ \subsubsection{End of Line Behavior}
                   lines.  Defaults to \getgrecount{unbreakablefinalnotes}.\\
 \end{argtable}
 
+\macroname{\textbackslash gresetunisonbreakbehavior}{\{\#1\}}{gregoriotex-main.tex}
+Macro to determine whether an automatic linebreak may occur between unison notes
+over a syllable.  This behavior governs how the system works when no explicit
+space is put between the notes.  In other words, any explicit space between the
+notes take precedence over this setting.
+
+\begin{argtable}
+  \#1 & \texttt{breakable}   & Allow automatic linebreaks between unison notes
+                               (default)\\
+      & \texttt{unbreakable} & Disallow automatic linebreaks between unison
+                               notes\\
+\end{argtable}
+
 
 \subsubsection{Bar spacing}
 

doc/Command_Index_gregorio.tex

@@ -402,6 +402,7 @@ \section{Gregorio Controls}
   & \texttt{4} & Ad-hoc space.\\
   \#2 & \texttt{0} & Space is breakable.\\
   & \texttt{1} & Space is unbreakable.\\
+  & \texttt{2} & Space is breakable according to the \verb=\setunisonbreakbehavior= setting.\\
   \#3 & integer & The number of notes in the syllable prior to this macro.\\
 \end{argtable}
 
@@ -444,6 +445,7 @@ \section{Gregorio Controls}
   & \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
   & \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
   & \texttt{22} & Half-space. \\
+  & \texttt{23} & Space between unison puncta inclinata. \\
 \end{argtable}
 
 \macroname{\textbackslash GreFinalCustos}{\#1\#2}{gregoriotex-signs.tex}

doc/Command_Index_internal.tex

@@ -480,20 +480,14 @@ \section{Gregorio\TeX{} Controls}
 \macroname{\textbackslash gre@noinitial}{}{gregoriotex-main.tex}
 Macro called when no initial is being set.
 
-\macroname{\textbackslash gre@setbiginitial}{}{gregoriotex-main.tex}
-Macro which indicates that a 2-line initial is desired.
-
 \macroname{\textbackslash gre@setinitial}{\#1}{gregoriotex-main.tex}
 Macro to set the initial in the score.
 
 \macroname{\textbackslash gre@adjustsecondline}{}{gregoriotex.tex}
 Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
 
-\macroname{\textbackslash gre@adjustthirdline}{}{gregoriotex-main.tex}
-Macro to call during the second line.
-
-\macroname{\textbackslash gre@adjustlineifnecessary}{}{gregoriotex-main.tex}
-Macro that calls \verb=\gre@adjustthirdline= if indicated by \verb=\ifgre@thirdlineadjustmentnecessary=.
+\macroname{\textbackslash gre@adjustlinesafterinitial}{}{gregoriotex-main.tex}
+Macro that call adjusts the line length after the lines next to the initial are completed.
 
 \macroname{\textbackslash gre@addspaceabove}{}{gregoriotex-main.tex}
 Macro to increase the space above the lines to account for above lines text.
@@ -560,7 +554,7 @@ \section{Gregorio\TeX{} Controls}
 \macroname{\textbackslash gre@updatelinewidth}{}{gregoriotex-main.tex}
 Macro to shorten the lines to account for the presence of the initial.
 
-\macroname{\textbackslash gre@knownline}{}{gregoriotex-main.tex}
+\macroname{\textbackslash gre@count@knownline}{}{gregoriotex-main.tex}
 A count which keeps track of which line of the score we’re on.
 
 \macroname{\textbackslash gre@lastoflinecount}{}{gregoriotex-main.tex}
@@ -747,9 +741,6 @@ \section{Gregorio\TeX{} Controls}
 \macroname{\textbackslash gre@newglyphcommon}{}{gregoriotex-syllable.tex}
 Macro called before each glyph.
 
-\macroname{\textbackslash gre@normalinitial}{}{gregoriotex-main.tex}
-Macro called at the end of the score to ensure that a big initial setting doesn’t carry into the next score.
-
 \macroname{\textbackslash greoldcatcode}{}{gregoriotex.tex}
 Macro to store the catcode for ``@'' so that we can use said symbol in function names under Plain \TeX\ and then restore the original catcode after the package is done loading.
 
@@ -1764,9 +1755,6 @@ \subsection{Flags}
 Boolean used to specify whether divisio braces should be drawn by \MP{} as
 opposed to rendered via the score font.
 
-\macroname{\textbackslash gre@biginitial}{}{gregoriotex-main.tex}
-Count to track whether the initial is big (2-lines) or normal (1-line).
-
 \macroname{\textbackslash ifgre@boxing}{}{gregoriotex-syllable.tex}
 Boolean to track whether we’re placing the contents of syllable notes into their box or actually printing that box (helps prevent spurious spaces from occurring when the box is being filled but not printed).
 
@@ -1902,9 +1890,6 @@ \subsection{Flags}
 \macroname{\textbackslash ifgre@possibleluahyphenafterthissyllable}{}{gregoriotex-syllable.tex}
 Boolean set by \verb=\GreSyllable= indicating if the Lua pass may add an hyphen after the syllable, used by \verb=\gre@calculate@eolshift= for protrusion calculation.
 
-\macroname{\textbackslash ifgre@thirdlineadjustmentnecessary}{}{gregoriotex-syllable.tex}
-Boolean which indicates that a third-line adjustment to staff line width is necessary.
-
 \macroname{\textbackslash ifgre@scale@stafflinefactor}{}{gregoriotex-spaces.tex}
 Boolean indicating whether the stafflinefactor should scale with changes of \texttt{grefactor}, or not.
 
@@ -1961,6 +1946,10 @@ \subsection{Flags}
 \macroname{\textbackslash ifgre@unbreakableendofelement}{}{gregoriotex-main.tex}
 Boolean used by \verb=\GreEndOfElement= to store whether the line may be broken at that point.
 
+\macroname{\textbackslash gre@unbreakableendofelement@unison}{}{gregoriotex-main.tex}
+Alias that sets \verb=\ifgre@unbreakableendofelement= according to the
+\verb=\setunisonbreakbehavior= preference.
+
 \macroname{\textbackslash gre@count@syllablenotes}{}{gregoriotex-syllable.tex}
 Count containing the number of notes in the syllable.
 
@@ -1991,8 +1980,11 @@ \subsection{Flags}
 \macroname{\textbackslash ifgre@showabovelinestext}{}{gregoriotex-main.tex}
 Boolean indicating whether the above lines text should be shown.
 
-\macroname{\textbackslash gre@initiallines}{}{gregoriotex-syllable.tex}
-Number of lines the initial takes up.  Currently limited to 0, 1, or 2.  Not currently a count, but will be changed to one in 5.0.
+\macroname{\textbackslash gre@count@initiallines}{}{gregoriotex-syllable.tex}
+Number of lines the initial takes up.  Currently limited to 0, 1, or 2.
+
+\macroname{\textbackslash ifgre@manualinitialend}{}{gregoriotex-syllable.tex}
+Boolean indicating whether all lines in the initial are indicated with a \texttt{z} or \texttt{Z} in the gabc (true), or if only the list line is so indicated (false).
 
 \macroname{\textbackslash ifgre@rewritethissyllable}{}{gregoriotex-syllable.tex}
 Boolean indicating that a syllable should be rewritten to improve ligature rendering.

doc/Gabc.tex

@@ -47,9 +47,9 @@ \subsection{File Structure}
   mode-modifier: t.;
   annotation: IN.;
   annotation: 6;
-  
+
   %%
-  
+
   (clef) text(notes)
   % another comment
   com(notes)plex(notes) word(notes)
@@ -579,6 +579,7 @@ \subsubsection{Neume Fusion}
   \texttt{gf} & flexus & if not at the end, must be followed by a higher note to fuse \\
   \texttt{gh} & pes & at the end only; in non-liquescent form, the previous note must be lower to fuse \\
   \texttt{gfg} & porrectus & at the end only, previous note must be lower to fuse \\
+  \texttt{gv} & virga & at the end only, previous note must be lower to fuse \\
 \end{tabularx}
 
 In the above table, \texttt{f}, \texttt{g}, and \texttt{h} are representative
@@ -646,6 +647,19 @@ \subsubsection{Neume Spacing}\label{neumespacing}
                space, makes the space that follows a non-breaking space \\
 \end{tabularx}
 
+\subsubsection{Shape Hints}
+
+In some cases, an alternate form of a shape is desired.  To do this, put a
+\texttt{[shape:}\textit{hint}\texttt{]} after the figure that needs to be
+altered.  The available alternate form hints are as follows:
+
+\begin{tabularx}{\textwidth}{l|X}
+  \textit{hint} & Description \\
+  \hline
+  \texttt{stroke} & Render a clivis/flexus as a stroke (like in a porrectus)
+    rather than as two notes \\
+\end{tabularx}
+
 \subsubsection{Additional Symbols}
 
 Puncta mora, episemata, and other symbols may also be added to a note by