In doc strings, replace trailing spaces with leading ones.

Obviously, I can't remember my own formatting rules...

101 files changed, 459 insertions, 497 deletions

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index ee4bc5742a..ce9a670f04 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -599,11 +599,11 @@ ADD_ACKNOWLEDGER (Accidental_engraver, note_column);
 
 ADD_TRANSLATOR (Accidental_engraver,
 		/* doc */
-		"Make accidentals.  "
-		"Catch note heads, ties and notices key-change events.  "
-		"This engraver usually lives at Staff level, but "
-		"reads the settings for Accidental at @code{Voice} level, "
-		"so you can @code{\\override} them at @code{Voice}.",
+		"Make accidentals."
+		"  Catch note heads, ties and notices key-change events."
+		"  This engraver usually lives at Staff level, but"
+		" reads the settings for Accidental at @code{Voice} level,"
+		" so you can @code{\\override} them at @code{Voice}.",
 
 		/* create */
 		"Accidental "
diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index a67cfbcb7f..daffa298fb 100644
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -399,14 +399,14 @@ Align_interface::calc_max_stretch (SCM smob)
 }
 
 ADD_INTERFACE (Align_interface,
-	       "Order grobs from top to bottom, left to right, right to left "
-	       "or bottom to top.  For vertical alignments of staves, the "
-	       "@code{break-system-details} of the left "
-	       "@internalsref{NonMusicalPaperColumn} may be set to tune "
-	       "vertical spacing.  Set @code{alignment-extra-space} to add "
-	       "extra space for staves.  Set "
-	       "@code{fixed-alignment-extra-space} to force staves in "
-	       "@code{PianoStaff}s further apart.",
+	       "Order grobs from top to bottom, left to right, right to left"
+	       " or bottom to top.  For vertical alignments of staves, the"
+	       " @code{break-system-details} of the left"
+	       " @internalsref{NonMusicalPaperColumn} may be set to tune"
+	       " vertical spacing.  Set @code{alignment-extra-space} to add"
+	       " extra space for staves.  Set"
+	       " @code{fixed-alignment-extra-space} to force staves in"
+	       " @code{PianoStaff}s further apart.",
 	       
 	       /* properties */
 	       "align-dir "
diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index c316716a8b..56573a5fdd 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -19,7 +19,7 @@
 #include "protected-scm.hh"
 #include "side-position-interface.hh"
 #include "separation-item.hh"
-#include "staff-symbol-referencer.hh" 
+#include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 
 #include "translator.icc"
diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index 0aef5c10ec..fe7b116821 100644
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -169,8 +169,8 @@ Arpeggio::pure_height (SCM smob, SCM, SCM)
 }
 
 ADD_INTERFACE (Arpeggio,
-	       "Functions and settings for drawing an arpeggio symbol (a "
-	       "wavy line left to noteheads.",
+	       "Functions and settings for drawing an arpeggio symbol (a"
+	       " wavy line left to noteheads.",
 
 	       /* properties */
 	       "arpeggio-direction "
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index db6ef1baa0..7c9927d467 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -424,12 +424,12 @@ ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
 ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
 ADD_TRANSLATOR (Auto_beam_engraver,
 		/* doc */
-		"Generate beams based on measure characteristics and observed "
-		"Stems.  Uses @code{beatLength}, @code{measureLength}, and "
-		"@code{measurePosition} to decide when to start and stop a "
-		"beam.  Overriding beaming is done through "
-		"@ref{Stem_engraver} properties @code{stemLeftBeamCount} and "
-		"@code{stemRightBeamCount}.",
+		"Generate beams based on measure characteristics and observed"
+		" Stems.  Uses @code{beatLength}, @code{measureLength}, and"
+		" @code{measurePosition} to decide when to start and stop a"
+		" beam.  Overriding beaming is done through"
+		" @ref{Stem_engraver} properties @code{stemLeftBeamCount} and"
+		" @code{stemRightBeamCount}.",
 
 		/* create */
 		"Beam ",
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 15e26309ce..9a2618a5ba 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -98,8 +98,8 @@ ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
 
 ADD_TRANSLATOR (Axis_group_engraver,
 		/* doc */
-		"Group all objects created in this context in a "
-		"@code{VerticalAxisGroup} spanner.",
+		"Group all objects created in this context in a"
+		" @code{VerticalAxisGroup} spanner.",
 
 		/* create */
 		"VerticalAxisGroup ",
diff --git a/lily/axis-group-interface-scheme.cc b/lily/axis-group-interface-scheme.cc
deleted file mode 100644
index 45236e6ca5..0000000000
--- a/lily/axis-group-interface-scheme.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  axis-group-interface-scheme.cc -- implement Axis_group_interface bindings
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
-
-#include "axis-group-interface.hh"
-#include "lily-guile.hh"
-#include "grob.hh"
-#include "grob-array.hh"
-
-LY_DEFINE (ly_relative_group_extent, "ly:relative-group-extent",
-	   3, 0, 0, (SCM elements, SCM common, SCM axis),
-	   "Determine the extent of @var{elements} relative to @var{common} in the"
-	   " @var{axis} direction.")
-{
-  Grob_array *ga = unsmob_grob_array (elements);
-
-  SCM_ASSERT_TYPE (ga || scm_is_pair (elements), elements, SCM_ARG1, __FUNCTION__, "list or Grob_array");
-  LY_ASSERT_SMOB (Grob, common, 2);
-  LY_ASSERT_TYPE (is_axis, axis, 3);
-
-  vector<Grob*> elts;
-  if (!ga)
-    {
-      for (SCM s = elements; scm_is_pair (s); s = scm_cdr (s))
-	elts.push_back (unsmob_grob (scm_car (s)));
-    }
-
-  Interval ext = Axis_group_interface::relative_group_extent (ga ? ga->array () : elts,
-							      unsmob_grob (common),
-							      (Axis) scm_to_int (axis));
-  return ly_interval2scm (ext);
-}
-
diff --git a/lily/balloon.cc b/lily/balloon.cc
index fa24ba913d..5252e88077 100644
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -70,8 +70,8 @@ Balloon_interface::print (SCM smob)
 }
 
 ADD_INTERFACE (Balloon_interface,
-	       "A collection of routines to put text balloons around an "
-	       "object.",
+	       "A collection of routines to put text balloons around an"
+	       " object.",
 
 	       /* properties */
 	       "padding "
diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index ac0afa37f2..61ec14aca1 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -103,9 +103,9 @@ ADD_END_ACKNOWLEDGER (Bar_engraver, spanner);
 
 ADD_TRANSLATOR (Bar_engraver,
 		/* doc */
-		"Create barlines.  This engraver is controlled through the "
-		"@code{whichBar} property.  If it has no bar line to create, "
-		"it will forbid a linebreak at this point.",
+		"Create barlines.  This engraver is controlled through the"
+		" @code{whichBar} property.  If it has no bar line to create,"
+		" it will forbid a linebreak at this point.",
 
 		/* create */
 		"BarLine ",
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 80c5e94f30..e51aad7196 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -293,22 +293,22 @@ Bar_line::calc_anchor (SCM smob)
 ADD_INTERFACE (Bar_line,
 	       "Bar line.\n"
 	       "\n"
-	       "Print a special bar symbol.  It replaces the regular bar "
-	       "symbol with a special symbol.  The argument @var{bartype} "
-	       "is a string which specifies the kind of bar to print.  "
-	       "Options are @code{:|}, @code{|:}, @code{:|:}, @code{||}, "
-	       "@code{|.}, @code{.|}, and @code{.|.}.\n"
+	       "Print a special bar symbol.  It replaces the regular bar"
+	       " symbol with a special symbol.  The argument @var{bartype}"
+	       " is a string which specifies the kind of bar to print."
+	       "  Options are @code{:|}, @code{|:}, @code{:|:}, @code{||},"
+	       " @code{|.}, @code{.|}, and @code{.|.}.\n"
 	       "\n"
-	       "These produce, respectively, a right repeat, a left repeat, "
-	       "a double repeat, a double bar, a start bar, an end bar, and "
-	       "a thick double bar.  In addition, there is an option "
-	       "@code{||:} which is equivalent to @code{|:} except at line "
-	       "breaks, where it produces a double bar (@code{||}) at the "
-	       "end of the line and a repeat sign (@code{|:}) at the "
-	       "beginning of the new line.\n"
+	       "These produce, respectively, a right repeat, a left repeat,"
+	       " a double repeat, a double bar, a start bar, an end bar, and"
+	       " a thick double bar.  In addition, there is an option"
+	       " @code{||:} which is equivalent to @code{|:} except at line"
+	       " breaks, where it produces a double bar (@code{||}) at the"
+	       " end of the line and a repeat sign (@code{|:}) at the"
+	       " beginning of the new line.\n"
 	       "\n"
-	       "If @var{bartype} is set to @code{empty} then nothing is "
-	       "printed, but a line break is allowed at that spot.\n"
+	       "If @var{bartype} is set to @code{empty} then nothing is"
+	       " printed, but a line break is allowed at that spot.\n"
 	       "\n"
 	       "@code{gap} is used for the gaps in dashed barlines.",
 
diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 5c4bf82ab3..aa9cb8f486 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -121,12 +121,12 @@ ADD_ACKNOWLEDGER (Bar_number_engraver, break_alignment);
 
 ADD_TRANSLATOR (Bar_number_engraver,
 		/* doc */
-		"A bar number is created whenever @code{measurePosition} is "
-		"zero and when there is a bar line (i.e., when "
-		"@code{whichBar} is set).  It is put on top of all staves, "
-		"and appears only at the left side of the staff.  The staves "
-		"are taken from @code{stavesFound}, which is maintained by "
-		"@ref{Staff_collecting_engraver}.",
+		"A bar number is created whenever @code{measurePosition} is"
+		" zero and when there is a bar line (i.e., when"
+		" @code{whichBar} is set).  It is put on top of all staves,"
+		" and appears only at the left side of the staff.  The staves"
+		" are taken from @code{stavesFound}, which is maintained by"
+		" @ref{Staff_collecting_engraver}.",
 
 		/* create */
 		"BarNumber ",
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 724485a3e0..609b3798c1 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -271,8 +271,8 @@ ADD_ACKNOWLEDGER (Beam_engraver, rest);
 
 ADD_TRANSLATOR (Beam_engraver,
 		/* doc */
-		"Handle @code{Beam} events by engraving beams.  If omitted, "
-		"then notes are printed with flags instead of beams.",
+		"Handle @code{Beam} events by engraving beams.  If omitted,"
+		" then notes are printed with flags instead of beams.",
 		
 		/* create */
 		"Beam ",
@@ -337,9 +337,9 @@ ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
 
 ADD_TRANSLATOR (Grace_beam_engraver,
 		/* doc */
-		"Handle @code{Beam} events by engraving beams.  If omitted, "
-		"then notes are printed with flags instead of beams.  Only "
-		"engraves beams when we are at grace points in time.",
+		"Handle @code{Beam} events by engraving beams.  If omitted,"
+		" then notes are printed with flags instead of beams.  Only"
+		" engraves beams when we are at grace points in time.",
 		
 		/* create */
 		"Beam ",
diff --git a/lily/beam.cc b/lily/beam.cc
index 147b3f01f0..5cc6c7c845 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1525,10 +1525,10 @@ Beam::get_direction_beam_count (Grob *me, Direction d)
 ADD_INTERFACE (Beam,
 	       "A beam.\n"
 	       "\n"
-	       "The @code{thickness} property is the weight of beams, "
-	       "measured in staffspace.  The @code{direction} property is "
-	       "not user-serviceable.  Use the @code{direction} property "
-	       "of @code{Stem} instead.",
+	       "The @code{thickness} property is the weight of beams,"
+	       " measured in staffspace.  The @code{direction} property is"
+	       " not user-serviceable.  Use the @code{direction} property"
+	       " of @code{Stem} instead.",
 	       
 	       /* properties */
 	       "annotation "
@@ -1540,7 +1540,7 @@ ADD_INTERFACE (Beam,
 	       "concaveness "
 	       "damping "
 	       "details "
-	       "direction " 
+	       "direction "
 	       "gap "
 	       "gap-count "
 	       "grow-direction "
diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index c02c298330..5db2e145d6 100644
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -141,10 +141,10 @@ ADD_ACKNOWLEDGER (Break_align_engraver, break_aligned);
 ADD_ACKNOWLEDGER (Break_align_engraver, break_alignable);
 ADD_TRANSLATOR (Break_align_engraver,
 		/* doc */
-		"Align grobs with corresponding @code{break-align-symbols} "
-		"into groups, and order the groups according to "
-		"@code{breakAlignOrder}.  The left edge of the alignment gets "
-		"a separate group, with a symbol @code{left-edge}.",
+		"Align grobs with corresponding @code{break-align-symbols}"
+		" into groups, and order the groups according to"
+		" @code{breakAlignOrder}.  The left edge of the alignment gets"
+		" a separate group, with a symbol @code{left-edge}.",
 
 		/* create */
 		"BreakAlignment "
diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 06c34a6251..a5c6679bea 100644
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -375,29 +375,29 @@ ADD_INTERFACE (Break_alignable_interface,
 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} property.  It contains a list "
-	       "@code{break-align-symbol}s with a specification of the "
-	       "associated space.  The space specification can be\n"
+	       "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. "
-	       "  (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 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.  "
-	       "See [Wanske] page 126--134, [Ross] page 143--147.",
+	       "Rules for this spacing are much more complicated than this."
+	       "  See [Wanske] page 126--134, [Ross] page 143--147.",
 
 	       /* properties */ 
 	       "break-align-anchor "
@@ -407,8 +407,8 @@ 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 aligment.  See"
+	       " @ref{break-aligned-interface}.",
 
 	       /* properties */
 	       "positioning-done "
diff --git a/lily/cluster.cc b/lily/cluster.cc
index 8d18406c03..b6008fea60 100644
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -200,13 +200,13 @@ Cluster::print (SCM smob)
 ADD_INTERFACE (Cluster,
 	       "A graphically drawn musical cluster.\n"
 	       "\n"
-	       "@code{padding} adds to the vertical extent of the shape (top "
-	       "and bottom).\n"
+	       "@code{padding} adds to the vertical extent of the shape (top"
+	       " and bottom).\n"
 	       "\n"
-	       "The property @code{style} controls the shape of cluster "
-	       "segments.  Valid values include @code{leftsided-stairs}, "
-	       "@code{rightsided-stairs}, @code{centered-stairs}, and "
-	       "@code{ramp}.\n",
+	       "The property @code{style} controls the shape of cluster"
+	       " segments.  Valid values include @code{leftsided-stairs},"
+	       " @code{rightsided-stairs}, @code{centered-stairs}, and"
+	       " @code{ramp}.\n",
 
 	       /* properties */
 	       "style "
@@ -232,9 +232,9 @@ Cluster_beacon::height (SCM g)
 }
 
 ADD_INTERFACE (Cluster_beacon,
-	       "A place holder for the cluster spanner to determine the "
-	       "vertical extents of a cluster spanner at this "
-	       "X@tie{}position.",
+	       "A place holder for the cluster spanner to determine the"
+	       " vertical extents of a cluster spanner at this"
+	       " X@tie{}position.",
 
 	       /* properties */
 	       "positions "
diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 79d66f6c12..717ad928b3 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -71,8 +71,8 @@ ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 
 ADD_TRANSLATOR (Collision_engraver,
 		/* doc */
-		"Collect @code{NoteColumns}, and as soon as there are two or "
-		"more, put them in a @code{NoteCollision} object.",
+		"Collect @code{NoteColumns}, and as soon as there are two or"
+		" more, put them in a @code{NoteCollision} object.",
 
 		/* create */
 		"NoteCollision ",
diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index bba68859e0..a83c961727 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -225,9 +225,9 @@ Completion_heads_engraver::Completion_heads_engraver ()
 
 ADD_TRANSLATOR (Completion_heads_engraver,
 		/* doc */
-		"This engraver replaces @code{Note_heads_engraver}.  It plays "
-		"some trickery to break long notes and automatically tie them "
-		"into the next measure.",
+		"This engraver replaces @code{Note_heads_engraver}.  It plays"
+		" some trickery to break long notes and automatically tie them"
+		" into the next measure.",
 
 		/* create */
 		"NoteHead "
diff --git a/lily/custos.cc b/lily/custos.cc
index 70850a2c27..79a69144dd 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -82,9 +82,9 @@ Custos::print (SCM smob)
 }
 
 ADD_INTERFACE (Custos,
-	       "A custos object.  @code{style} can have four valid values: "
-	       "@code{mensural}, @code{vaticana}, @code{medicaea}, and "
-	       "@code{hufnagel}.  @code{mensural} is the default style.",
+	       "A custos object.  @code{style} can have four valid values:"
+	       " @code{mensural}, @code{vaticana}, @code{medicaea}, and"
+	       " @code{hufnagel}.  @code{mensural} is the default style.",
 
 	       /* properties */
 	       "style "
diff --git a/lily/default-bar-line-engraver.cc b/lily/default-bar-line-engraver.cc
index 5710b186f5..e9dd6f8c5f 100644
--- a/lily/default-bar-line-engraver.cc
+++ b/lily/default-bar-line-engraver.cc
@@ -29,9 +29,9 @@ public:
 
 ADD_TRANSLATOR (Default_bar_line_engraver,
 		/* doc */
-		"This engraver determines what kind of automatic bar lines "
-		"should be produced, and sets @code{whichBar} accordingly.  "
-		"It should be at the same level as @ref{Timing_translator}.",
+		"This engraver determines what kind of automatic bar lines"
+		" should be produced, and sets @code{whichBar} accordingly."
+		"  It should be at the same level as @ref{Timing_translator}.",
 		
 		/* create */
 		"",
diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 2b50a738d4..76af05790e 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -11,7 +11,7 @@
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "translator.icc"
-#include "item.hh" 
+#include "item.hh"
 
 class Dot_column_engraver : public Engraver
 {
@@ -54,8 +54,8 @@ Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
 ADD_TRANSLATOR (Dot_column_engraver,
 		/* doc */
-		"Engrave dots on dotted notes shifted to the right of the "
-		"note.  If omitted, then dots appear on top of the notes.",
+		"Engrave dots on dotted notes shifted to the right of the"
+		" note.  If omitted, then dots appear on top of the notes.",
 
 		/* create */
 		"DotColumn ",
diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index fc4ec01be3..b2645ba6dd 100644
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -201,8 +201,8 @@ Dot_column::add_head (Grob *me, Grob *rh)
 }
 
 ADD_INTERFACE (Dot_column,
-	       "Group dot objects so they form a column, and position "
-	       "dots so they do not clash with staff lines.",
+	       "Group dot objects so they form a column, and position"
+	       " dots so they do not clash with staff lines.",
 
 	       /* properties */
 	       "dots "
diff --git a/lily/dots-engraver.cc b/lily/dots-engraver.cc
index 09b61310d2..bf0d67fd0b 100644
--- a/lily/dots-engraver.cc
+++ b/lily/dots-engraver.cc
@@ -53,8 +53,8 @@ Dots_engraver::acknowledge_rhythmic_head (Grob_info gi)
 ADD_ACKNOWLEDGER (Dots_engraver, rhythmic_head);
 
 ADD_TRANSLATOR (Dots_engraver,
-		"Create @ref{Dots} objects for "
-		"@ref{rhythmic-head-interface}s.",
+		"Create @ref{Dots} objects for"
+		" @ref{rhythmic-head-interface}s.",
 
 		/* create */
 		"Dots ",
diff --git a/lily/dots.cc b/lily/dots.cc
index d740ecd765..b9b11df365 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -59,11 +59,11 @@ Dots::print (SCM d)
 }
 
 ADD_INTERFACE (Dots,
-	       "The dots to go with a notehead or rest.  @code{direction} "
-	       "sets the preferred direction to move in case of staff line "
-	       "collisions.  @code{style} defaults to undefined, which is "
-	       "normal 19th/20th century traditional style.  Set "
-	       "@code{style} to @code{vaticana} for ancient type dots.",
+	       "The dots to go with a notehead or rest.  @code{direction}"
+	       " sets the preferred direction to move in case of staff line"
+	       " collisions.  @code{style} defaults to undefined, which is"
+	       " normal 19th/20th century traditional style.  Set"
+	       " @code{style} to @code{vaticana} for ancient type dots.",
 
 	       /* properties */
 	       "direction "
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index e3171756ee..51161d1501 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -439,10 +439,10 @@ ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
 
 ADD_TRANSLATOR (Dynamic_engraver,
 		/* doc */
-		"Create hairpins, dynamic texts, and their vertical "
-		"alignments.  The symbols are collected onto a "
-		"@code{DynamicLineSpanner} grob which takes care of vertical "
-		"positioning.",
+		"Create hairpins, dynamic texts, and their vertical"
+		" alignments.  The symbols are collected onto a"
+		" @code{DynamicLineSpanner} grob which takes care of vertical"
+		" positioning.",
 
 		/* create */
 		"DynamicLineSpanner "
diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 1990dccb7b..16f51c82b3 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -50,8 +50,8 @@ Font_interface::text_font_alist_chain (Grob *g)
 }
 
 ADD_INTERFACE (Font_interface,
-	       "Any symbol that is typeset through fixed sets of glyphs, "
-	       "(i.e., fonts).",
+	       "Any symbol that is typeset through fixed sets of glyphs,"
+	       " (i.e., fonts).",
 
 	       /* properties */
 	       "font "
diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc
index 68bfbb6bb8..f44d7bc27f 100644
--- a/lily/forbid-break-engraver.cc
+++ b/lily/forbid-break-engraver.cc
@@ -49,8 +49,8 @@ Forbid_line_break_engraver::start_translation_timestep ()
 
 ADD_TRANSLATOR (Forbid_line_break_engraver,
 		/* doc */
-		"Forbid line breaks when note heads are still playing at some "
-		"point.",
+		"Forbid line breaks when note heads are still playing at some"
+		" point.",
 
 		/* create */
 		"",
diff --git a/lily/fretboard-engraver.cc b/lily/fretboard-engraver.cc
index 71b7351bda..056b826588 100644
--- a/lily/fretboard-engraver.cc
+++ b/lily/fretboard-engraver.cc
@@ -86,8 +86,8 @@ Fretboard_engraver::stop_translation_timestep ()
 
 ADD_TRANSLATOR (Fretboard_engraver,
 		/* doc */
-		"Generate one or more tablature noteheads from event of type "
-		"@code{NoteEvent}.",
+		"Generate one or more tablature noteheads from event of type"
+		" @code{NoteEvent}.",
 
 		/* create */
 		"FretBoard ",
diff --git a/lily/grace-spacing-engraver.cc b/lily/grace-spacing-engraver.cc
index d5ccc67a65..69a42b2d5b 100644
--- a/lily/grace-spacing-engraver.cc
+++ b/lily/grace-spacing-engraver.cc
@@ -70,8 +70,8 @@ Grace_spacing_engraver::stop_translation_timestep ()
 
 
 ADD_TRANSLATOR (Grace_spacing_engraver,
-		"Bookkeeping of shortest starting and playing notes in grace "
-		"note runs.",
+		"Bookkeeping of shortest starting and playing notes in grace"
+		" note runs.",
 
 		/* create */
 		"GraceSpacing ",
diff --git a/lily/grid-line-span-engraver.cc b/lily/grid-line-span-engraver.cc
index 0026572c57..1fd00e8052 100644
--- a/lily/grid-line-span-engraver.cc
+++ b/lily/grid-line-span-engraver.cc
@@ -61,8 +61,8 @@ Grid_line_span_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Grid_line_span_engraver, grid_point);
 ADD_TRANSLATOR (Grid_line_span_engraver,
 		/* doc */
-		"This engraver makes cross-staff lines: It catches all normal "
-		"lines and draws a single span line across them.",
+		"This engraver makes cross-staff lines: It catches all normal"
+		" lines and draws a single span line across them.",
 
 		/* create */
 		"GridLine ",
diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 0dd0d6e533..31584e46b4 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -139,8 +139,8 @@ Grob_pq_engraver::start_translation_timestep ()
 ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
 		/* doc */
-		"Administrate when certain grobs (e.g., note heads) stop "
-		"playing.",
+		"Administrate when certain grobs (e.g., note heads) stop"
+		" playing.",
 
 		/* create */
 		"",
diff --git a/lily/grob.cc b/lily/grob.cc
index f5c9ebe4dd..78be89e399 100644
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -578,40 +578,40 @@ Grob::programming_error (string s) const
 ADD_INTERFACE (Grob,
 	       "A grob represents a piece of music notation.\n"
 	       "\n"
-	       "All grobs have an X and Y@tie{}position on the page.  These "
-	       "X and Y@tie{}positions are stored in a relative format, thus "
-	       "they can easily be combined by stacking them, hanging one "
-	       "grob to the side of another, or coupling them into grouping "
-	       "objects.\n"
+	       "All grobs have an X and Y@tie{}position on the page.  These"
+	       " X and Y@tie{}positions are stored in a relative format, thus"
+	       " they can easily be combined by stacking them, hanging one"
+	       " grob to the side of another, or coupling them into grouping"
+	       " objects.\n"
 	       "\n"
-	       "Each grob has a reference point (a.k.a.@: parent): The "
-	       "position of a grob is stored relative to that reference "
-	       "point.  For example, the X@tie{}reference point of a staccato "
-	       "dot usually is the note head that it applies to.  When the "
-	       "note head is moved, the staccato dot moves along "
-	       "automatically.\n"
+	       "Each grob has a reference point (a.k.a.@: parent): The"
+	       " position of a grob is stored relative to that reference"
+	       " point.  For example, the X@tie{}reference point of a staccato"
+	       " dot usually is the note head that it applies to.  When the"
+	       " note head is moved, the staccato dot moves along"
+	       " automatically.\n"
 	       "\n"
-	       "A grob is often associated with a symbol, but some grobs do "
-	       "not print any symbols.  They take care of grouping objects. "
-	       "For example, there is a separate grob that stacks staves "
-	       "vertically.  The @ref{NoteCollision} object is also an "
-	       "abstract grob: It only moves around chords, but doesn't print "
-	       "anything.\n"
+	       "A grob is often associated with a symbol, but some grobs do"
+	       " not print any symbols.  They take care of grouping objects."
+	       " For example, there is a separate grob that stacks staves"
+	       " vertically.  The @ref{NoteCollision} object is also an"
+	       " abstract grob: It only moves around chords, but doesn't print"
+	       " anything.\n"
 	       "\n"
-	       "Grobs have properties (Scheme variables) that can be read and "
-	       "set.  Two types of them exist: immutable and mutable.  "
-	       "Immutable variables define the default style and behavior.  "
-	       "They are shared between many objects.  They can be changed "
-	       "using @code{\\override} and @code{\\revert}.  Mutable "
-	       "properties are variables that are specific to one grob.  "
-	       "Typically, lists of other objects, or results from "
-	       "computations are stored in mutable properties.  In "
-	       "particular, every call to @code{set-grob-property} (or its "
-	       "C++ equivalent) sets a mutable property.\n"
+	       "Grobs have properties (Scheme variables) that can be read and"
+	       " set.  Two types of them exist: immutable and mutable."
+	       "  Immutable variables define the default style and behavior."
+	       "  They are shared between many objects.  They can be changed"
+	       " using @code{\\override} and @code{\\revert}.  Mutable"
+	       " properties are variables that are specific to one grob."
+	       "  Typically, lists of other objects, or results from"
+	       " computations are stored in mutable properties.  In"
+	       " particular, every call to @code{set-grob-property} (or its"
+	       " C++ equivalent) sets a mutable property.\n"
 	       "\n"
-	       "The properties @code{after-line-breaking} and "
-	       "@code{before-line-breaking} are dummies that are not "
-	       "user-serviceable.",
+	       "The properties @code{after-line-breaking} and"
+	       " @code{before-line-breaking} are dummies that are not"
+	       " user-serviceable.",
 
 	       /* properties */
 	       "X-extent "
diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 0661bf7e64..d9aa0ddfec 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -80,9 +80,9 @@ Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 ADD_ACKNOWLEDGER (Hara_kiri_engraver, grob);
 ADD_TRANSLATOR (Hara_kiri_engraver,
 		/* doc */
-		"Like @code{Axis_group_engraver}, but make a hara-kiri "
-		"spanner, and add interesting items (i.e., note heads, lyric "
-		"syllables, and normal rests).",
+		"Like @code{Axis_group_engraver}, but make a hara-kiri"
+		" spanner, and add interesting items (i.e., note heads, lyric"
+		" syllables, and normal rests).",
 
 		/* create */
 		"VerticalAxisGroup ",
diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 89f3bf1b6a..1523ac6766 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -154,9 +154,9 @@ Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
 }
 
 ADD_INTERFACE (Hara_kiri_group_spanner,
-	       "A group spanner that keeps track of interesting items.  If it "
-	       "doesn't contain any after line breaking, it removes itself "
-	       "and all its children.",
+	       "A group spanner that keeps track of interesting items.  If it"
+	       " doesn't contain any after line breaking, it removes itself"
+	       " and all its children.",
 
 	       /* properties */
 	       "items-worth-living "
diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 2dea762454..30c3ecad1b 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -36,8 +36,8 @@ public:
 ADD_ACKNOWLEDGER (Horizontal_bracket_engraver, note_column);
 ADD_TRANSLATOR (Horizontal_bracket_engraver,
 		/* doc */
-		"Create horizontal brackets over notes for musical analysis "
-		"purposes.",
+		"Create horizontal brackets over notes for musical analysis"
+		" purposes.",
 
 		/* create */
 		"HorizontalBracket ",
diff --git a/lily/item.cc b/lily/item.cc
index 82147a4655..c9d3790280 100644
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -249,31 +249,31 @@ Item::less (Grob * const &g1, Grob * const &g2)
 }
 
 ADD_INTERFACE (Item,
-	       "Grobs can be distinguished in their role in the horizontal "
-	       "spacing.  Many grobs define constraints on the spacing by "
-	       "their sizes, for example, note heads, clefs, stems, and all "
-	       "other symbols with a fixed shape.  These grobs form a "
-	       "subtype called @code{Item}.\n"
+	       "Grobs can be distinguished in their role in the horizontal"
+	       " spacing.  Many grobs define constraints on the spacing by"
+	       " their sizes, for example, note heads, clefs, stems, and all"
+	       " other symbols with a fixed shape.  These grobs form a"
+	       " subtype called @code{Item}.\n"
 	       "\n"
-	       "Some items need special treatment for line breaking.  For "
-	       "example, a clef is normally only printed at the start of a "
-	       "line (i.e., after a line break).   To model this, "
-	       "@q{breakable} items (clef, key signature, bar lines, etc.) "
-	       "are copied twice.  Then we have three versions of each "
-	       "breakable item: one version if there is no line break, one "
-	       "version that is printed before the line break (at the end of "
-	       "a system), and one version that is printed after the line "
-	       "break.\n"
+	       "Some items need special treatment for line breaking.  For"
+	       " example, a clef is normally only printed at the start of a"
+	       " line (i.e., after a line break).   To model this,"
+	       " @q{breakable} items (clef, key signature, bar lines, etc.)"
+	       " are copied twice.  Then we have three versions of each"
+	       " breakable item: one version if there is no line break, one"
+	       " version that is printed before the line break (at the end of"
+	       " a system), and one version that is printed after the line"
+	       " break.\n"
 	       "\n"
-	       "Whether these versions are visible and take up space is "
-	       "determined by the outcome of the @code{break-visibility} "
-	       "grob property, which is a function taking a direction (-1, 0 "
-	       "or@tie{}1) as an argument.  It returns a cons of booleans, "
-	       "signifying whether this grob should be transparent and have "
-	       "no extent.\n"
+	       "Whether these versions are visible and take up space is"
+	       " determined by the outcome of the @code{break-visibility}"
+	       " grob property, which is a function taking a direction (-1, 0"
+	       " or@tie{}1) as an argument.  It returns a cons of booleans,"
+	       " signifying whether this grob should be transparent and have"
+	       " no extent.\n"
 	       "\n"
-	       "The following variables for @code{break-visibility} are "
-	       "predefined:\n"
+	       "The following variables for @code{break-visibility} are"
+	       " predefined:\n"
 	       "@example\n"
 	       "           grob will show:   before  no     after\n"
 	       "                             break   break  break\n"
diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index ea06ac0e19..764b7b46b0 100644
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -114,8 +114,8 @@ ADD_ACKNOWLEDGER (Ledger_line_engraver, ledgered);
 ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
 ADD_TRANSLATOR (Ledger_line_engraver,
 		/* doc */
-		"Create the spanner to draw ledger lines, and notices "
-		"objects that need ledger lines.",
+		"Create the spanner to draw ledger lines, and notices"
+		" objects that need ledger lines.",
 
 		/* create */
 		"LedgerLineSpanner ",
diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index c8fb7d4ca6..3664bd40b7 100644
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -351,9 +351,9 @@ Ledger_line_spanner::print (SCM smob)
 }
 
 ADD_INTERFACE (Ledger_line_spanner,
-	       "This spanner draws the ledger lines of a staff.  This is a "
-	       "separate grob because it has to process all potential "
-	       "collisions between all note heads.",
+	       "This spanner draws the ledger lines of a staff.  This is a"
+	       " separate grob because it has to process all potential"
+	       " collisions between all note heads.",
 
 	       /* properties */
 	       "gap "	
@@ -369,8 +369,8 @@ struct Ledgered_interface
 };
 
 ADD_INTERFACE (Ledgered_interface,
-	       "Objects that need ledger lines, typically note heads.  See "
-	       "also @ref{ledger-line-spanner-interface}.",
+	       "Objects that need ledger lines, typically note heads.  See"
+	       " also @ref{ledger-line-spanner-interface}.",
 
 	       /* properties */
 	       "no-ledgers "
diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 69c51dfb74..091388f7e6 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -112,8 +112,8 @@ ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
 
 ADD_TRANSLATOR (Ligature_bracket_engraver,
 		/* doc */
-		"Handle @code{Ligature_events} by engraving @code{Ligature} "
-		"brackets.",
+		"Handle @code{Ligature_events} by engraving @code{Ligature}"
+		" brackets.",
 
 		/* create */
 		"LigatureBracket ",
diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index 6d2d44045a..13f5a8cdef 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -248,15 +248,15 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 }
 
 ADD_INTERFACE (Line_interface,
-	       "Generic line objects.  Any object using lines supports this.  "
-	       "The property @code{style} can be @code{line}, "
-	       "@code{dashed-line}, @code{trill}, @code{dotted-line} or "
-	       "@code{zigzag}.\n"
+	       "Generic line objects.  Any object using lines supports this."
+	       "  The property @code{style} can be @code{line},"
+	       " @code{dashed-line}, @code{trill}, @code{dotted-line} or"
+	       " @code{zigzag}.\n"
 	       "\n"
-	       "For @code{dashed-line}, the length of the dashes is tuned "
-	       "with @code{dash-fraction}.  If the latter is set to@tie{}0, a "
-	       "dotted line is produced.  If @code{dash-period} is negative, "
-	       "the line is made transparent.",
+	       "For @code{dashed-line}, the length of the dashes is tuned"
+	       " with @code{dash-fraction}.  If the latter is set to@tie{}0, a"
+	       " dotted line is produced.  If @code{dash-period} is negative,"
+	       " the line is made transparent.",
 
 	       /* properties */
 	       "dash-period "
diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 290c7cb74c..3215456f3e 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -348,20 +348,20 @@ Line_spanner::print (SCM smob)
 }
 
 ADD_INTERFACE (Line_spanner,
-	       "Generic line drawn between two objects, e.g., for use with "
-	       "glissandi.\n"
+	       "Generic line drawn between two objects, e.g., for use with"
+	       " glissandi.\n"
 	       "\n"
-	       "The property @code{style} can be @code{line}, "
-	       "@code{dashed-line}, @code{trill}, @code{dotted-line} or "
-	       "@code{zigzag}.",
+	       "The property @code{style} can be @code{line},"
+	       " @code{dashed-line}, @code{trill}, @code{dotted-line} or"
+	       " @code{zigzag}.",
 
 	       /* properties */
-	       "bound-details " 
+	       "bound-details "
 	       "extra-dy "
 	       "gap "
 	       "left-bound-info "
 	       "note-columns "
-	       "right-bound-info " 
+	       "right-bound-info "
 	       "thickness "
 	       "to-barline "
 	       );
diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 877c84bfe7..64d2b9715d 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -89,9 +89,9 @@ Lyric_extender::print (SCM smob)
 }
 
 ADD_INTERFACE (Lyric_extender,
-	       "The extender is a simple line at the baseline of the lyric "
-	       "that helps show the length of a melisma (a tied or slurred "
-	       "note).",
+	       "The extender is a simple line at the baseline of the lyric"
+	       " that helps show the length of a melisma (a tied or slurred"
+	       " note).",
 
 	       /* properties */
 	       "heads "
diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 416ad20d86..a871fbb843 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -130,8 +130,8 @@ Lyric_hyphen::set_spacing_rods (SCM smob)
 }
 
 ADD_INTERFACE (Lyric_hyphen,
-	       "A centered hyphen is simply a line between lyrics used to "
-	       "divide syllables.",
+	       "A centered hyphen is simply a line between lyrics used to"
+	       " divide syllables.",
 
 	       /* properties */
 	       "dash-period "
diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 1b7ed78c42..7ba13d49a4 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -140,11 +140,11 @@ ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
 
 ADD_TRANSLATOR (Mark_engraver,
 		/* doc */
-		"Create @code{RehearsalMark} objects.  It puts them on top of "
-		"all staves (which is taken from the property "
-		"@code{stavesFound}).  If moving this engraver to a different "
-		"context, @ref{Staff_collecting_engraver} must move along, "
-		"otherwise all marks end up on the same Y@tie{}location.",
+		"Create @code{RehearsalMark} objects.  It puts them on top of"
+		" all staves (which is taken from the property"
+		" @code{stavesFound}).  If moving this engraver to a different"
+		" context, @ref{Staff_collecting_engraver} must move along,"
+		" otherwise all marks end up on the same Y@tie{}location.",
 		
 		/* create */
 		"RehearsalMark ",
diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index 2048abc5d2..78d625ec66 100644
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -48,8 +48,8 @@ Measure_grouping::print (SCM grob)
 }
 
 ADD_INTERFACE (Measure_grouping,
-	       "This object indicates groups of beats.  Valid choices for "
-	       "@code{style} are @code{bracket} and @code{triangle}.",
+	       "This object indicates groups of beats.  Valid choices for"
+	       " @code{style} are @code{bracket} and @code{triangle}.",
 
 	       /* properties */
 	       "thickness "
diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc
index a39dda1c84..e1ef553c15 100644
--- a/lily/melody-engraver.cc
+++ b/lily/melody-engraver.cc
@@ -84,8 +84,8 @@ ADD_ACKNOWLEDGER (Melody_engraver, slur);
 
 ADD_TRANSLATOR (Melody_engraver,
 		/* doc */
-		"Create information for context dependent typesetting "
-		"decisions.",
+		"Create information for context dependent typesetting"
+		" decisions.",
 
 		/* create */
 		"MelodyItem ",
diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 9271013d6c..e728c5e789 100644
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -419,8 +419,8 @@ ADD_ACKNOWLEDGER (Mensural_ligature_engraver, note_head);
 
 ADD_TRANSLATOR (Mensural_ligature_engraver,
 		/* doc */
-		"Handle @code{Mensural_ligature_events} by glueing special "
-		"ligature heads together.",
+		"Handle @code{Mensural_ligature_events} by glueing special"
+		" ligature heads together.",
 
 		/* create */
 		"MensuralLigature ",
diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index b30fea183a..5bc715339c 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -95,11 +95,11 @@ Metronome_mark_engraver::process_music ()
 
 ADD_TRANSLATOR (Metronome_mark_engraver,
 		/* doc */
-		"Engrave metronome marking.  This delegates the formatting "
-		"work to the function in the @code{metronomeMarkFormatter} "
-		"property.  The mark is put over all staves.  The staves are "
-		"taken from the @code{stavesFound} property, which is "
-		"maintained by @ref{Staff_collecting_engraver}.",
+		"Engrave metronome marking.  This delegates the formatting"
+		" work to the function in the @code{metronomeMarkFormatter}"
+		" property.  The mark is put over all staves.  The staves are"
+		" taken from the @code{stavesFound} property, which is"
+		" maintained by @ref{Staff_collecting_engraver}.",
 
 		/* create */
 		"MetronomeMark ",
diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index d621652247..fc5563854c 100644
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -252,12 +252,12 @@ Multi_measure_rest_engraver::finalize ()
 
 ADD_TRANSLATOR (Multi_measure_rest_engraver,
 		/* doc */
-		"Engrave multi-measure rests that are produced with "
-		"@samp{R}.  It reads @code{measurePosition} and "
-		"@code{internalBarNumber} to determine what number to print "
-		"over the @ref{MultiMeasureRest}.  Reads @code{measureLength} "
-		"to determine whether it should use a whole rest or a breve "
-		"rest to represent one measure.",
+		"Engrave multi-measure rests that are produced with"
+		" @samp{R}.  It reads @code{measurePosition} and"
+		" @code{internalBarNumber} to determine what number to print"
+		" over the @ref{MultiMeasureRest}.  Reads @code{measureLength}"
+		" to determine whether it should use a whole rest or a breve"
+		" rest to represent one measure.",
 		
 		/* create */
 		"MultiMeasureRest "
diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 546fa8d3f6..fe75842c0f 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -346,9 +346,9 @@ ADD_ACKNOWLEDGER (New_fingering_engraver, stem);
 
 ADD_TRANSLATOR (New_fingering_engraver,
 		/* doc */
-		"Create fingering scripts for notes in a new chord.  This "
-		"engraver is ill-named, since it also takes care of "
-		"articulations and harmonic note heads.",
+		"Create fingering scripts for notes in a new chord.  This"
+		" engraver is ill-named, since it also takes care of"
+		" articulations and harmonic note heads.",
 
 		/* create */
 		"Fingering "
diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 1b654a713b..cdeb36c667 100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -579,11 +579,11 @@ Note_collision_interface::add_column (Grob *me, Grob *ncol)
 }
 
 ADD_INTERFACE (Note_collision_interface,
-	       "An object that handles collisions between notes with "
-	       "different stem directions and horizontal shifts.  Most of "
-	       "the interesting properties are to be set in "
-	       "@ref{note-column-interface}: these are @code{force-hshift} "
-	       "and @code{horizontal-shift}.",
+	       "An object that handles collisions between notes with"
+	       " different stem directions and horizontal shifts.  Most of"
+	       " the interesting properties are to be set in"
+	       " @ref{note-column-interface}: these are @code{force-hshift}"
+	       " and @code{horizontal-shift}.",
 
 	       /* properties */
 	       "merge-differently-dotted "
diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 35698563a7..152297d985 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -104,9 +104,9 @@ Note_head_line_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Note_head_line_engraver, rhythmic_head);
 ADD_TRANSLATOR (Note_head_line_engraver,
 		/* doc */
-		"Engrave a line between two note heads, for example a "
-		"glissando.  If @code{followVoice} is set, staff switches "
-		"also generate a line.",
+		"Engrave a line between two note heads, for example a"
+		" glissando.  If @code{followVoice} is set, staff switches"
+		" also generate a line.",
 
 		/* create */
 		"Glissando "
diff --git a/lily/note-spacing-engraver.cc b/lily/note-spacing-engraver.cc
index 23b0fcd797..9dd4eec906 100644
--- a/lily/note-spacing-engraver.cc
+++ b/lily/note-spacing-engraver.cc
@@ -131,8 +131,8 @@ ADD_ACKNOWLEDGER (Note_spacing_engraver, rhythmic_grob);
 
 ADD_TRANSLATOR (Note_spacing_engraver,
 		/* doc */
-		"Generate @code{NoteSpacing}, an object linking horizontal "
-		"lines for use in spacing.",
+		"Generate @code{NoteSpacing}, an object linking horizontal"
+		" lines for use in spacing.",
 
 		/* create */
 		"NoteSpacing ",
diff --git a/lily/page-breaking-scheme.cc b/lily/page-breaking-scheme.cc
index d9f9df152a..8b69894207 100644
--- a/lily/page-breaking-scheme.cc
+++ b/lily/page-breaking-scheme.cc
@@ -35,8 +35,8 @@ LY_DEFINE (ly_optimal_breaking, "ly:optimal-breaking",
 LY_DEFINE (ly_minimal_breaking, "ly:minimal-breaking",
 	   1, 0, 0, (SCM pb),
 	   "Break (pages and lines) the @code{Paper_book} object @var{pb}"
-	   "without looking for optimal spacing: stack as many lines on"
-	   "a page before moving to the next one.")
+	   " without looking for optimal spacing: stack as many lines on"
+	   " a page before moving to the next one.")
 {
   Minimal_page_breaking b (unsmob_paper_book (pb));
   return b.solve ();
diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index 58fd467ae6..c662a9baf7 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -266,14 +266,14 @@ ADD_TRANSLATOR (Paper_column_engraver,
 		/* doc */
 		"Take care of generating columns.\n"
 		"\n"
-		"This engraver decides whether a column is breakable.  The "
-		"default is that a column is always breakable.  However, "
-		"every @code{Bar_engraver} that does not have a barline at a "
-		"certain point will set @code{forbidBreaks} in the score "
-		"context to stop line breaks.  In practice, this means that "
-		"you can make a break point by creating a bar line (assuming "
-		"that there are no beams or notes that prevent a break "
-		"point).",
+		"This engraver decides whether a column is breakable.  The"
+		" default is that a column is always breakable.  However,"
+		" every @code{Bar_engraver} that does not have a barline at a"
+		" certain point will set @code{forbidBreaks} in the score"
+		" context to stop line breaks.  In practice, this means that"
+		" you can make a break point by creating a bar line (assuming"
+		" that there are no beams or notes that prevent a break"
+		" point).",
 		
 		/* create */
 		"PaperColumn "
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index e347def407..8c9e0aea4e 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -314,18 +314,18 @@ Paper_column::before_line_breaking (SCM grob)
 
 
 ADD_INTERFACE (Paper_column,
-	       "@code{Paper_column} objects form the top-most X@tie{}parents "
-	       "for items.  There are two types of columns: musical columns, "
-	       "where are attached to, and non-musical columns, where "
-	       "bar-lines, clefs, etc., are attached to.  The spacing engine "
-	       "determines the X@tie{}positions of these objects.\n"
+	       "@code{Paper_column} objects form the top-most X@tie{}parents"
+	       " for items.  There are two types of columns: musical columns,"
+	       " where are attached to, and non-musical columns, where"
+	       " bar-lines, clefs, etc., are attached to.  The spacing engine"
+	       " determines the X@tie{}positions of these objects.\n"
 	       "\n"
-	       "They are numbered, the first (leftmost) is column@tie{}0.  "
-	       "Numbering happens before line breaking, and columns are not "
-	       "renumbered after line breaking.  Since many columns go "
-	       "unused, you should only use the rank field to get ordering "
-	       "information.  Two adjacent columns may have non-adjacent "
-	       "numbers.",
+	       "They are numbered, the first (leftmost) is column@tie{}0."
+	       "  Numbering happens before line breaking, and columns are not"
+	       " renumbered after line breaking.  Since many columns go"
+	       " unused, you should only use the rank field to get ordering"
+	       " information.  Two adjacent columns may have non-adjacent"
+	       " numbers.",
 
 	       /* properties */
 	       "between-cols "
diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc
index 5cfa3adb71..c24d94a915 100644
--- a/lily/parenthesis-engraver.cc
+++ b/lily/parenthesis-engraver.cc
@@ -65,8 +65,8 @@ Parenthesis_engraver::acknowledge_grob (Grob_info info)
 ADD_ACKNOWLEDGER (Parenthesis_engraver, grob);
 ADD_TRANSLATOR (Parenthesis_engraver,
 		/* doc */
-		"Parenthesize objects whose music cause has the "
-		"@code{parenthesize} property.",
+		"Parenthesize objects whose music cause has the"
+		" @code{parenthesize} property.",
 		
 		/* create */
 		"ParenthesesItem ",
diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 178a9176e4..badc17c2f6 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -102,8 +102,8 @@ ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
 ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
 ADD_TRANSLATOR (Part_combine_engraver,
 		/* doc */
-		"Part combine engraver for orchestral scores: Print markings "
-		"@q{a2}, @q{Solo}, @q{Solo II}, and @q{unisono}.",
+		"Part combine engraver for orchestral scores: Print markings"
+		" @q{a2}, @q{Solo}, @q{Solo II}, and @q{unisono}.",
 
 		/* create */
 		"CombineTextScript ",
diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index 99267adbea..7d7e13d093 100644
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -90,8 +90,8 @@ Piano_pedal_bracket::print (SCM smob)
 }
 
 ADD_INTERFACE (Piano_pedal_bracket,
-	       "The bracket of the piano pedal.  It can be tuned through "
-	       "the regular bracket properties.",
+	       "The bracket of the piano pedal.  It can be tuned through"
+	       " the regular bracket properties.",
 
 	       /* properties */
 	       "bound-padding "
diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index 3a8cb7ea29..e8f3b5335d 100644
--- a/lily/pitch-squash-engraver.cc
+++ b/lily/pitch-squash-engraver.cc
@@ -36,10 +36,10 @@ Pitch_squash_engraver::Pitch_squash_engraver ()
 ADD_ACKNOWLEDGER (Pitch_squash_engraver, note_head);
 ADD_TRANSLATOR (Pitch_squash_engraver,
 		/* doc */
-		"Set the vertical position of note heads to "
-		"@code{squashedPosition}, if that property is set.  This can "
-		"be used to make a single-line staff demonstrating the "
-		"rhythm of a melody.",
+		"Set the vertical position of note heads to"
+		" @code{squashedPosition}, if that property is set.  This can"
+		" be used to make a single-line staff demonstrating the"
+		" rhythm of a melody.",
 
 		/* create */
 		"",
diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 209c7d5017..cf42756f14 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -108,9 +108,9 @@ Repeat_acknowledge_engraver::process_music ()
 
 ADD_TRANSLATOR (Repeat_acknowledge_engraver,
 		/* doc */
-		"Acknowledge repeated music, and convert the contents of "
-		"@code{repeatCommands} into an appropriate setting for "
-		"@code{whichBar}.",
+		"Acknowledge repeated music, and convert the contents of"
+		" @code{repeatCommands} into an appropriate setting for"
+		" @code{whichBar}.",
 
 		/* create */
 		"",
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index ccd18f17e7..e0a494c0c5 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -272,8 +272,8 @@ Rest_collision::calc_positioning_done (SCM smob)
 }
 
 ADD_INTERFACE (Rest_collision,
-	       "Move around ordinary rests (not multi-measure-rests) to avoid "
-	       "conflicts.",
+	       "Move around ordinary rests (not multi-measure-rests) to avoid"
+	       " conflicts.",
 
 	       /* properties */
 	       "minimum-distance "
diff --git a/lily/rest.cc b/lily/rest.cc
index 1f756c4c91..1abb770d7b 100644
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -188,9 +188,9 @@ Rest::pure_height (SCM smob, SCM start, SCM end)
 }
 
 ADD_INTERFACE (Rest,
-	       "A rest symbol.  The property @code{style} can be "
-	       "@code{default}, @code{mensural}, @code{neomensural} or "
-	       "@code{classical}.",
+	       "A rest symbol.  The property @code{style} can be"
+	       " @code{default}, @code{mensural}, @code{neomensural} or"
+	       " @code{classical}.",
 
 	       /* properties */
 	       "direction "
diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index b80f0de61b..4fef353a46 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -131,8 +131,8 @@ ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio);
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
 		/* doc */
-		"Generate @code{NoteColumn}, an object that groups stems, "
-		"note heads, and rests.",
+		"Generate @code{NoteColumn}, an object that groups stems,"
+		" note heads, and rests.",
 
 		/* create */
 		"NoteColumn ",
diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 746701722f..55becfef5e 100644
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -171,18 +171,18 @@ Score_engraver::typeset_all ()
 
 ADD_TRANSLATOR_GROUP (Score_engraver,
 		      /* doc */
-		      "The top-level engraver.  Takes care of generating "
-		      "columns and the complete system (i.e., "
-		      "@code{System}).\n"
+		      "The top-level engraver.  Takes care of generating"
+		      " columns and the complete system (i.e.,"
+		      " @code{System}).\n"
 		      "\n"
-		      "This engraver decides whether a column is breakable.  "
-		      "The default is that a column is always breakable.  "
-		      "However, every @code{Bar_engraver} that does not have "
-		      "a bar line at a certain point sets @code{forbidBreaks} "
-		      "to stop line breaks.  In practice, this means that you "
-		      "can make a break point by creating a bar line "
-		      "(assuming that there are no beams or notes that "
-		      "prevent a break point).",
+		      "This engraver decides whether a column is breakable."
+		      "  The default is that a column is always breakable."
+		      "  However, every @code{Bar_engraver} that does not have"
+		      " a bar line at a certain point sets @code{forbidBreaks}"
+		      " to stop line breaks.  In practice, this means that you"
+		      " can make a break point by creating a bar line"
+		      " (assuming that there are no beams or notes that"
+		      " prevent a break point).",
 
 		      /* create */
 		      "System ",
diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 8a3a54327d..14a00ec0d3 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -69,8 +69,8 @@ Script_column_engraver::process_acknowledged ()
 ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
 ADD_TRANSLATOR (Script_column_engraver,
 		/* doc */
-		"Find potentially colliding scripts and put them into a "
-		"@code{ScriptColumn} object; that will fix the collisions.",
+		"Find potentially colliding scripts and put them into a"
+		" @code{ScriptColumn} object; that will fix the collisions.",
 
 		/* create */
 		"ScriptColumn ",
diff --git a/lily/script-column.cc b/lily/script-column.cc
index 4bea9e31fc..b249fd00ac 100644
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -154,8 +154,8 @@ Script_column::order_grobs (vector<Grob*> grobs)
 }
 
 ADD_INTERFACE (Script_column,
-	       "An interface that sorts scripts according to their "
-	       "@code{script-priority}.",
+	       "An interface that sorts scripts according to their"
+	       " @code{script-priority}.",
 	       
 	       /* properties */
 	       ""
diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index c6de581aca..66e71f0497 100644
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -138,17 +138,17 @@ Self_alignment_interface::set_align_self (Grob *me, Axis a)
 }
 
 ADD_INTERFACE (Self_alignment_interface,
-	       "Position this object on itself and/or on its parent.  To this "
-	       "end, the following functions are provided:\n"
+	       "Position this object on itself and/or on its parent.  To this"
+	       " end, the following functions are provided:\n"
 	       "\n"
 	       "@table @code\n"
 	       "@item Self_alignment_interface::[xy]_aligned_on_self\n"
-	       "  Align self on reference point, using "
-	       "  @code{self-alignment-X} and @code{self-alignment-Y}."
+	       "Align self on reference point, using"
+	       " @code{self-alignment-X} and @code{self-alignment-Y}."
 	       "@item Self_alignment_interface::aligned_on_[xy]_parent\n"
 	       "@item Self_alignment_interface::centered_on_[xy]_parent\n"
-	       "  Shift the object so its own reference point is centered on "
-	       "  the extent of the parent\n"
+	       "Shift the object so its own reference point is centered on"
+	       " the extent of the parent\n"
 	       "@end table\n",
 
 	       /* properties */
diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 6422db2122..c1b848bfce 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -303,14 +303,14 @@ Side_position_interface::get_axis (Grob *me)
 }
 
 ADD_INTERFACE (Side_position_interface,
-	       "Position a victim object (this one) next to other objects "
-	       "(the support).  The property @code{direction} signifies where "
-	       "to put the victim object relative to the support (left or "
-	       "right, up or down?)\n"
+	       "Position a victim object (this one) next to other objects"
+	       " (the support).  The property @code{direction} signifies where"
+	       " to put the victim object relative to the support (left or"
+	       " right, up or down?)\n"
 	       "\n"
-	       "The routine also takes the size of the staff into account if "
-	       "@code{staff-padding} is set.  If undefined, the staff symbol "
-	       "is ignored.",
+	       "The routine also takes the size of the staff into account if"
+	       " @code{staff-padding} is set.  If undefined, the staff symbol"
+	       " is ignored.",
 
 	       /* properties */
 	       "direction "
diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 6c79a92980..4a4977829a 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -263,8 +263,8 @@ ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_grob);
 
 ADD_TRANSLATOR (Spacing_engraver,
 		/* doc */
-		"Make a @code{SpacingSpanner} and do bookkeeping of shortest "
-		"starting and playing notes.",
+		"Make a @code{SpacingSpanner} and do bookkeeping of shortest"
+		" starting and playing notes.",
 
 		/* create */
 		"SpacingSpanner ",
diff --git a/lily/spacing-interface.cc b/lily/spacing-interface.cc
index 072bdbb39d..2033cfcac4 100644
--- a/lily/spacing-interface.cc
+++ b/lily/spacing-interface.cc
@@ -247,8 +247,8 @@ Spacing_interface::extremal_break_aligned_grob (Grob *me,
 
 
 ADD_INTERFACE (Spacing_interface,
-	       "This object calculates the desired and minimum distances "
-	       "between two columns.",
+	       "This object calculates the desired and minimum distances"
+	       " between two columns.",
 
 	       /* properties */
 	       "left-items "
diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index c972dac5cc..e580e33267 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -517,18 +517,18 @@ 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 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"
+	       "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 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.",
+	       "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 "
diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index a135e6abb1..1062817a02 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -77,8 +77,8 @@ Span_bar_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Span_bar_engraver, bar_line);
 ADD_TRANSLATOR (Span_bar_engraver,
 		/* doc */
-		"Make cross-staff bar lines: It catches all normal bar lines "
-		"and draws a single span bar across them.",
+		"Make cross-staff bar lines: It catches all normal bar lines"
+		" and draws a single span bar across them.",
 
 		/* create */
 		"SpanBar ",
diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 75999a7846..76e1b60280 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -212,9 +212,9 @@ Span_bar::calc_bar_size (SCM smob)
 }
 
 ADD_INTERFACE (Span_bar,
-	       "A bar line that is spanned between other barlines.  This "
-	       "interface is used for bar lines that connect different "
-	       "staves.",
+	       "A bar line that is spanned between other barlines.  This"
+	       " interface is used for bar lines that connect different"
+	       " staves.",
 
 	       /* properties */
 	       "glyph-name "
diff --git a/lily/spanner.cc b/lily/spanner.cc
index 1cfcf093eb..e73399dae0 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -424,12 +424,12 @@ Spanner::bounds_width (SCM grob)
 }
 
 ADD_INTERFACE (Spanner,
-	       "Some objects are horizontally spanned between objects.  For "
-	       "example, slurs, beams, ties, etc.  These grobs form a subtype "
-	       "called @code{Spanner}.  All spanners have two span points "
-	       "(these must be @code{Item} objects), one on the left and one "
-	       "on the right.  The left bound is also the X@tie{}reference "
-	       "point of the spanner.",
+	       "Some objects are horizontally spanned between objects.  For"
+	       " example, slurs, beams, ties, etc.  These grobs form a subtype"
+	       " called @code{Spanner}.  All spanners have two span points"
+	       " (these must be @code{Item} objects), one on the left and one"
+	       " on the right.  The left bound is also the X@tie{}reference"
+	       " point of the spanner.",
 
 	       /* properties */
 	       "minimum-length "
diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 5bfea17b3f..801fb96948 100644
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -201,9 +201,9 @@ Staff_spacing::get_spacing (Grob *me, Grob *right_col)
 }
 
 ADD_INTERFACE (Staff_spacing,
-	       "This object calculates spacing details from a breakable "
-	       "symbol (left) to another object.  For example, it takes care "
-	       "of optical spacing from a bar line to a note.",
+	       "This object calculates spacing details from a breakable"
+	       " symbol (left) to another object.  For example, it takes care"
+	       " of optical spacing from a bar line to a note.",
 
 	       /* properties */
 	       "stem-spacing-correction "
diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 2077a50082..e8ef99f9dd 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -183,12 +183,11 @@ position_less (Grob *const &a, Grob *const &b)
 }
 
 ADD_INTERFACE (Staff_symbol_referencer,
-	       "An object whose Y@tie{}position is meant relative to a staff "
-	       "symbol.  These usually "
-	       "have @code{Staff_symbol_referencer::callback} in their "
-	       "@code{Y-offset-callbacks}.",
+	       "An object whose Y@tie{}position is meant relative to a staff"
+	       " symbol.  These usually"
+	       " have @code{Staff_symbol_referencer::callback} in their"
+	       " @code{Y-offset-callbacks}.",
 
 	       /* properties */
 	       "staff-position "
 	       );
-	       
\ No newline at end of file
diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 3604be85a3..d4aa9e116c 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -171,12 +171,12 @@ Staff_symbol::height  (SCM smob)
 
 
 ADD_INTERFACE (Staff_symbol,
-	       "This spanner draws the lines of a staff.  A staff symbol "
-	       "defines a vertical unit, the @empf{staff space}.  Quantities "
-	       "that go by a half staff space are called @emph{positions}.  "
-	       "The center (i.e., middle line or space) is position@tie{}0. "
-	       "The length of the symbol may be set by hand through the "
-	       "@code{width} property.",
+	       "This spanner draws the lines of a staff.  A staff symbol"
+	       " defines a vertical unit, the @emph{staff space}.  Quantities"
+	       " that go by a half staff space are called @emph{positions}."
+	       "  The center (i.e., middle line or space) is position@tie{}0."
+	       " The length of the symbol may be set by hand through the"
+	       " @code{width} property.",
 
 	       /* properties */
 	       "ledger-line-thickness "
diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index e2b5f4100c..bc1fc7b096 100644
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -63,8 +63,8 @@ ADD_ACKNOWLEDGER (Stanza_number_align_engraver, stanza_number);
 
 ADD_TRANSLATOR (Stanza_number_align_engraver,
 		/* doc */
-		"This engraver ensures that stanza numbers are neatly "
-		"aligned.",
+		"This engraver ensures that stanza numbers are neatly"
+		" aligned.",
 
 		/* create */
 		"",
diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 0e52e18a94..d07716e813 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -169,8 +169,8 @@ ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
 
 ADD_TRANSLATOR (Stem_engraver,
 		/* doc */
-		"Create stems and single-stem tremolos.  It also works "
-		"together with the beam engraver for overriding beaming.",
+		"Create stems and single-stem tremolos.  It also works"
+		" together with the beam engraver for overriding beaming.",
 
 		/* create */
 		"Stem "
diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index a41675137e..c093e9f40e 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -247,8 +247,8 @@ Stem_tremolo::print (SCM grob)
 }
 
 ADD_INTERFACE (Stem_tremolo,
-	       "A beam slashing a stem to indicate a tremolo.  The property "
-	       "@code{style} can be @code{default} or @code{rectangle}.",
+	       "A beam slashing a stem to indicate a tremolo.  The property"
+	       " @code{style} can be @code{default} or @code{rectangle}.",
 
                /* properties */
 	       "beam-thickness "
diff --git a/lily/stem.cc b/lily/stem.cc
index 34525194e7..a882e73a1f 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -996,29 +996,29 @@ Stem::calc_cross_staff (SCM smob)
 
 /* FIXME:  Too many properties  */
 ADD_INTERFACE (Stem,
-	       "The stem represents the graphical stem.  In addition, it "
-	       "internally connects note heads, beams, and tremolos.  Rests "
-	       "and whole notes have invisible stems.\n"
+	       "The stem represents the graphical stem.  In addition, it"
+	       " internally connects note heads, beams, and tremolos.  Rests"
+	       " and whole notes have invisible stems.\n"
 	       "\n"
-	       "The following properties may be set in the @code{details} "
-	       "list.\n"
+	       "The following properties may be set in the @code{details}"
+	       " list.\n"
 	       "\n"
 	       "@table @code\n"
 	       "@item beamed-lengths\n"
-	       "  List of stem lengths given beam multiplicity.\n"
+	       "List of stem lengths given beam multiplicity.\n"
 	       "@item beamed-minimum-free-lengths\n"
-	       "  List of normal minimum free stem lengths (chord to beams) "
-	       "  given beam multiplicity.\n"
+	       "List of normal minimum free stem lengths (chord to beams)"
+	       " given beam multiplicity.\n"
 	       "@item beamed-extreme-minimum-free-lengths\n"
-	       "  List of extreme minimum free stem lengths (chord to beams) "
-	       "  given beam multiplicity.\n"
+	       "List of extreme minimum free stem lengths (chord to beams)"
+	       " given beam multiplicity.\n"
 	       "@item lengths\n"
-	       "  Default stem lengths.  The list gives a length for each "
-	       "  flag count.\n"
+	       "Default stem lengths.  The list gives a length for each"
+	       " flag count.\n"
 	       "@item stem-shorten\n"
-	       "  How much a stem in a forced direction should be shortened.  "
-	       "  The list gives an amount depending on the number of flags "
-	       "  and beams.\n"
+	       "How much a stem in a forced direction should be shortened."
+	       "  The list gives an amount depending on the number of flags"
+	       " and beams.\n"
 	       "@end table\n",
 
 	       /* properties */
diff --git a/lily/string-number-engraver.cc b/lily/string-number-engraver.cc
index 4b3c39e590..234dbdb02b 100644
--- a/lily/string-number-engraver.cc
+++ b/lily/string-number-engraver.cc
@@ -36,10 +36,10 @@ String_number_engraver::String_number_engraver ()
 
 ADD_TRANSLATOR (String_number_engraver,
 		/* doc */
-		"Swallow string number events.  The purpose of this engraver "
-		"is to process tablatures for normal notation.  To provent "
-		"warnings for unprocessed string number events to obscure "
-		"real error messages, this engraver swallows them all.",
+		"Swallow string number events.  The purpose of this engraver"
+		" is to process tablatures for normal notation.  To provent"
+		" warnings for unprocessed string number events to obscure"
+		" real error messages, this engraver swallows them all.",
 
 		/* create */
 		"",
diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc
index cb42085950..37a2148dbf 100644
--- a/lily/swallow-engraver.cc
+++ b/lily/swallow-engraver.cc
@@ -30,9 +30,9 @@ Swallow_engraver::Swallow_engraver ()
 
 ADD_TRANSLATOR (Swallow_engraver,
 		/* doc */
-		"This engraver swallows everything given to it silently.  "
-		"The purpose of this is to prevent spurious @q{event junked} "
-		"warnings.",
+		"This engraver swallows everything given to it silently."
+		"  The purpose of this is to prevent spurious @q{event junked}"
+		" warnings.",
 
 		/* create */
 		"",
diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index 0eebd7f15e..238a3a6d9c 100644
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -251,10 +251,10 @@ ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_text);
 
 ADD_TRANSLATOR (System_start_delimiter_engraver,
 		/* doc */
-		"Create a system start delimiter (i.e., a "
-		"@code{SystemStartBar}, @code{SystemStartBrace}, "
-		"@code{SystemStartBracket} or @code{SystemStartSquare} "
-		"spanner).",
+		"Create a system start delimiter (i.e., a"
+		" @code{SystemStartBar}, @code{SystemStartBrace},"
+		" @code{SystemStartBracket} or @code{SystemStartSquare}"
+		" spanner).",
 
 		/* create */
 		"SystemStartSquare "
diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 78e7426722..233808da5e 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -7,7 +7,7 @@
 */
 
 #include "system-start-delimiter.hh"
-#include "text-interface.hh" 
+#include "text-interface.hh"
 #include "all-font-metrics.hh"
 #include "axis-group-interface.hh"
 #include "font-interface.hh"
@@ -173,27 +173,27 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
 }
 
 ADD_INTERFACE (System_start_delimiter,
-	       "The brace, bracket or bar in front of the system.  The "
-	       "following values for @code{style} are recognized:\n"
+	       "The brace, bracket or bar in front of the system.  The"
+	       " following values for @code{style} are recognized:\n"
 	       "\n"
 	       "@table @code\n"
 	       "@item bracket\n"
-	       "  A thick bracket, normally used to group similar "
-	       "  instruments in a score.  Default for @code{StaffGroup}.  "
+	       "A thick bracket, normally used to group similar"
+	       " instruments in a score.  Default for @code{StaffGroup}."
 	       "  @code{SystemStartBracket} uses this style.\n"
 	       "@item brace\n"
-	       "  A @q{piano style} brace normally used for an instrument "
-	       "  that uses two staves.  The default style for "
-	       "  @code{GrandStaff}.  @code{SystemStartBrace} uses this "
-	       "  style.\n"
+	       "A @q{piano style} brace normally used for an instrument"
+	       " that uses two staves.  The default style for"
+	       " @code{GrandStaff}.  @code{SystemStartBrace} uses this"
+	       " style.\n"
 	       "@item bar-line\n"
-	       "  A simple line between the staves in a score.  Default "
-	       "  for staves enclosed in @code{<<} and @code{>>}.  "
+	       "A simple line between the staves in a score.  Default"
+	       " for staves enclosed in @code{<<} and @code{>>}."
 	       "  @code{SystemStartBar} uses this style.\n"
 	       "@item line-bracket\n"
-	       "  A simple square, normally used for subgrouping "
-	       "  instruments in a score.  @code{SystemStartSquare} uses "
-	       "  this style.\n"
+	       "A simple square, normally used for subgrouping"
+	       " instruments in a score.  @code{SystemStartSquare} uses"
+	       " this style.\n"
 	       "@end table\n"
 	       "\n"
 	       "See also @file{input/regression/system-start-nesting.ly}.",
diff --git a/lily/system.cc b/lily/system.cc
index 2968028ab8..a2ad71ece3 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -512,9 +512,9 @@ get_root_system (Grob *me)
 }
 
 ADD_INTERFACE (System,
-	       "This is the top-level object: Each object in a score "
-	       "ultimately has a @code{System} object as its X and "
-	       "Y@tie{}parent.",
+	       "This is the top-level object: Each object in a score"
+	       " ultimately has a @code{System} object as its X and"
+	       " Y@tie{}parent.",
 
 	       /* properties */
 	       "all-elements "
diff --git a/lily/tab-harmonic-engraver.cc b/lily/tab-harmonic-engraver.cc
index 10fc13f579..86dee35ea4 100644
--- a/lily/tab-harmonic-engraver.cc
+++ b/lily/tab-harmonic-engraver.cc
@@ -65,8 +65,8 @@ Tab_harmonic_engraver::acknowledge_note_head (Grob_info info)
 ADD_ACKNOWLEDGER (Tab_harmonic_engraver, note_head);
 ADD_TRANSLATOR (Tab_harmonic_engraver,
 		/* doc */
-		"In a tablature, parenthesize objects whose music cause has "
-		"the @code{parenthesize} property.",
+		"In a tablature, parenthesize objects whose music cause has"
+		" the @code{parenthesize} property.",
 		
 		/* create */
 		"HarmonicParenthesesItem ",
diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 4c64432757..dd4ab16008 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -149,8 +149,8 @@ Tab_note_heads_engraver::stop_translation_timestep ()
 
 ADD_TRANSLATOR (Tab_note_heads_engraver,
 		/* doc */
-		"Generate one or more tablature noteheads from event of type "
-		"@code{NoteEvent}.",
+		"Generate one or more tablature noteheads from event of type"
+		" @code{NoteEvent}.",
 
 		/* create */
 		"TabNoteHead ",
diff --git a/lily/tab-staff-symbol-engraver.cc b/lily/tab-staff-symbol-engraver.cc
index 1a4ff8a298..27756d2bc5 100644
--- a/lily/tab-staff-symbol-engraver.cc
+++ b/lily/tab-staff-symbol-engraver.cc
@@ -34,8 +34,8 @@ Tab_staff_symbol_engraver::Tab_staff_symbol_engraver ()
 ADD_ACKNOWLEDGER (Tab_staff_symbol_engraver, staff_symbol);
 ADD_TRANSLATOR (Tab_staff_symbol_engraver,
 		/* doc */
-		"Create a tablature staff symbol, but look at "
-		"@code{stringTunings} for the number of lines.",
+		"Create a tablature staff symbol, but look at"
+		" @code{stringTunings} for the number of lines.",
 
 		/* create */
 		"StaffSymbol ",
diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index eeb41ffd1b..757f1d277c 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -137,13 +137,13 @@ Text_interface::is_markup_list (SCM x)
 
 
 ADD_INTERFACE (Text_interface,
-	       "A Scheme markup text, see @ruser{Text markup} and "
-	       "@ruser{New markup command definition}.\n"
+	       "A Scheme markup text, see @ruser{Text markup} and"
+	       " @ruser{New markup command definition}.\n"
 	       "\n"
-	       "There are two important commands: "
-	       "@code{ly:text-interface::print}, which is a "
-	       "grob callback, and "
-	       "@code{ly:text-interface::interpret-markup}.",
+	       "There are two important commands:"
+	       " @code{ly:text-interface::print}, which is a"
+	       " grob callback, and"
+	       " @code{ly:text-interface::interpret-markup}.",
 
 	       /* properties */
 	       "baseline-skip "
diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index c9e2e30fbb..bb50c4fbc1 100644
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -11,13 +11,13 @@
 
 #include "axis-group-interface.hh"
 #include "paper-column.hh"
-#include "bezier.hh" 
+#include "bezier.hh"
 #include "directional-element-interface.hh"
 #include "libc-extension.hh"
 #include "misc.hh"
 #include "note-head.hh"
 #include "rhythmic-head.hh"
-#include "spanner.hh" 
+#include "spanner.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
 #include "tie-configuration.hh"
diff --git a/lily/tie.cc b/lily/tie.cc
index 19feb2e26d..aa265f5042 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -312,7 +312,7 @@ ADD_INTERFACE (Tie,
 	       "direction "
 	       "separation-item "
 	       "head-direction "
-	       "line-thickness " 
+	       "line-thickness "
 	       "quant-score "
 	       "staff-position "
 	       "thickness "
diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index d72ba64645..26ba68e13d 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -87,8 +87,8 @@ Time_signature_engraver::stop_translation_timestep ()
 
 ADD_TRANSLATOR (Time_signature_engraver,
 		/* doc */
-		"Create a @ref{TimeSignature} whenever "
-		"@code{timeSignatureFraction} changes.",
+		"Create a @ref{TimeSignature} whenever"
+		" @code{timeSignatureFraction} changes.",
 
 		/* create */
 		"TimeSignature ",
diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 79adcbfb17..85b3b878b6 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -121,24 +121,24 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den)
 }
 
 ADD_INTERFACE (Time_signature,
-	       "A time signature, in different styles.  The following values "
-	       "for @code{style} are are recognized:\n"
+	       "A time signature, in different styles.  The following values"
+	       " for @code{style} are are recognized:\n"
 	       "\n"
 	       "@table @code\n"
 	       "@item C\n"
-	       "  4/4 and 2/2 are typeset as C and struck C, respectively.  "
+	       "4/4 and 2/2 are typeset as C and struck C, respectively."
 	       "  All other time signatures are written with two digits.\n"
 	       "@item neomensural\n"
-	       "  2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are "
-	       "  typeset with neo-mensural style mensuration marks.  All "
-	       "  other time signatures are written with two digits.\n"
+	       "2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are"
+	       " typeset with neo-mensural style mensuration marks.  All"
+	       " other time signatures are written with two digits.\n"
 	       "@item mensural\n"
-	       "  2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are "
-	       "  typeset with mensural style mensuration marks.  All other "
-	       "  time signatures are written with two digits.\n"
+	       "2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are"
+	       " typeset with mensural style mensuration marks.  All other"
+	       " time signatures are written with two digits.\n"
 	       "@item single-digit\n"
-	       "  All time signatures are typeset with a single digit, e.g., "
-	       "  3/2 is written as 3.\n"
+	       "All time signatures are typeset with a single digit, e.g.,"
+	       " 3/2 is written as 3.\n"
 	       "@end table\n"
 	       "\n"
 	       "See also the test-file @file{input/test/time.ly}.",
diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index a813957d04..dd4c23919e 100644
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -125,11 +125,11 @@ Timing_translator::start_translation_timestep ()
 
 ADD_TRANSLATOR (Timing_translator,
 		/* doc */
-		"This engraver adds the alias @code{Timing} to its containing "
-		"context.  Responsible for synchronizing timing information "
-		"from staves.  Normally in @code{Score}.  In order to create "
-		"polyrhythmic music, this engraver should be removed from "
-		"@code{Score} and placed in @code{Staff}.",
+		"This engraver adds the alias @code{Timing} to its containing"
+		" context.  Responsible for synchronizing timing information"
+		" from staves.  Normally in @code{Score}.  In order to create"
+		" polyrhythmic music, this engraver should be removed from"
+		" @code{Score} and placed in @code{Staff}.",
 
 		/* create */
 		"",
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index b52cd5b765..dde38da22d 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -767,11 +767,11 @@ Tuplet_bracket::calc_cross_staff (SCM smob)
 }
 
 ADD_INTERFACE (Tuplet_bracket,
-	       "A bracket with a number in the middle, used for tuplets.  "
-	       "When the bracket spans a line break, the value of "
-	       "@code{break-overshoot} determines how far it extends "
-	       "beyond the staff.  At a line break, the markups in the "
-	       "@code{edge-text} are printed at the edges.",
+	       "A bracket with a number in the middle, used for tuplets."
+	       "  When the bracket spans a line break, the value of"
+	       " @code{break-overshoot} determines how far it extends"
+	       " beyond the staff.  At a line break, the markups in the"
+	       " @code{edge-text} are printed at the edges.",
 
 	       /* properties */
 	       "bracket-flare "
diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index d5b44b3d97..1879697bc3 100644
--- a/lily/tweak-engraver.cc
+++ b/lily/tweak-engraver.cc
@@ -41,8 +41,8 @@ Tweak_engraver::acknowledge_grob (Grob_info info)
 ADD_ACKNOWLEDGER (Tweak_engraver, grob);
 ADD_TRANSLATOR (Tweak_engraver,
 		/* doc */
-		"Read the @code{tweaks} property from the originating event, "
-		"and set properties.",
+		"Read the @code{tweaks} property from the originating event,"
+		" and set properties.",
 		
 		/* create */
 		"",
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index ea13929e73..c812684b42 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -239,8 +239,8 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
       if (glyph_name_scm == SCM_EOL)
 	{
 	  primitive->programming_error ("Vaticana_ligature:"
-					"undefined glyph-name -> "
-					"ignoring grob");
+					" undefined glyph-name ->"
+					" ignoring grob");
 	  continue;
 	}
       string glyph_name = ly_scm2string (glyph_name_scm);
@@ -254,8 +254,8 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
 	  else
 	    {
 	      primitive->programming_error ("Vaticana_ligature:"
-					    "delta-position undefined -> "
-					    "ignoring grob");
+					    " delta-position undefined ->"
+					    " ignoring grob");
 	      continue;
 	    }
 	}
@@ -484,8 +484,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
       else
 	{
 	  primitive->programming_error ("Vaticana_ligature:"
-					"delta-position undefined -> "
-					"ignoring grob");
+					" delta-position undefined ->"
+					" ignoring grob");
 	  continue;
 	}
 
@@ -607,8 +607,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
 	else // (prev_delta_pitch == 0)
 	  {
 	    primitive->programming_error ("Vaticana_ligature:"
-					  "deminutum head must have different "
-					  "pitch -> ignoring grob");
+					  " deminutum head must have different"
+					  " pitch -> ignoring grob");
 	  }
       else if (prefix_set & (CAVUM | LINEA))
 	if ((prefix_set & CAVUM) && (prefix_set & LINEA))
diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index f48bb7cbb3..0cf90c5af9 100644
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -297,7 +297,7 @@ ADD_INTERFACE (Vaticana_ligature,
 
 	       /* properties */
 	       "glyph-name "
-	       "flexa-height " 
+	       "flexa-height "
 	       "flexa-width "
 	       "thickness "
 	       "add-cauda "
diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 347b982b18..c4adfaae11 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -38,8 +38,8 @@ protected:
 ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
 		/* doc */
-		"Catch groups (staves, lyrics lines, etc.) and stack them "
-		"vertically.",
+		"Catch groups (staves, lyrics lines, etc.) and stack them"
+		" vertically.",
 
 		/* create */
 		"VerticalAlignment ",