lilypond-0.0.77.jcn1

diff --git a/Documentation/lilygut.pod b/Documentation/lilygut.pod
index f84120b47bd2dbd89f88e54a1ad35cd3afb6e4c4..71d0f8f566d4527d8e0904a2da2f43dbdee4e3f2 100644 (file)
--- a/Documentation/lilygut.pod
+++ b/Documentation/lilygut.pod
@@ -206,7 +206,7 @@ C<Stem_beam_engraver> about the C<Notehead>, which will add the
 C<Notehead> to the C<Stem> it just created.
 
 To decide on merging, C<Complex_staff> has grouped several
-engravers. Please check init/engraver.ini.
+engravers. Please check F<init/engraver.ly>.
 
 
 =head1 ITEMS and SPANNERS

diff --git a/Documentation/lilypond.pod b/Documentation/lilypond.pod
index c0181bc645013e3c33646fd3a8c5c520b89c5d11..e479ff5c19b112a7c60c6673b710e3b9eeeb9f6d 100644 (file)
--- a/Documentation/lilypond.pod
+++ b/Documentation/lilypond.pod
@@ -8,9 +8,9 @@ lilypond - the GNU music typesetter
 
 =head1 DESCRIPTION
 
-GNU LilyPond which converts music definition files into visual or
-audio output: it can produce formatted sheet music in TeX and 
-and mechanical perfomances to MIDI files.
+GNU LilyPond is a program which converts music definition files into
+visual or auditive output: it can typeset formatted sheet music to a
+TeX file and and (mechanical) performances to MIDI files.
 
 =head1 OPTIONS
 
@@ -20,7 +20,6 @@ and mechanical perfomances to MIDI files.
 
 add F<FILE> to the search path for input files.
 
-
 =item B<-M,--midi>
 
 do midi output only
@@ -46,12 +45,16 @@ Show a summary of usage
 
 =item B<-i,--init=>F<FILE>
 
-set init file to F<FILE> (default: F<symbol.ini>)
+set init file to F<FILE> (default: F<symbol.ly>)
 
 =item B<--include, -I>=F<DIRECTORY>
 
 add F<DIRECTORY> to the search path for input files.
 
+=item B<--ignore-version, -V>
+
+make incompatible mudela version non-fatal 
+
 =back
 
 =head1 FEATURES
@@ -175,7 +178,7 @@ Than it would help if you send a dump of the Interval and the Item
 
 =over 5
 
-=item F<symbol.ini>
+=item F<symbol.ly>
 
 The initialisation file with symbol tables etc. It
 includes files from the directory F<init/>.
@@ -196,9 +199,9 @@ B<LILYINCLUDE> an (one) additional directory for finding lilypond data.
 
 On technical details of LilyPond
 
-=item mudela(5)
+=item mudela-man
 
-On the input format
+On the input format. This is a LilyPond-enhanced LaTeX document.
 
 =item MANIFESTO
 
@@ -208,18 +211,12 @@ Goals of the GNU LilyPond project.
 
 The GNU LilyPond FAQ list
 
-=item http://
-
-The GNU Music project. GNU LilyPond is part of the GNU Music
-project. For more information on the GNU Music project, 
-
 =item http://www.stack.nl/~hanwen/lilypond/index.html
 
 GNU LilyPond has her own webpage.  This webpage contains the MIDI, GIF
 and PS files for some standard music files. It also has the complete
 LilyPond documentation
 
-
 =back
 
 GNU LilyPond is

diff --git a/Documentation/mi2mu.pod b/Documentation/mi2mu.pod
index a4aa186f3bb254373fc0771ec1888a333ad74faf..faf125bbfe015aa78998f6a93203729bfcc4a7c9 100644 (file)
--- a/Documentation/mi2mu.pod
+++ b/Documentation/mi2mu.pod
@@ -111,7 +111,9 @@ The GNU LilyPond music typesetter.
 
 On the LilyPond input format.
 
-=item The GNU LilyPond FAQ list.
+=item mudela-man
+
+On the input format. This is a LilyPond-enhanced LaTeX document.
 
 =back
 

