* scm/define-grob-properties.scm: remove 'type

[lilypond.git] / lily / hyphen-spanner.cc

diff --git a/lily/hyphen-spanner.cc b/lily/hyphen-spanner.cc
index c222091ef45a55af3243c9f72c7e16b54b1e6c4f..09986ee206890d3e3a30753f8e2aa33a539b56d5 100644 (file)
--- a/lily/hyphen-spanner.cc
+++ b/lily/hyphen-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999 Glen Prideaux <glenprideaux@iname.com>
+  (c)  1999--2003 Glen Prideaux <glenprideaux@iname.com>
 
  (adapted from lyric-extender)
 */
@@ -24,7 +24,7 @@ MAKE_SCHEME_CALLBACK (Hyphen_spanner,brew_molecule,1)
 SCM 
 Hyphen_spanner::brew_molecule (SCM smob)
 {
-  Spanner * sp = dynamic_cast<Spanner*> (unsmob_grob (smob));
+  Spanner * sp = unsmob_spanner (smob);
 
   Grob * common = sp;
   Direction d = LEFT;
@@ -45,7 +45,7 @@ Hyphen_spanner::brew_molecule (SCM smob)
     }
   while (flip (&d) != LEFT);
   
-  Real lt = sp->paper_l ()->get_var ("stafflinethickness");
+  Real lt = sp->get_paper ()->get_var ("linethickness");
   Real th = gh_scm2double (sp->get_grob_property ("thickness")) * lt ;
   Real h = gh_scm2double (sp->get_grob_property ("height"));
 
@@ -80,7 +80,7 @@ Hyphen_spanner::brew_molecule (SCM smob)
          the offset for stuff */
       /* This test for being on the first column has been shamelessly
          ripped from spanner.cc */
-      Paper_column *sc = dynamic_cast<Paper_column*> (sp->get_bound (LEFT)->column_l ());
+      Paper_column *sc = dynamic_cast<Paper_column*> (sp->get_bound (LEFT)->get_column ());
       if (sc != NULL &&
          sc->break_status_dir () == RIGHT)
        {
@@ -105,12 +105,20 @@ Hyphen_spanner::brew_molecule (SCM smob)
 void
 Hyphen_spanner::set_textitem (Direction d, Grob* b)
 {
-  elt_l_->set_bound (d, b);
-  elt_l_->add_dependency (b);
+  elt_->set_bound (d, b);
+  elt_->add_dependency (b);
 }
 
 Hyphen_spanner::Hyphen_spanner (Spanner*s)
 {
-  elt_l_ = s;
+  elt_ = s;
 }
 
+
+
+ADD_INTERFACE (Hyphen_spanner, "lyric-hyphen-interface",
+  "A centred hyphen is a simple line between lyrics used to divide "
+"syllables.   The length of the hyphen line should stretch based on the "
+"size of the gap between syllables.",
+  "thickness height minimum-length maximum-length word-space");
+