From 4e43097ef1eb9fc889e7920ebd14c4d6f0888091 Mon Sep 17 00:00:00 2001 From: James Lowe Date: Sat, 1 Oct 2011 21:47:34 +0100 Subject: [PATCH] LSR: Updated snippet for MMR Positions (1931) Removed statement that default MMR position was #0 (it is actually #2) Added some examples of the overrides and clarified some comments including adding new example of more than two voices --- .../snippets/changing-fret-orientations.ly | 1 + .../customizing-fretboard-fret-diagrams.ly | 1 + .../new/positioning-multi-measure-rests.ly | 59 ++++++++++++++++++ .../positioning-multi-measure-rests.ly | 61 ++++++++++++------- 4 files changed, 100 insertions(+), 22 deletions(-) create mode 100644 Documentation/snippets/new/positioning-multi-measure-rests.ly diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly index c71c45a4fd..a78787d1a6 100644 --- a/Documentation/snippets/changing-fret-orientations.ly +++ b/Documentation/snippets/changing-fret-orientations.ly @@ -23,6 +23,7 @@ Ils s'aligneront par défaut sur la corde du haut ou le sommet du fret. + %% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb texidoces = " diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly index 6b90aae8b9..f818c943ec 100644 --- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly +++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly @@ -24,6 +24,7 @@ l'instancier de manière explicite pour adapter ses propriétés. + %% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb texidoces = " Se pueden establecer las propiedades de los diagramas de 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..ca752462a0 --- /dev/null +++ b/Documentation/snippets/new/positioning-multi-measure-rests.ly @@ -0,0 +1,59 @@ +\version "2.15.14" + +\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" +} % begin verbatim + +\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 + \compressFullBarRests + << + \revert MultiMeasureRest #'staff-position + { R1*3 } + \\ + \revert MultiMeasureRest #'staff-position + { R1*3 } + >> +} diff --git a/Documentation/snippets/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly index c5e38e8db1..2a422666f9 100644 --- a/Documentation/snippets/positioning-multi-measure-rests.ly +++ b/Documentation/snippets/positioning-multi-measure-rests.ly @@ -1,14 +1,13 @@ -%% 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.14.0" +% 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.15.14 +\version "2.15.14" \header { - lsrtags = "rhythms, tweaks-and-overrides" - %% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb doctitlees = "Posicionar los silencios multicompás" texidoces = " @@ -47,6 +46,8 @@ positionnement des silences multi-mesures peut se contrôler ainsi : " doctitlefr = "Positionnement des silences multi-mesures" + 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 @@ -60,29 +61,45 @@ follows: } % begin verbatim \relative c'' { - % MMR - Multi-Measure Rest - % MMRs by default are set under the fourth line + % Multi-measure rests by default are set under the fourth line R1 - % They can be moved with an override + % They can be moved using an override \override MultiMeasureRest #'staff-position = #-2 R1 - % A value of 0 is the default position; - % the following trick moves the rest to the center line - \override MultiMeasureRest #'staff-position = #-0.01 + \override MultiMeasureRest #'staff-position = #0 + R1 + \override MultiMeasureRest #'staff-position = #2 + R1 + \override MultiMeasureRest #'staff-position = #3 R1 - % MMRs in odd-numbered voices are under the top line + \override MultiMeasureRest #'staff-position = #6 + R1 + \revert MultiMeasureRest #'staff-position + \break + + % In two Voices, odd-numbered voices are under the top line << { R1 } \\ { a1 } >> - % MMRs in even-numbered voices are under the bottom line - << { c1 } \\ { R1 } >> - % They remain separated even in empty measures + % Even-numbered voices are under the bottom line + << { a1 } \\ { R1 } >> + % Multi-measure rests in both voices remain separate << { R1 } \\ { R1 } >> - % This brings them together even though there are two voices + + % Separating multi-measure rests in more than two voices + % requires an override + << { R1 } \\ { R1 } \\ + \once \override MultiMeasureRest #'staff-position = #0 + { R1 } % begin verbatim + + >> + + % Using compressed bars in multiple voices requires another override + % in all voices to avoid multiple instances being printed \compressFullBarRests << - \revert MultiMeasureRest #'staff-position + \revert MultiMeasureRest #'staff-position { R1*3 } \\ - \revert MultiMeasureRest #'staff-position + \revert MultiMeasureRest #'staff-position { R1*3 } >> } -- 2.39.2