summaryrefslogtreecommitdiff
path: root/Build/source/texk/gregorio/gregorio-src/doc
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-23 22:38:00 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-23 22:38:00 +0000
commitfaa5f31c4901212372d2dcf7080d9f0a23d5f195 (patch)
treecda02ce149a95cfa5d20f01943eceae7ff256b7b /Build/source/texk/gregorio/gregorio-src/doc
parent21d19604dc80efef1747f4a048c9dae5e8e810b1 (diff)
gregorio 4.1.0-beta1
git-svn-id: svn://tug.org/texlive/trunk@39470 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/doc')
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex628
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex306
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex414
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex216
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_1.pdfbin279370 -> 0 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta1.pdfbin0 -> 279348 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_1.pdfbin460969 -> 0 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta1.pdfbin0 -> 616735 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua146
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex27
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/factus.gabc1
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/veni.gabc1
13 files changed, 1323 insertions, 418 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
index 64324d2b321..74809dcd9e3 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
@@ -165,20 +165,17 @@ switch between different behaviors: \par\medskip
\gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
\end{latexcode}
-\macroname{\textbackslash gabcsnippet}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Converts the gabc notation specified in \texttt{\#2} to Gregorio\TeX\ and
-includes it directly in the document. The optional argument \texttt{[\#1]}
-may be used to specify a gabc \texttt{initial-style}, which defaults to
-\texttt{1}.
+\macroname{\textbackslash gabcsnippet}{\{\#1\}}{gregoriotex-main.tex}
+Converts the gabc notation specified in \texttt{\#1} to Gregorio\TeX\ and
+includes it directly in the document.
\begin{argtable}
- \#1 & number & Optional. The gabc \texttt{initial-style} value to use.\\
- \#2 & string & The gabc to insert into the document.\\
+ \#1 & string & The gabc to insert into the document.\\
\end{argtable}
\medskip For example:\par\medskip
\begin{latexcode}
- \gabcsnippet[0]{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
+ \gabcsnippet{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
\end{latexcode}
@@ -323,6 +320,30 @@ necessary.
\end{framed}
\end{small}
+\macroname{\textbackslash gresetledgerlineheuristic}{\{\#1\}}{gregoriotex-spaces.tex}
+Macro which enables or disables ledger line heuristics. Currently, ledger
+line heuristics allow Gregorio to reduce the space between a note and a
+horizontal episema that surround a line on which a ledger line may appear
+when the ledger line \textit{does not} appear.
+
+\begin{argtable}
+ \#1 & \texttt{enable} & Ledger line heuristics will be used in placing
+ the horizontal episema \\
+ & \texttt{disable} & Ledger line heuristics will not be used in
+ placing the horizontal episema \\
+\end{argtable}
+
+Because of the complexity of computing distances exactly, the heuristic may
+guess incorrectly, causing the horizontal episema to be placed incorrectly.
+This may be overridden on a note-by-note basic by using the
+\texttt{[hl:\textit{n}]} and \texttt{[ll:\textit{n}]} gabc directives. The
+\texttt{hl} directive sets an explicit high ledger line (above the staff),
+and the \texttt{ll} directive sets an explicit low ledger line (below the
+staff). The \texttt{\textit{n}} should be set to indicate whether the
+system should act as if the ledger line exists (\texttt{1}) or not
+(\texttt{0}).
+
+
\subsubsection{Staff Lines}
\macroname{\textbackslash gresetlinecolor}{\{\#1\}}{gregoriotex.sty \textup{and} gregoriotex.tex}
@@ -365,6 +386,8 @@ Set the font used for the neumes. The optional argument \texttt{[\#1]}
may be used to specify an alternate font/rule set. Currently, the only
available alternate font/rule set is \texttt{op} for Dominican neumes.
+Note that the font will be looked up by name through luaotfload, see the documentation of luaotfload for what it implies.
+
\begin{argtable}
\#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
& \texttt{op} & Use the alternate Dominican font/rule set.\\
@@ -373,6 +396,11 @@ available alternate font/rule set is \texttt{op} for Dominican neumes.
& \texttt{parmesan} & Use the Parmesan font.\\
\end{argtable}
+\macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex}
+
+This function is the same as above, with a third argument to scale the font. The fonts shipped with Gregorio do not need to use this function, but some custom fonts do. Note that you cannot use this to scale glyphs up or down, as they would not be placed correctly on the staff.
+
+The two first arguments are the same as \texttt{\textbackslash gresetgregoriofont}. The third argument is an integer representing the scaling factor, where the one used by \texttt{\textbackslash gresetgregoriofont} is 100000.
\subsubsection{Glyph Alteration}
In addition to the normal glyphs loaded by the choice of font, Gregorio\TeX\ also supports several methods for fine tuning the choice of glyphs. Using the below functions, you can choose from alternative glyphs which are already built into Gregorio\TeX\ or import custom glyphs you have designed yourself.
@@ -584,6 +612,24 @@ barred symbol.
\#5 & dimension & vertical shift of the bar glyph.\\
\end{argtable}
+\macroname{\textbackslash gothRbar}{}{gregoriotex-symbols.tex}
+Prints \gothRbar. Defined with \verb=\gredefsymbol=.
+
+\macroname{\textbackslash gothVbar}{}{gregoriotex-symbols.tex}
+Prints \gothVbar. Defined with \verb=\gredefsymbol=.
+
+\macroname{\textbackslash grealtcross}{}{gregoriotex-symbols.tex}
+Prints \grealtcross. Defined with \verb=\gredefsymbol=.
+
+\macroname{\textbackslash grecross}{}{gregoriotex-symbols.tex}
+Prints \grecross. Defined with \verb=\gredefsymbol=.
+
+\macroname{\textbackslash greheightstar}{}{gregoriotex-symbols.tex}
+Prints \greheightstar. Defined with \verb=\gredefsymbol=.
+
+\macroname{\textbackslash gresixstar}{}{gregoriotex-symbols.tex}
+Prints \gresixstar. Defined with \verb=\gredefsymbol=.
+
\macroname{\textbackslash greseparator}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
A macro for invoking one of the five separators (fancy lines) which are contained in the greextra font.
@@ -611,8 +657,7 @@ Different elements of an include score have different styles applied. These ele
\begin{tabular}{lp{7cm plus .5cm}r}
Element Name & Description & Default\\
\hline
- \stylename{initial} & Normal Initials & 40 pt font\\
- \stylename{biginitial} & Big (2-Line) Initials & 80 pt font\\
+ \stylename{initial} & Score initial (the first letter of the score, when offset from the rest of the text) & 40 pt font\\
\stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
\stylename{abovelinestext} & Above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
\stylename{normalstafflines} & Full length staff lines & none\\
@@ -622,7 +667,11 @@ Different elements of an include score have different styles applied. These ele
\stylename{firstsyllableinitial} & the first letter of the first syllable of a score which is not the score initial & none\\
\stylename{firstsyllable} & the first syllable of the score excluding the score initial & none\\
\stylename{firstword} & the first word of the first score excluding the score initial & none\\
+ \stylename{annotation} & the annotation & none\\
+ \stylename{commentary} & the commentary & {\footnotesize\it Footnote size italics}\\
\stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{Bold Small Capitals}}}\\
+ \stylename{modemodifier} & the rendered annotation from the \texttt{mode-modifier: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textit{\textbf{Bold Italics}}}\\
+ \stylename{modedifferentia} & the rendered annotation from the \texttt{mode-differentia: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textbf{Bold}}\\
\stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor} (\LaTeX)\\
&& none (Plain \TeX)\\
\end{tabular}
@@ -673,21 +722,15 @@ Macro to add annotations (the text which appears above the initial) to a score.
\textbf{Nota Bene:} The first argument does not affect the alignment of lines already in the annotation, only the way the new line aligns with the existing lines as a whole.
-\macroname{\textbackslash grecommentary}{\{\#1\}}{gregoriotex-main.tex}
+\macroname{\textbackslash grecommentary}{[\optional{\#2}]\{\#1\}}{gregoriotex-main.tex}
Macro to add commentary (the text flush right at the top, usually a scripture reference) to a score. While a single call of this function does not support multiple lines, successive calls to the function will add a new line to the commentary directly below the previous.
\begin{argtable}
- \#1 & string & The text of the commentary.\\
+ \#1 & distance & Optional. Additional distance to be placed between the commentary and the top staff line for the next score only.\\
+ \#2 & string & The text of the commentary.\\
\end{argtable}
-\textbf{Nota Bene:} This command should appear directly before \verb=\gregorioscore= when used.
-
-\macroname{\textbackslash grescorereference}{\{\#1\}}{gregoriotex-main.tex}
-Macro to hold the score reference. Currently the score reference does not print.
-
-\begin{argtable}
- \#1 & string & The text of the score reference.\\
-\end{argtable}
+\textbf{Nota Bene:} If your commentary is multi-lined, then the optional argument of the last line, and only the last line, will be taken into account. Further, pay attention to the fact that the optional argument is \emph{additional} distance, \ie, it will be added to \texttt{commentaryraise} to determine the distance from the baseline of the commentary to the top line of the staff.
\macroname{\textbackslash greillumination}{\{\#1\}}{gregoriotex-main.tex}
Macro to add an illuminated initial.
@@ -698,6 +741,21 @@ Macro to add an illuminated initial.
\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}
+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}
+
+\macroname{\textbackslash gresetmodenumbersystem}{\#1}{gregoriotex-main.tex}
+Sets the number system used for the mode number.
+
+\begin{argtable}
+ \#1 & \texttt{roman-minuscule} & Use lower-case Roman numerals (the default, good for small capitals).\\
+ & \texttt{roman-majuscule} & Use upper-case Roman numerals.\\
+ & \texttt{arabic} & Use Arabic numerals.\\
+\end{argtable}
\subsubsection{Text Alignment}
Gregorio\TeX\ allows you to manipulate the global alignment behavior of some text elements using the following commands.
@@ -731,10 +789,36 @@ Macro to specify how the translation text should be aligned with it respective s
& \texttt{center} & The translation text is centered under its respective syllable.
\end{argtable}
+\macroname{\textbackslash gresetannotationby}{\{\#1\}}{gregoriotex-main.tex}
+Macro to specify which line of the annotation should be used to determine its starting placement (i.e. before \texttt{annotationraise} is applied).
+
+\begin{argtable}
+ \#1 & \texttt{firstline} & Annotation placement is determined by the first line (default)\\
+ & \texttt{lastline} & annotation placement is determined by the last line\\
+\end{argtable}
+
+\macroname{\textbackslash gresetannotationvalign}{\{\#1\}}{gregoriotex-main.tex}
+Macro to specify which part of the control line in the annotation should be aligned with the top line of the staff before \texttt{annotationraise} is applied.
+
+\begin{argtable}
+ \#1 & \texttt{top} & The top of the annotation control line will align with the top line of the staff\\
+ & \texttt{baseline} & The baseline of the control line is used (default)\\
+ & \texttt{bottom} & The bottom of the control line is used\\
+\end{argtable}
+
+\textbf{Nota Bene:} These variable refer to the actual contents of the line and not to the ``hypothetical'' limits for the font. As a result if the top of an annotation containing only short letters will be different from one which contains tall ones even if both use the same font. Likewise, if the annotation contains no descenders, then baseline and bottom will be the same. If this is a problem, then the use of struts within the annotation can be used to control the line height (distance from baseline to top) and depth (distance from baseline to bottom).
\subsubsection{End of Line Behavior}
While Gregorio\TeX\ will automatically wrap scores to fit your page, there are several ways to fine tune that line breaking behavior with the following commands.
+\macroname{\textbackslash gresetbreakbeforeeuouae}{\{\#1\}}{gregoriotex-main.tex}
+Macro to determine whether an automatic linebreak before a EUOUAE area is justified or not.
+
+\begin{argtable}
+ \#1 & \texttt{justified} & Automatic line breaks before EUOUAE areas should be justified (default)\\
+ & \texttt{ragged} & Automatic line breaks before EUOUAE areas should be ragged\\
+\end{argtable}
+
\macroname{\textbackslash gresetbreakineuouae}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether line breaks are allowed inside a EUOUAE area (delimited by \texttt{<eu></eu>} tags in gabc).
@@ -761,6 +845,16 @@ Macro to determine whether Gregorio\TeX\ should automatically place the custos a
\textbf{Nota Bene:} This command only effects the custos that appears at the end of a line. Custos which are placed at a key change are unaffected. Further, if custos are specified in the gabc file manually and Gregorio\TeX\ is set to place custos automatically, you will get two custos at the line breaks.
+\macroname{\textbackslash greseteolcustosbeforeeuouae}{\{\#1\}}{gregoriotex-main.tex}
+Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break before a EUOUAE. Since the EUOUAE block is typically not a continuation of the melody but rather a reminder of the end of the tone that follows, this is set to \texttt{suppressed} (no custos) by default.
+
+\begin{argtable}
+ \#1 & \texttt{suppressed} & Custos will not automatically be placed at a line break before a EUOUAE block (the default)\\
+ & \texttt{auto} & Custos will behave according to \verb=greseteolcustos= at a line break before a EUOUAE block\\
+\end{argtable}
+
+\textbf{Nota Bene:} If \verb=\greseteolcustos= is set to \texttt{manual}, this setting is effectively ignored.
+
\macroname{\textbackslash greseteolshifts}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether Gregorio\TeX\ should apply a small shift at the end of each line which allows lyrics to stretch under the final custos.
@@ -786,18 +880,30 @@ Macro to determine whether the last line of the score should be justified or not
\end{argtable}
+\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:
+
+\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{never} & punctum mora are never ignored\\
+\end{argtable}
+
+When a punctum mora is ignored, the bar will also be shifted by \texttt{barmoraadjustment} (zero by default), see its description in the \textbf{Distances} section.
+
\subsubsection{Hyphenation}
\macroname{\textbackslash gresethyphen}{\{\#1\}}{gregoriotex-main.tex}
-Tells Gregorio\TeX\ how to place a hyphen between syllables in polysyllabic words in a score. This is done by overriding \texttt{maximumspacewithoutdash} so subsequent changes to this dimension will override this command.
+Tells Gregorio\TeX\ how to place a hyphen between syllables in polysyllabic words in a score.
\begin{argtable}
\#1 & \texttt{force} & Hyphens will appear between all syllables in polysyllabic words.\\
& \texttt{auto} & Hyphens will appear based on the setting of \texttt{maximumspacewithoutdash} (default)
\end{argtable}
-\textbf{Nota Bene:} \verb=\gresethyphen{auto}= restores \texttt{maximumspacewithoutdash} to the value found in \textit{gsp-default.tex}. If you have changed your score size, you may need to change this distance to a more appropriate value using \verb=\grechangedim=.
-
\macroname{\textbackslash gresetemptyfirstsyllablehyphen}{\{\#1\}}{gregoriotex-syllable.tex}
Tells Gregorio\TeX\ how to place a hyphen after an empty first syllable (\ie, when the first syllable consists only of the big initial).
@@ -865,6 +971,66 @@ harmonizes with the greciliae font. This macro must be redefined should
a different value be desired.
+\subsubsection{Headers}
+
+\macroname{\textbackslash gresetheadercapture}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-main.tex}
+Macro to tell Gregorio\TeX{} to capture a given header by calling a specified
+macro. Passing an empty \#2 will cancel capture of the given header.
+
+\begin{argtable}
+ \#1 & string & The name of the header\\
+ \#2 & string & The name of the macro to use (without the leading backslash)
+ or empty to stop capturing the given header\\
+ \#3 & string & a comma-separated list of options\\
+\end{argtable}
+
+The options are:
+
+\begin{tabular}{ll}
+ \texttt{name} & The header name should also be passed to the macro\\
+ \texttt{string} & The header value should be passed to the macro as a string\\
+\end{tabular}
+
+If the \texttt{name} option is not supplied, the macro supplied must take one
+argument: the value of the header.
+
+If the \texttt{name} option is supplied, the macro supplied must take two
+arguments: the name and the value of the header (in that order).
+
+If the \texttt{string} option is supplied, the value will be passed with all
+non-space characters as \TeX{} catcode 12 (and all spaces as catcode 10).
+If not, the value will be evaluated as \TeX{}.
+
+Other than the headers that define macros, which are not passed to \TeX{},
+the headers will be processed in the order they were presented in the gabc
+file. Headers will be processed in the \TeX{} state at the point of the
+\verb=\gregorioscore= call. This means, for example, that should the
+capturing macro produce something, it will be typeset within the same
+paragraph as the \verb=\gregorioscore= call.
+
+Gregorio will call whatever is passed to \verb=\grebeforeheaders= before
+processing a given set of headers and to \verb=\greafterheaders= after
+processing them.
+
+\macroname{\textbackslash grebeforeheaders}{\{\#1\}}{gregoriotex-main.tex}
+Specifies something to be done before a set of headers is processed.
+Defaults to nothing. If this is called multiple times, the most recent call
+will define the behavior at the next set of headers.
+
+\begin{argtable}
+ \#1 & \TeX\ code & The code to process before a set of headers.\\
+\end{argtable}
+
+\macroname{\textbackslash greafterheaders}{\{\#1\}}{gregoriotex-main.tex}
+Specifies something to be done after a set of headers is processed.
+Defaults to nothing. If this is called multiple times, the most recent call
+will define the behavior at the next set of headers.
+
+\begin{argtable}
+ \#1 & \TeX\ code & The code to process after a set of headers.\\
+\end{argtable}
+
+
\subsubsection{Ancient Notation}
For a full description of how to make use of the ancient notation capabilities of gregorio and Gregorio\TeX, look at the GregorioNabcRef documentation. The commands listed here allow the manipulation of settings related to that notation.
@@ -885,237 +1051,292 @@ While it may seem strange that many of these distances are defined to 5 decimal
\textbf{Nota Bene:} Because of the way Gregorio\TeX\ handles distances, these cannot be manipulated as if they were normal \TeX\ dimensions or skips. As a result they should only be changed using the command defined by Gregorio\TeX\ for this purpose.
-\macroname{additionallineswidth}{}{gsp-default.tex}
+\begin{gdimension}{additionallineswidth}
The additional width of the additional lines (\ie, the value added to the width of the glyph with which they're associated to get the width of the line).
+\end{gdimension}
-Default: \unit[0.14584]{cm}
-
-\macroname{alterationspace}{}{gsp-default.tex}
+\begin{gdimension}{alterationspace}
Space between an alteration (flat or natural) and the next glyph.
+\end{gdimension}
-Default: \unit[0.07747]{cm}
-
-\macroname{beforealterationspace}{}{gsp-default.tex}
+\begin{gdimension}{beforealterationspace}
When beginning of line shifts (bolshifts) are enabled, minimum space between a clef at the beginning of the line and a leading alteration glyph. This distance should be larger than \texttt{clefflatspace} so that a flatted clef can be distinguished from a flat which is part of the first glyph on a line, but also smaller than \texttt{spaceafterlineclef}, the distance from the clef to the first notes.
+\end{gdimension}
-Default: \unit[0.1]{cm}
-
-\macroname{beforelowchoralsignspace}{}{gsp-default.tex}
+\begin{gdimension}{beforelowchoralsignspace}
Space before a low choral sign.
+\end{gdimension}
-Default: \unit[0.04556]{cm} plus \unit[0.00638]{cm} minus \unit[0.00638]{cm}
-
-\macroname{clefflatspace}{}{gsp-default.tex}
+\begin{gdimension}{clefflatspace}
Space between a clef and a flat (for clefs with flat).
+\end{gdimension}
-Default: \unit[0.05469]{cm} plus \unit[0.00638]{cm} minus \unit[0.00638]{cm}
-
-\macroname{interglyphspace}{}{gsp-default.tex}
+\begin{gdimension}{interglyphspace}
Space between glyphs in the same element.
+\end{gdimension}
-Default: \unit[0.06927]{cm} plus \unit[0.00363]{cm} minus \unit[0.00363]{cm}
-
-\macroname{zerowidthspace}{}{gsp-default.tex}
+\begin{gdimension}{zerowidthspace}
Null space.
+\end{gdimension}
-Default: \unit[0]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
+\begin{gdimension}{halfspace}
+Half-space between elements.
+\end{gdimension}
-\macroname{interelementspace}{}{gsp-default.tex}
+\begin{gdimension}{interelementspace}
Space between elements.
+\end{gdimension}
-Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00363]{cm}
-
-\macroname{largerspace}{}{gsp-default.tex}
+\begin{gdimension}{largerspace}
Larger space between elements.
+\end{gdimension}
-Default: \unit[0.10938]{cm} plus \unit[0.01822]{cm} minus \unit[0.00911]{cm}
-
-\macroname{glyphspace}{}{gsp-default.tex}
+\begin{gdimension}{glyphspace}
Space between elements which has the size of a note.
+\end{gdimension}
-Default: \unit[0.21877]{cm} plus \unit[0.01822]{cm} minus \unit[0.01822]{cm}
-
-\macroname{intersyllablespacenotes}{}{gsp-default.tex}
-Minimum space between two notes of different syllables.
-
-Default: \unit[0.25523]{cm} plus \unit[0.31903]{cm} minus \unit[0]{cm}
-
-\macroname{spacebeforeeolcustos}{}{gsp-default.tex}
+\begin{gdimension}{spacebeforeeolcustos}
Space before custos at the end of a line.
+\end{gdimension}
-Default: \unit[0.1823]{cm} plus \unit[0.31903]{cm} minus \unit[0.0638]{cm}
-
-\macroname{spacebeforeinlinecustos}{}{gsp-default.tex}
+\begin{gdimension}{spacebeforeinlinecustos}
Space before custos within a line.
+\end{gdimension}
-Default: \unit[0]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
-
-\macroname{spacebeforesigns}{}{gsp-default.tex}
+\begin{gdimension}{spacebeforesigns}
Space before punctum mora and augmentum duplex.
+\end{gdimension}
-Default: \unit[0.05469]{cm} plus \unit[0.00455]{cm} minus \unit[0.00455]{cm}
+\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.
+\end{gdimension}
-\macroname{spaceaftersigns}{}{gsp-default.tex}
+\begin{gdimension}{spaceaftersigns}
Space after punctum mora and augmentum duplex.
+\end{gdimension}
-Default: \unit[0.08203]{cm} plus \unit[0.0082]{cm} minus \unit[0.0082]{cm}
-
-\macroname{spaceafterlineclef}{}{gsp-default.tex}
+\begin{gdimension}{spaceafterlineclef}
Space after a clef at the beginning of a line.
+\end{gdimension}
-Default: \unit[0.27345]{cm} plus \unit[0.14584]{cm} minus \unit[0.01367]{cm}
-
-\macroname{interwordspacenotes}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is a note and the first is a note.
+\begin{gdimension}{intersyllablespacenotes}
+Minimum space between notes of different syllables.
+\end{gdimension}
-Default: \unit[0.29169]{cm} plus \unit[0.08751]{cm} minus \unit[0.05469]{cm}
+\begin{gdimension}{interwordspacenotes}
+Minimum space between notes of syllables from different words.
+\end{gdimension}
-\macroname{interwordspacetext}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is text and the first is text.
+\begin{gdimension}{interwordspacetext}
+Minimum space between texts of different words. Please keep the same \texttt{plus} and \texttt{minus} as \texttt{interwordspacenotes}.
+\end{gdimension}
-Default: \unit[0.22787]{cm} plus \unit[0.41019]{cm} minus \unit[0.07292]{cm}
+\begin{gdimension}{interwordspacenotes@alteration}
+Same as \texttt{interwordspacenotes} for the case where the second syllable starts with an alteration.
+\end{gdimension}
-\macroname{interwordspacenotes@euouae}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is a note and the first is a note in \texttt{euouae} blocks.
+\begin{gdimension}{intersyllablespacenotes@alteration}
+Same as \texttt{intersyllablespacenotes} for the case where the second syllable starts with an alteration.
+\end{gdimension}
-Default: \unit[0.19]{cm} plus \unit[0.1]{cm} minus \unit[0.05]{cm}
+\begin{gdimension}{interwordspacenotes@euouae}
+Same as \texttt{interwordspacenotes} for \texttt{euouae} blocks.
+\end{gdimension}
-\macroname{interwordspacetext@euouae}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is text and the first is text in \texttt{euouae} blocks.
+\begin{gdimension}{interwordspacetext@euouae}
+Same as \texttt{interwordspacetext} for \texttt{euouae} blocks.
+\end{gdimension}
-Default: \unit[0.27]{cm} plus \unit[0.1]{cm} minus \unit[0.05]{cm}
-
-\macroname{bitrivirspace}{}{gsp-default.tex}
+\begin{gdimension}{bitrivirspace}
Space between notes of a bivirga or trivirga.
+\end{gdimension}
-Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00546]{cm}
-
-\macroname{bitristrospace}{}{gsp-default.tex}
+\begin{gdimension}{bitristrospace}
Space between notes of a bistropha or tristrophae.
+\end{gdimension}
-Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00546]{cm}
-
-\macroname{punctuminclinatumshift}{}{gsp-default.tex}
+\begin{gdimension}{punctuminclinatumshift}
Space between two punctum inclinatum.
+\end{gdimension}
-Default: \unit[-0.03918]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
-
-\macroname{beforepunctainclinatashift}{}{gsp-default.tex}
+\begin{gdimension}{beforepunctainclinatashift}
Space before puncta inclinata.
+\end{gdimension}
-Default: \unit[0.05286]{cm} plus \unit[0.00728]{cm} minus \unit[0.00455]{cm}
-
-\macroname{punctuminclinatumanddebilisshift}{}{gsp-default.tex}
+\begin{gdimension}{punctuminclinatumanddebilisshift}
Space between a punctum inclinatum and a punctum inclinatum deminutus.
+\end{gdimension}
-Default: \unit[-0.02278]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
-
-\macroname{punctuminclinatumdebilisshift}{}{gsp-default.tex}
+\begin{gdimension}{punctuminclinatumdebilisshift}
Space between two punctum inclinatum deminutus.
+\end{gdimension}
-Default: \unit[-0.00728]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
-
-\macroname{punctuminclinatumbigshift}{}{gsp-default.tex}
+\begin{gdimension}{punctuminclinatumbigshift}
Space between puncta inclinata, larger ambitus (range=3rd).
-
-Default: \unit[0.07565]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
-
-\macroname{punctuminclinatummaxshift}{}{gsp-default.tex}
-Space between puncta inclinata, larger ambitus (range=4th -or more?-).
-
-Default: \unit[0.17865]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
-
-\macroname{spacearoundsmallbar}{}{gsp-default.tex}
+\end{gdimension}
+
+\begin{gdimension}{punctuminclinatummaxshift}
+Space between puncta inclinata, larger ambitus (range=4th or 5th).
+\end{gdimension}
+
+\begin{gdimension}{ascendingpunctuminclinatumshift}
+Space between two ascending puncta inclinata.
+\end{gdimension}
+
+\begin{gdimension}{ascendingpunctuminclinatumanddebilisshift}
+Space between a punctum inclinatum and a punctum inclinatum deminutus,
+ascending.
+\end{gdimension}
+
+\begin{gdimension}{ascendingpunctuminclinatumbigshift}
+Space between ascending puncta inclinata, larger ambitus (range=3rd).
+\end{gdimension}
+
+\begin{gdimension}{ascendingpunctuminclinatummaxshift}
+Space between ascending puncta inclinata, larger ambitus (range=4th or 5th).
+\end{gdimension}
+
+\begin{gdimension}{descendinginclinatumtonobarshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph one pitch
+below.
+\end{gdimension}
+
+\begin{gdimension}{descendinginclinatumtonobarbigshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph two pitches
+below.
+\end{gdimension}
+
+\begin{gdimension}{descendinginclinatumtonobarmaxshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph three or four
+pitches below.
+\end{gdimension}
+
+\begin{gdimension}{ascendinginclinatumtonobarshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph one pitch
+above.
+\end{gdimension}
+
+\begin{gdimension}{ascendinginclinatumtonobarbigshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph two pitches
+above.
+\end{gdimension}
+
+\begin{gdimension}{ascendinginclinatumtonobarmaxshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph three or four
+pitches above.
+\end{gdimension}
+
+\begin{gdimension}{ascendinginclinatumtonobarmaxshift}
+Space between a punctum inclinatum and a no-bar (stemless) glyph three or four
+pitches above.
+\end{gdimension}
+
+\begin{gdimension}{spacearoundsmallbar}
Space around virgula and divisio minima.
+\end{gdimension}
-Default: \unit[0.1823]{cm} plus \unit[0.22787]{cm} minus \unit[0.05469]{cm}
-
-\macroname{spacearoundminor}{}{gsp-default.tex}
+\begin{gdimension}{spacearoundminor}
Space around divisio minor.
+\end{gdimension}
-Default: \unit[0.1823]{cm} plus \unit[0.22787]{cm} minus \unit[0.05469]{cm}
-
-\macroname{spacearoundmaior}{}{gsp-default.tex}
+\begin{gdimension}{spacearoundmaior}
Space around divisio maior.
+\end{gdimension}
-Default: \unit[0.1823]{cm} plus \unit[0.22787]{cm} minus \unit[0.05469]{cm}
-
-\macroname{spacearoundfinalis}{}{gsp-default.tex}
+\begin{gdimension}{spacearoundfinalis}
Space around divisio finalis.
+\end{gdimension}
-Default: \unit[0.1823]{cm} plus \unit[0.1823]{cm} minus \unit[0.05469]{cm}
-
-\macroname{spacebeforefinalfinalis}{}{gsp-default.tex}
+\begin{gdimension}{spacebeforefinalfinalis}
A special space for finalis, for when it is the last glyph.
+\end{gdimension}
-Default: \unit[0.29169]{cm} plus \unit[0.07292]{cm} minus \unit[0.27345]{cm}
+\begin{gdimension}{spacearoundsmallbartext}
+Space around virgula and divisio minima with text underneath.
+\end{gdimension}
-\macroname{spacearoundclefbars}{}{gsp-default.tex}
-Additional space that will appear around bars that are preceded by a custos and followed by a key.
+\begin{gdimension}{spacearoundminortext}
+Space around divisio minor with text underneath.
+\end{gdimension}
-Default: \unit[0.03645]{cm} plus \unit[0.00455]{cm} minus \unit[0.0009]{cm}
+\begin{gdimension}{spacearoundmaiortext}
+Space around divisio maior with text underneath.
+\end{gdimension}
-\macroname{textbartextspace}{}{gsp-default.tex}
-Space between the text and the text of the bar.
+\begin{gdimension}{spacearoundfinalistext}
+Space around divisio finalis with text underneath.
+\end{gdimension}
-Default: \unit[0.24611]{cm} plus \unit[0.13672]{cm} minus \unit[0.04921]{cm}
+\begin{gdimension}{spacebeforefinalfinalistext}
+A special space for finalis with text underneath, for when it is the last glyph.
+\end{gdimension}
-\macroname{notebarspace}{}{gsp-default.tex}
-Minimal space between a note and a bar.
+\begin{gdimension}{spacearoundclefbars}
+Additional space that will appear around bars that are preceded by a custos and followed by a key.
+\end{gdimension}
-Default: \unit[0.31903]{cm} plus \unit[0.27345]{cm} minus \unit[0.02824]{cm}
+\begin{gdimension}{textbartextspace}
+Space between the text and the text of the bar.
+\end{gdimension}
-\macroname{maximumspacewithoutdash}{}{gsp-default.tex}
-Maximal space between two syllables for which we consider a dash is not needed.
+\begin{gdimension}{notebarspace}
+Minimal space between a note and a bar.
+\end{gdimension}
-Default: \unit[0.02005]{cm}
+\begin{gdimension}{maximumspacewithoutdash}
+Maximal space between two syllables for which we consider a dash is not needed.
+\end{gdimension}
-\macroname{afterclefnospace}{}{gsp-default.tex}
+\begin{gdimension}{afterclefnospace}
An extensible space for the beginning of lines.
+\end{gdimension}
-Default: \unit[0]{cm} plus \unit[0.27345]{cm} minus \unit[0]{cm}
-
-\macroname{additionalcustoslineswidth}{}{gsp-default.tex}
+\begin{gdimension}{additionalcustoslineswidth}
Width of the additional lines, used only for the custos. The width is the one for the custos at end of lines, the line for custos in the middle of a score is the same multiplied by 2.
+\end{gdimension}
-Default: \unit[0.09114]{cm}
-
-\macroname{afterinitialshift}{}{gsp-default.tex}
+\begin{gdimension}{afterinitialshift}
Space between the initial and the beginning of the score.
+\end{gdimension}
-Default: \unit[0.2457]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
-
-\macroname{beforeinitialshift}{}{gsp-default.tex}
+\begin{gdimension}{beforeinitialshift}
Space between the initial and the beginning of the score.
+\end{gdimension}
-Default: \unit[0.2457]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
-
-\macroname{minimalspaceatlinebeginning}{}{gsp-default.tex}
+\begin{gdimension}{minimalspaceatlinebeginning}
Minimal space in front of the lyrics at the beginning of a line when \texttt{bolshift}s are enabled.
+\end{gdimension}
-Default: \unit[1.7]{cm}
-
-\macroname{manualinitialwidth}{}{gsp-default.tex}
+\begin{gdimension}{manualinitialwidth}
Space to force the initial width to. Ignored when 0.
+\end{gdimension}
-Default: \unit[0]{cm}
-
-\macroname{annotationseparation}{}{gsp-default.tex}
+\begin{gdimension}{annotationseparation}
This space is the one between lines in the annotation (text above the initial).
-Default: \unit[0.85]{cm}
+\textbf{Nota Bene:} This is the absolute space. If the lower line contains only short letters then it will get moved up so only this space shows (not the space above the letters on a normal line plus this space). You should use struts to control the line height of the lower line if this is a problem.
+\end{gdimension}
-\macroname{annotationraise}{}{gsp-default.tex}
-Amount to raise (positive) or lower (negative) the annotation from it's normal position (baseline of the first line aligned with the top line of the staff).
+\begin{gdimension}{annotationraise}
+Amount to raise (positive) or lower (negative) the annotation from its normal position (set with \verb=\gresetannotationby= and \verb=\gresetannotationvalign=).
+\end{gdimension}
-Default: \unit[0]{cm}
+\begin{gdimension}{commentaryseparation}
+This space is the one between lines in the commentary (text above the first staff line on the right).
-\macroname{noclefspace}{}{gsp-default.tex}
-Space at the beginning of the lines if there is no clef.
+\textbf{Nota Bene:} This is the absolute space. If the lower line contains only short letters then it will get moved up so only this space shows (not the space above the letters on a normal line plus this space). You should use struts to control the line height of the lower line if this is a problem.
+\end{gdimension}
-Default: \unit[0.1]{cm}
+\begin{gdimension}{commentaryraise}
+Distance from the commentary to the top line of the staff.
+\end{gdimension}
-\macroname{choralsigndownshift}{}{gsp-default.tex}
+\begin{gdimension}{noclefspace}
+Space at the beginning of the lines if there is no clef.
+\end{gdimension}
+
+\begin{gdimension}{choralsigndownshift}
The distance to shift choral signs down. The following choral signs are shifted down:
\begin{itemize}
@@ -1123,83 +1344,76 @@ The distance to shift choral signs down. The following choral signs are shifted
\item High choral signs which are in a space
\item Low choral signs that are lower than the note which are in a space
\end{itemize}
+\end{gdimension}
-Default: \unit[0.00911]{cm}
-
-\macroname{choralsignupshift}{}{gsp-default.tex}
+\begin{gdimension}{choralsignupshift}
The distance to shift choral signs up. The following choral signs are shifted up:
\begin{itemize}
\item High choral signs which are on a line
\item Low choral signs that are lower than the note which are on a line
\end{itemize}
+\end{gdimension}
-Default: \unit[0.04556]{cm}
-
-\macroname{translationheight}{}{gsp-default.tex}
+\begin{gdimension}{translationheight}
The space for the translation.
+\end{gdimension}
-Default: \unit[0.5]{cm}
-
-\macroname{spaceabovelines}{}{gsp-default.tex}
+\begin{gdimension}{spaceabovelines}
The space above the lines.
+\end{gdimension}
-Default: \unit[0.45576]{cm} plus \unit[0.36461]{cm} minus \unit[0.09114]{cm}
-
-\macroname{spacelinestext}{}{gsp-default.tex}
+\begin{gdimension}{spacelinestext}
The space between the lines and the bottom of the text.
+\end{gdimension}
-Default: \unit[0.60617]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
-
-\macroname{spacebeneathtext}{}{gsp-default.tex}
+\begin{gdimension}{spacebeneathtext}
The space beneath the text.
+\end{gdimension}
-Default: \unit[0]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
-
-\macroname{abovelinestextraise}{}{gsp-default.tex}
+\begin{gdimension}{abovelinestextraise}
Height of the text above the note line.
+\end{gdimension}
-Default: \unit[1.7]{cm}
-
-\macroname{abovelinestextheight}{}{gsp-default.tex}
+\begin{gdimension}{abovelinestextheight}
Height that is added at the top of the lines if there is text above the lines (it must be bigger than the text for it to be taken into consideration).
+\end{gdimension}
-Default: \unit[0.3]{cm}
-
-\macroname{braceshift}{}{gsp-default.tex}
+\begin{gdimension}{braceshift}
An additional shift you can give to the brace above the bars.
+\end{gdimension}
-Default: \unit[0]{cm}
-
-\macroname{curlybraceaccentusshift}{}{gsp-default.tex}
+\begin{gdimension}{curlybraceaccentusshift}
A shift you can give to the accentus above the curly brace.
+\end{gdimension}
-Default: $\unit[-0.05]{cm}$
-
-\macroname{nabcinterelementspace}{}{gsp-default.tex}
+\begin{gdimension}{nabcinterelementspace}
Space between elements in ancient notation.
+\end{gdimension}
-Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00363]{cm}
-
-\macroname{nabclargerspace}{}{gsp-default.tex}
+\begin{gdimension}{nabclargerspace}
Larger space between elements in ancient notation.
+\end{gdimension}
-Default: \unit[0.10938]{cm} plus \unit[0.01822]{cm} minus \unit[0.00911]{cm}
-
-\macroname{clivisalignmentmin}{}{gsp-default.tex}
+\begin{gdimension}{clivisalignmentmin}
When \verb=\gre@clivisalignment= is 2, this distance is the maximum length of the consonants after vowels for which the clivis will be aligned on its center.
+\end{gdimension}
-Default: \unit[0.3]{cm}
-
-\macroname{clefchangespace}{}{gsp-default.tex}
+\begin{gdimension}{clefchangespace}
Space around a clef change.
+\end{gdimension}
-Default: \unit[0.01768]{cm} plus \unit[0.00175]{cm} minus \unit[0.01768]{cm}
-
-\macroname{initialraise}{}{gsp-default.tex}
+\begin{gdimension}{initialraise}
Distance the initial will be raised above its default baseline. The default baseline for the initial coincides with the baseline for the text below the staff.
+\end{gdimension}
+
+\begin{gdimension}{overslurshift}
+Distance an over-the-notes slur will be raised above the baseline of a note at the same height.
+\end{gdimension}
-Default: \unit[0]{cm}
+\begin{gdimension}{underslurshift}
+Distance an under-the-notes slur will be raised above the baseline of a note at the same height.
+\end{gdimension}
\subsection{Penalties}\label{penalties}
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
index aff6c6b7ea6..5468228666e 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
@@ -20,7 +20,7 @@ respecting the annotation value in the \texttt{main.tex} file.
\#2 & string & Second line text to place above the initial.\\
\end{argtable}
-\macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6}{gregoriotex-main.tex}
+\macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-main.tex}
Macro to start a score.
\begin{argtable}
@@ -31,12 +31,19 @@ Macro to start a score.
& 1 & there is a translation line somewhere in the score\\
\#5 & 0 & there is no above lines text in the score\\
& 1 & there is above lines text somewhere in the score\\
- \#6 & string & the absolute filename of the gabc file if point-and-click is enabled.
+ \#6 & string & the absolute filename of the gabc file if point-and-click is enabled\\
+ \#7 & integer & the number of staff lines\\
\end{argtable}
\macroname{\textbackslash GreEndScore}{}{gregoriotex-main.tex}
Macro to end a score.
+\macroname{\textbackslash GreBeginHeaders}{}{gregoriotex-main.tex}
+Macro called at the beginning of a set of gabc headers.
+
+\macroname{\textbackslash GreEndHeaders}{}{gregoriotex-main.tex}
+Macro called at the end of a set of gabc headers.
+
\macroname{\textbackslash GreAccentus}{\#1\#2}{gregoriotex-signs.tex}
Macro for typesetting an accentus.
@@ -54,12 +61,14 @@ Macro to typeset the additional line above or below the staff.
\#3 & integer & Set horizontal episema (0), horizontal episema under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
\end{argtable}
-\macroname{\textbackslash GreAdjustSecondLine}{}{gregoriotex.tex}
-%didn't actually find this one in gregoriotex-write.c, classified it here based on it’s related function GreAdjustThirdLine
-Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
+\macroname{\textbackslash GreAdHocSpaceEndOfElement}{\#1\#2}{gregoriotex-main.tex}
+Macro to end an element with an ad-hoc space.
-\macroname{\textbackslash GreAdjustThirdLine}{}{gregoriotex-main.tex}
-Macro to call during the second line.
+\begin{argtable}
+ \#1 & float & The factor to scale the default space for use as an ad-hoc space.\\
+ \#2 & \texttt{0} & Space is breakable.\\
+ & \texttt{1} & Space is unbreakable.\\
+\end{argtable}
\macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
Macro for typesetting an augmentum duplex (a pair of punctum mora)
@@ -101,9 +110,13 @@ Macro to typeset a vertical episema on a bar.
\#1 & string & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
\end{argtable}
-\macroname{\textbackslash GreBeginEUOUAE}{}{gregoriotex-main.tex}
+\macroname{\textbackslash GreBeginEUOUAE}{\#1}{gregoriotex-main.tex}
Macro to mark the beginning of a EUOUAE block. Alters spacings and prohibits a line break until the end of the block.
+\begin{argtable}
+ \#1 & integer & The identifier of the EUOUAE block.\\
+\end{argtable}
+
\macroname{\textbackslash GreBeginNLBArea}{\#1\#2}{gregoriotex-main.tex}
Macro called at beginning of a no line break area.
@@ -114,9 +127,6 @@ Macro called at beginning of a no line break area.
& \texttt{1} & Call came from translation centering.
\end{argtable}
-\macroname{\textbackslash GreBeginNotes}{}{gregoriotex.tex}
-Macro to draw the staff lines. Comes after the initial but before the clef.
-
\macroname{\textbackslash GreBold}{\#1}{gregoriotex.sty and gregoriotex.tex}
Makes argument bold. Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty}) or Plain \TeX\ \verb=\bf= (\textit{gregoriotex.tex}) as appropriate. Corresponds to ``<b></b>'' tags in gabc.
@@ -124,15 +134,18 @@ Makes argument bold. Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty})
\#1 & string & Text to be typeset in bold.\\
\end{argtable}
-\macroname{\textbackslash GreChangeClef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreChangeClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
Macro called when key changes
\begin{argtable}
\#1 & character & Type of new clef (c or f).\\
- \#2 & integer & Line of new clef.\\
+ \#2 & \texttt{1}--\texttt{5} & Line of new clef.\\
\#3 & \texttt{0} & Print space before clef.\\
& \texttt{1} & Do not print space before clef.\\
- \#4 & integer & Height number of flat in key (\texttt{0} for no flat).\\
+ \#4 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
+ \#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
+ \#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
+ \#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
\end{argtable}
\macroname{\textbackslash GreCirculus}{\#1\#2}{gregoriotex-signs.tex}
@@ -177,42 +190,72 @@ A Gregorio\TeX-specific discretionary. Currently only used to avoid clef change
\#3 & \TeX\ code & Third argument of resulting \verb=\discretionary=.\\
\end{argtable}
-\macroname{\textbackslash GreDivisioFinalis}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDivisioFinalis}{\#1\#2}{gregoriotex-signs.tex}
Macro to typeset a divisio finalis.
\begin{argtable}
- \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisema=).\\
+ \#1 & \texttt{0} & There is no text under the bar.\\
+ & \texttt{1} & There is text under the bar.\\
+ \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisema=).\\
\end{argtable}
-\macroname{\textbackslash GreDivisioMaior}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDivisioMaior}{\#1\#2}{gregoriotex-signs.tex}
Macro to typeset a divisio maior.
\begin{argtable}
- \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
+ \#1 & \texttt{0} & There is no text under the bar.\\
+ & \texttt{1} & There is text under the bar.\\
+ \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
\end{argtable}
-\macroname{\textbackslash GreDivisioMinima}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDivisioMinima}{\#1\#2}{gregoriotex-signs.tex}
Macro to typeset a divisio minima.
\begin{argtable}
- \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
+ \#1 & \texttt{0} & There is no text under the bar.\\
+ & \texttt{1} & There is text under the bar.\\
+ \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
\end{argtable}
-\macroname{\textbackslash GreDivisioMinor}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
Macro to typeset a divisio minor.
\begin{argtable}
- \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisema=).\\
+ \#1 & \texttt{0} & There is no text under the bar.\\
+ & \texttt{1} & There is text under the bar.\\
+ \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisema=).\\
\end{argtable}
-\macroname{\textbackslash GreDominica}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreDominica}{\#1\#2\#3}{gregoriotex-signs.tex}
Macro to typeset a dominican bar.
\begin{argtable}
- \#1 & \texttt{1}--\texttt{6} & Type of dominican bar. Corresponds to bar types 6--11 in \verb=\grewritebar=.\\
- \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisema=).\\
+ \#1 & \texttt{1}--\texttt{6} & Type of dominican bar. Corresponds to bar types 6--13 in \verb=\grewritebar=.\\
+ \#2 & \texttt{0} & There is no text under the bar.\\
+ & \texttt{1} & There is text under the bar.\\
+ \#3 & \TeX\ code & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisema=).\\
\end{argtable}
+\macroname{\textbackslash GreDrawAdditionalLine}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to draw ledger lines.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
+ & \texttt{1} & Draw an under-the-staff ledger line. \\
+ \#2 & distance & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
+ \#3 & \texttt{0} & Start the line at this point. \\
+ & \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
+ & \texttt{2} & Start the line to the left of this point by \#4. \\
+ \#4 & distance & The distance to move left before starting the line if \#3 is \texttt{2}. \\
+ \#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
+ & \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
+ & \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
+ \#6 & distance & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
+\end{argtable}
+
+\macroname{\textbackslash GreEmptyFirstSyllableHyphen}{}{gregoriotex-syllable.tex}
+Macro that indicates the position of an empty-first-syllable hyphen, should one be desired.
+
\macroname{\textbackslash GreEndEUOUAE}{\#1}{gregoriotex-main.tex}
Macro to mark the end of a EUOUAE block.
@@ -231,6 +274,7 @@ Macro to end elements.
& \texttt{1} & Larger space.\\
& \texttt{2} & Glyph space.\\
& \texttt{3} & Zero-width space.\\
+ & \texttt{4} & Ad-hoc space.\\
\#2 & \texttt{0} & Space is breakable.\\
& \texttt{1} & Space is unbreakable.\\
\end{argtable}
@@ -254,15 +298,26 @@ Macro to end a glyph without ending the element.
\#1 & \texttt{0} & Default space.\\
& \texttt{1} & Zero-width space.\\
& \texttt{2} & Space between flat or natural and a note.\\
- & \texttt{3} & Space between two puncta inclinata.\\
+ & \texttt{3} & Space between two puncta inclinata, descending.\\
& \texttt{4} & Space between bivirga or trivirga.\\
& \texttt{5} & space between bistropha or tristropha.\\
& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
- & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
+ & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
& \texttt{8} & Space between two puncta inclinata debilis.\\
& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
- & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
- & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
+ & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
+ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
+ & \texttt{12} & Space between two puncta inclinata, ascending. \\
+ & \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
+ & \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
+ & \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
+ & \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
+ & \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
+ & \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
+ & \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
+ & \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. \\
\end{argtable}
\macroname{\textbackslash GreFinalCustos}{\#1}{gregoriotex-signs.tex}
@@ -321,18 +376,24 @@ many syllables are in the word.
\#1 & string & Text from the first word.
\end{argtable}
-\macroname{\textbackslash GreFlat}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreFlat}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
Macro to typeset a flat.
\begin{argtable}
\#1 & integer & Height number of the flat.\\
\#2 & \texttt{0} & No flat for a key change.\\
& \texttt{1} & Indicates the flat for a key change.\\
+ \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+ \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+ \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
\macroname{\textbackslash GreForceHyphen}{}{gregoriotex-syllable.tex}
Macro that indicates that a hyphen should be forced (if enabled) after the given syllable.
+\macroname{\textbackslash GreFuse}{}{gregoriotex-main.tex}
+Macro used between two fused glyphs.
+
\macroname{\textbackslash GreFuseTwo}{\#1\#2}{gregoriotex-main.tex}
Macro for fusing two glyphs to create a larger neume.
@@ -379,7 +440,15 @@ therefore compatible with the score.
\#1 & string & Version number for Gregorio\TeX.\\
\end{argtable}
-\macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreHeader}{\#1\#2}{gregoriotex-main.tex}
+Macro used to pass headers to TeX.
+
+\begin{argtable}
+ \#1 & string & The header name.\\
+ \#2 & string & The header value.\\
+\end{argtable}
+
+\macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
Macro to typeset an horizontal episema.
\begin{argtable}
@@ -397,9 +466,10 @@ Macro to typeset an horizontal episema.
& \texttt{c} & a small episema aligned center\\
& \texttt{r} & a small episema aligned right\\
\#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\
+ \#7 & \TeX\ code & code that sets heuristics\\
\end{argtable}
-\macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
Macro to typeset a bridge episema for the last note of a glyph
(element, syllable) if the next episema is at the same height.
@@ -418,7 +488,8 @@ Macro to typeset a bridge episema for the last note of a glyph
& \texttt{8} & Space between two puncta inclinata debilis.\\
& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
- & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).
+ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
+ \#4 & \TeX\ code & code that sets heuristics\\
\end{argtable}
\macroname{\textbackslash GreHighChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
@@ -434,19 +505,19 @@ Macro for typesetting high choral signs.
\macroname{\textbackslash GreHyph}{}{gregoriotex-main.tex}
Macro used for end of line hyphens. Defaults to \verb=\gre@char@normalhyph=.
-\macroname{\textbackslash GreInDivisioFinalis}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDivisioFinalis}{\#1\#2}{gregoriotex-signs.tex}
Same as \verb=\GreDivisioFinalis= except inside a syllable.
-\macroname{\textbackslash GreInDivisioMaior}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDivisioMaior}{\#1\#2}{gregoriotex-signs.tex}
Same as \verb=\GreDivisioMaior= except inside a syllable.
-\macroname{\textbackslash GreInDivisioMinima}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDivisioMinima}{\#1\#2}{gregoriotex-signs.tex}
Same as \verb=\GreDivisioMinima= except inside a syllable.
-\macroname{\textbackslash GreInDivisioMinor}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
Same as \verb=\GreDivisioMinor= except inside a syllable.
-\macroname{\textbackslash GreInDominica}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDominica}{\#1\#2\#3}{gregoriotex-signs.tex}
Same as \verb=\GreDominica= except inside a syllable.
\macroname{\textbackslash GreInVirgula}{\#1\#2}{gregoriotex-signs.tex}
@@ -498,7 +569,7 @@ Macro for typesetting low choral signs.
& \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
\end{argtable}
-\macroname{\textbackslash GreMode}{\#1}{gregoriotex-main.tex}
+\macroname{\textbackslash GreMode}{\#1\#2\#3}{gregoriotex-main.tex}
If the gabc file contains a mode in the header, then this function
places said mode as the first (top) annotation. If the user has
manually added a first annotation in the \TeX\ file, then this
@@ -506,16 +577,21 @@ function does nothing. Also, if the \texttt{annotation} header field
is used, then this function does nothing.
\begin{argtable}
- \#1 & \texttt{1}--\texttt{8} & The mode. Other values are ignored.\\
+ \#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
+ \#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
+ \#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
\end{argtable}
-\macroname{\textbackslash GreNatural}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreNatural}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
Macro to typeset a natural.
\begin{argtable}
\#1 & integer & Height number of the natural.\\
\#2 & \texttt{0} & No flat for a key change.\\
& \texttt{1} & Indicates the flat for a key change.\\
+ \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+ \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+ \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
\macroname{\textbackslash GreNewLine}{}{gregoriotex-main.tex}
@@ -532,8 +608,48 @@ where this macro is called.
\#1 & integer & Height number of the custos.\\
\end{argtable}
-\macroname{\textbackslash GreNoInitial}{}{gregoriotex-main.tex}
-Macro called when no initial is being set.
+\macroname{\textbackslash GreNextSyllableBeginsEUOUAE}{\#1}{gregoriotex-syllable.tex}
+Indicates that the syllable which follows begins a EUOUAE block.
+
+\begin{argtable}
+ \#1 & integer & The identifier of the EUOUAE block.\\
+\end{argtable}
+
+\macroname{\textbackslash GreOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset an oriscus cavum (the oriscus points at a higher note).
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GreOriscusCavumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a reverse oriscus cavum (the oriscus points at a lower note).
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GreOriscusCavumDeminutus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a reverse oriscus cavum with a deminutus tail.
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
\macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
Macro to typeset a round brace above the lines.
@@ -625,8 +741,16 @@ Macro for typesetting a reversed semicirculus.
\#2 & string & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
\end{argtable}
-\macroname{\textbackslash GreScoreReference}{\#1}{gregoriotex-main.tex}
-Currently does nothing.
+\macroname{\textbackslash GreScoreOpening}{\#1\#2\#3\#4\#5}{gregoriotex-syllable.tex}
+Opens the score.
+
+\begin{argtable}
+ \#1 & \TeX\ code & Macros rendering the things after the initial but before the notes.\\
+ \#2 & \TeX\ code & Macros rendering the things after starting notes but before the syllable.\\
+ \#3 & \TeX\ code & Macros rendering the things before the initial.\\
+ \#4 & \TeX\ control sequence & Control sequence for the syllable.\\
+ \#5 & \TeX\ code & Macros rendering the first syllable; should emit the initial and populate \verb=\gre@opening@syllabletext=.\\
+\end{argtable}
\macroname{\textbackslash GreSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
Macro for typesetting a semicirculus.
@@ -636,8 +760,17 @@ Macro for typesetting a semicirculus.
\#2 & string & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
\end{argtable}
-\macroname{\textbackslash GreSetBigInitial}{}{gregoriotex-main.tex}
-Macro which indicates that a 2-line initial is desired.
+\macroname{\textbackslash GreSetFirstSyllableText}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
+Sets the first syllable text.
+
+\begin{argtable}
+ \#1 & \TeX\ code & Initial.\\
+ \#2 & \TeX\ code & First letter after the initial.\\
+ \#3 & \TeX\ code & Everything else in the syllable.\\
+ \#4 & \TeX\ code & Three syllable parts when there is a separated initial.\\
+ \#5 & \TeX\ code & Three syllable parts where there is no separated initial.\\
+ \#6 & \TeX\ code & Extra macros to run if there is an initial.\\
+\end{argtable}
\macroname{\textbackslash GreSetFixedNextTextFormat}{\#1}{gregoriotex-syllable.tex}
Same as \verb=\GreSetFixedTextFormat= except for next syllable.
@@ -669,31 +802,34 @@ ligatures. In this example we should call \verb=\grefixedtext{\textit{ffj}}=.
& \texttt{5} & underline
\end{argtable}
-\macroname{\textbackslash GreSetInitial}{\#1}{gregoriotex-main.tex}
-Macro to set the initial in the score.
-
\begin{argtable}
\#1 & character & The initial letter of the score.\\
\end{argtable}
-\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for writing initial key.
+\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro for writing initial clef.
\begin{argtable}
\#1 & \texttt{c} or \texttt{f} & Type of clef.\\
- \#2 & \texttt{1}--\texttt{4} & Line of key.\\
- \#3 & integer & Height number of flat in key (\texttt{0} for no flat).\\
+ \#2 & \texttt{1}--\texttt{5} & Line of clef.\\
+ \#3 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
+ \#4 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
+ \#5 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
+ \#6 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
\end{argtable}
-\macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4}{gregoriotex-main.tex}
+\macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-main.tex}
Macro to define the clef that will appear at the beginning of the lines.
\begin{argtable}
\#1 & \texttt{c} or \texttt{f} & Type of clef.\\
- \#2 & \texttt{1}--\texttt{4} & Line of key.\\
+ \#2 & \texttt{1}--\texttt{5} & Line of clef.\\
\#3 & \texttt{0} & No space after clef.\\
& \texttt{1} & Space after clef.\\
- \#4 & integer & Height of flat in key (\texttt{0} for no flat).\\
+ \#4 & integer & Height of flat in clef (\texttt{3} for no flat).\\
+ \#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
+ \#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
+ \#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
\end{argtable}
\macroname{\textbackslash GreSetNextSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
@@ -705,6 +841,9 @@ Macro to set the text of the next syllable for spacing purposes.
\#3 & string & the end letters, they don't count for alignment\\
\end{argtable}
+\macroname{\textbackslash GreSetNoFirstSyllableText}{}{gregoriotex-syllable.tex}
+Macro that indicates there is no next in the first syllable.
+
\macroname{\textbackslash GreSetTextAboveLines}{\#1}{gregoriotex-main.tex}
Macro to place argument above the lines and empty
\verb=\gre@currenttextabovelines= when done.
@@ -722,13 +861,16 @@ Macro to set the text of the current syllable.
\#3 & string & the end letters, they don't count for alignment\\
\end{argtable}
-\macroname{\textbackslash GreSharp}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreSharp}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
Macro to typeset a sharp.
\begin{argtable}
\#1 & integer & Height number of the sharp.\\
\#2 & \texttt{0} & No flat for a key change.\\
& \texttt{1} & Indicates the flat for a key change.\\
+ \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+ \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+ \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
\macroname{\textbackslash GreSmallCaps}{\#1}{gregoriotex.sty and gregoriotex.tex}
@@ -740,9 +882,30 @@ in gabc.
\#1 & string & Text to be typeset in small caps font.\\
\end{argtable}
+\macroname{\textbackslash GreSlur}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Typesets a slur.
+
+\begin{argtable}
+ \#1 & integer & Height number of the pitch.\\
+ \#2 & \texttt{-1} & The slur should appear under the note.\\
+ & \texttt{1} & The slur should appear over the note.\\
+ \#3 & \texttt{0} & The slur should start at the right end of the note.\\
+ & \texttt{1} & The slur should start at one punctum's width to the left of the right end of the note.\\
+ & \texttt{2} & The slur should start at one-half punctum's width to the left of the right end of the note.\\
+ \#4 & string & The horizontal dimension of the slur.\\
+ \#5 & string & The vertical dimension of the slur.\\
+ \#6 & integer & Height number of the pitch.\\
+\end{argtable}
+
\macroname{\textbackslash GreStar}{}{gregoriotex-symbol.tex}
Macro to typeset an asterisk (\GreStar).
+\macroname{\textbackslash GreSupposeHighLedgerLine}{}{gregoriotex-spaces.tex}
+Indicates that the system should act as if a ledger line exists above the staff.
+
+\macroname{\textbackslash GreSupposeLowLedgerLine}{}{gregoriotex-spaces.tex}
+Indicates that the system should act as if a ledger line exists below the staff.
+
\macroname{\textbackslash GreSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
Macro to typeset the syllable.
@@ -799,20 +962,29 @@ Returns its argument as-is.
\#1 & string & Text to typeset without any extra styling.\\
\end{argtable}
+\macroname{\textbackslash GreUpcomingNewLineForcesCustos}{\#1}{gregoriotex-syllable.tex}
+Indicates that the new line in the next syllable forces a custos.
+
+\begin{argtable}
+ \#1 & \texttt{0} & The custos is forced off.\\
+ & \texttt{1} & The custos is forced on.\\
+\end{argtable}
+
\macroname{\textbackslash GreVarBraceLength}{\#1}{gregoriotex-signs.tex}
-Returns the computed length of the given brace.
+Returns the computed length of the given brace or ledger line.
\begin{argtable}
\#1 & string & unique identifier for the brace within the score.
\end{argtable}
\macroname{\textbackslash GreVarBraceSavePos}{\#1\#2\#3}{gregoriotex-signs.tex}
-Records positions to compute the lengths of variable-sized braces.
+Records positions to compute the lengths of variable-sized braces and ledger lines.
\begin{argtable}
\#1 & string & unique identifier for the brace within the score.\\
\#2 & \texttt{0} & Don't shift before recording the position.\\
& \texttt{1} & Shift back a punctum's width before recording the position.\\
+ & \texttt{2} & Shift back one-half a punctum's width before recording the position.\\
\#3 & \texttt{1} & Position to save is the start of brace.\\
& \texttt{2} & Position to save is the end of brace.
\end{argtable}
@@ -825,11 +997,13 @@ Macro for typesetting the vertical episema.
\#2 & string & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
\end{argtable}
-\macroname{\textbackslash GreVirgula}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreVirgula}{\#1\#2}{gregoriotex-signs.tex}
Macro to typeset a virgula.
\begin{argtable}
- \#1 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
+ \#1 & \texttt{0} & There is no text under the bar.\\
+ & \texttt{1} & There is text under the bar.\\
+ \#2 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
\end{argtable}
\macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}
@@ -883,6 +1057,14 @@ Macro which sets the number of \texttt{nabc} lines in the score.
\#1 & integer & the number of \texttt{nabc} lines (currently only 1 is supported)\\
\end{argtable}
+
+\macroname{\textbackslash GreModeNumber}{\#1}{gregoriotex-main.tex}
+Macro which formats the mode in roman or arabic numerals according to the appropriate setting.
+
+\begin{argtable}
+ \#1 & \texttt{1}--\texttt{8} & The mode to be formated\\
+\end{argtable}
+
%%% Local Variables:
%%% mode: latex
%%% TeX-master: "GregorioRef"
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
index 498c940dbdf..80370990ddc 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
@@ -86,6 +86,9 @@ Macro for calculating \verb=\gre@textaligncenter=.
\macroname{\textbackslash gre@calculate@annotationtrueraise}{}{gregoriotex-spaces.tex}
Macro to calculate \verb=\gre@dimen@annotationtrueraise=.
+\macroname{\textbackslash gre@calculate@commentarytrueraise}{}{gregoriotex-spaces.tex}
+Macro to calculate \verb=\gre@dimen@commentarytrueraise=.
+
\macroname{\textbackslash gre@calculate@textlower}{}{gregoriotex-spaces.tex}
Calculates the value of \texttt{textlower}. Default is \texttt{spacebeneathtext}.
@@ -114,7 +117,7 @@ Calculates the baseline correction for the glyphs. Dependent on \texttt{gre@fac
Aggregates all of the global distance calculations and calls them in the order needed to respect dependencies.
\macroname{\textbackslash gre@calculate@glyphraisevalue}{\#1\#2}{gregoriotex-spaces.tex}
-Calculates the raise values for a glyph (glyphraisevalue and addedraisevalue) based on where it is to be placed and what kind of a glyph it is. This is a time of use calculation.
+Calculates the raise value for a glyph (glyphraisevalue) based on where it is to be placed and what kind of a glyph it is. This is a time of use calculation.
\begin{argtable}
\#1 & integer & The number for where the glyph is located. \texttt{a} in gabc is \texttt{1}, \texttt{b} is \texttt{2}, \etc\\
@@ -130,7 +133,10 @@ Calculates the raise values for a glyph (glyphraisevalue and addedraisevalue) ba
& \texttt{10} & case of the low choral sign\\
& \texttt{11} & case of the high choral sign\\
& \texttt{12} & case of the low choral sign which is lower than the note\\
- & \texttt{13} & case of the brace above the bars
+ & \texttt{13} & case of the brace above the bars\\
+ & \texttt{14} & case of the punctum mora in a space with a note on the line below it\\
+ & \texttt{15} & case of the over-the-notes slur\\
+ & \texttt{16} & case of the under-the-notes slur\\
\end{argtable}
\macroname{\textbackslash gre@stafflinefactor}{}{gregoriotex-spaces.tex}
@@ -187,27 +193,21 @@ Macro to calculate \texttt{nextbegindifference}.
& $40 \le$ integer $\le 59$ & Same as below 20 except there is a natural before the notes. Subtract 40 to get the type of notes alignment.
\end{argtable}
-\macroname{\textbackslash gre@makein}{\#1}{gregoriotex-spaces.tex}
-Strips the decimals and units from a distance.
+\macroname{\textbackslash gre@strip@pt}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
+Strips the units from a distance. Under \LaTeX{}, this is an alias to \verb=\strip@pt=.
\begin{argtable}
- \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)
+ \#1 & control sequence & should be the control sequence for the the distance register (including the leading backslash)\\
\end{argtable}
-\macroname{\textbackslash gre@makenum}{\#1}{gregoriotex-spaces.tex}
-Strips the units from a distance.
+\macroname{\textbackslash gre@rem@pt}{\#1}{gregoriotex.tex}
+Strips the units from a distance. Used internally by \verb=\gre@strip@pt=. Under \LaTeX{}, this is not defined.
\begin{argtable}
- \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)
+ \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)\\
\end{argtable}
-\macroname{\textbackslash gre@unitfactor}{}{gregoriotex-spaces.tex}
-Temporary count used by \verb=\gre@convertto=.
-
-\macroname{\textbackslash gre@basefactor}{}{gregoriotex-spaces.tex}
-Temporary count used by \verb=\gre@convertto=.
-
-\macroname{\textbackslash gre@count@temp@**}{}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre@count@temp@...}{}{gregoriotex-spaces.tex}
Temporary count used in calculations. There are currently three of these.
\macroname{\textbackslash gre@convertto}{\#1\#2}{gregoriotex-spaces.tex}
@@ -259,22 +259,14 @@ optional argument.
\#1 & string & Snippet of gabc code.\\
\end{argtable}
-\macroname{\textbackslash gre@gabcsnippet@option}{[\#1]\#2}{gregoriotex-main.tex}
-Macro that handles \verb=\gabcsnippet= calls when they have an optional
-argument.
-
-\begin{argtable}
- \#1 & int & Value of initial style to be passed to gregorio \\
- \#2 & string & Snippet of gabc code.\\
-\end{argtable}
-
-\macroname{\textbackslash gre@writemode}{\#1}{gregoriotex-main.tex}
-Macro that writes its argument with \verb=\greannotation=. The
-argument typically is given to this macro by \verb=\GreMode= in the
-gtex file.
+\macroname{\textbackslash gre@writemode}{\#1\#2\#3}{gregoriotex-main.tex}
+Macro that writes its arguments with \verb=\greannotation=. This
+macro is typically called by \verb=\GreMode= in the gtex file.
\begin{argtable}
- \#1 & string & Text to place above the initial of a score.\\
+ \#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
+ \#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
+ \#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
\end{argtable}
\macroname{\textbackslash gre@brace@common}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
@@ -321,7 +313,7 @@ Draws a round under-brace using \MP{}.
\#1 & length & the width of the brace.
\end{argtable}
-\macroname{\textbackslash gre@draw@roundbrace}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@draw@roundbrace}{\#1\#2\#3}{gregoriotex-signs.tex}
Draws a round over- or under-brace using \MP{}.
\begin{argtable}
@@ -330,6 +322,17 @@ Draws a round over- or under-brace using \MP{}.
\#3 & \MP{} commands & \MP{} commands to draw the brace outline.
\end{argtable}
+\macroname{\textbackslash gre@draw@slur}{\#1\#2\#3}{gregoriotex-signs.tex}
+Draws a slur using \MP{}.
+
+\begin{argtable}
+ \#1 & length & the x-dimension of the slur.\\
+ \#2 & length & the y-dimension of the slur.\\
+ \#3 & \texttt{-1} & draw an under-the-notes slur.\\
+ & \texttt{1} & draw an over-the-notes slur.\\
+\end{argtable}
+
+
\macroname{\textbackslash gre@iflatex}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
Evaluates to \verb=#1= if running under \LaTeX{}.
@@ -369,13 +372,37 @@ Macro to pick the appropriate custos character.
\#1 & integer & height of the custos character to be placed\\
\end{argtable}
+\macroname{\textbackslash gre@nextcustos}{}{gregoriotex-signs.tex}
+Macro that saves the next custos height.
+
+\macroname{\textbackslash gre@beginnotes}{}{gregoriotex-main.tex}
+Macro to draw the staff lines. Comes after the initial but before the clef.
+
+\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@addspaceabove}{}{gregoriotex-main.tex}
Macro to increase the space above the lines to account for above lines text.
\macroname{\textbackslash gre@removespaceabove}{}{gregoriotex-main.tex}
Macro to decrease the space above the lines as there is no longer any above lines text.
-\macroname{\textbackslash gre@alteration}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@alteration}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
Macro to typeset an alteration.
\begin{argtable}
@@ -384,21 +411,28 @@ Macro to typeset an alteration.
\#3 & character alias & the hole of the alteration\\
\#4 & \texttt{1} & the alteration is a flat for a key change\\
& \texttt{0} & all other cases\\
+ \#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+ \#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+ \#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
\end{argtable}
-\macroname{\textbackslash gre@calculate@clefnum}{\#1\#2}{gregoriotex-signs.tex}
-Macro calculating the \verb=\gre@clefnum= from the letter and number.
+\macroname{\textbackslash gre@clef}{}{gregoriotex-signs.tex}
+Macro holding the current clef type.
-\begin{argtable}
- \#1 & charcter & type of clef (\texttt{c} or \texttt{f})\\
- \#2 & integer & line number\\
-\end{argtable}
+\macroname{\textbackslash gre@clefheight}{}{gregoriotex-signs.tex}
+Macro holding the current clef line.
+
+\macroname{\textbackslash gre@clefflatheight}{}{gregoriotex-signs.tex}
+Macro to hold the height of the current flat for the clef (\texttt{3} if no flat).
+
+\macroname{\textbackslash gre@cleftwo}{}{gregoriotex-signs.tex}
+Macro holding the current secondary clef type.
-\macroname{\textbackslash gre@clefnum}{}{gregoriotex-signs.tex}
-Count holding the current clef number.
+\macroname{\textbackslash gre@cleftwoheight}{}{gregoriotex-signs.tex}
+Macro holding the current secondary clef line (or 0 for no secondary clef).
-\macroname{\textbackslash gre@clefflat}{}{gregoriotex-signs.tex}
-Macro to hold the height of the current flat for the clef (\texttt{a} if no flat).
+\macroname{\textbackslash gre@cleftwoflatheight}{}{gregoriotex-signs.tex}
+Macro to hold the height of the current flat for the secondary clef (\texttt{3} if no flat).
\macroname{\textbackslash gre@updatelinesclef}{}{gregoriotex-signs.tex}
Macro redrawing a key from \verb=\gre@clefnum=, useful for vertical space changes.
@@ -458,6 +492,21 @@ Macro called at end of a syllable, adds a penalty and a space.
& \texttt{0} & otherwise\\
\end{argtable}
+\macroname{\textbackslash gre@setfirstsyllabletext}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
+Internal macro to set the first syllable text after all parts are known.
+
+\begin{argtable}
+ \#1 & \TeX\ code & First part of the syllable (before the vowel)\\
+ \#2 & \TeX\ code & Middle part of the syllable (the vowel)\\
+ \#3 & \TeX\ code & Last part of the syllable (after the vowel)\\
+ \#4 & \TeX\ code & First letter of the syllable\\
+ \#5 & \TeX\ code & Everything after the first letter of the syllable\\
+ \#6 & \TeX\ code & Macros to run after the text is emitted\\
+\end{argtable}
+
+\macroname{\textbackslash gre@opening@syllabletext}{}{gregoriotex-syllable.tex}
+Macro that stores the computed \TeX\ code for rendering the text of the first syllable.
+
\macroname{\textbackslash gre@exhyphencharsave}{}{gregoriotex-main.tex}
Macro for saving the ex hyphen character so that it can be restored at the end of the score.
@@ -518,6 +567,7 @@ Macro to typeset a horizontal line (either an additional staff line or an episem
& \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
& \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
+ & \texttt{4} & go back to the beginning of the previous glyph and then forward the width of \#1, then back the width of \#2; this ends the episema at the end of \#1\\
\#3 & integer &the ambitus for a two note episema at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
\#4 & \texttt{0} & an horizontal episema\\
& \texttt{1} & an horizontal episema under a note\\
@@ -587,9 +637,15 @@ Macro called at the end of the score to ensure that a big initial setting doesnâ
\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.
+\macroname{\textbackslash gre@prephepisemaledgerlineheuristics}{}{gregoriotex-spaces.tex}
+Prepares the system to accept ledger line heuristics for the horizontal episema.
+
\macroname{\textbackslash gre@reseteolcustos}{}{gregoriotex-main.tex}
Alias that resets the use of automatic custos to the value set by \verb=\greseteolcustos=. This macro is aliased to \verb=\gre@useautoeolcustos= or \verb=\gre@usemanualeolcustos= by \verb=\greseteolcustos=.
+\macroname{\textbackslash gre@resetledgerlineheuristics}{}{gregoriotex-spaces.tex}
+Resets the ledger line heuristic flags.
+
\macroname{\textbackslash gre@setstylefont}{}{gregoriotex-main.tex}
Macro for opening up greextra font.
@@ -606,17 +662,43 @@ The font size at which symbols are to be loaded.
\macroname{\textbackslash gre@textnormal}{\#1}{gregoriotex-syllable.tex}
Macro which applies the default text format.
-\macroname{\textbackslash gre@typekey}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro which typesets the key.
+\macroname{\textbackslash gre@save@clef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Saves clef information for use in \verb=gre@updatelinesclef=.
+
+\begin{argtable}
+ \#1 & character & the type of the clef: c or f\\
+ \#2 & integer & the line of the clef (1 is the lowest)\\
+ \#3 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
+ \#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}
+
+\macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-signs.tex}
+Macro which typesets the clef.
\begin{argtable}
- \#1 & character & the type of the key: c or f\\
- \#2 & integer & the line of the key (1 is the lowest)\\
- \#3 & \texttt{0} & no need to use small key characters (inside a line)\\
- & \texttt{1} & we must use small key characters (inside a line)\\
- \#4 & \texttt{0} & no extra space is needed after the key\\
- & \texttt{}1 & we must type a space after the key\\
- \#5 & integer & if \texttt{3}, it means that we must not put a flat after the key, otherwise it’s the height of the flat\\
+ \#1 & character & the type of the clef: c or f\\
+ \#2 & integer & the line of the clef (1 is the lowest)\\
+ \#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 & \texttt{0} & no extra space is needed after the clef\\
+ & \texttt{}1 & we must type a space after the clef\\
+ \#5 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
+ \#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}
+
+\macroname{\textbackslash gre@typesingleclef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+Macro which typesets a single clef.
+
+\begin{argtable}
+ \#1 & character & the type of the clef: c or f\\
+ \#2 & integer & the line of the clef (1 is the lowest)\\
+ \#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}
\macroname{\textbackslash gre@updateleftbox}{}{gregoriotex-main.tex}
@@ -634,7 +716,7 @@ Macro which specifies the alternate glyphs which are common to all of the styles
\macroname{\textbackslash gre@widthof}{\#1}{gregoriotex-main.tex}
Macro for calculating the width of its argument and storing it in \verb=\gre@dimen@temp@three=.
-\macroname{\textbackslash gre@writebar}{\#1\#2\#3}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@writebar}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
Macro to write a bar.
\begin{argtable}
@@ -646,7 +728,9 @@ Macro to write a bar.
& \texttt{5} & the last finalis\\
\#2 & \texttt{0} & in a syllable containing only this bar\\
& \texttt{1} & in a syllable containing other notes\\
- \#3 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
+ \#3 & \texttt{0} & if there is no text underneath the bar\\
+ & \texttt{1} & if there is text underneath the bar\\
+ \#4 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
\end{argtable}
\macroname{\textbackslash gre@@arg}{}{gregoriotex-syllable.tex}
@@ -665,6 +749,14 @@ Workhorse function behind \verb=\greannotation=.
\#2 & string & the new annotation content\\
\end{argtable}
+\macroname{\textbackslash gre@commentary}{[\#1]\#2}{gregoriotex-main.tex}
+Workhorse function behind \verb=\grecommentary=.
+
+\begin{argtable}
+ \#1 & distance & Additional distance to be placed between the commentary and the top staff line for the next score only.\\
+ \#2 & string & the new commentary content\\
+\end{argtable}
+
\macroname{\textbackslash gre@atletter}{}{gregoriotex-main.tex}
A Lua\TeX\ catcode table which makes sure that Lua\TeX\ treats `@‘ corectly.
@@ -691,7 +783,7 @@ Macro used in \verb=\GreSyllable=. Sets \verb=\gre@skip@bolshift= to the left ke
\end{argtable}
\macroname{\textbackslash gre@calculate@eolshift}{\#1}{gregoriotex-spaces.tex}
-Macro used in \verb=\GreSyllable=. Sets \verb=\gre@skip@eolshift= to the left kern that
+Macro used in \verb=\GreSyllable=. Sets \verb=\gre@dimen@eolshift= to the left kern that
should appear before an end of line. The improvement is tiny: when
text go further than notes in the last syllable of a line, the idea
is to allow text to go a bit further right, under the custos. This shift is applied to the left after every syllable and then to the right after setting the line break penalty. If the line break occurs after this syllable, it will occur between the two shifts, pushing the shift right to the beginning of the next line where \TeX\ will ignore it as leading white space.
@@ -770,15 +862,26 @@ desired case.
\#1 & \texttt{0} & Default space.\\
& \texttt{1} & Zero-width space.\\
& \texttt{2} & Space between flat or natural and a note.\\
- & \texttt{3} & Space between two puncta inclinata.\\
+ & \texttt{3} & Space between two puncta inclinata, descending.\\
& \texttt{4} & Space between bivirga or trivirga.\\
& \texttt{5} & space between bistropha or tristropha.\\
& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
- & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
+ & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
& \texttt{8} & Space between two puncta inclinata debilis.\\
& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
- & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
- & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
+ & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
+ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
+ & \texttt{12} & Space between two puncta inclinata, ascending. \\
+ & \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
+ & \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
+ & \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
+ & \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
+ & \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
+ & \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
+ & \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
+ & \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. \\
\end{argtable}
\macroname{\textbackslash gre@nabcfontname}{}{gregoriotex-main.tex}
@@ -843,7 +946,7 @@ Macro to set the point-and-click position for above lines text.
\macroname{\textbackslash gre@mark@translation}{}{gregoriotex-main.tex}
Macro to set the point-and-click position for translations.
-\macroname{\textbackslash gre@pitch@[a-p]}{}{gregoriotex-main.tex}
+\macroname{\textbackslash gre@pitch@[a-n,p]}{}{gregoriotex-main.tex}
Macros which map gabc pitch letters (the final part of the macro name) to the numerical value that Gregorio\TeX\ uses in processing note placement.
\macroname{\textbackslash gre@pitch@adjust@top}{}{gregoriotex-main.tex}
@@ -852,6 +955,39 @@ If any note appears above this pitch, the space above the lines must be adjusted
\macroname{\textbackslash gre@pitch@adjust@bottom}{}{gregoriotex-main.tex}
If any note appears below this pitch, the space below the lines must be adjusted to account for it.
+\macroname{\textbackslash gre@pitch@abovestaff}{}{gregoriotex-main.tex}
+The pitch above the staff.
+
+\macroname{\textbackslash gre@pitch@belowstaff}{}{gregoriotex-main.tex}
+The pitch below the staff.
+
+\macroname{\textbackslash gre@pitch@ledger@above}{}{gregoriotex-main.tex}
+The pitch of the ledger line above the staff.
+
+\macroname{\textbackslash gre@pitch@ledger@below}{}{gregoriotex-main.tex}
+The pitch of the ledger line below the staff.
+
+\macroname{\textbackslash gre@pitch@barvepisema}{}{gregoriotex-main.tex}
+The pitch of the bar episema.
+
+\macroname{\textbackslash gre@pitch@underbrace}{}{gregoriotex-main.tex}
+The pitch of the under-the-staff brace.
+
+\macroname{\textbackslash gre@pitch@overbrace}{}{gregoriotex-main.tex}
+The pitch of the over-the-staff brace.
+
+\macroname{\textbackslash gre@pitch@overbraceglyph}{}{gregoriotex-main.tex}
+The pitch of the over-the-staff brace glyph.
+
+\macroname{\textbackslash gre@pitch@bar}{}{gregoriotex-main.tex}
+The pitch of the bar glyph.
+
+\macroname{\textbackslash gre@pitch@raresign}{}{gregoriotex-main.tex}
+The pitch of a rare sign (semicirculus, \etc).
+
+\macroname{\textbackslash gre@pitch@dummy}{}{gregoriotex-main.tex}
+A meaningless (don't-care) pitch.
+
\macroname{\textbackslash gre@pointandclick}{\#1\#2}{gregoriotex-main.tex}
Macro to generate the point-and-click links.
@@ -918,6 +1054,71 @@ Alias for \verb=\resizebox=.
\macroname{\textbackslash gre@dimension}{}{gregoriotex-spaces.tex}
Workhorse function behind \verb=\grecreatedim= and \verb=\grechangedim=.
+\macroname{\textbackslash gre@setstafflines}{\#1}{gregoriotex-main.tex}
+Sets the number of staff lines.
+
+\begin{argtable}
+ \#1 & integer & The number of staff lines\\
+\end{argtable}
+
+\macroname{\textbackslash gre@stafflines}{}{gregoriotex-main.tex}
+Contains the number of staff lines.
+
+\macroname{\textbackslash gre@romannumeral@majuscule}{\#1}{gregoriotex-main.tex}
+Typesets its numeric argument as an upper-case Roman numeral.
+
+\begin{argtable}
+ \#1 & integer & The number to typeset\\
+\end{argtable}
+
+\macroname{\textbackslash gre@romannumeral@minuscule}{\#1}{gregoriotex-main.tex}
+Typesets its numeric argument as a lower-case Roman numeral.
+
+\begin{argtable}
+ \#1 & integer & The number to typeset\\
+\end{argtable}
+
+\macroname{\textbackslash gre@bar@text}{\#1}{gregoriotex-symbols.tex}
+Macro used to switch between spacings where bar has text and those where it doesn't.
+
+\begin{argtable}
+ \#1 & \texttt{0} & emits nothing\\
+ & \texttt{1} emits \texttt{text}\\
+\end{argtable}
+
+\macroname{\textbackslash gre@drawadditionalline}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Workhorse function behind \verb=\GreDrawAdditionalLine=.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
+ & \texttt{1} & Draw an under-the-staff ledger line. \\
+ \#2 & distance & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
+ \#3 & \texttt{0} & Start the line at this point. \\
+ & \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
+ & \texttt{2} & Start the line to the left of this point by \#4. \\
+ \#4 & distance & The distance to move left before starting the line if \#3 is \texttt{2}. \\
+ \#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
+ & \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
+ & \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
+ \#6 & distance & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
+\end{argtable}
+
+\macroname{\textbackslash gre@kern@bar@aftermora}{}{gregoriotex-signs.tex}
+Macro which kerns between a punctum mora and a kern according to the setting in \verb=\gre@count@barshiftaftermora=.
+
+\macroname{\textbackslash gre@setgregoriofontscaled}{[\#1]\#2\#3}{gregoriotex-main.tex}
+Workhorse behind \verb=\gresetgregoriofontscaled=.
+
+\begin{argtable}
+ \#1 & \textit{(omitted)} & Use the normal font and rule set.\\
+ & \texttt{op} & Use the alternate Dominican font/rule set.\\
+ \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
+ & \texttt{gregorio} & Use the Gregorio font.\\
+ & \texttt{parmesan} & Use the Parmesan font.\\
+ \#3 & integer & the scaling factor\\
+\end{argtable}
+
+
\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.
@@ -950,12 +1151,12 @@ The font for some of the extra characters, such as the bar for barred letters.
\macroname{\textbackslash gre@font@nabc}{}{gregoriotex-nabc.tex}
The font for ancient notation.
-\macroname{\textbackslash gre@font@biginitial}{}{gregoriotex.tex}
-The font for the default big initial format in Plain \TeX.
-
\macroname{\textbackslash gre@font@initial}{}{gregoriotex.tex}
The font for the default initial format in Plain \TeX.
+\macroname{\textbackslash gre@fontfactor@...}{}{gregoriotex-main.tex}
+Macro holding the factor at which the font is loaded. There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, parmesan, \etc).
+
\subsection{Character Reference Aliases}
To make referencing and changing them easier, Gregorio\TeX\ stores reference information for certain characters using the following macros.
@@ -1084,6 +1285,15 @@ All distances in \nameref{distances} and \texttt{stafflinefactor} have a boolean
indicates if the distance should scale when the staff size changes (true)
or not (false).
+\macroname{\textbackslash ifgre@annotationbottomline}{}{gregoriotex-main.tex}
+Boolean used to indicate if the bottom line of the annotation should be used as the control line for its initial vertical alignment.
+
+\macroname{\textbackslash gre@count@annotationvalign}{}{gregoriotex-main.tex}
+Count used to indicate which part of the annotation control line should be initially aligned with the top line of the staff. Values: \texttt{0}, top; \texttt{1}, baseline; or \texttt{2}, bottom.
+
+\macroname{\textbackslash ifgre@forcehyphen}{}{gregoriotex-main.tex}
+Boolean used to indicate if hyphens should be forced between all syllables in a polysyllabic word.
+
\macroname{\textbackslash ifgre@checklength}{}{gregoriotex-spaces.tex}
Boolean used in \verb=\gresetdim= to indicate if we are attempting to set a rubber length.
@@ -1163,12 +1373,21 @@ Boolean which indicates if the most recent note was a punctum mora.
\macroname{\textbackslash ifgre@lastispunctumsave}{}{gregoriotex-signs.tex}
Boolean for storing \verb=\ifgre@lastispunctum= so that it can be restored later.
+\macroname{\textbackslash ifgre@ledgerline@above}{}{gregoriotex-spaces.tex}
+Boolean which indicates whether the system should act as if there is a ledger line above the staff.
+
+\macroname{\textbackslash ifgre@ledgerline@below}{}{gregoriotex-spaces.tex}
+Boolean which indicates whether the system should act as if there is a ledger line below the staff.
+
\macroname{\textbackslash gre@nlbstate}{}{gregoriotex-main.tex}
Macro which indicates if we are in a no line break area due to translation centering (\texttt{1}), an explicit no line break designation in the gabc (\texttt{2}), or not at all (\texttt{0}).
\macroname{\textbackslash gre@nlbinitialstate}{}{gregoriotex-main.tex}
Macro to store \verb=\gre@nlbstate= as we initialize or end a no line break area so that we can manipulate said flag as part of the process.
+\macroname{\textbackslash ifgre@useledgerlineheuristic}{}{gregoriotex-spaces.tex}
+Boolean which specifies whether ledger line heuristics will be used or not.
+
\macroname{\textbackslash ifgre@usestylefont}{}{gregoriotex-main.tex}
Boolean which specifies whether the style font should be loaded or not.
@@ -1190,6 +1409,12 @@ Count to indicated if the spacing between lines should be variable (\texttt{1})
\macroname{\textbackslash ifgre@blockeolcustos}{}{gregoriotex-main.tex}
Boolean which indicates whether the custos at the end of the line should be blocked.
+\macroname{\textbackslash ifgre@blockeolcustosbeforeeuouae}{}{gregoriotex-main.tex}
+Boolean which indicates whether the custos at the end of the line should be blocked if a EUOUAE block immediately follows.
+
+\macroname{\textbackslash ifgre@raggedbreakbeforeeuouae}{}{gregoriotex-main.tex}
+Boolean which indicates whether an automatic line break immediately before a EUOUAE block should be ragged.
+
\macroname{\textbackslash ifgre@breakintranslation}{}{gregoriotex-main.tex}
Boolean which indicates if line breaks are allowed inside a translation.
@@ -1217,9 +1442,26 @@ Boolean which indicates that a hyphen after an empty first syllable should be fo
\macroname{\textbackslash ifgre@showhyphenafterthissyllable}{}{gregoriotex-syllable.tex}
Boolean used by \verb=\GreSyllable= to decide if a hyphen should be shown after the syllable.
+\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.
+\macroname{\textbackslash ifgre@haslinethree}{}{gregoriotex-spaces.tex}
+Boolean indicating whether the staff has a third line.
+
+\macroname{\textbackslash ifgre@haslinefour}{}{gregoriotex-spaces.tex}
+Boolean indicating whether the staff has a fourth line.
+
+\macroname{\textbackslash ifgre@haslinefive}{}{gregoriotex-spaces.tex}
+Boolean indicating whether the staff has a fifth line.
+
+\macroname{\textbackslash gre@count@barshiftaftermora}{}{gregoriotex-signs.tex}
+Count indicating when the presence of a punctum mora immediately before a bar line should affect the spacing.
+
+\macroname{\textbackslash ifgre@allowdeprecated}{}{gregoriotex.sty \textup{and} gregoriotex.tex}
+Boolean which controls whether deprecated functions raise a warning (true) or an error (false).
\subsection{Boxes}
@@ -1238,11 +1480,14 @@ Box which holds the initial of the score.
\macroname{\textbackslash gre@box@annotation}{}{gregoriotex-main.tex}
Box holding the annotation which goes above the initial.
-\macroname{\textbackslash gre@box@annotation@add}{}{gregoriotex-main.tex}
-Box used for the new line to be added to the annotation.
+\macroname{\textbackslash gre@box@commentary}{}{gregoriotex-main.tex}
+Box holding the commentary which goes above the first staff line on the right.
-\macroname{\textbackslash gre@box@annotation@old}{}{gregoriotex-main.tex}
-Box used for the existing lines in the annotation when a new line is being added.
+\macroname{\textbackslash gre@box@add}{}{gregoriotex-main.tex}
+Box used for the new line to be added to the box being built (used in multi-line commentaries and annotations).
+
+\macroname{\textbackslash gre@box@old}{}{gregoriotex-main.tex}
+Box used for the existing lines in the box being build when a new line is being added (used in multi-line commentaries and annotations).
\macroname{\textbackslash gre@box@lines}{}{gregoriotex-main.tex}
Box holding the staff lines.
@@ -1250,6 +1495,12 @@ Box holding the staff lines.
\macroname{\textbackslash gre@box@temp@sign}{}{gregoriotex-signs.tex}
Box to hold a sign so we can measure it for placement.
+\macroname{\textbackslash gre@box@temp@clef}{}{gregoriotex-signs.tex}
+Box for holding (and measuring) the clef when stacking non-overlapping clefs.
+
+\macroname{\textbackslash gre@box@temp@cleftwo}{}{gregoriotex-signs.tex}
+Box for holding (and measuring) the secondary clef when stacking non-overlapping clefs.
+
\macroname{\textbackslash gre@box@syllablenotes}{}{gregoriotex-syllable.tex}
Box holding the notes associated with a syllable.
@@ -1260,10 +1511,13 @@ Box holding the text associated with a syllable.
Box holding the horizontal episema.
+
\subsection{Distances}
-All of the distances listed in \nameref{distances} have an internal
-associated with them, of the form of \verb=\gre@*@*=, which stores the value of the distance (in
-string representation). The first wildcard is either \texttt{skip} or \texttt{dimen} according to the distance type, while the second is the name of the distance.
+All of the distances listed in \nameref{distances} have an internal associated
+with them, of the form of \verb=\gre@space@*@*=, which stores the value of the
+distance (in string representation). The first wildcard is either
+\texttt{skip} or \texttt{dimen} according to the distance type, while the
+second is the name of the distance.
These additional distances are calculated by Gregorio based on the values for the user customizable distances and what may be going on in the score at the time of their use.
@@ -1324,9 +1578,6 @@ The space between the lines.
\macroname{\textbackslash gre@dimen@glyphraisevalue}{}{gregoriotex-spaces.tex}
The value that a particular glyph must be raised to be set in the correct position.
-\macroname{\textbackslash gre@dimen@addedraisevalue}{}{gregoriotex-spaces.tex}
-The additional raise needed for the vertical episema and the puncta.
-
\macroname{\textbackslash gre@dimen@enddifference}{}{gregoriotex-spaces.tex}
Distance from the end of the notes to the end of the text for the previous syllable. Positive values when notes go further than text, negative in the other case.
@@ -1345,25 +1596,16 @@ The width of the last glyph.
\macroname{\textbackslash gre@dimen@notesaligncenter}{}{gregoriotex-spaces.tex}
Distance from beginning of notes to their point of alignment.
-\macroname{\textbackslash gre@dimen@temp@**}{}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre@dimen@temp@...}{}{gregoriotex-spaces.tex}
Temporary dimensions used in calculations. There are currently five of these.
-\macroname{\textbackslash gre@skip@temp@**}{}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre@skip@temp@...}{}{gregoriotex-spaces.tex}
Temporary skips used in calculations. There are currently four of these.
-\macroname{\textbackslash gre@unit}{}{gregoriotex-spaces.tex}
-Temporary dimension used by \verb=\gre@convertto=.
-
-\macroname{\textbackslash gre@base}{}{gregoriotex-spaces.tex}
-Temporary dimension used by \verb=\gre@convertto=.
-
-\macroname{\textbackslash gre@maxlen}{}{gregoriotex-spaces.tex}
-Distance holding the maximum legal length in TeX.
-
\macroname{\textbackslash gre@dimen@savedglyphraise}{}{gregoriotex-signs.tex}
Macro to hold the value of the glyph raise so that it can be restored after some calculations which may change it are performed.
-\macroname{\textbackslash gre@skip@eolshift}{}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre@dimen@eolshift}{}{gregoriotex-spaces.tex}
The left kern that should appear before an end of line.
\macroname{\textbackslash gre@dimen@bolshift}{}{gregoriotex-spaces.tex}
@@ -1375,6 +1617,9 @@ An extra space that is added to \verb=\gre@dimen@bolshift= when the first glyph
\macroname{\textbackslash gre@dimen@annotationtrueraise}{}{gregoriotex-spaces.tex}
The distance from the baseline of the initial to the baseline of the annotation.
+\macroname{\textbackslash gre@dimen@commentarytrueraise}{}{gregoriotex-spaces.tex}
+The distance from the baseline of the initial to the baseline of the commentary.
+
\macroname{\textbackslash gre@minTextDistance}{}{gregoriotex-spaces.tex}
Minimum distance between text (meaningful alias for \verb=\gre@skip@temp@one= inside \verb=\gre@calculate@syllablefinalskip=).
@@ -1402,6 +1647,9 @@ Working alias for \verb=\gre@skip@temp@one= or \verb=\gre@dimen@temp@one=, as ap
\macroname{\textbackslash gre@skip@syllablefinalskip}{}{gregoriotex-spaces.tex}
The final distance to skip at the end of a syllable.
+\macroname{\textbackslash greslurheight}{}{gregoriotex-signs.tex}
+Stores the computed height of a variable-length slur. The control sequence name
+does not have the \texttt{@} symbol because this dimension is used within \MP{}.
\subsection{Penalties}
These are the macros that Gregorio\TeX\ uses to manipulate the penalties in order to control line and page breaks within a score without affect the surrounding text.
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
index 13e6a70c668..cb463323859 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
@@ -23,39 +23,26 @@ following structure:
name: incipit;
gabc-copyright: copyright on this gabc file;
score-copyright: copyright on the source score;
-office-part: introitus/...;
-occasion: in church calendar;
-meter: for metrical hymns;
-commentary: source of words;
-arranger: name of arranger;
author: if known;
-date: xi c;
-manuscript: ms name;
-manuscript-reference: e.g. CAO reference;
-manuscript-storage-place: library/monastery;
-book: from which score taken;
-transcriber: writer of gabc;
-transcription-date: 2009;
language: latin;
-initial-style: 1;
-user-notes: whatever other comments you wish to make;
mode: 6;
+mode-modifier: t.;
annotation: IN.;
annotation: 6;
%%
(clef) text(notes)
\end{lstlisting}
-In each case, replace whatever is between the colon and semi-colon
-\texttt{(:...;)} with the appropriate character string. Of these attributes,
-only name is mandatory. Descriptions of how these header fields are
-intended to be used are below. If you wish to write a value over
-several lines, omit the semicolon at the end of the first line, and
-end the attribute value with \texttt{;;} (two semicolons).
+\subsection{Headers}
-\subsection{Header}
+The headers, such as \texttt{name: incipit;}, above, each have a name
+before the colon and a value, between the colon and the semicolon. The
+header name is composed of ASCII letters and numbers, optionally separated
+by dashes. If you wish to write a value over several lines, omit the
+semicolon at the end of the first line, and end the header value with
+\texttt{;;} (two semicolons).
-Here is a detailed description of each header field:
+Some headers have special meaning to Gregorio:
\begin{description}
\item[name] This is the name of the piece, in almost all cases the
@@ -70,22 +57,9 @@ Here is a detailed description of each header field:
\begin{lstlisting}[autogobble]
score-copyright: (C) Abbaye de Solesmes, 1934;
\end{lstlisting}
-\item[office-part] The office-part is the category of chant (in Latin), according to its liturgical rôle. Examples are: antiphona, hymnus, responsorium brevium, responsorium prolixum, introitus, graduale, tractus, offertorium, communio, kyrie, gloria, credo, sanctus, benedictus, agnus dei.
-\item[occasion] The occasion is the liturgical occasion, in Latin. For example, Dominica II Adventus, Commune doctorum, Feria secunda.
-\item[meter] For hymns and anything else with repetitive stanzas, the meter, the numbers of syllables in each line of a stanza. For example, 8.8.8.8 for typical Ambrosian-style hymns: 4 lines each of 8 syllables.
-\item[commentary] This is intended for notes about the source of the text, such as references to the Bible.
-\item[arranger] The name of a modern arranger, when a traditional chant melody has been adapted for new words, or when a manuscript is transcribed into square notation. This may be a corporate name, like Solesmes.
\item[author] The author of the piece, if known; of course, the author of most traditional chant is not known.
-\item[date] The date of composition, or the date of earliest attestation. With most traditional chant, this will only be approximate; e.g. XI. s. for eleventh century. The convention is to put it with the latin style, like the previous examples (capital letters, roman numerals, s for seculum and the dots).
-\item[manuscript] For transcriptions direct from a manuscript, the text normally used to identify the manuscript, for example Montpellier H.159
-\item[manuscript-reference] A unique reference for the piece, according to some well-known system. For example, the reference beginning cao in the Cantus database of office chants. If the reference is unclear as to which system it uses, it should be prefixed by the name of the system. Note that this should be a reference identifying the piece, not the manuscript as a whole; anything identifying the manuscript as a whole should be put in the manuscript field.
-\item[manuscript-storage-place] For transcriptions direct from a manuscript, where the manuscript is held; e.g. Bibliothèque Nationale, Paris.
-\item[book] For transcriptions from a modern book (such as Solesmes editions; modern goes back at least to the 19th century revival), the name of the book; e.g. Liber Usualis.
-\item[transcriber] The name of the transcriber into gabc.
-\item[transcription-date] The date the gabc was written, with the following convention yyyymmdd, like 20090129 for january the 29th 2009.
\item[language] The language of the lyrics.
-\item[initial-style] The style of the initial letter. 0 means no initial letter, 1 a normal one, and 2 a large one, on two lines. Note that if you want to use the initial on two lines, you have to specify at least the two first line breaks.
-\item[user-notes] This may contain any text in addition to the other headers -- any notes the transcriber may wish. However, it is recommended to use the specific header fields where they are suitable, so that it is easier to find particular information.
+\item[oriscus-orientation] If \texttt{legacy}, the orientation of an unconnected oriscus must be set manually.
\item[mode] The mode of the piece. This should normally be an arabic
number between 1 and 8, but may be any text required for unusual
cases. The mode number will be converted to roman numerals and
@@ -95,6 +69,13 @@ Here is a detailed description of each header field:
\item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
\item The \texttt{annotation} header field is defined.
\end{itemize}
+\item[mode-modifier] The mode ``modifier'' of the piece. This may be any
+ \TeX\ code to typeset after the mode, if the mode is typeset. If the mode
+ is not typeset, the mode-modifier will also not be typeset.
+\item[mode-differentia] The mode or tone differentia of the piece. Typically,
+ this expresses the variant of the psalm tone to use for the piece. This may
+ be any \TeX\ code to typeset after the mode-modifier, if the mode is typeset.
+ If the mode is not typeset, the mode-differentia will also not be typeset.
\item[annotation] The annotation is the text to appear above the
initial letter. Usually this is an abbreviation of the office-part
in the upper line, and an indication of the mode (and differentia
@@ -113,9 +94,172 @@ Here is a detailed description of each header field:
If the user already defined annotation(s) in the main \TeX\ file via
\verb=\greannotation= then the \texttt{annotation} header field will not
overwrite that definition.
+\end{description}
+
+Although gregorio ascribes no special meaning to them, other suggested headers are:
+\begin{description}
+\item[office-part] The office-part is the category of chant (in Latin), according to its liturgical rôle. Examples are: antiphona, hymnus, responsorium brevium, responsorium prolixum, introitus, graduale, tractus, offertorium, communio, kyrie, gloria, credo, sanctus, benedictus, agnus dei.
+\item[occasion] The occasion is the liturgical occasion, in Latin. For example, Dominica II Adventus, Commune doctorum, Feria secunda.
+\item[meter] For hymns and anything else with repetitive stanzas, the meter, the numbers of syllables in each line of a stanza. For example, 8.8.8.8 for typical Ambrosian-style hymns: 4 lines each of 8 syllables.
+\item[commentary] This is intended for notes about the source of the text, such as references to the Bible.
+\item[arranger] The name of a modern arranger, when a traditional chant melody has been adapted for new words, or when a manuscript is transcribed into square notation. This may be a corporate name, like Solesmes.
+\item[date] The date of composition, or the date of earliest attestation. With most traditional chant, this will only be approximate; e.g. XI. s. for eleventh century. The convention is to put it with the latin style, like the previous examples (capital letters, roman numerals, s for seculum and the dots).
+\item[manuscript] For transcriptions direct from a manuscript, the text normally used to identify the manuscript, for example Montpellier H.159
+\item[manuscript-reference] A unique reference for the piece, according to some well-known system. For example, the reference beginning cao in the Cantus database of office chants. If the reference is unclear as to which system it uses, it should be prefixed by the name of the system. Note that this should be a reference identifying the piece, not the manuscript as a whole; anything identifying the manuscript as a whole should be put in the manuscript field.
+\item[manuscript-storage-place] For transcriptions direct from a manuscript, where the manuscript is held; e.g. Bibliothèque Nationale, Paris.
+\item[book] For transcriptions from a modern book (such as Solesmes editions; modern goes back at least to the 19th century revival), the name of the book; e.g. Liber Usualis.
+\item[transcriber] The name of the transcriber into gabc.
+\item[transcription-date] The date the gabc was written, with the following convention yyyymmdd, like 20090129 for January the 29th 2009.
+\item[user-notes] This may contain any text in addition to the other headers -- any notes the transcriber may wish. However, it is recommended to use the specific header fields where they are suitable, so that it is easier to find particular information.
\end{description}
+\subsubsection{Mode Headers}
+
+The three mode headers described above (\texttt{mode}, \texttt{mode-modifier},
+and \texttt{mode-differentia}) will be typeset above the initial if neither
+the \texttt{annotation} gabc header nor the \verb=\greannotation= \TeX{}
+command is used.
+
+The mode annotation will look like
+\writemode{mode}{\thinspace mode-modifier}{\thinspace mode-differentia}.
+
+The \texttt{mode} header is typically a number that will be typeset as a
+Roman numeral using the \texttt{modeline} style. Therefore, if the first
+character of \texttt{mode} is a number from one (\texttt{1}) through eight
+(\texttt{8}), that number will be converted according to the
+\verb=\gresetmodenumbersystem= setting. However, there are other modes,
+so all other parts of \texttt{mode} will be typeset directly. If the
+\texttt{mode} header is omitted, none of the other mode headers will be
+typeset.
+
+The \texttt{mode-modifier} header is some text (typeset in the
+\texttt{modemodifier} style) that appears after \texttt{mode}, but before
+\texttt{mode-differentia}. This is meant for an extra notation that
+indicates something without altering the mode itself. An example would be
+\writemode{}{t.}{} to indicate a transposed mode. If the
+\texttt{mode-modifier} header starts with punctuation, there will be no space
+before it, otherwise there will be a \verb=\thinspace= before it.
+
+The \texttt{mode-differentia} header is some text (typeset in the
+\texttt{modedifferentia} style) that appears after \texttt{mode-modifier}.
+This is meant for indicating the psalm tone ending to use for the paired
+psalm tone. If the \texttt{mode-differentia} header starts with punctuation,
+there will be no space before it, otherwise there will be a \verb=\thinspace=
+before it.
+
+Some examples:
+
+\begin{tabularx}{\textwidth}{l|l|l|X}
+ \texttt{mode} & \texttt{mode-modifier} & \texttt{mode-differentia} & Result \\
+ \hline
+ \verb=6= & & & \writemode{\romannumeral 6}{}{} \\
+ \verb=4A= & & & \writemode{\romannumeral 4\relax A}{}{} \\
+ \verb=4a= & & & \writemode{\romannumeral 4\relax a}{}{} \\
+ \verb=2*= & \verb=t.= & & \writemode{\romannumeral 2*}{\thinspace t.}{} \\
+ \verb=5= & \verb=,\thinspace t.= & & \writemode{\romannumeral 5}{,\thinspace t.}{} \\
+ \verb=7= & & {\scriptsize\verb=c\raise0.5ex\hbox{\small2}=} & \writemode{\romannumeral 7}{}{\thinspace c\raise0.5ex\hbox{\small2}} \\
+ \verb=8= & \verb=-t.= & \verb=G*= & \writemode{\romannumeral 8}{-t.}{\thinspace G*} \\
+ {\scriptsize\verb=t. irregularis=} & & & \writemode{t. irregularis}{}{} \\
+\end{tabularx}
+
+\subsection{Neume Fusion}
+
+Neume fusion allows for the composition of new shapes based on a set of
+primitive neumes. These primitives are:
+
+\begin{tabularx}{\textwidth}{l|l|X}
+ Gabc & Description & Rules \\
+ \hline
+ \texttt{g} & punctum & fuses from higher or lower notes, and can fuse to higher or lower notes \\
+ \texttt{go} & oriscus & may only fuse in the direction it was fused from \\
+ \texttt{gO} & oriscus scapus & at the start only, next note must be higher to fuse \\
+ \texttt{gw} & quilisma & does not fuse from anything, and only fuses to a higher note \\
+ \texttt{gV} & virga reversa & at the start only, next note must be lower to fuse \\
+ \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 \\
+\end{tabularx}
+
+Placing the \texttt{@} character between two notes will attempt to use the above
+rules to fuse the notes together. If a shape that is not fusable is used,
+Gregorio will typically fall back on the non-fusable form, but in some cases
+will result in a syntax error.
+
+Placing the \texttt{@} character before a primitive that would get a stem will
+suppress the stem. Given the above list of primitives, this means the flexus
+and the porrectus.
+
+Here are some examples of fusion:
+
+\gresetinitiallines{0}\gresetlyriccentering{firstletter}%
+\gabcsnippet{
+(c3) h@iw@ji@j@ih<sp>~</sp>(h@iw@ji@j@ih~)
+(;) d@eo@fd(d@eo@fd)
+(;) IJ@kh(IJ@kh)
+}
+
+As a convenience, a sequence of notes enclosed within \texttt{@[} and
+\texttt{]} will be fused automatically based on an algorithm that breaks up
+the notes into the above primitives. Using the same examples as before:
+
+\gabcsnippet{
+(c3) @<v>[</v>hiwjijih<sp>~</sp><v>]</v>(@[hiwjijih~])
+(;) @<v>[</v>deofd<v>]</v>(@[deofd])
+(;) @<v>[</v>IJkh<v>]</v>(@[IJkh])
+}
+
+\subsection{Custom Ledger Lines}
+
+To specify a custom ledger line, use
+\texttt{[oll:}\textit{left}\texttt{;}\textit{right}\texttt{]} to create an
+over-the-staff ledger line with specified lengths to the left and right of the
+point where it is introduced. If \textit{left} is \texttt{0}, the ledger line
+will start at the introduction point. If \textit{left} is \texttt{1}, the
+ledger line will start at the \textit{additionaallineswidth} distance to the
+left of the introduction point. Otherwise, the line will start at the
+\textit{left} distance (taken to be an explicit length, with \TeX{} units
+required) to the left of the introduction point. When using this form,
+\texttt{right} must be an explicit length to the right of the introduction
+point at which to end the line.
+
+Alternately, use
+\texttt{[oll:}\textit{left}\texttt{\{}\textit{right}\texttt{]} to specify the
+start of an over-the-staff ledger line, followed by \texttt{[oll:\}]} at some
+point later to specify its end. When using this form, \textit{left} has the
+same meaning as before. However, \textit{right} takes on similar values as
+\textit{left}, which are instead applied to the right of the specified
+endpoint.
+
+Use \texttt{ull} instead of \texttt{oll} (with either form) to create an
+under-the-staff ledger line.
+
+When using this feature with fusion, you will not be able to start or end a
+ledger line in the middle of two-note primitive shapes. To work around this,
+either adjust the parameters of the ledger line or use manual fusion to break
+up those two notes.
+
+\subsection{Simple Slurs}
+
+To specify a simple slur, use
+\texttt{[oslur:}\textit{shift}\texttt{;}\textit{width}\texttt{,}\textit{height}\texttt{]}
+to create an over-the-notes slur with the specified \textit{width} and
+\textit{height}. If \textit{shift} is \texttt{0}, the slur will start on the
+right side of the note to which it is atteched. If \textit{shift} is
+\texttt{1}, the slur will start one punctum's width to the left of the right
+side of the note to which it is attached. If \textit{shift} is \texttt{2},
+the slur will start one-half punctum's width to the left of the right side of
+the note to which it is attached.
+
+Alternately, use
+\texttt{[oslur:}\textit{shift}\texttt{\{]} to specify the start of an
+over-the-notes slur, followed by \texttt{[oslur:}\textit{shift}\texttt{\}]} at
+some point later to specify its end. When using this form, \textit{shift} has
+the same meaning as before, but applies to both ends of the slur.
+
+Use \texttt{uslur} instead of \texttt{oslur} (with either form) to create an
+under-the-staff slur.
+
\subsection{Lyric Centering}
Gregorio centers the text of each syllable around the first note of each
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_1.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_1.pdf
deleted file mode 100644
index 45b11a94a7f..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_1.pdf
+++ /dev/null
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta1.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta1.pdf
new file mode 100644
index 00000000000..4e2e7841c4e
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta1.pdf
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
index db4857191c8..836e75db56b 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
@@ -9,7 +9,7 @@
\usepackage{fixltx2e}
\usepackage{hyperref}
\usepackage{color}
-\usepackage{gregoriotex}
+\usepackage[allowdeprecated=false]{gregoriotex}
\usepackage{longtable}
\usepackage{supertabular}
\usepackage{carolmin}
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_1.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_1.pdf
deleted file mode 100644
index e1f58bf0078..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_1.pdf
+++ /dev/null
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta1.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta1.pdf
new file mode 100644
index 00000000000..9443d145145
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta1.pdf
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
index ee02ff0f79c..50bd52134fc 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
@@ -28,10 +28,8 @@ local EXCLUDE = {
['.null'] = true,
nonmarkingreturn = true,
PunctumAuctusLineBL = true,
- PunctumLineBL = true,
PunctumLineBLBR = true,
PunctumLineBR = true,
- PunctumLineTL = true,
PunctumLineTR = true,
PunctumSmall = true,
FlexusNobar = true,
@@ -41,6 +39,18 @@ local EXCLUDE = {
QuilismaLineTR = true,
VirgaLineBR = true,
SalicusOriscus = true,
+ ['Virgula.2'] = true,
+ ['Virgula.3'] = true,
+ ['Virgula.5'] = true,
+ ['DivisioMinima.2'] = true,
+ ['DivisioMinima.3'] = true,
+ ['DivisioMinima.5'] = true,
+ ['DivisioMinor.2'] = true,
+ ['DivisioMinor.3'] = true,
+ ['DivisioMinor.5'] = true,
+ ['DivisioMaior.2'] = true,
+ ['DivisioMaior.3'] = true,
+ ['DivisioMaior.5'] = true,
}
local GABC = {
@@ -71,6 +81,7 @@ local GABC = {
FlatHole = [[\excluded{gx}]],
Flexus = [[ge]],
FlexusLongqueue = [[hf]],
+ FlexusNobar = [[@hf]],
FlexusOriscus = [[goe]],
FlexusOriscusScapus = [[gOe]],
FlexusOriscusScapusLongqueue = [[hOf]],
@@ -84,7 +95,15 @@ local GABC = {
Natural = [[gy]],
NaturalHole = [[\excluded{gy}]],
Oriscus = [[go]],
+ OriscusCavum = [[gor]],
+ OriscusCavumDeminutus = [[gor\~{}]],
+ OriscusCavumDeminutusHole = [[\excluded{gor\~{}}]],
+ OriscusCavumHole = [[\excluded{gor}]],
+ OriscusCavumReversus = [[gor>]],
+ OriscusCavumReversusHole = [[\excluded{gor>}]],
+ OriscusLineBL = [[\excluded{e}@go]],
OriscusReversus = [[go^^^^003c]],
+ OriscusReversusLineTL = [[\excluded{i}@go]],
OriscusScapus = [[gO]],
OriscusScapusLongqueue = [[hO]],
Pes = [[gi]],
@@ -98,16 +117,23 @@ local GABC = {
Porrectus = [[geg]],
PorrectusFlexus = [[gege]],
PorrectusFlexusNobar = [[\excluded{e}gege]],
- PorrectusNobar = [[\excluded{eo}geg]],
+ PorrectusNobar = [[@geg]],
Punctum = [[g]],
PunctumCavum = [[gr]],
PunctumCavumHole = [[\excluded{gr}]],
+ PunctumCavumInclinatum = [[Gr]],
+ PunctumCavumInclinatumAuctus = [[Gr>]],
+ PunctumCavumInclinatumAuctusHole = [[\excluded{Gr>}]],
+ PunctumCavumInclinatumHole = [[\excluded{Gr}]],
PunctumInclinatum = [[G]],
PunctumInclinatumAuctus = [[G>]],
+ PunctumLineBL = [[\excluded{e}@g]],
+ PunctumLineTL = [[\excluded{i}@g]],
Quilisma = [[gw]],
RoundBrace = '[ob:1;6mm]',
RoundBraceDown = '[ub:1;6mm]',
Salicus = [[giOk]],
+ SalicusFlexus = [[giOki]],
SalicusLongqueue = [[hjOl]],
Scandicus = [[gik]],
Semicirculus = [[\excluded{g}r4]],
@@ -116,6 +142,7 @@ local GABC = {
SharpHole = [[\excluded{g\#{}}]],
Stropha = [[gs]],
StrophaAucta = [[gs>]],
+ StrophaAuctaLongtail = [[hs>]],
Torculus = [[gig]],
TorculusLiquescens = [[gige]],
TorculusLiquescensQuilisma = [[gwige]],
@@ -131,6 +158,46 @@ local GABC = {
Virgula = [[^^^^0060]],
}
+local GABC_FUSE = {
+ Upper = {
+ Punctum = [[\excluded{e}@]],
+ Oriscus = [[\excluded{e}@]],
+ Pes = [[\excluded{e}@]],
+ PesQuadratum = [[\excluded{e}@]],
+ PesQuadratumLongqueue = [[\excluded{f}@]],
+ PesQuassus = [[\excluded{e}@]],
+ PesQuassusLongqueue = [[\excluded{f}@]],
+ Flexus = [[\excluded{e}@]],
+ },
+ Lower = {
+ Punctum = [[\excluded{i}@]],
+ Oriscus = [[\excluded{i}@]],
+ Pes = [[\excluded{i}@]],
+ PesQuadratum = [[\excluded{i}@]],
+ PesQuadratumLongqueue = [[\excluded{j}@]],
+ PesQuassus = [[\excluded{i}@]],
+ Flexus = [[\excluded{i}@]],
+ FlexusOriscus = [[\excluded{i}@]],
+ },
+ Up = {
+ Punctum = [[\excluded{@ij}]],
+ Oriscus = [[\excluded{@ij}]],
+ OriscusScapus = [[\excluded{@ij}]],
+ OriscusScapusLongqueue = [[\excluded{@jk}]],
+ Quilisma = [[\excluded{@ij}]],
+ Flexus = [[\excluded{@gi}]],
+ FlexusNobar = [[\excluded{@hj}]],
+ },
+ Down = {
+ Punctum = [[\excluded{@eg}]],
+ Oriscus = [[\excluded{@eg}]],
+ OriscusScapus = [[\excluded{@eg}]],
+ OriscusScapusLongqueue = [[\excluded{@eg}]],
+ VirgaReversa = [[\excluded{@eg}]],
+ VirgaReversaLongqueue = [[\excluded{@fg}]],
+ },
+}
+
local DEBILIS = {
InitioDebilis = [[-]],
[''] = [[]],
@@ -154,6 +221,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
local function index_font(csname, variants, common)
local glyphs = font.fonts[font.id(csname)].resources.unicodes
+ -- force-load the code points of the font --
+ local ignored = glyphs['___magic___']
local glyph, cp
for glyph, cp in pairs(glyphs) do
if cp >= 0xe000 and not EXCLUDE[glyph] and not glyph:match('^HEpisema') then
@@ -189,16 +258,32 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
end
end
- local function emit_score_glyph(shape, ambitus, debilis, liquescence)
- local name = shape..ambitus..debilis..liquescence
+ local function emit_score_glyph(fusion, shape, ambitus, debilis, liquescence)
+ local name = fusion..shape..ambitus..debilis..liquescence
local char = common_glyphs[name]
local gabc = GABC[shape]
if gabc then
- gabc = '('..DEBILIS[debilis]..gabc..LIQUESCENCE[liquescence]..')'
+ local fuse_head = ''
+ local fuse_tail = ''
+ if fusion ~= '' then
+ fuse_head = GABC_FUSE[fusion][shape]
+ if fuse_head == nil then
+ tex.error('No head fusion for '..name)
+ end
+ end
+ local liq = liquescence
+ if liq == 'Up' or liq == 'Down' then
+ fuse_tail = GABC_FUSE[liq][shape]
+ if fuse_tail == nil then
+ tex.error('No tail fusion for '..name)
+ end
+ liq = ''
+ end
+ gabc = '('..fuse_head..DEBILIS[debilis]..gabc..LIQUESCENCE[liq]..fuse_tail..')'
end
tex.sprint(string.format(
- [[{\scriptsize {\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&{\%s\char%d}&{\%s\char%d}&]],
- shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_parmesan, char
+ [[{\scriptsize %s{\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&{\%s\char%d}&{\%s\char%d}&]],
+ fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_parmesan, char
))
local emitted = false, i, variant
for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], parmesan[name]}) do
@@ -222,30 +307,38 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
local ambitus = P'One' + P'Two' + P'Three' + P'Four' + P'Five'
local majuscule = R'AZ'
local minuscule = R'az'
+ local fusion = P'Upper' + P'Lower'
local debilis = P'InitioDebilis'
- local liquescentia = P'Nothing' + P'Deminutus' + P'Ascendens' + P'Descendens'
- local word = (majuscule * minuscule^0) - ambitus - debilis - liquescentia
+ local post_word_liquescentia = P'Nothing' + P'Deminutus' + P'Ascendens' +
+ P'Descendens'
+ local liquescentia = post_word_liquescentia + P'Up' + P'Down'
+ local word = (majuscule * minuscule^0) - fusion - ambitus - debilis -
+ post_word_liquescentia
local liquescence = debilis^-1 * liquescentia^-1
- local pattern = C(word^1) * C(ambitus^0) * C(debilis^-1) * C(liquescentia^-1) * -1
+ local pattern = C(fusion^-1) * C(word^1) * C(ambitus^0) * C(debilis^-1) *
+ C(liquescentia^-1) * -1
local only_twos = P'Two'^1 * -1
for name in pairs(common_glyphs) do
- local a, b, c, d = pattern:match(name)
- if a then
- table.insert(glyph_names, { a, b, c, d })
+ local a, b, c, d, e = pattern:match(name)
+ if b then
+ table.insert(glyph_names, { a, b, c, d, e })
else
- tex.error('Unable to parse '..name)
+ -- if parse fails, just use the name
+ table.insert(glyph_names, { '', name, '', '', '' })
end
end
local function compare(x, y)
- if x[1] < y[1] then
+ local nx = x[1]..x[2]
+ local ny = y[1]..y[2]
+ if nx < ny then
return true
- elseif x[1] == y[1] then
- if x[3] < y[3] then
+ elseif nx == ny then
+ if x[4] < y[4] then
return true
- elseif x[3] == y[3] then
- if x[4] < y[4] then
+ elseif x[4] == y[4] then
+ if x[5] < y[5] then
return true
- elseif x[4] == y[4] and x[2] < y[2] then
+ elseif x[5] == y[5] and x[3] < y[3] then
return true
end
end
@@ -257,13 +350,13 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
local i, name
for i, name in ipairs(glyph_names) do
if not EXCLUDE[name[1]] then
- if (name[2] == '' and name[4] == '') or name[2] == '' or only_twos:match(name[2]) then
+ if (name[3] == '' and name[5] == '') or name[3] == '' or only_twos:match(name[3]) then
if first then
first = false
else
tex.print([[\hline]])
end
- emit_score_glyph(name[1], name[2], name[3], name[4])
+ emit_score_glyph(name[1], name[2], name[3], name[4], name[5])
end
end
end
@@ -294,3 +387,10 @@ function GregorioRef.emit_extra_glyphs(csname)
tex.print([[&\\]])
end
end
+
+function GregorioRef.emit_dimension(value)
+ value = string.gsub(value, '(-?%d+%.%d+)%s*(%a+)', [[\unit[%1]{%2}]])
+ value = string.gsub(value, '(-?%d+%.)%s*(%a+)', [[\unit[%1]{%2}]])
+ value = string.gsub(value, '(-?%.?%d+)%s*(%a+)', [[\unit[%1]{%2}]])
+ tex.sprint(value)
+end
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
index 0398eac8ff6..dd4a1ff3244 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
@@ -33,6 +33,7 @@
\usepackage{tabulary}
\usepackage{tabularx}
\usepackage{adjustbox}
+\usepackage{xparse}
\usepackage{makeidx}
\makeindex
@@ -54,7 +55,7 @@
\newenvironment{gabccode}{\tt}{}
-\usepackage{gregoriotex}
+\usepackage[allowdeprecated=false]{gregoriotex}
\usepackage{carolmin}
\usepackage{mflogo}
@@ -120,6 +121,24 @@
\hline}%
{\endtabularx\bigskip}
+\makeatletter%
+\NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gp-default.tex}}{%
+
+ \gre@rubberpermit{#1}%
+ \ifgre@rubber%
+ Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@skip@#1\endcsname}")}
+ \else%
+ Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@dimen@#1\endcsname}")}
+ \fi%
+}
+
+\newcommand{\writemode}[3]{%
+ \gre@style@modeline #1\endgre@style@modeline %
+ \gre@style@modemodifier #2\endgre@style@modemodifier %
+ \gre@style@modedifferentia #3\endgre@style@modedifferentia %
+}
+\makeatother
+
\setlength{\parindent}{0mm} % Default is 15pt
\begin{document}
@@ -133,7 +152,7 @@
\vspace{1cm}
- \large Version \textbf{4.0.1}, 28 December 2015 %% PARSE_VERSION_DATE
+ \large Version \textbf{4.1.0-beta1}, 23 January 2016 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
@@ -141,8 +160,8 @@
\grechangestyle{lowchoralsign}{\cminfamily\small}%
\grechangestyle{highchoralsign}{\cminfamily\small}%
\def\GreStar{\greheightstar}%
- \greannotation{\scriptsize{Comm.}}%
- \greannotation{\scriptsize{VII}}%
+ \greannotation{\scriptsize Comm.}%
+ \greannotation{\scriptsize VII}%
\begingroup%
\color{black!60}%
\setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc b/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
index b152d5a8219..5c290d30f73 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
+++ b/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
@@ -3,7 +3,6 @@ office-part: Communio;
occasion: Dominica Pentecostes ad Missam in die;
book: Graduale Novum;
mode: 7;
-initial-style: 1;
user-notes: with choral annotations and episema from the non-diastematic neumes;
annotation: Comm.;
annotation: VII.;
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc b/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
index a5ab3ab0b39..e13be15d58b 100644
--- a/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
+++ b/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
@@ -3,7 +3,6 @@ office-part: Alleluia;
mode: 2;
book: Graduale Romanum, 1908, p. 249; Graduale Triplex, 1979, p. 253; Sg. 376 p. 296;
transcriber: Andrew Hinkley, Jakub Jelínek;
-initial-style: 1;
nabc-lines: 1;
annotation: II;
%%