* mf/feta-bolletjes.mf (overdone_heads): cleanup triangle

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

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index e6110dad6833ffbcb85734836c74841ccb3670b5..983dbc043fe035e2cbe48e719c7d10a3a51a0725 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -6,24 +6,21 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <ctype.h>
+#include "lily-lexer.hh"
+
+#include <cctype>
 #include <sstream>
 
-#include "lily-proto.hh"
 #include "scm-hash.hh"
 #include "interval.hh"
-#include "lily-guile.hh"
 #include "parser.hh"
 #include "keyword.hh"
-#include "lily-lexer.hh"
 #include "warn.hh"
 #include "source-file.hh"
 #include "main.hh"
-#include "input.hh"
 #include "moment.hh"
 #include "ly-module.hh"
 
-
 static Keyword_ent the_key_tab[] = {
   {"accepts", ACCEPTS},
   {"addquote", ADDQUOTE},
@@ -32,7 +29,6 @@ static Keyword_ent the_key_tab[] = {
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"book", BOOK},
-  {"bookpaper", BOOKPAPER},
   {"change", CHANGE},
   {"chords", CHORDS},
   {"chordmode", CHORDMODE},
@@ -49,6 +45,7 @@ static Keyword_ent the_key_tab[] = {
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},
+  {"layout", LAYOUT},
   {"lyricmode", LYRICMODE},
   {"lyricsto", LYRICSTO},
   {"lyrics", LYRICS},
@@ -57,13 +54,13 @@ static Keyword_ent the_key_tab[] = {
   {"midi", MIDI},
   {"name", NAME},
   {"new", NEWCONTEXT},
+  {"objectid", OBJECTID},
   {"notemode", NOTEMODE},
   {"octave", OCTAVE},
   {"once", ONCE},
   {"override", OVERRIDE},
   {"paper", PAPER},
   {"partial", PARTIAL},
-  {"quote", QUOTE},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
@@ -126,7 +123,7 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src)
   for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM newmod = ly_make_anonymous_module (false);
-      ly_import_module (newmod, scm_car (s));
+      ly_module_copy (newmod, scm_car (s));
       *tail = scm_cons (newmod, SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
@@ -295,7 +292,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
 SCM
 Lily_lexer::mark_smob (SCM s)
 {
-  Lily_lexer *lexer = (Lily_lexer*) scm_cdr (s);
+  Lily_lexer *lexer = (Lily_lexer*) SCM_CELL_WORD_1 (s);
 
   scm_gc_mark (lexer->chordmodifier_tab_);
   scm_gc_mark (lexer->pitchname_tab_stack_);