X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-bracket.cc;h=f34afd16951c07d0136e82182407da3ce78b0770;hb=9fa898402775060cc74c8d986263c5a2a59a707f;hp=985fa41120e16d7c09f722812f5e246fc80b6f2e;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index 985fa41120..f34afd1695 100644 --- a/lily/ottava-bracket.cc +++ b/lily/ottava-bracket.cc @@ -1,14 +1,24 @@ -/* - ottava-bracket.cc -- implement Ottava_bracket +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2004--2015 Han-Wen Nienhuys - source file of the GNU LilyPond music typesetter + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - (c) 2004 Han-Wen Nienhuys + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - */ + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -#include "text-item.hh" -#include "line-spanner.hh" +#include "axis-group-interface.hh" +#include "text-interface.hh" #include "spanner.hh" #include "font-interface.hh" #include "dimensions.hh" @@ -20,173 +30,169 @@ #include "directional-element-interface.hh" #include "tuplet-bracket.hh" #include "rhythmic-head.hh" +#include "pointer-group-interface.hh" struct Ottava_bracket { DECLARE_SCHEME_CALLBACK (print, (SCM)); - static bool has_interface (Grob*); + DECLARE_GROB_INTERFACE (); }; - /* TODO: the string for ottava shoudl depend on the available space, ie. - - Long: 15ma Short: 15ma Empty: 15 - 8va 8va 8 - 8va bassa 8ba 8 + Long: 15ma Short: 15ma Empty: 15 + 8va 8va 8 + 8va bassa 8ba 8 */ MAKE_SCHEME_CALLBACK (Ottava_bracket, print, 1); SCM Ottava_bracket::print (SCM smob) { - Spanner*me = dynamic_cast (unsmob_grob (smob)); + Spanner *me = dynamic_cast (Grob::unsmob (smob)); Interval span_points; - + Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); - Output_def * layout = me->get_layout (); - + Output_def *layout = me->layout (); + Drul_array broken; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { Item *b = me->get_bound (d); broken[d] = (b->break_status_dir () != CENTER); if (Note_column::has_interface (b)) - { - SCM heads = b->get_property ("note-heads"); - common = common_refpoint_of_list (heads, common, X_AXIS); - for (SCM s = heads; scm_is_pair (s); s = scm_cdr (s)) - { - Grob * h = unsmob_grob (scm_car (s)); - Grob * dots = Rhythmic_head::get_dots (h); - if (dots) - common = dots->common_refpoint (common, X_AXIS); - } - } + { + extract_grob_set (b, "note-heads", heads); + common = common_refpoint_of_array (heads, common, X_AXIS); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *h = heads[i]; + Grob *dots = Rhythmic_head::get_dots (h); + if (dots) + common = dots->common_refpoint (common, X_AXIS); + } + } } - while (flip (&d) != LEFT); SCM properties = Font_interface::text_font_alist_chain (me); SCM markup = me->get_property ("text"); Stencil text; - if (Text_interface::markup_p (markup)) - text = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, markup)); - + if (Text_interface::is_markup (markup)) + text = *Stencil::unsmob (Text_interface::interpret_markup (layout->self_scm (), + properties, markup)); Drul_array shorten = robust_scm2interval (me->get_property ("shorten-pair"), - Interval (0,0)); - + Interval (0, 0)); /* TODO: we should check if there are ledgers, and modify length of the spanner to that. - */ - do + */ + for (LEFT_and_RIGHT (d)) { Item *b = me->get_bound (d); Interval ext; if (Note_column::has_interface (b)) - { - for (SCM s = b->get_property ("note-heads"); scm_is_pair (s); s = scm_cdr (s)) - { - Grob * h = unsmob_grob (scm_car (s)); - ext.unite (h->extent (common, X_AXIS)); - Grob * dots = Rhythmic_head::get_dots (h); - - if (dots && d == RIGHT) - { - ext.unite (dots->extent (common, X_AXIS)); - } - } - } - + { + extract_grob_set (b, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *h = heads[i]; + ext.unite (h->extent (common, X_AXIS)); + Grob *dots = Rhythmic_head::get_dots (h); + + if (dots && d == RIGHT) + ext.unite (dots->extent (common, X_AXIS)); + } + } + if (ext.is_empty ()) - { - ext = robust_relative_extent (b, common, X_AXIS); - } + ext = robust_relative_extent (b, common, X_AXIS); if (broken[d]) - { - span_points[d] = b->extent (common, X_AXIS)[RIGHT]; - shorten[d] = 0.; - } - + { + span_points[d] = Axis_group_interface::generic_bound_extent (b, common, X_AXIS)[RIGHT]; + shorten[d] = 0.; + } + else - span_points[d] = ext[d]; - } - while (flip (&d) != LEFT); + span_points[d] = ext[d]; + span_points[d] -= d * shorten[d]; + } /* - 0.3 is ~ italic correction. - */ - Real text_size = text.extent (X_AXIS).is_empty () - ? 0.0 : text.extent (X_AXIS)[RIGHT] + 0.3; - - span_points[LEFT] = span_points[LEFT] - get_property ("minimum-length"), -1.0)); - + 0.3 is ~ italic correction. + */ + Real text_size = text.extent (X_AXIS).is_empty () + ? 0.0 : text.extent (X_AXIS)[RIGHT] + 0.3; + + span_points[LEFT] + = min (span_points[LEFT], + (span_points[RIGHT] - text_size + - robust_scm2double (me->get_property ("minimum-length"), -1.0))); + Interval bracket_span_points = span_points; bracket_span_points[LEFT] += text_size; - + Drul_array edge_height = robust_scm2interval (me->get_property ("edge-height"), - Interval (1.0, 1.0)); + Interval (1.0, 1.0)); - Drul_array flare = robust_scm2interval (me->get_property ("bracket-flare"), - Interval (0,0)); - + Interval (0, 0)); + for (LEFT_and_RIGHT (d)) + { + edge_height[d] *= -get_grob_direction (me); + if (broken[d]) + edge_height[d] = 0.0; + } - edge_height[LEFT] = 0.0; - edge_height[RIGHT] *= - get_grob_direction (me); - if (broken[RIGHT]) - edge_height[RIGHT] = 0.0; - Stencil b; Interval empty; if (!bracket_span_points.is_empty () && bracket_span_points.length () > 0.001) b = Tuplet_bracket::make_bracket (me, - Y_AXIS, Offset (bracket_span_points.length (), 0), - edge_height, - empty, - flare, shorten); + Y_AXIS, Offset (bracket_span_points.length (), 0), + edge_height, + empty, + flare, Drul_array (0, 0)); /* - The vertical lines should not take space, for the following scenario: - - 8 -----+ - o | - | - | - - - Just a small amount, yes. In tight situations, it is even - possible to center the `8' directly below the note, dropping the - ottava line completely... - + * The vertical lines should not take space, for the following scenario: + * + * 8 -----+ + * o | + * | + * | + * + * Just a small amount, yes. In tight situations, it is even + * possible to center the `8' directly below the note, dropping the + * ottava line completely... */ - + b = Stencil (Box (b.extent (X_AXIS), - Interval (0.1,0.1)), - b.expr ()); - + Interval (0.1, 0.1)), + b.expr ()); + b.translate_axis (bracket_span_points[LEFT], X_AXIS); text.translate_axis (span_points[LEFT], X_AXIS); text.align_to (Y_AXIS, CENTER); b.add_stencil (text); - + b.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS); - - return b.smobbed_copy (); + + return b.smobbed_copy (); } +ADD_INTERFACE (Ottava_bracket, + "An ottava bracket.", -ADD_INTERFACE (Ottava_bracket, "ottava-bracket-interface", - "An ottava bracket", - "edge-height bracket-flare shorten-pair minimum-length"); + /* properties */ + "edge-height " + "bracket-flare " + "shorten-pair " + "minimum-length " + );