X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=b2254b14517cd4f331f5d42dc51038403cab48f2;hb=a2e0081b9f6263a3ddb8e7bf898f6592dad5f89e;hp=9a4406b24af1dc54a51be76b1175d3ea84018542;hpb=745b9d0980d8811783e4fe62380363d05fd6140c;p=lilypond.git diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 9a4406b24a..b2254b1451 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -3,97 +3,157 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 2000--2004 Jan Nieuwenhuizen + + Revised over good by Han-Wen. */ -#include "molecule.hh" -#include "boxes.hh" +#include "stencil.hh" +#include "text-item.hh" #include "text-spanner.hh" -#include "text-def.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "atom.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); -} - -void -Text_spanner::do_add_processing () -{ - set_bounds (LEFT, support_span_l_->spanned_drul_[LEFT]); - set_bounds (RIGHT, support_span_l_->spanned_drul_[RIGHT]); -} - -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_ * paper()->internote_f () * 4); // todo -} +#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* -Text_spanner::brew_molecule_p() const -{ - Atom tsym (spec_p_->get_atom (paper(),CENTER)); - tsym.translate (text_off_); - - Molecule*output = new Molecule; - output->add (tsym); - return output; -} - -void -Text_spanner::do_pre_processing() -{ - spanned_drul_ = support_span_l_->spanned_drul_; -} +/* + TODO: + - vertical start / vertical end (fixme-name) | + - contination types (vert. star, vert. end) |-> eat volta-bracket + - more styles + - more texts/positions +*/ -Interval -Text_spanner::height() const -{ - return brew_molecule_p()->extent ().y (); -} +MAKE_SCHEME_CALLBACK (Text_spanner, print, 1); -void -Text_spanner::do_substitute_dependency (Score_elem* o, Score_elem*n) +/* + TODO: this function is too long +*/ +SCM +Text_spanner::print (SCM smob) { - if (support_span_l_ == o) - support_span_l_ = (Directional_spanner*) (n?n->spanner():0); + 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 * paper = me->get_paper (); + + 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); + span_points[d] = b->extent (common, X_AXIS).linear_combination (d * encl); + + if (is_number_pair (shorten)) + span_points -= d * ly_scm2double (index_get_cell (shorten, d)); + } + + if (is_number_pair (flare)) + span_points -= d * ly_scm2double (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 (ly_c_pair_p (edge_text)) + { + Direction d = LEFT; + do + { + if (broken[d]) + continue; + + SCM text = index_get_cell (edge_text, d); + + if (Text_item::markup_p (text)) + edge[d] = *unsmob_stencil (Text_item::interpret_markup (paper->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 = ly_scm2double (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 ()) + { + edge[d].translate_axis (span_points[d], X_AXIS); + m.add_stencil (edge[d]); + span_points[d] += -d * ext[-d]; + } + } + 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 ()) + { + 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 (); } +ADD_INTERFACE (Text_spanner,"text-spanner-interface", + "generic text spanner", + "dash-period if-text-padding dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds"); -Text_spanner::~Text_spanner() -{ - delete spec_p_; -} - -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_; -}