2003 -> 2004

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index ed7f4193d9aebc6233cfa638077051d259467dd6..01fb504dbc2bd3207c4cf8127f961cc75d93d6ac 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <string.h>
@@ -11,6 +11,7 @@
 #include "box.hh"
 #include "warn.hh"
 #include "font-interface.hh"
+#include "line-interface.hh"
 #include "molecule.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
@@ -65,41 +66,39 @@ Volta_bracket_interface::brew_molecule (SCM smob)
     (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
      && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
 
-  Real staff_thick = me->get_paper ()->get_var ("linethickness");  
+  Paper_def * paper =me->get_paper ();
   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
 
   /*
     not a start, but really broken in two
-   */
+  */
   Real left =0.;  
   if (bound->break_status_dir () == RIGHT)
-  {
-    Paper_column *pc = bound->get_column ();
-    left = pc->extent (pc, X_AXIS)[RIGHT]   - bound->relative_coordinate (pc, X_AXIS);
-  }
+    {
+      Paper_column *pc = bound->get_column ();
+      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.
-    */
-  }
+    {
+      /*
+       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"));
-
+  Real h =  robust_scm2double (me->get_grob_property ("height"), 1);
 
   Molecule start,end ;
   if (!no_vertical_start)
-    start = Lookup::line (t, Offset (0,0), Offset (0, h)); 
+    start = Line_interface::line (me, Offset (0,0), Offset (0, h)); 
   
   if (!no_vertical_end)
-    end = Lookup::line (t, Offset (w, 0), Offset (w,h));
+    end = Line_interface::line (me, Offset (w, 0), Offset (w,h));
 
-  Molecule mol = Lookup::line (t, Offset (0, h), Offset (w,h));
+  Molecule mol = Line_interface::line (me, Offset (0, h), Offset (w,h));
   mol.add_molecule (start);
   mol.add_molecule (end);
 
@@ -107,8 +106,8 @@ Volta_bracket_interface::brew_molecule (SCM smob)
     {
       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);
+      SCM snum  = Text_item::interpret_markup (paper->self_scm (), properties, text);
+      Molecule num = *unsmob_molecule (snum);
 
       mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
                       - 1.0, 0);
@@ -133,6 +132,6 @@ Volta_bracket_interface::add_column (Grob*me, Grob* c)
 }
 
 ADD_INTERFACE (Volta_bracket_interface,"volta-bracket-interface",
-  "Volta bracket with number",
-  "bars thickness height");
+              "Volta bracket with number",
+              "bars thickness height");