From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 15 Apr 2008 08:42:17 +0000 (+0200)
Subject: Move input/new doctitles and update LSR
X-Git-Tag: release/2.11.45-1~72^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a74e95990c40b6e0d8aa9b659752a693180a9be5;p=lilypond.git

Move input/new doctitles and update LSR
---

diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list
index 9da2dde0b7..8593b52ab3 100644
--- a/input/lsr/ancient-notation.snippet-list
+++ b/input/lsr/ancient-notation.snippet-list
@@ -1,6 +1,7 @@
 transcription-of-ancient-music-with-incipit.ly
 chant-or-psalms-notation.ly
 adding-a-figured-bass-above-or-below-the-notes.ly
+incipit.ly
 ancient-notation-template----modern-transcription-of-mensural-music.ly
 ancient-fonts.ly
 ancient-time-signatures.ly
diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly
index dba8883242..a192b91444 100644
--- a/input/lsr/broken-crescendo-hairpin.ly
+++ b/input/lsr/broken-crescendo-hairpin.ly
@@ -3,7 +3,6 @@
 \version "2.11.38"
 
 \header {
-  doctitle = "Broken crescendo hairpin"
   lsrtags = "expressive-marks"
   texidoc = "
 In order to make parts of a crescendo hairpin invisible, the following
@@ -20,7 +19,9 @@ y-origin of the rectangle.
 
 Make sure to put the hairpin in a lower layer than the text markup to
 actually draw the rectangle above the hairpin. 
-" } % begin verbatim
+"
+  doctitle = "Broken crescendo hairpin"
+} % begin verbatim
 
 \score {
   \relative c' {
diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly
index 6d417d954d..58bde649d2 100644
--- a/input/lsr/caesura-railtracks-with-fermata.ly
+++ b/input/lsr/caesura-railtracks-with-fermata.ly
@@ -12,7 +12,7 @@ snippet should present an optically pleasing combination of railtracks
 and a fermata.
 
 "
-  doctitle = "Caesura ("railtracks") with fermata"
+  doctitle = "Caesura (\"railtracks\") with fermata"
 } % begin verbatim
 {
   c''2.
diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly
index 44573554d5..5b1d5c3bd3 100644
--- a/input/lsr/changing-form-of-multi--measure-rests.ly
+++ b/input/lsr/changing-form-of-multi--measure-rests.ly
@@ -1,17 +1,18 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
 \version "2.11.42"
-\layout { ragged-right= ##t }
+\layout { ragged-right = ##t }
 \header {
-  doctitle = "Changing form of multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
-If there are ten or fewer measures of rests, LilyPond prints
-a series of longa and breve rests (called in German
-\"Kirchenpausen\" - church rests) within the staff and
-prints a simple line otherwise.  This default number of ten
-may be changed by an override:
-"} % begin verbatim
+If there are ten or fewer measures of rests, a series of longa
+and breve rests (called in German \"Kirchenpausen\" - church rests)
+is printed within the staff; otherwise a simple line is shown.
+This default number of ten may be changed by overriding the
+@code{expand-limit} property:
+"
+  doctitle = "Changing form of multi-measure rests"
+} % begin verbatim
 
 \relative c'' {
   \compressFullBarRests
diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly
index c830b0e330..759a3de69e 100644
--- a/input/lsr/clip-systems.ly
+++ b/input/lsr/clip-systems.ly
@@ -3,11 +3,10 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Clip systems"
   lsrtags = "paper-and-layout"  % a new tag like "Mixing text and music" or
 % "Special output" might be more adequate -jm
   texidoc = "
-This code shows how to clip (extracts) snippets from a full score.
+This code shows how to clip (extract) snippets from a full score.
 
 This file needs to be run separately with @code{-dclip-systems}; the
 snippets page may not adequately show the results.
@@ -16,58 +15,54 @@ The result will be files named
 @file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}.
 
 @itemize @bullet
-@item If system starts and ends are included, they include extents of the System grob, eg. instrument names.
+@item If system starts and ends are included, they include extents of the System grob, e.g., instrument names.
 @item Grace notes at the end point of the region are not included.
 @item Regions can span multiple systems. In this case, multiple EPS files are generated.
 @end itemize
 "
+  doctitle = "Clip systems"
 } % begin verbatim
 
 #(ly:set-option 'clip-systems)
-
 #(set! output-count 1)
 
-origScore = \score{
-    \relative {
-      \set Staff.instrumentName = #"bla"
-      c1
-      d
-      \grace c16
-      e1
-      \key d\major
-      
-      f
-      \break  \clef bass
-      g,
-      fis
-    }  
+origScore = \score {
+  \relative c' {
+    \set Staff.instrumentName = #"bla"
+    c1
+    d
+    \grace c16 e1
+    \key d \major
+    f \break
+    \clef bass
+    g,
+    fis
+  }
 }
 
-\book { 
+\book {
   \score {
     \origScore
     \layout {
-
-      %% each clip-region is a (START . END) pair
-      %% where both are rhythmic-locations.
+      % Each clip-region is a (START . END) pair
+      % where both are rhythmic-locations.
       
-      %% (make-rhythmic-locations BAR-NUMBER NUM DEN)
-      %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER
+      % (make-rhythmic-locations BAR-NUMBER NUM DEN)
+      % means NUM/DEN whole-notes into bar numbered BAR-NUMBER
 
-      clip-regions
-      = #(list
-	  (cons
-	   (make-rhythmic-location 2 0 1)
-	   (make-rhythmic-location 4 0 1))
+      clip-regions = #(list
+      (cons
+       (make-rhythmic-location 2 0 1)
+       (make-rhythmic-location 4 0 1))
+      
+      (cons
+       (make-rhythmic-location 0 0 1)
+       (make-rhythmic-location 4 0 1))
 
-	  (cons
-	   (make-rhythmic-location 0 0 1)
-	   (make-rhythmic-location 4 0 1))
-	  
-	  (cons
-	   (make-rhythmic-location 0 0 1)
-	   (make-rhythmic-location 6 0 1))
-	)
+      (cons
+       (make-rhythmic-location 0 0 1)
+       (make-rhythmic-location 6 0 1))
+      )
     }
   }
 }
diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly
index fc77c565e2..96739ce494 100644
--- a/input/lsr/drawing-boxes-around-grobs.ly
+++ b/input/lsr/drawing-boxes-around-grobs.ly
@@ -3,27 +3,25 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Drawing boxes around grobs"
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 The @code{print-function} can be overridden to draw a box around an
 arbitrary grob.  
 "
+  doctitle = "Drawing boxes around grobs"
 } % begin verbatim
 
 \relative c'' {
   \override TextScript  #'stencil =
   #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
-
   c'4^"foo"
 
   \override Stem  #'stencil =
   #(make-stencil-boxer 0.05 0.25 ly:stem::print)
-
   \override Score.RehearsalMark  #'stencil =
   #(make-stencil-boxer 0.15 0.3 ly:text-interface::print)
   b8
+  
   \revert Stem #'stencil
-
   c4. c4 \mark "F" c1
 }
diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly
index d500865121..7f5f6b907d 100644
--- a/input/lsr/drawing-circles-around-various-objects.ly
+++ b/input/lsr/drawing-circles-around-various-objects.ly
@@ -3,17 +3,18 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Drawing circles around various objects"
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 The @code{\circle} command allows you to draw circles around various objects,
 for example fingering indications. However, some objects require
-specific tweaks: rehearsal marks depend on the @code{Score.markFormatter} % begin verbatim
+specific tweaks: rehearsal marks depend on the @code{Score.markFormatter}
 context, bar numbers on the @code{Score.BarNumber} context, and so on.
 
 You can tweak the printing of your circles by setting some properties
 such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}.
-" }
+"
+  doctitle = "Drawing circles around various objects"
+} % begin verbatim
 
 \relative c'{
 c1
diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list
index 139d6dbccc..c9059cf44a 100644
--- a/input/lsr/editorial-and-educational-use.snippet-list
+++ b/input/lsr/editorial-and-educational-use.snippet-list
@@ -8,5 +8,5 @@ changing-a-single-notes-size-in-a-chord.ly
 controlling-the-placement-of-chord-fingerings.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 blanking-staff-lines-using-the--whiteout-command.ly
-grid-lines;-emphasizing-rhythms-and-notes-synchronization.ly
-grid-lines;-changing-their-appearance.ly
+grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
+grid-lines-changing-their-appearance.ly
diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly
index 97f142337a..fc8999b7d1 100644
--- a/input/lsr/incipit.ly
+++ b/input/lsr/incipit.ly
@@ -2,10 +2,10 @@
 %% This file is in the public domain.
 \version "2.11.39"
 \header {
-  doctitle = "Incipit"
-  lsrtags = "staff-notation,Ancient notation"
+  lsrtags = "staff-notation,ancient-notation"
   texidoc = "Incipits can be added using the instrument name grob, but
 keeping separate the instrument name definition and the incipit definition."
+  doctitle = "Incipit"
 } % begin verbatim
 
 incipit =
diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly
index 7d1e7f4146..2da9341fa1 100644
--- a/input/lsr/letter-tablature-formatting.ly
+++ b/input/lsr/letter-tablature-formatting.ly
@@ -3,12 +3,12 @@
 \version "2.11.38"
 
 \header {
-  doctitle = "Letter tablature formatting"
   lsrtags = "guitar"
   texidoc = "
 You can format a tablature with letters instead of numbers - so that
 0->a, 1->b, 2->c, etc. 
 
 BROKEN IN 2.11, COMMENTED OUT."
+  doctitle = "Letter tablature formatting"
 } % begin verbatim
 { c'4 }
diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly
index fbd5aa8f71..aa7c977ff8 100644
--- a/input/lsr/line-arrows.ly
+++ b/input/lsr/line-arrows.ly
@@ -3,9 +3,9 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Line arrows"
   lsrtags = "expressive-marks"
   texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)"
