From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 1 Oct 1998 20:28:38 +0000 (+0200)
Subject: patch::: 1.0.12.hwn2
X-Git-Tag: release/1.0.13~2
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=7c0081d2e09d35232da5b7b5998f39adfa76d741;p=lilypond.git

patch::: 1.0.12.hwn2
---

diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index 30feb2d0e6..fbaf68ea12 100644
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -687,7 +687,7 @@ So the general form actually is `mycode(\keyword argument argument ... ;)'
 Let us review these commands:
 
 description(
-dit(mymycode(\clef) var(clefname)) This command sets the current clef for notation,
+dit(mycode(\clef) var(clefname)) This command sets the current clef for notation,
   i.e., a clef symbol is printed and the notes following this command
   are shifted vertically.  The argument is a string, the name of the
   new clef. The default clef is the treble clef.
@@ -696,12 +696,12 @@ dit(mymycode(\clef) var(clefname)) This command sets the current clef for notati
     \clef "treble"; c'4
     \clef "alto"; c'4    
   )
-dit(mymycode(\key) var(pitch)) This command changes the current key signature.  The
+dit(mycode(\key) var(pitch)) This command changes the current key signature.  The
   key signature is printed at the start of every line.  The argument
   is the name of the corresponding major key.  The key of C-minor can 
   thus be specified as `mycode(\key es)'.
   
-dit(mymycode(\keysignature) var(pitchlist))
+dit(mycode(\keysignature) var(pitchlist))
 
 This command changes the current key signature.  Unlike the
 `mycode(\key)' command, this command can produce arbitrary key
@@ -714,7 +714,7 @@ command `mycode(\keysignature fis es bis)' provides a more exotic
 example.
 
 
-dit(mymycode(\time) var(numerator)mycode(/)var(denominator))
+dit(mycode(\time) var(numerator)mycode(/)var(denominator))
   This command changes the current time signature.  LilyPond uses the
   time signature to
   calculate where to place the bars that start a measure.  These bars
@@ -730,7 +730,7 @@ song actually has a 2/4 time signature, so a metrically more correct
   )
 
 
-dit(mymycode(\cadenza) var(togglevalue)) When typesetting music without a
+dit(mycode(\cadenza) var(togglevalue)) When typesetting music without a
 regular meter (such as an ad libitum cadenza), no bar lines should be
 printed.  In LilyPond you can achieve this by issuing the command
 `mycode(\cadenza 1)': it turns off the automatically
@@ -740,7 +740,7 @@ You switch them on again with `mycode(\cadenza 0)', and then a bar line
 is printed.  LilyPond will act as if you are again at the start of a
 measure.
 
-dit(mymycode(\bar) var(bartype))
+dit(mycode(\bar) var(bartype))
   This command lets you print special bar
   lines and repeat symbols.  You can also use it to allow line breaks
   when entering cadenzas.  The argument var(bartype) is a string that
@@ -761,7 +761,7 @@ mudela(fragment,verbatim)(
 
 
   
-dit(mymycode(\partial) var(duration)) some music starts with a measure that
+dit(mycode(\partial) var(duration)) some music starts with a measure that
 isn't fully filled, a so-called upstep.  The mycode(\partial) command
 allows you to make
 upsteps. The argument is a duration similar to the duration of a note.
@@ -774,7 +774,7 @@ Example:
     [d'8 dis'] e' c''4 e'8 c''4 
   )
 
