release: 1.3.66

==========

* Corrected text sizes in paper*.ly

1.3.65.

18 files changed, 37 insertions, 151 deletions

diff --git a/lily/include/beam-engraver.hh b/lily/include/beam-engraver.hh
deleted file mode 100644
index 9393529a11..0000000000
--- a/lily/include/beam-engraver.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/*   
-  beam-engraver.hh -- declare Beam_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef BEAM_ENGRAVER_HH
-#define BEAM_ENGRAVER_HH
-
-#include "engraver.hh"
-#include "drul-array.hh"
-
-class Beam_engraver : public Engraver {
-  Drul_array<Span_req*> reqs_drul_;
-
-  Beam *finished_beam_p_;
-  Beam *beam_p_;
-  Span_req * prev_start_req_;
-
-  Beaming_info_list * beam_info_p_;
-  Beaming_info_list * finished_beam_info_p_;  
-
-  /// location  within measure where beam started.
-  Moment beam_start_location_;
-
-  /// moment (global time) where beam started.
-  Moment beam_start_mom_;
-  
-  void typeset_beam ();
-protected:
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_removal_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual bool do_try_music (Music*);
-  virtual void do_process_music ();
-public:
-  Beam_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
-};
-
-#endif /* BEAM_ENGRAVER_HH */
-
diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index d14801e370..9a85134d64 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -35,7 +35,7 @@ public:
   int visible_stem_count () const;
   Stem* first_visible_stem () const;
   Stem* last_visible_stem () const;
-
+  static Real rest_collision_callback (Score_element const*,Axis);
   Beam (SCM);
   void add_stem (Stem*);
   void set_grouping (Rhythmic_grouping def, Rhythmic_grouping current);
diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index e1297545da..6f7ffbb471 100644
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -9,8 +9,9 @@
 
 #ifndef COLLISION_HH
 #define COLLISION_HH
+
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
 
 
 /**
@@ -35,17 +36,16 @@
   Read and removed from elements.
   
 */
-class Collision : public Item
+class Collision			// interface
 {
 public:
-  SCM automatic_shift ();
-  SCM forced_shift ();
-  void do_shifts ();  
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
+  Score_element*  elt_l_;
+  static SCM automatic_shift (Score_element*);
+  static SCM forced_shift (Score_element*);
+  static Real force_shift_callback (Score_element const*, Axis);
+  static void do_shifts (Score_element*);
 
-    
   void add_column (Note_column*ncol_l);
-  Collision(SCM);
+  Collision(Score_element*);
 };
 #endif // COLLISION_HH
diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index c91d05d3d4..0a71a1466d 100644
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -18,8 +18,8 @@
  */
 class Dot_column : public Item
 {
-  static int compare (Dots * const&,Dots * const&);
-  void add_dots (Dots*);
+  static int compare (Item * const&,Item * const&);
+  void add_dots (Item*);
 public:
   VIRTUAL_COPY_CONS (Score_element);
   void add_head (Rhythmic_head*);
diff --git a/lily/include/dots.hh b/lily/include/dots.hh
index f816cc2a24..3333cd26b7 100644
--- a/lily/include/dots.hh
+++ b/lily/include/dots.hh
@@ -10,7 +10,8 @@
 #ifndef DOTS_HH
 #define DOTS_HH
 
-#include "item.hh"
+#include "lily-proto.hh"
+#include "lily-guile.hh"
 
 
 /**
@@ -23,15 +24,11 @@
 
   
   */
-class Dots :  public Item
+class Dots			// interface
 {
 public:
-  SCM member_brew_molecule () const;
-  SCM member_after_line_breaking ();
   static SCM after_line_breaking (SCM);
   static SCM brew_molecule (SCM);
-
-  Dots (SCM);
 };
 
 #endif // DOTS_HH
diff --git a/lily/include/dynamic-line-interface.hh b/lily/include/dynamic-line-interface.hh
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lily/include/dynamic-line-interface.hh
+++ /dev/null
diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 2fb91ecbfb..2c3ef7afd6 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -14,14 +14,12 @@
 #include "array.hh"
 #include "request.hh"
 #include "score-element-info.hh"
-#include "staff-info.hh"
 #include "translator.hh"
 
 
 /**
   a struct which processes requests, and creates the #Score_element#s.
-  It may use derived classes. Hungarian postfix: grav
-  
+  It may use derived classes. 
   */
 class Engraver : public virtual Translator {
     
diff --git a/lily/include/key-def.hh b/lily/include/key-def.hh
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lily/include/key-def.hh
+++ /dev/null
diff --git a/lily/include/newkey-def.hh b/lily/include/newkey-def.hh
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lily/include/newkey-def.hh
+++ /dev/null
diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index c8cf7959e9..dc6d665f77 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -14,12 +14,13 @@
 
 /** a struct for treating a group of noteheads (noteheads, stem
   (chord) and scripts) as a single entity.
+
+  UGR. Junkme.  refpoint should be the notehead, dir should come from stem.
+
 */
 class Note_column : public Item
 {
 public:
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
   static int shift_compare (Note_column *const &, Note_column*const&);
   
   /** The relative position of the "voice" containing this
@@ -30,15 +31,15 @@ public:
   Direction dir () const;
 
 
-  Interval_t<int> head_positions_interval() const;
-
+  static Slice head_positions_interval(Score_element* me) ;
+  static Direction static_dir (Score_element*);
   void translate_rests(int dy);
   Note_head * first_head ()const;
   Interval rest_dim ()const ;
   Note_column (SCM);
-  void set_stem (Stem*);
-  void set_dotcol (Dot_column*);
-  void add_head (Rhythmic_head*);
+  void set_stem (Score_element*);
+  void set_dotcol (Score_element*);
+  void add_head (Score_element*);
   bool rest_b () const;
 
   Stem *stem_l()const;
diff --git a/lily/include/note-heads-engraver.hh b/lily/include/note-heads-engraver.hh
index 39eb3868fe..bbe8e0254f 100644
--- a/lily/include/note-heads-engraver.hh
+++ b/lily/include/note-heads-engraver.hh
@@ -15,7 +15,7 @@
  */
 class Note_heads_engraver : public Engraver {
   Link_array<Note_head> note_p_arr_;
-  Link_array<Dots> dot_p_arr_;
+  Link_array<Item> dot_p_arr_;
   Link_array<Note_req> note_req_l_arr_;
   Moment note_end_mom_;
 public:
diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 1b46084bb0..8cba9f6cba 100644
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -12,7 +12,6 @@
 #include "array.hh"
 #include "request.hh"
 #include "score-element-info.hh"
-#include "staff-info.hh"
 #include "translator.hh"
 
 /**
diff --git a/lily/include/rest-collision-engraver.hh b/lily/include/rest-collision-engraver.hh
deleted file mode 100644
index c0de52bdbc..0000000000
--- a/lily/include/rest-collision-engraver.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  rest-collision-engraver.hh -- declare Rest_collision_engraver
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef REST_COLLISION_GRAV_HH
-#define REST_COLLISION_GRAV_HH
-
-#include "array.hh"
-#include "engraver.hh"
-
-class Rest_collision_engraver : public Engraver {
-  Rest_collision* rest_collision_p_;
-
-  Link_array<Note_column> note_column_l_arr_;
-protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing();
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Rest_collision_engraver();
-  
-};
-#endif // REST_COLLISION_GRAV_HH
diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 10b8ac01c1..4eaddd45d7 100644
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -11,16 +11,18 @@
 #define REST_COLLISION_HH
 
 #include "lily-proto.hh"
-#include "item.hh"
+#include "lily-guile.hh"
 
-class Rest_collision : public Item {
+class Rest_collision		// interface
+{
 public:
+  Score_element *elt_l_;
+  
   void add_column (Note_column*);
-  Interval rest_dim () const;
-    
-  Rest_collision(SCM);
+  Rest_collision(Score_element*);
+  void set_interface ();
 
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
+  static Real force_shift_callback (Score_element const*, Axis);
+  static SCM do_shift (Score_element*,SCM);
 };
 #endif // REST_COLLISION_HH
diff --git a/lily/include/rest-engraver.hh b/lily/include/rest-engraver.hh
index 54d5967480..af5715269d 100644
--- a/lily/include/rest-engraver.hh
+++ b/lily/include/rest-engraver.hh
@@ -15,7 +15,7 @@
 class Rest_engraver : public Engraver
 {
   Rest_req *rest_req_l_;
-  Dots * dot_p_;
+  Item * dot_p_;
   Rest * rest_p_;
 protected:
   virtual bool do_try_music (Music *);
diff --git a/lily/include/rhythmic-column-engraver.hh b/lily/include/rhythmic-column-engraver.hh
deleted file mode 100644
index f67c6bff58..0000000000
--- a/lily/include/rhythmic-column-engraver.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  rhythmic-column-engraver.hh -- declare Rhythmic_column_engraver
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef RHYTHMIC_COLUMN_GRAV_HH
-#define RHYTHMIC_COLUMN_GRAV_HH
-
-#include "engraver.hh"
-#include "parray.hh"
-
-class Rhythmic_column_engraver :public Engraver {
-  Link_array<Rhythmic_head> rhead_l_arr_;
-  Link_array<Slur> grace_slur_endings_;
-  Stem * stem_l_;
-  Note_column *ncol_p_;
-  Dot_column *dotcol_l_;
-
-protected:
-  VIRTUAL_COPY_CONS(Translator);
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
-public:
-  Rhythmic_column_engraver();
-  
-};
-#endif // RHYTHMIC_COLUMN_GRAV_HH
-
-
-
diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh
index 8145bd9118..33e7bb279b 100644
--- a/lily/include/rhythmic-head.hh
+++ b/lily/include/rhythmic-head.hh
@@ -30,9 +30,9 @@ public:
   VIRTUAL_COPY_CONS(Rhythmic_head);
   int balltype_i () const;
 
-  void add_dots (Dots *);
+  void add_dots (Item *);
   Stem * stem_l () const;
-  Dots * dots_l () const;
+  Item * dots_l () const;
   int dot_count () const;
 
   SCM member_after_line_breaking ();
diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lily/include/staff-info.hh
+++ /dev/null