* lily/text-item.cc (text_to_molecule): new function

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

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 5acf3cc6c5c28b1cd8fd76635d8c1e2e1008e7d9..adff5283bdd037814c1ce90854c43e21b234aa01 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,8 +14,7 @@
 
 #include "string.hh"
 #include "parray.hh"
-#include "fproto.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
 
 // GIGA urg!
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -39,14 +38,14 @@ public:
   ~Includable_lexer ();
 
   /// store dependencies for Makefile stuff.
-  Array<String> filename_str_arr_;
+  Array<String> filename_strings_;
 
-  Source_file* source_file_l () const;
+  Source_file* get_source_file () const;
   void new_input (String s, Sources*);
   void new_input (String name, String data, Sources*);
 
   void add_lexed_char (int);
-  char const * here_ch_C () const;
+  char const * here_str0 () const;
 };