X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def-scheme.cc;h=7a44a0d0824af53de2acb6bb7621f0c1beb5b053;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e7533eed16597c2d68a1595dd16abfc660bffb97;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index e7533eed16..7a44a0d082 100644
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "output-def.hh"
@@ -14,14 +14,15 @@
 #include "context-def.hh"
 #include "lily-parser.hh"
 
-LY_DEFINE (ly_layout_lookup, "ly:output-def-lookup",
+LY_DEFINE (ly_output_def_lookup, "ly:output-def-lookup",
 	   2, 1, 0, (SCM pap, SCM sym, SCM def),
-	   "Lookup @var{sym} in @var{pap}. "
-	   "Return the value or @var{def} (which defaults to  @code{'()}) if undefined.")
+	   "Look up @var{sym} in the @var{pap} output definition"
+	   " (e.g., @code{\\paper}).  Return the value or @var{def}"
+	   " (which defaults to @code{'()}) if undefined.")
 {
+  LY_ASSERT_SMOB (Output_def, pap, 1);
   Output_def *op = unsmob_output_def (pap);
-  SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Output_def");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   SCM answer = op->lookup_variable (sym);
   if (answer == SCM_UNDEFINED)
@@ -39,26 +40,37 @@ LY_DEFINE (ly_output_def_scope, "ly:output-def-scope",
 	   1, 0, 0, (SCM def),
 	   "Get the variable scope inside @var{def}.")
 {
+  LY_ASSERT_SMOB (Output_def, def, 1);
   Output_def *op = unsmob_output_def (def);
-  SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
   return op->scope_;
 }
 
 LY_DEFINE (ly_output_def_parent, "ly:output-def-parent",
 	   1, 0, 0, (SCM def),
-	   "Get the parent output-def of @var{def}.")
+	   "Get the parent output definition of @var{def}.")
 {
+  LY_ASSERT_SMOB (Output_def, def, 1);
   Output_def *op = unsmob_output_def (def);
-  SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
   return op->parent_ ? op->parent_->self_scm () : SCM_EOL;
 }
 
+LY_DEFINE (ly_output_def_set_variable_x, "ly:output-def-set-variable!",
+           3, 0, 0, (SCM def, SCM sym, SCM val),
+           "Set an output definition @var{def} variable @var{sym} to @var{val}.")
+{
+  LY_ASSERT_SMOB (Output_def, def, 1);
+  Output_def *output_def = unsmob_output_def (def);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
+  output_def->set_variable (sym, val);
+  return SCM_UNSPECIFIED;
+}
+
 LY_DEFINE (ly_output_def_clone, "ly:output-def-clone",
 	   1, 0, 0, (SCM def),
-	   "Clone @var{def}.")
+	   "Clone output definition @var{def}.")
 {
+  LY_ASSERT_SMOB (Output_def, def, 1);
   Output_def *op = unsmob_output_def (def);
-  SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
 
   Output_def *clone = op->clone ();
   return clone->unprotect ();
@@ -70,7 +82,7 @@ LY_DEFINE (ly_output_description, "ly:output-description",
 {
   Output_def *id = unsmob_output_def (output_def);
 
-  SCM al = ly_module2alist (id->scope_);
+  SCM al = ly_module_2_alist (id->scope_);
   SCM ell = SCM_EOL;
   for (SCM s = al; scm_is_pair (s); s = scm_cdr (s))
     {
@@ -91,16 +103,16 @@ LY_DEFINE (ly_output_def_p, "ly:output-def?",
 
 LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
 	   1, 0, 0, (SCM bp),
-	   "Get output-scale for BP.")
+	   "Get output-scale for @var{bp}.")
 {
+  LY_ASSERT_SMOB (Output_def, bp, 1);
   Output_def *b = unsmob_output_def (bp);
-  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
   return scm_from_double (output_scale (b));
 }
 
 LY_DEFINE (ly_make_output_def, "ly:make-output-def",
 	   0, 0, 0, (),
-	   "Make a output def.")
+	   "Make an output definition.")
 {
   Output_def *bp = new Output_def;
   return bp->unprotect ();
@@ -108,16 +120,13 @@ LY_DEFINE (ly_make_output_def, "ly:make-output-def",
 
 LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
 	   (SCM paper_smob, SCM chain),
-
-	   "Return a font metric satisfying the font-qualifiers "
-	   "in the alist chain @var{chain}.\n"
-	   "(An alist chain is a list of alists, "
-	   "containing grob properties).\n")
+	   "Return a font metric satisfying the font-qualifiers"
+	   " in the alist chain @var{chain}.  (An alist chain is a"
+	   " list of alists, containing grob properties.)")
 {
-  Output_def *paper = unsmob_output_def (paper_smob);
-  SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
-		   __FUNCTION__, "paper definition");
+  LY_ASSERT_SMOB (Output_def, paper_smob, 1);
 
+  Output_def *paper = unsmob_output_def (paper_smob);
   Font_metric *fm = select_font (paper, chain);
   return fm->self_scm ();
 }
@@ -126,9 +135,8 @@ LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,
 	   (SCM layout_smob, SCM name),
 	   "Return the layout variable @var{name}.")
 {
+  LY_ASSERT_SMOB (Output_def, layout_smob, 1);
   Output_def *layout = unsmob_output_def (layout_smob);
-  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
-		   __FUNCTION__, "layout definition");
   return scm_from_double (layout->get_dimension (name));
 }
 
@@ -137,10 +145,9 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
 	   (SCM bp),
 	   "Return fonts from the @code{\\paper} block @var{bp}.")
 {
+  LY_ASSERT_SMOB (Output_def, bp, 1);
   Output_def *b = unsmob_output_def (bp);
 
-  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
-
   SCM tab1 = b->lookup_variable (ly_symbol2scm ("scaled-fonts"));
   SCM tab2 = b->lookup_variable (ly_symbol2scm ("pango-fonts"));