* lily/ledger-line-spanner.cc (print): swap linear_combination

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 43b10a51de0755f053cb03c954581f9bd70799b2..391d2d51416a3fbdf1ae8e0da8070d46ba098263 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -193,7 +193,7 @@ HYPHEN              --
        progress_indication ("\n");
        progress_indication (_f ("input renamed to: `%s'", s.to_str0 ()));
        progress_indication ("\n");
-       scm_module_define (ly_car (scopes_),
+       scm_module_define (scm_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
                     scm_makfrom0str (s.to_str0()));
 
@@ -499,9 +499,9 @@ HYPHEN              --
                String str (YYText () + 1);
                SCM s = lookup_markup_command (str);
 
-               if (ly_c_pair_p (s) && ly_c_symbol_p (ly_cdr (s)) ) {
-                       yylval.scm = ly_car(s);
-                       SCM tag = ly_cdr(s);
+               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"))
@@ -676,7 +676,7 @@ void
 Lily_lexer::pop_state ()
 {
        if (YYSTATE == notes || YYSTATE == chords)
-               pitchname_tab_stack_ = ly_cdr (pitchname_tab_stack_);
+               pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
        yy_pop_state ();
 }
 
@@ -727,19 +727,19 @@ Lily_lexer::scan_bare_word (String str)
        SCM sym = ly_symbol2scm (str.to_str0 ());
        if ((YYSTATE == notes) || (YYSTATE == chords)) {
                SCM handle = SCM_BOOL_F;
-               if (ly_c_pair_p (pitchname_tab_stack_))
-                       handle = scm_hashq_get_handle (ly_car (pitchname_tab_stack_), sym);
+               if (scm_is_pair (pitchname_tab_stack_))
+                       handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym);
                
-               if (ly_c_pair_p (handle)) {
-                       yylval.scm = ly_cdr (handle);
+               if (scm_is_pair (handle)) {
+                       yylval.scm = scm_cdr (handle);
                        if (unsmob_pitch (yylval.scm)) 
                            return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-                       else if (ly_c_symbol_p (yylval.scm))
+                       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 (handle);
+                   yylval.scm = scm_cdr (handle);
                    return CHORD_MODIFIER;
                }
        }
@@ -801,7 +801,7 @@ strip_trailing_white (String&s)
 
 
 /* 2.1.2x something -> \property -> \set. */ 
-Lilypond_version oldest_version ("2.2.0");
+Lilypond_version oldest_version ("2.3.22");
 
 
 bool
@@ -922,6 +922,26 @@ music_function_type (SCM func)
        {
                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;