From 887c02daed290eefecbbe5e10b6a6ad5f49ac066 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Thu, 14 Jun 2007 00:23:48 -0700 Subject: [PATCH] LSR: update, add new files, remove old files from input/test/. --- .../glissando-written-out-in-small-notes.ly | 35 +++++++ ...y-customized-polymetric-time-signatures.ly | 38 ++++++++ .../scheme/creating-music-with-scheme.ly} | 95 +++++-------------- input/lsr/scheme/move-specific-text.ly | 21 ++++ ...-to-add-text-marks-at-the-end-of-a-line.ly | 18 ++++ .../scheme}/move-specific-text.ly | 0 input/test/caps.ly | 18 ---- input/test/null.ly | 3 + 8 files changed, 138 insertions(+), 90 deletions(-) create mode 100644 input/lsr/contemporary/glissando-written-out-in-small-notes.ly create mode 100644 input/lsr/education/heavily-customized-polymetric-time-signatures.ly rename input/{test/music-box.ly => lsr/scheme/creating-music-with-scheme.ly} (58%) create mode 100644 input/lsr/scheme/move-specific-text.ly create mode 100644 input/lsr/staff/how-to-add-text-marks-at-the-end-of-a-line.ly rename input/{test => new/scheme}/move-specific-text.ly (100%) delete mode 100644 input/test/caps.ly create mode 100644 input/test/null.ly diff --git a/input/lsr/contemporary/glissando-written-out-in-small-notes.ly b/input/lsr/contemporary/glissando-written-out-in-small-notes.ly new file mode 100644 index 0000000000..1211d7c245 --- /dev/null +++ b/input/lsr/contemporary/glissando-written-out-in-small-notes.ly @@ -0,0 +1,35 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.11.23" + +\header { texidoc = " +Sometimes a glissando is written out in smaller notes. This example +shows how to do this. +" } + +\relative c' { + \clef treble + \key c \major + \time 3/8 + + fis16.[-> a64 g] + + % Make tuplet markings invisible + \once \override TupletBracket #'number-visibility = ##f + \once \override TupletBracket #'bracket-visibility = ##f + + % Prepare for small notes + \override NoteHead #'font-size = #-4 + \override Accidental #'font-size = #-4 + + % Force stem direction down + \stemDown + + % Tuplet with small notes + \times 3/42 { fis8[( g gis a bes b c cis d dis e f fis g gis a bes! b c cis d] } + + % Restore normal note size + \revert NoteHead #'font-size + \revert Accidental #'font-size + + es32.[) fis,,64] +} diff --git a/input/lsr/education/heavily-customized-polymetric-time-signatures.ly b/input/lsr/education/heavily-customized-polymetric-time-signatures.ly new file mode 100644 index 0000000000..fdac8aee5b --- /dev/null +++ b/input/lsr/education/heavily-customized-polymetric-time-signatures.ly @@ -0,0 +1,38 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.11.23" + +\header { 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!). +" } + +#(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)))))) + + +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 } +} +drum = { + \new DrumStaff \drummode + { + \bar "|:" bd4. ^\markup { "Drums" } sn4 bd \bar ":" sn4. bd4 sn \bar ":" + bd sn bd4. sn4 bd \bar ":|" + } +} + +{ + \melody + \drum +} diff --git a/input/test/music-box.ly b/input/lsr/scheme/creating-music-with-scheme.ly similarity index 58% rename from input/test/music-box.ly rename to input/lsr/scheme/creating-music-with-scheme.ly index ae4567dbf7..9f85797483 100644 --- a/input/test/music-box.ly +++ b/input/lsr/scheme/creating-music-with-scheme.ly @@ -1,14 +1,14 @@ -\version "2.10.0" -\sourcefilename "music-box.ly" +%% Do not edit this file; it is auto-generated from LSR! +\version "2.11.23" -\include "deutsch.ly" -% possible rename to scheme- something. -gp -% TODO: ask if it needs to have so many empty bars in the middle. -gp -\header{ texidoc = "@cindex Scheme Music Box -This example shows prelude in C major of WTK1, but coded -using Scheme functions to avoid typing work. " } +\header { texidoc = " +This example shows prelude in C major of WTK1, but coded using Scheme +functions to avoid typing work. +" } +\version "2.11.23" +\include "deutsch.ly" #(define (transform music) (let* ((es (ly:music-property music 'elements)) (n (ly:music-property music 'name))) @@ -18,12 +18,13 @@ using Scheme functions to avoid typing work. " } (let recurse ((elts es)) (if (not (equal? elts '())) (begin - ((trans (ly:music-property (cadr elts) 'elements)) (car elts)) + ((trans (ly:music-property (cadr elts) 'elements)) (car +elts)) (set-cdr! elts (cddr elts)) (recurse (cdr elts)) ))))) music - )) + )) #(define ((trans pitches) music) (let* ((es (ly:music-property music 'elements)) @@ -52,6 +53,11 @@ using Scheme functions to avoid typing work. " } music)) + + + + + pat = \transpose c c' \repeat unfold 2 { << { \context Staff = "up" {r8 e16 f g e f g } } { \context Staff = "down" << @@ -63,80 +69,25 @@ pat = \transpose c c' \repeat unfold 2 { enda = { r8 f,16 a, c f c a, \stemUp c \change Staff = down a, f, a, f, d, f, d, \change Staff = up \stemNeutral - r8 g16 h d' f' d' h d' h g h d f e\prall d 1^\fermata \bar "|." + r8 g16 h d' f' d' h d' h g h d f e\prall d 1^\fermata \bar +"|." } -endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."} +endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar +"|."} endc = {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } - -prelude = -#(define-music-function (parser location patterns) (ly:music?) - (transform patterns)) - - \score { \transpose c c' \context PianoStaff << \new Staff = "up" { \clef "G" } \new Staff = "down" { \clef "F" } - { \prelude { + { \applyMusic #transform { \pat {c e g c' e' } \pat {c d a d' f' } } - -%{ - %Etc. - - %we get the idea now. - - - \pat {h, d g d' f' } - \pat {c e g c' e' } - - \pat {c e a e' a' } - \pat {c d fis a d' } - \pat {h, d g d' g' } - \pat {h, c e g c' } - \pat {a, c e g c' } - \pat {d, a, d fis c' } - \pat {g, h, d g h } - \pat {g, b, e g cis' } - \pat {f, a, d a d' } - \pat {f, as, d f h } - \pat {e, g, c g c' } - \pat {e, f, a, c f } - \pat {d, f, a, c f } - - \pat {g,, d, g, h, f } - \pat {c, e, g, c e } - \pat {c, g, b, c e } - \pat {f,, f, a, c e } - \pat {fis,, c, a, c es } - \pat {as,, f, h, c d } - \pat {g,, f, g, h, d } - \pat {g,, e, g, c e } - \pat {g,, d, g, c f } - \pat {g,, d, g, h, f } - \pat {g,, es, a, c fis } - \pat {g,, e, g, c g } - \pat {g,, d, g, c f } - \pat {g,, d, g, h, f } - \pat {c,, c, g, b, e } -%} + % Etc, we get the idea now } >> - - \layout { - line-width = 18.0 \cm - } - - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 80 4) - } - } +} -} diff --git a/input/lsr/scheme/move-specific-text.ly b/input/lsr/scheme/move-specific-text.ly new file mode 100644 index 0000000000..281f8bc0c8 --- /dev/null +++ b/input/lsr/scheme/move-specific-text.ly @@ -0,0 +1,21 @@ +%% Do not edit this file; it is auto-generated from LSR! + +\version "2.11.23" +% possible rename to scheme- or something like that. -gp +\header { texidoc = "@cindex Scheme Move Text +Objects, like text, can be moved around by using some Scheme code. +" } + +#(define (make-text-checker text) + (lambda (grob) (equal? text (ly:grob-property grob 'text)))) + +\score { + \relative c''' { + \stemUp + \applyOutput #'Voice #(outputproperty-compatibility (make-text-checker (make-simple-markup "m.d.")) + 'extra-offset '(-3.5 . -4.5)) + a^2^"m.d." + } + \layout { ragged-right = ##t} +} + diff --git a/input/lsr/staff/how-to-add-text-marks-at-the-end-of-a-line.ly b/input/lsr/staff/how-to-add-text-marks-at-the-end-of-a-line.ly new file mode 100644 index 0000000000..8f90467458 --- /dev/null +++ b/input/lsr/staff/how-to-add-text-marks-at-the-end-of-a-line.ly @@ -0,0 +1,18 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.11.23" + +\header { texidoc = " +By default, rehearsal marks specified at the end of a line are printed +at the beginning of the next line (even if it is the end of the piece, +in such case the mark isn't printed at all). + +To avoid this, override the #'break-visibility property of the +RehearsalMark object, like in the following snippet. +" } + +\paper{ ragged-right=##t } +\relative g' { + g4 g g g | g g g g | g g g g | + \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible + \mark "D.C. al Fine" +} diff --git a/input/test/move-specific-text.ly b/input/new/scheme/move-specific-text.ly similarity index 100% rename from input/test/move-specific-text.ly rename to input/new/scheme/move-specific-text.ly diff --git a/input/test/caps.ly b/input/test/caps.ly deleted file mode 100644 index f251121d09..0000000000 --- a/input/test/caps.ly +++ /dev/null @@ -1,18 +0,0 @@ - -\version "2.10.0" -\header { -texidoc = "@cindex Capital Letters -The font can be changed to small caps. -" } - -shapeSC = \override LyricText #'font-shape = #'caps -shapeNorm = \revert LyricText #'font-shape - -\score { << - \relative c'' { c4 c4 c8 c8 c8 } - \context Lyrics \lyricmode { - what4 is4 \shapeSC The8 Ma -- trix? } - >> - \layout { ragged-right = ##t} -} - diff --git a/input/test/null.ly b/input/test/null.ly new file mode 100644 index 0000000000..14766250c6 --- /dev/null +++ b/input/test/null.ly @@ -0,0 +1,3 @@ +% a null ly file, to make the build process happy +% while we delete this directory. +\markup { "null" } -- 2.39.5