* Documentation/user/refman.itely (Automatic note splitting):

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

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index e959395fb49781d2ea07b6ba97bbe707f6710186..bf2205f46fea08f9c60e669aed798e9f8c1c6390 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -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,7 +66,7 @@ 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_realvar (ly_symbol2scm ("linethickness"));  
+  Paper_def * paper =me->get_paper ();
   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
@@ -88,18 +89,16 @@ Volta_bracket_interface::brew_molecule (SCM smob)
     }
 
   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);