]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-0.0.77.jcn1
authorfred <fred>
Sun, 24 Mar 2002 19:49:03 +0000 (19:49 +0000)
committerfred <fred>
Sun, 24 Mar 2002 19:49:03 +0000 (19:49 +0000)
81 files changed:
.dstreamrc
flower/.version
flower/full-storage.cc
lily/bar-grav.cc
lily/bar.cc
lily/beam.cc
lily/bow.cc
lily/break-align-item.cc
lily/clef-grav.cc
lily/clef-item.cc
lily/collision-grav.cc
lily/collision.cc
lily/command-request.cc
lily/crescendo.cc
lily/dynamic-grav.cc
lily/elem-group-item.cc
lily/elem-group.cc
lily/engraver.cc
lily/general-script-def.cc
lily/global-translator.cc
lily/head-column.cc
lily/head-grav.cc
lily/horizontal-align-item.cc
lily/include/midi-item.hh
lily/include/request.hh
lily/include/score-elem-info.hh
lily/item.cc
lily/key-grav.cc
lily/key-item.cc
lily/local-key-grav.cc
lily/local-key-item.cc
lily/lyric-grav.cc
lily/meter-grav.cc
lily/meter.cc
lily/midi-item.cc
lily/music.cc
lily/musical-request.cc
lily/note-column-grav.cc
lily/note-column.cc
lily/notehead.cc
lily/request.cc
lily/rest-collision-grav.cc
lily/rest-collision.cc
lily/rest-column.cc
lily/score-elem-info.cc
lily/score-elem.cc
lily/score-halign-grav.cc
lily/scoreline.cc
lily/script-column.cc
lily/script-def.cc
lily/script-grav.cc
lily/script.cc
lily/slur-grav.cc
lily/slur.cc
lily/span-bar-grav.cc
lily/span-bar.cc
lily/span-score-bar-grav.cc
lily/span-score-bar.cc
lily/spanner-elem-group.cc
lily/spanner.cc
lily/staff-side.cc
lily/staff-sym-grav.cc
lily/staff-sym.cc
lily/staffline.cc
lily/stem-beam-grav.cc
lily/stem.cc
lily/super-elem.cc
lily/swallow-grav.cc
lily/swallow-perf.cc
lily/text-def.cc
lily/text-grav.cc
lily/text-item.cc
lily/text-spanner.cc
lily/tie-grav.cc
lily/tie.cc
lily/translator.cc
lily/vertical-align-elem.cc
lily/vertical-align-grav.cc
lily/vertical-align-spanner.cc
lily/voice-group-gravs.cc
lily/voice-group-performer.cc

index fbad82a93c56ec8d6ac7780ad08c07da623c8880..0bf620df03cf9a9fbd476c2c727d9483192ed1ed 100644 (file)
@@ -1,21 +1,6 @@
 # class name           silence?
 Dstream                        1
 
-File_path              1
-My_lily_lexer          1
-PCol                   0
-Score_column           0
-Script_column          0
-# E l b e ment? search/replace typo.
-# Yeah. kind of. Looks cute though
-Elbement_group         1
-Ineq_constrained_qp    1
-Spacing_problem        1
-Colinfo                        1
-Mixed_qp               1
-PScore                 1
-Idealspacing           0
-
 # yydebug
 InitParser             1
 Parser                 1
@@ -26,64 +11,81 @@ InitLexer           1
 Lexer                  1
 Matrix                 1
 
-parse_duration         1
-parse_pitchmod         1
-Col_configuration      1
-Request                        1
-Note_req               1
-Rhythmic_req           1
-Rest_req               1
-delete_identifiers     1
-Command                        1
-Staff_commands         1
-Stem                   1
-Staff                  1
-Score                  1
-Voice                  1
-Voice_element          1
-Spanner                        1
+
+
 Atom                   1
+Bar                    1
+Beam                   1
 Change_iterator                1
+Chord                  0
 Chord_iterator         1
-Music_iterator         1
-Request_iterator       1
-Score_performer                0
-Voice_element_iterator  1
-Voice_iterator         1
-Chord                  1
-Collision              1
-Rest_collision         1
-Stem                   1
-Key_item               1
 Clef_item              1
-Bar                    1
-Slur                   1
-Music                  1
-Paper_def              1
-Lookup                 1
-Input_translator       0
-Score_elem             1
-Item                   1
-Note_head              1
+Col_configuration      1
+Colinfo                        1
+Colinfo                        1
+Collision              1
+Command                        1
+
+# E l b e ment? search/replace typo.
+# Yeah. kind of. Looks cute though
+Elbement_group         1
 Engraver               1
-Rest_collision_engraver 1
-Score_engraver         0
 Engraver_group_engraver 1
-Time_description       1
-Melodic_req            1
+File_path              1
+Group_change_req       1
+Head_column            1
+Idealspacing           0
+Ineq_constrained_qp    1
+Input_translator       0
+Item                   1
+Key_item               1
+Lookup                 1
+Melodic_req            0
 Midi_def               1
+Mixed_qp               1
+Music                  0
+Music_iterator         1
+My_lily_lexer          1
+Note_head              1
 Note_performer         0
+Note_req               0
+PCol                   0
+PScore                 1
+Paper_def              1
+Paperdef               1
 Performer              0
-Stem_req               1
-Group_change_req       1
-Script_req             1
-Colinfo                        1
-Word_wrap              1
-Text_req               1
+Request                        0
+Request_iterator       1
+Rest_collision         1
+Rest_collision_engraver 1
+Rest_req               1
+Rhythmic_req           0
+Score                  1
+Score_column           0
+Score_elem             1
+Score_engraver         0
+Score_performer                0
+Script_column          0
 Script_def             0
-Text_def               0
-Paperdef               1
+Script_req             0
+Slur                   1
+Spacing_problem        1
+Spanner                        1
+Staff                  1
+Staff_commands         1
+Stem                   1
+Stem                   1
+Stem_req               1
 Symtable               1
 Symtables              1
-Beam                   1
-Head_column            1
+Text_def               0
+Text_req               0
+Time_description       1
+Voice                  0
+Voice_element          0
+Voice_element_iterator  1
+Voice_iterator         1
+Word_wrap              1
+delete_identifiers     1
+parse_duration         1
+parse_pitchmod         1
index a6d093ed4165d226761615c9b874702525d1a390..6214501523e8d6967e71259a2b7b307ae549e09a 100644 (file)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 1
-PATCH_LEVEL = 22
+PATCH_LEVEL = 23
 # use to send patches, always empty for released version:
 MY_PATCH_LEVEL = # include separator: "-1" or ".a"
 #
index 0a7bf4efbe508967cc771153e8057243855a9b49..1b5c05a392c6d19721128d9f369b583e4d091c21 100644 (file)
@@ -211,7 +211,5 @@ Full_storage::try_right_multiply(Matrix_storage * dest, Matrix_storage const * r
     
     
 }
-IMPLEMENT_STATIC_NAME(Full_storage);
-IMPLEMENT_STATIC_NAME(Matrix_storage);
 IMPLEMENT_IS_TYPE_B(Matrix_storage);
 IMPLEMENT_IS_TYPE_B1(Full_storage,Matrix_storage);
