X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=b8afd7718c4ee3e194155488f4bd87291f82d5ea;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b80fcaa7d0a7b6699c5016bfffc3629ecd5b9414;hpb=c0e85db728feff5de2e379d7631f146e0545a89e;p=lilypond.git

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index b80fcaa7d0..b8afd7718c 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2003--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2003--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include "lyric-hyphen.hh"
 
-
+#include "axis-group-interface.hh"
 #include "lookup.hh"
 #include "output-def.hh"
 #include "paper-column.hh"
@@ -35,44 +35,32 @@ MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1);
 SCM
 Lyric_hyphen::print (SCM smob)
 {
-
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = Spanner::unsmob (smob);
   Drul_array<Item *> bounds (me->get_bound (LEFT),
-			     me->get_bound (RIGHT));
-
-  /* No hyphen should be printed under a grace note at the start
-     of a line if the grace's main note starts a new syllable.  */
-
-  if (Paper_column::when_mom (bounds[LEFT]->get_column ()).grace_part () != Rational (0)
-      && Paper_column::when_mom (bounds[LEFT]->get_column ()).main_part ()
-      == Paper_column::when_mom (bounds[RIGHT]->get_column ()).main_part ())
-    return SCM_EOL;
+                             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[RIGHT]->get_column ())))
     return SCM_EOL;
 
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
 
   Interval span_points;
-  Direction d = LEFT;
-  Drul_array<bool> broken;
-  do
+  for (LEFT_and_RIGHT (d))
     {
-      Interval iv = bounds[d]->extent (common, X_AXIS);
+      Interval iv = Axis_group_interface::generic_bound_extent (bounds[d], common, X_AXIS);
 
       span_points[d] = iv.is_empty ()
-	? bounds[d]->relative_coordinate (common, X_AXIS)
-	: iv[-d];
+                       ? bounds[d]->relative_coordinate (common, X_AXIS)
+                       : iv[-d];
     }
-  while (flip (&d) != LEFT);
 
   Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt;
   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);
+           * pow (2.0, font_size_step / 6.0);
 
   // interval?
 
@@ -127,20 +115,18 @@ MAKE_SCHEME_CALLBACK (Lyric_hyphen, set_spacing_rods, 1);
 SCM
 Lyric_hyphen::set_spacing_rods (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = Grob::unsmob (smob);
 
   Rod r;
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
   r.distance_ = robust_scm2double (me->get_property ("minimum-distance"), 0);
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       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];
+        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])
@@ -150,15 +136,16 @@ Lyric_hyphen::set_spacing_rods (SCM smob)
 }
 
 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 "
-	       );
+               "A centered hyphen is simply a line between lyrics used to"
+               " divide syllables.",
+
+               /* properties */
+               "dash-period "
+               "height "
+               "length "
+               "minimum-distance "
+               "minimum-length "
+               "padding "
+               "thickness "
+              );
+