* 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.

diff --git a/ChangeLog b/ChangeLog
index 0217a72a03c2be9f591f111db2b1fbbc2c058cf8..64f0d50726051e971ab77f566efce6ce5ee0a13e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-08-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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 3fdfbd90045569e54826453f84d74d86dd090966..73ff6b60de4a2e484b55fa870008aca0114508ae 100644 (file)
--- 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
     <gis gis,> <fis fis,> e)-1-4-5 r
 
     | %6
@@ -103,8 +100,10 @@ trebleTwo = \new Voice \relative c''{
     <e, gis, e d!>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
     <cis e,>8[( <d,_3 b'_1>
     | %6
     <cis_1 a'_2>)] cis'4. d4 
@@ -186,11 +185,9 @@ bass = \new Voice \relative c{
     %%r b,-5 <e-3 gis-5 d'>4
     r b,-5\sustainUp\sustainDown <e gis d'>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'[(<a cis>)] r b,\sustainUp\sustainDown <e gis d'>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 1ee52e9c22401db03aa8b9fbb002db9c73cece9f..5378f586300fa88295405a10c09cf867f0c4fcea 100644 (file)
--- 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 969759a69e9f3b13019447f616bedc4c7a643dd9..1c9f1a6bd29bf8e6f98254a1b8fc19b4787b6334 100644 (file)
--- 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")))