From: fred <fred>
Date: Sun, 24 Mar 2002 20:08:58 +0000 (+0000)
Subject: lilypond-0.1.53
X-Git-Tag: release/1.5.59~3252
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f61e63c32dd2884b4ae3f932d9df7d2e5791ea88;p=lilypond.git

lilypond-0.1.53
---

diff --git a/Documentation/PATCHES.pod b/Documentation/PATCHES.pod
index e98860d082..6e5e1a134c 100644
--- a/Documentation/PATCHES.pod
+++ b/Documentation/PATCHES.pod
@@ -42,15 +42,14 @@ In F<NEWS>, enter a summary of changes:
 	pl 0.1.48.jcn1
 		- added PATCHES.pod
 
-Then, type something like
+Then, from the top of Lily's source tree, type
 
-    make dist
-    mv out/lilypond-0.1.48.jcn1.tar.gz ../releases
+    make distclean  # if you don't use --srcdir configure
     make-patch
 
 which leaves your patch as F<./patch-0.1.48.jcn1>.
 
-or even simpler:
+If you didn't configure Lily using --srcdir, you can do:
 
     release
 
diff --git a/bin/autowild b/bin/autowild
index e2e5638735..0371058399 100755
--- a/bin/autowild
+++ b/bin/autowild
@@ -17,7 +17,7 @@ for i in $WILD_MAKEFILES; do
 	dir=$(dirname $i)
 	wild=$(basename $i)
 	make=$(basename $i .wild)
