Revert "Merge branch 'footnote' into HEAD"

This reverts commit 2ec0cd55d55c49dee4e5604903dfab8ff4a089c4, reversing
changes made to 0a0274a3bf5792dfb7ce3719f5dfaef36059affe.

16 files changed, 174 insertions, 193 deletions

diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely
index 33a06a52d8..ba01fc60a3 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.15.39"
+@c \version "2.15.32"
 
 @c Translators: Till Paala
 
@@ -1127,10 +1127,10 @@ werden, auf den sich die Fußnote bezieht.
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote #'(0.5 . -2) #'NoteHead
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { Die erste Note }
     a'4 b8
-    <>\footnote #'(0.5 . 1) #'NoteHead
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { Die dritte Note }
     e c4 d4
   }
@@ -1147,9 +1147,9 @@ stehen:
   \header { tagline = ##f }
   \relative c' {
     <
-    c\footnote #'(1 . -1.25) "Hier ein C"
-    es\footnote #'(2 . -0.25) \markup { \italic "Ein Es" }
-    g\footnote #'(2 . 3) \markup { \bold "Das ist ein G" }
+    c-\footnote #'(1 . -1.25) "Hier ein C"
+    es-\footnote #'(2 . -0.25) \markup { \italic "Ein Es" }
+    g-\footnote #'(2 . 3) \markup { \bold "Das ist ein G" }
     >1
   }
 }
@@ -1167,25 +1167,25 @@ Tagline und Copyright gezeigt wird.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    <>\footnote #'(-3 . 0) #'DynamicText
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    <>\footnote #'(0 . 1.5) #'Slur
+    \footnote #'(0 . 1.5) #'Slur
       \markup { Ein Bogen }
     a'4\f(
 
-    <>\footnote #'(0 . -2) #'Beam
+    \footnote #'(0 . -2) #'Beam
       \markup { Balken }
     b8)[ e]
 
-    <>\footnote #'(1 . -1) #'Stem
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { Das ist ein Hals } }
     c4
 
-    <>\footnote #'(0 . 0.5) #'AccidentalCautionary
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { Ein Warnungsversetzungszeichen }
 
-    <>\footnote #'(0.5 . -0.5) #'TextScript
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Langsamer hier }
     dis?4_"rit."
   }
@@ -1228,13 +1228,13 @@ Wie auch bei automatischen Fußnoten muss der Befehl @code{\footnote}
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4\footnote
+    a'4-\footnote
           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. Die erste Note" }
     b8
-    e\footnote
+    e-\footnote
           \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. Die zweite Note"
     c4
-    d\p\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1246,10 +1246,10 @@ Fußnoten für Akkordnoten werden wie folgt notiert:
   \header { tagline = ##f }
   \relative c' {
     <
-    c\footnote "1" #'(1 . -1.25) "1. C"
-    es\footnote
+    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" }
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1266,36 +1266,36 @@ Position der Fußnotentexte zu Tagline und Copyright anzeigen:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote
+    \footnote
       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    <>\footnote
+    \footnote
       \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. Ein Bogen }
     a'4\f(
 
-    <>\footnote
+    \footnote
       \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Balken }
     b8)[ e]
 
-    <>\footnote
+    \footnote
       \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { Das ist ein Hals } }
     c4
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. Ein Warnungsversetzungszeichen }
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Langsamer hier }
     dis?4_"rit."
 
     \breathe
-    <>\footnote
+    \footnote
       \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }
   }
diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely
index 5df6365839..4668d0a140 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.39"
+@c \version "2.15.32"
 
 @node Entrada y salida generales
 @chapter Entrada y salida generales
@@ -1107,10 +1107,10 @@ al que se adjunta la nota al pie:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote #'(0.5 . -2) #'NoteHead
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { The first note }
     a'4 b8
-    <>\footnote #'(0.5 . 1) #'NoteHead
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { The third note }
     e c4 d4
   }
