Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index cfc09af6bff4a290a2368c566a217c37aaf5339a..d0a188ab69883d77fca0c278266a74ff67f9e4ac 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MY_LILY_LEXER_HH
@@ -24,10 +24,10 @@ class Lily_lexer : public Includable_lexer
   DECLARE_SMOBS (Lily_lexer,);
 
 private:
-  int lookup_keyword (String);
-  int scan_bare_word (String);
-  SCM scan_markup_word (String);
-  int scan_escaped_word (String);
+  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;
 
@@ -35,7 +35,7 @@ private:
   SCM scopes_;
   SCM start_module_;
 public:
-  String main_input_name_;
+  string main_input_name_;
   void *lexval;
   Input *lexloc;
   bool is_main_input_;
@@ -60,12 +60,12 @@ public:
   Input here_input () const;
 
   void add_scope (SCM);
-  void set_current_scope ();
+  SCM set_current_scope ();
   SCM remove_scope ();
 
   void start_main_input ();
 
-  SCM lookup_identifier (String s);
+  SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
   void push_chord_state (SCM tab);
   void push_figuredbass_state ();