patch::: 1.3.9.hwn2

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

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 431d2aed374546f2bd74ca68db59e3327e7a87d1..f1e641b78230c07a70105bffbe24fd5d221719fc 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -12,17 +12,18 @@
 #include "lookup.hh"
 #include "molecule.hh"
 #include "note-column.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "bar.hh"
 #include "paper-def.hh"
 #include "volta-spanner.hh"
 #include "stem.hh"
-
+#include "dimension-cache.hh"
 #include "pointer.tcc"
 
 Volta_spanner::Volta_spanner ()
 {
   last_b_ = false;
+  dim_cache_ [Y_AXIS]->set_callback (dim_callback);
 }
 
 Molecule*
@@ -30,31 +31,39 @@ Volta_spanner::do_brew_molecule_p () const
 {
   Molecule* mol_p = new Molecule;
 
-  if (!column_arr_.size ())
+  if (!bar_arr_.size ())
     return mol_p;
-
-
-  Real internote_f = paper_l ()->get_realvar (interline_scm_sym)/2.0;
+  
+  bool no_vertical_start = false;
+  bool no_vertical_end = last_b_;
+  Spanner *orig_span =  dynamic_cast<Spanner*> (original_l_);
+  if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)this))
+    no_vertical_start = true;
+  if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)this))
+    no_vertical_end = true;
+  if (bar_arr_.top ()->type_str_.length_i () > 1)
+    no_vertical_end = false;
+
+  Real interline_f = paper_l ()->get_var ("interline");
+  Real internote_f = interline_f/2;
+  Real t = paper_l ()->get_var ("volta_thick");
 
   Real dx = internote_f;
-  Real w = extent (X_AXIS).length () - dx;
-  Molecule volta (lookup_l ()->volta (w, last_b_));
-  Real h = volta.dim_.y ().length ();
+  Real w = extent (X_AXIS).length () - dx - get_broken_left_end_align ();
+  Real h = paper_l()->get_var ("volta_spanner_height");
+  Molecule volta (lookup_l ()->volta (h, w, t, no_vertical_start, no_vertical_end));
 
   
-  Molecule num (lookup_l ()->text ("volta", number_str_));
-  Real dy = column_arr_.top ()->extent (Y_AXIS) [UP] > 
-     column_arr_[0]->extent (Y_AXIS) [UP];
+  Molecule num (lookup_l ()->text ("volta", number_str_, paper_l ()));
+  Real dy = bar_arr_.top ()->extent (Y_AXIS) [UP] > 
+     bar_arr_[0]->extent (Y_AXIS) [UP];
   dy += 2 * h;
 
-  /*
-    UGH.  Must use extent  ()[dir_]
-   */
   for (int i = 0; i < note_column_arr_.size (); i++)
-    dy = dy >? note_column_arr_[i]->extent (Y_AXIS).max ();
+    dy = dy >? note_column_arr_[i]->extent (Y_AXIS)[BIGGER];
   dy -= h;
 
-  Molecule two (lookup_l ()->text ("number", "2"));
+  Molecule two (lookup_l ()->text ("number", "2", paper_l ()));
   Real gap = two.dim_.x ().length () / 2;
   Offset off (num.dim_.x ().length () + gap, 
              h / internote_f - gap);
@@ -68,28 +77,36 @@ Volta_spanner::do_brew_molecule_p () const
 void
 Volta_spanner::do_add_processing ()
 {
-  if (column_arr_.size ())
+  if (bar_arr_.size ())
     {
-      set_bounds (LEFT, column_arr_[0]);
-      set_bounds (RIGHT, column_arr_.top ());  
+      set_bounds (LEFT, bar_arr_[0]);
+      set_bounds (RIGHT, bar_arr_.top ());  
     }
 }
-  
+
+/*
+    Originally the following comment existed here
+    "in most cases, it's a lot better not no have height...",
+    but problems existed with collision between volta spanner
+    and above staff or lyrics for multi-staff music, so the proper
+    height is now being returned. Additional space should still
+    be added elsewhere so lyrics from above staff do not sit on
+    volta spanner. (Roy R. Rankin)
+*/
 Interval
-Volta_spanner::do_height () const
+Volta_spanner::dim_callback (Dimension_cache const *c)
 {
-  /*
-    in most cases, it's a lot better not no have height...
-  */
-  Interval i;
-  return i;
+  Volta_spanner * v = dynamic_cast<Volta_spanner*> (c->element_l ());
+  Real h = v->paper_l()->get_var ("volta_spanner_height") * 2.;
+  return Interval (0., h);
 }
 
 void
 Volta_spanner::do_post_processing ()
 {
-  if (column_arr_.size())
-    translate_axis (column_arr_[0]->extent (Y_AXIS)[UP], Y_AXIS);
+  if (bar_arr_.size())
+    translate_axis (bar_arr_[0]->extent (Y_AXIS)[UP], Y_AXIS);
+  translate_axis (get_broken_left_end_align (), X_AXIS);
 }
 
 void
@@ -98,13 +115,13 @@ Volta_spanner::do_substitute_element_pointer (Score_element* o, Score_element* n
   if (Note_column* c = dynamic_cast <Note_column*> (o))
     note_column_arr_.substitute (c, dynamic_cast<Note_column*> (n));
   else if (Bar* c = dynamic_cast <Bar*> (o))
-    column_arr_.substitute (c, dynamic_cast<Bar*> (n));
+    bar_arr_.substitute (c, dynamic_cast<Bar*> (n));
 }
   
 void
-Volta_spanner::add_column (Bar* c)
+Volta_spanner::add_bar  (Bar* c)
 {
-  column_arr_.push (c);
+  bar_arr_.push (c);
   add_dependency (c);
 }
 
@@ -115,3 +132,4 @@ Volta_spanner::add_column (Note_column* c)
   add_dependency (c);
 }
 
+