Merge branch 'master' into lilypond/translation

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

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 4d4b3ac33e609d8375c17b51bad8a4a86a49a14e..2ee77b1e6dec7a0f270761362c642c37d792aaa0 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -164,6 +164,12 @@ Lily_parser::parse_string (string ly_code)
   error_level_ = error_level_ | lexer_->error_level_;
 }
 
+void
+Lily_parser::include_string (string ly_code)
+{
+  lexer_->add_string_include (ly_code);
+}
+
 void
 Lily_parser::clear ()
 {
@@ -264,7 +270,7 @@ push_paper (Lily_parser *parser, Output_def *paper)
 void
 pop_paper (Lily_parser *parser)
 {
-  if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers")))
+  if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers")))
     parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
                                     scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
 }