lilypond-0.1.10

diff --git a/lily/parser.y b/lily/parser.y
index b72857d0d2e10d183a02d1c3ea3f923f212bd44f..288d1407f1219f2c62ef0de670f282bf4111f31f 100644 (file)
--- a/lily/parser.y
+++ b/lily/parser.y
@@ -228,6 +228,8 @@ yylex(YYSTYPE *s,  void * v_l)
 
 mudela:        /* empty */
        | mudela mudela_header {
+               delete THIS->default_header_p_ ;
+               THIS->default_header_p_ = $2;
        }
        | mudela score_block {
                add_score($2);          
@@ -415,6 +417,8 @@ score_block:
                /* handle error levels. */
                $$->errorlevel_i_ = THIS->error_level_i_;
                THIS->error_level_i_ = 0;
+               if (!$$->header_p_ && THIS->default_header_p_)
+                       $$->header_p_ = new Header(*THIS->default_header_p_);
        }
        ;
 
@@ -461,6 +465,9 @@ paper_body:
        /* empty */                     {
                $$ = THIS->default_paper(); // paper / video / engrave
        }
+       | PAPER_IDENTIFIER      {
+               $$ = $1->paperdef();
+       }
        | paper_body OUTPUT STRING ';'  { $$->outfile_str_ = *$3;
                delete $3;
        }