From 9b81e29e93efacd46e4bbb89d9e37cb7d12977f8 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Mon, 3 Mar 2008 22:15:24 -0800 Subject: [PATCH] LSR: update. --- ...y-customized-polymetric-time-signatures.ly | 58 +++++++++++++------ input/lsr/modifying-tuplet-bracket-length.ly | 37 ++++++++++++ input/lsr/rhythms.snippet-list | 23 ++++---- input/lsr/time-signature-in-parentheses.ly | 27 +++------ 4 files changed, 97 insertions(+), 48 deletions(-) create mode 100644 input/lsr/modifying-tuplet-bracket-length.ly diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 0873ab4e5f..32ee2eb564 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -10,32 +10,52 @@ has been included to show the beat of this piece (which is a template of a real balkan song!). " } % begin verbatim -#(define (compound-time one two three four five six seven eight nine ten num) - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num)) #:vcenter "+" (#:column (three num)) #:vcenter "+" (#:column (four num)) #:vcenter "+" (#:column (five num)) #:vcenter "+" (#:column (six num)) #:vcenter "+" (#:column (seven num)) #:vcenter "+" (#:column (eight num)) #:vcenter "+" (#:column (nine num)) #:vcenter "+" (#:column (ten num)))))) +#(define (compound-time 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)) +#:vcenter "+" (#:column (three num)) #:vcenter "+" (#:column (four num)) +#:vcenter "+" (#:column (five num)) #:vcenter "+" (#:column (six num)) +#:vcenter "+" (#:column (seven num)) #:vcenter "+" (#:column (eight +num)) #:vcenter "+" (#:column (nine num)) #:vcenter "+" (#:column (ten +num)) #:vcenter "+" (#:column (eleven num)))))) melody = { \relative c'' { - \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" "2" "2" "2" "3" "2" "2" "8" ) - c8[ c c] d4 c8[ c] b[ c b] a4 g fis8[ e d c] b'[ c d] e4-^ fis8[ g] | \break - c,4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | - c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break } + \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" +"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) + #(override-auto-beam-setting '(end * * 25 8) 5 8) + #(override-auto-beam-setting '(end * * 25 8) 7 8) + #(override-auto-beam-setting '(end * * 25 8) 10 8) + #(override-auto-beam-setting '(end * * 25 8) 12 8) + #(override-auto-beam-setting '(end * * 25 8) 14 8) + #(override-auto-beam-setting '(end * * 25 8) 16 8) + #(override-auto-beam-setting '(end * * 25 8) 18 8) + #(override-auto-beam-setting '(end * * 25 8) 21 8) + #(override-auto-beam-setting '(end * * 25 8) 23 8) + + c8 c c d4 c8 c b c b a4 g fis8 e d c b' c d e4-^ fis8 g | \break + c,4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | + c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break + c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | + c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 | \break } } drum = { - \new DrumStaff \drummode - { - \bar "|:" bd4. ^\markup { "Drums" } sn4 bd \bar ":" sn4. bd4 sn \bar ":" - bd sn bd4. sn4 bd \bar ":|" - } + \new DrumStaff \drummode + { + \bar "|:" bd4. ^\markup { "Drums" } sn4 bd \bar ":" sn4. +bd4 sn \bar ":" + bd sn bd4. sn4 bd \bar ":|" + } } { - \melody - \drum + \melody + \drum } diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly new file mode 100644 index 0000000000..b43cfc9ee3 --- /dev/null +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -0,0 +1,37 @@ +%% 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 = "rhythms" + texidoc = " +Tuplet brackets can be made to run to prefatory matter or the next +note. Default tuplet brackets end at the right edge of the final note +of the tuplet; full-length tuplet brackets extend farther to the right, +either to cover all the non-rhythmic notation up to the following note, +or to cover only the whitespace before the next item of notation, be +that a clef, time signature, key signature, or another note. The +example shows how to switch tuplets to full length mode and how to +modify what material they cover. +" } +% begin verbatim +\new RhythmicStaff { + + % Set tuplets to be extendable .. + + \set tupletFullLength = ##t + + % .. to cover all items up to the next note + + \set tupletFullLengthNote = ##t + \time 2/4 + \times 2/3 { c4 c c } + + % .. or to cover just whitespace + + \set tupletFullLengthNote = ##f + \time 4/4 + \times 4/5 { c4 c1 } + \time 3/4 + c4 +} diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index 63959b45bc..c6c3483538 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -1,21 +1,22 @@ altering-the-number-of-stems-in-a-beam.ly adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +modifying-tuplet-bracket-length.ly +changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly +making-an-object-invisible-with-the-transparent-property.ly +manually-controlling-beam-positions.ly +controlling-tuplet-bracket-visibility.ly +adding-drum-parts.ly +rest-styles.ly +skips-in-lyric-mode-2.ly +chant-or-psalms-notation.ly conducting-signs,-measure-grouping-signs.ly heavily-customized-polymetric-time-signatures.ly -skips-in-lyric-mode.ly +compound-time-signatures.ly rhythmic-slashes.ly -skips-in-lyric-mode-2.ly -manually-controlling-beam-positions.ly -chant-or-psalms-notation.ly -changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly -making-an-object-invisible-with-the-transparent-property.ly automatic-beam-subdivisions.ly -rest-styles.ly +entering-several-tuplets-using-only-one--times-command.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly -controlling-tuplet-bracket-visibility.ly beam-across-line-breaks.ly printing-music-with-different-time-signatures.ly -adding-drum-parts.ly -entering-several-tuplets-using-only-one--times-command.ly -compound-time-signatures.ly +skips-in-lyric-mode.ly diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly index db9ee9eedd..edfa50fd62 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -9,26 +9,17 @@ You may put the time signature in parentheses. " } % begin verbatim tsMarkup = \markup { - \number { - \bracket \column { "2" "4" } - } + \override #'(baseline-skip . 2) \number { + \bracket \column { "2" "4" } + } } \score { - \relative c'' { + \relative c'' { + \override Staff.TimeSignature #'stencil = #ly:text-interface::print + \override Staff.TimeSignature #'text = #tsMarkup + \time 2/4 -% FIXME: Gee, it doesn't work with 2.10 -vv - -%{ - - \override Staff.TimeSignature #'print-function = #Text_interface::print - \override Staff.TimeSignature #'text = #tsMarkup - -%} - - \time 2/4 - - a4 b8 c | - } + a4 b8 c | + } } - -- 2.39.5