X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-bracket.cc;h=22abe4babc5c254d2ff8331234a2cd988f8d28e7;hb=59c4bbfd0af56c1def7e1f923f8fd979fbef23d9;hp=bf2205f46fea08f9c60e669aed798e9f8c1c6390;hpb=50a19de991aac1e93d1ff2cda6b30929661e036d;p=lilypond.git

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index bf2205f46f..22abe4babc 100644
--- 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>
@@ -12,9 +12,9 @@
 #include "warn.hh"
 #include "font-interface.hh"
 #include "line-interface.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "text-item.hh"
 #include "volta-bracket.hh"
 #include "group-interface.hh"
@@ -32,17 +32,11 @@
   
 */
 
-MAKE_SCHEME_CALLBACK (Volta_bracket_interface,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Volta_bracket_interface,print,1);
 SCM
-Volta_bracket_interface::brew_molecule (SCM smob) 
+Volta_bracket_interface::print (SCM smob) 
 {
   Grob *me = unsmob_grob (smob);
-  Link_array<Item> bars
-    = Pointer_group_interface__extract_grobs (me, (Item*)0, "bars");
-
-  if (!bars.size ())
-    return SCM_EOL;
-
   Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_);
 
   bool broken_first_bracket = orig_span && (orig_span->broken_intos_[0] == (Spanner*)me);
@@ -51,22 +45,22 @@ Volta_bracket_interface::brew_molecule (SCM smob)
 
   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");
+  SCM s = me->get_property ("bars");
+  Grob * endbar = ly_c_pair_p (s) ?  unsmob_grob (ly_car (s)) : 0;
+  SCM glyph = endbar ? endbar->get_property ("glyph") : SCM_EOL;
   
   String str;
-  if (gh_string_p (glyph))
-    str = ly_scm2string(glyph);
+  if (scm_is_string (glyph))
+    str = ly_scm2string (glyph);
   else
-    return SCM_EOL;
+    str = "|";
   
   const char* cs = str.to_str0 ();
   no_vertical_end |=
-    (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
-     && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
+    (strcmp (cs,":|")!=0 && strcmp (cs,"|:")!=0 && strcmp (cs,"|.")!=0
+     && strcmp (cs,":|:")!=0 && strcmp (cs,".|")!=0);
 
-  Paper_def * paper =me->get_paper ();
+  Output_def * paper =me->get_paper ();
   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
@@ -89,25 +83,25 @@ Volta_bracket_interface::brew_molecule (SCM smob)
     }
 
   Real w = dynamic_cast<Spanner*> (me)->spanner_length () - left - half_space;
-  Real h =  robust_scm2double (me->get_grob_property ("height"), 1);
+  Real h =  robust_scm2double (me->get_property ("height"), 1);
 
-  Molecule start,end ;
+  Stencil start,end ;
   if (!no_vertical_start)
     start = Line_interface::line (me, Offset (0,0), Offset (0, h)); 
   
   if (!no_vertical_end)
     end = Line_interface::line (me, Offset (w, 0), Offset (w,h));
 
-  Molecule mol = Line_interface::line (me, Offset (0, h), Offset (w,h));
-  mol.add_molecule (start);
-  mol.add_molecule (end);
+  Stencil mol = Line_interface::line (me, Offset (0, h), Offset (w,h));
+  mol.add_stencil (start);
+  mol.add_stencil (end);
 
   if (!orig_span || broken_first_bracket)
     {
-      SCM text = me->get_grob_property ("text");
+      SCM text = me->get_property ("text");
       SCM properties = me->get_property_alist_chain (SCM_EOL);
       SCM snum  = Text_item::interpret_markup (paper->self_scm (), properties, text);
-      Molecule num = *unsmob_molecule (snum);
+      Stencil num = *unsmob_stencil (snum);
 
       mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
 		       - 1.0, 0);