From 1a0b474125ecdb4de64a29d99762cb26b1888167 Mon Sep 17 00:00:00 2001 From: David Chiang Date: Sat, 25 Jan 2025 13:14:11 -0500 Subject: [PATCH] rename some local macros with \gre@ prefix --- tex/gregoriotex-signs.tex | 16 ++++++++-------- tex/gregoriotex-syllable.tex | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index ee723372..a90321ea 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -2738,17 +2738,17 @@ \def\gre@alteration@visible#1#2#3#4#5#6{% \gre@trace{gre@alteration@visible{#1}{#2}{#3}{#4}{#5}{#6}}% \ifcase#2\relax - \or\def\alterationchar{\gre@fontchar@flat}\def\alterationhole{\gre@fontchar@flathole}% flat - \or\def\alterationchar{\gre@fontchar@natural}\def\alterationhole{\gre@fontchar@naturalhole}% natural - \or\def\alterationchar{\gre@fontchar@sharp}\def\alterationhole{\gre@fontchar@sharphole}% sharp - \or\def\alterationchar{\gre@fontchar@flatparen}\def\alterationhole{\gre@fontchar@flatparenhole}% parenthesized flat - \or\def\alterationchar{\gre@fontchar@naturalparen}\def\alterationhole{\gre@fontchar@naturalparenhole}% parenthesized natural - \or\def\alterationchar{\gre@fontchar@sharpparen}\def\alterationhole{\gre@fontchar@sharpparenhole}% parenthesized sharp + \or\def\gre@alteration@char{\gre@fontchar@flat}\def\gre@alteration@hole{\gre@fontchar@flathole}% flat + \or\def\gre@alteration@char{\gre@fontchar@natural}\def\gre@alteration@hole{\gre@fontchar@naturalhole}% natural + \or\def\gre@alteration@char{\gre@fontchar@sharp}\def\gre@alteration@hole{\gre@fontchar@sharphole}% sharp + \or\def\gre@alteration@char{\gre@fontchar@flatparen}\def\gre@alteration@hole{\gre@fontchar@flatparenhole}% parenthesized flat + \or\def\gre@alteration@char{\gre@fontchar@naturalparen}\def\gre@alteration@hole{\gre@fontchar@naturalparenhole}% parenthesized natural + \or\def\gre@alteration@char{\gre@fontchar@sharpparen}\def\gre@alteration@hole{\gre@fontchar@sharpparenhole}% parenthesized sharp \fi \setbox\gre@box@temp@width=\hbox attr \gre@attrid@alteration@height=#1\relax attr \gre@attrid@alteration@type=#2\relax - {\gre@pointandclick{\alterationchar}{#6}}% + {\gre@pointandclick{\gre@alteration@char}{#6}}% \ifnum#3=0\relax % \gre@newglyphcommon % \fi % @@ -2762,7 +2762,7 @@ \kern-\gre@skip@temp@one % \gre@calculate@glyphraisevalue{#1}{0}{}% \ifgre@hidealtlines % - \gre@fillhole{\alterationhole}{0}% + \gre@fillhole{\gre@alteration@hole}{0}% \fi % \raise \gre@dimen@glyphraisevalue% \copy\gre@box@temp@width% diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 409d4099..cacbeaa9 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -908,18 +908,18 @@ #5% % if the next glyph has an alteration, check if it is suppressed; % if so, pretend there's no alteration - \def\next@alignment{\gre@arg@oftwo@first#7}% - \def\next@alteration{\gre@arg@oftwo@second#7}% - \ifnum\next@alteration>0\relax + \def\gre@nextalignment{\gre@arg@oftwo@first#7}% + \def\gre@nextalteration{\gre@arg@oftwo@second#7}% + \ifnum\gre@nextalteration>0\relax \gre@alteration@isvisible{1}% if the notes contain an alteration, the id was incremented, so this checks the alteration after the notes \ifgre@alteration@isvisible \else - \def\next@alteration{0}% + \def\gre@nextalteration{0}% \fi \fi % now we can restore the alteration id to typeset the notes for real \global\gre@attr@alteration@id=\gre@saved@attr@alteration@id\relax % - \gre@calculate@nextbegindifference{\gre@emit@endsyllablepartfornextsyllable}{\gre@evaluatenextsyllable{\gre@nextfirstsyllablepart}}{\gre@evaluatenextsyllable{\gre@nextmiddlesyllablepart}}{\gre@evaluatenextsyllable{\gre@nextendsyllablepart}}{\next@alignment}{\next@alteration}% + \gre@calculate@nextbegindifference{\gre@emit@endsyllablepartfornextsyllable}{\gre@evaluatenextsyllable{\gre@nextfirstsyllablepart}}{\gre@evaluatenextsyllable{\gre@nextmiddlesyllablepart}}{\gre@evaluatenextsyllable{\gre@nextendsyllablepart}}{\gre@nextalignment}{\gre@nextalteration}% \gre@unsetfixednexttextformat % \ifgre@showlyrics% \setbox\gre@box@syllabletext=\hbox{% @@ -939,8 +939,8 @@ \gre@calculate@enddifference{\wd\gre@box@syllablenotes}{\wd\gre@box@syllabletext}{\gre@dimen@textaligncenter}{\gre@dimen@notesaligncenter}{1}% % gre@count@temp@one holds 1 if next is a bar, 2 if an alteration, else 0 \gre@count@temp@one=0% - \ifnum\next@alteration=0\relax % - \ifnum\next@alignment>9\relax % + \ifnum\gre@nextalteration=0\relax % + \ifnum\gre@nextalignment>9\relax % \gre@count@temp@one=1\relax % \fi % \else % @@ -1006,7 +1006,7 @@ \fi% \fi % % recomputing end difference and final skip with the final hyphen - \gre@calculate@nextbegindifference{\gre@emit@endsyllablepartfornextsyllable}{\gre@evaluatenextsyllable{\gre@nextfirstsyllablepart}}{\gre@evaluatenextsyllable{\gre@nextmiddlesyllablepart}}{\gre@evaluatenextsyllable{\gre@nextendsyllablepart}}{\next@alignment}{\next@alteration}% + \gre@calculate@nextbegindifference{\gre@emit@endsyllablepartfornextsyllable}{\gre@evaluatenextsyllable{\gre@nextfirstsyllablepart}}{\gre@evaluatenextsyllable{\gre@nextmiddlesyllablepart}}{\gre@evaluatenextsyllable{\gre@nextendsyllablepart}}{\gre@nextalignment}{\gre@nextalteration}% \gre@calculate@enddifference{\wd\gre@box@syllablenotes}{\wd\gre@box@syllabletext}{\gre@dimen@textaligncenter}{\gre@dimen@notesaligncenter}{0}% \gre@calculate@syllablefinalskip{#4}{\gre@count@temp@one}% \else % @@ -1077,7 +1077,7 @@ \GreNoBreak % \fi% % we call end of syllable - \gre@syllable@end{\next@alignment}{\next@alteration}{\gre@evaluatenextsyllable{\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart}}{#4}% + \gre@syllable@end{\gre@nextalignment}{\gre@nextalteration}{\gre@evaluatenextsyllable{\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart}}{#4}% \gre@push@endsyllable{#6}\relax % \global\gre@dimen@notesaligncenter=0pt\relax% very important, see flat and natural \gre@unsetfixedtextformat %