From: John Mandereau <john.mandereau@gmail.com>
Date: Mon, 29 Sep 2008 06:09:25 +0000 (+0200)
Subject: Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.61-1~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc8e9c050a98c809e66b10d9ae1d3df9d3b0190f;hp=bb37d13b0fe746737c2b576f63ce83c1fd621cd4;p=lilypond.git

Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	Documentation/de/user/templates.itely
---

diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/user/ancient.itely
index 35cb681928..024c209ad2 100644
--- a/Documentation/de/user/ancient.itely
+++ b/Documentation/de/user/ancient.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Ancient notation
@@ -633,7 +633,7 @@ für die Alte Musik zur Verfügung gestellt. Diese sind darauf hin geformt, dass
 sie mit der Notation des Editio Vaticana-Stils verwendet werden können.
 
 @lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \override TextScript #'font-family = #'typewriter
@@ -983,7 +983,7 @@ Deminutae}
 @code{1. Punctum}
 @tab
 @lilypond[staffsize=26,line-width=1.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum
@@ -998,7 +998,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum Auctum Ascendens
@@ -1017,7 +1017,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum Inclinatum Parvum
@@ -1031,7 +1031,7 @@ Deminutae}
 @code{2. Virga}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Virga
@@ -1047,7 +1047,7 @@ Deminutae}
 @code{3. Apostropha vel Stropha}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Stropha
@@ -1058,7 +1058,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Stropha Aucta
@@ -1073,7 +1073,7 @@ Deminutae}
 @code{4. Oriscus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Oriscus
@@ -1089,7 +1089,7 @@ Deminutae}
 @code{5. Clivis vel Flexa}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Clivis vel Flexa
@@ -1100,7 +1100,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Clivis Aucta Descendens
@@ -1115,7 +1115,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Cephalicus
@@ -1129,7 +1129,7 @@ Deminutae}
 @code{6. Podatus vel Pes}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Podatus vel Pes
@@ -1140,7 +1140,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Auctus Descendens
@@ -1155,7 +1155,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Epiphonus
@@ -1169,7 +1169,7 @@ Deminutae}
 @code{7. Pes Quassus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Quassus
@@ -1180,7 +1180,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Quassus Auctus Descendens
@@ -1195,7 +1195,7 @@ Deminutae}
 @code{8. Quilisma Pes}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Quilisma Pes
@@ -1206,7 +1206,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Quilisma Pes Auctus Descendens
@@ -1221,7 +1221,7 @@ Deminutae}
 @code{9. Podatus Initio Debilis}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Initio Debilis
@@ -1232,7 +1232,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Auctus Descendens Initio Debilis
@@ -1247,7 +1247,7 @@ Deminutae}
 @code{10. Torculus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus
@@ -1258,7 +1258,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Auctus Descendens
@@ -1269,7 +1269,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Deminutus
@@ -1283,7 +1283,7 @@ Deminutae}
 @code{11. Torculus Initio Debilis}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Initio Debilis
