* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

[lilypond.git] / lily / includable-lexer.cc

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index ff48f271aa47f8e6340a908739cd43ed06f75508..73fe726ee46edb1dfa4792128ac9c89008cca5cf 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,14 +3,14 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "includable-lexer.hh"
+
 #include <sstream>
 
 #include "config.hh"
-
-#include "includable-lexer.hh"
 #include "file-path.hh"
 #include "source-file.hh"
 #include "source.hh"
@@ -62,13 +62,13 @@ Includable_lexer::new_input (String name, Sources *sources)
       LexerError (msg.to_str0 ());
       return;
     }
-  filename_strings_.push (file->name_string ());
+  file_name_strings_.push (file->name_string ());
 
   char_count_stack_.push (0);
   if (yy_current_buffer)
     state_stack_.push (yy_current_buffer);
 
-  if (verbose_global_b)
+  if (be_verbose_global)
     progress_indication (String ("[") + name);
        
   include_stack_.push (file);
@@ -85,13 +85,13 @@ Includable_lexer::new_input (String name, String data, Sources *sources)
 {
   Source_file *file = new Source_file (name, data);
   sources->add (file);
-  filename_strings_.push (name);
+  file_name_strings_.push (name);
 
   char_count_stack_.push (0);
   if (yy_current_buffer)
     state_stack_.push (yy_current_buffer);
 
-  if (verbose_global_b)
+  if (be_verbose_global)
     progress_indication (String ("[") + name);
   include_stack_.push (file);
 
@@ -106,7 +106,7 @@ Includable_lexer::close_input ()
 {
   include_stack_.pop ();
   char_count_stack_.pop ();
-  if (verbose_global_b)
+  if (be_verbose_global)
     progress_indication ("]");
   yy_delete_buffer (yy_current_buffer);
 #if HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
@@ -138,15 +138,6 @@ Includable_lexer::~Includable_lexer ()
       close_input ();
     }
 }
-/**
-  Since we don't create the buffer state from the bytes directly, we
-  don't know about the location of the lexer. Add this as a
-  YY_USER_ACTION */
-void
-Includable_lexer::add_lexed_char (int count)
-{
-  char_count_stack_.top () += count;
-}
 
 Source_file*
 Includable_lexer::get_source_file () const