lilypond-0.1.15

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index eab94bf65940bdb67c6befcc6cf603b7e8b2b951..65c5ad7253c070cbdd0d3ad43f9ebb631681cf85 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -76,12 +76,12 @@ Local_key_item::brew_molecule_p() const
          octmol= new Molecule;
        }
       lastoct = accs[i].octave_i_;
-      Symbol s =paper()->lookup_l ()->accidental (accs[i].accidental_i_);   
-      Atom a (s);
+      
       Real dy = (accs[i].name_i_ + c0_position) * paper()->internote_f ();
+      Atom a (paper()->lookup_l ()->accidental (accs[i].accidental_i_));
       a.translate (dy, Y_AXIS);
-
-      octmol->add_at_edge (X_AXIS, RIGHT, a);
+      Molecule m(a);
+      octmol->add_at_edge (X_AXIS, RIGHT, m);
     }
 
   if (octmol)

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index e23b3226781ca2d4eb15b55cd4ce9bea8fb8d369..d4bd26f0a99662e2f69a9844080632856103852b 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -9,7 +9,7 @@
 #include "dimen.hh"
 #include "span-bar.hh"
 #include "lookup.hh"
-#include "symbol.hh"
+#include "atom.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "vertical-align-elem.hh"
@@ -55,8 +55,9 @@ Span_bar::set (Vertical_align_element *a)
 Interval
 Span_bar::do_width() const
 {
-  return paper()->lookup_l ()->bar (type_str_, 40 PT).dim.x (); // ugh
+  return paper()->lookup_l ()->bar (type_str_, 40 PT).dim_.x (); // ugh
 }
+
 void
 Span_bar::do_pre_processing()
 {
@@ -85,7 +86,7 @@ Span_bar::do_pre_processing()
     }
 }
 
-Symbol
+Atom
 Span_bar::get_bar_sym (Real dy) const
 {
   return paper()->lookup_l ()->bar (type_str_, dy);
@@ -107,7 +108,7 @@ Span_bar::brew_molecule_p() const
       y_int.unite (y + spanning_l_arr_[i]->height());
     }
 
-  Symbol s = get_bar_sym (y_int.length());
+  Atom s = get_bar_sym (y_int.length());
   Molecule*output = new Molecule (Atom (s));
   output->translate (y_int[-1], Y_AXIS);
   return output;