* lily/book.cc: remove Book::to_stencil().

(process): whoops. Score::book_rendering returns vector, not list.

* lily/paper-book.cc (output): load framework module
scm_c_resolve_module().

diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly
index 91065b3d1fd8f83dbc769116298335683bc564f8..6011d3c1946bb0871edec3a2216c3d3dc0a7179b 100644 (file)
--- a/input/regression/newaddlyrics.ly
+++ b/input/regression/newaddlyrics.ly
@@ -4,13 +4,6 @@
     
 }
 
-%% FIXME:
-%% THIS does not parse:
-%\new PianoStaff <<
-
-%% and THIS: gives incorrect results (all lyrics below pianostaff)
-%\context PianoStaff <<
-
 %% only this works as advertised...
 <<
     \new Staff \relative {

diff --git a/lily/beam.cc b/lily/beam.cc
index 6cc0a3a7171b56dabfb403ed787ea62c107296a4..7a9eeecb9f2c8f0c48c0940fe04da4ceac39dcb2 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -548,7 +548,7 @@ Beam::get_default_dir (Grob *me)
   Link_array<Grob> stems=
        Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
 
-  for (int i=0; i <stems.size (); i++)
+  for (int i=0; i < stems.size (); i++)
     do {
       Grob *s = stems[i];
       Direction sd = get_grob_direction (s);

diff --git a/lily/book.cc b/lily/book.cc
index e8caa730d76fcbbbd74d8e2ea5902840dd97b9f1..7387d645d63818a9314f3695bd6ed59a9322c513 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -83,7 +83,7 @@ Book::process (String outname, Output_def *default_def)
       
       /* If the score is empty, generate no output.  Should we
         do titling?  */
-      if (ly_c_pair_p (systems))
+      if (SCM_NFALSEP(scm_vector_p (systems)))
        {
          Score_lines sc;
          sc.lines_ = systems;

diff --git a/lily/score.cc b/lily/score.cc
index a86868d965b3b5e104741d9ccd6c1f90464a0de1..86eccf3e6e489f4ab48c10f999bb3ce8182de328 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -26,7 +26,6 @@
 #include "score.hh"
 #include "warn.hh"
 
-/*  TODO: junkme.  */
 Score::Score ()
   : Input ()
 {
@@ -205,7 +204,13 @@ default_rendering (SCM music, SCM outdef,
   scm_remember_upto_here_1 (scaled_bookdef);
 }
 
-/*  PAPERBOOK should be scaled already.  */
+/*
+Format score, return systems. OUTNAME is still passed to create a midi
+file.
+
+PAPERBOOK should be scaled already.
+
+*/
 SCM
 Score::book_rendering (String outname,
                       Output_def *paperbook,
@@ -254,7 +259,8 @@ LY_DEFINE (ly_score_bookify, "ly:score-bookify",
           "Return @var{score_smob} encapsulated in a Book object. Set "
           "@var{header} as book level header.")
 {
-  SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob");
+  SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob,
+                  SCM_ARG1, __FUNCTION__, "score_smob");
   
   Score *score = unsmob_score (score_smob);
   Book *book = new Book;