release: 1.3.67

===========

* Use callbacks for augmentation dot positioning.

* Removed types Note_head and Rest

* Cleanup of slur.cc: use common reference points in a sane manner.

1.3

16 files changed, 28 insertions, 148 deletions

diff --git a/lily/include/breathing-sign-engraver.hh b/lily/include/breathing-sign-engraver.hh
deleted file mode 100644
index ef0fa899fa..0000000000
--- a/lily/include/breathing-sign-engraver.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  breathing-sign-engraver.hh -- declare Breathing_Sign_engraver
-
-  Copyright (C) 1999 Michael Krause
-
-  written for the GNU LilyPond music typesetter
-
-*/
-
-#ifndef BREATHING_SIGN_ENGRAVER_HH
-#define BREATHING_SIGN_ENGRAVER_HH
-
-#include "engraver.hh"
-#include "command-request.hh"
-#include "breathing-sign.hh"
-
-class Breathing_sign_engraver : public Engraver {
-public:
-  Breathing_sign_engraver();
-  VIRTUAL_COPY_CONS(Translator);
-  
-protected:
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_music();
-
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
-
-private:
-  Breathing_sign_req * breathing_sign_req_l_;
-  Breathing_sign * breathing_sign_p_;
-};
-
-#endif // BREATHING_SIGN_ENGRAVER_HH
diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index 0a71a1466d..e812875e99 100644
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -18,15 +18,13 @@
  */
 class Dot_column : public Item
 {
-  static int compare (Item * const&,Item * const&);
-  void add_dots (Item*);
+  static int compare (Score_element * const&,Score_element * const&);
 public:
   VIRTUAL_COPY_CONS (Score_element);
   void add_head (Rhythmic_head*);
   Dot_column (SCM);
-
-
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
+  
+  static Real force_shift_callback (Score_element const* , Axis);
+  static SCM do_shifts (SCM dotlist);
 };
 #endif // DOT_COLUMN_HH
diff --git a/lily/include/dots.hh b/lily/include/dots.hh
index 3333cd26b7..21be4f7747 100644
--- a/lily/include/dots.hh
+++ b/lily/include/dots.hh
@@ -27,7 +27,7 @@
 class Dots			// interface
 {
 public:
-  static SCM after_line_breaking (SCM);
+  static Real quantised_position_callback(Score_element const*, Axis);
   static SCM brew_molecule (SCM);
 };
 
diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh
index 50ab957bb3..6a9b31be68 100644
--- a/lily/include/multi-measure-rest.hh
+++ b/lily/include/multi-measure-rest.hh
@@ -26,7 +26,6 @@ public:
   SCM member_brew_molecule () const;
   VIRTUAL_COPY_CONS (Score_element);
 
-  virtual void do_add_processing ();
   SCM member_after_line_breaking ();
   static SCM after_line_breaking (SCM);
   virtual Array<Rod> get_rods () const;
diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index dc6d665f77..ddd691232d 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -34,7 +34,7 @@ public:
   static Slice head_positions_interval(Score_element* me) ;
   static Direction static_dir (Score_element*);
   void translate_rests(int dy);
-  Note_head * first_head ()const;
+  Rhythmic_head * first_head ()const;
   Interval rest_dim ()const ;
   Note_column (SCM);
   void set_stem (Score_element*);
diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index 272ed3da95..b945d3a28a 100644
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -7,7 +7,8 @@
 #ifndef NOTEHEAD_HH
 #define NOTEHEAD_HH
 
-#include "rhythmic-head.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
 
 /** ball at the end of the stem. Takes care of:
 
@@ -19,19 +20,11 @@
 
   */
 
-class Note_head : public Rhythmic_head
+class Note_head 
 {
 public:
-  static int compare (Note_head * const &a, Note_head *const &b) ;
- static SCM brew_molecule (SCM);
-  
-
-  Molecule ledger_line (Interval) const;
-  Note_head (SCM);
-
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
-  SCM member_brew_molecule() const;
+  static SCM brew_molecule (SCM);
+  static Molecule ledger_line (Interval, Score_element*) ;
 };
 #endif // NOTEHEAD_HH
 
diff --git a/lily/include/note-heads-engraver.hh b/lily/include/note-heads-engraver.hh
deleted file mode 100644
index bbe8e0254f..0000000000
--- a/lily/include/note-heads-engraver.hh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  head-engraver.hh -- part of GNU LilyPond
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef HEADSGRAV_HH
-#define HEADSGRAV_HH
-#include "engraver.hh"
-#include "pqueue.hh"
-
-/**
-  make balls and rests
- */
-class Note_heads_engraver : public Engraver {
-  Link_array<Note_head> note_p_arr_;
-  Link_array<Item> dot_p_arr_;
-  Link_array<Note_req> note_req_l_arr_;
-  Moment note_end_mom_;
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Note_heads_engraver();
-  
-protected:
-  virtual bool do_try_music (Music *req_l) ;
-  virtual void do_process_music();
-  virtual void do_pre_move_processing();
-};
-
-
-#endif // HEADSGRAV_HH
diff --git a/lily/include/rest-engraver.hh b/lily/include/rest-engraver.hh
deleted file mode 100644
index af5715269d..0000000000
--- a/lily/include/rest-engraver.hh
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  rest-engraver.hh -- declare Engraver
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef REST_GRAV_HH
-#define REST_GRAV_HH
-
-#include "engraver.hh"
-
-class Rest_engraver : public Engraver
-{
-  Rest_req *rest_req_l_;
-  Item * dot_p_;
-  Rest * rest_p_;
-protected:
-  virtual bool do_try_music (Music *);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_process_music ();
-public:
-  
-  VIRTUAL_COPY_CONS(Translator);
-  Rest_engraver ();
-};
-#endif // REST_GRAV_HH
diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index db36065f0c..dc3706005b 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -10,7 +10,7 @@
 #ifndef REST_HH
 #define REST_HH
 
