Issue 4894: Remove unescaped @funindex entries

With adjacent @funindex entries of which one differs from the other
only by the absence of a preceding backslash, the one without the
preceding backslash is removed.  This is done by using the script:

    sed -i '/^@funindex/{N;s/^@funindex \\\([^\n\\]*\)\n@funindex \1$/@funindex \\\1/mg;s/^@funindex \([^\n\\]*\)\n@funindex \\\1$/@funindex \\\1/mg;P;D;}' $(git grep -l '^@funindex')

12 files changed, 0 insertions, 312 deletions

diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 9f2f25690e..714584210a 100644
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -2651,7 +2651,6 @@ same source.
 @node Incipits
 @unnumberedsubsubsec Incipits
 @funindex \incipit
-@funindex incipit
 @cindex incipits, adding
 
 It is customary when transcribing mensural music into modern notation to place
diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index b79b69100d..7cca8e59af 100644
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -1125,17 +1125,11 @@ Notation Reference:
 @cindex engravers, including in contexts
 
 @funindex \alias
-@funindex alias
 @funindex \name
-@funindex name
 @funindex \type
-@funindex type
 @funindex \consists
-@funindex consists
 @funindex \accepts
-@funindex accepts
 @funindex \denies
-@funindex denies
 
 Specific contexts, like @code{Staff} and @code{Voice}, are made from
 simple building blocks.  It is possible to create new types of
diff --git a/Documentation/notation/editorial.itely b/Documentation/notation/editorial.itely
index 96d0a75356..e329810ae5 100644
--- a/Documentation/notation/editorial.itely
+++ b/Documentation/notation/editorial.itely
@@ -330,7 +330,6 @@ and @code{\revert} commands:
 @cindex finger change
 
 @funindex \finger
-@funindex finger
 
 Fingering instructions can be entered using
 @samp{@var{note}-@var{digit}}:
@@ -350,7 +349,6 @@ Markup texts or strings may be used for finger changes.
 @cindex thumb-script
 
 @funindex \thumb
-@funindex thumb
 
 A thumb-script can be added (e.g. cello music) to indicate
 that a note should be played with the thumb.
@@ -412,9 +410,7 @@ Internals Reference:
 @cindex notes, transparent
 
 @funindex \hideNotes
-@funindex hideNotes
 @funindex \unHideNotes
-@funindex unHideNotes
 
 Hidden (or invisible or transparent) notes can be useful in
 preparing theory or composition exercises.
@@ -484,7 +480,6 @@ Internals Reference:
 
 @funindex color
 @funindex \with-color
-@funindex with-color
 @funindex x11-color
 
 Individual objects may be assigned colors.  Valid color names
@@ -596,7 +591,6 @@ Notes in a chord cannot be separately colored with
 @cindex brackets
 
 @funindex \parenthesize
-@funindex parenthesize
 
 Objects may be parenthesized by prefixing @code{\parenthesize} to
 the music event.  When prefixed to a chord, it parenthesizes every
@@ -643,11 +637,8 @@ chord.
 @cindex invisible stem
 
 @funindex \stemUp
-@funindex stemUp
 @funindex \stemDown
-@funindex stemDown
 @funindex \stemNeutral
-@funindex stemNeutral
 @cindex stem, direction
 @cindex stem, up
 @cindex stem, down
@@ -715,9 +706,7 @@ from outside of the staff.
 @funindex balloonGrobText
 @funindex balloonText
 @funindex \balloonLengthOn
-@funindex balloonLengthOn
 @funindex \balloonLengthOff
-@funindex balloonLengthOff
 
 Elements of notation can be marked and named with the help of a
 square balloon.  The primary purpose of this feature is to explain
@@ -853,9 +842,7 @@ Internals Reference:
 
 @funindex Horizontal_bracket_engraver
 @funindex \startGroup
-@funindex startGroup
 @funindex \stopGroup
-@funindex stopGroup
 
 Brackets are used in musical analysis to indicate structure in musical
 pieces.  Simple horizontal brackets are supported.
diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index f999363cb4..defe8ad946 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -229,43 +229,24 @@ Internals Reference:
 @cindex dynamics, absolute
 
 @funindex \ppppp
-@funindex ppppp
 @funindex \pppp
-@funindex pppp
 @funindex \ppp
-@funindex ppp
 @funindex \pp
-@funindex pp
 @funindex \p
-@funindex p
 @funindex \mp
-@funindex mp
 @funindex \mf
-@funindex mf
 @funindex \f
-@funindex f
 @funindex \ff
-@funindex ff
 @funindex \fff
-@funindex fff
 @funindex \ffff
-@funindex ffff
 @funindex \fffff
-@funindex fffff
 @funindex \fp
-@funindex fp
 @funindex \sf
-@funindex sf
 @funindex \sff
-@funindex sff
 @funindex \sp
-@funindex sp
 @funindex \spp
-@funindex spp
 @funindex \sfz
-@funindex sfz
 @funindex \rfz
-@funindex rfz
 
 Absolute dynamic marks are specified using a command after a note,
 such as @code{c4\ff}.  The available dynamic marks are
@@ -293,9 +274,7 @@ marks may be manually placed above or below the staff; see
 @funindex \>
 @funindex \!
 @funindex \cr
-@funindex cr
 @funindex \decr
-@funindex decr
 
 A @notation{crescendo} mark is started with @code{\<} and
 terminated with @code{\!}, an absolute dynamic, or an additional
@@ -360,7 +339,6 @@ This is particularly useful when adding a @notation{crescendo} and
 @cindex espressivo articulation
 
 @funindex \espressivo
-@funindex espressivo
 
 The @code{\espressivo} command can be used to indicate a crescendo
 and decrescendo on the same note.  However, be warned that this is
@@ -374,11 +352,8 @@ implemented as an articulation, not a dynamic.
 @end lilypond
 
 @funindex \cresc
-@funindex cresc
 @funindex \decresc
-@funindex decresc
 @funindex \dim
-@funindex dim
 Textual crescendo marks begin with @code{\cresc}.
 Textual decrescendos begin with @code{\decresc} or @code{\dim}.
 Extender lines are engraved as required.
