Run scripts/auxiliar/update-with-convert-ly.sh

11 files changed, 172 insertions, 172 deletions

diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely
index 6c735634e6..a6f225374f 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.15.17"
+@c \version "2.15.25"
 
 @node Entrada y salida generales
 @chapter Entrada y salida generales
@@ -1090,10 +1090,10 @@ los indicadores (y por tanto las notas al pie) durante la compilación.
 @translationof Automatic footnotes
 
 De las dos instrucciones utilizadas para crear notas al pie
-automáticas, utilice @code{\autoFootnoteGrob} para los grobs
+automáticas, utilice @code{\footnoteGrob} para los grobs
 individuales (es decir: la cabeza de las notas, plicas, ligaduras de
 expresión, matices dinámicos y elementos de @code{\markup} si se
-utilizan @code{TextScripts}); y @code{\autoFootnote} para anotar las
+utilizan @code{TextScripts}); y @code{\footnote} para anotar las
 notas de un acorde.
 
 Las dos instrucciones aceptan tres argumentos; el @var{Objeto de
@@ -1101,17 +1101,17 @@ presentación} que anotar, la posición @var{(x . y)} del indicador y un
 elemento de @code{\markup} que aparecerá en la nota, en la parte
 inferior de la página.
 
-La instrucción @code{\autoFootnoteGrob} debe ir @emph{antes} del grob
+La instrucción @code{\footnoteGrob} debe ir @emph{antes} del grob
 al que se adjunta la nota al pie:
 
 @lilypond[verbatim,quote,ragged-right,papersize=a8]
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \autoFootnoteGrob #'NoteHead #'(0.5 . -2)
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { The first note }
     a'4 b8
-    \autoFootnoteGrob #'NoteHead #'(0.5 . 1)
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { The third note }
     e c4 d4
   }
@@ -1119,7 +1119,7 @@ al que se adjunta la nota al pie:
 @end lilypond
 
 Para anotar las notas de un acorde, la instrucción
-@code{\autoFootnote} debe ir @emph{después} de la nota a la que se
+@code{\footnote} debe ir @emph{después} de la nota a la que se
 quiere adjuntar la nota al pie como un @code{TextScript}:
 
 @lilypond[verbatim,quote,ragged-right,papersize=a8]
@@ -1127,9 +1127,9 @@ quiere adjuntar la nota al pie como un @code{TextScript}:
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\autoFootnote #'(1 . -1.25) "Here is a C"
-    es-\autoFootnote #'(2 . -0.25) \markup { \italic "An E-flat" }
-    g-\autoFootnote #'(2 . 3) \markup { \bold "This is a G" }
+    c-\footnote #'(1 . -1.25) "Here is a C"
+    es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" }
+    g-\footnote #'(2 . 3) \markup { \bold "This is a G" }
     >1
   }
 }
