From f93a69795ef171d9a486c46d6d2a0480aee4e438 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 1 Dec 2004 11:56:46 +0000
Subject: [PATCH] * 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.
---
 ChangeLog               |  9 +++++++++
 THANKS                  |  1 +
 lily/note-head.cc       |  3 +--
 scm/music-functions.scm | 23 +++++++++++++++--------
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1ddac1ff8..20aa3964d3 100644
--- 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 c421f10db8..dfceaf5216 100644
--- 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 1bdb0dcac5..8e8da2d500 100644
--- 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 1d8fa5bc00..2eb261b110 100644
--- 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))
+   
    ))
 
 ;;;;;;;;;;;;;;;;;
-- 
2.39.2