]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.0.12.hwn2
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Thu, 1 Oct 1998 20:28:38 +0000 (22:28 +0200)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Thu, 1 Oct 1998 20:28:38 +0000 (22:28 +0200)
30 files changed:
Documentation/tex/tutorial.yo
TODO
VERSION
init/engraver.ly
input/test/orchestalpart.ly [new file with mode: 0644]
lily/GNUmakefile
lily/VERSION
lily/include/identifier.hh
lily/music-output-def.cc
lily/parser.yy
make/STATE-VECTOR
mi2mu/GNUmakefile
mutopia/Coriolan/bassi-part.ly
mutopia/Coriolan/clarinetti-part.ly
mutopia/Coriolan/contrabasso-part.ly
mutopia/Coriolan/coriolan-part-paper.ly [new file with mode: 0644]
mutopia/Coriolan/coriolan.ly
mutopia/Coriolan/corni-part.ly
mutopia/Coriolan/fagotti-part.ly
mutopia/Coriolan/flauti-part.ly
mutopia/Coriolan/oboi-part.ly
mutopia/Coriolan/trombe-part.ly
mutopia/Coriolan/viola-part.ly
mutopia/Coriolan/violino-1-part.ly
mutopia/Coriolan/violino-2-part.ly
mutopia/Coriolan/violoncello-part.ly
mutopia/los-toros-oboe.ly
mutopia/standchen.ly
stepmake/stepmake/generic-targets.make
tex/lilypond-latex.tex

index 30feb2d0e64d2b22e7fa5225d8242fda4542687f..fbaf68ea12d26987d882d0691a14846053c2a045 100644 (file)
@@ -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 de989a19742fb1eee90ada9420fee90353265a14..89c536fba333940319cc2bcdd4548515072a6dae 100644 (file)
--- 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 6a630939a4246dbb275a4f8727dabd940469ba8e..abbd6eab86328abac92f19d0fa48abe9072c5968 100644 (file)
--- 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.
index 2921a518c53e7e99f6efb59b02f3023256b5a007..a310e9336c76bcdc10ee0dc06c60f4505fc235d4 100644 (file)
@@ -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 (file)
index 0000000..7691628
--- /dev/null
@@ -0,0 +1,9 @@
+
+\score
+{
+       \notes { c1 c1 \property Score.skipBars = 1 c1 \break R1*8 c1 c1 c1 c1
+       }
+       \paper {
+
+       }
+}
index 52014326e820f9e676f8a822086596e173fd357f..cf4db4c84a3a529f325b1a939547f2ca5233fc9d 100644 (file)
@@ -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 $< $@
 
index 6a630939a4246dbb275a4f8727dabd940469ba8e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -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.
index 8a951de6c715edfcbb7ebb715e37e0b4a5621518..ab6f25edd764f969fba3ca0b87ffc2e689f7d2af 100644 (file)
@@ -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; \
index 8a3928c4be09e766245df934f96b64cc278db727..86a20a731e862e20bc8a2bdd42501d555b8d56f0 100644 (file)
@@ -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;
     }
 }
index 10e1b8df1a817e513033edea21cd0d230985f041..45a5f2ba032555ecfba00acafffb6bae5b633728 100644 (file)
@@ -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;
index 77fa91d8ebd1df6175a1fa0356134811a1d3be07..9cf5c4b8cf2e5ba72ca9241d8e6b7173acded0ea 100644 (file)
@@ -92,3 +92,4 @@
 1.0.12
 1.0.12.am1
 1.0.12.hwn1
+1.0.12.hwn2
index 067b0c5c17bb1debff2b46865e69842a1da49b44..cb87334f7dc2509efe397ab91277fca78d3cdcf0 100644 (file)
@@ -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 $< $@
index 43bf8760e8bdd4960a46e411d638c7deab9080fc..5f9a6ea234cf79e76c0e3970ce682160bfa0b374 100644 (file)
@@ -26,7 +26,7 @@ $bassi = \type GrandStaff = bassi_group <
 
 \score{
        \$bassi
-       \include "part-paper.ly"
+       \include "coriolan-part-paper.ly"
        \midi{ \tempo 4 = 160; }
 }
 
index 363c427b71dcc6cbfc186711a5797bf3b813deaf..60e77fc9862ca52fcc8f5128b65c8223df4f5142 100644 (file)
@@ -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; }
 }
 
