From: Trevor Daniels Date: Fri, 1 May 2015 21:17:10 +0000 (+0100) Subject: Issue 3687 (part 3) Update snippets to use \compressMMRests X-Git-Tag: release/2.19.20-1~17 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f509f0d4df0b7d4336d904ca61902ad67dc2be5e;p=lilypond.git Issue 3687 (part 3) Update snippets to use \compressMMRests --- diff --git a/Documentation/snippets/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/changing-form-of-multi-measure-rests.ly index 2ed1698168..db7e3d54f4 100644 --- a/Documentation/snippets/changing-form-of-multi-measure-rests.ly +++ b/Documentation/snippets/changing-form-of-multi-measure-rests.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.20" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -21,8 +21,9 @@ default number of ten may be changed by overriding the } % begin verbatim \relative c'' { - \compressFullBarRests - R1*2 | R1*5 | R1*9 - \override MultiMeasureRest.expand-limit = #3 - R1*2 | R1*5 | R1*9 + \compressMMRests { + R1*2 | R1*5 | R1*9 + \override MultiMeasureRest.expand-limit = #3 + R1*2 | R1*5 | R1*9 + } } diff --git a/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly b/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly index 10a95c5417..72fa34b0ba 100644 --- a/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly +++ b/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.20" \header { lsrtags = "staff-notation, workaround" @@ -28,10 +28,11 @@ example = { } { - \compressFullBarRests - \example - R1 - R1 - \override Score.MetronomeMark.extra-spacing-width = #'(-3 . 0) - \example + \compressMMRests { + \example + R1 + R1 + \override Score.MetronomeMark.extra-spacing-width = #'(-3 . 0) + \example + } } diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly index 752aca16ed..d7958d004a 100644 --- a/Documentation/snippets/multi-measure-rest-markup.ly +++ b/Documentation/snippets/multi-measure-rest-markup.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.20" \header { lsrtags = "rhythms, text" @@ -26,13 +26,14 @@ appear to be centered. } % begin verbatim \relative c' { - \compressFullBarRests - \textLengthOn - <>^\markup { [MAJOR GENERAL] } - R1*19 - <>_\markup { \italic { Cue: ... it is yours } } - <>^\markup { A } - R1*30^\markup { [MABEL] } - \textLengthOff - c4^\markup { CHORUS } d f c + \compressMMRests { + \textLengthOn + <>^\markup { [MAJOR GENERAL] } + R1*19 + <>_\markup { \italic { Cue: ... it is yours } } + <>^\markup { A } + R1*30^\markup { [MABEL] } + \textLengthOff + c4^\markup { CHORUS } d f c + } } diff --git a/Documentation/snippets/new/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/new/changing-form-of-multi-measure-rests.ly new file mode 100644 index 0000000000..3a7c2c7259 --- /dev/null +++ b/Documentation/snippets/new/changing-form-of-multi-measure-rests.ly @@ -0,0 +1,24 @@ + +\version "2.19.20" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + texidoc = " +If there are ten or fewer measures of rests, a series of longa and +breve rests (called in German @qq{Kirchenpausen} - church rests) is +printed within the staff; otherwise a simple line is shown. This +default number of ten may be changed by overriding the +@code{expand-limit} property. + +" + doctitle = "Changing form of multi-measure rests" +} + +\relative c'' { + \compressMMRests { + R1*2 | R1*5 | R1*9 + \override MultiMeasureRest.expand-limit = #3 + R1*2 | R1*5 | R1*9 + } +} diff --git a/Documentation/snippets/new/forcing-measure-width-to-adapt-to-metronomemarks-width.ly b/Documentation/snippets/new/forcing-measure-width-to-adapt-to-metronomemarks-width.ly new file mode 100644 index 0000000000..f4291fde13 --- /dev/null +++ b/Documentation/snippets/new/forcing-measure-width-to-adapt-to-metronomemarks-width.ly @@ -0,0 +1,33 @@ + +\version "2.19.20" + +\header { + lsrtags = "staff-notation, workaround" + + texidoc = " +By default, metronome marks do not influence horizontal spacing. This +can be solved through a simple override, as shown in the second half of +the example. + +" + doctitle = "Forcing measure width to adapt to MetronomeMark's width" +} + +example = { + \tempo "Allegro" + R1*6 + \tempo "Rall." + R1*2 + \tempo "A tempo" + R1*8 +} + +{ + \compressMMRests { + \example + R1 + R1 + \override Score.MetronomeMark.extra-spacing-width = #'(-3 . 0) + \example + } +} diff --git a/Documentation/snippets/new/multi-measure-rest-markup.ly b/Documentation/snippets/new/multi-measure-rest-markup.ly new file mode 100644 index 0000000000..d17b03d4ba --- /dev/null +++ b/Documentation/snippets/new/multi-measure-rest-markup.ly @@ -0,0 +1,34 @@ + +\version "2.19.20" + +\header { + lsrtags = "rhythms, text" + + texidoc = " +Markups attached to a multi-measure rest will be centered above or +below it. Long markups attached to multi-measure rests do not cause +the measure to expand. To expand a multi-measure rest to fit the +markup, use an empty chord with an attached markup before the +multi-measure rest. + +Text attached to a spacer rest in this way is left-aligned to the +position where the note would be placed in the measure, but if the +measure length is determined by the length of the text, the text will +appear to be centered. + +" + doctitle = "Multi-measure rest markup" +} + +\relative c' { + \compressMMRests { + \textLengthOn + <>^\markup { [MAJOR GENERAL] } + R1*19 + <>_\markup { \italic { Cue: ... it is yours } } + <>^\markup { A } + R1*30^\markup { [MABEL] } + \textLengthOff + c4^\markup { CHORUS } d f c + } +} diff --git a/Documentation/snippets/new/positioning-multi-measure-rests.ly b/Documentation/snippets/new/positioning-multi-measure-rests.ly new file mode 100644 index 0000000000..0a533aba26 --- /dev/null +++ b/Documentation/snippets/new/positioning-multi-measure-rests.ly @@ -0,0 +1,60 @@ + +\version "2.19.20" + +\header { + lsrtags = "rhythms, tweaks-and-overrides" + + texidoc = " +Unlike ordinary rests, there is no predefined command to change the +staff position of a multi-measure rest symbol of either form by +attaching it to a note. However, in polyphonic music multi-measure +rests in odd-numbered and even-numbered voices are vertically +separated. The positioning of multi-measure rests can be controlled as +follows: + +" + doctitle = "Positioning multi-measure rests" +} + +\relative c'' { + % Multi-measure rests by default are set under the fourth line + R1 + % They can be moved using an override + \override MultiMeasureRest.staff-position = #-2 + R1 + \override MultiMeasureRest.staff-position = #0 + R1 + \override MultiMeasureRest.staff-position = #2 + R1 + \override MultiMeasureRest.staff-position = #3 + R1 + \override MultiMeasureRest.staff-position = #6 + R1 + \revert MultiMeasureRest.staff-position + \break + + % In two Voices, odd-numbered voices are under the top line + << { R1 } \\ { a1 } >> + % Even-numbered voices are under the bottom line + << { a1 } \\ { R1 } >> + % Multi-measure rests in both voices remain separate + << { R1 } \\ { R1 } >> + + % Separating multi-measure rests in more than two voices + % requires an override + << { R1 } \\ { R1 } \\ + \once \override MultiMeasureRest.staff-position = #0 + { R1 } + >> + + % Using compressed bars in multiple voices requires another override + % in all voices to avoid multiple instances being printed + \compressMMRests + << + \revert MultiMeasureRest.direction + { R1*3 } + \\ + \revert MultiMeasureRest.direction + { R1*3 } + >> +} diff --git a/Documentation/snippets/new/vocal-headword.ly b/Documentation/snippets/new/vocal-headword.ly new file mode 100644 index 0000000000..70de0f93aa --- /dev/null +++ b/Documentation/snippets/new/vocal-headword.ly @@ -0,0 +1,65 @@ + +\version "2.19.20" + +\header { + lsrtags = "headword" + + texidoc = " +Vocal headword + +" + doctitle = "Vocal headword" +} + +%% http://lsr.di.unimi.it/LSR/Item?id=832 +%% see also http://lilypond.org/doc/v2.18/Documentation/notation/vocal-music + +% L. van Beethoven. Symphony No. 9 in D minor, op.125; Finale +% mm. 216 -- 236 +% Text: F. von Schiller + +\score { + \new Staff \relative c' { + \set Score.currentBarNumber = 216 + \bar "" % make first bar number be shown + \clef bass \key d \minor \time 3/4 + % \tempo "Presto" + % \compressMMRests R2.*8 + \tempo "Recitativo" + \autoBeamOff + r4^\markup { \small Baritono } r a + \appoggiatura a8 e'2. ~ + e4 d8[ cis d e] + e4 g, r8 g + bes2 a8 e + g4 f r + R2.*2 + gis2 gis4 + r4 d'4. b8 + b4 gis8([ a b cis] + e8[ d cis d)] b([ gis)] + e8 d d4 fis8([ e)] + d4 cis r + \key d \major + r4 r a' + d4.( e8[ fis e)] + e([ d)] d([ cis d a)] + g8([ fis)] fis([ e d c)] + c8([ b)] g'2~ + \once \override Script.outside-staff-priority = #1 % put fermata closer to staff + g4.\fermata ^\markup { \small \italic "ad libitum" } e8[ cis!] d + d8 a a4 r \bar "||" + + % \time 4/4 \tempo "Allegro assai" + % R1 + % e''4^\f d r2 + % R1 + % e4( ^\f d2) a8([ g)] + } + \addlyrics { + O Freun -- _ _ de, nicht die -- _ se Tö -- ne! + Son -- dern laßt uns an -- _ ge -- neh -- me -- re an -- stim -- men, + und freu -- _ _ _ _ _ _ _ den -- vol -- le -- re! + % Freu -- de, Freu -- de,__ + } +} diff --git a/Documentation/snippets/new/wind-headword.ly b/Documentation/snippets/new/wind-headword.ly new file mode 100644 index 0000000000..eae9e1df18 --- /dev/null +++ b/Documentation/snippets/new/wind-headword.ly @@ -0,0 +1,49 @@ + +\version "2.19.20" + +\header { + lsrtags = "headword" + + texidoc = " +Wind headword + +" + doctitle = "Wind headword" +} + +%% http://lsr.di.unimi.it/LSR/Item?id=833 +%% see also http://lilypond.org/doc/v2.18/Documentation/notation/wind-instruments + +% NR 2.whatever Wind +% Tchaikovsky +% Nutcracker Suite, VII Dance of the Merlitons +\score { + \new StaffGroup << + \new Staff \relative c'' { + \set Staff.instrumentName = "Flauto I,II" + \once \override Score.RehearsalMark.self-alignment-X = #-1 + \once \override Score.RehearsalMark.break-align-symbols = #'(time-signature) + \once \override Score.TimeSignature.break-align-anchor-alignment = #LEFT + \once \override Score.RehearsalMark.padding = #4 + \mark \markup \large \bold {Moderato assai} + \key d \major + \time 2/4 + \compressMMRests R2*2 + 16-.\p -. -. -. 8-. -. + -.\< 32( 4--)\mf + 16-. -. -. -. + (\> ) -. -.\! + 4--\sf \acciaccatura {8} 4--\mf + } + \new Staff \relative c' { + \set Staff.instrumentName = "Flauto III" + \key d \major + \time 2/4 + \compressMMRests R2*2_\markup{Gr.Fl.} + fis16-.\p e-. fis-. e-. fis8-. e-. + g8-.\< fis32( a d fis a4--)\mf + b16-. a-. b-. a-. g(\> fis) d-. a-.\! + g4--\sf \acciaccatura fis'8 g4--\mf + } + >> +} diff --git a/Documentation/snippets/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly index 2f9cd215d7..b49d162f12 100644 --- a/Documentation/snippets/positioning-multi-measure-rests.ly +++ b/Documentation/snippets/positioning-multi-measure-rests.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.20" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -54,7 +54,7 @@ follows: % Using compressed bars in multiple voices requires another override % in all voices to avoid multiple instances being printed - \compressFullBarRests + \compressMMRests << \revert MultiMeasureRest.direction { R1*3 } diff --git a/Documentation/snippets/vocal-headword.ly b/Documentation/snippets/vocal-headword.ly index cc21ee8369..2de2e86547 100644 --- a/Documentation/snippets/vocal-headword.ly +++ b/Documentation/snippets/vocal-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.20" \header { lsrtags = "headword" @@ -29,7 +29,7 @@ Vocal headword \bar "" % make first bar number be shown \clef bass \key d \minor \time 3/4 % \tempo "Presto" - % \compressFullBarRests R2.*8 + % \compressMMRests R2.*8 \tempo "Recitativo" \autoBeamOff r4^\markup { \small Baritono } r a diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly index 4d115afc26..e7e06478df 100644 --- a/Documentation/snippets/wind-headword.ly +++ b/Documentation/snippets/wind-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.20" \header { lsrtags = "headword" @@ -33,8 +33,7 @@ Wind headword \mark \markup \large \bold {Moderato assai} \key d \major \time 2/4 - \compressFullBarRests - R2*2 + \compressMMRests R2*2 16-.\p -. -. -. 8-. -. -.\< 32( 4--)\mf 16-. -. -. -. @@ -45,8 +44,7 @@ Wind headword \set Staff.instrumentName = "Flauto III" \key d \major \time 2/4 - \compressFullBarRests - R2*2_\markup{Gr.Fl.} + \compressMMRests R2*2_\markup{Gr.Fl.} fis16-.\p e-. fis-. e-. fis8-. e-. g8-.\< fis32( a d fis a4--)\mf b16-. a-. b-. a-. g(\> fis) d-. a-.\!