X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftext-spanner.cc;h=6f07666a6878b44afb79744a6cddc2fad3896ee3;hb=14ca3493aab1a1f4f837f1b483ad9ea1d1e444ad;hp=cce4e27b93c73cfdea50a629d8eeffb00ed98b05;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index cce4e27b93..6f07666a68 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -3,193 +3,157 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2004 Jan Nieuwenhuizen + + Revised over good by Han-Wen. */ -#include "molecule.hh" +#include "stencil.hh" #include "text-item.hh" #include "text-spanner.hh" +#include "line-spanner.hh" #include "spanner.hh" #include "font-interface.hh" #include "dimensions.hh" #include "paper-def.hh" -#include "debug.hh" +#include "warn.hh" #include "paper-column.hh" #include "staff-symbol-referencer.hh" /* TODO: - - vertical start / vertical end (fixme-name) | - - contination types (vert. star, vert. end) |-> eat volta-spanner - - more styles - - more texts/positions - - style: hairpin ? - */ + - vertical start / vertical end (fixme-name) | + - contination types (vert. star, vert. end) |-> eat volta-bracket + - more styles + - more texts/positions +*/ -MAKE_SCHEME_CALLBACK (Text_spanner, brew_molecule, 1); +MAKE_SCHEME_CALLBACK (Text_spanner, print, 1); +/* + TODO: this function is too long +*/ SCM -Text_spanner::brew_molecule (SCM smob) +Text_spanner::print (SCM smob) { - Grob *me= unsmob_element (smob); + Grob *me= unsmob_grob (smob); Spanner *spanner = dynamic_cast (me); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real thickness = me->paper_l ()->get_var ("stafflinethickness"); + /* Ugh, must be same as Hairpin::print. */ + Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS); + Paper_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 { - Paper_column* s = dynamic_cast(spanner->get_bound (d)); // UGH - broken[d] = (!s->musical_b ()); + 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); - -#if 0 - SCM s = me->get_grob_property ("text-style"); - - String text_style = "italic"; - if (gh_string_p (s)) - text_style = ly_scm2string (s); -#endif - SCM properties = Font_interface::font_alist_chain (me); - SCM edge_text = me->get_grob_property ("edge-text"); - Drul_array edge; - if (gh_pair_p (edge_text)) + 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 { - SCM text = index_cell (edge_text, d); - edge[d] = Text_item::text2molecule (me, text, properties); - if (!edge[d].empty_b ()) + 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 shorten; - shorten[LEFT] = 0; - shorten[RIGHT] = 0; - - SCM s = me->get_grob_property ("shorten"); - if (gh_pair_p (s)) + + Drul_array edge_height = robust_scm2interval (me->get_property ("edge-height"), + Interval (0.0, 0.0)); + Drul_array edge_line; { - shorten[LEFT] = gh_scm2double (gh_car (s)) * staff_space; - shorten[RIGHT] = gh_scm2double (gh_cdr (s)) * staff_space; + 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); } - - Real broken_left = spanner->get_broken_left_end_align (); - Real width = spanner->spanner_length (); - Grob *bnd = spanner->get_bound (RIGHT); - width += bnd->extent (bnd, X_AXIS).length (); - width -= broken_left; - width -= shorten[LEFT] + shorten[RIGHT]; - width -= edge[LEFT].extent (X_AXIS).length () - + edge[RIGHT].extent (X_AXIS).length (); - - if (width < 0) + + Stencil m; + do { - warning (_ ("Text_spanner too small")); - width = 0; + 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]; + } } - - - String type = "dashed-line"; - s = me->get_grob_property ("type"); - if (gh_string_p (s)) - type = ly_scm2string (s); - - Molecule line; - Drul_array edge_line; - if (type == "line" - || type == "dashed-line" - || type == "dotted-line") + while (flip (&d) != LEFT); + do { - Real thick = thickness; - s = me->get_grob_property ("line-thickness"); - if (gh_number_p (s)) - thick *= gh_scm2double (s); - - // maybe these should be in line-thickness? - Real length = staff_space; - s = me->get_grob_property ("dash-length"); - if (gh_number_p (s)) - length = gh_scm2double (s) * staff_space; - - Real period = 2 * length + thick; - s = me->get_grob_property ("dash-period"); - if (gh_number_p (s)) - period = gh_scm2double (s) * staff_space; - - if (type == "dotted-line") - length = thick; - - if (type == "line") - length = period + thick; - - Real on = length - thick; - Real off = period - on; - - SCM list = gh_list (ly_symbol2scm ("dashed-line"), - gh_double2scm (thick), - gh_double2scm (on), - gh_double2scm (off), - gh_double2scm (width), - gh_double2scm (0), - SCM_UNDEFINED); - - Box b (Interval (0, width), Interval (-thick / 2, thick / 2)); - line = Molecule (b, list); - - s = me->get_grob_property ("edge-height"); - if (gh_pair_p (s)) + if (d* span_points[d] > d * edge[-d].extent (X_AXIS)[d]) { - Direction d = LEFT; - int dir = to_dir (me->get_grob_property ("direction")); - do - { - Real dy = gh_scm2double (index_cell (s, d)) * - dir; - if (dy) - { - SCM list = gh_list (ly_symbol2scm ("dashed-line"), - gh_double2scm (thick), - gh_double2scm (on), - gh_double2scm (off), - gh_double2scm (0), - gh_double2scm (dy), - SCM_UNDEFINED); - - Box b (Interval (0, thick), - dy > 0 - ? Interval (0, dy) - : Interval (dy, 0)); - edge_line[d] = Molecule (b, list); - } - } - while (flip (&d) != LEFT); + edge_line[d].translate_axis (span_points[d], X_AXIS); + m.add_stencil (edge_line[d]); } } + while (flip (&d) != LEFT); - Molecule m; - if (!edge[LEFT].empty_b ()) - m = edge[LEFT]; - - if (!edge_line[LEFT].empty_b ()) - m.add_at_edge (X_AXIS, RIGHT, edge_line[LEFT], 0); - if (!line.empty_b ()) - m.add_at_edge (X_AXIS, RIGHT, line, 0); - if (!edge_line[RIGHT].empty_b ()) - m.add_at_edge (X_AXIS, RIGHT, edge_line[RIGHT], 0); - if (!edge[RIGHT].empty_b ()) - m.add_at_edge (X_AXIS, RIGHT, edge[RIGHT], 0); - m.translate_axis (broken_left, X_AXIS); - + 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");