resolve merge

[lilypond.git] / lily / include / includable-lexer.hh

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 150c4d5c626c28007d2d559687c99379c7e7a791..a7ca04ca24cffff02a12349047444a6dccc447c9 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -1,9 +1,20 @@
 /*
-  includable-lexer.hh -- declare Includable_lexer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef INCLUDABLE_LEXER_HH
@@ -31,6 +42,7 @@ protected:
   bool close_input ();
   vector<Source_file*> include_stack_;
   vector<int> char_count_stack_;
+  vector<string> pending_string_includes_;
 
 public:
 
@@ -45,6 +57,7 @@ public:
   virtual void new_input (string s, Sources *);
   
   void new_input (string name, string data, Sources *);
+  void add_string_include (string data);
   
   char const *here_str0 () const;
 };