From: David Kastrup <dak@gnu.org>
Date: Mon, 6 Feb 2012 18:20:02 +0000 (+0100)
Subject: Issue 630 et al.  Change confusion between property overrides and sets.
X-Git-Tag: release/2.15.30-1~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c4caf7d48d8a1b816ab3b007197f4dedaa6f7f75;p=lilypond.git

Issue 630 et al.  Change confusion between property overrides and sets.
---

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 1666084735..8e9a7658de 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -426,8 +426,8 @@ in @var{grob}."
 (define-safe-public (make-voice-props-set n)
   (make-sequential-music
    (append
-    (map (lambda (x) (make-grob-property-set x 'direction
-					     (if (odd? n) -1 1)))
+    (map (lambda (x) (make-grob-property-override x 'direction
+						  (if (odd? n) -1 1)))
 	 direction-polyphonic-grobs)
     (list
      (make-property-set 'graceSettings
@@ -447,8 +447,8 @@ in @var{grob}."
 			  (Voice Fingering font-size -8)
 			  (Voice StringNumber font-size -8)))
 
-     (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2))
-     (make-grob-property-set 'MultiMeasureRest 'staff-position (if (odd? n) -4 4))))))
+     (make-grob-property-override 'NoteColumn 'horizontal-shift (quotient n 2))
+     (make-grob-property-override 'MultiMeasureRest 'staff-position (if (odd? n) -4 4))))))
 
 (define-safe-public (make-voice-props-revert)
   (make-sequential-music