index 8bcfd80ce727217abde1d8a1c84cabc09e4e81cf..3362ce00245b059eb3a1a56765dc465a99f475f6 100644 (file)
@@ -67,7 +67,7 @@ Bar_engraver::do_post_move_processing()
     bar_p_ =0;
 }
 
-IMPLEMENT_STATIC_NAME(Bar_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Bar_engraver,Engraver);
 ADD_THIS_ENGRAVER(Bar_engraver);
 
index b4364e6cd5eb4bde634ce27a30be63bb2a0e941b..b45d977b2625914282ed1c060376f8e64d84ccdf 100644 (file)
@@ -20,7 +20,7 @@ Bar::Bar()
 }
 
 
-IMPLEMENT_STATIC_NAME(Bar);
+
 IMPLEMENT_IS_TYPE_B1(Bar,Item);
 
 void
index d09eb627f115df578a15e1974ff978f4b3a0eaf2..9079d277ba292c8f90b7189377b3ceb07af1be11 100644 (file)
@@ -370,7 +370,7 @@ Beam::brew_molecule_p() const
     return mol_p;
 }
 
-IMPLEMENT_STATIC_NAME(Beam);
+
 IMPLEMENT_IS_TYPE_B1(Beam, Spanner);
 
 void
index de9269b2e45fb8085e3d6ebdf1cdb750a9ca25e1..46707624af26701f6b3dce61f1d6d756832fcf12 100644 (file)
@@ -55,5 +55,5 @@ Bow::brew_molecule_p() const
     return output;
 }
 
-IMPLEMENT_STATIC_NAME(Bow);
+
 IMPLEMENT_IS_TYPE_B1(Bow,Directional_spanner);
index 14ff34118bf470222d8a81e53cc776b0ee252dbb..d3c9e5df79ee8e567de1f2980b6a88414c4cc2a9 100644 (file)
@@ -15,5 +15,5 @@ Break_align_item::do_pre_processing()
     align_i_ = break_status_i();
     Horizontal_align_item::do_pre_processing();
 }
-IMPLEMENT_STATIC_NAME(Break_align_item);
+
 IMPLEMENT_IS_TYPE_B1(Break_align_item, Horizontal_align_item);
index 5f7ad85a8cc466bb0159a6f2259433fb756682f9..e7126456e2d8830fc9f2610508c99dfdafbdf5e5 100644 (file)
@@ -123,6 +123,6 @@ Clef_engraver::do_removal_processing()
     clef_p_ =0;
 }
 
-IMPLEMENT_STATIC_NAME(Clef_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Clef_engraver,Engraver);
 ADD_THIS_ENGRAVER(Clef_engraver);
index 7e399f37c32e3c7dba5287d68a99415d0130cb3c..15cc5687b21786cd60e0c38665d81a9ff78f246f 100644 (file)
@@ -63,5 +63,5 @@ Clef_item::brew_molecule_p()const
     return output;
 }
 
-IMPLEMENT_STATIC_NAME(Clef_item);
+
 IMPLEMENT_IS_TYPE_B1(Clef_item,Item);
index 1cb0295a8bba4b5ec5dd3f50ce2b6dd70780c6dc..2a4903d10518cc72127d769d39c03e3a8ce5bd26 100644 (file)
@@ -35,6 +35,6 @@ Collision_engraver::Collision_engraver()
     col_p_ =0;
 }
 
-IMPLEMENT_STATIC_NAME(Collision_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Collision_engraver,Engraver);
 ADD_THIS_ENGRAVER(Collision_engraver);
index 7ba6c4c601bc19d9a7cf50910c7f4600a62441e2..f9a15bc4fa4a11615a42c022e713fa9c8dc1e197 100644 (file)
@@ -140,7 +140,7 @@ Collision::do_pre_processing()
     }
 }
 
-IMPLEMENT_STATIC_NAME(Collision);
+
 IMPLEMENT_IS_TYPE_B1(Collision, Item);
 
 void
index a9539e28f7a6db3e933494f72bf38c43deb5af48..0d44ccbd351e657f09c53a0dafe0259183282ee3 100644 (file)
 void
 Command_script_req::do_print() const
 {}
-IMPLEMENT_STATIC_NAME(Command_script_req);
+
 IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req);
 
-IMPLEMENT_STATIC_NAME(Cadenza_req);
+
 IMPLEMENT_IS_TYPE_B1(Cadenza_req, Timing_req);
 
 void
@@ -38,7 +38,7 @@ Bar_req::compare(Bar_req const &c1)const
     return type_str_ == c1.type_str_;
 }
 
-IMPLEMENT_STATIC_NAME(Bar_req);
+
 IMPLEMENT_IS_TYPE_B1(Bar_req,Command_req);
 
 void
@@ -58,33 +58,33 @@ Partial_measure_req::Partial_measure_req(Moment m)
 }
 /* *************** */
 
-IMPLEMENT_STATIC_NAME(Timing_req);
+
 IMPLEMENT_IS_TYPE_B1(Timing_req,Command_req);
 
 void
 Timing_req::do_print()const{}
 
-IMPLEMENT_STATIC_NAME(Command_req);
+
 IMPLEMENT_IS_TYPE_B1(Command_req,Request);
 
 void
 Command_req::do_print()const{}
 
 IMPLEMENT_IS_TYPE_B1(Disallow_break_req,Command_req);
-IMPLEMENT_STATIC_NAME(Disallow_break_req);
+
 void
 Disallow_break_req::do_print()const
 {
 }
 /* *************** */
-IMPLEMENT_STATIC_NAME(Barcheck_req);
+
 IMPLEMENT_IS_TYPE_B1(Barcheck_req,Timing_req);
 
 void
 Barcheck_req::do_print() const{}
 
 /* *************** */
-IMPLEMENT_STATIC_NAME(Clef_change_req);
+
 IMPLEMENT_IS_TYPE_B1(Clef_change_req,Command_req);
 
 void
@@ -100,7 +100,7 @@ Clef_change_req::Clef_change_req(String s)
     clef_str_ = s;
 }
 /* *************** */
-IMPLEMENT_STATIC_NAME(Group_feature_req);
+
 IMPLEMENT_IS_TYPE_B1(Group_feature_req,Command_req);
 
 void
@@ -113,7 +113,7 @@ Group_feature_req::do_print() const
 
 /* *************** */
 
-IMPLEMENT_STATIC_NAME(Partial_measure_req);
+
 IMPLEMENT_IS_TYPE_B1(Partial_measure_req,Timing_req);
 
 void
@@ -122,7 +122,7 @@ Partial_measure_req::do_print() const
     mtor << duration_;
 }
 
-IMPLEMENT_STATIC_NAME(Meter_change_req);
+
 IMPLEMENT_IS_TYPE_B1(Meter_change_req,Timing_req);
 
 void
@@ -152,7 +152,7 @@ Meter_change_req::set(int b,int o)
 
 /* *************** */
 
-IMPLEMENT_STATIC_NAME(Measure_grouping_req);
+
 IMPLEMENT_IS_TYPE_B1(Measure_grouping_req,Timing_req);
 
 void
