From 991ffdcd95f4616d06ead87b894b1c837673bbf3 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:07:59 +0000 Subject: [PATCH] lilypond-0.1.57 --- .dstreamrc | 137 ++++++++++++++++++++++------------------- flower/matrix-debug.cc | 14 ++--- 2 files changed, 82 insertions(+), 69 deletions(-) diff --git a/.dstreamrc b/.dstreamrc index 82f615d66b..dedc100f50 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -5,16 +5,16 @@ Dstream 1 # yydebug InitParser 1 -Parser 0 +Parser 1 InitDeclarations 1 Declarations 1 # FlexLexer debug InitLexer 1 Lexer 1 -My_lily_lexer 0 +My_lily_lexer 1 -walking 0 +walking 1 # flower lib File_path 1 @@ -22,73 +22,86 @@ Matrix 0 Vector 0 # lily -Atom 1 -Bar 1 -Beam 1 -Change_iterator 1 -Chord 1 -Chord_iterator 1 -Clef_item 1 -Col_configuration 1 -Colinfo 1 -Colinfo 1 -Collision 1 -Engraver 1 -Engraver_group_engraver 1 -Group_change_req 1 -Head_column 1 -Idealspacing 1 +Atom 0 +Bar 0 +Beam 0 +Change_iterator 0 +Chord 0 +Chord_iterator 0 +Clef_item 0 +Col_configuration 0 +Colinfo 0 +Colinfo 0 +Collision 0 +Engraver 0 +Engraver_group_engraver 0 +Group_change_req 0 +Head_column 0 +Idealspacing 0 Ineq_constrained_qp 0 -Input_translator 1 -Item 1 -Key_item 1 -Lookup 1 -Line_spacer 1 -Melodic_req 1 -Midi_def 1 +Input_translator 0 +Item 0 +Key_item 0 +Lookup 0 +Line_spacer 0 +Melodic_req 0 +Midi_def 0 Midistrings 0 Mixed_qp 0 -Music 1 -Music_iterator 1 -Note_head 1 -Note_performer 1 -Note_req 1 +Music 0 +Music_iterator 0 +Note_head 0 +Note_performer 0 +Note_req 0 Paper_score 1 -Paper_def 1 -Performer 1 -Performer_group_performer 1 +Paper_def 0 +Performer 0 +Performer_group_performer 0 Request 0 -Request_iterator 1 -Rest_collision 1 -Rest_collision_engraver 1 -Rest_req 1 -Rhythmic_req 1 +Request_iterator 0 +Rest_collision 0 +Rest_collision_engraver 0 +Rest_req 0 +Rhythmic_req 0 Score 1 Score_column 0 Score_elem 0 -Score_engraver 1 -Score_performer 1 -Script_column 1 -Script_def 1 -Script_req 1 -Slur 1 -Spacing_problem 1 -Spanner 1 +Score_engraver 0 +Score_performer 0 +Script_column 0 +Script_def 0 +Script_req 0 +Slur 0 +Spacing_problem 0 +Spanner 0 Spring_spacer 0 -Staff 1 -Staff_commands 1 -Stem 1 -Stem 1 -Stem_req 1 -Symtable 1 -Symtables 1 +Staff 0 +Staff_commands 0 +Stem 0 +Stem 0 +Stem_req 0 +Symtable 0 +Symtables 0 -Text_def 1 -Text_req 1 -Time_description 1 -Voice 1 -Voice_iterator 1 +Text_def 0 +Text_req 0 +Time_description 0 +Voice 0 +Voice_iterator 0 Word_wrap 0 -delete_identifiers 1 -parse_duration 1 -parse_pitchmod 1 +delete_identifiers 0 +parse_duration 0 +parse_pitchmod 0 +Translator_group 0 +Translator 0 +Music_output_def 0 +Graphical_element 0 +Axis_group_administration 0 +Horizontal_align_item 0 +Single_malt_grouping_item 0 +Note_column 0 +Rhythmic_head 0 +Paper_column 0 +Paper_column 0 +Staff_symbol 0 +Column_rod 0 diff --git a/flower/matrix-debug.cc b/flower/matrix-debug.cc index 81aa05f39c..762da9e0a8 100644 --- a/flower/matrix-debug.cc +++ b/flower/matrix-debug.cc @@ -20,11 +20,11 @@ Matrix::operator String() const s=String ("matrix { (") + dat->name() + ")\n"; for (int i=0; i< rows(); i++) { - for (int j = 0; j < cols(); j++) - { - s+= String (stor_c_l->elem (i,j), "%6f "); - } - s+="\n"; + for (int j = 0; j < cols(); j++) + { + s+= String (stor_c_l->elem (i,j), "%6f "); + } + s+="\n"; } s+="}\n"; #endif @@ -44,10 +44,10 @@ Vector::operator String() const { String s; #ifndef NPRINT - s="vector ["; + s=String ("vector (") + dim () + ") ["; for (int i=0; i < dim(); i++) { - s += String (dat[i], "%6f") + String (' '); + s += String (dat[i], "%6f") + String (' '); } s+="]"; #endif -- 2.39.5