X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner.cc;h=bcaf49098bd2fbb2dd663dd6a1e0ff4a6f8212cc;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=88d20d457b71721aa580e96002ba11ae7d495964;hpb=11b3094461e045deafd0e2b1cef8c60f79e259a1;p=lilypond.git diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 88d20d457b..bcaf49098b 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -3,19 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2003 Jan Nieuwenhuizen + (c) 2000--2006 Jan Nieuwenhuizen - Revised over good by Han-Wen. + 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 "output-def.hh" #include "warn.hh" #include "paper-column.hh" #include "staff-symbol-referencer.hh" @@ -28,26 +28,25 @@ - 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. */ - Real padding = 0.0; - SCM itp= me->get_grob_property ("if-text-padding"); - if (gh_number_p (itp)) - padding = gh_scm2double (itp); + 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); - Paper_def * paper = me->get_paper(); - + 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; @@ -58,119 +57,108 @@ Text_spanner::brew_molecule (SCM smob) 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); + if (d == LEFT) + span_points[d] = spanner->get_broken_left_end_align (); + else + span_points[d] = b->relative_coordinate (common, X_AXIS); } else - { - bool encl = to_boolean (me->get_grob_property ("enclose-bounds")); - span_points[d] = b->extent (common, X_AXIS)[encl ? d : -d]; - } - } - while (flip (&d) != LEFT); + { + 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::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 { - /* Don't repeat edge text for broken end */ if (broken[d]) continue; - + SCM text = index_get_cell (edge_text, d); - if (Text_item::markup_p (text)) - edge[d] = *unsmob_molecule (Text_item::interpret_markup (paper->self_scm (), properties, text)); - - if (!edge[d].empty_b ()) + 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 shorten; - shorten[LEFT] = 0; - shorten[RIGHT] = 0; - - SCM ew = me->get_grob_property ("bracket-flare"); - SCM s = me->get_grob_property ("shorten-pair"); - if (gh_pair_p (s)) - { - span_points[LEFT] += gh_scm2double (ly_car (s)); - span_points[RIGHT] -= gh_scm2double (ly_cdr (s)); - } - if (gh_pair_p (ew)) - { - span_points[LEFT] += gh_scm2double (ly_car (ew)); - span_points[RIGHT] -= gh_scm2double (ly_cdr (ew)); - } - - Real thick = paper->get_realvar (ly_symbol2scm ("linethickness")); - SCM st = me->get_grob_property ("thickness"); - if (gh_number_p (st)) - { - thick *= gh_scm2double (st); - } - - Drul_array edge_line; - s = me->get_grob_property ("edge-height"); - 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; + { + 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 { - Direction d = LEFT; - int dir = to_dir (me->get_grob_property ("direction")); - do + Interval ext = edge[d].extent (X_AXIS); + if (!ext.is_empty ()) { - if (broken[d]) - continue; - - Real dx = 0.0; - if (gh_pair_p (ew)) - dx = gh_scm2double (index_get_cell (ew, d)) * d; - - Real dy = gh_scm2double (index_get_cell (s, d)) * - dir; - if (dy) - edge_line[d] = Line_spanner::line_molecule (me, thick, Offset(0,0), - Offset (dx, dy)); + 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); } - - Molecule m; + while (flip (&d) != LEFT); + do { - Interval ext = edge[d].extent (X_AXIS); - - edge[d].translate_axis (span_points[d], X_AXIS); - m.add_molecule (edge[d]); - edge_line[d].translate_axis (span_points[d], X_AXIS); - m.add_molecule (edge_line[d]); - if (!ext.empty_b ()) - span_points[d] += -d * ext[-d]; + 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); - Molecule l =Line_spanner::line_molecule (me, thick, - Offset (span_points[LEFT], 0), - Offset (span_points[RIGHT], 0)); - m.add_molecule (l); - + 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", +ADD_INTERFACE (Text_spanner, "text-spanner-interface", "generic text spanner", - "dash-period if-text-padding dash-length edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds width-correct"); + "bound-padding dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");