Uniformize, internalize.

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

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 0f5460b4b8e599af3b589a94c7b71bded9cb9214..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)
 {
@@ -44,7 +41,7 @@ Hyphen_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
   
-  Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  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);
 
@@ -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)
 {
@@ -100,7 +97,7 @@ Hyphen_spanner::set_spacing_rods (SCM smob)
   r.distance_ =
     robust_scm2double (me->get_property ("minimum-length"), 0);
 
-  Direction d=LEFT;
+  Direction d = LEFT;
   do
     {
       r.item_l_drul_[d] = sp->get_bound (d);