From: Jan Nieuwenhuizen Date: Sun, 19 Nov 2000 22:50:12 +0000 (+0100) Subject: patch::: 1.3.108.jcn5 X-Git-Tag: release/1.3.109~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3c5ca37ea37ea91dfc9fcc303cf6d68446e87291;p=lilypond.git patch::: 1.3.108.jcn5 1.3.108.jcn5 ============ * Fixed mark default font. --- diff --git a/CHANGES b/CHANGES index ed137253f1..ed602b83f1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3.108.jcn5 +============ + +* Fixed mark default font. + 1.3.108.jcn2 ============ diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index a2d0289437..75427b745b 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -147,7 +147,7 @@ main note. Grace notes can also be positioned after the main note. Grace notes without beams should have a slash, if @code{flagStyle} is not set. Main note scripts don't end up on the grace note. -@lilypondfile{grace.ly} +@c @lily pondfile{grace.ly} @section Beams, slurs and other spanners @@ -167,7 +167,7 @@ counting from the note head side, should never be lower than the second staff line. This does not hold for grace note beams. Override with @code{noStemExtend}. -@lilypondfile{beam-position.ly} +@c @lily pondfile{beam-position.ly} Slurs should look nice and symmetric. The curvature may increase only to avoid noteheads, and as little as possible. Slurs never diff --git a/VERSION b/VERSION index 3c75bd37de..78cec122d9 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=108 -MY_PATCH_LEVEL=jcn4 +MY_PATCH_LEVEL=jcn5 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index 85ac0efab4..723785658f 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -12,7 +12,8 @@ copyright = "public domain"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t \autoBeamOff - g4 r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4 + %g4 r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4 + g4 r8 \times 2/3 { g'8( f )e } r8 e4 \emptyText d8.^"melisma" \melisma c16 \melismaEnd diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index 3c935ebb41..23a93a17bd 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -58,6 +58,12 @@ Align_note_column_engraver::do_creation_processing () void Align_note_column_engraver::do_removal_processing () { + if (!align_item_p_) + { + programming_error ("Align_note_column_engraver:: urg\n"); + return; + } + SCM al = get_property ("graceAlignPosition"); if (isdir_b (al)) { diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index 8f932cc632..3a91da262d 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -11,6 +11,7 @@ #include "lily-guile.hh" #include "score-element.hh" #include "musical-request.hh" +#include "warn.hh" void Grace_engraver_group::start () @@ -56,6 +57,10 @@ Grace_engraver_group::announce_element (Score_element_info inf) void Grace_engraver_group::typeset_element (Score_element*e) { + if (!e) + programming_error ("Grace_engraver_group: empty elt\n"); + else + typeset_us_.push (e); } @@ -69,7 +74,13 @@ void Grace_engraver_group::process () { calling_self_b_ = true; - //process_music (); + + //process_music (); -- used to do implicit creation processing () + // possibly post_move_processing ()? + do_creation_processing (); + post_move_processing (); + + announces(); pre_move_processing(); check_removal(); diff --git a/lily/include/key-performer.hh b/lily/include/key-performer.hh index b89dbb8b42..e69de29bb2 100644 --- a/lily/include/key-performer.hh +++ b/lily/include/key-performer.hh @@ -1,33 +0,0 @@ -/* - key-performer.hh -- declare Key_performer - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Jan Nieuwenhuizen -*/ - -#ifndef KEY_PERFOMER_HH -#define KEY_PERFOMER_HH - -#include "lily-proto.hh" -#include "performer.hh" - -class Key_performer : public Performer -{ -public: - VIRTUAL_COPY_CONS(Translator); - - Key_performer(); - ~Key_performer(); - -protected: - virtual bool do_try_music (Music* req_l); - void deprecated_process_music (); - virtual void do_pre_move_processing (); - -private: - Key_change_req* key_req_l_; - Audio_key* audio_p_; -}; - -#endif // KEY_PERFOMER_HH diff --git a/lily/include/lyric-performer.hh b/lily/include/lyric-performer.hh index 4fe468899f..e69de29bb2 100644 --- a/lily/include/lyric-performer.hh +++ b/lily/include/lyric-performer.hh @@ -1,33 +0,0 @@ -/* - lyric-performer.hh -- declare Lyric_performer - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Jan Nieuwenhuizen -*/ - - -#ifndef LYRIC_PERFOMER_HH -#define LYRIC_PERFOMER_HH - -#include "lily-proto.hh" -#include "performer.hh" -#include "array.hh" - -class Lyric_performer : public Performer { -public: - VIRTUAL_COPY_CONS(Translator); - Lyric_performer (); - -protected: - - virtual bool do_try_music (Music* req_l); - void deprecated_process_music(); - virtual void do_pre_move_processing (); - -private: - Link_array lreq_arr_; - Audio_text* audio_p_; -}; - -#endif // LYRIC_PERFOMER_HH diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh index a7ffbc2261..e69de29bb2 100644 --- a/lily/include/note-performer.hh +++ b/lily/include/note-performer.hh @@ -1,37 +0,0 @@ -/* - note-performer.hh -- declare Note_performer - - (c) 1996--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ - -#ifndef NOTE_PERFORMER_HH -#define NOTE_PERFORMER_HH - -#include "performer.hh" - -/** -Convert reqs to audio notes. -*/ -class Note_performer : public Performer { -public: - VIRTUAL_COPY_CONS(Translator); - - - Note_performer(); - -protected: - void deprecated_process_music (); - virtual bool do_try_music (Music *req_l) ; - - virtual void do_pre_move_processing (); - virtual void process_acknowledged (); - Global_translator* global_translator_l (); - -private: - Array note_req_l_arr_; - Array note_p_arr_; - Array delayed_p_arr_; -}; - -#endif // NOTE_PERFORMER_HH diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh index 7fdaea3a0e..e69de29bb2 100644 --- a/lily/include/staff-performer.hh +++ b/lily/include/staff-performer.hh @@ -1,44 +0,0 @@ -/* - staff-performer.hh -- declare Staff_performer - - (c) 1996--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ - -#ifndef STAFF_PERFORMER_HH -#define STAFF_PERFORMER_HH - -#include "performer-group-performer.hh" - -/** Perform a staff. Individual notes should have their instrument - (staff-wide) set, so we override play_element() - - */ -class Staff_performer : public Performer_group_performer -{ -public: - VIRTUAL_COPY_CONS(Translator); - - - Staff_performer (); - ~Staff_performer (); - - String new_instrument_str (); - String instrument_str_; - -protected: - virtual void play_element (Audio_element* p); - virtual void do_removal_processing (); - virtual void do_creation_processing (); - void deprecated_process_music (); - virtual void do_pre_move_processing (); - -private: - Audio_staff* audio_staff_p_; - Audio_instrument* instrument_p_; - Audio_text* instrument_name_p_; - Audio_text* name_p_; - Audio_tempo* tempo_p_; -}; - -#endif // STAFF_PERFORMER_HH diff --git a/lily/include/tempo-performer.hh b/lily/include/tempo-performer.hh index e2eb89cc24..e69de29bb2 100644 --- a/lily/include/tempo-performer.hh +++ b/lily/include/tempo-performer.hh @@ -1,34 +0,0 @@ -/* - tempo-performer.hh -- declare Tempo_performer - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Jan Nieuwenhuizen -*/ - -#ifndef TEMPO_PERFORMER_HH -#define TEMPO_PERFORMER_HH - -#include "lily-proto.hh" -#include "performer.hh" - -class Tempo_performer : public Performer -{ -public: - VIRTUAL_COPY_CONS(Translator); - - Tempo_performer(); - ~Tempo_performer(); - -protected: - - virtual bool do_try_music (Music* req_l); - void deprecated_process_music(); - virtual void do_pre_move_processing (); - -private: - Tempo_req* tempo_req_l_; - Audio_tempo* audio_p_; -}; - -#endif // TEMPO_PERFORMER_HH diff --git a/lily/include/tie-performer.hh b/lily/include/tie-performer.hh index cec634ac80..e69de29bb2 100644 --- a/lily/include/tie-performer.hh +++ b/lily/include/tie-performer.hh @@ -1,64 +0,0 @@ -/* - tie-performer.hh -- declare Tie_performer - - source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Jan Nieuwenhuizen - - */ - -#ifndef TIE_PERFORMER_HH -#define TIE_PERFORMER_HH - -#include "pqueue.hh" -#include "performer.hh" - -struct CNote_melodic_tuple { - Melodic_req *req_l_ ; - Audio_note *note_l_; - Moment end_; - CNote_melodic_tuple (); - CNote_melodic_tuple (Audio_note*, Melodic_req*, Moment); - static int pitch_compare (CNote_melodic_tuple const &, CNote_melodic_tuple const &); - static int time_compare (CNote_melodic_tuple const &, CNote_melodic_tuple const &); -}; - -inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b) -{ - return CNote_melodic_tuple::time_compare (a,b); -} - - -/** - Manufacture ties. Acknowledge notes, and put them into a - priority queue. If we have a Tie_req, connect the notes that finish - just at this time, and note that start at this time. - - TODO: should share code with Tie_engraver ? - */ -class Tie_performer : public Performer -{ -public: - VIRTUAL_COPY_CONS(Translator); - Tie_performer (); - -private: - PQueue past_notes_pq_; - Tie_req *req_l_; - Array now_notes_; - Array stopped_notes_; - Link_array tie_p_arr_; - -protected: - virtual void do_post_move_processing (); - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Audio_element_info); - virtual bool do_try_music (Music*); - void deprecated_process_music (); - virtual void process_acknowledged (); - -}; - - -#endif /* TIE_PERFORMER_HH */ - diff --git a/lily/include/time-signature-performer.hh b/lily/include/time-signature-performer.hh index 5a827b54bc..e69de29bb2 100644 --- a/lily/include/time-signature-performer.hh +++ b/lily/include/time-signature-performer.hh @@ -1,13 +0,0 @@ -/* - time_signature-performer.hh -- declare Time_signature_performer - - source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Jan Nieuwenhuizen -*/ - -#ifndef TIME_SIGNATURE_PERFORMER_HH -#define TIME_SIGNATURE_PERFORMER_HH - - -#endif // TIME_SIGNATURE_PERFORMER_HH diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 77fb5c74e7..a3fecf5267 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -6,10 +6,27 @@ (c) 1997--2000 Jan Nieuwenhuizen */ -#include "key-performer.hh" #include "command-request.hh" #include "audio-item.hh" +#include "performer.hh" +class Key_performer : public Performer +{ +public: + VIRTUAL_COPY_CONS(Translator); + + Key_performer(); + ~Key_performer(); + +protected: + virtual bool do_try_music (Music* req_l); + virtual void process_acknowledged (); + virtual void do_pre_move_processing (); + +private: + Key_change_req* key_req_l_; + Audio_key* audio_p_; +}; ADD_THIS_TRANSLATOR (Key_performer); @@ -24,7 +41,7 @@ Key_performer::~Key_performer () } void -Key_performer::deprecated_process_music () +Key_performer::process_acknowledged () { if (key_req_l_ && gh_list_p (key_req_l_->get_mus_property ("pitch-alist"))) diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index f20891ab28..3d34dbf047 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -6,9 +6,27 @@ (c) 1997--2000 Jan Nieuwenhuizen */ -#include "lyric-performer.hh" #include "musical-request.hh" #include "audio-item.hh" +#include "lily-proto.hh" +#include "performer.hh" +#include "array.hh" + +class Lyric_performer : public Performer { +public: + VIRTUAL_COPY_CONS(Translator); + Lyric_performer (); + +protected: + + virtual bool do_try_music (Music* req_l); + virtual void do_pre_move_processing (); + virtual void process_acknowledged (); + +private: + Link_array lreq_arr_; + Audio_text* audio_p_; +}; ADD_THIS_TRANSLATOR (Lyric_performer); @@ -19,7 +37,7 @@ Lyric_performer::Lyric_performer () void -Lyric_performer::deprecated_process_music () +Lyric_performer::process_acknowledged () { // FIXME: won't work with fancy lyrics if (lreq_arr_.size () diff --git a/lily/note-performer.cc b/lily/note-performer.cc index d63d0c442b..f6e74e7f22 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -6,24 +6,37 @@ (c) 1996--2000 Jan Nieuwenhuizen */ -#include "note-performer.hh" +#include "performer.hh" #include "musical-request.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-translator.hh" #include "debug.hh" +/** +Convert reqs to audio notes. +*/ +class Note_performer : public Performer { +public: + VIRTUAL_COPY_CONS(Translator); + +protected: + virtual bool do_try_music (Music *req_l) ; + + virtual void do_pre_move_processing (); + virtual void process_acknowledged (); + Global_translator* global_translator_l (); + +private: + Array note_req_l_arr_; + Array note_p_arr_; + Array delayed_p_arr_; +}; ADD_THIS_TRANSLATOR (Note_performer); -Note_performer::Note_performer () -{ -} - - - void -Note_performer::deprecated_process_music () +Note_performer::process_acknowledged () { if (note_req_l_arr_.size ()) { @@ -42,14 +55,10 @@ Note_performer::deprecated_process_music () announce_element (info); note_p_arr_.push (p); } + note_req_l_arr_.clear (); } } -void -Note_performer::process_acknowledged () -{ -} - Global_translator* Note_performer::global_translator_l () { diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 0d2348f41b..48a46fb999 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -33,7 +33,6 @@ public: protected: virtual void do_creation_processing (); virtual bool do_try_music (Music*); - void deprecated_process_music (); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); virtual void acknowledge_element (Score_element_info); @@ -86,9 +85,9 @@ Piano_pedal_engraver::~Piano_pedal_engraver() } /* - Urg: Code dup - I'm a script - */ + Urg: Code dup + I'm a script + */ void Piano_pedal_engraver::acknowledge_element (Score_element_info info) { @@ -132,12 +131,6 @@ Piano_pedal_engraver::do_try_music (Music *m) void Piano_pedal_engraver::process_acknowledged () -{ - deprecated_process_music (); -} - -void -Piano_pedal_engraver::deprecated_process_music () { for (Pedal_info*p = info_list_; p && p->name_; p ++) { @@ -185,6 +178,8 @@ Piano_pedal_engraver::deprecated_process_music () ? p->req_l_drul_[START] : p->req_l_drul_[STOP]); } + p->req_l_drul_[START] = 0; + p->req_l_drul_[STOP] = 0; } } diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index e2d6eb02ca..92fed8d8c3 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -33,7 +33,7 @@ public: protected: virtual void do_creation_processing (); virtual bool do_try_music (Music*); - void deprecated_process_music (); + virtual void process_acknowledged (); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); @@ -75,7 +75,7 @@ Piano_pedal_performer::do_creation_processing () } void -Piano_pedal_performer::deprecated_process_music () +Piano_pedal_performer::process_acknowledged () { for (Pedal_info*p = info_alist_; p && p->name_; p ++) @@ -104,6 +104,8 @@ Piano_pedal_performer::deprecated_process_music () a->dir_ = START; audio_p_arr_.push (a); } + p->req_l_drul_[START] = 0; + p->req_l_drul_[STOP] = 0; } } diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index c877b114e2..e7d7561fc9 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -6,13 +6,43 @@ (c) 1997--2000 Jan Nieuwenhuizen */ -#include "staff-performer.hh" #include "translator-group.hh" #include "debug.hh" #include "audio-column.hh" #include "audio-item.hh" #include "audio-staff.hh" +#include "performer-group-performer.hh" +/** Perform a staff. Individual notes should have their instrument + (staff-wide) set, so we override play_element() + + */ +class Staff_performer : public Performer_group_performer +{ +public: + VIRTUAL_COPY_CONS(Translator); + + + Staff_performer (); + ~Staff_performer (); + + String new_instrument_str (); + String instrument_str_; + +protected: + virtual void play_element (Audio_element* p); + virtual void do_removal_processing (); + virtual void do_creation_processing (); + virtual void process_acknowledged (); + virtual void do_pre_move_processing (); + +private: + Audio_staff* audio_staff_p_; + Audio_instrument* instrument_p_; + Audio_text* instrument_name_p_; + Audio_text* name_p_; + Audio_tempo* tempo_p_; +}; ADD_THIS_TRANSLATOR (Staff_performer); @@ -45,7 +75,7 @@ Staff_performer::do_creation_processing () } void -Staff_performer::deprecated_process_music () +Staff_performer::process_acknowledged () { String str = new_instrument_str (); if (str.length_i ()) @@ -55,7 +85,7 @@ Staff_performer::deprecated_process_music () instrument_p_ = new Audio_instrument (str); announce_element (Audio_element_info (instrument_p_, 0)); } - // Performer_group_performer::deprecated_process_music (); + //Performer_group_performer::deprecated_process_music (); } void diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 9a8b89ade2..3b57dccd47 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -6,9 +6,28 @@ (c) 1997--2000 Jan Nieuwenhuizen */ -#include "tempo-performer.hh" #include "command-request.hh" #include "audio-item.hh" +#include "performer.hh" + +class Tempo_performer : public Performer +{ +public: + VIRTUAL_COPY_CONS(Translator); + + Tempo_performer(); + ~Tempo_performer(); + +protected: + + virtual bool do_try_music (Music* req_l); + virtual void do_pre_move_processing (); + virtual void process_acknowledged (); + +private: + Tempo_req* tempo_req_l_; + Audio_tempo* audio_p_; +}; ADD_THIS_TRANSLATOR (Tempo_performer); @@ -24,7 +43,7 @@ Tempo_performer::~Tempo_performer () void -Tempo_performer::deprecated_process_music () +Tempo_performer::process_acknowledged () { if (tempo_req_l_) { diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index bee102edfd..d58cc35da6 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -44,6 +44,7 @@ inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b) */ class Tie_engraver : public Engraver { + bool done_; PQueue past_notes_pq_; Moment end_mom_; Moment next_end_mom_; @@ -62,7 +63,6 @@ protected: virtual void do_pre_move_processing (); virtual void acknowledge_element (Score_element_info); virtual bool do_try_music (Music*); - void deprecated_process_music (); virtual void process_acknowledged (); void typeset_tie (Score_element*); public: @@ -117,25 +117,20 @@ Tie_engraver::acknowledge_element (Score_element_info i) } } -void -Tie_engraver::deprecated_process_music () -{ -} - void Tie_engraver::process_acknowledged () { - if (tie_p_arr_.size ()) - return; - - if (req_l_) + if (req_l_ && !done_) { Moment now = now_mom (); stopped_heads_.clear (); while (past_notes_pq_.size () && past_notes_pq_.front ().end_ == now) stopped_heads_.push (past_notes_pq_.get ()); + done_ = true; + return; } + if (req_l_) { now_heads_.sort (CHead_melodic_tuple::pitch_compare); @@ -268,6 +263,7 @@ Tie_engraver::do_post_move_processing () set_melisma (false); } req_l_ = 0; + done_ = false; Moment now = now_mom (); while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) past_notes_pq_.delmin (); diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 66de72eddb..c25e51ea13 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -7,18 +7,57 @@ */ -#include "tie-performer.hh" #include "command-request.hh" #include "audio-item.hh" #include "musical-request.hh" +#include "pqueue.hh" +#include "performer.hh" + +struct CNote_melodic_tuple { + Melodic_req *req_l_ ; + Audio_note *note_l_; + Moment end_; + CNote_melodic_tuple (); + CNote_melodic_tuple (Audio_note*, Melodic_req*, Moment); + static int pitch_compare (CNote_melodic_tuple const &, CNote_melodic_tuple const &); + static int time_compare (CNote_melodic_tuple const &, CNote_melodic_tuple const &); +}; + +inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b) +{ + return CNote_melodic_tuple::time_compare (a,b); +} -ADD_THIS_TRANSLATOR (Tie_performer); +/** + Manufacture ties. Acknowledge notes, and put them into a + priority queue. If we have a Tie_req, connect the notes that finish + just at this time, and note that start at this time. -Tie_performer::Tie_performer() + TODO: should share code with Tie_engraver ? + */ +class Tie_performer : public Performer { - req_l_ = 0; -} +public: + VIRTUAL_COPY_CONS(Translator); + +private: + bool done_; + PQueue past_notes_pq_; + Tie_req *req_l_; + Array now_notes_; + Array stopped_notes_; + Link_array tie_p_arr_; + +protected: + virtual void do_post_move_processing (); + virtual void do_pre_move_processing (); + virtual void acknowledge_element (Audio_element_info); + virtual bool do_try_music (Music*); + virtual void process_acknowledged (); +}; + +ADD_THIS_TRANSLATOR (Tie_performer); bool Tie_performer::do_try_music (Music *m) @@ -47,9 +86,9 @@ Tie_performer::acknowledge_element (Audio_element_info i) } void -Tie_performer::deprecated_process_music () +Tie_performer::process_acknowledged () { - if (req_l_) + if (req_l_ && ! done_) { Moment now = now_mom (); Link_array nharr; @@ -58,13 +97,10 @@ Tie_performer::deprecated_process_music () while (past_notes_pq_.size () && past_notes_pq_.front ().end_ == now) stopped_notes_.push (past_notes_pq_.get ()); + done_ = true; + return; } -} -void -Tie_performer::process_acknowledged () -{ - deprecated_process_music (); if (req_l_) { now_notes_.sort (CNote_melodic_tuple::pitch_compare); @@ -109,7 +145,6 @@ Tie_performer::process_acknowledged () { req_l_->origin ()->warning (_("No ties were created!")); } - } } @@ -134,6 +169,7 @@ void Tie_performer::do_post_move_processing () { req_l_ =0; + done_ = false; Moment now = now_mom (); while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) past_notes_pq_.delmin (); diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index dcc2c5fe0d..c544be8180 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -21,8 +21,8 @@ public: protected: - void deprecated_process_music(); virtual void do_pre_move_processing (); + virtual void process_acknowledged (); SCM prev_fraction_; private: @@ -43,7 +43,7 @@ Time_signature_performer::~Time_signature_performer () void -Time_signature_performer::deprecated_process_music () +Time_signature_performer::process_acknowledged () { SCM fr = get_property ("timeSignatureFraction"); if (gh_pair_p (fr) diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index 0fba22b977..e2ffcfcbcf 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -246,7 +246,8 @@ (molecule-callback . ,Text_item::brew_molecule) (direction . 1) (breakable . #t) - (font-family . roman) + (font-family . number) + (font-shape . upright) (font-relative-size . 1) (visibility-lambda . ,end-of-line-invisible) (padding . 0.8)