catch GUILE errors

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 1705fbf24bbd3ef9fa2f0b3458663d70e24a2537..4bfc99013004a09c3d6334a1cc7fac05ff0a0269 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
 #include "paper-column.hh"
@@ -19,7 +19,7 @@
 #include "group-interface.hh"
 #include "side-position-interface.hh"
 #include "directional-element-interface.hh"
-
+#include "lookup.hh"
 
 /*
   this is too complicated. Yet another version of side-positioning,
@@ -36,30 +36,36 @@ SCM
 Volta_bracket_interface::brew_molecule (SCM smob) 
 {
   Grob *me = unsmob_grob (smob);
-  Link_array<Item> bar_arr
+  Link_array<Item> bars
     = Pointer_group_interface__extract_grobs (me, (Item*)0, "bars");
 
-  if (!bar_arr.size ())
+  if (!bars.size ())
     return SCM_EOL;
 
-  Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_l_);
+  Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_);
 
-  bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me);
+  bool first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner*)me);
   
-  bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
+  bool last_bracket = orig_span && (orig_span->broken_intos_.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 s = me->get_grob_property ("bars");
+  Grob * endbar =   unsmob_grob (ly_car (s));
   SCM glyph = endbar->get_grob_property("glyph");
-  String str = ly_scm2string(glyph);
-  const char* cs = str.ch_C();
+  
+  String str;
+  if (gh_string_p (glyph))
+    str = ly_scm2string(glyph);
+  else
+    return SCM_EOL;
+  
+  const char* cs = str.to_str0 ();
   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 staff_thick = me->get_paper ()->get_var ("linethickness");  
   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
@@ -70,7 +76,7 @@ Volta_bracket_interface::brew_molecule (SCM smob)
   Real left =0.;  
   if (bound->break_status_dir () == RIGHT)
   {
-    Paper_column *pc = bound->column_l ();
+    Paper_column *pc = bound->get_column ();
     left = pc->extent (pc, X_AXIS)[RIGHT]   - bound->relative_coordinate (pc, X_AXIS);
   }
   else
@@ -85,22 +91,21 @@ Volta_bracket_interface::brew_molecule (SCM smob)
   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 = (scm_list_n (ly_symbol2scm ("volta"),
-                    gh_double2scm (h),
-                    gh_double2scm (w),
-                    gh_double2scm (t),
-                    gh_int2scm (no_vertical_start),
-                    gh_int2scm (no_vertical_end),
-                    SCM_UNDEFINED));
-
-  Box b (Interval (0, w), Interval (0, h));
-  Molecule mol (b, at);
+
+  Molecule start,end ;
+  if (!no_vertical_start)
+    start = Lookup::line (t, Offset (0,0), Offset (0, h)); 
+  
+  if (!no_vertical_end)
+    end = Lookup::line (t, Offset (w, 0), Offset (w,h));
+
+  Molecule mol = Lookup::line (t, Offset (0, h), Offset (w,h));
+  mol.add_molecule (start);
+  mol.add_molecule (end);
+  
   SCM text = me->get_grob_property ("text");
-  SCM properties = scm_list_n (me->mutable_property_alist_,
-                              me->immutable_property_alist_,SCM_UNDEFINED);
+  SCM properties = me->get_property_alist_chain (SCM_EOL);
+
   Molecule num = Text_item::text2molecule (me, text, properties);
 
   mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()