From: Han-Wen Nienhuys Date: Sun, 25 Mar 2001 12:19:51 +0000 (+0200) Subject: patch::: 1.3.141.hwn3: Re: Sugar X-Git-Tag: release/1.3.142~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1e0b328b0eaf62dc57c6f60463864f2e5cb0e659;p=lilypond.git patch::: 1.3.141.hwn3: Re: Sugar * property silencedNotes 1.3.141.hwn2 ============ --- Generated by hanwen@cs.uu.nl, >From = lilypond-1.3.141.hwn2, To = lilypond-1.3.141.hwn3 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.141.hwn3.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- diff --git a/CHANGES b/CHANGES index 9996f1fa38..20f294c352 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,17 @@ -1.3.141.jcn3 +--- ../lilypond-1.3.141.hwn2/CHANGES Sun Mar 25 00:23:24 2001 +++ b/CHANGES Sun Mar 25 13:30:43 2001 +@@ -1,6 +1,11 @@ + 1.3.141.hwn2 + ============ + +* property silencedNotes + +1.3.141.hwn2 +============ + + * Fix: instrument names on piano staffs. + + * Bugfix: don't left-align absolute dynamics.1.3.141.jcn3 ============ * some mup2ly progress. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index ee400db07a..d4c7585aff 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3297,7 +3297,10 @@ relocated, so this can also be used to shorten measures. A bar check is entered using the bar symbol, @code{|} +@node Speeding up debugging +@subsection Speeding up debugging +[TODO: describe skipTypesetting here] @c . {Point and click} @node Point and click diff --git a/VERSION b/VERSION index 1e462b46e0..6c19d310bb 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=141 -MY_PATCH_LEVEL=jcn4 +MY_PATCH_LEVEL=hwn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index fd60e0de66..edbaac8009 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -71,7 +71,7 @@ Grace_engraver_group::one_time_step () calling_self_b_ = true; process_music (); announces (); - pre_move_processing (); + stop_translation_timestep (); check_removal (); calling_self_b_ = false; } diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc index 54fbce92d9..58a3f1fdde 100644 --- a/lily/grace-performer-group.cc +++ b/lily/grace-performer-group.cc @@ -73,7 +73,7 @@ Grace_performer_group::one_time_step () calling_self_b_ = true; // process_music (); announces (); - pre_move_processing (); + stop_translation_timestep (); check_removal (); calling_self_b_ = false; } diff --git a/lily/include/translator.hh b/lily/include/translator.hh index d0c14c1424..112c21496f 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -38,9 +38,8 @@ public: Translator_group * daddy_trans_l_ ; - void pre_move_processing (); void announces (); - void post_move_processing (); + void removal_processing (); /** ask daddy for a feature diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 2b3b9e0827..2d13e7a7a8 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -26,7 +26,7 @@ class Note_heads_engraver : public Engraver Moment note_end_mom_; public: VIRTUAL_COPY_CONS (Translator); - + protected: virtual void start_translation_timestep (); virtual bool try_music (Music *req_l) ; @@ -35,7 +35,6 @@ protected: virtual void stop_translation_timestep (); }; - bool Note_heads_engraver::try_music (Music *m) { @@ -131,6 +130,7 @@ Note_heads_engraver::stop_translation_timestep () void Note_heads_engraver::start_translation_timestep () { + /* TODO:make this settable? */ if (note_end_mom_ > now_mom ()) @@ -147,6 +147,8 @@ Note_heads_engraver::start_translation_timestep () else e->forbid_breaks (); // guh. Use properties! } + + } diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index a85c72c895..c387a33959 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -59,7 +59,7 @@ Score_engraver::prepare (Moment w) Global_translator::prepare (w); make_columns (w); - post_move_processing (); + start_translation_timestep (); } void @@ -115,9 +115,14 @@ Score_engraver::finalize () void Score_engraver::one_time_step () { - process_music (); - announces (); - pre_move_processing (); + if (!to_boolean (get_property (ly_symbol2scm("skipTypesetting")))) + { + process_music (); + announces (); + } + + + stop_translation_timestep (); check_removal (); } diff --git a/lily/score-performer.cc b/lily/score-performer.cc index e3d966e6e8..63af656abe 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -60,7 +60,7 @@ Score_performer::prepare (Moment m) Global_translator::prepare (m); audio_column_l_ = new Audio_column (m); play_element (audio_column_l_); - post_move_processing (); + start_translation_timestep (); } @@ -70,7 +70,7 @@ Score_performer::one_time_step () // fixme: put this back. // process_music (); announces (); - pre_move_processing (); + stop_translation_timestep (); check_removal (); } diff --git a/lily/translator-group.cc b/lily/translator-group.cc index ff63c26e16..6bda7b9030 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -372,13 +372,13 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va void Translator_group::stop_translation_timestep () { - each (&Translator::pre_move_processing); + each (&Translator::stop_translation_timestep); } void Translator_group::start_translation_timestep () { - each (&Translator::post_move_processing); + each (&Translator::start_translation_timestep); } void diff --git a/lily/translator.cc b/lily/translator.cc index 6183057b85..03adb249f9 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -82,11 +82,6 @@ Translator::now_mom () const -void -Translator::post_move_processing () -{ - start_translation_timestep (); -} void Translator::removal_processing () @@ -102,14 +97,6 @@ Translator::announces () } -void -Translator::pre_move_processing () -{ - stop_translation_timestep (); -} - - - Music_output_def * Translator::output_def_l () const { diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index ba69b79bd0..cf2bd96fa5 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -259,6 +259,11 @@ r1 r1*3 R1*3 \\\\property Score.skipBars= ##t r1*3 R1*3 @end example ") +(translator-property-description 'skipTypesetting boolean? + "When true, all no typesetting is done at +this moment, causing the interpretation phase to go a lot faster. This can +help with debugging large scores.") + (translator-property-description 'slurBeginAttachment symbol? "translates to the car of grob-property 'attachment of NoteColumn. See @ref{Slur}.")