From: fred <fred>
Date: Sun, 24 Mar 2002 19:49:03 +0000 (+0000)
Subject: lilypond-0.0.77.jcn1
X-Git-Tag: release/1.5.59~4397
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c4f1453d4596299c483090bb511399061bf5e316;p=lilypond.git

lilypond-0.0.77.jcn1
---

diff --git a/.dstreamrc b/.dstreamrc
index fbad82a93c..0bf620df03 100644
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -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
diff --git a/flower/.version b/flower/.version
index a6d093ed41..6214501523 100644
--- a/flower/.version
+++ b/flower/.version
@@ -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"
 #
diff --git a/flower/full-storage.cc b/flower/full-storage.cc
index 0a7bf4efbe..1b5c05a392 100644
--- a/flower/full-storage.cc
+++ b/flower/full-storage.cc
@@ -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);
diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index 8bcfd80ce7..3362ce0024 100644
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -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);
 
diff --git a/lily/bar.cc b/lily/bar.cc
index b4364e6cd5..b45d977b26 100644
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -20,7 +20,7 @@ Bar::Bar()
 }
 
 
-IMPLEMENT_STATIC_NAME(Bar);
+
 IMPLEMENT_IS_TYPE_B1(Bar,Item);
 
 void
diff --git a/lily/beam.cc b/lily/beam.cc
index d09eb627f1..9079d277ba 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -370,7 +370,7 @@ Beam::brew_molecule_p() const
     return mol_p;
 }
 
-IMPLEMENT_STATIC_NAME(Beam);
+
 IMPLEMENT_IS_TYPE_B1(Beam, Spanner);
 
 void
diff --git a/lily/bow.cc b/lily/bow.cc
index de9269b2e4..46707624af 100644
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -55,5 +55,5 @@ Bow::brew_molecule_p() const
     return output;
 }
 
-IMPLEMENT_STATIC_NAME(Bow);
+
 IMPLEMENT_IS_TYPE_B1(Bow,Directional_spanner);
diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 14ff34118b..d3c9e5df79 100644
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -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);
diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index 5f7ad85a8c..e7126456e2 100644
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -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);
diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 7e399f37c3..15cc5687b2 100644
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -63,5 +63,5 @@ Clef_item::brew_molecule_p()const
     return output;
 }
 
-IMPLEMENT_STATIC_NAME(Clef_item);
+
 IMPLEMENT_IS_TYPE_B1(Clef_item,Item);
diff --git a/lily/collision-grav.cc b/lily/collision-grav.cc
index 1cb0295a8b..2a4903d105 100644
--- a/lily/collision-grav.cc
+++ b/lily/collision-grav.cc
@@ -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);
diff --git a/lily/collision.cc b/lily/collision.cc
index 7ba6c4c601..f9a15bc4fa 100644
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -140,7 +140,7 @@ Collision::do_pre_processing()
     }
 }
 
-IMPLEMENT_STATIC_NAME(Collision);
+
 IMPLEMENT_IS_TYPE_B1(Collision, Item);
 
 void
diff --git a/lily/command-request.cc b/lily/command-request.cc
index a9539e28f7..0d44ccbd35 100644
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -13,10 +13,10 @@
 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()
diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 1b25d8439f..8de7d68759 100644
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -64,5 +64,5 @@ Crescendo::brew_molecule_p() const
     return m_p;
 }
 
-IMPLEMENT_STATIC_NAME(Crescendo);
+
 IMPLEMENT_IS_TYPE_B1(Crescendo,Spanner);
diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc
index 09673c240d..8f99590581 100644
--- a/lily/dynamic-grav.cc
+++ b/lily/dynamic-grav.cc
@@ -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);
 
diff --git a/lily/elem-group-item.cc b/lily/elem-group-item.cc
index 2c174c6379..c1903ffcd0 100644
--- a/lily/elem-group-item.cc
+++ b/lily/elem-group-item.cc
@@ -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);
+
diff --git a/lily/elem-group.cc b/lily/elem-group.cc
index 1bf661a271..e60570ed66 100644
--- a/lily/elem-group.cc
+++ b/lily/elem-group.cc
@@ -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()
 {
diff --git a/lily/engraver.cc b/lily/engraver.cc
index 54518e6daf..4dea919eca 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -125,7 +125,7 @@ Engraver::print() const
 #endif
 }
 
-IMPLEMENT_STATIC_NAME(Engraver);
+
 IMPLEMENT_IS_TYPE_B(Engraver);
 
 void
diff --git a/lily/general-script-def.cc b/lily/general-script-def.cc
index 688e9cdd36..9bf570e5b8 100644
--- a/lily/general-script-def.cc
+++ b/lily/general-script-def.cc
@@ -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);
diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index d53bc4eb6d..78fa0a0ff7 100644
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -68,5 +68,5 @@ Global_translator::prepare(Moment)
 {
 }
 