@@ -173,7 +173,7 @@ Key_change_req::transpose(Melodic_req const & d)const
     }
 }
 
-IMPLEMENT_STATIC_NAME(Key_change_req);
+
 IMPLEMENT_IS_TYPE_B1(Key_change_req,Command_req);
 void
 Key_change_req::squash_octaves()
index 1b25d8439f1b8c831fab6a295017527343806a02..8de7d68759930576ece02c093a996097dfd6319d 100644 (file)
@@ -64,5 +64,5 @@ Crescendo::brew_molecule_p() const
     return m_p;
 }
 
-IMPLEMENT_STATIC_NAME(Crescendo);
+
 IMPLEMENT_IS_TYPE_B1(Crescendo,Spanner);
index 09673c240dc9d9a9580c436a8cf7f90eb1e33e98..8f99590581b991f38b20ef74db08dda47344f5a0 100644 (file)
@@ -116,7 +116,7 @@ Dynamic_engraver::set_feature(Feature i)
        dir_i_ = i.value_;
 }
 
-IMPLEMENT_STATIC_NAME(Dynamic_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Dynamic_engraver,Engraver);
 ADD_THIS_ENGRAVER(Dynamic_engraver);
 
index 2c174c63796a38b74c36fbb07a8c3b4d247863b5..c1903ffcd065d0909a1ea1dae77079b7b4b6a84a 100644 (file)
@@ -14,8 +14,8 @@ Horizontal_vertical_group_item::do_print()const
 {
     Horizontal_vertical_group::do_print();
 }
-IMPLEMENT_STATIC_NAME(Horizontal_vertical_group_item);
+
 IMPLEMENT_IS_TYPE_B2(Horizontal_vertical_group_item,Horizontal_vertical_group,Item);
     
 IMPLEMENT_IS_TYPE_B2(Horizontal_group_item, Horizontal_group, Item);
-IMPLEMENT_STATIC_NAME(Horizontal_group_item);
+
index 1bf661a27140846c11cd1d2c3eb325258b67adf2..e60570ed6655816847ce467bc0d003bde50e330a 100644 (file)
@@ -36,10 +36,10 @@ Horizontal_group::do_width()const
     return r;
 }
 
-IMPLEMENT_STATIC_NAME(Horizontal_group);
+
 IMPLEMENT_IS_TYPE_B1(Horizontal_group, Elbement_group);
 IMPLEMENT_IS_TYPE_B1(Vertical_group, Elbement_group);
-IMPLEMENT_STATIC_NAME(Vertical_group);
+
 
 void
 Elbement_group::add_element(Score_elem*i_l)
@@ -80,7 +80,7 @@ Vertical_group::translate_y(Real y)
        elem_l_arr_[i]->translate_y(y);
 }
 
-IMPLEMENT_STATIC_NAME(Elbement_group);
+
 IMPLEMENT_IS_TYPE_B1(Elbement_group, Score_elem);
 
 void
@@ -148,7 +148,7 @@ Elbement_group::Elbement_group()
 }
 
 IMPLEMENT_IS_TYPE_B2(Horizontal_vertical_group, Horizontal_group, Vertical_group);
-IMPLEMENT_STATIC_NAME(Horizontal_vertical_group);
+
 
 Horizontal_vertical_group::Horizontal_vertical_group()
 {
index 54518e6daf01b6e4005e1eed946760abbeca818f..4dea919ecaedf486bfb7156f74c7a25182c45aa7 100644 (file)
@@ -125,7 +125,7 @@ Engraver::print() const
 #endif
 }
 
-IMPLEMENT_STATIC_NAME(Engraver);
+
 IMPLEMENT_IS_TYPE_B(Engraver);
 
 void
index 688e9cdd36c933c537b60eb8cca3b07f4c042dfc..9bf570e5b8a2d9725a91bcbc7fb17aa6585b1749 100644 (file)
@@ -67,5 +67,5 @@ General_script_def::get_atom(Paper_def*, int)const
     Symbol s;
     return Atom(s);
 }
-IMPLEMENT_STATIC_NAME(General_script_def);
+
 IMPLEMENT_IS_TYPE_B(General_script_def);
index d53bc4eb6d9d25639b49992624244d797ea1d7a3..78fa0a0ff7a93925df3f02130222150c8b7feea5 100644 (file)
@@ -68,5 +68,5 @@ Global_translator::prepare(Moment)
 {
 }
 
-IMPLEMENT_STATIC_NAME(Global_translator);
+
 IMPLEMENT_IS_TYPE_B1(Global_translator, Translator);
index 4a50701e63e6b1c63cf3bfaf845b06abaa00dd95..d08519a8913e06b81a8880794556262b68630323 100644 (file)
@@ -47,7 +47,7 @@ Head_column::add(Note_head *n_l)
 }
 
 
-IMPLEMENT_STATIC_NAME(Head_column);
+
 IMPLEMENT_IS_TYPE_B1(Head_column,Script_column);
 
 void
index f3bca5172139e5aebde907a1c58f0a3044cca798..952f6d867073f430403791de50c565d922e432e9 100644 (file)
@@ -64,6 +64,6 @@ Note_head_engraver::do_post_move_processing()
     note_req_l_ = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Note_head_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Note_head_engraver,Engraver);
 ADD_THIS_ENGRAVER(Note_head_engraver);
index 46e2b67ee281949162becc55861f52ec6d3e1fd8..972b52f8e0812f0472f6b5a177d6e37bbcdf2501 100644 (file)
@@ -8,7 +8,7 @@
 
 #include "horizontal-align-item.hh"
 
-IMPLEMENT_STATIC_NAME(Horizontal_align_item);
+
 IMPLEMENT_IS_TYPE_B1(Horizontal_align_item,Item);
 
 
