From 301ce8aca31f41a5137231016485abde6aafe64b Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:09:30 +0000
Subject: [PATCH] lilypond-0.1.55

---
 input/scripts.ly          | 10 +++++++
 lily/bar.cc               |  1 +
 mutopia/los-toros-oboe.ly | 61 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/input/scripts.ly b/input/scripts.ly
index 7e9bc76163..042ec2216f 100644
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -34,6 +34,16 @@ blah = 	\melodic {
 	d' _>_._\fermata _"text"
 	d'' _>_._\fermata _"text"
 			
+	\stemup
+	'b-. c-. d-. e-. f-. g-. a-. b-. c'-.
+	\stemdown
+	a-. b-. c'-. d'-. e'-. f'-. g'-. a'-. b'-.
+	\stemup
+	'b-> c-> d-> e-> f-> g-> a-> b-> c'->
+	\stemup
+	'b---. c---. d---. e---. f---. g---. a---. b---. c'---.
+	\stemboth
+
       \meter 4/4;
 	\duration  8;
 	\octave c';
diff --git a/lily/bar.cc b/lily/bar.cc
index 87a654100e..0a699a26ab 100644
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -53,6 +53,7 @@ static char const *bar_breaks[][3] ={
   {"", "|:", "|:"},
   {"||.", "||.", ""},
   {":|", ":|", ""},
+  {"||", "||", ""},
   {0,0,0}
 };
 
diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 86774fc1ba..e213b38dfc 100644
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -93,13 +93,13 @@ hoboonemid = \melodic{
 
 % ugh
 %	d'4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant"
-%	d'4(\<^"Un peu plus lent"
-	d'4(\<
+%	d'4(\^"Un peu plus lent et \\'el\\'egant"<
 	\textstyle "italic"; 
-	[e'8_"tr\\`es \\'el\\'egant" \!f'8] |
+	d'4(\<
+	[e'8 \!f'8] |
 %	[)b'-. a'-.] [g16( fis' e' )d'] |
 	\textstyle "bold";
-	[)b'-.^"Un peu plus lent" a'-.] [g16( fis' e' )d'] |
+	[)b'-.^"Un peu plus lent et \\'el\\'egant" a'-.] [g16( fis' e' )d'] |
 	\textstyle "italic"; 
 	[d'( c' b\< c'] [)\!f'8-. e'-.] |
 	d4-> ~ [d16 e( fis g] |
@@ -177,10 +177,12 @@ hoboonelast = \melodic{
 	[bes16-. bes-. bes-. bes-.] [bes8-. ces'->] |
 	[bes'16-.\ff bes'-. bes'-. bes'-.] [bes'8-. ces''16->] r16^"court"-\fermata |
 	% ugh: eight measures rest (ugh: r1 -> four beats...)
-	r2-"Un peu plus lent et \\'el\\'egant"
-	\textstyle "italic";
+	\textstyle "bold";
+%	r2^"Un peu plus lent et \\'el\\'egant"
+	r2
 	r4 r8\p bes |
-	g2-> ~ |
+	g2->^"Un peu plus lent et \\'el\\'egant" ~ |
+	\textstyle "italic";
 	g8 r r c' |
 	c'2-> ~ |
 	c'8 r r bes'\f |
@@ -280,12 +282,55 @@ $staff_hoboone = \type Staff = hoboonestaff <
 
 a4 = \paper{
 	\paper_twenty
-	linewidth= 195.\mm;
+	linewidth= 165.\mm;
+	Score = \translator {
+		\type Score_engraver;
+
+		\consists "Timing_engraver";
+		\consists "Bar_column_engraver";
+		\consists "Bar_number_engraver";
+
+		\consists "Span_score_bar_engraver";
+		\consists "Score_priority_engraver";
+		\consists "Priority_horizontal_align_engraver";
+		\consists "Vertical_align_engraver";
+
+
+		\accepts "Staff_group";
+		\accepts "Staff";
+		\accepts "Rhythmic_staff";	
+		\accepts "Lyrics";
+		\accepts "Grandstaff";
+	}
+}
+
+a4sixteen = \paper{
+	linewidth= 165.\mm;
+	Score = \translator {
+		\type Score_engraver;
+
+		\consists "Timing_engraver";
+		\consists "Bar_column_engraver";
+		\consists "Bar_number_engraver";
+
+		\consists "Span_score_bar_engraver";
+		\consists "Score_priority_engraver";
+		\consists "Priority_horizontal_align_engraver";
+		\consists "Vertical_align_engraver";
+
+
+		\accepts "Staff_group";
+		\accepts "Staff";
+		\accepts "Rhythmic_staff";	
+		\accepts "Lyrics";
+		\accepts "Grandstaff";
+	}
 }
 
 \score{
 	\$staff_hoboone
 	\paper{ \a4 }
+%	\paper{ \a4sixteen }
 	\midi{
 		\tempo 4 = 80;
 	}
-- 
2.39.5