X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=b4049350e15da715d5b6031ff4b4b258c78e33d8;hb=df56feefa28914b45532b0a31b24c304c162b497;hp=c90632a355e28a8844590da513e9ae3e6b98cf40;hpb=91ad96d55a9848ab482d0946987aaa68af76d357;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c90632a355..b4049350e1 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -1,10 +1,10 @@
 %{ // -*-Fundamental-*-
 /*
-  lexer.l -- implement the Flex lexer
+  lexer.ll -- implement the Flex lexer
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -26,24 +26,31 @@
 #include <ctype.h>
 #include <errno.h>
 
+/* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks
+   when building the actual lexer.  */
+
+#define LEXER_CC
+
 #include <iostream>
 
-#include "score.hh"
+using namespace std;
+
+#include "music-function.hh"
+#include "source-file.hh"
+#include "parse-scm.hh"
 #include "lily-guile.hh"
 #include "string.hh"
 #include "string-convert.hh"
-#include "my-lily-lexer.hh"
-#include "array.hh"
+#include "lily-lexer.hh"
 #include "interval.hh"
 #include "lily-guile.hh"
 #include "parser.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "main.hh"
-#include "musical-request.hh"
 #include "version.hh"
 #include "lilypond-input-version.hh"
-#include "translator-def.hh"
-#include "music-output-def.hh"
+#include "context-def.hh"
+#include "identifier-smob.hh"
 
 /*
 RH 7 fix (?)
@@ -53,19 +60,21 @@ RH 7 fix (?)
 void strip_trailing_white (String&);
 void strip_leading_white (String&);
 String lyric_fudge (String s);
-
-
-bool
-valid_version_b (String s);
-
+int music_function_type (SCM);
+SCM lookup_markup_command (String s);
+bool is_valid_version (String s);
 
 
 #define start_quote()	\
 	yy_push_state (quote);\
 	yylval.string = new String
 
+#define start_lyric_quote()	\
+	yy_push_state (lyric_quote);\
+	yylval.string = new String
+
 #define yylval \
-	(*(YYSTYPE*)lexval_l)
+	(*(YYSTYPE*)lexval)
 
 #define YY_USER_ACTION	add_lexed_char (YYLeng ());
 /*
@@ -76,6 +85,9 @@ LYRICS		({AA}|{TEX})[^0-9 \t\n\f]*
 
 
 SCM scan_fraction (String);
+SCM (* scm_parse_error_handler) (void *);
+
+
 
 %}
 
@@ -83,20 +95,22 @@ SCM scan_fraction (String);
 %option noyywrap
 %option nodefault
 %option debug
-%option yyclass="My_lily_lexer"
+%option yyclass="Lily_lexer"
 %option stack
 %option never-interactive 
 %option warn
 
-%x version
 %x chords
+%x figures
 %x incl
 %x lyrics
+%x lyric_quote
+%x longcomment
+%x markup 
 %x notes
-%x figures
 %x quote
-%x longcomment
-
+%x renameinput
+%x version
 
 A		[a-zA-Z]
 AA		{A}|_
@@ -110,6 +124,7 @@ WORD		{A}{AN}*
 ALPHAWORD	{A}+
 DIGIT		{N}
 UNSIGNED	{N}+
+E_UNSIGNED	\\{N}+
 FRACTION	{N}+\/{N}+
 INT		-?{UNSIGNED}
 REAL		({INT}\.{N}*)|(-?\.{N}+)
@@ -119,7 +134,8 @@ HORIZONTALWHITE		[ \t]
 BLACK		[^ \n\t\f\r]
 RESTNAME	[rs]
 NOTECOMMAND	\\{A}+
-LYRICS		({AA}|{TEX})[^0-9 \t\n\f]*
+MARKUPCOMMAND	\\({A}|[-_])+
+LYRICS		({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED		[nt\\'"]
 EXTENDER	__
 HYPHEN		--
@@ -130,17 +146,17 @@ HYPHEN		--
 	// windows-suck-suck-suck
 }
 
-<INITIAL,chords,incl,lyrics,notes,figures>{
+<INITIAL,chords,incl,markup,lyrics,notes,figures>{
   "%{"	{
 	yy_push_state (longcomment);
   }
-  %[^{\n].*\n	{
+  %[^{\n\r].*[\n\r]	{
   }
-  %[^{\n]	{ // backup rule
+  %[^{\n\r]	{ // backup rule
   }
-  %\n	{
+  %[\n\r]	{
   }
-  %[^{\n].*	{
+  %[^{\n\r].*	{
   }
   {WHITE}+ 	{
 
@@ -150,16 +166,40 @@ HYPHEN		--
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}*	{
 	yy_push_state (version);
 }
+<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*	{
+	yy_push_state (renameinput);
+}
 <version>\"[^"]*\"     { /* got the version number */
-	String s (YYText ()+1);
-	s = s.left_str (s.index_last_i ('"'));
+	String s (YYText () + 1);
+	s = s.left_string (s.index_last ('\"'));
 
 	yy_pop_state ();
-	if (!valid_version_b (s))
+	if (!is_valid_version (s))
 		return INVALID;
+
+	SCM top_scope = scm_car (scm_last_pair (scopes_));
+	scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T);
+
+}
+<renameinput>\"[^"]*\"     {
+	String s (YYText () + 1);
+	s = s.left_string (s.index_last ('\"'));
+
+	yy_pop_state();
+	this->here_input().source_file_->name_ = s;
+	progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
+	progress_indication ("\n");
+	scm_module_define (scm_car (scopes_),
+		     ly_symbol2scm ("input-file-name"),
+		     scm_makfrom0str (s.to_str0 ()));
+
 }
 <version>. 	{
-	LexerError ("No quoted string found after \\version");
+	LexerError (_ ("No quoted string found after \\version").to_str0 ());
+	yy_pop_state ();
+}
+<renameinput>. 	{
+	LexerError (_ ("No quoted string found after \\renameinput").to_str0 ());
 	yy_pop_state ();
 }
 <longcomment>{
@@ -172,7 +212,8 @@ HYPHEN		--
 		yy_pop_state ();
 	}
 	<<EOF>> 	{
-		LexerError (_ ("EOF found inside a comment").ch_C ());
+		LexerError (_ ("EOF found inside a comment").to_str0 ());
+		main_input_b_ = false;
 		if (! close_input ()) 
 		  yyterminate (); // can't move this, since it actually rets a YY_NULL
 	}
