*** empty log message ***

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

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 4a1e4963631553c4ac52a314d8fb482755566dca..d8eecf3f623906944ec805ff6d6902c6832db44c 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -6,18 +6,19 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "output-def.hh"
+
 #include "context-def.hh"
 #include "file-path.hh"
 #include "global-context.hh"
 #include "interval.hh"
-#include "lily-guile.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
-#include "output-def.hh"
 #include "scm-hash.hh"
 #include "warn.hh"
 
+#include "ly-smobs.icc"
+
 Output_def::Output_def ()
 {
   scope_ = SCM_EOL;
@@ -34,16 +35,15 @@ Output_def::Output_def (Output_def const &s)
   smobify_self ();
 
   input_origin_ = s.input_origin_;
-  scope_= ly_make_anonymous_module (false);
+  scope_ = ly_make_anonymous_module (false);
   if (ly_c_module_p (s.scope_))
-    ly_import_module (scope_, s.scope_);
+    ly_module_copy (scope_, s.scope_);
 }
 
 Output_def::~Output_def ()
 {
 }
 
-#include "ly-smobs.icc"
 IMPLEMENT_SMOBS (Output_def);
 IMPLEMENT_DEFAULT_EQUAL_P (Output_def);
 
@@ -53,19 +53,13 @@ Output_def::mark_smob (SCM m)
   Output_def *mo = (Output_def*) SCM_CELL_WORD_1 (m);
 
   /* FIXME: why is this necessary?
-     all bookpaper_ should be protected by themselves. */
+     all paper_ should be protected by themselves. */
   if (mo->parent_)
     scm_gc_mark (mo->parent_->self_scm ());
 
-  mo->derived_mark ();
   return mo->scope_;
 }
 
-void
-Output_def::derived_mark ()
-{
-}
-
 void
 assign_context_def (Output_def * m, SCM transdef)
 {
@@ -131,68 +125,9 @@ Output_def::set_variable (SCM sym, SCM val)
   scm_module_define (scope_, sym, val);
 }
 
-LY_DEFINE (ly_paper_lookup, "ly:output-def-lookup",
-          2, 0, 0, (SCM pap, SCM sym),
-          "Lookup @var{sym} in @var{pap}. "
-          "Return the value or @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);
-}
-
-LY_DEFINE (ly_output_def_scope, "ly:output-def-scope",
-          1, 0, 0, (SCM def),
-          "Get the variable scope inside @var{def}.")
-{
-  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}.")
-{
-  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_clone, "ly:output-def-clone",
-          1, 0, 0, (SCM def),
-          "Clone @var{def}.")
-{
-  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;
-}
-
-LY_DEFINE (ly_output_description, "ly:output-description",
-          1, 0, 0, (SCM output_def),
-          "Return the description of translators in @var{output-def}.")
-{
-  Output_def *id = unsmob_output_def (output_def);
-  
-  SCM al = ly_module2alist (id->scope_);
-
-  SCM ell = SCM_EOL;
-  for (SCM s = al; ly_c_pair_p (s); s = ly_cdr (s))
-    {
-      Context_def * td = unsmob_context_def (ly_cdar (s));
-      SCM key = ly_caar (s);
-      if (td && key == td->get_context_name ())
-       ell = scm_cons (scm_cons (key, td->to_alist ()),  ell);
-    }
-  return ell;  
-}
   
 /* FIXME.  This is broken until we have a generic way of
-   putting lists inside the \paper block.  */
+   putting lists inside the \layout block.  */
 Interval
 line_dimensions_int (Output_def *def, int n)
 {
@@ -201,28 +136,4 @@ line_dimensions_int (Output_def *def, int n)
   return Interval (ind, lw);
 }
 
-LY_DEFINE (ly_paper_def_p, "ly:paper-def?",
-          1, 0, 0, (SCM def),
-          "Is @var{def} a paper definition?")
-{
-  return ly_bool2scm (unsmob_output_def (def));
-}
-
-LY_DEFINE (ly_bookpaper_outputscale, "ly:bookpaper-outputscale",
-         1, 0, 0, (SCM bp),
-         "Get outputscale for BP.")
-{
-  Output_def *b = unsmob_output_def (bp);
-  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "bookpaper");
-  return scm_make_real (output_scale (b));
-}
-
-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 ());
-}
-