remove padding tweaks. Add

comment strings.

diff --git a/ChangeLog b/ChangeLog
index df9c082ef7cb861b19bb8920f6a3c79b7a87fa63..7a0dfb3911cf51836986e02b575269855ccc2892 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * input/regression/slur-script.ly: remove padding tweaks. Add
+       comment strings.
+
        * lily/note-spacing.cc (get_spacing): remove kludge for EOL wide
        time sigs and related stuff.
 

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index e0399ba7c57da5ec979fd31331aa2fa816f8d6e9..8eb12d5ab96f13f60c3e6c3fa443a0f67522864c 100644 (file)
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -1,41 +1,41 @@
 
 \header {
 
-    texidoc = "A slur avoids collisions with scripts.  Articulations
+  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.6.0"
 \layout {
-    indent = 0\mm
-    raggedright = ##t
+  indent = 0\mm
+  raggedright = ##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( f'_1_2_3 c_3_4_5 a)
-    b( f'\p b,)
-    
-    %% Do not force dynamics outside slur, only avoid collisions.
-    \override DynamicLineSpanner #'avoid-slur = #'around
-    \override DynamicLineSpanner #'padding = #0.4
-    b( e\p e\f b)
-    
-    %% Do not avoid collisions.
-    \override DynamicLineSpanner #'avoid-slur = #'()
-    \revert DynamicLineSpanner #'padding
-    b( 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-.)]
+  \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-.)]
 }