X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-spanner.cc;h=74e54e7eac7d308672ecb44e73e8704c37244656;hb=9c371dd6286d4faddffd9ea18a6dd307ee5586bc;hp=53d6ef278b1b4b11a468e744edbbb62fea0fd957;hpb=06c9c603c02f173189c4ba6289e61193633c6e85;p=lilypond.git

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 53d6ef278b..74e54e7eac 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -21,6 +21,7 @@
 #include "paper-score.hh"
 #include "pointer-group-interface.hh"
 #include "separation-item.hh"
+#include "skyline-pair.hh"
 #include "spaceable-grob.hh"
 #include "spacing-interface.hh"
 #include "staff-spacing.hh"
@@ -337,7 +338,17 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 	    This is probably a waste of time in the case of polyphonic
 	    music.  */
 	  if (Note_spacing::has_interface (wish))
-	    springs.push_back (Note_spacing::get_spacing (wish, right_col, base_note_space, options->increment_));
+	    {
+	      Real inc = options->increment_;
+	      Grob *gsp = unsmob_grob (left_col->get_object ("grace-spacing"));
+	      if (gsp && Paper_column::when_mom (left_col).grace_part_)
+		{
+		  Spacing_options grace_opts;
+		  grace_opts.init_from_grob (gsp);
+		  inc = grace_opts.increment_;
+		}
+	      springs.push_back (Note_spacing::get_spacing (wish, right_col, base_note_space, inc));
+	    }
 	}
 
       if (springs.empty ())
@@ -507,18 +518,20 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
 }
 
 ADD_INTERFACE (Spacing_spanner,
-	       "The space taken by a note is dependent on its duration. Doubling a\n"
-	       "duration adds spacing-increment to the space. The most common shortest\n"
-	       "note gets @code{shortest-duration-space}. Notes that are even shorter are\n"
-	       "spaced proportonial to their duration.\n"
+	       "The space taken by a note is dependent on its duration."
+	       "  Doubling a duration adds @code{spacing-increment} to the"
+	       " space.  The most common shortest note gets"
+	       " @code{shortest-duration-space}.  Notes that are even shorter"
+	       " are spaced proportonial to their duration.\n"
 	       "\n"
-	       "Typically, the increment is the width of a black note head.  In a\n"
-	       "piece with lots of 8th notes, and some 16th notes, the eighth note\n"
-	       "gets 2 note heads width (i.e. the space following a note is 1 note\n"
-	       "head width) A 16th note is followed by 0.5 note head width. The\n"
-	       "quarter note is followed by  3 NHW, the half by 4 NHW, etc.\n",
-
-	       
+	       "Typically, the increment is the width of a black note head."
+	       "  In a piece with lots of 8th notes, and some 16th notes, the"
+	       " eighth note gets a 2@tie{}note heads width (i.e., the space"
+	       " following a note is a 1@tie{}note head width).  A 16th note"
+	       " is followed by 0.5 note head width.  The quarter note is"
+	       " followed by 3@tie{}NHW, the half by 4@tie{}NHW, etc.",
+
+	       /* properties */
 	       "average-spacing-wishes "
 	       "base-shortest-duration "
 	       "common-shortest-duration "
@@ -528,6 +541,5 @@ ADD_INTERFACE (Spacing_spanner,
 	       "strict-grace-spacing "
 	       "strict-note-spacing "
 	       "uniform-stretching "
-	       
 	       );