X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=bcb480451507ccbbde9553d113e90bd1bb772df2;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=1cb1452c852dba5eef1ad055387bbab354df5aa4;hpb=dc7cc1e2d4f48c4051de6394a3975b835552cc5d;p=lilypond.git diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 1cb1452c85..bcb4804515 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 = unsmob_moment (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 (unsmob_moment (m)) - s = *unsmob_moment (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]; } @@ -181,10 +180,13 @@ Paper_column::minimum_distance (Grob *left, Grob *right) } Interval -Paper_column::break_align_width (Grob *me, SCM align_sym) +Paper_column::break_align_width (Grob *me, SCM align_syms) { Grob *p = me->get_parent (X_AXIS); + if (scm_is_symbol (align_syms)) + align_syms = scm_list_1 (align_syms); + if (is_musical (me)) { me->programming_error ("tried to get break-align-width of a musical column"); @@ -192,22 +194,28 @@ Paper_column::break_align_width (Grob *me, SCM align_sym) } Grob *align = 0; - if (align_sym == ly_symbol2scm ("staff-bar") - || align_sym == ly_symbol2scm ("break-alignment")) - align - = Pointer_group_interface::find_grob (me, ly_symbol2scm ("elements"), - (align_sym == ly_symbol2scm ("staff-bar") - ? Bar_line::non_empty_barline - : Break_alignment_interface::has_interface)); - else + for (;!align && scm_is_pair (align_syms); align_syms = scm_cdr (align_syms)) { - extract_grob_set (me, "elements", elts); - for (vsize i = 0; i < elts.size (); i++) + SCM align_sym = scm_car (align_syms); + 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"), + (scm_is_eq (align_sym, ly_symbol2scm ("staff-bar")) + ? Bar_line::non_empty_barline + : has_interface)); + else { - if (elts[i]->get_property ("break-align-symbol") == align_sym) + extract_grob_set (me, "elements", elts); + for (vsize i = 0; i < elts.size (); i++) { - align = elts[i]; - break; + if (scm_is_eq (align_sym, elts[i]->get_property ("break-align-symbol")) + // TODO SCM: there must be a simpler way to put this. + && !elts[i]->extent (elts[i], X_AXIS).is_empty ()) + { + align = elts[i]; + break; + } } } } @@ -218,6 +226,22 @@ Paper_column::break_align_width (Grob *me, SCM align_sym) return align->extent (p, X_AXIS); } +LY_DEFINE (ly_paper_column__break_align_width, "ly:paper-column::break-align-width", + 2, 0, 0, (SCM col, SCM align_syms), + "Determine the extent along the X-axis of a grob used for" + " break-alignment organized by column @var{col}. The grob is" + " specified by @var{align-syms}, which contains either a" + " single @code{break-align-symbol} or a list of such" + " symbols.") +{ + LY_ASSERT_SMOB (Grob, col, 1); + SCM_ASSERT_TYPE (scm_is_symbol (align_syms) || ly_is_list (align_syms), + align_syms, SCM_ARG2, __FUNCTION__, "symbol or list"); + + Interval ext = Paper_column::break_align_width (unsmob (col), align_syms); + return ly_interval2scm (ext); +} + /* Loop through elements of a PaperColumn, find all grobs implementing specified interface and return their combined extent. @@ -248,15 +272,21 @@ Paper_column::get_interface_extent (Grob *column, SCM iface, Axis a) to your score. Also, as of 2013-10-16 there's a switch in Frescobaldi that turns this on. */ -MAKE_SCHEME_CALLBACK (Paper_column, print, 1); +MAKE_DOCUMENTED_SCHEME_CALLBACK (Paper_column, print, 1, + "Optional stencil for @code{PaperColumn} or" + "@code{NonMusicalPaperColumn}.\n" + "Draws the @code{rank number} of each column," + " its moment in time, a blue arrow showing the" + " ideal distance, and a red arrow showing the" + " minimum distance between columns."); SCM Paper_column::print (SCM p) { - Paper_column *me = dynamic_cast (unsmob_grob (p)); + Paper_column *me = unsmob (p); string r = ::to_string (Paper_column::get_rank (me)); - Moment *mom = unsmob_moment (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); @@ -267,9 +297,9 @@ Paper_column::print (SCM p) SCM when_mol = Text_interface::interpret_markup (me->layout ()->self_scm (), properties, ly_string2scm (when)); - Stencil t = *unsmob_stencil (scm_mol); + Stencil t = *unsmob (scm_mol); t.scale (1.2, 1.4); - t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (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)); @@ -287,9 +317,9 @@ Paper_column::print (SCM p) for (SCM s = me->get_object ("ideal-distances"); scm_is_pair (s); s = scm_cdr (s)) { - Spring *sp = unsmob_spring (scm_caar (s)); - if (!unsmob_grob (scm_cdar (s)) - || !unsmob_grob (scm_cdar (s))->get_system ()) + Spring *sp = unsmob (scm_caar (s)); + if (!unsmob (scm_cdar (s)) + || !unsmob (scm_cdar (s))->get_system ()) continue; j++; @@ -302,7 +332,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 = unsmob_stencil (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 (); @@ -333,7 +363,7 @@ Paper_column::print (SCM p) scm_is_pair (s); s = scm_cdr (s)) { Real dist = scm_to_double (scm_cdar (s)); - Grob *other = unsmob_grob (scm_caar (s)); + Grob *other = unsmob (scm_caar (s)); if (!other || other->get_system () != me->get_system ()) continue; @@ -347,7 +377,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 = unsmob_stencil (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 (); @@ -377,6 +407,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, @@ -389,23 +424,10 @@ MAKE_SCHEME_CALLBACK (Paper_column, before_line_breaking, 1); SCM Paper_column::before_line_breaking (SCM grob) { - Grob *me = unsmob_grob (grob); - - SCM bbm = me->get_object ("bounded-by-me"); - Grob_array *ga = unsmob_grob_array (bbm); - if (!ga) - return SCM_UNSPECIFIED; - - vector &array (ga->array_reference ()); + Grob *me = unsmob (grob); - 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; } @@ -427,7 +449,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)