release: 1.1.8

[lilypond.git] / lily / volta-spanner.cc

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 884f8c9dd2b6de53429540b814332d74d1860137..86a16e1c324fb04026d01fb23042f05192ba62de 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -11,7 +11,9 @@
 #include "debug.hh"
 #include "lookup.hh"
 #include "molecule.hh"
-#include "note-column.hh"
+//#include "note-column.hh"
+#include "p-col.hh" // urg
+#include "bar.hh"
 #include "p-col.hh"
 #include "paper-def.hh"
 #include "volta-spanner.hh"
@@ -27,9 +29,10 @@ Volta_spanner::Volta_spanner ()
 {
   dir_ = UP;
   last_b_ = false;
-  tdef_p_.set_p (new Text_def);
-  tdef_p_->align_dir_ = CENTER;
-  tdef_p_->style_str_ = "nummer";
+  number_p_.set_p (new Text_def);
+  number_p_->align_dir_ = LEFT;
+  dot_p_.set_p (new Text_def);
+  dot_p_->align_dir_ = LEFT;
 }
 
 Molecule*
@@ -38,13 +41,25 @@ Volta_spanner::brew_molecule_p () const
   Molecule* mol_p = new Molecule;
 
   if (column_arr_.size ()){
-    Real w = width ().length ();
-    Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_]
-      - column_arr_[0]->extent (Y_AXIS) [dir_];
+    Real dx = paper ()->internote_f ();
+    Real w = width ().length () - 2 * dx;
+    Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] > 
+      column_arr_[0]->extent (Y_AXIS) [dir_];
+    dy += 4;
 
-    Atom num (tdef_p_->get_atom (paper (), CENTER));
+    Atom num (number_p_->get_atom (paper (), LEFT));
+    Atom dot (dot_p_->get_atom (paper (), LEFT));
+    Real gap = num.dim_.x ().length () / 2;
+    Offset off (num.dim_.x ().length () + gap, 
+      num.dim_.y ().length () - 4 - gap / paper ()->internote_f ());
+    // urg?
+    off -= Offset (0, num.dim_.y ().length () + gap / paper ()->internote_f ());
+    num.translate (off);
+    dot.translate (off);
     mol_p->add_atom (num);
+    mol_p->add_atom (dot);
     mol_p->add_atom (lookup_l ()->volta (w, last_b_));
+    mol_p->translate (Offset (dx, dy));
   }
   return mol_p;
 }
@@ -57,6 +72,9 @@ Volta_spanner::do_add_processing ()
       set_bounds (LEFT, column_arr_[0]);
       set_bounds (RIGHT, column_arr_.top ());  
     }
+  number_p_->style_str_ = "number-1";
+  dot_p_->text_str_ = ".";
+  dot_p_->style_str_ = "bold";
 }
   
 void
@@ -69,14 +87,17 @@ Volta_spanner::do_post_processing ()
 void
 Volta_spanner::do_substitute_dependency (Score_element* o, Score_element* n)
 {
-  if (Note_column *onc = dynamic_cast <Note_column *> (o))
-    column_arr_.substitute (onc, dynamic_cast<Note_column*> (n));
+//  if (Note_column* c = dynamic_cast <Note_column*> (o))
+//    column_arr_.substitute (c, dynamic_cast<Note_column*> (n));
+  if (Bar* c = dynamic_cast <Bar*> (o))
+    column_arr_.substitute (c, dynamic_cast<Bar*> (n));
 }
   
 void
-Volta_spanner::add_column (Note_column*n)
+//Volta_spanner::add_column (Note_column* c)
+Volta_spanner::add_column (Bar* c)
 {
-  column_arr_.push (n);
-  add_dependency (n);
+  column_arr_.push (c);
+  add_dependency (c);
 }