* scripts/convert-ly.py: Add rule.

* input/test/music-creation.ly:
* input/test/add-staccato.ly:
* input/test/add-text-script.ly: ly-make-music.

diff --git a/ChangeLog b/ChangeLog
index f3aa3c1d9c3106ebd6960b0b05b187ecc2cca566..b15f83116505bbf5f0b15406c5d149a66b295e3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-09-23  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scripts/convert-ly.py: Add rule.
+
+       * input/test/music-creation.ly:
+       * input/test/add-staccato.ly:
+       * input/test/add-text-script.ly: ly-make-music.
+
        * scm/drums.scm (make-head-type-elem, make-articulation-script):
        More ly-make-music renamings.
 

diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly
index 427a48464ea54f250441d9117b005b8e73e739e5..19abe00052f726e77074a33d9419881d47793c39 100644 (file)
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,4 +1,4 @@
-\version "1.5.68"
+\version "1.7.0"  %% or actually: 1.7.1 ...
 \header {
 
 texidoc= "Using make-music, you can add various stuff to notes. Here
@@ -8,12 +8,12 @@ one would not use scm constructs.  See separate-staccato.ly first."
 } 
 
 #(define (make-script x)
-   (let ((m (ly-make-music "Articulation_req")))
+   (let ((m (make-music-by-name "Articulation_req")))
      (ly-set-mus-property! m 'articulation-type x)
      m))
     
 #(define (add-script m x)
-   (if (equal? (ly-music-name m) "Request_chord")
+   (if (equal? (make-music-by-name m) "Request_chord")
        (ly-set-mus-property! m 'elements
                            (cons (make-script x)
                                  (ly-get-mus-property m 'elements)))

diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index b459467c84c1e6b8ce2d557538cd30710c33b9f8..b800ad259a9635f624933d7c0d1ca11f4aa6c473 100644 (file)
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,4 @@
-\version "1.5.68"
+\version "1.7.0"  %% or actually: 1.7.1 ...
 \header {
 texidoc= "Using make-music, you can add
 various stuff to notes. Here is an example
@@ -9,7 +9,7 @@ create, then write a function that will build the structure for you."
 } 
 
 #(define (make-text-script x) 
-   (let ((m (ly-make-music "Text_script_req")))
+   (let ((m (make-music-by-name "Text_script_req")))
      (ly-set-mus-property! m 'text-type 'finger)
      (ly-set-mus-property! m 'text x)
      m))

diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly
index 7d586c8ce8a12ecbbc3dccd4567adc2c2e74f4d0..00e12dd2ce77b403eda16338e2f692f68c079f9b 100644 (file)
--- a/input/test/music-creation.ly
+++ b/input/test/music-creation.ly
@@ -1,30 +1,32 @@
-\version "1.5.68"
+\version "1.7.0"  %% or actually: 1.7.1 ...
 \header {
 
  texidoc = "You can create music expressions from Scheme.  The
  mechanism for this is rather clumsy to use, so avoid if possible."
 
  }
- 
 
 #(define (make-note-req p d)
-   (let* ( (ml (ly-make-music "Note_req")) )
+   ;; huh? lily-guile: Could not find music type `Note_req' 
+   ;;(let* ((ml (make-music-by-name "Note_req")))
+   (let* ((ml (make-music-by-name 'NoteEvent)))
    (ly-set-mus-property! ml 'duration d)
-   (ly-set-mus-property! ml 'pitch p)   
-   ml 
-))
+   (ly-set-mus-property! ml 'pitch p)
+   ml))
 
 #(define (make-note elts)
-   (let* ( (ml (ly-make-music "Request_chord")) )
+   ;; huh?  lily-guile: Could not find music type `Request_chord'
+   ;;(let* ((ml (make-music-by-name "Request_chord")))
+   (let* ((ml (make-music-by-name 'RequestChord)))
    (ly-set-mus-property! ml 'elements elts)
-   ml 
-))
+   ml))
 
 #(define (seq-music-list elts)
-   (let* ( (ml (ly-make-music "Sequential_music")) )
+   ;; huh? lily-guile: Could not find music type `Sequential_music' 
+   ;;(let* ((ml (make-music-by-name "Sequential_music")))
+   (let* ((ml (make-music-by-name 'SequentialMusic)))
    (ly-set-mus-property! ml 'elements elts)
-   ml 
-))
+   ml))
 
 
 fooMusic  = #(seq-music-list

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index b571c8330b4dc850686e630fa903202a7e0d5e7d..c5a5b20395451eac009e9b69e8347645719c5edc 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -965,6 +965,13 @@ if 1:
        
        conversions.append (((1,5,72), conv, 'set! point-and-click -> set-point-and-click!'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('ly-make-music', 'make-music-by-name', str)
+               return str
+       
+       conversions.append (((1,7,1), conv, 'ly-make-music -> make-music-by-name'))
+
 
 ################################
 #      END OF CONVERSIONS