@@ -186,33 +227,33 @@ HYPHEN		--
 		main_input_b_ = true;
 	}
 	else
-		error (_ ("\\maininput disallowed outside init files"));
+		error (_ ("\\maininput not allowed outside init files"));
 }
 
 <INITIAL,chords,lyrics,figures,notes>\\include           {
 	yy_push_state (incl);
 }
-<incl>\"[^"]*\";?   { /* got the include file name */
+<incl>\"[^"]*\"   { /* got the include file name */
 	String s (YYText ()+1);
-	s = s.left_str (s.index_last_i ('"'));
+	s = s.left_string (s.index_last ('"'));
 
-	new_input (s,source_global_l);
+	new_input (s, sources_);
 	yy_pop_state ();
 }
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
+<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
 	String s = YYText () + 1;
 	strip_trailing_white (s);
-	if (s.length_i () && (s[s.length_i () - 1] == ';'))
-	  s = s.left_str (s.length_i () - 1);
+	if (s.length () && (s[s.length () - 1] == ';'))
+	  s = s.left_string (s.length () - 1);
 
 	SCM sid = lookup_identifier (s);
-	if (gh_string_p (sid)) {
-		new_input (ly_scm2string (sid), source_global_l);
+	if (scm_is_string (sid)) {
+		new_input (ly_scm2string (sid), sources_);
 		yy_pop_state ();
 	} else { 
 	    String msg (_f ("wrong or undefined identifier: `%s'", s ));
 
-	    LexerError (msg.ch_C ());
+	    LexerError (msg.to_str0 ());
 	    SCM err = scm_current_error_port ();
 	    scm_puts ("This value was found in the table: ", err);
 	    scm_display (sid, err);
@@ -224,50 +265,48 @@ HYPHEN		--
 }
 <chords,notes,figures>{RESTNAME} 	{
 	const char *s = YYText ();
-	yylval.scm = ly_str02scm (s);
+	yylval.scm = scm_makfrom0str (s);
 	return RESTNAME;
 }
 <chords,notes,figures>R		{
 	return MULTI_MEASURE_REST;
 }
-<INITIAL,chords,lyrics,notes,figures>\\\${BLACK}*{WHITE}	{
-	String s=YYText () + 2;
-	s=s.left_str (s.length_i () - 1);
-	return scan_escaped_word (s); 
-}
-<INITIAL,chords,lyrics,notes,figures>\${BLACK}*{WHITE}		{
-	String s=YYText () + 1;
-	s=s.left_str (s.length_i () - 1);
-	return scan_bare_word (s);
-}
-<INITIAL,chords,lyrics,notes,figures>\\\${BLACK}*		{ // backup rule
-	error (_("white expected"));
-	exit (1);
-}
-<INITIAL,chords,lyrics,notes,figures>\${BLACK}*		{ // backup rule
-	error (_("white expected"));
-	exit (1);
-}
-
-<INITIAL,chords,lyrics,notes,figures>#	{ //embedded scm
+<INITIAL,markup,chords,lyrics,notes,figures>#	{ //embedded scm
 	//char const* s = YYText () + 1;
-	char const* s = here_ch_C ();
+	char const* s = here_str0 ();
 	int n = 0;
-	if (main_input_b_ && safe_global_b) {
-		error (_ ("Can't evaluate Scheme in safe mode"));
-		yylval.scm =  SCM_EOL;
-		return SCM_T;
-	}
-	yylval.scm = ly_parse_scm (s, &n);
-	
-	for (int i=0; i < n; i++)
+	SCM sval = ly_parse_scm (s, &n, here_input (),
+		safe_global_b && main_input_b_);
+
+	if (sval == SCM_UNDEFINED)
+	{
+		sval = SCM_UNSPECIFIED;
+		error_level_ = 1;
+ 	}
+
+	for (int i = 0; i < n; i++)
 	{
 		yyinput ();
 	}
 	char_count_stack_.top () += n;
 
+	if (unpack_identifier (sval) != SCM_UNDEFINED)
+	{
+		yylval.scm = unpack_identifier(sval);
+		return identifier_type (yylval.scm);
+	}
+		
+	yylval.scm = sval;
 	return SCM_T;
 }
