X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=44d699b7ce1bcd0b35137945f03c1ad490c008cf;hb=e3fa24f095381f36fdc5fa17494ec16b5cd18fe8;hp=1cc6d2b0311cf8c79c4f8f444f1d6a7c0d3d2acf;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 1cc6d2b031..44d699b7ce 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen + (c) 1998--2006 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" @@ -16,7 +16,7 @@ #include "misc.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" -#include "text-item.hh" +#include "text-interface.hh" #include "percent-repeat-item.hh" #include "lookup.hh" #include "separation-item.hh" @@ -32,30 +32,32 @@ Multi_measure_rest::percent (SCM smob) // ugh copy & paste. + Grob *common_x = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), + X_AXIS); Interval sp_iv; Direction d = LEFT; do { Item *col = sp->get_bound (d)->get_column (); - Interval coldim = col->extent (0, X_AXIS); + Interval coldim = robust_relative_extent (col, common_x, X_AXIS); sp_iv[d] = coldim[-d]; } while ((flip (&d)) != LEFT); Real x_off = 0.0; - Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); + Real rx = sp->get_bound (LEFT)->relative_coordinate (common_x, X_AXIS); /* we gotta stay clear of sp_iv, so move a bit to the right if needed. */ - x_off += (sp_iv[LEFT] - rx) >? 0; + x_off += max (sp_iv[LEFT] - rx, 0.0); /* center between stuff. */ - x_off += sp_iv.length ()/ 2; + x_off += sp_iv.length () / 2; r.translate_axis (x_off, X_AXIS); @@ -92,7 +94,7 @@ Multi_measure_rest::print (SCM smob) we gotta stay clear of sp_iv, so move a bit to the right if needed. */ - Real x_off = (sp_iv[LEFT] - rx) >? 0; + Real x_off = max (sp_iv[LEFT] - rx, 0.0); Stencil mol; mol.add_stencil (symbol_stencil (me, space)); @@ -100,9 +102,7 @@ Multi_measure_rest::print (SCM smob) int measures = 0; SCM m (me->get_property ("measure-count")); if (scm_is_number (m)) - { - measures = scm_to_int (m); - } + measures = scm_to_int (m); mol.translate_axis (x_off, X_AXIS); return mol.smobbed_copy (); @@ -114,9 +114,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) int measures = 0; SCM m (me->get_property ("measure-count")); if (scm_is_number (m)) - { - measures = scm_to_int (m); - } + measures = scm_to_int (m); if (measures <= 0) return Stencil (); @@ -124,7 +122,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) if (measures > scm_to_int (limit)) { Real padding = 0.15; - Stencil s = big_rest (me, (1.0 - 2*padding) * space); + Stencil s = big_rest (me, (1.0 - 2 * padding) * space); s.translate_axis (padding * space, X_AXIS); return s; } @@ -133,7 +131,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) Real staff_space = Staff_symbol_referencer::staff_space (me); Font_metric *musfont - = select_font (me->get_layout (), alist_chain); + = select_font (me->layout (), alist_chain); SCM sml = me->get_property ("use-breve-rest"); if (measures == 1) @@ -162,9 +160,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) } } else - { - return church_rest (me, musfont, measures, space); - } + return church_rest (me, musfont, measures, space); } /* @@ -177,15 +173,15 @@ Multi_measure_rest::big_rest (Grob *me, Real width) Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1); Real ss = Staff_symbol_referencer::staff_space (me); - Real slt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); + Real slt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); Real y = slt * thick_thick / 2 * ss; Real ythick = hair_thick * slt * ss; - Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y)); + Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y)); - Real blot = width ? (.8 * (y = 2) + else if (l >= 2) { l -= 2; k = -1; @@ -285,17 +281,14 @@ Multi_measure_rest::add_column (Grob *me, Item *c) add_bound_item (dynamic_cast (me), c); } -MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); -SCM -Multi_measure_rest::set_spacing_rods (SCM smob) +void +Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) { - Grob *me = unsmob_grob (smob); - Spanner *sp = dynamic_cast (me); if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT))) { programming_error ("Multi_measure_rest::get_rods (): I am not spanned!"); - return SCM_UNSPECIFIED; + return ; } Item *li = sp->get_bound (LEFT)->get_column (); @@ -308,8 +301,6 @@ Multi_measure_rest::set_spacing_rods (SCM smob) {li, rb}, {lb, rb}}; - Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); - for (int i = 0; i < 4; i++) { Item *li = combinations[i][0]; @@ -324,17 +315,51 @@ Multi_measure_rest::set_spacing_rods (SCM smob) rod.distance_ = li->extent (li, X_AXIS)[BIGGER] - ri->extent (ri, X_AXIS)[SMALLER] - /* 2.0 = magic! */ - + sym_width + 2.0; + + length + + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0); Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0); rod.distance_ = max (rod.distance_, minlen); rod.add_to_cols (); } +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); + calculate_spacing_rods (me, sym_width); + + return SCM_UNSPECIFIED; +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1); +SCM +Multi_measure_rest::set_text_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Stencil *stil = me->get_stencil (); + + /* FIXME uncached */ + Real len = (stil && !stil->extent (X_AXIS).is_empty ()) + ? stil->extent (X_AXIS).length () + : 0.0; + calculate_spacing_rods (me, len); + return SCM_UNSPECIFIED; } -ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface", +ADD_INTERFACE (Multi_measure_rest, "A rest that spans a whole number of measures.", - "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length"); + + /* properties */ + "expand-limit " + "measure-count " + "hair-thickness " + "thick-thickness " + "use-breve-rest " + "bound-padding " + "minimum-length");