lilypond-1.0.14

diff --git a/init/engraver.ly b/init/engraver.ly
index a310e9336c76bcdc10ee0dc06c60f4505fc235d4..be324756689ace5695f6d3a05756a56cc0aea594 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -4,7 +4,7 @@
 
 StaffContext=\translator {
        \type "Line_group_engraver_group";
-       Staff ;
+       \name Staff ;
 
 %{
        The Hara_kiri_line_group_engraver is a Line_group_engraver 
@@ -58,7 +58,7 @@ StaffContext=\translator {
 \translator{\StaffContext }
 \translator {
        \type "Line_group_engraver_group";
-       ChoirStaff;
+       \name ChoirStaff;
        \consists "Vertical_align_engraver";
        \consists "Staff_group_bar_engraver";
        \accepts "Staff";
@@ -73,7 +73,7 @@ RhythmicStaffContext=\translator{
        nolines  = "1";
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
-       RhythmicStaff;
+       \name RhythmicStaff;
        \consists "Bar_engraver";
        \consists "Time_signature_engraver";
        \consists "Staff_sym_engraver";
@@ -83,7 +83,7 @@ RhythmicStaffContext=\translator{
 VoiceContext = \translator {
        \type "Engraver_group_engraver";
        \consists "Dynamic_engraver";
-       Voice ;
+       \name Voice ;
        
        \consists "Rest_engraver";
        \consists "Dot_column_engraver";
@@ -104,7 +104,7 @@ VoiceContext = \translator {
 \translator {\VoiceContext}
 \translator {
        \type "Line_group_engraver_group";
-       GrandStaff;
+       \name GrandStaff;
        \consists "Span_bar_engraver";
        \consists "Vertical_align_engraver";
        \consists "Piano_bar_engraver";
@@ -119,7 +119,7 @@ VoiceContext = \translator {
        \consists "Span_bar_engraver";
        \consists "Vertical_align_engraver";
        \consists "Staff_group_bar_engraver";
-       StaffGroup;
+       \name StaffGroup;
        \accepts "Staff";
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
@@ -129,7 +129,7 @@ VoiceContext = \translator {
 \translator{
        \type "Line_group_engraver_group";
 
-       LyricVoice ;
+       \name LyricVoice ;
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Beam_req_swallow_translator";
@@ -138,14 +138,14 @@ VoiceContext = \translator {
 
 \translator {
        \type "Line_group_engraver_group";
-       Lyrics;
+       \name Lyrics;
        \consists "Vertical_align_engraver";
        \accepts "LyricVoice";
 }
 
 ScoreContext = \translator {
        \type Score_engraver;
-       Score;
+       \name Score;
        defaultClef = violin;
 
        \consists "Timing_engraver";
@@ -177,7 +177,7 @@ ScoreWithNumbers = \translator {
 
 \translator {
        \type "Score_engraver";
-       StupidScore;
+       \name StupidScore;
 
        \consists "Staff_sym_engraver";
 }
@@ -197,7 +197,7 @@ BarNumberingStaffContext = \translator {
 
 HaraKiriStaffContext = \translator {
        \type "Hara_kiri_line_group_engraver";
-       Staff;
+       \name Staff;
        barColumnPriority = "0";
        marginBreakPriority = "-4";
 
@@ -226,7 +226,7 @@ OrchestralPartStaffContext = \translator {
 
 OrchestralScoreContext= \translator {
        \type Score_engraver;
-       Score;
+       \name Score;
        barScriptPadding = "2.0";       % dimension \pt
        markScriptPadding = "4.0";
        barColumnPriority = "-4";

diff --git a/init/performer.ly b/init/performer.ly
index be6707238a153781375c72585b00c95bffbd76e4..105243f5c52385410776b933dfa927b2ad39e46c 100644 (file)
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -4,7 +4,7 @@
 \translator {
        \type "Staff_performer";
        \accepts Voice;
-       Staff;
+       \name Staff;
        \consists "Key_performer";
        \consists "Time_signature_performer";
 }
@@ -12,51 +12,51 @@
 \translator
 {
        \type "Performer_group_performer";
-       Thread ;
+       \name Thread ;
        \consists "Note_performer";
 }
 \translator
 {
        \type "Performer_group_performer";
        \accepts Thread;
-Voice;
+\name Voice;
 }
 \translator
 {
        \type "Performer_group_performer";
        \accepts Staff;
 
-GrandStaff;}
+\name GrandStaff;}
 
 \translator {
        \type "Performer_group_performer";
        \consists "Lyric_performer";
-LyricVoice;
+\name LyricVoice;
 }
 
 \translator{
        \type "Performer_group_performer";
-       ChoirStaff;
+       \name ChoirStaff;
        \accepts Staff;
 }
 \translator { 
        \type "Staff_performer";
        \accepts LyricVoice;
-       Lyrics;
+       \name Lyrics;
        \consists "Time_signature_performer";
 }
 \translator
 {
        \type Performer_group_performer;
 
-       StaffGroup;
+       \name StaffGroup;
        \accepts Staff;
 }
 \translator {
        \type "Score_performer";
 
 
-       Score;
+       \name Score;
        instrument = piano;
        \accepts Staff;
        \accepts GrandStaff;

diff --git a/lily/parser.yy b/lily/parser.yy
index 99af0e5ec1d7b1ea3aaf9b22dc617179007ca82a..bc323e061f969c8c011cd5c89b25975d34924f52 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -27,7 +27,7 @@
 #include "keyword.hh"
 #include "debug.hh"
 #include "parseconstruct.hh"
-#include "dimension.hh"
+#include "dimensions.hh"
 #include "identifier.hh"
 #include "command-request.hh"
 #include "musical-request.hh"
@@ -164,6 +164,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %token MM_T
 %token MUSIC
 %token MUSICAL_PITCH
+%token NAME
 %token NOTENAMES
 %token NOTES
 %token OCTAVE
@@ -369,6 +370,8 @@ add_declaration:
            $4->set_spot (THIS->pop_spot ());
        }
        ;
+
+
 simple_identifier_init: identifier_init
        ;
 identifier_init:
@@ -455,9 +458,9 @@ translator_spec_body:
                delete $4;
                $$->set_property (*$2, str);
        }
-       | translator_spec_body STRING ';' {
-               $$->type_str_ = *$2;
-               delete $2;
+       | translator_spec_body NAME STRING ';' {
+               $$->type_str_ = *$3;
+               delete $3;
        }
        | translator_spec_body CONSISTS STRING ';' {
                $$->access_Translator_group ()-> set_element (*$3, true);
@@ -561,8 +564,7 @@ paper_def_body:
                $$ = p;
        }
        | paper_def_body int '=' symtables              { // ugh, what a syntax
-               Lookup * l = ps_output_global_b ? new Ps_lookup (*$4)
-                 : new Tex_lookup (*$4);
+               Lookup * l = global_lookup_l->lookup_p (*$4);
                $$->set_lookup ($2, l);
        }
        | paper_def_body STRING '=' simple_identifier_init ';' {
@@ -1261,7 +1263,6 @@ simple_element:
                if (!THIS->lexer_p_->note_state_b ())
                        THIS->parser_error (_ ("have to be in Note mode for notes"));
                $1->set_duration (*$2);
-               int durlog_i = $2->durlog_i_;
                $$ = THIS->get_note_element ($1, $2);
        }
        | RESTNAME notemode_duration            {
@@ -1401,14 +1402,14 @@ symtable_body:
        ;
 
 symboldef:
-       STRING  box             {
-               $$ = new Atom (*$1, *$2);
+       STRING unsigned box             {
+               $$ = global_lookup_l->atom_p (*$1, $2, *$3);
                delete $1;
-               delete $2;
+               delete $3;
        }
-       | STRING {
+       | STRING unsigned {
                Box b (Interval (0,0), Interval (0,0));
-               $$ = new Atom (*$1, b);
+               $$ = global_lookup_l->atom_p (*$1, $2, b);
                delete $1;
        }
        ;