* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 3691dedc624c126f1370a5e02297bb735d1cd789..f98d5c446f84ead7e25d9ac8429a4bf7447f559c 100644 (file)
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -3,22 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "lyric-hyphen.hh"
+
 #include <math.h>
 
-#include "box.hh"
 #include "lookup.hh"
-#include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "paper-column.hh"
-#include "spanner.hh"
-#include "item.hh"
-#include "lyric-hyphen.hh"
 #include "moment.hh"
 
-MAKE_SCHEME_CALLBACK (Hyphen_spanner,print,1)
+MAKE_SCHEME_CALLBACK (Hyphen_spanner, print, 1)
 SCM 
 Hyphen_spanner::print (SCM smob)
 {
@@ -27,7 +24,7 @@ Hyphen_spanner::print (SCM smob)
                            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);
@@ -44,14 +41,14 @@ Hyphen_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
   
-  Real lt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
-  Real th = robust_scm2double (me->get_grob_property ("thickness"), 1) * lt ;
-  Real h = robust_scm2double (me->get_grob_property ("height"), 0.5);
+  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt ;
+  Real h = robust_scm2double (me->get_property ("height"), 0.5);
 
   // interval?
   
-  Real dp = robust_scm2double (me->get_grob_property ("dash-period"), 1.0);
-  Real dl = robust_scm2double (me->get_grob_property ("length"), .5 );
+  Real dp = robust_scm2double (me->get_property ("dash-period"), 1.0);
+  Real dl = robust_scm2double (me->get_property ("length"), .5 );
 
   if (dp < dl)
     dp = 1.5 * dl;
@@ -73,7 +70,7 @@ Hyphen_spanner::print (SCM smob)
 
   space_left = space_left >? 0.0;
   
-  Box b (Interval (0, dl), Interval (h,h+th));
+  Box b (Interval (0, dl), Interval (h, h+th));
   Stencil dash_mol (Lookup::round_filled_box (b, 0.8 * lt));
 
   Stencil total;
@@ -89,7 +86,7 @@ Hyphen_spanner::print (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK (Hyphen_spanner,set_spacing_rods,1);
+MAKE_SCHEME_CALLBACK (Hyphen_spanner, set_spacing_rods, 1);
 SCM
 Hyphen_spanner::set_spacing_rods (SCM smob)
 {
@@ -98,14 +95,21 @@ Hyphen_spanner::set_spacing_rods (SCM smob)
   Rod r;
   Spanner*sp = dynamic_cast<Spanner*> (me);
   r.distance_ =
-    robust_scm2double (me->get_grob_property ("minimum-length"), 0);
-  Direction d=LEFT;
-  do {
-    r.item_l_drul_[d] = sp->get_bound (d);
-    r.distance_ += r.item_l_drul_[d]->extent (r.item_l_drul_[d], X_AXIS)[-d];
-  } while (flip (&d) != LEFT);
-
-  r.add_to_cols ();
+    robust_scm2double (me->get_property ("minimum-length"), 0);
+
+  Direction d = LEFT;
+  do
+    {
+      r.item_l_drul_[d] = sp->get_bound (d);
+      if (r.item_l_drul_[d])
+       r.distance_ += r.item_l_drul_[d]->extent (r.item_l_drul_[d], X_AXIS)[-d];
+    }
+  while (flip (&d) != LEFT);
+
+  if (r.item_l_drul_[LEFT]
+      && r.item_l_drul_[RIGHT])
+    r.add_to_cols ();
+  
   return SCM_UNSPECIFIED;
 }