* Documentation/topdocs/INSTALL.texi (Top): bump GUILE

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 1c3d2fd1a45c378ecd14593a58330dcbc4159a70..ed7f4193d9aebc6233cfa638077051d259467dd6 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <string.h>
 
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
 #include "paper-column.hh"
@@ -36,22 +36,22 @@ 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 last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
+  bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner*)me);
+
+  bool broken_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));
+  bool no_vertical_start = orig_span && !broken_first_bracket;
+  bool no_vertical_end = orig_span && !broken_last_bracket;
+  SCM s = me->get_grob_property ("bars");
+  Grob * endbar =   unsmob_grob (ly_car (s));
   SCM glyph = endbar->get_grob_property("glyph");
   
   String str;
@@ -60,12 +60,12 @@ Volta_bracket_interface::brew_molecule (SCM smob)
   else
     return SCM_EOL;
   
-  const char* cs = str.ch_C();
+  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 ("linethickness");  
+  Real staff_thick = me->get_paper ()->get_var ("linethickness");  
   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
@@ -76,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
@@ -102,14 +102,17 @@ Volta_bracket_interface::brew_molecule (SCM smob)
   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 = me->get_property_alist_chain (SCM_EOL);
 
-  Molecule num = Text_item::text2molecule (me, text, properties);
+  if (!orig_span || broken_first_bracket)
+    {
+      SCM text = me->get_grob_property ("text");
+      SCM properties = me->get_property_alist_chain (SCM_EOL);
+      
+      Molecule num = Text_item::interpret_new_markup (smob, properties, text);
 
-  mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
-                  - 1.0);
+      mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
+                      - 1.0, 0);
+    }
   mol.translate_axis (left, X_AXIS);
   return mol.smobbed_copy ();
 }