X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-alignment-interface.cc;h=a9205fb3093d151fd890b259a357e4953071da1f;hb=fc2b57cd64badbd76b3776742821808321fe3314;hp=c40219b8d23e72fbe5fbfc573da49b231f71bdd6;hpb=3846cd517023c7e63379eefb8dde3a8de3b8fbe4;p=lilypond.git

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index c40219b8d2..a9205fb309 100644
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -1,9 +1,20 @@
 /*
-  break-align-interface.cc -- implement Break_alignment_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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/>.
 */
 
 
@@ -281,7 +292,8 @@ Break_alignable_interface::self_align_callback (SCM grob)
 	{
 	  if (elements[i]->get_property ("break-align-symbol") == sym)
 	    {
-	      if (Item::break_visible (elements[i]))
+	      if (Item::break_visible (elements[i])
+		  && !elements[i]->extent (elements[i], X_AXIS).is_empty ())
 		{
 		  break_aligned_grob = i;
 		  goto found_break_aligned_grob; /* ugh. need to break out of 2 loops */
@@ -334,15 +346,19 @@ Break_aligned_interface::calc_extent_aligned_anchor (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real alignment = robust_scm2double (me->get_property ("break-align-anchor-alignment"), 0.0);
+  Interval iv = me->extent (me, X_AXIS);
 
-  return scm_from_double (me->extent (me, X_AXIS).linear_combination (alignment));
+  if (isinf (iv[LEFT]) && isinf (iv[RIGHT])) /* avoid NaN */
+    return scm_from_double (0.0);
+
+  return scm_from_double (iv.linear_combination (alignment));
 }
 
 MAKE_SCHEME_CALLBACK (Break_aligned_interface, calc_break_visibility, 1)
 SCM
 Break_aligned_interface::calc_break_visibility (SCM smob)
 {
-  /* a BreakAlignGroup is break-visible iff it has one element that is break-visible */
+  /* a BreakAlignGroup is break-visible if it has one element that is break-visible */
   Grob *me = unsmob_grob (smob);
   SCM ret = scm_c_make_vector (3, SCM_EOL);
   extract_grob_set (me, "elements", elts);
@@ -361,37 +377,39 @@ Break_aligned_interface::calc_break_visibility (SCM smob)
 }
 
 ADD_INTERFACE (Break_alignable_interface,
-	       "Object that is aligned on a break aligment. ",
+	       "Object that is aligned on a break alignment.",
 
 	       /* properties */
 	       "break-align-symbols "
-	       )
-
-
+	       "non-break-align-symbols "
+	       );
 
 ADD_INTERFACE (Break_aligned_interface,
 	       "Items that are aligned in prefatory matter.\n"
 	       "\n"
-	       "The spacing of these items is controlled by the @code{space-alist}\n"
-	       "property. It contains a list @code{break-align-symbol}s with a specification\n"
-	       "of the associated space. The space specification can be "
+	       "The spacing of these items is controlled by the"
+	       " @code{space-alist} property.  It contains a list"
+	       " @code{break-align-symbol}s with a specification of the"
+	       " associated space.  The space specification can be\n"
+	       "\n"
 	       "@table @code\n"
 	       "@item (minimum-space . @var{spc}))\n"
-	       "  Pad space until the distance is @var{spc}\n"
+	       "Pad space until the distance is @var{spc}.\n"
 	       "@item (fixed-space . @var{spc})\n"
-	       "  Set a fixed space\n"
+	       "Set a fixed space.\n"
 	       "@item (semi-fixed-space . @var{spc})\n"
-	       "  Set a space. Half of it is fixed and half is stretchable. \n"
-	       "(does not work at start of line. fixme)\n"
+	       "Set a space.  Half of it is fixed and half is stretchable."
+	       " (does not work at start of line. fixme)\n"
 	       "@item (extra-space . @var{spc})\n"
-	       "  Add @var{spc} amount of space.\n"
+	       "Add @var{spc} amount of space.\n"
 	       "@end table\n"
 	       "\n"
-	       "Special keys for the alist are @code{first-note} and @code{next-note}, signifying\n"
-	       "the first note on a line, and the next note halfway a line.\n"
+	       "Special keys for the alist are @code{first-note} and"
+	       " @code{next-note}, signifying the first note on a line, and"
+	       " the next note halfway a line.\n"
 	       "\n"
-	       "Rules for this spacing are much more complicated than this. \n"
-	       "See [Wanske] page 126 -- 134, [Ross] pg 143 -- 147\n",
+	       "Rules for this spacing are much more complicated than this."
+	       "  See [Wanske] page 126--134, [Ross] page 143--147.",
 
 	       /* properties */ 
 	       "break-align-anchor "
@@ -401,8 +419,10 @@ ADD_INTERFACE (Break_aligned_interface,
 	       );
 
 ADD_INTERFACE (Break_alignment_interface,
-	       "The object that performs break aligment. See @ref{break-aligned-interface}.",
+	       "The object that performs break alignment.  See"
+	       " @ref{break-aligned-interface}.",
 
 	       /* properties */
 	       "positioning-done "
-	       "break-align-orders");
+	       "break-align-orders "
+	       );