Imported Upstream version 2.14.2

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

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index a59d5fb756c87803aecf6fc2649d9e619504faee..5fae21fc34f9e4704d6561ad0637158c193b56fc 100644 (file)
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -1,9 +1,20 @@
 /*
-  hyphen-spanner.cc -- implement Hyphen_spanner
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2003--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2003--2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "lyric-hyphen.hh"
@@ -13,15 +24,16 @@
 #include "output-def.hh"
 #include "paper-column.hh"
 #include "moment.hh"
+#include "spanner.hh"
 
 /*
   TODO: should extract hyphen dimensions or hyphen glyph from the
   font.
  */
 
-MAKE_SCHEME_CALLBACK (Hyphen_spanner, print, 1);
+MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1);
 SCM
-Hyphen_spanner::print (SCM smob)
+Lyric_hyphen::print (SCM smob)
 {
   Spanner *me = unsmob_spanner (smob);
   Drul_array<Item *> bounds (me->get_bound (LEFT),
@@ -47,7 +59,7 @@ Hyphen_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  Real lt = me->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 font_size_step = robust_scm2double (me->get_property ("font-size"), 0.0);
   Real h = robust_scm2double (me->get_property ("height"), 0.5)
@@ -102,9 +114,9 @@ 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);
 
@@ -117,7 +129,7 @@ Hyphen_spanner::set_spacing_rods (SCM smob)
     {
       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];
+       r.distance_ += -d * r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d];
     }
   while (flip (&d) != LEFT);
 
@@ -128,15 +140,17 @@ Hyphen_spanner::set_spacing_rods (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-ADD_INTERFACE (Hyphen_spanner, "lyric-hyphen-interface",
-              "A centered hyphen is a simple line between lyrics used to divide syllables",
+ADD_INTERFACE (Lyric_hyphen,
+              "A centered hyphen is simply a line between lyrics used to"
+              " divide syllables.",
 
-              /* props */
-              "padding "
-              "thickness "
-              "height "
+              /* properties */
               "dash-period "
-              "minimum-length "
+              "height "
+              "length "
               "minimum-distance "
-              "length");
+              "minimum-length "
+              "padding "
+              "thickness "
+              );