From: Graham Percival Date: Thu, 3 Apr 2008 03:23:30 +0000 (-0700) Subject: LSR: update. X-Git-Tag: release/2.11.44-1~39^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=80ed5a545c47955594996023417093d0693ea712;p=lilypond.git LSR: update. --- diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly deleted file mode 100644 index af753c7f6c..0000000000 --- a/input/lsr/clefs-commonly-tweaked-properties.ly +++ /dev/null @@ -1,82 +0,0 @@ -%% 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 { - 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 -printed when any of these properties 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 -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. - - -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 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 behavior 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'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: - - \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.middleCPosition = #0 - c' -} diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list index 978ea8cf1c..26494a9118 100644 --- a/input/lsr/pitches.snippet-list +++ b/input/lsr/pitches.snippet-list @@ -3,10 +3,10 @@ adding-ambitus-per-voice.ly applying-note-head-styles-depending-on-the-step-of-the-scale.ly transposing-pitches-with-minimum-accidentals-smart-transpose.ly ottava-text.ly +tweaking-clef-properties.ly preventing-extra-naturals-from-being-automatically-added.ly ambitus-with-multiple-voices.ly generating-random-notes.ly -clefs-commonly-tweaked-properties.ly dodecaphonic-style-accidentals-for-each-note-including-naturals.ly preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly quoting-another-voice-with-transposition.ly diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly index 858a304cc2..b09134cc84 100644 --- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly @@ -11,16 +11,18 @@ mark has to be added at the end of a score -- when there is no next line. In such cases, the right end of the mark has to be aligned with the -final barline, as demonstrated on the second line of this example. +final bar line, as demonstrated on the second line of this example. " } % begin verbatim \relative c'' { \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible - g2 c d, a' + g2 c + d, a' \mark \default \break \override Score.RehearsalMark #'self-alignment-X = #right - g b, c1 \bar "||" + g b, + c1 \bar "||" \mark "D.C. al Fine" } diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index 1de82b50f2..e6594271f7 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -6,11 +6,11 @@ changing-the-number-of-lines-in-a-staff.ly adding-an-extra-staff-at-a-line-break.ly display-bracket-with-only-one-staff-in-a-system.ly time-signature-in-parentheses.ly +tweaking-clef-properties.ly adding-an-extra-staff.ly changing-the-staff-size.ly use-square-bracket-at-the-start-of-a-staff-group.ly quoting-another-voice-with-transposition.ly -clefs-commonly-tweaked-properties.ly quoting-another-voice.ly volta-multi-staff.ly inserting-score-fragments-above-a-staff,-as-markups.ly diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly new file mode 100644 index 0000000000..af753c7f6c --- /dev/null +++ b/input/lsr/tweaking-clef-properties.ly @@ -0,0 +1,82 @@ +%% 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 { + 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 +printed when any of these properties 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 +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. + + +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 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 behavior 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'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: + + \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.middleCPosition = #0 + c' +} diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index 3598567b3e..b016069f67 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,5 +1,5 @@ display-bracket-with-only-one-staff-in-a-system.ly -time-signature-in-parentheses.ly +rhythmic-slashes.ly changing-the-default-text-font-family.ly drawing-boxes-around-grobs.ly manually-controlling-beam-positions.ly @@ -10,11 +10,11 @@ using-the--tweak-command-to-tweak-individual-grobs.ly controlling-tuplet-bracket-visibility.ly positioning-multi--measure-rests.ly changing-the-staff-size.ly -clefs-commonly-tweaked-properties.ly vertically-aligning-ossias-and-lyrics.ly changing-properties-for-individual-grobs.ly altering-the-number-of-stems-in-a-beam.ly mensurstriche-layout-bar-lines-between-the-staves.ly +tweaking-clef-properties.ly vertically-centered-dynamics-and-textscripts.ly proportional-strict-notespacing.ly making-an-object-invisible-with-the-transparent-property.ly @@ -24,6 +24,6 @@ drawing-circles-around-various-objects.ly creating-text-spanners.ly caesura-railtracks-with-fermata.ly changing-form-of-multi--measure-rests.ly -rhythmic-slashes.ly +time-signature-in-parentheses.ly changing-a-single-notes-size-in-a-chord.ly nesting-staves.ly