X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fsnippets%2Fheavily-customized-polymetric-time-signatures.ly;h=e71300b4a4b75175565891367c813cac80ffefa0;hb=4ee99b07605942b02e82c6526df98b68cbc03981;hp=46c5b1481558896409cba05553a0f23db564a210;hpb=b27579f3a9b2311232f8eb1f11403f560dcc9b17;p=lilypond.git diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly index 46c5b14815..e71300b4a4 100644 --- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly +++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly @@ -1,13 +1,14 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.dsi.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.15.32" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.17.15 +\version "2.18.0" \header { - lsrtags = "real-music, percussion, contemporary-notation, rhythms" + lsrtags = "contemporary-notation, percussion, real-music, rhythms" texidoc = " Though the polymetric time signature shown was not the most essential @@ -19,29 +20,11 @@ is the template of a real Balkan song!). } % begin verbatim -#(define plus (markup #:vcenter "+")) -#(define ((custom-time-signature one two three four five six - seven eight nine ten eleven num) grob) - (grob-interpret-markup grob - (markup #:override '(baseline-skip . 0) #:number - (#:line ((#:column (one num)) plus - (#:column (two num)) plus - (#:column (three num)) plus - (#:column (four num)) plus - (#:column (five num)) plus - (#:column (six num)) plus - (#:column (seven num)) plus - (#:column (eight num)) plus - (#:column (nine num)) plus - (#:column (ten num)) plus - (#:column (eleven num))))))) melody = \relative c'' { \set Staff.instrumentName = #"Bb Sop." \key g \major - \time #'(3 2 2 3 2 2 2 2 3 2 2) 25/8 - \override Staff.TimeSignature #'stencil = - #(custom-time-signature "3" "2" "2" "3" "2" "2" - "2" "2" "3" "2" "2" "8") + \compoundMeter #'((3 8) (2 8) (2 8) (3 8) (2 8) (2 8) + (2 8) (2 8) (3 8) (2 8) (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 @@ -50,12 +33,11 @@ melody = \relative c'' { } drum = \new DrumStaff \drummode { - \bar "|:" bd4.^\markup { Drums } sn4 bd \bar ":" sn4. - bd4 sn \bar ":" bd sn bd4. sn4 bd \bar ":|" + \bar ".|:" bd4.^\markup { Drums } sn4 bd \bar ";" sn4. + bd4 sn \bar ";" bd sn bd4. sn4 bd \bar ":|." } { \melody \drum } -