index 2467318e463a780ab8758b7220bf7b9779293494..b8e1a6b8b4c08c38a6e495ec2d600838b0b2a2a5 100644 (file)
@@ -9,57 +9,57 @@
 #include "lily-proto.hh"
 
 struct Midi_item {
-    /* *************** */
     static String i2varint_str( int i );
     virtual void output_midi( Midi_stream& midi_stream_r ) const;
     virtual String str() const = 0;
+    NAME_MEMBERS();
 };
 
 struct Midi_key : public Midi_item {
-       Midi_key( int accidentals_i, int minor_i );
-       
-       virtual String str() const;
+    Midi_key( int accidentals_i, int minor_i );
        
-       int accidentals_i_;
-       int minor_i_;
+    virtual String str() const;
+    NAME_MEMBERS();
+    /* *************** */
+    int accidentals_i_;
+    int minor_i_;
 };
 
 struct Midi_note : public Midi_item {
-    /* *************** */
-    int const c0_pitch_i_c_ = 60;
-    Byte dynamic_byte_;
-
     /**
       Generate a note-event on a channel pitch.
 
       @param #melreq_l# is the pitch. 
      */
     Midi_note( Melodic_req* melreq_l, int channel_i, bool on_b );
-
+    NAME_MEMBERS();
     virtual String str() const;
 
+    /* *************** */
+    int const c0_pitch_i_c_ = 60;
+    Byte dynamic_byte_;
+
     int channel_i_;
     int on_b_;
     int pitch_i_;
 };
 
 struct Midi_duration : public Midi_item {
-    /* *************** */
     Midi_duration( Real seconds_f );
 
     virtual String str() const;
-
+    NAME_MEMBERS();
+    /* *************** */
     Real seconds_f_;
 };
 
 struct Midi_chunk : Midi_item {
-    /* *************** */
     Midi_chunk();
 
     void add( String str );
     void set( String header_str, String data_str, String footer_str );
     virtual String str() const;
-
+    NAME_MEMBERS();
 private:
     String data_str_;
     String footer_str_;
@@ -69,46 +69,52 @@ private:
 struct Midi_header : Midi_chunk {
     /* *************** */
     Midi_header( int format_i, int tracks_i, int clocks_per_4_i );
+    NAME_MEMBERS();
 };
 
 struct Midi_text : Midi_item {
+    
+    enum Type { 
+       TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
+       MARKER, CUE_POINT
+    };
+    Midi_text( Midi_text::Type type, String text_str );
+    NAME_MEMBERS();
+    virtual String str() const;
     /* *************** */
-       enum Type { 
-               TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
-               MARKER, CUE_POINT
-       };
-       Midi_text( Midi_text::Type type, String text_str );
-
-       virtual String str() const;
-
-       Type type_;
-       String text_str_;
+    Type type_;
+    String text_str_;
+    
 };
 
 struct Midi_tempo : Midi_item {
-    /* *************** */
     Midi_tempo( int per_minute_4_i );
+    NAME_MEMBERS();
 
     virtual String str() const;
+    /* *************** */
 
     int per_minute_4_i_;
 };
 
 struct Midi_time : Midi_item {
-    /* *************** */
+
     Midi_time( int num_i, int den_i, int clocks_per_1_i );
+    NAME_MEMBERS();
 
     virtual String str() const;
 
+    /* *************** */
     int num_i_;
     int den_i_;
     int clocks_per_1_i_;
 };
 
 struct Midi_track : Midi_chunk {
-    /* *************** */
     int number_i_;
-    Midi_track( int number_i );
+    /* *************** */
+    Midi_track( );
+    NAME_MEMBERS();
 
     void add( int delta_time_i, String event );
 //     void add( Moment delta_time_moment, Midi_item& mitem_r );
index 62d5e73e8ca39b4f5a2e132b6fe8e64e0b9a897f..f130120cf67b4648f81d4508a3c968c614e47dc6 100644 (file)
@@ -24,7 +24,6 @@
 class Request : public Music {
 
 public:
-    Voice  * voice_l();
     
     /* *************** */
 
@@ -33,7 +32,6 @@ public:
     NAME_MEMBERS();
     VIRTUAL_COPY_CONS(Request,Music);
     
-    void print()const ;
     virtual MInterval time_int() const;
     virtual void transpose(Melodic_req const &){}
     virtual Moment duration() const { return 0; }
index 6b97718562df71e813599de2df13ed2ac605e693..05c1413ddfbeaddd5737d0148f27b63f97d87ddc 100644 (file)
@@ -18,7 +18,6 @@
 struct Score_elem_info {
     Score_elem * elem_l_;
     Request*req_l_;
-    Voice const * voice_l_;
     Array<Engraver*> origin_grav_l_arr_;
 
     /* *** */
index ab0290db9f4fd2f5e61aff3024152212f3abf7c4..7919a3ec35ce8baca840bd02f1c04a83b6c5eb13 100644 (file)
@@ -18,7 +18,7 @@ Item::Item()
        = broken_to_a_[1]=0;
 }
 
-IMPLEMENT_STATIC_NAME(Item);
+
 IMPLEMENT_IS_TYPE_B1(Item, Score_elem);
 
 void
index ba07441885f6c58b429ae5fc448f56de6b896a8a..84288bd1012dc75d57cdcfe1c32acfc5c4aac600 100644 (file)
@@ -111,6 +111,6 @@ Key_engraver::do_post_move_processing()
     default_key_b_ = false;
 }
 
-IMPLEMENT_STATIC_NAME(Key_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Key_engraver,Engraver);
 ADD_THIS_ENGRAVER(Key_engraver);
index ae15a9532491e2528490cf3e5085b5dc3060d0e0..aa8401e005e520b8b744464bf772888afa6edace 100644 (file)
@@ -71,7 +71,7 @@ Key_item::brew_molecule_p()const
     }
     return output;
 }
-IMPLEMENT_STATIC_NAME(Key_item);
+
 IMPLEMENT_IS_TYPE_B1(Key_item,Item);
 
 void 
index 4c10dc50b65642b148b7e66ca9b66cffa26cc547..78fbae299214cc5eb5220371f8cf9ad22aa39c50 100644 (file)
@@ -103,6 +103,6 @@ Local_key_engraver::do_process_requests()
     }
 }
 
-IMPLEMENT_STATIC_NAME(Local_key_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Local_key_engraver,Engraver);
 ADD_THIS_ENGRAVER(Local_key_engraver);
index 439f24f9fef15390b7269e1f93b11cc1a69cc559..50f870c1cfe9b1f2b353d5ffe7907c3df742135f 100644 (file)
@@ -104,7 +104,7 @@ Local_acc::compare(Local_acc&a, Local_acc&b)
     
     return a.accidental_i_ - b.accidental_i_;
 };
-IMPLEMENT_STATIC_NAME(Local_key_item);
+
 IMPLEMENT_IS_TYPE_B1(Local_key_item,Item);
 
 void
index 08c81723a0e8f5e1b6dd67d2336933852cb5be46..0ba2ae489676a30fcd5cce11a4b8f8bd1b5e551b 100644 (file)
@@ -55,6 +55,6 @@ Lyric_engraver::do_pre_move_processing()
     }
 }
 
-IMPLEMENT_STATIC_NAME(Lyric_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
 ADD_THIS_ENGRAVER(Lyric_engraver);
index 28397bb198a764fccce5c89a6af3811f499a8336..3112f1855620fa498dd83758c26ae705d6036e93 100644 (file)
@@ -121,6 +121,6 @@ Meter_engraver::do_post_move_processing()
     time_.add( get_staff_info().when()  - time_.when_ );
 }
 
-IMPLEMENT_STATIC_NAME(Meter_engraver);
+
 ADD_THIS_ENGRAVER(Meter_engraver);
 IMPLEMENT_IS_TYPE_B1(Meter_engraver,Engraver); 
index d56bc338697818d12e686db80ef42a3777175e03..e578cef5fe498b0f832ab0950756c62715032cdc 100644 (file)
@@ -16,6 +16,6 @@ Meter::brew_molecule_p()const
     return new Molecule(Atom(s));
 }
 
-IMPLEMENT_STATIC_NAME(Meter);
+
 
 IMPLEMENT_IS_TYPE_B1(Meter,Item);
index 404f06b5ca5b103829854ede06f4a8c986b6c039..2efb36aff1057f6c4e19ae3e37399da1780c1655 100644 (file)
@@ -1,9 +1,10 @@
-//
-// midiitem.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-item.cc -- implement various midi items.
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
 
 #include <limits.h>
 #include "proto.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
 
