X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=da3807c31d6f4ddb33fb75edf69c24ec3baf8175;hb=313d11786149a101118f3db1ab319ca0c7b6f113;hp=f4721e92518f46f60ac101576d4f9940369ef1c1;hpb=b3fa845f6fa55c4d4fb8b302d9f9e809692974fe;p=lilypond.git diff --git a/lily/paper-column.cc b/lily/paper-column.cc index f4721e9251..da3807c31d 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ #include "font-interface.hh" #include "grob-array.hh" #include "lookup.hh" -#include "lookup.hh" #include "moment.hh" #include "output-def.hh" #include "paper-score.hh" @@ -118,7 +117,7 @@ Moment Paper_column::when_mom (Grob *me) { SCM m = me->get_property ("when"); - if (Moment *when = Moment::unsmob (m)) + if (Moment *when = unsmob (m)) return *when; return Moment (0); } @@ -128,8 +127,8 @@ Paper_column::is_musical (Grob *me) { SCM m = me->get_property ("shortest-starter-duration"); Moment s (0); - if (Moment::unsmob (m)) - s = *Moment::unsmob (m); + if (unsmob (m)) + s = *unsmob (m); return s != Moment (0); } @@ -170,7 +169,7 @@ Paper_column::minimum_distance (Grob *left, Grob *right) for (LEFT_and_RIGHT (d)) { - Skyline_pair *sp = Skyline_pair::unsmob (cols[d]->get_property ("horizontal-skylines")); + Skyline_pair *sp = unsmob (cols[d]->get_property ("horizontal-skylines")); if (sp) skys[d] = (*sp)[-d]; } @@ -198,13 +197,13 @@ Paper_column::break_align_width (Grob *me, SCM align_syms) for (;!align && scm_is_pair (align_syms); align_syms = scm_cdr (align_syms)) { SCM align_sym = scm_car (align_syms); - if (align_sym == ly_symbol2scm ("staff-bar") - || align_sym == ly_symbol2scm ("break-alignment")) + if (scm_is_eq (align_sym, ly_symbol2scm ("staff-bar")) + || scm_is_eq (align_sym, ly_symbol2scm ("break-alignment"))) align = Pointer_group_interface::find_grob (me, ly_symbol2scm ("elements"), - (align_sym == ly_symbol2scm ("staff-bar") + (scm_is_eq (align_sym, ly_symbol2scm ("staff-bar")) ? Bar_line::non_empty_barline - : Break_alignment_interface::has_interface)); + : has_interface)); else { extract_grob_set (me, "elements", elts); @@ -266,11 +265,11 @@ MAKE_DOCUMENTED_SCHEME_CALLBACK (Paper_column, print, 1, SCM Paper_column::print (SCM p) { - Paper_column *me = dynamic_cast (Grob::unsmob (p)); + Paper_column *me = unsmob (p); string r = ::to_string (Paper_column::get_rank (me)); - Moment *mom = Moment::unsmob (me->get_property ("when")); + Moment *mom = unsmob (me->get_property ("when")); string when = mom ? mom->to_string () : "?/?"; Font_metric *musfont = Font_interface::get_default_font (me); @@ -281,9 +280,9 @@ Paper_column::print (SCM p) SCM when_mol = Text_interface::interpret_markup (me->layout ()->self_scm (), properties, ly_string2scm (when)); - Stencil t = *Stencil::unsmob (scm_mol); + Stencil t = *unsmob (scm_mol); t.scale (1.2, 1.4); - t.add_at_edge (Y_AXIS, DOWN, *Stencil::unsmob (when_mol), 0.1); + t.add_at_edge (Y_AXIS, DOWN, *unsmob (when_mol), 0.1); t.align_to (X_AXIS, LEFT); // compensate for font serifs and half letter-distance t.translate (Offset (-0.1, 0)); @@ -301,9 +300,9 @@ Paper_column::print (SCM p) for (SCM s = me->get_object ("ideal-distances"); scm_is_pair (s); s = scm_cdr (s)) { - Spring *sp = Spring::unsmob (scm_caar (s)); - if (!Grob::is_smob (scm_cdar (s)) - || !Grob::unsmob (scm_cdar (s))->get_system ()) + Spring *sp = unsmob (scm_caar (s)); + if (!unsmob (scm_cdar (s)) + || !unsmob (scm_cdar (s))->get_system ()) continue; j++; @@ -316,7 +315,7 @@ Paper_column::print (SCM p) SCM stil = Text_interface::interpret_markup (me->layout ()->self_scm (), properties, ly_string2scm (String_convert::form_string ("%5.2lf", sp->distance ()))); - Stencil *number_stc = Stencil::unsmob (stil); + Stencil *number_stc = unsmob (stil); number_stc->scale (1, 1.1); Real num_height = number_stc->extent (Y_AXIS).length (); Real num_len = number_stc->extent (X_AXIS).length (); @@ -347,7 +346,7 @@ Paper_column::print (SCM p) scm_is_pair (s); s = scm_cdr (s)) { Real dist = scm_to_double (scm_cdar (s)); - Grob *other = Grob::unsmob (scm_caar (s)); + Grob *other = unsmob (scm_caar (s)); if (!other || other->get_system () != me->get_system ()) continue; @@ -361,7 +360,7 @@ Paper_column::print (SCM p) SCM stil = Text_interface::interpret_markup (me->layout ()->self_scm (), properties, ly_string2scm (String_convert::form_string ("%5.2lf", dist))); - Stencil *number_stc = Stencil::unsmob (stil); + Stencil *number_stc = unsmob (stil); number_stc->scale (1, 1.1); Real num_height = number_stc->extent (Y_AXIS).length (); Real num_len = number_stc->extent (X_AXIS).length (); @@ -391,6 +390,11 @@ Paper_column::print (SCM p) return t.smobbed_copy (); } +static bool grob_is_live (const Grob *g) +{ + return g && g->is_live (); +} + /* This is all too hairy. We use bounded-by-me to make sure that some columns are kept "alive". Unfortunately, when spanners are suicided, @@ -403,23 +407,10 @@ MAKE_SCHEME_CALLBACK (Paper_column, before_line_breaking, 1); SCM Paper_column::before_line_breaking (SCM grob) { - Grob *me = Grob::unsmob (grob); - - SCM bbm = me->get_object ("bounded-by-me"); - Grob_array *ga = Grob_array::unsmob (bbm); - if (!ga) - return SCM_UNSPECIFIED; + Grob *me = unsmob (grob); - vector &array (ga->array_reference ()); - - for (vsize i = array.size (); i--;) - { - Grob *g = array[i]; - - if (!g || !g->is_live ()) - /* UGH . potentially quadratic. */ - array.erase (array.begin () + i); - } + if (Grob_array *ga = unsmob (me->get_object ("bounded-by-me"))) + ga->filter (grob_is_live); return SCM_UNSPECIFIED; } @@ -441,7 +432,7 @@ Paper_column::is_extraneous_column_from_ligature (Grob *me) bool has_notehead = false; for (vsize i = 0; i < elts.size (); i++) { - if (Rhythmic_head::has_interface (elts[i])) + if (has_interface (elts[i])) { has_notehead = true; if (dynamic_cast (elts[i])->get_column () == me)