X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;fp=lily%2Fpaper-system.cc;h=711d919446d4f8d21a3205563d6dde914aceb8b2;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=6653b6ddc7deb9e60582752206eda332470d27f2;hpb=5a22d6233a39d3164e1ca043244794c268be4ad0;p=lilypond.git diff --git a/lily/paper-system.cc b/lily/paper-system.cc index 6653b6ddc7..711d919446 100644 --- a/lily/paper-system.cc +++ b/lily/paper-system.cc @@ -1,9 +1,20 @@ /* - paper-system.cc -- implement Prob functions for paper-system + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2011 Jan Nieuwenhuizen - (c) 2004--2009 Jan Nieuwenhuizen + 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. + + 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 "paper-system.hh" @@ -16,6 +27,64 @@ make_paper_system (SCM 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) + + 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) +{ + 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_is_pair (footnote)) + { + for (SCM y = footnote; scm_is_pair (y); y = scm_cdr (y)) + { + *tail = scm_cons (scm_car (y), SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + } + else if (SCM_EOL != footnote) + { + *tail = scm_cons (footnote, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + } + return out; + } + if (head == ly_symbol2scm ("translate-stencil")) + return get_footnotes (scm_caddr (expr)); + + if (head == ly_symbol2scm ("footnote")) + return scm_cadr (expr); + + return SCM_EOL; +} + + void paper_system_set_stencil (Prob *prob, Stencil s) {