@@ -393,17 +368,11 @@ Extender lines are engraved as required.
 @end lilypond
 
 @funindex \crescTextCresc
-@funindex crescTextCresc
 @funindex \dimTextDecresc
-@funindex dimTextDecresc
 @funindex \dimTextDecr
-@funindex dimTextDecr
 @funindex \dimTextDim
-@funindex dimTextDim
 @funindex \crescHairpin
-@funindex crescHairpin
 @funindex \dimHairpin
-@funindex dimHairpin
 
 Textual marks for dynamic changes can also replace hairpins:
 @lilypond[verbatim,quote]
@@ -435,11 +404,8 @@ aligned with dynamics, see @ref{New dynamic marks}.
 Vertical positioning of dynamics is handled by
 @rinternals{DynamicLineSpanner}.
 @funindex \dynamicUp
-@funindex dynamicUp
 @funindex \dynamicDown
-@funindex dynamicDown
 @funindex \dynamicNeutral
-@funindex dynamicNeutral
 
 A @code{Dynamics} context is available to engrave dynamics on
 their own horizontal line.  Use spacer rests to indicate timing.
@@ -559,9 +525,7 @@ moltoF = \markup { molto \dynamic f }
 @cindex dynamics, parenthesis
 @cindex editorial dynamics
 @funindex \bracket
-@funindex bracket
 @funindex \dynamic
-@funindex dynamic
 
 In markup mode, editorial dynamics (within parentheses or square
 brackets) can be created.  The syntax for markup mode is described
@@ -701,9 +665,7 @@ in the same voice it began.}
 @cindex slurs, below notes
 @cindex slurs, above notes
 @funindex \slurDown
-@funindex slurDown
 @funindex \slurNeutral
-@funindex slurNeutral
 
 Slurs may be manually placed above or below the staff; see
 @ref{Direction and placement}.
@@ -738,11 +700,8 @@ them with @code{\=} followed by an identifying number or string.
 @cindex dashed slur
 @cindex style, slur
 @funindex \slurDashed
-@funindex slurDashed
 @funindex \slurDotted
-@funindex slurDotted
 @funindex \slurSolid
-@funindex slurSolid
 
 Slurs can be solid, dotted, or dashed.  Solid is the default slur
 style:
@@ -760,9 +719,7 @@ style:
 @end lilypond
 
 @funindex \slurHalfDashed
-@funindex slurHalfDashed
 @funindex \slurHalfSolid
-@funindex slurHalfSolid
 @cindex slur, half dashed and half solid
 
 Slurs can also be made half-dashed (the first half dashed, the
@@ -782,7 +739,6 @@ half dashed):
 @end lilypond
 
 @funindex \slurDashPattern
-@funindex slurDashPattern
 @cindex slur, defining dash patterns
 
 Custom dash patterns for slurs can be defined:
@@ -802,7 +758,6 @@ Custom dash patterns for slurs can be defined:
 
 
 @funindex \slurUp
-@funindex slurUp
 
 
 @predefined
@@ -869,11 +824,8 @@ musical sentence are written using the commands @code{\(} and
 @end lilypond
 
 @funindex \phrasingSlurUp
-@funindex phrasingSlurUp
 @funindex \phrasingSlurDown
-@funindex phrasingSlurDown
 @funindex \phrasingSlurNeutral
-@funindex phrasingSlurNeutral
 
 Typographically, a phrasing slur behaves almost exactly like a
 normal slur.  However, they are treated as different objects; a
@@ -891,12 +843,9 @@ may be manually placed above or below the staff; see
 Simultaneous or overlapping phrasing slurs are entered using
 @code{\=} as with regular slurs, see @ref{Slurs}.
 
-@funindex phrasingSlurDashed
 @funindex \phrasingSlurDashed
 @funindex \phrasingSlurDotted
-@funindex phrasingSlurDotted
 @funindex \phrasingSlurSolid
-@funindex phrasingSlurSolid
 @cindex phrasing slur, dashed
 @cindex dashed phrasing slur
 @cindex phrasing slur, dotted
@@ -919,10 +868,8 @@ style for phrasing slurs:
 }
 @end lilypond
 
-@funindex phrasingSlurHalfDashed
 @funindex \phrasingSlurHalfDashed
 @funindex \phrasingSlurHalfSolid
-@funindex phrasingSlurHalfSolid
 @cindex phrasing slur, half solid and half dashed
 @cindex slur, half solid and half dashed phrasing
 
@@ -943,7 +890,6 @@ half dashed):
 @end lilypond
 
 @funindex \phrasingSlurDashPattern
-@funindex phrasingSlurDashPattern
 @cindex phrasing slur, defining dash patterns
 @cindex slur, phrasing, defining dash patterns
 @cindex slur, defining dash patterns for phrasing
@@ -999,7 +945,6 @@ Internals Reference:
 @cindex breath marks
 @cindex pause mark
 @funindex \breathe
-@funindex breathe
 
 Breath marks are entered using @code{\breathe}:
 
@@ -1062,7 +1007,6 @@ Internals Reference:
 @cindex falls
 @cindex doits
 @funindex \bendAfter
-@funindex bendAfter
 
 @notation{Falls} and @notation{doits} can be added to notes using
 the @code{\bendAfter} command.  The direction of the fall or doit
@@ -1112,7 +1056,6 @@ follow a linear path: glissandos, arpeggios, and trills.
 
 @cindex glissando
 @funindex \glissando
-@funindex glissando
 
 A @notation{glissando} is created by appending @code{\glissando}
 to a note:
@@ -1211,13 +1154,9 @@ supported.
 @cindex chord, broken
 
 @funindex \arpeggio
-@funindex arpeggio
 @funindex \arpeggioArrowUp
-@funindex arpeggioArrowUp
 @funindex \arpeggioArrowDown
-@funindex arpeggioArrowDown
 @funindex \arpeggioNormal
-@funindex arpeggioNormal
 
 An @notation{arpeggio} on a chord (also known as a broken chord)
 is denoted by appending @code{\arpeggio} to the chord construct:
@@ -1248,11 +1187,8 @@ Different types of arpeggios may be written.
 @cindex special arpeggio symbols
 
 @funindex \arpeggioBracket
-@funindex arpeggioBracket
 @funindex \arpeggioParenthesis
-@funindex arpeggioParenthesis
 @funindex \arpeggioParenthesisDashed
-@funindex arpeggioParenthesisDashed
 
 Special @emph{bracketed} arpeggio symbols can be created:
 
@@ -1339,11 +1275,8 @@ cross-staff arpeggios; see @ref{Cross-staff stems}.
 @cindex trills
 
 @funindex \trill
-@funindex trill
 @funindex \startTrillSpan
-@funindex startTrillSpan
 @funindex \stopTrillSpan
-@funindex stopTrillSpan
 
 Short trills without an extender line are printed with
 @code{\trill}; see @ref{Articulations and ornamentations}.
@@ -1402,7 +1335,6 @@ described in @ref{Grace notes}.
 @cindex pitched trills
 @cindex trills, pitched
 @funindex \pitchedTrill
-@funindex pitchedTrill
 
 Trills that require an auxiliary note with an explicit pitch can
 be typeset with the @code{\pitchedTrill} command.  The first
diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely
index c7c18bacb6..a69f678735 100644
--- a/Documentation/notation/fretted-strings.itely
+++ b/Documentation/notation/fretted-strings.itely
@@ -597,7 +597,6 @@ is the standard EADGBE tuning.  Some other predefined tunings are
 @code{banjo-open-g-tuning}.  The predefined string tunings
 are found in @file{ly/string-tunings-init.ly}.
 
-@funindex stringTuning
 @funindex \stringTuning
 @cindex tablature, custom string tunings
 @cindex custom string tunings
@@ -843,7 +842,6 @@ the fret-diagram markup string.
 @cindex fret-diagram markup
 @cindex ukulele
 
-@funindex fret-diagram
 @funindex \fret-diagram
 
 The size of the fret diagram, and the number of frets in the diagram
@@ -934,7 +932,6 @@ markup string.
 
 @cindex fret-diagram-terse markup
 
-@funindex fret-diagram-terse
 @funindex \fret-diagram-terse
 
 The fret-diagram-terse markup string omits string numbers; the string
@@ -1012,7 +1009,6 @@ Other fret diagram properties must be adjusted using
 @cindex fret-diagram-verbose markup
 @cindex capo
 
-@funindex fret-diagram-verbose
 @funindex \fret-diagram-verbose
 
 The fret-diagram-verbose markup string is in the format of a Scheme list.  Each