@@ -1147,25 +1147,25 @@ línea informativa y la línea de copyright.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    \autoFootnoteGrob #'DynamicText #'(-3 . 0)
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    \autoFootnoteGrob #'Slur #'(0 . 1.5)
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    \autoFootnoteGrob #'Beam #'(0 . -2)
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    \autoFootnoteGrob #'Stem #'(1 . -1)
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    \autoFootnoteGrob #'AccidentalCautionary #'(0 . 0.5)
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    \autoFootnoteGrob #'TextScript #'(0.5 . -0.5)
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1213,13 +1213,13 @@ que la nota al pie está anotando y adjuntada como un
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4-\footnoteGrob #'NoteHead #'(0.5 . -2)
-          "1" \markup { \italic "1. The first note" }
+    a'4-\footnote
+          "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e-\footnoteGrob #'NoteHead #'(0.5 . 1)
-          \markup { \bold "2" } "2. The second note"
+    e-\footnote
+          \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p-\footnoteGrob #'DynamicText #'(0.5 . -1) "3" "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1233,10 +1233,10 @@ adjuntarse como un @code{TextScript}:
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\footnote #'(1 . -1.25) "1" "1. C"
-    es-\footnote #'(2 . -0.25)
-       \markup { \bold "b" } "b. E-flat"
-    g-\footnote #'(2 . 3) "3" \markup { \italic "iii. G" }
+    c-\footnote "1" #'(1 . -1.25) "1. C"
+    es-\footnote
+       \markup { \bold "b" } #'(2 . -0.25) "b. E-flat"
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1254,37 +1254,37 @@ informativa a la de copyright:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \footnoteGrob #'DynamicText #'(-3 . 0)
-      \markup { \teeny 1 }
+    \footnote
+      \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    \footnoteGrob #'Slur #'(0 . 1.5)
-      \markup { \teeny b }
+    \footnote
+      \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    \footnoteGrob #'Beam #'(0 . -2)
-      \markup { \teeny 3 }
+    \footnote
+      \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    \footnoteGrob #'Stem #'(1 . -1)
-      \markup { 4 }
+    \footnote
+      \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    \footnoteGrob #'AccidentalCautionary #'(0 . 0.5)
-      \markup \concat \teeny { "sharp (v)" }
+    \footnote
+      \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    \footnoteGrob #'TextScript #'(0.5 . -0.5)
-      \markup \concat \teeny { "a" }
+    \footnote
+      \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    \footnoteGrob #'BreathingSign #'(1.5 . -0.25)
-      \markup { \teeny \musicglyph #"rests.4" }
+    \footnote
+      \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }
   }
 }
diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely
index a042ada11d..fb89db3b24 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.15.17"
+@c \version "2.15.25"
 
 @c Translators: Jean-Charles Malahieude, Valentin Villenave
 
@@ -1139,15 +1139,15 @@ appels et comment les annotations seront créées lors de la compilation.
 @cindex note de bas de page automatique
 @cindex bas de page, note automatique
 
-@funindex \autoFootnote
-@funindex \autoFootnoteGrob
+@funindex \footnote
+@funindex \footnoteGrob
 @funindex \auto-footnote
 
 LilyPond dispose, selon l'objet à référencer, de deux différentes
 commandes pour créer des notes de bas de page automatiques.  La commande
-@code{\autoFootnoteGrob} s'applique aux objets individuels, tels que
+@code{\footnoteGrob} s'applique aux objets individuels, tels que
 tête de note, hampe, liaison, nuance ou @code{\markup} contenant un
-@code{TextScripts}.  La commande @code{\autoFootnote}, quant à elle,
+@code{TextScripts}.  La commande @code{\footnote}, quant à elle,
 permet de référencer l'une des notes d'un accord.
 
 Ces deux commandes requièrent trois arguments@tie{}: l'@var{Objet de
@@ -1155,7 +1155,7 @@ Rendu} devant être annoté, la position @var{(x@tie{}.@tie{}y)} de
 l'appel de note, et enfin un @code{\markup} contenant l'annotation qui
 apparaîtra en bas de la page.
 
-La commande @code{\autoFootnoteGrob} doit être mentionnée @strong{avant}
+La commande @code{\footnoteGrob} doit être mentionnée @strong{avant}
 l'objet auquel la note est attachée.
 
 @c KEEP LY
@@ -1163,10 +1163,10 @@ l'objet auquel la note est attachée.
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \autoFootnoteGrob #'NoteHead #'(0.5 . -2)
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { La première note }
     a'4 b8
-    \autoFootnoteGrob #'NoteHead #'(0.5 . 1)
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { La troisième note }
     e c4 d4
   }
@@ -1174,7 +1174,7 @@ l'objet auquel la note est attachée.
 @end lilypond
 
 Lorsqu'il s'agit de notes inscrites dans un accord, la commande
-@code{\autoFootnote} doit être mentionnée @strong{après} la note à
+@code{\footnote} doit être mentionnée @strong{après} la note à
 laquelle le @code{TextScript} fait référence.
 
 @c KEEP LY