+
+IMPLEMENT_IS_TYPE_B(Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_key,Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_note, Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_duration, Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_chunk, Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_header, Midi_chunk);
+IMPLEMENT_IS_TYPE_B1(Midi_text, Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_tempo, Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_time, Midi_item);
+IMPLEMENT_IS_TYPE_B1(Midi_track, Midi_chunk);
+
 Midi_chunk::Midi_chunk()
 {
 }
@@ -195,7 +208,7 @@ Midi_text::str() const
        return str;
 }
 
-Midi_track::Midi_track( int number_i )
+Midi_track::Midi_track( )
 {
 //                4D 54 72 6B     MTrk
 //                00 00 00 3B     chunk length (59)
@@ -211,7 +224,7 @@ Midi_track::Midi_track( int number_i )
 //         mi = 0:  major key
 //         mi = 1:  minor key
 
-    number_i_ = number_i;
+    number_i_ = 0;
        
     char const* data_ch_C = ""
 //        "00" "ff58" "0404" "0218" "08"
index ca55e559ecc3023e121e5c25a7d805fac960cf50..f42394b9e6ef8d1a36224a79e0fcaaa84b2fb11c 100644 (file)
@@ -42,7 +42,7 @@ Music::do_print()const
 {
 }
 
-IMPLEMENT_STATIC_NAME(Music);
+
 IMPLEMENT_IS_TYPE_B(Music);
 
 
@@ -54,4 +54,4 @@ Music::Music()
 }
 
 IMPLEMENT_IS_TYPE_B1(Change_reg,Music)
-IMPLEMENT_STATIC_NAME(Change_reg);
+
index 396870dd36a8effed905a614fa9ad7be9b150cfa..0d14c09c386ad81f67dabcddc7e4dbc651dd7614 100644 (file)
@@ -13,7 +13,7 @@
 #include "text-def.hh"
 #include "music-list.hh"
 
-IMPLEMENT_STATIC_NAME(Stem_req);
+
 IMPLEMENT_IS_TYPE_B1(Stem_req,Rhythmic_req);
 
 void
@@ -31,7 +31,7 @@ Stem_req::Stem_req()
 }
 
 /* ************** */
-IMPLEMENT_STATIC_NAME(Musical_req);
+
 IMPLEMENT_IS_TYPE_B1(Musical_req,Request);
 void
 Musical_req::do_print()const{}
@@ -43,7 +43,7 @@ Tie_req::do_print()const{}
    
 
 
-IMPLEMENT_STATIC_NAME(Span_req);
+
 IMPLEMENT_IS_TYPE_B1(Span_req,Musical_req);
 
 void
@@ -60,7 +60,7 @@ Spacing_req::Spacing_req()
     distance = 0;
     strength = 0;
 }
-IMPLEMENT_STATIC_NAME(Spacing_req);
+
 IMPLEMENT_IS_TYPE_B1(Spacing_req,Request);
 
 void
@@ -71,7 +71,7 @@ Spacing_req::do_print()const
 #endif
 }
 
-IMPLEMENT_STATIC_NAME(Blank_req);
+
 IMPLEMENT_IS_TYPE_B2(Blank_req,Spacing_req,Rhythmic_req);
 
 void
@@ -107,7 +107,7 @@ Melodic_req::transpose(Melodic_req const & delta)
     }
 }
 
-IMPLEMENT_STATIC_NAME(Melodic_req);
+
 IMPLEMENT_IS_TYPE_B1(Melodic_req,Musical_req);
 
 int
@@ -164,7 +164,7 @@ Rhythmic_req::Rhythmic_req()
 {
 }
 
-IMPLEMENT_STATIC_NAME(Rhythmic_req);
+
 IMPLEMENT_IS_TYPE_B1(Rhythmic_req,Musical_req);
 
 void
@@ -189,7 +189,7 @@ Lyric_req::Lyric_req(Text_def* def_p)
     dir_i_ = -1;               // lyrics below (invisible) staff
 }
 
-IMPLEMENT_STATIC_NAME(Lyric_req);
+
 IMPLEMENT_IS_TYPE_B2(Lyric_req,Musical_req,Rhythmic_req);
 
 void
@@ -204,7 +204,7 @@ Note_req::Note_req()
 {
     forceacc_b_ = false;
 }
-IMPLEMENT_STATIC_NAME(Note_req);
+
 IMPLEMENT_IS_TYPE_B2(Note_req,Melodic_req,Rhythmic_req);
 
 void
@@ -219,7 +219,7 @@ Note_req::do_print() const
 #endif
 }
 /* *************** */
-IMPLEMENT_STATIC_NAME(Rest_req);
+
 IMPLEMENT_IS_TYPE_B1(Rest_req,Rhythmic_req);
 
 void
@@ -233,12 +233,12 @@ Beam_req::Beam_req()
 {
     nplet = 0;
 }
-IMPLEMENT_STATIC_NAME(Beam_req);
+
 IMPLEMENT_IS_TYPE_B1(Beam_req,Span_req);
 void
 Beam_req::do_print()const{}
 /* *************** */
-IMPLEMENT_STATIC_NAME(Slur_req);
+
 IMPLEMENT_IS_TYPE_B1(Slur_req,Span_req);
 void
 Slur_req::do_print()const{}
@@ -274,7 +274,7 @@ Script_req::Script_req()
     scriptdef_p_ = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Script_req);
+
 IMPLEMENT_IS_TYPE_B1(Script_req,Request);
 
 void
@@ -292,7 +292,7 @@ Musical_script_req::do_print() const
     Script_req::do_print();
 }
 
-IMPLEMENT_STATIC_NAME(Musical_script_req);
+
 IMPLEMENT_IS_TYPE_B2(Musical_script_req,Musical_req, Script_req);
 
 
@@ -326,7 +326,7 @@ Text_req::Text_req(int dir_i, Text_def* tdef_p)
     tdef_p_ = tdef_p;
 }
 
-IMPLEMENT_STATIC_NAME(Text_req);
+
 IMPLEMENT_IS_TYPE_B1(Text_req,Musical_req);
 
 void
@@ -341,7 +341,7 @@ Text_req::do_print() const
 
 /* *************** */
 
-IMPLEMENT_STATIC_NAME(Skip_req);
+
 IMPLEMENT_IS_TYPE_B1(Skip_req,Musical_req);
 
 void
@@ -353,17 +353,8 @@ Skip_req::do_print() const
 #endif
 }
 
-Voice *
-Request::voice_l()
-{
-    if (!parent_music_l_)
-       return 0;
-    else
-       return (Voice*)parent_music_l_;
-}
-/* *************** */
 
-IMPLEMENT_STATIC_NAME(Dynamic_req);
+
 IMPLEMENT_IS_TYPE_B1(Dynamic_req,Musical_req);
 
 void
@@ -372,7 +363,7 @@ Dynamic_req::do_print() const
     Musical_req::do_print();
 }
 
-IMPLEMENT_STATIC_NAME(Absolute_dynamic_req);
+
 IMPLEMENT_IS_TYPE_B1(Absolute_dynamic_req,Musical_req);
 
 void
