X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=2c3816d1d4f1ce69afa2e68ce240c36a2055408e;hb=cc483d3cb2ca605cd3c5ae6349f15fe27a94630c;hp=4bafc7e508c82353fabc5bd2663f220c4cb9698b;hpb=eb72c0f066957c3e71d336db0f72814e34d3964d;p=lilypond.git

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 4bafc7e508..2c3816d1d4 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -1,9 +1,9 @@
 /*
-  hyphen-spanner.cc -- implement Hyphen_spanner
+  hyphen-spanner.cc -- implement Lyric_hyphen
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lyric-hyphen.hh"
@@ -13,17 +13,24 @@
 #include "output-def.hh"
 #include "paper-column.hh"
 #include "moment.hh"
+#include "spanner.hh"
 
-MAKE_SCHEME_CALLBACK (Hyphen_spanner, print, 1)
-  SCM
-Hyphen_spanner::print (SCM smob)
+/*
+  TODO: should extract hyphen dimensions or hyphen glyph from the
+  font.
+ */
+
+MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1);
+SCM
+Lyric_hyphen::print (SCM smob)
 {
   Spanner *me = unsmob_spanner (smob);
   Drul_array<Item *> bounds (me->get_bound (LEFT),
 			     me->get_bound (RIGHT));
 
   if (bounds[LEFT]->break_status_dir ()
-      && Paper_column::when_mom (bounds[LEFT]) == Paper_column::when_mom (bounds[RIGHT]->get_column ()))
+      && (Paper_column::when_mom (bounds[LEFT])
+	  == Paper_column::when_mom (bounds[RIGHT]->get_column ())))
     return SCM_EOL;
 
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
@@ -41,9 +48,11 @@ Hyphen_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt;
-  Real h = robust_scm2double (me->get_property ("height"), 0.5);
+  Real font_size_step = robust_scm2double (me->get_property ("font-size"), 0.0);
+  Real h = robust_scm2double (me->get_property ("height"), 0.5)
+    * pow (2.0, font_size_step / 6.0);
 
   // interval?
 
@@ -94,39 +103,43 @@ Hyphen_spanner::print (SCM smob)
   return total.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Hyphen_spanner, set_spacing_rods, 1);
+MAKE_SCHEME_CALLBACK (Lyric_hyphen, set_spacing_rods, 1);
 SCM
-Hyphen_spanner::set_spacing_rods (SCM smob)
+Lyric_hyphen::set_spacing_rods (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
   Rod r;
   Spanner *sp = dynamic_cast<Spanner *> (me);
-  r.distance_
-    = robust_scm2double (me->get_property ("minimum-length"), 0);
 
-  if (r.distance_ > 0.0)
+  r.distance_ = robust_scm2double (me->get_property ("minimum-distance"), 0);
+  Direction d = LEFT;
+  do
     {
-      Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
-      r.distance_ += 2*padding;
-      Direction d = LEFT;
-      do
-	{
-	  r.item_drul_[d] = sp->get_bound (d);
-	  if (r.item_drul_[d])
-	    r.distance_ += r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d];
-	}
-      while (flip (&d) != LEFT);
-
-      if (r.item_drul_[LEFT]
-	  && r.item_drul_[RIGHT])
-	r.add_to_cols ();
+      r.item_drul_[d] = sp->get_bound (d);
+      if (r.item_drul_[d])
+	r.distance_ += -d * r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d];
     }
+  while (flip (&d) != LEFT);
+
+  if (r.item_drul_[LEFT]
+      && r.item_drul_[RIGHT])
+    r.add_to_cols ();
 
   return SCM_UNSPECIFIED;
 }
 
-ADD_INTERFACE (Hyphen_spanner, "lyric-hyphen-interface",
-	       "A centred hyphen is a simple line between lyrics used to divide syllables",
-	       "padding thickness height dash-period minimum-length length");
+ADD_INTERFACE (Lyric_hyphen,
+	       "A centered hyphen is simply a line between lyrics used to"
+	       " divide syllables.",
+
+	       /* properties */
+	       "dash-period "
+	       "height "
+	       "length "
+	       "minimum-distance "
+	       "minimum-length "
+	       "padding "
+	       "thickness "
+	       );