thinko for trill-spanner

[lilypond.git] / lily / score-scheme.cc

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index ddd97e3a0dc8c58fba814ca8db2faf9c17ae9d72..c188de3704d9e1a7ea9d32d16250ad363cbe3f87 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "score.hh"
@@ -13,7 +13,6 @@
 #include "global-context.hh"
 #include "lilypond-key.hh"
 
-
 LY_DEFINE (ly_make_score, "ly:make-score",
           1, 0, 0,
           (SCM music),
@@ -21,19 +20,17 @@ LY_DEFINE (ly_make_score, "ly:make-score",
 {
   Music *mus = unsmob_music (music);
   SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
-  
+
   Score *score = new Score;
   score->set_music (music);
 
-  SCM self = score->self_scm ();
-  scm_gc_unprotect_object (self);
-  return self;
+  return score->unprotect ();
 }
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
           2, 1, 0, (SCM score, SCM layout, SCM key),
           "Run @var{score} through @var{layout}, an output definition, "
-          "scaled to correct outputscale already, "
+          "scaled to correct output-scale already, "
           "return a list of layout-lines. "
           "\nTake optional Object_key argument.")
 {
@@ -50,7 +47,7 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
 
   /* UGR, FIXME, these are default \layout blocks once again.  They
      suck. */
-  for (int i = 0; !score_def && i < sc->defs_.size (); i++)
+  for (vsize i = 0; !score_def && i < sc->defs_.size (); i++)
     if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)
       score_def = sc->defs_[i];
 
@@ -58,8 +55,7 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
     return SCM_BOOL_F;
 
   score_def = score_def->clone ();
-  SCM prot = score_def->self_scm ();
-  scm_gc_unprotect_object (prot);
+  SCM prot = score_def->unprotect ();
 
   /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
      itself. */
@@ -74,27 +70,24 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
 }
 
 LY_DEFINE (ly_score_process, "ly:score-process",
-          2, 0, 0,
+          5, 0, 0,
           (SCM score_smob,
            SCM default_header,
            SCM default_paper,
            SCM default_layout,
            SCM basename),
-          "Print score, i.e., the classic way.")
+          "Print score without page-layout: just print the systems.")
 {
   Score *score = unsmob_score (score_smob);
 
   SCM_ASSERT_TYPE (score, score_smob, SCM_ARG1, __FUNCTION__, "score");
 
-  SCM_ASSERT_TYPE (ly_is_module (default_header),
-                  default_header, SCM_ARG2, __FUNCTION__, "module");
+  // allow header to be undefined.
   SCM_ASSERT_TYPE (unsmob_output_def (default_paper),
                   default_header, SCM_ARG3, __FUNCTION__, "\\paper block");
   SCM_ASSERT_TYPE (unsmob_output_def (default_layout),
                   default_header, SCM_ARG4, __FUNCTION__, "\\layout block");
-  SCM_ASSERT_TYPE (scm_is_string (basename),
-                  default_header, SCM_ARG5, __FUNCTION__, "basename");
-  
+
   Object_key *key = new Lilypond_general_key (0, score->user_key_, 0);
 
   if (score->error_found_)
@@ -103,12 +96,12 @@ LY_DEFINE (ly_score_process, "ly:score-process",
   SCM header = ly_is_module (score->header_)
     ? score->header_
     : default_header;
-  
-  for (int i = 0; i < score->defs_.size (); i++)
+
+  for (vsize i = 0; i < score->defs_.size (); i++)
     default_rendering (score->get_music (), score->defs_[i]->self_scm (),
                       default_paper, header, basename, key->self_scm ());
 
-  if (score->defs_.is_empty ())
+  if (score->defs_.empty ())
     {
       default_rendering (score->get_music (),
                         default_layout,
@@ -116,8 +109,7 @@ LY_DEFINE (ly_score_process, "ly:score-process",
                         header, basename, key->self_scm ());
     }
 
-  scm_gc_unprotect_object (key->self_scm ());
+  key->unprotect ();
   return SCM_UNSPECIFIED;
 }
 
-