* scm/music-functions.scm (cue-substitute): voice counts start at 0.

* lily/note-head.cc (internal_print): always try the "s" head if
u/d not found.

diff --git a/ChangeLog b/ChangeLog
index a1ddac1ff80e2b3e20b3544f828c6c6018cb77ad..20aa3964d35a9a96db9e1d41e9c986f039d50b4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/music-functions.scm (cue-substitute): voice counts start at 0.
+
+       * lily/note-head.cc (internal_print): always try the "s" head if
+       u/d not found.
+
+       * scm/titling.scm (marked-up-headfoot): reinstate default tagline.
+
 2004-11-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * mf/parmesan-heads.mf (overdone_heads): typos.

diff --git a/THANKS b/THANKS
index c421f10db8effff4f531d922188cc8d790fde6d1..dfceaf521622c2d7108bdc71938a6b56a5809cd4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ Andreas Scherer
 Arjan Bos
 Fernando Pablo Lopez-Lezcano
 Jack O'Quin
+Juergen Reuter
 Karl Hammar
 Richard Schoeller
 

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 1bdb0dcac5ae75e4ba9066c958a1ca6977fa9c7e..8e8da2d500aadcb6015c8949d29da00d6ca84bb1 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -57,8 +57,7 @@ internal_print (Grob *me, String * font_char)
   String idx =
     prefix + ((stem_dir == UP) ? "u" : "d")  + ly_scm2string (scm_font_char);
   out = fm->find_by_name (idx);
-  if (out.is_empty ()
-      && stem_dir)
+  if (out.is_empty ())
     {
       idx = prefix + "s" + ly_scm2string (scm_font_char);
       out = fm->find_by_name (idx);

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 1d8fa5bc00943e36eaa45873d559c85d743e5701..2eb261b110b5a437789c6455be900a28f29fe77f 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -577,21 +577,26 @@ Syntax:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (cue-substitute quote-music)
+  "Must happen after quote-substitute."
+  
   (if (vector? (ly:music-property quote-music 'quoted-events))
       (let*
          ((dir (ly:music-property quote-music 'quoted-voice-direction))
-          (main-voice (if (eq? 1 dir) 2 1))
-          (cue-voice (if (eq? 1 dir) 1 2))
+          (main-voice (if (eq? 1 dir) 1 0))
+          (cue-voice (if (eq? 1 dir) 0 1))
           (main-music (ly:music-property quote-music 'element))
           (return-value quote-music)
           )
        
        (if (or (eq? 1 dir) (eq? -1 dir))
-
+           
            ;; if we have stem dirs, change both quoted and main music
            ;; to have opposite stems.
            (begin
              (set! return-value
+
+                   ;; cannot context-spec Quote-music, since context
+                   ;; for the quotes is determined in the iterator.
                    (make-sequential-music
                     (list
                      (context-spec-music (make-voice-props-set cue-voice) 'Voice "cue")
@@ -603,9 +608,10 @@ Syntax:
                     (list
                      (make-voice-props-set main-voice)
                      main-music
-                     (make-voice-props-revert)))
-                   )
-             (set! (ly:music-property quote-music 'element) main-music)))
+                     (make-voice-props-revert)
+                     )))
+             (set! (ly:music-property quote-music 'element) main-music)
+             ))
 
        return-value)
       quote-music))
@@ -617,7 +623,7 @@ Syntax:
                          (hash-ref quote-tab quoted-name #f)
                          #f
                          )))
-
+    
     (if (string? quoted-name)
        (if  (vector? quoted-vector)
             (set! (ly:music-property music 'quoted-events) quoted-vector)
@@ -656,11 +662,12 @@ Syntax:
    (lambda (music parser) (voicify-music music))
    (lambda (x parser) (music-map glue-mm-rest-texts x))
    (lambda (x parser) (music-map music-check-error x))
-   (lambda (x parser) (music-map cue-substitute x))
    (lambda (music parser)
 
      (music-map (quote-substitute (ly:parser-lookup parser 'musicQuotes))  music))
    ;; switch-on-debugging
+   (lambda (x parser) (music-map cue-substitute x))
+   
    ))
 
 ;;;;;;;;;;;;;;;;;