Issue 4894: Remove unescaped @funindex entries

[lilypond.git] / Documentation / notation / ancient.itely

diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 1ab6d478676c8d881f558ffd60d8c3cf6c6bf983..714584210af7d2dc7026a1b7561b71287cc19820 100644 (file)
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -220,8 +220,8 @@ specific for this particular type of ligature.  By default, the
 above the ligature.
 
 @lilypond[quote,ragged-right,verbatim]
-\relative c'' {
-  \[ g c, a' f d' \]
+\relative {
+  \[ g' c, a' f d' \]
   a g f
   \[ e f a g \]
 }
@@ -363,8 +363,8 @@ Internals Reference:
 @node Mensural contexts
 @unnumberedsubsubsec Mensural contexts
 
-@cindex MensuralVoiceContext
-@cindex MensuralStaffContext
+@cindex MensuralVoice
+@cindex MensuralStaff
 
 The predefined @code{MensuralVoice} and @code{MensuralStaff}
 contexts can be used to engrave a piece in mensural style.  These
@@ -375,9 +375,9 @@ entering the chant, as the following excerpt demonstrates:
 @lilypond[quote,ragged-right,verbatim]
 \score {
   <<
-    \new MensuralVoice = "discantus" \relative c'' {
+    \new MensuralVoice = "discantus" \relative {
       \hide Score.BarNumber {
-        c1\melisma bes a g\melismaEnd
+        c''1\melisma bes a g\melismaEnd
         f\breve
         \[ f1\melisma a c\breve d\melismaEnd \]
         c\longa
@@ -430,10 +430,10 @@ mensural C clef
 @code{mensural-c3}, @code{mensural-c4},@*
 @code{mensural-c5}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "mensural-c2"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 
 @item
@@ -441,10 +441,10 @@ mensural F clef
 @tab
 @code{mensural-f}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "mensural-f"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 
 @item
@@ -452,10 +452,10 @@ mensural G clef
 @tab
 @code{mensural-g}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "mensural-g"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 
 @item
@@ -465,10 +465,10 @@ black mensural C clef
 @code{blackmensural-c3}, @code{blackmensural-c4},@*
 @code{blackmensural-c5}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "blackmensural-c2"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 
 @item
@@ -477,8 +477,8 @@ neomensural C clef
 @code{neomensural-c1}, @code{neomensural-c2},@*
 @code{neomensural-c3}, @code{neomensural-c4}
 @tab
-@lilypond[relative=1,notime]
-  \clef "neomensural-c2" c1
+@lilypond[fragment,notime]
+  \clef "neomensural-c2" c'1
 @end lilypond
 
 @item
@@ -489,10 +489,10 @@ petrucci style C clefs, for use on different staff lines
 @code{petrucci-c3}, @code{petrucci-c4},@*
 @code{petrucci-c5}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "petrucci-c2"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 
 @item
@@ -502,10 +502,10 @@ petrucci style F clefs, for use on different staff lines
 @code{petrucci-f3}, @code{petrucci-f4},@*
 @code{petrucci-f5}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "petrucci-f3"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 
 @item
@@ -513,10 +513,10 @@ petrucci style G clef
 @tab
 @code{petrucci-g}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \clef "petrucci-g"
   \override NoteHead.style = #'mensural
-  c1
+  c'1
 @end lilypond
 @end multitable
 
@@ -596,8 +596,8 @@ to select ancient time signatures.  Supported styles are
 @code{neomensural} style.  The following examples show the
 differences in style:
 
-@lilypond[ragged-right,relative=1,quote]
-{
+@lilypond[ragged-right,quote]
+\relative c' {
   \textLengthOn
 
   \time 2/2
@@ -729,13 +729,15 @@ Use the @code{flag-style} property of grob @code{Stem} to
 select ancient flags.  Besides the @code{default} flag style,
 only the @code{mensural} style is supported.
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=1]
-\override Flag.style = #'mensural
-\override Stem.thickness = #1.0
-\override NoteHead.style = #'mensural
-\autoBeamOff
-c8 d e f c16 d e f c32 d e f s8
-c'8 d e f c16 d e f c32 d e f
+@lilypond[quote,fragment,ragged-right,verbatim]
+\relative c' {
+  \override Flag.style = #'mensural
+  \override Stem.thickness = #1.0
+  \override NoteHead.style = #'mensural
+  \autoBeamOff
+  c8 d e f c16 d e f c32 d e f s8
+  c'8 d e f c16 d e f c32 d e f
+}
 @end lilypond
 
 Note that the innermost flare of each mensural flag is
@@ -862,10 +864,12 @@ switched on by setting @code{suggestAccidentals} to true.
 
 @funindex suggestAccidentals
 
-@lilypond[verbatim,relative=1]
-fis gis
-\set suggestAccidentals = ##t
-ais bis
+@lilypond[verbatim]
+\relative {
+  fis' gis
+  \set suggestAccidentals = ##t
+  ais bis
+}
 @end lilypond
 
 This will treat @emph{every} subsequent accidental as
@@ -876,10 +880,10 @@ defined as a convenient shorthand:
 
 @lilypond[quote,verbatim]
 ficta = { \once \set suggestAccidentals = ##t }
-\score { \relative c''
+\score { \relative
   \new MensuralVoice  {
     \once \set suggestAccidentals = ##t
-    bes4 a2 g2 \ficta fis8 \ficta e! fis2 g1
+    bes'4 a2 g2 \ficta fis8 \ficta e! fis2 g1
   }
 }
 @end lilypond
@@ -932,13 +936,13 @@ For example,
 
 @lilypond[quote,ragged-right,verbatim]
 \score {
-  \relative c' {
+  \relative {
     \set Score.timing = ##f
     \set Score.defaultBarType = "-"
     \override NoteHead.style = #'petrucci
     \override Staff.TimeSignature.style = #'mensural
     \clef "petrucci-g"
-    \[ c'\maxima g \]
+    \[ c''\maxima g \]
     \[ d'\longa
        \override NoteHead.ligature-flexa = ##t
        \once \override NoteHead.flexa-width = #3.2
@@ -960,13 +964,13 @@ Without replacing @code{Ligature_bracket_engraver} with
 @code{Mensural_ligature_engraver}, the same music looks as follows:
 
 @lilypond[quote,ragged-right]
-\relative c' {
+\relative {
   \set Score.timing = ##f
   \set Score.defaultBarType = "-"
   \override NoteHead.style = #'petrucci
   \override Staff.TimeSignature.style = #'mensural
   \clef "petrucci-g"
-  \[ c'\maxima g \]
+  \[ c''\maxima g \]
   \[ d'\longa
      \override NoteHead.ligature-flexa = ##t
      \once \override NoteHead.flexa-width = #3.2
@@ -1022,11 +1026,11 @@ Notation Reference:
 @node Gregorian chant contexts
 @unnumberedsubsubsec Gregorian chant contexts
 
-@cindex VaticanaVoiceContext
-@cindex VaticanaStaffContext
+@cindex VaticanaVoice
+@cindex VaticanaStaff
 
-The predefined @code{VaticanaVoiceContext} and
-@code{VaticanaStaffContext} can be used to engrave a piece of
+The predefined @code{VaticanaVoice} and
+@code{VaticanaStaff} can be used to engrave a piece of
 Gregorian chant in the style of the Editio Vaticana.  These contexts
 initialize all relevant context properties and grob properties to
 proper values, so you can immediately go ahead entering the chant, as
@@ -1086,14 +1090,14 @@ Editio Vaticana style do clef
 @code{vaticana-do1}, @code{vaticana-do2},@*
 @code{vaticana-do3}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.line-count = #4
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'vaticana.punctum
   \clef "vaticana-do2"
-  c
+  c'
 @end lilypond
 
 @item
@@ -1101,14 +1105,14 @@ Editio Vaticana style fa clef
 @tab
 @code{vaticana-fa1}, @code{vaticana-fa2}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.line-count = #4
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'vaticana.punctum
   \clef "vaticana-fa2"
-  c
+  c'
 @end lilypond
 
 @item
@@ -1117,14 +1121,14 @@ Editio Medicaea style do clef
 @code{medicaea-do1}, @code{medicaea-do2},@*
 @code{medicaea-do3}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.line-count = #4
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'medicaea.punctum
   \clef "medicaea-do2"
-  c
+  c'
 @end lilypond
 
 @item
@@ -1132,14 +1136,14 @@ Editio Medicaea style fa clef
 @tab
 @code{medicaea-fa1}, @code{medicaea-fa2}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.line-count = #4
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'medicaea.punctum
   \clef "medicaea-fa2"
-  c
+  c'
 @end lilypond
 
 @item
@@ -1148,14 +1152,14 @@ hufnagel style do clef
 @code{hufnagel-do1}, @code{hufnagel-do2},@*
 @code{hufnagel-do3}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.line-count = #4
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'hufnagel.punctum
   \clef "hufnagel-do2"
-  c
+  c'
 @end lilypond
 
 @item
@@ -1163,14 +1167,14 @@ hufnagel style fa clef
 @tab
 @code{hufnagel-fa1}, @code{hufnagel-fa2}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.line-count = #4
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'hufnagel.punctum
   \clef "hufnagel-fa2"
-  c
+  c'
 @end lilypond
 
 @item
@@ -1178,13 +1182,13 @@ hufnagel style combined do/fa clef
 @tab
 @code{hufnagel-do-fa}
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,notime]
   \override Staff.StaffSymbol.color = #red
   \override Staff.LedgerLineSpanner.color = #red
   \hide Voice.Stem
   \override NoteHead.style = #'hufnagel.punctum
   \clef "hufnagel-do-fa"
-  c
+  c'
 @end lilypond
 @end multitable
 
@@ -1612,9 +1616,9 @@ code}
 @lilypond[staffsize=26,line-width=1.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum
-    \[ b \]
+    \[ b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1626,9 +1630,9 @@ code}
 @lilypond[staffsize=26,line-width=1.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum
-    \[ \cavum b \]
+    \[ \cavum b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1640,9 +1644,9 @@ code}
 @lilypond[staffsize=26,line-width=1.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum
-    \[ \linea b \]
+    \[ \linea b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1655,9 +1659,9 @@ code}
 @lilypond[staffsize=26,line-width=2.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum Auctum Ascendens
-    \[ \auctum \ascendens b \]
+    \[ \auctum \ascendens b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1670,9 +1674,9 @@ code}
 @lilypond[staffsize=26,line-width=2.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum Auctum Descendens
-    \[ \auctum \descendens b \]
+    \[ \auctum \descendens b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1685,9 +1689,9 @@ code}
 @lilypond[staffsize=26,line-width=1.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum Inclinatum
-    \[ \inclinatum b \]
+    \[ \inclinatum b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1700,9 +1704,9 @@ code}
 @lilypond[staffsize=26,line-width=2.5\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum Inclinatum Auctum
-    \[ \inclinatum \auctum b \]
+    \[ \inclinatum \auctum b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1715,9 +1719,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Punctum Inclinatum Parvum
-    \[ \inclinatum \deminutum b \]
+    \[ \inclinatum \deminutum b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1730,9 +1734,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Virga
-    \[ \virga b \]
+    \[ \virga b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1751,9 +1755,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Clivis vel Flexa
-    \[ b \flexa g \]
+    \[ b' \flexa g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1767,9 +1771,9 @@ code}
 @lilypond[staffsize=26,line-width=2.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Clivis Aucta Descendens
-    \[ b \flexa \auctum \descendens g \]
+    \[ b' \flexa \auctum \descendens g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1782,9 +1786,9 @@ code}
 @lilypond[staffsize=26,line-width=2.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Clivis Aucta Ascendens
-    \[ b \flexa \auctum \ascendens g \]
+    \[ b' \flexa \auctum \ascendens g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1797,9 +1801,9 @@ code}
 @lilypond[staffsize=26,line-width=2.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Cephalicus
-    \[ b \flexa \deminutum g \]
+    \[ b' \flexa \deminutum g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1812,9 +1816,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Podatus vel Pes
-    \[ g \pes b \]
+    \[ g' \pes b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1827,9 +1831,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Pes Auctus Descendens
-    \[ g \pes \auctum \descendens b \]
+    \[ g' \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1842,9 +1846,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Pes Auctus Ascendens
-    \[ g \pes \auctum \ascendens b \]
+    \[ g' \pes \auctum \ascendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1857,9 +1861,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Epiphonus
-    \[ g \pes \deminutum b \]
+    \[ g' \pes \deminutum b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1872,9 +1876,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Pes Initio Debilis
-    \[ \deminutum g \pes b \]
+    \[ \deminutum g' \pes b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1887,9 +1891,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Pes Auctus Descendens Initio Debilis
-    \[ \deminutum g \pes \auctum \descendens b \]
+    \[ \deminutum g' \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1909,9 +1913,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Torculus
-    \[ a \pes b \flexa g \]
+    \[ a' \pes b \flexa g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1924,9 +1928,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Torculus Auctus Descendens
-    \[ a \pes b \flexa \auctum \descendens g \]
+    \[ a' \pes b \flexa \auctum \descendens g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1939,9 +1943,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Torculus Deminutus
-    \[ a \pes b \flexa \deminutum g \]
+    \[ a' \pes b \flexa \deminutum g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1954,9 +1958,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Torculus Initio Debilis
-    \[ \deminutum a \pes b \flexa g \]
+    \[ \deminutum a' \pes b \flexa g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1969,9 +1973,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Torculus Auctus Descendens Initio Debilis
-    \[ \deminutum a \pes b \flexa \auctum \descendens g \]
+    \[ \deminutum a' \pes b \flexa \auctum \descendens g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1984,9 +1988,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Torculus Deminutus Initio Debilis
-    \[ \deminutum a \pes b \flexa \deminutum g \]
+    \[ \deminutum a' \pes b \flexa \deminutum g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -1999,9 +2003,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Porrectus
-    \[ a \flexa g \pes b \]
+    \[ a' \flexa g \pes b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2014,9 +2018,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Porrectus Auctus Descendens
-    \[ a \flexa g \pes \auctum \descendens b \]
+    \[ a' \flexa g \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2029,9 +2033,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Porrectus Deminutus
-    \[ a \flexa g \pes \deminutum b \]
+    \[ a' \flexa g \pes \deminutum b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2044,9 +2048,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Climacus
-    \[ \virga b \inclinatum a \inclinatum g \]
+    \[ \virga b' \inclinatum a \inclinatum g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2059,9 +2063,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Climacus Auctus
-    \[ \virga b \inclinatum a \inclinatum \auctum g \]
+    \[ \virga b' \inclinatum a \inclinatum \auctum g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2074,9 +2078,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Climacus Deminutus
-    \[ \virga b \inclinatum a \inclinatum \deminutum g \]
+    \[ \virga b' \inclinatum a \inclinatum \deminutum g \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2089,9 +2093,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Scandicus
-    \[ g \pes a \virga b \]
+    \[ g' \pes a \virga b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2104,9 +2108,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Scandicus Auctus Descendens
-    \[ g \pes a \pes \auctum \descendens b \]
+    \[ g' \pes a \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2119,9 +2123,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Scandicus Deminutus
-    \[ g \pes a \pes \deminutum b \]
+    \[ g' \pes a \pes \deminutum b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2141,9 +2145,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Quilisma
-    \[ g \pes \quilisma a \pes b \]
+    \[ g' \pes \quilisma a \pes b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2156,9 +2160,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Quilisma Pes Auctus Descendens
-    \[ g \quilisma a \pes \auctum \descendens b \]
+    \[ g' \quilisma a \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2171,9 +2175,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Oriscus
-    \[ \oriscus b \]
+    \[ \oriscus b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2186,9 +2190,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Pes Quassus
-    \[ \oriscus g \pes \virga b \]
+    \[ \oriscus g' \pes \virga b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2201,9 +2205,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Pes Quassus Auctus Descendens
-    \[ \oriscus g \pes \auctum \descendens b \]
+    \[ \oriscus g' \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2216,9 +2220,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Salicus
-    \[ g \oriscus a \pes \virga b \]
+    \[ g' \oriscus a \pes \virga b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2231,9 +2235,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Salicus Auctus Descendens
-    \[ g \oriscus a \pes \auctum \descendens b \]
+    \[ g' \oriscus a \pes \auctum \descendens b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2246,9 +2250,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Stropha
-    \[ \stropha b \]
+    \[ \stropha b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2261,9 +2265,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Stropha Aucta
-    \[ \stropha \auctum b \]
+    \[ \stropha \auctum b' \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2276,9 +2280,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Bistropha
-    \[ \stropha b \stropha b \]
+    \[ \stropha b' \stropha b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2291,9 +2295,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Tristropha
-    \[ \stropha b \stropha b \stropha b \]
+    \[ \stropha b' \stropha b \stropha b \]
   }
 \layout { \neumeDemoLayout }}
 @end lilypond
@@ -2306,9 +2310,9 @@ code}
 @lilypond[staffsize=26,line-width=1.0\cm]
 \include "gregorian.ly"
 \score {
-  \relative c'' {
+  \relative {
     % Trigonus
-    \[ \stropha b \stropha b \stropha a \]
+    \[ \stropha b' \stropha b \stropha a \]
   }
   \layout { \neumeDemoLayout }
 }
@@ -2394,8 +2398,8 @@ with head prefixes in arbitrary order.
 @node Kievan contexts
 @unnumberedsubsubsec Kievan contexts
 
-@cindex KievanVoiceContext
-@cindex KievanStaffContext
+@cindex KievanVoice
+@cindex KievanStaff
 
 As with Mensural and Gregorian notation, the predefined
 @code{KievanVoice} and @code{KievanStaff} contexts can be used
@@ -2404,6 +2408,14 @@ all relevant context properties and grob properties to proper
 values, so you can immediately go ahead entering the chant:
 
 @lilypond[quote,ragged-right,verbatim]
+% Font settings for Cyrillic
+\paper {
+  #(define fonts
+    (set-global-fonts
+     #:roman "Linux Libertine O,serif"
+   ))
+}
+
 \score {
   <<
     \new KievanVoice = "melody" \relative c' {
@@ -2437,10 +2449,10 @@ Kievan notation that were used in Galicia to notate Rusyn plainchant.
 There is only one clef used in Kievan notation (the Tse-fa-ut Clef).
 It is used to indicate the position of @code{c}:
 
-@lilypond[quote,relative=1,notime,verbatim]
+@lilypond[quote,fragment,notime,verbatim]
   \clef "kievan-do"
   \kievanOn
-  c
+  c'
 @end lilypond
 
 @seealso
@@ -2508,11 +2520,11 @@ in Kievan notation.  The sharp sign is not used in Synodal music
 but may occur in earlier manuscripts.  It has been included
 primarily for the sake of compatibility.
 
-@lilypond[quote,relative=1,notime,verbatim]
+@lilypond[quote,fragment,notime,verbatim]
 \clef "kievan-do"
 \override Accidental.glyph-name-alist =
  #alteration-kievan-glyph-name-alist
-bes' dis,
+bes' dis'
 @end lilypond
 
 @seealso
@@ -2532,10 +2544,10 @@ A decorative figure is commonly placed at the end of a piece of
 Kievan notation, which may be called the Kievan final bar line.
 It can be invoked as @code{\bar "k"}.
 
-@lilypond[quote,relative=1,notime,verbatim]
+@lilypond[quote,fragment,notime,verbatim]
   \kievanOn
   \clef "kievan-do"
-  c \bar "k"
+  c' \bar "k"
 @end lilypond
 
 @seealso
@@ -2574,6 +2586,14 @@ by setting the @code{padding} property of the @code{KievanLigature}.
 The following example demonstrates the use of Kievan ligatures:
 
 @lilypond[quote,ragged-right,verbatim]
+% Font settings for Cyrillic
+\paper {
+  #(define fonts
+    (set-global-fonts
+     #:roman "Linux Libertine O,serif"
+   ))
+}
+
 \score {
   <<
     \new KievanVoice = "melody" \relative c' {
@@ -2631,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
@@ -2783,11 +2802,11 @@ when needed with the corresponding @code{\undo \hide Stem}.
 
 @lilypond[verbatim,ragged-right]
 \include "gregorian.ly"
-chant = \relative c' {
+chant = \relative {
   \clef "G_8"
   \set Score.timing = ##f
   \hide Stem
-  c\breve \hide NoteHead  c c c c c
+  c'\breve \hide NoteHead  c c c c c
   \undo \hide NoteHead
   \undo \hide Stem \stemUp c4 b4 a
   \hide Stem c2 c4  \divisioMaior
@@ -2836,10 +2855,10 @@ adjustments are necessary, this can be easily done with
 @code{s} @q{notes}.
 
 @lilypond[verbatim,quote]
-spiritus = \relative c' {
+spiritus = \relative {
   \time 1/4
   \override Lyrics.LyricText.X-extent  = #'(0 . 3)
-  d4 \tuplet 3/2 { f8 a g } g a a4 g f8 e
+  d'4 \tuplet 3/2 { f8 a g } g a a4 g f8 e
   d4 f8 g g8 d f g a g f4 g8 a a4  s
   \tuplet 3/2 { g8 f d } e f g a g4
 }