* mf/GNUmakefile ($(NCSB_TTFS)): revise rule. Create

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

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 8a331e263aefe913812490e1a7c1b87af0f4f284..fb3fdba8b87446a8a3c96cb8f253225741f9f51e 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-lexer.hh"
 
 #include <cctype>
 #include <sstream>
+using namespace std;
 
 #include "scm-hash.hh"
 #include "interval.hh"
@@ -27,12 +28,10 @@ static Keyword_ent the_key_tab[]
   {"addquote", ADDQUOTE},
   {"alias", ALIAS},
   {"alternative", ALTERNATIVE},
-  {"bar", BAR},
   {"book", BOOK},
   {"change", CHANGE},
   {"chordmode", CHORDMODE},
   {"chords", CHORDS},
-  {"clef", CLEF},
   {"consists", CONSISTS},
   {"context", CONTEXT},
   {"default", DEFAULT},
@@ -72,7 +71,6 @@ static Keyword_ent the_key_tab[]
   {"set", SET},
   {"simultaneous", SIMULTANEOUS},
   {"skip", SKIP},
-  {"tag", TAG},
   {"tempo", TEMPO},
   {"time", TIME_T},
   {"times", TIMES},
@@ -144,9 +142,7 @@ Lily_lexer::add_scope (SCM module)
     start_module_ = scm_current_module ();
 
   for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
-    {
-      ly_use_module (module, scm_car (s));
-    }
+    ly_use_module (module, scm_car (s));
   scopes_ = scm_cons (module, scopes_);
 
   set_current_scope ();
@@ -269,7 +265,7 @@ Lily_lexer::escaped_char (char c) const
 Input
 Lily_lexer::here_input () const
 {
-  return Input(*lexloc);
+  return Input (*lexloc);
 }
 
 void