release: 0.1.15

[lilypond.git] / lily / clef-item.cc

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 15cc5687b21786cd60e0c38665d81a9ff78f246f..a0ca99bcc5b90d9fc987da43cf2435b2be25558c 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -17,50 +17,52 @@
 void
 Clef_item::do_pre_processing()
 {
-    change_b_ = ! (break_status_i() == 1);
+  change_b_ = ! (break_status_i() == 1);
 
-    if (default_b_){
-       empty_b_ = (break_status_i() != 1);
-       transparent_b_ = (break_status_i() != 1);
+  if (default_b_)
+    {
+      set_empty(break_status_i() != 1);
+      transparent_b_ = (break_status_i() != 1);
     }
 }
 
 Clef_item::Clef_item()
 {
-    default_b_ = false;
-    change_b_ = true;
-    read("violin");
+  breakable_b_ =true;
+  default_b_ = false;
+  change_b_ = true;
+  read ("violin");
 }
 
 void
-Clef_item::read(String t)
+Clef_item::read (String t)
 {
-    type_= t;
-    if (type_ == "violin")
-       y_off = 2;
-    if (type_ == "alto")
-       y_off = 4;
-    if (type_ == "tenor")
-       y_off = 6;
-    if (type_ == "bass")
-       y_off = 6;
+  type_= t;
+  if (type_ == "violin")
+    y_off = 2;
+  if (type_ == "alto")
+    y_off = 4;
+  if (type_ == "tenor")
+    y_off = 6;
+  if (type_ == "bass")
+    y_off = 6;
 }
 void
-Clef_item::read(Clef_engraver const &k)
+Clef_item::read (Clef_engraver const &k)
 {
-    read(k.clef_type_str_);
+  read (k.clef_type_str_);
 }
 
 Molecule*
-Clef_item::brew_molecule_p()const
+Clef_item::brew_molecule_p() const
 {
-    String t = type_;
-    if  (change_b_)
-       t += "_change";
-    Symbol s = paper()->lookup_l()->clef(t);
-    Molecule*output = new Molecule(Atom(s));
-    output->translate_y( paper()->internote_f() * y_off);
-    return output;
+  String t = type_;
+  if  (change_b_)
+    t += "_change";
+  Atom s = paper()->lookup_l ()->clef (t);
+  Molecule*output = new Molecule (Atom (s));
+  output->translate (paper()->internote_f () * y_off, Y_AXIS);
+  return output;
 }