(get_system_specs): separate generation of

titles and systems.

diff --git a/ChangeLog b/ChangeLog
index f8d8788624cc1439e0e5ba1fdc32428731417a76..43a8741d1dd2be5d75ffa3f974be46f0588eb36b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/paper-book.cc (get_system_specs): separate generation of
+       titles and systems.
+
        * flower/include/std-vector.hh: don't include config.hh
 
 2006-02-15  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index ca1de4560f66a91ee1742cb2cf694ef8223f21c2..e841c15158cde1300e73193c73c64aaa876e027e 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -25,6 +25,9 @@ class Paper_book
   SCM performances_;
 
   void add_score_title (SCM);
+  SCM get_score_title (SCM);
+  SCM get_system_specs ();
+  
 public:
   SCM header_;
   SCM header_0_;
@@ -41,6 +44,7 @@ public:
   SCM pages ();
   Stencil book_title ();
   Stencil score_title (SCM);
+  
   void classic_output (SCM output_channel);
   void output (SCM output_channel);
 };

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 8eca04af59bcefdc81e272d06c218ec93f4aed7f..c2fcf60f302bd7522c131038791380ee17508863 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -232,8 +232,9 @@ set_system_penalty (Prob *ps, SCM header)
     }
 }
 
-void
-Paper_book::add_score_title (SCM header)
+
+SCM
+Paper_book::get_score_title (SCM header)
 {
   Stencil title = score_title (header);
   if (title.is_empty ())
@@ -247,30 +248,20 @@ Paper_book::add_score_title (SCM header)
       SCM props = paper_->lookup_variable (ly_symbol2scm ("score-title-properties"));
       Prob *ps = make_paper_system (props);
       paper_system_set_stencil (ps, title);
-      
-      systems_ = scm_cons (ps->self_scm (), systems_);
-      ps->unprotect ();
       set_system_penalty (ps, header);
+
+      return ps->self_scm();
     }
-}
 
-#if  0
-SCM
-Paper_book::system_specs ()
-{
-  
+  return SCM_BOOL_F;
 }
-#endif
 
 SCM
-Paper_book::systems ()
+Paper_book::get_system_specs ()
 {
-  if (systems_ != SCM_BOOL_F)
-    return systems_;
-
-  systems_ = SCM_EOL;
+  SCM system_specs = SCM_EOL;
+  
   Stencil title = book_title ();
-
   if (!title.is_empty ())
     {
       SCM props = paper_->lookup_variable (ly_symbol2scm ("book-title-properties"));
@@ -278,7 +269,7 @@ Paper_book::systems ()
       paper_system_set_stencil (ps, title);
       set_system_penalty (ps, header_);
 
-      systems_ = scm_cons (ps->self_scm (), systems_);
+      system_specs = scm_cons (ps->self_scm (), system_specs);
       ps->unprotect ();
     }
 
@@ -299,13 +290,15 @@ Paper_book::systems ()
        {
          if (Paper_score *pscore = dynamic_cast<Paper_score *> (mop))
            {
-             add_score_title (header);
+             SCM title = get_score_title (header);
+             if (unsmob_prob (title))
+               {
+                 system_specs = scm_cons (title, system_specs);
+                 unsmob_prob (title)->unprotect ();
+               }
 
              header = SCM_EOL;
-
-             SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
-             system_list = scm_reverse (system_list);
-             systems_ = scm_append (scm_list_2 (system_list, systems_));
+             system_specs = scm_cons (pscore->self_scm (), system_specs);
            }
          else
            {
@@ -314,19 +307,6 @@ Paper_book::systems ()
              */
            }
        }
-      else if (scm_is_vector (scm_car (s)))
-       {
-         programming_error ("Vector case?");
-         /*
-           UGH. code dup.
-         */
-         add_score_title (header);
-         header = SCM_EOL;
-
-         SCM system_list = scm_vector_to_list (scm_car (s));
-         system_list = scm_reverse (system_list);
-         systems_ = scm_append (scm_list_2 (system_list, systems_));
-       }
       else if (Text_interface::is_markup (scm_car (s)))
        {
          SCM t = Text_interface::interpret_markup (paper_->self_scm (),
@@ -337,7 +317,7 @@ Paper_book::systems ()
          Prob *ps = make_paper_system (SCM_EOL);
          paper_system_set_stencil (ps, *unsmob_stencil (t));
          ps->set_property ("is-title", SCM_BOOL_T); 
-         systems_ = scm_cons (ps->self_scm (), systems_);
+         system_specs = scm_cons (ps->self_scm (), system_specs);
          ps->unprotect ();
          
          // FIXME: figure out penalty.
@@ -347,6 +327,32 @@ Paper_book::systems ()
        assert (0);
     }
 
+  system_specs = scm_reverse_x (system_specs, SCM_EOL);
+  return system_specs;
+}
+
+SCM
+Paper_book::systems ()
+{
+  if (systems_ != SCM_BOOL_F)
+    return systems_;
+
+  systems_ = SCM_EOL;
+  SCM specs = get_system_specs ();
+  for (SCM s = specs; scm_is_pair (s); s = scm_cdr (s))
+    {
+      if (Paper_score *pscore = dynamic_cast<Paper_score*> (unsmob_music_output (scm_car (s))))
+       {
+         SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
+         system_list = scm_reverse (system_list);
+         systems_ = scm_append (scm_list_2 (system_list, systems_));
+       }
+      else
+       {
+         systems_ = scm_cons (scm_car (s), systems_);
+       }
+    }
+  
   systems_ = scm_reverse (systems_);
 
   int i = 0;

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index a2af964b4b2d23b0416e7890b8f215f9ddaf8b3d..5f7e1540df1be0fa81ba6c17826cef5b50d99bda 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -115,3 +115,4 @@ Paper_score::get_paper_systems () const
 {
   return paper_systems_;
 }
+