-  dit(mymycode(\grouping) var(durationslist)) sets the metric structure of the measure.
+  dit(mycode(\grouping) var(durationslist)) sets the metric structure of the measure.
     Its effect can best be shown by an example:
     mudela(fragment,verbatim)(
         \time 5/16;
@@ -1639,12 +1639,12 @@ mycode(Timing_engraver).
 
 mudela(verbatim)(
 polymetricpaper = \paper {
-  Score = \translator {
+  \translator {
     \ScoreContext
     \remove "Timing_engraver";
   }
 
-  Staff = \translator {
+  \translator {
     \StaffContext
     \consists "Timing_engraver";
   }
diff --git a/TODO b/TODO
index de989a1974..89c536fba3 100644
--- a/TODO
+++ b/TODO
@@ -7,9 +7,23 @@ done, or is an idea that I want to think about
 Most of the items are marked in the code as well, with full explanation. 
 grep for TODO and ugh/ugr/urg
 
+
+BUGS:
+
+	* fix Score.skipBars
+
+	* repeat bars: need distance after ":|" and before "|:"
+
+	* \shape 1st dim skipped? 
+
+	* fix marks/barnumbers/marginal notes
+
+****
+
+
 	* uniformise property names.
 
-	ydirection <-> yDirection
+	* ydirection <-> yDirection
 
 	* typo checks on property names?
 
@@ -28,8 +42,6 @@ grep for TODO and ugh/ugr/urg
 
 	* zip target for binary windows dist (JBR)
 
-	* repeat bars: need distance after ":|" and before "|:"
-
 	* text continuationss
 
 	* revise documentation
@@ -38,10 +50,6 @@ grep for TODO and ugh/ugr/urg
 
 	* junking \skip req in lyrics
 
-	* \shape 1st dim skipped? 
-
-	* Choire -> Choir
-
 	* Language:
 	- general plet mechanism.
 
@@ -64,14 +72,14 @@ grep for TODO and ugh/ugr/urg
 
 	* install TeX stuff into tex/generic directory.
 
+	* /etc/profile.d support for RPM.
+
 	* percussion note heads
 
 	* mi2mu empty staffs.
 
 	* include MIDI list 
 
-	* make separate translation property list.
-
 	* make GNU style webpages.
 
 	* There seems to be an install error in lilypond-1.0.0.  Most of the
diff --git a/VERSION b/VERSION
index 6a630939a4..abbd6eab86 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=12
-MY_PATCH_LEVEL=hwn1
+MY_PATCH_LEVEL=hwn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/init/engraver.ly b/init/engraver.ly
index 2921a518c5..a310e9336c 100644
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -146,6 +146,8 @@ VoiceContext = \translator {
 ScoreContext = \translator {
 	\type Score_engraver;
 	Score;
+	defaultClef = violin;
+
 	\consists "Timing_engraver";
 
 	\consists "Bar_column_engraver";
@@ -184,10 +186,7 @@ ScoreWithNumbers = \translator {
 
 BarNumberingStaffContext = \translator {
 	\StaffContext
-
-
 	barColumnPriority = "0";
-
 	marginBreakPriority = "-4";
 	\consists "Mark_engraver";
 	\consists "Bar_column_engraver";
@@ -199,7 +198,6 @@ BarNumberingStaffContext = \translator {
 HaraKiriStaffContext = \translator {
 	\type "Hara_kiri_line_group_engraver";
 	Staff;
-	defaultclef = violin;
 	barColumnPriority = "0";
 	marginBreakPriority = "-4";
 
@@ -217,6 +215,15 @@ HaraKiriStaffContext = \translator {
 	\accepts "Voice";
 };
 
+OrchestralPartStaffContext = \translator {
+	\HaraKiriStaffContext
+	barColumnPriority = "0";
+	marginBreakPriority = "-4";
+	\consists "Mark_engraver";
+	\consists "Bar_column_engraver";
+	\consists "Bar_number_engraver";
+};
+
 OrchestralScoreContext= \translator {
 	\type Score_engraver;
 	Score;
@@ -224,6 +231,7 @@ OrchestralScoreContext= \translator {
 	markScriptPadding = "4.0";
 	barColumnPriority = "-4";
 	markBreakPriority = "-4";
+	defaultClef = violin;
 
 	\consists "Timing_engraver";
 	\consists "Bar_column_engraver";
diff --git a/input/test/orchestalpart.ly b/input/test/orchestalpart.ly
new file mode 100644
index 0000000000..76916287b6
--- /dev/null
+++ b/input/test/orchestalpart.ly
@@ -0,0 +1,9 @@
+
+\score
+{
+	\notes { c1 c1 \property Score.skipBars = 1 c1 \break R1*8 c1 c1 c1 c1
+	}
+	\paper {
+
+	}
+}
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 52014326e8..cf4db4c84a 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -6,7 +6,6 @@ depth = ..
 NAME = lilypond
 SUBDIRS = include
 
-EXTRA_DIST_FILES = VERSION 
 MODULE_LIBS=$(depth)/lib $(depth)/flower
 
 STEPMAKE_TEMPLATES= c++ executable 
@@ -21,7 +20,4 @@ $(outdir)/lily-version.o: $(outdir)/version.hh
 $(outdir)/main.o: $(outdir)/BLURB.hh $(outdir)/COPERTINA.hh $(outdir)/FLAPTEKST.hh
 
 
-# ugh . -> $(outdir)
-VERSION: $(depth)/VERSION
-	cp $< $@
 
diff --git a/lily/VERSION b/lily/VERSION
index 6a630939a4..e69de29bb2 100644
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,11 +0,0 @@
-PACKAGE_NAME=LilyPond
-MAJOR_VERSION=1
-MINOR_VERSION=0
-PATCH_LEVEL=12
-MY_PATCH_LEVEL=hwn1
-
-# use the above to send patches: MY_PATCH_LEVEL is always empty for a
-# released version.
-#
-# Please don't move these comments up; the patch should fail if 
-# the previous version was wrong.
diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index 8a951de6c7..ab6f25edd7 100644
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -86,7 +86,7 @@ struct Class ## _identifier : Identifier {\
     {\
       return this;\
     }\
-			     virtual Class* access_ ## Class (bool copy_b = true) const;\
+			     virtual Class* access_ ## Class (bool copy_b) const;\
 			     ~Class ## _identifier();\
 			     virtual void do_print () const; \
 			     virtual String do_str () const; \
diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 8a3928c4be..86a20a731e 100644
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -40,7 +40,7 @@ Music_output_def::Music_output_def (Music_output_def const &s)
   
   for (Dictionary_iter<Identifier*> i (*translator_p_dict_p_);  i.ok (); i++)
     {
-      Translator * t = i.val ()->access_Translator ();
+      Translator * t = i.val ()->access_Translator (false);
       t-> output_def_l_ = this;
     }
 }
diff --git a/lily/parser.yy b/lily/parser.yy
index 10e1b8df1a..45a5f2ba03 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -328,7 +328,7 @@ notenames_body:
 		$$ = new Notename_table;
 	}
 	| NOTENAME_TABLE_IDENTIFIER	{
-		$$ = $1-> access_Notename_table();
+		$$ = $1-> access_Notename_table(true);
 	}
 	| notenames_body STRING '=' explicit_musical_pitch {
 		(*$$)[*$2] = *$4;
@@ -425,7 +425,7 @@ translator_spec:
 
 translator_spec_body:
 	TRANS_IDENTIFIER	{
-		$$ = $1->access_Translator ();
+		$$ = $1->access_Translator (true);
 		$$-> set_spot (THIS->here_input ());
 	}
 	| TYPE STRING ';'	{
@@ -497,7 +497,7 @@ score_body:		{
 		$$ = new Score;
 	}
 	| SCORE_IDENTIFIER {
-		$$ = $1->access_Score ();
+		$$ = $1->access_Score (true);
 	}
 	| score_body mudela_header 	{
 		$$->header_p_ = $2;
@@ -557,7 +557,7 @@ paper_def_body:
 		$$ = p;
 	}
 	| PAPER_IDENTIFIER optional_semicolon	{
-		Paper_def *p = $1->access_Paper_def ();
+		Paper_def *p = $1->access_Paper_def (true);
 		THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
 		$$ = p;
 	}
@@ -585,10 +585,7 @@ real_primary:
 		$$ = $1;
 	}
 	| REAL_IDENTIFIER		{
-		Real *r_p = $1->access_Real ();
-		$$ = * r_p;
-		DOUT << "Lookup real: " << *r_p << "\n";
-		delete r_p;
+		$$= *$1->access_Real (false);
 	}
 	| dim
 	| '(' real ')' {
@@ -637,7 +634,7 @@ midi_body: /* empty */ 		{
 		$$ = THIS->default_midi_p ();
 	}
 	| MIDI_IDENTIFIER	{
-		$$ = $1-> access_Midi_def ();		
+		$$ = $1-> access_Midi_def (true);
 	}
 	| midi_body translator_spec	{
 		$$-> assign_translator ($2);
@@ -700,7 +697,7 @@ Music:
 		$$ = new Transposed_music ($3, *$2);
 		delete $2;
 	}
-	| MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
+	| MUSIC_IDENTIFIER { $$ = $1->access_Music (true); }
 	| NOTES
 		{ THIS->lexer_p_->push_note_state (); }
 	Music
@@ -792,7 +789,7 @@ abbrev_command_req:
 		$$ = new Barcheck_req;
 	}
 	| COMMAND_IDENTIFIER	{
-		$$ = $1->access_Request ();
+		$$ = $1->access_Request (true);
 	}
 	;
 
@@ -888,7 +885,7 @@ structured_post_request:
 
 post_request:
 	POST_REQUEST_IDENTIFIER	{
-		$$ = (Request*)$1->access_Request ();
+		$$ = (Request*)$1->access_Request (true);
 	}
 	| dynamic_req {
 		$$ = $1;
@@ -1229,7 +1226,7 @@ steno_duration:
 		     }
 	}
 	| DURATION_IDENTIFIER	{
-		$$ = $1->access_Duration ();
+		$$ = $1->access_Duration (true);
 	}
 	| steno_duration '.' 	{
 		$$->dots_i_ ++;
@@ -1327,9 +1324,7 @@ int:
 		$$ = -$2;
 	}
 	| INT_IDENTIFIER	{
-		int *i_p = $1->access_int ();
-		$$ = *i_p;
-		delete i_p;
+		$$ = *$1->access_int (false);
 	}
 	;
 
@@ -1338,10 +1333,7 @@ string_primary:
 		$$ = $1;
 	}
 	| STRING_IDENTIFIER	{
-		String *s_p = $1->access_String ();
-
-		$$ = s_p;
-		DOUT << "Lookup string: " << *s_p << "\n";
+		$$ = $1->access_String (true);
 	}
 	;
 
@@ -1378,7 +1370,7 @@ symtables_body:
 		$$ = new Lookup;
 	}
 	| IDENTIFIER		{
-		$$ = $1->access_Lookup ();
+		$$ = $1->access_Lookup (true);
 	}
 	| symtables_body FONT STRING 		{
 		$$->font_ = *$3;
diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index 77fa91d8eb..9cf5c4b8cf 100644
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -92,3 +92,4 @@
 1.0.12
 1.0.12.am1
 1.0.12.hwn1
+1.0.12.hwn2
diff --git a/mi2mu/GNUmakefile b/mi2mu/GNUmakefile
index 067b0c5c17..cb87334f7d 100644
--- a/mi2mu/GNUmakefile
+++ b/mi2mu/GNUmakefile
@@ -9,7 +9,6 @@ MODULE_NAME = mi2mu
 SUBDIRS = include
 EXTRA_DIST_FILES += TODO
 MODULE_LIBS=$(depth)/lib $(depth)/flower
-
 STEPMAKE_TEMPLATES=c++ executable
 
 include $(depth)/make/stepmake.make 
@@ -21,5 +20,3 @@ midi-lexer.l:	$(outdir)/midi-parser.hh
 
 $(outdir)/mi2mu-version.o: $(outdir)/version.hh
 
-VERSION: $(depth)/VERSION
-	cp $< $@
diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly
index 43bf8760e8..5f9a6ea234 100644
--- a/mutopia/Coriolan/bassi-part.ly
+++ b/mutopia/Coriolan/bassi-part.ly
@@ -26,7 +26,7 @@ $bassi = \type GrandStaff = bassi_group <
 
 \score{
 	\$bassi
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index 363c427b71..60e77fc986 100644
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -13,7 +13,7 @@ copyright =	 "public domain";
 \include "clarinetti.ly"
 \score{
 	\$clarinetti_staff
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly
index 722dca5083..5562da4dd9 100644
--- a/mutopia/Coriolan/contrabasso-part.ly
+++ b/mutopia/Coriolan/contrabasso-part.ly
@@ -14,7 +14,7 @@ copyright =	 "public domain";
 
 \score{
 	\$contrabasso_staff 
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
new file mode 100644
index 0000000000..40c4ce7d3c
--- /dev/null
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -0,0 +1,9 @@
+
+\paper { \translator {
+	\OrchestralPartStaffContext
+
+	}
+	\translator { \ScoreContext
+		skipBars = 1;	
+	}
+}
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index 33d155f495..b1831d5ca8 100644
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -63,7 +63,7 @@ strijkers = \type StaffGroup = strijkers_group <
 	\$bassi
 >
 
- \include "score-paper.ly"
+
 \score{
 	<
 		\property Score . textstyle =  "italic"
@@ -76,6 +76,7 @@ strijkers = \type StaffGroup = strijkers_group <
 	\paper{
 		% Give hara-kiri something to do...
 		linewidth = 130.0\mm;
+		\translator { \OrchestralScoreContext }
 	}
 	\midi{ \tempo 4 = 160; }
 }
diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index 0486c83125..33a62d0755 100644
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -13,7 +13,7 @@ copyright =	 "public domain";
 \include "corni.ly"
 \score{
 	\$corni_staff
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index 59ca4c916e..01f7b5f2d2 100644
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -15,7 +15,7 @@ copyright =	 "public domain";
 \include "fagotti.ly"
 \score{
 	\$fagotti_staff
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 7c497e009e..b588c6ec27 100644
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -16,7 +16,7 @@ copyright =	 "public domain";
 
 \score{
 	\$flauti_staff
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index 6869ab8e73..9c8f03f82f 100644
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -16,7 +16,7 @@ copyright =	 "public domain";
 
 \score{
 	\$oboi_staff 
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index 0452afad65..fd10ff1505 100644
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -15,7 +15,7 @@ copyright =	 "public domain";
 \include "trombe.ly"
 \score{
 	\$trombe_staff 
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly
index 37de6ee6d3..42bc8c95b3 100644
--- a/mutopia/Coriolan/viola-part.ly
+++ b/mutopia/Coriolan/viola-part.ly
@@ -27,7 +27,7 @@ $viola_staff = \type Staff = violai <
 
 \score{
 	\$viola_staff
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly
index a367ac3173..a1b2a54829 100644
--- a/mutopia/Coriolan/violino-1-part.ly
+++ b/mutopia/Coriolan/violino-1-part.ly
@@ -14,7 +14,7 @@ copyright =	 "public domain";
 
 \score{
 	\$violino1_staff 
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly
index 0e7231b183..b56fc8fbcb 100644
--- a/mutopia/Coriolan/violino-2-part.ly
+++ b/mutopia/Coriolan/violino-2-part.ly
@@ -14,7 +14,7 @@ copyright =	 "public domain";
 
 \score{
 	\$violino2_staff 
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly
index 6c0dffe102..972103b6ce 100644
--- a/mutopia/Coriolan/violoncello-part.ly
+++ b/mutopia/Coriolan/violoncello-part.ly
@@ -14,7 +14,7 @@ copyright =	 "public domain";
 
 \score{
 	\$violoncello_staff 
-	\include "part-paper.ly"
+	\include "coriolan-part-paper.ly"
 	\midi{ \tempo 4 = 160; }
 }
 
diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index b8c08e12c1..c4aa806955 100644
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -304,13 +304,13 @@ $staff_hoboone = \type Staff = hoboonestaff <
 >
 
 a4 = \paper{
-	\include "bar-numbering.ly"
+	\translator{ \BarNumberingStaffContext }
 }
 
 a4sixteen = \paper{
 	\paper_sixteen
 	linewidth= 193.\mm;
-	\include "bar-numbering.ly"
+	\translator { \BarNumberingStaffContext }
 }
 
 \score{
diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index 7c3589bcf2..055c306010 100644
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -448,7 +448,7 @@ $grand_staff = \type GrandStaff<
 		\$lyric_staff
 		{ \notes \transpose a { \$grand_staff } }
 	>
-	\include "score-paper.ly";
+	\paper { \translator { \OrchestralScoreContext }}
 	\midi{
 		\tempo 4 = 54;
 	}
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 68c065b9fc..cfade84d89 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -3,7 +3,7 @@
 
 .PHONY : all clean config default dist doc doc++  exe help html lib TAGS\
 	 po
-
+VPATH=$(outdir)/		#ugh?
 # target all:
 #
 all:	 default
@@ -119,9 +119,12 @@ TAGS:
 
 	$(LOOP)
 
-$(outdir)/version.hh: VERSION
-	sh ./$(step-bindir)/make-version.sh > $@
+# ugh . -> $(outdir)
+$(outdir)/VERSION: $(depth)/VERSION
+	cp $< $@
 
+$(outdir)/version.hh: VERSION
+	sh ./$(step-bindir)/make-version.sh $< > $@
 
 # should this be in Rules?
 configure: configure.in aclocal.m4
diff --git a/tex/lilypond-latex.tex b/tex/lilypond-latex.tex
index 1da26f84cd..97b6f320ac 100644
--- a/tex/lilypond-latex.tex
+++ b/tex/lilypond-latex.tex
@@ -66,7 +66,6 @@
                         \ifnum\thepage=1{\hfil \LilyIdString}%
                         \else{foo\hfil\the\pageno\hfil}%
                         \fi}}%
-\fi
 \nopagenumbers
 }