From 6bfdd034b10c08fcc484ac2134c078f538a9ae09 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 01:03:43 +0000
Subject: [PATCH] lilypond-1.3.153

---
 input/test/equaliser.ly    | 30 +++++++++++++++++-------------
 input/test/orchestscore.ly |  2 +-
 input/twinkle-pop.ly       |  2 +-
 scm/output-lib.scm         |  1 +
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/input/test/equaliser.ly b/input/test/equaliser.ly
index 3b38c5ca4e..300be0c9d3 100644
--- a/input/test/equaliser.ly
+++ b/input/test/equaliser.ly
@@ -22,8 +22,8 @@ oboi = \notes \relative c' {
 
 clarinetti = \notes \relative c' {
   \property Staff.midiInstrument = #"clarinet"
-  \property Staff.instrument	= #"2 Clarinetti\n(B\\textflat)"
-  \property Staff.instr		= #"Cl.\n(B\\textflat)"
+  \property Staff.instrument	= #`(lines "2 Clarinetti" (columns "(B" (music "accidentals--1") ")"))
+  \property Staff.instr		= #`(lines "Cl."(columns "(B" (music "accidentals--1") ")"))
 
   R1*2 c1 R1*8
 }
@@ -33,28 +33,30 @@ fagotti = \notes \relative c' {
   \property Staff.instrument	= #"2 Fagotti"
   \property Staff.instr		= #"Fg."
 
+  \clef bass
   R1*3 c1 R1*7
 }
 
 corni = \notes \relative c' {
   \property Staff.midiInstrument = #"french horn"
-  \property Staff.instrument	= #"2 Corni\n(E\\textflat)"
-  \property Staff.instr		= #"Cor.\n(E\\textflat)"
+  \property Staff.instrument	= #`(lines "2 Corni" (columns "(E" (music "accidentals--1") ")"))
+  \property Staff.instr		= #`(lines "Cor." (columns "(E" (music "accidentals--1") ")"))
 
   R1*4 c1 R1*6
 }
 
 trombe = \notes \relative c' {
   \property Staff.midiInstrument = #"trumpet"
-  \property Staff.instrument	= #"2 Trombe\n(C)"
-  \property Staff.instr		= #"Tbe.\n(C)"
+  \property Staff.instrument	= #'(lines "2 Trombe" "(C)")
+  \property Staff.instr		= #'(lines "Tbe." "(C)")
 
+  \clef bass
   R1*5 c1 R1*5
 }
 
 timpani = \notes \relative c' {
   \property Staff.midiInstrument = #"timpani"
-  \property Staff.instrument	= #"Timpani\n(C-G)"
+  \property Staff.instrument	= #'(lines "Timpani" "(C-G)")
   \property Staff.instr		= #"Timp."
 
   R1*6 c1 R1*4
@@ -62,16 +64,16 @@ timpani = \notes \relative c' {
 
 violinoI = \notes \relative c' {
   \property Staff.midiInstrument = #"violin"
-  \property Staff.instrument	= #"Violino I"
-  \property Staff.instr		= #"Vl. I"
+  \property Staff.instrument	= #"Violino I "
+  \property Staff.instr		= #"Vl. I "
 
   R1*7 c1 R1*3
 }
 
 violinoII = \notes \relative c' {
   \property Staff.midiInstrument = #"violin"
-  \property Staff.instrument	= #"Violino II"
-  \property Staff.instr		= #"Vl. II"
+  \property Staff.instrument	= #"Violino II "
+  \property Staff.instr		= #"Vl. II "
  
   R1*8 c1 R1*2
 }
@@ -81,15 +83,17 @@ viola = \notes \relative c' {
   \property Staff.instrument	= #"Viola"
   \property Staff.instr		= #"Vla."
 
+  \clef alto
   R1*9 c1 R1*1
 }
 
 violoncello = \notes \relative c' {
   \property Staff.midiInstrument = #"cello"
   %\property Staff.midiInstrument = #"contrabass"
-  \property Staff.instrument	= #"Violoncello\ne\nContrabasso"
-  \property Staff.instr		= #"Vc.\nCb."
+  \property Staff.instrument	= #'(lines "Violoncello" "e" "Contrabasso")
+  \property Staff.instr		= #'(lines "Vc." "Cb.")
   
+  \clef bass
   R1*10 c1
 }
 
diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index e4ce479f13..53c7a28d70 100644
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -53,7 +53,7 @@ c1 | c2 c | c c | R1*5
       \context Voice = corII { \stemDown \M }
     >
     \context Staff = trp <
-      \property Staff.instrument = "2 Trp. in B\\textflat  "
+      \property Staff.instrument = #`(columns "2 Trp. in B " (music "accidentals--1"))
       \property Staff.instr = "Trp."
       \context Voice = trpI { \stemUp \M }
       \context Voice = trpII { \stemDown \M }
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index adee2dd170..e5073265d0 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -64,7 +64,7 @@ text =  \lyrics{
            \lyrics \context Lyrics \text
         >
 	\header{
-		piece = "clarinet in B\\textflat"
+		piece = "clarinet in B$\flat$"
 	}
         \paper {  }
 }
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index e3a9ad11ac..a5364c45e8 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -68,6 +68,7 @@
    ((baroque) 
     (string-append (number->string duration)
 		   (if (< duration 0) "mensural" "")))
+   ((mensural) (string-append (number->string duration) (symbol->string style)))
    ((default) (number->string duration))
    (else
     (string-append (number->string (max 0 duration)) (symbol->string style)))))
-- 
2.39.5