From: fred Date: Tue, 26 Mar 2002 22:47:07 +0000 (+0000) Subject: lilypond-1.3.34 X-Git-Tag: release/1.5.59~1819 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9f9124e2a5fb7537ae7c43b0c5b53515f00e6e13;p=lilypond.git lilypond-1.3.34 --- diff --git a/input/bugs/updownstem.ly b/input/bugs/updownstem.ly new file mode 100644 index 0000000000..8d2cabc3f3 --- /dev/null +++ b/input/bugs/updownstem.ly @@ -0,0 +1,8 @@ +% silly short upstem? +\score{ +\context Staff \notes\relative c''{ +< a4 c e > +} +\paper{ +} +} diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 842b45bce0..4d3f289cd9 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,21 +1,8 @@ - -\header{ -%% URG -Clarinetti ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Clarinetti\\hss}\\hbox to0pt{\\hss (B\\textflat)\\hss}\vss}"; -Cl ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Cl.\\hss}\\hbox to0pt{\\hss (B\\textflat)\\hss}\vss}"; -Corni ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Corni\\hss}\\hbox to0pt{\\hss (E\\textflat)\\hss}\vss}"; -Cor ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Cor.\\hss}\\hbox to0pt{\\hss (E\\textflat)\\hss}\vss}"; -Trombe ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Trombe\\hss}\\hbox to0pt{\\hss (C)\\hss}\vss}"; -Tbe ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Tbe.\\hss}\\hbox to0pt{\\hss (C)\\hss}\vss}"; -Timpani ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Timpani\\hss}\\hbox to0pt{\\hss (C-G)\\hss}\vss}"; -VioloncelloContrabasso ="\\hss\\vbox to0pt{\vss\\hbox to0pt{\\hss Violoncello\\hss}\\hbox to0pt{\\hss e\\hss}\\hbox to0pt{\\hss Contrabasso\\hss}\vss}"; -VcCb ="\\hss\\vbox to0pt{\vss\\hbox to0pt{\\hss Vc.\\hss}\\hbox to0pt{\\hss Cb.\\hss}\vss}"; -} - flauti = \notes \relative c' { \property Staff.instrument = #"2 Flauti" \property Staff.instr = #"Fl." - c1 \break c + c1 + \break c \bar"|."; } @@ -26,9 +13,6 @@ oboi = \notes \relative c' { } clarinetti = \notes \relative c' { - %%\property Staff.instrument = #"\\mudelaClarinetti " - %%\property Staff.instr = #"\\mudelaCl " - \property Staff.instrument = #"2 Clarinetti\n(B\\textflat)" \property Staff.instr = #"Cl.\n(B\\textflat)" @@ -42,9 +26,6 @@ fagotti = \notes \relative c' { } corni = \notes \relative c' { - %%\property Staff.instrument = #"\\mudelaCorni " - %%\property Staff.instr = #"\\mudelaCor " - \property Staff.instrument = #"2 Corni\n(E\\textflat)" \property Staff.instr = #"Cor.\n(E\\textflat)" @@ -52,9 +33,6 @@ corni = \notes \relative c' { } trombe = \notes \relative c' { - %%\property Staff.instrument = #"\\mudelaTrombe " - %%\property Staff.instr = #"\\mudelaTbe " - \property Staff.instrument = #"2 Trombe\n(C)" \property Staff.instr = #"Tbe.\n(C)" @@ -62,9 +40,6 @@ trombe = \notes \relative c' { } timpani = \notes \relative c' { - %%\property Staff.instrument = #"\\mudelaTimpani " - %%\property Staff.instr = #"Timp." - \property Staff.instrument = #"Timpani\n(C-G)" \property Staff.instr = #"Timp." @@ -90,14 +65,13 @@ viola = \notes \relative c' { } violoncello = \notes \relative c' { - %%\property Staff.instrument = #"\\mudelaVioloncelloContrabasso " - %%\property Staff.instr = #"\\mudelaVcCb " - \property Staff.instrument = #"Violoncello\ne\nContrabasso" \property Staff.instr = #"Vc.\nCb." c1 c } +\include "paper16.ly" + \score { < \context StaffGroup ="legni" < @@ -112,6 +86,11 @@ violoncello = \notes \relative c' { > \context StaffGroup ="timpani" < \context Staff ="timpani" \timpani + { + \skip 1; + % Hmm: this forces a staff-bracket, that's good! + % However, I can't find where is decided on staff-bracket yes/no + } > \context StaffGroup ="archi" < \context GrandStaff ="violini" < @@ -132,12 +111,16 @@ violoncello = \notes \relative c' { } \paper { + \paper_sixteen indent=100.0\mm; linewidth=150.0\mm; \translator { - \StaffContext - \consists Staff_margin_engraver; - staffMarginHorizontalPadding = #-12 + \HaraKiriStaffContext + } + \translator { + \ScoreContext + instrumentScriptPadding = #55 %% urg, this is in pt + instrScriptPadding = #25 } } } diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly new file mode 100644 index 0000000000..cbb02a484b --- /dev/null +++ b/input/test/maximum-rest-count.ly @@ -0,0 +1,21 @@ +\score{ +\context Staff \notes\relative c''{ +< a4 c e > +< r r r > +\property Staff.maximumRestCount = #3 +< r r r > +\property Staff.maximumRestCount = #2 +< r r r > +\property Staff.maximumRestCount = #1 +< r r r > +\property Staff.maximumRestCount = #0 +< r r r > +% urg +r +} +\paper{ +} +\midi{ +\tempo 1 = 60; +} +} diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index 9fb7d41b99..5bde41d6bf 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ @@ -59,7 +59,6 @@ Align_note_column_engraver::do_removal_processing () { Direction d = to_dir (al); directional_element (align_item_p_).set (d); - align_item_p_->set_elt_property ("align-dir", to_dir (-d)); } typeset_element (align_item_p_); diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 0d61907069..450b1b4b70 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 779d0781b0..5ee092ad59 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #include "beaming.hh" diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 7b4b7b1450..ef0edb3cbd 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/auto-change-music.cc b/lily/auto-change-music.cc index 7902d55ced..82871ffd7d 100644 --- a/lily/auto-change-music.cc +++ b/lily/auto-change-music.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/axis-align-item.cc b/lily/axis-align-item.cc index 8990872b21..d0301c907b 100644 --- a/lily/axis-align-item.cc +++ b/lily/axis-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/axis-align-spanner.cc b/lily/axis-align-spanner.cc index 4eacf9fe8b..b369c85122 100644 --- a/lily/axis-align-spanner.cc +++ b/lily/axis-align-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "axis-align-spanner.hh" diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index e4182d8f5a..f9d813035a 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "axis-group-engraver.hh" diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 68c8760492..d835edbd09 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997, 1998, 1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index c41d9d1205..521b23f7aa 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc index 8e16c50988..9b92ddeb1a 100644 --- a/lily/beaming-info.cc +++ b/lily/beaming-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/boxes.cc b/lily/boxes.cc index 6b52a0daee..acc6681d79 100644 --- a/lily/boxes.cc +++ b/lily/boxes.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include "box.hh" diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 540c6597c8..91916e56ae 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include "paper-column.hh" diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 508f7d3c38..c111645eee 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/chord-name.cc b/lily/chord-name.cc index e395663bd1..396909c461 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #include "chord-name.hh" diff --git a/lily/chord.cc b/lily/chord.cc index 89d4c4590e..e188062f0e 100644 --- a/lily/chord.cc +++ b/lily/chord.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #include "chord.hh" diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc index 138de63631..eb3005964e 100644 --- a/lily/context-specced-music.cc +++ b/lily/context-specced-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "context-specced-music.hh" diff --git a/lily/debug.cc b/lily/debug.cc index 3638dd6c76..76eb7e7117 100644 --- a/lily/debug.cc +++ b/lily/debug.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996,98 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ diff --git a/lily/directional-element.cc b/lily/directional-element.cc index dac91951bd..4cc5ebb52f 100644 --- a/lily/directional-element.cc +++ b/lily/directional-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 87ab488ac6..9bd790f001 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -7,6 +7,7 @@ */ #include "debug.hh" #include "dimensions.hh" +#include "dimension-cache.hh" #include "crescendo.hh" #include "musical-request.hh" #include "lookup.hh" @@ -24,6 +25,14 @@ #include "staff-symbol-referencer.hh" #include "translator-group.hh" + +/* + TODO: + + * fix vertical placement of orphaned items + * fix padding + */ + class Dynamic_line_spanner : public Spanner { public: @@ -71,6 +80,9 @@ class Dynamic_engraver : public Engraver Dynamic_line_spanner* line_spanner_; Moment last_request_mom_; + + Note_column* pending_column_; + Link_array pending_element_arr_; void typeset_all (); @@ -87,6 +99,7 @@ protected: virtual void do_process_music (); virtual void do_pre_move_processing (); virtual void do_post_move_processing (); + virtual void typeset_element (Score_element*); }; ADD_THIS_TRANSLATOR (Dynamic_engraver); @@ -107,6 +120,7 @@ Dynamic_engraver::Dynamic_engraver () line_spanner_ = 0; span_start_req_l_ = 0; cresc_p_ =0; + pending_column_ = 0; text_req_l_ = 0; span_req_l_drul_[START] = 0; @@ -153,18 +167,32 @@ Dynamic_engraver::do_try_music (Music * m) void Dynamic_engraver::do_process_music () { - if ((span_req_l_drul_[START] || text_req_l_) && !line_spanner_) + if ((span_req_l_drul_[START] || text_req_l_) + && !line_spanner_ + && pending_element_arr_.size ()) { line_spanner_ = new Dynamic_line_spanner; + assert (pending_column_); + line_spanner_->add_column (pending_column_); side_position (line_spanner_).set_axis (Y_AXIS); announce_element (Score_element_info (line_spanner_, text_req_l_ ? text_req_l_ : span_req_l_drul_[START])); } - + + if (line_spanner_ && pending_element_arr_.size ()) + { + for (int i = 0; i < pending_element_arr_.size (); i++) + pending_element_arr_[i]->set_parent (line_spanner_, Y_AXIS); + pending_element_arr_.clear (); + } + if (span_req_l_drul_[START] || text_req_l_) last_request_mom_ = now_mom (); + else + pending_element_arr_.clear (); + if (text_req_l_) { @@ -176,9 +204,10 @@ Dynamic_engraver::do_process_music () text_p_->set_elt_property ("style", gh_str02scm ("dynamic")); text_p_->set_elt_property ("script-priority", gh_int2scm (100)); - - assert (line_spanner_); - text_p_->set_parent (line_spanner_, Y_AXIS); + pending_element_arr_.push (text_p_); + text_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0)); + text_p_->add_offset_callback (Side_position_interface::aligned_on_self, + Y_AXIS); announce_element (Score_element_info (text_p_, text_req_l_)); } @@ -193,7 +222,6 @@ Dynamic_engraver::do_process_music () { assert (!finished_cresc_p_); cresc_p_->set_bound(RIGHT, get_staff_info ().musical_pcol_l ()); - // cresc_p_->add_dependency (get_staff_info ().musical_pcol_l ()); finished_cresc_p_ = cresc_p_; cresc_p_ = 0; span_start_req_l_ = 0; @@ -238,8 +266,6 @@ Dynamic_engraver::do_process_music () cresc_p_->set_bound(LEFT, get_staff_info ().musical_pcol_l ()); - // cresc_p_->add_dependency (get_staff_info ().musical_pcol_l ()); - /* We know how wide the text is, if we can be sure that the text already has relevant pointers into the paperdef, @@ -247,6 +273,12 @@ Dynamic_engraver::do_process_music () Since font-size may be set by a context higher up, we can not be sure of the size. + + + We shouldn't try to do this stuff here, the Item should + do it when the score is finished. We could maybe + set a callback to have the Item do the alignment if + it is not a special symbol, like Crescendo. */ @@ -258,10 +290,10 @@ Dynamic_engraver::do_process_music () index_set_cell (finished_cresc_p_->get_elt_property ("dynamic-drul"), RIGHT, SCM_BOOL_T); } - - assert (line_spanner_); - cresc_p_->set_parent (line_spanner_, Y_AXIS); - // cresc_p_->add_dependency (line_spanner_); + pending_element_arr_.push (cresc_p_); + cresc_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0)); + cresc_p_->add_offset_callback + (Side_position_interface::aligned_on_self, Y_AXIS); announce_element (Score_element_info (cresc_p_, span_req_l_drul_[START])); } } @@ -291,6 +323,12 @@ Dynamic_engraver::do_removal_processing () } } +void +Dynamic_engraver::typeset_element (Score_element* e) +{ + side_position (e).add_staff_support (); + Engraver::typeset_element (e); +} void Dynamic_engraver::typeset_all () @@ -314,9 +352,6 @@ Dynamic_engraver::typeset_all () * continue through piece */ if (line_spanner_ && last_request_mom_ < now_mom ()) { - - side_position (line_spanner_).add_staff_support (); - typeset_element (line_spanner_); line_spanner_ = 0; } @@ -325,12 +360,16 @@ Dynamic_engraver::typeset_all () void Dynamic_engraver::acknowledge_element (Score_element_info i) { - if (line_spanner_) + if (Note_column* n = dynamic_cast (i.elem_l_)) { - if (Note_column* n = dynamic_cast (i.elem_l_)) + if (line_spanner_) { side_position (line_spanner_).add_support (n); line_spanner_->add_column (n); } + else + { + pending_column_ = n; + } } } diff --git a/lily/extender-spanner.cc b/lily/extender-spanner.cc index 0f5cbfb5d9..dd9e1a9bdd 100644 --- a/lily/extender-spanner.cc +++ b/lily/extender-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998, 1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ /* diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index 8132ad6dca..1083b8fa69 100644 --- a/lily/folded-repeat-iterator.cc +++ b/lily/folded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/font-metric.cc b/lily/font-metric.cc index ef615ae0a9..1f54aa5ead 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc index e8838acf48..b48a72ff3b 100644 --- a/lily/global-ctor.cc +++ b/lily/global-ctor.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "global-ctor.hh" diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc index 2ae9d267e9..0ddf8481b7 100644 --- a/lily/grace-align-item.cc +++ b/lily/grace-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ @@ -24,7 +24,9 @@ Grace_align_item::before_line_breaking () Real nhw = // lookup_l ()->notehead (2, "").dim_[X_AXIS].length(); paper_l ()->get_var ("quartwidth"); - threshold_interval_[MIN] = nhw* 1.5; + set_elt_property ("threshold", + gh_cons (gh_double2scm (nhw* 1.5), + gh_double2scm (infinity_f))); column_l ()->set_elt_property ("contains-grace", SCM_BOOL_T); diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index cb99415a2b..20eb4a63ee 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "grace-engraver-group.hh" diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index ffd57a8976..52ba6f57e0 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/grace-music.cc b/lily/grace-music.cc index d93d4829b3..50c0f155f6 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc index 45c47ca37f..f2c8ef2776 100644 --- a/lily/grace-performer-group.cc +++ b/lily/grace-performer-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music playter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #include "grace-performer-group.hh" diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc index 5024b8c7b8..866b3a2d80 100644 --- a/lily/grace-position-engraver.cc +++ b/lily/grace-position-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/grace-position-performer.cc b/lily/grace-position-performer.cc index d932f3900f..c1c4ae8896 100644 --- a/lily/grace-position-performer.cc +++ b/lily/grace-position-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/group-interface.cc b/lily/group-interface.cc index 628a9fff58..a24e883da6 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "group-interface.hh" diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc index 0761b36ce3..a0a2e0cf50 100644 --- a/lily/hara-kiri-engraver.cc +++ b/lily/hara-kiri-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "hara-kiri-vertical-group-spanner.hh" diff --git a/lily/hara-kiri-line-group-engraver.cc b/lily/hara-kiri-line-group-engraver.cc index 2d9fe8a916..721a0995a8 100644 --- a/lily/hara-kiri-line-group-engraver.cc +++ b/lily/hara-kiri-line-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998, 1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ #include "rhythmic-head.hh" diff --git a/lily/hara-kiri-vertical-group-spanner.cc b/lily/hara-kiri-vertical-group-spanner.cc index 3abb6296f2..b6a6416455 100644 --- a/lily/hara-kiri-vertical-group-spanner.cc +++ b/lily/hara-kiri-vertical-group-spanner.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998,1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/idealspacing.cc b/lily/idealspacing.cc index ec5e17d8a9..d7379218f1 100644 --- a/lily/idealspacing.cc +++ b/lily/idealspacing.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include "idealspacing.hh" diff --git a/lily/include/audio-element-info.hh b/lily/include/audio-element-info.hh index a247fc9c5e..2d09970ab4 100644 --- a/lily/include/audio-element-info.hh +++ b/lily/include/audio-element-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 8edd0ef388..fd465f9f4c 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -1,7 +1,7 @@ /* audio-item.hh -- declare Audio_items - (c) 1996, 1997--2000 Jan Nieuwenhuizen + (c) 1996--2000 Jan Nieuwenhuizen */ #ifndef AUDIO_ITEM_HH diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 84cb1172bb..89d701b81f 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -1,7 +1,7 @@ /* audio-staff.hh -- declare Audio_staff - (c) 1996, 1997--2000 Jan Nieuwenhuizen + (c) 1996--2000 Jan Nieuwenhuizen */ #ifndef AUDIO_STAFF_HH diff --git a/lily/include/auto-beam-engraver.hh b/lily/include/auto-beam-engraver.hh index 2c7575fde4..b5aec56fb1 100644 --- a/lily/include/auto-beam-engraver.hh +++ b/lily/include/auto-beam-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/include/auto-change-iterator.hh b/lily/include/auto-change-iterator.hh index 4171a9cf84..ff55700bc1 100644 --- a/lily/include/auto-change-iterator.hh +++ b/lily/include/auto-change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/auto-change-music.hh b/lily/include/auto-change-music.hh index ec698bec82..2295eb2223 100644 --- a/lily/include/auto-change-music.hh +++ b/lily/include/auto-change-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/axis-align-item.hh b/lily/include/axis-align-item.hh index bcea4e18d9..7a7d4022ec 100644 --- a/lily/include/axis-align-item.hh +++ b/lily/include/axis-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/axis-group-engraver.hh b/lily/include/axis-group-engraver.hh index ee745cc345..f2f99b0411 100644 --- a/lily/include/axis-group-engraver.hh +++ b/lily/include/axis-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/bar-req-collector-engraver.hh b/lily/include/bar-req-collector-engraver.hh index 126d2e0404..e80065e459 100644 --- a/lily/include/bar-req-collector-engraver.hh +++ b/lily/include/bar-req-collector-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/bar-script-engraver.hh b/lily/include/bar-script-engraver.hh index 29110c81fe..2e330e88a4 100644 --- a/lily/include/bar-script-engraver.hh +++ b/lily/include/bar-script-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh index 3dcf419bf6..cb0b455a5c 100644 --- a/lily/include/beaming.hh +++ b/lily/include/beaming.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/bezier-bow.hh b/lily/include/bezier-bow.hh index 4c2ea55fc9..e9b361e8fa 100644 --- a/lily/include/bezier-bow.hh +++ b/lily/include/bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh index 052ad732df..99bba1a2c5 100644 --- a/lily/include/break-algorithm.hh +++ b/lily/include/break-algorithm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index ae1ddc0500..fa9cba3a87 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #ifndef CHORD_NAME_HH diff --git a/lily/include/chord.hh b/lily/include/chord.hh index 935758ae63..3075bab0ac 100644 --- a/lily/include/chord.hh +++ b/lily/include/chord.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #ifndef CHORD_HH diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh index 8aadd3398d..56206a3bdf 100644 --- a/lily/include/context-specced-music.hh +++ b/lily/include/context-specced-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/cross-staff.hh b/lily/include/cross-staff.hh index 9fdfb97f84..673941a79d 100644 --- a/lily/include/cross-staff.hh +++ b/lily/include/cross-staff.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh index c21a89d2ec..9fa0e0692d 100644 --- a/lily/include/directional-element-interface.hh +++ b/lily/include/directional-element-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index c8597b78dd..04a73eaf1b 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ diff --git a/lily/include/extender-spanner.hh b/lily/include/extender-spanner.hh index d2d0b021ef..261e758f4d 100644 --- a/lily/include/extender-spanner.hh +++ b/lily/include/extender-spanner.hh @@ -1,7 +1,7 @@ /* extender-spanner.hh -- part of GNU LilyPond - (c) 1998, 1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ #ifndef EXTENDER_SPANNER_HH diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh index 07e6710d44..499b7b4be8 100644 --- a/lily/include/folded-repeat-iterator.hh +++ b/lily/include/folded-repeat-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index 3c3c2071ae..9db37fda4e 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh index 53d25a4477..a0cf239349 100644 --- a/lily/include/global-ctor.hh +++ b/lily/include/global-ctor.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh index 028ff63255..f3bb2af3c4 100644 --- a/lily/include/grace-align-item.hh +++ b/lily/include/grace-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/grace-engraver-group.hh b/lily/include/grace-engraver-group.hh index 92301686be..5c63b4fd2a 100644 --- a/lily/include/grace-engraver-group.hh +++ b/lily/include/grace-engraver-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh index ce7459b974..9743d7ab90 100644 --- a/lily/include/grace-iterator.hh +++ b/lily/include/grace-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/grace-music.hh b/lily/include/grace-music.hh index c7b62786bb..ed9ab73d9f 100644 --- a/lily/include/grace-music.hh +++ b/lily/include/grace-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/grace-performer-group.hh b/lily/include/grace-performer-group.hh index c7f6db0914..cfeb9884a0 100644 --- a/lily/include/grace-performer-group.hh +++ b/lily/include/grace-performer-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index eb21db6ee6..509fcdf25b 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-engraver.hh b/lily/include/hara-kiri-engraver.hh index 0d88b3d847..82992a29a8 100644 --- a/lily/include/hara-kiri-engraver.hh +++ b/lily/include/hara-kiri-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-line-group-engraver.hh b/lily/include/hara-kiri-line-group-engraver.hh index 43439cadcf..43f71b1787 100644 --- a/lily/include/hara-kiri-line-group-engraver.hh +++ b/lily/include/hara-kiri-line-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998, 1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ diff --git a/lily/include/hara-kiri-vertical-group-spanner.hh b/lily/include/hara-kiri-vertical-group-spanner.hh index bba2981777..e3e34c2a00 100644 --- a/lily/include/hara-kiri-vertical-group-spanner.hh +++ b/lily/include/hara-kiri-vertical-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998, 1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ diff --git a/lily/include/interpretation-context-handle.hh b/lily/include/interpretation-context-handle.hh index d990a02f47..a8adf33cb4 100644 --- a/lily/include/interpretation-context-handle.hh +++ b/lily/include/interpretation-context-handle.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/lily-guile.icc b/lily/include/lily-guile.icc index 42bc9b772d..aeeefc5338 100644 --- a/lily/include/lily-guile.icc +++ b/lily/include/lily-guile.icc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_ICC diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh index e0b69bfe9b..f5d37d3a55 100644 --- a/lily/include/lily-version.hh +++ b/lily/include/lily-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc index 10e9b03f30..9b54ddc24e 100644 --- a/lily/include/ly-smobs.icc +++ b/lily/include/ly-smobs.icc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh index b53efd365d..73b7c925a8 100644 --- a/lily/include/lyric-combine-music-iterator.hh +++ b/lily/include/lyric-combine-music-iterator.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh index d3a2a21f43..16a60a60c0 100644 --- a/lily/include/lyric-combine-music.hh +++ b/lily/include/lyric-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh index e899f00572..522660ee45 100644 --- a/lily/include/midi-walker.hh +++ b/lily/include/midi-walker.hh @@ -1,7 +1,7 @@ /* midi-walker.hh -- declare Midi_walker - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 3f69637f05..17835b3e95 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh index f9af35188d..6b0f607ade 100644 --- a/lily/include/note-performer.hh +++ b/lily/include/note-performer.hh @@ -1,7 +1,7 @@ /* note-performer.hh -- declare Note_performer - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index e4f608088d..987c0f25da 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 9938895086..e6d757fcfb 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh index e61a3a352b..9764275cc1 100644 --- a/lily/include/performer-group-performer.hh +++ b/lily/include/performer-group-performer.hh @@ -1,7 +1,7 @@ /* performer-group-performer.hh -- declare Performer_group_performer - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/performer.hh b/lily/include/performer.hh index 9213f81fb4..1b46084bb0 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -1,7 +1,7 @@ /* performer.hh -- declare Performer - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/property-inspect.hh b/lily/include/property-inspect.hh index 3188ddbfa4..e59125619e 100644 --- a/lily/include/property-inspect.hh +++ b/lily/include/property-inspect.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 25b2bee652..89384b9af7 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index 409fc1a3cf..bc5fbafd91 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh index 8eb39f509b..9bcbd2e33c 100644 --- a/lily/include/score-element.hh +++ b/lily/include/score-element.hh @@ -1,7 +1,7 @@ /* score-element.hh -- declare Score_element - (c) 1996-1999 Han-Wen Nienhuys + (c) 1996-1999--2000 Han-Wen Nienhuys */ #ifndef STAFFELEM_HH @@ -12,6 +12,8 @@ #include "lily-guile.hh" #include "lily-proto.hh" #include "smobs.hh" +#include "dimension-cache-callback.hh" + typedef void (Score_element::*Score_element_method_pointer) (void); @@ -150,8 +152,6 @@ protected: /// do calculations after determining horizontal spacing virtual void after_line_breaking (); - virtual Link_array get_extra_dependencies () const; - static Interval dim_cache_callback (Dimension_cache const*); public: static SCM ly_set_elt_property (SCM, SCM,SCM); @@ -194,6 +194,9 @@ public: Score_element*common_refpoint (Score_element const* s, Axis a) const; Score_element*common_refpoint (Link_array elems, Axis a) const; + + bool has_offset_callback_b (Offset_cache_callback, Axis)const; + void add_offset_callback (Offset_cache_callback, Axis); /** Set the parent refpoint of THIS to E */ diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh index 839d1a456e..4c71b7b8f7 100644 --- a/lily/include/score-performer.hh +++ b/lily/include/score-performer.hh @@ -1,7 +1,7 @@ /* score-performer.hh -- declare Score_performer - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 9e2b9ded5f..0ba7cb1281 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/script.hh b/lily/include/script.hh index c6ee25529e..05149c7b93 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index 2a3ab87457..341b711c67 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh index e0c9840924..5a1501347a 100644 --- a/lily/include/simple-spacer.hh +++ b/lily/include/simple-spacer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index 5c44644c2e..96343a9b95 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/spacing-engraver.hh b/lily/include/spacing-engraver.hh index 3c1f5f7920..be6c44ff3c 100644 --- a/lily/include/spacing-engraver.hh +++ b/lily/include/spacing-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index eb3a0eb1a8..46a7d6f025 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/spring.hh b/lily/include/spring.hh index d4e2e94c3a..739df44dd2 100644 --- a/lily/include/spring.hh +++ b/lily/include/spring.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/staff-bar.hh b/lily/include/staff-bar.hh index 244f36a849..c8f5049293 100644 --- a/lily/include/staff-bar.hh +++ b/lily/include/staff-bar.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh index 12abd08cfb..2ff3cd276d 100644 --- a/lily/include/staff-performer.hh +++ b/lily/include/staff-performer.hh @@ -1,7 +1,7 @@ /* staff-performer.hh -- declare Staff_performer - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 834310db08..edd3263978 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh index 7d802d09a8..569a2d0614 100644 --- a/lily/include/tfm-reader.hh +++ b/lily/include/tfm-reader.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh index 0ab9037235..bf482a6780 100644 --- a/lily/include/tfm.hh +++ b/lily/include/tfm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tie-performer.hh b/lily/include/tie-performer.hh index 6b1f924470..54425eb2fa 100644 --- a/lily/include/tie-performer.hh +++ b/lily/include/tie-performer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/include/unfolded-repeat-iterator.hh b/lily/include/unfolded-repeat-iterator.hh index 71adef6598..9008f30420 100644 --- a/lily/include/unfolded-repeat-iterator.hh +++ b/lily/include/unfolded-repeat-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/interpretation-context-handle.cc b/lily/interpretation-context-handle.cc index 185991b748..ca1071ae0f 100644 --- a/lily/interpretation-context-handle.cc +++ b/lily/interpretation-context-handle.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/key-def.cc b/lily/key-def.cc index a28f125e34..523c214462 100644 --- a/lily/key-def.cc +++ b/lily/key-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/lexer.ll b/lily/lexer.ll index 9c0369c424..4cf958de48 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996--1999 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/lily-version.cc b/lily/lily-version.cc index 909a9b95a5..6da4880b58 100644 --- a/lily/lily-version.cc +++ b/lily/lily-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ #include "config.h" diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index cde8965e03..3bba1d479b 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include "line-of-score.hh" diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 6d4cdc6bee..fe73d4f62e 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 9da40bf778..5676d4cff0 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc index a9e1dce2b3..f3b96c7fcf 100644 --- a/lily/melisma-engraver.cc +++ b/lily/melisma-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/moment.cc b/lily/moment.cc index 45002d8eed..8495cdc470 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 4c629dd2b7..80e7651b6e 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/note-performer.cc b/lily/note-performer.cc index c0f8cf48ef..782b4848a2 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Jan Nieuwenhuizen + (c) 1996--2000 Jan Nieuwenhuizen */ #include "note-performer.hh" diff --git a/lily/paper-score.cc b/lily/paper-score.cc index b062978633..41a4fcd8e0 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include "main.hh" diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index 52770a3e0b..6bc925a1bd 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/performer.cc b/lily/performer.cc index 7ccad7dd2a..fe706b01f9 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index ba0c1ee4e1..519ca724b3 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/property-inspect.cc b/lily/property-inspect.cc index 89a97caa09..2ea7282385 100644 --- a/lily/property-inspect.cc +++ b/lily/property-inspect.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index f7cfefac53..2ff126ea33 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/request.cc b/lily/request.cc index f5a869b788..14eb23856c 100644 --- a/lily/request.cc +++ b/lily/request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include "request.hh" diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index b2fd168d07..c735a03205 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -28,6 +28,7 @@ Rest_collision_engraver::process_acknowledged () return; rest_collision_p_ = new Rest_collision; + announce_element (Score_element_info (rest_collision_p_, 0)); for (int i=0; i< note_column_l_arr_.size (); i++) rest_collision_p_->add_column (note_column_l_arr_[i]); diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 4ef293f8f1..2dd7aa890b 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -18,6 +18,7 @@ #include "rest.hh" #include "group-interface.hh" #include "staff-symbol-referencer.hh" +#include "duration.hh" void Rest_collision::add_column (Note_column *nc_l) @@ -32,6 +33,30 @@ Rest_collision::add_column (Note_column *nc_l) gi.add_element (nc_l); } +static Duration +to_duration (int type, int dots) +{ + Duration d; + d.durlog_i_ = type; + d.dots_i_ = dots; + return d; +} + +static Moment +rhythmic_head2mom (Rhythmic_head* r) +{ + return to_duration (r->balltype_i (), r->dot_count ()).length_mom (); +} + +static Rhythmic_head* +col2rhythmic_head (Note_column* c) +{ + SCM s = c->get_elt_property ("rests"); + assert (gh_pair_p (s)); + Score_element* e = unsmob_element (gh_car (s)); + return dynamic_cast (e); +} + void Rest_collision::before_line_breaking () { @@ -61,13 +86,59 @@ Rest_collision::before_line_breaking () // meisjes met meisjes if (!ncol_l_arr.size()) { + + /* + Oeps, nu zie ik 't pas: colommen met noten. + Het commentaar, dat ik ooit geschreven had: meisjes met meisjes, + is achterhaald: urg. + + */ + + Moment m = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[0])); + int i = 1; + for (; i < rest_l_arr.size (); i++) + { + Moment me = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[i])); + if (me != m) + break; + } + + /* + If all durations are the same, we'll check if there are more + rests than maximum-rest-count. + Otherwise (different durations), we'll try to display them all + (urg: all 3 of them, currently). + */ + int display_count; + SCM s = get_elt_property ("maximum-rest-count"); + if (i == rest_l_arr.size () + && gh_number_p (s) && gh_int2scm (s) < rest_l_arr.size ()) + { + display_count = gh_int2scm (s); +#if 0 + /* + Setting surplus rests to transparent. + Only really necessary for maximum-rest-count == 0, + because rests wil be set at exact the same position + and thus overlap. + */ + for (i--;i > display_count; i--) + col2rhythmic_head (rest_l_arr[i-1]) + ->set_elt_property ("transparent", SCM_BOOL_T); +#endif + } + else + display_count = rest_l_arr.size (); + /* UGH. Should get dims from table. Should have minimum dist. */ - int dy = rest_l_arr.size() > 2 ? 6 : 4; - - rest_l_arr[0]->translate_rests (rest_l_arr[0]->dir () *dy); - rest_l_arr.top()->translate_rests (rest_l_arr.top ()->dir ()* dy); + int dy = display_count > 2 ? 6 : 4; + if (display_count > 1) + { + rest_l_arr[0]->translate_rests (dy); + rest_l_arr[1]->translate_rests (-dy); + } } // meisjes met jongetjes else diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index ebef9e278c..90009ffcd7 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include diff --git a/lily/score-performer.cc b/lily/score-performer.cc index b4eba3d00b..4ba1a270fc 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Jan Nieuwenhuizen + (c) 1996--2000 Jan Nieuwenhuizen */ #include "score-performer.hh" diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index c79f0bee93..572fd3f807 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/script-column.cc b/lily/script-column.cc index a386058d87..35d9d02604 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include "script-column.hh" diff --git a/lily/script.cc b/lily/script.cc index 6f96f1b7b8..879881583a 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 4910fd27de..85ec848123 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys TODO: - add support for different stretch/shrink constants? diff --git a/lily/slur.cc b/lily/slur.cc index c2166932a0..b5ce992237 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 5caefdf72e..83b3ab1337 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index e912cf5d3c..52ff8c05e1 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/spanner.cc b/lily/spanner.cc index 2bc8b98ab4..222a391496 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys */ #include diff --git a/lily/spring.cc b/lily/spring.cc index c52b464bc3..b061067833 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/staff-bar.cc b/lily/staff-bar.cc index 0f37c1cf0c..c1aba6ca96 100644 --- a/lily/staff-bar.cc +++ b/lily/staff-bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 00172d1985..8126bbbcf1 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ #include @@ -22,7 +22,8 @@ void Staff_symbol_referencer_interface::set_interface () { elt_l_->set_elt_property ("staff-position", gh_double2scm (0.0)); - elt_l_->dim_cache_[Y_AXIS]->off_callbacks_.push (callback); + elt_l_->add_offset_callback (callback, Y_AXIS); + } @@ -138,12 +139,10 @@ Staff_symbol_referencer_interface::set_position (Real p) } - Array &callbacks (elt_l_->dim_cache_[Y_AXIS]->off_callbacks_); - for (int i=0; i < callbacks.size ();i++) - if (callbacks[i] == callback) - return ; + if (elt_l_->has_offset_callback_b (callback, Y_AXIS)) + return ; - callbacks.push (callback); + elt_l_->add_offset_callback (callback, Y_AXIS); } Staff_symbol_referencer_interface diff --git a/lily/stem.cc b/lily/stem.cc index 2b9ca36469..470d324552 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--2000 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -219,7 +219,7 @@ Stem::Stem () set_elt_property ("heads", SCM_EOL); set_elt_property ("rests", SCM_EOL); - dim_cache_[X_AXIS]->off_callbacks_.push ( &Stem::off_callback); + add_offset_callback ( &Stem::off_callback, X_AXIS); } bool diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc index 31fea32ab2..7bc495b49b 100644 --- a/lily/tfm-reader.cc +++ b/lily/tfm-reader.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/tfm.cc b/lily/tfm.cc index af11940191..bbcfaab5b1 100644 --- a/lily/tfm.cc +++ b/lily/tfm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 9b5afbc491..51d1375d84 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2000 Jan Nieuwenhuizen */ diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 347e929b4a..a51bbca2f6 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2000 Han-Wen Nienhuys */ diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index 9c059b4e02..2b175075fc 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -1,15 +1,17 @@ \paper{ \paper_sixteen + % slurs are never beautiful (no steep slurs) + slur_beautiful = 0.0; %% - \translator { \VoiceContext \remove "Dynamic_engraver"; } + %%\translator { \VoiceContext \remove "Dynamic_engraver"; } \translator { \VoiceContext \name "VoiceOne"; %% - \remove "Dynamic_engraver"; + %%\remove "Dynamic_engraver"; %%\consists "Line_number_engraver"; verticalDirection = #1 @@ -28,6 +30,8 @@ } \translator { \HaraKiriStaffContext + instrumentScriptPadding = #55 %% urg, this is in pt + instrScriptPadding = #25 %% urg, this is in pt \accepts "VoiceOne"; \accepts "VoiceTwo"; } diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index 67df401e15..0610b3083d 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -1,5 +1,11 @@ \paper { - \translator { \OrchestralPartStaffContext } + % slurs are never beautiful (no steep slurs) + slur_beautiful = 0.0; + \translator { + \OrchestralPartStaffContext + instrumentScriptPadding = #55 %% urg, this is in pt + instrScriptPadding = #25 %% urg, this is in pt + } \translator { \VoiceContext \name "VoiceOne"; diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 9273d71dab..6059c48393 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -42,8 +42,8 @@ ottoni = \context StaffGroup = otonni_group < $timpani_g = \context StaffGroup = timpani_group < \$timpani_staff - % HaraKiri mustn't work on first page - \context Staff = urgtimpany \notes{ \skip 1*34; } + % Force a staff bracket (?) + \context Staff = timpany { \skip 1; } > violini = \context GrandStaff = violini_group < diff --git a/scm/generic-property.scm b/scm/generic-property.scm index b105f31233..ef89bf14ba 100644 --- a/scm/generic-property.scm +++ b/scm/generic-property.scm @@ -99,6 +99,9 @@ (define generic-rest-properties (cons "Rest" (list (list 'restStyle string? 'reststyle)))) +(define generic-rest-collision-properties + (cons "Rest_collision" (list (list 'maximumRestCount number? 'maximum-rest-count)))) + (define generic-tie-properties (cons "Tie" (list (list 'tieVerticalDirection dir? 'direction) @@ -175,6 +178,7 @@ generic-timesig-properties generic-clef-properties generic-collision-properties + generic-rest-collision-properties ; generic-staff-symbol-properties generic-All-properties )