Reviewers: ,
Message:
Neil's fix for a critical crash with markuplines.
Description:
HACK DO NOT PUSH markuplines fix (Neil)
Please review this at http://codereview.appspot.com/4160059/
Affected files:
M lily/parser.yy
Index: lily/parser.yy
diff --git a/lily/parser.yy b/lily/parser.yy
index
0bb4c152f273455dd1e02f201803e66d8eeaa685..e6a7e096ab81122cc50048addffaebf962d3d042
100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2405,7 +2405,10 @@ full_markup_list:
| MARKUPLINES
{ PARSER->lexer_->push_markup_state (); }
markup_list {
- $$ = $3;
+ if (scm_is_pair ($3))
+ $$ = $3;
+ else
+ $$ = scm_list_1 (scm_cons (ly_lily_module_constant ("null-markup"),
SCM_EOL));
PARSER->lexer_->pop_state ();
}
;
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
