* The grand 2005-2006 replace.

[lilypond.git] / lily / lily-parser.cc

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 0f35e8aab97fcdc8b0423b3720c5cd889fbf03d4..00d68102e62ea38adb567c9ac65938db6f881c4e 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -23,6 +23,8 @@
 #include "source.hh"
 #include "warn.hh"
 
+#include "ly-smobs.icc"
+
 Lily_parser::Lily_parser (Sources *sources)
 {
   lexer_ = 0;
@@ -55,11 +57,6 @@ Lily_parser::~Lily_parser ()
 {
 }
 
-#include "ly-smobs.icc"
-
-IMPLEMENT_SMOBS (Lily_parser);
-IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
 
 SCM
 Lily_parser::mark_smob (SCM s)
@@ -179,10 +176,19 @@ Lily_parser::parser_error (Input const &i, String s)
   error_level_ = 1;
 }
 
-/****************************************************************/
+
+
+IMPLEMENT_SMOBS (Lily_parser);
+IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
+IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
+
+
+/****************************************************************
+  OUTPUT-DEF 
+ ****************************************************************/
 
 Output_def *
-layout (Lily_parser *parser)
+get_layout (Lily_parser *parser)
 {
   SCM id = parser->lexer_->lookup_identifier ("$defaultlayout");
   Output_def *layout = unsmob_output_def (id);