+  doctitle = "Line arrows"
 } % begin verbatim
 
 \relative c'' {
diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly
index 308d683a3a..8849640ba7 100644
--- a/input/lsr/makam.ly
+++ b/input/lsr/makam.ly
@@ -1,140 +1,21 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
 \version "2.11.38"
-\layout { ragged-right = ##t }
 \header {
-  doctitle = "Makam"
   lsrtags = "pitches"
   texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
-  microtonal alterations."
+  microtonal alterations.  Consult the initialization file
+  @code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
+  for details of pitch names and alterations.
+  "
+  doctitle = "Makam"
 } % begin verbatim
 
-% Define 1/9 alterations.
-
-#(define-public KOMA 1/9)
-#(define-public BAKIYE 4/9)
-#(define-public KUCUK 5/9)
-#(define-public BUYUKMUCENNEB 8/9)
-
-
-% Define pitch names
-
-makamPitchNames = #`(
-  (c . ,(ly:make-pitch -1 0 NATURAL))
-  (d . ,(ly:make-pitch -1 1 NATURAL))
-  (e . ,(ly:make-pitch -1 2 NATURAL))
-  (f . ,(ly:make-pitch -1 3 NATURAL))
-  (g . ,(ly:make-pitch -1 4 NATURAL))
-  (a . ,(ly:make-pitch -1 5 NATURAL))
-  (b . ,(ly:make-pitch -1 6 NATURAL))
-  
-  (cc . ,(ly:make-pitch -1 0 KOMA))
-  (dc . ,(ly:make-pitch -1 1 KOMA))
-  (ec . ,(ly:make-pitch -1 2 KOMA))
-  (fc . ,(ly:make-pitch -1 3 KOMA))
-  (gc . ,(ly:make-pitch -1 4 KOMA))
-  (ac . ,(ly:make-pitch -1 5 KOMA))
-  (bc . ,(ly:make-pitch -1 6 KOMA))
-  
-  (cb . ,(ly:make-pitch -1 0 BAKIYE))
-  (db . ,(ly:make-pitch -1 1 BAKIYE))
-  (eb . ,(ly:make-pitch -1 2 BAKIYE))
-  (fb . ,(ly:make-pitch -1 3 BAKIYE))
-  (gb . ,(ly:make-pitch -1 4 BAKIYE))
-  (ab . ,(ly:make-pitch -1 5 BAKIYE))
-  (bb . ,(ly:make-pitch -1 6 BAKIYE))
-  
-  (ck . ,(ly:make-pitch -1 0 KUCUK))
-  (dk . ,(ly:make-pitch -1 1 KUCUK))
-  (ek . ,(ly:make-pitch -1 2 KUCUK))
-  (fk . ,(ly:make-pitch -1 3 KUCUK))
-  (gk . ,(ly:make-pitch -1 4 KUCUK))
-  (ak . ,(ly:make-pitch -1 5 KUCUK))
-  (bk . ,(ly:make-pitch -1 6 KUCUK))
-  
-  (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB))
-  (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB))
-  (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB))
-  (fbm . ,(ly:make-pitch -1 3 BUYUKMUCENNEB))
-  (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB))
-  (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB))
-  (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB))
-  
-  ;; f for flat.
-  (cfc . ,(ly:make-pitch -1 0 (- KOMA)))
-  (dfc . ,(ly:make-pitch -1 1 (- KOMA)))
-  (efc . ,(ly:make-pitch -1 2 (- KOMA)))
-  (ffc . ,(ly:make-pitch -1 3 (- KOMA)))
-  (gfc . ,(ly:make-pitch -1 4 (- KOMA)))
-  (afc . ,(ly:make-pitch -1 5 (- KOMA)))
-  (bfc . ,(ly:make-pitch -1 6 (- KOMA)))
-  
-  (cfb . ,(ly:make-pitch -1 0 (- BAKIYE)))
-  (dfb . ,(ly:make-pitch -1 1 (- BAKIYE)))
-  (efb . ,(ly:make-pitch -1 2 (- BAKIYE)))
-  (ffb . ,(ly:make-pitch -1 3 (- BAKIYE)))
-  (gfb . ,(ly:make-pitch -1 4 (- BAKIYE)))
-  (afb . ,(ly:make-pitch -1 5 (- BAKIYE)))
-  (bfb . ,(ly:make-pitch -1 6 (- BAKIYE)))
-  
-  (cfk . ,(ly:make-pitch -1 0 (- KUCUK)))
-  (dfk . ,(ly:make-pitch -1 1 (- KUCUK)))
-  (efk . ,(ly:make-pitch -1 2 (- KUCUK)))
-  (ffk . ,(ly:make-pitch -1 3 (- KUCUK)))
-  (gfk . ,(ly:make-pitch -1 4 (- KUCUK)))
-  (afk . ,(ly:make-pitch -1 5 (- KUCUK)))
-  (bfk . ,(ly:make-pitch -1 6 (- KUCUK)))
-  
-  (cfbm . ,(ly:make-pitch -1 0 (- BUYUKMUCENNEB)))
-  (dfbm . ,(ly:make-pitch -1 1 (- BUYUKMUCENNEB)))
-  (efbm . ,(ly:make-pitch -1 2 (- BUYUKMUCENNEB)))
-  (ffbm . ,(ly:make-pitch -1 3 (- BUYUKMUCENNEB)))
-  (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB)))
-  (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB)))
-  (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB)))
-)
-
-% Set pitch names.
-pitchnames = \makamPitchNames
-#(ly:parser-set-note-names parser makamPitchNames)
-
-makamGlyphs = #'(
-       (1 . "accidentals.doublesharp")
-       (8/9 . "accidentals.sharp.slashslashslash.stemstem")
-       (5/9 . "accidentals.sharp.slashslashslash.stem")
-       (4/9 . "accidentals.sharp")
-       (1/9 . "accidentals.sharp.slashslash.stem")
-       (0 . "accidentals.natural")
-       (-1/9 . "accidentals.mirroredflat")
-       (-4/9 . "accidentals.flat.slash")
-       (-5/9 . "accidentals.flat")
-       (-8/9 . "accidentals.flat.slashslash")
-       (-1 . "accidentals.flatflat")
-       )
+% Initialize makam settings
+\include "makam-init.ly"
 
