release: 0.1.8

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

diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh
index 341204f8eab2c284d7e1e41cbff594dc82950a4b..ad8a674242d04a252a9313b56b3b449d4f9e8db7 100644 (file)
--- a/lily/include/clef-item.hh
+++ b/lily/include/clef-item.hh
@@ -1,4 +1,3 @@
-
 /*
   clef-item.hh -- declare Clef_item
 
@@ -9,21 +8,30 @@
 #define CLEFITEM_HH
 #include "item.hh"
 
-
-struct Clef_item : Item {
-    String type;
+/**
+  Set a clef in a staff.
+ */
+class Clef_item : public Item {
+protected:
+    virtual void do_pre_processing();
+    Molecule* brew_molecule_p()const;
+public:
+    
+    String type_;
     int y_off;
 
     /// is this a change clef (smaller size)?
-    bool change;
-
+    bool change_b_;
+    
+    /// set because of existence of a bar
+    bool default_b_;
 
     /* *************** */
-NAME_MEMBERS(Clef_item);
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    SCORE_ELEM_CLONE(Clef_item);
     Clef_item();
-    void read(Clef_register const&);
-    void read(String);
-    Molecule* brew_molecule_p()const;
+    void read (Clef_engraver const&);
+    void read (String);
 };
 
 #endif // CLEFITEM_HH