Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / tweaking-clef-properties.ly

diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
index d4c5d6ed3ef753c3b7223c0d96a77dbf33647db9..645530ea2bec1f24bd044a876d69edc2afd59854 100644 (file)
--- a/Documentation/snippets/tweaking-clef-properties.ly
+++ b/Documentation/snippets/tweaking-clef-properties.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
 %% DO NOT EDIT this file manually; it is automatically

-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it

 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.

-\version "2.14.2"
+\version "2.18.0"

 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"
 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"


@@ -20,10 +20,12 @@ except @code{middleCPosition} are changed.
 Note that changing the glyph, the position of the clef, or the
 octavation does not in itself change the position of subsequent notes
 on the staff: the position of middle C must also be specified to do
 Note that changing the glyph, the position of the clef, or the
 octavation does not in itself change the position of subsequent notes
 on the staff: the position of middle C must also be specified to do

-this. The positional parameters are relative to the staff center line,
-positive numbers displacing upwards, counting one for each line and
-space. The @code{clefOctavation} value would normally be set to 7, -7,
-15 or -15, but other values are valid.
+this. In order to get key signatures on the correct staff lines,
+@code{middleCClefPosition} must also be set.  The positional parameters
+are relative to the staff center line, positive numbers displacing
+upwards, counting one for each line and space. The
+@code{clefOctavation} value would normally be set to 7, -7, 15 or -15,
+but other values are valid.

 
 
 When a clef change takes place at a line break the new clef symbol is
 
 
 When a clef change takes place at a line break the new clef symbol is


@@ -43,36 +45,47 @@ line, they do not.
   doctitle = "Tweaking clef properties"
 } % begin verbatim
 
   doctitle = "Tweaking clef properties"
 } % begin verbatim
 

-
-\layout { ragged-right = ##t }
-
+\layout {
+  indent = 0
+  ragged-right = ##t
+}

 {
   % The default treble clef
 {
   % The default treble clef

+  \key f \major

   c'1
   % The standard bass clef
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
   \set Staff.middleCPosition = #6
   c'1
   % The standard bass clef
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
   \set Staff.middleCPosition = #6

+  \set Staff.middleCClefPosition = #6
+  \key g \major

   c'1
   % The baritone clef
   \set Staff.clefGlyph = #"clefs.C"
   \set Staff.clefPosition = #4
   \set Staff.middleCPosition = #4
   c'1
   % The baritone clef
   \set Staff.clefGlyph = #"clefs.C"
   \set Staff.clefPosition = #4
   \set Staff.middleCPosition = #4

+  \set Staff.middleCClefPosition = #4
+  \key f \major

   c'1
   % The standard choral tenor clef
   \set Staff.clefGlyph = #"clefs.G"
   \set Staff.clefPosition = #-2
   c'1
   % The standard choral tenor clef
   \set Staff.clefGlyph = #"clefs.G"
   \set Staff.clefPosition = #-2

-  \set Staff.clefOctavation = #-7
+  \set Staff.clefTransposition = #-7

   \set Staff.middleCPosition = #1
   \set Staff.middleCPosition = #1

+  \set Staff.middleCClefPosition = #1
+  \key f \major

   c'1
   % A non-standard clef
   \set Staff.clefPosition = #0
   c'1
   % A non-standard clef
   \set Staff.clefPosition = #0

-  \set Staff.clefOctavation = #0
+  \set Staff.clefTransposition = #0

   \set Staff.middleCPosition = #-4
   \set Staff.middleCPosition = #-4

+  \set Staff.middleCClefPosition = #-4
+  \key g \major

   c'1 \break
 
   % The following clef changes do not preserve
   c'1 \break
 
   % The following clef changes do not preserve

-  % the normal relationship between notes and clefs:
+  % the normal relationship between notes, key signatures
+  % and clefs:

 
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
 
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2


@@ -81,9 +94,9 @@ line, they do not.
   c'1
   \set Staff.clefGlyph = #"clefs.C"
   c'1
   c'1
   \set Staff.clefGlyph = #"clefs.C"
   c'1

-  \set Staff.clefOctavation = #7
+  \set Staff.clefTransposition = #7

   c'1
   c'1

-  \set Staff.clefOctavation = #0
+  \set Staff.clefTransposition = #0

   \set Staff.clefPosition = #0
   c'1
 
   \set Staff.clefPosition = #0
   c'1