From: Graham Percival Date: Sat, 1 Dec 2007 03:40:45 +0000 (-0800) Subject: LSR: automatic update. X-Git-Tag: release/2.11.36-1~50 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e7d2a9102b8f2eab7b8a504b718e1819b7a73fdf;p=lilypond.git LSR: automatic update. --- diff --git a/input/lsr/editorial/clefs.ly b/input/lsr/editorial/clefs.ly deleted file mode 100644 index 68966e277a..0000000000 --- a/input/lsr/editorial/clefs.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " - The clef indicates which lines of the staff correspond to which -pitches. The clef is set with the @code{\\clef} command - - - @{ c''2 \\clef alto g'2 @} - - -Supported clefs include: - -@code{treble, violin, G, G2} G clef on 2nd line @code{alto, C} C clef -on 3rd line @code{tenor} C clef on 4th line. @code{bass, F} F clef on -4th line @code{french} G clef on 1st line, so-called French violin clef -@code{soprano} C clef on 1st line @code{mezzosoprano} C clef on 2nd -line @code{baritone} C clef on 5th line @code{varbaritone} F clef on -3rd line @code{subbass} F clef on 5th line @code{percussion} percussion -clef @code{tab} tablature clef - - By adding @code{_8} or @code{^8} to the clef name, the clef is -transposed one octave down or up, respectively, and @code{_15} and -@code{^15} transposes by two octaves. The argument clefname must be -enclosed in quotes when it contains underscores or digits. See the last -two bars for an example. -" } - -{ g'2 \clef alto g'2 - \clef tenor g'2 \clef bass g'2 - \clef french g'2 \clef soprano g'2 - \clef mezzosoprano g'2 \clef baritone g'2 - \clef varbaritone g'2 \clef subbass g'2 - \clef percussion g'2 \clef tab g'2 -% TO TRANSPOSE THE CLEF ONE OCTAVE UP OR DOWN SEE THE FOLLOWING BARS: - \clef "G_8" c'1 \clef "G^8" c'1 -} - diff --git a/input/lsr/pitches/adding-ambiti-per-voice.ly b/input/lsr/pitches/adding-ambiti-per-voice.ly index 014475bb20..c313028e4f 100644 --- a/input/lsr/pitches/adding-ambiti-per-voice.ly +++ b/input/lsr/pitches/adding-ambiti-per-voice.ly @@ -6,19 +6,21 @@ Ambits can be added per voice. In that case, the ambitus must be moved manually to prevent collisions. " } +{ \new Staff << \new Voice \with { \consists "Ambitus_engraver" } \relative c'' { - \override Ambitus #'X-offset = # 1.0 + \override Ambitus #'X-offset = # 2.0 \voiceOne - c4 a d e f2 + c4 a d e f1 } \new Voice \with { \consists "Ambitus_engraver" } \relative c' { \voiceTwo - es4 f g as b2 + es4 f g as b1 } >> +} diff --git a/input/lsr/pitches/ambitus.ly b/input/lsr/pitches/ambitus.ly deleted file mode 100644 index f077935570..0000000000 --- a/input/lsr/pitches/ambitus.ly +++ /dev/null @@ -1,31 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -Ambituses indicate pitch ranges for voices. - - -Accidentals only show up if they're not part of key signature. -@code{AmbitusNoteHead} grobs also have ledger lines. -" } - -\layout { - ragged-right = ##t - \context { - \Voice - \consists Ambitus_engraver - } -} - -\relative -<< - \new Staff { - \time 2/4 c4 f' - } - \new Staff \relative { - \time 2/4 - \key d \major - cis as' - } ->> - diff --git a/input/lsr/pitches/chords-entry---simultaneous-notes.ly b/input/lsr/pitches/chords-entry---simultaneous-notes.ly deleted file mode 100644 index f92b5d9de6..0000000000 --- a/input/lsr/pitches/chords-entry---simultaneous-notes.ly +++ /dev/null @@ -1,13 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -A chord is formed by a enclosing a set of pitches in < and >. A chord -may be followed by a duration, and a set of articulations, just like -simple notes -" } - -\relative c' -{ -4 8 -} diff --git a/input/lsr/pitches/clefs.ly b/input/lsr/pitches/clefs.ly deleted file mode 100644 index 68966e277a..0000000000 --- a/input/lsr/pitches/clefs.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " - The clef indicates which lines of the staff correspond to which -pitches. The clef is set with the @code{\\clef} command - - - @{ c''2 \\clef alto g'2 @} - - -Supported clefs include: - -@code{treble, violin, G, G2} G clef on 2nd line @code{alto, C} C clef -on 3rd line @code{tenor} C clef on 4th line. @code{bass, F} F clef on -4th line @code{french} G clef on 1st line, so-called French violin clef -@code{soprano} C clef on 1st line @code{mezzosoprano} C clef on 2nd -line @code{baritone} C clef on 5th line @code{varbaritone} F clef on -3rd line @code{subbass} F clef on 5th line @code{percussion} percussion -clef @code{tab} tablature clef - - By adding @code{_8} or @code{^8} to the clef name, the clef is -transposed one octave down or up, respectively, and @code{_15} and -@code{^15} transposes by two octaves. The argument clefname must be -enclosed in quotes when it contains underscores or digits. See the last -two bars for an example. -" } - -{ g'2 \clef alto g'2 - \clef tenor g'2 \clef bass g'2 - \clef french g'2 \clef soprano g'2 - \clef mezzosoprano g'2 \clef baritone g'2 - \clef varbaritone g'2 \clef subbass g'2 - \clef percussion g'2 \clef tab g'2 -% TO TRANSPOSE THE CLEF ONE OCTAVE UP OR DOWN SEE THE FOLLOWING BARS: - \clef "G_8" c'1 \clef "G^8" c'1 -} - diff --git a/input/lsr/pitches/combining-two-parts-on-the-same-staff.ly b/input/lsr/pitches/combining-two-parts-on-the-same-staff.ly deleted file mode 100644 index c31de07d25..0000000000 --- a/input/lsr/pitches/combining-two-parts-on-the-same-staff.ly +++ /dev/null @@ -1,74 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -The part combiner tool ( \\partcombine command ) allows you to combine -different parts on a same Staff. You can choose whether you want or -don't want to add texts such as \"solo\" or \"a2\", by defining the -printPartCombineTexts property. - -For vocal scores (hymns), there is no need to add \"solo\"/\"a2\" -texts, so they should be switched off. However, you'd better not use it -if there are any solos, as they won't be indicated. In such cases, you -may simply want to use standard LilyPond polyphony. - -This snippet presents the three ways two parts can be printed on a same -staff : standard polyphony, \\partcombine whitout texts, and -\\partcombine with texts. - - -" } - -musicUp = { \time 4/4 - \relative c'' { - a4 c4.(g8) a4 | - g4 e' g,( a8 b) | - c b a2. - } -} - -musicDown = { - \relative c'' { - g4 e4.(d8) c4 | - r2 g'4( f8 e) | - d2 a - } -} -\score{ - \new Staff { - \set Staff.instrumentName = "Standard polyphony " - << \musicUp \\ \musicDown >> - } - \layout{ - indent = 6.0\cm - } -} - -\score{ - \context Staff { - \set Staff.instrumentName = "PartCombine without texts " - \partcombine \musicUp \musicDown - } - \layout{ - indent = 6.0\cm - \context { - \Voice - printPartCombineTexts = ##f - } - } -} - -\score{ - \context Staff { - \set Staff.instrumentName = "PartCombine with texts " - \partcombine \musicUp \musicDown - } - \layout{ - indent = 6.0\cm - \context { - \Voice - printPartCombineTexts = ##t - } - } -} - diff --git a/input/lsr/pitches/forced-and-cautionary-accidentals.ly b/input/lsr/pitches/forced-and-cautionary-accidentals.ly deleted file mode 100644 index 0e7742133c..0000000000 --- a/input/lsr/pitches/forced-and-cautionary-accidentals.ly +++ /dev/null @@ -1,26 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " - Normally accidentals are printed automatically, but you may also print -them manually. A reminder accidental can be forced by adding an -exclamation mark ! after the pitch. A cautionary accidental (i.e., an -accidental within parentheses) can be obtained by adding the question -mark `?' after the pitch. - - - -Cautionary accidentals may be made smaller, or placed inside -parentheses -" } - -{ -cis' cis' cis'! cis'? - - c''4 - cis''?4 - \once \override Staff.AccidentalCautionary #'font-size = #-2 - cis''?4 - \once \override Staff.AccidentalCautionary #'parenthesized = ##t - cis''?4 -} diff --git a/input/lsr/pitches/generating-random-notes.ly b/input/lsr/pitches/generating-random-notes.ly index a41f2f0066..c565e37118 100644 --- a/input/lsr/pitches/generating-random-notes.ly +++ b/input/lsr/pitches/generating-random-notes.ly @@ -2,10 +2,11 @@ \version "2.10.12" \header { texidoc = " -This Scheme-based snippet allows you to generate 256 random notes based -on the current time (or any randomish number you might wish to specify -instead, so you can obtain the same random notes each time): i.e. to -get different random notes patterns, just change this number. +This Scheme-based snippet allows you to generate 32 random notes (or as +many as you want), based on the current time (or any randomish number +you might wish to specify instead, so you can obtain the same random +notes each time): i.e. to get different random notes patterns, just +change this number. " } \score { @@ -20,6 +21,6 @@ get different random notes patterns, just change this number. 'pitch (ly:make-pitch (quotient idx 7) (remainder idx 7) 0)))))) - (make-list 256))))) + (make-list 32))))) } } diff --git a/input/lsr/pitches/key-signatures.ly b/input/lsr/pitches/key-signatures.ly deleted file mode 100644 index c36c1f2e07..0000000000 --- a/input/lsr/pitches/key-signatures.ly +++ /dev/null @@ -1,44 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -The key signature indicates the tonality in which a piece is played. -It is denoted by a set of alterations (flats or sharps) at the start of -the staff. - - Setting or changing the key signature is done with the @code{\\key} -command - - -@code{\\key} pitch type - - -Here, type should be @code{\\major} or @code{\\minor} to get -pitch-major or pitch-minor, respectively. You may also use the -standard mode names (also called “church modes”): @code{\\ionian}, -@code{\\locrian}, @code{\\aeolian}, @code{\\mixolydian}, -@code{\\lydian}, @code{\\phrygian}, and @code{\\dorian}. - - -This command sets the context property @code{Staff.keySignature}. -Non-standard key signatures can be specified by setting this property -directly. - - -Accidentals and key signatures often confuse new users, because -unaltered notes get natural signs depending on the key signature. -" } - -\relative c'' -{ -\key d \major -a b cis d -\key g \minor -a bes c d -\set Staff.printKeyCancellation = ##f -\key d \major -a b cis d -\key g \minor -a bes c d -} - diff --git a/input/lsr/pitches/microtones---quarter-tones.ly b/input/lsr/pitches/microtones---quarter-tones.ly deleted file mode 100644 index 61b744fb3a..0000000000 --- a/input/lsr/pitches/microtones---quarter-tones.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -Half-flats and half-sharps are formed by adding -eh and -ih; the -following is a series of Cs with increasing pitches. Micro tones are -also exported to the MIDI file. There are no generally accepted -standards for denoting three quarter flats, so LilyPond's symbol does -not conform to any standard. -" } - -\relative c'' -{ -{ ceseh ceh cih cisih } -} diff --git a/input/lsr/pitches/pitches-entry-1.ly b/input/lsr/pitches/pitches-entry-1.ly deleted file mode 100644 index 4b00fa1661..0000000000 --- a/input/lsr/pitches/pitches-entry-1.ly +++ /dev/null @@ -1,14 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -The notes are specified by the letters a through g. The octave is -formed with notes ranging from c to b. The pitch c is an octave below -middle C and the letters span the octave above that C. -" } - -{ -\clef bass -a,4 b, c d e f g a b c' d' e' \clef treble f' g' a' b' c'' -} - diff --git a/input/lsr/pitches/pitches-entry-2---accidental-signs.ly b/input/lsr/pitches/pitches-entry-2---accidental-signs.ly deleted file mode 100644 index 3c46c6dd38..0000000000 --- a/input/lsr/pitches/pitches-entry-2---accidental-signs.ly +++ /dev/null @@ -1,22 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -A sharp is formed by adding -is to the end of a pitch name and a flat -is formed by adding -es. Double sharps and double flats are obtained by -adding -isis or -eses. These names are the Dutch note names. In Dutch, -aes is contracted to as, but both forms are accepted. Similarly, both -es and ees are accepted. -" } - -\relative c'' -{ -% ly snippet contents follows: -ceses4 -ces -c -cis -cisis - -% end ly snippet -} diff --git a/input/lsr/pitches/pitches-entry-3---octaves.ly b/input/lsr/pitches/pitches-entry-3---octaves.ly deleted file mode 100644 index bc8c67ad32..0000000000 --- a/input/lsr/pitches/pitches-entry-3---octaves.ly +++ /dev/null @@ -1,13 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -The optional octave specification takes the form of a series of single -quote (`'') characters or a series of comma (`,') characters. Each ' -raises the pitch by one octave; each , lowers the pitch by an octave -" } - -{ -c' c'' es' g' as' gisis' ais' -} - diff --git a/input/lsr/simultaneous/chords-entry---simultaneous-notes.ly b/input/lsr/simultaneous/chords-entry---simultaneous-notes.ly deleted file mode 100644 index f92b5d9de6..0000000000 --- a/input/lsr/simultaneous/chords-entry---simultaneous-notes.ly +++ /dev/null @@ -1,13 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -A chord is formed by a enclosing a set of pitches in < and >. A chord -may be followed by a duration, and a set of articulations, just like -simple notes -" } - -\relative c' -{ -4 8 -} diff --git a/input/lsr/staff/adding-ambiti-per-voice.ly b/input/lsr/staff/adding-ambiti-per-voice.ly index 014475bb20..c313028e4f 100644 --- a/input/lsr/staff/adding-ambiti-per-voice.ly +++ b/input/lsr/staff/adding-ambiti-per-voice.ly @@ -6,19 +6,21 @@ Ambits can be added per voice. In that case, the ambitus must be moved manually to prevent collisions. " } +{ \new Staff << \new Voice \with { \consists "Ambitus_engraver" } \relative c'' { - \override Ambitus #'X-offset = # 1.0 + \override Ambitus #'X-offset = # 2.0 \voiceOne - c4 a d e f2 + c4 a d e f1 } \new Voice \with { \consists "Ambitus_engraver" } \relative c' { \voiceTwo - es4 f g as b2 + es4 f g as b1 } >> +} diff --git a/input/lsr/staff/clefs.ly b/input/lsr/staff/clefs.ly deleted file mode 100644 index 68966e277a..0000000000 --- a/input/lsr/staff/clefs.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " - The clef indicates which lines of the staff correspond to which -pitches. The clef is set with the @code{\\clef} command - - - @{ c''2 \\clef alto g'2 @} - - -Supported clefs include: - -@code{treble, violin, G, G2} G clef on 2nd line @code{alto, C} C clef -on 3rd line @code{tenor} C clef on 4th line. @code{bass, F} F clef on -4th line @code{french} G clef on 1st line, so-called French violin clef -@code{soprano} C clef on 1st line @code{mezzosoprano} C clef on 2nd -line @code{baritone} C clef on 5th line @code{varbaritone} F clef on -3rd line @code{subbass} F clef on 5th line @code{percussion} percussion -clef @code{tab} tablature clef - - By adding @code{_8} or @code{^8} to the clef name, the clef is -transposed one octave down or up, respectively, and @code{_15} and -@code{^15} transposes by two octaves. The argument clefname must be -enclosed in quotes when it contains underscores or digits. See the last -two bars for an example. -" } - -{ g'2 \clef alto g'2 - \clef tenor g'2 \clef bass g'2 - \clef french g'2 \clef soprano g'2 - \clef mezzosoprano g'2 \clef baritone g'2 - \clef varbaritone g'2 \clef subbass g'2 - \clef percussion g'2 \clef tab g'2 -% TO TRANSPOSE THE CLEF ONE OCTAVE UP OR DOWN SEE THE FOLLOWING BARS: - \clef "G_8" c'1 \clef "G^8" c'1 -} -