Run update-with-convert-ly

28 files changed, 315 insertions, 315 deletions

diff --git a/Documentation/de/extending/programming-interface.itely b/Documentation/de/extending/programming-interface.itely
index 257ec972a6..32b49ab2ad 100644
--- a/Documentation/de/extending/programming-interface.itely
+++ b/Documentation/de/extending/programming-interface.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @c Translators: Till Paala
 
@@ -771,7 +771,7 @@ Zuletzt wird die Beschriftungsliste ausgewertet durch die
 Dieser neue Beschriftungslistenbefehl kann wie folgt benutzt werden:
 
 @example
-\markuplines @{
+\markuplist @{
   \paragraph @{
     Die Kunst des Notensatzes wird auch als \italic @{Notenstich@} bezeichnet. Dieser
     Begriff stammt aus dem traditionellen Notendruck. Noch bis vor etwa
diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely
index 7ab810733c..eb516d6716 100644
--- a/Documentation/de/notation/input.itely
+++ b/Documentation/de/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @c Translators: Till Paala
 
@@ -934,14 +934,14 @@ bestimmt.  Wenn eine Partitur zwischen 10 und 99 Seiten hat, kann man
 @translationof Table of contents
 
 Ein Inhaltsverzeichnis kann eingefügt werden mit dem Befehl
-@code{\markuplines \table-of-contents}.  Die Elemente, die im
+@code{\markuplist \table-of-contents}.  Die Elemente, die im
 Inhaltsverzeichnis aufgelistet werden sollen, werden mit dem
 @code{\tocItem}-Befehl markiert, welches sowohl auf höchster
 Ebene als auch in einem musikalischen Ausdruck verwendet werden
 kann.
 
 @verbatim
-\markuplines \table-of-contents
+\markuplist \table-of-contents
 \pageBreak
 
 \tocItem \markup "Erste Partitur"
@@ -1033,7 +1033,7 @@ tocAct =
    (add-toc-item! 'tocActMarkup text))
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocAct \markup { Atto Primo }
   \tocItem \markup { Coro. Viva il nostro Alcide }
   \tocItem \markup { Cesare. Presti omai l'Egizzia terra }
@@ -1054,7 +1054,7 @@ Linie gefüllt werden:
 }
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocItem \markup { Allegro }
   \tocItem \markup { Largo }
   \markup \null
diff --git a/Documentation/de/notation/notation-appendices.itely b/Documentation/de/notation/notation-appendices.itely
index 5b4e05ac72..4dad94f90d 100644
--- a/Documentation/de/notation/notation-appendices.itely
+++ b/Documentation/de/notation/notation-appendices.itely
@@ -10,7 +10,7 @@
 
 @c Translators: Till Paala
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Notationsübersicht
 @appendix Notationsübersicht
@@ -654,8 +654,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #clefs
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #clefs
 @end lilypond
 
 
@@ -666,8 +666,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #timesig
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #timesig
 @end lilypond
 
 
@@ -677,8 +677,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #numbers
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #numbers
 @end lilypond
 
 
@@ -688,8 +688,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accidentals
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accidentals
 @end lilypond
 
 
@@ -699,8 +699,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #default-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #default-noteheads
 @end lilypond
 
 
@@ -710,8 +710,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #special-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #special-noteheads
 @end lilypond
 
 
@@ -721,8 +721,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #shape-note-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #shape-note-noteheads
 @end lilypond
 
 
@@ -732,8 +732,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #rests
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #rests
 @end lilypond
 
 
@@ -743,8 +743,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #flags
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #flags
 @end lilypond
 
 
@@ -754,8 +754,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dots
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dots
 @end lilypond
 
 
@@ -765,8 +765,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dynamics
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dynamics
 @end lilypond
 
 
@@ -775,8 +775,8 @@ zu (bspw. @code{g^\markup @{
 @translationof Script glyphs
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #scripts
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #scripts
 @end lilypond
 
 
@@ -786,8 +786,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #arrowheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #arrowheads
 @end lilypond
 
 
@@ -797,8 +797,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #brackettips
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #brackettips
 @end lilypond
 
 
@@ -808,8 +808,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #pedal
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #pedal
 @end lilypond
 
 
@@ -819,8 +819,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accordion
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accordion
 @end lilypond
 
 
@@ -830,8 +830,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #vaticana
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #vaticana
 @end lilypond
 
 
@@ -841,8 +841,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #medicaea
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #medicaea
 @end lilypond
 
 
@@ -852,8 +852,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #hufnagel
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #hufnagel
 @end lilypond
 
 
@@ -863,8 +863,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #mensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #mensural
 @end lilypond
 
 
@@ -874,8 +874,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #neomensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #neomensural
 @end lilypond
 
 
@@ -885,8 +885,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #petrucci
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #petrucci
 @end lilypond
 
 
@@ -896,8 +896,8 @@ zu (bspw. @code{g^\markup @{
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #solesmes
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #solesmes
 @end lilypond
 
 
@@ -927,7 +927,7 @@ Folgende Stile können zur Darstellung der Notenköpfe verwendet werden:
 @appendixsec Textbeschriftungslistenbefehle
 @translationof Text markup list commands
 
-Folgende Befehle können mit dem Befehl @code{\markuplines} zusammen
+Folgende Befehle können mit dem Befehl @code{\markuplist} zusammen
 benutzt werden:
 
 @include markup-list-commands.tely
diff --git a/Documentation/de/notation/text.itely b/Documentation/de/notation/text.itely
index 27bda76774..cde9ad583e 100644
--- a/Documentation/de/notation/text.itely
+++ b/Documentation/de/notation/text.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @c Translators: Till Paala
 
@@ -380,14 +380,14 @@ dass man Textdokumente oder Bücher ausschließlich mit LilyPond
 setzen kann.  Einzelheiten zu den vielfältigen Möglichkeiten finden
 sich in @ref{Textbeschriftung über mehrere Seiten}.
 
-@funindex \markuplines
+@funindex \markuplist
 @funindex \markup
-@funindex markuplines
+@funindex markuplist
 @funindex markup
 
 @predefined
 @code{\markup},
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
@@ -1341,8 +1341,8 @@ Installierte Dateien:
 @cindex Text über mehrere Seiten
 @cindex mehrseitiger Text
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines
@@ -1353,7 +1353,7 @@ einer spezifischen Umgebung ist es möglich, Text auch über mehrere Seiten
 fließen zu lassen:
 
 @lilypond[quote,verbatim]
-\markuplines {
+\markuplist {
   \justified-lines {
     A very long text of justified lines.
     ...
@@ -1396,11 +1396,11 @@ Referenz der Interna:
 Installierte Dateien:
 @file{scm/define-markup-commands.scm}.
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
diff --git a/Documentation/es/extending/programming-interface.itely b/Documentation/es/extending/programming-interface.itely
index 7c3666643f..0a5336b488 100644
--- a/Documentation/es/extending/programming-interface.itely
+++ b/Documentation/es/extending/programming-interface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Interfaces para programadores
 @chapter Interfaces para programadores
@@ -1001,7 +1001,7 @@ del argumento @code{props}.
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
    #:properties ((par-indent 2))
    (interpret-markup-list layout props
-     #@{\markuplines \justified-lines @{ \hspace #$par-indent $args @} #@}))
+     #@{\markuplist \justified-lines @{ \hspace #$par-indent $args @} #@}))
 @end example
 
 
@@ -1033,7 +1033,7 @@ interpreta usando la función @code{interpret-markup-list}.
 Esta nueva instrucción de lista de marcados se puede usar como sigue:
 
 @example
-\markuplines @{
+\markuplist @{
   \paragraph @{
     El arte de la tipografía musical se llama  \italic @{grabado (en plancha).@}
     El término deriva del proceso tradicional de impresión de música.
diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely
index fcffa2574e..e27129348b 100644
--- a/Documentation/es/notation/input.itely
+++ b/Documentation/es/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Entrada y salida generales
 @chapter Entrada y salida generales
@@ -1118,13 +1118,13 @@ dígitos.
 @translationof Table of contents
 
 Se puede insertar un índice general o tabla de contenidos utilizando
-la instrucción @code{\markuplines \table-of-contents}.  Los elementos
+la instrucción @code{\markuplist \table-of-contents}.  Los elementos
 que deben aparecer en la tabla de contenidos se introducen con la
 instrucción @code{\tocItem}, que se puede usar en el nivel más alto de
 la jerarquía del código, o dentro de una expresión musical.
 
 @verbatim
-\markuplines \table-of-contents
+\markuplist \table-of-contents
 \pageBreak
 
 \tocItem \markup "Primera partitura"
@@ -1209,7 +1209,7 @@ tocAct =
    (add-toc-item! 'tocActMarkup text))
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocAct \markup { Atto Primo }
   \tocItem \markup { Coro. Viva il nostro Alcide }
   \tocItem \markup { Cesare. Presti omai l'Egizzia terra }
@@ -1229,7 +1229,7 @@ Se pueden añadir puntos de relleno entre un elemento y su número de página:
 }
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocItem \markup { Allegro }
   \tocItem \markup { Largo }
   \markup \null
diff --git a/Documentation/es/notation/notation-appendices.itely b/Documentation/es/notation/notation-appendices.itely
index d81adc5529..6d6df37904 100644
--- a/Documentation/es/notation/notation-appendices.itely
+++ b/Documentation/es/notation/notation-appendices.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Tablas del manual sobre notación
 @appendix Tablas del manual sobre notación
@@ -657,8 +657,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #clefs
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #clefs
 @end lilypond
 
 
@@ -668,8 +668,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #timesig
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #timesig
 @end lilypond
 
 
@@ -679,8 +679,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #numbers
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #numbers
 @end lilypond
 
 
@@ -690,8 +690,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accidentals
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accidentals
 @end lilypond
 
 
@@ -701,8 +701,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #default-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #default-noteheads
 @end lilypond
 
 
@@ -712,8 +712,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #special-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #special-noteheads
 @end lilypond
 
 
@@ -723,8 +723,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #shape-note-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #shape-note-noteheads
 @end lilypond
 
 
@@ -734,8 +734,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #rests
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #rests
 @end lilypond
 
 
@@ -745,8 +745,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #flags
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #flags
 @end lilypond
 
 
@@ -756,8 +756,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dots
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dots
 @end lilypond
 
 
@@ -767,8 +767,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dynamics
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dynamics
 @end lilypond
 
 
@@ -778,8 +778,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #scripts
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #scripts
 @end lilypond
 
 
@@ -789,8 +789,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #arrowheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #arrowheads
 @end lilypond
 
 
@@ -800,8 +800,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #brackettips
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #brackettips
 @end lilypond
 
 
@@ -811,8 +811,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #pedal
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #pedal
 @end lilypond
 
 
@@ -822,8 +822,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accordion
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accordion
 @end lilypond
 
 
@@ -833,8 +833,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #ties
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #ties
 @end lilypond
 
 @node Glifos de vaticana
@@ -843,8 +843,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #vaticana
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #vaticana
 @end lilypond
 
 
@@ -854,8 +854,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #medicaea
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #medicaea
 @end lilypond
 
 
@@ -865,8 +865,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #hufnagel
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #hufnagel
 @end lilypond
 
 
@@ -876,8 +876,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #mensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #mensural
 @end lilypond
 
 
@@ -887,8 +887,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #neomensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #neomensural
 @end lilypond
 
 
@@ -898,8 +898,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #petrucci
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #petrucci
 @end lilypond
 
 
@@ -909,8 +909,8 @@ consulte @ref{Formatear el texto}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #solesmes
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #solesmes
 @end lilypond
 
 
@@ -936,7 +936,7 @@ Se pueden usar los siguientes estilos para las cabezas de las notas.
 @translationof Text markup list commands
 
 Se puede usar cualquiera de las siguientes instrucciones con
-@code{\markuplines}:
+@code{\markuplist}:
 
 @include markup-list-commands.tely
 
diff --git a/Documentation/es/notation/text.itely b/Documentation/es/notation/text.itely
index 80faad40f6..fcf4e6b1e6 100644
--- a/Documentation/es/notation/text.itely
+++ b/Documentation/es/notation/text.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Texto
 @section Texto
@@ -367,12 +367,12 @@ requiere se describen en @ref{Elementos de marcado de varias páginas}.
 
 @funindex \markup
 @funindex markup
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
 @code{\markup},
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
@@ -1322,8 +1322,8 @@ Archivos de inicio:
 @cindex marcado, texto de, varias páginas
 @cindex texto que ocupa varias páginas
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines
@@ -1335,7 +1335,7 @@ que pueden abarcar varias páginas:
 
 @c KEEP LY
 @lilypond[quote,verbatim]
-\markuplines {
+\markuplist {
   \justified-lines {
     Un texto muy largo de líneas justificadas.
     ...
@@ -1379,11 +1379,11 @@ Archivos de inicio:
 @file{scm/define-markup-commands.scm}.
 
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
diff --git a/Documentation/extending/programming-interface.itely b/Documentation/extending/programming-interface.itely
index a24dd4a1c2..87430c6a19 100644
--- a/Documentation/extending/programming-interface.itely
+++ b/Documentation/extending/programming-interface.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Interfaces for programmers
 @chapter Interfaces for programmers
@@ -953,7 +953,7 @@ indented.  The indent width is taken from the @code{props} argument.
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
    #:properties ((par-indent 2))
    (interpret-markup-list layout props
-     #@{\markuplines \justified-lines @{ \hspace #$par-indent $args @} #@}))
+     #@{\markuplist \justified-lines @{ \hspace #$par-indent $args @} #@}))
 @end example
 
 
@@ -982,7 +982,7 @@ interpreted using the @code{interpret-markup-list} function.
 
 This new markup list command can be used as follows:
 @example
-\markuplines @{
+\markuplist @{
   \paragraph @{
     The art of music typography is called \italic @{(plate) engraving.@}
     The term derives from the traditional process of music printing.
diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely
index f68687a274..55146ac588 100644
--- a/Documentation/fr/notation/input.itely
+++ b/Documentation/fr/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @c Translators: Jean-Charles Malahieude, Valentin Villenave
 
@@ -1158,13 +1158,13 @@ emporte-pièce sur deux caractères -- soit @code{"00"}.
 @subsection Table des matières
 @translationof Table of contents
 
-La commande @code{\markuplines \table-of-contents} vous permettra de
+La commande @code{\markuplist \table-of-contents} vous permettra de
 générer une table des matières.  Les éléments qui la composeront sont
 créés par la commande @code{\tocItem}, insérée indépendamment ou au sein
 d'une expression musicale.
 
 @verbatim
-\markuplines \table-of-contents
+\markuplist \table-of-contents
 \pageBreak
 
 \tocItem \markup "Premier mouvement"
@@ -1253,7 +1253,7 @@ tocAct =
    (add-toc-item! 'tocActMarkup text))
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocAct \markup { Atto Primo }
   \tocItem \markup { Coro. Viva il nostro Alcide }
   \tocItem \markup { Cesare. Presti omai l'Egizzia terra }
@@ -1274,7 +1274,7 @@ pointillée@tie{}:
 }
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocItem \markup { Allegro }
   \tocItem \markup { Largo }
   \markup \null
diff --git a/Documentation/fr/notation/notation-appendices.itely b/Documentation/fr/notation/notation-appendices.itely
index 7fa677c743..6bce4787ca 100644
--- a/Documentation/fr/notation/notation-appendices.itely
+++ b/Documentation/fr/notation/notation-appendices.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 
@@ -639,8 +639,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #clefs
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #clefs
 @end lilypond
 
 
@@ -650,8 +650,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #timesig
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #timesig
 @end lilypond
 
 
@@ -661,8 +661,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #numbers
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #numbers
 @end lilypond
 
 
@@ -672,8 +672,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accidentals
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accidentals
 @end lilypond
 
 
@@ -683,8 +683,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #default-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #default-noteheads
 @end lilypond
 
 
@@ -694,8 +694,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #special-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #special-noteheads
 @end lilypond
 
 
@@ -705,8 +705,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #shape-note-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #shape-note-noteheads
 @end lilypond
 
 
@@ -716,8 +716,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #rests
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #rests
 @end lilypond
 
 
@@ -727,8 +727,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #flags
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #flags
 @end lilypond
 
 
@@ -738,8 +738,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dots
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dots
 @end lilypond
 
 
@@ -749,8 +749,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dynamics
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dynamics
 @end lilypond
 
 
@@ -760,8 +760,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #scripts
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #scripts
 @end lilypond
 
 
@@ -771,8 +771,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #arrowheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #arrowheads
 @end lilypond
 
 
@@ -782,8 +782,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #brackettips
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #brackettips
 @end lilypond
 
 
@@ -793,8 +793,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #pedal
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #pedal
 @end lilypond
 
 
@@ -804,8 +804,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accordion
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accordion
 @end lilypond
 
 
@@ -814,8 +814,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #ties
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #ties
 @end lilypond
 
 
@@ -825,8 +825,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #vaticana
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #vaticana
 @end lilypond
 
 
@@ -836,8 +836,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #medicaea
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #medicaea
 @end lilypond
 
 
@@ -847,8 +847,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #hufnagel
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #hufnagel
 @end lilypond
 
 
@@ -858,8 +858,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #mensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #mensural
 @end lilypond
 
 
@@ -869,8 +869,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #neomensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #neomensural
 @end lilypond
 
 
@@ -880,8 +880,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #petrucci
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #petrucci
 @end lilypond
 
 
@@ -891,8 +891,8 @@ informations, reportez-vous au chapitre @ref{Mise en forme du texte}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #solesmes
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #solesmes
 @end lilypond
 
 
@@ -920,7 +920,7 @@ Les commandes suivantes peuvent être utilisées dans un bloc
 @translationof Text markup list commands
 
 Les commandes suivantes peuvent être utilisées dans un
-bloc @code{\markuplines @{ @}}.
+bloc @code{\markuplist @{ @}}.
 
 @include markup-list-commands.tely
 
diff --git a/Documentation/fr/notation/text.itely b/Documentation/fr/notation/text.itely
index c18d491c32..368649a803 100644
--- a/Documentation/fr/notation/text.itely
+++ b/Documentation/fr/notation/text.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @c Translators: Jean-Charles Malahieude
 @c Translation checkers: Valentin Villenave, John Mandereau
@@ -372,12 +372,12 @@ détail au chapitre @ref{Texte avec sauts de page}.
 
 @funindex \markup
 @funindex markup
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
 @code{\markup},
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
@@ -1334,21 +1334,21 @@ Fichiers d'initialisation :
 @cindex markup, texte multi-page
 @cindex plusieurs pages de texte
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines
 @funindex wordwrap-lines
 
 Alors que @code{\markup} s'utilise pour traiter un bloc de texte
-insécable, @code{\markuplines} permet, employé en tête de partition,
+insécable, @code{\markuplist} permet, employé en tête de partition,
 d'obtenir un bloc de lignes réparties différemment et, le cas échéant,
 sur plusieurs pages.
 
 @c KEEP LY
 @lilypond[quote,verbatim]
-\markuplines {
+\markuplist {
   \justified-lines {
     Un long texte constitué de lignes justifiées.
     ...
@@ -1394,11 +1394,11 @@ Fichiers d'initialisation :
 @file{scm/define-markup-commands.scm}.
 
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
diff --git a/Documentation/included/special-characters.ly b/Documentation/included/special-characters.ly
index 7c6f2728bf..447e2c8a4f 100644
--- a/Documentation/included/special-characters.ly
+++ b/Documentation/included/special-characters.ly
@@ -1,4 +1,4 @@
-\version "2.15.13"
+\version "2.15.17"
 
 #(set-default-paper-size "a4")
 \paper {
@@ -15,4 +15,4 @@
                      #:override '(thickness . 0.1) #:box (cdr pair))))
             (list-tail (assoc-get 'replacement-alist defs) 3)))))
 
-\markuplines \justified-lines \show-special-characters
+\markuplist \justified-lines \show-special-characters
diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely
index b530ab8cfa..bf28780d6b 100644
--- a/Documentation/ja/notation/input.itely
+++ b/Documentation/ja/notation/input.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 
 @c Translators: Yoshiki Sawada
@@ -1189,12 +1189,12 @@ book のページ数が 10 から 99 までの範囲であるのなら、ゲー�
 @subsection 目次
 @translationof Table of contents
 
-目次は @code{\markuplines \table-of-contents} コマンドを用いて挿入します。@c
+目次は @code{\markuplist \table-of-contents} コマンドを用いて挿入します。@c
 目次に表示すべき要素は @code{\tocItem} コマンドで挿入されます
 -- このコマンドは最上位あるいは音楽表記の内部で使用します。
 
 @verbatim
-\markuplines \table-of-contents
+\markuplist \table-of-contents
 \pageBreak
 
 \tocItem \markup "First score"
@@ -1280,7 +1280,7 @@ tocAct =
    (add-toc-item! 'tocActMarkup text))
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocAct \markup { Atto Primo }
   \tocItem \markup { Coro. Viva il nostro Alcide }
   \tocItem \markup { Cesare. Presti omai l'Egizzia terra }
@@ -1300,7 +1300,7 @@ tocAct =
 }
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocItem \markup { Allegro }
   \tocItem \markup { Largo }
   \markup \null
diff --git a/Documentation/ja/notation/text.itely b/Documentation/ja/notation/text.itely
index aa1d7e54c2..e060c49355 100644
--- a/Documentation/ja/notation/text.itely
+++ b/Documentation/ja/notation/text.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 
 @c Translators: Yoshiki Sawada
@@ -369,12 +369,12 @@ c  c
 
 @funindex \markup
 @funindex markup
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
 @code{\markup},
-@code{\markuplines}
+@code{\markuplist}
 @endpredefined
 
 
@@ -1322,8 +1322,8 @@ c d e f
 @cindex markup text, multi-page (複数ページにわたるマークアップ テキスト)
 @cindex text spread over multiple pages (複数ページに広がるテキスト)
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines
@@ -1335,7 +1335,7 @@ c d e f
 
 @c KEEP LY
 @lilypond[quote,verbatim]
-\markuplines {
+\markuplist {
   \justified-lines {
     両端揃えされた非常に長いテキスト。
     ...
@@ -1379,11 +1379,11 @@ c d e f
 インストールされているファイル:
 @file{scm/define-markup-commands.scm}.
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
-@code{\markuplines}
+@code{\markuplist}
 @endpredefined
 
 
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index d21c78435c..a162c0ecce 100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node General input and output
 @chapter General input and output
@@ -1066,13 +1066,13 @@ ie. a two digit number.
 
 @node Table of contents
 @subsection Table of contents
-A table of contents is included using the @code{\markuplines \table-of-contents}
+A table of contents is included using the @code{\markuplist \table-of-contents}
 command.  The elements which should appear in the table of contents are
 entered with the @code{\tocItem} command, which may be used either at
 top-level, or inside a music expression.
 
 @verbatim
-\markuplines \table-of-contents
+\markuplist \table-of-contents
 \pageBreak
 
 \tocItem \markup "First score"
@@ -1155,7 +1155,7 @@ tocAct =
    (add-toc-item! 'tocActMarkup text))
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocAct \markup { Atto Primo }
   \tocItem \markup { Coro. Viva il nostro Alcide }
   \tocItem \markup { Cesare. Presti omai l'Egizzia terra }
@@ -1175,7 +1175,7 @@ Dots can be added to fill the line between an item and its page number:
 }
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \tocItem \markup { Allegro }
   \tocItem \markup { Largo }
   \markup \null
diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 81b43d9390..c2927539ab 100644
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Notation manual tables
 @appendix Notation manual tables
@@ -644,8 +644,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #clefs
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #clefs
 @end lilypond
 
 
@@ -654,8 +654,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #timesig
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #timesig
 @end lilypond
 
 
@@ -664,8 +664,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #numbers
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #numbers
 @end lilypond
 
 
@@ -674,8 +674,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accidentals
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accidentals
 @end lilypond
 
 
@@ -684,8 +684,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #default-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #default-noteheads
 @end lilypond
 
 
@@ -694,8 +694,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #special-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #special-noteheads
 @end lilypond
 
 
@@ -704,8 +704,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #shape-note-noteheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #shape-note-noteheads
 @end lilypond
 
 
@@ -714,8 +714,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #rests
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #rests
 @end lilypond
 
 
@@ -724,8 +724,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #flags
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #flags
 @end lilypond
 
 
@@ -734,8 +734,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dots
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dots
 @end lilypond
 
 
@@ -744,8 +744,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #dynamics
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #dynamics
 @end lilypond
 
 
@@ -754,8 +754,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #scripts
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #scripts
 @end lilypond
 
 
@@ -764,8 +764,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #arrowheads
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #arrowheads
 @end lilypond
 
 
@@ -774,8 +774,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #brackettips
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #brackettips
 @end lilypond
 
 
@@ -784,8 +784,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #pedal
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #pedal
 @end lilypond
 
 
@@ -794,8 +794,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #accordion
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #accordion
 @end lilypond
 
 
@@ -804,8 +804,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #ties
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #ties
 @end lilypond
 
 
@@ -814,8 +814,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #vaticana
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #vaticana
 @end lilypond
 
 
@@ -824,8 +824,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #medicaea
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #medicaea
 @end lilypond
 
 
@@ -834,8 +834,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #hufnagel
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #hufnagel
 @end lilypond
 
 
@@ -844,8 +844,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #mensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #mensural
 @end lilypond
 
 
@@ -854,8 +854,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #neomensural
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #neomensural
 @end lilypond
 
 
@@ -864,8 +864,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #petrucci
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #petrucci
 @end lilypond
 
 
@@ -874,8 +874,8 @@ see @ref{Formatting text}.
 
 @lilypond[quote]
 \include "font-table.ly"
-\markuplines \override-lines #'(word-space . 4)
-             \doc-chars #solesmes
+\markuplist \override-lines #'(word-space . 4)
+            \doc-chars #solesmes
 @end lilypond
 
 
@@ -897,7 +897,7 @@ The following styles may be used for note heads.
 @node Text markup list commands
 @appendixsec Text markup list commands
 
-The following commands can all be used with @code{\markuplines}:
+The following commands can all be used with @code{\markuplist}:
 
 @include markup-list-commands.tely
 
diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index d56fa1348f..a770eb1d9c 100644
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.17"
 
 @node Text
 @section Text
@@ -348,12 +348,12 @@ requires, are described in @ref{Multi-page markup}.
 
 @funindex \markup
 @funindex markup
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
 @code{\markup},
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
@@ -1277,8 +1277,8 @@ Installed Files:
 @cindex markup text, multi-page
 @cindex text spread over multiple pages
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 @funindex \justified-lines
 @funindex justified-lines
 @funindex \wordwrap-lines
@@ -1289,7 +1289,7 @@ makes it possible to enter lines of text that can spread over multiple
 pages:
 
 @lilypond[quote,verbatim]
-\markuplines {
+\markuplist {
   \justified-lines {
     A very long text of justified lines.
     ...
@@ -1333,11 +1333,11 @@ Installed Files:
 @file{scm/define-markup-commands.scm}.
 
 
-@funindex \markuplines
-@funindex markuplines
+@funindex \markuplist
+@funindex markuplist
 
 @predefined
-@code{\markuplines}.
+@code{\markuplist}.
 @endpredefined
 
 
diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index fea2fb1ea7..106ad4f36e 100644
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -4,14 +4,14 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   lsrtags = "text"
 
   texidoc = "
 Text that can spread over pages is entered with the
-@code{\\markuplines} command.
+@code{\\markuplist} command.
 
 "
   doctitle = "Markup lines"
@@ -24,7 +24,7 @@ Text that can spread over pages is entered with the
    (make-justified-lines-markup-list (cons (make-hspace-markup 2) args))))
 
 % Candide, Voltaire
-\markuplines {
+\markuplist {
   \override-lines #'(baseline-skip . 2.5) {
     \paragraph {
       Il y avait en Westphalie, dans le château de M. le baron de
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index 60292e665a..42fe2cb4d2 100644
--- a/Documentation/snippets/table-of-contents.ly
+++ b/Documentation/snippets/table-of-contents.ly
@@ -4,13 +4,13 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   lsrtags = "paper-and-layout"
 
   texidoc = "
-A table of contents is included using @code{\\markuplines
+A table of contents is included using @code{\\markuplist
 \\table-of-contents}.  The TOC items are added with the
 @code{\\tocItem} command.
 
@@ -21,7 +21,7 @@ A table of contents is included using @code{\\markuplines
 #(set-default-paper-size "a6")
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \pageBreak
   \tocItem \markup { The first score }
   \score {
diff --git a/input/regression/bookparts.ly b/input/regression/bookparts.ly
index 75ab8a54b5..528f547085 100644
--- a/input/regression/bookparts.ly
+++ b/input/regression/bookparts.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   texidoc = "A book can be split into several parts with different paper settings,
@@ -35,5 +35,5 @@ Page labels are also collected into the top-level paper."
 
   \tocItem \markup "Third part"
   \markup { Third part }
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
 }
diff --git a/input/regression/markup-lines-identifier.ly b/input/regression/markup-lines-identifier.ly
index 579a735d9f..5f9ccca581 100644
--- a/input/regression/markup-lines-identifier.ly
+++ b/input/regression/markup-lines-identifier.ly
@@ -1,19 +1,19 @@
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   texidoc = "Text that can spread over pages is entered with the
-@code{\\markuplines} command. It can be assigned to a variable and inserted
-at top-level with or without preceding it by @code{\\markuplines}."
+@code{\\markuplist} command. It can be assigned to a variable and inserted
+at top-level with or without preceding it by @code{\\markuplist}."
 }
 
 #(set-default-paper-size "a6")
 
-mytext = \markuplines {
+mytext = \markuplist {
   \justified-lines {
     Lorem ipsum dolor sit amet, consectetur adipisici elit, sed
     eiusmod tempor incidunt ut labore et dolore magna aliqua. ...
   }
 }
 
-\markuplines \mytext
+\markuplist \mytext
 \mytext
diff --git a/input/regression/markup-lines.ly b/input/regression/markup-lines.ly
index c0f61f2348..038b6830ef 100644
--- a/input/regression/markup-lines.ly
+++ b/input/regression/markup-lines.ly
@@ -1,10 +1,10 @@
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   tagline = ##f
   texidoc = "Text that can spread over pages is entered with the
-@code{\\markuplines} command.  Widowed and orphaned lines are avoided
-at the begininng and end of a @code{\\markuplines} containing more
+@code{\\markuplist} command.  Widowed and orphaned lines are avoided
+at the begininng and end of a @code{\\markuplist} containing more
 than one line."
 }
 
@@ -14,9 +14,9 @@ than one line."
   (interpret-markup-list layout props 
    (make-justified-lines-markup-list (cons (make-hspace-markup 2) args))))
 \book {
-  \markuplines {} % Empty list is handled gracefully
+  \markuplist {} % Empty list is handled gracefully
   %% Candide, Voltaire
-  \markuplines \override-lines #'(baseline-skip . 3.0) {
+  \markuplist \override-lines #'(baseline-skip . 3.0) {
     \paragraph { % The final two lines are placed on page 2.
       Il y avait en Westphalie, dans le château de M. le baron de
       Thunder-ten-tronckh, un jeune garçon à qui la nature avait donné
@@ -31,7 +31,7 @@ than one line."
       perdu par l'injure du temps. (not orphaned)
     }
   }
-  \markuplines \override-lines #'(baseline-skip . 3.9) {
+  \markuplist \override-lines #'(baseline-skip . 3.9) {
     \paragraph {
       Monsieur le baron était un des plus puissants seigneurs de la
       Westphalie, car son château avait une porte et des fenêtres.  Sa
@@ -42,7 +42,7 @@ than one line."
       riaient quand il faisait des contes.
     }
   }
-  \markuplines {
+  \markuplist {
     \paragraph { % A single-line paragraph may be orphaned
       Madame la ... (may be orphaned)
     }
diff --git a/input/regression/no-header.ly b/input/regression/no-header.ly
index c5f2d4b3a5..352b84480d 100644
--- a/input/regression/no-header.ly
+++ b/input/regression/no-header.ly
@@ -1,6 +1,6 @@
-\version "2.14.0"
+\version "2.15.17"
 
-\markuplines \wordwrap-lines {
+\markuplist \wordwrap-lines {
   This regtest does not contain any header and paper blocks. Its purpose is to
   test whether anything breaks if these blocks are absent.
 }
diff --git a/input/regression/page-label-loose-column.ly b/input/regression/page-label-loose-column.ly
index 4ecc672fe3..6e0dadd0e5 100644
--- a/input/regression/page-label-loose-column.ly
+++ b/input/regression/page-label-loose-column.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   texidoc = "Page labels on loose columns are not ignored: this includes both mid-line
@@ -9,7 +9,7 @@ break-aligned grobs)."
 #(set-default-paper-size "a6")
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
 
   \relative c' {
     c2 \tocItem "Mid-line" c^"mid"
diff --git a/input/regression/page-spacing-markups.ly b/input/regression/page-spacing-markups.ly
index 55acfaeef6..d11613b945 100644
--- a/input/regression/page-spacing-markups.ly
+++ b/input/regression/page-spacing-markups.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   texidoc = "Adjacent lines of markup are placed as closely
@@ -10,7 +10,7 @@ together as possible."
   \paper {
     ragged-last-bottom = ##f
   }
-  \markuplines {
+  \markuplist {
     \column { A B } C D E
   }
 }
diff --git a/input/regression/toc.ly b/input/regression/toc.ly
index c16018afbb..7c0a965383 100644
--- a/input/regression/toc.ly
+++ b/input/regression/toc.ly
@@ -1,8 +1,8 @@
-\version "2.14.0"
+\version "2.15.17"
 
 \header {
   texidoc = "A table of contents is included using
-@code{\\markuplines \\table-of-contents}. The toc items are added with
+@code{\\markuplist \\table-of-contents}. The toc items are added with
 the @code{\\tocItem} command. In the PDF backend, the toc items are linked
 to the corresponding pages."
 }
@@ -10,7 +10,7 @@ to the corresponding pages."
 #(set-default-paper-size "a6")
 
 \book {
-  \markuplines \table-of-contents
+  \markuplist \table-of-contents
   \pageBreak
 
   \tocItem \markup "The first score"
diff --git a/ly/toc-init.ly b/ly/toc-init.ly
index 55b48b96c2..f959e1679f 100644
--- a/ly/toc-init.ly
+++ b/ly/toc-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.17"
 
 %% defined later, in a closure
 #(define-public (add-toc-item! markup-symbol text)
@@ -38,7 +38,7 @@ tocItemWithDotsMarkup = \markup \fill-with-pattern #1 #RIGHT .
   ( _i "Outputs the table of contents, using the paper variable
 @code{tocTitleMarkup} for its title, then the list of lines
 built using the @code{tocItem} music function
-Usage: @code{\\markuplines \\table-of-contents}" )
+Usage: @code{\\markuplist \\table-of-contents}" )
   (cons (interpret-markup layout props
 			  (ly:output-def-lookup layout 'tocTitleMarkup))
 	(space-lines (chain-assoc-get 'baseline-skip props)