From: Graham Percival Date: Fri, 30 Nov 2007 03:37:28 +0000 (-0800) Subject: LSR: automatic update. X-Git-Tag: release/2.11.36-1~55 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=260cf68e546aad75b850561f09c47bfd50beef66;p=lilypond.git LSR: automatic update. --- diff --git a/input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly new file mode 100644 index 0000000000..5b5cb5bab3 --- /dev/null +++ b/input/lsr/expressive/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +LilyPond syntax can involve many unusual placements for parentheses, +brackets etc., which might sometimes have to be interleaved.For +example, when entering a manual beam, the left square bracket has to be +placed after the starting note and its duration, not before. Similarly, +the right square bracket should directly follow the note which is to be +at the end of the requested beaming, even if this note happens to be +inside a tuplet section. This snippet demonstrates how to superpose +manual beaming, manual slurs, ties, and phrasing slurs, while using +tuplet sections (enclosed with curly braces). +" } + +{ + r16[ g16 \times 2/3 {r16 e'8] } + + g16( a \times 2/3 {b d e') } + + g8[( a \times 2/3 {b d') e'~]} + + \times 4/5 {e'32\( a b d' e'} a'4.\) +} diff --git a/input/lsr/expressive/adding-parentheses-around-an-expressive-mark.ly b/input/lsr/expressive/adding-parentheses-around-an-expressive-mark.ly new file mode 100644 index 0000000000..1e2d06718a --- /dev/null +++ b/input/lsr/expressive/adding-parentheses-around-an-expressive-mark.ly @@ -0,0 +1,16 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +The parenthesize function is a special tweak that encloses objects in +parentheses. The associated grob is Score.ParenthesesItem. +" } + +\relative { + c4 -\parenthesize -. + + \override ParenthesesItem #'padding = #0.1 + + +} + diff --git a/input/lsr/expressive/breathing-sign.ly b/input/lsr/expressive/breathing-sign.ly new file mode 100644 index 0000000000..6de0a1371e --- /dev/null +++ b/input/lsr/expressive/breathing-sign.ly @@ -0,0 +1,53 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +Breathing signs are available in different tastes: commas (default), +ticks, vees and `railroad tracks' (caesura). +" } + +{ + %% Modern notation: + \new Staff { + \relative c'' { + \key es \major \time 3/4 + + %% this bar contains no \breathe + << + { g4 as g } \\ + { es4 bes es } + >> | + + %% by default, \breathe uses the rcomma, just as if saying: + %% \override BreathingSign #'text = + % #(make-musicglyph-markup "scripts.rcomma") + << + { g4 as g } \\ + { es4 \breathe bes es } + >> | + + %% rvarcomma and lvarcomma are variations of the default rcomma + %% and lcomma + + %% N.B.: must use Staff context here, since we start a Voice below + \override Staff.BreathingSign #'text = + #(make-musicglyph-markup "scripts.rvarcomma") + << + { g4 as g } \\ + { es4 \breathe bes es } + >> | + + %% wedge + \override BreathingSign #'text = + #(make-musicglyph-markup "scripts.upbow") + es8 d es f g8 \breathe f | + + %% caesura + \override BreathingSign #'text = + #(make-musicglyph-markup "scripts.caesura") + es8[ d] \breathe es[ f g f] | + es2 r4 \bar "||" \break + } + } +} + diff --git a/input/lsr/expressive/broken-crescendo-hairpin.ly b/input/lsr/expressive/broken-crescendo-hairpin.ly new file mode 100644 index 0000000000..12e3419bc2 --- /dev/null +++ b/input/lsr/expressive/broken-crescendo-hairpin.ly @@ -0,0 +1,35 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +In order to make parts of a crescendo hairpin invisible, the following +method is used: A white rectangle is drawn on top of the respective +part of the crescendo hairpin, making it invisible. the rectangle is +defined as postscript code within a text markup. In order to fine tune +the position and size of the markup, the number preceding the +\"setgray\" in the postscript definition can be set to a value <1 +making it grey. The two numbes before the \"scale\" in the postscript +code are responsible for the width and height of the rectangle, the two +numbers before the \"translate\" change the x- and y-origin of the +rectangle. Make sure to put the Hairpin in a lower layer than the Text +Markup to actually draw the rectangle above the hairpin. +" } + +\score +{ + \relative c' { + << { + \dynamicUp + \override DynamicLineSpanner #'staff-padding = #4 + r2 r16 c'8.\pp r4 + } \\ { + \override DynamicLineSpanner #'layer = #0 + des,2~\mf \< + \override TextScript #'layer = #2 + des16_\markup { \postscript #"1.9 -4.5 translate 5 4 scale 1 setgray 0 0 moveto 0 1 lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" } + r8. des4~ des16-> \sff + } + >> + } + \layout { ragged-right = ##t} +} diff --git a/input/lsr/expressive/caesura-railtracks-with-fermata.ly b/input/lsr/expressive/caesura-railtracks-with-fermata.ly new file mode 100644 index 0000000000..1abdc103a0 --- /dev/null +++ b/input/lsr/expressive/caesura-railtracks-with-fermata.ly @@ -0,0 +1,27 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +A caesura is sometimes denoted with a double \"railtracks\" breath mark +with a fermata sign positioned over the top of the railtracks. This +snippet should present an optically pleasing combination of railtracks +and a fermata. +" } + +{ + \context Voice { + c''2. + % use some scheme code to construct the symbol + \override BreathingSign #'text = #(markup #:line + (#:musicglyph "scripts.caesura" + #:translate (cons -1.75 1.6) + #:musicglyph "scripts.ufermata" + )) + \breathe c''4 + % set the breathe mark back to normal + \revert BreathingSign #'text + c''2. \breathe c''4 + \bar "|." + } +} + diff --git a/input/lsr/expressive/center-text-below-hairpin-dynamics.ly b/input/lsr/expressive/center-text-below-hairpin-dynamics.ly new file mode 100644 index 0000000000..4db721c4d5 --- /dev/null +++ b/input/lsr/expressive/center-text-below-hairpin-dynamics.ly @@ -0,0 +1,34 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +This example provides a function to typeset hairpin (de)crescendo with +some additional text below it, such as \"molto\" or \"poco\". + +The example also illustrates how to use modify the way an object +normally is printed, using some Scheme code. +" } + +hairpinWithCenteredText = #(define-music-function + (parser location text) (markup?) +#{ +\override Voice.Hairpin #'stencil = #(lambda (grob) + (ly:stencil-aligned-to + (ly:stencil-combine-at-edge + (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER) + Y + DOWN + (ly:stencil-aligned-to (ly:text-interface::print grob) X CENTER)) + X LEFT)) +\override Voice.Hairpin #'text = $text +#}) + + +hairpinMolto = \hairpinWithCenteredText \markup {\italic "molto"} +hairpinMore = \hairpinWithCenteredText \markup {\bigger "moltissimo"} + +\new Staff { + \hairpinMolto c'2\< c'2\f + \hairpinMore c'2\< c'2\f +} + diff --git a/input/lsr/expressive/changing--flageolet-mark-size.ly b/input/lsr/expressive/changing--flageolet-mark-size.ly new file mode 100644 index 0000000000..8184b9640d --- /dev/null +++ b/input/lsr/expressive/changing--flageolet-mark-size.ly @@ -0,0 +1,18 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +To make the \\flageolet circle smaller you can use the following scheme +code (found in the Lilypond-user-archive) +" } + +F = #(let ((m (make-music 'ArticulationEvent + 'articulation-type "flageolet"))) + (set! (ly:music-property m 'tweaks) + (acons 'font-size -3 + (ly:music-property m 'tweaks))) + m) + +\relative c'' { d4^\flageolet_\markup {"orginal \flageolet "} d4_\flageolet + c4^\F_\markup {smaller } c4_\F +} diff --git a/input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly new file mode 100644 index 0000000000..70f1183674 --- /dev/null +++ b/input/lsr/expressive/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -0,0 +1,27 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +The appearance of slurs may be changed from solid to dotted or dashed. + + +" } + +\score{ + \relative c'{ + c( d e c) | + \slurDotted + c( d e c) | + \slurSolid + c( d e c) | + \slurDashed + c( d e c) | + \slurSolid + c( d e c) | + } + \layout{ raggedright=##t } +} + + + + diff --git a/input/lsr/expressive/combining-dynamics-with-markup-texts.ly b/input/lsr/expressive/combining-dynamics-with-markup-texts.ly new file mode 100644 index 0000000000..69590e2297 --- /dev/null +++ b/input/lsr/expressive/combining-dynamics-with-markup-texts.ly @@ -0,0 +1,20 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +Some dynamics may involve text indications (such as \"più forte\", +\"piano subito\", etc.). They can be produced using a \\markup bloc. +" } + +\layout{ragged-right = ##t} + +piuf = \markup { \italic "molto" \dynamic "f" } + +\relative c''{ + c-\piuf + c + c2\< c2\! + + c2\< c2\! +} + diff --git a/input/lsr/repeats/volta-multi-staff.ly b/input/lsr/repeats/volta-multi-staff.ly new file mode 100644 index 0000000000..a59b9a8b7d --- /dev/null +++ b/input/lsr/repeats/volta-multi-staff.ly @@ -0,0 +1,28 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +By setting @code{voltaOnThisStaff}, repeat brackets can be put over +staves other than the topmost one in a score. +" } + +\layout { + ragged-right = ##t +} + +vmus = { + \repeat volta 2 c1 \alternative { d e } +} + +\relative c'' << + \new StaffGroup << + \context Staff \vmus + \new Staff \vmus + >> + \new StaffGroup << + \new Staff << + \set Staff.voltaOnThisStaff = ##t + \vmus >> + \new Staff \vmus + >> +>> diff --git a/input/lsr/staff/adding-ambiti-per-voice.ly b/input/lsr/staff/adding-ambiti-per-voice.ly new file mode 100644 index 0000000000..014475bb20 --- /dev/null +++ b/input/lsr/staff/adding-ambiti-per-voice.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +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 + \voiceOne + c4 a d e f2 + } + \new Voice \with { + \consists "Ambitus_engraver" + } \relative c' { + \voiceTwo + es4 f g as b2 + } +>> + diff --git a/input/lsr/staff/adding-an-extra-staff.ly b/input/lsr/staff/adding-an-extra-staff.ly new file mode 100644 index 0000000000..38d41f1391 --- /dev/null +++ b/input/lsr/staff/adding-an-extra-staff.ly @@ -0,0 +1,31 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +You can add (possibly temporarily) an extra staff after the beginning +of a piece. +" } + +\score { + << + \new Staff \relative c''{ c1 c c c c } + \new StaffGroup \relative c''{ + \new Staff + c1 c + << c1 \new Staff { c1 } >> + c + } + >> + \layout { + + \context{ + \Score + + } + } +} + + + + + diff --git a/input/lsr/staff/adding-and-extra-staff-at-a-line-break.ly b/input/lsr/staff/adding-and-extra-staff-at-a-line-break.ly new file mode 100644 index 0000000000..064f92d10b --- /dev/null +++ b/input/lsr/staff/adding-and-extra-staff-at-a-line-break.ly @@ -0,0 +1,36 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +When adding a new Staff at a line break, LilyPond will unfortunately +add some extra space at the end of the line before the break (to fit in +a key signature change, which will never be printed anyway). The +workaround is to add a setting of Staff.explicitKeySignatureVisibility +as is shown in the example. In version 2.10 and earlier, you have to do +a similar setting for the time signatures, see the example. +" } + +\score { + \new StaffGroup \relative c''{ + \new Staff + \key f \major + c1 c^"Unwanted extra space" \break + << { c1 c } + \new Staff { + \key f \major + c1 c + } + >> + c1 c^"Fixed here" \break + << { c1 c } + \new Staff { + \once \set Staff.explicitKeySignatureVisibility = #end-of-line-invisible + %The next line is not needed in 2.11.x or later: + \once \override Staff.TimeSignature #'break-visibility = #end-of-line-invisible + \key f \major + c1 c + } + >> + } +} + diff --git a/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly new file mode 100644 index 0000000000..416e87d2fc --- /dev/null +++ b/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly @@ -0,0 +1,32 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +The number of lines in a staff may changed by overriding +@code{line-count} in the properties of @code{StaffSymbol}. + + +" } + +upper = \relative c'' { + c1 d e f +} + +lower = \relative c { + c1 b a g +} + +\score { + \context PianoStaff << + \new Staff << + \upper + >> + \new Staff { + \override Staff.StaffSymbol #'line-count = #4 + \clef bass + \lower + } + >> + +} + diff --git a/input/lsr/staff/changing-the-staff-size.ly b/input/lsr/staff/changing-the-staff-size.ly new file mode 100644 index 0000000000..b1b972ffdb --- /dev/null +++ b/input/lsr/staff/changing-the-staff-size.ly @@ -0,0 +1,22 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +In order to change staff sizes, both @code{staff-space} and +@code{fontSize} must be scaled. +" } + +{ + \new Staff \relative c'' { \dynamicDown c8 \ff c c c c c c c } +} + +{ + \new Staff \with { + fontSize = #-3 + \override StaffSymbol #'staff-space = #(magstep -3) + } { + \clef bass + c8 c c c c c c c + } +} + diff --git a/input/lsr/staff/clefs-commonly-tweaked-properties.ly b/input/lsr/staff/clefs-commonly-tweaked-properties.ly new file mode 100644 index 0000000000..90eb606cb1 --- /dev/null +++ b/input/lsr/staff/clefs-commonly-tweaked-properties.ly @@ -0,0 +1,30 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { 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. The following +example shows possibilities when setting properties manually. +" } + +{ + \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 + \clef "bass" + c'4 + \set Staff.middleCPosition = #4 + c'4 +} + diff --git a/input/lsr/staff/clefs.ly b/input/lsr/staff/clefs.ly new file mode 100644 index 0000000000..68966e277a --- /dev/null +++ b/input/lsr/staff/clefs.ly @@ -0,0 +1,38 @@ +%% 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 +} +