X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=52cd57f8d8c517d700745413b200e7c239e9b6e3;hb=329f465a4b6d33aee925665a5d172b6fabcdaf2f;hp=20d0dd17588f04759ca18a29d82eee452539691d;hpb=f8f39cc1859172628bbaeda76521736c62ac6d9a;p=lilypond.git diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 20d0dd1758..52cd57f8d8 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -3,170 +3,162 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2005 Jan Nieuwenhuizen + + Revised over good by Han-Wen. */ -#include "molecule.hh" -#include "text-item.hh" #include "text-spanner.hh" + +#include "text-interface.hh" #include "line-spanner.hh" #include "spanner.hh" #include "font-interface.hh" #include "dimensions.hh" -#include "paper-def.hh" -#include "debug.hh" +#include "output-def.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 - */ + - 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_grob (smob); - Spanner *spanner = dynamic_cast (me); - - - - /* Ugh, must be same as Hairpin::brew_molecule. */ -#if 0 - Real padding = gh_scm2double (me->get_grob_property ("padding")); -#else - /* something seems seriously broken, somewhere, when used by - text-spanner-engraver. For dynamic-engraver, all seems fine */ - Real padding = 0; - if (me->get_grob_property ("padding") != SCM_EOL - && gh_number_p (me->get_grob_property ("padding"))) - padding = gh_scm2double (me->get_grob_property ("padding")); -#endif - Real broken_left = spanner->get_broken_left_end_align (); - Real width = spanner->spanner_length (); - width -= broken_left; + 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->get_layout (); + + SCM flare = me->get_property ("bracket-flare"); + SCM shorten = me->get_property ("shorten-pair"); + + Interval span_points; Drul_array broken; - Drul_array extra_off; Direction d = LEFT; do { Item *b = spanner->get_bound (d); broken[d] = b->break_status_dir () != CENTER; - /* This should be switchable, only for (de)cresc. not for generic - text spanners */ - if (padding && !broken [d]) + 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); - Interval e = b->extent (b, X_AXIS); - Real r = 0.0; - if (!e.empty_b ()) - r = e[-d] + padding; - width += d * r; - extra_off[d] = r; + 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); - // FIXME: ecs tells us -- only for (de)cresc. spanners - if (padding) - width += gh_scm2double (me->get_grob_property ("width-correct")); - /* /Ugh */ - - - 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 (scm_is_pair (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_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); } - width -= edge[LEFT].extent (X_AXIS).length () - + edge[RIGHT].extent (X_AXIS).length (); - Drul_array shorten; - shorten[LEFT] = 0; - shorten[RIGHT] = 0; - - SCM s = me->get_grob_property ("shorten"); - if (gh_pair_p (s)) - { - shorten[LEFT] = gh_scm2double (gh_car (s)); - shorten[RIGHT] = gh_scm2double (gh_cdr (s)); - } - - width -= shorten[LEFT] + shorten[RIGHT]; - - if (width < 0) + 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 { - warning (_ ("Text_spanner too small")); - width = 0; + 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); - /* ugh */ - Real thick = me->paper_l ()->get_var ("stafflinethickness"); - - Molecule line; - SCM list = Line_spanner::line_atom (me, width, 0); - if (list != SCM_EOL) - { - - Box b (Interval (0, width), Interval (-thick / 2, thick / 2)); - line = Molecule (b, list); - } - - Drul_array edge_line; - s = me->get_grob_property ("edge-height"); - if (gh_pair_p (s)) + do { - Direction d = LEFT; - int dir = to_dir (me->get_grob_property ("direction")); - do + if (d * span_points[d] > d * edge[-d].extent (X_AXIS)[d]) { - Real dy = gh_scm2double (index_cell (s, d)) * - dir; - if (dy) - { - SCM list = Line_spanner::line_atom (me, 0, dy); - Box b (Interval (0, thick), - dy > 0 - ? Interval (0, dy) - : Interval (dy, 0)); - edge_line[d] = Molecule (b, list); - } + 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 + extra_off[LEFT], X_AXIS); + 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", + "bound-padding dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");