Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / lsr / clefs-commonly-tweaked-properties.ly

diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly
index 1d09848d53373b3632d5492ca843db8bbdfb24cc..fe0a4ea9eb2c03ab847b505597564ef2410a69f0 100644 (file)
--- a/input/lsr/clefs-commonly-tweaked-properties.ly
+++ b/input/lsr/clefs-commonly-tweaked-properties.ly
@@ -1,11 +1,13 @@
-%% Do not edit this file; it is auto-generated from LSR!
-%% Tags: pitches, staff-notation, editorial-and-educational-use
-\version "2.11.35"
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.11.38"
 
-\header { texidoc = "
+\header {
+  lsrtags = "pitches, staff-notation, tweaks-and-overrides"
+ texidoc = "
 The command @code{\\clef \"treble_8\"} is equivalent to setting
-@code{clefGlyph}, @code{clefPosition} (which controls the Y position of
-the clef), @code{middleCPosition} and @code{clefOctavation}.  A clef is
+@code{clefGlyph}, @code{clefPosition} (which controls the Y-position of
+the clef), @code{middleCPosition} and @code{clefOctavation}. A clef is
 printed when any of these properties are changed.
 
 
@@ -14,66 +16,67 @@ 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 centre line,
 positive numbers displacing upwards, counting 1 for each line and
-space. The clefOctavation value would normally be set to 7, -7, 15 or
--15, but other values are not invalid.
+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
 printed at both the end of the previous line and the beginning of the
 new line by default. If the warning clef at the end of the previous
-line in not required it can be suppressed by setting the
-explicitClefVisibility Staff property to the value  @code{
-end-of-line-invisible: \\set Staff.explicitClefVisibility =
-#end-of-line-invisible  } The default behaviour can be recovered with 
-@code{\\unset Staff.explicitClefVisibility}
-
+line is not required it can be suppressed by setting the @code{Staff}
+property @code{explicitClefVisibility} to the value
+@code{end-of-line-invisible}. The default behaviour can be recovered
+with  @code{\\unset Staff.explicitClefVisibility}.
 
 The following examples show the possibilities when setting these
 properties manually. On the first line, the manual changes preserve the
 standard relative positioning of clefs and notes, whereas on the second
 line, they do not. 
 " }
-
+% begin verbatim
 {
-           % The default treble clef
-           c'4
-           % The standard bass clef
-           \set Staff.clefGlyph = #"clefs.F"
-           \set Staff.clefPosition = #2
-           \set Staff.middleCPosition = #6
-           c'4
-           % The baritone clef
-           \set Staff.clefGlyph = #"clefs.C"
-           \set Staff.clefPosition = #4
-           \set Staff.middleCPosition = #4
-           c'4
-           % The standard choral tenor clef
-           \set Staff.clefGlyph = #"clefs.G"
-           \set Staff.clefPosition = #-2
-           \set Staff.clefOctavation = #-7
-           \set Staff.middleCPosition = #1
-           c'4
-           % A non-standard clef
-           \set Staff.clefPosition = #0
-           \set Staff.clefOctavation = #0
-           \set Staff.middleCPosition = #-4
-           c'4 \break
+  % The default treble clef
+  c'1
+  % The standard bass clef
+  \set Staff.clefGlyph = #"clefs.F"
+  \set Staff.clefPosition = #2
+  \set Staff.middleCPosition = #6
+  c'
+  % The baritone clef
+  \set Staff.clefGlyph = #"clefs.C"
+  \set Staff.clefPosition = #4
+  \set Staff.middleCPosition = #4
+  c'
+  % The standard choral tenor clef
+  \set Staff.clefGlyph = #"clefs.G"
+  \set Staff.clefPosition = #-2
+  \set Staff.clefOctavation = #-7
+  \set Staff.middleCPosition = #1
+  c'
+  % A non-standard clef
+  \set Staff.clefPosition = #0
+  \set Staff.clefOctavation = #0
+  \set Staff.middleCPosition = #-4
+  c' \break
+
+  % The following clef changes do not preserve
+  % the normal relationship between notes and clefs:
 
-           % The following clef changes do not preserve
-           % the normal relationship between notes and clefs:
+  \set Staff.clefGlyph = #"clefs.F"
+  \set Staff.clefPosition = #2
+  c'
+  \set Staff.clefGlyph = #"clefs.G"
+  c'
+  \set Staff.clefGlyph = #"clefs.C"
+  c'
+  \set Staff.clefOctavation = #7
+  c'
+  \set Staff.clefOctavation = #0
+  \set Staff.clefPosition = #0
+  c'
+  
+  % Here we go back to the normal clef:
 
-           \set Staff.clefGlyph = #"clefs.F"
-           \set Staff.clefPosition = #2
-           c'4
-           \set Staff.clefGlyph = #"clefs.G"
-           c'4
-           \set Staff.clefGlyph = #"clefs.C"
-           c'4
-           \set Staff.clefOctavation = #7
-           c'4
-           \set Staff.clefOctavation = #0
-           \set Staff.clefPosition = #0
-           c'4
-           \set Staff.middleCPosition = #4
-           c'4
-         }
+  \set Staff.middleCPosition = #4
+  c'
+}