From: fred <fred>
Date: Wed, 27 Mar 2002 00:59:26 +0000 (+0000)
Subject: lilypond-1.3.144
X-Git-Tag: release/1.5.59~815
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f4c3b9aaca9d9d5e72da03b0adf8a7c5c2e9dab0;p=lilypond.git

lilypond-1.3.144
---

diff --git a/input/bugs/textcresc.ly b/input/bugs/textcresc.ly
new file mode 100644
index 0000000000..e9f6eac683
--- /dev/null
+++ b/input/bugs/textcresc.ly
@@ -0,0 +1,12 @@
+
+
+\score { \notes {
+  \context Voice {
+    \property Voice.crescendoText = "cresc."
+    \property Voice.crescendoSpanner = #'dashed-line
+    c2. r8 c8 \< \break \! c1
+  }
+}
+\paper { linewidth = 5.\cm;}
+}
+
diff --git a/ly/engraver.ly b/ly/engraver.ly
index 72dced40f5..6536fe26bb 100644
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -1,4 +1,4 @@
-\version "1.3.122"
+\version "1.3.140"
 
 %
 % setup for Request->Element conversion. Guru-only
@@ -45,6 +45,12 @@ StaffContext=\translator {
 
 	\consistsend "Axis_group_engraver";
 
+	% explicitly set instrument, so we don't get 
+	% weird effects when doing instrument names for
+	% piano staffs
+
+	instrument = #""
+	instr = #""
 	  
 	\accepts "Voice";
 }
@@ -57,9 +63,9 @@ StaffContainerContext = \translator {
 	\name StaffContainer;
 }
 
-ChoirStaffContext = \translator {
+InnerChoirStaffContext = \translator {
 	\type "Engraver_group_engraver";
-	\name ChoirStaff;
+	\name InnerChoirStaff;
 	alignmentReference = \center;
 	\consists "System_start_delimiter_engraver";
 	SystemStartDelimiter \override #'glyph = #'bracket
@@ -71,6 +77,12 @@ ChoirStaffContext = \translator {
 	\accepts "Lyrics";
 	\accepts "ChordNames";
 }
+ChoirStaffContext = \translator {
+	\InnerChoirStaffContext
+	\name ChoirStaff;
+	\accepts "InnerChoirStaff";
+	\accepts "InnerStaffGroup";
+}
 
 
 RhythmicStaffContext=\translator{
@@ -233,9 +245,9 @@ PianoStaffContext = \translator{
 %	\consistsend "Axis_group_engraver";
 }
 
-StaffGroupContext= \translator {
+InnerStaffGroupContext= \translator {
 	\type "Engraver_group_engraver";
-	\name StaffGroup;
+	\name InnerStaffGroup;
 
 	\consists "Span_bar_engraver";
 	\consists "Span_arpeggio_engraver";
@@ -251,6 +263,13 @@ StaffGroupContext= \translator {
 	\accepts "Lyrics";
 	\accepts "ChordNames";
 }
+StaffGroupContext = \translator {
+	\InnerStaffGroupContext
+	\name StaffGroup;
+	\accepts "InnerChoirStaff";
+	\accepts "ChoirStaff";
+	\accepts "InnerStaffGroup";
+}
 
 
 % UGH! JUNKME
@@ -406,7 +425,7 @@ ScoreContext = \translator {
 	verticalAlignmentChildCallback = #Align_interface::alignment_callback
 
 	pedalSustainStrings = #'("Ped." "*Ped." "*")
-	pedalUnaChordaStrings = #'("una chorda" "" "tre chorde")
+	pedalUnaCordaStrings = #'("una corda" "" "tre corde")
 	pedalSostenutoStrings = #'()  % FIXME
 
 	tupletNumberFormatFunction = #denominator-tuplet-formatter