From: Graham Percival Date: Sat, 29 Mar 2008 12:07:46 +0000 (-0700) Subject: LSR: update. X-Git-Tag: release/2.11.44-1~68 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4ec941211615e84d82c5129b7f6b51cef706a873;p=lilypond.git LSR: update. --- diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index 42b4a22122..d00ab08965 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -12,28 +12,26 @@ clef symbol) and have noteheads according to the drum. You can easily attach an extra symbol to the drum, and restrict the number of lines. " } % begin verbatim -drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat unfold 5 { hhc8 hho hhc8 hh16 hh } hhc4 r4 r2 } -drl = \drummode { \repeat unfold 3 { bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } -timb = \drummode { \repeat unfold 2 { timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb } } +drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh hhc8 hho hhc8 hh16 hh hhc4 r4 r2 } +drl = \drummode { bd4 sn8 bd bd4 << bd ss >> bd8 tommh tommh bd toml toml bd tomfh16 tomfh } +timb = \drummode { timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb } \score { - \repeat volta 2 { - << - \new DrumStaff \with { - drumStyleTable = #timbales-style - \override StaffSymbol #'line-count = #2 - \override BarLine #'bar-size = #2 - } << - \set Staff.instrumentName = "timbales" - \timb - >> - \new DrumStaff << - \set Staff.instrumentName = "drums" - \new DrumVoice { \stemUp \drh } - \new DrumVoice { \stemDown \drl } - >> + << + \new DrumStaff \with { + drumStyleTable = #timbales-style + \override StaffSymbol #'line-count = #2 + \override BarLine #'bar-size = #2 + } << + \set Staff.instrumentName = "timbales" + \timb >> - } + \new DrumStaff << + \set Staff.instrumentName = "drums" + \new DrumVoice { \stemUp \drh } + \new DrumVoice { \stemDown \drl } + >> + >> \layout {} \midi { \context { diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly index 1cb96225ba..fcd55166d1 100644 --- a/input/lsr/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -6,9 +6,10 @@ lsrtags = "text, vocal-music" texidoc = " You can specify different horizontal alignment for your lyrics, by -overriding the #'self-alignment-X property of the LyricText object. #-1 -is left, #0 is center and #1 is right; however, you can use #LEFT, -#CENTER and #RIGHT as well. +overriding the @code{#'self-alignment-X} property of the +@code{LyricText} object. @code{#-1} is left, @code{#0} is center and +@code{#1} is right; however, you can use @code{#LEFT}, @code{#CENTER} +and @code{#RIGHT} as well. " } % begin verbatim \relative c'' { diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index ec94f1d7c9..ae1c92d6d5 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -5,50 +5,46 @@ \header { lsrtags = "rhythms" texidoc = " -In time signature 2/2 or 4/4 the beam are @code{         _____         - _   _ Default | | | | I want | | | |. } Use a \"macro\" with -#(override-auto-beam-setting '..... - - - +In a simple time signature of 2/2 or 4/4, 8th notes are beamed by +default as two sets of four. Using a macro which overrides the +autobeaming behaviour, this snippet changes the beaming to quarter note +beats. " } % begin verbatim % Automatic beams two per two in 4/4 or 2/2 time signature -% _____ +% _____ % Default | | | | -% _ _ +% _ _ % I want | | | | -% The good way adapted from David Bobrof +% The good way adapted from David Bobroff % macro for beamed two per two in 2/2 and 4/4 time signature -qbeam={ - #(override-auto-beam-setting '(end 1 8 * *) 1 4 'Staff) - #(override-auto-beam-setting '(end 1 8 * *) 2 4 'Staff) - #(override-auto-beam-setting '(end 1 8 * *) 3 4 'Staff) - } -% other macros -timeFractionstyle = { \override Staff.TimeSignature #'style = #'() } -textn = ^\markup { without the macro } -texty = ^\markup { with the macro } +qbeam= { + #(override-auto-beam-setting '(end 1 8 * *) 1 4 'Staff) + #(override-auto-beam-setting '(end 1 8 * *) 2 4 'Staff) + #(override-auto-beam-setting '(end 1 8 * *) 3 4 'Staff) +} \score { - << - \new Staff << \relative c'' { - \timeFractionstyle - \time 4/4 - g8\textn g g g g g g g g g g g4 g8 g g - } - >> - - %Use the macro - - \new Staff << \relative c'' { - \timeFractionstyle - \time 4/4 - \qbeam - g8\texty g g g g g g g g g g g4 g8 g g - } - >> - >> + << + \new Staff \relative c'' { + \time 4/4 + g8^\markup { without the macro } g g g g g g g | + g g g g4 g8 g g | + } + %Use the macro + \new Staff \relative c'' { + \time 4/4 + \qbeam + g8^\markup { with the macro } g g g g g g g | + g g g g4 g8 g g | + } + >> + \layout { + \context { + \Staff + \override TimeSignature #'style = #'() + } + } } diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly index efe560040c..7f71858787 100644 --- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly +++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly @@ -19,5 +19,7 @@ The code for the chord example shown: @code{} " } % begin verbatim \relative { - <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup{A tiny e}_\markup{A big c} + <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup { A tiny e }_\markup { A big c } } +\layout { ragged-right = ##t } + diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index cd173a7242..a5b17af197 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -15,6 +15,6 @@ be printed, or the tuplet number may be suppressed altogether. \times 2/3 { c8 c c } \times 2/3 { c8 c c } \override TupletNumber #'text = #tuplet-number::calc-fraction-text \times 2/3 { c8 c c } - \override TupletNumber #'transparent = ##t + \override TupletNumber #'stencil = ##f \times 2/3 { c8 c c } } diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index e5b2c27707..47c57d79b3 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -15,8 +15,8 @@ played. fragment = \relative c' { c4 f4 4 - 8 a4 c2 4 e4 - c4 + 8 a4 c2 4 + e2 c2 } << diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index c493552014..b180f3b5a7 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -5,76 +5,56 @@ \header { lsrtags = "simultaneous-notes, text" 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. +The part combiner tool ( @code{\\partcombine} command ) allows you to +combine different parts on the same staff. Text directions such as +\"solo\" or \"a2\" are added by default; to remove them, simply set the +property @code{printPartCombineTexts} to \"false\". 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, +@code{\\partcombine} whitout texts, and @code{\\partcombine} with texts. -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. " } % begin verbatim -musicUp = { +musicUp = \relative c'' { \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 - } + a4 c4.( g8) a4 | + g4 e' g,( a8 b) | + c b a2. } -\score{ - \new Staff { - \set Staff.instrumentName = "Standard polyphony " - << \musicUp \\ \musicDown >> +musicDown = \relative c'' { + g4 e4.( d8) c4 | + r2 g'4( f8 e) | + d2 \stemDown a } - \layout{ - indent = 6.0\cm +\score { + << + << + \new Staff { + \set Staff.instrumentName = "Standard polyphony " + << \musicUp \\ \musicDown >> + } + \new Staff \with { printPartCombineTexts = ##f } { + \set Staff.instrumentName = "PartCombine without texts " + \partcombine \musicUp \musicDown + } + \new Staff { + \set Staff.instrumentName = "PartCombine with texts " + \partcombine \musicUp \musicDown + } + >> + >> + \layout { + indent = 6.0\cm + \context { + \Score + \override SystemStartBar #'collapse-height = #30 + } } } - -\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/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index 17bc15b9b3..7877ee704b 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -15,15 +15,17 @@ database.) " } % begin verbatim #(define (compound-time one two num) - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)))))) - + (markup #:override '(baseline-skip . 0) #:number + (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)))) + )) \relative { - %% compound time signature hack - \time 5/8 + % compound time signature hack \override Staff.TimeSignature #'stencil = #ly:text-interface::print - \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8" ) + \override Staff.TimeSignature #'text = #( compound-time "2" "3" "8" ) + \time 5/8 #(override-auto-beam-setting '(end 1 8 5 8) 1 4) - c8 d e fis gis | c fis, gis e d | c8 d e4 gis8 + c8 d e fis gis | + c fis, gis e d | + c8 d e4 gis8 } diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly index ebb58b3490..b9b7d2779e 100644 --- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -5,39 +5,49 @@ \header { lsrtags = "staff-notation, tweaks-and-overrides" texidoc = " -If there is only one staff in one of the staff types ChoirStaff, -InnerChoirStaff, InnerStaffGroup and StaffGroup, the bracket won't be -displayed as standard behaviour. This can be changed with: +If there is only one staff in one of the staff types @code{ChoirStaff}, +@code{InnerChoirStaff}, @code{InnerStaffGroup} or @code{StaffGroup}, +the bracket and the starting bar line will not be displayed as standard +behaviour. This can be changed with: @code{\\override [staffcontext].SystemStartBracket #'collapse-height = #1} + and + +@code{\\override [staffcontext].SystemStartBar #'collapse-height = #1} This applies to all staff contexts with @code{systemStartDelimiter}-property set to @code{'SystemStartBracket}. + For staff contexts with @code{'SystemStartBrace}, such as -@code{PianoStaff}, this tweaking can be used as well. +@code{PianoStaff}, this tweaking can be used as well. + + + " } % begin verbatim \score { - \new StaffGroup << - % Must be one lower than your actual amount off staff lines - \override StaffGroup.SystemStartBracket #'collapse-height = #4 - \new Staff { - c'4 d' e' f' - } - >> - } - { - \new PianoStaff << - \override PianoStaff.SystemStartBrace #'collapse-height = #4 - \new Staff { - c'4 d' e' f' - } - >> +\new StaffGroup << + % Must be lower than your actual amount off staff lines + \override StaffGroup.SystemStartBracket #'collapse-height = #1 + \override Score.SystemStartBar #'collapse-height = #1 + \new Staff { + c'4 d' e' f' + } + >> + } + { + \new PianoStaff << + \override PianoStaff.SystemStartBrace #'collapse-height = #1 + \override Score.SystemStartBar #'collapse-height = #1 + \new Staff { + c'4 d' e' f' + } + >> } \layout { ragged-right = ##t diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index 9b2185ce1e..58781733e6 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -8,7 +8,7 @@ Ties may be engraved manually by changing the @code{tie-configuration} property of the @code{TieColumn} object. The first number indicates the distance from the center of the staff in staff-spaces, and the second -number indicates the direction (1=up, -1=down). +number indicates the direction (1 = up, -1 = down). " } % begin verbatim \relative c' { diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index 667acf3fb1..373a935473 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -18,10 +18,8 @@ marks, but from the letter or number you want. c1 \mark \default c1 \mark \default c1 \mark \default - -\break - - \set Score.markFormatter = #format-mark-numbers + \break + \set Score.markFormatter = #format-mark-numbers c1 \mark #1 c1 \mark \default c1 \mark \default diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 32ee2eb564..c06315257c 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -5,12 +5,12 @@ \header { lsrtags = "rhythms, percussion" texidoc = " -Though the set-time-signature thing was not the most essential here, it -has been included to show the beat of this piece (which is a template -of a real balkan song!). +Though the polymetric time signature shown was not the most essential +item here, it has been included to show the beat of this piece (which +is the template of a real Balkan song!). " } % begin verbatim -#(define (compound-time one two three four five six seven eight nine ten +#(define (set-time-signature one two three four five six seven eight nine ten eleven num) (markup #:override '(baseline-skip . 0) #:number (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)) @@ -26,7 +26,7 @@ melody = \set Staff.instrumentName = "Bb Sop." \key g \major \time 25/8 \override Staff.TimeSignature #'stencil = #ly:text-interface::print - \override Staff.TimeSignature #'text = #(compound-time "3" "2" "2" "3" + \override Staff.TimeSignature #'text = #(set-time-signature "3" "2" "2" "3" "2" "2" "2" "2 " "3" "2" "2" "8" ) \set Staff.beatGrouping = #'(3 2 2 3 2 2 2 2 3 2 2) #(override-auto-beam-setting '(end * * 25 8) 3 8) diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index a57f8575b2..442c172727 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -13,11 +13,12 @@ Beam positions may be controlled manually, by overriding the " } % begin verbatim \relative c { + \time 2/4 % from upper staffline (position 4) to centre (position 0) \override Beam #'positions = #'(2 . 0) - c'8[ c] + c'8 c % from centre to one above centre (position 2) \override Beam #'positions = #'(0 . 1) - c[ c] + c c }