index 722dca50832481868cfbea2908ffbdb60f66ba09..5562da4dd9e23ed1b5fd2c545af75111e8f14404 100644 (file)
@@ -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 (file)
index 0000000..40c4ce7
--- /dev/null
@@ -0,0 +1,9 @@
+
+\paper { \translator {
+       \OrchestralPartStaffContext
+
+       }
+       \translator { \ScoreContext
+               skipBars = 1;   
+       }
+}
index 33d155f495a3cea81d09125bc427cebfbd4f0b49..b1831d5ca8616e0a02ad282682c7098c77b70346 100644 (file)
@@ -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; }
 }
index 0486c83125cffb768dcdd8783b0b36b858c4d27e..33a62d075540600f28360fb4270a7d9317bc47cf 100644 (file)
@@ -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; }
 }
 
index 59ca4c916e184fac3a4d73865b0709ea4b442b1b..01f7b5f2d2b222881cf11bb3058feaf9fe6dacb9 100644 (file)
@@ -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; }
 }
 
index 7c497e009e057843239a31029f2ef257dbe9cc49..b588c6ec274532ec22c24bdf53e051cdaf58f00b 100644 (file)
@@ -16,7 +16,7 @@ copyright =    "public domain";
 
 \score{
        \$flauti_staff
-       \include "part-paper.ly"
+       \include "coriolan-part-paper.ly"
        \midi{ \tempo 4 = 160; }
 }
 
index 6869ab8e73fcd6974c8c8ed500aeffb7d710cb58..9c8f03f82fa1f4ff4e7aad44e6343e6e4023cb1e 100644 (file)
@@ -16,7 +16,7 @@ copyright =    "public domain";
 
 \score{
        \$oboi_staff 
-       \include "part-paper.ly"
+       \include "coriolan-part-paper.ly"
        \midi{ \tempo 4 = 160; }
 }
 
index 0452afad65fff794626adf563c9845bdd8fb59dd..fd10ff150552ea9806fc780efe35b5f013beef76 100644 (file)
@@ -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; }
 }
 
index 37de6ee6d3ad9f4795af92165bc2066e93fe7aed..42bc8c95b33a45e790788168e9c4ec9aa6354bc0 100644 (file)
@@ -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; }
 }
 
index a367ac3173908dc021493062722d0859f28dd4b1..a1b2a54829a35decae76474d33a64de21fd2f5c1 100644 (file)
@@ -14,7 +14,7 @@ copyright =    "public domain";
 
 \score{
        \$violino1_staff 
-       \include "part-paper.ly"
+       \include "coriolan-part-paper.ly"
        \midi{ \tempo 4 = 160; }
 }
 
index 0e7231b183e8357ce5506ab3e753a438549fb967..b56fc8fbcb8f428776b0dd6a4036060d09ccfdc3 100644 (file)
@@ -14,7 +14,7 @@ copyright =    "public domain";
 
 \score{
        \$violino2_staff 
-       \include "part-paper.ly"
+       \include "coriolan-part-paper.ly"
        \midi{ \tempo 4 = 160; }
 }
 
index 6c0dffe1022a232e1ee0485fd5096a0e1f002203..972103b6ce2abb1ce76c1575180ec02ba54c10de 100644 (file)
@@ -14,7 +14,7 @@ copyright =    "public domain";
 
 \score{
        \$violoncello_staff 
-       \include "part-paper.ly"
+       \include "coriolan-part-paper.ly"
        \midi{ \tempo 4 = 160; }
 }
 
index b8c08e12c15ee3f8f4bc3b015c5dfd87e68d4f97..c4aa806955418aa88642c60d3ca01800394447c0 100644 (file)
@@ -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{
index 7c3589bcf27572e599521e6ff8be1b8e8bc818ab..055c306010cddb96e213a6859579376f27955925 100644 (file)
@@ -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;
        }
index 68c065b9fca7871a41b8b6ae2fa805792b87ff22..cfade84d8924e4b1ed585b90d0895149e233ec48 100644 (file)
@@ -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
index 1da26f84cdcf99083c85fa6c27b83da1a2dccc4e..97b6f320ac878a88e937c1c3008c79af854058e3 100644 (file)
@@ -66,7 +66,6 @@
                         \ifnum\thepage=1{\hfil \LilyIdString}%
                         \else{foo\hfil\the\pageno\hfil}%
                         \fi}}%
-\fi
 \nopagenumbers
 }