Merge branch 'lilypond/translation'

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

diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 71ab7bfb0913ee8f1012ec9cf47342cfa0113d85..8dd363d71292362f051deab1f8d3f6f25a232e7b 100644 (file)
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.15.10"
 
 
 @node Ancient notation
@@ -499,12 +499,14 @@ petrucci style C clefs, for use on different staff lines
 @end lilypond
 
 @item
-petrucci style F clef
+petrucci style F clefs, for use on different staff lines
+(the example shows the 3rd staff line F clef)
 @tab
-@code{petrucci-f}
+@code{petrucci-f3}, @code{petrucci-f4},@*
+@code{petrucci-f5}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "petrucci-f"
+  \clef "petrucci-f3"
   \override NoteHead #'style = #'mensural
   c
 @end lilypond
@@ -631,9 +633,10 @@ Notation Reference:
 @ref{Time signature}.
 
 @knownissues
-Ratios of note durations do not change with the time signature.  For
+Ratios of note durations cannot change with the time signature,
+as those are not constant.  For
 example, the ratio of 1@tie{}breve = 3@tie{}semibreves
-(@emph{tempus perfectum}) must be made by hand, by setting
+(@emph{tempus perfectum}) can be made by hand, by setting
 
 @example
 breveTP = #(ly:make-duration -1 0 3 2)