@@ -1183,9 +1183,9 @@ laquelle le @code{TextScript} fait référence.
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\autoFootnote #'(1 . -1.25) "Voici un do"
-    es-\autoFootnote #'(2 . -0.25) \markup { \italic "Un mi bémol" }
-    g-\autoFootnote #'(2 . 3) \markup { \bold "Ceci est un sol" }
+    c-\footnote #'(1 . -1.25) "Voici un do"
+    es-\footnote #'(2 . -0.25) \markup { \italic "Un mi bémol" }
+    g-\footnote #'(2 . 3) \markup { \bold "Ceci est un sol" }
     >1
   }
 }
@@ -1204,25 +1204,25 @@ et le pied de page.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    \autoFootnoteGrob #'DynamicText #'(-3 . 0)
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    \autoFootnoteGrob #'Slur #'(0 . 1.5)
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    \autoFootnoteGrob #'Beam #'(0 . -2)
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    \autoFootnoteGrob #'Stem #'(1 . -1)
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    \autoFootnoteGrob #'AccidentalCautionary #'(0 . 0.5)
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    \autoFootnoteGrob #'TextScript #'(0.5 . -0.5)
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1274,13 +1274,13 @@ articulation.
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4-\footnoteGrob #'NoteHead #'(0.5 . -2)
-          "1" \markup { \italic "1. The first note" }
+    a'4-\footnote
+          "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e-\footnoteGrob #'NoteHead #'(0.5 . 1)
-          \markup { \bold "2" } "2. The second note"
+    e-\footnote
+          \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p-\footnoteGrob #'DynamicText #'(0.5 . -1) "3" "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1294,10 +1294,10 @@ l'annotation fait référence, comme s'il s'agissait d'une articulation.
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\footnote #'(1 . -1.25) "1" "1. C"
-    es-\footnote #'(2 . -0.25)
-       \markup { \bold "b" } "b. E-flat"
-    g-\footnote #'(2 . 3) "3" \markup { \italic "iii. G" }
+    c-\footnote "1" #'(1 . -1.25) "1. C"
+    es-\footnote
+       \markup { \bold "b" } #'(2 . -0.25) "b. E-flat"
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1316,37 +1316,37 @@ et le pied de page.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    \footnoteGrob #'DynamicText #'(-3 . 0)
-      \markup { \teeny 1 }
+    \footnote
+      \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    \footnoteGrob #'Slur #'(0 . 1.5)
-      \markup { \teeny b }
+    \footnote
+      \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    \footnoteGrob #'Beam #'(0 . -2)
-      \markup { \teeny 3 }
+    \footnote
+      \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    \footnoteGrob #'Stem #'(1 . -1)
-      \markup { 4 }
+    \footnote
+      \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    \footnoteGrob #'AccidentalCautionary #'(0 . 0.5)
-      \markup \concat \teeny { "sharp (v)" }
+    \footnote
+      \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    \footnoteGrob #'TextScript #'(0.5 . -0.5)
-      \markup \concat \teeny { "a" }
+    \footnote
+      \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    \footnoteGrob #'BreathingSign #'(1.5 . -0.25)
-      \markup { \teeny \musicglyph #"rests.4" }
+    \footnote
+      \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }
   }
 }
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 9b020b0785..9ec2b19b79 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.15.17"
+@c \version "2.15.25"
 
 @node General input and output
 @chapter General input and output
@@ -1041,33 +1041,33 @@ indicator and so footnotes are created during compilation.
 @unnumberedsubsubsec Automatic footnotes
 
 Of the two commands used to create automatic footnotes, use
-@code{\autoFootnoteGrob} for individual grobs (i.e. note heads, stems,
+@code{\footnoteGrob} for individual grobs (i.e. note heads, stems,
 slurs, dynamics and @code{\markup} when using @code{TextScripts});
-and @code{\autoFootnote} for annotating chorded notes.
+and @code{\footnote} for annotating chorded notes.
 
 Both commands take three arguments; the @var{Layout Object} to be
 annotated, the @var{(x . y)} position of the indicator and a
 @code{\markup} that will appear in the footnote at the bottom of the
 page.
 
-The command @code{\autoFootnoteGrob} must come @emph{before} the grob
+The command @code{\footnoteGrob} must come @emph{before} the grob
 that the footnote is being attached to:
 
 @lilypond[verbatim,quote,ragged-right,papersize=a8]
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \autoFootnoteGrob #'NoteHead #'(0.5 . -2)
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { The first note }
     a'4 b8
-    \autoFootnoteGrob #'NoteHead #'(0.5 . 1)
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { The third note }
     e c4 d4
   }
 }
 @end lilypond
 