@@ -412,7 +403,7 @@ Span_dynamic_req::Span_dynamic_req()
     dynamic_dir_i_  = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Span_dynamic_req);
+
 IMPLEMENT_IS_TYPE_B1(Span_dynamic_req,Musical_req);
 
 void
@@ -424,7 +415,7 @@ Span_dynamic_req::do_print()const
 #endif
 }
 
-IMPLEMENT_STATIC_NAME(Tie_req);
+
 IMPLEMENT_IS_TYPE_B1(Tie_req,Musical_req);
 
 
index 3cf96d2575c811f50f29cfa076a9e070f8772c58..67614565588c115f2457835906209d1539022192 100644 (file)
@@ -130,6 +130,6 @@ Note_column_engraver::Note_column_engraver()
     do_post_move_processing();
 }
 
-IMPLEMENT_STATIC_NAME(Note_column_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Note_column_engraver,Engraver);
 ADD_THIS_ENGRAVER(Note_column_engraver);
index 8d7d7f7e2b8dcf5cc48a56b7b24837e0354b0211..e3bb6b1f524d6afe2b90ffca1908e6e4b32bcf56 100644 (file)
@@ -11,7 +11,7 @@
 #include "note-head.hh"
 #include "stem.hh"
 
-IMPLEMENT_STATIC_NAME(Note_column);
+
 IMPLEMENT_IS_TYPE_B1(Note_column,Head_column);
 
 void
index bd7fa443edbb9934488e2ccf84f4659f93dc496a..48b6b7ba6d16641a59b7fb6cf282f8afc95ebe41 100644 (file)
@@ -63,7 +63,7 @@ Note_head::set_rhythmic(Rhythmic_req*r_req_l)
     dots_i_ = r_req_l->duration_.dots_i_;
 }
     
-IMPLEMENT_STATIC_NAME(Note_head);
+
 IMPLEMENT_IS_TYPE_B1(Note_head,Item);
 
 void