@@ -1299,7 +1295,6 @@ either as simultaneous music or using chord mode (see
 @cindex fret diagrams with chord names
 
 @funindex ChordNames
-@funindex chordmode
 @funindex \chordmode
 
 It is common that both chord names and fret diagrams are displayed together.
@@ -1443,8 +1438,6 @@ mychords = \chordmode {
 @cindex chord shapes for fretted instruments
 
 @funindex \addChordShape
-@funindex addChordShape
-@funindex storePredefinedDiagram
 @funindex \storePredefinedDiagram
 
 In addition to fret diagrams, LilyPond stores an internal list of chord
@@ -1561,9 +1554,7 @@ calculates strings and frets that can be used to play the notes.
 >>
 @end lilypond
 
-@funindex predefinedFretboardsOff
 @funindex \predefinedFretboardsOff
-@funindex predefinedFretboardsOn
 @funindex \predefinedFretboardsOn
 
 As no predefined diagrams are loaded by default, automatic calculation
@@ -1698,7 +1689,6 @@ with non-monotonic tunings.
 @cindex fingerings, right hand for fretted instruments
 @cindex right hand fingerings for fretted instruments
 
-@funindex rightHandFinger
 @funindex \rightHandFinger
 
 Right-hand fingerings @var{p-i-m-a} must be entered using
@@ -1869,7 +1859,6 @@ Notation Reference:
 @node Indicating power chords
 @unnumberedsubsubsec Indicating power chords
 
-@funindex powerChords
 @funindex \powerChords
 
 @cindex power chords
diff --git a/Documentation/notation/keyboards.itely b/Documentation/notation/keyboards.itely
index 3d2919edc7..db8057b67f 100644
--- a/Documentation/notation/keyboards.itely
+++ b/Documentation/notation/keyboards.itely
@@ -150,7 +150,6 @@ Snippets:
 @cindex beams, cross-staff
 
 @funindex \change
-@funindex change
 
 Voices can be switched between staves manually, using the command
 
@@ -262,7 +261,6 @@ right before a change in staff.  In this case use manual beams.
 @cindex staff changes, automatic
 
 @funindex \autochange
-@funindex autochange
 @funindex PianoStaff
 
 Voices can be made to switch automatically between the top and the
@@ -308,7 +306,6 @@ music = {
 @cindex autochange and relative music
 
 @funindex \relative
-@funindex relative
 
 A @code{\relative} section that is outside of @code{\autochange}
 has no effect on the pitches of the music, so if necessary, put
@@ -381,9 +378,7 @@ staff based on the first note named in the chord construct.
 
 @funindex followVoice
 @funindex \showStaffSwitch
-@funindex showStaffSwitch
 @funindex \hideStaffSwitch
-@funindex hideStaffSwitch
 
 Whenever a voice switches to another staff, a line connecting the
 notes can be printed automatically:
@@ -485,17 +480,11 @@ piano.
 @cindex U.C.
 
 @funindex \sustainOn
-@funindex sustainOn
 @funindex \sustainOff
-@funindex sustainOff
 @funindex \sostenutoOn
-@funindex sostenutoOn
 @funindex \sostenutoOff
-@funindex sostenutoOff
 @funindex \unaCorda
-@funindex unaCorda
 @funindex \treCorde
-@funindex treCorde
 
 Pianos generally have three pedals that alter the way sound is
 produced: @notation{sustain}, @notation{sostenuto}
diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 9529c6704b..3aa7738e2b 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -87,7 +87,6 @@ octave.
 }
 @end lilypond
 
-@funindex fixed
 @funindex \fixed
 Common octave marks can be entered just once on a reference pitch
 after @code{\fixed} placed before the music.  Pitches inside
@@ -129,7 +128,6 @@ Snippets:
 @cindex relative octave specification
 @cindex octave specification, relative
 
-@funindex relative
 @funindex \relative
 
 Absolute octave entry requires specifying the octave for every
@@ -319,11 +317,8 @@ Internals Reference:
 @cindex transposition and relative octave entry
 
 @funindex \transpose
-@funindex transpose
 @funindex \chordmode
-@funindex chordmode
 @funindex \relative
-@funindex relative
 
 
 @node Accidentals
@@ -645,7 +640,6 @@ This section discusses how to modify pitches.
 
 @funindex =
 @funindex \octaveCheck
-@funindex octaveCheck
 @funindex controlpitch
 
 In relative mode, it is easy to forget an octave changing mark.
@@ -720,7 +714,6 @@ Internals Reference:
 @cindex notes, transposition of
 
 @funindex \transpose
-@funindex transpose
 
 A music expression can be transposed with @code{\transpose}.  The
 syntax is
@@ -838,11 +831,8 @@ Internals Reference:
 @rinternals{TransposedMusic}.
 
 @funindex \transpose
-@funindex transpose
 @funindex \chordmode
-@funindex chordmode
 @funindex \relative
-@funindex relative
 
 @knownissues
 The relative conversion will not affect @code{\transpose},
@@ -900,7 +890,6 @@ Notation Reference:
 @cindex transformation, retrograde
 @cindex operation, retrograde
 @funindex \retrograde
-@funindex retrograde
 
 A music expression can be reversed to produce its retrograde:
 
@@ -948,7 +937,6 @@ left untransformed.}
 @cindex transposition, modal
 @cindex operation, transposition
 @funindex \modalTranspose
-@funindex modalTranspose
 
 A motif can be transposed within a given scale with:
 
@@ -1005,7 +993,6 @@ motif = \relative { c'8 d e f g a b c }
 @cindex inversion, modal
 @cindex operation, modal inversion
 @funindex \modalInversion
-@funindex modalInversion
 
 A motif can be inverted within a given scale around a given pivot
 note and transposed in a single operation with:
@@ -1119,7 +1106,6 @@ This section discusses how to alter the output of pitches.
 
 
 @funindex \clef
-@funindex clef
 
 Without any explicit command, the default clef for LilyPond is the
 treble (or @emph{G}) clef.
@@ -1296,7 +1282,6 @@ need to be applied, as a separate @code{\override}, to the
 @cindex key signature
 
 @funindex \key
-@funindex key
 
 @c duplicated in Key signature and Accidentals
 @warning{New users are sometimes confused about accidentals and
@@ -1315,23 +1300,14 @@ at the start of the staff.  The key signature may be altered:
 @end example
 
 @funindex \major
-@funindex major
 @funindex \minor
-@funindex minor
 @funindex \ionian
-@funindex ionian
 @funindex \locrian
-@funindex locrian
 @funindex \aeolian
-@funindex aeolian
 @funindex \mixolydian
-@funindex mixolydian
 @funindex \lydian
-@funindex lydian
 @funindex \phrygian
-@funindex phrygian
 @funindex \dorian
-@funindex dorian
 
 @cindex church modes
 @cindex modes
@@ -1434,7 +1410,6 @@ Internals Reference:
 
 @funindex set-octavation
 @funindex \ottava
-@funindex ottava
 
 @notation{Ottava brackets} introduce an extra transposition of an
 octave for the staff:
@@ -1489,7 +1464,6 @@ Internals Reference:
 @cindex MIDI transposition
 
 @funindex \transposition
-@funindex transposition
 
 When typesetting scores that involve transposing instruments, some
 parts can be typeset in a different pitch than the
@@ -3070,9 +3044,7 @@ Internals Reference:
 @cindex note heads, easy play
 
 @funindex \easyHeadsOn
-@funindex easyHeadsOn
 @funindex \easyHeadsOff
-@funindex easyHeadsOff
 
 The @q{easy play} note head includes a note name inside the head.
 It is used in music for beginners.  To make the letters readable,
@@ -3137,15 +3109,10 @@ Internals Reference:
 @cindex note heads, Walker
 
 @funindex \aikenHeads
-@funindex aikenHeads
 @funindex \sacredHarpHeads
-@funindex sacredHarpHeads
 @funindex \southernHarmonyHeads
-@funindex southernHarmonyHeads
 @funindex \funkHeads
-@funindex funkHeads
 @funindex \walkerHeads
-@funindex walkerHeads
 
 In shape note head notation, the shape of the note head
 corresponds to the harmonic function of a note in the scale.  This
@@ -3169,17 +3136,11 @@ Funk (Harmonica Sacra), Walker, and Aiken (Christian Harmony) styles:
 @end lilypond
 
 @funindex \key
-@funindex key
 @funindex \aikenHeadsMinor
-@funindex aikenHeadsMinor
 @funindex \sacredHarpHeadsMinor
-@funindex sacredHarpHeadsMinor
 @funindex \southernHarmonyHeadsMinor
-@funindex southernHarmonyHeadsMinor
 @funindex \funkHeadsMinor
-@funindex funkHeadsMinor
 @funindex \walkerHeadsMinor
-@funindex walkerHeadsMinor
 
 Shapes are typeset according to the step in the scale, where the base
 of the scale is determined by the @code{\key} command.  When writing
@@ -3249,9 +3210,7 @@ Internals Reference:
 @cindex note heads, slashed
 
 @funindex \improvisationOn
-@funindex improvisationOn
 @funindex \improvisationOff
-@funindex improvisationOff
 
 Improvisation is sometimes denoted with slashed note heads, where
 the performer may choose any pitch but should play the specified
diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 27241d8fde..05d71edc49 100644
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -45,11 +45,8 @@ This section discusses rhythms, rests, durations, beaming and bars.
 @cindex note lengths
 
 @funindex \longa
-@funindex longa
 @funindex \breve
-@funindex breve
 @funindex \maxima
-@funindex maxima
 
 Durations are designated by numbers and dots.  Durations are entered
 as their reciprocal values.  For example, a quarter note is entered
@@ -135,11 +132,8 @@ duration.  For details of this and other settings which control
 proportional notation, see @ref{Proportional notation}.
 
 @funindex \dotsUp
-@funindex dotsUp
 @funindex \dotsDown
-@funindex dotsDown
 @funindex \dotsNeutral
-@funindex dotsNeutral
 
 Dots are normally moved up to avoid staff lines, except in
 polyphonic situations.  Dots may be manually placed above or below
@@ -202,7 +196,6 @@ rests from 128th to maxima (8 x whole) may be printed.
 @cindex triplets
 
 @funindex \tuplet
-@funindex tuplet
 
 Tuplets are made from a music expression with the @code{\tuplet}
 command, multiplying the speed of the music expression by a fraction:
@@ -239,11 +232,8 @@ in order to have the tuplets grouped automatically:
 @cindex tuplet bracket placement
 
 @funindex \tupletUp
-@funindex tupletUp
 @funindex \tupletDown
-@funindex tupletDown
 @funindex \tupletNeutral
-@funindex tupletNeutral
 
 Tuplet brackets may be manually placed above or below the staff:
 
@@ -371,7 +361,6 @@ a multiplier.  This is useful for skipping many measures, e.g.,
 @cindex expanding music
 
 @funindex \scaleDurations
-@funindex scaleDurations
 
 Longer stretches of music may be compressed by a fraction in the
 same way, as if every note, chord or rest had the fraction as a
@@ -486,7 +475,6 @@ the chord.
 @cindex ties and volta brackets
 
 @funindex \repeatTie
-@funindex repeatTie
 
 When a second alternative of a repeat starts with a tied note, you
 have to specify the repeated tie as follows:
@@ -507,7 +495,6 @@ have to specify the repeated tie as follows:
 @cindex ties, laissez vibrer
 
 @funindex \laissezVibrer
-@funindex laissezVibrer
 
 @notation{L.v.}@: ties (@notation{laissez vibrer}) indicate that
 notes must not be damped at the end.  It is used in notation for
@@ -521,11 +508,8 @@ be entered as follows:
 @cindex ties, placement
 
 @funindex \tieUp
-@funindex tieUp
 @funindex \tieDown
-@funindex tieDown
 @funindex \tieNeutral
-@funindex tieNeutral
 
 Ties may be made to curve up or down manually; see
 @ref{Direction and placement}.
@@ -537,11 +521,8 @@ Ties may be made to curve up or down manually; see
 @cindex dotted ties
 
 @funindex \tieDotted
-@funindex tieDotted
 @funindex \tieDashed
-@funindex tieDashed
 @funindex \tieSolid
-@funindex tieSolid
 
 Ties may be made dashed, dotted, or a combination of solid and
 dashed.
@@ -662,14 +643,10 @@ Rests are entered as part of the music in music expressions.
 @cindex breve rest
 
 @funindex \rest
-@funindex rest
 @funindex r
 @funindex \maxima
-@funindex maxima
 @funindex \longa
-@funindex longa
 @funindex \breve
-@funindex breve
 
 Rests are entered like notes with the note name @code{r}.
 Durations longer than a whole rest use the following predefined
@@ -750,7 +727,6 @@ are rests from 128th to maxima (8 x whole).
 
 @funindex s
 @funindex \skip
-@funindex skip
 
 An invisible rest (also called a @q{spacer rest}) can be entered
 like a note with the note name@tie{}@code{s}:
@@ -841,7 +817,6 @@ Internals Reference:
 @cindex whole rest for a full measure
 @cindex rest, whole for a full measure
 
-@funindex compressMMRests
 @funindex \compressMMRests
 @funindex R
 
@@ -921,7 +896,6 @@ R2.*2 |
 @cindex multi-measure rest with markup
 
 @funindex \fermataMarkup
-@funindex fermataMarkup
 @funindex MultiMeasureRestText
 
 Markups can be added to multi-measure rests.
@@ -955,13 +929,9 @@ setting, resulting bar-check warnings may not be displayed.
 
 
 @funindex \textLengthOn
-@funindex textLengthOn
 @funindex \textLengthOff
-@funindex textLengthOff
 @funindex \fermataMarkup
-@funindex fermataMarkup
 @funindex \compressMMRests
-@funindex compressMMRests
 
 @predefined
 @code{\textLengthOn},
@@ -1046,7 +1016,6 @@ Multi-measure rests do not take part in rest collisions.
 @cindex meter
 
 @funindex \time
-@funindex time
 
 The time signature is set as follows:
 
@@ -1081,9 +1050,7 @@ there.  This default behavior may be changed, see
 @cindex meter style
 
 @funindex \numericTimeSignature
-@funindex numericTimeSignature
 @funindex \defaultTimeSignature
-@funindex defaultTimeSignature
 
 The time signature symbol that is used in 2/2 and 4/4 time can be
 changed to a numeric style:
@@ -1292,7 +1259,6 @@ Internals Reference:
 @cindex metronome marking with text
 
 @funindex \tempo
-@funindex tempo
 
 A basic metronome mark is simple to write:
 
@@ -1355,9 +1321,7 @@ written by including an empty string in the input:
 @end lilypond
 
 @funindex \markLengthOn
-@funindex markLengthOn
 @funindex \markLengthOff
-@funindex markLengthOff
 
 In a part for an instrument with long periods of rests,
 tempo indications sometimes follow each other closely.
@@ -1425,7 +1389,6 @@ Internals Reference:
 
 @funindex measurePosition
 @funindex \partial
-@funindex partial
 
 Partial or pick-up measures, such as an @emph{anacrusis} or an
 @emph{upbeat}, are entered using the @code{\partial} command:
@@ -1523,9 +1486,7 @@ Internal Reference:
 @cindex beams, unmetered music
 
 @funindex \cadenzaOn
-@funindex cadenzaOn
 @funindex \cadenzaOff
-@funindex cadenzaOff
 
 In metered music bar lines are inserted and bar numbers are calculated
 automatically. In unmetered music (i.e. cadenzas), this is not
@@ -1653,9 +1614,7 @@ stretches of unmetered music to permit breaking:
 
 @funindex timeSignatureFraction
 @funindex \scaleDurations
-@funindex scaleDurations
 @funindex \tuplet
-@funindex tuplet
 
 Polymetric notation is supported explicitly or by manually modifying the
 visible time signature symbol and/or scaling note durations.
@@ -1944,9 +1903,7 @@ staff are squashed, and the staff itself has a single line
 
 @funindex Pitch_squash_engraver
 @funindex \improvisationOn
-@funindex improvisationOn
 @funindex \improvisationOff
-@funindex improvisationOff
 
 Guitar chord charts often show the strumming rhythms.  This can
 be done with the @code{Pitch_squash_engraver} and
@@ -2013,9 +1970,7 @@ By default, beams are inserted automatically:
 @cindex beams, customizing rules
 
 @funindex \autoBeamOn
-@funindex autoBeamOn
 @funindex \autoBeamOff
-@funindex autoBeamOff
 
 @lilypond[quote,verbatim]
 \relative c'' {
@@ -2112,14 +2067,11 @@ new beam starts.
 
 @funindex autoBeaming
 @funindex baseMoment
-@funindex beamExceptions
 @funindex \beamExceptions
 @funindex beatStructure
 @funindex measureLength
 @funindex \time
-@funindex time
 @funindex \set
-@funindex set
 
 When automatic beaming is enabled, the placement of automatic beams
 is determined by three context properties:
@@ -2528,7 +2480,6 @@ Beaming direction can be set manually using direction indicators:
 @end lilypond
 
 @funindex \noBeam
-@funindex noBeam
 
 Individual notes may be marked with @code{\noBeam} to prevent them
 from being beamed:
@@ -2611,7 +2562,6 @@ Internals Reference:
 @cindex feathered beams
 
 @funindex \featherDurations
-@funindex featherDurations
 @funindex grow-direction
 
 Feathered beams are used to indicate that a small group of notes
@@ -2692,7 +2642,6 @@ music snippets, and when numbers in the fraction are small.
 @cindex repeat bars
 
 @funindex \bar
-@funindex bar
 
 Bar lines delimit measures, and are also used to indicate
 repeats.  Normally, simple bar lines are automatically inserted
@@ -2902,7 +2851,6 @@ when used with a @code{\repeat volta} command, see
 @ref{Normal repeats}.
 
 @funindex \defineBarLine
-@funindex defineBarLine
 @cindex bar lines, defining
 @cindex defining bar lines
 
@@ -3022,7 +2970,6 @@ connected between different staves of a @code{StaffGroup},
 @funindex whichBar
 @funindex defaultBarType
 @funindex \bar
-@funindex bar
 @funindex bartype
 
 The command @samp{\bar @var{bartype}} is a shortcut for
@@ -3221,7 +3168,6 @@ for end of bar.
 @end lilypond
 
 @funindex \barNumberCheck
-@funindex barNumberCheck
 
 When copying large pieces of music, it can be helpful to check that
 the LilyPond bar number corresponds to the original that you are
@@ -3248,7 +3194,6 @@ Snippets:
 @cindex mark, rehearsal
 
 @funindex \mark
-@funindex mark
 
 To print a rehearsal mark, use the @code{\mark} command.
 
@@ -3367,7 +3312,6 @@ string.
 @cindex glyphs, music
 
 @funindex \musicglyph
-@funindex musicglyph
 
 Music glyphs (such as the segno sign) may be printed inside a
 @code{\mark}
@@ -3479,7 +3423,6 @@ eighth grace note
 @cindex grace notes, following
 
 @funindex \afterGrace
-@funindex afterGrace
 
 If you want to end a note with a grace, use the @code{\afterGrace}
 command.  It takes two arguments: the main note, and the grace
diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index b7b2f3e7ea..a29dd9c4ae 100644
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -341,7 +341,6 @@ collision resolution whatsover and may have other unintended effects
 @cindex note cluster
 
 @funindex \makeClusters
-@funindex makeClusters
 
 A cluster indicates a continuous range of pitches to be played.
 They can be denoted as the envelope of a set of notes.  They are
@@ -404,11 +403,9 @@ multiple staves.
 @cindex lyrics assigned to one voice
 
 @funindex \voiceOne
-@funindex voiceOne
 @funindex \voiceOne ... \voiceFour
 @funindex Voice
 @funindex \oneVoice
-@funindex oneVoice
 
 @subsubsubheading Explicitly instantiating voices
 
@@ -667,21 +664,13 @@ Snippets:
 @cindex voices, multiple
 @cindex shift rest, automatic
 @funindex \shiftOn
-@funindex shiftOn
 @funindex \shiftOnn
-@funindex shiftOnn
 @funindex \shiftOnnn
-@funindex shiftOnnn
 @funindex \shiftOff
-@funindex shiftOff
 @funindex \mergeDifferentlyDottedOn
-@funindex mergeDifferentlyDottedOn
 @funindex \mergeDifferentlyDottedOff
-@funindex mergeDifferentlyDottedOff
 @funindex \mergeDifferentlyHeadedOn
-@funindex mergeDifferentlyHeadedOn
 @funindex \mergeDifferentlyHeadedOff
-@funindex mergeDifferentlyHeadedOff
 
 The note heads of notes in different voices with the same pitch,
 same note head and opposite stem direction are automatically
@@ -907,7 +896,6 @@ are at the same time differently dotted are not clear.
 @cindex a due part
 @cindex solo part
 @funindex \partcombine
-@funindex partcombine
 
 Automatic part combining is used to merge two separate parts of music
 onto a single staff. This can be especially helpful when typesetting
@@ -1010,17 +998,11 @@ effect on the pitches of @code{@var{musicexpr1}} or
 @code{@var{musicexpr2}}.
 
 @funindex \partcombineChords
-@funindex partcombineChords
 @funindex \partcombineApart
-@funindex partcombineApart
 @funindex \partcombineUnisono
-@funindex partcombineUnisono
 @funindex \partcombineSoloI
-@funindex partcombineSoloI
 @funindex \partcombineSoloII
-@funindex partcombineSoloII
 @funindex \partcombineAutomatic
-@funindex partcombineAutomatic
 
 In professional scores, voices are often kept apart from each other for
 long passages of music even if some of the notes are the same in both
@@ -1159,7 +1141,6 @@ Refer also to @emph{Known issues and warnings} when using
 @cindex interleaved music
 @cindex parallel music
 @funindex \parallelMusic
-@funindex parallelMusic
 
 Music for multiple parts can be interleaved in input code.  The
 function @code{\parallelMusic} accepts a list with the names of a
diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely
index 1a2f07566d..ce859e2bb5 100644
--- a/Documentation/notation/staff.itely
+++ b/Documentation/notation/staff.itely
@@ -59,7 +59,6 @@ grouping staves.
 @cindex tablature
 
 @funindex \drummode
-@funindex drummode
 @funindex DrumStaff
 @funindex RhythmicStaff
 @funindex TabStaff
@@ -409,9 +408,7 @@ sections are also described.
 @cindex ledger lines, modifying
 
 @funindex \startStaff
-@funindex startStaff
 @funindex \stopStaff
-@funindex stopStaff
 
 The @code{\stopStaff} and @code{\startStaff} commands can be used to
 stop or (re)start the staff lines respectively, from being printed at
@@ -582,9 +579,7 @@ Internals Reference:
 @cindex resizing of staves
 
 @funindex \startStaff
-@funindex startStaff
 @funindex \stopStaff
-@funindex stopStaff
 
 @notation{Ossia} staves can be set by creating a new simultaneous
 staff in the appropriate location:
@@ -741,7 +736,6 @@ Internals Reference:
 @funindex \RemoveAllEmptyStaves
 @funindex Staff_symbol_engraver
 @funindex \stopStaff
-@funindex stopStaff
 
 
 Staff lines can be hidden by removing the
@@ -1025,11 +1019,8 @@ Internals Reference:
 @cindex cue notes
 
 @funindex \addQuote
-@funindex addQuote
 @funindex \quoteDuring
-@funindex quoteDuring
 @funindex \transposition
-@funindex transposition
 
 It is very common for one voice to use the same notes as those from
 another voice.  For example, first and second violins playing the same
@@ -1225,13 +1216,9 @@ triplets may result in poor notation.
 
 
 @funindex \cueDuring
-@funindex cueDuring
 @funindex \cueClef
-@funindex cueClef
 @funindex \cueDuringWithClef
-@funindex cueDuringWithClef
 @funindex \quoteDuring
-@funindex quoteDuring
 
 @cindex notes, smaller
 @cindex smaller notes
@@ -1415,7 +1402,6 @@ bassoonNotes = \relative c {
 @end lilypond
 
 @funindex \transposedCueDuring
-@funindex transposedCueDuring
 
 Like @code{\quoteDuring}, @code{\cueDuring} takes instrument
 transpositions into account.  Cue notes are produced at the
@@ -1456,7 +1442,6 @@ bassClarinetNotes = \relative c' {
 @cindex cue notes, removing
 
 @funindex \killCues
-@funindex killCues
 
 The @code{\killCues} command removes cue notes from a music
 expression, so the same music expression can be used to produce
diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 3a9cdbd6d2..22471b86b3 100644
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -92,9 +92,7 @@ For more information about the relative ordering of text scripts and
 articulations, see @rlearning{Placement of objects}.
 
 @funindex \textLengthOn
-@funindex textLengthOn
 @funindex \textLengthOff
-@funindex textLengthOff
 
 @predefined
 @code{\textLengthOn},
@@ -172,11 +170,8 @@ The line style, as well as the text string, can be defined as an
 object property.  This syntax is described in @ref{Line styles}.
 
 @funindex \textSpannerUp
-@funindex textSpannerUp
 @funindex \textSpannerDown
-@funindex textSpannerDown
 @funindex \textSpannerNeutral
-@funindex textSpannerNeutral
 
 
 @predefined
@@ -223,9 +218,7 @@ Internals Reference:
 @cindex bar lines, symbols on
 
 @funindex \mark
-@funindex mark
 @funindex \markup
-@funindex markup
 
 Various text elements may be added to a score using the syntax described
 in @ref{Rehearsal marks}:
@@ -287,9 +280,7 @@ the next line.
 @end lilypond
 
 @funindex \markLengthOn
-@funindex markLengthOn
 @funindex \markLengthOff
-@funindex markLengthOff
 
 @predefined
 @code{\markLengthOn},
@@ -331,7 +322,6 @@ Internals Reference:
 @cindex text, standalone
 
 @funindex \markup
-@funindex markup
 
 A @code{\markup} block can exist by itself, outside of any
 @code{\score} block, as a @qq{top-level expression}.  This syntax
@@ -367,9 +357,7 @@ requires, are described in @ref{Multi-page markup}.
 
 
 @funindex \markup
-@funindex markup
 @funindex \markuplist
-@funindex markuplist
 
 @predefined
 @code{\markup},
@@ -420,7 +408,6 @@ using the @code{\markup} mode specific syntax.
 @cindex typeset text
 
 @funindex \markup
-@funindex markup
 
 A @code{\markup} block is used to typeset text with an extensible
 syntax called @qq{markup mode}.
@@ -529,11 +516,8 @@ Syntax errors for markup mode can be confusing.
 @cindex switching fonts
 
 @funindex \italic
-@funindex italic
 @funindex \bold
-@funindex bold
 @funindex \underline
-@funindex underline
 
 Basic font switching is supported in markup mode:
 
@@ -554,13 +538,9 @@ Basic font switching is supported in markup mode:
 
 @funindex \abs-fontsize
 @funindex \fontsize
-@funindex fontsize
 @funindex \smaller
-@funindex smaller
 @funindex \larger
-@funindex larger
 @funindex \magnify
-@funindex magnify
 
 The font size can be altered, relative to the global staff size, in a
 number of different ways
@@ -620,11 +600,8 @@ other characters.
 @cindex superscript
 
 @funindex \super
-@funindex super
 @funindex \sub
-@funindex sub
 @funindex \normal-size-super
-@funindex normal-size-super
 
 Text may be printed as subscript or superscript.  By default these are
 printed in a smaller size, but a normal size can be used as well:
@@ -691,21 +668,13 @@ Defining custom font sets is also possible, as explained in
 @ref{Fonts}.
 
 @funindex \teeny
-@funindex teeny
 @funindex \tiny
-@funindex tiny
 @funindex \small
-@funindex small
 @funindex \normalsize
-@funindex normalsize
 @funindex \large
-@funindex large
 @funindex \huge
-@funindex huge
 @funindex \smaller
-@funindex smaller
 @funindex \larger
-@funindex larger
 
 
 @predefined
@@ -763,11 +732,8 @@ objects can also be moved as a whole, using the syntax described in
 @cindex horizontal text alignment
 
 @funindex \left-align
-@funindex left-align
 @funindex \center-align
-@funindex center-align
 @funindex \right-align
-@funindex right-align
 
 Markup objects may be aligned in different ways.  By default, a text
 indication is aligned on its left edge: in the following example,
@@ -786,7 +752,6 @@ there is no difference between the first and the second markup.
 @end lilypond
 
 @funindex \halign
-@funindex halign
 
 Horizontal alignment may be fine-tuned using a numeric value:
 
@@ -812,11 +777,8 @@ markup objects as a whole, as shown for instance in
 @cindex vertical text alignment
 
 @funindex \raise
-@funindex raise
 @funindex \lower
-@funindex lower
 @funindex \null
-@funindex null
 
 @c QUERY Should the function of ``\null'' be clarified? rp
 
@@ -848,11 +810,8 @@ has no anchor point, and therefore is not moved.
 @end lilypond
 
 @funindex \general-align
-@funindex general-align
 @funindex \translate
-@funindex translate
 @funindex \translate-scaled
-@funindex translate-scaled
 
 Some commands can affect both the horizontal and vertical alignment of
 text objects in markup mode.  Any object affected by these commands
@@ -886,9 +845,7 @@ must be preceded with an anchor point:
 @cindex columns, text
 
 @funindex \column
-@funindex column
 @funindex \center-column
-@funindex center-column
 
 A markup object may include several lines of text.  In the following
 example, each element or expression is placed on its own line, either
@@ -915,7 +872,6 @@ left-aligned or centered:
 @cindex markup, centering on the page
 
 @funindex \fill-line
-@funindex fill-line
 
 Similarly, a list of elements or expressions may be spread to fill the
 entire horizontal line width (if there is only one element, it will be
@@ -947,9 +903,7 @@ multi-line text or any other markup expression:
 @cindex markup text, justified
 
 @funindex \wordwrap
-@funindex wordwrap
 @funindex \justify
-@funindex justify
 
 Long text indications can also be automatically wrapped accordingly to
 the given line width.  These will be either left-aligned or justified,
@@ -1026,15 +980,10 @@ commands.
 @cindex markup text, framing
 
 @funindex \box
-@funindex box
 @funindex \circle
-@funindex circle
 @funindex \rounded-box
-@funindex rounded-box
 @funindex \bracket
-@funindex bracket
 @funindex \hbracket
-@funindex hbracket
 
 Some markup commands allow decoration of text elements with graphics,
 as demonstrated in the following example.
@@ -1061,13 +1010,9 @@ as demonstrated in the following example.
 @cindex markup text padding
 
 @funindex \pad-markup
-@funindex pad-markup
 @funindex \pad-x
-@funindex pad-x
 @funindex \pad-to-box
-@funindex pad-to-box
 @funindex \pad-around
-@funindex pad-around
 
 Some commands may require an increase in the padding around the text;
 this is achieved with some markup commands exhaustively described in
@@ -1101,17 +1046,11 @@ Flute quartet keeps very uneven time."
 @cindex notation, graphic
 
 @funindex \combine
-@funindex combine
 @funindex \draw-circle
-@funindex draw-circle
 @funindex \filled-box
-@funindex filled-box
 @funindex \triangle
-@funindex triangle
 @funindex \draw-line
-@funindex draw-line
 @funindex \arrow-head
-@funindex arrow-head
 
 Other graphic elements or symbols may be printed without requiring any
 text.  As with any markup expression, such objects can be combined.
@@ -1138,9 +1077,7 @@ text.  As with any markup expression, such objects can be combined.
 @cindex postscript
 
 @funindex \epsfile
-@funindex epsfile
 @funindex \postscript
-@funindex postscript
 
 Advanced graphic features include the ability to include external
 image files converted to the Encapsulated PostScript format
@@ -1335,11 +1272,8 @@ Internals Reference:
 @cindex text spread over multiple pages
 
 @funindex \markuplist
-@funindex markuplist
 @funindex \justified-lines
-@funindex justified-lines
 @funindex \wordwrap-lines
-@funindex wordwrap-lines
 
 Although standard markup objects are not breakable, a specific syntax
 makes it possible to enter lines of text that can spread over multiple
@@ -1389,7 +1323,6 @@ Internals Reference:
 @rinternals{TextScript}.
 
 @funindex \markuplist
-@funindex markuplist
 
 @predefined
 @code{\markuplist}.
diff --git a/Documentation/notation/wind.itely b/Documentation/notation/wind.itely
index 3d518817ae..73d8c36b38 100644
--- a/Documentation/notation/wind.itely
+++ b/Documentation/notation/wind.itely
@@ -143,11 +143,8 @@ This section discusses notation common bagpipes.
 @cindex Scottish highland bagpipe
 @cindex grace notes
 @funindex \taor
-@funindex taor
 @funindex \hideKeySignature
-@funindex hideKeySignature
 @funindex \showKeySignature
-@funindex showKeySignature
 
 LilyPond contains special definitions for Scottish, Highland Bagpipe
 music; to use them, add