@@ -1294,7 +1294,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Auctus Descendens Initio Debilis
@@ -1305,7 +1305,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Deminutus Initio Debilis
@@ -1319,7 +1319,7 @@ Deminutae}
 @code{12. Porrectus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus
@@ -1330,7 +1330,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus Auctus Descendens
@@ -1341,7 +1341,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus Deminutus
@@ -1355,7 +1355,7 @@ Deminutae}
 @code{13. Climacus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus
@@ -1367,7 +1367,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus Auctus
@@ -1378,7 +1378,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus Deminutus
@@ -1392,7 +1392,7 @@ Deminutae}
 @code{14. Scandicus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus
@@ -1403,7 +1403,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus Auctus Descendens
@@ -1414,7 +1414,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus Deminutus
@@ -1428,7 +1428,7 @@ Deminutae}
 @code{15. Salicus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Salicus
@@ -1439,7 +1439,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Salicus Auctus Descendens
@@ -1454,7 +1454,7 @@ Deminutae}
 @code{16. Trigonus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Trigonus
@@ -1828,7 +1828,7 @@ funktionieren beide Befehle. Es ist auch möglich, mit
 @code{\augmentum a \augmentum g} abzukürzen.
 
 @lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \[ \augmentum a \flexa \augmentum g \]
@@ -1917,7 +1917,7 @@ und die graphischen Objekte, so dass unmittelbar mit der Notation
 begonnen werden kann. Siehe das folgende Beispiel:
 
 @lilypond[quote,ragged-right,packed,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   <<
     \new VaticanaVoice = "cantus" {
diff --git a/Documentation/de/user/cheatsheet.itely b/Documentation/de/user/cheatsheet.itely
index 36d948607b..cc880cf8d1 100644
--- a/Documentation/de/user/cheatsheet.itely
+++ b/Documentation/de/user/cheatsheet.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @c TODO: add tablature.
diff --git a/Documentation/de/user/chords.itely b/Documentation/de/user/chords.itely
index d892284a45..671bfc0cf1 100644
--- a/Documentation/de/user/chords.itely
+++ b/Documentation/de/user/chords.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Chord notation
 @section Chord notation
diff --git a/Documentation/de/user/dedication.itely b/Documentation/de/user/dedication.itely
index 0c4dc33fd1..509cef7c1a 100644
--- a/Documentation/de/user/dedication.itely
+++ b/Documentation/de/user/dedication.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @quotation
 Wir wollen dieses Programm allen Freunden widmen, die wir
diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely
index 2550e858e0..de487bfe3a 100644
--- a/Documentation/de/user/editorial.itely
+++ b/Documentation/de/user/editorial.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Editorial annotations
 @section Editorial annotations
diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely
index 10029630ad..32c228a67c 100644
--- a/Documentation/de/user/expressive.itely
+++ b/Documentation/de/user/expressive.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Expressive marks
 @section Expressive marks
diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely
index f2350e18c1..768fe3ac89 100644
--- a/Documentation/de/user/fretted-strings.itely
+++ b/Documentation/de/user/fretted-strings.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Fretted string instruments
 @section Fretted string instruments
diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/user/fundamental.itely
index ec87b98f48..be8d32fa04 100644
--- a/Documentation/de/user/fundamental.itely
+++ b/Documentation/de/user/fundamental.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 @c Translators: Till Rettig, Reinhold Kainhofer
 
 @node Fundamental concepts
diff --git a/Documentation/de/user/input.itely b/Documentation/de/user/input.itely
index 84523f9077..08c20e32df 100644
--- a/Documentation/de/user/input.itely
+++ b/Documentation/de/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node General input and output
 @chapter General input and output
diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/user/introduction.itely
index 692b324fa3..49425f9b43 100644
--- a/Documentation/de/user/introduction.itely
+++ b/Documentation/de/user/introduction.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 @c Translators: Till Rettig, Reinhold Kainhofer
 
 @node Introduction
diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely
index dde309f2ed..030428b36d 100644
--- a/Documentation/de/user/keyboards.itely
+++ b/Documentation/de/user/keyboards.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Keyboard instruments
 @section Keyboard instruments
diff --git a/Documentation/de/user/literature.itely b/Documentation/de/user/literature.itely
index 84c0c2b4ea..329497311c 100644
--- a/Documentation/de/user/literature.itely
+++ b/Documentation/de/user/literature.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Literature list
diff --git a/Documentation/de/user/notation-appendices.itely b/Documentation/de/user/notation-appendices.itely
index 54dc146467..f2bf71dddc 100644
--- a/Documentation/de/user/notation-appendices.itely
+++ b/Documentation/de/user/notation-appendices.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Notation manual tables
 @appendix Notation manual tables
diff --git a/Documentation/de/user/notation.itely b/Documentation/de/user/notation.itely
index a9e70f2133..d619eb5b14 100644
--- a/Documentation/de/user/notation.itely
+++ b/Documentation/de/user/notation.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Musical notation
 @chapter Musical notation
diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely
index 563d61670f..2021f9d23f 100644
--- a/Documentation/de/user/pitches.itely
+++ b/Documentation/de/user/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Pitches
 @section Pitches
diff --git a/Documentation/de/user/preface.itely b/Documentation/de/user/preface.itely
index 6aa8f13755..50bedbe2d5 100644
--- a/Documentation/de/user/preface.itely
+++ b/Documentation/de/user/preface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Preface
 @unnumbered Preface
diff --git a/Documentation/de/user/repeats.itely b/Documentation/de/user/repeats.itely
index 0108bbc362..7e0eba26cb 100644
--- a/Documentation/de/user/repeats.itely
+++ b/Documentation/de/user/repeats.itely
@@ -6,13 +6,12 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Repeats
 @section Repeats
 
-@lilypondfile[ragged-right,line-width=16\cm,staffsize=16,quote]
-{repeats-headword.ly}
+@lilypondfile[quote]{repeats-headword.ly}
 
 Wiederholung ist ein zentrales Konzept in der Musik, und es gibt eine 
 ganze Vielzahl von Notationsmöglichkeiten für Wiederholungen.
diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely
index 479babf345..0e45e41157 100644
--- a/Documentation/de/user/rhythms.itely
+++ b/Documentation/de/user/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Rhythms
 @section Rhythms
diff --git a/Documentation/de/user/scheme-tutorial.itely b/Documentation/de/user/scheme-tutorial.itely
index c1a963433b..6f0fdea432 100644
--- a/Documentation/de/user/scheme-tutorial.itely
+++ b/Documentation/de/user/scheme-tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Scheme tutorial
 @appendix Scheme tutorial
diff --git a/Documentation/de/user/setup.itely b/Documentation/de/user/setup.itely
index e6461cbfd8..46a6cb72b3 100644
--- a/Documentation/de/user/setup.itely
+++ b/Documentation/de/user/setup.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Till Rettig, Reinhold Kainhofer
 
diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/user/simultaneous.itely
index 63f485d1fd..5063d9452a 100644
--- a/Documentation/de/user/simultaneous.itely
+++ b/Documentation/de/user/simultaneous.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Simultaneous notes
 @section Simultaneous notes
diff --git a/Documentation/de/user/specialist.itely b/Documentation/de/user/specialist.itely
index 37ce5cdd02..cdafdd8887 100644
--- a/Documentation/de/user/specialist.itely
+++ b/Documentation/de/user/specialist.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Specialist notation
 @chapter Specialist notation
diff --git a/Documentation/de/user/staff.itely b/Documentation/de/user/staff.itely
index 0992571cc5..b3bf3b044d 100644
--- a/Documentation/de/user/staff.itely
+++ b/Documentation/de/user/staff.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Staff notation
 @section Staff notation
diff --git a/Documentation/de/user/templates.itely b/Documentation/de/user/templates.itely
index c28c6892de..4d15e9a8d0 100644
--- a/Documentation/de/user/templates.itely
+++ b/Documentation/de/user/templates.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Templates
 @appendix Templates
@@ -162,7 +162,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 
 @ The `line-width' is for \header.
 @li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.11.51"
+\version "2.11.61"
 \header {
   dedication = "dedication"
   title = "Title"
diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/user/tutorial.itely
index 2036a541ab..ba65e514d4 100644
--- a/Documentation/de/user/tutorial.itely
+++ b/Documentation/de/user/tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 Tutorial guidelines:
diff --git a/Documentation/de/user/tweaks.itely b/Documentation/de/user/tweaks.itely
index 1aa72b2d72..fa3020b8c8 100644
--- a/Documentation/de/user/tweaks.itely
+++ b/Documentation/de/user/tweaks.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Tweaking output
 @chapter Tweaking output
diff --git a/Documentation/de/user/unfretted-strings.itely b/Documentation/de/user/unfretted-strings.itely
index 032966b59b..66f7af79d7 100644
--- a/Documentation/de/user/unfretted-strings.itely
+++ b/Documentation/de/user/unfretted-strings.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Unfretted string instruments
 @section Unfretted string instruments
diff --git a/Documentation/de/user/wind.itely b/Documentation/de/user/wind.itely
index 34d0a4f790..48d53ba941 100644
--- a/Documentation/de/user/wind.itely
+++ b/Documentation/de/user/wind.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Wind instruments
diff --git a/Documentation/de/user/working.itely b/Documentation/de/user/working.itely
index de14bd0139..2da0721b78 100644
--- a/Documentation/de/user/working.itely
+++ b/Documentation/de/user/working.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Working on LilyPond projects
 @chapter Working on LilyPond projects
@@ -75,7 +75,7 @@ Hier einige Vorschläge, wie Sie Probleme vermeiden oder lösen können:
 @item @strong{Schreiben Sie immer mit @code{\version} die 
 Versionsnummer 
 in jede Datei}. Beachten Sie, dass in allen Vorlagen die Versionsnummer  
-@code{\version "2.11.51"} eingetragen ist. Es empfiehlt sich, in alle 
+@code{\version "2.11.61"} eingetragen ist. Es empfiehlt sich, in alle 
 Dateien, unabhängig von ihrer Größe, den @code{\version}-Befehl 
 einzufügen. Persönliche Erfahrung hat gezeigt, dass es ziemlich 
 frustrierend sein kann zu erinnern, welche Programmversion man etwa 
@@ -557,7 +557,7 @@ für meine Projekte. Jede Notationsdatei fängt an mit
 
 @example
 %%%   global.ly
-\version "2.11.51"
+\version "2.11.61"
 #(ly:set-option 'point-and-click #f)
 \include "../init/init-defs.ly"
 \include "../init/init-layout.ly"
diff --git a/Documentation/es/user/ancient.itely b/Documentation/es/user/ancient.itely
index f14f828e52..0cb2d53b54 100644
--- a/Documentation/es/user/ancient.itely
+++ b/Documentation/es/user/ancient.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Ancient notation
 @section Ancient notation
@@ -709,7 +709,7 @@ específicamente para utilizarlos con la notación del estilo Editio
 Vaticana.
 
 @lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \override TextScript #'font-family = #'typewriter
@@ -1078,7 +1078,7 @@ Deminutae}
 @code{1. Punctum}
 @tab
 @lilypond[staffsize=26,line-width=1.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum
@@ -1093,7 +1093,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum Auctum Ascendens
@@ -1112,7 +1112,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum Inclinatum Parvum
@@ -1126,7 +1126,7 @@ Deminutae}
 @code{2. Virga}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Virga
@@ -1142,7 +1142,7 @@ Deminutae}
 @code{3. Apostropha vel Stropha}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Stropha
@@ -1153,7 +1153,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Stropha Aucta
@@ -1168,7 +1168,7 @@ Deminutae}
 @code{4. Oriscus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Oriscus
@@ -1184,7 +1184,7 @@ Deminutae}
 @code{5. Clivis vel Flexa}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Clivis vel Flexa
@@ -1195,7 +1195,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Clivis Aucta Descendens
@@ -1210,7 +1210,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Cephalicus
@@ -1224,7 +1224,7 @@ Deminutae}
 @code{6. Podatus vel Pes}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Podatus vel Pes
@@ -1235,7 +1235,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Auctus Descendens
@@ -1250,7 +1250,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Epiphonus
@@ -1264,7 +1264,7 @@ Deminutae}
 @code{7. Pes Quassus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Quassus
@@ -1275,7 +1275,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Quassus Auctus Descendens
@@ -1290,7 +1290,7 @@ Deminutae}
 @code{8. Quilisma Pes}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Quilisma Pes
@@ -1301,7 +1301,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Quilisma Pes Auctus Descendens
@@ -1316,7 +1316,7 @@ Deminutae}
 @code{9. Podatus Initio Debilis}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Initio Debilis
@@ -1327,7 +1327,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Auctus Descendens Initio Debilis
@@ -1342,7 +1342,7 @@ Deminutae}
 @code{10. Torculus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus
@@ -1353,7 +1353,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Auctus Descendens
@@ -1364,7 +1364,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Deminutus
@@ -1378,7 +1378,7 @@ Deminutae}
 @code{11. Torculus Initio Debilis}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Initio Debilis
@@ -1389,7 +1389,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Auctus Descendens Initio Debilis
@@ -1400,7 +1400,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Deminutus Initio Debilis
@@ -1414,7 +1414,7 @@ Deminutae}
 @code{12. Porrectus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus
@@ -1425,7 +1425,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus Auctus Descendens
@@ -1436,7 +1436,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus Deminutus
@@ -1450,7 +1450,7 @@ Deminutae}
 @code{13. Climacus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus
@@ -1462,7 +1462,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus Auctus
@@ -1473,7 +1473,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus Deminutus
@@ -1487,7 +1487,7 @@ Deminutae}
 @code{14. Scandicus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus
@@ -1498,7 +1498,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus Auctus Descendens
@@ -1509,7 +1509,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus Deminutus
@@ -1523,7 +1523,7 @@ Deminutae}
 @code{15. Salicus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Salicus
@@ -1534,7 +1534,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Salicus Auctus Descendens
@@ -1549,7 +1549,7 @@ Deminutae}
 @code{16. Trigonus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Trigonus
@@ -1927,7 +1927,7 @@ también que puede escribir @code{\augmentum @{a g@}} como abreviatura
 de @code{\augmentum a \augmentum g}.
 
 @lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \[ \augmentum a \flexa \augmentum g \]
@@ -2013,7 +2013,7 @@ forma que pueda inmediatamente comenzar a escribir el canto en sí,
 como lo demuestra el siguiente fragmento
 
 @lilypond[quote,ragged-right,packed,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   <<
     \new VaticanaVoice = "cantus" {
diff --git a/Documentation/es/user/changing-defaults.itely b/Documentation/es/user/changing-defaults.itely
index f2eff421b0..739df4969b 100644
--- a/Documentation/es/user/changing-defaults.itely
+++ b/Documentation/es/user/changing-defaults.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Changing defaults
 @chapter Changing defaults
diff --git a/Documentation/es/user/cheatsheet.itely b/Documentation/es/user/cheatsheet.itely
index 73fdef7b2c..a34770868e 100644
--- a/Documentation/es/user/cheatsheet.itely
+++ b/Documentation/es/user/cheatsheet.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @c TODO: add tablature.
diff --git a/Documentation/es/user/chords.itely b/Documentation/es/user/chords.itely
index 11f3ac0fc7..a5068d5c3c 100644
--- a/Documentation/es/user/chords.itely
+++ b/Documentation/es/user/chords.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Chord notation
 @section Chord notation
diff --git a/Documentation/es/user/converters.itely b/Documentation/es/user/converters.itely
index b21adb0ec0..f8587d281e 100644
--- a/Documentation/es/user/converters.itely
+++ b/Documentation/es/user/converters.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Converting from other formats
 @chapter Converting from other formats
diff --git a/Documentation/es/user/dedication.itely b/Documentation/es/user/dedication.itely
index af85e05bc2..d35b2889bf 100644
--- a/Documentation/es/user/dedication.itely
+++ b/Documentation/es/user/dedication.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @quotation
 Queremos dedicar este programa a todos los amigos que hemos
diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely
index c4440b769b..00d66807e1 100644
--- a/Documentation/es/user/editorial.itely
+++ b/Documentation/es/user/editorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Editorial annotations
 @section Editorial annotations
diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/user/expressive.itely
index d38a454377..69bd9f94d4 100644
--- a/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Expressive marks
 @section Expressive marks
diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely
index 020f930174..b91b242b57 100644
--- a/Documentation/es/user/fretted-strings.itely
+++ b/Documentation/es/user/fretted-strings.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Fretted string instruments
 @section Fretted string instruments
diff --git a/Documentation/es/user/fundamental.itely b/Documentation/es/user/fundamental.itely
index 643a1a096e..a86df78317 100644
--- a/Documentation/es/user/fundamental.itely
+++ b/Documentation/es/user/fundamental.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Fundamental concepts
diff --git a/Documentation/es/user/input.itely b/Documentation/es/user/input.itely
index 406ad57e81..aed4af225e 100644
--- a/Documentation/es/user/input.itely
+++ b/Documentation/es/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node General input and output
 @chapter General input and output
diff --git a/Documentation/es/user/install.itely b/Documentation/es/user/install.itely
index b717a4301d..7dacb23138 100644
--- a/Documentation/es/user/install.itely
+++ b/Documentation/es/user/install.itely
@@ -8,7 +8,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Francisco Vila
 
diff --git a/Documentation/es/user/introduction.itely b/Documentation/es/user/introduction.itely
index bc7825652c..e79f1902f6 100644
--- a/Documentation/es/user/introduction.itely
+++ b/Documentation/es/user/introduction.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translation status: post-GDP
 
diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely
index 437eb8aae8..b152304286 100644
--- a/Documentation/es/user/keyboards.itely
+++ b/Documentation/es/user/keyboards.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Keyboard instruments
 @section Keyboard instruments
diff --git a/Documentation/es/user/lilypond-book.itely b/Documentation/es/user/lilypond-book.itely
index 1a37bb4888..716f7c4a59 100644
--- a/Documentation/es/user/lilypond-book.itely
+++ b/Documentation/es/user/lilypond-book.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @c Note: keep this node named so that `info lilypond-book' brings you here.
diff --git a/Documentation/es/user/literature.itely b/Documentation/es/user/literature.itely
index e23629aa51..601cf1ec3e 100644
--- a/Documentation/es/user/literature.itely
+++ b/Documentation/es/user/literature.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Literature list
 @appendix Literature list
diff --git a/Documentation/es/user/notation-appendices.itely b/Documentation/es/user/notation-appendices.itely
index 93a22cabdd..29ffe576d8 100644
--- a/Documentation/es/user/notation-appendices.itely
+++ b/Documentation/es/user/notation-appendices.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Notation manual tables
 @appendix Notation manual tables
diff --git a/Documentation/es/user/notation.itely b/Documentation/es/user/notation.itely
index 04a624d5eb..deea3a8137 100644
--- a/Documentation/es/user/notation.itely
+++ b/Documentation/es/user/notation.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Musical notation
 @chapter Musical notation
diff --git a/Documentation/es/user/percussion.itely b/Documentation/es/user/percussion.itely
index 7f96f6070c..d84a49427e 100644
--- a/Documentation/es/user/percussion.itely
+++ b/Documentation/es/user/percussion.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Percussion
 @section Percussion
diff --git a/Documentation/es/user/pitches.itely b/Documentation/es/user/pitches.itely
index bc4004a803..aecd50331f 100644
--- a/Documentation/es/user/pitches.itely
+++ b/Documentation/es/user/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Pitches
diff --git a/Documentation/es/user/preface.itely b/Documentation/es/user/preface.itely
index 998e44b89e..1cdc9cd83c 100644
--- a/Documentation/es/user/preface.itely
+++ b/Documentation/es/user/preface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Preface
 @unnumbered Preface
diff --git a/Documentation/es/user/repeats.itely b/Documentation/es/user/repeats.itely
index f7069a3494..2b00d0f39b 100644
--- a/Documentation/es/user/repeats.itely
+++ b/Documentation/es/user/repeats.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Repeats
 @section Repeats
diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely
index 505c4b6a6f..18f7d40459 100644
--- a/Documentation/es/user/rhythms.itely
+++ b/Documentation/es/user/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Rhythms
 @section Rhythms
diff --git a/Documentation/es/user/running.itely b/Documentation/es/user/running.itely
index f8a44dd225..cedd42aef4 100644
--- a/Documentation/es/user/running.itely
+++ b/Documentation/es/user/running.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 
 @node Running LilyPond
diff --git a/Documentation/es/user/scheme-tutorial.itely b/Documentation/es/user/scheme-tutorial.itely
index 1d53969802..3a2592afb2 100644
--- a/Documentation/es/user/scheme-tutorial.itely
+++ b/Documentation/es/user/scheme-tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Scheme tutorial
diff --git a/Documentation/es/user/setup.itely b/Documentation/es/user/setup.itely
index 5262208b39..36de20b4df 100644
--- a/Documentation/es/user/setup.itely
+++ b/Documentation/es/user/setup.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Setup
 @chapter Setup
diff --git a/Documentation/es/user/simultaneous.itely b/Documentation/es/user/simultaneous.itely
index 776e7c0612..4ce2919c15 100644
--- a/Documentation/es/user/simultaneous.itely
+++ b/Documentation/es/user/simultaneous.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translation status: post-GDP
 
diff --git a/Documentation/es/user/specialist.itely b/Documentation/es/user/specialist.itely
index 948ca681a1..b282a57635 100644
--- a/Documentation/es/user/specialist.itely
+++ b/Documentation/es/user/specialist.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Specialist notation
 @chapter Specialist notation
diff --git a/Documentation/es/user/staff.itely b/Documentation/es/user/staff.itely
index abec276ed7..0c24ec87dc 100644
--- a/Documentation/es/user/staff.itely
+++ b/Documentation/es/user/staff.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Staff notation
 @section Staff notation
diff --git a/Documentation/es/user/templates.itely b/Documentation/es/user/templates.itely
index eb9dfeeeb9..9e86942529 100644
--- a/Documentation/es/user/templates.itely
+++ b/Documentation/es/user/templates.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Templates
 @appendix Templates
diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely
index 32474fdfd7..fe4241ede5 100644
--- a/Documentation/es/user/text.itely
+++ b/Documentation/es/user/text.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Text
 @section Text
diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/user/tutorial.itely
index b082c6d981..e65b62597e 100644
--- a/Documentation/es/user/tutorial.itely
+++ b/Documentation/es/user/tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely
index fa24286784..bfcb3fe3e8 100644
--- a/Documentation/es/user/tweaks.itely
+++ b/Documentation/es/user/tweaks.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Tweaking output
 @chapter Tweaking output
diff --git a/Documentation/es/user/unfretted-strings.itely b/Documentation/es/user/unfretted-strings.itely
index 639d33d447..ff322a151b 100644
--- a/Documentation/es/user/unfretted-strings.itely
+++ b/Documentation/es/user/unfretted-strings.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Unfretted string instruments
 @section Unfretted string instruments
diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely
index 015e4a1cad..331e2b7ac4 100644
--- a/Documentation/es/user/vocal.itely
+++ b/Documentation/es/user/vocal.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Vocal music
diff --git a/Documentation/es/user/wind.itely b/Documentation/es/user/wind.itely
index fc82d24705..46b07d241b 100644
--- a/Documentation/es/user/wind.itely
+++ b/Documentation/es/user/wind.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Wind instruments
diff --git a/Documentation/es/user/working.itely b/Documentation/es/user/working.itely
index 5505b6c0b6..796a232b36 100644
--- a/Documentation/es/user/working.itely
+++ b/Documentation/es/user/working.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Working on LilyPond projects
 @chapter Working on LilyPond projects
diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in
index c315519ce7..3da75f9fc5 100644
--- a/Documentation/fr/index.html.in
+++ b/Documentation/fr/index.html.in
@@ -149,9 +149,12 @@ au format <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         </tr>
       </tbody>
     </table>
-    <p><strong>NOTE</strong>&nbsp;: vous pouvez trouver, au bas de
-    chaque page de cette documentation, des liens vers les traductions
-    disponibles.
+    <p>
+      Toute la documentation répertoriée sur cette page est
+      téléchargeable, dans une archive compressée&nbsp;:
+      <a href="http://download.linuxaudio.org/lilypond/binaries/documentation/lilypond-@VERSION@-1.documentation.tar.bz2">téléchargement</a>.
+      <br>Vous pouvez trouver, au bas de chaque page de cette
+      documentation, des liens vers les traductions disponibles.
     </p>
   </body>
 </html>
diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/user/changing-defaults.itely
index d7fc97767b..4f7d8755c9 100644
--- a/Documentation/fr/user/changing-defaults.itely
+++ b/Documentation/fr/user/changing-defaults.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Gilles Thibault
diff --git a/Documentation/fr/user/cheatsheet.itely b/Documentation/fr/user/cheatsheet.itely
index 1e20fd390f..4a28f43bd0 100644
--- a/Documentation/fr/user/cheatsheet.itely
+++ b/Documentation/fr/user/cheatsheet.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 
diff --git a/Documentation/fr/user/chords.itely b/Documentation/fr/user/chords.itely
index d7b73a7ac8..9fe25576ff 100644
--- a/Documentation/fr/user/chords.itely
+++ b/Documentation/fr/user/chords.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/converters.itely b/Documentation/fr/user/converters.itely
index 82c054ecf3..c0bbeb6741 100644
--- a/Documentation/fr/user/converters.itely
+++ b/Documentation/fr/user/converters.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Jean-Charles Malahieude
 
diff --git a/Documentation/fr/user/dedication.itely b/Documentation/fr/user/dedication.itely
index d4c3e6781e..d58182a643 100644
--- a/Documentation/fr/user/dedication.itely
+++ b/Documentation/fr/user/dedication.itely
@@ -8,7 +8,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @quotation
 Nous souhaitons dédier ce programme à tous les amis que nous avons
diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/user/editorial.itely
index 7d6ddfaa5e..94900a226e 100644
--- a/Documentation/fr/user/editorial.itely
+++ b/Documentation/fr/user/editorial.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Jean-Charles Malahieude
 
diff --git a/Documentation/fr/user/expressive.itely b/Documentation/fr/user/expressive.itely
index 3db45a5dc0..33b07f55f9 100644
--- a/Documentation/fr/user/expressive.itely
+++ b/Documentation/fr/user/expressive.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/user/fretted-strings.itely
index 044421b904..99cae747eb 100644
--- a/Documentation/fr/user/fretted-strings.itely
+++ b/Documentation/fr/user/fretted-strings.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely
index faf8f08615..84d6d4a8be 100644
--- a/Documentation/fr/user/fundamental.itely
+++ b/Documentation/fr/user/fundamental.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave, Jean-Charles Malahieude
 @c Translation checkers: John Mandereau
diff --git a/Documentation/fr/user/input.itely b/Documentation/fr/user/input.itely
index 32c0fc7765..4fc489724b 100644
--- a/Documentation/fr/user/input.itely
+++ b/Documentation/fr/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Jean-Charles Malahieude, Valentin Villenave
 
diff --git a/Documentation/fr/user/install.itely b/Documentation/fr/user/install.itely
index 976c2fb824..3320d3a4da 100644
--- a/Documentation/fr/user/install.itely
+++ b/Documentation/fr/user/install.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Install
diff --git a/Documentation/fr/user/introduction.itely b/Documentation/fr/user/introduction.itely
index 2c18b99802..53f77e6d0d 100644
--- a/Documentation/fr/user/introduction.itely
+++ b/Documentation/fr/user/introduction.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Ludovic Sardain, John Mandereau
 @c Translation checkers: Jean-Charles Malahieude, Jean-Yves Baudais
diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/user/keyboards.itely
index 8ddfeac864..6a59d5e12e 100644
--- a/Documentation/fr/user/keyboards.itely
+++ b/Documentation/fr/user/keyboards.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/notation-appendices.itely b/Documentation/fr/user/notation-appendices.itely
index f74d5de11a..e1a0aec499 100644
--- a/Documentation/fr/user/notation-appendices.itely
+++ b/Documentation/fr/user/notation-appendices.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 
diff --git a/Documentation/fr/user/notation.itely b/Documentation/fr/user/notation.itely
index 7d97550106..a10c9b9687 100644
--- a/Documentation/fr/user/notation.itely
+++ b/Documentation/fr/user/notation.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Musical notation
 @chapter Musical notation
diff --git a/Documentation/fr/user/percussion.itely b/Documentation/fr/user/percussion.itely
index 48df7fbaee..d2f791ae1b 100644
--- a/Documentation/fr/user/percussion.itely
+++ b/Documentation/fr/user/percussion.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/pitches.itely b/Documentation/fr/user/pitches.itely
index b23de0510d..34b54b88da 100644
--- a/Documentation/fr/user/pitches.itely
+++ b/Documentation/fr/user/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Frédéric Chiasson
 @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude
diff --git a/Documentation/fr/user/preface.itely b/Documentation/fr/user/preface.itely
index 94a9252c9e..6d971b81f5 100644
--- a/Documentation/fr/user/preface.itely
+++ b/Documentation/fr/user/preface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Ludovic Sardain
diff --git a/Documentation/fr/user/repeats.itely b/Documentation/fr/user/repeats.itely
index 5bf7747c85..f156855825 100644
--- a/Documentation/fr/user/repeats.itely
+++ b/Documentation/fr/user/repeats.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
@@ -14,19 +14,50 @@
 @node Repeats
 @section Repeats
 
-@lilypondfile[ragged-right,line-width=16\cm,staffsize=16,quote]
-{repeats-headword.ly}
+@lilypondfile[quote]{repeats-headword.ly}
 
+@cindex reprises
+@cindex répétitions
 La répétition est une notion essentielle en musique, et il existe de
-nombreuses façons de mettre en œuvre et noter ce concept.
+nombreuses façons de mettre en œuvre et noter ce concept.  LilyPond
+prend en charge les types de répétition suivants :
+
+@table @code
+@item volta
+Le passage répété n'est pas développé , mais il est encadré par des
+barres de reprises, et peut se terminer par plusieurs fins
+alternatives --- ou @emph{volte} --- imprimées de gauche à droite sous
+des crochets.  Lorsque la répétition commence au début de la pièce,
+aucune barre de reprise n'est gravée au début de la partition.  Il
+s'agit de la notation courante des reprises avec fins alternatives.
+
+@item unfold
+La musique répétée est développée dans la partition autant de fois
+qu'indiqué.  Ceci est particulièrement utile pour de la musique
+répétitive.
+
+@item percent
+Des barres obliques ou signes de pourcentage indiquent la répétition
+de temps ou de mesures, imprimés sous la forme de signes de
+pourcentage.
+
+@item tremolo
+Ce type permet de réaliser des trémolos sous forme de liens de croches.
+@end table
 
 @menu
-* Writing repeats::             
+* Long repeats::             
 * Other repeats::               
 @end menu
 
-@node Writing repeats
-@subsection Writing repeats
+@node Long repeats
+@subsection Long repeats
+
+Cette section présente la syntaxe des répétitions longues ---
+c'est-à-dire plusieurs mesures.  Ces répétitions peuvent prendre deux
+formes : encadrées par des barres de reprises, ou bien développées
+dans la partition.  Les barres et autres signe de reprise peuvent être
+contrôlés manuellement.
 
 @menu
 * Repeat types::                
@@ -34,48 +65,30 @@ nombreuses façons de mettre en œuvre et noter ce concept.
 * Manual repeat commands::      
 @end menu
 
+@cindex barres de reprise
+@cindex reprise
+@cindex répétition avec barres de reprise
+@cindex volta
+@cindex fois, pre
+@cindex première fois
+@cindex seconde fois
+@funindex \repeat
+
 
 @node Repeat types
 @unnumberedsubsubsec Repeat types
 
-@cindex reprises et répétitions
-
 On peut indiquer des répétitions des façons suivantes :
 
 @table @code
-@item unfold
-La musique qui doit être répétée sera entièrement imprimée (et jouée).
-Ceci est particulièrement utile dans de la musique répétitive.  Ce type
-de reprise est le seul pris en compte dans le rendu MIDI.
-
-@item volta
-Le passage répété ne sera pas écrit explicitement, mais il sera encadré
-sur la partition par des barres de reprises, et peut se terminer par
-plusieurs fins alternatives, imprimées de gauche à droite sous des
-crochets.  Il s'agit là de la notation courante des reprises avec des
-fins alternatives.  Ces dernières, par défaut, ne sont pas jouées dans
-le rendu MIDI.
-
-@item tremolo
-Pour réaliser des trémolos.  Ceux-ci, par défaut, ne sont pas joués dans
-le rendu MIDI.
-
-@item percent
-Pour répéter des temps ou des mesures, imprimés sous la forme de signes de
-pourcentage.  Ceux-ci, par défaut, ne sont pas joués dans le rendu MIDI.
-Les répétitions indiquées par ces symboles doivent être déclarées dans
-un contexte @code{Voice}.
-
+@item bar
+baz
 @end table
 
-
 @node Repeat syntax
 @unnumberedsubsubsec Repeat syntax
 
 @cindex volta
-@cindex première fois
-@cindex seconde fois
-@funindex \repeat
 
 Tous les différents types de reprise se spécifient dans
 LilyPond avec une même construction syntaxique, qui est :
diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely
index d94c1ef94f..9dfd8a6a17 100644
--- a/Documentation/fr/user/rhythms.itely
+++ b/Documentation/fr/user/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Frédéric Chiasson
 @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude
diff --git a/Documentation/fr/user/simultaneous.itely b/Documentation/fr/user/simultaneous.itely
index 463c00031b..b88fe863c6 100644
--- a/Documentation/fr/user/simultaneous.itely
+++ b/Documentation/fr/user/simultaneous.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Frédéric Chiasson, Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/spacing.itely b/Documentation/fr/user/spacing.itely
index 3927035f5c..6690b28400 100644
--- a/Documentation/fr/user/spacing.itely
+++ b/Documentation/fr/user/spacing.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 
diff --git a/Documentation/fr/user/specialist.itely b/Documentation/fr/user/specialist.itely
index f499224199..5b877e6850 100644
--- a/Documentation/fr/user/specialist.itely
+++ b/Documentation/fr/user/specialist.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Specialist notation
 @chapter Specialist notation
diff --git a/Documentation/fr/user/staff.itely b/Documentation/fr/user/staff.itely
index ef154906eb..17eab91bad 100644
--- a/Documentation/fr/user/staff.itely
+++ b/Documentation/fr/user/staff.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave, Jean-Charles Malahieude
 @c Translation checkers: John Mandereau
diff --git a/Documentation/fr/user/text.itely b/Documentation/fr/user/text.itely
index 6c57158cdf..869f47c600 100644
--- a/Documentation/fr/user/text.itely
+++ b/Documentation/fr/user/text.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @c Translators: Jean-Charles Malahieude
 @c Translation checkers: Valentin Villenave, John Mandereau
diff --git a/Documentation/fr/user/tutorial.itely b/Documentation/fr/user/tutorial.itely
index f49bb017bf..aee55748ec 100644
--- a/Documentation/fr/user/tutorial.itely
+++ b/Documentation/fr/user/tutorial.itely
@@ -7,7 +7,7 @@
    version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
diff --git a/Documentation/fr/user/tweaks.itely b/Documentation/fr/user/tweaks.itely
index e8bf011654..172ccfdbc8 100644
--- a/Documentation/fr/user/tweaks.itely
+++ b/Documentation/fr/user/tweaks.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave, Nicolas Klutchnikoff
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/unfretted-strings.itely b/Documentation/fr/user/unfretted-strings.itely
index 75c145c513..ea7cb56aa7 100644
--- a/Documentation/fr/user/unfretted-strings.itely
+++ b/Documentation/fr/user/unfretted-strings.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely
index 0393879771..8ab2e21546 100644
--- a/Documentation/fr/user/vocal.itely
+++ b/Documentation/fr/user/vocal.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude
diff --git a/Documentation/fr/user/wind.itely b/Documentation/fr/user/wind.itely
index 6b7e13a1a1..57ad497bc3 100644
--- a/Documentation/fr/user/wind.itely
+++ b/Documentation/fr/user/wind.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Valentin Villenave
 @c Translation checkers: Jean-Charles Malahieude, John Mandereau
diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/user/working.itely
index 0fbd30cfe7..9fd28c2e24 100644
--- a/Documentation/fr/user/working.itely
+++ b/Documentation/fr/user/working.itely
@@ -7,7 +7,7 @@
    version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Translators: Ludovic Sardain
 @c Translation checkers: Jean-Yves Baudais, Valentin Villenave, John Mandereau, Jean-Charles Malahieude
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index d8da5d976b..cdeeeb638f 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -65,7 +65,29 @@ which scares away people.
 
 @end ignore
 
-@item Three automatic accidentals rules have been added: @code{neo-modern},
+@item
+The file extension for MIDI can be set using the command-line
+program default @code{midi-extension}.  For Windows, the default
+extension has been changed to @code{.mid}.
+
+@item
+Two variations on the default double repeat bar line are now available.
+@lilypond[]
+{
+  \set Score.doubleRepeatType = #":|.:"
+  \repeat volta 2 {
+    c'1
+  }
+  \repeat volta 2 {
+    c'1
+  } 
+  \bar ":|.|:"
+  c'1
+}
+@end lilypond
+
+@item
+Three automatic accidentals rules have been added: @code{neo-modern},
 @code{neo-modern-cautionary} and @code{dodecaphonic}.  The following
 example illustrates @code{neo-modern} rule.
 @lilypond[]
@@ -89,18 +111,26 @@ notes = {
 }
 @end lilypond
 
-@item Flags can now be generated with Scheme-code using the @code{'flag} Stem
-grob property. Existing scores will work without change.
-@lilypond
-testnotes = { \autoBeamOff c'8 d'16 c''8 d''16 }
+@item
+Flags can now be generated with Scheme-code using the @code{'flag}
+@code{Stem} grob property.  Existing scores will work without change.
+@lilypond[]
+testnotes = {
+  \autoBeamOff
+  c'8 d'16 c''8 d''16
+}
 
 #(define (inverted-flag stem-grob)
   (let* ((dir (if (eqv? (ly:grob-property stem-grob 'direction) UP) "d" "u"))
          (flag (retrieve-glyph-flag "" dir "" stem-grob))
+         (line-thickness (ly:staff-symbol-line-thickness stem-grob))
+         (stem-thickness (ly:grob-property stem-grob 'thickness))
+         (stem-width (* line-thickness stem-thickness))
          (stroke-style (ly:grob-property stem-grob 'stroke-style))
          (stencil (if (null? stroke-style) flag
-                         (add-stroke-glyph flag stem-grob dir stroke-style ""))))
-    (ly:stencil-rotate-absolute stencil 180 -0.05 0)))
+                         (add-stroke-glyph flag stem-grob dir stroke-style "")))
+                         (rotated-flag (ly:stencil-rotate-absolute stencil 180 0 0)))
+    (ly:stencil-translate rotated-flag (cons (- (/ stem-width 2))  0))))
 
 #(define-public (weight-flag stem-grob)
   (let* ((log (- (ly:grob-property stem-grob 'duration-log) 2))
@@ -118,15 +148,14 @@ testnotes = { \autoBeamOff c'8 d'16 c''8 d''16 }
 
   \override Stem #'flag = #inverted-flag
   \testnotes
-
 }
-
 @end lilypond
 
-@item Harp pedalling diagrams were added:
+@item
+Harp pedalling diagrams were added:
 
-@lilypond
-\markup \harp-pedal #"^v-|vv-o^"
+@lilypond[]
+\markup { \harp-pedal #"^v-|vv-o^" }
 @end lilypond
 
 @item
@@ -136,13 +165,15 @@ are now available in the @code{FretBoards} context:
 \include "predefined-guitar-fretboards.ly"
 <<
   \new ChordNames {
-   \chordmode {
-      c1 \transpose c e { c }
+    \chordmode {
+      c1
+      \transpose c e { c }
     }
   }
   \new FretBoards {
     \chordmode {
-      c1 \transpose c e { c }
+      c1
+      \transpose c e { c }
     }
   }
 >>
@@ -151,11 +182,11 @@ are now available in the @code{FretBoards} context:
 @item
 The following syntax changes were made, in chronological order. In
 addition, fret diagram properties have been moved to
-@code{fret-diagram-details}, and @code{#'style} property is used to
-select solid/dashed lines instead of @code{#'dash-fraction}.
+@code{fret-diagram-details}, and the @code{#'style} property is
+used to select solid/dashed lines instead of @code{#'dash-fraction}.
 
 @example
-#'break-align-symbol -> #'break-align-symbols
+'break-align-symbol -> 'break-align-symbols
 scripts.caesura -> scripts.caesura.curved
 \setEasyHeads -> \easyHeadsOn
 \easyHeadsOff (new command)
@@ -177,17 +208,21 @@ scripts.caesura -> scripts.caesura.curved
 \sustainDown -> \sustainOn
 \sostenutoDown -> \sostenutoOn
 \sostenutoUp -> \sostenutoOff
-infinite-spacing-height -> extra-spacing-height
+'infinite-spacing-height -> 'extra-spacing-height
 #(set-octavation oct) -> \ottava #oct
 \put-adjacent markup axis dir markup -> \put-adjacent axis dir markup markup
+\pointAndClickOn (new command)
+\pointAndClickOff (new command)
 \center-align -> \center-column
 \hcenter -> \center-align
+printallheaders -> print-all-headers
 @end example
 
-@item Metronome marks can now also contain a textual description.  The
+@item
+Metronome marks can now also contain a textual description.  The
 duration and count (if given) are shown in parentheses after the text.
 
-@lilypond
+@lilypond[]
 {
   \tempo "Fast"
   c'4 c' c' c'
@@ -204,27 +239,33 @@ duration and count (if given) are shown in parentheses after the text.
 }
 @end lilypond
 
-@item In figured bass you can now also use a backslash through a number to
+@item
+In figured bass you can now also use a backslash through a number to
 indicate a raised 6th step.
 
-@lilypond[ragged-right]
+@lilypond[]
 \new FiguredBass \figuremode { < 6\\ 5\\ > < 6/ > }
 @end lilypond
 
 @item
 Arpeggios may now use ``parenthesis'' style brackets:
 
-@lilypond[relative,ragged-right]
-  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
+@lilypond[relative=1]
+\override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
 
-  % Note: does not work for cross staff arpeggios.
-  \override Arpeggio #'X-extent = #ly:grob::stencil-width
-  <c g' c>2\arpeggio ~ c
+% Note: does not work for cross-staff arpeggios.
+\override Arpeggio #'X-extent = #ly:grob::stencil-width
+<c g' c>2\arpeggio ~ c
 @end lilypond
 
+@item
+Single-system scores are now naturally spaced instead of being
+stretched to fill the line width.  This can be changed by setting
+@code{ragged-right = ##f}.
+
 @item
 Enclosing text within boxes with rounded corners is now possible,
-using the @code{rounded-box} command.
+using the @code{\rounded-box} markup command.
 
 @item
 @command{lilypond-book} can run any program instead of @command{latex}
@@ -240,7 +281,7 @@ the paper block, the number of pages that will be used.
 
 @item
 A new page breaking function, @code{ly:minimal-breaking}, is dedicated
-to books with many pages or a lot of texts.
+to books with many pages or a lot of text.
 
 @item
 A table of contents is included using @code{\markuplines \table-of-contents}.
@@ -248,18 +289,18 @@ Elements are added to it using the @code{\tocItem} command.
 
 @item
 Text spreading over several pages is entered using the
-@code{\markuplines} keyword. Builtin markup list commands, such as
+@code{\markuplines} keyword.  Builtin markup list commands, such as
 @code{\justified-lines} or @code{\wordwrap-lines} may be used, and new
 ones created using the @code{define-markup-list-command} Scheme macro.
 
 @item
 Particular points of a book may be marked with the @code{\label}
-command. Then, the page where these points are placed can be refered to
-using the @code{\page-ref} markup command.
+command.  Then, the page where these points are placed can be
+referred to using the @code{\page-ref} markup command.
 
 @item
 Page breaking and page turning commands (@code{\pageBreak},
-@code{\noPageBreak}, etc) can be used at top-level, between scores and
+@code{\noPageBreak}, etc.) can be used at top-level, between scores and
 top-level markups.
 
 @item
@@ -269,14 +310,15 @@ The following options are now changed as a @code{-d} sub-option:
 option does not exist any more.
 
 @item
-Improved testing procedure now catch changes in CPU and memory
+Improved testing procedures now catch changes in CPU and memory
 performance, page layout, MIDI results and warnings.  This helps to
 reduce the number of regression errors during development, resulting
 in more stable releases.
 
 See @uref{INSTALL.html#Testing-LilyPond} for more information.
+
 @item
-Nested properties, such as @code{details} in @code{Slur}, can be
+Nested properties, such as @code{'details} in @code{Slur}, can be
 reverted as well.  The syntax for this is
 
 @example
@@ -306,16 +348,15 @@ text on line spanners is no longer valid.
 
 This feature was sponsored by Trevor Bača.
 
- 
 @item
-The environment variable LILYPONDPREFIX has been renamed to
-LILYPOND_DATADIR.
+The environment variable @code{LILYPONDPREFIX} has been renamed
+@code{LILYPOND_DATADIR}.
 
 @item
 Notes or rests, such as a typical end note, that fill an entire
 measure are preceded by some more space.
 
-@lilypond[ragged-right]
+@lilypond[]
 \relative c' {
   \time 4/4
   s1
@@ -325,61 +366,64 @@ measure are preceded by some more space.
 }
 @end lilypond
 
-@item All @code{\score}s in a lilypond-book fragment are now inserted
-into the document. Also, toplevel markups don't result in an entire
+@item
+All @code{\score}s in a lilypond-book fragment are now inserted
+into the document.  Also, toplevel markups don't result in an entire
 page.
 
-@item Alterations (such as a sharp and flat) may now be arbitrary
-fractions. This allows some forms of microtonal music.  For example,
+@item
+Alterations (such as a sharp or flat) may now be arbitrary
+fractions.  This allows some forms of microtonal music.  For example,
 Turkish makam music uses 1/9th tone alterations.
 
 @lilypondfile{makam.ly}
 
+@item
+Tie directions may be set with @code{^~} and @code{_~}.
 
+@item
+Tablature now supports harmonics and slides:
 
-@item Tie directions may be set with @code{^~} and @code{_~}
-
-@item Tablature now supports harmonics and slides,
-
-@lilypond[fragment,ragged-right,relative=1]
-\new TabVoice
-{
-    <c g'\harmonic> d\2\glissando e\2
+@lilypond[relative=1]
+\new TabVoice {
+  <c g'\harmonic>4 d\2\glissando e2\2
 }
 @end lilypond
 
 This feature was sponsored by Mike Amundsen
 
-@item Horizontal spacing now follows object outlines more
-accurately. This allows tighter horizontal spacing.
+@item
+Horizontal spacing now follows object outlines more accurately.
+This allows tighter horizontal spacing.
 
-@lilypond[fragment,ragged-right]
+@lilypond[]
 {
-  \stemUp c''4...*1/2
-  ceses'!
+  \stemUp
+  c''4... ceses'! s16
 }
 @end lilypond
 
-
-@item Objects that belong outside of the staff are
-now positioned automatically to avoid collisions.
-
-@lilypond[fragment,ragged-right,relative=1]
-  c''
-  \once \override TextScript #'self-alignment-X = #CENTER
-  a,^"this doesn't collide with the c"
-  b^"this goes above the previous markup"
-  a8_"this goes below the dynamic"
-  a\f
+@item
+Objects that belong outside of the staff are now positioned
+automatically to avoid collisions.
+
+@lilypond[relative=1]
+c''4
+\once \override TextScript #'self-alignment-X = #CENTER
+a,4^"this doesn't collide with the c"
+b4^"this goes above the previous markup"
+a8_"this goes below the dynamic"
+a8\f
 @end lilypond
 
-@item Staves are spaced vertically using a skyline algorithm. This helps to avoid
-uneven vertical spacing.
+@item
+Staves are spaced vertically using a skyline algorithm.  This helps
+prevent uneven vertical spacing.
 
 @lilypond[ragged-right]
 
 %% todo: fix 'landscape PDF.
-#(set-default-paper-size "a6" )
+#(set-default-paper-size "a6")
 \header {
   tagline = ##f
 }
@@ -387,8 +431,10 @@ uneven vertical spacing.
 \book {
   \score {
     {
-      a,,1 | a'4 b' c'' d'' \break
-      \repeat unfold 2 {a' b' c'' d''} | b''''1
+      a,,1
+      a'4 b' c'' d'' \break
+      \repeat unfold 2 { a'4 b' c'' d''}
+      b''''1
     }
   }
 }
diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index f641269f2b..f299ada41e 100644
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Ancient notation
 @section Ancient notation
@@ -19,13 +19,15 @@
 @cindex Petrucci
 @cindex mensural
 
+
 @menu
 * Introduction to ancient notation::  
 * Alternative note signs::      
-* Additional note signs::       
+* Additional signs for Gregorian chant::
+* Ligatures::
+* Annotational accidentals (musica ficta)::
 * Pre-defined contexts::        
 * Transcribing ancient music::  
-* Editorial markings::          
 @end menu
 
 
@@ -33,16 +35,103 @@
 @subsection Introduction to ancient notation
 
 @menu
-* Ancient notation supported::  
+* Overview of the supported styles::
+* Predefined contexts::
+* Alternative and additional signs::
+* Figured bass notation::
 @end menu
 
 
-@node Ancient notation supported
-@subsubsection Ancient notation supported
+@c @node Ancient notation supported
+@c @subsection Ancient notation supported
 
 Support for ancient notation includes features for mensural notation and
 Gregorian chant notation, as well as limited support for figured bass notation.
 
+
+@node Overview of the supported styles
+@unnumberedsubsubsec Overview of the supported styles
+
+Note heads and flags, accidentals, time signatures, rests, and
+other features can be changed to emulate several different styles
+of ancient notation:
+
+
+@itemize
+@item @emph{Editio Vaticana} is a complete style for
+Gregorian chant, following the appearance of the Solesmes
+editions, the official chant books of the Vatican since 1904.
+Lilypond has support for all the notational signs used in this
+style, including ligatures, @emph{custodes}, and special signs
+such as the quilisma and the oriscus.
+
+@item The @emph{Editio Medicaea} style offers certain features
+used in the Medicaea (or Ratisbona) editions which were used prior
+to the Solesmes editions.  The most significant differences from
+the @emph{Vaticana} style are the clefs, which have
+downward-slanted strokes, and the noteheads, which are square and
+regular.
+
+@item The @emph{Hufnagel} (@qq{horseshoe nail}) style mimics the
+writing style in chant manuscripts from Germany and Central Europe
+during the middle ages.  It is named after the basic note shape
+(the @emph{virga}), which looks like a small nail.
+
+@item The @code{mensural} and @code{petrucci} styles aim to
+emulate the appearance of late-medieval and renaissance
+manuscripts and prints of mensural music.  The @emph{Mensural}
+style most closely resembles the writing style used in
+late-medieval and early renaissance manuscripts, with its small
+and narrow, diamond-shaped noteheads and its rests which approach
+a hand-drawn style.
+
+@item The @emph{Neomensural} style is a modernized and
+stylized version of the former: the noteheads are broader and the
+rests are made up of straight lines.  This style is particularly
+suited, e.g., for incipits of transcribed pieces of mensural
+music.
+
+@item The @emph{petrucci} style is named after Ottaviano Petrucci
+(1466-1539), the first printer to use movable type for music (in
+his @emph{Harmonice musices odhecaton}, 1501).  The style uses
+larger note heads than the other mensural styles.
+
+@item @emph{Baroque} and @emph{Classical} are not complete styles
+but differ from the default style only in some details: certain
+noteheads (Baroque) and the quarter rest (Classical).
+
+@end itemize
+
+Only the mensural style has alternatives for all aspects of the
+notation.  Thus, there are no rests or flags in the Gregorian
+styles, since these signs are not used in plainchant notation, and
+the Petrucci style has no flags or accidentals of its own.  Each
+feature can be changed independently of the others, so that one
+can use mensural flags, petrucci noteheads, classical rests and
+vaticana clefs in the same piece, if one wishes.
+
+@node Predefined contexts
+@unnumberedsubsubsec Predefined contexts
+
+For Gregorian chant and mensural notation, there are pre-defined
+voice and staff contexts available, which set all the various
+notation signs to values suitable for these styles.  If one is
+satisfied with these defaults, one can proceed directly with note
+entry without worrying about the details on how to customize a
+context.
+
+See @ref{Pre-defined contexts}.
+
+
+@itemize
+@item @ref{Gregorian chant contexts},
+@item @ref{Mensural contexts}.
+@end itemize
+
+
+@node Alternative and additional signs
+@unnumberedsubsubsec Alternative and additional signs
+
 Many graphical objects provide a @code{style} property, see
 
 @itemize
@@ -76,15 +165,8 @@ notational concepts are introduced specifically for ancient notation,
 @item @ref{Ligatures}.
 @end itemize
 
-To start typesetting without worrying too much about the details on how to
-customize a context, there are predefined contexts for Gregorian chant and
-mensural notation.  They set up predefined style-specific voice and staff
-contexts, and allow one to proceed directly with note entry:
-
-@itemize
-@item @ref{Gregorian chant contexts},
-@item @ref{Mensural contexts}.
-@end itemize
+@node Figured bass notation
+@unnumberedsubsubsec Figured bass notation
 
 There is limited support for figured bass notation from the Baroque period:
 
@@ -95,6 +177,7 @@ There is limited support for figured bass notation from the Baroque period:
 @c Here are all subtopics at a glance:
 
 
+
 @node Alternative note signs
 @subsection Alternative note signs
 
@@ -109,7 +192,7 @@ There is limited support for figured bass notation from the Baroque period:
 
 
 @node Ancient note heads
-@subsubsection Ancient note heads
+@unnumberedsubsubsec Ancient note heads
 
 @cindex note heads, ancient
 
@@ -133,13 +216,10 @@ the @code{baroque} style by:
 @item Centering the stems on the note heads.
 @end itemize
 
-The @code{mensural} and @code{petrucci} styles aim to emulate the appearance
-of historic printed music.  The @code{petrucci} style uses larger note
-heads.
 
-The following example demonstrates the @code{petrucci} style
+The following example demonstrates the @code{petrucci} style:
 
-@c Renaissance music doesn't use bar lines ... but they do help to
+@c Renaissance music doesn't use bar lines ...  but they do help to
 @c separate the notes for easier identification.
 
 @lilypond[quote,fragment,ragged-right,verbatim]
@@ -147,28 +227,29 @@ The following example demonstrates the @code{petrucci} style
 \autoBeamOff
 \override NoteHead #'style = #'petrucci
 a'\maxima a'\longa a'\breve a'1 a'2 a'4 a'8 a'16 a'
+
 @end lilypond
 
 When typesetting a piece in Gregorian chant notation, the
-@rinternals{Vaticana_ligature_engraver} automatically selects the proper
-note heads, so there is no need to explicitly set the note head style. 
-Still, the note head style can be set, e.g., to @code{vaticana_punctum} to
-produce punctum neumes.  Similarly, the
-@rinternals{Mensural_ligature_engraver} automatically assembles mensural
-ligatures.  See @ref{Ligatures}, for how ligature engravers work.
+@rinternals{Vaticana_ligature_engraver} automatically selects the
+proper note heads, so there is no need to explicitly set the note
+head style.  Still, the note head style can be set, e.g., to
+@code{vaticana_punctum} to produce punctum neumes.  Similarly, the
+@rinternals{Mensural_ligature_engraver} automatically assembles
+mensural ligatures.  See @ref{Ligatures}, for how ligature
+engravers work.
 
 @seealso
 
-@ref{Note head styles}, gives an overview of all available note head styles.
+@ref{Note head styles} gives an overview of all available note head styles.
 
 
 @node Ancient accidentals
-@subsubsection Ancient accidentals
+@unnumberedsubsubsec Ancient accidentals
 
 @cindex accidentals
 
-Use the @code{glyph-name-alist} property of grob @rinternals{Accidental} and
-@rinternals{KeySignature} to select ancient accidentals.
+Four different accidental styles for ancient music are available:
 
 @lilypond[quote,ragged-right,staffsize=26]
 \score {
@@ -212,47 +293,55 @@ Use the @code{glyph-name-alist} property of grob @rinternals{Accidental} and
 As shown, not all accidentals are supported by each style.  When
 trying to access an unsupported accidental, LilyPond will switch to a
 different style, as demonstrated in
-@c @lsr{ancient,ancient-accidentals.ly}.
+@c @lsr{Ancient}.
+
+The style for accidentals and key signatures is controlled by the
+@code{glyph-name-alist} property of the  grobs @rinternals{Accidental} and
+@rinternals{KeySignature}, respectively; e.g.:
 
-Similarly to local accidentals, the style of the key signature can be
-controlled by the @code{glyph-name-alist} property of the
-@rinternals{KeySignature} grob.
+@code{\override Staff.Accidental #'glyph-name-alist =
+#alteration-mensural-glyph-name-alist}
 
 @seealso
 
 Notation Reference: @ref{Pitches}, @ref{Accidentals}, and
-@ref{Automatic accidentals}, give a general introduction of the use of
-accidentals.  @ref{Key signature}, gives a general introduction of
+@ref{Automatic accidentals} give a general introduction of the use of
+accidentals.  @ref{Key signature} gives a general introduction of
 the use of key signatures.
 
 Internals Reference: @rinternals{KeySignature}.
 
 
 @node Ancient rests
-@subsubsection Ancient rests
+@unnumberedsubsubsec Ancient rests
 
 @cindex rests, ancient
 
 Use the @code{style} property of grob @rinternals{Rest} to select
 ancient rests.   Supported styles are @code{classical},
 @code{neomensural}, and @code{mensural}.  @code{classical} differs
-from the @code{default} style only in that the quarter rest looks like
-a horizontally mirrored 8th rest.  The @code{neomensural} style suits
-well for, e.g., the incipit of a transcribed mensural piece of music.
-The @code{mensural} style finally mimics the appearance of rests as
-in historic prints of the 16th century.
+from the @code{default} style only in that the quarter rest looks
+like a horizontally mirrored 8th rest.  The @code{mensural} and
+the @code{neomensural} styles mimic the appearance of rests in
+manuscripts and prints up to the 16th century.
 
-The following example demonstrates the @code{neomensural} style
+The following example demonstrates the @code{mensural} and
+@code{neomensural} styles:
 
 @lilypond[quote,fragment,ragged-right,verbatim]
 \set Score.skipBars = ##t
+\override Rest #'style = #'classical
+r\longa^"classical" r\breve r1 r2 r4 r8 r16
+\override Rest #'style = #'mensural
+r\longa^"mensural" r\breve r1 r2 r4 r8 r16
 \override Rest #'style = #'neomensural
-r\longa r\breve r1 r2 r4 r8 r16
+r\longa^"neomensural" r\breve r1 r2 r4 r8 r16 \break
 @end lilypond
 
 There are no 32th and 64th rests specifically for the mensural or
 neo-mensural style.  Instead, the rests from the default style will be
-taken.  See @c @lsr{pitches,rests} for a chart of all rests.
+taken.
+@c See @lsr{pitches,rests} for a chart of all rests.
 
 There are no rests in Gregorian chant notation; instead, it uses
 @ref{Divisiones}.
@@ -264,20 +353,24 @@ rests.
 
 
 @node Ancient clefs
-@subsubsection Ancient clefs
+@unnumberedsubsubsec Ancient clefs
 
 @cindex clefs
 
 LilyPond supports a variety of clefs, many of them ancient.
 
-The following table shows all ancient clefs that are supported via the
-@code{\clef} command.  Some of the clefs use the same glyph, but
-differ only with respect to the line they are printed on.  In such
-cases, a trailing number in the name is used to enumerate these clefs.
-Still, you can manually force a clef glyph to be typeset on an
-arbitrary line, as described in @ref{Clef}.  The note printed to the
-right side of each clef in the example column denotes the @code{c'}
-with respect to that clef.
+The following table shows all ancient clefs that are supported via
+the @code{\clef} command.  Some of the clefs use the same glyph,
+but differ only with respect to the line they are printed on.  In
+such cases, a trailing number in the name is used to enumerate
+these clefs, numbered from the lowest to the highest line.  Still,
+you can manually force a clef glyph to be typeset on an arbitrary
+line, as described in @ref{Clef}.  The note printed to the right
+side of each clef in the example column denotes the @code{c'} with
+respect to that clef.
+
+Petrucci used C clefs with differently balanced left-side vertical
+beams, depending on which staff line it is printed.
 
 @multitable @columnfractions .4 .4 .2
 @item
@@ -288,7 +381,7 @@ with respect to that clef.
 @b{Example}
 
 @item
-modern style mensural C clef
+neomensural C clef
 @tab
 @code{neomensural-c1}, @code{neomensural-c2},@*
 @code{neomensural-c3}, @code{neomensural-c4}
@@ -298,7 +391,7 @@ modern style mensural C clef
 @end lilypond
 
 @item
-petrucci style mensural C clefs, for use on different staff lines
+petrucci style C clefs, for use on different staff lines
 (the examples show the 2nd staff line C clef)
 @tab
 @code{petrucci-c1}, @code{petrucci-c2},@*
@@ -312,7 +405,7 @@ petrucci style mensural C clefs, for use on different staff lines
 @end lilypond
 
 @item
-petrucci style mensural F clef
+petrucci style F clef
 @tab
 @code{petrucci-f}
 @tab
@@ -323,7 +416,7 @@ petrucci style mensural F clef
 @end lilypond
 
 @item
-petrucci style mensural G clef
+petrucci style G clef
 @tab
 @code{petrucci-g}
 @tab
@@ -334,7 +427,7 @@ petrucci style mensural G clef
 @end lilypond
 
 @item
-historic style mensural C clef
+mensural C clef
 @tab
 @code{mensural-c1}, @code{mensural-c2},@*
 @code{mensural-c3}, @code{mensural-c4}
@@ -346,7 +439,7 @@ historic style mensural C clef
 @end lilypond
 
 @item
-historic style mensural F clef
+mensural F clef
 @tab
 @code{mensural-f}
 @tab
@@ -357,7 +450,7 @@ historic style mensural F clef
 @end lilypond
 
 @item
-historic style mensural G clef
+mensural G clef
 @tab
 @code{mensural-g}
 @tab
@@ -430,7 +523,7 @@ Editio Medicaea style fa clef
 @end lilypond
 
 @item
-historic style hufnagel do clef
+hufnagel style do clef
 @tab
 @code{hufnagel-do1}, @code{hufnagel-do2},@*
 @code{hufnagel-do3}
@@ -446,7 +539,7 @@ historic style hufnagel do clef
 @end lilypond
 
 @item
-historic style hufnagel fa clef
+hufnagel style fa clef
 @tab
 @code{hufnagel-fa1}, @code{hufnagel-fa2}
 @tab
@@ -461,7 +554,7 @@ historic style hufnagel fa clef
 @end lilypond
 
 @item
-historic style hufnagel combined do/fa clef
+hufnagel style combined do/fa clef
 @tab
 @code{hufnagel-do-fa}
 @tab
@@ -475,20 +568,6 @@ historic style hufnagel combined do/fa clef
 @end lilypond
 @end multitable
 
-@emph{Modern} or @emph{Neo-mensural style} means @qq{as is typeset in
-modern editions of transcribed mensural music.}
-
-@emph{Petrucci style} means @qq{inspired by music published by the famous
-engraver Petrucci (1466-1539).}
-
-@emph{Historic style} means @qq{as was typeset or written in historic
-editions other than those of Petrucci.}
-
-@emph{Editio XXX style} means @qq{as is/was printed in Editio XXX.}
-
-Petrucci used C clefs with differently balanced left-side vertical
-beams, depending on which staff line it is printed.
-
 @seealso
 
 Notation Reference: see @ref{Clef}.
@@ -499,13 +578,13 @@ The mensural g clef is mapped to the Petrucci g clef.
 
 
 @node Ancient flags
-@subsubsection Ancient flags
+@unnumberedsubsubsec Ancient flags
 
 @cindex flags
 
 Use the @code{flag-style} property of grob @rinternals{Stem} to
 select ancient flags.  Besides the @code{default} flag style,
-only the @code{mensural} style is supported
+only the @code{mensural} style is supported.
 
 @lilypond[quote,fragment,ragged-right,verbatim]
 \override Stem #'flag-style = #'mensural
@@ -519,10 +598,11 @@ c''8 d''8 e''8 f''8 c''16 d''16 e''16 f''16 c''32 d''32 e''32 f''32
 Note that the innermost flare of each mensural flag always is
 vertically aligned with a staff line.
 
-There is no particular flag style for neo-mensural notation.  Hence,
-when typesetting the incipit of a transcribed piece of mensural
-music, the default flag style should be used.  There are no flags in
-Gregorian chant notation.
+There is no particular flag style for neo-mensural or Petrucci notation.
+@c Hence,
+@c when typesetting the incipit of a transcribed piece of mensural
+@c music, the default flag style should be used.
+There are no flags in Gregorian chant notation.
 
 @seealso
 
@@ -541,7 +621,7 @@ scope for mensural notation).
 
 
 @node Ancient time signatures
-@subsubsection Ancient time signatures
+@unnumberedsubsubsec Ancient time signatures
 
 @cindex mensuration sign
 @cindex time signatures
@@ -597,14 +677,11 @@ chosen according to the following table
 }
 @end lilypond
 
-Use the @code{style} property of grob @rinternals{TimeSignature} to
-select ancient time signatures.  Supported styles are
+Use the @code{style} property of grob @rinternals{TimeSignature}
+to select ancient time signatures.  Supported styles are
 @code{neomensural} and @code{mensural}.  The above table uses the
-@code{neomensural} style.  This style is appropriate for the
-incipit of transcriptions of mensural pieces.  The @code{mensural}
-style mimics the look of historical printings of the 16th century.
-
-The following examples show the differences in style,
+@code{neomensural} style.  The following examples show the
+differences in style:
 
 @lilypond[ragged-right,fragment,relative=1,quote]
 {
@@ -650,44 +727,41 @@ breveTP = #(ly:make-duration -1 0 3 2)
 @noindent
 This sets @code{breveTP} to 3/2 times 2 = 3 times a whole note.
 
-The @code{old6/8alt} symbol (an alternate symbol for 6/8) is not
-addressable with @code{\time}.  Use a @code{\markup} instead
-
+The @code{mensural68alt} and @code{neomensural68alt} symbols
+(alternate symbols for 6/8) are not addressable with @code{\time}.
+Use @code{\markup @{\musicglyph #"timesig.mensural68alt" @}} instead.
 
-@node Additional note signs
-@subsection Additional note signs
+@node Additional signs for Gregorian chant
+@subsection Additional signs for Gregorian chant
 
 @menu
 * Ancient articulations::       
 * Custodes::                    
 * Divisiones::                  
-* Ligatures::                   
-* White mensural ligatures::    
-* Gregorian square neumes ligatures::  
 @end menu
 
 
 @node Ancient articulations
-@subsubsection Ancient articulations
+@unnumberedsubsubsec Ancient articulations
 
 @cindex articulations
 
 In addition to the standard articulation signs described in
 section @ref{Articulations and ornamentations}, articulation signs
-for ancient notation are provided.  These are specifically
-designed for use with notation in Editio Vaticana style.
+specifically designed for use with notation in @emph{Editio
+Vaticana} style are provided.
 
 @lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \override TextScript #'font-family = #'typewriter
     \override TextScript #'font-shape = #'upright
     \override Script #'padding = #-0.1
-    a\ictus_"ictus" \break
-    a\circulus_"circulus" \break
-    a\semicirculus_"semicirculus" \break
-    a\accentus_"accentus" \break
+    a\ictus_"ictus " \break
+    a\circulus_"circulus " \break
+    a\semicirculus_"semicirculus " \break
+    a\accentus_"accentus " \break
     \[ a_"episem" \episemInitium \pes b \flexa a b \episemFinis \flexa a \]
   }
 }
@@ -702,30 +776,32 @@ TODO: nothing here yet ...
 Some articulations are vertically placed too closely to the
 corresponding note heads.
 
-The episem line is not displayed in many cases.  If it is displayed,
-the right end of the episem line is often too far to the right.
+The episema line is not displayed in many cases.  If it is displayed,
+the right end of the episema line is often too far to the right.
 
 
 @node Custodes
-@subsubsection Custodes
+@unnumberedsubsubsec Custodes
 
 @cindex custos
 @cindex custodes
 
-A @emph{custos} (plural: @emph{custodes}; Latin word for @q{guard}) is a
+A @emph{custos} (plural: @emph{custodes}; Latin word for @qq{guard}) is a
 symbol that appears at the end of a staff.  It anticipates the pitch
-of the first note(s) of the following line thus helping the performer
+of the first note of the following line, thus helping the performer
 to manage line breaks during performance.
 
-Custodes were frequently used in music notation until the 17th
-century.  Nowadays, they have survived only in a few particular forms
-of musical notation such as contemporary editions of Gregorian chant
-like the @emph{editio vaticana}.  There are different custos glyphs
-used in different flavors of notational style.
+Custodes were frequently used in music notation until the
+seventeenth century.  Nowadays, they have survived only in a few
+particular forms of musical notation such as contemporary editions
+of Gregorian chant like the @emph{Editio Vaticana}.  There are
+different custos glyphs used in different flavors of notational
+style.
 
 For typesetting custodes, just put a @rinternals{Custos_engraver} into the
 @rinternals{Staff} context when declaring the @code{\layout} block,
-as shown in the following example
+and change the style of the custos with an @code{\override} if
+desired, as shown in the following example:
 
 @example
 \layout @{
@@ -783,19 +859,19 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and
 Internals Reference: @rinternals{Custos}.
 
 Examples:
-@c @lsr{ancient,custodes@/.ly}.
+@c @lsr{Ancient}.
 
 
 @node Divisiones
-@subsubsection Divisiones
+@unnumberedsubsubsec Divisiones
 
 @cindex divisio
 @cindex divisiones
 @cindex finalis
 
 A @emph{divisio} (plural: @emph{divisiones}; Latin word for
-@q{division}) is a staff context symbol that is used to structure
-Gregorian music into phrases and sections.  The musical meaning of
+@q{division}) is a staff context symbol that is used to indicate
+the phrase and section structure of Gregorian music.  The musical meaning of
 @emph{divisio minima}, @emph{divisio maior}, and @emph{divisio maxima}
 can be characterized as short, medium, and long pause, somewhat like
 the breathmarks from @ref{Breath marks}.  The @emph{finalis} sign not
@@ -833,26 +909,33 @@ Notation Reference: @ref{Breath marks}.
 
 Internals Reference: @rinternals{BreathingSign}.
 
-Examples: @c @lsr{expressive,breathing-sign.ly}.
+@c Examples: @lsr{Ancient}.
 
 
 @node Ligatures
-@subsubsection Ligatures
+@subsection Ligatures
+
+@menu
+* White mensural ligatures::
+* Gregorian square neumes ligatures::
+@end menu
 
 @cindex Ligatures
 
 @c TODO: Should double check if I recalled things correctly when I wrote
 @c down the following paragraph by heart.
 
-A ligature is a graphical symbol that represents at least two distinct
-notes.  Ligatures originally appeared in the manuscripts of Gregorian
-chant notation to denote ascending or descending sequences of notes.
+A ligature is a graphical symbol that represents at least two
+distinct notes.  Ligatures originally appeared in the manuscripts
+of Gregorian chant notation to denote ascending or descending
+sequences of notes on the same syllable.  They are also used in
+mensural notation.
 
 Ligatures are entered by enclosing them in @code{\[} and @code{\]}.
 Some ligature styles may need additional input syntax specific for
 this particular type of ligature.  By default, the
 @rinternals{LigatureBracket} engraver just puts a square bracket
-above the ligature
+above the ligature.
 
 @lilypond[quote,ragged-right,verbatim]
 \transpose c c' {
@@ -862,10 +945,13 @@ above the ligature
 }
 @end lilypond
 
-To select a specific style of ligatures, a proper ligature engraver
-has to be added to the @rinternals{Voice} context, as explained in
-the following subsections.   Only white mensural ligatures
-are supported with certain limitations.
+Two other ligature styles are available: the Vaticana for
+Gregorian chant, and the Mensural for mensural music (Only white
+mensural ligatures are supported for mensural music, and with
+certain limitations).  To use any of these styles, the default
+@code{Ligature_bracket_engraver} has to be replaced by one of the
+specialized ligature engravers in the @rinternals{Voice} context,
+as explained in the following subsections.
 
 @seealso
 
@@ -891,24 +977,19 @@ function
 @end example
 with the same effect and is believed to be stable.
 
-@menu
-* White mensural ligatures::
-* Gregorian square neumes ligatures::
-@end menu
-
 
 @node White mensural ligatures
-@subsubsection White mensural ligatures
+@unnumberedsubsubsec White mensural ligatures
 
 @cindex Mensural ligatures
 @cindex White mensural ligatures
 
 There is limited support for white mensural ligatures.
 
-To engrave white mensural ligatures, in the layout block put the
-@rinternals{Mensural_ligature_engraver} into the
-@rinternals{Voice} context, and remove the
-@rinternals{Ligature_bracket_engraver}, like this
+To engrave white mensural ligatures, in the layout block, replace
+the @rinternals{Ligature_bracket_engraver} with the
+@rinternals{Mensural_ligature_engraver} in the @rinternals{Voice}
+context:
 
 @example
 \layout @{
@@ -930,18 +1011,18 @@ automatic transcription of the ligatures.
 
 For example,
 
-@example
-\set Score.timing = ##f
-\set Score.defaultBarType = "empty"
-\override NoteHead #'style = #'neomensural
-\override Staff.TimeSignature #'style = #'neomensural
-\clef "petrucci-g"
-\[ c'\maxima g \]
-\[ d\longa c\breve f e d \]
-\[ c'\maxima d'\longa \]
-\[ e'1 a g\breve \]
-@end example
-@lilypond[quote,ragged-right]
+@c @example
+@c \set Score.timing = ##f
+@c \set Score.defaultBarType = "empty"
+@c \override NoteHead #'style = #'neomensural
+@c \override Staff.TimeSignature #'style = #'neomensural
+@c \clef "petrucci-g"
+@c \[ c'\maxima g \]
+@c \[ d\longa c\breve f e d \]
+@c \[ c'\maxima d'\longa \]
+@c \[ e'1 a g\breve \]
+@c @end example
+@lilypond[quote,ragged-right,verbatim]
 \score {
   \transpose c c' {
     \set Score.timing = ##f
@@ -992,7 +1073,7 @@ Horizontal spacing is poor.
 
 
 @node Gregorian square neumes ligatures
-@subsubsection Gregorian square neumes ligatures
+@unnumberedsubsubsec Gregorian square neumes ligatures
 
 @cindex Square neumes ligatures
 @cindex Gregorian square neumes ligatures
@@ -1001,7 +1082,7 @@ There is limited support for Gregorian square neumes notation
 (following the style of the Editio Vaticana).  Core ligatures can
 already be typeset, but essential issues for serious typesetting are
 still lacking, such as (among others) horizontal alignment of multiple
-ligatures, lyrics alignment and proper handling of accidentals.
+ligatures, lyrics alignment, and proper handling of accidentals.
 
 
 The following table contains the extended neumes table of the 2nd
@@ -1027,19 +1108,19 @@ Deminutae}
 
 @c TODO: \layout block is identical in all of the below examples.
 @c Therefore, it should somehow be included rather than duplicated all
-@c the time. --jr
+@c the time.  --jr
 
 @c why not make variables in ly/engraver-init.ly? --hwn
 
 @c Because it's just used to typeset plain notes without
 @c a staff for demonstration purposes rather than something
-@c special of Gregorian chant notation. --jr
+@c special of Gregorian chant notation.  --jr
 
 @item
 @code{1. Punctum}
 @tab
 @lilypond[staffsize=26,line-width=1.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum
@@ -1054,7 +1135,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.5\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum Auctum Ascendens
@@ -1073,7 +1154,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Punctum Inclinatum Parvum
@@ -1087,7 +1168,7 @@ Deminutae}
 @code{2. Virga}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Virga
@@ -1103,7 +1184,7 @@ Deminutae}
 @code{3. Apostropha vel Stropha}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Stropha
@@ -1114,7 +1195,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Stropha Aucta
@@ -1129,7 +1210,7 @@ Deminutae}
 @code{4. Oriscus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Oriscus
@@ -1145,7 +1226,7 @@ Deminutae}
 @code{5. Clivis vel Flexa}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Clivis vel Flexa
@@ -1156,7 +1237,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Clivis Aucta Descendens
@@ -1171,7 +1252,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Cephalicus
@@ -1185,7 +1266,7 @@ Deminutae}
 @code{6. Podatus vel Pes}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Podatus vel Pes
@@ -1196,7 +1277,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=2.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Auctus Descendens
@@ -1211,7 +1292,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Epiphonus
@@ -1225,7 +1306,7 @@ Deminutae}
 @code{7. Pes Quassus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Quassus
@@ -1236,7 +1317,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Quassus Auctus Descendens
@@ -1251,7 +1332,7 @@ Deminutae}
 @code{8. Quilisma Pes}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Quilisma Pes
@@ -1262,7 +1343,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Quilisma Pes Auctus Descendens
@@ -1277,7 +1358,7 @@ Deminutae}
 @code{9. Podatus Initio Debilis}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Initio Debilis
@@ -1288,7 +1369,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Pes Auctus Descendens Initio Debilis
@@ -1303,7 +1384,7 @@ Deminutae}
 @code{10. Torculus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus
@@ -1314,7 +1395,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Auctus Descendens
@@ -1325,7 +1406,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Deminutus
@@ -1339,7 +1420,7 @@ Deminutae}
 @code{11. Torculus Initio Debilis}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Initio Debilis
@@ -1350,7 +1431,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Auctus Descendens Initio Debilis
@@ -1361,7 +1442,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Torculus Deminutus Initio Debilis
@@ -1375,7 +1456,7 @@ Deminutae}
 @code{12. Porrectus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus
@@ -1386,7 +1467,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus Auctus Descendens
@@ -1397,7 +1478,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Porrectus Deminutus
@@ -1411,7 +1492,7 @@ Deminutae}
 @code{13. Climacus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus
@@ -1423,7 +1504,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus Auctus
@@ -1434,7 +1515,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Climacus Deminutus
@@ -1448,7 +1529,7 @@ Deminutae}
 @code{14. Scandicus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus
@@ -1459,7 +1540,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus Auctus Descendens
@@ -1470,7 +1551,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Scandicus Deminutus
@@ -1484,7 +1565,7 @@ Deminutae}
 @code{15. Salicus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Salicus
@@ -1495,7 +1576,7 @@ Deminutae}
 @end lilypond
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Salicus Auctus Descendens
@@ -1510,7 +1591,7 @@ Deminutae}
 @code{16. Trigonus}
 @tab
 @lilypond[staffsize=26,line-width=1.0\cm]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \transpose c c' {
     % Trigonus
@@ -1882,7 +1963,7 @@ note that you can say @code{\augmentum @{a g@}} as a shortcut for
 @code{\augmentum a \augmentum g}.
 
 @lilypond[quote,ragged-right,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \[ \augmentum a \flexa \augmentum g \]
@@ -1947,6 +2028,74 @@ unary music function, such that @code{\augmentum} can be intermixed
 with head prefixes in arbitrary order.
 
 
+@node Annotational accidentals (musica ficta)
+@subsection Annotational accidentals (musica ficta)
+
+In European music from before about 1600, singers were expected to
+chromatically alter notes at their own initiative according to
+certain rules.  This is called @notation{musica ficta}.  In modern
+transcriptions, these accidentals are usually printed over the
+note.
+
+@cindex Accidental, musica ficta
+@cindex Musica ficta
+
+Support for such suggested accidentals is included, and can be
+switched on by setting @code{suggestAccidentals} to true.
+
+@funindex suggestAccidentals
+
+@lilypond[verbatim,fragment,relative=1]
+fis gis
+\set suggestAccidentals = ##t
+ais bis
+@end lilypond
+
+This will treat @emph{every} subsequent accidental as @emph{musica
+ficta} until it is unset with @code{\set suggestAccidentals =
+##f}.  A more convenient way is to use @code{\once}, or to define
+a macro: @code{ficta = @{ \once \set suggestAccidentals = ##t @}}
+and simply use @code{\ficta} @emph{note}:
+
+@c @lilypond[quote,relative=1]
+@c \score {
+  @c \new MensuralVoice  {
+	@c \once \set suggestAccidentals = ##t bes4 a2 g2
+	@c \once \set suggestAccidentals = ##t fis8
+	@c \once \set suggestAccidentals = ##t e! fis2 g1
+  @c }
+@c }
+@c @end lilypond
+
+@lilypond[quote,verbatim]
+ficta = { \once \set suggestAccidentals = ##t }
+\score { \relative c''
+  \new MensuralVoice  {
+	\once \set suggestAccidentals = ##t
+  bes4 a2 g2 \ficta fis8 \ficta e! fis2 g1
+  }
+}
+@end lilypond
+
+@c @lilypond[quote,ragged-right]
+@c ossia = { f4 f f f }
+@c \score{
+  @c \relative c' \new Staff = "main" {
+    @c c4 c c c
+    @c <<
+      @c \new Staff \with {alignAboveContext=main} \ossia
+      @c { d8 f d f d f d f }
+    @c >>
+  @c }
+@c }
+@c @end lilypond
+
+@seealso
+
+Internals Reference: @rinternals{Accidental_engraver} engraver and
+the @rinternals{AccidentalSuggestion} object.
+
+
 @node Pre-defined contexts
 @subsection Pre-defined contexts
 
@@ -1957,7 +2106,7 @@ with head prefixes in arbitrary order.
 
 
 @node Gregorian chant contexts
-@subsubsection Gregorian chant contexts
+@unnumberedsubsubsec Gregorian chant contexts
 
 @cindex VaticanaVoiceContext
 @cindex VaticanaStaffContext
@@ -1967,10 +2116,10 @@ The predefined @code{VaticanaVoiceContext} and
 Gregorian chant in the style of the Editio Vaticana.  These contexts
 initialize all relevant context properties and grob properties to
 proper values, so you can immediately go ahead entering the chant, as
-the following excerpt demonstrates
+the following excerpt demonstrates:
 
 @lilypond[quote,ragged-right,packed,verbatim]
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   <<
     \new VaticanaVoice = "cantus" {
@@ -1994,7 +2143,7 @@ the following excerpt demonstrates
 TODO: nothing here yet ...
 
 @node Mensural contexts
-@subsubsection Mensural contexts
+@unnumberedsubsubsec Mensural contexts
 
 @cindex MensuralVoiceContext
 @cindex MensuralStaffContext
@@ -2004,7 +2153,7 @@ The predefined @code{MensuralVoiceContext} and
 mensural style.  These contexts initialize all relevant context
 properties and grob properties to proper values, so you can
 immediately go ahead entering the chant, as the following excerpt
-demonstrates
+demonstrates:
 
 @lilypond[quote,ragged-right,verbatim]
 \score {
@@ -2039,11 +2188,13 @@ TODO: nothing here yet ...
 * Incipits::                    
 * Mensurstriche layout::        
 * Transcribing Gregorian chant::  
+* Editorial markings::
+* Baroque rhythmic notation::
 @end menu
 
 
 @node Ancient and modern from one source
-@subsubsection Ancient and modern from one source
+@unnumberedsubsubsec Ancient and modern from one source
 
 @c TODO Add text
 @c Here among others the snippets about reducing note length
@@ -2055,7 +2206,7 @@ TBC
 
 
 @node Incipits
-@subsubsection Incipits
+@unnumberedsubsubsec Incipits
 
 @c TODO Add text
 @c clefs, mensuration signs etc from lsr and -user
@@ -2067,7 +2218,7 @@ TBC
 @c ... and reference to other sections ...
 
 @node Mensurstriche layout
-@subsubsection Mensurstriche layout
+@unnumberedsubsubsec Mensurstriche layout
 
 @c TODO Add text
 @c from lsr and -user
@@ -2079,7 +2230,7 @@ TBC
 
 
 @node Transcribing Gregorian chant
-@subsubsection Transcribing Gregorian chant
+@unnumberedsubsubsec Transcribing Gregorian chant
 
 @c TODO Add text
 @c extract from 1.6.1.1
@@ -2091,54 +2242,17 @@ TBC
 
 
 @node Editorial markings
-@subsection Editorial markings
+@unnumberedsubsubsec Editorial markings
 
 @menu
-* Annotational accidentals::    
+* Annotational accidentals (musica ficta)::
 * Baroque rhythmic notation::   
 @end menu
 
 
-@node Annotational accidentals
-@subsubsection Annotational accidentals
-
-In European music from before about 1600, singers were often
-expected to chromatically alter notes at their own initiative.
-This is called @notation{musica ficta}.  In modern transcriptions, these
-accidentals are usually printed over the note.
-
-@cindex Accidental, musica ficta
-@cindex Musica ficta
-
-Support for such suggested accidentals is included, and can be
-switched on by setting @code{suggestAccidentals} to true.
-
-@funindex suggestAccidentals
-
-@lilypond[verbatim,fragment,relative=1]
-fis gis
-\set suggestAccidentals = ##t
-ais bis
-@end lilypond
-
-This will treat @emph{every} subsequent accidental as @emph{musica ficta}
-until it is unset with @code{\set suggestAccidentals = ##f}.  A more
-convenient way is to use @code{\once}:
-
-@lilypond[verbatim,fragment,relative=1]
-fis gis
-\once \set suggestAccidentals = ##t
-ais ais bis
-@end lilypond
-
-@seealso
-
-Internals Reference: @rinternals{Accidental_engraver} engraver and
-the @rinternals{AccidentalSuggestion} object.
-
 
 @node Baroque rhythmic notation
-@subsubsection Baroque rhythmic notation
+@unnumberedsubsubsec Baroque rhythmic notation
 
 @c TODO Add text
 @c try Till Rettig
@@ -2150,8 +2264,8 @@ the @rinternals{AccidentalSuggestion} object.
 @c TODO Add example of this:
 @c I was referring to e.g. notated a8. a16, which should, if I
 @c remember correctly, be interpreted more like a8.. a32 (in the french
-@c style). The editor might want to show that rythmic figure above the
-@c staff as an hint to performers. (Karl Hammer)
+@c style).  The editor might want to show that rythmic figure above the
+@c staff as an hint to performers.  (Karl Hammer)
 
 
 TBC
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 4151c98337..5d2876eb6d 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -7,13 +7,11 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.55"
+@c \version "2.11.61"
 
 @node Changing defaults
 @chapter Changing defaults
 
-@strong{N.B. This Chapter is still being developed at present.}
-
 The purpose of LilyPond's design is to provide the finest quality
 output by default.  Nevertheless, it may happen that you need to
 change this default layout.  The layout is controlled through a large
@@ -34,31 +32,6 @@ which is available
 @uref{http://@/lilypond@/.org/@/doc/@/stable/@/Documentation/@/user/@/lilypond@/-internals/,on@/-line},
 and is also included with the LilyPond documentation package.
 
-@c TODO The following is at variance to what actually follows.  Fix -td
-
-@ignore
-There are four areas where the default settings may be changed:
-
-@itemize
-@item
-Automatic notation: changing the automatic creation of notation
-elements.  For example, changing the beaming rules.
-
-@item
-Output: changing the appearance of individual
-objects.  For example, changing stem directions or the location of
-subscripts.
-
-@item
-Context: changing aspects of the translation from music events to
-notation.  For example, giving each staff a separate time signature.
-
-@item
-Page layout: changing the appearance of the spacing, line
-breaks, and page dimensions.  These modifications are discussed
-@c in @ref{notation}, and @ref{Spacing issues}.
-@end itemize
-
 Internally, LilyPond uses Scheme (a LISP dialect) to provide
 infrastructure.  Overriding layout decisions in effect accesses the
 program internals, which requires Scheme input.  Scheme elements are
@@ -66,8 +39,6 @@ introduced in a @code{.ly} file with the hash mark
 @code{#}.@footnote{@rlearning{Scheme tutorial}, contains a short tutorial
 on entering numbers, lists, strings, and symbols in Scheme.}
 
-@end ignore
-
 
 @menu
 * Interpretation contexts::
@@ -75,7 +46,6 @@ on entering numbers, lists, strings, and symbols in Scheme.}
 * Modifying properties::
 * Useful concepts and properties::
 * Advanced tweaks::
-* Discussion of specific tweaks::
 @end menu
 
 
@@ -90,7 +60,7 @@ This section describes what contexts are, and how to modify them.
 * Modifying context plug-ins::  
 * Changing context default settings::  
 * Defining new contexts::       
-* Aligning contexts::           
+* Aligning contexts::
 @end menu
 
 
@@ -168,11 +138,11 @@ connected vertically.
 
 @strong{@emph{PianoStaff}}
 
-TODO No longer correct?  Check.  -td
-
+@c TODO No longer correct?  Check.  -td
 Just like GrandStaff but with a forced distance between the
 staves, so cross staff beaming and slurring can be used.
 
+@ignore
 @strong{@emph{InnerStaffGroup}}
 
 TODO  -td
@@ -181,6 +151,8 @@ TODO  -td
 
 TODO  -td
 
+@end ignore
+
 @node Intermediate-level contexts - staves
 @unnumberedsubsubsec Intermediate-level contexts - staves
 
@@ -260,8 +232,7 @@ be created implicitly.
 
 Typesets chord names.
 
-------------------------------
-
+@ignore
 TODO
 
 Then the following, which I don't know what to do with:
@@ -284,6 +255,7 @@ documented.
         Silently discards all musical information given to this
 context.
 
+@end ignore
 
 @node Creating contexts
 @subsection Creating contexts
@@ -618,7 +590,7 @@ after calling @code{\RemoveEmptyStaffContext}, ie
 @}
 @end example
 
-TODO: add \with in here.
+@c TODO: add \with in here.
 
 
 
@@ -1829,11 +1801,59 @@ TrillPitchGroup - not tried
 @node Distances and measurements
 @subsection Distances and measurements
 
-To be written
+@cindex distances, absolute
+@cindex distances, scaled
+
+@funindex \mm
+@funindex \cm
+@funindex \in
+@funindex \pt
+
+Distances in LilyPond are of two types: absolute and scaled.
+
+Absolute distances are used for specifying margins, indents, and
+other page layout details, and are by default specified in
+millimeters.  Distances may be specified in other units by
+following the quantity by @code{\mm}, @code{\cm},
+@code{\in}@tie{}(inches), or @code{\pt}@tie{}(points, 1/72.27
+of an inch).  Page layout distances can also be specified in
+scalable units (see the following paragraph) by appending
+@code{\staff-space} to the quantity.
+Page layout is described in detail in @ref{Page formatting}.
+
+Scaled distances are always specified in units of the staff-space
+or, rarely, the half staff-space.  The staff-space is the distance
+between two adjacent staff lines.  The default value can be changed
+globally by setting the global staff size, or it can be overridden
+locally by changing the @code{staff-space} property of
+@code{StaffSymbol}.  Scaled distances automatically scale with any
+change to the either the global staff size or the
+@code{staff-space} property of @code{StaffSymbol}, but fonts scale
+automatically only with changes to the global staff size.
+The global staff size thus enables the overall size of a rendered
+score to be easily varied.  For the methods of setting the global
+staff size see @ref{Setting the staff size}.
+
+@funindex magstep
+
+If just a section of a score needs to be rendered to a different
+scale, for example an ossia section or a footnote, the global staff
+size cannot simply be changed as this would affect the entire score.
+In such cases the change in size is made by overriding both the
+@code{staff-space} property of @code{StaffSymbol} and the size of
+the fonts.  A Scheme function, @code{magstep}, is available to
+convert from a font size change to the equivalent change in
+@code{staff-space}.  For an explanation and an example of its use,
+see @rlearning{Length and thickness of objects}.
 
-@c FIXME DISCUSS after working on other sections.
+@seealso
 
-@c TODO: staff spaces.  Maybe move into tweaks?
+Learning Manual:
+@rlearning{Length and thickness of objects}.
+
+Notation Reference:
+@ref{Page formatting},
+@ref{Setting the staff size}.
 
 
 @node Spanners
@@ -3032,9 +3052,4 @@ command.
 
 
 
-@node Discussion of specific tweaks
-@section Discussion of specific tweaks
-
-@c TODO What should go in here?
-
 
diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 0a1492a45a..5495c4607d 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @c TODO: add tablature.
diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely
index 363b061984..3382c43d2f 100644
--- a/Documentation/user/chords.itely
+++ b/Documentation/user/chords.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Chord notation
diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index b779ef4285..160689fb21 100644
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Converting from other formats
 @chapter Converting from other formats
@@ -18,8 +18,11 @@ There are other tools that produce LilyPond input, for example GUI
 sequencers and XML converters.  Refer to the
 @uref{http://@/lilypond@/.org,website} for more details.
 
-These are separate programs from @command{lilypond} itself, and are run
-on the command-line; see @ref{Command-line usage} for more information.
+These are separate programs from @command{lilypond} itself, and are
+run on the command line; see @ref{Command-line usage} for more
+information.  If you have MacOS 10.3 or 10.4 and you have trouble
+running some of these scripts, e.g. @code{convert-ly}, see @ref{Setup
+for MacOS X}.
 
 
 @knownissues
diff --git a/Documentation/user/dedication.itely b/Documentation/user/dedication.itely
index a2c2599044..0199244ff1 100644
--- a/Documentation/user/dedication.itely
+++ b/Documentation/user/dedication.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @quotation
 We want to dedicate this program to all the friends that we
diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index c93a2c4045..d8e8c9f691 100644
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Editorial annotations
 @section Editorial annotations
diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 9f5b3a251b..596ebc998b 100644
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Expressive marks
 @section Expressive marks
diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index e5c0697d7b..e2ad4c4dc4 100644
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.53"
+@c \version "2.11.61"
 
 @node Fretted string instruments
 @section Fretted string instruments
diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely
index b0a7da2510..b82feb2907 100644
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Fundamental concepts
 @chapter Fundamental concepts
diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 28224546f7..2896c21391 100644
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node General input and output
 @chapter General input and output
diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 77f821f54a..d556bc5973 100644
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ifclear INSTALL
 @node Install
@@ -47,12 +47,17 @@ darwin-x86  - MacOS X intel
 freebsd-64  - FreeBSD 6.x, x86_64
 freebsd-x86 - FreeBSD 4.x, x86
 linux-64    - Any GNU/Linux distribution, x86_64
-linux-arm   - Any GNU/Linux distribution, arm
 linux-ppc   - Any GNU/Linux distribution, powerpc
 linux-x86   - Any GNU/Linux distribution, x86
 mingw       - Windows x86
 @end example
 
+@knownissues
+
+If you have MacOS 10.3 or 10.4 and you would like to use Python
+scripts such as @command{convert-ly} and @command{lilypond-book}, see
+@ref{Setup for MacOS X}.
+
 
 @node Compiling from source
 @section Compiling from source
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 0d9d8666c7..befcdd5a4d 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Introduction
 @chapter Introduction
diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index 11a8f6f1c5..b28130232e 100644
--- a/Documentation/user/keyboards.itely
+++ b/Documentation/user/keyboards.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Keyboard instruments
 @section Keyboard instruments
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 2eb9a13a7f..7fc46d3f15 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @c Note: keep this node named so that `info lilypond-book' brings you here.
 @node LilyPond-book
@@ -24,10 +24,13 @@ program extracts snippets of music from your document, runs
 substituted for the music.  The line width and font size definitions for
 the music are adjusted to match the layout of your document.
 
-This is a separate program from @command{lilypond} itself, and is run on
-the command-line; for more information, see @ref{Command-line usage}.
+This is a separate program from @command{lilypond} itself, and is run
+on the command line; for more information, see @ref{Command-line
+usage}.  If you have MacOS 10.3 or 10.4 and you have trouble running
+@code{lilypond-book}, see @ref{Setup for MacOS X}.
 
-This procedure may be applied to @LaTeX{}, HTML, Texinfo or DocBook documents.
+This procedure may be applied to @LaTeX{}, HTML, Texinfo or DocBook
+documents.
 
 @cindex texinfo
 @cindex latex
diff --git a/Documentation/user/literature.itely b/Documentation/user/literature.itely
index 52b60eee37..5d7b1a4126 100644
--- a/Documentation/user/literature.itely
+++ b/Documentation/user/literature.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Literature list
 @appendix Literature list
diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index db23c86066..8c6bc0618f 100644
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Notation manual tables
 @appendix Notation manual tables
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 5e03600b46..2e497e9acb 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Musical notation
 @chapter Musical notation
diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely
index d972e61974..8d439f0852 100644
--- a/Documentation/user/percussion.itely
+++ b/Documentation/user/percussion.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Percussion
 @section Percussion
diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 7f39d91f10..4a9fae59b6 100644
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Pitches
@@ -351,7 +351,7 @@ Learning Manual:
 
 Notation Reference:
 @ref{Automatic accidentals},
-@ref{Annotational accidentals},
+@ref{Annotational accidentals (musica ficta)},
 @ref{Note names in other languages}.
 
 Snippets:
@@ -1853,6 +1853,68 @@ musicB = {
 @end lilypond
 
 
+@item teaching
+
+@funindex teaching
+@cindex teaching accidental style
+@cindex accidental style, teaching
+
+This rule is intended for students, and makes it easy to create
+scale sheets with automagically created cautionary accidentals.
+Accidentals are printed like with @code{modern}, but cautionary
+accidentals are added for all sharp or flat tones specified by the
+key signature, except if the note is immediately repeated.
+
+@lilypond[quote]
+musicA = {
+  <<
+    \relative c' {
+      cis'8 fis, d'4 <a cis>8 f bis4 |
+      cis2. <c, g'>4 |
+    }
+    \\
+    \relative c' {
+      ais'2 cis, |
+      fis8 b a4 cis2 |
+    }
+  >>
+}
+
+musicB = {
+  \clef bass
+  \new Voice {
+    \voiceTwo \relative c' {
+      <fis, a cis>4
+      \change Staff = up
+      cis'
+      \change Staff = down
+      <fis, a>
+      \change Staff = up
+      dis' |
+      \change Staff = down
+      <fis, a cis>4 gis <f a d>2 |
+    }
+  }
+}
+
+\new PianoStaff {
+  <<
+    \context Staff = "up" {
+      \key fis \minor
+      #(set-accidental-style 'teaching)
+      \musicA
+    }
+    \context Staff = "down" {
+      \key fis \minor
+      #(set-accidental-style 'teaching)
+      \musicB
+    }
+  >>
+}
+@end lilypond
+
+
+
 @item no-reset
 
 @funindex no-reset
diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index 496a360c35..2f8414cfb0 100644
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Preface
 @unnumbered Preface
diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index a427ede629..9b1a518797 100644
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Interfaces for programmers
 @chapter Interfaces for programmers
diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely
index c411d4a1ab..d2d7c053e7 100644
--- a/Documentation/user/repeats.itely
+++ b/Documentation/user/repeats.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Repeats
 @section Repeats
diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index fff7c7c1e4..b716ab08a0 100644
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 GDP TODO list
diff --git a/Documentation/user/running.itely b/Documentation/user/running.itely
index 3d8cfbf818..0bbd4d14bb 100644
--- a/Documentation/user/running.itely
+++ b/Documentation/user/running.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 
 @node Running LilyPond
@@ -42,8 +42,8 @@ as @code{midi2ly}) which are only available on the command-line.
 By @q{command-line}, we mean the command line in the operating system.
 Windows users might be more familiar with the terms @q{DOS shell} or
 @q{command shell}; MacOS@tie{}X users might be more familiar with the terms
-@q{terminal} or @q{console}.  They should also consult @ref{MacOS X
-on the command-line}.
+@q{terminal} or @q{console}.  They should also consult @ref{Setup
+for MacOS X}.
 
 Describing how to use this part of an operating system is outside the
 scope of this manual; please consult other documentation on this topic
diff --git a/Documentation/user/scheme-tutorial.itely b/Documentation/user/scheme-tutorial.itely
index 5ced0b1a84..403180d9bc 100644
--- a/Documentation/user/scheme-tutorial.itely
+++ b/Documentation/user/scheme-tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Scheme tutorial
 @appendix Scheme tutorial
diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely
index daf89d72c6..796db8dc40 100644
--- a/Documentation/user/setup.itely
+++ b/Documentation/user/setup.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Setup
 @chapter Setup
@@ -30,15 +30,39 @@ This section explains how to perform additional setup for specific
 operating systems.
 
 @menu
-* MacOS X on the command-line::  
+* Setup for MacOS X::  
 @end menu
 
+@node Setup for MacOS X
+@subsection Setup for MacOS X
 
-@node MacOS X on the command-line
-@subsection MacOS X on the command-line
+@subsubheading Using Python scripts on MacOS 10.3 or 10.4
 
-The scripts (such as lilypond-book, convert-ly, abc2ly, and even
-lilypond itself) are included inside the .app file for MacOS@tie{}X.  They can be run from
+LilyPond binaries for MacOS X do not provide Python, but Python 2.4 or
+newer is required by @command{convert-ly}.  Therefore, if you use MacOS
+10.3 or 10.4, you must install a newer Python version from
+@uref{http://python.org/download/}, then edit the first line of
+@command{convert-ly} and @command{lilypond-book} as follows: if the
+Python binary you just installed is in your @var{PATH}, the first line
+should be
+
+@example
+#!/usr/bin/env python
+@end example
+
+@noindent
+otherwise it should be
+
+@example
+#!@var{/path/to/newly_installed/python}
+@end example
+
+
+@subsubheading MacOS X on the command line
+
+The scripts --- such as @command{lilypond-book}, @command{convert-ly},
+@command{abc2ly}, and even @command{lilypond} itself --- are included
+inside the @code{.app} file for MacOS@tie{}X.  They can be run from
 the command line by invoking them directly, e.g.
 
 @example
@@ -47,7 +71,7 @@ the command line by invoking them directly, e.g.
 
 @noindent
 The same is true of the other scripts in that directory, including
-lilypond-book, convert-ly, abc2ly, etc.
+@command{lilypond-book}, @command{convert-ly}, @command{abc2ly}, etc.
 
 Alternatively, you may create scripts which add the path
 automatically.  Create a directory to store these scripts,
diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 07be1d420b..53f47778b6 100644
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 
 @node Simultaneous notes
diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index e2ba3c1820..92669a28dc 100644
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 GDP TODO list
diff --git a/Documentation/user/specialist.itely b/Documentation/user/specialist.itely
index 74c405235f..f099e64e4a 100644
--- a/Documentation/user/specialist.itely
+++ b/Documentation/user/specialist.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Specialist notation
 @chapter Specialist notation
diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index db101e604b..529ab05320 100644
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Staff notation
 @section Staff notation
diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index 702ca59a16..b9fb828ebe 100644
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Templates
 @appendix Templates
@@ -152,7 +152,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 
 @ The `line-width' is for \header.
 @li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.11.51"
+\version "2.11.61"
 \header {
   dedication = "dedication"
   title = "Title"
diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index 1571d45195..b3177a972f 100644
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Text
 @section Text
@@ -20,19 +20,17 @@ formatting) in music scores.
 Some text elements that are not dealt with here are discussed in other
 specific sections: @ref{Vocal music}, @ref{Titles and headers}.
 
-
-@cindex Text, other languages
-@warning{To write accented and special text (such as characters
-from other languages), simply insert the characters directly into
-the LilyPond file.  The file must be saved as UTF-8.  For more
-information, see @ref{Text encoding}.}
-
 @menu
 * Writing text::                
 * Formatting text::             
 * Fonts::                       
 @end menu
 
+@cindex Text, other languages
+@warning{To write accented and special text (such as characters
+from other languages), simply insert the characters directly into
+the LilyPond file.  The file must be saved as UTF-8.  For more
+information, see @ref{Text encoding}.}
 
 @node Writing text
 @subsection Writing text
@@ -55,9 +53,9 @@ This section introduces different ways of adding text to a score.
 @cindex non-empty texts
 @cindex quoted text
 
-Simple @q{quoted text} indications may be added
+Simple @qq{quoted text} indications may be added
 to a score, as demonstrated in the following example.
-Such indications can be manually placed
+Such indications may be manually placed
 above or below the staff, using the
 syntax described in @ref{Direction and
 placement}.
@@ -96,13 +94,15 @@ a4_"scherzando" f
 
 @seealso
 
-Notation Reference: @ref{Formatting text},
+Notation Reference:
+@ref{Formatting text},
 @ref{Direction and placement}.
 
 Snippets:
 @rlsr{Text}.
 
-Internals Reference: @rinternals{TextScript}.
+Internals Reference:
+@rinternals{TextScript}.
 
 @knownissues
 
@@ -124,7 +124,7 @@ default; to enable it, use
 Some performance indications, e.g., @notation{rallentando} or
 @notation{accelerando}, are written as text and are extended over
 multiple notes with dotted lines.
-Such objects, called @q{spanners}, may be created
+Such objects, called @qq{spanners}, may be created
 from one note to another using the following syntax:
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
@@ -160,12 +160,15 @@ object property.  This syntax is described in @ref{Line styles}.
 
 @seealso
 
-Notation Reference: @ref{Line styles}.
+Notation Reference:
+@ref{Line styles},
+@ref{Dynamics}.
 
 Snippets:
 @rlsr{Text}.
 
-Internals Reference: @rinternals{TextSpanner}.
+Internals Reference:
+@rinternals{TextSpanner}.
 
 
 @node Text marks
@@ -191,14 +194,24 @@ c c c
 
 This syntax makes it possible to put any text on a bar line;
 more complex text formatting may be added using a @code{\markup}
-block, as described in @ref{Formatting text}.  This can be used to print
-signs like coda, segno or fermata, by specifying the appropriate
-symbol name:
+block, as described in @ref{Formatting text}:
 
-@lilypond[fragment,quote,ragged-right,verbatim,relative=2]
-c1
+@lilypond[fragment,quote,ragged-right,verbatim,relative=1]
+<c e>1
+\mark \markup { \italic { colla parte } }
+<d f>2 <e g>
+<c f aes>1
+@end lilypond
+
+@noindent
+This syntax also allows to print special signs, like coda, segno
+or fermata, by specifying the appropriate symbol name as explained in
+@ref{Music notation inside markup}:
+
+@lilypond[fragment,quote,ragged-right,verbatim,relative=1]
+<f bes>2 <d aes'>
 \mark \markup { \musicglyph #"scripts.ufermata" }
-c1
+<e g>1
 @end lilypond
 
 @noindent
@@ -229,13 +242,17 @@ c  c
 
 @seealso
 
-Notation Reference: @ref{Rehearsal marks},
-@ref{Formatting text}, @ref{The Feta font}.
+Notation Reference:
+@ref{Rehearsal marks},
+@ref{Formatting text},
+@ref{Music notation inside markup},
+@ref{The Feta font}.
 
 Snippets:
 @rlsr{Text}.
 
-Internals Reference: @rinternals{RehearsalMark}.
+Internals Reference:
+@rinternals{RehearsalMark}.
 
 @knownissues
 @c  To be removed when Issue 69 in the tracker gets fixed. -vv
@@ -283,7 +300,7 @@ several music pieces, as described in
 @end lilypond
 
 Using a specific syntax, text blocks can be spread
-over multiple pages, making possible to print
+over multiple pages, making it possible to print
 text documents or books (and therefore to
 use LilyPond as a word processor).  This syntax is described in
 @ref{Multi-page markup}.
@@ -348,7 +365,7 @@ The markup syntax is similar to LilyPond's usual syntax: a
 @dots{} @}}.  A single word is regarded as a minimal expression,
 and therefore does not need to be enclosed with braces.
 
-Unlike simple @q{quoted text} indications, @code{\markup} blocks
+Unlike simple @qq{quoted text} indications, @code{\markup} blocks
 may contain nested expressions or specific commands,
 entered using the backslash @code{\} character.
 Such commands only affect the first following expression.
@@ -680,14 +697,17 @@ point, and therefore is not moved.
 @lilypond[quote,verbatim,fragment,relative=1]
 d2^\markup { 
   Acte I
-  \raise #2 { Scène 1 } }
+  \raise #2 { Scène 1 }
+}
 a'
 g_\markup {
   \null
-  \lower #4 \bold { Très modéré } }
+  \lower #4 \bold { Très modéré }
+}
 a
 d,^\markup {
-  \raise #4 \italic { Une forêt. } }
+  \raise #4 \italic { Une forêt. }
+}
 a'4 a g2 a
 @end lilypond
 
@@ -703,15 +723,18 @@ anchor point:
 @lilypond[quote,verbatim,fragment,relative=1]
 d2^\markup {
   Acte I
-  \translate #'(-1 . 2) "Scène 1" }
+  \translate #'(-1 . 2) "Scène 1"
+}
 a'
 g_\markup {
   \null
-  \general-align #Y #3.2 \bold "Très modéré" }
+  \general-align #Y #3.2 \bold "Très modéré"
+}
 a
 d,^\markup {
   \null
-  \translate-scaled #'(-1 . 2) \teeny "Une forêt." }
+  \translate-scaled #'(-1 . 2) \teeny "Une forêt."
+}
 a'4 a g2 a
 @end lilypond
 
@@ -940,12 +963,15 @@ Advanced graphic features include the ability to
 include external image files converted to the
 Encapsulated PostScript format (@emph{eps}), or
 to directly embed graphics into the input file,
-using native PostScript code.
+using native PostScript code.  In such a case, it
+may be useful to explicitely specify the size of the
+drawing, as demonstrated below:
 
 @lilypond[quote,verbatim,fragment,relative=1]
 c1^\markup {
   \combine
     \epsfile #X #10 #"./context-example.eps"
+    \with-dimensions #'(0 . 6) #'(0 . 10)
     \postscript #"
       -2 3 translate
       2.7 2 scale
@@ -1042,7 +1068,7 @@ c2^\markup { \musicglyph #"timesig.neomensural94" }
 @c TODO: add \lookup here? -vv
 
 @noindent
-Another way of including non-text glyphs is described
+Another way of printing non-text glyphs is described
 in @ref{Fonts explained}.
 
 The markup mode also supports diagrams for specific
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 816dc6136c..c8a09d49af 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index 8094700d47..31beac2538 100644
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Tweaking output
 @chapter Tweaking output
@@ -713,13 +713,12 @@ properties and placed in an @strong{Interface}, the
 So now we need to learn how to find the properties of interfaces,
 and to discover what objects use these interface properties.
 
-Look again at the IR page which describes LyricText.  At the
-bottom of the page is a list of clickable (in the html versions
-of the IR) interfaces which LyricText supports.  The list has 
-seven items, including @code{font-interface}.
-Clicking on this brings up the properties associated
-with this interface, which are also properties of all the objects
-which support it, including LyricText.
+Look again at the IR page which describes LyricText.  At the bottom of
+the page is a list of clickable interfaces which LyricText supports.
+The list has several items, including @code{font-interface}.  Clicking
+on this brings up the properties associated with this interface, which
+are also properties of all the objects which support it, including
+LyricText.
 
 Now we see all the user-settable properties which control fonts,
 including @code{font-shape(symbol)}, where @code{symbol} can be
@@ -744,18 +743,17 @@ to change the lyrics to italics.  The object is @code{LyricText},
 the property is @code{font-shape} and the value is
 @code{italic}.  As before, we'll omit the context.
 
-As an aside, although it is an important one, note that because 
-the values of
-@code{font-shape} are symbols they must be introduced with a
-single apostrophe, @code{'}.  That is why apostrophes
-are needed before @code{thickness} in the earlier example
-and @code{font-shape}.  These are both symbols too.
-Symbols are special names which are known internally to 
-LilyPond.  Some of them are the names of properties,
-like @code{thickness} or @code{font-shape}, others are in
-effect special values that can be given to properties, like
-@code{italic}.  Note the distinction from arbitrary
-text strings, which would appear as @code{"a text string"}.
+As an aside, although it is an important one, note that because the
+values of @code{font-shape} are symbols they must be introduced with a
+single apostrophe, @code{'}.  That is why apostrophes are needed
+before @code{thickness} in the earlier example and @code{font-shape}.
+These are both symbols too.  Symbols are then read internally by
+LilyPond.  Some of them are the names of properties, like
+@code{thickness} or @code{font-shape}, others are used as values that
+can be given to properties, like @code{italic}.  Note the distinction
+from arbitrary text strings, which would appear as @code{"a text
+string"}; for more details about symbols and strings, see @ref{Scheme
+tutorial}.
 
 Ok, so the @code{\override} command we need to print the lyrics
 in italics should be
@@ -811,6 +809,11 @@ syllable and the terminating brace.}
 @warning{In overrides in lyrics always place spaces around
 the dot between the context name and the object name.}
 
+@seealso
+
+Learning Manual: @ref{Scheme tutorial}.
+
+
 @node Types of properties
 @subsection Types of properties
 
@@ -837,15 +840,16 @@ to the front of these values when they are entered in the
   @tab A positive decimal number (in units of staff space)
   @tab @code{2.5}, @code{0.34}
 @item Direction
-  @tab A valid direction constant or its numerical equivalent
+  @tab A valid direction constant or its numerical equivalent (decimal
+values between -1 and 1 are allowed)
   @tab @code{LEFT}, @code{CENTER}, @code{UP},
        @code{1}, @code{-1}
 @item Integer
   @tab A positive whole number
   @tab @code{3}, @code{1}
 @item List
-  @tab A bracketed set of items separated by spaces,
-preceded by an apostrophe
+  @tab A set of values separated by spaces, enclosed in parentheses
+and preceded by an apostrophe
   @tab @code{'(left-edge staff-bar)}, @code{'(1)},
        @code{'(1.0 0.25 0.5)}
 @item Markup
@@ -868,15 +872,20 @@ in brackets preceded by an apostrophe
 preceded by an apostrophe
   @tab @code{'italic}, @code{'inside}
 @item Unknown
-  @tab A procedure or @code{#f} (to cause no action)
+  @tab A procedure, or @code{#f} to cause no action
   @tab @code{bend::print}, @code{ly:text-interface::print},
        @code{#f}
 @item Vector
-  @tab A list of three items enclosed in brackets and preceded
+  @tab A list of three items enclosed in parentheses and preceded
 by apostrophe-hash, @code{'#}.
   @tab @code{'#(#t #t #f)}
 @end multitable
 
+@seealso
+
+Learning Manual: @ref{Scheme tutorial}.
+
+
 @node Appearance of objects
 @section Appearance of objects
 
@@ -900,17 +909,16 @@ let us suppose the exercise is to supply the missing bar lines
 in a piece of music.  But the bar lines are normally inserted
 automatically.  How do we prevent them printing?
 
-Before we tackle this, let us remember that object properties
-are grouped in what are called @emph{interfaces} -- see
-@ref{Properties found in interfaces}.  This is simply to
-group together those properties that are commonly required
-together -- if one of them is required for an object, so are
-the others.  Some objects then need the properties in some
-interfaces, others need them from other interfaces.  The
-interfaces which contain the properties required by a 
-particular grob are listed in the IR at the bottom of the
-page describing that grob, and those properties may be
-viewed by looking at those interfaces.
+Before we tackle this, let us remember that object properties are
+grouped in what are called @emph{interfaces} -- see @ref{Properties
+found in interfaces}.  This is simply to group together those
+properties that may be used together to tweak a graphical object -- if
+one of them is allowed for an object, so are the others.  Some objects
+then use the properties in some interfaces, others use them from other
+interfaces.  The interfaces which contain the properties used by a
+particular grob are listed in the IR at the bottom of the page
+describing that grob, and those properties may be viewed by looking at
+those interfaces.
 
 We explained how to find information about grobs in 
 @ref{Properties of layout objects}.  Using the same approach,
diff --git a/Documentation/user/unfretted-strings.itely b/Documentation/user/unfretted-strings.itely
index 8f2fe29839..ba70166d74 100644
--- a/Documentation/user/unfretted-strings.itely
+++ b/Documentation/user/unfretted-strings.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Unfretted string instruments
 @section Unfretted string instruments
diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index a59389ff71..c542f66d43 100644
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.57"
+@c \version "2.11.61"
 
 @node Vocal music
 @section Vocal music
diff --git a/Documentation/user/wind.itely b/Documentation/user/wind.itely
index 9c9e483d0b..772e291297 100644
--- a/Documentation/user/wind.itely
+++ b/Documentation/user/wind.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Wind instruments
 @section Wind instruments
diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely
index 32b9f73579..c6007c7ee7 100644
--- a/Documentation/user/working.itely
+++ b/Documentation/user/working.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node Working on LilyPond projects
 @chapter Working on LilyPond projects
diff --git a/Documentation/user/world.itely b/Documentation/user/world.itely
index 6538ad949c..b1e387a806 100644
--- a/Documentation/user/world.itely
+++ b/Documentation/user/world.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.11.61"
 
 @node World music
 @section World music
diff --git a/VERSION b/VERSION
index 1643689da7..e009d3dfd0 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=60
+PATCH_LEVEL=61
 MY_PATCH_LEVEL=
 
diff --git a/buildscripts/lilypond-words.py b/buildscripts/lilypond-words.py
index eacece2c38..e9851f6231 100755
--- a/buildscripts/lilypond-words.py
+++ b/buildscripts/lilypond-words.py
@@ -29,7 +29,7 @@ for name in ['ly/chord-modifiers-init.ly',
              'ly/dynamic-scripts-init.ly',
              'ly/engraver-init.ly',
              'ly/grace-init.ly',
-             'ly/gregorian-init.ly',
+             'ly/gregorian.ly',
              'ly/music-functions-init.ly',
              'ly/performer-init.ly',
              'ly/property-init.ly',
diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly
index 48fa74db71..9e5b9dbe4b 100644
--- a/input/bach-schenker.ly
+++ b/input/bach-schenker.ly
@@ -14,7 +14,7 @@
 
 I = \once \override NoteColumn #'ignore-collision = ##t
 
-\version "2.11.51"
+\version "2.11.61"
 
 staffPiano = \new PianoStaff {
   \set Score.timing = ##f
diff --git a/input/cary-layout.ly b/input/cary-layout.ly
index 3bfde1d7b7..04655ddbb3 100644
--- a/input/cary-layout.ly
+++ b/input/cary-layout.ly
@@ -1,5 +1,5 @@
 
-\version "2.11.51"
+\version "2.11.61"
 
 \layout {
   indent = #0
diff --git a/input/cary.ly b/input/cary.ly
index bc79fc9db9..8dfcae424c 100644
--- a/input/cary.ly
+++ b/input/cary.ly
@@ -21,7 +21,7 @@
 % Copyright 2006 for the entire score;
 % All rights reserved by the composer.
 
-\version "2.11.51"
+\version "2.11.61"
 
 \include "english.ly"
 \include "cary-layout.ly"
diff --git a/input/example-1.ly b/input/example-1.ly
index 9163177ac0..a4ea980eee 100644
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -18,4 +18,4 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.11.51"
+\version "2.11.61"
diff --git a/input/example-2.ly b/input/example-2.ly
index 94d56b09f8..6deaa3d0a2 100644
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -17,5 +17,5 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.11.51"
+\version "2.11.61"
 
diff --git a/input/example-3.ly b/input/example-3.ly
index 30a16d164c..c2827edb88 100644
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -33,4 +33,4 @@ also included in the user-manual.
 %}
 
 %% Optional version number
-\version "2.11.51"
+\version "2.11.61"
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index b96a5ce49e..7a420afbd3 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 
 \header {
     composer = "ARTHUR GRAY"
@@ -46,7 +46,7 @@ treble = \new Voice \relative c''{
     \slurUp
     \set PianoStaff.connectArpeggios = ##t
 
-    #(set-octavation 1)
+    \ottava #1
 
     \tieUp
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
@@ -55,7 +55,7 @@ treble = \new Voice \relative c''{
 	\revert Stem #'direction
 	
 	a16[-5_( fis dis]
-	#(set-octavation 0)
+	\ottava #0
 	
 	cis32[ a-1 fis-4 dis]   cis[ a  fis)-2]
 				% the small grace in lower staff comes after us
diff --git a/input/lsr/accordion-discant-symbols.ly b/input/lsr/accordion-discant-symbols.ly
index a4f694fb75..245bf7e762 100644
--- a/input/lsr/accordion-discant-symbols.ly
+++ b/input/lsr/accordion-discant-symbols.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "keyboards"
diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
index 790d88cac0..80b80ae242 100644
--- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
+++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords, ancient-notation, contexts-and-engravers"
diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly
index 5822e60ddd..842b5f09c4 100644
--- a/input/lsr/adding-ambitus-per-voice.ly
+++ b/input/lsr/adding-ambitus-per-voice.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches, staff-notation, vocal-music"
diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly
index ec2a3886d1..b3ff40da96 100644
--- a/input/lsr/adding-an-extra-staff-at-a-line-break.ly
+++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers, breaks"
diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly
index 8eeb59ca30..618af762fb 100644
--- a/input/lsr/adding-an-extra-staff.ly
+++ b/input/lsr/adding-an-extra-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers"
diff --git a/input/lsr/adding-bar-lines-to-chordnames-context.ly b/input/lsr/adding-bar-lines-to-chordnames-context.ly
index 4b5c352c80..3b81b9d6eb 100644
--- a/input/lsr/adding-bar-lines-to-chordnames-context.ly
+++ b/input/lsr/adding-bar-lines-to-chordnames-context.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
index 4dd2402dcc..1461980ad8 100644
--- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
+++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, expressive-marks"
diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly
index 61d066675d..f819e4567a 100644
--- a/input/lsr/adding-drum-parts.ly
+++ b/input/lsr/adding-drum-parts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, percussion"
diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/input/lsr/adding-fingerings-to-a-score.ly
index 4ee8a7ab64..d61d7f07ed 100644
--- a/input/lsr/adding-fingerings-to-a-score.ly
+++ b/input/lsr/adding-fingerings-to-a-score.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings"
diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly
index 668928f1f7..d44a24000e 100644
--- a/input/lsr/adding-fingerings-to-tablatures.ly
+++ b/input/lsr/adding-fingerings-to-tablatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
index f6df025203..2601ae7312 100644
--- a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
+++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly
index a4748c36a7..0556f8f6aa 100644
--- a/input/lsr/adding-the-current-date-to-a-score.ly
+++ b/input/lsr/adding-the-current-date-to-a-score.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "titles"
diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly
index f53cad4c3f..551713864b 100644
--- a/input/lsr/adding-volta-brackets-to-additional-staves.ly
+++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats"
diff --git a/input/lsr/additional-voices-to-avoid-collisions.ly b/input/lsr/additional-voices-to-avoid-collisions.ly
index bdf03bb7b5..a2350d2461 100644
--- a/input/lsr/additional-voices-to-avoid-collisions.ly
+++ b/input/lsr/additional-voices-to-avoid-collisions.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes"
diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly
index 3d6c4e1731..a117c7a606 100644
--- a/input/lsr/adjusting-lyrics-vertical-spacing.ly
+++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, vocal-music, spacing"
diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly
index a92cf0f7f5..cdcca428c7 100644
--- a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly
+++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly
index cc150346d8..a7eb7647c2 100644
--- a/input/lsr/aligning-and-centering-instrument-names.ly
+++ b/input/lsr/aligning-and-centering-instrument-names.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.59"
+\version "2.11.61"
 
 \header {
   texidoces = "
diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly
index e4efc493bd..dbbd4eae5b 100644
--- a/input/lsr/aligning-lyrics.ly
+++ b/input/lsr/aligning-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, vocal-music"
diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly
index 7fd019f805..2193425919 100644
--- a/input/lsr/aligning-marks-with-various-notation-objects.ly
+++ b/input/lsr/aligning-marks-with-various-notation-objects.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.59"
+\version "2.11.61"
 
 \header {
   texidoces = "
diff --git a/input/lsr/alignment-vertical-spacing.ly b/input/lsr/alignment-vertical-spacing.ly
index 11a6db8926..e602e7177d 100644
--- a/input/lsr/alignment-vertical-spacing.ly
+++ b/input/lsr/alignment-vertical-spacing.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "tweaks-and-overrides, paper-and-layout, spacing"
diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
index 10d9da84a1..69209363e8 100644
--- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
+++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings, spacing"
diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly
index 39f444b951..a893294b76 100644
--- a/input/lsr/ambitus-with-multiple-voices.ly
+++ b/input/lsr/ambitus-with-multiple-voices.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches, vocal-music"
diff --git a/input/lsr/analysis-brackets-above-the-staff.ly b/input/lsr/analysis-brackets-above-the-staff.ly
index b437a15160..7cb08f2b2a 100644
--- a/input/lsr/analysis-brackets-above-the-staff.ly
+++ b/input/lsr/analysis-brackets-above-the-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly
index ff0aa413c3..e1c67606bb 100644
--- a/input/lsr/ancient-fonts.ly
+++ b/input/lsr/ancient-fonts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "ancient-notation"
diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
index 7ce54b33e9..6c4f7d03cc 100644
--- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
+++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "ancient-notation, template"
@@ -24,7 +24,7 @@ length.
 "
   doctitle = "Ancient notation template -- modern transcription of gregorian music"
 } % begin verbatim
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 
 chant = \relative c' {
   \set Score.timing = ##f
diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
index 066401e74f..16568cac25 100644
--- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
+++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "ancient-notation, template"
diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly
index 976af10489..4e89c5c5bd 100644
--- a/input/lsr/ancient-time-signatures.ly
+++ b/input/lsr/ancient-time-signatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "ancient-notation"
diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
index be323a1060..53b6863f34 100644
--- a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
+++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches, editorial-annotations"
diff --git a/input/lsr/arabic-improvisation.ly b/input/lsr/arabic-improvisation.ly
index 752443f9fc..2f421ff3cb 100644
--- a/input/lsr/arabic-improvisation.ly
+++ b/input/lsr/arabic-improvisation.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "world-music"
diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly
index a6d94fdb4d..d23f6ff035 100644
--- a/input/lsr/automatic-beam-subdivisions.ly
+++ b/input/lsr/automatic-beam-subdivisions.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
index c304144330..c28b68e112 100644
--- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
+++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/beams-across-line-breaks.ly b/input/lsr/beams-across-line-breaks.ly
index a16bcf7ed6..a982b617b7 100644
--- a/input/lsr/beams-across-line-breaks.ly
+++ b/input/lsr/beams-across-line-breaks.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, breaks"
diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
index 7b21f7c853..91eff84f6a 100644
--- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations, text"
diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly
index c716539c70..5d0e419f7b 100644
--- a/input/lsr/breathing-signs.ly
+++ b/input/lsr/breathing-signs.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "winds"
diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly
index 487ccd0402..2eba0967fe 100644
--- a/input/lsr/broken-crescendo-hairpin.ly
+++ b/input/lsr/broken-crescendo-hairpin.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   texidoces = "
diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly
index bb6e93a5b2..9072d393a0 100644
--- a/input/lsr/caesura-railtracks-with-fermata.ly
+++ b/input/lsr/caesura-railtracks-with-fermata.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly
index 5a34811db7..401ca18319 100644
--- a/input/lsr/center-text-below-hairpin-dynamics.ly
+++ b/input/lsr/center-text-below-hairpin-dynamics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, text"
diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly
index a7233f67a3..196a2a9a19 100644
--- a/input/lsr/changing--flageolet-mark-size.ly
+++ b/input/lsr/changing--flageolet-mark-size.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, unfretted-strings"
diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly
index 50a2f49824..9397e83ec1 100644
--- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly
+++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides"
diff --git a/input/lsr/changing-chord-separator.ly b/input/lsr/changing-chord-separator.ly
index c76d650620..bbd1f80283 100644
--- a/input/lsr/changing-chord-separator.ly
+++ b/input/lsr/changing-chord-separator.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly
index 9630f5629f..0fc031e322 100644
--- a/input/lsr/changing-form-of-multi--measure-rests.ly
+++ b/input/lsr/changing-form-of-multi--measure-rests.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
  doctitlees = "Cambiar la forma de los silencios multicompás"
  texidoces = "
diff --git a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly
index 8d418a0e91..e0d89f486a 100644
--- a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly
+++ b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "contexts-and-engravers, midi"
diff --git a/input/lsr/changing-partcombine-texts.ly b/input/lsr/changing-partcombine-texts.ly
index 2d6cb0f622..f0a1db73d0 100644
--- a/input/lsr/changing-partcombine-texts.ly
+++ b/input/lsr/changing-partcombine-texts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes"
diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly
index 9fc650da47..6639e8a7f7 100644
--- a/input/lsr/changing-properties-for-individual-grobs.ly
+++ b/input/lsr/changing-properties-for-individual-grobs.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "tweaks-and-overrides"
diff --git a/input/lsr/changing-stanza-fonts.ly b/input/lsr/changing-stanza-fonts.ly
index b3a8947c38..96933aeb6c 100644
--- a/input/lsr/changing-stanza-fonts.ly
+++ b/input/lsr/changing-stanza-fonts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly
index 38042cde5e..bff3c268f3 100644
--- a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly
+++ b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 Se puede modificar el texto empleado para los crescendos y
diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
index 3e8bd9062b..dcfd25b511 100644
--- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, editorial-annotations"
diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly
index 92c5558af3..f44d46376d 100644
--- a/input/lsr/changing-the-breath-mark-symbol.ly
+++ b/input/lsr/changing-the-breath-mark-symbol.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly
index 31fcbd85d6..59dbe13ab6 100644
--- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly
+++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly
index 1e09c7537b..04ee456945 100644
--- a/input/lsr/changing-the-default-text-font-family.ly
+++ b/input/lsr/changing-the-default-text-font-family.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, tweaks-and-overrides"
diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly
index 7d83ff9467..bbf4baa498 100644
--- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly
+++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly
index 4aa06db13d..1183eabf78 100644
--- a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly
+++ b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly
index 529d37c0fe..fed5ab50a5 100644
--- a/input/lsr/changing-the-staff-size.ly
+++ b/input/lsr/changing-the-staff-size.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout"
diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly
index ffde23b7cd..0ba323e1fd 100644
--- a/input/lsr/changing-the-tuplet-number.ly
+++ b/input/lsr/changing-the-tuplet-number.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
index 3e4c94fc3c..0de0eae221 100644
--- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
+++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 La propiedad @code{measureLength}, junto con
diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly
index 9dc4399906..4c35937b26 100644
--- a/input/lsr/chant-or-psalms-notation.ly
+++ b/input/lsr/chant-or-psalms-notation.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers"
diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly
index 87e9500815..cf6a4fefb5 100644
--- a/input/lsr/chord-name-exceptions.ly
+++ b/input/lsr/chord-name-exceptions.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly
index a9092949c9..052dd99688 100644
--- a/input/lsr/clip-systems.ly
+++ b/input/lsr/clip-systems.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "paper-and-layout"  % a new tag like "Mixing text and music" or
 % "Special output" might be more adequate -jm
diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly
index 32fff38d42..1c622e0a15 100644
--- a/input/lsr/clusters.ly
+++ b/input/lsr/clusters.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes, chords, keyboards"
diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly
index 0357e962b4..106951cc82 100644
--- a/input/lsr/combining-dynamics-with-markup-texts.ly
+++ b/input/lsr/combining-dynamics-with-markup-texts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, text"
diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly
index 8c6cedd110..ac9fefd6e5 100644
--- a/input/lsr/combining-two-parts-on-the-same-staff.ly
+++ b/input/lsr/combining-two-parts-on-the-same-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes, text"
diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly
index 62d2864760..0d9eceb0f0 100644
--- a/input/lsr/compound-time-signatures.ly
+++ b/input/lsr/compound-time-signatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly
index 4343ee551f..7158060032 100644
--- a/input/lsr/conducting-signs,-measure-grouping-signs.ly
+++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly
index 6b958d327b..213fee3106 100644
--- a/input/lsr/contemporary-glissando.ly
+++ b/input/lsr/contemporary-glissando.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly
index 3677c61a01..69960929c3 100644
--- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly
+++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations, chords, keyboards, fretted-strings"
diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly
index 470b67f173..fc01ea4c5a 100644
--- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly
+++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly
index b59f499037..0fda94ed07 100644
--- a/input/lsr/controlling-tuplet-bracket-visibility.ly
+++ b/input/lsr/controlling-tuplet-bracket-visibility.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
index b25eca23c3..d074c12820 100644
--- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
+++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches"
diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly
index 11fb0324b4..89a275edda 100644
--- a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly
+++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly
index 64c2bad17b..d1dc30aff7 100644
--- a/input/lsr/creating-blank-staves.ly
+++ b/input/lsr/creating-blank-staves.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout"
diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
index c162b741f6..38492f4881 100644
--- a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
+++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly
index 83b57312c1..1492987c0e 100644
--- a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly
+++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly
index c0ba6dc0bf..21ad65bc9a 100644
--- a/input/lsr/creating-real-parenthesized-dynamics.ly
+++ b/input/lsr/creating-real-parenthesized-dynamics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, text"
diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly
index da5fa2b541..0708ec234f 100644
--- a/input/lsr/creating-simultaneous-rehearsal-marks.ly
+++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 A diferencia de las inscripciones de texto, las lestras de ensayo
diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly
index 9e8cd55c97..6ac92d76ae 100644
--- a/input/lsr/creating-slurs-across-voices.ly
+++ b/input/lsr/creating-slurs-across-voices.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, keyboards, unfretted-strings"
diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly
index 24edbc26d8..f9fc96742b 100644
--- a/input/lsr/creating-text-spanners.ly
+++ b/input/lsr/creating-text-spanners.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly
index 0528232da3..c2bb30e391 100644
--- a/input/lsr/custodes.ly
+++ b/input/lsr/custodes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "ancient-notation, tweaks-and-overrides"
diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly
index c0e80af4a5..9cce684794 100644
--- a/input/lsr/customizing-fretboard-fret-diagrams.ly
+++ b/input/lsr/customizing-fretboard-fret-diagrams.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly
index 3b304e73be..e4913401b1 100644
--- a/input/lsr/customizing-markup-fret-diagrams.ly
+++ b/input/lsr/customizing-markup-fret-diagrams.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
index 145d92a1bd..2d4cb79128 100644
--- a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
+++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly
index 7132ce4f93..697b2a5b2d 100644
--- a/input/lsr/demo-midiinstruments.ly
+++ b/input/lsr/demo-midiinstruments.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, keyboards, unfretted-strings, midi"
diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly
index b79225c789..8dd3920549 100644
--- a/input/lsr/demonstrating-all-headers.ly
+++ b/input/lsr/demonstrating-all-headers.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
index 4d488cd26c..a17c69e59e 100644
--- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
+++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "staff-notation,tweaks-and-overrides"
   texidoc = "If there is only one staff in one of the staff types
diff --git a/input/lsr/displaying-complex-chords.ly b/input/lsr/displaying-complex-chords.ly
index 7490cca3d9..ccb05c5b35 100644
--- a/input/lsr/displaying-complex-chords.ly
+++ b/input/lsr/displaying-complex-chords.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes, chords"
diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
index e9b255b51b..552329fdd4 100644
--- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches"
diff --git a/input/lsr/dotted-harmonics.ly b/input/lsr/dotted-harmonics.ly
index e9bd4e4bb2..a71f4c0dc0 100644
--- a/input/lsr/dotted-harmonics.ly
+++ b/input/lsr/dotted-harmonics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.58"
+\version "2.11.61"
 
 \header {
   lsrtags = "unfretted-strings,tweaks-and-overrides"
diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly
index 80d68ce2eb..3e9c0a9110 100644
--- a/input/lsr/drawing-boxes-around-grobs.ly
+++ b/input/lsr/drawing-boxes-around-grobs.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly
index 80f481494c..54361a4a08 100644
--- a/input/lsr/drawing-circles-around-various-objects.ly
+++ b/input/lsr/drawing-circles-around-various-objects.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly
index b6d503fb44..f402399753 100644
--- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly
+++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations, text"
diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly
index 5152e5a460..8ca45d4555 100644
--- a/input/lsr/engravers-one-by-one.ly
+++ b/input/lsr/engravers-one-by-one.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "contexts-and-engravers"
diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly
index 50d55de3f7..c83b3fb047 100644
--- a/input/lsr/engraving-ties-manually.ly
+++ b/input/lsr/engraving-ties-manually.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly
index e21b8f33db..2803cb9448 100644
--- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly
+++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/faking-a-hammer-in-tablatures.ly b/input/lsr/faking-a-hammer-in-tablatures.ly
index 95306494cc..c0330ce6ef 100644
--- a/input/lsr/faking-a-hammer-in-tablatures.ly
+++ b/input/lsr/faking-a-hammer-in-tablatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/fine-tuning-pedal-brackets.ly b/input/lsr/fine-tuning-pedal-brackets.ly
index 54aceb27d1..8cd6603002 100644
--- a/input/lsr/fine-tuning-pedal-brackets.ly
+++ b/input/lsr/fine-tuning-pedal-brackets.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.59"
+\version "2.11.61"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
diff --git a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
index deba345fe9..7588359b4a 100644
--- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
+++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/flamenco-notation.ly b/input/lsr/flamenco-notation.ly
index fc01ecdf83..0c8fcc44d1 100644
--- a/input/lsr/flamenco-notation.ly
+++ b/input/lsr/flamenco-notation.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/forcing-horizontal-shift-of-notes.ly b/input/lsr/forcing-horizontal-shift-of-notes.ly
index 50dede719b..d131233aee 100644
--- a/input/lsr/forcing-horizontal-shift-of-notes.ly
+++ b/input/lsr/forcing-horizontal-shift-of-notes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
index 42d4efd0ac..8004c1e258 100644
--- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly
index f0a93f7e69..59a1018152 100644
--- a/input/lsr/formatting-lyrics-syllables.ly
+++ b/input/lsr/formatting-lyrics-syllables.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, vocal-music"
diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/input/lsr/fret-diagrams-explained-and-developed.ly
index 6acd52c358..59a86d7f4c 100644
--- a/input/lsr/fret-diagrams-explained-and-developed.ly
+++ b/input/lsr/fret-diagrams-explained-and-developed.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly
index d2163416df..cd3b4f03c1 100644
--- a/input/lsr/generating-random-notes.ly
+++ b/input/lsr/generating-random-notes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches"
diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/input/lsr/grid-lines--changing-their-appearance.ly
index f1ac309991..7bf438d1c2 100644
--- a/input/lsr/grid-lines--changing-their-appearance.ly
+++ b/input/lsr/grid-lines--changing-their-appearance.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
index d548a46447..1876d89991 100644
--- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
+++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly
index 47d5553140..8f77dd6971 100644
--- a/input/lsr/heavily-customized-polymetric-time-signatures.ly
+++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, percussion"
diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly
index 8a82ba651a..c311a17a4f 100644
--- a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly
+++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
index 95bffb3e38..b89103bf99 100644
--- a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
+++ b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/input/lsr/how-to-change-fret-diagram-position.ly b/input/lsr/how-to-change-fret-diagram-position.ly
index c2d0ff0360..b0ece32ccc 100644
--- a/input/lsr/how-to-change-fret-diagram-position.ly
+++ b/input/lsr/how-to-change-fret-diagram-position.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly
index 0404c5263b..c7b0aec7dc 100644
--- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly
+++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, vocal-music"
diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly
index 57876e200a..24b0d787a7 100644
--- a/input/lsr/incipit.ly
+++ b/input/lsr/incipit.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 Los «incipit» se pueden escribir utilizando el grob del nombre del
diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
index 3bce8e1137..36e777db1f 100644
--- a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
+++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "keyboards"
diff --git a/input/lsr/inserting-a-caesura.ly b/input/lsr/inserting-a-caesura.ly
index b83d904d99..06ebe5712a 100644
--- a/input/lsr/inserting-a-caesura.ly
+++ b/input/lsr/inserting-a-caesura.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "expressive-marks,tweaks-and-overrides"
   texidoc = "
diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
index 2d1859960c..47f53cfce0 100644
--- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
+++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/input/lsr/isolated-percent-repeats.ly b/input/lsr/isolated-percent-repeats.ly
index 35c22531bb..1e2cbce607 100644
--- a/input/lsr/isolated-percent-repeats.ly
+++ b/input/lsr/isolated-percent-repeats.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats"
diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly
index 59bad46ade..6b8fcf61a2 100644
--- a/input/lsr/jazz-combo-template.ly
+++ b/input/lsr/jazz-combo-template.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "keyboards, percussion, fretted-strings, template"
diff --git a/input/lsr/laissez-vibrer-ties.ly b/input/lsr/laissez-vibrer-ties.ly
index 55f0fa592c..1a30d1e418 100644
--- a/input/lsr/laissez-vibrer-ties.ly
+++ b/input/lsr/laissez-vibrer-ties.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks, keyboards, fretted-strings"
diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly
index 1c638516cc..ca33120f1e 100644
--- a/input/lsr/letter-tablature-formatting.ly
+++ b/input/lsr/letter-tablature-formatting.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation,fretted-strings"
diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly
index 8b0eea9ded..836b3df405 100644
--- a/input/lsr/line-arrows.ly
+++ b/input/lsr/line-arrows.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 Se pueden aplicar puntas de flecha a los elementos de extensión de
diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly
index 863aabe735..d5590a260e 100644
--- a/input/lsr/makam.ly
+++ b/input/lsr/makam.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 El «Makam» es un tipo de melodía de Turquía que
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 746a8aaa90..92f47abba4 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
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
index 61afb59921..bdb1487c22 100644
--- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
+++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, editorial-annotations"
diff --git a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly
index 4674b52745..d6ad2facdc 100644
--- a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly
+++ b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly
index af3b5e2231..e01ee11366 100644
--- a/input/lsr/manually-controlling-beam-positions.ly
+++ b/input/lsr/manually-controlling-beam-positions.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly
index fef5cc8c4c..12e836d40e 100644
--- a/input/lsr/markup-lines.ly
+++ b/input/lsr/markup-lines.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/lsr/measure-counter.ly b/input/lsr/measure-counter.ly
index d7fca89032..2b4dd1e348 100644
--- a/input/lsr/measure-counter.ly
+++ b/input/lsr/measure-counter.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats, staff-notation, editorial-annotations"
diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
index c70adb7f78..d60652e8c8 100644
--- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides"
diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly
index bf2a50b789..fbafb1bd13 100644
--- a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly
+++ b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/modern-tab-text-clef.ly b/input/lsr/modern-tab-text-clef.ly
index 2e87f40a41..b6fa8b8714 100644
--- a/input/lsr/modern-tab-text-clef.ly
+++ b/input/lsr/modern-tab-text-clef.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, fretted-strings"
diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
index fdc35bcd1a..bedb9b550b 100644
--- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly
index af363a9a40..3cdff49265 100644
--- a/input/lsr/modifying-tuplet-bracket-length.ly
+++ b/input/lsr/modifying-tuplet-bracket-length.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/multi--measure-rest-markup.ly b/input/lsr/multi--measure-rest-markup.ly
index f688d037a5..8ce19202b4 100644
--- a/input/lsr/multi--measure-rest-markup.ly
+++ b/input/lsr/multi--measure-rest-markup.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.58"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, text"
diff --git a/input/lsr/nesting-staves.ly b/input/lsr/nesting-staves.ly
index 752c59963a..92261f5cf2 100644
--- a/input/lsr/nesting-staves.ly
+++ b/input/lsr/nesting-staves.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides"
diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly
index dfe2f31fef..c1afaed2ed 100644
--- a/input/lsr/non-traditional-key-signatures.ly
+++ b/input/lsr/non-traditional-key-signatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches, staff-notation"
diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly
index 3d88ff3b98..201bad1fdc 100644
--- a/input/lsr/ottava-text.ly
+++ b/input/lsr/ottava-text.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches, text"
diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly
index 07622d4b47..63f0447253 100644
--- a/input/lsr/outputting-the-version-number.ly
+++ b/input/lsr/outputting-the-version-number.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly
index f4d3650290..2948d9d9aa 100644
--- a/input/lsr/page-label.ly
+++ b/input/lsr/page-label.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "spacing"
   texidoc = "Page labels may be placed inside music or at top-level,
diff --git a/input/lsr/percent-repeat-counter.ly b/input/lsr/percent-repeat-counter.ly
index 5f71a00799..0840421e56 100644
--- a/input/lsr/percent-repeat-counter.ly
+++ b/input/lsr/percent-repeat-counter.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats"
diff --git a/input/lsr/percussion-beaters.ly b/input/lsr/percussion-beaters.ly
index 72bef527d0..58fe8a04e3 100644
--- a/input/lsr/percussion-beaters.ly
+++ b/input/lsr/percussion-beaters.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "percussion"
diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly
index d1e10a967f..4718def8ab 100644
--- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly
+++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly
index 2ffcf6fede..f899433e8a 100644
--- a/input/lsr/piano-template-simple.ly
+++ b/input/lsr/piano-template-simple.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "keyboards, template"
diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly
index a2501d3f70..3634d7472c 100644
--- a/input/lsr/piano-template-with-centered-dynamics.ly
+++ b/input/lsr/piano-template-with-centered-dynamics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   texidoces = "
diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly
index 9d3e6e36f0..9f24b8d58b 100644
--- a/input/lsr/piano-template-with-centered-lyrics.ly
+++ b/input/lsr/piano-template-with-centered-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, keyboards, template"
diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly
index 502e65edf3..d6848308c9 100644
--- a/input/lsr/piano-template-with-melody-and-lyrics.ly
+++ b/input/lsr/piano-template-with-melody-and-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, keyboards, template"
diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly
index 1037051c1d..289273a777 100644
--- a/input/lsr/placement-of-right-hand-fingerings.ly
+++ b/input/lsr/placement-of-right-hand-fingerings.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/polyphony-in-tablature.ly b/input/lsr/polyphony-in-tablature.ly
index 95364c59fe..10dce8704b 100644
--- a/input/lsr/polyphony-in-tablature.ly
+++ b/input/lsr/polyphony-in-tablature.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly
index ba20ae33a1..6902e16b83 100644
--- a/input/lsr/positioning-multi--measure-rests.ly
+++ b/input/lsr/positioning-multi--measure-rests.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
  doctitlees = "Posicionar los silencios multicompás"
  texidoces = "
diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly
index 4196c8f021..824fbb2c81 100644
--- a/input/lsr/positioning-segno-and-coda-with-line-break.ly
+++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats, breaks"
diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
index 20f30e51df..23434e2381 100644
--- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches"
diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
index 9cd0f7c4a0..64efbc4243 100644
--- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
+++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches"
diff --git a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
index 822187031a..fd86ae1698 100644
--- a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
+++ b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats, tweaks-and-overrides"
diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/input/lsr/printing-hairpins-using-al-niente-notation.ly
index e0632f0c4d..0802649d27 100644
--- a/input/lsr/printing-hairpins-using-al-niente-notation.ly
+++ b/input/lsr/printing-hairpins-using-al-niente-notation.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
index 80c04c2fca..36669cb110 100644
--- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
+++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly
index 19af7d60f6..11a96e7e0f 100644
--- a/input/lsr/printing-marks-on-every-staff.ly
+++ b/input/lsr/printing-marks-on-every-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly
index d4385a7d05..b2305292fa 100644
--- a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly
+++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides"
diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly
index 33f82f16d7..633ab03dfe 100644
--- a/input/lsr/printing-music-with-different-time-signatures.ly
+++ b/input/lsr/printing-music-with-different-time-signatures.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, percussion"
diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly
index db6dfae345..ee075c2868 100644
--- a/input/lsr/proportional-strict-notespacing.ly
+++ b/input/lsr/proportional-strict-notespacing.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "tweaks-and-overrides, spacing"
diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly
index ba25aac513..78b806d6d5 100644
--- a/input/lsr/quoting-another-voice-with-transposition.ly
+++ b/input/lsr/quoting-another-voice-with-transposition.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "Los pasajes citados tienen en cuenta la
 transposición de la fuente tanto como la del destino.  En este
diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly
index 604b678c14..e975750fde 100644
--- a/input/lsr/quoting-another-voice.ly
+++ b/input/lsr/quoting-another-voice.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "staff-notation"
   texidoc = "With @code{\\quote}, fragments of previously entered
diff --git a/input/lsr/removing-the-first-empty-line.ly b/input/lsr/removing-the-first-empty-line.ly
index c85f8039ac..6fab810519 100644
--- a/input/lsr/removing-the-first-empty-line.ly
+++ b/input/lsr/removing-the-first-empty-line.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, breaks"
diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly
index 82ad46ec33..35e5d1ea9c 100644
--- a/input/lsr/rest-styles.ly
+++ b/input/lsr/rest-styles.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, ancient-notation, tweaks-and-overrides"
diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly
index 22c90d6325..578716bb34 100644
--- a/input/lsr/rhythmic-slashes.ly
+++ b/input/lsr/rhythmic-slashes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly
index 48de04ffaf..0160e1a2b3 100644
--- a/input/lsr/score-for-diatonic-accordion.ly
+++ b/input/lsr/score-for-diatonic-accordion.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "template"
diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly
index efcbc8fc9e..987611a7b3 100644
--- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 Si la nota que da fin a un regulador cae sobre la primera parte de
diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/input/lsr/setting-the-minimum-length-of-hairpins.ly
index 575828c822..4c64d80d7f 100644
--- a/input/lsr/setting-the-minimum-length-of-hairpins.ly
+++ b/input/lsr/setting-the-minimum-length-of-hairpins.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly
index 22e52ece02..8e57c3fb6e 100644
--- a/input/lsr/shortening-volta-brackets.ly
+++ b/input/lsr/shortening-volta-brackets.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats"
diff --git a/input/lsr/showing-chords-at-changes.ly b/input/lsr/showing-chords-at-changes.ly
index 27755fd3b2..477638fef8 100644
--- a/input/lsr/showing-chords-at-changes.ly
+++ b/input/lsr/showing-chords-at-changes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/simple-lead-sheet.ly b/input/lsr/simple-lead-sheet.ly
index 65db2d3c10..8cc7807b56 100644
--- a/input/lsr/simple-lead-sheet.ly
+++ b/input/lsr/simple-lead-sheet.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords"
diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly
index e3589215d5..7f333585ee 100644
--- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly
+++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, chords, template"
diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
index da66dd555f..74e33c417e 100644
--- a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
+++ b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, chords, template"
diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly
index 665b13fe48..701b266132 100644
--- a/input/lsr/single-staff-template-with-notes-and-chords.ly
+++ b/input/lsr/single-staff-template-with-notes-and-chords.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "chords, template"
diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly
index 89570cb799..85d6d166c5 100644
--- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly
+++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, template"
diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly
index 45349ef789..c241625172 100644
--- a/input/lsr/single-staff-template-with-only-notes.ly
+++ b/input/lsr/single-staff-template-with-only-notes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "template"
diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly
index fde276f18f..68355a8ba8 100644
--- a/input/lsr/skips-in-lyric-mode-2.ly
+++ b/input/lsr/skips-in-lyric-mode-2.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, vocal-music"
diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly
index 58da3aacaf..1688cb53f3 100644
--- a/input/lsr/skips-in-lyric-mode.ly
+++ b/input/lsr/skips-in-lyric-mode.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, vocal-music"
diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly
index 41c33630f0..69d5b70fb6 100644
--- a/input/lsr/stem-and-beam-behavior-in-tablature.ly
+++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/input/lsr/stemlets.ly b/input/lsr/stemlets.ly
index e9d0478a4c..05b4a11087 100644
--- a/input/lsr/stemlets.ly
+++ b/input/lsr/stemlets.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly
index 47b553882c..586b0bd49a 100644
--- a/input/lsr/string-quartet-template-simple.ly
+++ b/input/lsr/string-quartet-template-simple.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "unfretted-strings, template"
diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly
index 62ae6dec78..3e5fe236cf 100644
--- a/input/lsr/string-quartet-template-with-separate-parts.ly
+++ b/input/lsr/string-quartet-template-with-separate-parts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "unfretted-strings, template"
diff --git a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
index a5f653b5e5..9dc798d306 100644
--- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
+++ b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "simultaneous-notes,tweaks-and-overrides"
   texidoc = "
diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly
index 5a0b32e2ea..472b360a59 100644
--- a/input/lsr/table-of-contents.ly
+++ b/input/lsr/table-of-contents.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "paper-and-layout"
   texidoc = "A table of contents is included using
diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly
index 6ae6a1cf37..02185938cc 100644
--- a/input/lsr/three-sided-box.ly
+++ b/input/lsr/three-sided-box.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, text"
diff --git a/input/lsr/tick-bar-lines.ly b/input/lsr/tick-bar-lines.ly
index 735368cb32..da28154ab5 100644
--- a/input/lsr/tick-bar-lines.ly
+++ b/input/lsr/tick-bar-lines.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly
index 3974330991..7c8fcd5593 100644
--- a/input/lsr/time-signature-in-parentheses.ly
+++ b/input/lsr/time-signature-in-parentheses.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
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 cefad94027..65f89edc5c 100644
--- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
 doctitlees = "Transportar música con el menor número de alteraciones"
 texidoces = "
diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly
index 1e15a443c0..80c1e95db9 100644
--- a/input/lsr/tweaking-clef-properties.ly
+++ b/input/lsr/tweaking-clef-properties.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"
diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly
index 7406b25a2f..0437da3610 100644
--- a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly
+++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers"
diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly
index cbcec89245..b3efd1df28 100644
--- a/input/lsr/using-double-slurs-for-legato-chords.ly
+++ b/input/lsr/using-double-slurs-for-legato-chords.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
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 d93aa57695..b88cd7a751 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
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly
index d364d6a875..42bd0b3e5b 100644
--- a/input/lsr/using-ties-with-arpeggios.ly
+++ b/input/lsr/using-ties-with-arpeggios.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms"
diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly
index 5dcf25b291..a3c42e4328 100644
--- a/input/lsr/utf-8.ly
+++ b/input/lsr/utf-8.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly
index e5de65f8af..e583771667 100644
--- a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly
+++ b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "tweaks-and-overrides, spacing"
diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly
index d48c1a1e94..ad3538a306 100644
--- a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly
+++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly
index 4f1d4c0813..540858cf4b 100644
--- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly
+++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, tweaks-and-overrides, spacing"
diff --git a/input/lsr/vertically-centered-common-lyrics.ly b/input/lsr/vertically-centered-common-lyrics.ly
index 193ab9d5ba..0223e27835 100644
--- a/input/lsr/vertically-centered-common-lyrics.ly
+++ b/input/lsr/vertically-centered-common-lyrics.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
index 9929058bca..4fb6841a0b 100644
--- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, keyboards, template"
diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
index 5f55cb5665..f01c33dc5a 100644
--- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, vocal-music, contexts-and-engravers, template"
diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly
index c09842698c..f0c1016a15 100644
--- a/input/lsr/vocal-ensemble-template.ly
+++ b/input/lsr/vocal-ensemble-template.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "vocal-music, template"
diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly
index 32771d4458..204230e1fb 100644
--- a/input/lsr/volta-below-chords.ly
+++ b/input/lsr/volta-below-chords.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   texidoces = "
 Mediante la adición del grabador @code{Volta_engraver} al
diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly
index 47edeffc44..e087f90b2d 100644
--- a/input/lsr/volta-multi-staff.ly
+++ b/input/lsr/volta-multi-staff.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "repeats,staff-notation"
   texidoc = "By adding the @code{Volta_engraver} to the relevant
diff --git a/input/lsr/volta-text-markup-using-repeatcommands.ly b/input/lsr/volta-text-markup-using-repeatcommands.ly
index d4b17a7f85..f51d80293b 100644
--- a/input/lsr/volta-text-markup-using-repeatcommands.ly
+++ b/input/lsr/volta-text-markup-using-repeatcommands.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats"
diff --git a/input/manual/ancient-headword.ly b/input/manual/ancient-headword.ly
index 4f25fce07a..6b92df874f 100644
--- a/input/manual/ancient-headword.ly
+++ b/input/manual/ancient-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 
 #(set-global-staff-size 15)
 \paper{
@@ -14,7 +14,7 @@
   }
 }
 
-\include "gregorian-init.ly" 
+\include "gregorian.ly" 
 
 \score {
   <<
diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly
index 4c1d2847c5..ceb1b90134 100644
--- a/input/manual/chord-names-jazz.ly
+++ b/input/manual/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The
diff --git a/input/manual/chord-names-languages.ly b/input/manual/chord-names-languages.ly
index 5dea0ce1a6..1641c3f7d7 100644
--- a/input/manual/chord-names-languages.ly
+++ b/input/manual/chord-names-languages.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
diff --git a/input/manual/chords-headword.ly b/input/manual/chords-headword.ly
index 5e141af3d5..f1c477eefd 100644
--- a/input/manual/chords-headword.ly
+++ b/input/manual/chords-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 #(set-global-staff-size 15)
 \paper{
   ragged-right=##f
diff --git a/input/manual/display-predefined-fretboards.ly b/input/manual/display-predefined-fretboards.ly
index 3d4b9c6000..7dd4ac914b 100644
--- a/input/manual/display-predefined-fretboards.ly
+++ b/input/manual/display-predefined-fretboards.ly
@@ -1,5 +1,5 @@
 \include "predefined-guitar-fretboards.ly"
-\version "2.11.57"
+\version "2.11.61"
 
 
 mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break }
diff --git a/input/manual/divisiones.ly b/input/manual/divisiones.ly
index b76adf8c94..97be62eddf 100644
--- a/input/manual/divisiones.ly
+++ b/input/manual/divisiones.ly
@@ -9,9 +9,9 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
 
 " }
 
-\version "2.11.57"
+\version "2.11.61"
 
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 
 \score {
   <<
diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly
index 9935cfe965..0cadb4dc32 100644
--- a/input/manual/editorial-headword.ly
+++ b/input/manual/editorial-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
diff --git a/input/manual/engraver-example.ily b/input/manual/engraver-example.ily
index a01887d95b..f099874d3b 100644
--- a/input/manual/engraver-example.ily
+++ b/input/manual/engraver-example.ily
@@ -1,5 +1,5 @@
 %% texidoc = "Include file for engraver example."
-\version "2.10.0"
+\version "2.11.61"
 topVoice =  \relative c' {
   \key d\major
   es8([ g] a[ fis])
diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly
index 7393206852..1ea60271c0 100644
--- a/input/manual/expressive-headword.ly
+++ b/input/manual/expressive-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/input/manual/figured-bass-headword.ly b/input/manual/figured-bass-headword.ly
index e8663e3ebb..14daed63a6 100644
--- a/input/manual/figured-bass-headword.ly
+++ b/input/manual/figured-bass-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 #(set-global-staff-size 15)
 \paper{
   ragged-right=##f
diff --git a/input/manual/font-table.ly b/input/manual/font-table.ly
index 476e36af37..c2fa775f5b 100644
--- a/input/manual/font-table.ly
+++ b/input/manual/font-table.ly
@@ -9,7 +9,7 @@
   evenFooterMarkup = \markup {}
   }
 
-\version "2.11.57"
+\version "2.11.61"
 
 #(define-markup-command (doc-char layout props name) (string?)
   (interpret-markup layout props
diff --git a/input/manual/fretted-headword.ly b/input/manual/fretted-headword.ly
index 85877d9785..75fdeb04a6 100644
--- a/input/manual/fretted-headword.ly
+++ b/input/manual/fretted-headword.ly
@@ -3,7 +3,7 @@
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.11.57"
+\version "2.11.61"
 
 #(set-global-staff-size 15)
 \paper{
diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly
index ba04b1b76b..81ea9ec397 100644
--- a/input/manual/keyboard-headword.ly
+++ b/input/manual/keyboard-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 
 #(set-global-staff-size 15)
diff --git a/input/manual/note-head-style.ly b/input/manual/note-head-style.ly
index 82852e767f..05be352bdf 100644
--- a/input/manual/note-head-style.ly
+++ b/input/manual/note-head-style.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \header{
   texidoc="
 Note head shapes may be set from several choices.  
diff --git a/input/manual/percussion-chart.ly b/input/manual/percussion-chart.ly
index b7dcd632ff..f30cda1b67 100644
--- a/input/manual/percussion-chart.ly
+++ b/input/manual/percussion-chart.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 
 % yes, I know this is a mess.  But I'm not going to fuss with
 % it one day before I leave.  -gp
diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly
index b5ce0822d0..33d4006513 100644
--- a/input/manual/pitches-headword.ly
+++ b/input/manual/pitches-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly
index 5c33642ab9..c23a20de6e 100644
--- a/input/manual/repeats-headword.ly
+++ b/input/manual/repeats-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly
index e1d1389a1a..cc9a465fe7 100644
--- a/input/manual/rhythms-headword.ly
+++ b/input/manual/rhythms-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/input/manual/screech-boink.ly b/input/manual/screech-boink.ly
index a509e8f5e6..5b72a68d3c 100644
--- a/input/manual/screech-boink.ly
+++ b/input/manual/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
diff --git a/input/manual/script-chart.ly b/input/manual/script-chart.ly
index 431cceecb7..c2439fe941 100644
--- a/input/manual/script-chart.ly
+++ b/input/manual/script-chart.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 
 % this chart is used in the manual too.
 
diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
index b21a3c5b5f..5f49914f84 100644
--- a/input/manual/simultaneous-headword.ly
+++ b/input/manual/simultaneous-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly
index b8a13dd376..f1de7cc2ee 100644
--- a/input/manual/staff-headword.ly
+++ b/input/manual/staff-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
index f848ccd503..dd6b11856e 100644
--- a/input/manual/text-headword.ly
+++ b/input/manual/text-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper{
diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly
index 8ef7822efc..69ca7d35c3 100644
--- a/input/manual/wind-headword.ly
+++ b/input/manual/wind-headword.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 #(set-global-staff-size 15)
 \paper {
   line-width = 16\cm
diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly
index fad11b69c9..5e09b1424e 100644
--- a/input/mutopia-header.ly
+++ b/input/mutopia-header.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 \header {
   title =	"Title"
   subtitle =	"Subtitle"
diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 310439102b..6d0047e469 100644
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -7,7 +7,7 @@
   copyright = "Public Domain"
 }
 
-\version "2.11.38"
+\version "2.11.61"
 
 global =  {
   \key a \minor
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 31720633f4..84ab30e083 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.11.38"
+\version "2.11.61"
 manuscriptBreak = { \break }
 
 
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index b22bbf878c..c39c0a4ab8 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -40,7 +40,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.11.38"
+\version "2.11.61"
 
 #(set-global-staff-size 16)
 
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 276f102b25..731ceff949 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.11.38"
+\version "2.11.61"
 
 forcedLastBreak =  { \break }
 
diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index 63f4f9a048..dd41132afa 100644
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.11.38"
+\version "2.11.61"
 
 %{
  Header for Petites Preludes.
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 0bb7239a35..bead2fddfc 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -41,7 +41,7 @@
 
 
 
-\version "2.11.38"
+\version "2.11.61"
 
 
 
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 1c0eec1c99..0f37f3a1ed 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 
 #(set-global-staff-size 16)
 
-\version "2.11.38"
+\version "2.11.61"
 
 \header {
   title = "Romanzen"
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index a63f310d9b..5edd274ac3 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -41,7 +41,7 @@ virtuoso that taught in Geneva.
 
 %}
 
-\version "2.11.38"
+\version "2.11.61"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
index 88509f100a..3815801f39 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 \include  "mozart-hrn3-defs.ily"
 
 allegro =
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
index 1f4bed18e2..c234ffd3d5 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
@@ -4,7 +4,7 @@ longgrace = \override Stem  #'stroke-style = #'()
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
-\version "2.10.0"
+\version "2.11.61"
   
 cresc =  {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
index 5f80fe35f2..cca5e1885c 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 \include  "mozart-hrn3-defs.ily"
 
 romanze =  \relative c' {
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
index 4fadba268f..b4372ef72f 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 
 % \include "mozart-hrn3-defs.ily"
 
diff --git a/input/new/aligning-and-centering-instrument-names.ly b/input/new/aligning-and-centering-instrument-names.ly
index b6975adce2..8469fc7f24 100644
--- a/input/new/aligning-and-centering-instrument-names.ly
+++ b/input/new/aligning-and-centering-instrument-names.ly
@@ -1,4 +1,4 @@
-\version "2.11.59"
+\version "2.11.61"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
diff --git a/input/new/aligning-marks-with-various-notation-objects.ly b/input/new/aligning-marks-with-various-notation-objects.ly
index e34bcda14b..dc44a1aab1 100644
--- a/input/new/aligning-marks-with-various-notation-objects.ly
+++ b/input/new/aligning-marks-with-various-notation-objects.ly
@@ -1,4 +1,4 @@
-\version "2.11.59"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/new/arabic-improvisation.ly b/input/new/arabic-improvisation.ly
index 2fb315e751..e45e14e364 100644
--- a/input/new/arabic-improvisation.ly
+++ b/input/new/arabic-improvisation.ly
@@ -1,4 +1,4 @@
-\version "2.11.54"
+\version "2.11.61"
 
 \header {
   lsrtags = "world-music"
diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly
index 6ead4937e3..c0de47ef45 100644
--- a/input/new/broken-crescendo-hairpin.ly
+++ b/input/new/broken-crescendo-hairpin.ly
@@ -1,4 +1,4 @@
-\version "2.11.38"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly
index ef9027d949..2a267e94aa 100644
--- a/input/new/changing-form-of-multi--measure-rests.ly
+++ b/input/new/changing-form-of-multi--measure-rests.ly
@@ -1,4 +1,4 @@
-\version "2.11.42"
+\version "2.11.61"
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly
index 2e905d94fc..500417c7e8 100644
--- a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly
+++ b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.11.47"
+\version "2.11.61"
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
index 8477c1aee8..ebd3989a95 100644
--- a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
+++ b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
@@ -1,4 +1,4 @@
-\version "2.11.48"
+\version "2.11.61"
 \header {
   lsrtags = "rhythms,contexts-and-engravers"
   texidoc = "The @code{measureLength} property, together with
diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly
index 6f330de463..e37bf09df1 100644
--- a/input/new/clip-systems.ly
+++ b/input/new/clip-systems.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 \header {
   lsrtags = "paper-and-layout"  % a new tag like "Mixing text and music" or
 % "Special output" might be more adequate -jm
diff --git a/input/new/creating-simultaneous-rehearsal-marks.ly b/input/new/creating-simultaneous-rehearsal-marks.ly
index cbf8aa6fcd..a7f003d859 100644
--- a/input/new/creating-simultaneous-rehearsal-marks.ly
+++ b/input/new/creating-simultaneous-rehearsal-marks.ly
@@ -1,4 +1,4 @@
-\version "2.11.39"
+\version "2.11.61"
 \header {
   lsrtags = "expressive-marks,text,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/customizing-fretboard-fret-diagrams.ly b/input/new/customizing-fretboard-fret-diagrams.ly
index 1b9ab8f912..617aa79102 100644
--- a/input/new/customizing-fretboard-fret-diagrams.ly
+++ b/input/new/customizing-fretboard-fret-diagrams.ly
@@ -1,4 +1,4 @@
-\version "2.11.55"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
diff --git a/input/new/customizing-markup-fret-diagrams.ly b/input/new/customizing-markup-fret-diagrams.ly
index c170f847c4..af791b31d4 100644
--- a/input/new/customizing-markup-fret-diagrams.ly
+++ b/input/new/customizing-markup-fret-diagrams.ly
@@ -1,4 +1,4 @@
-\version "2.11.55"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
diff --git a/input/new/display-bracket-with-only-one-staff-in-a-system.ly b/input/new/display-bracket-with-only-one-staff-in-a-system.ly
index 01b0c53569..74b74811c2 100644
--- a/input/new/display-bracket-with-only-one-staff-in-a-system.ly
+++ b/input/new/display-bracket-with-only-one-staff-in-a-system.ly
@@ -1,4 +1,4 @@
-\version "2.11.38"
+\version "2.11.61"
 \header {
   lsrtags = "staff-notation,tweaks-and-overrides"
   texidoc = "If there is only one staff in one of the staff types
diff --git a/input/new/dotted-harmonics.ly b/input/new/dotted-harmonics.ly
index 760e54a639..83d112db3d 100644
--- a/input/new/dotted-harmonics.ly
+++ b/input/new/dotted-harmonics.ly
@@ -1,4 +1,4 @@
-\version "2.11.58"
+\version "2.11.61"
 
 \header {
   lsrtags = "unfretted-strings,tweaks-and-overrides"
diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly
index 25521bf7b5..eb655ab5a5 100644
--- a/input/new/drawing-boxes-around-grobs.ly
+++ b/input/new/drawing-boxes-around-grobs.ly
@@ -1,4 +1,4 @@
-\version "2.11.23"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly
index 8b8a09ee2d..a19e896c95 100644
--- a/input/new/drawing-circles-around-various-objects.ly
+++ b/input/new/drawing-circles-around-various-objects.ly
@@ -1,4 +1,4 @@
-\version "2.11.23"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/fine-tuning-pedal-brackets.ly b/input/new/fine-tuning-pedal-brackets.ly
index 327989148a..d492f5f536 100644
--- a/input/new/fine-tuning-pedal-brackets.ly
+++ b/input/new/fine-tuning-pedal-brackets.ly
@@ -1,4 +1,4 @@
-\version "2.11.59"
+\version "2.11.61"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
diff --git a/input/new/fret-diagrams-explained-and-developed.ly b/input/new/fret-diagrams-explained-and-developed.ly
index d8d408b7bd..38782818c2 100644
--- a/input/new/fret-diagrams-explained-and-developed.ly
+++ b/input/new/fret-diagrams-explained-and-developed.ly
@@ -1,4 +1,4 @@
-\version "2.11.53"
+\version "2.11.61"
 
 \header {
   lsrtags = "fretted-strings,tweaks-and-overrides"
diff --git a/input/new/incipit.ly b/input/new/incipit.ly
index 51d5cc54c0..eae5a9a948 100644
--- a/input/new/incipit.ly
+++ b/input/new/incipit.ly
@@ -1,4 +1,4 @@
-\version "2.11.39"
+\version "2.11.61"
 \header {
   lsrtags = "staff-notation,ancient-notation"
   texidoc = "Incipits can be added using the instrument name grob, but
diff --git a/input/new/inserting-a-caesura.ly b/input/new/inserting-a-caesura.ly
index df2ad1a115..58001e6b78 100644
--- a/input/new/inserting-a-caesura.ly
+++ b/input/new/inserting-a-caesura.ly
@@ -1,4 +1,4 @@
-\version "2.11.49"
+\version "2.11.61"
 \header {
   lsrtags = "expressive-marks,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly
index 5f2b267903..6b22d699c9 100644
--- a/input/new/letter-tablature-formatting.ly
+++ b/input/new/letter-tablature-formatting.ly
@@ -1,4 +1,4 @@
-\version "2.11.53"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation,fretted-strings"
diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly
index 72c347073d..365c61d8fe 100644
--- a/input/new/line-arrows.ly
+++ b/input/new/line-arrows.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 \header {
   lsrtags = "expressive-marks"
   texidoc = "Arrows can be applied to text-spanners and line-spanners
diff --git a/input/new/makam.ly b/input/new/makam.ly
index c4150ae30c..502a43132d 100644
--- a/input/new/makam.ly
+++ b/input/new/makam.ly
@@ -1,4 +1,4 @@
-\version "2.11.6"
+\version "2.11.61"
 \header {
   lsrtags = "pitches,world-music"
   texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
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 801955d2db..a2cea0921b 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,4 +1,4 @@
-\version "2.11.23"
+\version "2.11.61"
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly
index 26d0261e97..789461a05b 100644
--- a/input/new/markup-lines.ly
+++ b/input/new/markup-lines.ly
@@ -1,4 +1,4 @@
-\version "2.11.25"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/new/modern-tab-text-clef.ly b/input/new/modern-tab-text-clef.ly
index 6c8501de10..e30bda8183 100644
--- a/input/new/modern-tab-text-clef.ly
+++ b/input/new/modern-tab-text-clef.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 
 \header {
   lsrtags = "staff-notation, fretted-strings"
diff --git a/input/new/multi--measure-rest-markup.ly b/input/new/multi--measure-rest-markup.ly
index 6063a5f8f6..f75cf29724 100644
--- a/input/new/multi--measure-rest-markup.ly
+++ b/input/new/multi--measure-rest-markup.ly
@@ -1,4 +1,4 @@
-\version "2.11.58"
+\version "2.11.61"
 
 \header {
   lsrtags = "rhythms, text"
diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly
index 87a89cb4a0..81d7648240 100644
--- a/input/new/outputting-the-version-number.ly
+++ b/input/new/outputting-the-version-number.ly
@@ -1,4 +1,4 @@
-\version "2.11.23"
+\version "2.11.61"
 
 \header {
   lsrtags = "text"
diff --git a/input/new/page-label.ly b/input/new/page-label.ly
index 5c76862641..fed511bff2 100644
--- a/input/new/page-label.ly
+++ b/input/new/page-label.ly
@@ -1,4 +1,4 @@
-\version "2.11.26"
+\version "2.11.61"
 \header {
   lsrtags = "spacing"
   texidoc = "Page labels may be placed inside music or at top-level,
diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly
index ca93a44e05..cc88a79d7e 100644
--- a/input/new/piano-template-with-centered-dynamics.ly
+++ b/input/new/piano-template-with-centered-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.11.35"
+\version "2.11.61"
 
 \header {
   lsrtags = "expressive-marks,keyboards,template"
@@ -31,7 +31,7 @@ dynamics = {
 }
 
 pedal = {
-  s2\sustainDown s\sustainUp
+  s2\sustainOn s\sustainOff
 }
 
 \score {
diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly
index 8db3d1f66e..068d2e439c 100644
--- a/input/new/positioning-multi--measure-rests.ly
+++ b/input/new/positioning-multi--measure-rests.ly
@@ -1,4 +1,4 @@
-\version "2.11.42"
+\version "2.11.61"
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly
index 5e7ed7a07f..6d8383797f 100644
--- a/input/new/quoting-another-voice-with-transposition.ly
+++ b/input/new/quoting-another-voice-with-transposition.ly
@@ -1,4 +1,4 @@
-\version "2.11.57"
+\version "2.11.61"
 \header {
   lsrtags = "pitches,staff-notation"
   texidoc = "Quotations take into account the transposition of both
diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly
index f16395dd2e..b0e75a9d32 100644
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,4 +1,4 @@
-\version "2.11.10"
+\version "2.11.61"
 \header {
   lsrtags = "staff-notation"
   texidoc = "The @code{quotedEventTypes} property determines the
diff --git a/input/new/setting-hairpin-behavior-at-bar-lines.ly b/input/new/setting-hairpin-behavior-at-bar-lines.ly
index 6f53465a11..df17b780cf 100644
--- a/input/new/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly
@@ -1,4 +1,4 @@
-\version "2.11.46"
+\version "2.11.61"
 \header {
   lsrtags = "expressive-marks"
   texidoc = "If the note which ends a hairpin falls on a downbeat,
diff --git a/input/new/suppressing-warnings-for-clashing-note-columns.ly b/input/new/suppressing-warnings-for-clashing-note-columns.ly
index 77409ba82b..cc6c7c4bdc 100644
--- a/input/new/suppressing-warnings-for-clashing-note-columns.ly
+++ b/input/new/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,4 +1,4 @@
-\version "2.11.49"
+\version "2.11.61"
 \header {
   lsrtags = "simultaneous-notes,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly
index 2be389d4e0..1094712ec2 100644
--- a/input/new/table-of-contents.ly
+++ b/input/new/table-of-contents.ly
@@ -1,4 +1,4 @@
-\version "2.11.26"
+\version "2.11.61"
 \header {
   lsrtags = "paper-and-layout"
   texidoc = "A table of contents is included using
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 40bf9fb664..f83861f6be 100644
--- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,4 +1,4 @@
-\version "2.11.33"
+\version "2.11.61"
 \header {
   lsrtags = "pitches"
   texidoc = "This example uses some Scheme code to enforce enharmonic
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 75c8c59030..659a0bc60f 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,4 +1,4 @@
-\version "2.11.23"
+\version "2.11.61"
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly
index 84622caab1..31a423c680 100644
--- a/input/new/utf-8.ly
+++ b/input/new/utf-8.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
diff --git a/input/new/volta-below-chords.ly b/input/new/volta-below-chords.ly
index 8c4ad9d2a8..0fd41d1777 100644
--- a/input/new/volta-below-chords.ly
+++ b/input/new/volta-below-chords.ly
@@ -1,4 +1,4 @@
-\version "2.11.47"
+\version "2.11.61"
 \header {
   lsrtags = "repeats,staff-notation,chords"
   texidoc = "By adding the @code{Volta_engraver} to the relevant
diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly
index 5a56af1a43..33cb728a65 100644
--- a/input/new/volta-multi-staff.ly
+++ b/input/new/volta-multi-staff.ly
@@ -1,4 +1,4 @@
-\version "2.11.36"
+\version "2.11.61"
 \header {
   lsrtags = "repeats,staff-notation"
   texidoc = "By adding the @code{Volta_engraver} to the relevant
diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly
index 62dd38fbaf..8e8a34739f 100644
--- a/input/new/volta-text-markup-using-repeatcommands.ly
+++ b/input/new/volta-text-markup-using-repeatcommands.ly
@@ -1,4 +1,4 @@
-\version "2.11.48"
+\version "2.11.61"
 
 \header {
   lsrtags = "repeats"
diff --git a/input/proportional.ly b/input/proportional.ly
index fed31ed8e3..8f3d806ee7 100644
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 
 \header
 {
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index afcfc52bf9..790cc31b7d 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 \header {
     title	= "Puer natus est nobis"
     subtitle	= "Antiphona ad introitum VII"
@@ -17,7 +17,7 @@ ligature (not demonstrated in this example)."
 }
 
 #(set-global-staff-size 26)
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 
 %%% N.B.: Yes, I know, the formatting of the following looks awful,
 %%% but this is intentional for editorial purposes (simplifies some
diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly
index 926c9ffc62..eeb01cccb0 100644
--- a/input/regression/accidental-contemporary.ly
+++ b/input/regression/accidental-contemporary.ly
@@ -15,6 +15,10 @@ immediately repeated
 @item
 'neo-modern-cautionary style acts like neo-modern,
 adding cautionary parentheses around accidentals.
+@item
+'teaching prints accidentals normally, but adds
+cautionary accidentals when an accidental is
+already included in the key signature.
 @end itemize
 
 Both scores should show the same accidentals.
@@ -32,6 +36,9 @@ Both scores should show the same accidentals.
     gis8 a gis gis g' gis gis,, a'
     #(set-accidental-style 'neo-modern-cautionary)
     eis fis eis eis g2
+    #(set-accidental-style 'teaching)
+    \key e \major
+    e8 eis fis fis gis2
   }
 }
 
@@ -42,5 +49,7 @@ Both scores should show the same accidentals.
     gis!4 a! g! gisis!
     gis!8 a gis! gis g'! gis! gis,,! a'
     eis! fis! eis? eis g?2
+    \key e \major
+    e8 eis! fis? fis gis?2
   }
 }
diff --git a/input/regression/augmentum.ly b/input/regression/augmentum.ly
index a7592e495a..7abc308b5c 100644
--- a/input/regression/augmentum.ly
+++ b/input/regression/augmentum.ly
@@ -4,7 +4,7 @@
 
 \version "2.11.51"
 
-\include "gregorian-init.ly"
+\include "gregorian.ly"
 \score {
   \new VaticanaVoice {
     \[ \augmentum a \flexa \augmentum g \]
diff --git a/input/regression/line-style-zigzag-spacing.ly b/input/regression/line-style-zigzag-spacing.ly
new file mode 100644
index 0000000000..0d9368a664
--- /dev/null
+++ b/input/regression/line-style-zigzag-spacing.ly
@@ -0,0 +1,19 @@
+\version "2.11.57"
+
+\header {
+  texidoc = "Setting zigzag style for spanners does not cause
+spacing problems: in this example, the first text markup and
+zigzag trillspanner have the same outside staff positioning as
+the second markup and default trillspanner.
+"
+}
+
+\relative c' {
+  c1^"text"
+  \override TrillSpanner #'style = #'zigzag
+  c1\startTrillSpan
+  c2^\stopTrillSpan c^"text"
+  \revert TrillSpanner #'style
+  c1\startTrillSpan
+  c1^\stopTrillSpan
+}
diff --git a/input/sakura-sakura.ly b/input/sakura-sakura.ly
index 22b956e536..8bdcb2ebb5 100644
--- a/input/sakura-sakura.ly
+++ b/input/sakura-sakura.ly
@@ -1,6 +1,6 @@
 %% sakura-sakura.ly
 
-\version "2.11.51"
+\version "2.11.61"
 
 
 \header {
diff --git a/input/simple-song.ly b/input/simple-song.ly
index 74f48a75b7..654ca8f594 100644
--- a/input/simple-song.ly
+++ b/input/simple-song.ly
@@ -13,5 +13,5 @@
 >>
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.11.51"
+\version "2.11.61"
     
diff --git a/input/simple.ly b/input/simple.ly
index f701f7947f..cfa72542fa 100644
--- a/input/simple.ly
+++ b/input/simple.ly
@@ -4,4 +4,4 @@
 }
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
-\version "2.11.51"
+\version "2.11.61"
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index bb7d750deb..d320f821e5 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 \header{
   filename = "twinkle-pop.ly"
   composer = "traditional"
diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index 0c1488f46a..fbe31bb624 100644
--- a/input/typography-demo.ly
+++ b/input/typography-demo.ly
@@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.11.51"
+\version "2.11.61"
 
 ignoreMelisma =	\set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 3cd7cf698d..bd3eddc659 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.11.51"
+\version "2.11.61"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
diff --git a/input/xiao-haizi-guai-guai.ly b/input/xiao-haizi-guai-guai.ly
index 4185baa468..cae08f8ae8 100644
--- a/input/xiao-haizi-guai-guai.ly
+++ b/input/xiao-haizi-guai-guai.ly
@@ -4,7 +4,7 @@
 %%  hai2zi5: child,
 %%  guai1-guai1: well-behaved)
 
-\version "2.11.51"
+\version "2.11.61"
 
 \header {
   title = "小孩子乖乖"
diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index c662d77d9f..771ed69b59 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -111,13 +111,7 @@ Line_interface::make_zigzag_line (Grob *me,
       total.add_stencil (moved_squiggle);
     }
 
-  Box b;
-  b.add_point (Offset (0, 0));
-  b.add_point (dz);
-  b[X_AXIS].widen (thick / 2);
-  b[Y_AXIS].widen (thick / 2);
-
-  return Stencil (b, total.expr ());
+  return total;
 }
 
 
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 88fdfe1c03..661c7f8854 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -75,7 +75,7 @@ repeatTie = #(make-music 'RepeatTieEvent)
 		  
 \include "grace-init.ly"
 \include "midi-init.ly"
-\include "paper-defaults.ly"
+\include "paper-defaults-init.ly"
 
 \layout {
     mm = #(ly:output-def-lookup $defaultpaper 'mm)
diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
deleted file mode 100644
index 3a99d82f93..0000000000
--- a/ly/gregorian-init.ly
+++ /dev/null
@@ -1,315 +0,0 @@
-%{
-  Shortcuts common for all styles of gregorian chant notation.
-  $Id$
-%}
-
-\version "2.10.0"
-
-%
-% Declare memorable shortcuts for special unicode characters
-% that are used in chant notation.
-% 
-
-% unicode 0132 (latin capital ligature IJ)
-IJ = \lyricmode { IJ }
-IIJ = \lyricmode { IIJ }
-
-% unicode 0133 (latin small ligature ij)
-ij = \lyricmode { ij }
-iij = \lyricmode { iij }
-
-%
-% Given some music that represents lyrics, add a prefix to the first
-% lyric event.
-%
-% TODO: Robustify this function.  For example, this function works
-% correctly for "\versus { some lyrics }", but it barfs with a wrong type
-% argument error for e.g. "\versus some lyrics".
-%
-#(define (add-prefix-to-lyrics prefix music)
-   (make-music
-    'SequentialMusic
-    'elements (append
-	       (cons
-		(let* ((elems (car (ly:music-property music 'elements)))
-		       (props (ly:music-mutable-properties elems))
-		       (events (filter (lambda (x)
-					 (equal? (car x) 'elements))
-				       props))
-		       (first-evt (cadar events))
-		       (first-syllable (ly:prob-property first-evt 'text))
-		       (first-duration (ly:prob-property first-evt 'duration)))
-		  (make-music
-		   'LyricEvent
-		   'duration first-duration
-		   'text (string-append prefix first-syllable)))
-		(cdr (ly:music-property music 'elements))))))
-
-% Add unicode 2123 (versicle) as prefix to lyrics.
-versus =
-#(define-music-function (parser location music) (ly:music?)
-   (add-prefix-to-lyrics "℣" music))
-
-% Add unicode 211F (response) as prefix to lyrics.
-responsum =
-#(define-music-function (parser location music) (ly:music?)
-   (add-prefix-to-lyrics "℟" music))
-
-%
-% Declare head prefix shortcuts.
-%
-virga =
-  \once \override NoteHead  #'virga = ##t
-stropha =
-  \once \override NoteHead  #'stropha = ##t
-inclinatum =
-  \once \override NoteHead  #'inclinatum = ##t
-auctum =
-  \once \override NoteHead  #'auctum = ##t
-descendens =
-  \once \override NoteHead  #'descendens = ##t
-ascendens =
-  \once \override NoteHead  #'ascendens = ##t
-pes =
-  \once \override NoteHead  #'pes-or-flexa = ##t
-flexa =
-  \once \override NoteHead  #'pes-or-flexa = ##t
-oriscus =
-  \once \override NoteHead  #'oriscus = ##t
-quilisma =
-  \once \override NoteHead  #'quilisma = ##t
-deminutum =
-  \once \override NoteHead  #'deminutum = ##t
-linea =
-  \once \override NoteHead  #'linea = ##t
-cavum =
-  \once \override NoteHead  #'cavum = ##t
-
-%
-% Declare divisiones shortcuts.
-%
-virgula = {
-  \once \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rcomma")
-  \once \override BreathingSign  #'font-size = #-2
-
-  % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
-
-  \breathe
-}
-caesura = {
-  \once \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rvarcomma")
-  \once \override BreathingSign  #'font-size = #-2
-
-  % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
-
-  \breathe
-}
-divisioMinima = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-minima
-
-  % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
-
-  \breathe
-}
-divisioMaior = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maior
-  \once \override BreathingSign  #'Y-offset = #0
-
-  % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
-
-  \breathe
-}
-divisioMaxima = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maxima
-  \once \override BreathingSign  #'Y-offset = #0
-
-  % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
-
-  \breathe
-}
-finalis = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::finalis
-  \once \override BreathingSign  #'Y-offset = #0
-
-  % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
-
-  \breathe
-}
-
-%
-% Declare articulation shortcuts.
-%
-accentus = #(make-articulation "accentus")
-ictus = #(make-articulation "ictus")
-semicirculus = #(make-articulation "semicirculus")
-circulus = #(make-articulation "circulus")
-episemInitium = \startTextSpan
-episemFinis = \stopTextSpan
-
-%
-% \augmentum increases the dot-count value of all note heads to which
-% it is applied by one.
-%
-augmentum =
-#(define-music-function (parser location expr) (ly:music?)
-   (shift-duration-log expr 0 1))
-
-%
-% Declare shortcut music functions for Liber Hymnarius neumes
-% table (experimental).
-%
-
-#(define (make-ligature music)
-   (make-music 'SequentialMusic
-	       'elements (append
-			  (cons
-			   (make-music 'EventChord
-				       'elements (list
-						  (make-span-event 'LigatureEvent START)))
-			   (ly:music-property music 'elements))
-			  (list
-			   (make-music 'EventChord
-				       'elements (list
-						  (make-span-event 'LigatureEvent STOP)))))))
-
-ligature = #(define-music-function
-	      (location music) (ly:music?)
-	      (make-ligature music))
-
-%#(define (make-script x)
-%   (make-music 'ArticulationEvent
-%               'articulation-type x))
-%    
-%#(define (add-script m x)
-%   (if
-%     (equal? (ly:music-property m 'name) 'EventChord)
-%     (set! (ly:music-property m 'elements)
-%           (cons (make-script x)
-%                 (ly:music-property m 'elements))))
-%   m)
-%
-%#(define (add-staccato m)
-%   (add-script m "staccato"))
-%
-% % \applyMusic #(lambda (x) (music-map add-staccato x)) { c c }
-%
-% % \climacus { x y z ... }:
-% % \[ \virga x \inclinatum y \inclinatum z ... \]
-%
-%#(defmacro def-climacus-function (start stop)
-%  `(define-music-function (location music) (ly:music?)
-%     (make-music 'SequentialMusic
-%        'elements (list 'LigatureStartEvent
-%			(ly:music-deep-copy ,start)
-%                        music
-%                        (ly:music-deep-copy ,stop)
-%			'LigatureStopEvent))))
-%climacus = #(def-climacus-function startSequentialMusic stopSequentialMusic)
-
-%
-% Declare default layout; here for Vaticana style.  In case there will
-% be additional styles, we may want to create style-specific .ly files
-% for inclusion (e.g. vaticana-init.ly), move the style-dependent stuff
-% over there, leave the style-independent Gregorian stuff here, and let
-% the style-specific file (vaticana-init.ly) include this file.  The
-% user then will have to include vaticana-init.ly instead of
-% gregorian-init.ly.
-%
-\layout {
-    indent = 0.0
-    packed = ##t
-
-    %%% TODO: should raggedright be the default?
-    %ragged-right = ##t
-    ragged-last = ##t
-
-    %%% FIXME: line-thickness should be set here to a slightly
-    %%% thicker value as the default; but we can not set it here,
-    %%% since neither \staff-space nor #staff-space is yet defined
-    %%% when lily comes across the following line.
-    %line-thickness = \staff-space / 7.0
-
-    \context {
-	\VaticanaStaff
-	 \override StaffSymbol #'color = #red
-	 \override LedgerLineSpanner #'color = #red
-    }
-    \context {
-	\Score
-	\remove "Bar_number_engraver"
-
-	%%%
-	%%% FIXME: Musicologically seen, timing should be set to #f.
-	%%% Unfortunately, setting it to #f will result in no
-	%%% line-breakable items being created, such that the whole
-	%%% music will end up in a single line.  Therefore, we
-	%%% currently set it to #t, until the ligature code is fixed
-	%%% to automatically insert breakable items.
-	%%%
-	timing = ##t
-
-	%%%
-	%%% FIXME: Setting barAlways to #t would fix the above
-	%%% "timing = ##t" problem, but, surprisingly, it increases
-	%%% the space between ligatures.  Hence, we set it to #f.
-	%%%
-	barAlways = ##f
-
-	\override SpacingSpanner #'packed-spacing = ##t
-
-	%%%
-	%%% TODO: Play around with the following SpacingSpanner
-	%%% settings to yield better spacing between ligatures.
-	%%%
-	%%% FIXME: setting #'spacing-increment to a small value
-	%%% causes tons of "programming error: adding reverse spring,
-	%%% setting to unit" messages.
-	%%%
-	%\override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 4)
-	%\override SpacingSpanner #'shortest-duration-space = #0
-	%\override SpacingSpanner #'average-spacing-wishes = ##f
-	%\override SpacingSpanner #'spacing-increment = #0.0
-	%\override SpacingSpanner #'uniform-stretching = ##t
-    }
-}
-
-%
-% neumeDemoLayout defines a layout block suitable for notating pure
-% Vaticana style neumes without any other notation symbols such as
-% staff lines or clefs.  This layout is useful for engraving neumes
-% tables, such as that one in the lilypond manual section on
-% Gregorian ligatures, or for educational works.
-%
-neumeDemoLayout = \layout {
-    interscoreline = 1
-    \context {
-	\Score
-	\remove "Bar_number_engraver"
-    }
-    \context {
-	\Staff
-	\remove "Clef_engraver"
-	\remove "Key_engraver"
-	\override StaffSymbol #'transparent = ##t
-	\remove "Time_signature_engraver"
-	\remove "Bar_engraver"
-	\override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
-    \context {
-	\Voice
-	\remove Ligature_bracket_engraver
-	\consists Vaticana_ligature_engraver
-	\override NoteHead #'style = #'vaticana.punctum
-	\override Stem #'transparent = ##t
-    }
-}
-
-%%% Local Variables:
-%%% coding: utf-8
-%%% End:
diff --git a/ly/gregorian.ly b/ly/gregorian.ly
new file mode 100644
index 0000000000..3a99d82f93
--- /dev/null
+++ b/ly/gregorian.ly
@@ -0,0 +1,315 @@
+%{
+  Shortcuts common for all styles of gregorian chant notation.
+  $Id$
+%}
+
+\version "2.10.0"
+
+%
+% Declare memorable shortcuts for special unicode characters
+% that are used in chant notation.
+% 
+
+% unicode 0132 (latin capital ligature IJ)
+IJ = \lyricmode { IJ }
+IIJ = \lyricmode { IIJ }
+
+% unicode 0133 (latin small ligature ij)
+ij = \lyricmode { ij }
+iij = \lyricmode { iij }
+
+%
+% Given some music that represents lyrics, add a prefix to the first
+% lyric event.
+%
+% TODO: Robustify this function.  For example, this function works
+% correctly for "\versus { some lyrics }", but it barfs with a wrong type
+% argument error for e.g. "\versus some lyrics".
+%
+#(define (add-prefix-to-lyrics prefix music)
+   (make-music
+    'SequentialMusic
+    'elements (append
+	       (cons
+		(let* ((elems (car (ly:music-property music 'elements)))
+		       (props (ly:music-mutable-properties elems))
+		       (events (filter (lambda (x)
+					 (equal? (car x) 'elements))
+				       props))
+		       (first-evt (cadar events))
+		       (first-syllable (ly:prob-property first-evt 'text))
+		       (first-duration (ly:prob-property first-evt 'duration)))
+		  (make-music
+		   'LyricEvent
+		   'duration first-duration
+		   'text (string-append prefix first-syllable)))
+		(cdr (ly:music-property music 'elements))))))
+
+% Add unicode 2123 (versicle) as prefix to lyrics.
+versus =
+#(define-music-function (parser location music) (ly:music?)
+   (add-prefix-to-lyrics "℣" music))
+
+% Add unicode 211F (response) as prefix to lyrics.
+responsum =
+#(define-music-function (parser location music) (ly:music?)
+   (add-prefix-to-lyrics "℟" music))
+
+%
+% Declare head prefix shortcuts.
+%
+virga =
+  \once \override NoteHead  #'virga = ##t
+stropha =
+  \once \override NoteHead  #'stropha = ##t
+inclinatum =
+  \once \override NoteHead  #'inclinatum = ##t
+auctum =
+  \once \override NoteHead  #'auctum = ##t
+descendens =
+  \once \override NoteHead  #'descendens = ##t
+ascendens =
+  \once \override NoteHead  #'ascendens = ##t
+pes =
+  \once \override NoteHead  #'pes-or-flexa = ##t
+flexa =
+  \once \override NoteHead  #'pes-or-flexa = ##t
+oriscus =
+  \once \override NoteHead  #'oriscus = ##t
+quilisma =
+  \once \override NoteHead  #'quilisma = ##t
+deminutum =
+  \once \override NoteHead  #'deminutum = ##t
+linea =
+  \once \override NoteHead  #'linea = ##t
+cavum =
+  \once \override NoteHead  #'cavum = ##t
+
+%
+% Declare divisiones shortcuts.
+%
+virgula = {
+  \once \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rcomma")
+  \once \override BreathingSign  #'font-size = #-2
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
+  \breathe
+}
+caesura = {
+  \once \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rvarcomma")
+  \once \override BreathingSign  #'font-size = #-2
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
+  \breathe
+}
+divisioMinima = {
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-minima
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
+  \breathe
+}
+divisioMaior = {
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maior
+  \once \override BreathingSign  #'Y-offset = #0
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
+  \breathe
+}
+divisioMaxima = {
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maxima
+  \once \override BreathingSign  #'Y-offset = #0
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
+  \breathe
+}
+finalis = {
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::finalis
+  \once \override BreathingSign  #'Y-offset = #0
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
+  \breathe
+}
+
+%
+% Declare articulation shortcuts.
+%
+accentus = #(make-articulation "accentus")
+ictus = #(make-articulation "ictus")
+semicirculus = #(make-articulation "semicirculus")
+circulus = #(make-articulation "circulus")
+episemInitium = \startTextSpan
+episemFinis = \stopTextSpan
+
+%
+% \augmentum increases the dot-count value of all note heads to which
+% it is applied by one.
+%
+augmentum =
+#(define-music-function (parser location expr) (ly:music?)
+   (shift-duration-log expr 0 1))
+
+%
+% Declare shortcut music functions for Liber Hymnarius neumes
+% table (experimental).
+%
+
+#(define (make-ligature music)
+   (make-music 'SequentialMusic
+	       'elements (append
+			  (cons
+			   (make-music 'EventChord
+				       'elements (list
+						  (make-span-event 'LigatureEvent START)))
+			   (ly:music-property music 'elements))
+			  (list
+			   (make-music 'EventChord
+				       'elements (list
+						  (make-span-event 'LigatureEvent STOP)))))))
+
+ligature = #(define-music-function
+	      (location music) (ly:music?)
+	      (make-ligature music))
+
+%#(define (make-script x)
+%   (make-music 'ArticulationEvent
+%               'articulation-type x))
+%    
+%#(define (add-script m x)
+%   (if
+%     (equal? (ly:music-property m 'name) 'EventChord)
+%     (set! (ly:music-property m 'elements)
+%           (cons (make-script x)
+%                 (ly:music-property m 'elements))))
+%   m)
+%
+%#(define (add-staccato m)
+%   (add-script m "staccato"))
+%
+% % \applyMusic #(lambda (x) (music-map add-staccato x)) { c c }
+%
+% % \climacus { x y z ... }:
+% % \[ \virga x \inclinatum y \inclinatum z ... \]
+%
+%#(defmacro def-climacus-function (start stop)
+%  `(define-music-function (location music) (ly:music?)
+%     (make-music 'SequentialMusic
+%        'elements (list 'LigatureStartEvent
+%			(ly:music-deep-copy ,start)
+%                        music
+%                        (ly:music-deep-copy ,stop)
+%			'LigatureStopEvent))))
+%climacus = #(def-climacus-function startSequentialMusic stopSequentialMusic)
+
+%
+% Declare default layout; here for Vaticana style.  In case there will
+% be additional styles, we may want to create style-specific .ly files
+% for inclusion (e.g. vaticana-init.ly), move the style-dependent stuff
+% over there, leave the style-independent Gregorian stuff here, and let
+% the style-specific file (vaticana-init.ly) include this file.  The
+% user then will have to include vaticana-init.ly instead of
+% gregorian-init.ly.
+%
+\layout {
+    indent = 0.0
+    packed = ##t
+
+    %%% TODO: should raggedright be the default?
+    %ragged-right = ##t
+    ragged-last = ##t
+
+    %%% FIXME: line-thickness should be set here to a slightly
+    %%% thicker value as the default; but we can not set it here,
+    %%% since neither \staff-space nor #staff-space is yet defined
+    %%% when lily comes across the following line.
+    %line-thickness = \staff-space / 7.0
+
+    \context {
+	\VaticanaStaff
+	 \override StaffSymbol #'color = #red
+	 \override LedgerLineSpanner #'color = #red
+    }
+    \context {
+	\Score
+	\remove "Bar_number_engraver"
+
+	%%%
+	%%% FIXME: Musicologically seen, timing should be set to #f.
+	%%% Unfortunately, setting it to #f will result in no
+	%%% line-breakable items being created, such that the whole
+	%%% music will end up in a single line.  Therefore, we
+	%%% currently set it to #t, until the ligature code is fixed
+	%%% to automatically insert breakable items.
+	%%%
+	timing = ##t
+
+	%%%
+	%%% FIXME: Setting barAlways to #t would fix the above
+	%%% "timing = ##t" problem, but, surprisingly, it increases
+	%%% the space between ligatures.  Hence, we set it to #f.
+	%%%
+	barAlways = ##f
+
+	\override SpacingSpanner #'packed-spacing = ##t
+
+	%%%
+	%%% TODO: Play around with the following SpacingSpanner
+	%%% settings to yield better spacing between ligatures.
+	%%%
+	%%% FIXME: setting #'spacing-increment to a small value
+	%%% causes tons of "programming error: adding reverse spring,
+	%%% setting to unit" messages.
+	%%%
+	%\override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 4)
+	%\override SpacingSpanner #'shortest-duration-space = #0
+	%\override SpacingSpanner #'average-spacing-wishes = ##f
+	%\override SpacingSpanner #'spacing-increment = #0.0
+	%\override SpacingSpanner #'uniform-stretching = ##t
+    }
+}
+
+%
+% neumeDemoLayout defines a layout block suitable for notating pure
+% Vaticana style neumes without any other notation symbols such as
+% staff lines or clefs.  This layout is useful for engraving neumes
+% tables, such as that one in the lilypond manual section on
+% Gregorian ligatures, or for educational works.
+%
+neumeDemoLayout = \layout {
+    interscoreline = 1
+    \context {
+	\Score
+	\remove "Bar_number_engraver"
+    }
+    \context {
+	\Staff
+	\remove "Clef_engraver"
+	\remove "Key_engraver"
+	\override StaffSymbol #'transparent = ##t
+	\remove "Time_signature_engraver"
+	\remove "Bar_engraver"
+	\override VerticalAxisGroup #'minimum-Y-extent = ##f
+    }
+    \context {
+	\Voice
+	\remove Ligature_bracket_engraver
+	\consists Vaticana_ligature_engraver
+	\override NoteHead #'style = #'vaticana.punctum
+	\override Stem #'transparent = ##t
+    }
+}
+
+%%% Local Variables:
+%%% coding: utf-8
+%%% End:
diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
new file mode 100644
index 0000000000..67839f9c6c
--- /dev/null
+++ b/ly/paper-defaults-init.ly
@@ -0,0 +1,134 @@
+\version "2.11.11"
+#(use-modules (scm layout-page-layout))
+\paper {
+
+    %%%% WARNING
+
+    %%% if you  add any new dimensions, don't forget to update
+    %%% the dimension-variables variable. see paper.scm
+    
+    unit = #(ly:unit)
+    mm = 1.0
+    in = 25.4
+    pt = #(/  in 72.27)
+    cm = #(* 10 mm)
+
+    %% This is weird; `everyone' uses LATIN1?  How does I select TeX
+    %% input encoding in EMACS? -- jcn
+    %%%%input-encoding = #"TeX"
+    input-encoding = #"latin1"
+    print-page-number = ##t
+
+    %%
+    %% 20pt staff, 5 pt = 1.75 mm
+    %%
+
+    output-scale = #1.7573
+    
+    #(define-public book-title (marked-up-title 'bookTitleMarkup))
+    #(define-public score-title (marked-up-title 'scoreTitleMarkup))
+    #(define-public force-eps-font-include #f)
+    
+    %%
+    %% ugh. hard coded?
+    %%
+
+    #(layout-set-absolute-staff-size (* 20.0 pt))
+
+
+    #(define-public score-title-properties
+      '((is-title . #t)
+	(is-book-title . #f)
+	))
+    #(define-public book-title-properties
+      '((is-title . #t)
+	(is-book-title . #t)
+	))
+    
+    %%
+    %% this dimension includes the extent of the
+    %% staves themselves.
+    %%
+    between-system-space = #(* 20 mm)
+    
+    
+    %%
+    %% fixed space between systems.
+    %%
+    between-system-padding = #(* 4 mm)
+
+    after-title-space = 5 \mm
+    before-title-space = 10 \mm
+    between-title-space = 2 \mm
+
+
+    %%
+    %% Small staves are aligned so they come out on the same place on
+    %% across different pages.
+    %%
+    page-top-space = #(* 12 mm)
+
+    
+    ragged-bottom = ##f
+
+    %%
+    %% looks best for shorter scores.
+    %%
+    ragged-last-bottom= ##t
+
+    %%
+    %% settings for the page breaker
+    %%
+    blank-last-page-force = 0
+    blank-after-score-page-force = 2
+    blank-page-force = 5
+
+    %%
+    %% To limit space between systems on a page with a lot of space left
+    %%
+    page-limit-inter-system-space = ##f
+    page-limit-inter-system-space-factor = 1.4
+
+    #(define font-defaults
+      '((font-encoding . fetaMusic)))
+
+    %% use lmodern in latin1 (cork) flavour if EC is not available.
+    #(define text-font-defaults
+      `((font-encoding .
+	 ,(cond
+	   (tex-backend? 'Extended-TeX-Font-Encoding---Latin)
+	   (else 'latin1)))
+	;; add to taste here.
+	
+	(baseline-skip . 3)
+	(word-space . 0.6)))
+
+    #(define page-breaking ly:optimal-breaking)
+    #(define page-breaking-wrapper page-breaking-wrapper)
+    #(define page-post-process post-process-pages)
+
+    #(define write-page-layout (ly:get-option 'dump-tweaks))
+    #(define system-maximum-stretch-procedure
+       (lambda (line)
+	 (if (stretchable-line? line)
+	     (let ((height (line-height line)))
+	       (/ (* height height) 80.0))
+	     0.0)))
+
+%    #(define page-music-height default-page-music-height )
+%    #(define page-make-stencil default-page-make-stencil )
+
+    #(define make-header (marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup))
+    #(define make-footer (marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup))
+    #(set-paper-dimension-variables (current-module))
+
+    \include "titling-init.ly"
+
+    top-margin = 5 \mm
+    bottom-margin = 6 \mm
+    head-separation = 4 \mm
+    foot-separation = 4 \mm
+
+    first-page-number = #1
+    print-first-page-number =##f
+  }
diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
deleted file mode 100644
index 67839f9c6c..0000000000
--- a/ly/paper-defaults.ly
+++ /dev/null
@@ -1,134 +0,0 @@
-\version "2.11.11"
-#(use-modules (scm layout-page-layout))
-\paper {
-
-    %%%% WARNING
-
-    %%% if you  add any new dimensions, don't forget to update
-    %%% the dimension-variables variable. see paper.scm
-    
-    unit = #(ly:unit)
-    mm = 1.0
-    in = 25.4
-    pt = #(/  in 72.27)
-    cm = #(* 10 mm)
-
-    %% This is weird; `everyone' uses LATIN1?  How does I select TeX
-    %% input encoding in EMACS? -- jcn
-    %%%%input-encoding = #"TeX"
-    input-encoding = #"latin1"
-    print-page-number = ##t
-
-    %%
-    %% 20pt staff, 5 pt = 1.75 mm
-    %%
-
-    output-scale = #1.7573
-    
-    #(define-public book-title (marked-up-title 'bookTitleMarkup))
-    #(define-public score-title (marked-up-title 'scoreTitleMarkup))
-    #(define-public force-eps-font-include #f)
-    
-    %%
-    %% ugh. hard coded?
-    %%
-
-    #(layout-set-absolute-staff-size (* 20.0 pt))
-
-
-    #(define-public score-title-properties
-      '((is-title . #t)
-	(is-book-title . #f)
-	))
-    #(define-public book-title-properties
-      '((is-title . #t)
-	(is-book-title . #t)
-	))
-    
-    %%
-    %% this dimension includes the extent of the
-    %% staves themselves.
-    %%
-    between-system-space = #(* 20 mm)
-    
-    
-    %%
-    %% fixed space between systems.
-    %%
-    between-system-padding = #(* 4 mm)
-
-    after-title-space = 5 \mm
-    before-title-space = 10 \mm
-    between-title-space = 2 \mm
-
-
-    %%
-    %% Small staves are aligned so they come out on the same place on
-    %% across different pages.
-    %%
-    page-top-space = #(* 12 mm)
-
-    
-    ragged-bottom = ##f
-
-    %%
-    %% looks best for shorter scores.
-    %%
-    ragged-last-bottom= ##t
-
-    %%
-    %% settings for the page breaker
-    %%
-    blank-last-page-force = 0
-    blank-after-score-page-force = 2
-    blank-page-force = 5
-
-    %%
-    %% To limit space between systems on a page with a lot of space left
-    %%
-    page-limit-inter-system-space = ##f
-    page-limit-inter-system-space-factor = 1.4
-
-    #(define font-defaults
-      '((font-encoding . fetaMusic)))
-
-    %% use lmodern in latin1 (cork) flavour if EC is not available.
-    #(define text-font-defaults
-      `((font-encoding .
-	 ,(cond
-	   (tex-backend? 'Extended-TeX-Font-Encoding---Latin)
-	   (else 'latin1)))
-	;; add to taste here.
-	
-	(baseline-skip . 3)
-	(word-space . 0.6)))
-
-    #(define page-breaking ly:optimal-breaking)
-    #(define page-breaking-wrapper page-breaking-wrapper)
-    #(define page-post-process post-process-pages)
-
-    #(define write-page-layout (ly:get-option 'dump-tweaks))
-    #(define system-maximum-stretch-procedure
-       (lambda (line)
-	 (if (stretchable-line? line)
-	     (let ((height (line-height line)))
-	       (/ (* height height) 80.0))
-	     0.0)))
-
-%    #(define page-music-height default-page-music-height )
-%    #(define page-make-stencil default-page-make-stencil )
-
-    #(define make-header (marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup))
-    #(define make-footer (marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup))
-    #(set-paper-dimension-variables (current-module))
-
-    \include "titling-init.ly"
-
-    top-margin = 5 \mm
-    bottom-margin = 6 \mm
-    head-separation = 4 \mm
-    foot-separation = 4 \mm
-
-    first-page-number = #1
-    print-first-page-number =##f
-  }
diff --git a/python/convertrules.py b/python/convertrules.py
index 41bfafc958..0373f10915 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2812,6 +2812,11 @@ def conv (str):
     str = re.sub (r"printallheaders", r"print-all-headers", str)
     return str
 
+@rule ((2, 11, 61), "gregorian-init.ly -> gregorian.ly")
+def conv (str):
+    str = re.sub (r'\\include(\s+)"gregorian-init.ly"', r'\\include\1"gregorian.ly"', str)
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,
diff --git a/python/lilylib.py b/python/lilylib.py
index f9cbff2c60..27dd98deab 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -68,6 +68,14 @@ def stderr_write (s):
 
 progress = stderr_write
 
+def require_python_version ():
+    if sys.hexversion < 0x02040000:
+        stderr_write ("Python 2.4 or newer is required to run this program.\n\
+Please upgrade Python from http://python.org/download/, and if you use MacOS X,\n\
+please read 'Setup for MacOS X' in Application Usage.")
+        os.system ("open http://python.org/download/")
+        sys.exit (2)
+
 # Modified version of the commands.mkarg(x), which always uses 
 # double quotes (since Windows can't handle the single quotes:
 def mkarg(x):
diff --git a/scm/lily.scm b/scm/lily.scm
index 2cca01ddcb..8344f80a8e 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -20,7 +20,7 @@
 (define-public PLATFORM
   (string->symbol
    (string-downcase
-    (utsname:sysname (uname)))))
+    (car (string-tokenize (utsname:sysname (uname)))))))
 
 (define scheme-options-definitions
   `(
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 0344e4bf58..490cafe92c 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -974,6 +974,23 @@ if appropriate.
 	  (cons #f (not (or (equal? acc key-acc)
 			    (and (equal? entrybn barnum) (equal? entrymp measurepos)))))))))
 
+(define-public (teaching-accidental-rule context pitch barnum measurepos)
+  "an accidental rule that typesets a cautionary accidental
+  if it is included in the key signature AND does not directly follow
+  a note on the same staff-line."
+  (let* ((keysig (ly:context-property context 'localKeySignature))
+	 (entry (find-pitch-entry keysig pitch #t #t)))
+    (if (equal? #f entry)
+	(cons #f #f)
+	(let* ((global-entry (find-pitch-entry keysig pitch #f #f))
+	       (key-acc (if (equal? global-entry #f)
+			    0
+			    (key-entry-alteration global-entry)))
+	       (acc (ly:pitch-alteration pitch))
+	       (entrymp (key-entry-measure-position entry))
+	       (entrybn (key-entry-bar-number entry)))
+	  (cons #f (not (or (equal? acc key-acc)
+			    (and (equal? entrybn barnum) (equal? entrymp measurepos)))))))))
 
 (define-public (set-accidentals-properties extra-natural
 					   auto-accs auto-cauts
@@ -1095,6 +1112,15 @@ use GrandStaff as a context. "
 				           ,(make-accidental-rule 'any-octave 0)
 					   ,(make-accidental-rule 'same-octave 1))
 				   pcontext))
+
+      ;; same as modern, but cautionary accidentals are printed for all sharp or flat
+      ;; tones specified by the key signature.  
+       ((equal? style 'teaching)
+       (set-accidentals-properties #f
+				    `(Staff ,(make-accidental-rule 'same-octave 0))
+				    `(Staff ,(make-accidental-rule 'same-octave 1)
+				           ,teaching-accidental-rule)
+				   context))
       
       ;; do not set localKeySignature when a note alterated differently from
       ;; localKeySignature is found.
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9bc0a14005..7affd1bd25 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -21,6 +21,8 @@ import re
 import lilylib as ly
 global _;_=ly._
 
+ly.require_python_version ()
+
 import convertrules
 
 lilypond_version_re_str = '\\\\version *\"([0-9.]+)"'
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 09fecd1540..be9fef694a 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -45,6 +45,7 @@ import fontextract
 import langdefs
 global _;_=ly._
 
+ly.require_python_version ()
 
 # Lilylib globals.
 program_version = '@TOPLEVEL_VERSION@'