X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=bdd38e4181e3cc159e14d32c79e96702d9303524;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=885296a3ecf759189d6bed7080ef9e259ebce97e;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git diff --git a/lily/paper-system.cc b/lily/paper-system.cc index 885296a3ec..bdd38e4181 100644 --- a/lily/paper-system.cc +++ b/lily/paper-system.cc @@ -1,136 +1,94 @@ /* - paper-system.cc -- implement Paper_system + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2014 Jan Nieuwenhuizen - (c) 2004 Jan Nieuwenhuizen -*/ - -#include "paper-system.hh" -#include "stencil.hh" -#include "string.hh" -#include "virtual-methods.hh" - -#include "ly-smobs.icc" - -IMPLEMENT_SMOBS (Paper_system); -IMPLEMENT_TYPE_P (Paper_system, "ly:paper-system?"); -IMPLEMENT_DEFAULT_EQUAL_P (Paper_system); - - - -Paper_system::Paper_system (Stencil s, bool is_title) -{ - is_title_ = is_title; - number_ = 0; - penalty_ = 0; - smobify_self (); - stencil_ = s; - staff_refpoints_ = Interval(0,0); -} - -Paper_system::~Paper_system () -{ -} - -SCM -Paper_system::mark_smob (SCM smob) -{ - Paper_system *system = (Paper_system*) ly_cdr (smob); - return system-> stencil_.expr (); -} - -int -Paper_system::print_smob (SCM smob, SCM port, scm_print_state*) -{ - Paper_system *p = (Paper_system*) ly_cdr (smob); - scm_puts ("#<", port); - scm_puts (classname (p), port); - scm_puts (" ", port); - scm_puts (to_string (p->number_).to_str0 (), port); - scm_puts ("p ", port); - scm_puts (to_string (p->penalty_).to_str0 (), port); - if (p->is_title ()) - scm_puts (" t", port); - scm_puts (" >", port); - return 1; -} + 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. -bool -Paper_system::is_title () const -{ - return is_title_; -} + 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. -Real -Paper_system::penalty () const -{ - return penalty_; -} + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -Stencil -Paper_system::to_stencil () const -{ - return stencil_; -} +#include "paper-system.hh" +#include "international.hh" +#include "item.hh" -LY_DEFINE (ly_paper_system_height, "ly:paper-system-extent", - 2, 0, 0, (SCM system, SCM axis), - "Return the extent of @var{system}.") +Prob * +make_paper_system (SCM immutable_init) { - Paper_system *ps = unsmob_paper_system (system); - SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system"); - SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis"); - Axis ax = (Axis)scm_to_int (axis); - return ly_interval2scm (ps->to_stencil().extent (ax)); + Prob *prob = new Prob (ly_symbol2scm ("paper-system"), immutable_init); + return prob; } +/* + TODO + it might be interesting to split off the footnotes as well, ie. + get_footnotes(SCM expr, SCM* footnotes, SCM* cleaned) -LY_DEFINE (ly_paper_system_title_p, "ly:paper-system-title?", - 1, 0, 0, (SCM system), - "Is @var{system} a title system?") -{ - Paper_system *ps = unsmob_paper_system (system); - SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system"); - return SCM_BOOL (ps->is_title ()); -} - -LY_DEFINE (ly_paper_system_number, "ly:paper-system-number", - 1, 0, 0, (SCM system), - "Return the number of @var{system}.") -{ - Paper_system *ps = unsmob_paper_system (system); - SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system"); - return scm_int2num (ps->number_); -} - -LY_DEFINE (ly_paper_system_break_score, "ly:paper-system-break-penalty", - 1, 0, 0, (SCM system), - "Return the score for page break after @var{system}.") + by doing it this way and overwriting the old expr in the caller, + you can make sure nobody tries to handle footnotes differently + downstream. +*/ +SCM +get_footnotes (SCM expr) { - Paper_system *ps = unsmob_paper_system (system); - SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system"); - return scm_int2num (int (ps->penalty ())); + if (!scm_is_pair (expr)) + return SCM_EOL; + + SCM head = scm_car (expr); + + if (head == ly_symbol2scm ("delay-stencil-evaluation")) + { + // we likely need to do something here...just don't know what... + return SCM_EOL; + } + + if (head == ly_symbol2scm ("combine-stencil")) + { + SCM out = SCM_EOL; + SCM *tail = &out; + + for (SCM x = scm_cdr (expr); scm_is_pair (x); x = scm_cdr (x)) + { + SCM footnote = get_footnotes (scm_car (x)); + if (SCM_EOL != footnote) + { + *tail = scm_cons (footnote, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + } + return scm_append (out); + } + if (head == ly_symbol2scm ("translate-stencil")) + return get_footnotes (scm_caddr (expr)); + + if (head == ly_symbol2scm ("footnote")) + return scm_list_1 (scm_cdr (expr)); + + return SCM_EOL; } -LY_DEFINE (ly_paper_system_stencil, "ly:paper-system-stencil", - 1, 0, 0, (SCM system), - "Return the height of @var{system}.") +void +paper_system_set_stencil (Prob *prob, Stencil s) { - Paper_system *ps = unsmob_paper_system (system); - SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system"); - return ps->to_stencil ().smobbed_copy (); -} + SCM yext = prob->get_property ("Y-extent"); + if (is_number_pair (yext)) + { + Box b = s.extent_box (); + b[Y_AXIS] = ly_scm2interval (yext); + s = Stencil (b, s.expr ()); + } -LY_DEFINE (ly_paper_system_staff_extent, "ly:paper-system-staff-extents", - 1, 0, 0, (SCM system), - "Return the top and bottom staff refpoint.") -{ - Paper_system *ps = unsmob_paper_system (system); - SCM_ASSERT_TYPE (ps, system, SCM_ARG1, __FUNCTION__, "paper-system"); - return ly_interval2scm (ps->staff_refpoints_); + prob->set_property ("stencil", s.smobbed_copy ()); } -