From a07222d78fc7c16d73444d80ec5b3b23a9f1eb49 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:55:33 +0000 Subject: [PATCH] lilypond-1.3.86 --- input/test/stacked-scripts.ly | 7 +++++++ lily/dot-column.cc | 2 +- lily/group-interface.cc | 2 +- lily/hara-kiri-group-spanner.cc | 1 - lily/include/multi-measure-rest.hh | 4 ++++ lily/include/spaceable-element.hh | 8 ++++++++ lily/include/stem-tremolo.hh | 3 +++ lily/include/tie.hh | 4 ++++ lily/include/tuplet-spanner.hh | 7 +++++++ lily/include/volta-spanner.hh | 8 +++++++- lily/rest-collision.cc | 1 - lily/script-column-engraver.cc | 11 +++++------ lily/script-column.cc | 2 +- lily/separation-item.cc | 1 - lily/side-position-interface.cc | 9 ++------- lily/spaceable-element.cc | 3 --- lily/stem-tremolo.cc | 1 - lily/text-engraver.cc | 4 ++-- lily/tuplet-spanner.cc | 2 -- lily/volta-spanner.cc | 1 - 20 files changed, 52 insertions(+), 29 deletions(-) create mode 100644 input/test/stacked-scripts.ly diff --git a/input/test/stacked-scripts.ly b/input/test/stacked-scripts.ly new file mode 100644 index 0000000000..fa21ad8328 --- /dev/null +++ b/input/test/stacked-scripts.ly @@ -0,0 +1,7 @@ +\score { + \notes { + c2_"geen gedonder"_"jij gaat onder" + c2^^^.^|^"down"^"up" + } + \paper { linewidth = -1. ; } +} diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 38777cb569..738052d5a2 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -39,7 +39,7 @@ Dot_column::add_head (Score_element * me, Score_element *rh) void Dot_column::set_interface (Score_element* me) { - me->set_elt_property ("dots", SCM_EOL); + Directional_element_interface::set (me, RIGHT); Axis_group_interface::set_interface (me); diff --git a/lily/group-interface.cc b/lily/group-interface.cc index ffbbf06c5d..b82807d5b2 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -53,7 +53,7 @@ Group_interface::set_interface () { if (!has_interface ()) { - elt_l_->set_elt_property (name_.ch_C (), SCM_EOL); + } } diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 25680db3ef..bbc6bfc643 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -16,7 +16,6 @@ void Hara_kiri_group_spanner::set_interface (Score_element*me) { - me->set_elt_property ("items-worth-living", SCM_EOL); me->add_offset_callback (force_hara_kiri_callback, Y_AXIS); me->set_interface (ly_symbol2scm ("hara-kiri-spanner-interface")); me->set_extent_callback (Hara_kiri_group_spanner::y_extent, Y_AXIS); diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index 4b57a9662c..4803ce3437 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -13,7 +13,11 @@ #include "lily-proto.hh" #include "lily-guile.hh" #include "rod.hh" +/* + properties: + columns -- list of paper-columns + */ class Multi_measure_rest { public: diff --git a/lily/include/spaceable-element.hh b/lily/include/spaceable-element.hh index 72a713ed4c..9b71907707 100644 --- a/lily/include/spaceable-element.hh +++ b/lily/include/spaceable-element.hh @@ -12,7 +12,15 @@ #include "lily-guile.hh" #include "lily-proto.hh" +/* + properties : + minimum-distances -- list of rods (ie. (OBJ . DIST) pairs) + + ideal-distances -- (OBJ . (DIST . STRENGTH)) pairs + + dir-list -- list of stem directions. + */ struct Spaceable_element { diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index 71ad915593..c8c29a678a 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -13,6 +13,9 @@ #include "lily-proto.hh" #include "lily-guile.hh" +/* + stem -- pointer to the stem object. + */ class Stem_tremolo { public: diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 4ecd9e56d0..329e41fb0b 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -13,6 +13,10 @@ #include "lily-guile.hh" #include "lily-proto.hh" + +/* + heads -- pair of element pointers, pointing to the two heads of the + tie. */ class Tie { public: diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 0bebbf3805..49a5bac13c 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -15,7 +15,14 @@ (or should we be above staff?) todo: handle breaking elegantly. +properties: + + beams -- list of beam ptrs. + + columns -- list of note-columns. + */ + class Tuplet_spanner { public: diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 733c43b1e0..4697b8d8b6 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -10,7 +10,13 @@ #include "spanner.hh" -/** Volta bracket with number */ +/** Volta bracket with number + +properties: + +bars -- list of barline ptrs. + +*/ class Volta_spanner { diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 6429df3684..f5605bc667 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -218,6 +218,5 @@ Rest_collision::set_interface (Score_element*me) { me->set_extent_callback (0, X_AXIS); me->set_extent_callback (0, Y_AXIS); - me->set_elt_property ("elements", SCM_EOL); } diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 23df7b72af..0a30bea249 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -54,13 +54,12 @@ Script_column_engraver::do_post_move_processing () } void -Script_column_engraver::acknowledge_element( Score_element_info inf) +Script_column_engraver::acknowledge_element(Score_element_info inf) { - if (Side_position::has_interface (inf.elem_l_)) // ugh FIXME + Item *thing = dynamic_cast (inf.elem_l_); + if (thing && Side_position::has_interface (inf.elem_l_)) // ugh FIXME { - Item *thing = dynamic_cast (inf.elem_l_); - if (thing - && !Item::breakable_b (thing) + if (!Item::breakable_b (thing) && Side_position::get_axis (inf.elem_l_) == Y_AXIS) { script_l_arr_.push (thing); @@ -74,7 +73,7 @@ Script_column_engraver::process_acknowledged () if (!scol_p_ && script_l_arr_.size () > 1) { scol_p_ = new Item (get_property ("basicScriptColumnProperties")); - scol_p_->set_elt_property ("scripts", SCM_EOL); + announce_element (scol_p_, 0); } diff --git a/lily/script-column.cc b/lily/script-column.cc index 15b2eb58e9..51055a3a9a 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -1,5 +1,5 @@ /* - g-script-column.cc -- implement Script_column + script-column.cc -- implement Script_column source file of the GNU LilyPond music typesetter diff --git a/lily/separation-item.cc b/lily/separation-item.cc index d740483ac8..a50bea8d4f 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -15,7 +15,6 @@ void Separation_item::set_interface (Score_element*s) { - s->set_elt_property ("elements", SCM_EOL); s->set_extent_callback (0, X_AXIS); s->set_extent_callback (0, Y_AXIS); } diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index de2d398b70..e82bf70465 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -219,11 +219,6 @@ Side_position::add_staff_support (Score_element*me) void Side_position::set_axis (Score_element*me, Axis a) { - /* - // prop transparent ? - if (me->get_elt_property ("side-support-elements") == SCM_UNDEFINED) - me->set_elt_property ("side-support-elements" ,SCM_EOL); - */ if (!me->has_offset_callback_b (aligned_side, a)) me->add_offset_callback (aligned_side, a); } @@ -263,14 +258,14 @@ Side_position::set_padding (Score_element*me, Real p) bool Side_position::has_interface (Score_element*me) { - return me->get_elt_property ("side-support-elements") != SCM_EOL; + return me->has_interface (ly_symbol2scm ("side-position-interface")); } bool Side_position::supported_b (Score_element*me) { SCM s = me->get_elt_property ("side-support-elements"); - return s != SCM_UNDEFINED && s != SCM_EOL; + return gh_pair_p(s); } diff --git a/lily/spaceable-element.cc b/lily/spaceable-element.cc index b11f984218..37cac89a5e 100644 --- a/lily/spaceable-element.cc +++ b/lily/spaceable-element.cc @@ -78,7 +78,4 @@ Spaceable_element::remove_interface (Score_element*me) void Spaceable_element::set_interface (Score_element*me) { - me->set_elt_property ("minimum-distances", SCM_EOL); - me->set_elt_property ("ideal-distances", SCM_EOL); - me->set_elt_property ("dir-list",SCM_EOL) ; } diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index e52df9fd05..e2cd5c6b2c 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -25,7 +25,6 @@ void Stem_tremolo::set_interface (Score_element *me) { -me->set_elt_property ("stem", SCM_EOL); } diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index b634bf70e6..4d72b074db 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -13,7 +13,7 @@ #include "item.hh" #include "musical-request.hh" #include "stem.hh" -#include "note-head.hh" +#include "rhythmic-head.hh" /** typeset directions that are plain text. @@ -48,7 +48,7 @@ Text_engraver::do_try_music (Music *m) void Text_engraver::acknowledge_element (Score_element_info inf) { - if (Note_head::has_interface (inf.elem_l_)) + if (Rhythmic_head::has_interface (inf.elem_l_)) { for (int i=0; i < texts_.size (); i++) { diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc index a74e155f0f..4600df3e2d 100644 --- a/lily/tuplet-spanner.cc +++ b/lily/tuplet-spanner.cc @@ -27,8 +27,6 @@ void Tuplet_spanner::set_interface (Score_element*me) { - me-> set_elt_property ("beams", SCM_EOL); - me->set_elt_property ("columns", SCM_EOL); } /* diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index 7e73842989..c2d6c7511b 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -22,7 +22,6 @@ void Volta_spanner::set_interface (Score_element*me) { - me->set_elt_property ("bars", SCM_EOL); Side_position::set_axis (me, Y_AXIS); Directional_element_interface::set (me, UP); } -- 2.39.5