From: fred Date: Sun, 24 Mar 2002 19:52:16 +0000 (+0000) Subject: lilypond-0.0.77.jcn1 X-Git-Tag: release/1.5.59~4205 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c17d992bf4e4125e958c6de9e0583c9f65bd5ec1;p=lilypond.git lilypond-0.0.77.jcn1 --- diff --git a/TODO b/TODO index 5ac024269a..d0c00112f6 100644 --- a/TODO +++ b/TODO @@ -12,6 +12,8 @@ grep for TODO and ugh/ugr * dots into separate item. + * return status + * lyrics in chords still fuck up. * add to MIDI output: @@ -22,6 +24,8 @@ grep for TODO and ugh/ugr * rewire acknowledge_element() logic with a process_acknowledged() + * progress when creating MIDI elts. + * pushgroup/popgroup * whole head on ledger line diff --git a/bin/make-website b/bin/make-website index 3a38929684..8f00d4f9cc 100755 --- a/bin/make-website +++ b/bin/make-website @@ -6,7 +6,10 @@ use Getopt::Long; my $lily_version; my $footstr; my $mw_id = ""; -my $id_str = "make-website 0.2"; +my $id_str = "make-website 0.3"; + +my $TAR="tar"; +my $MAKE="make"; sub get_version { @@ -72,7 +75,7 @@ sub my_system local $base="lilypond/"; -local @examples=("multi", "wohltemperirt" ,"standchen", "toccata-fuga-E", +local @examples=("twinkle", "multi", "wohltemperirt" ,"standchen", "toccata-fuga-E", "scsii-menuetto", "collisions", "cadenza", "scales"); # rhythm, scales, @@ -81,60 +84,18 @@ local @examples=("multi", "wohltemperirt" ,"standchen", "toccata-fuga-E", sub gen_html { print "generating HTML\n"; - my_system "make -kC .. html"; -} - -sub ps_to_gif -{ - my ($a)=@_; - - if (! -f "$a.ps" ) { - my_system("gunzip -c $a.ps.gz > $a.ps"); - } - my_system "gs -q -sDEVICE=ppmraw -sOutputFile=- -r200 -dNOPAUSE $a.ps -c quit |pnmscale 0.5| ppmtogif > $a.gif"; -} - - -sub ps_to_jpeg -{ - my ($a)=@_; - my $in = "$a.ps"; - - my_system "gs -q -sDEVICE=ppmraw -sOutputFile=- -r200 -dNOPAUSE $in -c quit |pnmscale 0.5| cjpeg -grayscale > $a.jpeg"; + my_system "$MAKE -kC .. html"; } sub gen_examples { print "generating examples: \n"; + my @todo=(); foreach $a (@examples) { - $texfile="lelie"; - $tex = "tex $texfile"; - if ($a eq "standchen" || $a eq "scsii-menuetto" ) { - $tex = "latex $a"; - $texfile = "$a"; - } - - if ( ! -f "$a.ly.txt" ) { - my_system "ln $depth/input/$a.ly ./$a.ly.txt"; - } - if (! -f "$a.dvi" ) { - my_system "lilypond $a;", - "$tex", "-mv $texfile.dvi $a.dvi"; - } - if ( ! -f "$a.ps.gz" && ! -f "$a.ps" ) { - my_system "dvips -o $a.ps $a.dvi"; - } - - my_system "mv lelie.midi $a.midi; " if ( -f "lelie.midi" ); - - # generate the pixmap at twice the size, then rescale (for antialiasing) - if ( ! -f "$a.gif" ) { - ps_to_gif($a); - } - if ( ! -f "$a.ps.gz" ) { - my_system "gzip -f $a.ps"; - } + push @todo, "out/$a.ps.gz", "out/$a.gif", "out/$a.ly.txt"; } + + my_system ("$MAKE -C .. " . join(' ', @todo)); } my @texstuff = ("mudela-man", "mudela-course"); @@ -145,13 +106,15 @@ sub gen_manuals open HTMLLIST, ">tex_manuals.html"; print HTMLLIST "LilyPond manuals in TeX\n" . ""; close HTMLLIST; + + my_system( "$MAKE -C .. " . join(' ', @todo)); } sub gen_list @@ -233,12 +196,25 @@ sub edit_html } } +sub copy_txt_file +{ + my ($f) = @_; + my $d = $f; + $d =~ s!^.*\/!!; + if (! $f =~ /.txt$/) { + $d = "$f.txt"; + } + print $f, $d; +} + sub copy_files { print "copying files\n"; print `ln -s $depth/out ./docxx` if ( ! -x "docxx" ) ; my_system "cp $depth/TODO ./TODO.txt", + "cp $depth/ANNOUNCE ./ANNOUNCE.txt", "cp $depth/NEWS ./NEWS.txt", + "cp $depth/DEDICATION ./DEDICATION.txt", "cp ../lelie*gif ."; } @@ -258,7 +234,7 @@ sub set_images sub docxx_update { - my_system "make -C $depth doc++"; + my_system "$MAKE -C $depth doc++"; } sub do_tar @@ -266,8 +242,8 @@ sub do_tar print "tarring.\n"; $files = join (' ', < *.html *.$image *.ps.gz *.txt *.midi docxx/*>); my_system - "-tar vhcf website.tar $files;", - "gzip -f9 website.tar;"; + "-$TAR zvhcf website.tar.gz $files;", +# "gzip -f9 website.tar;"; } sub identify diff --git a/lily/performer.cc b/lily/performer.cc index 76b9333253..e26f2ef2da 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -9,12 +9,13 @@ #include "performer-group-performer.hh" #include "debug.hh" -IMPLEMENT_STATIC_NAME(Performer); + IMPLEMENT_IS_TYPE_B(Performer); Performer::Performer() { daddy_perf_l_ = 0; + init_b_ =false; } Performer::~Performer() @@ -32,23 +33,24 @@ Performer::get_mom() const return daddy_perf_l_->get_mom(); } -void -Performer::midi_output( Midi_stream* ) -{ -} - void Performer::play_event( Midi_item* l ) { daddy_perf_l_->play_event( l ); } +int +Performer::get_tempo_i()const +{ + return daddy_perf_l_->get_tempo_i(); +} + void Performer::print() const { #ifndef NPRINT mtor << "\n" << name() << " {"; -// do_print(); + do_print(); mtor << "}"; #endif } @@ -63,16 +65,42 @@ Performer::set( Moment ) { } -void -Performer::set_track( Midi_def*, int& ) -{ -} - bool -Performer::try_request( Request* req_l ) +Performer::do_try_request( Request* req_l ) { -// huh? -// return daddy_perf_l_->try_request( req_l_ ); return false; } +bool +Performer::try_request(Request*r) +{ + if (!init_b_) { + creation_processing(); + } + return do_try_request(r); +} + +void +Performer::creation_processing() +{ + if (!init_b_) { +/* if ( daddy_perf_l_ ) { + init_b_ = true; // ugh. avoid recursion + daddy_perf_l_->creation_processing(); + init_b_ = false; + } + + */ + do_creation_processing(); + init_b_ = true; + } +} +void +Performer::do_creation_processing() +{ +} + +void +Performer::do_removal_processing() +{ +}