Doc: In NR, always write comma after `e.g.' and `i.e.'.

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

diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 1e7f61d6b275e5e1c0743633e77076f86e7a41d5..1fda1536658a855996d0d1e3abdbb96906a37165 100644 (file)
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -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
@@ -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
@@ -682,7 +682,7 @@ mensural notation or coloratio sections in white mensural notation.
 Because note head style does not influence flag count, in
 this style a semiminima should be notated as @code{a8*2}, not
 @code{a4}, otherwise it will look like a minima.
-The multiplier can be different if coloratio is used e.g. to notate
+The multiplier can be different if coloratio is used, e.g., to notate
 triplets.
 
 Use @code{semipetrucci} style to draw half-colored
@@ -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
@@ -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
 
@@ -1467,7 +1471,7 @@ with any of the following commands:
 @funindex \linea
 @code{\linea}.
 
-@item Ligatures, properly speaking (i.e. notes joined together), are
+@item Ligatures, properly speaking (i.e., notes joined together), are
 produced by placing one of the joining commands @code{\pes} or
 @code{\flexa}, for upwards and downwards movement, respectively,
 @emph{between} the notes to be joined.
@@ -1521,7 +1525,7 @@ Liquescent neumes
 
 Another main category of notes in Gregorian chant is the so-called
 liquescent neumes.  They are used under certain circumstances at
-the end of a syllable which ends in a @q{liquescent} letter, i.e.
+the end of a syllable which ends in a @q{liquescent} letter, i.e.,
 the sounding consonants that can hold a tone (the nasals, l, r, v,
 j, and their diphthong equivalents).  Thus, the liquescent neumes
 are never used alone (although some of them can be produced), and
@@ -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' {
@@ -2617,7 +2637,7 @@ typical scenarios are outlined, with suggestions of solutions.
 These involve:
 
 @itemize
-@item how to make incipits (i.e. prefatory material to indicate
+@item how to make incipits (i.e., prefatory material to indicate
 what the original has looked like) to modern transcriptions of
 mensural music;
 @item how to achieve the @emph{Mensurstriche} layout frequently
@@ -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
@@ -2678,7 +2697,7 @@ produced.  If no instrument name is required then use
 @emph{Mensurstriche} (@q{mensuration lines}) is the accepted term
 for bar lines that are drawn between the staves of a system but
 not through the staves themselves.  It is a common way to preserve
-the rhythmic appearance of the original, i.e. not having to break
+the rhythmic appearance of the original, i.e., not having to break
 syncopated notes at bar lines, while still providing the
 orientation aids that bar lines give.
 
@@ -2816,7 +2835,7 @@ verba = \lyricmode {
 @end lilypond
 
 Another common situation is transcription of neumatic or
-melismatic chants, i.e. chants with a varying number of notes
+melismatic chants, i.e., chants with a varying number of notes
 to each syllable.  In this case, one would want to set the
 syllable groups clearly apart, usually also the subdivisions of a
 longer melisma.  One way to achieve this is to use a fixed