index 545abcef838464869baeb43ae727092578ffaa79..15a90ca6e3de3f4f00320b3b4c45a0e3a627378a 100644 (file)
@@ -1,7 +1,15 @@
+/*
+  request.cc -- implement Request
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #include "request.hh"
 #include "debug.hh"
 
-IMPLEMENT_STATIC_NAME(Request);
+
 IMPLEMENT_IS_TYPE_B1(Request,Music);
 
 void
@@ -15,13 +23,3 @@ Request::time_int() const
     return MInterval(0, duration());
 }
 
-void
-Request::print() const
-{
-#ifndef NPRINT
-    mtor << name() << " {";
-    do_print();
-    mtor << "}\n";
-#endif
-}
-  
index 296f856a8a47f54b498f88a06ce3ddeaaba43690..29fdac1a3d47c3ef1df153725ad2852152cd768e 100644 (file)
@@ -13,7 +13,7 @@
 #include "rest-column.hh"
 #include "note-column.hh"
 
-IMPLEMENT_STATIC_NAME(Rest_collision_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Rest_collision_engraver, Engraver);
 ADD_THIS_ENGRAVER(Rest_collision_engraver);
 
index 4529bbc4d6128cce92ec344afb2204800447c282..7b3da49d41f6ed2eb4c85a42a5a48c9ff7875ef8 100644 (file)
@@ -15,7 +15,7 @@
 #include "collision.hh"
 #include "paper-def.hh"
 
-IMPLEMENT_STATIC_NAME(Rest_collision);
+
 IMPLEMENT_IS_TYPE_B1(Rest_collision,Item);
 
 void
index 9f811d39ded19fbf045bff551be9f8d1954cea96..5a0d141777e6164e597010b3fe8e3075443179e0 100644 (file)
@@ -12,7 +12,7 @@
 #include "rest-column.hh"
 #include "stem.hh"
 
-IMPLEMENT_STATIC_NAME(Rest_column);
+
 IMPLEMENT_IS_TYPE_B1(Rest_column,Head_column);
 
 
index 9f15b846df4e2ac772d32834d1ac59f16da82bd5..99e6673a7d1e555801b96a4a10d0ec84e0b87ca2 100644 (file)
 Score_elem_info::Score_elem_info(Score_elem*s_l, Request*r_l)
 {
     elem_l_ = s_l;
-    voice_l_ =  (r_l)?r_l->voice_l():0;
     req_l_ = r_l;
 }
 
 Score_elem_info::Score_elem_info()
 {
     elem_l_ = 0;
-    voice_l_ = 0;
-
     req_l_ = 0;
 }
 
index 7f026d1e88452cf311d1b1a259d6a3f1abff44ba..c95817d9fd2341e11408fbc441ae440f1c4f098c 100644 (file)
@@ -343,7 +343,7 @@ Score_elem::do_substitute_dependent(Score_elem*,Score_elem*)
 }
 
 
-IMPLEMENT_STATIC_NAME(Score_elem);
+
 IMPLEMENT_IS_TYPE_B(Score_elem);
 
 Molecule*
index 15d266599a9e2ff3846f1640eb892778ee34ad8b..243b8622f9d7bb3e05b163860a65b2b3858c047b 100644 (file)
@@ -45,6 +45,6 @@ Score_horizontal_align_engraver::acknowledge_element(Score_elem_info i)
        halign_p_->add(it, align_grav_l->priority_i_);
     }
 }
-IMPLEMENT_STATIC_NAME(Score_horizontal_align_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Score_horizontal_align_engraver,Engraver);
 ADD_THIS_ENGRAVER(Score_horizontal_align_engraver);
index 85be620ccf4d13ae307521de97934420b53b1c10..64a7df296d3859fcd2daeff4e92c359764c00575 100644 (file)
@@ -69,7 +69,7 @@ Line_of_score::Line_of_score()
 
 
 
-IMPLEMENT_STATIC_NAME(Line_of_score);
+
 IMPLEMENT_IS_TYPE_B1(Line_of_score,Spanner);
 
 void
index b49fbd48f5a72618b371d4b11e336b7a62fefe61..166eb348bb7db6f2b5a070f8da17387e8fa252f5 100644 (file)
@@ -12,7 +12,7 @@
 #include "note-head.hh"
 #include "stem.hh"
 
-IMPLEMENT_STATIC_NAME(Script_column);
+
 IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item);
 
 
index 38b2608f25bf149ab604735903f7275ddf699f45..5475ec8cf2369df2959d72d0b3613b3393d62aba 100644 (file)
@@ -81,7 +81,7 @@ Script_def::get_atom(Paper_def *p , int d)const
     return p->lookup_l()->script(preidx_str + symidx_str_);
 }
 
-IMPLEMENT_STATIC_NAME(Script_def);
+
 IMPLEMENT_IS_TYPE_B1(Script_def,General_script_def);
 
 int
index 0c8f1e0590afa2b190db166716817722bde7585f..e33f121bb178eab8ba92e740ccf85bad5c0dc295 100644 (file)
@@ -84,6 +84,6 @@ Script_engraver::do_post_move_processing()
     script_req_l_arr_.set_size(0);
 }
 
-IMPLEMENT_STATIC_NAME(Script_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Script_engraver,Engraver);
 ADD_THIS_ENGRAVER(Script_engraver);
index c74afdb1fb45341848d861a2aaf4b1f9467e08d3..4fed33001398e65ea5299accfa66310f082e8261 100644 (file)
@@ -94,7 +94,7 @@ Script::brew_molecule_p() const
     return out;
 }
 
-IMPLEMENT_STATIC_NAME(Script);
+
 IMPLEMENT_IS_TYPE_B2(Script,Item,Staff_side);
 
 int 
index 655d7aad234f3bf3cf2eb76969065a0ac49baab2..feabdd45b4b2ebbfb2350edc4e1d10711e03c923 100644 (file)
@@ -99,6 +99,6 @@ Slur_engraver::~Slur_engraver()
        requests_arr_[i]->warning("unterminated slur");
     }
 }
-IMPLEMENT_STATIC_NAME(Slur_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Slur_engraver,Engraver);
 ADD_THIS_ENGRAVER(Slur_engraver);
index 098bdc3fe425c60c9ccd718e3817cd7b2d4bf4d4..89bdd2444c9d5fcbff43bf0766fc1a6629ad8175 100644 (file)
@@ -94,5 +94,5 @@ Slur::do_post_processing()
     left_pos_i_ += dir_i_;
     right_pos_i_ += dir_i_;
 }
-IMPLEMENT_STATIC_NAME(Slur);
+
 IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
index c38fe430733d4e3a277492a66243f8133be3d7ff..a6d40fdd9c69bea88f13e90510a6c3dc95b57f1f 100644 (file)
@@ -53,6 +53,6 @@ Span_bar_engraver::do_pre_move_processing()
        
 }
 
-IMPLEMENT_STATIC_NAME(Span_bar_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Span_bar_engraver,Engraver);
 ADD_THIS_ENGRAVER(Span_bar_engraver);
index 61f6b1b4e6816f986cd90658870fd9710e808f90..24430729bd623e5c5cf573e62f17cf037a9eee19 100644 (file)
@@ -72,11 +72,15 @@ Span_bar::do_pre_processing()
        transparent_b_ = true;
        empty_b_ =true;
     } else {
-       if  (type_str_ == "")
+       if (type_str_ == "")
            type_str_ = spanning_l_arr_[0]->type_str_;
        if (type_str_ =="") {
            transparent_b_=true;
            empty_b_ = true;
+       } else if ( type_str_ == "|:") {
+           type_str_ = ".|";
+       } else if ( type_str_ == ":|"){
+           type_str_ = "|.";
        }
     }
 }
@@ -100,5 +104,5 @@ Span_bar::brew_molecule_p()const
     return output;
 }
 
-IMPLEMENT_STATIC_NAME(Span_bar);
+
 IMPLEMENT_IS_TYPE_B1(Span_bar,Bar);
index 9bfe9ef1cedee58e08b651860a6dabe7f8da34e7..cccbd03b7825f2ed0878d41c2f3b3c3ed9bd6ccc 100644 (file)
@@ -15,9 +15,9 @@ Span_score_bar_engraver::get_span_bar_p() const
     return new Span_score_bar;
 }
 
-IMPLEMENT_STATIC_NAME(Span_score_bar_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Span_score_bar_engraver, Span_bar_engraver);
-IMPLEMENT_STATIC_NAME(Piano_bar_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Piano_bar_engraver, Span_score_bar_engraver);
 
 Span_bar*
index 9ee958ae46056f4a8fb586ffe79584ef6d5ea436..d6a7a2fa71b81b396ace127f0155714c2bb3abe9 100644 (file)
@@ -38,8 +38,8 @@ Piano_brace::do_width()const
     return Interval(0,0);
 }
 
-IMPLEMENT_STATIC_NAME(Span_score_bar);
+
 IMPLEMENT_IS_TYPE_B1(Span_score_bar, Span_bar);
 IMPLEMENT_IS_TYPE_B1(Piano_brace, Span_score_bar);
-IMPLEMENT_STATIC_NAME(Piano_brace);
+
     
index f0b76a277ccad7b253bdc9d3f093ddde04441f55..8e2c98bf1996bba52e0d759015616ad13bdb3f28 100644 (file)
@@ -10,7 +10,7 @@
 #include "spanner-elem-group.hh"
 
 
-IMPLEMENT_STATIC_NAME(Spanner_elem_group);
+
 IMPLEMENT_IS_TYPE_B2(Spanner_elem_group,Spanner,Horizontal_vertical_group);
 
 Interval
index eb6d16f6fdb3c4e691cbcc2d91f42e6bf638dc03..1ca347172bda6db6fa9a73820a3c22c76d78760c 100644 (file)
@@ -11,7 +11,7 @@
 #include "p-col.hh"
 #include "p-score.hh"
 
-IMPLEMENT_STATIC_NAME(Spanner);
+
 IMPLEMENT_IS_TYPE_B1(Spanner,Score_elem);
 
 void
index 9cb61495f960c92bf75e1d770f1dff481ddc5c8c..a661a0cb974d1721251dbe63b8535af057ab8768 100644 (file)
@@ -117,5 +117,5 @@ Staff_side::do_substitute_dependency(Score_elem*o, Score_elem*n)
        staff_sym_l_ = n ? (Staff_symbol*) n->spanner():0;
 }
 
-IMPLEMENT_STATIC_NAME(Staff_side);
+
 IMPLEMENT_IS_TYPE_B1(Staff_side, Score_elem);
index 2894a34120e0164cafc12f65fb01f20df9cb41b3..03de4a59d9a97e68b82f8e35682a7903309a611c 100644 (file)
@@ -50,6 +50,6 @@ Staff_sym_engraver::do_process_requests()
 }
 
 
-IMPLEMENT_STATIC_NAME(Staff_sym_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Staff_sym_engraver,Engraver);
 ADD_THIS_ENGRAVER(Staff_sym_engraver);
index 718bddbc586b95bde847961ef963ea0a096588d9..c228be587060fcdb7459813589995a0c5b7ad6d4 100644 (file)
@@ -18,7 +18,7 @@ Staff_symbol::Staff_symbol(int l)
     no_lines_i_ = l;
 }
 
-IMPLEMENT_STATIC_NAME(Staff_symbol);
+
 IMPLEMENT_IS_TYPE_B1(Staff_symbol,Spanner);
 
 void
index 359d719f0beba863a7a12d60a610461462ae4ff8..7e4aa95741c9483566b1b52f1623b0ebabc9e47c 100644 (file)
@@ -17,7 +17,7 @@
 #include "p-score.hh"
 
 
-IMPLEMENT_STATIC_NAME(Line_of_staff);
+
 IMPLEMENT_IS_TYPE_B2(Line_of_staff,Spanner,Horizontal_vertical_group);
 
 void
index a5cb842cbb881e43408fa9fe5c6efcc25160c817..38f84a48dcae51f548e65184d439a80439b3fbe8 100644 (file)
@@ -172,6 +172,6 @@ Stem_beam_engraver::set_feature(Feature i)
        default_dir_i_ = i.value_;
 }
 
-IMPLEMENT_STATIC_NAME(Stem_beam_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Stem_beam_engraver,Engraver);
 ADD_THIS_ENGRAVER(Stem_beam_engraver);
index 00b7423a2b014356f2a833a9b9c3fa2bd2bd641c..cf811ddf56025118613ec50b517be066b8026f43 100644 (file)
@@ -51,7 +51,7 @@ Stem::Stem(int c)
     stem_xoffset_f_ =0;
 }
 
-IMPLEMENT_STATIC_NAME(Stem);
+
 IMPLEMENT_IS_TYPE_B1(Stem,Item);
 
 void
index c2554516fe16bdc89903ac863194ad051fd93f78..cf7884fd7aba2fec0a409cc83d0c8fa1ac96dc85 100644 (file)
@@ -53,5 +53,5 @@ Super_elem::do_add_processing()
 
 
 
-IMPLEMENT_STATIC_NAME(Super_elem);
+
 IMPLEMENT_IS_TYPE_B1(Super_elem,Score_elem);
index 9f596cba76ffad37696264d71f9f73d7599225c1..b445c9c4b5964a9d467e707cf667d5a0ad269482 100644 (file)
@@ -7,7 +7,7 @@
 */
 #include "swallow-grav.hh"
 
