(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},
{"alternative", ALTERNATIVE},
{"bar", BAR},
{"book", BOOK},
- {"bookpaper", BOOKPAPER},
{"change", CHANGE},
{"chords", CHORDS},
{"chordmode", CHORDMODE},
{"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
{"key", KEY},
+ {"layout", LAYOUT},
{"lyricmode", LYRICMODE},
{"lyricsto", LYRICSTO},
{"lyrics", LYRICS},
{"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},
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);
}
Input
Lily_lexer::here_input () const
{
- Source_file * f= get_source_file ();
+ Source_file * f = get_source_file ();
return Input (f, (char*)here_str0 ());
}