release: 1.5.46

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

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 3046205792b03c30032affb687206d779f40e467..8b3faa777be1ce98cebbf199aaed58dd9ad5a593 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -3,9 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include <string.h>
 
 #include "box.hh"
 #include "debug.hh"
@@ -35,47 +36,64 @@ Volta_spanner::set_interface (Grob*)
   
 */
 
-MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Volta_spanner,brew_molecule,1);
 SCM
 Volta_spanner::brew_molecule (SCM smob) 
 {
   Grob *me = unsmob_grob (smob);
   Link_array<Item> bar_arr
-    = Pointer_group_interface__extract_elements (me, (Item*)0, "bars");
+    = Pointer_group_interface__extract_grobs (me, (Item*)0, "bars");
 
   if (!bar_arr.size ())
     return SCM_EOL;
 
-  bool no_vertical_start = false;
-  bool no_vertical_end = to_boolean (me->get_grob_property ("last-volta"));
   Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_l_);
-  if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)me))
-    no_vertical_start = true;
-  if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)me))
-    no_vertical_end = true;
 
-#if 0
-  // FIXME
-  if (bar_arr.top ()->me->get_grob_property (type_str_.length_i () > 1)
-    no_vertical_end = false;
-#endif
+  bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me);
+  
+  bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
+
+  bool no_vertical_start = orig_span && !first_bracket;
+  bool no_vertical_end = orig_span && !last_bracket;
+  SCM bars = me->get_grob_property ("bars");
+  Grob * endbar =   unsmob_grob (ly_car (bars));
+  SCM glyph = endbar->get_grob_property("glyph");
+  String str = ly_scm2string(glyph);
+  const char* cs = str.ch_C();
+  no_vertical_end |=
+    (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
+     && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
 
   Real staff_thick = me->paper_l ()->get_var ("stafflinethickness");  
   Real half_space = 0.5;
 
+  Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
+
   /*
-    the volta spanner is attached to the bar-line, which is moved
-    to the right. We don't need to compensate for the left edge.
+    not a start, but really broken in two
    */
-  Real left = 0.0;
-  Real w = dynamic_cast<Spanner*>(me)->spanner_length () - left - half_space;
+  Real left =0.;  
+  if (bound->break_status_dir () == RIGHT)
+  {
+    Paper_column *pc = bound->column_l ();
+    left = pc->extent (pc, X_AXIS)[RIGHT]   - bound->relative_coordinate (pc, X_AXIS);
+  }
+  else
+  {
+    /*
+      the volta spanner is attached to the bar-line, which is moved
+      to the right. We don't need to compensate for the left edge.
+    */
+  }
+
+  Real w = dynamic_cast<Spanner*> (me)->spanner_length () - left - half_space;
   Real h =  gh_scm2double (me->get_grob_property ("height"));
   Real t =  staff_thick * gh_scm2double (me->get_grob_property ("thickness"));
 
   /*
     ugh: should build from line segments.
    */
-  SCM at = (gh_list (ly_symbol2scm ("volta"),
+  SCM at = (scm_list_n (ly_symbol2scm ("volta"),
                     gh_double2scm (h),
                     gh_double2scm (w),
                     gh_double2scm (t),
@@ -85,8 +103,8 @@ Volta_spanner::brew_molecule (SCM smob)
 
   Box b (Interval (0, w), Interval (0, h));
   Molecule mol (b, at);
-  SCM text = me->get_grob_property("text");
-  SCM properties = gh_list (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED);
+  SCM text = me->get_grob_property ("text");
+  SCM properties = scm_list_n (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED);
   Molecule num = Text_item::text2molecule (me, text, properties);
 
   mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
@@ -97,15 +115,15 @@ Volta_spanner::brew_molecule (SCM smob)
 
 
 void
-Volta_spanner::add_bar  (Grob *me, Item* b)
+Volta_spanner::add_bar (Grob *me, Item* b)
 {
-  Pointer_group_interface::add_element(me, "bars",b);
-  Side_position::add_support (me,b);
-  add_bound_item (dynamic_cast<Spanner*>(me), b); 
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("bars"), b);
+  Side_position_interface::add_support (me,b);
+  add_bound_item (dynamic_cast<Spanner*> (me), b); 
 }
 
 void
 Volta_spanner::add_column (Grob*me, Grob* c)
 {
-  Side_position::add_support (me,c);
+  Side_position_interface::add_support (me,c);
 }