+<INITIAL,notes,lyrics>{ 
+	\<\<   {
+		return DOUBLE_ANGLE_OPEN;
+	}
+	\>\>   {
+		return DOUBLE_ANGLE_CLOSE;
+	}
+}
 <figures>{
 	_	{
 		return FIGURE_SPACE;
@@ -279,6 +318,7 @@ HYPHEN		--
 		return FIGURE_OPEN;
 	}
 }
+
 <notes,figures>{
 	{ALPHAWORD}	{
 		return scan_bare_word (YYText ());
@@ -293,14 +333,17 @@ HYPHEN		--
 	}
 
 	{DIGIT}		{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
+		yylval.i = String_convert::dec2int (String (YYText ()));
 		return DIGIT;
 	}
 	{UNSIGNED}		{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
+		yylval.i = String_convert::dec2int (String (YYText ()));
 		return UNSIGNED;
 	}
-
+	{E_UNSIGNED}	{
+		yylval.i = String_convert::dec2int (String (YYText () +1));
+		return E_UNSIGNED;
+	}
 	\" {
 		start_quote ();
 	}
@@ -311,7 +354,7 @@ HYPHEN		--
 }
 <quote>{
 	\\{ESCAPED}	{
-		*yylval.string += to_str (escaped_char (YYText ()[1]));
+		*yylval.string += to_string (escaped_char (YYText ()[1]));
 	}
 	[^\\"]+	{
 		*yylval.string += YYText ();
@@ -322,7 +365,7 @@ HYPHEN		--
 
 		/* yylval is union. Must remember STRING before setting SCM*/
 		String *sp = yylval.string;
-		yylval.scm = ly_str02scm (sp->ch_C ());
+		yylval.scm = scm_makfrom0str (sp->to_str0 ());
 		delete sp;
 		return STRING;
 	}
@@ -330,17 +373,38 @@ HYPHEN		--
 		*yylval.string += YYText ();
 	}
 }
