Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

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

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 739b4b9e7be729adeec2efea548258dbaf201f94..853704c5c98d478442499b28f2ea3ad22f367192 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "output-def.hh"
@@ -26,7 +26,6 @@
 Output_def::Output_def ()
 {
   scope_ = SCM_EOL;
-  parser_ = 0;
   parent_ = 0;
 
   smobify_self ();
@@ -38,7 +37,6 @@ Output_def::Output_def (Output_def const &s)
 {
   scope_ = SCM_EOL;
   parent_ = 0;
-  parser_ = s.parser_;
   smobify_self ();
 
   input_origin_ = s.input_origin_;
@@ -54,12 +52,6 @@ Output_def::~Output_def ()
 IMPLEMENT_SMOBS (Output_def);
 IMPLEMENT_DEFAULT_EQUAL_P (Output_def);
 
-Lily_parser *
-Output_def::get_parser () const
-{
-  return parent_ ? parent_->get_parser () : parser_;
-}
-
 SCM
 Output_def::mark_smob (SCM m)
 {
@@ -117,7 +109,7 @@ SCM
 Output_def::lookup_variable (SCM sym) const
 {
   SCM var = ly_module_lookup (scope_, sym);
-  if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF(var) != SCM_UNDEFINED)
+  if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF (var) != SCM_UNDEFINED)
     return SCM_VARIABLE_REF (var);
   
   if (parent_)