texlive[74101] Master/texmf-dist: gregoriotex (18feb25)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 18 22:06:29 CET 2025
Revision: 74101
https://tug.org/svn/texlive?view=revision&revision=74101
Author: karl
Date: 2025-02-18 22:06:29 +0100 (Tue, 18 Feb 2025)
Log Message:
-----------
gregoriotex (18feb25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/gregoriotex/CHANGELOG.md
trunk/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf
trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh
trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-gsp-default.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
Added Paths:
-----------
trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta2.zip
Removed Paths:
-------------
trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta1.zip
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/gregoriotex/CHANGELOG.md 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/doc/luatex/gregoriotex/CHANGELOG.md 2025-02-18 21:06:29 UTC (rev 74101)
@@ -8,7 +8,7 @@
## [Unreleased][CTAN]
-## [6.1.0-beta1] - 2025-02-10
+## [6.1.0-beta2] - 2025-02-17
### Fixed
- Multiple Scribus render frames were all using the same file name, which would result in the same score appearing in all render frames. This change makes the score files use an available Scribus variable to force multiple file names.
- When kpsewhich cannot write to a particular location, it generates an error which is directed to stderr but not to our glog file. This created an undocumented error when trying to write to a gtex file to a bad location. We now capture stderr output produced when compiling scores and redirect it to our glog file so that the error is properly recorded. Fixes [#1541](https://github.com/gregorio-project/gregorio/issues/1541).
@@ -18,6 +18,10 @@
- Fixed a bug that caused a custos to sometimes change into a clef. See [#1373](https://github.com/gregorio-project/gregorio/issues/1373).
- Fixed the alignment of 2-line initials so that an initial's baseline more exactly aligns with the baseline of the lowest line it appears next to.
- When fancyhdr and GregorioTeX are used together, GregorioTeX's disabling of hyphenation and its `post_linebreak` modification of the `post_linebreak_filter` interfere with multiline headers. Using the `fancyhdr/before` and `fancyhdr/after` hooks we temporarily reenable hyphenation and disable our `post_linebreak` modification while headers and footers are being processed in the middle of a score. See [#1603](https://github.com/gregorio-project/gregorio/issues/1603).
+- Fixed a bug that could cause a hyphen to appear on the wrong line. See [#1319](https://github.com/gregorio-project/gregorio/issues/1319).
+- Fixed the placement of above-lines text (`<alt>`) relative to a note above the staff or when the number of staff lines is not 4. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613) and [#1614](https://github.com/gregorio-project/gregorio/issues/1614).
+- Fixed a bug where the above-lines text (`<alt>`) could collid with a note above the staff. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613).
+- Fixed a bug that could cause the clef and staff to be printed too high. See [#1503](https://github.com/gregorio-project/gregorio/issues/1503).
### Changed
- Modified gregorio to append to the log file specified as an argument and to send early messages to it. See [#1541](https://github.com/gregorio-project/gregorio/issues/1541).
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -1294,9 +1294,6 @@
\#1 & integer & The number of staff lines\\
\end{argtable}
-\macroname{\textbackslash gre at stafflines}{}{gregoriotex-main.tex}
-Contains the number of staff lines.
-
\macroname{\textbackslash gre at romannumeral@majuscule}{\#1}{gregoriotex-main.tex}
Typesets its numeric argument as an upper-case Roman numeral.
@@ -1912,15 +1909,6 @@
\macroname{\textbackslash ifgre at scale@stafflinefactor}{}{gregoriotex-spaces.tex}
Boolean indicating whether the stafflinefactor should scale with changes of \texttt{grefactor}, or not.
-\macroname{\textbackslash ifgre at haslinethree}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the staff has a third line.
-
-\macroname{\textbackslash ifgre at haslinefour}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the staff has a fourth line.
-
-\macroname{\textbackslash ifgre at haslinefive}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the staff has a fifth line.
-
\macroname{\textbackslash gre at count@shiftaftermora}{}{gregoriotex-signs.tex}
Count indicating when the presence of a punctum mora at the end of a syllable should affect the spacing with the next syllable.
@@ -2024,6 +2012,9 @@
\macroname{\textbackslash ifgre at noteadditionalspacelinestext}{}{gregoriotex-main.tex}
Boolean indicating that the additional space needed between the notes and the lyrics due to really low notes should follow the user setting of noteadditionalspacelinestext (as opposed to being calculated automatically, the default).
+\macroname{\textbackslash gre at count@stafflines}{}{gregoriotex-main.tex}
+Count containing the number of staff lines.
+
\macroname{\textbackslash ifgre at alteration@effect at note}{}{gregoriotex-signs.tex}
Boolean indicating that soft alterations should last until they apply to a single note (i.e. all soft alterations will be printed).
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -183,7 +183,7 @@
\vspace{1cm}
- \large Version \textbf{6.1.0-beta1}, 10 February 2025 %% PARSE_VERSION_DATE
+ \large Version \textbf{6.1.0-beta2}, 17 February 2025 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\gresetlinecolor{gregoriocolor}
Modified: trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py
===================================================================
--- trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/fonts/source/gregoriotex/squarize.py 2025-02-18 21:06:29 UTC (rev 74101)
@@ -89,7 +89,7 @@
14 : 'Fourteen',
}
-GREGORIO_VERSION = '6.1.0-beta1'
+GREGORIO_VERSION = '6.1.0-beta2'
# The unicode character at which we start our numbering:
# U+E000 is the start of the BMP Private Use Area
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hole.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-hollow.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hole.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op-hollow.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae-op.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/greciliae.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gregall.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/grelaon.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/truetype/public/gregoriotex/gresgmodern.ttf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh
===================================================================
--- trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/scripts/gregoriotex/uninstall-gtex.sh 2025-02-18 21:06:29 UTC (rev 74101)
@@ -92,6 +92,6 @@
$RM doc/luatex/gregoriotex//UPGRADE.md
rmdir -p doc/luatex/gregoriotex/ 2> /dev/null || true
-$RM source/luatex/gregoriotex//gregorio-6.1.0-beta1.zip
+$RM source/luatex/gregoriotex//gregorio-6.1.0-beta2.zip
rmdir -p source/luatex/gregoriotex/ 2> /dev/null || true
Deleted: trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta1.zip
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta2.zip
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta2.zip
===================================================================
--- trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta2.zip 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta2.zip 2025-02-18 21:06:29 UTC (rev 74101)
Property changes on: trunk/Master/texmf-dist/source/luatex/gregoriotex/gregorio-6.1.0-beta2.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriosyms.sty 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
- [2025/02/10 v6.1.0-beta1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2025/02/17 v6.1.0-beta2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
\RequirePackage{iftex}%
\RequireLuaTeX
@@ -41,7 +41,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre at gregoriotexversion{6.1.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{6.1.0-beta2}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre at declarefileversion}[2]{\relax}
Modified: trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/lualatex/gregoriotex/gregoriotex.sty 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
- [2025/02/10 v6.1.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2025/02/17 v6.1.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\RequirePackage{iftex}%
\RequireLuaTeX
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-chars.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-\gre at declarefileversion{gregoriotex-chars.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-chars.tex}{6.1.0-beta2}% GREGORIO_VERSION
\def\gre at char@fuse at punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
\def\gre at char@fuse at quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-common.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-\gre at declarefileversion{gregoriotex-common.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-common.tex}{6.1.0-beta2}% GREGORIO_VERSION
\ifnum\luatexversion<76%
\gre at error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-gsp-default.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-gsp-default.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-gsp-default.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -20,7 +20,7 @@
% this file contains definitions of spaces and penalties
% version check
-\gre at declarefileversion{gregoriotex-gsp-default.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-gsp-default.tex}{6.1.0-beta2}% GREGORIO_VERSION
%% First, the penalties
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-main.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -21,7 +21,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre at gregoriotexversion{6.1.0-beta1}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre at gregoriotexversion{6.1.0-beta2}% GREGORIO_VERSION - VersionManager.py
% first some macros to allow checks for version:
% Tests that all gregoriotex files are of the same version.
@@ -214,8 +214,7 @@
\let\gre at pitch@underbrace\gre at pitch@b %
\let\gre at pitch@overbraceglyph\gre at pitch@g %
\let\gre at pitch@bar\gre at pitch@g %
-\let\gre at pitch@dummy\gre at pitch@g %
-\let\gre at pitch@nominal\gre at pitch@e %
+\let\gre at pitch@dummy\gre at pitch@e % not above or below staff, even if 2 lines
% factor is the factor with which you open you font (the number after the at). It will decide almost everything (spaces, etc.), so it is particularly important.
% it is set to the default value : 17 (the value that makes it look like a standard graduale)
@@ -735,8 +734,8 @@
\else%
\gre at dimen@temp at five=\gre at dimen@additionaltopspacenabc\relax%
\fi%
- \gre at dimen@temp at five=\dimexpr(4\gre at dimen@stafflineheight %
- + 4\gre at dimen@interstafflinespace %
+ \gre at dimen@temp at five=\dimexpr(\gre at dimen@staffheight %
+ + \gre at dimen@interstafflinespace %
+ \gre at space@dimen at spacebeneathtext %
+ \gre at dimen@currenttranslationheight %
+ \gre at space@dimen at spacelinestext %
@@ -789,45 +788,17 @@
\vbox attr \gre at attrid@part=2 {%
\gre at style@normalstafflines%
\vskip\glueexpr(\gre at dimen@additionaltopspace+\gre at space@skip at spaceabovelines+\gre at dimen@currentabovelinestextheight)\relax%
- \ifgre at showlines %
- \hrule height \gre at dimen@stafflineheight width \gre at dimen@stafflinewidth\relax%
- \else %
- \vskip\gre at dimen@stafflineheight\relax%
- \fi %
- \gre at skip@temp at four = \gre at dimen@interstafflinespace\relax%
- \kern\gre at skip@temp at four %
- \ifgre at showlines %
- \hrule height \gre at dimen@stafflineheight width \gre at dimen@stafflinewidth\relax%
- \else %
- \vskip\gre at dimen@stafflineheight\relax%
- \fi %
- \ifgre at haslinethree %
- \gre at skip@temp at four = \gre at dimen@interstafflinespace\relax%
- \kern\gre at skip@temp at four %
+ \gre at count@temp at one=0\relax
+ \loop
\ifgre at showlines %
\hrule height \gre at dimen@stafflineheight width \gre at dimen@stafflinewidth\relax%
\else %
\vskip\gre at dimen@stafflineheight\relax%
\fi %
- \fi %
- \ifgre at haslinefour %
- \gre at skip@temp at four = \gre at dimen@interstafflinespace\relax%
- \kern\gre at skip@temp at four %
- \ifgre at showlines %
- \hrule height \gre at dimen@stafflineheight width \gre at dimen@stafflinewidth\relax%
- \else %
- \vskip\gre at dimen@stafflineheight\relax%
- \fi %
- \fi %
- \ifgre at haslinefive %
- \gre at skip@temp at four = \gre at dimen@interstafflinespace\relax%
- \kern\gre at skip@temp at four %
- \ifgre at showlines %
- \hrule height \gre at dimen@stafflineheight width \gre at dimen@stafflinewidth\relax%
- \else %
- \vskip\gre at dimen@stafflineheight\relax%
- \fi %
- \fi %
+ \advance\gre at count@temp at one by 1\relax
+ \ifnum\gre at count@temp at one<\gre at count@stafflines
+ \kern\gre at dimen@interstafflinespace\relax
+ \repeat
\kern\dimexpr(\gre at space@dimen at spacelinestext+\gre at dimen@additionalbottomspace+\gre at space@dimen at spacebeneathtext+\gre at dimen@currenttranslationheight)\relax%
\endgre at style@normalstafflines %
}%
@@ -1049,13 +1020,11 @@
% gre at attr@dash (see its definition in gregorio-syllable) is 0 when we are in a score, and unset when we are not
\newif\ifgre at beginningofscore%
-\newif\ifgre at haslinethree%
-\newif\ifgre at haslinefour%
-\newif\ifgre at haslinefive%
+\newcount\gre at count@stafflines
\def\gre at setstafflines#1{%
\gre at trace{gre at setstafflines{#1}}%
- \def\gre at stafflines{#1}%
+ \gre at count@stafflines=#1\relax
\ifcase#1% 0
\gre at error{Invalid number of staff lines}%
\or % 1
@@ -1080,9 +1049,6 @@
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorTwo %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedTwo %
\let\gre at char@bar at divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingTwo %
- \gre at haslinethreefalse %
- \gre at haslinefourfalse %
- \gre at haslinefivefalse %
\or % 3
\let\gre at pitch@adjust at top\gre at pitch@h %
\let\gre at pitch@abovestaff\gre at pitch@i %
@@ -1103,9 +1069,6 @@
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorThree %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedThree %
\let\gre at char@bar at divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingThree %
- \gre at haslinethreetrue %
- \gre at haslinefourfalse %
- \gre at haslinefivefalse %
\or % 4
\let\gre at pitch@adjust at top\gre at pitch@j %
\let\gre at pitch@abovestaff\gre at pitch@k %
@@ -1126,9 +1089,6 @@
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorFour %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedFour %
\let\gre at char@bar at divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingFour %
- \gre at haslinethreetrue %
- \gre at haslinefourtrue %
- \gre at haslinefivefalse %
\or % 5
\let\gre at pitch@adjust at top\gre at pitch@l %
\let\gre at pitch@abovestaff\gre at pitch@m %
@@ -1149,9 +1109,6 @@
\let\gre at char@bar at divisiomaior\GreCPDivisioMaiorFive %
\let\gre at char@bar at divisiomaiordotted\GreCPDivisioMaiorDottedFive %
\let\gre at char@bar at divisiomaiordottedbacking\GreCPDivisioMaiorDottedBackingFive %
- \gre at haslinethreetrue %
- \gre at haslinefourtrue %
- \gre at haslinefivetrue %
\else %
\gre at error{Invalid number of staff lines}%
\fi %
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.lua 2025-02-18 21:06:29 UTC (rev 74101)
@@ -20,7 +20,7 @@
-- this file contains lua functions used by GregorioTeX St. Gall ancient
-- neume support when called with LuaTeX.
--- GREGORIO_VERSION 6.1.0-beta1
+-- GREGORIO_VERSION 6.1.0-beta2
local catcode_at_letter = luatexbase.catcodetables['gre at atletter']
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-nabc.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
% this file contains macros for St. Gall ancient neume support
-\gre at declarefileversion{gregoriotex-nabc.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-nabc.tex}{6.1.0-beta2}% GREGORIO_VERSION
\xdef\gre at nabcfontname{gregall}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.lua 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 6.1.0-beta1
+-- GREGORIO_VERSION 6.1.0-beta2
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-signs.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -22,7 +22,7 @@
\def\grebarbracewidth{.58879}%
-\gre at declarefileversion{gregoriotex-signs.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-signs.tex}{6.1.0-beta2}% GREGORIO_VERSION
\def\gre at usestylecommon{%
\gre at trace{gre at usestylecommon}%
@@ -705,28 +705,28 @@
\or\gre at fontchar@custostoplong %
\or\gre at fontchar@custostopshort %
\or %
- \ifgre at haslinethree %
+ \ifnum\gre at count@stafflines>2\relax
\gre at fontchar@custostoplong %
\else %
\gre at fontchar@custosbottomlong %
\fi %
\or %
- \ifgre at haslinethree %
+ \ifnum\gre at count@stafflines>2\relax
\gre at fontchar@custostopshort %
\else %
\gre at fontchar@custosbottomshort %
\fi %
\or %
- \ifgre at haslinefour %
+ \ifnum\gre at count@stafflines>3\relax
\gre at fontchar@custostoplong %
\else %
\gre at fontchar@custosbottomlong %
\fi %
\or %
- \ifgre at haslinefour %
+ \ifnum\gre at count@stafflines>3\relax
\gre at fontchar@custostopshort %
\else %
- \ifgre at haslinethree %
+ \ifnum\gre at count@stafflines>2\relax
\gre at fontchar@custosbottomshort %
\else %
\gre at fontchar@custosbottommiddle %
@@ -733,16 +733,16 @@
\fi %
\fi %
\or %
- \ifgre at haslinefive %
+ \ifnum\gre at count@stafflines>4\relax
\gre at fontchar@custostoplong %
\else %
\gre at fontchar@custosbottomlong %
\fi %
\or %
- \ifgre at haslinefive %
+ \ifnum\gre at count@stafflines>4\relax
\gre at fontchar@custostopshort %
\else %
- \ifgre at haslinefour %
+ \ifnum\gre at count@stafflines>3\relax
\gre at fontchar@custosbottomshort %
\else %
\gre at fontchar@custosbottommiddle %
@@ -750,7 +750,7 @@
\fi %
\or\gre at fontchar@custosbottomlong %
\or %
- \ifgre at haslinefive %
+ \ifnum\gre at count@stafflines>4\relax
\gre at fontchar@custosbottomshort %
\else %
\gre at fontchar@custosbottommiddle %
@@ -1637,8 +1637,8 @@
+ \gre at space@dimen at spacebeneathtext %
+ \gre at space@dimen at spacelinestext %
+ \gre at dimen@currenttranslationheight %
- + \gre at stafflines\gre at dimen@interstafflinespace %
- + \gre at stafflines\gre at dimen@stafflineheight)\relax%
+ + \gre at count@stafflines\gre at dimen@interstafflinespace %
+ + \gre at count@stafflines\gre at dimen@stafflineheight)\relax%
\or % 1
\gre at dimen@glyphraisevalue=%
\dimexpr(\gre at dimen@additionalbottomspace %
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-spaces.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
% this file contains definitions of spaces
-\gre at declarefileversion{gregoriotex-spaces.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-spaces.tex}{6.1.0-beta2}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
@@ -231,8 +231,8 @@
\def\gre at calculate@staffheight{%
\gre at trace{gre at calculate@staffheight}%
\global\gre at dimen@staffheight = \dimexpr %
- \gre at stafflines\gre at dimen@stafflineheight %
- + \gre at stafflines\gre at dimen@interstafflinespace %
+ \gre at count@stafflines\gre at dimen@stafflineheight %
+ + \gre at count@stafflines\gre at dimen@interstafflinespace %
- \gre at dimen@interstafflinespace\relax%
\relax %
\gre at trace@end%
@@ -733,7 +733,7 @@
\global\gre at isonalinetrue%
\or\gre at count@temp at three=\number 8%
\or\gre at count@temp at three=\number 9%
- \ifgre at haslinethree %
+ \ifnum\gre at count@stafflines>2\relax
\global\gre at isonalinetrue%
\else %
\ifgre at ledgerline@above %
@@ -742,10 +742,10 @@
\fi %
\or\gre at count@temp at three=\number 10%
\or\gre at count@temp at three=\number 11%
- \ifgre at haslinefour %
+ \ifnum\gre at count@stafflines>3\relax
\global\gre at isonalinetrue%
\else %
- \ifgre at haslinethree %
+ \ifnum\gre at count@stafflines>2\relax
\ifgre at ledgerline@above %
\global\gre at isonalinetrue%
\fi %
@@ -753,10 +753,10 @@
\fi %
\or\gre at count@temp at three=\number 12%
\or\gre at count@temp at three=\number 13%
- \ifgre at haslinefive %
+ \ifnum\gre at count@stafflines>4\relax
\global\gre at isonalinetrue%
\else %
- \ifgre at haslinefour %
+ \ifnum\gre at count@stafflines>3\relax
\ifgre at ledgerline@above %
\global\gre at isonalinetrue%
\fi %
@@ -764,7 +764,7 @@
\fi %
\or\gre at count@temp at three=\number 14%
\or\gre at count@temp at three=\number 15%
- \ifgre at haslinefive %
+ \ifnum\gre at count@stafflines>4\relax
\ifgre at ledgerline@above %
\global\gre at isonalinetrue%
\fi %
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-syllable.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
% this file contains definitions of the glyphs and the syllables
-\gre at declarefileversion{gregoriotex-syllable.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-syllable.tex}{6.1.0-beta2}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
@@ -154,16 +154,21 @@
% #7 is the line:char:column for a textedit link
\def\GreGlyph#1#2#3#4#5#6#7{%
\gre at newglyphcommon %
+ % Create box containing the new glyph.
\setbox\gre at box@temp at width=\hbox{\gre at pointandclick{\gre at font@music #1}{#7}}%
\global\gre at dimen@lastglyphwidth=\wd\gre at box@temp at width %
% the three next lines are a trick to get the additional lines below the glyphs
\gre at skip@temp at one = \gre at dimen@lastglyphwidth\relax%
\kern\gre at skip@temp at one %
+ % #5 contains things like ledger lines, but also calls to \GreGlyphHeights
#5\relax %
\kern-\gre at skip@temp at one %
\gre at calculate@glyphraisevalue{#2}{0}{}%
\raise\gre at dimen@glyphraisevalue%
- \copy\gre at box@temp at width%
+ % Since \gre at box@temp at width was created before the calls
+ % to \GreGlyphHeights, we need to rebox it to
+ % set \gre at attr@glyph at top and \gre at attr@glyph at bottom correctly.
+ \hbox{\unhcopy\gre at box@temp at width}%
\ifgre at endofscore\else\ifgre at boxing\else %
#3%
\fi\fi %
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.lua 2025-02-18 21:06:29 UTC (rev 74101)
@@ -19,7 +19,7 @@
-- this file contains lua functions to support signs used by GregorioTeX.
--- GREGORIO_VERSION 6.1.0-beta1
+-- GREGORIO_VERSION 6.1.0-beta2
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex-symbols.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -22,7 +22,7 @@
\ifcsname gregoriotex at symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex at symbols@loaded{}%
-\gre at declarefileversion{gregoriotex-symbols.tex}{6.1.0-beta1}% GREGORIO_VERSION
+\gre at declarefileversion{gregoriotex-symbols.tex}{6.1.0-beta2}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.lua 2025-02-18 21:06:29 UTC (rev 74101)
@@ -24,13 +24,13 @@
gregoriotex = gregoriotex or {}
local gregoriotex = gregoriotex
-local internalversion = '6.1.0-beta1' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '6.1.0-beta2' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '6.1.0-beta1', -- GREGORIO_VERSION
+ version = '6.1.0-beta2', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2025/02/10", -- GREGORIO_DATE_LTX
+ date = "2025/02/17", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2025 - The Gregorio Project",
@@ -163,7 +163,7 @@
local exe_version
-- first look for one with the exact version
- real_gregorio_exe = 'gregorio-6_1_0-beta1' -- FILENAME_VERSION
+ real_gregorio_exe = 'gregorio-6_1_0-beta2' -- FILENAME_VERSION
local cmd = string.format([[%s -o "%%s" "%s"]], real_gregorio_exe,
test_snippet_filename)
exe_version = get_prog_output(cmd, '*line')
@@ -476,11 +476,10 @@
local function dump_nodes_helper(head, indent)
local dots = string.rep('..', indent)
for n in traverse(head) do
- local ids = format("%s", has_attribute(n, part_attr))
+ local ids = format("%s", has_attribute(n, glyph_id))
if node.type(n.id) == 'penalty' then
- log(dots .. "%s=%s {%s}", node.type(n.id), n.penalty, ids)
+ log(dots .. "%s %s {%s}", node.type(n.id), n.penalty, ids)
elseif n.id == whatsit and n.subtype == user_defined_subtype and n.user_id == marker_whatsit_id then
- log("marker-whatsit %s", n.value)
log(dots .. "marker-whatsit %s", n.value)
elseif n.id == glyph then
local f = font.fonts[n.font]
@@ -490,9 +489,11 @@
end
log(dots .. "glyph %s {%s}", charname, ids)
elseif n.id == rule then
- log(dots .. "rule subtype=%s width=%spt height=%spt depth=%spt", n.subtype, n.width/65536, n.height/65536, n.depth/65536)
+ log(dots .. "rule [%s] width=%.2fpt height=%.2fpt depth=%.2fpt", n.subtype, n.width/2^16, n.height/2^16, n.depth/2^16)
+ elseif n.id == hlist or n.id ==vlist then
+ log(dots .. "%s [%s] width=%.2fpt height=%.2fpt depth=%.2fpt shift=%.2fpt {%s}", node.type(n.id), n.subtype, n.width/2^16, n.height/2^16, n.depth/2^16, n.shift/2^16, ids)
elseif n.id == glue then
- log(dots .. "glue subtype=%s width=%spt", n.subtype, n.width/65536)
+ log(dots .. "glue [%s] width=%.2fpt", n.subtype, n.width/2^16)
else
log(dots .. "node %s [%s] {%s}", node.type(n.id), n.subtype, ids)
end
@@ -720,9 +721,6 @@
local function post_linebreak(h, groupcode, glyphes)
-- TODO: to be changed according to the font
local lastseennode = nil
- local adddash = false
- local currentfont = 0
- local currentshift = 0
local centerstartnode = nil
local line_id = nil
local line_top = nil
@@ -754,6 +752,7 @@
line_bottom = nil
line_has_translation = false
line_has_abovelinestext = false
+
for n in traverse_id(hlist, line.head) do
syl_id = has_attribute(n, syllable_id_attr) or syl_id
if has_attribute(n, center_attr, startcenter) then
@@ -764,32 +763,12 @@
else
center_translation(centerstartnode, n, line.glue_set, line.glue_sign, line.glue_order)
end
- elseif has_attribute(n, dash_attr, potentialdashvalue) then
- adddash=true
- lastseennode=n
- currentfont = 0
- -- we traverse the list, to detect the font to use,
- -- and also not to add an hyphen if there is already one
- for g in node.traverse_id(glyph, n.head) do
- if currentfont == 0 then
- currentfont = g.font
- end
- if g.char == hyphen or g.char == 45 then
- adddash = false
- end
- end
- if currentshift == 0 then
- currentshift = n.shift
- end
- -- if we encounter a text that doesn't need a dash, we acknowledge it
- elseif has_attribute(n, dash_attr, nopotentialdashvalue) then
- adddash=false
end
-
+
if new_score_heights then
local glyph_id = has_attribute(n, glyph_id_attr)
- local glyph_top = has_attribute(n, glyph_top_attr) or 9 -- 'g'
- local glyph_bottom = has_attribute(n, glyph_bottom_attr) or 9 -- 'g'
+ local glyph_top = has_attribute(n, glyph_top_attr) or 7 -- 'e' = \gre at pitch@dummy
+ local glyph_bottom = has_attribute(n, glyph_bottom_attr) or 7 -- 'e' = \gre at pitch@dummy
if glyph_id and glyph_id > prev_line_id then
if not line_id or glyph_id > line_id then
line_id = glyph_id
@@ -812,13 +791,7 @@
is_mark(n, abovelinestext_mark)
end
end
- if adddash==true then
- local dashnode, hyphnode = getdashnnode()
- dashnode.shift = currentshift
- hyphnode.font = currentfont
- insert_after(line.head, lastseennode, dashnode)
- addash=false
- end
+
if line_id then
new_score_heights[prev_line_id] = { linenum, line_top, line_bottom,
line_has_translation and 1 or 0,
@@ -830,8 +803,6 @@
new_score_last_syllables[syl_id] = syl_id
end
end
- -- we reinitialize the shift value, because it may change according to the line
- currentshift=0
end
end
@@ -871,7 +842,43 @@
end
end
end
-
+
+ -- Look for words that are broken across lines and insert a hyphen
+ for line in traverse_id(hlist, h) do
+ if has_attribute(line, dash_attr) then
+ -- Look for the last node that has dash_attr > 0
+ local adddash=false
+ for n in traverse_id(hlist, line.head) do
+ -- If a syllable is not word-final, it may need a dash if it
+ -- ends up being line-final.
+ -- Note: This also loops over translations, but translations
+ -- come before lyrics, so they should never become lastseennode
+ if has_attribute(n, dash_attr, potentialdashvalue) then
+ adddash=true
+ lastseennode=n
+ -- if we encounter a text that doesn't need a dash, we acknowledge it
+ elseif has_attribute(n, dash_attr, nopotentialdashvalue) then
+ adddash=false
+ end
+ end
+
+ -- If the last syllable needed a dash, add it
+ if adddash then
+ local lastglyph
+ -- we traverse the list, to detect the font to use,
+ -- and also not to add an hyphen if there is already one
+ for g in node.traverse_id(glyph, lastseennode.head) do
+ lastglyph = g
+ end
+ if not (lastglyph.char == hyphen or lastglyph.char == 45) then
+ local dashnode, hyphnode = getdashnnode()
+ hyphnode.font = lastglyph.font
+ insert_after(lastseennode.head, lastglyph, dashnode)
+ end
+ end
+ end
+ end
+
--dump_nodes(h)
-- due to special cases, we don't return h here (see comments in bug #20974)
return true
@@ -1290,6 +1297,7 @@
glog_file = string.format("%s%s-%s.glog", output_dir, cleaned_filename,
internalversion:gsub("%.", "_"))
compile_gabc(gabc_file, gtex_filename, glog_file, allow_deprecated)
+ gtex_filename = lfs.normalize(gtex_filename)
tex.print(string.format([[\input %s\relax]], gtex_filename))
return
else
@@ -1298,6 +1306,7 @@
end
end
if not gabc_file then
+ gtex_file = lfs.normalize(gtex_file)
tex.print(string.format([[\input %s\relax]], gtex_file))
return
end
@@ -1320,6 +1329,7 @@
elseif force_gabccompile then
compile_gabc(gabc_file, gtex_file, glog_file, allow_deprecated)
end
+ gtex_file = lfs.normalize(gtex_file)
tex.print(string.format([[\input %s\relax]], gtex_file))
return
end
@@ -1641,7 +1651,9 @@
if for_next_line then
local last = score_heights['last']
if last then
- local target_id = tex.getattribute(glyph_id_attr) + 1
+ -- Let target_id be the glyph_id of the last glyph on this line.
+ -- Then heights[target_id] is the information for the next line.
+ local target_id = tex.getattribute(glyph_id_attr)
while target_id <= last do
heights = score_heights[target_id]
if heights then break end
Modified: trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex 2025-02-18 19:01:43 UTC (rev 74100)
+++ trunk/Master/texmf-dist/tex/luatex/gregoriotex/gregoriotex.tex 2025-02-18 21:06:29 UTC (rev 74101)
@@ -21,7 +21,7 @@
% This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does.
-% [2025/02/10 v6.1.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2025/02/17 v6.1.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\input iftex.sty
\RequireLuaTeX%
More information about the tex-live-commits
mailing list.