X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=4c6766c7fd0369752b33bc9a8f7b1bc463ced7c4;hb=refs%2Fheads%2Fdon%2Fdep5_copyright;hp=7d506373f32788674bf3c3fd8bc4f02720cdf33e;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 7d506373f3..4c6766c7fd 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -1,9 +1,20 @@
 /*
-  includable-lexer.cc -- implement 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/>.
 */
 
 #include "includable-lexer.hh"
@@ -71,7 +82,12 @@ Includable_lexer::new_input (string name, Sources *sources)
     state_stack_.push_back (yy_current_buffer);
 
   if (be_verbose_global)
-    progress_indication (string ("[") + file->name_string ());
+    {
+      string spaces = "";
+      for (size_t i = 0; i < state_stack_.size (); i++)
+	spaces += " ";
+      progress_indication (string ("\n") + spaces + string ("[") + file->name_string ());
+    }
 
   include_stack_.push_back (file);
 
@@ -94,12 +110,23 @@ Includable_lexer::new_input (string name, string data, Sources *sources)
     state_stack_.push_back (yy_current_buffer);
 
   if (be_verbose_global)
-    progress_indication (string ("[") + name);
+    {
+      string spaces = "";
+      for (size_t i = 0; i < state_stack_.size (); i++)
+	spaces += " ";
+      progress_indication (string ("\n") + spaces + string ("[") + name);
+    }
   include_stack_.push_back (file);
 
   yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));
 }
 
+void
+Includable_lexer::add_string_include (string data)
+{
+  pending_string_includes_.push_back (data);
+}
+
 /** pop the inputstack.  conceptually this is a destructor, but it
     does not destruct the Source_file that Includable_lexer::new_input
     creates.  */