X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=b67eb0123b1154dadc5ab2e7a6c92ea81a8d7758;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=c96e412d8a36b2ae8576bf3ee8b0d682bc9f4485;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/paper-system.cc b/lily/paper-system.cc index c96e412d8a..b67eb0123b 100644 --- a/lily/paper-system.cc +++ b/lily/paper-system.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2010 Jan Nieuwenhuizen + Copyright (C) 2004--2015 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 @@ -18,6 +18,7 @@ */ #include "paper-system.hh" +#include "international.hh" #include "item.hh" Prob * @@ -27,6 +28,55 @@ 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 (scm_is_eq (head, ly_symbol2scm ("delay-stencil-evaluation"))) + { + // we likely need to do something here...just don't know what... + return SCM_EOL; + } + + if (scm_is_eq (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_null (footnote)) + { + *tail = scm_cons (footnote, SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + } + return scm_append (out); + } + if (scm_is_eq (head, ly_symbol2scm ("translate-stencil"))) + return get_footnotes (scm_caddr (expr)); + + if (scm_is_eq (head, ly_symbol2scm ("footnote"))) + return scm_list_1 (scm_cdr (expr)); + + return SCM_EOL; +} + void paper_system_set_stencil (Prob *prob, Stencil s) {