From eead7f97fe329a0a6efa27dfbd8bb7c8f74a5026 Mon Sep 17 00:00:00 2001
From: hjunes <hjunes>
Date: Mon, 16 Feb 2004 22:44:25 +0000
Subject: [PATCH]         * lily/align-interface.cc,
 lily/axis-group-engraver.cc: spell         it hara-kiri.

        * input/regression/{many}.ly: improve descriptions trying to figure
---
 ChangeLog                                      | 8 ++++++++
 input/regression/dots.ly                       | 4 ++--
 input/regression/dynamics-unbound-hairpin.ly   | 2 +-
 input/regression/easy-notation.ly              | 2 +-
 input/regression/finger-chords.ly              | 2 +-
 input/regression/follow-voice-break.ly         | 3 ++-
 input/regression/font-magnification.ly         | 3 ++-
 input/regression/font-name.ly                  | 2 +-
 input/regression/glissando.ly                  | 4 ++--
 input/regression/grace-nest3.ly                | 2 +-
 input/regression/grace-nest4.ly                | 2 +-
 input/regression/grace-nest5.ly                | 2 +-
 input/regression/grace-part-combine.ly         | 2 +-
 input/regression/grace-stems.ly                | 4 ++--
 input/regression/grace-types.ly                | 3 ++-
 input/regression/grace-unfold-repeat.ly        | 4 ++--
 input/regression/grace-volta-repeat-2.ly       | 5 ++---
 input/regression/grace.ly                      | 6 +++---
 input/regression/hara-kiri-pianostaff.ly       | 4 ++--
 input/regression/instrument-name.ly            | 5 +++--
 input/regression/key-signature-scordatura.ly   | 6 +++---
 input/regression/keys.ly                       | 8 ++++----
 input/regression/lyric-combine-polyphonic.ly   | 2 +-
 input/regression/lyric-combine.ly              | 2 +-
 input/regression/lyric-hyphen-break.ly         | 2 +-
 input/regression/lyric-hyphen.ly               | 2 +-
 input/regression/lyric-phrasing-new.ly         | 3 +--
 input/regression/lyric-phrasing.ly             | 7 +++----
 input/regression/lyrics-bar.ly                 | 2 +-
 input/regression/markup-note.ly                | 4 ++--
 input/regression/markup-stack.ly               | 2 +-
 input/regression/markup-user.ly                | 2 +-
 input/regression/measure-grouping.ly           | 2 +-
 input/regression/metronome-marking.ly          | 2 +-
 input/regression/multi-measure-rest-spacing.ly | 4 ++--
 input/regression/multi-measure-rest-text.ly    | 2 +-
 input/regression/multi-measure-rest.ly         | 2 +-
 input/regression/new-markup-syntax.ly          | 2 +-
 input/regression/non-empty-text.ly             | 4 ++--
 input/regression/note-group-bracket.ly         | 2 +-
 input/regression/note-head-style.ly            | 2 +-
 input/regression/number-staff-lines.ly         | 2 +-
 input/regression/ottava-broken.ly              | 4 ++--
 input/regression/part-combine-a2.ly            | 2 +-
 input/regression/part-combine-text.ly          | 5 ++---
 input/regression/part-combine.ly               | 9 ++++-----
 input/regression/pedal-bracket.ly              | 6 +++---
 input/regression/pedal-ped.ly                  | 4 ++--
 input/regression/phrasing-slur.ly              | 2 +-
 input/regression/prefatory-empty-spacing.ly    | 2 +-
 input/regression/prefatory-spacing-matter.ly   | 2 +-
 lily/align-interface.cc                        | 2 +-
 lily/axis-group-engraver.cc                    | 2 +-
 53 files changed, 91 insertions(+), 84 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4d1e59f18..2ad319e919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-16  Heikki Junes  <hjunes@cc.hut.fi>
+
+	* lily/align-interface.cc, lily/axis-group-engraver.cc: spell
+	it hara-kiri.
+
+	* input/regression/{many}.ly: improve descriptions trying to figure
+	out what is tested.
+
 2004-02-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* lily/slur.cc (broken_trend_offset): robustness fix.
diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index 99a4ad2567..6cf29b100c 100644
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -1,8 +1,8 @@
 \version "2.1.22" \header{
 
 
-    texidoc=" Noteheads can have dots, and rests
-can too.  Augmentation dots should never be printed on a staff line,
+    texidoc=" Noteheads can have dots, and rests too.  
+    Augmentation dots should never be printed on a staff line,
 but rather be shifted vertically. They should go up, but in case of
 multiple parts, the down stems have down shifted dots.  In case of
 chords, all dots should be in a column.  The dots go along as rests
diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly
index 6dcc2522c1..325c4f6f2a 100644
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -1,7 +1,7 @@
 \version "2.1.22"
 
 \header {
-texidoc = "Crescendi may start off-notes. In that case, they should  not collapse into flat lines."
+texidoc = "Crescendi may start off-notes, however, they should  not collapse into flat lines."
 }
 
 \score { \notes { \context  Voice { 
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index a89f86be54..127e69ecc1 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,7 +1,7 @@
 \version "2.1.23"
 
 \header {
-texidoc = " Ez-notation prints names in note heads.
+texidoc = " Easy-notation (or Ez-notation) prints names in note heads.
 You also get ledger lines, of course."
 }
 
diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index d7684f77c9..a217be2aa5 100644
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -2,7 +2,7 @@
 \version "2.1.22"
 \header {
 
-texidoc = "With the new chord syntax it's possible to associate
+texidoc = "With the new chord syntax, it is possible to associate
 fingerings uniquely with notes. This makes horizontal fingering much
 easier to process."
 
diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index 4e03fe69e1..b8fb135f65 100644
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -2,8 +2,9 @@
 \version "2.1.22"
 \header{
        texidoc = "
+The line-spanners connects to the Y position of the note  on the next line.
 When put across line breaks, only the part before the line break is
-printed. The line-spanners connects to the Y position of the note  on the next line.
+printed. 
 "
 
 }
diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index d613f8ba98..7f666b679a 100644
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -1,7 +1,8 @@
 
 \version "2.1.22"
 \header { texidoc = "The magnification can be set for any font. Note
-that this doesn't change variable symbols such as beams or slurs. " }
+that this does not change variable symbols such as beams or slurs. 
+" }
 
 \score {
 \notes \relative c'' \context Voice {
diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index d2ea32412a..0dab543a74 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -2,7 +2,7 @@
 
 \header {
 
-    texidoc = "Using other fonts can be done by setting font-name for
+    texidoc = "Other fonts can be used by setting font-name for
 the appropriate object. This may include Postscript fonts that are
 available through (La)TeX.
 
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index b04eb2aee0..aabd306c9c 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -3,8 +3,8 @@
 
 \header{
 
-texidoc=" Simple glissando lines between notes are supported.
-The first two glissandi are not consecutive.
+texidoc=" Between notes, there may be simple glissando lines.
+Here, the first two glissandi are not consecutive.
 
 The engraver does no time-keeping, so it involves some trickery to get
 << @{ s8 s8 s4 @} @{ c4 \\gliss d4 @} >> working correctly.
diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly
index 66325fdc89..1a750318c4 100644
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,6 +1,6 @@
 \version "2.1.22"
 \header {
-    texidoc = "Another nested grace situation."
+    texidoc = "In nested syntax, graces are still properly handled."
     }
     \paper { raggedright= ##t }
 
diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly
index 5fdf93faf0..720d3492fc 100644
--- a/input/regression/grace-nest4.ly
+++ b/input/regression/grace-nest4.ly
@@ -1,6 +1,6 @@
 \version "2.1.22"
 \header {
-texidoc = "Another combination of grace note nesting."
+texidoc = "Also in the nested syntax here, grace notes appear rightly."
 }
 
 \score { \notes \context Voice \relative c'' {
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index 6e0d7e7a3c..31a4556e43 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,7 +1,7 @@
 
 \version "2.1.22"
 \header {
-    texidoc = "Another nested grace situation."
+    texidoc = "Graces notes may have the same duration as the main note."
     }
 
 \score
diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index a126ad88b5..69429e4036 100644
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,7 +1,7 @@
 
 \version "2.1.22"
 \header {
-    texidoc = "Partcombiner and grace notes can go together."
+    texidoc = "Grace notes may be put in a @code{partcombine}r."
 }
 
 \paper { raggedright= ##t }
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 23f7f299cc..bb586434f4 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,8 +1,8 @@
 
 \version "2.1.22"
 \header{
-texidoc = "Here startGraceMusic should set no-stem-extend to true;
-the two grace beams should be the same here.
+texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
+true; the two grace beams should be the same here.
 "
 }
 
diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly
index a0a7053a42..3ece3a658a 100644
--- a/input/regression/grace-types.ly
+++ b/input/regression/grace-types.ly
@@ -1,6 +1,7 @@
 \version "2.1.22"
 \header {
-    texidoc = "Different grace types explained: the base grace switches to smaller type. The appoggiatura also inserts a slur, and the
+    texidoc = "There are three different kinds of grace types: the base 
+grace switches to smaller type, the appoggiatura inserts also a slur, and the
 acciaccatura inserts a slur and slashes the stem." 
     }
 
diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly
index d22cee63d4..1fda839e58 100644
--- a/input/regression/grace-unfold-repeat.ly
+++ b/input/regression/grace-unfold-repeat.ly
@@ -1,7 +1,7 @@
 \version "2.1.22"
 \header {
-    texidoc = "Grace notes and unfolded repeats.
-Line breaks may happen before  grace  notes.
+    texidoc = "When grace notes are entered with unfolded repeats,
+line breaks take place before  grace  notes.
 "
 }
     
diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly
index 5c4a08569c..907a6f132a 100644
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -2,9 +2,8 @@
 
 \header {
 
-    texidoc = "Graces at combined with volta repeats: a repeat
-starting with a grace, following a repeat directly. The bars should be
-merged into one @code{:||:}."
+    texidoc = "A volta repeat may begin with a grace. Consecutive ending and
+    starting repeat bars are into one @code{:||:}."
 
       }
 
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 36f6f59fc8..d3c2add774 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -5,15 +5,15 @@
 texidoc="
 Grace notes are typeset as an encapsulated piece of music. You can
 have beams, notes, chords, stems etc. within a @code{\grace} section.
-Slurs that start within a grace section, but aren't ended are attached
+Slurs that start within a grace section, but are not ended are attached
 to the next normal note.  Grace notes have zero duration.  If there
-are tuplets, the grace notes won't be under the brace.  Grace notes
+are tuplets, the grace notes will not be under the brace.  Grace notes
 can have accidentals, but they are (currently) spaced at a fixed
 distance.  Grace notes (of course) come before the accidentals of the
 main note.  Grace notes can also be positioned after the main note.
 
 Grace notes without beams should have a slash, if @code{flagStyle} is
-not set.  Main note scripts don't end up on the grace note.
+not set.  Main note scripts do not end up on the grace note.
 
 "
 }
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 20b13c6f41..89f92dc4ac 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -2,12 +2,12 @@
 
 \header { texidoc =
 
-	  " Hara kiri staves kill themselves if they are empty.  This
+	  " Hara-kiri staves kill themselves if they are empty.  This
 example really contains three staves, but as they progress, empty ones
 are removed: this example has three staves, but some of them
 disappear: note how the 2nd line only has the bar number 2. (That the
 bar number is printed might be considered a bug, however, the scenario
-of all staves disappearing doesn't happen in practice.)
+of all staves disappearing does not happen in practice.)
 
 Any staff brackets and braces are removed, both in the single staff
 and no staff case.
diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 9d8920b147..fbe6310d1e 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -2,8 +2,9 @@
 \header{
 texidoc="
 Staff margins are also markings attached to barlines.  They should be
-left of the staff, and be centered vertically wrt the staff.  They may
-be on normal staves, but also on compound staves, like the PianoStaff.
+left of the staff, and be centered vertically with respect to the staff.  
+They may be on normal staves, but also on compound staves, like the 
+PianoStaff.
 "
 }
 
diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly
index 9f9747909f..f9101a4b11 100644
--- a/input/regression/key-signature-scordatura.ly
+++ b/input/regression/key-signature-scordatura.ly
@@ -1,9 +1,9 @@
 
 \version "2.1.22"
 
-\header { texidoc = "Key signatures can be set per pitch
-individually. This can be done by setting @code{Staff.keySignature}
-directly."
+\header { texidoc = "By setting @code{Staff.keySignature} directly,
+key signatures can be set invidually per pitch.
+"
 
 }
 \score { \notes
diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 06a257c6a4..b63961e50e 100644
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -2,10 +2,10 @@
 \version "2.1.22"
 \header{
 texidoc="
-Key signatures appear on key  changes. They may also
-appear without barlines.  The restoration accidentals are not printed at
-the start of the line. If @code{createKeyOnClefChange} is set, they're
-also created on a clef change.
+Key signatures may appear on key changes, even without a barline.  
+In the case of a line break, the restoration accidentals are printed at 
+end of a line. If @code{createKeyOnClefChange} is set, key signatures
+are created also on a clef change.
 "
 }
 
diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index aeed986bfc..6c2726551a 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,7 +1,7 @@
 \version "2.1.22"
 \header {
 
-texidoc ="Polyphonic rhythms and rests don't disturb
+texidoc ="Polyphonic rhythms and rests do not disturb
 @code{\lyricsto}."
 
 }
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 67866164bd..31d6ce86b6 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -7,7 +7,7 @@ discarded.  Lyrics will not be set over rests.  You can have melismata
 either by setting a property melismaBusy, or by setting
 automaticMelismas (which will set melismas during slurs and ties).  If
 you want a different order than first Music, then Lyrics, you must
-precook a chord of staves/lyrics and label those.  Of course
+precook a chord of staves/lyrics and label those.  Of course,
 @code{\rhythm} ignores any other rhythms in the piece.  Hyphens and
 extenders do not assume anything about lyric lengths, so they continue
 to work."
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index 45cc46c831..79fead524a 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -2,7 +2,7 @@
 
 \header {
 
-    texidoc = "Hyphens only print at the beginning of the line, when
+    texidoc = "Hyphens are print at the beginning of the line only when
 they go past the first note. "
 
     }
diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index 4dc26dabd7..d93aba641f 100644
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -4,7 +4,7 @@
 }
 \score{
 	<<
-	\context Staff \notes { c' (c') (c') c' }
+	\context Staff \notes { c' (c') c'( c') }
 	\context Lyrics \lyrics { bla -- alb xxx -- yyy }
 	>>
 }
diff --git a/input/regression/lyric-phrasing-new.ly b/input/regression/lyric-phrasing-new.ly
index af8babbaba..7415c633e9 100644
--- a/input/regression/lyric-phrasing-new.ly
+++ b/input/regression/lyric-phrasing-new.ly
@@ -1,8 +1,7 @@
 \version "2.1.22"
 \header {
 
-texidoc = "Lyric phrasing:
-
+texidoc = "
   Normally, the lyric is centered on the note head. However, on
   melismata, the text is left aligned on the left-side of the note head.
 
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index b8147edf90..fd0ddc9839 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -3,10 +3,9 @@
 \header{
   texidoc="Lyric phrasing
 
-  We find start and end of phrases, and align lyrics of multiple stanzas
-  accordingly.
+  The multiple stanzas are aligned according to the start and end of a phrase.
 
-  Also, lyrics at start of melismata should be left aligned.
+  Also, lyrics at the beginning of a melismata should be left aligned.
   (is that only lyrics that are followed by `__'?  Because
   that seems to be the case now -- jcn)
 
@@ -18,7 +17,7 @@
      2:  x         x         x______      x
 @end example
 
-  Only lyrics that are followed by '__' while there's a melisma,
+  Only lyrics that are followed by '__' while there is a melisma,
   are left-aligned, in this case the third x."
 }
 
diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index dbf879b98a..89207ab89b 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -3,7 +3,7 @@
 \header{
 texidoc="
 Adding a @code{Bar_engraver} to the Lyrics context makes sure that
-lyrics don't collide with barlines.
+lyrics do not collide with barlines.
 "
 }
 
diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 4a55fc510e..32b3437928 100644
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -1,7 +1,7 @@
 \header {
 
-    texidoc = "The note markup function is used to make metronome
- markings. It works for a variety of flag dot and duration settings."
+    texidoc = "The note markup function may be used to make metronome
+ markings. It works for a variety of flag, dot and duration settings."
 }
 \version "2.1.22"
 
diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index 04b968fd38..3abee5f618 100644
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,5 +1,5 @@
 \version "2.1.22"
-\header {texidoc="Stacking of markup scripts."}
+\header {texidoc="Markup scripts may be stacked."}
 \paper { raggedright = ##t}
 \score { \notes { c''^\markup { "a" \column < "1" \bold "2"  "3" > } } }
 
diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index f5e3909bfe..373d65256f 100644
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,7 +1,7 @@
 
 \header {
 
-    texidoc = "Users may define their own markup commands using the
+    texidoc = "Own markup commands may be defined by using the
     @code{def-markup-command} scheme macro."
 
 
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 23b17c7b81..ec2a008ead 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -3,7 +3,7 @@
 {
 
     texidoc = "The @code{Measure_grouping_engraver} adds triangles and
-brackets above beats when you set beatGrouping.  "
+brackets above beats when the beats of a time signature are grouped.  "
 
 }
 
diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index 8a2f334695..b381a6fa1b 100644
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -2,7 +2,7 @@
 
 \header {
 
-    texidoc = "Here @code{\tempo} directives are printed as metronome markings.
+    texidoc = "Here @code{\\tempo} directives are printed as metronome markings.
 
 The marking is left aligned with the time signature, if there is one.
 "
diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly
index 6ccb8b9a45..a4db531ffe 100644
--- a/input/regression/multi-measure-rest-spacing.ly
+++ b/input/regression/multi-measure-rest-spacing.ly
@@ -1,7 +1,7 @@
 \header {
 
-    texidoc = "By setting texts starting with a mmrest we create
-an extra spacing column. This should not cause problems."
+    texidoc = "By setting texts starting with a mmrest, an extra spacing 
+column is created. This should not cause problems."
     }
 \version "2.1.22"
 
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index cd28968db4..4255d628d7 100644
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -3,7 +3,7 @@
 \header  {
 
 texidoc = "
-Texts may be added to the multi measure rests.
+Texts may be added to the multi-measure rests.
 
 "
 
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index bbd16b65bb..d89b4dd266 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -2,7 +2,7 @@
 \header{
 
 texidoc="
-Multiple measure rests do not collide with barlines and clefs.  They
+Multi-measure rests do not collide with barlines and clefs.  They
 are not expanded when you set @code{Score.skipBars}.  Although the
 multi-measure-rest is a Spanner, minimum distances are set to keep it
 colliding from barlines. 
diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index 461534f6f5..36f64728bb 100644
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -1,5 +1,5 @@
 \header  {
-texidoc = "New markup syntax."
+texidoc = "With the new markup syntax, text may be written in various manenrs."
 }
 
 \version "2.1.22"
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index e93e1039f0..6daf89e8c1 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -2,8 +2,8 @@
 \version "2.1.22"
 
 \header{
-    texidoc=" Text is set with empty horizontal dimensions.  The
-boolean property @code{no-spacing-rods} in @code{TextScript} is used
+    texidoc=" By default, text is set with empty horizontal dimensions.  
+The boolean property @code{no-spacing-rods} in @code{TextScript} is used
 to control the horizontal size of text.  " }
 
 \score{
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index 150c69d159..56e04c1bfa 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -4,7 +4,7 @@
 \header {
 
     texidoc = "Note grouping events are used to indicate where
-brackets for analysis start and end.
+analysis brackets start and end.
 
 @cindex bracket
 @cindex note groups
diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 4f8f23ecfc..2640802151 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -3,7 +3,7 @@
 texidoc="
 Note head shapes are settable.  The stem endings should be adjusted
 per note head.  If you want different note head styles on one stem,
-you must create a special context called 
+you must create a special context called.
 
 Harmonic notes have a different shape and different
 dimensions. 
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 28e705efe7..36e4e706f1 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -4,7 +4,7 @@
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger
 lines both on note heads and rests are adjusted.  Barlines also are
-adjusted.  "
+adjusted accordingly.  "
 }
 
 \score { 
diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly
index c2ce16c536..ddd784d8b7 100644
--- a/input/regression/ottava-broken.ly
+++ b/input/regression/ottava-broken.ly
@@ -3,8 +3,8 @@
 \header
 {
     
-texidoc = "Ottava brackets behave properly at line breaks: no vertical
-line, and the horizontal line doesn't stick out."
+texidoc = "Ottava brackets behave properly at line breaks: there is 
+no vertical line and the horizontal line does not stick out."
 
 
 }
diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly
index 24e53c8422..7c1b19770d 100644
--- a/input/regression/part-combine-a2.ly
+++ b/input/regression/part-combine-a2.ly
@@ -1,7 +1,7 @@
 
 \version "2.1.22"
 \header {
-    texidoc ="The a2 string is only printed on notes, not on rests,
+    texidoc ="The a2 string is printed only on notes (i.e. not on rests),
 and only after chords, solo or polyphony."
     }
 
diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly
index f76981470a..dff93c7c33 100644
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -1,8 +1,7 @@
 
 \header {
-    texidoc ="The new part combiner:
-
-Detect a2, solo1, solo2  and print texts accordingly.
+    texidoc ="The new part combiner detects a2, solo1 and solo2, and prints i
+texts accordingly.
 
 "
 
diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly
index 4158246883..5e432cf6f7 100644
--- a/input/regression/part-combine.ly
+++ b/input/regression/part-combine.ly
@@ -1,11 +1,10 @@
 
 \header {
-    texidoc ="The new part combiner.
-Apart for:
+    texidoc ="The new part combiner stays apart from:
 @itemize @bullet
-@item different durations (start points)
-@item different articulations (only slur/beam/tie work)
-@item wide pitch ranges
+@item different durations,
+@item different articulations (taking into account only slur/beam/tie), and
+@item wide pitch ranges.
 @end itemize
 "
     }
diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly
index f3da680f36..8913e85199 100644
--- a/input/regression/pedal-bracket.ly
+++ b/input/regression/pedal-bracket.ly
@@ -2,11 +2,11 @@
 
 \header {
 
-    texidoc = "Piano pedal brackets.  Brackets should start and end at
+    texidoc = "The brackets of a piano pedal should start and end at
  the left side of the note. If a note is shared between two brackets,
- the ends are flared.
+ these ends are flared.
 
-There are no vertical endings at a line-break.  " }
+At a line-break, there are no vertical endings.  " }
 
 \score {
     \notes \relative c'' {
diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly
index 593fca8c13..3de9866bcf 100644
--- a/input/regression/pedal-ped.ly
+++ b/input/regression/pedal-ped.ly
@@ -1,8 +1,8 @@
 \version "2.1.22"
 \header
 {
-    texidoc = "Piano pedals: the standard style is with Ped symbols.
-The string can be tuned. This example shows the shorter tilde/P variant
+    texidoc = "The standard piano pedals style comes with Ped symbols.
+The pedal string can be also tuned, for example, to a shorter tilde/P variant
 at the end of the melody."
 
 }
diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly
index b3148e735b..a4000f74a3 100644
--- a/input/regression/phrasing-slur.ly
+++ b/input/regression/phrasing-slur.ly
@@ -2,7 +2,7 @@
 \version "2.1.22"
 
 \header {
-texidoc="Slurs play well with phrasing slur."
+texidoc="Ordinary slurs should work well with phrasing slur."
 }
 
 \score {
diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly
index 6cc7af173a..78a64cbfd5 100644
--- a/input/regression/prefatory-empty-spacing.ly
+++ b/input/regression/prefatory-empty-spacing.ly
@@ -2,7 +2,7 @@
 
 \header {
 
-texidoc =" The A is atop an invisible barline. The barline
+texidoc =" The A is atop an invisible barline. The barline,
 although invisible, is also translated because it is the last one of
 the break alignment."
     
diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly
index 852c9bc188..21656dd799 100644
--- a/input/regression/prefatory-spacing-matter.ly
+++ b/input/regression/prefatory-spacing-matter.ly
@@ -2,7 +2,7 @@
 \version "2.1.22"
 \header {
 
-    texidoc = "Distances between prefatory items (eg. clef, bar, etc.)
+    texidoc = "Distances between prefatory items (e.g. clef, bar, etc.)
    are done using engraving standard distances.  These distances
    depend on which items are combined."
 
diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 47d90b7b24..b745978191 100644
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -71,7 +71,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
     {
       /*
 	This is not very elegant, in that we need special support for
-	hara kiri. Unfortunately, the generic wiring of
+	hara-kiri. Unfortunately, the generic wiring of
 	force_hara_kiri_callback () (extent and offset callback) is
 	such that we might get into a loop if we call extent() or
 	offset() the elements.
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 7c509ca9bb..65d2aac84c 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -186,7 +186,7 @@ Hara_kiri_engraver::Hara_kiri_engraver()
 }
 
 ENTER_DESCRIPTION(Hara_kiri_engraver,
-/* descr */       "Like Axis_group_engraver, but make a hara kiri spanner, and add "
+/* descr */       "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
 "interesting items (ie. note heads, lyric syllables and normal rests) ",
 /* creats*/       "RemoveEmptyVerticalGroup",
 /* accepts */     "",
-- 
2.39.5