X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=4d8b3a092f82162a3df5e0912eafbbd6c00e909c;hb=0c5f0f50cf22a3133ac2e0f83105efdadf3efb2b;hp=437739019ae8b8346667529b5c3ac35c69b3df58;hpb=48bdd9154a32245a075494b403639181615864e2;p=lilypond.git diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 437739019a..4d8b3a092f 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -3,92 +3,177 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 2000--2006 Jan Nieuwenhuizen + + Revised over good by Han-Wen. */ -#include "molecule.hh" -#include "boxes.hh" #include "text-spanner.hh" -#include "text-def.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "symbol.hh" - - -void -Text_spanner::set_support(Directional_spanner*d) -{ - if (support_span_l_) - remove_dependency(support_span_l_); - - support_span_l_ =d; - add_dependency(d); -} - -Text_spanner::Text_spanner() -{ - spec_p_ = 0; - support_span_l_ = 0; -} - - -IMPLEMENT_IS_TYPE_B1(Text_spanner,Spanner); - -void -Text_spanner::do_print() const -{ - spec_p_->print(); -} - -void -Text_spanner::do_post_processing() -{ - text_off_ = support_span_l_->center() + - Offset(0,support_span_l_->dir_i_ * paper()->internote_f() * 4); // todo -} -Molecule* -Text_spanner::brew_molecule_p() const -{ - Atom tsym (spec_p_->get_atom(paper(),0)); - tsym.translate(text_off_); +#include "text-interface.hh" +#include "line-spanner.hh" +#include "spanner.hh" +#include "font-interface.hh" +#include "dimensions.hh" +#include "output-def.hh" +#include "warn.hh" +#include "paper-column.hh" +#include "staff-symbol-referencer.hh" - Molecule*output = new Molecule; - output->add( tsym ); - return output; -} +/* + TODO: + - vertical start / vertical end (fixme-name) | + - contination types (vert. star, vert. end) |-> eat volta-bracket + - more styles + - more texts/positions +*/ -void -Text_spanner::do_pre_processing() -{ - right_col_l_ = support_span_l_->right_col_l_; - left_col_l_ = support_span_l_->left_col_l_; - assert(left_col_l_ && right_col_l_); -} +MAKE_SCHEME_CALLBACK (Text_spanner, print, 1); -Interval -Text_spanner::height()const +/* + TODO: this function is too long +*/ +SCM +Text_spanner::print (SCM smob) { - return brew_molecule_p()->extent().y; + Grob *me = unsmob_grob (smob); + Spanner *spanner = dynamic_cast (me); + + /* Ugh, must be same as Hairpin::print. */ + + Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS); + Output_def *layout = me->layout (); + + SCM flare = me->get_property ("bracket-flare"); + SCM shorten = me->get_property ("shorten-pair"); + + Interval span_points; + Drul_array broken; + Direction d = LEFT; + do + { + Item *b = spanner->get_bound (d); + broken[d] = b->break_status_dir () != CENTER; + + if (broken[d]) + { + if (d == LEFT) + span_points[d] = spanner->get_broken_left_end_align (); + else + span_points[d] = b->relative_coordinate (common, X_AXIS); + } + else + { + Real encl = robust_scm2double (me->get_property ("enclose-bounds"), 0.0); + Interval ext = b->extent (common, X_AXIS); + + span_points[d] + = robust_relative_extent (b, common, X_AXIS).linear_combination (d * encl); + + if (is_number_pair (shorten)) + span_points -= d * scm_to_double (index_get_cell (shorten, d)); + } + + if (is_number_pair (flare)) + span_points -= d * scm_to_double (index_get_cell (flare, d)); + } + while (flip (&d) != LEFT); + + SCM properties = Font_interface::text_font_alist_chain (me); + SCM edge_text = me->get_property ("edge-text"); + Drul_array edge; + if (scm_is_pair (edge_text)) + { + Direction d = LEFT; + do + { + if (broken[d]) + continue; + + SCM text = index_get_cell (edge_text, d); + + if (Text_interface::is_markup (text)) + edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text)); + + if (!edge[d].is_empty ()) + edge[d].align_to (Y_AXIS, CENTER); + } + while (flip (&d) != LEFT); + } + + Drul_array edge_height = robust_scm2interval (me->get_property ("edge-height"), + Interval (0.0, 0.0)); + Drul_array edge_line; + { + Direction d = LEFT; + int dir = to_dir (me->get_property ("direction")); + do + { + if (broken[d]) + continue; + + Real dx = 0.0; + if (is_number_pair (flare)) + dx = scm_to_double (index_get_cell (flare, d)) * d; + + Real dy = -dir * edge_height[d]; + if (dy) + edge_line[d] = Line_spanner::line_stencil (me, Offset (0, 0), Offset (dx, dy)); + } + while (flip (&d) != LEFT); + } + + Stencil m; + do + { + Interval ext = edge[d].extent (X_AXIS); + if (!ext.is_empty ()) + { + Real pad = robust_scm2double (me->get_property ("bound-padding"), 0.0); + edge[d].translate_axis (span_points[d], X_AXIS); + m.add_stencil (edge[d]); + span_points[d] += -d * (ext[-d] + pad); + } + } + while (flip (&d) != LEFT); + + do + { + if (d * span_points[d] > d * edge[-d].extent (X_AXIS)[d]) + { + edge_line[d].translate_axis (span_points[d], X_AXIS); + m.add_stencil (edge_line[d]); + } + } + while (flip (&d) != LEFT); + + + if (!span_points.is_empty () + && span_points.length () > robust_scm2double (me->get_property ("dash-period"), 0.0)) + { + Stencil l = Line_spanner::line_stencil (me, + Offset (span_points[LEFT], 0), + Offset (span_points[RIGHT], 0)); + m.add_stencil (l); + } + m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS); + return m.smobbed_copy (); } -void -Text_spanner::do_substitute_dependency(Score_elem* o, Score_elem*n) -{ - if (support_span_l_ == o) - support_span_l_ = (Directional_spanner*) (n?n->spanner():0); -} +ADD_INTERFACE (Text_spanner, + "text-spanner-interface", + "generic text spanner", -Text_spanner::~Text_spanner() -{ - delete spec_p_; -} + "bound-padding " + "bracket-flare " + "dash-fraction " + "dash-period " + "edge-height " + "edge-text " + "enclose-bounds " + "shorten-pair " + "style " + "thickness " + ); -Text_spanner::Text_spanner(Text_spanner const&s) - : Spanner( s) -{ - support_span_l_ = s.support_span_l_; - spec_p_ = s.spec_p_? s.spec_p_->clone() : 0; - text_off_ = s.text_off_; -}