-To annotate chorded notes, the @code{\autoFootnote} must come
+To annotate chorded notes, the @code{\footnote} must come
 @emph{after} the note to which the footnote is being attached as a
 @code{TextScript}:
 
@@ -1076,9 +1076,9 @@ To annotate chorded notes, the @code{\autoFootnote} must come
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\autoFootnote #'(1 . -1.25) "Here is a C"
-    es-\autoFootnote #'(2 . -0.25) \markup { \italic "An E-flat" }
-    g-\autoFootnote #'(2 . 3) \markup { \bold "This is a G" }
+    c-\footnote #'(1 . -1.25) "Here is a C"
+    es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" }
+    g-\footnote #'(2 . 3) \markup { \bold "This is a G" }
     >1
   }
 }
@@ -1095,25 +1095,25 @@ the relative position of the footnotes to the tagline and copyright.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    \autoFootnoteGrob #'DynamicText #'(-3 . 0)
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    \autoFootnoteGrob #'Slur #'(0 . 1.5)
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    \autoFootnoteGrob #'Beam #'(0 . -2)
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    \autoFootnoteGrob #'Stem #'(1 . -1)
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    \autoFootnoteGrob #'AccidentalCautionary #'(0 . 0.5)
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    \autoFootnoteGrob #'TextScript #'(0.5 . -0.5)
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1158,13 +1158,13 @@ the footnote is annotating and attached as a @code{TextScript}:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4-\footnoteGrob #'NoteHead #'(0.5 . -2)
-          "1" \markup { \italic "1. The first note" }
+    a'4-\footnote
+          "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e-\footnoteGrob #'NoteHead #'(0.5 . 1)
-          \markup { \bold "2" } "2. The second note"
+    e-\footnote
+          \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p-\footnoteGrob #'DynamicText #'(0.5 . -1) "3" "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1178,10 +1178,10 @@ the note that the footnote is annotating and attached as a
   \header { tagline = ##f }
   \relative c' {
     <
-    c-\footnote #'(1 . -1.25) "1" "1. C"
-    es-\footnote #'(2 . -0.25)
-       \markup { \bold "b" } "b. E-flat"
-    g-\footnote #'(2 . 3) "3" \markup { \italic "iii. G" }
+    c-\footnote "1" #'(1 . -1.25) "1. C"
+    es-\footnote
+       \markup { \bold "b" } #'(2 . -0.25) "b. E-flat"
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1198,37 +1198,37 @@ the relative position of the footnotes to the tagline and copyright
 \book {
   \header { tagline = ##f }
   \relative c' {
-    \footnoteGrob #'DynamicText #'(-3 . 0)
-      \markup { \teeny 1 }
+    \footnote
+      \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    \footnoteGrob #'Slur #'(0 . 1.5)
-      \markup { \teeny b }
+    \footnote
+      \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    \footnoteGrob #'Beam #'(0 . -2)
-      \markup { \teeny 3 }
+    \footnote
+      \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    \footnoteGrob #'Stem #'(1 . -1)
-      \markup { 4 }
+    \footnote
+      \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    \footnoteGrob #'AccidentalCautionary #'(0 . 0.5)
-      \markup \concat \teeny { "sharp (v)" }
+    \footnote
+      \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    \footnoteGrob #'TextScript #'(0.5 . -0.5)
-      \markup \concat \teeny { "a" }
+    \footnote
+      \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    \footnoteGrob #'BreathingSign #'(1.5 . -0.25)
-      \markup { \teeny \musicglyph #"rests.4" }
+    \footnote
+      \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }
   }
 }
diff --git a/input/regression/footnote-auto-numbering-page-reset.ly b/input/regression/footnote-auto-numbering-page-reset.ly
index 0663f5e80a..5014b32cb2 100644
--- a/input/regression/footnote-auto-numbering-page-reset.ly
+++ b/input/regression/footnote-auto-numbering-page-reset.ly
@@ -1,4 +1,4 @@
-\version "2.15.7"
+\version "2.15.25"
 \header {
   texidoc = "This is an example of automatic footnote numbering
 where the number is reset on each page.  It uses the symbol-footnotes
@@ -24,7 +24,7 @@ have been reached.
 \markup { h i }
 
 \relative c' {
-\autoFootnoteGrob #'NoteHead #'(1 . -1) \markup { j }
+\footnote #'(1 . -1) #'NoteHead \markup { j }
 a b c d }
 
 \pageBreak
@@ -35,9 +35,9 @@ a b c d }
 
 \relative c' {
   d4 e
