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

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 352334a0a7..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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2015 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
@@ -18,6 +18,7 @@
 */
 
 #include "paper-system.hh"
+#include "international.hh"
 #include "item.hh"
 
 Prob *
@@ -27,6 +28,16 @@ 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)
 {
@@ -35,38 +46,37 @@ get_footnotes (SCM expr)
 
   SCM head = scm_car (expr);
 
-  if (head == ly_symbol2scm ("delay-stencil-evaluation"))
+  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 (head == ly_symbol2scm ("combine-stencil"))
+
+  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_pair (footnote))
+          if (!scm_is_null (footnote))
             {
-              for (SCM y = scm_reverse (footnote); scm_is_pair (y); y = scm_cdr (y))
-                out = scm_cons (scm_car (y), out);
+              *tail = scm_cons (footnote, SCM_EOL);
+              tail = SCM_CDRLOC (*tail);
             }
-          else if (SCM_EOL != footnote)
-            out = scm_cons (footnote, out);
         }
-      return out;
+      return scm_append (out);
     }
-  if (head == ly_symbol2scm ("translate-stencil"))
+  if (scm_is_eq (head, ly_symbol2scm ("translate-stencil")))
     return get_footnotes (scm_caddr (expr));
 
-  if (head == ly_symbol2scm ("footnote"))
-    return scm_cadr (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)
 {