X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-lexer.cc;h=7b77d58922b6816c55607a1d30c9c0f622ae87d1;hb=39dbc0fafd835267b23c2ea4166046d19040f281;hp=cd0c42eaa4eedf910386703de34a975ffaf43909;hpb=14ee7d1ba5ac5b0e0722ef98b7de223168f5da58;p=lilypond.git

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index cd0c42eaa4..7b77d58922 100644
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-lexer.hh"
@@ -53,6 +53,7 @@ static Keyword_ent the_key_tab[]
   {"lyricsto", LYRICSTO},
   {"mark", MARK},
   {"markup", MARKUP},
+  {"markuplines", MARKUPLINES},
   {"midi", MIDI},
   {"name", NAME},
   {"new", NEWCONTEXT},
@@ -193,11 +194,11 @@ Lily_lexer::keyword_list () const
   SCM *tail = &l;
   for (vsize i = 0; i < keytable_->table_.size (); i++)
     {
-      *tail = scm_acons (scm_makfrom0str (keytable_->table_[i].name_),
+      *tail = scm_acons (scm_from_locale_string (keytable_->table_[i].name_),
 			 scm_from_int (keytable_->table_[i].tokcode_),
 			 SCM_EOL);
 
-      tail = SCM_CDRLOC(*tail);
+      tail = SCM_CDRLOC (*tail);
     }
 
   return l;
@@ -233,7 +234,7 @@ Lily_lexer::start_main_input ()
 
   scm_module_define (scm_car (scopes_),
 		     ly_symbol2scm ("input-file-name"),
-		     scm_makfrom0str (main_input_name_.c_str ()));
+		     ly_string2scm (main_input_name_));
 }
 
 void
@@ -341,7 +342,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
 SCM
 Lily_lexer::mark_smob (SCM s)
 {
-  ASSERT_LIVE_IS_ALLOWED();
+  ASSERT_LIVE_IS_ALLOWED ();
   
   Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);