-\relative {
-  
-  %{ define alteration <-> symbol mapping. The following glyphs are available.
-  accidentals.sharp 
-  accidentals.sharp.slashslash.stem 
-  accidentals.sharp.slashslashslash.stemstem 
-  accidentals.sharp.slashslashslash.stem 
-  accidentals.sharp.slashslash.stemstemstem 
-  accidentals.natural 
-  accidentals.flat 
-  accidentals.flat.slash 
-  accidentals.flat.slashslash 
-  accidentals.mirroredflat.flat 
-  accidentals.mirroredflat 
-  accidentals.flatflat 
-  accidentals.flatflat.slash 
-  accidentals.doublesharp 
-  %}
-  
-  \override Accidental #'glyph-name-alist =  \makamGlyphs
-  \override Staff.KeySignature #'glyph-name-alist = \makamGlyphs
-  \set Staff.keySignature =  #'((3 .  4/9) (6 . -1/9))
-  
+\relative c' {
+  \set Staff.keySignature =  #`((3 . ,BAKIYE) (6 . ,(- KOMA)))  
   c cc db fk
   gbm gfc gfb efk
   fk db cc c
diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
index 4ce8514090..096b23f67e 100644
--- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
+++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
@@ -3,7 +3,6 @@
 \version "2.11.38"
 \layout { ragged-right = ##t }
 \header {
-  doctitle = "Making an object invisible with the transparent property"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
 Setting the @code{transparent} property will cause an object to be
@@ -17,7 +16,9 @@ Normally, ties only connect two notes in the same voice.  By
 introducing a tie in a different voice, and blanking the first up-stem
 in that voice, the tie appears to cross voices.  To prevent the blanked stem's
 flag from interfering with tie positioning, the stem is extended.
-" } % begin verbatim
+"
+  doctitle = "Making an object invisible with the transparent property"
+} % begin verbatim
 
 \relative c'' {
   \time 2/4
diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly
index 311962f9ee..333e5610f3 100644
--- a/input/lsr/markup-lines.ly
+++ b/input/lsr/markup-lines.ly
@@ -3,10 +3,10 @@
 \version "2.11.38"
 
 \header {
-  doctitle = "Markup lines"
   lsrtags = "text"
   texidoc = "Text that can spread over pages is entered with the
 @code{\\markuplines} command."
+  doctitle = "Markup lines"
 } % begin verbatim
 
 #(set-default-paper-size "a6")
diff --git a/input/lsr/move-specific-text.ly b/input/lsr/move-specific-text.ly
index 27102b7acf..e1e5f119cf 100644
--- a/input/lsr/move-specific-text.ly
+++ b/input/lsr/move-specific-text.ly
@@ -3,11 +3,12 @@
 \version "2.11.38"
 % possible rename to scheme- or something like that.  -gp
 \header {
-  doctitle = "Move specific text"
   lsrtags = "tweaks-and-overrides"
   texidoc = "@cindex Scheme Move Text
 Objects of the same type, like text, can be moved around by using some Scheme code.
-" } % begin verbatim
+"
+  doctitle = "Move specific text"
+} % begin verbatim
 
 #(define (make-text-checker text)
    (lambda (grob) (equal? text (ly:grob-property grob 'text))))
diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly
index 1f3634b2d2..e2c9db25f8 100644
--- a/input/lsr/outputting-the-version-number.ly
+++ b/input/lsr/outputting-the-version-number.ly
@@ -3,13 +3,13 @@
 \version "2.11.38"
 
 \header {
-  doctitle = "Outputting the version number"
   lsrtags = "text"
   texidoc = "
 By putting the output of @code{lilypond-version} into a lyric or a
 text markup, it is possible to print the version number of LilyPond in
 a score, or in a document generated with @code{lilypond-book}.
 "
+  doctitle = "Outputting the version number"
 } % begin verbatim
 
 \score { \context Lyrics  {
diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly
index 9f1a416bd0..f482cbac61 100644
--- a/input/lsr/page-label.ly
+++ b/input/lsr/page-label.ly
@@ -3,10 +3,10 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Page label"
   lsrtags = "spacing"
   texidoc = "Page labels may be placed inside music or at top-level,
 and refered to in markups."
+  doctitle = "Page label"
 } % begin verbatim
 
 #(set-default-paper-size "a6")
diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly
index 45c0ffc46e..2770aab1f0 100644
--- a/input/lsr/piano-template-with-centered-dynamics.ly
+++ b/input/lsr/piano-template-with-centered-dynamics.ly
@@ -3,13 +3,14 @@
 \version "2.11.38"
 
 \header {
-  doctitle = "Piano template with centered dynamics"
   lsrtags = "expressive-marks,piano-music,template"
   texidoc = "
 Many piano scores have the dynamics centered between the two staves.
 This requires a bit of tweaking to implement, but since the template is
 right here, you don't have to do the tweaking yourself.
-" } % begin verbatim
+"
+  doctitle = "Piano template with centered dynamics"
+} % begin verbatim
 
 upper = \relative c'' {
   \clef treble
diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly
index 732180830b..829b69e1dc 100644
--- a/input/lsr/positioning-multi--measure-rests.ly
+++ b/input/lsr/positioning-multi--measure-rests.ly
@@ -3,7 +3,6 @@
 \version "2.11.42"
 \layout { ragged-right = ##t }
 \header {
-  doctitle = "Positioning multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
 Unlike ordinary rests, there is no predefined command
@@ -12,7 +11,9 @@ rest symbol of either form by attaching it to a note.  However,
 in polyphonic music multi-measure rests in odd-numbered and
 even-numbered voices are vertically separated.  The positioning
 of multi-measure rests can be controlled as follows:
- "} % begin verbatim
+ "
+  doctitle = "Positioning multi-measure rests"
+} % begin verbatim
 
 \relative c'' {
   % Multi-measure rests by default are set under the second line
@@ -28,7 +29,7 @@ of multi-measure rests can be controlled as follows:
   << { R1 } \\ { a1 } >>
   % Multi-measure rests in even-numbered voices are under the bottom line
   << { c1 } \\ { R1 } >>
-  % They remain separated even in empty bars
+  % They remain separated even in empty measures
   << { R1 } \\ { R1 } >>
   % This brings them together even though there are two voices
   \compressFullBarRests
diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly
index 8aedbff5e7..f0be04104a 100644
--- a/input/lsr/quoting-another-voice-with-transposition.ly
+++ b/input/lsr/quoting-another-voice-with-transposition.ly
@@ -2,13 +2,13 @@
 %% This file is in the public domain.
 \version "2.11.38"
 \header {
-  doctitle = "Quoting another voice with transposition"
   lsrtags = "pitches,staff-notation"
   texidoc = "Quotations take into account the transposition of both
 source and target. In this example, all instruments play sounding
 middle C; the target is an instrument in F. The target part may be
 transposed using @code{\\transpose}. In this case, all the pitches (including the
 quoted ones) are transposed."
+  doctitle = "Quoting another voice with transposition"
 } % begin verbatim
 
 \addQuote clarinet {
diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly
index ad9d493c10..09328e4ed5 100644
--- a/input/lsr/quoting-another-voice.ly
+++ b/input/lsr/quoting-another-voice.ly
@@ -3,12 +3,12 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Quoting another voice"
   lsrtags = "staff-notation"
   texidoc = "With @code{\\quote}, fragments of previously entered
 music may be quoted. @code{quotedEventTypes} will determines what
 things are quoted.  In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
+  doctitle = "Quoting another voice"
 } % begin verbatim
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly
index b80e3d2703..4e6016acad 100644
--- a/input/lsr/table-of-contents.ly
+++ b/input/lsr/table-of-contents.ly
@@ -3,11 +3,11 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Table of contents"
   lsrtags = "paper-and-layout"
   texidoc = "A table of contents is included using
 @code{\\markuplines \\table-of-contents}. The TOC items are added with
 the @code{\\tocItem} command."
+  doctitle = "Table of contents"
 } % begin verbatim
 
 #(set-default-paper-size "a6")
diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index c799d7c9e8..45e08d8f93 100644
--- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -2,17 +2,33 @@
 %% This file is in the public domain.
 \version "2.11.38"
 \header {
-  doctitle = "Transposing music with minimum accidentals"
   lsrtags = "pitches"
- texidoc = "There is a way to enforce enharmonic modifications for
+  texidoc = "This example uses some Scheme code to enforce enharmonic modifications for
 notes in order to have the minimum number of accidentals. In this
 case, the following rules apply:
 
-\"Double accidentals should be removed, as well as E sharp (-> F),
-C flat (-> B), F flat (-> E) and B sharp (-> C)\".
+@itemize
+@item
+Double accidentals should be removed
+
+@item
+B sharp -> C
+
+@item
+E sharp -> F
+
+@item
+C flat -> B
+
+@item
+F flat -> E
+
+@end itemize
 
 In this manner, the most natural enharmonic notes are chosen.
-"} % begin verbatim
+"
+  doctitle = "Transposing music with minimum accidentals"
+} % begin verbatim
 
 #(define  (naturalize-pitch p)
   (let* ((o (ly:pitch-octave p))
diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly
index 91f0023170..82c79adeb3 100644
--- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly
+++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -3,12 +3,12 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Using the @code{\tweak} command to tweak individual grobs"
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 With the @code{\tweak} command, you can tune every grob directly. Here
 are some examples of available tweaks.
 "
+  doctitle = "Using the @code{\tweak} command to tweak individual grobs"
 } % begin verbatim
 
 {
diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly
index 58955c34f7..2918e75da0 100644
--- a/input/lsr/utf-8.ly
+++ b/input/lsr/utf-8.ly
@@ -21,15 +21,13 @@ Debian GNU/Linux
 %} 
 
 \header {
-  doctitle = "UTF-8"
   lsrtags = "text"
   texidoc = "Various scripts may be used for texts (like titles and
 lyrics) introduced by entering them in UTF-8 encoding, and using a
 Pango based backend.  Depending on the fonts installed, this fragment
 will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
-
 "
-  
+  doctitle = "UTF-8"
 } % begin verbatim
 
 % end verbatim - this comment is a hack to prevent texinfo.tex
diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly
index 7724606396..e215a35865 100644
--- a/input/lsr/volta-multi-staff.ly
+++ b/input/lsr/volta-multi-staff.ly
@@ -3,10 +3,10 @@
 \version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Volta multi-staff"
   lsrtags = "repeats,staff-notation"
   texidoc = "By adding @code{Volta_engraver}, repeat brackets
 can be put over staves other than the topmost one in a score."
+  doctitle = "Volta multi-staff"
 } % begin verbatim
 
 vmus = \relative c'' {
diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly
index 14ac6b04eb..484f07071d 100644
--- a/input/new/broken-crescendo-hairpin.ly
+++ b/input/new/broken-crescendo-hairpin.ly
@@ -1,7 +1,6 @@
 \version "2.11.38"
 
 \header {
-  doctitle = "Broken crescendo hairpin"
   lsrtags = "expressive-marks"
   texidoc = "
 In order to make parts of a crescendo hairpin invisible, the following
@@ -18,7 +17,9 @@ y-origin of the rectangle.
 
 Make sure to put the hairpin in a lower layer than the text markup to
 actually draw the rectangle above the hairpin. 
-" }
+"
+  doctitle = "Broken crescendo hairpin"
+}
 
 \score {
   \relative c' {
diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly
index cd5161271d..f0567c7083 100644
--- a/input/new/changing-form-of-multi--measure-rests.ly
+++ b/input/new/changing-form-of-multi--measure-rests.ly
@@ -1,7 +1,6 @@
 \version "2.11.42"
 \layout { ragged-right = ##t }
 \header {
-  doctitle = "Changing form of multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
 If there are ten or fewer measures of rests, a series of longa
@@ -9,7 +8,9 @@ and breve rests (called in German \"Kirchenpausen\" - church rests)
 is printed within the staff; otherwise a simple line is shown.
 This default number of ten may be changed by overriding the
 @code{expand-limit} property:
-"}
+"
+  doctitle = "Changing form of multi-measure rests"
+}
 
 \relative c'' {
   \compressFullBarRests
diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly
index 9b63e760fc..ad009a1a21 100644
--- a/input/new/clip-systems.ly
+++ b/input/new/clip-systems.ly
@@ -1,7 +1,6 @@
 \version "2.10.0"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Clip systems"
   lsrtags = "paper-and-layout"  % a new tag like "Mixing text and music" or
 % "Special output" might be more adequate -jm
   texidoc = "
@@ -19,6 +18,7 @@ The result will be files named
 @item Regions can span multiple systems. In this case, multiple EPS files are generated.
 @end itemize
 "
+  doctitle = "Clip systems"
 }
 
 #(ly:set-option 'clip-systems)
diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly
index bebe56e5ae..489a9bd8a6 100644
--- a/input/new/drawing-boxes-around-grobs.ly
+++ b/input/new/drawing-boxes-around-grobs.ly
@@ -1,12 +1,12 @@
 \version "2.11.23"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Drawing boxes around grobs"
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 The @code{print-function} can be overridden to draw a box around an
 arbitrary grob.  
 "
+  doctitle = "Drawing boxes around grobs"
 }
 
 \relative c'' {
diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly
index 07b9033b38..0fcd4ffee3 100644
--- a/input/new/drawing-circles-around-various-objects.ly
+++ b/input/new/drawing-circles-around-various-objects.ly
@@ -1,7 +1,6 @@
 \version "2.11.23"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Drawing circles around various objects"
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 The @code{\circle} command allows you to draw circles around various objects,
@@ -11,7 +10,9 @@ context, bar numbers on the @code{Score.BarNumber} context, and so on.
 
 You can tweak the printing of your circles by setting some properties
 such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}.
-" }
+"
+  doctitle = "Drawing circles around various objects"
+}
 
 \relative c'{
 c1
diff --git a/input/new/incipit.ly b/input/new/incipit.ly
index 42361e66e1..8b0081d0b1 100644
--- a/input/new/incipit.ly
+++ b/input/new/incipit.ly
@@ -1,9 +1,9 @@
 \version "2.11.39"
 \header {
-  doctitle = "Incipit"
-  lsrtags = "staff-notation,Ancient notation"
+  lsrtags = "staff-notation,ancient-notation"
   texidoc = "Incipits can be added using the instrument name grob, but
 keeping separate the instrument name definition and the incipit definition."
+  doctitle = "Incipit"
 }
 
 incipit =
diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly
index 628eb17b59..7cf604ff8f 100644
--- a/input/new/letter-tablature-formatting.ly
+++ b/input/new/letter-tablature-formatting.ly
@@ -1,12 +1,12 @@
 \version "2.11.35"
 
 \header {
-  doctitle = "Letter tablature formatting"
   lsrtags = "guitar"
   texidoc = "
 You can format a tablature with letters instead of numbers - so that
 0->a, 1->b, 2->c, etc. 
 
 BROKEN IN 2.11, COMMENTED OUT."
+  doctitle = "Letter tablature formatting"
 }
 { c'4 }
diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly
index f58c336147..dfef7c8f12 100644
--- a/input/new/line-arrows.ly
+++ b/input/new/line-arrows.ly
@@ -1,9 +1,9 @@
 \version "2.10.0"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Line arrows"
   lsrtags = "expressive-marks"
   texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)"
+  doctitle = "Line arrows"
 }
 
 \relative c'' {
diff --git a/input/new/makam.ly b/input/new/makam.ly
index 7e42bb25b3..b62e93fd64 100644
--- a/input/new/makam.ly
+++ b/input/new/makam.ly
@@ -1,12 +1,12 @@
 \version "2.11.6"
 \header {
-  doctitle = "Makam"
   lsrtags = "pitches"
   texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
   microtonal alterations.  Consult the initialization file
   @code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
   for details of pitch names and alterations.
   "
+  doctitle = "Makam"
 }
 
 % Initialize makam settings
diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly
index 46975c1ec6..30fe17870f 100644
--- a/input/new/making-an-object-invisible-with-the-transparent-property.ly
+++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly
@@ -1,7 +1,6 @@
 \version "2.11.23"
 \layout { ragged-right = ##t }
 \header {
-  doctitle = "Making an object invisible with the transparent property"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
 Setting the @code{transparent} property will cause an object to be
@@ -15,7 +14,9 @@ Normally, ties only connect two notes in the same voice.  By
 introducing a tie in a different voice, and blanking the first up-stem
 in that voice, the tie appears to cross voices.  To prevent the blanked stem's
 flag from interfering with tie positioning, the stem is extended.
-" }
+"
+  doctitle = "Making an object invisible with the transparent property"
+}
 
 \relative c'' {
   \time 2/4
diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly
index 1d809989cd..0595133a11 100644
--- a/input/new/markup-lines.ly
+++ b/input/new/markup-lines.ly
@@ -1,10 +1,10 @@
 \version "2.11.25"
 
 \header {
-  doctitle = "Markup lines"
   lsrtags = "text"
   texidoc = "Text that can spread over pages is entered with the
 @code{\\markuplines} command."
+  doctitle = "Markup lines"
 }
 
 #(set-default-paper-size "a6")
diff --git a/input/new/move-specific-text.ly b/input/new/move-specific-text.ly
index 268995a975..0335be73f3 100644
--- a/input/new/move-specific-text.ly
+++ b/input/new/move-specific-text.ly
@@ -1,11 +1,12 @@
 \version "2.10.0"
 % possible rename to scheme- or something like that.  -gp
 \header {
-  doctitle = "Move specific text"
   lsrtags = "tweaks-and-overrides"
   texidoc = "@cindex Scheme Move Text
 Objects of the same type, like text, can be moved around by using some Scheme code.
-" }
+"
+  doctitle = "Move specific text"
+}
 
 #(define (make-text-checker text)
    (lambda (grob) (equal? text (ly:grob-property grob 'text))))
diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly
index 0d32f6bdf1..cfb274d0ec 100644
--- a/input/new/outputting-the-version-number.ly
+++ b/input/new/outputting-the-version-number.ly
@@ -1,13 +1,13 @@
 \version "2.11.23"
 
 \header {
-  doctitle = "Outputting the version number"
   lsrtags = "text"
   texidoc = "
 By putting the output of @code{lilypond-version} into a lyric or a
 text markup, it is possible to print the version number of LilyPond in
 a score, or in a document generated with @code{lilypond-book}.
 "
+  doctitle = "Outputting the version number"
 }
 
 \score { \context Lyrics  {
diff --git a/input/new/page-label.ly b/input/new/page-label.ly
index 1eb75e0d2f..2af1ad1f1b 100644
--- a/input/new/page-label.ly
+++ b/input/new/page-label.ly
@@ -1,10 +1,10 @@
 \version "2.11.26"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Page label"
   lsrtags = "spacing"
   texidoc = "Page labels may be placed inside music or at top-level,
 and refered to in markups."
+  doctitle = "Page label"
 }
 
 #(set-default-paper-size "a6")
diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly
index a70f64776e..d18c5b1cee 100644
--- a/input/new/piano-template-with-centered-dynamics.ly
+++ b/input/new/piano-template-with-centered-dynamics.ly
@@ -1,13 +1,14 @@
 \version "2.11.35"
 
 \header {
-  doctitle = "Piano template with centered dynamics"
   lsrtags = "expressive-marks,piano-music,template"
   texidoc = "
 Many piano scores have the dynamics centered between the two staves.
 This requires a bit of tweaking to implement, but since the template is
 right here, you don't have to do the tweaking yourself.
-" }
+"
+  doctitle = "Piano template with centered dynamics"
+}
 
 upper = \relative c'' {
   \clef treble
diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly
index 188e6eeaf0..64d4f07994 100644
--- a/input/new/positioning-multi--measure-rests.ly
+++ b/input/new/positioning-multi--measure-rests.ly
@@ -1,7 +1,6 @@
 \version "2.11.42"
 \layout { ragged-right = ##t }
 \header {
-  doctitle = "Positioning multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
 Unlike ordinary rests, there is no predefined command
@@ -10,7 +9,9 @@ rest symbol of either form by attaching it to a note.  However,
 in polyphonic music multi-measure rests in odd-numbered and
 even-numbered voices are vertically separated.  The positioning
 of multi-measure rests can be controlled as follows:
- "}
+ "
+  doctitle = "Positioning multi-measure rests"
+}
 
 \relative c'' {
   % Multi-measure rests by default are set under the second line
diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly
index 5b23bf0754..c2ba9850a7 100644
--- a/input/new/quoting-another-voice-with-transposition.ly
+++ b/input/new/quoting-another-voice-with-transposition.ly
@@ -1,12 +1,12 @@
 \version "2.11.10"
 \header {
-  doctitle = "Quoting another voice with transposition"
   lsrtags = "pitches,staff-notation"
   texidoc = "Quotations take into account the transposition of both
 source and target. In this example, all instruments play sounding
 middle C; the target is an instrument in F. The target part may be
 transposed using @code{\\transpose}. In this case, all the pitches (including the
 quoted ones) are transposed."
+  doctitle = "Quoting another voice with transposition"
 }
 
 \addQuote clarinet {
diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly
index 9a1c58eea3..bac9ef3ea9 100644
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,12 +1,12 @@
 \version "2.11.10"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Quoting another voice"
   lsrtags = "staff-notation"
   texidoc = "With @code{\\quote}, fragments of previously entered
 music may be quoted. @code{quotedEventTypes} will determines what
 things are quoted.  In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
+  doctitle = "Quoting another voice"
 }
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly
index 30ad7ccce8..327cd0972d 100644
--- a/input/new/table-of-contents.ly
+++ b/input/new/table-of-contents.ly
@@ -1,11 +1,11 @@
 \version "2.11.26"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Table of contents"
   lsrtags = "paper-and-layout"
   texidoc = "A table of contents is included using
 @code{\\markuplines \\table-of-contents}. The TOC items are added with
 the @code{\\tocItem} command."
+  doctitle = "Table of contents"
 }
 
 #(set-default-paper-size "a6")
diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 899659fc88..5414de61f3 100644
--- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,8 +1,7 @@
 \version "2.11.33"
 \header {
-  doctitle = "Transposing music with minimum accidentals"
   lsrtags = "pitches"
- texidoc = "This example uses some Scheme code to enforce enharmonic modifications for
+  texidoc = "This example uses some Scheme code to enforce enharmonic modifications for
 notes in order to have the minimum number of accidentals. In this
 case, the following rules apply:
 
@@ -25,7 +24,9 @@ F flat -> E
 @end itemize
 
 In this manner, the most natural enharmonic notes are chosen.
-"}
+"
+  doctitle = "Transposing music with minimum accidentals"
+}
 
 #(define  (naturalize-pitch p)
   (let* ((o (ly:pitch-octave p))
diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly
index e079b27b10..6573543ea8 100644
--- a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly
+++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -1,12 +1,12 @@
 \version "2.11.23"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Using the @code{\tweak} command to tweak individual grobs"
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 With the @code{\tweak} command, you can tune every grob directly. Here
 are some examples of available tweaks.
 "
+  doctitle = "Using the @code{\tweak} command to tweak individual grobs"
 }
 
 {
diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly
index b2981fbef4..8425157065 100644
--- a/input/new/utf-8.ly
+++ b/input/new/utf-8.ly
@@ -19,15 +19,13 @@ Debian GNU/Linux
 %} 
 
 \header {
-  doctitle = "UTF-8"
   lsrtags = "text"
   texidoc = "Various scripts may be used for texts (like titles and
 lyrics) introduced by entering them in UTF-8 encoding, and using a
 Pango based backend.  Depending on the fonts installed, this fragment
 will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
-
 "
-  
+  doctitle = "UTF-8"
 }
 
 % end verbatim - this comment is a hack to prevent texinfo.tex
diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly
index 7f1a489971..e04c46fd0d 100644
--- a/input/new/volta-multi-staff.ly
+++ b/input/new/volta-multi-staff.ly
@@ -1,10 +1,10 @@
 \version "2.11.36"
 \layout { ragged-right= ##t }
 \header {
-  doctitle = "Volta multi-staff"
   lsrtags = "repeats,staff-notation"
   texidoc = "By adding @code{Volta_engraver}, repeat brackets
 can be put over staves other than the topmost one in a score."
+  doctitle = "Volta multi-staff"
 }
 
 vmus = \relative c'' {