From eb544f70b8dc19a053705a02722bb4eaf24a4a98 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 18 Aug 2005 10:23:16 +0000 Subject: [PATCH] * input/les-nereides.ly: Remove three fingering tweaks, update remaining one. * input/regression/slur-script-inside.ly: Update, fix doc. * scm/script.scm: Update to avoid-slur. --- ChangeLog | 7 +++++++ input/les-nereides.ly | 16 +++++++--------- input/regression/slur-script-inside.ly | 12 +++++++----- scm/script.scm | 16 ++++++++-------- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0217a72a03..64f0d50726 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-08-18 Jan Nieuwenhuizen + * input/les-nereides.ly: Remove three fingering tweaks, update + remaining one. + + * input/regression/slur-script-inside.ly: Update, fix doc. + + * scm/script.scm: Update to avoid-slur. + * scm/define-grob-properties.scm (avoid-slur): New property. * lily/phrasing-slur-engraver.cc (acknowledge_extra_object): diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 3fdfbd9004..73ff6b60de 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -15,8 +15,7 @@ Nastiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf - -lines that contain tweaks (14 currently, not counting reverts) are +Lines that contain tweaks (10 currently, not counting reverts) are marked with %tweak possibly more impressive to render without tweaks? @@ -77,8 +76,6 @@ treble = \new Voice \relative c''{ % \fingerUp \override Fingering #'direction = #1 - % Manual fix for collision with slur - \override Fingering #'inside-slur = ##f %tweak e)-1-4-5 r | %6 @@ -103,8 +100,10 @@ trebleTwo = \new Voice \relative c''{ 2 | %5 s8 cis4. d4 + % fair to count as one tweak? \override Fingering #'add-stem-support = ##t %tweak - \override Fingering #'padding = #0.1 %tweak + \override Fingering #'padding = #0.15 + \override Fingering #'slur-padding = #0.1 8[( | %6 )] cis'4. d4 @@ -186,11 +185,9 @@ bass = \new Voice \relative c{ %%r b,-5 4 r b,-5\sustainUp\sustainDown 4-3-5 \slurNeutral - \once \override Fingering #'extra-offset = #'(0 . -1) %tweak e,8[-5(\sustainUp | %6 - \once \override Fingering #'extra-offset = #'(0 . -1) %tweak a)-2]\sustainDown \slurUp e'[()] r b,\sustainUp\sustainDown 4 @@ -227,8 +224,9 @@ middleDynamics = { s32 s s s\! } - + \fatText s32 s-"rall." s s s8 s4 + \emptyText | %5 s2-"a tempo" s8 \once\override Dynamics.Hairpin #'extra-offset = #'(1 . 0) %tweak @@ -271,7 +269,7 @@ theScore = \score{ \consists "Dynamic_engraver" \consists "Text_engraver" - \override TextScript #'font-size = #2 + %%\override TextScript #'font-size = #1 \override TextScript #'font-shape = #'italic \consists "Skip_event_swallow_translator" diff --git a/input/regression/slur-script-inside.ly b/input/regression/slur-script-inside.ly index 1ee52e9c22..5378f58630 100644 --- a/input/regression/slur-script-inside.ly +++ b/input/regression/slur-script-inside.ly @@ -1,8 +1,9 @@ \header { - texidoc = "Slurs avoid scripts with @code{inside-slur} set - true, while scripts avoid slurs if @code{inside-slur} set to - false." + texidoc = "Slurs avoid scripts with @code{avoid-slur} set to +@code{inside}, scripts avoid slurs with @code{avoid-slur} set to +@code{around}. Slurs and scripts keep a distance of +@code{slur-padding}." } @@ -14,9 +15,10 @@ \relative c''{ \clef alto \slurUp - \override Script #'inside-slur = ##t + \override Script #'slur-padding = #0.2 + \override Script #'avoid-slur = #'inside c4(^\downbow b) - \override Script #'inside-slur = ##f + \override Script #'avoid-slur = #'around c4(^\downbow b) c4^\downbow b } diff --git a/scm/script.scm b/scm/script.scm index 969759a69e..1c9f1a6bd2 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -10,12 +10,12 @@ ((script-stencil . (feta . ("thumb" . "thumb"))) (direction . 1))) ("accent" . - ((inside-slur . #f) + ((avoid-slur . around) (follow-into-staff . #t) (script-stencil . (feta . ("sforzato" . "sforzato"))) (side-relative-direction . -1))) ("espressivo" . - ((inside-slur . #f) + ((avoid-slur . around) (follow-into-staff . #t) (script-stencil . (feta . ("espr" . "espr"))) (side-relative-direction . -1))) @@ -24,7 +24,7 @@ (follow-into-staff . #t) (side-relative-direction . -1))) ("staccatissimo" . - ((inside-slur . #t) + ((avoid-slur . inside) (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo"))) (side-relative-direction . -1))) @@ -62,7 +62,7 @@ (direction . 1))) ("fermata" . ((script-stencil . (feta . ("dfermata" . "ufermata"))) - (inside-slur . #f) + (avoid-slur . around) (direction . 1))) ("shortfermata" . ((script-stencil . (feta . ("dshortfermata" . "ushortfermata"))) @@ -80,12 +80,12 @@ ((script-stencil . (feta . ("staccato" . "staccato"))) (side-relative-direction . -1) (follow-into-staff . #t) - (inside-slur . #t) + (avoid-slur . inside) (priority . -100))) ("tenuto" . ((script-stencil . (feta . ("tenuto" . "tenuto"))) (follow-into-staff . #t) - (inside-slur . #t) + (avoid-slur . inside) (side-relative-direction . -1))) ("comma" . ((script-stencil . (feta . ("lcomma" . "rcomma"))) @@ -97,11 +97,11 @@ (direction . 1))) ("upbow" . ((script-stencil . (feta . ("upbow" . "upbow"))) - (inside-slur . #f) + (avoid-slur . around) (direction . 1))) ("downbow" . ((script-stencil . (feta . ("downbow" . "downbow"))) - (inside-slur . #f) + (avoid-slur . around) (direction . 1))) ("lheel" . ((script-stencil . (feta . ("upedalheel" . "upedalheel"))) -- 2.39.5