-IMPLEMENT_STATIC_NAME(Global_translator);
+
 IMPLEMENT_IS_TYPE_B1(Global_translator, Translator);
diff --git a/lily/head-column.cc b/lily/head-column.cc
index 4a50701e63..d08519a891 100644
--- a/lily/head-column.cc
+++ b/lily/head-column.cc
@@ -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
diff --git a/lily/head-grav.cc b/lily/head-grav.cc
index f3bca51721..952f6d8670 100644
--- a/lily/head-grav.cc
+++ b/lily/head-grav.cc
@@ -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);
diff --git a/lily/horizontal-align-item.cc b/lily/horizontal-align-item.cc
index 46e2b67ee2..972b52f8e0 100644
--- a/lily/horizontal-align-item.cc
+++ b/lily/horizontal-align-item.cc
@@ -8,7 +8,7 @@
 
 #include "horizontal-align-item.hh"
 
-IMPLEMENT_STATIC_NAME(Horizontal_align_item);
+
 IMPLEMENT_IS_TYPE_B1(Horizontal_align_item,Item);
 
 
diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 2467318e46..b8e1a6b8b4 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -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 );
diff --git a/lily/include/request.hh b/lily/include/request.hh
index 62d5e73e8c..f130120cf6 100644
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -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; }
diff --git a/lily/include/score-elem-info.hh b/lily/include/score-elem-info.hh
index 6b97718562..05c1413ddf 100644
--- a/lily/include/score-elem-info.hh
+++ b/lily/include/score-elem-info.hh
@@ -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_;
 
     /* *** */
diff --git a/lily/item.cc b/lily/item.cc
index ab0290db9f..7919a3ec35 100644
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -18,7 +18,7 @@ Item::Item()
 	= broken_to_a_[1]=0;
 }
 
-IMPLEMENT_STATIC_NAME(Item);
+
 IMPLEMENT_IS_TYPE_B1(Item, Score_elem);
 
 void
diff --git a/lily/key-grav.cc b/lily/key-grav.cc
index ba07441885..84288bd101 100644
--- a/lily/key-grav.cc
+++ b/lily/key-grav.cc
@@ -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);
diff --git a/lily/key-item.cc b/lily/key-item.cc
index ae15a95324..aa8401e005 100644
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -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 
diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc
index 4c10dc50b6..78fbae2992 100644
--- a/lily/local-key-grav.cc
+++ b/lily/local-key-grav.cc
@@ -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);
diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index 439f24f9fe..50f870c1cf 100644
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -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
diff --git a/lily/lyric-grav.cc b/lily/lyric-grav.cc
index 08c81723a0..0ba2ae4896 100644
--- a/lily/lyric-grav.cc
+++ b/lily/lyric-grav.cc
@@ -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);
diff --git a/lily/meter-grav.cc b/lily/meter-grav.cc
index 28397bb198..3112f18556 100644
--- a/lily/meter-grav.cc
+++ b/lily/meter-grav.cc
@@ -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); 
diff --git a/lily/meter.cc b/lily/meter.cc
index d56bc33869..e578cef5fe 100644
--- a/lily/meter.cc
+++ b/lily/meter.cc
@@ -16,6 +16,6 @@ Meter::brew_molecule_p()const
     return new Molecule(Atom(s));
 }
 
-IMPLEMENT_STATIC_NAME(Meter);
+
 
 IMPLEMENT_IS_TYPE_B1(Meter,Item);
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 404f06b5ca..2efb36aff1 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -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"
@@ -19,6 +20,18 @@
 #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"
diff --git a/lily/music.cc b/lily/music.cc
index ca55e559ec..f42394b9e6 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -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);
+
diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 396870dd36..0d14c09c38 100644
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -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);
 
 
diff --git a/lily/note-column-grav.cc b/lily/note-column-grav.cc
index 3cf96d2575..6761456558 100644
--- a/lily/note-column-grav.cc
+++ b/lily/note-column-grav.cc
@@ -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);
diff --git a/lily/note-column.cc b/lily/note-column.cc
index 8d7d7f7e2b..e3bb6b1f52 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -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
diff --git a/lily/notehead.cc b/lily/notehead.cc
index bd7fa443ed..48b6b7ba6d 100644
--- a/lily/notehead.cc
+++ b/lily/notehead.cc
@@ -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
diff --git a/lily/request.cc b/lily/request.cc
index 545abcef83..15a90ca6e3 100644
--- a/lily/request.cc
+++ b/lily/request.cc
@@ -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
-}
-  
diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 296f856a8a..29fdac1a3d 100644
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -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);
 
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 4529bbc4d6..7b3da49d41 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -15,7 +15,7 @@
 #include "collision.hh"
 #include "paper-def.hh"
 
