Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / output-def-scheme.cc

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 9e56fb79bb29c29bea919d89b143c153e1882b59..4bf03f2e13d84001138d1f0d29a6059d8b998e21 100644 (file)
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -3,27 +3,36 @@
 
   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 "font-metric.hh"
+#include "output-def.hh"
+
 #include "pango-font.hh"
 #include "modified-font-metric.hh"
-#include "output-def.hh"
 #include "ly-module.hh"
 #include "context-def.hh"
+#include "lily-parser.hh"
 
 LY_DEFINE (ly_layout_lookup, "ly:output-def-lookup",
-          2, 0, 0, (SCM pap, SCM sym),
+          2, 1, 0, (SCM pap, SCM sym, SCM def),
           "Lookup @var{sym} in @var{pap}. "
-          "Return the value or @code{'()} if undefined.")
+          "Return the value or @var{def} (which defaults to  @code{'()}) if undefined.")
 {
   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");
 
-  return op->lookup_variable (sym);
+  SCM answer = op->lookup_variable (sym);
+  if (answer == SCM_UNDEFINED)
+    {
+      if (def == SCM_UNDEFINED)
+       def = SCM_EOL;
+
+      answer = def;
+    }
+
+  return answer;
 }
 
 LY_DEFINE (ly_output_def_scope, "ly:output-def-scope",
@@ -50,9 +59,9 @@ LY_DEFINE (ly_output_def_clone, "ly:output-def-clone",
 {
   Output_def *op = unsmob_output_def (def);
   SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
-  SCM s = op->clone ()->self_scm ();
-  scm_gc_unprotect_object (s);
-  return s;
+
+  Output_def *clone = op->clone ();
+  return clone->unprotect ();
 }
 
 LY_DEFINE (ly_output_description, "ly:output-description",
@@ -60,21 +69,20 @@ LY_DEFINE (ly_output_description, "ly:output-description",
           "Return the description of translators in @var{output-def}.")
 {
   Output_def *id = unsmob_output_def (output_def);
-  
-  SCM al = ly_module2alist (id->scope_);
 
+  SCM al = ly_module2alist (id->scope_);
   SCM ell = SCM_EOL;
   for (SCM s = al; scm_is_pair (s); s = scm_cdr (s))
     {
-      Context_def * td = unsmob_context_def (scm_cdar (s));
+      Context_def *td = unsmob_context_def (scm_cdar (s));
       SCM key = scm_caar (s);
       if (td && key == td->get_context_name ())
-       ell = scm_cons (scm_cons (key, td->to_alist ()),  ell);
+       ell = scm_cons (scm_cons (key, td->to_alist ()), ell);
     }
-  return ell;  
+  return ell;
 }
 
-LY_DEFINE (ly_layout_def_p, "ly:layout-def?",
+LY_DEFINE (ly_output_def_p, "ly:output-def?",
           1, 0, 0, (SCM def),
           "Is @var{def} a layout definition?")
 {
@@ -82,20 +90,35 @@ LY_DEFINE (ly_layout_def_p, "ly:layout-def?",
 }
 
 LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
-         1, 0, 0, (SCM bp),
-         "Get outputscale for BP.")
+          1, 0, 0, (SCM bp),
+          "Get output-scale for BP.")
 {
   Output_def *b = unsmob_output_def (bp);
   SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
-  return scm_make_real (output_scale (b));
+  return scm_from_double (output_scale (b));
 }
 
+/*
+  Cannot put in scope, but need a separate function, since we don't
+  want to allow this in --safe.
+ */
+LY_DEFINE (ly_output_def_parser, "ly:output-def-parser",
+          1, 0, 0, (SCM odef),
+          "Return the parser where @var{odef} is coming from.")
+{
+  Output_def *b = unsmob_output_def (odef);
+  SCM_ASSERT_TYPE (b, odef, SCM_ARG1, __FUNCTION__, "paper");
+
+  return b->get_parser()->self_scm ();
+}
+
+
 LY_DEFINE (ly_make_output_def, "ly:make-output-def",
           0, 0, 0, (),
           "Make a output def.")
 {
-  Output_def *bp = new Output_def ;
-  return scm_gc_unprotect_object (bp->self_scm ());
+  Output_def *bp = new Output_def;
+  return bp->unprotect ();
 }
 
 LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
@@ -109,7 +132,7 @@ LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
   Output_def *paper = unsmob_output_def (paper_smob);
   SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
                   __FUNCTION__, "paper definition");
-  
+
   Font_metric *fm = select_font (paper, chain);
   return fm->self_scm ();
 }
@@ -121,7 +144,7 @@ LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,
   Output_def *layout = unsmob_output_def (layout_smob);
   SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
                   __FUNCTION__, "layout definition");
-  return scm_make_real (layout->get_dimension (name));
+  return scm_from_double (layout->get_dimension (name));
 }
 
 LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
@@ -131,7 +154,6 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
 {
   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"));
@@ -141,7 +163,7 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
   if (scm_hash_table_p (tab1) == SCM_BOOL_T)
     {
       alist1 = scm_append (ly_alist_vals (ly_hash2alist (tab1)));
-      
+
       alist1 = ly_alist_vals (alist1);
     }
 
@@ -152,7 +174,7 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
       alist2 = scm_append (ly_alist_vals (ly_hash2alist (tab2)));
 
       // strip size factors
-      alist2 = ly_alist_vals (alist2); 
+      alist2 = ly_alist_vals (alist2);
     }
 
   SCM alist = scm_append (scm_list_2 (alist1, alist2));
@@ -160,13 +182,13 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM entry = scm_car (s);
-      
+
       Font_metric *fm = unsmob_metrics (entry);
 
-      if (dynamic_cast<Modified_font_metric*> (fm)
-         || dynamic_cast<Pango_font*> (fm))
+      if (dynamic_cast<Modified_font_metric *> (fm)
+         || dynamic_cast<Pango_font *> (fm))
        font_list = scm_cons (fm->self_scm (), font_list);
     }
-  
+
   return font_list;
 }