-#include "rhythmic-head.hh"
+#include "lily-guile.hh"
 
 /**
    A pause.
@@ -19,15 +19,10 @@
 
    style -- string specifying glyph style
  */
-class  Rest : public Rhythmic_head
+class  Rest
 {
 public:
-  SCM member_after_line_breaking ();
   static SCM after_line_breaking (SCM);
-  SCM member_brew_molecule () const;
-
-   static SCM brew_molecule (SCM);
-  
-Rest (SCM s);
+  static SCM brew_molecule (SCM);
 };
 #endif // REST_HH
diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh
index 33e7bb279b..cb00554714 100644
--- a/lily/include/rhythmic-head.hh
+++ b/lily/include/rhythmic-head.hh
@@ -30,7 +30,7 @@ public:
   VIRTUAL_COPY_CONS(Rhythmic_head);
   int balltype_i () const;
 
-  void add_dots (Item *);
+  void set_dots (Item *);
   Stem * stem_l () const;
   Item * dots_l () const;
   int dot_count () const;
diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 3176d4b6bb..e37761e8a5 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -23,21 +23,20 @@ public:
  static SCM brew_molecule (SCM);
   
   SCM member_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
+  Array<Offset> get_encompass_offset_arr () const;
   Bezier get_curve () const;
 
-  virtual Direction get_default_dir () const;
+  Direction get_default_dir () const;
   SCM member_after_line_breaking ();
   static SCM after_line_breaking (SCM);
-  virtual void do_add_processing ();
   Array<Rod> get_rods () const;
-  Offset get_attachment (Direction dir) const;
+  Offset get_attachment (Direction dir, Score_element**common) const;
 
 private:  
   void de_uglyfy (Slur_bezier_bow* bb, Real default_height);
   void set_extremities ();
   void set_control_points ();
-  Offset encompass_offset (Note_column const* )const;
+  Offset encompass_offset (Score_element *col,Score_element**common)const;
 };
 
 #endif // SLUR_HH
diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh
index 20311c8abb..9734cf17af 100644
--- a/lily/include/staff-symbol-referencer.hh
+++ b/lily/include/staff-symbol-referencer.hh
@@ -40,9 +40,5 @@ public:
 };
 
 int compare_position (Score_element *const&,Score_element *const&); 
-
-
-Staff_symbol_referencer_interface staff_symbol_referencer  (Score_element const*);
-
 #endif /* STAFF_SYMBOL_REFERENCER_HH */
 
diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 24e0630c76..ed0f619d0f 100644
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -57,8 +57,8 @@ public:
     our beam, for aligning abbrev flags
    */
   Beam* beam_l () const;
-  Note_head * first_head () const;
-  Drul_array<Note_head*> extremal_heads () const;
+  Rhythmic_head * first_head () const;
+  Drul_array<Rhythmic_head*> extremal_heads () const;
 
   Score_element * support_head () const;
   Stem (SCM);
diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index bf6f386fc4..92a2b24719 100644
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -23,16 +23,12 @@ public:
   void set_head (Direction, Item*head_l);
   VIRTUAL_COPY_CONS(Score_element);
 
-  Note_head* head (Direction) const;
+  Rhythmic_head* head (Direction) const;
   Real position_f () const;
-   static SCM brew_molecule (SCM);
-  
-
-  virtual Direction get_default_dir() const;
-
-
+  static SCM brew_molecule (SCM);
+  Direction get_default_dir() const;
   SCM member_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
+  Array<Offset> get_encompass_offset_arr () const;
   Bezier get_curve () const;
 
   /*
diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh
index 42019434b7..90496b424e 100644
--- a/lily/include/tuplet-spanner.hh
+++ b/lily/include/tuplet-spanner.hh
@@ -34,8 +34,8 @@ public:
   SCM member_brew_molecule () const;
   VIRTUAL_COPY_CONS(Score_element);
 
-  virtual void do_add_processing ();
-  virtual Direction get_default_dir () const;
+
+  Direction get_default_dir () const;
 };
 
 #endif // Tuplet_spanner_HH
diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh
index ede918a767..ba28f37e6a 100644
--- a/lily/include/volta-spanner.hh
+++ b/lily/include/volta-spanner.hh
@@ -23,7 +23,7 @@ public:
   SCM member_brew_molecule () const;
   VIRTUAL_COPY_CONS (Score_element);
 
-  virtual void do_add_processing ();
+
   SCM member_after_line_breaking ();
   static SCM after_line_breaking (SCM);
 };