-IMPLEMENT_STATIC_NAME(Rest_collision);
+
 IMPLEMENT_IS_TYPE_B1(Rest_collision,Item);
 
 void
diff --git a/lily/rest-column.cc b/lily/rest-column.cc
index 9f811d39de..5a0d141777 100644
--- a/lily/rest-column.cc
+++ b/lily/rest-column.cc
@@ -12,7 +12,7 @@
 #include "rest-column.hh"
 #include "stem.hh"
 
-IMPLEMENT_STATIC_NAME(Rest_column);
+
 IMPLEMENT_IS_TYPE_B1(Rest_column,Head_column);
 
 
diff --git a/lily/score-elem-info.cc b/lily/score-elem-info.cc
index 9f15b846df..99e6673a7d 100644
--- a/lily/score-elem-info.cc
+++ b/lily/score-elem-info.cc
@@ -12,15 +12,12 @@
 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;
 }
 
diff --git a/lily/score-elem.cc b/lily/score-elem.cc
index 7f026d1e88..c95817d9fd 100644
--- a/lily/score-elem.cc
+++ b/lily/score-elem.cc
@@ -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*
diff --git a/lily/score-halign-grav.cc b/lily/score-halign-grav.cc
index 15d266599a..243b8622f9 100644
--- a/lily/score-halign-grav.cc
+++ b/lily/score-halign-grav.cc
@@ -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);
diff --git a/lily/scoreline.cc b/lily/scoreline.cc
index 85be620ccf..64a7df296d 100644
--- a/lily/scoreline.cc
+++ b/lily/scoreline.cc
@@ -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
diff --git a/lily/script-column.cc b/lily/script-column.cc
index b49fbd48f5..166eb348bb 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -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);
 
 
diff --git a/lily/script-def.cc b/lily/script-def.cc
index 38b2608f25..5475ec8cf2 100644
--- a/lily/script-def.cc
+++ b/lily/script-def.cc
@@ -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
diff --git a/lily/script-grav.cc b/lily/script-grav.cc
index 0c8f1e0590..e33f121bb1 100644
--- a/lily/script-grav.cc
+++ b/lily/script-grav.cc
@@ -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);
diff --git a/lily/script.cc b/lily/script.cc
index c74afdb1fb..4fed330013 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -94,7 +94,7 @@ Script::brew_molecule_p() const
     return out;
 }
 
-IMPLEMENT_STATIC_NAME(Script);
+
 IMPLEMENT_IS_TYPE_B2(Script,Item,Staff_side);
 
 int 
diff --git a/lily/slur-grav.cc b/lily/slur-grav.cc
index 655d7aad23..feabdd45b4 100644
--- a/lily/slur-grav.cc
+++ b/lily/slur-grav.cc
@@ -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);
diff --git a/lily/slur.cc b/lily/slur.cc
index 098bdc3fe4..89bdd2444c 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -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);
diff --git a/lily/span-bar-grav.cc b/lily/span-bar-grav.cc
index c38fe43073..a6d40fdd9c 100644
--- a/lily/span-bar-grav.cc
+++ b/lily/span-bar-grav.cc
@@ -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);
diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 61f6b1b4e6..24430729bd 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -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);
diff --git a/lily/span-score-bar-grav.cc b/lily/span-score-bar-grav.cc
index 9bfe9ef1ce..cccbd03b78 100644
--- a/lily/span-score-bar-grav.cc
+++ b/lily/span-score-bar-grav.cc
@@ -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*
diff --git a/lily/span-score-bar.cc b/lily/span-score-bar.cc
index 9ee958ae46..d6a7a2fa71 100644
--- a/lily/span-score-bar.cc
+++ b/lily/span-score-bar.cc
@@ -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);
+
     
diff --git a/lily/spanner-elem-group.cc b/lily/spanner-elem-group.cc
index f0b76a277c..8e2c98bf19 100644
--- a/lily/spanner-elem-group.cc
+++ b/lily/spanner-elem-group.cc
@@ -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
diff --git a/lily/spanner.cc b/lily/spanner.cc
index eb6d16f6fd..1ca347172b 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -11,7 +11,7 @@
 #include "p-col.hh"
 #include "p-score.hh"
 
-IMPLEMENT_STATIC_NAME(Spanner);
+
 IMPLEMENT_IS_TYPE_B1(Spanner,Score_elem);
 
 void
diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 9cb61495f9..a661a0cb97 100644
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -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);
diff --git a/lily/staff-sym-grav.cc b/lily/staff-sym-grav.cc
index 2894a34120..03de4a59d9 100644
--- a/lily/staff-sym-grav.cc
+++ b/lily/staff-sym-grav.cc
@@ -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);
diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc
index 718bddbc58..c228be5870 100644
--- a/lily/staff-sym.cc
+++ b/lily/staff-sym.cc
@@ -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
diff --git a/lily/staffline.cc b/lily/staffline.cc
index 359d719f0b..7e4aa95741 100644
--- a/lily/staffline.cc
+++ b/lily/staffline.cc
@@ -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
diff --git a/lily/stem-beam-grav.cc b/lily/stem-beam-grav.cc
index a5cb842cbb..38f84a48dc 100644
--- a/lily/stem-beam-grav.cc
+++ b/lily/stem-beam-grav.cc
@@ -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);
diff --git a/lily/stem.cc b/lily/stem.cc
index 00b7423a2b..cf811ddf56 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -51,7 +51,7 @@ Stem::Stem(int c)
     stem_xoffset_f_ =0;
 }
 
-IMPLEMENT_STATIC_NAME(Stem);
+
 IMPLEMENT_IS_TYPE_B1(Stem,Item);
 
 void
diff --git a/lily/super-elem.cc b/lily/super-elem.cc
index c2554516fe..cf7884fd7a 100644
--- a/lily/super-elem.cc
+++ b/lily/super-elem.cc
@@ -53,5 +53,5 @@ Super_elem::do_add_processing()
 
 
 
-IMPLEMENT_STATIC_NAME(Super_elem);
+
 IMPLEMENT_IS_TYPE_B1(Super_elem,Score_elem);
diff --git a/lily/swallow-grav.cc b/lily/swallow-grav.cc
index 9f596cba76..b445c9c4b5 100644
--- a/lily/swallow-grav.cc
+++ b/lily/swallow-grav.cc
@@ -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);
 
diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc
index 7bdb355adc..332964af40 100644
--- a/lily/swallow-perf.cc
+++ b/lily/swallow-perf.cc
@@ -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);
diff --git a/lily/text-def.cc b/lily/text-def.cc
index 4d6c641436..9ab7d0a25b 100644
--- a/lily/text-def.cc
+++ b/lily/text-def.cc
@@ -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);
diff --git a/lily/text-grav.cc b/lily/text-grav.cc
index d685a47a12..5095b23b3c 100644
--- a/lily/text-grav.cc
+++ b/lily/text-grav.cc
@@ -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);
diff --git a/lily/text-item.cc b/lily/text-item.cc
index a8cddcfade..3ae99c40ad 100644
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -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);
diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 10bbb0b0fa..437739019a 100644
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -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
diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc
index 981e3f12c7..e49cd5b7e5 100644
--- a/lily/tie-grav.cc
+++ b/lily/tie-grav.cc
@@ -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);
diff --git a/lily/tie.cc b/lily/tie.cc
index 7ce834946c..d67aacccfc 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -91,5 +91,5 @@ Tie::do_substitute_dependency(Score_elem*o, Score_elem*n)
 }
 
 
-IMPLEMENT_STATIC_NAME(Tie);
+
 IMPLEMENT_IS_TYPE_B1(Tie,Bow);
diff --git a/lily/translator.cc b/lily/translator.cc
index 06e30c21e9..0d86219b26 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -13,7 +13,7 @@ Translator::Translator()
     iterator_count_  = 0;
 }
 
-IMPLEMENT_STATIC_NAME(Translator);
+
 IMPLEMENT_IS_TYPE_B(Translator);
 
 bool
diff --git a/lily/vertical-align-elem.cc b/lily/vertical-align-elem.cc
index 506bce550c..4ba8b7c5a4 100644
--- a/lily/vertical-align-elem.cc
+++ b/lily/vertical-align-elem.cc
@@ -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);
 
diff --git a/lily/vertical-align-grav.cc b/lily/vertical-align-grav.cc
index 6eb56a4dff..83cfae7acc 100644
--- a/lily/vertical-align-grav.cc
+++ b/lily/vertical-align-grav.cc
@@ -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);
diff --git a/lily/vertical-align-spanner.cc b/lily/vertical-align-spanner.cc
index 461f6bd282..94a8c5ee72 100644
--- a/lily/vertical-align-spanner.cc
+++ b/lily/vertical-align-spanner.cc
@@ -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);
diff --git a/lily/voice-group-gravs.cc b/lily/voice-group-gravs.cc
index 5021a29440..f5e5df0c5f 100644
--- a/lily/voice-group-gravs.cc
+++ b/lily/voice-group-gravs.cc
@@ -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
diff --git a/lily/voice-group-performer.cc b/lily/voice-group-performer.cc
index ac5c6cb7da..fa3393347b 100644
--- a/lily/voice-group-performer.cc
+++ b/lily/voice-group-performer.cc
@@ -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()