Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index fc344239868f5f9632e688e045fe10f9d9df0b67..8ef498aaec847516fe388469e4d3f9db22e25bd8 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -65,9 +65,9 @@ SCM
 dump_fields ()
 {
   SCM fields = SCM_EOL;
-  for (int i = dump_header_fieldnames_global.size (); i--;)
+  for (vsize i = dump_header_fieldnames_global.size (); i--;)
     fields
-      = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
+      = scm_cons (ly_symbol2scm (dump_header_fieldnames_global[i].c_str ()),
                  fields);
   return fields;
 }
@@ -104,9 +104,9 @@ Paper_book::output (SCM output_channel)
   if (ly_is_module (header_))
     scopes = scm_cons (header_, scopes);
 
-  String mod_nm = "scm framework-" + output_backend_global;
+  string mod_nm = "scm framework-" + output_backend_global;
 
-  SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+  SCM mod = scm_c_resolve_module (mod_nm.c_str ());
   if (make_print)
     {
       SCM func = scm_c_module_lookup (mod, "output-framework");
@@ -144,10 +144,10 @@ Paper_book::classic_output (SCM output)
   if (ly_is_module (header_0_))
     scopes = scm_cons (header_0_, scopes);
 
-  String format = output_backend_global;
-  String mod_nm = "scm framework-" + format;
+  string format = output_backend_global;
+  string mod_nm = "scm framework-" + format;
 
-  SCM mod = scm_c_resolve_module (mod_nm.to_str0 ());
+  SCM mod = scm_c_resolve_module (mod_nm.c_str ());
   SCM func = scm_c_module_lookup (mod, "output-classic-framework");
 
   func = scm_variable_ref (func);
@@ -216,7 +216,7 @@ Paper_book::score_title (SCM header)
 }
 
 void
-set_system_penalty (Paper_system *ps, SCM header)
+set_system_penalty (Prob *ps, SCM header)
 {
   if (ly_is_module (header))
     {
@@ -232,8 +232,9 @@ set_system_penalty (Paper_system *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 ())
@@ -245,29 +246,31 @@ Paper_book::add_score_title (SCM header)
        override settings from \paper {}
       */
       SCM props = paper_->lookup_variable (ly_symbol2scm ("score-title-properties"));
-      Paper_system *ps = new Paper_system (title, props);
-      systems_ = scm_cons (ps->self_scm (), systems_);
-      ps->unprotect ();
+      Prob *ps = make_paper_system (props);
+      paper_system_set_stencil (ps, title);
       set_system_penalty (ps, header);
+
+      return ps->self_scm();
     }
+
+  return SCM_BOOL_F;
 }
 
+
 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"));
-      Paper_system *ps = new Paper_system (title, props);
+      Prob *ps = make_paper_system (props);
+      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 ();
     }
 
@@ -285,17 +288,18 @@ Paper_book::systems ()
            header_0_ = header;
        }
       else if (Music_output *mop = unsmob_music_output (scm_car (s)))
-
        {
          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
            {
@@ -304,18 +308,6 @@ Paper_book::systems ()
              */
            }
        }
-      else if (scm_is_vector (scm_car (s)))
-       {
-         /*
-           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 (),
@@ -323,9 +315,10 @@ Paper_book::systems ()
                                                    scm_car (s));
          
          // TODO: init props
-         Paper_system *ps = new Paper_system (*unsmob_stencil (t), SCM_EOL);
+         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.
@@ -335,13 +328,39 @@ 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;
-  Paper_system *last = 0;
+  Prob *last = 0;
   for (SCM s = systems_; s != SCM_EOL; s = scm_cdr (s))
     {
-      Paper_system *ps = unsmob_paper_system (scm_car (s));
+      Prob *ps = unsmob_prob (scm_car (s));
       ps->set_property ("number", scm_from_int (++i));
 
       if (last