lilypond-1.5.34

diff --git a/lily/translator-def.cc b/lily/translator-def.cc
index 2533c486cc64ba6e25b79e12f49f6477a650a870..79c4087bdbacbb8cd6b5587281e6983531d256aa 100644 (file)
--- a/lily/translator-def.cc
+++ b/lily/translator-def.cc
@@ -138,16 +138,13 @@ Translator_def::add_pop_property (SCM props, SCM syms)
 }
 
 /*
-  Do it. SYMS maybe a symbol or a list of symbols. VAL is
-  SCM_UNDEFINED in case of a pop
+  Do it. SYM is single symbol. VAL is SCM_UNDEFINED in case of a pop
 */
 void
-Translator_def::apply_pushpop_property (Translator_group* me,SCM syms, SCM eprop, SCM val)
+Translator_def::apply_pushpop_property (Translator_group* me,SCM sym, SCM eprop, SCM val)
 {
-  if (gh_symbol_p (syms))
-    dynamic_cast<Translator_group*> (me)->execute_single_pushpop_property (syms, eprop, val);
-  else for (SCM s = syms; gh_pair_p (s); s = ly_cdr (s))
-    dynamic_cast<Translator_group*> (me)->execute_single_pushpop_property (ly_car (s), eprop, val);
+  dynamic_cast<Translator_group*> (me)
+    ->execute_single_pushpop_property (sym, eprop, val);
 }
 
 

diff --git a/scm/drums.scm b/scm/drums.scm
index 45d8e6be195fb789e7d63b82419f88422ba929ba..e3862259f1f3d078b84454e2cbc5b3c2acb48071 100644 (file)
--- a/scm/drums.scm
+++ b/scm/drums.scm
@@ -33,7 +33,7 @@
    (let* ( (m (ly-make-music "Music"))
          )
      (ly-set-mus-property m 'iterator-ctor Push_property_iterator::constructor)
-     (ly-set-mus-property m 'symbols 'NoteHead)
+     (ly-set-mus-property m 'symbol 'NoteHead)
      (ly-set-mus-property m 'grob-property 'style)
      (ly-set-mus-property m 'grob-value t)
      m

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 9c254e5a8d69d6da5a1670397d5e6eb61ba6c483..10e91ee26332566b0a534e302d19e5030b57585f 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -74,14 +74,14 @@ Fingering_engraver."
 ;;;;;;;;;;;;;;;;
 
 
-(define (make-grob-property-set grobs gprop val)
+(define (make-grob-property-set grob gprop val)
   "Make a M-exp that sets GPROP to VAL in GROBS. Does a pop first, i.e.
 this is not an override 
 "
   
    (let* ((m (ly-make-music  "Music")))
      (ly-set-mus-property m 'iterator-ctor Push_property_iterator::constructor)
-     (ly-set-mus-property m 'symbols grobs)
+     (ly-set-mus-property m 'symbol grob)
      (ly-set-mus-property m 'grob-property gprop)
      (ly-set-mus-property m 'grob-value val)
      (ly-set-mus-property m 'pop-first #t)
@@ -90,10 +90,11 @@ this is not an override
    
    ))
    
-(define (make-grob-property-revert grobs gprop)
+(define (make-grob-property-revert grob gprop)
+  "Revert the grob property GPROP for GROB."
    (let* ((m (ly-make-music  "Music")))
      (ly-set-mus-property m 'iterator-ctor Pop_property_iterator::constructor)
-     (ly-set-mus-property m 'symbols grobs)
+     (ly-set-mus-property m 'symbol grob)
      (ly-set-mus-property m 'grob-property gprop)
                
      m
@@ -102,18 +103,22 @@ this is not an override
    
 (define (make-voice-props-set n)
   (make-sequential-music
-   (list
-      (make-grob-property-set '(Tie Slur Stem Dots) 'direction
-                        (if (odd? n) -1 1))
-      (make-grob-property-set '(NoteColumn) 'horizontal-shift (quotient n 2))
+   (append
+      (map (lambda (x) (make-grob-property-set x 'direction
+                                              (if (odd? n) -1 1)))
+          '(Tie Slur Stem Dots))
+      (list (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2)))
    )
   ))
 
 (define (make-voice-props-revert)
   (make-sequential-music
    (list
-      (make-grob-property-revert '(Tie Slur Stem Dots) 'direction)
-      (make-grob-property-revert '(NoteColumn) 'horizontal-shift)
+      (make-grob-property-revert 'Tie 'direction)
+      (make-grob-property-revert 'Dots 'direction)
+      (make-grob-property-revert 'Stem 'direction)
+      (make-grob-property-revert 'Slur 'direction)         
+      (make-grob-property-revert 'NoteColumn 'horizontal-shift)
    ))
   )