@@ -1126,9 +1126,9 @@ quiere adjuntar la nota al pie como un @code{TextScript}:
   \header { tagline = ##f }
   \relative c' {
     <
-    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" }
+    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
   }
 }
@@ -1146,25 +1146,25 @@ línea informativa y la línea de copyright.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    <>\footnote #'(-3 . 0) #'DynamicText
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    <>\footnote #'(0 . 1.5) #'Slur
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    <>\footnote #'(0 . -2) #'Beam
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    <>\footnote #'(1 . -1) #'Stem
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    <>\footnote #'(0 . 0.5) #'AccidentalCautionary
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    <>\footnote #'(0.5 . -0.5) #'TextScript
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1206,13 +1206,13 @@ que la nota al pie está anotando y adjuntada como un
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4\footnote
+    a'4-\footnote
           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e\footnote
+    e-\footnote
           \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1224,10 +1224,10 @@ Para anotar notas de acordes con notas al pie manuales:
   \header { tagline = ##f }
   \relative c' {
     <
-    c\footnote "1" #'(1 . -1.25) "1. C"
-    es\footnote
+    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" }
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1245,37 +1245,37 @@ informativa a la de copyright:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote
+    \footnote
       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    <>\footnote
+    \footnote
       \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    <>\footnote
+    \footnote
       \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    <>\footnote
+    \footnote
       \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "sharp (v)" }
           #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    <>\footnote
+    \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 754a39b2b8..182c8e54b2 100644
--- a/Documentation/fr/notation/input.itely
+++ b/Documentation/fr/notation/input.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.39"
+@c \version "2.15.32"
 
 @c Translators: Jean-Charles Malahieude, Valentin Villenave
 
@@ -1154,10 +1154,10 @@ l'objet auquel la note est attachée.
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote #'(0.5 . -2) #'NoteHead
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { La première note }
     a'4 b8
-    <>\footnote #'(0.5 . 1) #'NoteHead
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { La troisième note }
     e c4 d4
   }
@@ -1174,9 +1174,9 @@ le @code{TextScript} fait référence.
   \header { tagline = ##f }
   \relative c' {
     <
-    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" }
+    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
   }
 }
@@ -1195,25 +1195,25 @@ et le pied de page.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    <>\footnote #'(-3 . 0) #'DynamicText
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    <>\footnote #'(0 . 1.5) #'Slur
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    <>\footnote #'(0 . -2) #'Beam
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    <>\footnote #'(1 . -1) #'Stem
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    <>\footnote #'(0 . 0.5) #'AccidentalCautionary
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    <>\footnote #'(0.5 . -0.5) #'TextScript
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1261,13 +1261,13 @@ référence.
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4\footnote
+    a'4-\footnote
           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e\footnote
+    e-\footnote
           \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1281,10 +1281,10 @@ l'annotation fait référence, comme s'il s'agissait d'une articulation.
   \header { tagline = ##f }
   \relative c' {
     <
-    c\footnote "1" #'(1 . -1.25) "1. C"
-    es\footnote
+    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" }
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1303,37 +1303,37 @@ et le pied de page.
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote
+    \footnote
       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    <>\footnote
+    \footnote
       \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    <>\footnote
+    \footnote
       \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    <>\footnote
+    \footnote
       \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "sharp (v)" }
           #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    <>\footnote
