* lily/music-constructor.cc (make_music): Add debugging info.

* scm/music-functions.scm (make-simultaneous-music,
(make-sequential-music, context-spec-music):
* scm/music-types.scm (music-descriptions): Get lily to run.

diff --git a/ChangeLog b/ChangeLog
index 165e0273f7693bf6ce15c3e75e36d94a69d31355..612c792d0cd2f336aa101dcdcc22a4f8870684f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-23  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/music-constructor.cc (make_music): Add debugging info.
+
+       * scm/music-functions.scm (make-simultaneous-music,
+       (make-sequential-music, context-spec-music):
+       * scm/music-types.scm (music-descriptions): Get lily to run.
+
 2002-09-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/command-request.cc (transpose_key_alist): new function.

diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc
index 86b415100073921240653749aaa78b3b16440398..5d567c02afe49d34b1c8655b7f466fea91ce7f85 100644 (file)
--- a/lily/music-constructor.cc
+++ b/lily/music-constructor.cc
@@ -8,6 +8,7 @@
  */
 
 #include <map>                 // UGH.
+#include "warn.hh"
 #include "music-constructor.hh"
 typedef Music* (*Music_ctor) ();
 
@@ -36,6 +37,8 @@ Music*
 make_music (String s)
 {
   Music_ctor c = get_music_ctor (s);
+  if (!c)
+    programming_error (String ("No constructor for music: ") + s);
   assert (c);
   
   return (*c) ();

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index afddac1866f78ac7e284abc706fd958f4e68c7b9..eff861cf86b30569c84fdf89f5b984c1fb141944 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -206,7 +206,7 @@ this is not an override
 (define-public (context-spec-music m context . rest)
   "Add \context CONTEXT = foo to M. "
   
-  (let* ((cm (ly-make-music "Context_specced_music")))
+  (let* ((cm (make-music-by-name 'ContextSpeccedMusic)))
     (ly-set-mus-property! cm 'element m)
     (ly-set-mus-property! cm 'context-type context)
     (if (and  (pair? rest) (string? (car rest)))
@@ -216,13 +216,13 @@ this is not an override
   ))
 
 (define-public (make-sequential-music elts)
-  (let*  ((m (ly-make-music "Sequential_music")))
+  (let*  ((m (make-music-by-name 'SequentialMusic)))
     (ly-set-mus-property! m 'elements elts)
     m
   ))
 
 (define-public (make-simultaneous-music elts)
-  (let*  ((m (ly-make-music "Simultaneous_music")))
+  (let*  ((m (make-music-by-name 'SimultaneousMusic)))
     (ly-set-mus-property! m 'elements elts)
     m
     ))

diff --git a/scm/music-types.scm b/scm/music-types.scm
index 3b7685a45d792d1a72833b6558c6868537d5af59..b127293ce381a9e18b83ecd3df8c9133e565a995 100644 (file)
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -4,7 +4,7 @@
     (ArpeggioEvent 
      . (
        (name . "Arpeggio_req")
-       (types . (general-music event ))
+       (types . (general-music event))
        ))
     (ArticulationEvent
      . (
@@ -98,7 +98,7 @@
     (RepeatedMusic
      . (
        (name . "Repeated_music")
-       (type .  repeated-music)g
+       (type .  repeated-music)
        (types . (general-music repeat-music))
        ))
     (Request
@@ -302,5 +302,5 @@
 
     (if (eq? props '())
        (ly-warn (format "Could not find music type `~a'" x)))  
-    (ly-extended-make-music name props)
+    (ly-make-bare-music name props)
   ))