-	TOPDIR=`pwd`
+	TOPDIR=${LILYPOND_SOURCEDIR-`pwd`}
 	(cd $dir
 
 	$verbose -n "trying $dir/$make.. "
diff --git a/bin/conflily.in b/bin/conflily.in
index f175c17586..3b42fc3ebc 100644
--- a/bin/conflily.in
+++ b/bin/conflily.in
@@ -32,5 +32,7 @@ if [ "x$LILYINCLUDE" = "x" ]; then
 	echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf"
 fi
 
-configure --prefix=/usr --enable-debugging --enable-printing --enable-checking
+mkdir -f ../build
+(cd ../build; 
+../current/configure --prefix=/usr --enable-debugging --enable-printing --enable-checking)
 
diff --git a/init/table16.ly b/init/table16.ly
index 415cfa8353..d9680a0f19 100644
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -12,7 +12,8 @@ table_sixteen=
 
      "style" = \table {
 		"bold"	"\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
-		"roman"	"\settext{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
+%		"roman"	"\settext{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
+		"roman"	"\settext{%}"	0.0\pt	9.50\pt	0.0\pt	8.0\pt
 		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
 		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	8.0\pt
 		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	4.0\pt
diff --git a/input/test-lyrics.ly b/input/test-lyrics.ly
index 7fb5d45daa..c1a8a944b8 100644
--- a/input/test-lyrics.ly
+++ b/input/test-lyrics.ly
@@ -1,10 +1,64 @@
+$somewhat_long = \lyric{
+	\textstyle "roman" ;
+	AaaaaaA2
+	BbbbbbB2
+	CcccccC2 
+	DdddddD2
+	EeeeeeE2
+	FfffffF2
+}
+
+$rather_long = \lyric{
+	\textstyle "roman" ;
+	LLLLoooonggggg2 
+	Syyllllaaabbble2 
+	LLLLoooonggggg2 
+	Syyllllllaaabbble2
+	LLLLoooonggggg2 
+	Syyyylllaaabbble2
+}
+
+$quite_long = \lyric{
+	\textstyle "roman" ;
+	LLLLLLLLLooooongggggggg2 
+	Syyyyyyyyyyyyylllllllaaaaaabbble2 
+	LLLLLLLLLooooongggggggg2 
+	Syyyyyyyyyyyyylllllllaaaaaabbble2
+	LLLLLLLLLooooongggggggg2 
+	Syyyyyyyyyyyyylllllllaaaaaabbble2
+}
+
+$somewhat_long_lyrics_staff = \type Lyrics = somewhat <
+	\$somewhat_long
+>
+
+$rather_long_lyrics_staff = \type Lyrics = rather <
+	\$rather_long
+>
+
+$quite_long_lyrics_staff = \type Lyrics = quite <
+	\$quite_long
+>
+
+melody = \melodic{
+	\octave c'; 
+	c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4
+	c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4
+}
+
+$melodic_staff = \type Staff = mel <
+	\melody
+>
 
 \score
 {
-	< \type Staff 
-		\melodic { \octave c'; c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  c4 e4 g4 e4  }
-	\type Lyrics
-		\lyric { LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 }
+	<
+		\$melodic_staff
+		\$somewhat_long_lyrics_staff	
+%		\$rather_long_lyrics_staff	
+%		\$quite_long_lyrics_staff	
 	>
+	\paper{
+%		castingalgorithm = \Wordwrap;	
+	}
 }
-	
diff --git a/lib/include/Makefile.am.wild b/lib/include/Makefile.am.wild
index 3d8f060700..9f406b5501 100644
--- a/lib/include/Makefile.am.wild
+++ b/lib/include/Makefile.am.wild
@@ -2,5 +2,13 @@
 
 noinst_HEADERS = $(wildcard *.hh)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
diff --git a/lib/template.cc b/lib/template.cc
index 781a53d279..2ea84593a9 100644
--- a/lib/template.cc
+++ b/lib/template.cc
@@ -12,17 +12,8 @@
 #include "cursor.tcc"
 #include "list.tcc"
 
-#if 0
+#if !defined(__CYGWIN32__) && __GNUC_MINOR__ < 8
 LIST_INSTANTIATE (void *);
-
-#else
-
-    static void force_list_members ()
-    {
-    List<void*> bla;
-    bla.top().add ((void*)0);
-    }
-
 #endif
 
 POINTERLIST_INSTANTIATE (Source_file);
diff --git a/lily/include/Makefile.am.wild b/lily/include/Makefile.am.wild
index 3540ce1719..e3d95d5172 100644
--- a/lily/include/Makefile.am.wild
+++ b/lily/include/Makefile.am.wild
@@ -2,5 +2,13 @@
 
 noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index f688baf6d5..36ba0668b9 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -55,11 +55,14 @@ String
 Midi_chunk::str () const
 {
   String str = header_str_;
+  String dat = data_str ();
+  // huh, huh??
+//  String length_str = String_convert::i2hex_str (dat.length_i () 
   String length_str = String_convert::i2hex_str (data_str_.length_i () 
     + footer_str_.length_i (), 8, '0');
   length_str = String_convert::hex2bin_str (length_str);
   str += length_str;
-  str += data_str ();
+  str += dat;
   str += footer_str_;
   return str;
 }
diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 0a741a104a..35af4fff2d 100644
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -68,7 +68,12 @@ Staff_side::get_position_f () const
   Real inter_f = paper()-> internote_f ();
 
   Interval v= support_height();
-  y = v[dir_] + 2 * dir_ * inter_f;	// ugh
+  if (inside_staff_b_)
+    // ugh: i don't know why, but this is needed for inside-staff
+    y = v[dir_] + 2 * dir_ * inter_f;	// ugh
+  else
+    // get accents just above staff; (fermata etc.: ugh)
+    y = v[dir_] - 3 * dir_ * inter_f;
 
   return y;
 }
diff --git a/lily/template4.cc b/lily/template4.cc
index 820b07be3d..062c1e1a8d 100644
--- a/lily/template4.cc
+++ b/lily/template4.cc
@@ -6,23 +6,23 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#ifndef __CYGWIN32__
 #include "proto.hh"
 #include "pcursor.hh"
 #include "plist.hh"
-/*
+#include "spanner.hh"
+#include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
 #include "p-col.hh"
 #include "p-score.hh"
-*/
 #include "cursor.tcc"
 #include "list.tcc"
 #include "pcursor.tcc"
 #include "plist.tcc"
 
-/*
 POINTERLIST_INSTANTIATE(Audio_item);
 POINTERLIST_INSTANTIATE(Audio_staff);
 POINTERLIST_INSTANTIATE(Paper_column);
 POINTERLIST_INSTANTIATE(Paper_score);
-*/
+#endif
diff --git a/mf/Makefile.am.wild b/mf/Makefile.am.wild
index 245d7f7eb6..aa7ff51dff 100644
--- a/mf/Makefile.am.wild
+++ b/mf/Makefile.am.wild
@@ -12,13 +12,13 @@ outdir = .
 TEXFILES = $(wildcard *.tex)
 MFFILES = $(wildcard *.mf)
 MFDEPS = $(outdir)/mf.dep
-EXTRA_DIST = Makefile.am.wild Rules.make $(MFFILES) $(TEXFILES) TODO README
+EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO README
 
 FONT_FILES = $(wildcard *[0-9].mf)
 FET_FILES = $(wildcard feta[0-9]*.mf)
 
-lyout = $(depth)/init
-texout = $(depth)/tex
+lyout = $(top_builddir)/init
+texout = $(top_builddir)/tex
 LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
 TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 
diff --git a/mf/Rules.make b/mf/Rules.make
index 9c6f8679a1..7c7881c57b 100644
--- a/mf/Rules.make
+++ b/mf/Rules.make
@@ -1,22 +1,22 @@
 
-$(outdir)/%.dvi: %.mf
+$(top_builddir)/mf/%.dvi: %.mf
 	mf $<
 	gftodvi  $(basename $<)
 #	mv $(basename $<).dvi $(outdir)
-	rm $(basename $<).*gf
+#	rm $(basename $<).*gf
 
-$(outdir)/%.log: %.mf
+$(top_builddir)/mf/%.log: %.mf
 	mf $<
 #	mv $(@F) $@
-	rm $(basename $< ).*gf
+#	rm $(basename $< ).*gf
 
-$(lyout)/%.ly $(texout)/%.tex: $(outdir)/%.log
-	$(PYTHON) $(depth)/bin/mf-to-table --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
+$(lyout)/%.ly $(texout)/%.tex: $(top_builddir)/mf/%.log
+	$(PYTHON) $(top_builddir)/bin/mf-to-table --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
 
 $(MFDEPS): $(FONT_FILES)
 # do something silly to avoid barfs if python not installed.
 	echo > $@
-	$(PYTHON) $(depth)/bin/mf-deps $^ >> $@
+	$(PYTHON) $(top_builddir)/bin/mf-deps $^ >> $@
 
 # silly workaround for stupid TeXs
 systempks:
diff --git a/mi2mu/include/Makefile.am.wild b/mi2mu/include/Makefile.am.wild
index 1cf201f1c6..d03dd28817 100644
--- a/mi2mu/include/Makefile.am.wild
+++ b/mi2mu/include/Makefile.am.wild
@@ -1,6 +1,14 @@
-# lib/include/Makefile.am.wild
+# mi2mu/include/Makefile.am.wild
 
 noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
+
+# override default target for all-am: to get an extra dependency
+# all-am: Makefile $(PROGRAMS) wild-check
+# ugh, automake doesn't generate the all-am target here...
+all: Makefile $(HEADERS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 
diff --git a/mutopia/los-toros-oboe-20.tex b/mutopia/los-toros-oboe-20.tex
new file mode 100644
index 0000000000..910651a6f5
--- /dev/null
+++ b/mutopia/los-toros-oboe-20.tex
@@ -0,0 +1,24 @@
+\documentclass{article}         %UGH
+\usepackage{a4}
+
+%
+% UGH UGH
+\advance\oddsidemargin-30mm
+\evensidemargin\oddsidemargin
+% ugh, centre
+\advance\textwidth60mm
+\advance\topmargin-20mm
+\addtolength{\textheight}{40mm}
+\pagestyle{empty}
+\begin{document}
+\input lilyponddefs
+\input titledefs
+\def\interscoreline{\vskip3mm}
+\title{La Feria\normalsize\\[2ex]Los Toros}
+\composer{Paul Lac\^ome d'Estalenx (1838-1920)}
+%\instrument{} % heu
+%#%\tempo{M\"a\ss ig}
+\makelilytitle
+\input{los-toros-oboe.tex}
+%\input lelie.tex
+\end{document}
diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 04c6d9b80d..20f454567e 100644
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -7,18 +7,29 @@ enteredby =	 "jcn";
 copyright =	 "public domain";
 } 
 
+\include "paper20.ly"
 
-hobo1 = \melodic{
+hoboonestart = \melodic{
+% ugh: can't copy: allegro/primo tempo
 	\octave c';
-	[es'16-. es'-. es'-. es'-.] [es'8-. d'-.] |
+	\textstyle "roman";
+	[es'16-.-"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] |
+	\textstyle "italic";
+}
+
+hobooneintro = \melodic{
+	\octave c';
+%	\textstyle "roman";
+%	[es'16-.-"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] |
+%	\textstyle "italic";
 	[f'8.-> es'16(] [)d'8 c'-.] |
 	[bes16( c' d' es'] [)d'8 c'-.] |
 	[bes-. as->~] [as16( g f g] |
 	[as bes c' d'] [)es'8 c'-.] |
 	[d'8-. c'16( bes] )a4 ~ |
-	[as16 g f g] [as c' bes as] |
-%	[)g8 as16(] [)f8 g16( f] |
-	[)g8. as16(] [)f8 g16( f] |
+	[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'-.] [es'8-. d'-.] |
 	[f'8.-> es'16(] [)d'8 c'-.] |
@@ -29,20 +40,30 @@ hobo1 = \melodic{
 	[g'16 f'( es' d'] [c' es'  d' c'] |
 	[)bes8 c'16( bes] [)a8 bes16( a] |
 	[)g8  r d'] r |
+}
+
+hoboonemid = \melodic{
+	\octave c';
 	[g16-. g-. g-. g-.] [g8-. f-.] |
 	as2-> |
 	[as16-. as-. as-. as-.] [as8-. g-.] |
 	bes2-> |
 	[bes16-. bes-. bes-. bes-.] [bes8-. c'] |
+
 	r-"cresc." [d'8-. r c'-.] |
 	r\f [d'-. es'-. f'-.] |
 	[g'8.-> es'16] [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'-.] |
@@ -58,21 +79,208 @@ hobo1 = \melodic{
 	[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 2
+	% `a deux
+	[d8 d'] [es'8.-> c'16] |
+	[a8 bes g es] |
+	[c' d' es8. bes16] |
+	[g8 es bes c] |
+	[d16-. d-. d-. d-.] [d8.-. es16->] |
+	[d'16-.-"cresc." d'-. d'-. d'-.] [d'8.-. es'16->] |
+	[d'16-. d'-. d'-. d'-.] [d'8.-. es'16->] |
+	[d'16 d' d' d'] [d'8 es'16-.] r16-\fermata-"court"-"tr\\`es" |
+	% Un peu plus lent.
+	\textstyle "roman";
+
+% ugh
+%	d'4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant"
+	d'4(\<^"Un peu plus lent"
+	\textstyle "italic"; 
+	[e'8_"tr\\`es \\'el\\'egant" \!f'8] |
+	[)b'-. a'-.] [g16( fis' e' )d'] |
+	[d'( c' b\< c'] [)\!f'8-. e'-.] |
+	d4-> ~ [d16 e( fis g] |
+	[a b\< d' fis] [)\!a'8-. g'-.] |
+	[fis'16( e' a )c'] e'4 ~ |
+	[e'16 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'-.] |
+	e'2-> ~ |
+	[e'8 \[/3 d16( e fis ]1/1 [)g8\f d'-.] |
+	[d'8.-> b'16-.] [g'16-. d'-. b-. c'-.] |
+	[d'-. e'-. fis'-. a'-.] [g'8-. e'-.] |
+	fis'2-> ~ |
+	[fis'16 g'-.\< a'-. b'-.] [\!c''8-. c'-.] |
+	[es'8.->(-"espress.") d'16] d'4 ~ |
+	[d'16 e'( fis a'] [)g'8 b-.] |
+	[b8.->( )c'16] c4 ~ |
+	[c'16\< cis'( d' \!dis'] [)e'8-.-"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'-.] |
+	e'2-> ~ |
+	[e'8 \[/3 d16(_"h\\^atez" e fis ]1/1 [)g8\f d'-.] |
+	[d'8.-> b16-.] [g16-.-"cresc." d'-. b-. c'-.] |
+	[d'16\f\< e'-. fis'-. g'-.] [a'-. b-. c'-. \!d'-.] 
+}
+
+
+hoboonesecondstart = \melodic{
+	\octave c';
+% ugh: can't copy: allegro/primo tempo
+	\textstyle "roman";
+	[es'16-.\ff^"Tempo 1$^o$" es'-. es'-. es'-.] [es'8-. d'-.] |
+	\textstyle "italic";
+	
+}
+	
+hoboonelast = \melodic{
+	\octave c';
+	% could transpose/copy from measure 19...
+	[d'16-.\p  d'-. d'-. d'-.] [d'8-. c'-.] |
+	es'2-> |
+	[es'16-. es'-. es'-. es'-.] [es'8-. d'-.] |
+	f'2-> |
+	[f'16-. f'-. f'-. f'-.] [f'8-. g'-.] |
+	r8 [a'-.-"cresc." r g'-.] |
+	r [a'-.\f bes'-.\< \!c''-.] |
+	[d''8.->\> \!bes'16] [f'8 d'] |
+
+	% four measures copied from 8 measures back...
+	[d'16-.\p  d'-. d'-. d'-.] [d'8-. c'-.] |
+	es'2-> |
+	[es'16-. es'-. es'-. es'-.] [es'8-. d'-.-"cresc."] |
+	f'2-> |
+	[fis'16-.\p  fis'-. fis'-. fis'-.] [fis'8-. g'-.] |
+	% same measure
+	[fis'16-.\p  fis'-. fis'-. fis'-.] [fis'8-. g'-.] |
+	[fis'8-. g-. fis-. g-.] |
+	[a'-. bes'-. a'-. bes'-. ] |
+	[a'-.\f bes'-. a'-. bes'-. ] |
+	[c''-.-"cresc." f'-. g'-. a'-.] |
+	[bes'-. bes'-. ces''8.-> as'16] |
+	[f'8-. ges'-. es'-. ces'-.] |
+	% `a deux
+	[as-. bes-. ces'8.-> ges16] |
+	[es8-. ces'-. ges-. as-.] |
+	bes\p r r4 |
+	[bes16-.-"cresc." bes-. bes-. bes-.] [bes8-. ces'->] |
+	% same measure
+	[bes16-. bes-. bes-. bes-.] [bes8-. ces'->] |
+	\textstyle "roman";
+	[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";
+	r4 r8\p bes |
+	g2-> ~ |
+	g8 r r c' |
+	c'2-> ~ |
+	c'8 r r bes'\f |
+	[bes'8.->\f g'16-.] [es'16-. bes-. g-. as-.] |
+	[bes-.-"dim." c'-. d'-. f'-.] [es'8-. c'-.] |
+	d'2-> ~ |
+	[d'16-"dim."( es' f' g'] [)as'8 as-.] |
+	[ces'8.->\p( )bes16-.] bes4 ~ |
+	[bes16( c' d' f] [)es'8 g-.] |
+	[g8.->( )as16] as4 ~ |
+	[as16( a bes b] [)c'8-. d-.] |
+	% a deux
+	[d8.->( ) es16] es4 ~ |
+	es4 r8 bes-. |
+	g2-> ~ |
+	g8 r r c' |
+	c'2 ~ |
+	c'8  r r bes' |
+	[bes'8.-> g'16-.] [es'16-. bes-. g-. as-.] |
+	[bes-. c'-. d'-. es'-.] [f'-. g'-. as'-. bes'-.] |
+	d''8-. r c''4-> ~ |
+	[c''16 f-. g'-. a-.] [bes'-. c'-. d'-. es'-.] |
+	g'8-. r f'4-> ~ |
+	[f'16 bes-. c'-. d-.] [es'-. f'-. g-. as-.] |
+	c''8 r bes'4 ~ |
+	[bes'8 as'-. g'8.-. e'16-.] |
+	g'8-. r f4-> ~ |
+	[f'8 es'-. ces'8.-. as16-.] |
+	% `a deux
+	\textstyle "roman";
+	[ces'8.->^"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''] |
+	[)es''-.^"Tempo 1$^o$" g'-. g'-. g-.] [g'8-. g'-.] |
+	bes'4.-> g'8-. |
+	gis'2->( |
+	)as'! |
+	[g'16-. g'-. g'-. g-.] [g'8-. g'-.] |
+	bes'4.-> g'8-. |
+	gis'2->( |
+%	)as'! |
+	)as' |
+	[bes'16-. bes'-. bes'-. bes-.] [bes'8-. bes'-.] |
+	bes'4.-> g'8-. |
+	[g'16-._"h\\^atez" g'-. g'-. g-.] [g'8-. g'-.] |
+	g'4.-> g'8-. |
+	es'4.-> es'8-. |
+	bes4.-> bes8-. |
+	\textstyle "roman";
+	g'4.->^"Presto" g'8-. |
+	\textstyle "italic";
+	es'4.-> es'8-. |
+	[bes-. bes-. es'-. g-.] |
+	[bes'-. bes-. es'-. g'-.] |
+	bes'-. r r4 |
+	g'8-. r r4 |
+	g'8-. r r4 |
+}
+
+hoboone = \melodic {
+	\hoboonestart
+	\hobooneintro
+	\hoboonemid
+	\hoboonesecondstart
+	\hobooneintro
+	\hoboonelast
 }
 
 global = \melodic{
 	\key bes es as;
 	\meter 2/4;
+	\skip 4*106;
+	\bar "||";
+	\key fis;
+	\skip 4*60;
+	\bar "||";
+	\key bes es as;
 }
 
-$staff_hobo1 = \type Staff = hobo1 <
+
+$staff_hoboone = \type Staff = hoboonestaff <
 	\global
-	\hobo1
+	\property Staff.instrument = "oboe"
+	\hoboone
 >
 
+a4 = \paper{
+	\paper_twenty
+	linewidth= 195.\mm;
+}
+
 \score{
-	\$staff_hobo1
-	\paper{}
-	\midi{}
+	\$staff_hoboone
+	\paper{ \a4 }
+	\midi{
+		\tempo 4 = 120;
+	}
 }
+