-IMPLEMENT_STATIC_NAME(Swallow_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Swallow_engraver,Engraver);
 ADD_THIS_ENGRAVER(Swallow_engraver);
 
index 7bdb355adc9793653b65fae396c9f55822df5bb6..332964af408d088720a1dc468110e0d7113b5143 100644 (file)
@@ -8,6 +8,6 @@
 
 #include "swallow-perf.hh"
 
-IMPLEMENT_STATIC_NAME(Swallow_performer);
+
 IMPLEMENT_IS_TYPE_B1(Swallow_performer, Performer);
 ADD_THIS_PERFORMER(Swallow_performer);
index 4d6c641436a4e78c073ba72b73c42a200fcd7934..9ab7d0a25b5f9d6f21f485d9c40cda432a175dec 100644 (file)
@@ -58,5 +58,5 @@ Text_def::print() const
        style_str_ << "align " << align_i_ << '\n';
 }
 
-IMPLEMENT_STATIC_NAME(Text_def);
+
 IMPLEMENT_IS_TYPE_B1(Text_def,General_script_def);
index d685a47a126a110947541afd4668c0009a0df01a..5095b23b3c92e7949e872cc6aa1b57e8af4b34a4 100644 (file)
@@ -70,6 +70,6 @@ Text_engraver::do_post_move_processing()
 {
     text_req_l_ = 0;
 }
-IMPLEMENT_STATIC_NAME(Text_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Text_engraver,Engraver);
 ADD_THIS_ENGRAVER(Text_engraver);
index a8cddcfade0c8b5f59b80aa9dd8ff66269139c6d..3ae99c40ad1b352ad71fe51d995d682dcb15be96 100644 (file)
@@ -57,5 +57,5 @@ Text_item::brew_molecule_p() const
     return mol_p;
 }
 
-IMPLEMENT_STATIC_NAME(Text_item);
+
 IMPLEMENT_IS_TYPE_B1(Text_item,Item);
index 10bbb0b0fa5db74ac8d88042a85ea2b5420accb4..437739019ae8b8346667529b5c3ac35c69b3df58 100644 (file)
@@ -31,7 +31,7 @@ Text_spanner::Text_spanner()
     support_span_l_ = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Text_spanner);
+
 IMPLEMENT_IS_TYPE_B1(Text_spanner,Spanner);
 
 void
index 981e3f12c729eb939eae9e082874a487c83b42db..e49cd5b7e5aa2f82454614b2dedd97360335531a 100644 (file)
@@ -119,6 +119,6 @@ Tie_engraver::set_feature(Feature f)
        dir_i_ = f.value_;
 }
 
-IMPLEMENT_STATIC_NAME(Tie_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Tie_engraver,Engraver);
 ADD_THIS_ENGRAVER(Tie_engraver);
index 7ce834946c887d185a5b5318e814135ebdd61eb4..d67aacccfcbfdc864695699e767a8f7f4cf58ad3 100644 (file)
@@ -91,5 +91,5 @@ Tie::do_substitute_dependency(Score_elem*o, Score_elem*n)
 }
 
 
-IMPLEMENT_STATIC_NAME(Tie);
+
 IMPLEMENT_IS_TYPE_B1(Tie,Bow);
index 06e30c21e998a7a3264220f3192f3260d0a8d2fe..0d86219b267f82f31cc4d5e5df0720714d24746f 100644 (file)
@@ -13,7 +13,7 @@ Translator::Translator()
     iterator_count_  = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Translator);
+
 IMPLEMENT_IS_TYPE_B(Translator);
 
 bool
index 506bce550cde24aaa061b6802b639af748e304bc..4ba8b7c5a4d69f566273907571113be9c4e20a20 100644 (file)
@@ -58,6 +58,6 @@ Vertical_align_element::Vertical_align_element()
     empty_b_ =true;
 }
 
-IMPLEMENT_STATIC_NAME(Vertical_align_element);
+
 IMPLEMENT_IS_TYPE_B1(Vertical_align_element, Score_elem);
 
index 6eb56a4dffdd7c83797ab1fcff36d08b01832de2..83cfae7acce35adfe4e37e8fd32850e9b24d1eeb 100644 (file)
@@ -43,6 +43,6 @@ Vertical_align_engraver::acknowledge_element(Score_elem_info i)
     }
 }
 
-IMPLEMENT_STATIC_NAME(Vertical_align_engraver);
+
 IMPLEMENT_IS_TYPE_B1(Vertical_align_engraver, Engraver);
 ADD_THIS_ENGRAVER(Vertical_align_engraver);
index 461f6bd2822b86f1ffbc38dc8f4c66b7e985e286..94a8c5ee723fe24995bb82465d65a79af374e8a4 100644 (file)
@@ -8,5 +8,5 @@
 
 #include "vertical-align-spanner.hh"
 
-IMPLEMENT_STATIC_NAME(Vertical_align_spanner);
+
 IMPLEMENT_IS_TYPE_B2(Vertical_align_spanner, Vertical_align_element, Spanner);
index 5021a294407897c6750dca903d0f775fe5f856fe..f5e5df0c5fb7bbbffe9aa6b5bd0bd95026b95184 100644 (file)
@@ -34,7 +34,7 @@ Voice_group_engravers::do_try_request(Request*r_l)
 }
 
 
-IMPLEMENT_STATIC_NAME(Voice_group_engravers);
+
 IMPLEMENT_IS_TYPE_B1(Voice_group_engravers,Engraver_group_engraver);
 
 void
index ac5c6cb7da1f954cb2f3b63de6d730fa3f2e4d43..fa3393347b003e3be8756406996e71d7b6265bf8 100644 (file)
@@ -13,7 +13,7 @@
 
 //IMPLEMENT_IS_TYPE_B2(Voice_group_performer,Performer, Translator);
 IMPLEMENT_IS_TYPE_B1(Voice_group_performer,Performer_group_performer);
-IMPLEMENT_STATIC_NAME(Voice_group_performer);
+
 ADD_THIS_PERFORMER(Voice_group_performer);
 
 Voice_group_performer::Voice_group_performer()