diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-10 21:27:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-10 21:27:24 +0000 |
commit | 18e100730bd2e086a899a55f7423e028f07e90b9 (patch) | |
tree | a8a1e68d59e61256ebffadbe060ee834a29f60af /Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex | |
parent | 8a59bef2d86da7bbe2ffd977865b0e011b4175aa (diff) |
gregoriotex (10may16)
git-svn-id: svn://tug.org/texlive/trunk@41008 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex')
-rw-r--r-- | Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex index 0426e613ced..b29e1cb6258 100644 --- a/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex +++ b/Master/texmf-dist/tex/luatex/gregoriotex/gsp-default.tex @@ -22,50 +22,51 @@ %% First, the penalties % penalty to force a break on a new line -\grechangecount{newlinepenalty}{-10001}% +\xdef\grenewlinepenalty{-10001}% % penalty to prevent a line break -\grechangecount{nobreakpenalty}{10001}% +\xdef\grenobreakpenalty{10001}% % penalty at the end of a syllable which is the end of a word -\grechangecount{endofwordpenalty}{-100}% +\xdef\greendofwordpenalty{-100}% % penalty at the end of a syllable which is not the end of a word -\grechangecount{endofsyllablepenalty}{-50}% +\xdef\greendofsyllablepenalty{-50}% % penalty at the end of a syllable which is just a bar, with something printed % under it -\grechangecount{endafterbarpenalty}{-200}% +\xdef\greendafterbarpenalty{-200}% % penalty right after a bar with nothing printed -\grechangecount{endafterbaraltpenalty}{-200}% +\xdef\greendafterbaraltpenalty{-200}% % penalty at the end of the score -\grechangecount{finalpenalty}{0}% +\xdef\grefinalpenalty{0}% % penalty at the end of a breakable neumatic element (typically at a space % between elements) -\grechangecount{endofelementpenalty}{-50}% +\xdef\greendofelementpenalty{-50}% % hyphenpenalty will be used in discretionaries, in Gregorio this is used for % a bar with clef change for example. It also set \exhyphenpenalty. It should -% be close to endafterbarpenalty -\grechangecount{hyphenpenalty}{-200}% +% be close to \greendafterbarpenalty +\xdef\grehyphenpenalty{-200}% % broken penalty is the vertical penalty inserted after a break on a clef change % I'm not sure it should be set, but it might be useful... -\grechangecount{brokenpenalty}{0}% +\xdef\grebrokenpenalty{0}% %% These macro enable the tuning of linepenalty, tolerance, pretolerance %% and emergencystretch -\grechangecount{looseness}{-1}% -\grechangecount{tolerance}{9000}% +\def\grelooseness{-1}% +\def\gretolerance{9000}% % Workaround for bug 842 (http://tracker.luatex.org/view.php?id=842) % see http://tug.org/pipermail/luatex/2013-July/004516.html % The idea is that we use discretionaries (explicit hyphens, though more than hyphens in our case) for clef changes, and we need to give them a special penalty, which is not taken into account if pretolerance is > -1 on LuaTeX < 0.80. For a more detailed explanation see http://tug.org/pipermail/luatex/2013-July/004516.html. \ifnum\the\luatexversion < 78\relax % - \grechangecount{pretolerance}{-1}% + \global\def\grepretolerance{-1}% \else % - \grechangecount{pretolerance}{\the\pretolerance}% + \global\def\grepretolerance{\pretolerance}% \fi % -\grecreatedim{emergencystretch}{\the\emergencystretch}{scalable}% +\def\greemergencystretch{\emergencystretch}% % By default, we don't care if a line of score is alone on the page, % if you think it is bad, you can modify the two following values. Assigning % 10000 to them will prevent all orphaned lines (this will certainly improve % some spacings a lot). -\grechangecount{widowpenalty}{0}% -\grechangecount{clubpenalty}{0}% +\def\grewidowpenalty{0}% +\def\greclubpenalty{0}% + %%%%%%%%%%%%%%%%%%% @@ -108,7 +109,7 @@ % space between elements which has the size of a note \grecreatedim{glyphspace}{0.21877 cm plus 0.01822 cm minus 0.01822 cm}{scalable}% % space before in-line custos -\grecreatedim{spacebeforeinlinecustos}{0.10938 cm plus 0.01822 cm minus 0.00911 cm}{scalable}% +\grecreatedim{spacebeforeinlinecustos}{0 cm plus 0 cm minus 0 cm}{scalable}% % space before end-of-line custos \grecreatedim{spacebeforeeolcustos}{0.3 cm plus 0 cm minus 0 cm}{scalable}% % space before punctum mora and augmentum duplex @@ -130,11 +131,12 @@ % stretching added in the case where the text of two syllables of the same word are % separated with an automatic hyphen \grecreatedim{intersyllablespacestretchhyphen}{0cm plus 0.05cm}{scalable}% -% minimal space between letters of different words. -\grecreatedim{interwordspacetext}{1ex plus 0.15cm minus 0.05cm}{fixed}% +% minimal space between letters of different words. Makes sense to have +% the same plus and minus as interwordspacenotes. +\grecreatedim{interwordspacetext}{0.38 cm plus 0.15 cm minus 0.05 cm}{scalable}% % Versions of interword spaces for euouae blocks \grecreatedim{interwordspacenotes@euouae}{0.19 cm plus 0.1 cm minus 0.05 cm}{scalable}% -\grecreatedim{interwordspacetext@euouae}{0.8ex plus 01.cm minus 0.05cm}{fixed}% +\grecreatedim{interwordspacetext@euouae}{0.27 cm plus 0.1 cm minus 0.05 cm}{scalable}% % versions of note spaces when the first note of the second syllable is an alteration % those are used in euouae blocks \grecreatedim{interwordspacenotes@alteration}{0.1 cm plus 0.07 cm minus 0.01 cm}{scalable}% @@ -150,8 +152,6 @@ % % space between two punctum inclinatum \grecreatedim{punctuminclinatumshift}{-0.03918 cm plus 0.0009 cm minus 0.0009 cm}{scalable}% -% space between two unison punctum inclinatum -\grecreatedim{punctuminclinatumunisonshift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}% % space before puncta inclinata \grecreatedim{beforepunctainclinatashift}{0.05286 cm plus 0.00728 cm minus 0.00455 cm}{scalable}% % space between a punctum inclinatum and a punctum inclinatum deminutus @@ -223,14 +223,14 @@ % % minimal space between letters of different syllable texts for text around bars % (new bar spacing algorithm only) -\grecreatedim{interwordspacetext@bars}{0.7ex}{fixed}% +\grecreatedim{interwordspacetext@bars}{0.15 cm}{scalable}% % minimal space between letters of different syllable texts for text around bars, % euouae context -\grecreatedim{interwordspacetext@bars@euouae}{0.7ex}{fixed}% -\grecreatedim{interwordspacetext@bars@notext}{1ex}{fixed}% +\grecreatedim{interwordspacetext@bars@euouae}{0.15 cm}{scalable}% +\grecreatedim{interwordspacetext@bars@notext}{0.4 cm}{scalable}% % minimal space between letters of different syllable texts for text around bars, % euouae context -\grecreatedim{interwordspacetext@bars@notext@euouae}{0.7ex}{fixed}% +\grecreatedim{interwordspacetext@bars@notext@euouae}{0.3 cm}{scalable}% % rubber length that will be added around bars in new bar spacing algorithm \grecreatedim{bar@rubber}{0 cm plus 0.22787 cm minus 0.02 cm}{scalable}% % additional space that will appear around bars that are preceded by a custos and followed by a key. @@ -280,7 +280,7 @@ % space at the beginning of the lines if there is no clef \grecreatedim{noclefspace}{0.1 cm}{scalable}% % space around a clef change -\grecreatedim{clefchangespace}{0.27345 cm plus 0.14584 cm minus 0.01367 cm}{scalable}% +\grecreatedim{clefchangespace}{0.01768 cm plus 0.00175 cm minus 0.01768 cm}{scalable}% % When \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. \grecreatedim{clivisalignmentmin}{0.3 cm}{scalable}% |