From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 2 Aug 2004 18:01:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.11~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=24dae874aaf50790de3471e3fd916e0278c7a3ac;p=lilypond.git

*** empty log message ***
---

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index 17bdd37121..7eadad134f 100644
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -9,25 +9,20 @@
     }
 
 \version "2.3.7"
-\paper { raggedright = ##t }
+\paper {
+    raggedright = ##t
+}
 \relative
 {
     b4-.( b-. b-.)
-    
     b(-.  d-.)
-    d(-.  b-.)
-    
-    b--( b-- b--)
-    b->( b-> b->)
-    b-.--( b-.-- b-.--)
-    b---.( b---. b---.)
 
     b_1( b b_1_2_3)
     c-1_\markup { \italic {"cresc."}}( f c)
-    c-1( f\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-.)]
 }
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 6392d0933a..2a3ece31bb 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -4,7 +4,8 @@
 applymusic = #(def-music-function (location func music) (procedure? ly:music?)
                (func music))
 
-addlyrics = #(def-music-function (location music lyrics) (ly:music? ly:music?)
+oldaddlyrics = #(def-music-function (location music lyrics) (ly:music? ly:music?)
+
               (make-music 'LyricCombineMusic 
                           'origin location
                           'elements (list music lyrics)))