* input/regression/hara-kiri-pianostaff.ly (disappear): remove

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

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index bc861e76199a23ebb020b4f5cbf0f361a5c2f171..8eb12d5ab96f13f60c3e6c3fa443a0f67522864c 100644 (file)
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,22 +1,41 @@
 
 \header {
 
-    texidoc = "Slurs avoid collisions with scripts. If you want to
-have a different configuration, the scripts must be moved manually."
+  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 defaults can be changed, and
+    scripts can be moved manually."
+}
 
-\version "2.3.7"
-\paper { raggedright = ##t }
+\version "2.6.0"
+\layout {
+  indent = 0\mm
+  raggedright = ##t
+}
+\relative
 {
-    \once \override Script #'padding = #1.2
-    b8-.( b-.
-    \once \override Script #'padding = #1.2
-    b-.)
-    
-    b-.( b-. b-.)
-    b--( b-- b--)
-    b->( b-> b->)
-    b-.--( b-.-- b-.--)
-    b---.( b---. b---.)
+  b4-.( b-. b-.)
+  b(-.  d-.)
+
+  b_1( f'_1_2_3 c_3_4_5 a)
+
+  \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-.)]
 }