+    \footnote
       \markup { \teeny \musicglyph #"rests.4" }
           #'(1.5 . -0.25) #'BreathingSign
       \markup { \null }
diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely
index a6f7fe2e83..eafb56fb51 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.15.39"
+@c \version "2.15.32"
 
 
 @c Translators: Yoshiki Sawada
@@ -1106,10 +1106,10 @@ scoreTitleMarkup = \markup @{ \column @{
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote #'(0.5 . -2) #'NoteHead
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { The first note }
     a'4 b8
-    <>\footnote #'(0.5 . 1) #'NoteHead
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { The third note }
     e c4 d4
   }
@@ -1125,9 +1125,9 @@ scoreTitleMarkup = \markup @{ \column @{
   \header { tagline = ##f }
   \relative c' {
     <
-    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" }
+    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
   }
 }
@@ -1145,25 +1145,25 @@ scoreTitleMarkup = \markup @{ \column @{
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    <>\footnote #'(-3 . 0) #'DynamicText
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    <>\footnote #'(0 . 1.5) #'Slur
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    <>\footnote #'(0 . -2) #'Beam
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    <>\footnote #'(1 . -1) #'Stem
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    <>\footnote #'(0 . 0.5) #'AccidentalCautionary
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    <>\footnote #'(0.5 . -0.5) #'TextScript
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1204,13 +1204,13 @@ scoreTitleMarkup = \markup @{ \column @{
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4\footnote
+    a'4-\footnote
           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e\footnote
+    e-\footnote
           \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1222,10 +1222,10 @@ scoreTitleMarkup = \markup @{ \column @{
   \header { tagline = ##f }
   \relative c' {
     <
-    c\footnote "1" #'(1 . -1.25) "1. C"
-    es\footnote
+    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" }
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1243,37 +1243,37 @@ scoreTitleMarkup = \markup @{ \column @{
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote
+    \footnote
       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    <>\footnote
+    \footnote
       \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    <>\footnote
+    \footnote
       \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    <>\footnote
+    \footnote
       \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "sharp (v)" }
           #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    <>\footnote
+    \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 76cffd15c2..9294d5cd08 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.39"
+@c \version "2.15.32"
 
 @node General input and output
 @chapter General input and output
@@ -1053,10 +1053,10 @@ footnote is being attached to:
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote #'(0.5 . -2) #'NoteHead
+    \footnote #'(0.5 . -2) #'NoteHead
       \markup { The first note }
     a'4 b8
-    <>\footnote #'(0.5 . 1) #'NoteHead
+    \footnote #'(0.5 . 1) #'NoteHead
       \markup { The third note }
     e c4 d4
   }
@@ -1071,9 +1071,9 @@ the note to which the footnote is being attached as a @code{TextScript}:
   \header { tagline = ##f }
   \relative c' {
     <
-    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" }
+    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
   }
 }
@@ -1090,25 +1090,25 @@ relative position of the footnotes to the tagline and copyright.
 \book {
   \header { copyright = \markup { "Copyright 1970" } }
   \relative c' {
-    <>\footnote #'(-3 . 0) #'DynamicText
+    \footnote #'(-3 . 0) #'DynamicText
       \markup { \bold Forte }
 
-    <>\footnote #'(0 . 1.5) #'Slur
+    \footnote #'(0 . 1.5) #'Slur
       \markup { A slur }
     a'4\f(
 
-    <>\footnote #'(0 . -2) #'Beam
+    \footnote #'(0 . -2) #'Beam
       \markup { Beam }
     b8)[ e]
 
-    <>\footnote #'(1 . -1) #'Stem
+    \footnote #'(1 . -1) #'Stem
       \markup  { \teeny { This is a stem } }
     c4
 
-    <>\footnote #'(0 . 0.5) #'AccidentalCautionary
+    \footnote #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { A cautionary accidental }
 
-    <>\footnote #'(0.5 . -0.5) #'TextScript
+    \footnote #'(0.5 . -0.5) #'TextScript
       \markup \italic { Slow Down }
     dis?4_"rit."
   }
@@ -1147,13 +1147,13 @@ Like automatic footnotes, manual @code{\footnote} commands must come
 \book {
   \header { tagline = ##f }
   \relative c' {
-    a'4\footnote
+    a'4-\footnote
           "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" }
     b8
-    e\footnote
+    e-\footnote
           \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note"
     c4
-    d\p\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
+    d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano"
   }
 }
 @end lilypond
@@ -1165,10 +1165,10 @@ To annotate chorded notes with manual footnotes:
   \header { tagline = ##f }
   \relative c' {
     <
-    c\footnote "1" #'(1 . -1.25) "1. C"
-    es\footnote
+    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" }
+    g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" }
     >1
   }
 }
@@ -1185,37 +1185,37 @@ the relative position of the footnotes to the tagline and copyright
 \book {
   \header { tagline = ##f }
   \relative c' {
-    <>\footnote
+    \footnote
       \markup { \teeny 1 } #'(-3 . 0) #'DynamicText
       \markup { 1. \bold Forte }
 
-    <>\footnote
+    \footnote
       \markup { \teeny b } #'(0 . 1.5) #'Slur
       \markup { b. A slur }
     a'4\f(
 
-    <>\footnote
+    \footnote
       \markup { \teeny 3 } #'(0 . -2) #'Beam
       \markup { 3. Beam }
     b8)[ e]
 
-    <>\footnote
+    \footnote
       \markup { 4 } #'(1 . -1) #'Stem
       \markup  { \bold 4. { This is a stem } }
     c4
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "sharp (v)" }
           #'(0 . 0.5) #'AccidentalCautionary
       \markup \italic { v. A cautionary accidental }
 
-    <>\footnote
+    \footnote
       \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript
       \markup \italic { a. Slow Down }
     dis?4_"rit."
 
     \breathe
-    <>\footnote
+    \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 2310221433..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.39"
+\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' {
-<>\footnote #'(1 . -1) #'NoteHead \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\footnote #'(1 . -1) \markup { n } c >
-  <>\footnote #'(1 . 1) #'Beam \markup { o }
-  <>\footnote #'(1 . 1) #'Hairpin \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 549075b368..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.39"
+\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\footnote #'(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)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \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\footnote #'(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)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \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\footnote #'(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)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \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\footnote #'(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)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \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\footnote #'(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)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \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\footnote #'(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)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \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 dd2251ecbf..11d9c276f5 100644
--- a/input/regression/footnote-auto-numbering.ly
+++ b/input/regression/footnote-auto-numbering.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\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))
-  <>\footnote #'(1 . -1) #'NoteHead \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\footnote #'(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)
-  <>\footnote #'(1 . 1) #'Beam \markup { o }
-  <>\footnote #'(1 . 1) #'Hairpin \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 0176312e0a..fb49e84841 100644
--- a/input/regression/footnote-break-visibility.ly
+++ b/input/regression/footnote-break-visibility.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\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
-    <>\footnote "foo" #'(0 . 2) #'TimeSignature "bar"
+    \footnote "foo" #'(0 . 2) #'TimeSignature "bar"
     \time 3/4
     \break \pageBreak
     c2.
     \once \override Staff . FootnoteItem #'break-visibility = ##(#f #f #t)
-    <>\footnote "foo" #'(0 . 2) #'TimeSignature "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 3011b07331..0c72c5e41f 100644
--- a/input/regression/footnote-footer-padding.ly
+++ b/input/regression/footnote-footer-padding.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\version "2.15.25"
 \header {
   texidoc = "The padding between a footnote and the footer can be tweaked."
 }
@@ -8,19 +8,19 @@
 \book {
 
   \relative c' {
-    <>\footnote
+    \footnote
                   \markup { \tiny 1 }
                   #'(1 . -1) #'NoteHead
                   \markup { 1. Tiny space below. }
     e1
 
-    <>\footnote
+    \footnote
                   \markup { \tiny 2 }
                   #'(1 . -1) #'NoteHead
                   \markup { 2. Tiny space below. }
     e1
 
-    <>\footnote
+    \footnote
                   \markup { \tiny 3 }
                   #'(1 . -1) #'NoteHead
                   \markup { 3. Big space below. }
diff --git a/input/regression/footnote-spanner.ly b/input/regression/footnote-spanner.ly
index 58ce06a92b..c550eae244 100644
--- a/input/regression/footnote-spanner.ly
+++ b/input/regression/footnote-spanner.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\version "2.15.25"
 \header {
   texidoc = "Footnotes are annotated at the correct place, and the
 annotation goes to the correct page."
@@ -13,7 +13,7 @@ annotation goes to the correct page."
 \book {
 
 \relative c'' {
-<>\footnote
+\footnote
               \markup { \tiny "1." }
               #'(0.5 . 0.5) #'Hairpin
               \markup { 1. \justify { Goes to the first broken spanner. } }
@@ -37,7 +37,7 @@ b c d a
 b c d a\!
 
 \once \override FootnoteSpanner #'spanner-placement = #RIGHT
-<>\footnote
+\footnote
               \markup { \tiny "2." }
               #'(0.5 . 0.5) #'Hairpin
               \markup { 2. \justify { Goes to the last broken spanner. } }
diff --git a/input/regression/footnote.ly b/input/regression/footnote.ly
index 037635965e..8086ecca74 100644
--- a/input/regression/footnote.ly
+++ b/input/regression/footnote.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\version "2.15.25"
 \header {
   texidoc = "Lilypond does footnotes."
 }
@@ -15,7 +15,7 @@
 \markup { h i }
 
 \relative c' {
-<>\footnote \markup { \tiny 4 } #'(1 . -1) #'NoteHead \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 \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 }
+  < 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 8748353513..a7466f9fea 100644
--- a/input/regression/in-note.ly
+++ b/input/regression/in-note.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\version "2.15.25"
 
 \header {
   texidoc = "LilyPond does in-notes.
@@ -10,10 +10,10 @@
   \relative c' {
     \repeat unfold 5 {
       \once \override FootnoteItem #'footnote = ##f
-      <>\footnote
+      \footnote
                     "" #'(0 . 0) #'NoteHead \markup { \box \fill-line { "this is a test" } }
       \repeat unfold 5 { a\< b c d\! }
-      <>\footnote #'(-1 . 1) #'NoteHead "foobar"
+      \footnote #'(-1 . 1) #'NoteHead "foobar"
       \repeat unfold 5 { a\< b c d\! }
     }
   }
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 6244f1dd7d..f9f6ef7b35 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -342,7 +342,7 @@ featherDurations=
      argument))
 
 footnote =
-#(define-event-function (parser location text offset grob-name footnote)
+#(define-music-function (parser location text offset grob-name footnote)
    ((markup?) number-pair? (symbol? '()) markup?)
    (_i "Attach @var{text} at @var{offset} with @var{text} referring to
 @var{footnote}.  If @var{text} is given as @code{\\default}, use
diff --git a/python/convertrules.py b/python/convertrules.py
index acabe0237e..5c94c59e1f 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3346,25 +3346,6 @@ def conv (str):
                   sub_tempo, str)
     return str
 
-@rule((2, 15, 39), r"\footnote -> <>\footnote, -\footnote -> \footnote")
-def conv (str):
-    def not_first (s):
-        def match_fun (m):
-            if m.group (1):
-                return m.group (0)
-            return m.expand (s)
-        return match_fun
-    str = re.sub ("(" + matchmarkup + ")|"
-                  + r"(?<![-_^])((?:[-_^][-_^])*)(\\footnote(?:\s*"
-                  + matchmarkup + ")?" + matcharg + "(?:" + matcharg
-                  + ")?\s+" + matchmarkup + ")",
-                  not_first (r"\2<>\3"), str)
-    str = re.sub ("(" + matchmarkup + ")|"
-                  + r"(?<![-_^])((?:[-_^][-_^])*)-(\\footnote(?:\s*"
-                  + matchmarkup + ")?" + matcharg + "(?:" + matcharg
-                  + ")?\s+" + matchmarkup + ")",
-                  not_first (r"\2\3"), str)
-    return str
 
 # Guidelines to write rules (please keep this at the end of this file)
 #
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 658027c88c..0b828c1516 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -228,7 +228,7 @@ duration stored in @code{duration}.")
 
     (FootnoteEvent
      . ((description . "Footnote a grob.")
-	(types . (general-music event post-event footnote-event))
+	(types . (general-music event footnote-event))
 	))
 
     (GlissandoEvent