-  < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
-  \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-  \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+  < f  a-\footnote #'(1 . -1) \markup { n } c >
+  \footnote #'(1 . 1) #'Beam \markup { o }
+  \footnote #'(1 . 1) #'Hairpin \markup { p }
   a8\< [ b c d ] a4 b c |
   d a b c |
   d a b c |
diff --git a/input/regression/footnote-auto-numbering-vertical-order.ly b/input/regression/footnote-auto-numbering-vertical-order.ly
index c7862a98b3..d229da8454 100644
--- a/input/regression/footnote-auto-numbering-vertical-order.ly
+++ b/input/regression/footnote-auto-numbering-vertical-order.ly
@@ -1,4 +1,4 @@
-\version "2.15.21"
+\version "2.15.25"
 \header {
   texidoc = "This regtest makes sure that footnote numbers are laid out
 in the correct vertical order.
@@ -32,31 +32,31 @@ in the correct vertical order.
         d4 e
         \once \override FootnoteItem #'numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 0))
-        < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+        < f  a-\footnote #'(1 . -1) \markup { n } c >
         \once \override FootnoteSpanner #'numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 2 4)
-        \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-        \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+        \footnote #'(1 . 1) #'Beam \markup { o }
+        \footnote #'(1 . 1) #'Hairpin \markup { p }
         a8\< [ b c d ] a4 b c\f |
         d a b c |\break
         d,4 e
         \once \override FootnoteItem #'numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 6))
-        < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+        < f  a-\footnote #'(1 . -1) \markup { n } c >
         \once \override FootnoteSpanner #'numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 8 10)
-        \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-        \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+        \footnote #'(1 . 1) #'Beam \markup { o }
+        \footnote #'(1 . 1) #'Hairpin \markup { p }
         a8\< [ b c d ] a4 b c |
         d a b c\f |\pageBreak
         d,4 e
         \once \override FootnoteItem #'numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 12))
-        < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+        < f  a-\footnote #'(1 . -1) \markup { n } c >
         \once \override FootnoteSpanner #'numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 14 16)
-        \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-        \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+        \footnote #'(1 . 1) #'Beam \markup { o }
+        \footnote #'(1 . 1) #'Hairpin \markup { p }
         a8\< [ b c d ] a4 b c |
         d a b c\! |\break
       }
@@ -64,31 +64,31 @@ in the correct vertical order.
         d4 e
         \once \override FootnoteItem #'numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 1))
-        < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+        < f  a-\footnote #'(1 . -1) \markup { n } c >
         \once \override FootnoteSpanner #'numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 3 5)
-        \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-        \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+        \footnote #'(1 . 1) #'Beam \markup { o }
+        \footnote #'(1 . 1) #'Hairpin \markup { p }
         a8\< [ b c d ] a4 b c\f |
         d a b c |\break
         d,4 e
         \once \override FootnoteItem #'numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 7))
-        < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+        < f  a-\footnote #'(1 . -1) \markup { n } c >
         \once \override FootnoteSpanner #'numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 9 11)
-        \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-        \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+        \footnote #'(1 . 1) #'Beam \markup { o }
+        \footnote #'(1 . 1) #'Hairpin \markup { p }
         a8\< [ b c d ] a4 b c |
         d a b c\f |\pageBreak
         d,4 e
         \once \override FootnoteItem #'numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 13))
-        < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+        < f  a-\footnote #'(1 . -1) \markup { n } c >
         \once \override FootnoteSpanner #'numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 15 17)
