Fix #223.

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index 114ef0cdf2df8cc5c56bedef16beb90f3c68a4a4..44f7ee4ef933f7f206c151c1b4738c72aece689c 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -12,18 +12,13 @@
 using namespace std;
 
 #include "lilypond-key.hh"
-#include "global-context.hh"
 #include "main.hh"
-#include "music-iterator.hh"
-#include "music-output.hh"
 #include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "score.hh"
-#include "stencil.hh"
 #include "text-interface.hh"
 #include "warn.hh"
-
 #include "performance.hh"
 #include "paper-score.hh"
 
@@ -118,7 +113,7 @@ Paper_book *
 Book::process (Output_def *default_paper,
               Output_def *default_layout)
 {
-  for (SCM s = scores_; s != SCM_EOL; s = scm_cdr (s))
+  for (SCM s = scores_; scm_is_pair (s); s = scm_cdr (s))
     if (Score *score = unsmob_score (scm_car (s)))
       if (score->error_found_)
        return 0;
@@ -140,7 +135,7 @@ Book::process (Output_def *default_paper,
   paper_book->header_ = header_;
 
   /* Render in order of parsing.  */
-  for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
+  for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
     {
       if (Score *score = unsmob_score (scm_car (s)))
        {