+<lyric_quote>{
+	\\{ESCAPED}	{
+		*yylval.string += to_string (escaped_char (YYText ()[1]));
+	}
+	[^\\"]+	{
+		*yylval.string += YYText ();
+	}
+	\"	{
+
+		yy_pop_state ();
+
+		/* yylval is union. Must remember STRING before setting SCM*/
+		String *sp = yylval.string;
+		yylval.scm = scm_makfrom0str (sp->to_str0 ());
+		delete sp;
+		return LYRICS_STRING;
+	}
+	.	{
+		*yylval.string += YYText ();
+	}
+}
 
 <lyrics>{
 	\" {
-		start_quote ();
+		start_lyric_quote ();
 	}
 	{FRACTION}	{
 		yylval.scm =  scan_fraction (YYText ());
 		return FRACTION;
 	}
 	{UNSIGNED}		{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
+		yylval.i = String_convert::dec2int (String (YYText ()));
 		return UNSIGNED;
 	}
 	{NOTECOMMAND}	{
@@ -355,14 +419,14 @@ HYPHEN		--
 			return yylval.i = HYPHEN;
 		s = lyric_fudge (s);
 
-		char c = s[s.length_i () - 1];
+		char c = s[s.length () - 1];
 		if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
 			here_input ().warning (
-				_ ("Brace found at end of lyric. Did you forget a space?"));
-		yylval.scm = ly_str02scm (s.ch_C ());
+				_ ("Brace found at end of lyric.  Did you forget a space?"));
+		yylval.scm = scm_makfrom0str (s.to_str0 ());
 
 
-		return STRING;
+		return LYRICS_STRING;
 	}
 	. {
 		return YYText ()[0];
@@ -380,7 +444,7 @@ HYPHEN		--
 		return FRACTION;
 	}
 	{UNSIGNED}		{
-		yylval.i = String_convert::dec2_i (String (YYText ()));
+		yylval.i = String_convert::dec2int (String (YYText ()));
 		return UNSIGNED;
 	}
 	\" {
@@ -395,6 +459,9 @@ HYPHEN		--
 	\/\+ {
 		return CHORD_BASS;
 	}
+	\/  {
+		return CHORD_SLASH;
+	}
 	\^  {
 		return CHORD_CARET;
 	}
@@ -403,12 +470,79 @@ HYPHEN		--
 	}
 }
 
-<<EOF>> {
 
+<markup>{
+	\" {
+		start_quote ();
+	}
+	\\score {
+		return SCORE;
+	}
+	{MARKUPCOMMAND} {
+		String str (YYText () + 1);
+		SCM s = lookup_markup_command (str);
+
+		if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) {
+			yylval.scm = scm_car(s);
+			SCM tag = scm_cdr(s);
+			if (tag == ly_symbol2scm("markup0"))
+				return MARKUP_HEAD_MARKUP0;
+			if (tag == ly_symbol2scm("empty"))
+				return MARKUP_HEAD_EMPTY;
+			else if (tag == ly_symbol2scm ("markup0-markup1"))
+				return MARKUP_HEAD_MARKUP0_MARKUP1;
+			else if (tag == ly_symbol2scm ("markup-list0"))
+				return MARKUP_HEAD_LIST0;
+			else if (tag == ly_symbol2scm ("scheme0"))
+				return MARKUP_HEAD_SCM0;
+			else if (tag == ly_symbol2scm ("scheme0-scheme1"))
+				return MARKUP_HEAD_SCM0_SCM1;
+			else if (tag == ly_symbol2scm ("scheme0-markup1"))
+				return MARKUP_HEAD_SCM0_MARKUP1;
+			else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
+				return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+			else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
+				return MARKUP_HEAD_SCM0_SCM1_SCM2;
+			else {
+				programming_error ("No parser tag defined for this signature. Abort"); 
+				ly_display_scm (s);
+				assert(false);
+			}
+		} else
+			return scan_escaped_word (str);
+	}
+	[{}]	{
+		return YYText ()[0];
+	}
+	[^#{}"\\ \t\n\r\f]+ {
+		String s (YYText ()); 
+
+		char c = s[s.length () - 1];
+		/* brace open is for not confusing dumb tools.  */
+		if (c == '{' ||  c == '}')
+			here_input ().warning (
+				_ ("Brace found at end of markup.  Did you forget a space?"));
+		yylval.scm = scm_makfrom0str (s.to_str0 ());
+
+
+		return STRING;
+	}
+	.  {
+		return YYText()[0];
+	}
+}
 
