CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/20 10:13:46
Modified files:
. : ChangeLog
input : wilhelmus.ly
input/mutopia/J.S.Bach: baerenreiter-sarabande.ly
lily : breathing-sign-engraver.cc
completion-note-heads-engraver.cc
dynamic-engraver.cc ligature-engraver.cc
lyric-performer.cc
multi-measure-rest-engraver.cc
paper-column-engraver.cc
piano-pedal-performer.cc tempo-performer.cc
text-spanner-engraver.cc
lily/include : ligature-engraver.hh
Log message:
release commit
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3897&tr2=1.3898&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/wilhelmus.ly.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/breathing-sign-engraver.cc.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/completion-note-heads-engraver.cc.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.172&tr2=1.173&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ligature-engraver.cc.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lyric-performer.cc.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/multi-measure-rest-engraver.cc.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-column-engraver.cc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/piano-pedal-performer.cc.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tempo-performer.cc.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-spanner-engraver.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/ligature-engraver.hh.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3897 lilypond/ChangeLog:1.3898
--- lilypond/ChangeLog:1.3897 Tue Jul 19 15:42:40 2005
+++ lilypond/ChangeLog Wed Jul 20 10:13:44 2005
@@ -15,10 +15,12 @@
* lily/GNUmakefile (static-gxx-libs): new target
static-gxx-libs. Create link to libstdc++.a
- * lily/new-lyric-combine-music-iterator.cc: rename to
Lyric_combine_music_iterator
+ * lily/new-lyric-combine-music-iterator.cc: rename to
+ Lyric_combine_music_iterator
* lily/lyric-combine-music-iterator.cc
- (Old_lyric_combine_music_iterator): rename to
Old_lyric_combine_music_iterator
+ (Old_lyric_combine_music_iterator): rename to
+ Old_lyric_combine_music_iterator
* lily/*-engraver.cc (various): remove double use of
PRECOMPUTED_VIRTUAL function: only use
@@ -112,7 +114,7 @@
2005-07-16 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/system.cc (do_derived_mark): don't mark from object_alist_
- anymore, but do it centrally. Speedup: approximately 3-5 %.
+ anymore, but do it centrally.
* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): remove
hammer hack.
Index: lilypond/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
diff -u lilypond/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly:1.57
lilypond/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly:1.58
--- lilypond/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly:1.57 Sun Jun
26 22:39:13 2005
+++ lilypond/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly Wed Jul 20
10:13:46 2005
@@ -15,6 +15,13 @@
" systems (expecting " (number->string n))))))
+#(define (assert-system-count-override count)
+ (ly:export #{ \override NoteHead
+ #'after-line-breaking-callback
+ = #(lambda (smob) (assert-system-count smob $count))
+ #}))
+
+
\header {
title = "Solo Cello Suite II"
piece ="Sarabande"
@@ -50,7 +57,7 @@
<< { d8. e16 e4.\trill d16 e } \\
{ d4 a2 } >>
- <d, a' f'>4. e'8[ d c] |
+ <d, a' f'>4. e'8[ d c] |
bes[ g'] f[
e16(f] g[ a bes d,)] |
cis4.\trill b8[ a g] |
@@ -120,9 +127,7 @@
d'[ cis] |
%% d4 d,,2 |
d4
- \override NoteHead
- #'after-line-breaking-callback
- = #(lambda (smob) (assert-system-count smob 6))
+ #(assert-system-count-override 6)
d,,2 |
}
@@ -147,18 +152,20 @@
\sarabandeCelloScripts
>>
-% size perversions
+%% size perversions
smallerPaper = \layout {
- \context { \Staff
- fontSize = #-1
- \override StaffSymbol #'staff-space = #0.8
- }
- \context { \Score
- \override SpacingSpanner #'spacing-increment = #0.96
- }
-
- indent = 5.6 \mm
- linewidth = 146.8 \mm
+ \context {
+ \Staff
+ fontSize = #-1
+ \override StaffSymbol #'staff-space = #0.8
+ }
+ \context {
+ \Score
+ \override SpacingSpanner #'spacing-increment = #0.96
+ }
+
+ indent = 5.6 \mm
+ linewidth = 146.8 \mm
}
\paper {
Index: lilypond/input/wilhelmus.ly
diff -u lilypond/input/wilhelmus.ly:1.20 lilypond/input/wilhelmus.ly:1.21
--- lilypond/input/wilhelmus.ly:1.20 Sun Jun 26 22:46:55 2005
+++ lilypond/input/wilhelmus.ly Wed Jul 20 10:13:46 2005
@@ -28,7 +28,8 @@
noclefs = {
s1
- \override Staff.Clef #'break-visibility = #(lambda (dir) (cons #t #t))
+ \override Staff.Clef #'break-visibility =
+ #all-invisible
}
setMargins = {
Index: lilypond/lily/breathing-sign-engraver.cc
diff -u lilypond/lily/breathing-sign-engraver.cc:1.37
lilypond/lily/breathing-sign-engraver.cc:1.38
--- lilypond/lily/breathing-sign-engraver.cc:1.37 Mon Jul 18 23:37:24 2005
+++ lilypond/lily/breathing-sign-engraver.cc Wed Jul 20 10:13:46 2005
@@ -23,35 +23,35 @@
TRANSLATOR_DECLARATIONS (Breathing_sign_engraver);
protected:
- virtual bool try_music (Music *req);
+ virtual bool try_music (Music *event);
PRECOMPUTED_VIRTUAL void process_acknowledged ();
PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
private:
- Music *breathing_sign_req_;
+ Music *breathing_sign_event_;
Grob *breathing_sign_;
};
Breathing_sign_engraver::Breathing_sign_engraver ()
{
breathing_sign_ = 0;
- breathing_sign_req_ = 0;
+ breathing_sign_event_ = 0;
}
bool
Breathing_sign_engraver::try_music (Music *r)
{
- breathing_sign_req_ = r;
+ breathing_sign_event_ = r;
return true;
}
void
Breathing_sign_engraver::process_acknowledged ()
{
- if (breathing_sign_req_ && ! breathing_sign_)
+ if (breathing_sign_event_ && ! breathing_sign_)
{
- breathing_sign_ = make_item ("BreathingSign",
breathing_sign_req_->self_scm ());
- breathing_sign_req_ = 0;
+ breathing_sign_ = make_item ("BreathingSign",
breathing_sign_event_->self_scm ());
+ breathing_sign_event_ = 0;
}
}
@@ -59,7 +59,7 @@
Breathing_sign_engraver::stop_translation_timestep ()
{
breathing_sign_ = 0;
- breathing_sign_req_ = 0;
+ breathing_sign_event_ = 0;
}
#include "translator.icc"
Index: lilypond/lily/completion-note-heads-engraver.cc
diff -u lilypond/lily/completion-note-heads-engraver.cc:1.51
lilypond/lily/completion-note-heads-engraver.cc:1.52
--- lilypond/lily/completion-note-heads-engraver.cc:1.51 Mon Jul 18
23:37:24 2005
+++ lilypond/lily/completion-note-heads-engraver.cc Wed Jul 20 10:13:46 2005
@@ -38,7 +38,7 @@
longer than what's specified, than what is left to do and it should
not cross barlines.
- We copy the reqs into scratch note reqs, to make sure that we get
+ We copy the events into scratch note events, to make sure that we get
all durations exactly right.
*/
@@ -49,8 +49,8 @@
Link_array<Grob> ties_;
Link_array<Item> dots_;
- Link_array<Music> note_reqs_;
- Link_array<Music> scratch_note_reqs_;
+ Link_array<Music> note_events_;
+ Link_array<Music> scratch_note_events_;
Moment note_end_mom_;
bool is_first_;
@@ -66,7 +66,7 @@
protected:
virtual void initialize ();
PRECOMPUTED_VIRTUAL void start_translation_timestep ();
- virtual bool try_music (Music *req);
+ virtual bool try_music (Music *event);
PRECOMPUTED_VIRTUAL void process_music ();
PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
};
@@ -82,7 +82,7 @@
{
if (m->is_mus_type ("note-event"))
{
- note_reqs_.push (m);
+ note_events_.push (m);
is_first_ = true;
Moment musiclen = m->get_length ();
@@ -100,7 +100,7 @@
}
else if (m->is_mus_type ("busy-playing-event"))
{
- return note_reqs_.size () && is_first_;
+ return note_events_.size () && is_first_;
}
return false;
@@ -178,7 +178,7 @@
}
else
{
- orig = unsmob_duration (note_reqs_[0]->get_property ("duration"));
+ orig = unsmob_duration (note_events_[0]->get_property ("duration"));
note_dur = *orig;
}
Moment nb = next_barline_moment ();
@@ -200,28 +200,28 @@
if (orig && note_dur.get_length () != orig->get_length ())
{
- if (!scratch_note_reqs_.size ())
- for (int i = 0; i < note_reqs_.size (); i++)
+ if (!scratch_note_events_.size ())
+ for (int i = 0; i < note_events_.size (); i++)
{
- Music *m = note_reqs_[i]->clone ();
- scratch_note_reqs_.push (m);
+ Music *m = note_events_[i]->clone ();
+ scratch_note_events_.push (m);
}
}
for (int i = 0;
- left_to_do_ && i < note_reqs_.size (); i++)
+ left_to_do_ && i < note_events_.size (); i++)
{
- Music *req = note_reqs_[i];
- if (scratch_note_reqs_.size ())
+ Music *event = note_events_[i];
+ if (scratch_note_events_.size ())
{
- req = scratch_note_reqs_[i];
- SCM pits = note_reqs_[i]->get_property ("pitch");
- req->set_property ("pitch", pits);
+ event = scratch_note_events_[i];
+ SCM pits = note_events_[i]->get_property ("pitch");
+ event->set_property ("pitch", pits);
}
- req->set_property ("duration", note_dur.smobbed_copy ());
+ event->set_property ("duration", note_dur.smobbed_copy ());
- Item *note = make_item ("NoteHead", req->self_scm ());
+ Item *note = make_item ("NoteHead", event->self_scm ());
note->set_property ("duration-log",
scm_int2num (note_dur.duration_log ()));
@@ -241,7 +241,7 @@
dots_.push (d);
}
- Pitch *pit = unsmob_pitch (req->get_property ("pitch"));
+ Pitch *pit = unsmob_pitch (event->get_property ("pitch"));
int pos = pit->steps ();
SCM c0 = get_property ("middleCPosition");
@@ -289,12 +289,12 @@
dots_.clear ();
- for (int i = scratch_note_reqs_.size (); i--;)
+ for (int i = scratch_note_events_.size (); i--;)
{
- scm_gc_unprotect_object (scratch_note_reqs_[i]->self_scm ());
+ scm_gc_unprotect_object (scratch_note_events_[i]->self_scm ());
}
- scratch_note_reqs_.clear ();
+ scratch_note_events_.clear ();
}
void
@@ -303,7 +303,7 @@
Moment now = now_mom ();
if (note_end_mom_.main_part_ <= now.main_part_)
{
- note_reqs_.clear ();
+ note_events_.clear ();
prev_notes_.clear ();
}
}
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.172
lilypond/lily/dynamic-engraver.cc:1.173
--- lilypond/lily/dynamic-engraver.cc:1.172 Mon Jul 18 23:37:24 2005
+++ lilypond/lily/dynamic-engraver.cc Wed Jul 20 10:13:46 2005
@@ -50,7 +50,7 @@
Music *script_ev_;
Music *current_cresc_ev_;
- Drul_array<Music *> accepted_spanreqs_drul_;
+ Drul_array<Music *> accepted_spanevents_drul_;
Link_array<Note_column> pending_columns_;
Link_array<Grob> pending_elements_;
@@ -62,7 +62,7 @@
protected:
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
- virtual bool try_music (Music *req);
+ virtual bool try_music (Music *event);
PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
PRECOMPUTED_VIRTUAL void process_music ();
};
@@ -77,8 +77,8 @@
cresc_ = 0;
script_ev_ = 0;
- accepted_spanreqs_drul_[START] = 0;
- accepted_spanreqs_drul_[STOP] = 0;
+ accepted_spanevents_drul_[START] = 0;
+ accepted_spanevents_drul_[STOP] = 0;
}
bool
@@ -97,9 +97,9 @@
{
Direction d = to_dir (m->get_property ("span-direction"));
- accepted_spanreqs_drul_[d] = m;
+ accepted_spanevents_drul_[d] = m;
if (current_cresc_ev_ && d == START)
- accepted_spanreqs_drul_[STOP] = m;
+ accepted_spanevents_drul_[STOP] = m;
return true;
}
return false;
@@ -108,11 +108,11 @@
void
Dynamic_engraver::process_music ()
{
- if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] ||
script_ev_)
+ if (accepted_spanevents_drul_[START] || accepted_spanevents_drul_[STOP] ||
script_ev_)
{
if (!line_spanner_)
{
- Music *rq = accepted_spanreqs_drul_[START];
+ Music *rq = accepted_spanevents_drul_[START];
line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm
() : SCM_EOL);
if (script_ev_)
@@ -145,10 +145,10 @@
Axis_group_interface::add_element (line_spanner_, script_);
}
- Music *stop_ev = accepted_spanreqs_drul_ [STOP]
- ? accepted_spanreqs_drul_[STOP] : script_ev_;
+ Music *stop_ev = accepted_spanevents_drul_ [STOP]
+ ? accepted_spanevents_drul_[STOP] : script_ev_;
- if (accepted_spanreqs_drul_[STOP] || script_ev_)
+ if (accepted_spanevents_drul_[STOP] || script_ev_)
{
/*
finish side position alignment if the (de)cresc ends here, and
@@ -169,14 +169,14 @@
cresc_ = 0;
current_cresc_ev_ = 0;
}
- else if (accepted_spanreqs_drul_[STOP])
+ else if (accepted_spanevents_drul_[STOP])
{
- accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find
start of (de)crescendo"));
+ accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find
start of (de)crescendo"));
stop_ev = 0;
}
}
- if (accepted_spanreqs_drul_[START])
+ if (accepted_spanevents_drul_[START])
{
if (current_cresc_ev_)
{
@@ -184,12 +184,12 @@
if (current_cresc_ev_->is_mus_type ("decrescendo-event"))
msg = _ ("already have a crescendo");
- accepted_spanreqs_drul_[START]->origin ()->warning (msg);
+ accepted_spanevents_drul_[START]->origin ()->warning (msg);
current_cresc_ev_->origin ()->warning (_ ("cresc starts here"));
}
else
{
- current_cresc_ev_ = accepted_spanreqs_drul_[START];
+ current_cresc_ev_ = accepted_spanevents_drul_[START];
if (Direction d = to_dir (current_cresc_ev_->get_property
("direction")))
set_grob_direction (line_spanner_, d);
@@ -212,7 +212,7 @@
SCM s = get_property ((start_type + "Spanner").to_str0 ());
if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
{
- cresc_ = make_spanner ("Hairpin",
accepted_spanreqs_drul_[START]->self_scm ());
+ cresc_ = make_spanner ("Hairpin",
accepted_spanevents_drul_[START]->self_scm ());
if (finished_cresc_)
{
Pointer_group_interface::add_grob (finished_cresc_,
@@ -235,7 +235,7 @@
*/
else
{
- cresc_ = make_spanner ("DynamicTextSpanner",
accepted_spanreqs_drul_[START]->self_scm ());
+ cresc_ = make_spanner ("DynamicTextSpanner",
accepted_spanevents_drul_[START]->self_scm ());
cresc_->set_property ("style", s);
context ()->set_property ((start_type
+ "Spanner").to_str0 (), SCM_EOL);
@@ -282,8 +282,8 @@
}
script_ev_ = 0;
- accepted_spanreqs_drul_[START] = 0;
- accepted_spanreqs_drul_[STOP] = 0;
+ accepted_spanevents_drul_[START] = 0;
+ accepted_spanevents_drul_[STOP] = 0;
}
void
Index: lilypond/lily/include/ligature-engraver.hh
diff -u lilypond/lily/include/ligature-engraver.hh:1.14
lilypond/lily/include/ligature-engraver.hh:1.15
--- lilypond/lily/include/ligature-engraver.hh:1.14 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/include/ligature-engraver.hh Wed Jul 20 10:13:46 2005
@@ -46,7 +46,7 @@
TRANSLATOR_DECLARATIONS (Ligature_engraver);
private:
- Drul_array<Music *> reqs_drul_;
+ Drul_array<Music *> events_drul_;
Spanner *ligature_;
Array<Grob_info> primitives_;
@@ -54,7 +54,7 @@
Spanner *finished_ligature_;
Array<Grob_info> finished_primitives_;
- Music *prev_start_req_;
+ Music *prev_start_event_;
// moment where ligature started.
Moment ligature_start_mom_;
Index: lilypond/lily/ligature-engraver.cc
diff -u lilypond/lily/ligature-engraver.cc:1.43
lilypond/lily/ligature-engraver.cc:1.44
--- lilypond/lily/ligature-engraver.cc:1.43 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/ligature-engraver.cc Wed Jul 20 10:13:46 2005
@@ -17,7 +17,7 @@
/*
* This abstract class provides the general framework for ligatures of
- * any kind. It cares for handling start/stop ligatures requests and
+ * any kind. It cares for handling start/stop ligatures events and
* collecting all noteheads inbetween, but delegates creation of a
* ligature spanner for each start/stop pair and typesetting of the
* ligature spanner to a concrete subclass.
@@ -69,8 +69,8 @@
{
ligature_ = 0;
finished_ligature_ = 0;
- reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0;
- prev_start_req_ = 0;
+ events_drul_[LEFT] = events_drul_[RIGHT] = 0;
+ prev_start_event_ = 0;
last_bound_ = 0;
brew_ligature_primitive_proc = SCM_EOL;
}
@@ -81,7 +81,7 @@
if (m->is_mus_type ("ligature-event"))
{
Direction d = to_dir (m->get_property ("span-direction"));
- reqs_drul_[d] = m;
+ events_drul_[d] = m;
return true;
}
return false;
@@ -145,24 +145,24 @@
void
Ligature_engraver::process_music ()
{
- if (reqs_drul_[STOP])
+ if (events_drul_[STOP])
{
if (!ligature_)
{
- reqs_drul_[STOP]->origin ()->warning (_ ("can't find start of
ligature"));
+ events_drul_[STOP]->origin ()->warning (_ ("can't find start of
ligature"));
return;
}
if (!last_bound_)
{
- reqs_drul_[STOP]->origin ()->warning (_ ("no right bound"));
+ events_drul_[STOP]->origin ()->warning (_ ("no right bound"));
}
else
{
ligature_->set_bound (RIGHT, last_bound_);
}
- prev_start_req_ = 0;
+ prev_start_event_ = 0;
finished_primitives_ = primitives_;
finished_ligature_ = ligature_;
primitives_.clear ();
@@ -177,15 +177,15 @@
get_score_engraver ()->forbid_breaks ();
}
- if (reqs_drul_[START])
+ if (events_drul_[START])
{
if (ligature_)
{
- reqs_drul_[START]->origin ()->warning (_ ("already have a ligature"));
+ events_drul_[START]->origin ()->warning (_ ("already have a
ligature"));
return;
}
- prev_start_req_ = reqs_drul_[START];
+ prev_start_event_ = events_drul_[START];
ligature_ = create_ligature_spanner ();
brew_ligature_primitive_proc
= ligature_->get_property ("ligature-primitive-callback");
@@ -197,7 +197,7 @@
Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
if (!bound)
{
- reqs_drul_[START]->origin ()->warning (_ ("no left bound"));
+ events_drul_[START]->origin ()->warning (_ ("no left bound"));
}
else
{
@@ -207,7 +207,7 @@
ligature_start_mom_ = now_mom ();
// TODO: dump cause into make_item/spanner.
- // announce_grob (ligature_, reqs_drul_[START]->self_scm ());
+ // announce_grob (ligature_, events_drul_[START]->self_scm ());
override_stencil_callback ();
}
}
@@ -238,8 +238,8 @@
finished_ligature_ = 0;
}
- reqs_drul_[START] = 0;
- reqs_drul_[STOP] = 0;
+ events_drul_[START] = 0;
+ events_drul_[STOP] = 0;
}
void
@@ -253,7 +253,7 @@
}
if (ligature_)
{
- prev_start_req_->origin ()->warning (_ ("unterminated ligature"));
+ prev_start_event_->origin ()->warning (_ ("unterminated ligature"));
ligature_->suicide ();
}
}
@@ -278,7 +278,7 @@
if (Rest::has_interface (info.grob ()))
{
info.music_cause ()->origin ()->warning (_ ("ignoring rest: ligature
may not contain rest"));
- prev_start_req_->origin ()->warning (_ ("ligature was started here"));
+ prev_start_event_->origin ()->warning (_ ("ligature was started
here"));
// TODO: maybe better should stop ligature here rather than
// ignoring the rest?
}
Index: lilypond/lily/lyric-performer.cc
diff -u lilypond/lily/lyric-performer.cc:1.46
lilypond/lily/lyric-performer.cc:1.47
--- lilypond/lily/lyric-performer.cc:1.46 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/lyric-performer.cc Wed Jul 20 10:13:46 2005
@@ -16,12 +16,12 @@
TRANSLATOR_DECLARATIONS (Lyric_performer);
protected:
- virtual bool try_music (Music *req);
+ virtual bool try_music (Music *event);
PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
virtual void create_audio_elements ();
private:
- Link_array<Music> lreqs_;
+ Link_array<Music> events_;
Audio_text *audio_;
};
@@ -34,16 +34,16 @@
Lyric_performer::create_audio_elements ()
{
// FIXME: won't work with fancy lyrics
- if (lreqs_.size ()
- && scm_is_string (lreqs_[0]->get_property ("text"))
- && ly_scm2string (lreqs_[0]->get_property ("text")).length ())
+ if (events_.size ()
+ && scm_is_string (events_[0]->get_property ("text"))
+ && ly_scm2string (events_[0]->get_property ("text")).length ())
{
audio_ = new Audio_text (Audio_text::LYRIC,
- ly_scm2string (lreqs_[0]->get_property
("text")));
- Audio_element_info info (audio_, lreqs_[0]);
+ ly_scm2string (events_[0]->get_property
("text")));
+ Audio_element_info info (audio_, events_[0]);
announce_element (info);
}
- lreqs_.clear ();
+ events_.clear ();
}
void
@@ -54,15 +54,15 @@
play_element (audio_);
audio_ = 0;
}
- lreqs_.clear ();
+ events_.clear ();
}
bool
-Lyric_performer::try_music (Music *req)
+Lyric_performer::try_music (Music *event)
{
- if (req->is_mus_type ("lyric-event"))
+ if (event->is_mus_type ("lyric-event"))
{
- lreqs_.push (req);
+ events_.push (event);
return true;
}
return false;
Index: lilypond/lily/multi-measure-rest-engraver.cc
diff -u lilypond/lily/multi-measure-rest-engraver.cc:1.105
lilypond/lily/multi-measure-rest-engraver.cc:1.106
--- lilypond/lily/multi-measure-rest-engraver.cc:1.105 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/multi-measure-rest-engraver.cc Wed Jul 20 10:13:46 2005
@@ -58,18 +58,18 @@
}
bool
-Multi_measure_rest_engraver::try_music (Music *req)
+Multi_measure_rest_engraver::try_music (Music *event)
{
- if (req->is_mus_type ("multi-measure-rest-event"))
+ if (event->is_mus_type ("multi-measure-rest-event"))
{
- rest_ev_ = req;
+ rest_ev_ = event;
stop_moment_ = now_mom () + rest_ev_->get_length ();
return true;
}
- else if (req->is_mus_type ("multi-measure-text-event"))
+ else if (event->is_mus_type ("multi-measure-text-event"))
{
- text_events_.push (req);
+ text_events_.push (event);
return true;
}
return false;
Index: lilypond/lily/paper-column-engraver.cc
diff -u lilypond/lily/paper-column-engraver.cc:1.1
lilypond/lily/paper-column-engraver.cc:1.2
--- lilypond/lily/paper-column-engraver.cc:1.1 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/paper-column-engraver.cc Wed Jul 20 10:13:46 2005
@@ -18,6 +18,7 @@
#include "axis-group-interface.hh"
#include "warn.hh"
+#include "translator.icc"
Paper_column_engraver::Paper_column_engraver ()
@@ -203,6 +204,7 @@
}
first_ = false;
+ break_event_ = 0;
}
void
@@ -217,7 +219,6 @@
-#include "translator.icc"
ADD_TRANSLATOR (Paper_column_engraver,
/* descr */ "Takes care of generating columns."
Index: lilypond/lily/piano-pedal-performer.cc
diff -u lilypond/lily/piano-pedal-performer.cc:1.39
lilypond/lily/piano-pedal-performer.cc:1.40
--- lilypond/lily/piano-pedal-performer.cc:1.39 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/piano-pedal-performer.cc Wed Jul 20 10:13:46 2005
@@ -18,8 +18,8 @@
struct Pedal_info
{
char const *name_;
- Music *start_req_;
- Drul_array<Music *> req_drul_;
+ Music *start_event_;
+ Drul_array<Music *> event_drul_;
};
public:
@@ -59,9 +59,9 @@
do
{
p->name_ = *np;
- p->req_drul_[START] = 0;
- p->req_drul_[STOP] = 0;
- p->start_req_ = 0;
+ p->event_drul_[START] = 0;
+ p->event_drul_[STOP] = 0;
+ p->start_event_ = 0;
p++;
}
@@ -74,11 +74,11 @@
for (Pedal_info *p = info_alist_; p && p->name_; p++)
{
- if (p->req_drul_[STOP])
+ if (p->event_drul_[STOP])
{
- if (!p->start_req_)
+ if (!p->start_event_)
{
- p->req_drul_[STOP]->origin ()->warning (_f ("can't find start of
piano pedal: `%s'", String (p->name_)));
+ p->event_drul_[STOP]->origin ()->warning (_f ("can't find start
of piano pedal: `%s'", String (p->name_)));
}
else
{
@@ -87,19 +87,19 @@
a->dir_ = STOP;
audios_.push (a);
}
- p->start_req_ = 0;
+ p->start_event_ = 0;
}
- if (p->req_drul_[START])
+ if (p->event_drul_[START])
{
- p->start_req_ = p->req_drul_[START];
+ p->start_event_ = p->event_drul_[START];
Audio_piano_pedal *a = new Audio_piano_pedal;
a->type_string_ = String (p->name_);
a->dir_ = START;
audios_.push (a);
}
- p->req_drul_[START] = 0;
- p->req_drul_[STOP] = 0;
+ p->event_drul_[START] = 0;
+ p->event_drul_[STOP] = 0;
}
}
@@ -116,8 +116,8 @@
{
for (Pedal_info *p = info_alist_; p && p->name_; p++)
{
- p->req_drul_[STOP] = 0;
- p->req_drul_[START] = 0;
+ p->event_drul_[STOP] = 0;
+ p->event_drul_[START] = 0;
}
}
@@ -133,7 +133,7 @@
scm_str2symbol (nm.to_str0 ())))
{
Direction d = to_dir (r->get_property ("span-direction"));
- p->req_drul_[d] = r;
+ p->event_drul_[d] = r;
return true;
}
}
Index: lilypond/lily/tempo-performer.cc
diff -u lilypond/lily/tempo-performer.cc:1.36
lilypond/lily/tempo-performer.cc:1.37
--- lilypond/lily/tempo-performer.cc:1.36 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/tempo-performer.cc Wed Jul 20 10:13:46 2005
@@ -20,18 +20,18 @@
protected:
- virtual bool try_music (Music *req);
+ virtual bool try_music (Music *event);
PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
virtual void create_audio_elements ();
private:
- Music *tempo_req_;
+ Music *tempo_event_;
Audio_tempo *audio_;
};
Tempo_performer::Tempo_performer ()
{
- tempo_req_ = 0;
+ tempo_event_ = 0;
audio_ = 0;
}
@@ -42,18 +42,18 @@
void
Tempo_performer::create_audio_elements ()
{
- if (tempo_req_)
+ if (tempo_event_)
{
- SCM met = tempo_req_->get_property ("metronome-count");
- Duration *d = unsmob_duration (tempo_req_->get_property ("tempo-unit"));
+ SCM met = tempo_event_->get_property ("metronome-count");
+ Duration *d = unsmob_duration (tempo_event_->get_property
("tempo-unit"));
Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment
(scm_to_int (met))).main_part_;
audio_ = new Audio_tempo (int (r));
- Audio_element_info info (audio_, tempo_req_);
+ Audio_element_info info (audio_, tempo_event_);
announce_element (info);
- tempo_req_ = 0;
+ tempo_event_ = 0;
}
}
@@ -68,12 +68,12 @@
}
bool
-Tempo_performer::try_music (Music *req)
+Tempo_performer::try_music (Music *event)
{
- if (tempo_req_)
+ if (tempo_event_)
return false;
- tempo_req_ = req;
+ tempo_event_ = event;
return true;
}
Index: lilypond/lily/text-spanner-engraver.cc
diff -u lilypond/lily/text-spanner-engraver.cc:1.40
lilypond/lily/text-spanner-engraver.cc:1.41
--- lilypond/lily/text-spanner-engraver.cc:1.40 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/text-spanner-engraver.cc Wed Jul 20 10:13:46 2005
@@ -24,18 +24,18 @@
private:
Spanner *span_;
Spanner *finished_;
- Music *current_req_;
- Drul_array<Music *> req_drul_;
+ Music *current_event_;
+ Drul_array<Music *> event_drul_;
void typeset_all ();
};
Text_spanner_engraver::Text_spanner_engraver ()
{
finished_ = 0;
- current_req_ = 0;
+ current_event_ = 0;
span_ = 0;
- req_drul_[START] = 0;
- req_drul_[STOP] = 0;
+ event_drul_[START] = 0;
+ event_drul_[STOP] = 0;
}
bool
@@ -44,7 +44,7 @@
if (m->is_mus_type ("text-span-event"))
{
Direction d = to_dir (m->get_property ("span-direction"));
- req_drul_[d] = m;
+ event_drul_[d] = m;
return true;
}
@@ -54,33 +54,33 @@
void
Text_spanner_engraver::process_music ()
{
- if (req_drul_[STOP])
+ if (event_drul_[STOP])
{
if (!span_)
{
- req_drul_[STOP]->origin ()->warning (_ ("can't find start of text
spanner"));
+ event_drul_[STOP]->origin ()->warning (_ ("can't find start of text
spanner"));
}
else
{
finished_ = span_;
span_ = 0;
- current_req_ = 0;
+ current_event_ = 0;
}
}
- if (req_drul_[START])
+ if (event_drul_[START])
{
- if (current_req_)
+ if (current_event_)
{
- req_drul_[START]->origin ()->warning (_ ("already have a text
spanner"));
+ event_drul_[START]->origin ()->warning (_ ("already have a text
spanner"));
}
else
{
- current_req_ = req_drul_[START];
- span_ = make_spanner ("TextSpanner", req_drul_[START]->self_scm ());
+ current_event_ = event_drul_[START];
+ span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
Side_position_interface::set_axis (span_, Y_AXIS);
- req_drul_[START] = 0;
+ event_drul_[START] = 0;
}
}
}
@@ -123,8 +123,8 @@
}
typeset_all ();
- req_drul_[START] = 0;
- req_drul_[STOP] = 0;
+ event_drul_[START] = 0;
+ event_drul_[STOP] = 0;
}
void
@@ -133,7 +133,7 @@
typeset_all ();
if (span_)
{
- current_req_->origin ()->warning (_ ("unterminated text spanner"));
+ current_event_->origin ()->warning (_ ("unterminated text spanner"));
span_->suicide ();
span_ = 0;
}
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
