Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / lily / paper-system.cc

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 352334a0a7cf7efd85ab26975b4b7a33d2e59251..437a0eb450d32e165536e693f1fa63fdf92f9f7f 100644 (file)
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -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)
 {
@@ -44,24 +55,24 @@ get_footnotes (SCM expr)
   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))
+          if (SCM_EOL != 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"))
     return get_footnotes (scm_caddr (expr));
 
   if (head == ly_symbol2scm ("footnote"))
-    return scm_cadr (expr);
+    return scm_list_1 (scm_cdr (expr));
 
   return SCM_EOL;
 }