diff --git a/flower/TODO b/flower/TODO
index b810fabd7ad6846b17f5f05276e3d63b4315f94e..169a0525e6957791433e404bf8d56c494cb2fc3a 100644 (file)
--- a/flower/TODO
+++ b/flower/TODO
@@ -1,3 +1,7 @@
+       * write a String_hash template
+
+       * write a Pointer_hash template
+
        * fix/junk ambiguous String constructor overloads, e.g.:
          String( int ) and String( char )
 
@@ -7,7 +11,7 @@
 
        * disable this auto conv: const pointer -> bool -> string
 
-       * PointerVec ?
+       * Pointer_array
 
        * PCursor -> Pointer_cursor / PointerCursor ?
 

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 8ab61fe2ed6021f7ef60cc5c501a6ca187f002e9..769edecec772bc96f08318112e60f503d6ce9621 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -29,14 +29,17 @@ protected:
     virtual void process();
     virtual void set_score( Score* score_l );
     virtual void start();
-
+    virtual int get_tempo_i() const;
+    virtual void play_event(Midi_item*);
 private:
-    void header();
+    void header(Midi_stream&);
 
     Midi_def* midi_l_;
-    Midi_stream* midi_stream_p_;
+
     Moment prev_mom_;
     Moment now_mom_;
+
+    Link_array<Midi_item> midi_item_p_arr_;
 };
 
 #endif // SCORE_PERFORMER_HH

diff --git a/make/Rules.make b/make/Rules.make
index 23fee6acc0c4e3ab69e530c6e7be79f1b86503ac..07e44b7041b3908667c160af6fe362ef5dbc7d22 100644 (file)
--- a/make/Rules.make
+++ b/make/Rules.make
@@ -24,10 +24,7 @@ $(outdir)/%.o: $(outdir)/%.cc
        $(DO_CXX_COMPILE)
 
 $(outdir)/%.cc: %.y
-#      $(BISON) -d $<
        $(BISON) $<
-#      mv $(shell basename $@ .cc ).tab.h $(include-lib)/$(shell basename $@ .cc).hh
-#      mv $(shell basename $@ .cc ).tab.h $(outdir)/$(shell basename $@ .cc).hh
        mv $(shell basename $@ .cc ).tab.c $@
 
 $(outdir)/%.hh: %.y
@@ -40,25 +37,6 @@ $(outdir)/%.cc: %.l
 # could be faster:
 #      $(FLEX) -8 -Cf -t $< > $@
 
-$(outdir)/%.text: $(outdir)/%.1
-       groff -man -Tascii $< > $@
-
-$(depth)/%.text: $(outdir)/%.text
-       cp $< $@
-
-$(outdir)/%.html: %.pod
-       $(pod2html)  $<
-       mv $(notdir $@) $(outdir)/
-
-$(outdir)/%.5: %.pod
-       $(pod2groff)
-$(outdir)/%.1: %.pod
-       $(pod2groff)
-
-
-
-#
-
 # outdirs:
 #
 # ?$(outdir)/%.dep:
@@ -75,17 +53,3 @@ $(outdir)/%.1: %.pod
 $(depth)/%.text: check-doc-deps
        rm -f $@
        ln `find ${depth}/Documentation -name $@|head -1` .
-
-$(outdir)/%.xpm: %.gif
-       giftopnm $< | ppmtoxpm > $@
-
-$(outdir)/%.ps: $(outdir)/%.dvi
-       dvips -o $@ $<
-
-$(outdir)/%.dvi: $(outdir)/%.mudtex
-       latex '\batchmode \input $<'
-
-$(outdir)/%.mudtex: %.doc
-       $(depth)/bin/mudela-book --outdir=$(outdir)/ --outname=$(notdir $@) $<
-
-

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 5cab6df5a71c0d8fe61bcbddf830faa34a9dea8e..a37f43022196756666ac60242f5fa12f31314946 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -14,7 +14,7 @@ Buildroot: /tmp/lilypond_build
 GNU LilyPond which converts music definition files into visual or
 audio output: it can typeset formatted sheet music to a TeX file and
 and (mechanical) performances to MIDI files. Features include multiple
-meters, clefs, keys, lyrics, versatile input-language, cadenzas
+staffs meters, clefs, keys, lyrics, versatile input-language, cadenzas
 beams, slurs, triplets.
 
 %prep