Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / input / regression / slur-script.ly

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index 7eadad134fb03d028c3ff5e693bac3f9ab0d2c10..a46439a13468e7492f017a6f115495b8aad8712f 100644 (file)
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,28 +1,41 @@
 
 \header {
 
-    texidoc = "A slur avoids collisions with scripts.  Only articulations
-    go inside the slur, dynamic markings, fingerings texts etc. go outside
-    of slur.
+  texidoc = "A slur avoids collisions with scripts.  Articulations
+    go inside the slur, dynamic markings go outside the slur.
+    Fingerings and texts are placed either inside or outside.
 
-    For different configurations, the scripts can be moved manually."
-    }
+    For different configurations, the defaults can be changed, and
+    scripts can be moved manually."
+}
 
-\version "2.3.7"
-\paper {
-    raggedright = ##t
+\version "2.10.0"
+\layout {
+  indent = 0\mm
+  ragged-right = ##t
 }
 \relative
 {
-    b4-.( b-. b-.)
-    b(-.  d-.)
+  b4-.( b-. b-.)
+  b(-.  d-.)
+
+  b_1( f'_1_2_3 c_3_4_5 a)
 
-    b_1( b b_1_2_3)
-    c-1_\markup { \italic {"cresc."}}( f c)
-    c-1( c\f c)
-    \once \override Script #'padding = #1.2
-    b-.( b-.
-    \once \override Script #'padding = #1.2
-    b-.)
-    e=''16[-.( f-.)]
+  \override DynamicLineSpanner #'avoid-slur = #'outside
+  b(^"dyn outside" b f'\p b,)
+  
+  %% Do not force dynamics outside slur, only avoid collisions.
+  \override DynamicLineSpanner #'avoid-slur = #'around
+  b(^"dyn around" e\p e\f b)
+  
+  %% Do not avoid collisions.
+  \override DynamicLineSpanner #'avoid-slur = #'()
+  b(^"no avoid" d\p d\f b)
+  
+  c_\markup { \italic {"cresc."}}( c c)
+  \once \override Script #'padding = #1.2
+  b-.( b-.
+  \once \override Script #'padding = #1.2
+  b-.)
+  e='16[-.( f-.)]
 }