X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fslur-script.ly;h=84629752eb5040ee47eabe096fe2e7955d970817;hb=10811621a5b430dadb9202b7ba1093df91a2e5dd;hp=8eb12d5ab96f13f60c3e6c3fa443a0f67522864c;hpb=39e82b792ff85043adac9e22038560be14d834ee;p=lilypond.git

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index 8eb12d5ab9..84629752eb 100644
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,41 +1,22 @@
 
 \header {
 
-  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."
+  texidoc = "A slur avoids collisions with scripts, which are placed
+    either inside or outside the slur, depending on the script.  The
+    slur responds appropriately if a script is moved."
 }
 
-\version "2.6.0"
+\version "2.12.0"
 \layout {
   indent = 0\mm
-  raggedright = ##t
+  ragged-right = ##t
 }
 \relative
 {
-  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-.)]
+  b4-.( b-.)
+  \once \override Script #'padding = #1.5
+  b-.( b-.)
+  b_\downbow( b_\downbow)
+  \once \override Script #'padding = #1.5
+  b_\downbow( b_\downbow)
 }