(pango_item_string_stencil): put

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

diff --git a/lily/output-def.cc b/lily/output-def.cc
index eedf75c9881e1c6a8fe775bd2fe1e2edbf820d6f..8af69976b9fda2ee66a9f48205f6090a7f94d089 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "output-def.hh"
@@ -19,6 +19,10 @@
 
 #include "ly-smobs.icc"
 
+#include "program-option.hh"
+
+#include "string-convert.hh"
+
 Output_def::Output_def ()
 {
   scope_ = SCM_EOL;
@@ -36,7 +40,7 @@ Output_def::Output_def (Output_def const &s)
 
   input_origin_ = s.input_origin_;
   scope_ = ly_make_anonymous_module (false);
-  if (ly_c_module_p (s.scope_))
+  if (ly_is_module (s.scope_))
     ly_module_copy (scope_, s.scope_);
 }
 
@@ -86,7 +90,7 @@ Output_def::print_smob (SCM s, SCM p, scm_print_state *)
 {
   Output_def * def = unsmob_output_def (s);
   scm_puts ("#< ", p);
-  scm_puts (classname (def), p);
+  scm_puts (def->class_name (), p);
   
   (void)def;
   scm_puts (">", p);
@@ -110,7 +114,7 @@ Output_def::lookup_variable (SCM sym) const
   if (parent_)
     return parent_->lookup_variable (sym);
   
-  return SCM_EOL;
+  return SCM_UNDEFINED;
 }
 
 SCM