* lily/mark-engraver.cc (stop_translation_timestep): set grob

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

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 08e378b41eb911542203fde1766fd970240f081f..fa40e5ef582a1fcd7d82665dc02ab7d3bb114db5 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -81,14 +81,12 @@ Paper_book::add_score (SCM s)
   scores_ = scm_cons (s, scores_);
 }
 
-
 void
 Paper_book::add_performance (SCM s)
 {
   performances_ = scm_cons (s, performances_);
 }
 
-
 void
 Paper_book::output (SCM output_channel)
 {
@@ -239,7 +237,7 @@ Paper_book::add_score_title (SCM header)
     {
       Paper_system *ps = new Paper_system (title, true);
       systems_ = scm_cons (ps->self_scm (), systems_);
-      scm_gc_unprotect_object (ps->self_scm ());
+      ps->unprotect ();
       set_system_penalty (ps, header);
     }
 }
@@ -259,7 +257,7 @@ Paper_book::systems ()
       set_system_penalty (ps, header_);
 
       systems_ = scm_cons (ps->self_scm (), systems_);
-      scm_gc_unprotect_object (ps->self_scm ());
+      ps->unprotect ();
     }
 
   SCM page_properties
@@ -276,14 +274,14 @@ 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);
-         
+
              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_));
@@ -298,16 +296,16 @@ Paper_book::systems ()
       else if (scm_is_vector (scm_car (s)))
        {
          /*
-           UGH. code dup.  
+           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::markup_p (scm_car (s)))
+      else if (Text_interface::is_markup (scm_car (s)))
        {
          SCM t = Text_interface::interpret_markup (paper_->self_scm (),
                                                    page_properties,
@@ -315,7 +313,7 @@ Paper_book::systems ()
          // FIXME: title=true?
          Paper_system *ps = new Paper_system (*unsmob_stencil (t), true);
          systems_ = scm_cons (ps->self_scm (), systems_);
-         scm_gc_unprotect_object (ps->self_scm ());
+         ps->unprotect ();
          // FIXME: figure out penalty.
          //set_system_penalty (ps, scores_[i].header_);
        }