release: 1.0.1

[lilypond.git] / lily / include / clef-item.hh

diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh
index 3b82f9d426e77d994707d7cb8bca3033e752d883..54c5bf1a0ce268bacb747ebf74168ab18e515505 100644 (file)
--- a/lily/include/clef-item.hh
+++ b/lily/include/clef-item.hh
@@ -1,7 +1,7 @@
 /*
   clef-item.hh -- declare Clef_item
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1998 Han-Wen Nienhuys
 */
 
 #ifndef CLEFITEM_HH
@@ -9,37 +9,36 @@
 #include "item.hh"
 #include "text-def.hh"
 #include "direction.hh"
+#include "pointer.hh"
 
 /**
   Set a clef in a staff.
  */
 class Clef_item : public Item {
 protected:
-    virtual void do_pre_processing();
-    Molecule* brew_molecule_p() const;
+  virtual void do_pre_processing();
+  virtual Molecule* brew_molecule_p() const;
 public:
     
-    String symbol_;
-    int y_position_i_;
+  String symbol_;
+  int y_position_i_;
 
-    /// is this a change clef (smaller size)?
-    bool change_b_;
+  /// is this a change clef (smaller size)?
+  bool change_b_;
     
-    /// set because of existence of a bar
-    bool default_b_;
-
-    /// should we print an octave symbol (8), and where? (up=1, down=1)?
-    Direction octave_dir_;
-
-    /// text def to put above/below clef (ugh: should be const)
-    Text_def * octave_marker_td_p_;
-  
-    /* *************** */
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    SCORE_ELEM_CLONE(Clef_item);
-    Clef_item();
-    void read (Clef_engraver const&);
-    void read (String);
+  /// set because of existence of a bar
+  bool default_b_;
+
+  /// should we print an octave symbol (8), and where? (up=1, down=-1)?
+  Direction octave_dir_;
+
+  /// text def to put above/below clef?
+  P<Text_def> octave_marker_td_p_;
+
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  SCORE_ELEMENT_CLONE(Clef_item);
+  Clef_item();
+  void read (Clef_engraver const&);
 };
 
 #endif // CLEFITEM_HH