(music-separator?): don't use name music

property.

diff --git a/ChangeLog b/ChangeLog
index d19e11bb754ca7335fb5d685c18c08aa580f68ab..a00be13144679e0bd9e5bd64266ebb75ddd656d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scm/music-functions.scm (music-separator?): don't use name music
+       property.
+
 2002-09-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/new-accidental-engraver.cc: Compile fix.

diff --git a/lily/music.cc b/lily/music.cc
index d2c0105d8097d122087af85d86a57aee32bbfb9b..d87be5881ecd96a30b079f08ba20e81cebe9bd68 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -285,6 +285,8 @@ future.
 
 Music is the data type that music expressions are stored in. The data
 type does not yet offer many manipulations.
+
+WARNING: deprecated; use make-music-by-name. 
 ")
 {
   SCM_ASSERT_TYPE(gh_string_p (type), type, SCM_ARG1, __FUNCTION__, "string");

diff --git a/lily/new-accidental-engraver.cc b/lily/new-accidental-engraver.cc
index 6604b3cbb996f193b3a7f70932f8bcacb7de4f03..0bc51dff5cbcca71334a036af7ee8e293e65c9dc 100644 (file)
--- a/lily/new-accidental-engraver.cc
+++ b/lily/new-accidental-engraver.cc
@@ -6,6 +6,7 @@
 
   This is an experimental file - producing correct accidentals but
   unfortunately ruining the spacing. -rz
+  
 */
 
 #include "musical-request.hh"

diff --git a/scm/drums.scm b/scm/drums.scm
index b2c5d24d5571b5de1c9904e0640a16ec6b7ec764..5ba33107802ebb4357a9e64d933a98a6d391b642 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -165,7 +165,7 @@
 ;;
 
 (define (make-articulation-script x) 
-     (let* ((m (make-music-by-name "Articulation_req")))
+     (let* ((m (make-music-by-name 'ArticulationEvent)))
      (ly-set-mus-property! m 'articulation-type x)
      m))
 
@@ -188,7 +188,7 @@
  )
 
 (define (make-head-type-elem t)
-   (let* ( (m (make-music-by-name "Music")))
+   (let* ( (m (make-music-by-name 'Music)))
      (set-mus-properties!
       m
       `((iterator-ctor . ,Push_property_iterator::constructor)

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index eff861cf86b30569c84fdf89f5b984c1fb141944..8c0476ce1d3434dd347ef2ef64703e4b4a6a238a 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -236,8 +236,8 @@ this is not an override
 
 (define-public (music-separator? m)
   "Is M a separator."
-  (let* ((n (ly-get-mus-property m 'name )))
-    (and (symbol? n) (equal? 'separator n))
+  (let* ((ts (ly-get-mus-property m 'types )))
+    (memq 'separator ts)
   ))
 
 (define (split-one sep?  l acc)
@@ -324,7 +324,7 @@ this is not an override
      ))
 
 (define-public (empty-music)
-  (ly-id (make-music-by-name "Music"))
+  (ly-id (make-music-by-name 'Music))
   )
 ;;;
 

diff --git a/scm/music-types.scm b/scm/music-types.scm
index b127293ce381a9e18b83ecd3df8c9133e565a995..65fd166dae2ff0b9e17e1d2b3bbfd560126a50d0 100644 (file)
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -294,6 +294,8 @@
      music-descriptions)
 
 (define-public (make-music-by-name x)
+  (if (not (symbol? x))
+      (misc-error "Not a symbol: ~s" x))
   (let*
       (
        (props (hashq-ref music-name-to-property-table x '()))

diff --git a/scm/ps.scm b/scm/ps.scm
index 2c99fe5d24c3d1f4c83eecc55e488099b50d7c8e..611c3244e7f34f2ef84085a7eb4bc8e5a3c19291 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -7,7 +7,9 @@
 
 
 
-(define-module (scm ps)
+(define-module
+  (scm ps)
+
   )
 
 (define font-name-alist  '())