From 18e100730bd2e086a899a55f7423e028f07e90b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 May 2016 21:27:24 +0000 Subject: gregoriotex (10may16) git-svn-id: svn://tug.org/texlive/trunk@41008 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/luatex/gregoriotex/Command_Index_User.tex | 171 +++++++++------------ .../luatex/gregoriotex/Command_Index_gregorio.tex | 40 ++--- .../luatex/gregoriotex/Command_Index_internal.tex | 63 +------- .../luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf | Bin 0 -> 279402 bytes .../gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf | Bin 280390 -> 0 bytes .../doc/luatex/gregoriotex/GregorioNabcRef.tex | 1 + .../doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf | Bin 0 -> 675857 bytes .../luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf | Bin 712227 -> 0 bytes .../doc/luatex/gregoriotex/GregorioRef.lua | 100 +++++------- .../doc/luatex/gregoriotex/GregorioRef.tex | 13 +- .../doc/luatex/gregoriotex/examples/debugging.tex | 10 ++ 11 files changed, 133 insertions(+), 265 deletions(-) create mode 100644 Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf delete mode 100644 Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf create mode 100644 Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf delete mode 100644 Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf create mode 100644 Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex index ae1dbd80222..e1e4fac9ede 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex @@ -234,8 +234,7 @@ Macro to create one of Gregorio\TeX’s distances. Used to initialize distances \#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\ \#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\ \#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\ - & \texttt{scalable} & Distance will scale when staff size is changed.\\ - & \texttt{inherited} & Distance will inherit its value from another distance. When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance. + & \texttt{scalable} & Distance will scale when staff size is changed. \end{argtable} \macroname{\textbackslash grechangedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex} @@ -245,8 +244,7 @@ Macro to change one of Gregorio\TeX’s distances. This function will check to \#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\ \#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\ \#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\ - & \texttt{scalable} & Distance will scale when staff size is changed.\\ - & \texttt{inherited} & Distance will inherit its value from another distance. When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance. + & \texttt{scalable} & Distance will scale when staff size is changed. \end{argtable} \macroname{\textbackslash grescaledim}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex} @@ -261,10 +259,10 @@ Macro to turn on or off scaling with the staff size for a particular distance. \textbf{Nota bene:} This macro also can be used to change whether or not the staff line thickness scales with the staff size by specifying \texttt{stafflinefactor} for the first argument. \macroname{\textbackslash grechangecount}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex} -Macro to change one of Gregorio\TeX’s counts or penalities (numeric values). +Macro to change one of Gregorio\TeX’s counts (numeric values). \begin{argtable} - \#1 & string & The name of the count to be changed. See \nameref{counts} and \nameref{penalties} below.\\ + \#1 & string & The name of the count to be changed. See \nameref{counts} below.\\ \#2 & integer & The new value.\\ \end{argtable} @@ -711,7 +709,8 @@ Different elements of an include score have different styles applied. These ele \stylename{modedifferentia} & the rendered annotation from the \texttt{mode-differentia: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textbf{bold}}\\ \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{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor}\\ + \stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor} (\LaTeX)\\ + && none (Plain \TeX)\\ \stylename{normalstafflines} & Full length staff lines & none\\ \stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\ \end{tabular} @@ -781,7 +780,7 @@ 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} +\macroname{\textbackslash gresetinitiallines}{\#1}{gregoriotex-syllable.tex} Sets the number of lines the score initial requires. \begin{argtable} @@ -790,7 +789,7 @@ Sets the number of lines the score initial requires. \textbf{Nota Bene:} As currently implemented, you cannot set an initial which is larger than 2 lines and in order to do so you must set manual line breaks in the gabc for the first two lines. -\macroname{\textbackslash gresetmodenumbersystem}{\{\#1\}}{gregoriotex-main.tex} +\macroname{\textbackslash gresetmodenumbersystem}{\#1}{gregoriotex-main.tex} Sets the number system used for the mode number. \begin{argtable} @@ -799,15 +798,6 @@ Sets the number system used for the mode number. & \texttt{arabic} & Use Arabic numerals.\\ \end{argtable} -\macroname{\textbackslash gresetlyrics}{\{\#1\}}{gregoriotex-syllable.tex} -Sets the visibility of the lyrics. - -\begin{argtable} - \#1 & \texttt{visible} & Lyrics are visible (default).\\ - & \texttt{invisible} & Lyrics are not visible.\\ -\end{argtable} - - \subsubsection{Text Alignment} Gregorio\TeX\ allows you to manipulate the global alignment behavior of some text elements using the following commands. @@ -905,15 +895,6 @@ Macro to determine whether line breaks are allowed inside a translation. & \texttt{prohibit} & Line breaks are prohibited, the entire translation should appear on one line \end{argtable} -\macroname{\textbackslash gresetcustosalteration}{\{\#1\}}{gregoriotex-signs.tex} -Macro for setting whether an alteration (flat, sharp, or natural) should be -rendered before a custos or not. - -\begin{argtable} - \#1 & \texttt{visible} & The custos alteration should be printed (default)\\ - & \texttt{invisible} & The custos alteration should not be printed -\end{argtable} - \macroname{\textbackslash greseteolcustos}{\{\#1\}}{gregoriotex-main.tex} Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break. @@ -958,21 +939,6 @@ Macro to determine whether the last line of the score should be justified or not & \texttt{ragged} & Set the last line ragged (default) \end{argtable} -\macroname{\textbackslash gresetunbreakablesyllablenote}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-syllable.tex} -Configures how notes should be kept together on line breaks. - -\begin{argtable} - \#1 & integer & The minimum number of notes in the syllable before the - syllable may be broken across lines. Defaults to - \getgrecount{unbreakabletotalnotes}.\\ - \#2 & integer & The minimum number of notes at the start of a syllable that - must be kept together when the syllable is broken across - lines. Defaults to \getgrecount{unbreakableinitialnotes}.\\ - \#3 & integer & The minimum number of notes at the end of a syllable that - must be kept together when the syllable is broken across - lines. Defaults to \getgrecount{unbreakablefinalnotes}.\\ -\end{argtable} - \subsubsection{Bar spacing} @@ -1000,16 +966,6 @@ Macro to activate the new bar spacing algorithm. The new algorithm attempts to \subsubsection{Sign printing} -\macroname{\textbackslash gresetnotes}{\{\#1\}}{gregoriotex-syllable.tex} -Sets the visibility of the notes. - -\begin{argtable} - \#1 & \texttt{visible} & Notes are visible (default).\\ - & \texttt{invisible} & Notes are not visible.\\ -\end{argtable} - -\textbf{Nota Bene:} If the notes are set to be invisible, then bar lines, rythmic signs, and the like will also be invisible. However, the staff lines and clefs will still show up (since their visibility is controlled by other settings). - \macroname{\textbackslash greprintsigns}{\{\#1\}\{\#2\}}{gregoriotex-signs.tex} Macro to prevent rythmic signs from printing (all signs are printed by default): @@ -1019,7 +975,7 @@ Macro to prevent rythmic signs from printing (all signs are printed by default): & \texttt{mora} & sets the printing of punctum mora and auctum duplex\\ & \texttt{all} & set the printing of all of these\\ \#2 & \texttt{enable} & enable the printing\\ - & \texttt{disable} & disable the printing\\ + & \texttt{disable} & disable the priting\\ \end{argtable} Note that punctum mora and auctum duplex have an influence on spacings, so removing them will have an impact on that matter. @@ -1193,18 +1149,22 @@ Macro to set the font to be used for the ancient notation. Each of the following counts controls some aspect of the configuration of the Gregorio\TeX\ score. They are changed using \verb=\grechangecount=, documented above. -\begin{gcount}{additionaltopspacethreshold} +\macroname{additionaltopspacethreshold}{}{gsp-default.tex} + The threshold above which we start accounting notes above lines for additional vertical space. For instance with a threshold of \texttt{2}, notes with a pitch of \texttt{k} and \texttt{l} will not interfere with the space above lines. Set it to a high value if you don't want high notes to interfere with space above lines. -\end{gcount} -\begin{gcount}{additionaltopspacealtthreshold} +Default: \texttt{2} + +\macroname{additionaltopspacealtthreshold}{}{gsp-default.tex} + Same as \texttt{additionaltopspacethreshold} but setting the threshold for notes taken into account with above lines text vertical placement. -\end{gcount} + +Default: \texttt{0} \subsection{Distances}\label{distances} @@ -1330,11 +1290,7 @@ Space between notes of a bistropha or tristrophae. \end{gdimension} \begin{gdimension}{punctuminclinatumshift} -Space between two descending puncta inclinata. -\end{gdimension} - -\begin{gdimension}{punctuminclinatumunisonshift} -Space between two unison puncta inclinata. +Space between two punctum inclinatum. \end{gdimension} \begin{gdimension}{beforepunctainclinatashift} @@ -1342,8 +1298,7 @@ Space before puncta inclinata. \end{gdimension} \begin{gdimension}{punctuminclinatumanddebilisshift} -Space between a punctum inclinatum and a punctum inclinatum deminutus, -descending. +Space between a punctum inclinatum and a punctum inclinatum deminutus. \end{gdimension} \begin{gdimension}{punctuminclinatumdebilisshift} @@ -1351,11 +1306,11 @@ Space between two punctum inclinatum deminutus. \end{gdimension} \begin{gdimension}{punctuminclinatumbigshift} -Space between descending puncta inclinata, larger ambitus (range=3rd). +Space between puncta inclinata, larger ambitus (range=3rd). \end{gdimension} \begin{gdimension}{punctuminclinatummaxshift} -Space between descending puncta inclinata, larger ambitus (range=4th or 5th). +Space between puncta inclinata, larger ambitus (range=4th or 5th). \end{gdimension} \begin{gdimension}{ascendingpunctuminclinatumshift} @@ -1597,7 +1552,7 @@ Vertical distance to place a punctum mora for the second note in a porrectus (or Distance to place a ``rare'' sign above the top space in a score. \end{gdimension} -\subsubsection{Bar distances} +\subsubsection*{Bar distances} \begin{gdimension}{bar@finalfinalis} This space is added before the final divisio final of a score (old bar spacing algorithm only). @@ -1729,74 +1684,87 @@ Same as \texttt{maxbaroffsettextleft@eol} but when the center of the text goes r \subsection{Penalties}\label{penalties} -Penalties are used by \TeX\ to determine where line and page breaks should occur. Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores. With the exception of \texttt{emergencystretch} (which should be changed using \verb=\grechangedim=) these should be changed using \verb=\grechangecount=, described above. +Penalties are used by \TeX\ to determine where line and page breaks should occur. Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores. -\begin{gcount}{brokenpenalty} +\macroname{\textbackslash grebrokenpenalty}{}{gsp-default.tex} The vertical penalty inserted after a break on a clef change. -\end{gcount} -\begin{gcount}{clubpenalty} +Default: 0 + +\macroname{\textbackslash greclubpenalty}{}{gsp-default.tex} The club penalty (determines how important it is to prevent orphans from occurring). -\end{gcount} -\begin{gcount}{widowpenalty} +Default: 0 + +\macroname{\textbackslash grewidowpenalty}{}{gsp-default.tex} The widow penalty (determines how important it is to prevent widows from occurring). -\end{gcount} -\macroname{emergencystretch}{}{gsp-default.tex} -The value of the last ditch stretch for overfull boxes. This should be set using \verb=\grechangedim=. +Default: 0 + +\macroname{\textbackslash greemergencystretch}{}{gsp-default.tex} +The value of the last ditch stretch for overfull boxes. Default: \verb=\emergencystretch= -\begin{gcount}{endafterbarpenalty} +\macroname{\textbackslash greendafterbarpenalty}{}{gsp-default.tex} The end after bar penalty. -\end{gcount} -\begin{gcount}{endafterbaraltpenalty}{}{gsp-default.tex} +Default: $-200$ + +\macroname{\textbackslash greendafterbaraltpenalty}{}{gsp-default.tex} The alternate end after bar penalty (used when there is no text under the bar). -\end{gcount} -\begin{gcount}{endofelementpenalty}{}{gsp-default.tex} +Default: $-200$ + +\macroname{\textbackslash greendofelementpenalty}{}{gsp-default.tex} The end of element penalty. -\end{gcount} -\begin{gcount}{endofsyllablepenalty}{}{gsp-default.tex} +Default: $-50$ + +\macroname{\textbackslash greendofsyllablepenalty}{}{gsp-default.tex} The end of element penalty. -\end{gcount} -\begin{gcount}{endofwordpenalty}{}{gsp-default.tex} +Default: $-50$ + +\macroname{\textbackslash greendofwordpenalty}{}{gsp-default.tex} The end of element penalty. -\end{gcount} -\begin{gcount}{hyphenpenalty}{}{gsp-default.tex} +Default: $-100$ + +\macroname{\textbackslash grehyphenpenalty}{}{gsp-default.tex} The hyphen penalty. -\end{gcount} -\begin{gcount}{nobreakpenalty}{}{gsp-default.tex} +Default: $-200$ + +\macroname{\textbackslash grenobreakpenalty}{}{gsp-default.tex} Penalty to prevent a line break. -\end{gcount} -\begin{gcount}{newlinepenalty} +Default: 10001 + +\macroname{\textbackslash grenewlinepenalty}{}{gsp-default.tex} Penalty to force a line break. -\end{gcount} -\begin{gcount}{finalpenalty} +Default: $-10001$ + +\macroname{\textbackslash grefinalpenalty}{}{gsp-default.tex} The penalty applied after the final element of a score. -\end{gcount} -\macroname{looseness}{}{gsp-default.tex} +Default: $0$ + +\macroname{\textbackslash grelooseness}{}{gsp-default.tex} The \TeX\ looseness within a score. Default: \verb=\looseness= -\begin{gcount}{tolerance} +\macroname{\textbackslash gretolerance}{}{gsp-default.tex} The \TeX\ tolerance within a score. See \url{https://en.wikibooks.org/wiki/TeX/tolerance} for an explanation of what tolerance is. -\end{gcount} -\macroname{pretolerance}{}{gsp-default.tex} +Default: 9000 + +\macroname{\textbackslash grepretolerance}{}{gsp-default.tex} The \TeX\ pretolerance within a score. See \url{https://en.wikibooks.org/wiki/TeX/pretolerance} for an explanation of what pretolerance is. -Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (versions after, and including, 0.80)] +Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (versions after, and including, 0.80) \textit{Nota bene:} For more details on why this is necessary see the comments in gsp-default.tex. @@ -1805,8 +1773,11 @@ Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (version \subsection{Colors}\label{colors} +Colors are strictly a \LaTeX\ phenomena as currently implemented. All +commands which change a color will raise a warning in Plain \TeX, but will not alter the document. + All colors can be redefined using \verb=\definecolor=. See the -\verb=xcolor= (\LaTeX) or \verb=color= (Plain\TeX) package for documentation. +\verb=xcolor= package for documentation. Example:\par\medskip \begin{latexcode} diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex index 2ffa06181cb..c61e16809bd 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex @@ -61,14 +61,13 @@ 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 GreAdHocSpaceEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex} +\macroname{\textbackslash GreAdHocSpaceEndOfElement}{\#1\#2}{gregoriotex-main.tex} Macro to end an element with an ad-hoc space. \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.\\ - \#3 & integer & The number of notes in the syllable prior to this macro.\\ \end{argtable} \macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex} @@ -176,10 +175,7 @@ Typesets a custos. \begin{argtable} \#1 & integer & Height number of custos.\\ - \#2 & \texttt{Flat} & The custos should have a flat.\\ - & \texttt{Natural} & The custos should have a natural.\\ - & \texttt{Sharp} & The custos should have a sharp.\\ - & \textit{empty} & The custos should not have an alteration.\\ + \#2 & integer & Indicate if the custo is the last of the score.\\ \end{argtable} \macroname{\textbackslash GreDagger}{}{gregoriotex-symbols.tex} @@ -277,7 +273,7 @@ Macro to mark the end of a EUOUAE block. & \texttt{3} & before bar \end{argtable} -\macroname{\textbackslash GreEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex} +\macroname{\textbackslash GreEndOfElement}{\#1\#2}{gregoriotex-main.tex} Macro to end elements. \begin{argtable} @@ -288,7 +284,6 @@ Macro to end elements. & \texttt{4} & Ad-hoc space.\\ \#2 & \texttt{0} & Space is breakable.\\ & \texttt{1} & Space is unbreakable.\\ - \#3 & integer & The number of notes in the syllable prior to this macro.\\ \end{argtable} \macroname{\textbackslash GreEndNLBArea}{\#1\#2}{gregoriotex-main.tex} @@ -332,15 +327,11 @@ Macro to end a glyph without ending the element. & \texttt{22} & Half-space. \\ \end{argtable} -\macroname{\textbackslash GreFinalCustos}{\#1\#2}{gregoriotex-signs.tex} +\macroname{\textbackslash GreFinalCustos}{\#1}{gregoriotex-signs.tex} Typesets a custos after the final bar in a score. \begin{argtable} \#1 & integer & Height number of custos.\\ - \#2 & \texttt{Flat} & The custos should have a flat.\\ - & \texttt{Natural} & The custos should have a natural.\\ - & \texttt{Sharp} & The custos should have a sharp.\\ - & \textit{empty} & The custos should not have an alteration.\\ \end{argtable} \macroname{\textbackslash GreFinalDivisioFinalis}{\#1}{gregoriotex-signs.tex} @@ -424,7 +415,7 @@ Macro to typeset a glyph. \begin{argtable} \#1 & character & the character that it must call\\ \#2 & integer & The number for where the glyph is located. \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\ - \#3 & \TeX\ code & code to set the next custos (using \verb=\GreNextCustos=)\\ + \#3 & integer & height number of the next note\\ \#4 & \texttt{0} & One-note glyph or more than two notes glyph except porrectus: \ie, we must put the aligncenter in the middle of the first note\\ & \texttt{1} & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\ & \texttt{2} & Porrectus: has a special align center.\\ @@ -639,16 +630,12 @@ Macro to call if you want to go to the next line. \macroname{\textbackslash GreNewParLine}{}{gregoriotex-main.tex} Same as \verb=\GreNewLine= except line is not justified. -\macroname{\textbackslash GreNextCustos}{\#1\#2}{gregoriotex-signs.tex} +\macroname{\textbackslash GreNextCustos}{\#1}{gregoriotex-signs.tex} Sets the pitch to use for the next custos if it were to happen at the point where this macro is called. \begin{argtable} \#1 & integer & Height number of the custos.\\ - \#2 & \texttt{Flat} & The custos should have a flat.\\ - & \texttt{Natural} & The custos should have a natural.\\ - & \texttt{Sharp} & The custos should have a sharp.\\ - & \textit{empty} & The custos should not have an alteration.\\ \end{argtable} \macroname{\textbackslash GreNextSyllableBeginsEUOUAE}{\#1\#2}{gregoriotex-syllable.tex} @@ -660,8 +647,8 @@ Indicates that the syllable which follows begins a EUOUAE block. & \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\ \end{argtable} -\macroname{\textbackslash GreAscendensOriscus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex} -Macro to typeset an ascending oriscus cavum (the oriscus points at a higher note). +\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.\\ @@ -672,8 +659,8 @@ Macro to typeset an ascending oriscus cavum (the oriscus points at a higher note \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled. \end{argtable} -\macroname{\textbackslash GreDescendensOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex} -Macro to typeset a descending oriscus cavum (the oriscus points at a lower note). +\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.\\ @@ -976,13 +963,6 @@ Macro to typeset the syllable. \#9 & Gregorio\TeX\ glyphs & all the notes \end{argtable} -\macroname{\textbackslash GreSyllableNoteCount}{\#1}{gregoriotex-syllable.tex} -Indicates the number of notes in the current syllable. - -\begin{argtable} - \#1 & integer & The number of notes in the current syllable.\\ -\end{argtable} - \macroname{\textbackslash GreTranslationCenterEnd}{}{gregoriotex-main.tex} Macro to end the centering of the translation text. diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex index 17798653673..9a2ae64deb9 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex @@ -48,11 +48,6 @@ Macro that handles obsolescence errors. \#2 & string & name of the correct macro to use\\ \end{argtable} -\macroname{\textbackslash gre@allowdeprecated@asboolean}{}{gregoriotex-main.tex} -Macro that evaluates \texttt{true} or \texttt{false} depending on whether -deprecated usage is allowed. This is used to pass the value of -\verb=\ifgre@allowdeprecated= to Lua. - \macroname{\textbackslash gre@loadgregoriofont}{}{gregoriotex-main.tex} Loads the chosen font for the neumes at the correct size. @@ -430,22 +425,8 @@ Macro to pick the appropriate custos character. \#1 & integer & height of the custos character to be placed\\ \end{argtable} -\macroname{\textbackslash gre@nextcustospitch}{}{gregoriotex-signs.tex} -Macro that saves the next custos pitch (height). - -\macroname{\textbackslash gre@nextcustosalteration}{}{gregoriotex-signs.tex} -Macro that saves the next custos alteration. - -\macroname{\textbackslash gre@custosalteration}{\#1\#2}{gregoriotex-signs.tex} -Typesets the alteration for a custos, if enabled. - -\begin{argtable} - \#1 & integer & The pitch (height number) of the custos.\\ - \#2 & \texttt{Flat} & The custos should have a flat.\\ - & \texttt{Natural} & The custos should have a natural.\\ - & \texttt{Sharp} & The custos should have a sharp.\\ - & \textit{empty} & The custos should not have an alteration.\\ -\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. @@ -1069,9 +1050,6 @@ 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@pitch@nominal}{}{gregoriotex-main.tex} -A pitch guaranteed to be in the staff. - \macroname{\textbackslash gre@pointandclick}{\#1\#2}{gregoriotex-main.tex} Macro to generate the point-and-click links. @@ -1081,10 +1059,7 @@ Macro to generate the point-and-click links. \end{argtable} \macroname{\textbackslash gre@prefix}{}{gregoriotex-spaces.tex} -Either \texttt{skip} or \texttt{dimen} according to the distance being set or changed at the given moment. - -\macroname{\textbackslash gre@prefixII}{}{gregoriotex-spaces.tex} -Same as \verb=\gre@prefix=. Used when we were dealing with two distances simultaneously. +Either ``skip’’ or ``dimen’’ according to the distance being set or changed at the given moment. \macroname{\textbackslash gre@rubberpermit}{\#1}{gregoriotex-spaces.tex} Determines whether the given distance is allowed to take a rubber length. @@ -1139,7 +1114,7 @@ Alias for \verb=\luatexlocalrightbox= or \verb=\localrightbox=, depending on \La Alias for \verb=\resizebox=. \macroname{\textbackslash gre@dimension}{}{gregoriotex-spaces.tex} -Workhorse function for setting distances in \verb=\grecreatedim= and \verb=\grechangedim=. +Workhorse function behind \verb=\grecreatedim= and \verb=\grechangedim=. \macroname{\textbackslash gre@setstafflines}{\#1}{gregoriotex-main.tex} Sets the number of staff lines. @@ -1546,17 +1521,11 @@ Count which indicates whether the point-and-click functionality should be implem \macroname{\textbackslash gre@variableheightexpansion}{}{gregoriotex-main.tex} Count to indicated if the spacing between lines should be variable (\texttt{1}) or fixed (\texttt{0}). Not a boolean because it needs to be readable by Lua. -\macroname{\textbackslash ifgre@usecustosalteration}{}{gregoriotex-signs.tex} -Boolean which indicates whether alterations should be printed for custodes. - \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@blockeolcustos}{}{gregoriotex-main.tex} -Boolean which indicates whether the custos at the end of the line should be blocked. - \macroname{\textbackslash ifgre@raggedbreakbeforeeuouae}{}{gregoriotex-main.tex} Boolean which indicates whether an automatic line break immediately before a EUOUAE block should be ragged. @@ -1650,30 +1619,6 @@ Boolean indicating that the current syllable had a forced center in the gabc whi \macroname{\textbackslash ifgre@nextforcedcentering}{}{gregoriotex-syllable.tex} Boolean indicating that the next syllable had a forced center in the gabc which is to be respected. -\macroname{\textbackslash ifgre@unbreakableendofelement}{}{gregoriotex-main.tex} -Boolean used by \verb=\GreEndOfElement= to store whether the line may be broken at that point. - -\macroname{\textbackslash gre@count@syllablenotes}{}{gregoriotex-syllable.tex} -Count containing the number of notes in the syllable. - -\macroname{\textbackslash gre@count@unbreakabletotalnotes}{}{gregoriotex-syllable.tex} -Count containing the minimum number of notes in the syllable before the syllable -may be broken across lines. - -\macroname{\textbackslash gre@count@unbreakableinitialnotes}{}{gregoriotex-syllable.tex} -Count containing the minimum number of notes at the start of a syllable that -must be kept together when the syllable is broken across lines. - -\macroname{\textbackslash gre@count@unbreakablefinalnotes}{}{gregoriotex-syllable.tex} -Count containing the minimum number of notes at the end of a syllable that must -be kept together when the syllable is broken across lines. - -\macroname{\textbackslash ifgre@shownotes}{}{gregoriotex-syllable.tex} -Boolean indicating whether the notes should be shown. - -\macroname{\textbackslash ifgre@showlyrics}{}{gregoriotex-syllable.tex} -Boolean indicating whether the lyrics should be shown. - \subsection{Boxes} diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf new file mode 100644 index 00000000000..7f5603ecb2d Binary files /dev/null and b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_2.pdf differ diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf deleted file mode 100644 index a23fc2db5a1..00000000000 Binary files a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex index 3e648537460..836e75db56b 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex @@ -6,6 +6,7 @@ \usepackage{fontspec} \usepackage{luacode} \usepackage{multicol} +\usepackage{fixltx2e} \usepackage{hyperref} \usepackage{color} \usepackage[allowdeprecated=false]{gregoriotex} diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf new file mode 100644 index 00000000000..d7d482dc8df Binary files /dev/null and b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_2.pdf differ diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf deleted file mode 100644 index 90cf661bbcd..00000000000 Binary files a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua index 3f6e7e88099..bcc35a9bb69 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua @@ -27,8 +27,6 @@ local EXCLUDE = { ['.notdef'] = true, ['.null'] = true, nonmarkingreturn = true, - AscendensOriscusLineBLTR = true, - AscendensOriscusLineTR = true, PunctumAuctusLineBL = true, PunctumLineBLBR = true, PunctumLineBR = true, @@ -36,8 +34,7 @@ local EXCLUDE = { PunctumSmall = true, FlexusLineBL = true, FlexusAmOneLineBL = true, - DescendensOriscusLineTR = true, - DescendensOriscusLineBLTR = true, + OriscusLineTR = true, QuilismaLineTR = true, VirgaLineBR = true, SalicusOriscus = true, @@ -61,14 +58,6 @@ local GABC = { AccentusReversus = [[\excluded{g}r2]], Ancus = [[gec]], AncusLongqueue = [[hfd]], - AscendensOriscusCavum = [[go1r]], - AscendensOriscusCavumHole = [[\excluded{gor}]], - AscendensOriscus = [[go1]], - AscendensOriscusLineBL = [[\excluded{e}@go1]], - AscendensOriscusLineTL = [[\excluded{i}@go1]], - AscendensOriscusScapus = [[gO1]], - AscendensOriscusScapusLongqueue = [[hO1]], - AscendensOriscusScapusOpenqueue = [[aO1]], AuctumMora = [[\excluded{g}.]], BarBrace = [[\excluded{,}\_]], CClef = [[c3]], @@ -81,84 +70,84 @@ local GABC = { CustosUpLong = [[f+]], CustosUpMedium = [[a+]], CustosUpShort = [[g+]], - DescendensOriscusCavum = [[go0r]], - DescendensOriscusCavumHole = [[\excluded{go0r}]], - DescendensOriscus = [[go0]], - DescendensOriscusLineBL = [[\excluded{e}@go0]], - DescendensOriscusLineTL = [[\excluded{i}@go0]], - DescendensOriscusScapus = [[gO0]], - DescendensOriscusScapusLongqueue = [[hO0]], - DescendensOriscusScapusOpenqueue = [[aO0]], DivisioDominican = [[,3]], DivisioDominicanAlt = [[,4]], DivisioMaior = [[:]], DivisioMinima = [[,]], DivisioMinor = [[;]], - FClefChange = [[f3]], FClef = [[f3]], + FClefChange = [[f3]], Flat = [[gx]], FlatHole = [[\excluded{gx}]], Flexus = [[ge]], FlexusLongqueue = [[hf]], FlexusNobar = [[@hf]], FlexusOriscus = [[goe]], - FlexusOriscusInusitatus = [[go1e]], FlexusOriscusScapus = [[gOe]], - FlexusOriscusScapusInusitatus = [[gO1e]], - FlexusOriscusScapusInusitatusLongqueue = [[hO1f]], FlexusOriscusScapusLongqueue = [[hOf]], LeadingOriscus = [[go\excluded{igig}]], LeadingPunctum = [[g\excluded{igig}]], LeadingQuilisma = [[gw\excluded{igig}]], Linea = [[g=]], + LineaPunctum = [[gR]], LineaPunctumCavum = [[gr0]], LineaPunctumCavumHole = [[\excluded{gr0}]], - LineaPunctum = [[gR]], Natural = [[gy]], NaturalHole = [[\excluded{gy}]], - Oriscus = [[go]], -- for Deminutus - OriscusCavum = [[gor]], -- for Deminutus + Oriscus = [[go1]], + OriscusCavum = [[go1r]], + OriscusCavumDeminutus = [[gor\~{}]], OriscusCavumDeminutusHole = [[\excluded{gor\~{}}]], + OriscusCavumHole = [[\excluded{gor}]], + OriscusCavumReversus = [[go0r]], + OriscusCavumReversusHole = [[\excluded{go0r}]], + OriscusLineBL = [[\excluded{e}@go]], + OriscusReversus = [[go0]], + OriscusReversusLineTL = [[\excluded{i}@go]], + OriscusScapus = [[gO1]], + OriscusScapusLongqueue = [[hO1]], + OriscusScapusOpenqueue = [[aO1]], + OriscusScapusReversus = [[gO0]], + OriscusScapusReversusLongqueue = [[hO0]], + OriscusScapusReversusOpenqueue = [[aO0]], Pes = [[gi]], PesQuadratum = [[gqi]], PesQuadratumLongqueue = [[hqj]], PesQuassus = [[goi]], - PesQuassusInusitatus = [[go0i]], - PesQuassusInusitatusLongqueue = [[ho0j]], PesQuassusLongqueue = [[hoj]], PesQuilisma = [[gwi]], PesQuilismaQuadratum = [[gWi]], PesQuilismaQuadratumLongqueue = [[hWj]], + Porrectus = [[geg]], PorrectusFlexus = [[gege]], PorrectusFlexusNobar = [[\excluded{e}gege]], - Porrectus = [[geg]], PorrectusLongqueue = [[hfh]], PorrectusNobar = [[@geg]], + Punctum = [[g]], PunctumCavum = [[gr]], PunctumCavumHole = [[\excluded{gr}]], + PunctumCavumInclinatum = [[Gr]], PunctumCavumInclinatumAuctus = [[Gr>]], PunctumCavumInclinatumAuctusHole = [[\excluded{Gr>}]], - PunctumCavumInclinatum = [[Gr]], PunctumCavumInclinatumHole = [[\excluded{Gr}]], - Punctum = [[g]], - PunctumInclinatumAuctus = [[G>]], PunctumInclinatum = [[G]], + PunctumInclinatumAuctus = [[G>]], PunctumLineBL = [[\excluded{e}@g]], PunctumLineTL = [[\excluded{i}@g]], Quilisma = [[gw]], - RoundBraceDown = '[ub:1;6mm]', RoundBrace = '[ob:1;6mm]', - SalicusFlexus = [[giOki]], + RoundBraceDown = '[ub:1;6mm]', Salicus = [[giOk]], + SalicusFlexus = [[giOki]], SalicusLongqueue = [[hjOl]], Scandicus = [[gik]], Semicirculus = [[\excluded{g}r4]], SemicirculusReversus = [[\excluded{g}r5]], Sharp = [[g\#{}]], SharpHole = [[\excluded{g\#{}}]], + Stropha = [[gs]], StrophaAucta = [[gs>]], StrophaAuctaLongtail = [[hs>]], - Stropha = [[gs]], Torculus = [[gig]], TorculusLiquescens = [[gige]], TorculusLiquescensQuilisma = [[gwige]], @@ -190,60 +179,41 @@ local GABC_AMBITUS_ONE = { local GABC_FUSE = { Upper = { Punctum = [[\excluded{e}@]], - AscendensOriscus = [[\excluded{e}@]], - DescendensOriscus = [[\excluded{e}@]], + Oriscus = [[\excluded{e}@]], Pes = [[\excluded{e}@]], PesQuadratum = [[\excluded{e}@]], PesQuadratumLongqueue = [[\excluded{f}@]], PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bq[ll:0]c]] }, PesQuassus = [[\excluded{e}@]], - PesQuassusInusitatus = [[\excluded{e}@]], - PesQuassusInusitatusLongqueue = [[\excluded{f}@]], - PesQuassusInusitatusOpenqueue = { [[\excluded{a}@]], [[bo0[ll:0]c]] }, PesQuassusLongqueue = [[\excluded{f}@]], PesQuassusOpenqueue = { [[\excluded{a}@]], [[bo[ll:0]c]] }, Flexus = [[\excluded{e}@]], - FlexusOriscus = [[\excluded{e}@]], - FlexusOriscusInusitatus = [[\excluded{e}@]], }, Lower = { Punctum = [[\excluded{i}@]], - AscendensOriscus = [[\excluded{i}@]], - DescendensOriscus = [[\excluded{i}@]], + Oriscus = [[\excluded{i}@]], Pes = [[\excluded{i}@]], PesQuadratum = [[\excluded{i}@]], PesQuadratumLongqueue = [[\excluded{j}@]], PesQuadratumOpenqueue = [[\excluded{b}@]], PesQuassus = [[\excluded{i}@]], - PesQuassusInusitatus = [[\excluded{i}@]], - PesQuassusInusitatusLongqueue = [[\excluded{j}@]], - PesQuassusInusitatusOpenqueue = [[\excluded{b}@]], - PesQuassusLongqueue = [[\excluded{j}@]], - PesQuassusOpenqueue = [[\excluded{b}@]], Flexus = [[\excluded{i}@]], FlexusOriscus = [[\excluded{i}@]], - FlexusOriscusInusitatus = [[\excluded{i}@]], }, Up = { Punctum = [[\excluded{@ij}]], - AscendensOriscus = [[\excluded{@ij}]], - AscendensOriscusScapus = [[\excluded{@ij}]], - AscendensOriscusScapusLongqueue = [[\excluded{@jk}]], - DescendensOriscus = [[\excluded{@ij}]], - DescendensOriscusScapus = [[\excluded{@ij}]], - DescendensOriscusScapusLongqueue = [[\excluded{@jk}]], + Oriscus = [[\excluded{@ij}]], + OriscusScapus = [[\excluded{@ij}]], + OriscusScapusLongqueue = [[\excluded{@jk}]], Quilisma = [[\excluded{@ij}]], Flexus = [[\excluded{@gi}]], FlexusNobar = [[\excluded{@hj}]], }, Down = { Punctum = [[\excluded{@eg}]], - AscendensOriscus = [[\excluded{@eg}]], - AscendensOriscusScapus = [[\excluded{@eg}]], - AscendensOriscusScapusLongqueue = [[\excluded{@eg}]], - DescendensOriscus = [[\excluded{@eg}]], - DescendensOriscusScapus = [[\excluded{@eg}]], - DescendensOriscusScapusLongqueue = [[\excluded{@eg}]], + Oriscus = [[\excluded{@eg}]], + OriscusScapus = [[\excluded{@eg}]], + OriscusScapusLongqueue = [[\excluded{@eg}]], VirgaReversa = [[\excluded{@eg}]], VirgaReversaLongqueue = [[\excluded{@fg}]], }, @@ -366,8 +336,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano 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) + ((P'Ascendens' + P'Descendens') * P'Oriscus') + local word = (majuscule * minuscule^0) - fusion - ambitus - debilis - + post_word_liquescentia local liquescence = debilis^-1 * liquescentia^-1 local pattern = C(fusion^-1) * C(word^1) * C(ambitus^0) * C(debilis^-1) * C(liquescentia^-1) * -1 diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex index 406769c2064..dea7bb727c4 100644 --- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex +++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex @@ -87,7 +87,7 @@ \ifbreakable% \filbreak% \else% - \global\breakabletrue% + \breakabletrue% \fi% \makebox[\linewidth]{\ttfamily\bfseries #1#2% \hspace{\fill}\normalfont\itshape #3}% @@ -132,20 +132,11 @@ \fi% } -\NewDocumentEnvironment{gcount}{m}{\macroname{#1}{}{gsp-default.tex}}{% - - Default: \expandafter$\expandafter\the\csname gre@space@count@#1\endcsname$ -} - \newcommand{\writemode}[3]{% \gre@style@modeline #1\endgre@style@modeline % \gre@style@modemodifier #2\endgre@style@modemodifier % \gre@style@modedifferentia #3\endgre@style@modedifferentia % } - -\newcommand{\getgrecount}[1]{% - \the\csname gre@count@#1\endcsname% -} \makeatother \setlength{\parindent}{0mm} % Default is 15pt @@ -161,7 +152,7 @@ \vspace{1cm} - \large Version \textbf{4.2.0-beta1}, 27 April 2016 %% PARSE_VERSION_DATE + \large Version \textbf{4.1.2}, 8 May 2016 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex b/Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex new file mode 100644 index 00000000000..9aeee8d0558 --- /dev/null +++ b/Master/texmf-dist/doc/luatex/gregoriotex/examples/debugging.tex @@ -0,0 +1,10 @@ +% !TEX program = LuaLaTeX+se +\documentclass{article} + +\usepackage[debug]{gregoriotex} + +\listfiles + +\begin{document} +Debugging document +\end{document} -- cgit v1.2.3