-        \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-        \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+        \footnote #'(1 . 1) #'Beam \markup { o }
+        \footnote #'(1 . 1) #'Hairpin \markup { p }
         a8\< [ b c d ] a4 b c |
         d a b c\! |\break
       }
diff --git a/input/regression/footnote-auto-numbering.ly b/input/regression/footnote-auto-numbering.ly
index 0461597eac..11d9c276f5 100644
--- a/input/regression/footnote-auto-numbering.ly
+++ b/input/regression/footnote-auto-numbering.ly
@@ -1,4 +1,4 @@
-\version "2.15.21"
+\version "2.15.25"
 \header {
   texidoc = "This is an example of automatic footnote numbering
 where the number is not reset on each page.  It uses the default
@@ -40,7 +40,7 @@ footnotes.
 \relative c' {
   \once \override FootnoteItem #'numbering-assertion-function =
     #(lambda (grob) (make-footnote-numbering-assertion-function 3))
-  \autoFootnoteGrob #'NoteHead #'(1 . -1) \markup { j }
+  \footnote #'(1 . -1) #'NoteHead \markup { j }
   a b c d
 }
 
@@ -54,11 +54,11 @@ footnotes.
   d4 e
   \once \override FootnoteItem #'numbering-assertion-function =
     #(lambda (grob) (make-footnote-numbering-assertion-function 5))
-  < f  a-\autoFootnote #'(1 . -1) \markup { n } c >
+  < f  a-\footnote #'(1 . -1) \markup { n } c >
   \once \override FootnoteSpanner #'numbering-assertion-function =
     #(simultaneous-footnote-numbering-assertion-function 6 7)
-  \autoFootnoteGrob #'Beam #'(1 . 1) \markup { o }
-  \autoFootnoteGrob #'Hairpin #'(1 . 1) \markup { p }
+  \footnote #'(1 . 1) #'Beam \markup { o }
+  \footnote #'(1 . 1) #'Hairpin \markup { p }
   a8\< [ b c d ] a4 b c |
   d a b c |
   d a b c |
