Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 2b7d0fbee57d0ce4f686b734c8675df7c664858f..0699239db55b6e8bdc52a3add4b21dd39d3d926a 100644 (file)
--- 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
@@ -461,7 +456,7 @@ Internals Reference:
 
 @knownissues
 There are no generally accepted standards for denoting
-quarter-tone accidentals, so LilyPond's symbol does not conform to
+quarter-tone accidentals, so LilyPond's symbols do not conform to
 any standard.
 
 
@@ -489,7 +484,7 @@ using Italian note names:
 The available languages and the note names they define are:
 
 @quotation
-@multitable {@code{nederlands}} {do re mi fa sol la sib si}
+@multitable {@code{nederlands}} {do re/re mi fa sol la sib si}
 @headitem Language
   @tab Note Names
 @item @code{nederlands}
@@ -502,7 +497,9 @@ The available languages and the note names they define are:
   @tab c d e f g a bf b
 @item @code{espanol} or @code{español}
   @tab do re mi fa sol la sib si
-@item @code{italiano} or @code{français}
+@item @code{français}
+  @tab do ré/re mi fa sol la sib si
+@item @code{italiano}
   @tab do re mi fa sol la sib si
 @item @code{norsk}
   @tab c d e f g a b h
@@ -521,7 +518,7 @@ In addition to note names, accidental suffixes may
 also vary depending on the language:
 
 @quotation
-@multitable {@code{nederlands}} {-@code{s}/-@code{-sharp}} {-@code{ess}/-@code{es}} {-@code{ss}/-@code{x}/-@code{-sharpsharp}} {-@code{essess}/-@code{eses}}
+@multitable {@code{nederlands}} {-@code{s}/-@code{-sharp}} {-@code{f}/-@code{-flat}} {-@code{ss}/-@code{x}/-@code{-sharpsharp}} {-@code{ff}/-@code{-flatflat}}
 @headitem Language
   @tab sharp @tab flat @tab double sharp @tab double flat
 @item @code{nederlands}
@@ -535,7 +532,9 @@ also vary depending on the language:
     @tab -@code{ff}/-@code{-flatflat}
 @item @code{espanol} or @code{español}
   @tab -@code{s} @tab -@code{b} @tab -@code{ss}/-@code{x} @tab -@code{bb}
-@item @code{italiano} or @code{français}
+@item @code{français}
+  @tab -@code{d} @tab -@code{b} @tab -@code{dd}/-@code{x} @tab -@code{bb}
+@item @code{italiano}
   @tab -@code{d} @tab -@code{b} @tab -@code{dd} @tab -@code{bb}
 @item @code{norsk}
   @tab -@code{iss}/-@code{is} @tab -@code{ess}/-@code{es} @tab -@code{ississ}/-@code{isis}
@@ -589,7 +588,9 @@ appear in this table do not provide special note names yet.
   @tab -qs @tab -qf @tab -tqs @tab -tqf
 @item @code{espanol} or @code{español}
   @tab -cs @tab -cb @tab -tcs @tab -tcb
-@item @code{italiano} or @code{français}
+@item @code{français}
+  @tab -sd @tab -sb @tab -dsd @tab -bsb
+@item @code{italiano}
   @tab -sd @tab -sb @tab -dsd @tab -bsb
 @item @code{portugues}
   @tab -sqt @tab -bqt @tab -stqt @tab -btqt
@@ -639,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.
@@ -714,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
@@ -832,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},
@@ -845,7 +841,7 @@ relative mode within transposed music, an additional @code{\relative}
 must be placed inside @code{\transpose}.
 
 Triple accidentals will not be printed if using @code{\transpose}. An
-@q{enharmonically equivalent} pitch will be used instead (e.g. d-flat
+@q{enharmonically equivalent} pitch will be used instead (e.g., d-flat
 rather than e-triple-flat).
 
 
@@ -894,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:
 
@@ -942,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:
 
@@ -999,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:
@@ -1113,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.
@@ -1222,6 +1214,13 @@ will be ignored.  The command
   c'1
 @end lilypond
 
+@noindent
+To be more precise, it is not the @code{\clef} command itself that
+prints a clef.  Instead, it sets or changes a property of the
+@code{Clef_engraver}, which then decides by its own whether to
+display a clef or not in the current staff.  The @code{forceClef}
+property overrides this decision locally to re-print a clef once.
+
 When there is a manual clef change, the glyph of the changed clef
 will be smaller than normal.  This behaviour can be overridden.
 
@@ -1290,7 +1289,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
@@ -1309,23 +1307,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
@@ -1428,7 +1417,6 @@ Internals Reference:
 
 @funindex set-octavation
 @funindex \ottava
-@funindex ottava
 
 @notation{Ottava brackets} introduce an extra transposition of an
 octave for the staff:
@@ -1483,7 +1471,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
@@ -3064,9 +3051,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,
@@ -3131,15 +3116,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
@@ -3163,17 +3143,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
@@ -3243,9 +3217,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