source file of the LilyPond music typesetter
- (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <iostream>
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 "lily-lexer.hh"
+#include "context-def.hh"
+#include "identifier-smob.hh"
+#include "international.hh"
#include "interval.hh"
#include "lily-guile.hh"
-#include "parser.hh"
-#include "warn.hh"
+#include "lily-lexer.hh"
+#include "lilypond-version.hh"
#include "main.hh"
+#include "music.hh"
+#include "music-function.hh"
+#include "parse-scm.hh"
+#include "parser.hh"
+#include "source-file.hh"
+#include "std-string.hh"
+#include "string-convert.hh"
#include "version.hh"
-#include "lilypond-input-version.hh"
-#include "context-def.hh"
-#include "identifier-smob.hh"
+#include "warn.hh"
/*
RH 7 fix (?)
*/
#define isatty HORRIBLEKLUDGE
-void strip_trailing_white (String&);
-void strip_leading_white (String&);
-String lyric_fudge (String s);
-int music_function_type (SCM);
-SCM lookup_markup_command (String s);
-bool is_valid_version (String s);
+void strip_trailing_white (string&);
+void strip_leading_white (string&);
+string lyric_fudge (string s);
+SCM lookup_markup_command (string s);
+SCM lookup_markup_list_command (string s);
+bool is_valid_version (string s);
#define start_quote() \
yy_push_state (quote);\
- yylval.string = new String
+ yylval.string = new string
#define start_lyric_quote() \
yy_push_state (lyric_quote);\
- yylval.string = new String
+ yylval.string = new string
#define yylval \
(*(YYSTYPE*)lexval)
(*(YYLTYPE*)lexloc)
#define YY_USER_ACTION add_lexed_char (YYLeng ());
-/*
-LYRICS ({AA}|{TEX})[^0-9 \t\n\f]*
-*/
-
-
-SCM scan_fraction (String);
+SCM scan_fraction (string);
SCM (* scm_parse_error_handler) (void *);
%option never-interactive
%option warn
+%x extratoken
%x chords
%x figures
%x incl
%x markup
%x notes
%x quote
-%x renameinput
+%x sourcefileline
+%x sourcefilename
%x version
-A [a-zA-Z]
+A [a-zA-Z\200-\377]
AA {A}|_
N [0-9]
AN {AA}|{N}
+ANY_CHAR (.|\n)
PUNCT [?!:'`]
ACCENT \\[`'"^]
-NATIONAL [\001-\006\021-\027\031\036\200-\377]
+NATIONAL [\001-\006\021-\027\031\036]
TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL}
WORD {A}{AN}*
+DASHED_WORD {A}({AN}|-)*
+DASHED_KEY_WORD \\{DASHED_WORD}
+
+
+
ALPHAWORD {A}+
DIGIT {N}
UNSIGNED {N}+
EXTENDER __
HYPHEN --
BOM_UTF8 \357\273\277
+
%%
// windows-suck-suck-suck
}
-<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+<extratoken>{ANY_CHAR} {
+ /* Generate a token without swallowing anything */
+
+ /* First unswallow the eaten character */
+ add_lexed_char (-YYLeng ());
+ yyless (0);
+
+ /* produce requested token */
+ int type = extra_token_types_.back ();
+ extra_token_types_.pop_back ();
+ if (extra_token_types_.empty ())
+ yy_pop_state ();
+
+ return type;
+}
+
+ /* Use the trailing context feature. Otherwise, the BOM will not be
+ found if the file starts with an identifier definition. */
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8}/.* {
if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
{
- LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ());
+ LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
exit (1);
}
if (be_verbose_global)
}
}
+<INITIAL,notes,figures,chords,markup>{
+ \" {
+ start_quote ();
+ }
+}
+
<INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
yy_push_state (version);
}
-<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}* {
- yy_push_state (renameinput);
+<INITIAL,chords,lyrics,notes,figures>\\sourcefilename{WHITE}* {
+ yy_push_state (sourcefilename);
+}
+<INITIAL,chords,lyrics,notes,figures>\\sourcefileline{WHITE}* {
+ yy_push_state (sourcefileline);
}
<version>\"[^"]*\" { /* got the version number */
- String s (YYText () + 1);
- s = s.left_string (s.index_last ('\"'));
+ string s (YYText () + 1);
+ s = s.substr (0, s.rfind ('\"'));
yy_pop_state ();
+
+ SCM top_scope = scm_car (scm_last_pair (scopes_));
+ scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T);
+
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 ('\"'));
+<sourcefilename>\"[^"]*\" {
+ string s (YYText () + 1);
+ s = s.substr (0, s.rfind ('\"'));
yy_pop_state ();
this->here_input().get_source_file ()->name_ = s;
- message (_f ("Renaming input to: `%s'", s.to_str0 ()));
+ message (_f ("Renaming input to: `%s'", s.c_str ()));
progress_indication ("\n");
scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (s.to_str0 ()));
+ ly_string2scm (s));
+
+}
+
+<sourcefileline>{INT} {
+ int i;
+ sscanf (YYText (), "%d", &i);
+ yy_pop_state ();
+ this->here_input ().get_source_file ()->set_line (here_input ().start (), i);
}
+
<version>. {
- LexerError (_ ("quoted string expected after \\version").to_str0 ());
+ LexerError (_ ("quoted string expected after \\version").c_str ());
yy_pop_state ();
}
-<renameinput>. {
- LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
+<sourcefilename>. {
+ LexerError (_ ("quoted string expected after \\sourcefilename").c_str ());
+ yy_pop_state ();
+}
+<sourcefileline>. {
+ LexerError (_ ("integer expected after \\sourcefileline").c_str ());
yy_pop_state ();
}
<longcomment>{
yy_pop_state ();
}
<<EOF>> {
- LexerError (_ ("EOF found inside a comment").to_str0 ());
- is_main_input_ = false;
+ LexerError (_ ("EOF found inside a comment").c_str ());
+ is_main_input_ = false; // should be safe , can't have \include in --safe.
if (! close_input ())
yyterminate (); // can't move this, since it actually rets a YY_NULL
}
yy_push_state (incl);
}
<incl>\"[^"]*\" { /* got the include file name */
- String s (YYText ()+1);
- s = s.left_string (s.index_last ('"'));
+ string s (YYText ()+1);
+ s = s.substr (0, s.rfind ('"'));
new_input (s, sources_);
yy_pop_state ();
}
<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
- String s = YYText () + 1;
+ string s = YYText () + 1;
strip_trailing_white (s);
if (s.length () && (s[s.length () - 1] == ';'))
- s = s.left_string (s.length () - 1);
+ s = s.substr (0, s.length () - 1);
SCM sid = lookup_identifier (s);
if (scm_is_string (sid)) {
new_input (ly_scm2string (sid), sources_);
yy_pop_state ();
} else {
- String msg (_f ("wrong or undefined identifier: `%s'", s ));
+ string msg (_f ("wrong or undefined identifier: `%s'", s ));
- LexerError (msg.to_str0 ());
+ LexerError (msg.c_str ());
SCM err = scm_current_error_port ();
scm_puts ("This value was found in the table: ", err);
scm_display (sid, err);
}
<chords,notes,figures>{RESTNAME} {
char const *s = YYText ();
- yylval.scm = scm_makfrom0str (s);
+ yylval.scm = scm_from_locale_string (s);
return RESTNAME;
}
<chords,notes,figures>R {
Input hi = here_input();
hi.step_forward ();
SCM sval = ly_parse_scm (hi.start (), &n, hi,
- be_safe_global && is_main_input_);
+ be_safe_global && is_main_input_, parser_);
if (sval == SCM_UNDEFINED)
{
{
yyinput ();
}
- char_count_stack_.top () += n;
+ char_count_stack_.back () += n;
if (unpack_identifier (sval) != SCM_UNDEFINED)
{
}
yylval.scm = sval;
- return SCM_T;
+ return SCM_TOKEN;
}
<INITIAL,notes,lyrics>{
- \<\< {
+ \<\< {
return DOUBLE_ANGLE_OPEN;
}
- \>\> {
+ \>\> {
return DOUBLE_ANGLE_CLOSE;
}
}
+
+<INITIAL,notes>{
+ \< {
+ return ANGLE_OPEN;
+ }
+ \> {
+ return ANGLE_CLOSE;
+ }
+}
+
<figures>{
_ {
return FIGURE_SPACE;
}
{DIGIT} {
- yylval.i = String_convert::dec2int (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return DIGIT;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
{E_UNSIGNED} {
- yylval.i = String_convert::dec2int (String (YYText () +1));
+ yylval.i = String_convert::dec2int (string (YYText () +1));
return E_UNSIGNED;
}
- \" {
- start_quote ();
- }
-}
-
-\" {
- start_quote ();
}
-<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 STRING;
- }
- . {
- *yylval.string += YYText ();
- }
-}
-<lyric_quote>{
+<quote,lyric_quote>{
\\{ESCAPED} {
*yylval.string += to_string (escaped_char (YYText ()[1]));
}
yy_pop_state ();
/* yylval is union. Must remember STRING before setting SCM*/
- String *sp = yylval.string;
- yylval.scm = scm_makfrom0str (sp->to_str0 ());
+ string *sp = yylval.string;
+ yylval.scm = ly_string2scm (*sp);
delete sp;
- return LYRICS_STRING;
+ return is_lyric_state () ? LYRICS_STRING : STRING;
}
. {
*yylval.string += YYText ();
return FRACTION;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
{NOTECOMMAND} {
}
{LYRICS} {
/* ugr. This sux. */
- String s (YYText ());
+ string s (YYText ());
if (s == "__")
return yylval.i = EXTENDER;
if (s == "--")
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 = scm_makfrom0str (s.to_str0 ());
+ yylval.scm = ly_string2scm (s);
return LYRICS_STRING;
return FRACTION;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
- \" {
- start_quote ();
- }
- {
return CHORD_MINUS;
}
<markup>{
- \" {
- start_quote ();
- }
\\score {
return SCORE;
}
{MARKUPCOMMAND} {
- String str (YYText () + 1);
+ string str (YYText () + 1);
SCM s = lookup_markup_command (str);
-
+ SCM s2 = lookup_markup_list_command (str);
if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) {
yylval.scm = scm_car(s);
SCM tag = scm_cdr(s);
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-markup2-markup3"))
+ return MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3;
+ else if (tag == ly_symbol2scm ("scheme0-markup1-markup2"))
+ return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2;
else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
return MARKUP_HEAD_SCM0_SCM1_SCM2;
else {
ly_display_scm (s);
assert(false);
}
+ } else if (scm_is_pair (s2) && scm_is_symbol (scm_cdr (s2))) {
+ yylval.scm = scm_car(s2);
+ SCM tag = scm_cdr(s2);
+ if (tag == ly_symbol2scm("empty"))
+ return MARKUP_LIST_HEAD_EMPTY;
+ else if (tag == ly_symbol2scm ("scheme0"))
+ return MARKUP_LIST_HEAD_SCM0;
+ else if (tag == ly_symbol2scm ("markup-list0"))
+ return MARKUP_LIST_HEAD_LIST0;
+ else if (tag == ly_symbol2scm ("scheme0-markup-list1"))
+ return MARKUP_LIST_HEAD_SCM0_LIST1;
+ else if (tag == ly_symbol2scm ("scheme0-scheme1-markup-list2"))
+ return MARKUP_LIST_HEAD_SCM0_SCM1_LIST2;
+ else {
+ programming_error ("no parser tag defined for this markup list signature");
+ ly_display_scm (s);
+ assert(false);
+ }
} else
return scan_escaped_word (str);
}
return YYText ()[0];
}
[^#{}"\\ \t\n\r\f]+ {
- String s (YYText ());
+ 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 ());
+ yylval.scm = ly_string2scm (s);
return STRING;
}
}
-<<EOF>> {
+<*><<EOF>> {
if (is_main_input_)
{
- is_main_input_ = false;
+ /* 2 = init.ly + current file.
+ > because we're before closing, but is_main_input_ should
+ reflect after.
+ */
+ is_main_input_ = include_stack_.size () > 2;
if (!close_input ())
/* Returns YY_NULL */
yyterminate ();
yyterminate ();
}
+<INITIAL>{
+ {DASHED_WORD} {
+ return scan_bare_word (YYText ());
+ }
+ {DASHED_KEY_WORD} {
+ return scan_escaped_word (YYText () + 1);
+ }
+}
{WORD} {
return scan_bare_word (YYText ());
Real r;
int cnv = sscanf (YYText (), "%lf", &r);
assert (cnv == 1);
+ (void) cnv;
yylval.scm = scm_from_double (r);
return REAL;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
}
<*>. {
- String msg = _f ("invalid character: `%c'", YYText ()[0]);
- LexerError (msg.to_str0 ());
+ string msg = _f ("invalid character: `%c'", YYText ()[0]);
+ LexerError (msg.c_str ());
return YYText ()[0];
}
%%
+/* Make the lexer generate a token of the given type as the next token.
+ TODO: make it possible to define a value for the token as well */
+void
+Lily_lexer::push_extra_token (int token_type)
+{
+ if (extra_token_types_.empty ())
+ {
+ if (YY_START != extratoken)
+ hidden_state_ = YY_START;
+ yy_push_state (extratoken);
+ }
+ extra_token_types_.push_back (token_type);
+}
+
void
Lily_lexer::push_chord_state (SCM tab)
{
{
if (YYSTATE == notes || YYSTATE == chords)
pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
+
yy_pop_state ();
}
int
-Lily_lexer::scan_escaped_word (String str)
+Lily_lexer::scan_escaped_word (string str)
{
// use more SCM for this.
-// SCM sym = ly_symbol2scm (str.to_str0 ());
+// SCM sym = ly_symbol2scm (str.c_str ());
int i = lookup_keyword (str);
if (i == MARKUP && is_lyric_state ())
if (is_music_function (sid))
{
yylval.scm = get_music_function_transform (sid);
- return music_function_type (yylval.scm);
+
+ SCM s = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature"));
+ push_extra_token (EXPECT_NO_MORE_ARGS);
+ for (; scm_is_pair (s); s = scm_cdr (s))
+ {
+ if (scm_car (s) == ly_music_p_proc)
+ push_extra_token (EXPECT_MUSIC);
+ else if (scm_car (s) == ly_lily_module_constant ("markup?"))
+ push_extra_token (EXPECT_MARKUP);
+ else if (ly_is_procedure (scm_car (s)))
+ push_extra_token (EXPECT_SCM);
+ else programming_error ("Function parameter without type-checking predicate");
+ }
+ return MUSIC_FUNCTION;
}
if (sid != SCM_UNDEFINED)
return identifier_type (sid);
}
- String msg (_f ("unknown escaped string: `\\%s'", str));
- LexerError (msg.to_str0 ());
+ string msg (_f ("unknown escaped string: `\\%s'", str));
+ LexerError (msg.c_str ());
- yylval.scm = scm_makfrom0str (str.to_str0 ());
+ yylval.scm = ly_string2scm (str);
return STRING;
}
int
-Lily_lexer::scan_bare_word (String str)
+Lily_lexer::scan_bare_word (string str)
{
- SCM sym = ly_symbol2scm (str.to_str0 ());
+ SCM sym = ly_symbol2scm (str.c_str ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
SCM handle = SCM_BOOL_F;
if (scm_is_pair (pitchname_tab_stack_))
else if (scm_is_symbol (yylval.scm))
return DRUM_PITCH;
}
- else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+ else if ((YYSTATE == chords)
+ && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
{
yylval.scm = scm_cdr (handle);
return CHORD_MODIFIER;
}
}
- yylval.scm = scm_makfrom0str (str.to_str0 ());
+ yylval.scm = ly_string2scm (str);
return STRING;
}
+int
+Lily_lexer::get_state () const
+{
+ if (YY_START == extratoken)
+ return hidden_state_;
+ else
+ return YY_START;
+}
+
bool
Lily_lexer::is_note_state () const
{
- return YY_START == notes;
+ return get_state () == notes;
}
bool
Lily_lexer::is_chord_state () const
{
- return YY_START == chords;
+ return get_state () == chords;
}
bool
Lily_lexer::is_lyric_state () const
{
- return YY_START == lyrics;
+ return get_state () == lyrics;
}
bool
Lily_lexer::is_figure_state () const
{
- return YY_START == figures;
+ return get_state () == figures;
}
/*
- urg, belong to String (_convert)
+ urg, belong to string (_convert)
and should be generalised
*/
void
-strip_leading_white (String&s)
+strip_leading_white (string&s)
{
- int i = 0;
- for (; i < s.length (); i++)
+ ssize i = 0;
+ for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
- s = s.nomid_string (0, i);
+ s = s.substr (i);
}
void
-strip_trailing_white (String&s)
+strip_trailing_white (string&s)
{
- int i = s.length ();
+ ssize i = s.length ();
while (i--)
if (!isspace (s[i]))
break;
- s = s.left_string (i+1);
+ s = s.substr (0, i + 1);
}
-/* 2.1.2x something -> \property -> \set. */
-Lilypond_version oldest_version ("2.3.22");
+Lilypond_version oldest_version ("2.7.38");
bool
-is_valid_version (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)))
+ if (int (ver) < oldest_version)
{
- 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"));
+ non_fatal_error (_f ("file too old: %s (oldest supported: %s)", ver.to_string (), oldest_version.to_string ()));
+ non_fatal_error (_ ("consider updating the input with the convert-ly script"));
return false;
- }
+ }
+
+ if (ver > current)
+ {
+ non_fatal_error (_f ("program too old: %s (file requires: %s)", current.to_string (), ver.to_string ()));
+ return false;
+ }
return true;
}
/*
substitute _ and \,
*/
-String
-lyric_fudge (String s)
+string
+lyric_fudge (string s)
{
- char * chars = s.get_copy_str0 ();
+ char *chars = string_copy (s);
- for (char * p = chars; *p ; p++)
+ for (char *p = chars; *p ; p++)
{
if (*p == '_' && (p == chars || *(p-1) != '\\'))
*p = ' ';
}
- s = String (chars);
+ s = string (chars);
delete[] chars;
- int i = 0;
- if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c "
+ ssize i = 0;
+ if ((i = s.find ("\\,")) != NPOS) // change "\," to TeX's "\c "
{
- * (s.get_str0 () + i + 1) = 'c';
- s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
+ * (((char*)s.c_str ()) + i + 1) = 'c';
+ s = s.substr (0, i + 2) + " " + s.substr (i - 2);
}
return s;
Convert "NUM/DEN" into a '(NUM . DEN) cons.
*/
SCM
-scan_fraction (String frac)
+scan_fraction (string frac)
{
- int i = frac.index ('/');
- int l = frac.length ();
- String left = frac.left_string (i);
- String right = frac.right_string (l - i - 1);
+ ssize i = frac.find ('/');
+ string left = frac.substr (0, i);
+ string right = frac.substr (i + 1, (frac.length () - i + 1));
int n = String_convert::dec2int (left);
int d = String_convert::dec2int (right);
}
SCM
-lookup_markup_command (String s)
+lookup_markup_command (string s)
{
SCM proc = ly_lily_module_constant ("lookup-markup-command");
- return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
+ return scm_call_1 (proc, ly_string2scm (s));
}
-
-int
-music_function_type (SCM func)
+SCM
+lookup_markup_list_command (string s)
{
- 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 ("scm-scm-scm"))
- {
- return MUSIC_FUNCTION_SCM_SCM_SCM;
- }
- 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't find signature for music function"));
- }
-
- return MUSIC_FUNCTION_SCM;
+ SCM proc = ly_lily_module_constant ("lookup-markup-list-command");
+ return scm_call_1 (proc, ly_string2scm (s));
}
/* Shut up lexer warnings. */
projects / lilypond.git / blobdiff