doc string.

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index fc2b4f0dc8e588f5038034b0a1a3252ae725618f..c90a2837263658ef493f8ed00cc2ad7029a57b6a 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "span-bar.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "warn.hh"
 #include "axis-group-interface.hh"
 #include "group-interface.hh"
@@ -25,11 +25,11 @@ Span_bar::add_bar (Grob*me, Grob*b)
   me->add_dependency (b);
 }
 
-MAKE_SCHEME_CALLBACK (Span_bar,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Span_bar,print,1);
 
 /* Limitations/Bugs:
 
-   (1) Elements from 'me->get_grob_property ("elements")' must be
+   (1) Elements from 'me->get_property ("elements")' must be
    ordered according to their y coordinates relative to their common
    axis group parent.  Otherwise, the computation goes mad.
 
@@ -46,10 +46,10 @@ MAKE_SCHEME_CALLBACK (Span_bar,brew_molecule,1);
 /* This routine was originally by Juergen Reuter, but it was a on the
    bulky side. Rewritten by Han-Wen. */
 SCM
-Span_bar::brew_molecule (SCM smobbed_me) 
+Span_bar::print (SCM smobbed_me) 
 {
   Grob *me = unsmob_grob (smobbed_me);
-  SCM first_elt = me->get_grob_property ("elements");
+  SCM first_elt = me->get_property ("elements");
 
   /* compute common refpoint of elements */
   Grob *refp = me;
@@ -61,7 +61,7 @@ Span_bar::brew_molecule (SCM smobbed_me)
     }
 
   Span_bar::evaluate_glyph (me);
-  SCM glyph = me->get_grob_property ("glyph");
+  SCM glyph = me->get_property ("glyph");
 
   /* glyph may not be a string, when ME is killed by Hara Kiri in
     between. */
@@ -71,7 +71,7 @@ Span_bar::brew_molecule (SCM smobbed_me)
   String glyph_string = ly_scm2string (glyph);
 
   /* compose span_bar_mol */
-  Molecule span_bar_mol;
+  Stencil span_bar_mol;
 
   Interval prev_extent;
   for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts))
@@ -93,11 +93,11 @@ Span_bar::brew_molecule (SCM smobbed_me)
            }
          else
            {
-             Molecule interbar = Bar_line::compound_barline (staff_bar,
+             Stencil interbar = Bar_line::compound_barline (staff_bar,
                                                              glyph_string,
                                                              l.length ());
              interbar.translate_axis (l.center (), Y_AXIS);
-             span_bar_mol.add_molecule (interbar);
+             span_bar_mol.add_stencil (interbar);
            }
        }
       prev_extent = ext;
@@ -116,12 +116,12 @@ Span_bar::width_callback (SCM element_smob, SCM scm_axis)
   Grob *se = unsmob_grob (element_smob);
   Axis a = (Axis) gh_scm2int (scm_axis);
   assert (a == X_AXIS);
-  String gl = ly_scm2string (se->get_grob_property ("glyph"));
+  String gl = ly_scm2string (se->get_property ("glyph"));
 
   /*
     urg.
   */
-  Molecule m = Bar_line::compound_barline (se, gl, 40 PT);
+  Stencil m = Bar_line::compound_barline (se, gl, 40 PT);
   
   return ly_interval2scm (m.extent (X_AXIS));
 }
@@ -149,7 +149,7 @@ Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis)
   assert (a == Y_AXIS);
   Interval i (get_spanned_interval (me));
 
-  /* Bar_line::brew_molecule delivers a barline of y-extent (-h/2,h/2), so
+  /* Bar_line::print delivers a barline of y-extent (-h/2,h/2), so
      we have to translate ourselves to be in the center of the 
      interval that we span. */
   if (i.is_empty ())
@@ -167,7 +167,7 @@ Span_bar::evaluate_empty (Grob*me)
   /* TODO: filter all hara-kiried out of ELEMENS list, and then
      optionally do suicide. Call this cleanage function from
      center_on_spanned_callback () as well. */
-  if (!gh_pair_p (me->get_grob_property ("elements")))
+  if (!gh_pair_p (me->get_property ("elements")))
     {
       me->suicide ();
     }
@@ -176,17 +176,16 @@ Span_bar::evaluate_empty (Grob*me)
 void
 Span_bar::evaluate_glyph (Grob*me)
 {
-  SCM elts = me->get_grob_property ("elements");
-  SCM glyph_symbol = ly_symbol2scm ("glyph");
-  SCM gl = SCM_EOL;
+  SCM gl = me->get_property ("glyph");
 
-  while (gh_pair_p (elts))
+  if (gh_string_p (gl))
+    return ;
+  
+  for (SCM s = me->get_property ("elements");
+       !gh_string_p (gl) && gh_pair_p (s); s = gh_cdr (s))
     {
-      gl = unsmob_grob (gh_car (elts))
-       ->internal_get_grob_property (glyph_symbol);
-      if (gh_string_p (gl))
-       break;
-      elts =gh_cdr (elts);
+      gl = unsmob_grob (gh_car (s))
+       ->get_property ("glyph");
     }
 
   if (!gh_string_p (gl))
@@ -210,9 +209,9 @@ Span_bar::evaluate_glyph (Grob*me)
     }
 
   gl = scm_makfrom0str (type.to_str0 ());
-  if (scm_equal_p (me->internal_get_grob_property (glyph_symbol), gl)
+  if (scm_equal_p (me->get_property ("glyph"), gl)
       != SCM_BOOL_T)
-    me->internal_set_grob_property (glyph_symbol, gl);
+    me->set_property ("glyph", gl);
 }
 
 Interval
@@ -241,7 +240,8 @@ Span_bar::get_bar_size (SCM smob)
 
 
 ADD_INTERFACE (Span_bar,"span-bar-interface",
-  "A bar line that spans other barlines (typically used to get cross-staff barlines.",
-  "");
+  "A bar line that spanned between other barlines. This interface is "
+              " used for  bar lines that connect different staves.",
+  "elements");