diff --git a/input/regression/footnote-break-visibility.ly b/input/regression/footnote-break-visibility.ly
index c23d5d6d2b..fb49e84841 100644
--- a/input/regression/footnote-break-visibility.ly
+++ b/input/regression/footnote-break-visibility.ly
@@ -1,4 +1,4 @@
-\version "2.15.17"
+\version "2.15.25"
 \header {
   texidoc = "With grobs that have break visibility, footnotes will
 automatically take the break visibility of the grob being footnoted.
@@ -14,12 +14,12 @@ This behavior can be overridden.
 {
   \relative c' {
     c1
-    \footnoteGrob #'TimeSignature #'(0 . 2) "foo" "bar"
+    \footnote "foo" #'(0 . 2) #'TimeSignature "bar"
     \time 3/4
     \break \pageBreak
     c2.
     \once \override Staff . FootnoteItem #'break-visibility = ##(#f #f #t)
-    \footnoteGrob #'TimeSignature #'(0 . 2) "foo" "bar"
+    \footnote "foo" #'(0 . 2) #'TimeSignature "bar"
     \time 4/4
     \break \pageBreak
     c1 \bar "|."
diff --git a/input/regression/footnote-footer-padding.ly b/input/regression/footnote-footer-padding.ly
index b0fd84a309..0c72c5e41f 100644
--- a/input/regression/footnote-footer-padding.ly
+++ b/input/regression/footnote-footer-padding.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.25"
 \header {
   texidoc = "The padding between a footnote and the footer can be tweaked."
 }
@@ -8,21 +8,21 @@
 \book {
 
   \relative c' {
-    \footnoteGrob #'NoteHead
-                  #'(1 . -1)
+    \footnote
                   \markup { \tiny 1 }
+                  #'(1 . -1) #'NoteHead
                   \markup { 1. Tiny space below. }
     e1
 
-    \footnoteGrob #'NoteHead
-                  #'(1 . -1)
+    \footnote
                   \markup { \tiny 2 }
+                  #'(1 . -1) #'NoteHead
                   \markup { 2. Tiny space below. }
     e1
 
-    \footnoteGrob #'NoteHead
-                  #'(1 . -1)
+    \footnote
                   \markup { \tiny 3 }
+                  #'(1 . -1) #'NoteHead
                   \markup { 3. Big space below. }
     e1
 }}
diff --git a/input/regression/footnote-spanner.ly b/input/regression/footnote-spanner.ly
index ec27ba7f36..c550eae244 100644
--- a/input/regression/footnote-spanner.ly
+++ b/input/regression/footnote-spanner.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.25"
 \header {
   texidoc = "Footnotes are annotated at the correct place, and the
 annotation goes to the correct page."
@@ -13,9 +13,9 @@ annotation goes to the correct page."
 \book {
 
 \relative c'' {
-\footnoteGrob #'Hairpin
-              #'(0.5 . 0.5)
+\footnote
               \markup { \tiny "1." }
+              #'(0.5 . 0.5) #'Hairpin
               \markup { 1. \justify { Goes to the first broken spanner. } }
 b4\< c d a
 b c d a
@@ -37,9 +37,9 @@ b c d a
 b c d a\!
 
 \once \override FootnoteSpanner #'spanner-placement = #RIGHT
-\footnoteGrob #'Hairpin
-              #'(0.5 . 0.5)
+\footnote
               \markup { \tiny "2." }
+              #'(0.5 . 0.5) #'Hairpin
               \markup { 2. \justify { Goes to the last broken spanner. } }
 b4\< c d a
 b c d a
diff --git a/input/regression/footnote.ly b/input/regression/footnote.ly
index f13347d31a..8086ecca74 100644
--- a/input/regression/footnote.ly
+++ b/input/regression/footnote.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.25"
 \header {
   texidoc = "Lilypond does footnotes."
 }
@@ -15,7 +15,7 @@
 \markup { h i }
 
 \relative c' {
-\footnoteGrob #'NoteHead #'(1 . -1) \markup { \tiny 4 } \markup { 4. j }
+\footnote \markup { \tiny 4 } #'(1 . -1) #'NoteHead \markup { 4. j }
 a b c d }
 
 \pageBreak
@@ -26,8 +26,8 @@ a b c d }
 
 \relative c' {
   d4 e
-  < f  a-\footnote #'(1 . -1) \markup { \tiny 6 } \markup { 6. n } c >
-  \footnoteGrob #'Beam #'(1 . 1) \markup { \tiny 7 } \markup { 7. o }
-  \footnoteGrob #'Hairpin #'(1 . 1) \markup { \tiny 8 } \markup { 8. p }
+  < f  a-\footnote \markup { \tiny 6 } #'(1 . -1) \markup { 6. n } c >
+  \footnote \markup { \tiny 7 } #'(1 . 1) #'Beam \markup { 7. o }
+  \footnote \markup { \tiny 8 } #'(1 . 1) #'Hairpin \markup { 8. p }
   a8\< [ b c d\f ] r2. |
 }}
diff --git a/input/regression/in-note.ly b/input/regression/in-note.ly
index 1d08d5c12c..a7466f9fea 100644
--- a/input/regression/in-note.ly
+++ b/input/regression/in-note.ly
@@ -1,4 +1,4 @@
-\version "2.15.17"
+\version "2.15.25"
 
 \header {
   texidoc = "LilyPond does in-notes.
@@ -10,10 +10,10 @@
   \relative c' {
     \repeat unfold 5 {
       \once \override FootnoteItem #'footnote = ##f
-      \footnoteGrob #'NoteHead #'(0 . 0)
-                    "" \markup { \box \fill-line { "this is a test" } }
+      \footnote
+                    "" #'(0 . 0) #'NoteHead \markup { \box \fill-line { "this is a test" } }
       \repeat unfold 5 { a\< b c d\! }
-      \autoFootnoteGrob #'NoteHead #'(-1 . 1) "foobar"
+      \footnote #'(-1 . 1) #'NoteHead "foobar"
       \repeat unfold 5 { a\< b c d\! }
     }
   }