@@ -657,13 +660,13 @@ Use @code{\markup @{\musicglyph #"timesig.mensural68alt" @}} instead.
 For ancient notation, a note head style other than the
 @code{default} style may be chosen.  This is accomplished by setting
 the @code{style} property of the @code{NoteHead} object to
-@code{baroque}, @code{neomensural}, @code{mensural} or
-@code{petrucci}.
+@code{baroque}, @code{neomensural}, @code{mensural},
+@code{petrucci}, @code{blackpetrucci} or @code{semipetrucci}.
 
 The @code{baroque} style differs from the @code{default} style by:
 
 @itemize
-@item Providing a @code{maxima} notehead, and
+@item Providing a @code{maxima} note head, and
 @item Using a square shape for @code{\breve} note heads.
 @end itemize
 
@@ -676,6 +679,17 @@ and
 @item Centering the stems on the note heads.
 @end itemize
 
+The @code{blackpetrucci} style produces note heads usable in black
+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 multiplyer can be different if coloratio is used e.g. to notate
+triplets.
+
+Use @code{semipetrucci} style to draw half-colored
+note heads (breves, longas and maximas).
+
 
 The following example demonstrates the @code{petrucci} style:
 
@@ -687,7 +701,12 @@ The following example demonstrates the @code{petrucci} style:
 \autoBeamOff
 \override NoteHead #'style = #'petrucci
 a'\maxima a'\longa a'\breve a'1 a'2 a'4 a'8 a'16 a'
-
+\override NoteHead #'style = #'semipetrucci
+a'\breve*5/6
+\override NoteHead #'style = #'blackpetrucci
+a'8*4/3 a'
+\override NoteHead #'style = #'petrucci
+a'\longa
 @end lilypond
 
 
@@ -713,7 +732,7 @@ select ancient flags.  Besides the @code{default} flag style,
 only the @code{mensural} style is supported.
 
 @lilypond[quote,fragment,ragged-right,verbatim]
-\override Stem #'flag-style = #'mensural
+\override Flag #'style = #'mensural
 \override Stem #'thickness = #1.0
 \override NoteHead #'style = #'mensural
 \autoBeamOff
@@ -789,6 +808,13 @@ Snippets:
 @rlsr{Ancient notation}.
 
 
+@knownissues
+The glyph for the maxima rest in mensural style is actually a perfect
+longa rest; use two (or three) longa rests to print a maxima rest.
+Longa rests are not grouped automatically, so have to be done manually by
+using pitched rests.
+
+
 @node Mensural accidentals and key signatures
 @unnumberedsubsubsec Mensural accidentals and key signatures
 
@@ -910,6 +936,13 @@ that the full musical information of the ligature is known internally.
 This is not only required for correct MIDI output, but also allows for
 automatic transcription of the ligatures.
 
+At certain places two consecutive notes can be represented either as
+two squares or as an oblique parallelogram (flexa shape).  In such
+cases the default is the two squares, but a flexa can be required by
+setting the @code{ligature-flexa} property of the @emph{second} note
+head.  The length of a flexa can be set by the note head property
+@code{flexa-width}.
+
 For example,
 
 @c @example
@@ -928,11 +961,14 @@ For example,
   \transpose c c' {
     \set Score.timing = ##f
     \set Score.defaultBarType = "empty"
-    \override NoteHead #'style = #'neomensural
-    \override Staff.TimeSignature #'style = #'neomensural
+    \override NoteHead #'style = #'petrucci
+    \override Staff.TimeSignature #'style = #'mensural
     \clef "petrucci-g"
     \[ c'\maxima g \]
-    \[ d\longa c\breve f e d \]
+    \[ d\longa
+       \override NoteHead #'ligature-flexa = ##t
+       \once \override NoteHead #'flexa-width = #3.2
+       c\breve f e d \]
     \[ c'\maxima d'\longa \]
     \[ e'1 a g\breve \]
   }
@@ -954,11 +990,14 @@ to the following
 \transpose c c' {
   \set Score.timing = ##f
   \set Score.defaultBarType = "empty"
-  \override NoteHead #'style = #'neomensural
-  \override Staff.TimeSignature #'style = #'neomensural
+  \override NoteHead #'style = #'petrucci
+  \override Staff.TimeSignature #'style = #'mensural
   \clef "petrucci-g"
   \[ c'\maxima g \]
-  \[ d\longa c\breve f e d \]
+  \[ d\longa
+     \override NoteHead #'ligature-flexa = ##t
+     \once \override NoteHead #'flexa-width = #3.2
+     c\breve f e d \]
   \[ c'\maxima d'\longa \]
   \[ e'1 a g\breve \]
 }
@@ -974,7 +1013,7 @@ Notation Reference:
 
 @knownissues
 Horizontal spacing of ligatures is poor.
-
+Accidentals may collide with previous notes.
 
 @node Typesetting Gregorian chant
 @subsection Typesetting Gregorian chant
@@ -1077,6 +1116,7 @@ Editio Vaticana style do clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'vaticana.punctum
   \clef "vaticana-do2"
   c
@@ -1092,6 +1132,7 @@ Editio Vaticana style fa clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'vaticana.punctum
   \clef "vaticana-fa2"
   c
@@ -1108,6 +1149,7 @@ Editio Medicaea style do clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'medicaea.punctum
   \clef "medicaea-do2"
   c
@@ -1123,6 +1165,7 @@ Editio Medicaea style fa clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'medicaea.punctum
   \clef "medicaea-fa2"
   c
@@ -1139,6 +1182,7 @@ hufnagel style do clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'hufnagel.punctum
   \clef "hufnagel-do2"
   c
@@ -1154,6 +1198,7 @@ hufnagel style fa clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'hufnagel.punctum
   \clef "hufnagel-fa2"
   c
@@ -1168,6 +1213,7 @@ hufnagel style combined do/fa clef
   \override Staff.StaffSymbol #'color = #red
   \override Staff.LedgerLineSpanner #'color = #red
   \override Voice.Stem #'transparent = ##t
+  \override Voice.Flag #'transparent = ##t
   \override NoteHead #'style = #'hufnagel.punctum
   \clef "hufnagel-do-fa"
   c
@@ -1213,7 +1259,7 @@ As shown, not all accidentals are supported by each style.  When
 trying to access an unsupported accidental, LilyPond will switch to a
 different style.
 
-@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@c @lilypondfile[verbatim,quote,texidoc,doctitle]
 @c {ancient-accidentals.ly}
 
 The style for accidentals and key signatures is controlled by the
@@ -2423,7 +2469,7 @@ syncopated notes at bar lines, while still providing the
 orientation aids that bar lines give.
 
 
-@lilypondfile[verbatim,lilyquote,texidoc]
+@lilypondfile[verbatim,quote,texidoc]
 {mensurstriche-layout-bar-lines-between-the-staves.ly}
 
 @c This simple setup will take care of the
@@ -2462,7 +2508,9 @@ single-tone recitative to a fixed melodic gesture.  In these cases,
 one can use either @code{\override Stem #'transparent = ##t} or
 @code{\override Stem #'length = #0} instead, and restore the stem
 when needed with the corresponding @code{\once \override Stem
-#'transparent = ##f} (see example below).
+#'transparent = ##f} (see example below).  When using stems that
+carry flags, make sure to set @code{\override Flag #'transparent
+= ##t} as well.
 
 @b{Timing.} For unmetered chant, there are several alternatives.
 
@@ -2510,6 +2558,7 @@ verba = \lyricmode {
       \remove "Time_signature_engraver"
       \remove "Bar_engraver"
       \override Stem #'transparent = ##t
+      \override Flag #'transparent = ##t
     }
   }
 }
@@ -2528,7 +2577,8 @@ chant = \relative c' {
   c\breve \override NoteHead #'transparent = ##t  c c c c c
   \revert NoteHead #'transparent
   \override Stem #'transparent = ##f \stemUp c4 b4 a
-  \override Stem #'transparent = ##t c2 c4  \divisioMaior
+  \override Stem #'transparent = ##t
+  \override Flag #'transparent = ##t c2 c4  \divisioMaior
   c\breve \override NoteHead #'transparent = ##t c c c c c c c
   \revert NoteHead #'transparent c4 c f, f \finalis
 }
@@ -2549,6 +2599,7 @@ verba = \lyricmode {
       \remove "Time_signature_engraver"
       \override BarLine #'transparent = ##t
       \override Stem #'transparent = ##t
+      \override Flag #'transparent = ##t
     }
   }
 }
@@ -2568,7 +2619,7 @@ notation of the original.
 
 To avoid that syllables of different width (such as @qq{-ri} and
 @qq{-rum}) spread the syllable note groups unevenly apart, the
-@code{#'X-extent} property of the @code{LyricText} object may be
+@code{'X-extent} property of the @code{LyricText} object may be
 set to a fixed value.  Another, more cumbersome way would be to
 add the syllables as @code{\markup} elements.  If further
 adjustments are necessary, this can be easily done with
@@ -2599,6 +2650,7 @@ spirLyr = \lyricmode {
       \remove "Time_signature_engraver"
       \override BarLine #'X-extent = #'(-1 . 1)
       \override Stem #'transparent = ##t
+      \override Flag #'transparent = ##t
       \override Beam #'transparent = ##t
       \override BarLine #'transparent = ##t
       \override TupletNumber #'transparent = ##t
@@ -2636,7 +2688,7 @@ TBC
 @c Add example of white note heads:
 @c In the french baroque some composers used white note heads in slow pieces,
 @c mainly in 3/2-time.  A quarter looks there like a eighth with a white
-@c notehead.  (Franz-Rudolf Kuhnen)
+@c note head.  (Franz-Rudolf Kuhnen)
 
 @c TODO Add example of this:
 @c I was referring to e.g. notated a8. a16, which should, if I
@@ -2645,7 +2697,7 @@ TBC
 @c staff as an hint to performers.  (Karl Hammer)
 
 
-TBC
+@c TBC
 
 
 @c @seealso