* Documentation/user/GNUmakefile

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

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index 3cc210b9589a902615971ab847c39643ecc8e2ad..e50fd7273c8a295460f8c67620ba4fc0c51cdf6b 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -3,21 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
 #define LEXER_HH
 
-#include <FlexLexer.h>
+#include "includable-lexer.hh"
 
 #include "input.hh"
-#include "dictionary.hh"
 #include "lily-proto.hh"
 #include "flower-proto.hh"
 #include "array.hh"
 #include "string.hh"
-#include "includable-lexer.hh"
 #include "duration.hh"
 #include "pitch.hh"
 #include "protected-scm.hh"
@@ -26,12 +24,12 @@ bool busy_parsing ();
 void kill_lexer ();
 void set_lexer ();
 
-/// lexer for Lilypond
+/// lexer for LilyPond
 class My_lily_lexer : public Includable_lexer 
 {
   Protected_scm scopes_;
 public:
-  String main_input_string_;
+  String main_input_name_;
   void * lexval;
   bool main_input_b_;
 
@@ -59,6 +57,7 @@ public:
 
   SCM lookup_identifier (String s);
   void push_note_state ();
+  void push_markup_state ();
   void push_figuredbass_state ();
   void push_chord_state ();
   void push_lyric_state ();
@@ -72,6 +71,7 @@ public:
 private:
   int lookup_keyword (String);
   int scan_bare_word (String);
+  SCM scan_markup_word (String);
   int scan_escaped_word (String);
   int identifier_type (SCM);
   char escaped_char (char) const;