Fix issue 897

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

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 81b3a4782cb5365c369bab14af6dd618aa335565..7a13120c6464d0f426e8d63fad05cf1d8ef56d1a 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2011 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
@@ -134,7 +134,7 @@ Paper_book::output_aux (SCM output_channel,
       scm_call_3 (proc,
                  performances (),
                  output_channel,
-                 scm_long2num (*first_performance_number));
+                 scm_from_long (*first_performance_number));
       *first_performance_number += scm_ilength (performances_);
     }
 
@@ -155,7 +155,7 @@ Paper_book::output_aux (SCM output_channel,
       if (scores_ == SCM_EOL)
        return 0;
       paper_->set_variable (ly_symbol2scm ("first-page-number"),
-                           scm_long2num (*first_page_number));
+                           scm_from_long (*first_page_number));
       paper_->set_variable (ly_symbol2scm ("is-last-bookpart"),
                            ly_bool2scm (is_last));
       /* Generate all stencils to trigger font loads.  */
@@ -245,7 +245,7 @@ Paper_book::classic_output_aux (SCM output,
       scm_call_3 (proc,
                  performances (),
                  output,
-                 scm_long2num (*first_performance_number));
+                 scm_from_long (*first_performance_number));
       *first_performance_number += scm_ilength (performances_);
     }
   
@@ -532,6 +532,9 @@ Paper_book::get_system_specs ()
                          list == texts? SCM_BOOL_T : SCM_BOOL_F);
 
              paper_system_set_stencil (ps, *unsmob_stencil (t));
+             
+             SCM footnotes = get_footnotes (unsmob_stencil (t)->expr ());
+             ps->set_property ("footnotes", footnotes);
              ps->set_property ("is-title", SCM_BOOL_T);
              if (list != texts)
                /* For each markup other than the first, place it as closely as