X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context-scheme.cc;h=d672178a54c3fda156dcc294ac348839596edcda;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=e4a941d8072fd031b49d25c5dc8361c146a8c595;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index e4a941d807..d672178a54 100644
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -3,8 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
 #include "cpu-timer.hh"
 #include "global-context.hh"
 #include "international.hh"
@@ -12,18 +13,19 @@
 #include "music-iterator.hh"
 #include "music-output.hh"
 #include "music.hh"
-#include "object-key.hh"
 #include "output-def.hh"
 #include "translator-group.hh"
 #include "warn.hh"
 
 LY_DEFINE (ly_format_output, "ly:format-output",
 	   1, 0, 0, (SCM context),
-	   "Given a Global context in its final state, "
-	   "process it and return the @code{Music_output} object in its final state.")
+	   "Given a global context in its final state,"
+	   " process it and return the @code{Music_output} object"
+	   " in its final state.")
 {
   Global_context *g = dynamic_cast<Global_context *> (unsmob_context (context));
-  SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
+  
+  LY_ASSERT_TYPE (unsmob_global_context, context, 1)
 
   SCM output = g->get_output ();
   progress_indication ("\n");
@@ -36,11 +38,11 @@ LY_DEFINE (ly_format_output, "ly:format-output",
 
 LY_DEFINE (ly_make_global_translator, "ly:make-global-translator",
           1, 0, 0, (SCM global),
-          "Create a translator group and connect it to the global context\n"
-          "@var{global}. The translator group is returned.")
+          "Create a translator group and connect it to the global context"
+          " @var{global}.  The translator group is returned.")
 {
   Global_context *g = dynamic_cast<Global_context *> (unsmob_context (global));
-  SCM_ASSERT_TYPE (g, global, SCM_ARG1, __FUNCTION__, "Global context");
+  LY_ASSERT_TYPE (unsmob_global_context, global, 1)
 
   Translator_group *tg = new Translator_group ();
   tg->connect_to_context (g);
@@ -50,20 +52,14 @@ LY_DEFINE (ly_make_global_translator, "ly:make-global-translator",
 }
 
 LY_DEFINE (ly_make_global_context, "ly:make-global-context",
-	   1, 1, 0, (SCM output_def, SCM key),
-	   "Set up a global interpretation context, using the output\n"
-	   "block @var{output_def}.\n"
-	   "The context is returned.\n"
-
-	   "\n\nOptionally, this routine takes an Object-key to\n"
-	   "to uniquely identify the Score block containing it.\n")
+	   1, 0, 0, (SCM output_def),
+	   "Set up a global interpretation context, using the output"
+	   " block @var{output_def}.  The context is returned.")
 {
-  Output_def *odef = unsmob_output_def (output_def);
+  LY_ASSERT_SMOB (Output_def, output_def, 1);
+  Output_def *odef = unsmob_output_def (output_def); 
 
-  SCM_ASSERT_TYPE (odef, output_def, SCM_ARG1, __FUNCTION__,
-		   "Output definition");
-
-  Global_context *glob = new Global_context (odef, unsmob_key (key));
+  Global_context *glob = new Global_context (odef);
 
   if (!glob)
     {
@@ -76,15 +72,13 @@ LY_DEFINE (ly_make_global_context, "ly:make-global-context",
 
 LY_DEFINE (ly_interpret_music_expression, "ly:interpret-music-expression",
 	   2, 0, 0, (SCM mus, SCM ctx),
-	   "Interpret the music expression @var{mus} in the\n"
-	   "global context @var{ctx}. The context is returned in its\n"
-	   "final state.\n")
+	   "Interpret the music expression @var{mus} in the global context"
+	   " @var{ctx}.  The context is returned in its final state.")
 {
-  Music *music = unsmob_music (mus);
-  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (ctx));
-  SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music");
-  SCM_ASSERT_TYPE (g, ctx, SCM_ARG2, __FUNCTION__, "Global context");
+  LY_ASSERT_SMOB (Music, mus, 1);
+  LY_ASSERT_TYPE (unsmob_global_context, ctx, 2);
 
+  Music *music = unsmob_music (mus);
   if (!music
       || !music->get_length ().to_bool ())
     {
@@ -92,6 +86,8 @@ LY_DEFINE (ly_interpret_music_expression, "ly:interpret-music-expression",
       return SCM_BOOL_F;
     }
 
+  Global_context *g = dynamic_cast<Global_context *> (unsmob_context (ctx));
+
   Cpu_timer timer;
 
   message (_ ("Interpreting music... "));
@@ -123,16 +119,19 @@ LY_DEFINE (ly_interpret_music_expression, "ly:interpret-music-expression",
 }
 
 LY_DEFINE (ly_run_translator, "ly:run-translator",
-	   2, 1, 0, (SCM mus, SCM output_def, SCM key),
-	   "Process @var{mus} according to @var{output_def}. \n"
-	   "An interpretation context is set up,\n"
-	   "and @var{mus} is interpreted with it.  \n"
-	   "The context is returned in its final state.\n"
-	   "\n\n"
-	   "Optionally, this routine takes an Object-key to\n"
-	   "to uniquely identify the Score block containing it.\n")
+	   2, 1, 0, (SCM mus, SCM output_def),
+	   "Process @var{mus} according to @var{output-def}.  An"
+	   " interpretation context is set up, and @var{mus} is"
+	   " interpreted with it.  The context is returned in its"
+	   " final state.\n"
+	   "\n"
+	   "Optionally, this routine takes an object-key to"
+	   " to uniquely identify the score block containing it.")
 {
-  SCM glob = ly_make_global_context (output_def, key);
+  LY_ASSERT_SMOB (Music, mus, 1);
+  LY_ASSERT_SMOB (Output_def, output_def, 2);
+
+  SCM glob = ly_make_global_context (output_def);
   ly_make_global_translator (glob);
   ly_interpret_music_expression (mus, glob);
   return glob;