X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system.cc;h=b67eb0123b1154dadc5ab2e7a6c92ea81a8d7758;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=544f64d8b05eefed05652ab79d7fc47dd0113397;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 544f64d8b0..b67eb0123b 100644
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -1,12 +1,24 @@
 /*
-  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--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "paper-system.hh"
+#include "international.hh"
 #include "item.hh"
 
 Prob *
@@ -16,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)
 {
@@ -23,7 +84,7 @@ paper_system_set_stencil (Prob *prob, Stencil s)
 
   if (is_number_pair (yext))
     {
-      Box b = s.extent_box();
+      Box b = s.extent_box ();
       b[Y_AXIS] = ly_scm2interval (yext);
 
       s = Stencil (b, s.expr ());