release: 1.3.46

======

1.3.45.j

5 files changed, 9 insertions, 77 deletions

diff --git a/lily/include/bar-number-engraver.hh b/lily/include/bar-number-engraver.hh
deleted file mode 100644
index 22c6c3ef22..0000000000
--- a/lily/include/bar-number-engraver.hh
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-  bar-number-engraver.hh -- declare Bar_number_grav
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef BAR_NUMBER_GRAV_HH
-#define BAR_NUMBER_GRAV_HH
-
-#include "bar-script-engraver.hh"
-
-class Bar_number_engraver : public Bar_script_engraver {
-protected:
-  void do_process_music ();
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Bar_number_engraver();
-};
-#endif // BAR_NUMBER_GRAV_HH
diff --git a/lily/include/bar-script-engraver.hh b/lily/include/bar-script-engraver.hh
deleted file mode 100644
index 2e330e88a4..0000000000
--- a/lily/include/bar-script-engraver.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-/*   
-  bar-script-engraver.hh -- declare Bar_script_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef BAR_SCRIPT_ENGRAVER_HH
-#define BAR_SCRIPT_ENGRAVER_HH
-#include "engraver.hh"
-#include "protected-scm.hh"
-
-/**
-  put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
-  rehearsal marks.
- */
-class Bar_script_engraver : public Engraver
-{
-public:
-  VIRTUAL_COPY_CONS(Translator);
-protected:
-  Text_item* text_p_;
-  Protected_scm visibility_lambda_;
-  String type_;
-  Axis axis_;
-
-protected:
-  /**
-    Put the script on #it#
-   */
-  void attach_script_to_item (Item *it);
-  /**
-     Return non-nil if we want to hang something on this.
-   */
-  Item *cast_to_interesting_item (Score_element*);
-  Bar_script_engraver ();
-  virtual void do_creation_processing ();
-  virtual void do_pre_move_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  void create_items(Request*);
-};
-
-
-#endif /* BAR_SCRIPT_ENGRAVER_HH */
-
diff --git a/lily/include/key-engraver.hh b/lily/include/key-engraver.hh
index cbd80e8d42..f91f7eea8b 100644
--- a/lily/include/key-engraver.hh
+++ b/lily/include/key-engraver.hh
@@ -25,6 +25,10 @@ public:
   Key_engraver();
   
   VIRTUAL_COPY_CONS(Translator);
+
+  /*
+    TODO: move these into properties.
+   */
   Key key_;
   Key_change_req * keyreq_l_;
   Key_item * item_p_;
diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index 0d81e99399..9ad0295ad7 100644
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -31,7 +31,6 @@ public:
 
 
   Interval_t<int> head_positions_interval() const;
-  //  Interval width () const;
 
   void translate_rests(int dy);
   Note_head * first_head ()const;
diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh
index bb34f17efe..4733d5f155 100644
--- a/lily/include/rhythmic-head.hh
+++ b/lily/include/rhythmic-head.hh
@@ -12,16 +12,14 @@
 
 #include "item.hh"
 
-/*
-  Why don't I have a 
-  VIRTUAL_COPY_CONS (Score_element);
-  see also note-head, rest.
-  ?
-*/
-
 class Rhythmic_head : public Item
 {
 public:
+
+  /*
+    Typically not used, since Rhythmic_head is not breakable.
+   */
+  VIRTUAL_COPY_CONS(Rhythmic_head);
   int balltype_i () const;
 
   void add_dots (Dots *);