From 3b22c71cb70199ba8b456134debb0aab781fdf8c Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:11:05 +0000
Subject: [PATCH] lilypond-0.1.62

---
 input/test/abbrev.ly |  14 +-
 mutopia/ltor.ly      | 361 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 368 insertions(+), 7 deletions(-)
 create mode 100644 mutopia/ltor.ly

diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly
index c2522e60a1..c57aeabdae 100644
--- a/input/test/abbrev.ly
+++ b/input/test/abbrev.ly
@@ -5,13 +5,13 @@
 		'a1
 		'a1:32
 		'c4:8 c': 'c4:16 c':
-%		[ 'c8:16 'c 'c 'c ] [ a a a a ]
-%		[ 'c 'f 'b e ] 
-%		[ 'c16:32 'c 'c 'c ] [ a16:32 a a a ]
-%%		% there's still some hairy beam bugfixing todo
-%%		[ c'8:16 g d 'a ]
-%%		[ c'16:32 g d 'a ]
-%%		[ 'c8:32 'f 'b e ]
+		[ 'c8:16 'c 'c 'c ] [ a a a a ]
+		[ 'c 'f 'b e ] 
+		[ 'c16:32 'c 'c 'c ] [ a16:32 a a a ]
+%		% there's still some hairy beam bugfixing todo
+		[ c'8:16 g d 'a ]
+		[ c'16:32 g d 'a ]
+		[ 'c8:32 'f 'b e ]
 		[:32 c16 e]
 		[:32 c16 e]
 		[:16 c8 e]
diff --git a/mutopia/ltor.ly b/mutopia/ltor.ly
new file mode 100644
index 0000000000..afc524c505
--- /dev/null
+++ b/mutopia/ltor.ly
@@ -0,0 +1,361 @@
+\header{
+filename =	 "los-toros-oboe.ly";
+title =	         "La Feria";
+subtitle = "Los Toros";
+opus =	         "";
+composer =	 "Paul Lac\\^ome dEstalenx (1838-1920)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+latexheaders=    "headers";
+} 
+
+%{
+Silly latex file dropped; use ly2dvi
+
+Converted to relative octave from los-toros-oboe.ly:
+    :s/[^\\]'/'x/g
+    :s/'x//g
+    (511 substitutions on 155 lines)
+
+    lilypond -f los-toros-oboe 2> bla
+    wc -l bla
+    138
+    138 / 3 =  46 octave quotes of 511 remain!
+
+%}
+
+\include "paper16.ly"
+
+hoboonestart = \melodic{
+% ugh: cant copy: allegro/primo tempo
+	\octave relative;
+	\textstyle "large";
+	[es''16-.^"Allegro" es-. es-. es-.] [es8-. d-.] |
+	\textstyle "italic";
+}
+
+hobooneintro = \melodic{
+	\octave relative;
+%	\textstyle "roman";
+%	[es''16-.-"Allegro" es-. es-. es-.] [es8-. d-.] |
+%	\textstyle "italic";
+	[f''8.-> es16(] [)d8 c-.] |
+	[bes16( c d es] [)d8 c-.] |
+	[bes-. as->~] [as16( g f g] |
+	[as bes c d] [)es8 c-.] |
+	[d8-. c16( bes] )as4 ~ |
+	[as16 g( f g] [as c bes as] |
+%	[)g8 as16 g(] [)f8 g16( f] |
+	[)g8 as16 g(] [)f8 g16( f] |
+	[)es8 f16-. g-.] [as-. bes-. c-. d-.] |
+	[es-. es-. es-. es-.] [es8-. d-.] |
+	[f8.-> es16(] [)d8 c-.] |
+	[bes16( c d es] [)d8 c-.] |
+	[bes8 a->~] [a16 g( fis g] |
+	[a bes c d] [)es8 d16()c] |
+	[bes-. g-. bes-. d-.] g4-> ~ |
+	[g16 f( es d] [c es  d c] |
+	[)bes8 c16( bes] [)a8 bes16( a] |
+	[)g8  r d'] r |
+}
+
+hoboonemid = \melodic{
+	\octave relative;
+	[g'16-. g-. g-. g-.] [g8-. f-.] |
+	as2-> |
+	[as16-. as-. as-. as-.] [as8-. g-.] |
+	bes2-> |
+	[bes16-. bes-. bes-. bes-.] [bes8-. c] |
+
+	r-"cresc." [d8-. r c-.] |
+	r\f [d-. es-. f-.] |
+	[g8.-> es16] [bes8 g] |
+
+	% four measures copied from 8 measures back...
+	[g16-.\p g-. g-. g-.] [g8-. f-.] |
+	as2-> |
+	[as16-. as-. as-. as-.] [as8-. g-.] |
+	bes2-> |
+	[b16-. b-. b-. b-.] [b8-. c-.] |
+
+	% same measure
+	[b16-. b-. b-. b-.] [b8-. c-.] |
+
+	[b8-.-"cresc." c-. b-. c-.] |
+	[d-. es-. d-. es-.] |
+	[f\f-. g-. f-. g-.] |
+	[as-.\< g-. as-. bes-.] |
+	[\!g16\ff-. g-. g-. g-.] [g8-. g-.] |
+	[g8.-> g16] [g8 g] |
+	[g8.-> g16] [g8 g] |
+	[f8.-> f16] [f8 f] |
+	[f8.-> f16] [f8 f] |
+	[bes8-. as16( g] )f4 ~ |
+	[f16 es( d es] [f as g )f] |
+	[es( g f es] [d f es d] |
+	[c es d c] [b d c b] |
+	[a c bes a] [g bes a g] |
+	[fis a g fis] [e g fis )e] |
+	% `a deux
+	[d8 d'] [es8.-> c16] |
+	[a8 bes g es] |
+	[c' d es8. bes16] |
+	[g8 es bes' 'c] |
+	[d16-. d-. d-. d-.] [d8.-. es16->] |
+	[d'16-.-"cresc." d-. d-. d-.] [d8.-. es16->] |
+	[d16-. d-. d-. d-.] [d8.-. es16->] |
+	[d16 d d d] [d8 es16-.] r16-\fermata^"court"^"tr\\`es" |
+	% Un peu plus lent.
+	\textstyle "bold";
+
+% ugh
+%	d4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant"
+%	d4(\^"Un peu plus lent et \\'el\\'egant"<
+	\textstyle "italic"; 
+	d4(\<
+	[e8 \!fis8] |
+%	[)b-. a-.] [g16( fis e )d] |
+	\textstyle "bold";
+	[)b-.^"Un peu plus lent et \\'el\\'egant" a-.] [''g16( fis' e )d] |
+	\textstyle "italic"; 
+	[d( c b\< c] [)\!fis8-. e-.] |
+	''d4-> ~ [d16 e( fis g] |
+	[a b\< d fis] [)\!a8-. g-.] |
+	[fis16( e 'a )c] e4 ~ |
+	[e16 d( 'e c'] [)b8-. a-.] |
+	g2 ~ |
+	[g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] |
+	b2-> ~ |
+	[b8 \[/3 'd16( e fis ]1/1 [)g8-"cresc. poco" e'-.] |
+	e2-> ~ |
+	[e8 \[/3 ''d16( e fis ]1/1 [)g8\f d'-.] |
+	[d8.-> b'16-.] [g16-. d-. b-. c-.] |
+	[d-. e-. fis-. a-.] [g8-. e-.] |
+	fis2-> ~ |
+	[fis16 g-.\< a-. b-.] [\!c8-. 'c-.] |
+	[es8.->(-"espress.") d16] d4 ~ |
+	[d16 e( fis a] [)g8 'b-.] |
+	[b8.->( )c16] c4 ~ |
+	[c16\< cis( d \!dis] [)e8-.-"dim." 'fis-.] |
+	[fis8.->( g16] )g4 ~ |
+
+	% (only notes! of) five measures copied from 14 measures above
+	[g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] |
+	b2->-"cresc." ~ |
+	[b8 \[/3 'd16( e fis ]1/1 [)g8 e'-.] |
+	e2-> ~ |
+	[e8 \[/3 ''d16(_"h\\^atez" e fis ]1/1 [)g8\f d'-.] |
+	[d8.-> b16-.] [g16-.-"cresc." d'-. b-. c-.] |
+	[d16\f\< e-. fis-. g-.] [a-. 'b-. c-. \!d-.] 
+}
+
+
+hoboonesecondstart = \melodic{
+	\octave relative;
+% ugh: cant copy: allegro/primo tempo
+	\textstyle "large";
+	[es''16-.\ff^"Tempo 1$^o$" es-. es-. es-.] [es8-. d-.] |
+	\textstyle "italic";
+	
+}
+	
+hoboonelast = \melodic{
+	\octave relative;
+	% could transpose/copy from measure 19...
+	[d''16-.\p  d-. d-. d-.] [d8-. c-.] |
+	es2-> |
+	[es16-. es-. es-. es-.] [es8-. d-.] |
+	f2-> |
+	[f16-. f-. f-. f-.] [f8-. g-.] |
+	r8 [a-.-"cresc." r g-.] |
+	r [a-.\f bes-.\< \!c-.] |
+	[d8.->\> \!bes16] [f8 d] |
+
+	% four measures copied from 8 measures back...
+	[d16-.\p  d-. d-. d-.] [d8-. c-.] |
+	es2-> |
+	[es16-. es-. es-. es-.] [es8-. d-.-"cresc."] |
+	f2-> |
+	[fis16-.\p  fis-. fis-. fis-.] [fis8-. g-.] |
+	% same measure
+	[fis16-.\p  fis-. fis-. fis-.] [fis8-. g-.] |
+	[fis8-. g-. fis-. g-.] |
+	[a-. bes-. a-. bes-. ] |
+	[a-.\f bes-. a-. bes-. ] |
+	[c-.-"cresc." 'f-. g-. a-.] |
+	[bes-. bes-. ces8.-> as16] |
+	[f8-. ges-. es-. ces-.] |
+	% `a deux
+	[as-. bes-. ces8.-> ges16] |
+	[es8-. ces'-. ges-. as-.] |
+	bes\p r r4 |
+	[bes16-.-"cresc." bes-. bes-. bes-.] [bes8-. ces->] |
+	% same measure
+	[bes16-. bes-. bes-. bes-.] [bes8-. ces->] |
+	[bes'16-.\ff bes-. bes-. bes-.] [bes8-. ces16->] r16^"court"-\fermata |
+	% ugh: eight measures rest (ugh: r1 -> four beats...)
+	% eiht measures rest..
+	\textstyle "bold";
+%	r2^"Un peu plus lent et \\'el\\'egant"
+	R2*8
+%	r4 r8\p bes |
+	r4^"Un peu plus lent et \\'el\\'egant"
+	r8\p ''bes |
+%	g2->^"Un peu plus lent et \\'el\\'egant" ~ |
+	g2-> ~ |
+	\textstyle "italic";
+	g8 r r c |
+	c2-> ~ |
+	c8 r r bes'\f |
+	[bes8.->\f g16-.] [es16-. bes-. g-. as-.] |
+	[bes-.-"dim." c-. d-. f-.] [es8-. c-.] |
+	d2-> ~ |
+	[d16-"dim."( es f g] [)'as8 as-.] |
+	[ces8.->\p( )bes16-.] bes4 ~ |
+	[bes16( c! d f] [)es8 'g-.] |
+	[g8.->( )as16] as4 ~ |
+	[as16( a bes b] [)c8-. 'd-.] |
+	% a deux
+	[d8.->( ) es16] es4 ~ |
+	es4 r8 bes'-. |
+	g2-> ~ |
+	g8 r r c |
+	c2 ~ |
+	c8  r r bes' |
+	[bes8.-> g16-.] [es16-. bes-. g-. as-.] |
+	[bes-. c-. d-. es-.] [f-. g-. as-. bes-.] |
+	d8-. r c4-> ~ |
+	[c16 'f-. g-. a-.] [bes-. 'c-. d-. es-.] |
+	g8-. r f4-> ~ |
+	[f16 'bes-. c-. d-.] [es-. f-. g-. as-.] |
+	c8 r bes4 ~ |
+	[bes8 as-. g8.-. e16-.] |
+	g8-. r f4-> ~ |
+	[f8 es-. ces8.-. as16-.] |
+	% `a deux
+	\textstyle "large";
+	[ces8.->^"Plus vite" bes16-.(] [a bes es d] |
+	\textstyle "italic";
+	[)c!8.-> bes16] [a( bes es )d] |
+	[c->( bes es )d] [c->( bes es )d] |
+	% same measure
+	[c->( bes es )d] [c->( bes es )d] |
+	[c( bes a bes] [c d es e] |
+	[g )f d( es] [f g as a] |
+	[c )bes 'bes( c] [d es f g] |
+	[as g f g] [as bes c d] |
+	\textstyle "large";
+	[)es-.^"Tempo 1$^o$" 'g-. g-. g-.] [g8-. g-.] |
+	\textstyle "italic";
+	bes4.-> g8-. |
+	gis2->( |
+	)as! |
+	[g16-. g-. g-. g-.] [g8-. g-.] |
+	bes4.-> g8-. |
+	gis2->( |
+%	)as! |
+	)as |
+	[bes16-. bes-. bes-. bes-.] [bes8-. bes-.] |
+	bes4.-> g8-. |
+	[g16-._"h\\^atez" g-. g-. g-.] [g8-. g-.] |
+	g4.-> g8-. |
+	es4.-> es8-. |
+	bes4.-> bes8-. |
+	\textstyle "large";
+	g'4.->^"Presto" g8-. |
+	\textstyle "italic";
+	es4.-> es8-. |
+	[bes-. bes-. es-. g-.] |
+	[bes-. 'bes-. es-. g-.] |
+	bes-. r r4 |
+	g8-. r r4 |
+	g8-. r r4 |
+}
+
+hoboone = \melodic {
+	\hoboonestart
+	\hobooneintro
+	\hoboonemid
+	\hoboonesecondstart
+	\hobooneintro
+	\hoboonelast
+}
+
+global = \melodic{
+	\key bes es as;
+	\meter 2/4;
+	\skip 4*110;
+	\key fis; |
+	\bar "||";
+	\skip 4*58;
+	\key bes es as; |
+	\bar "||";
+	\skip 4*220;
+	\bar "|.";
+}
+
+
+$staff_hoboone = \type Staff = hoboonestaff <
+	\global
+	\property Staff.instrument = "oboe"
+	\hoboone
+>
+
+a4 = \paper{
+%	\paper_twenty
+	linewidth= 185.\mm;
+	gourlay_maxmeasures = 10.0;
+	Staff = \translator {
+		\type "Engraver_group_engraver";
+		defaultclef = violin;
+
+		\consists "Bar_engraver";
+		\consists "Clef_engraver";
+		\consists "Key_engraver";
+		\consists "Meter_engraver";
+		\consists "Local_key_engraver";
+		\consists "Staff_sym_engraver";
+		\consists "Collision_engraver";
+		\consists "Rest_collision_engraver";
+		\consists "Bar_column_engraver";
+		\consists "Bar_number_engraver";
+		\consists "Separating_line_group_engraver";
+		\consists "Line_group_engraver";
+		  
+		\accepts "Voice";
+	}
+}
+
+a4sixteen = \paper{
+	\paper_sixteen
+	linewidth= 193.\mm;
+	Staff = \translator {
+		\type "Engraver_group_engraver";
+		defaultclef = violin;
+
+		\consists "Bar_engraver";
+		\consists "Clef_engraver";
+		\consists "Key_engraver";
+		\consists "Meter_engraver";
+		\consists "Local_key_engraver";
+		\consists "Staff_sym_engraver";
+		\consists "Collision_engraver";
+		\consists "Rest_collision_engraver";
+		\consists "Bar_column_engraver";
+		\consists "Bar_number_engraver";
+		\consists "Separating_line_group_engraver";
+		\consists "Line_group_engraver";
+		  
+		\accepts "Voice";
+	}
+}
+
+\score{
+	\$staff_hoboone
+	\paper{ \a4 }
+	\midi{
+		\tempo 4 = 80;
+	}
+%	\paper{ \a4sixteen }
+}
+
-- 
2.39.5