-	if (! close_input ()) { 
- 	  yyterminate (); // can't move this, since it actually rets a YY_NULL
+<<EOF>> {
+	if (main_input_b_)
+	{
+		main_input_b_ = false;
+		if (!close_input ())
+ 	        /* Returns YY_NULL */
+			yyterminate ();
 	}
+	else if (!close_input ())
+ 	        /* Returns YY_NULL */
+ 	  	yyterminate ();
 }
 
 
@@ -420,18 +554,19 @@ HYPHEN		--
 }
 {REAL}		{
 	Real r;
-	int cnv=sscanf (YYText (), "%lf", &r);
+	int cnv = sscanf (YYText (), "%lf", &r);
 	assert (cnv == 1);
 
-	yylval.scm = gh_double2scm (r);
+	yylval.scm = scm_make_real (r);
 	return REAL;
 }
 
 {UNSIGNED}	{
-	yylval.i = String_convert::dec2_i (String (YYText ()));
+	yylval.i = String_convert::dec2int (String (YYText ()));
 	return UNSIGNED;
 }
 
+
 [{}]	{
 
 	return YYText ()[0];
@@ -447,7 +582,7 @@ HYPHEN		--
 }
 
 <INITIAL,lyrics,notes,figures>\\. {
-    char c= YYText ()[1];
+    char c = YYText ()[1];
 
     switch (c) {
     case '>':
@@ -468,6 +603,7 @@ HYPHEN		--
 	return E_TILDE;
     case '\\':
 	return E_BACKSLASH;
+
     default:
 	return E_CHAR;
     }
@@ -475,139 +611,146 @@ HYPHEN		--
 
 <*>.		{
 	String msg = _f ("invalid character: `%c'", YYText ()[0]);
-	LexerError (msg.ch_C ());
+	LexerError (msg.to_str0 ());
 	return YYText ()[0];
 }
 
 %%
 
 void
-My_lily_lexer::push_note_state ()
+Lily_lexer::push_chord_state (SCM tab)
 {
-	yy_push_state (notes);
+	pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
+	yy_push_state (chords);
 }
 
 void
-My_lily_lexer::push_figuredbass_state()
+Lily_lexer::push_figuredbass_state ()
 {
 	yy_push_state (figures);
 }
+
 void
-My_lily_lexer::push_chord_state ()
+Lily_lexer::push_initial_state ()
 {
-	yy_push_state (chords);
+	yy_push_state (INITIAL);
 }
 
 void
-My_lily_lexer::push_lyric_state ()
+Lily_lexer::push_lyric_state ()
 {
 	yy_push_state (lyrics);
 }
 
 void
-My_lily_lexer::pop_state ()
+Lily_lexer::push_markup_state ()
 {
+	yy_push_state (markup);
+}
+
+void
+Lily_lexer::push_note_state (SCM tab)
+{
+	pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
+	yy_push_state (notes);
+}
+
+void
+Lily_lexer::pop_state ()
+{
+	if (YYSTATE == notes || YYSTATE == chords)
+		pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
 	yy_pop_state ();
 }
 
 int
-My_lily_lexer::scan_escaped_word (String str)
+Lily_lexer::identifier_type (SCM sid)
+{
+	int k = try_special_identifiers (&yylval.scm , sid);
+	return k >= 0  ? k : SCM_IDENTIFIER;
+}
+
+
+int
+Lily_lexer::scan_escaped_word (String str)
 {
 	// use more SCM for this.
 
-	SCM sym = ly_symbol2scm (str.ch_C ());
+//	SCM sym = ly_symbol2scm (str.to_str0 ());
 
 	int l = lookup_keyword (str);
 	if (l != -1) {
 		return l;
 	}
 	SCM sid = lookup_identifier (str);
-	if (gh_string_p (sid)) {
-		yylval.scm = sid; 
-		return STRING_IDENTIFIER;
-	} else if (gh_number_p (sid)) {
-		yylval.scm = sid;
-		return NUMBER_IDENTIFIER;
-	} else if (unsmob_translator_def (sid)) {
-		yylval.scm = sid;
-		return TRANSLATOR_IDENTIFIER;
-	} else if (unsmob_score (sid)) {
-		yylval.scm =sid;
-		return SCORE_IDENTIFIER;
-	} else if (Music * mus =unsmob_music (sid)) {
-		yylval.scm = sid;
+	if (is_music_function (sid))
+	{
+		yylval.scm = get_music_function_transform (sid);
 		
-		return dynamic_cast<Request*> (mus) ? REQUEST_IDENTIFIER : MUSIC_IDENTIFIER;
-	} else if (unsmob_duration (sid)) {
-		yylval.scm = sid;
-		return DURATION_IDENTIFIER;
-	} else if (unsmob_music_output_def (sid)) {
-		yylval.scm = sid;
-		return MUSIC_OUTPUT_DEF_IDENTIFIER;
+		return music_function_type (yylval.scm);
 	}
 
-	if (sid != SCM_UNDEFINED) {
+	if (sid != SCM_UNDEFINED)
+	{
 		yylval.scm = sid;
-		return SCM_IDENTIFIER;
+		return identifier_type (sid);
 	}
 
-	if ((YYSTATE != notes) && (YYSTATE != chords)) {
-		SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-		
-		if (gh_pair_p (pitch))
-		{
-			yylval.scm = ly_cdr (pitch);
-			return NOTENAME_PITCH;
-		}
-	}
 	String msg (_f ("unknown escaped string: `\\%s'", str));	
-	LexerError (msg.ch_C ());
+	LexerError (msg.to_str0 ());
 
-	yylval.scm = ly_str02scm (str.ch_C ());
+	yylval.scm = scm_makfrom0str (str.to_str0 ());
 
 	return STRING;
 }
 
 int
-My_lily_lexer::scan_bare_word (String str)
+Lily_lexer::scan_bare_word (String str)
 {
-	SCM sym = ly_symbol2scm (str.ch_C ());
+	SCM sym = ly_symbol2scm (str.to_str0 ());
 	if ((YYSTATE == notes) || (YYSTATE == chords)) {
-		SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-		if (gh_pair_p (pitch)) {
-		    yylval.scm = ly_cdr (pitch);
-                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-		} else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+		SCM handle = SCM_BOOL_F;
+		if (scm_is_pair (pitchname_tab_stack_))
+			handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym);
+		
+		if (scm_is_pair (handle)) {
+			yylval.scm = scm_cdr (handle);
+			if (unsmob_pitch (yylval.scm)) 
+	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
+			else if (scm_is_symbol (yylval.scm))
+			    return DRUM_PITCH;
+		}
+		else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
 		{
-		    yylval.scm = ly_cdr (pitch);
-		    return CHORDMODIFIER_PITCH;
+		    yylval.scm = scm_cdr (handle);
+		    return CHORD_MODIFIER;
 		}
 	}
 
-	yylval.scm = ly_str02scm (str.ch_C ());
+	yylval.scm = scm_makfrom0str (str.to_str0 ());
 	return STRING;
 }
 
 bool
-My_lily_lexer::note_state_b () const
+Lily_lexer::is_note_state () const
 {
 	return YY_START == notes;
 }
 
 bool
-My_lily_lexer::chord_state_b () const
+Lily_lexer::is_chord_state () const
 {
 	return YY_START == chords;
 }
 
 bool
-My_lily_lexer::lyric_state_b () const
+Lily_lexer::is_lyric_state () const
 {
 	return YY_START == lyrics;
 }
 
 bool
-My_lily_lexer::figure_state_b () const
+Lily_lexer::is_figure_state () const
 {
 	return YY_START == figures;
 }
@@ -619,50 +762,53 @@ My_lily_lexer::figure_state_b () const
 void
 strip_leading_white (String&s)
 {
-	int i=0;
-	for (;  i < s.length_i (); i++) 
+	int i = 0;
+	for (;  i < s.length (); i++) 
 		if (!isspace (s[i]))
 			break;
 
-	s = s.nomid_str (0, i);
+	s = s.nomid_string (0, i);
 }
 
 void
 strip_trailing_white (String&s)
 {
-	int i=s.length_i ();	
+	int i = s.length ();	
 	while (i--) 
 		if (!isspace (s[i]))
 			break;
 
-	s = s.left_str (i+1);
+	s = s.left_string (i+1);
 }
 
 
 
-/* 1.3.146 == removal of ; */ 
-Lilypond_version oldest_version ("1.3.146");
+/* 2.1.2x something -> \property -> \set. */ 
+Lilypond_version oldest_version ("2.3.22");
 
 
 bool
-valid_version_b (String s)
+is_valid_version (String s)
 {
   Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
   Lilypond_version ver (s);
   if (! ((ver >= oldest_version) && (ver <= current)))
 	{	
-		non_fatal_error (_f ("incorrect lilypond version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
-		non_fatal_error (_ ("Consider converting the input with the convert-ly script")); 
+		non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ()));
+		non_fatal_error (_ ("Consider updating the input with the convert-ly script")); 
 		return false;
     }
   return true;
 }
 	
 
+/*
+  substitute _ and \,
+*/
 String
 lyric_fudge (String s)
 {
-  char  * chars  =s.copy_ch_p ();
+  char  * chars  = s.get_copy_str0 ();
 
   for (char * p = chars; *p ; p++)
     {
@@ -673,11 +819,11 @@ lyric_fudge (String s)
   s = String (chars);
   delete[] chars;
 
-  int i =0;	
-  if ((i=s.index_i ("\\,")) != -1)   // change "\," to TeX's "\c "
+  int i = 0;	
+  if ((i = s.index ("\\,")) != -1)   // change "\," to TeX's "\c "
     {
-      * (s.ch_l () + i + 1) = 'c';
-      s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2);
+      * (s.get_str0 () + i + 1) = 'c';
+      s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
     }
 
   return s;
@@ -689,13 +835,105 @@ Convert "NUM/DEN" into a '(NUM . DEN) cons.
 SCM
 scan_fraction (String frac)
 {
-	int i = frac.index_i ('/');
-	int l = frac.length_i ();
-	String left = frac.left_str (i);
-	String right = frac.right_str (l - i - 1);
+	int i = frac.index ('/');
+	int l = frac.length ();
+	String left = frac.left_string (i);
+	String right = frac.right_string (l - i - 1);
 
-	int n = String_convert::dec2_i (left);
-	int d = String_convert::dec2_i (right);
-	return gh_cons (gh_int2scm (n), gh_int2scm (d));
+	int n = String_convert::dec2int (left);
+	int d = String_convert::dec2int (right);
+	return scm_cons (scm_int2num (n), scm_int2num (d));
+}
+
+// Breaks for flex 2.5.31
+#if 0
+/* avoid silly flex induced gcc warnings */
+static void yy_push_state (int) {;}
+static void yy_pop_state () {;}
+static int yy_top_state () { return 0; }
+
+static void
+avoid_silly_flex_induced_gcc_warnings ()
+{
+	(void)yy_start_stack_ptr;
+	(void)yy_start_stack_depth;
+	(void)yy_start_stack;
+	yy_push_state (0);
+	yy_pop_state ();
+	yy_top_state ();
+	avoid_silly_flex_induced_gcc_warnings ();
+}
+#endif
+
+SCM
+lookup_markup_command (String s)
+{
+	SCM proc = ly_lily_module_constant ("lookup-markup-command");
+	return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
+}
+
+
+int
+music_function_type (SCM func)
+{
+	SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
+	if (type == ly_symbol2scm ("scm"))
+	{
+		return MUSIC_FUNCTION_SCM;
+	}
+	else if (type == ly_symbol2scm ("music"))
+	{
+		return MUSIC_FUNCTION_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-music"))
+	{
+		return MUSIC_FUNCTION_SCM_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-scm"))
+	{
+		return MUSIC_FUNCTION_SCM_SCM;
+	}
+	else if (type == ly_symbol2scm ("music-music"))
+	{
+		return MUSIC_FUNCTION_MUSIC_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-music-music"))
+	{
+		return MUSIC_FUNCTION_SCM_MUSIC_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-scm-music"))
+	{
+		return MUSIC_FUNCTION_SCM_SCM_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("markup"))
+	{
+		return MUSIC_FUNCTION_MARKUP;
+	}
+	else if (type == ly_symbol2scm ("markup-music"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("markup-markup"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MARKUP;
+	}
+	else if (type == ly_symbol2scm ("markup-music-music"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("markup-markup-music"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("noarg"))
+	{
+		return MUSIC_FUNCTION;
+	}
+	else
+		{
+		/* TODO: print location */
+		error ("Can not find signature for music function.");
+		}
+
+	return MUSIC_FUNCTION_SCM;
 }
-