From 2ba2ca2073f389842aa87f85b6c740b8488f0125 Mon Sep 17 00:00:00 2001 From: James Lowe Date: Sun, 10 May 2015 12:02:25 +0100 Subject: [PATCH] Run makelsr For commit 0129dea8eff59c10ba6e295f6f2cd48083fc5296 --- .../changing-form-of-multi-measure-rests.ly | 15 +++-- ...creating-custom-dynamics-in-midi-output.ly | 42 ++++++++++++ ...-width-to-adapt-to-metronomemarks-width.ly | 15 +++-- Documentation/snippets/midi.snippet-list | 3 + .../snippets/multi-measure-rest-markup.ly | 15 +++-- .../positioning-multi-measure-rests.ly | 15 +++-- ...ng-default-midi-instrument-equalization.ly | 67 +++++++++++++++++++ .../snippets/scheme-language.snippet-list | 3 + Documentation/snippets/vocal-headword.ly | 15 +++-- Documentation/snippets/wind-headword.ly | 15 +++-- 10 files changed, 169 insertions(+), 36 deletions(-) create mode 100644 Documentation/snippets/creating-custom-dynamics-in-midi-output.ly create mode 100644 Documentation/snippets/replacing-default-midi-instrument-equalization.ly diff --git a/Documentation/snippets/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/changing-form-of-multi-measure-rests.ly index db7e3d54f4..3e4c3fcb2e 100644 --- a/Documentation/snippets/changing-form-of-multi-measure-rests.ly +++ b/Documentation/snippets/changing-form-of-multi-measure-rests.ly @@ -1,9 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.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. +% 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.19.20 + \version "2.19.20" \header { @@ -20,6 +22,7 @@ default number of ten may be changed by overriding the doctitle = "Changing form of multi-measure rests" } % begin verbatim + \relative c'' { \compressMMRests { R1*2 | R1*5 | R1*9 diff --git a/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly b/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly new file mode 100644 index 0000000000..572126232f --- /dev/null +++ b/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly @@ -0,0 +1,42 @@ +% 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.18.0 +\version "2.18.0" + +\header { + + lsrtags = "scheme-language, midi" + + texidoc = "The following example shows how to create a dynamic + marking, not included in the default list, and assign it a specific + value so that it can be used to affect MIDI output. + + The dynamic mark @code{\\rfz} (@notation{rinforzando}) is assigned a + value of @code{0.9}." + + doctitle = "Creating custom dynamics in MIDI output" +} % begin verbatim + + +#(define (myDynamics dynamic) + (if (equal? dynamic "rfz") + 0.9 + (default-dynamic-absolute-volume dynamic))) + +\score { + \new Staff { + \set Staff.midiInstrument = #"cello" + \set Score.dynamicAbsoluteVolumeFunction = #myDynamics + \new Voice { + \relative c'' { + a4\pp b c-\rfz + } + } + } + \layout {} + \midi {} +} 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 72fa34b0ba..ff5451109d 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 @@ -1,9 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.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. +% 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.19.20 + \version "2.19.20" \header { @@ -18,6 +20,7 @@ the example. doctitle = "Forcing measure width to adapt to MetronomeMark's width" } % begin verbatim + example = { \tempo "Allegro" R1*6 diff --git a/Documentation/snippets/midi.snippet-list b/Documentation/snippets/midi.snippet-list index 4c94738982..a9ebf68f2d 100644 --- a/Documentation/snippets/midi.snippet-list +++ b/Documentation/snippets/midi.snippet-list @@ -1,3 +1,6 @@ changing-midi-output-to-one-channel-per-voice.ly changing-the-tempo-without-a-metronome-mark.ly +creating-custom-dynamics-in-midi-output.ly +creating-custom-dynamics-in-midi.ly demo-midiinstruments.ly +replacing-default-midi-instrument-equalization.ly diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly index d7958d004a..6ee5046d9e 100644 --- a/Documentation/snippets/multi-measure-rest-markup.ly +++ b/Documentation/snippets/multi-measure-rest-markup.ly @@ -1,9 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.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. +% 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.19.20 + \version "2.19.20" \header { @@ -25,6 +27,7 @@ appear to be centered. doctitle = "Multi-measure rest markup" } % begin verbatim + \relative c' { \compressMMRests { \textLengthOn diff --git a/Documentation/snippets/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly index b49d162f12..f990182ce0 100644 --- a/Documentation/snippets/positioning-multi-measure-rests.ly +++ b/Documentation/snippets/positioning-multi-measure-rests.ly @@ -1,9 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.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. +% 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.19.20 + \version "2.19.20" \header { @@ -21,6 +23,7 @@ follows: doctitle = "Positioning multi-measure rests" } % begin verbatim + \relative c'' { % Multi-measure rests by default are set under the fourth line R1 diff --git a/Documentation/snippets/replacing-default-midi-instrument-equalization.ly b/Documentation/snippets/replacing-default-midi-instrument-equalization.ly new file mode 100644 index 0000000000..038198f0fc --- /dev/null +++ b/Documentation/snippets/replacing-default-midi-instrument-equalization.ly @@ -0,0 +1,67 @@ +% 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.18.0 +\version "2.18.0" + +\header { + + lsrtags = "scheme-language, midi" + + texidoc = "The default MIDI instrument equalizer can be replaced by + setting the @code{instrumentEqualizer} property in the @code{Score} + context to a user-defined Scheme procedure that uses a MIDI instrument + name as its argument along with a pair of fractions indicating the + minimum and maximum volumes respectively to be applied to that + specific instrument. + + The following example sets the minimum and maximum volumes for flute + and clarinet respectively." + + doctitle = "Replacing default MIDI instrument equalization" +} % begin verbatim + + +#(define my-instrument-equalizer-alist '()) + +#(set! my-instrument-equalizer-alist + (append + '( + ("flute" . (0.7 . 0.9)) + ("clarinet" . (0.3 . 0.6))) + my-instrument-equalizer-alist)) + +#(define (my-instrument-equalizer s) + (let ((entry (assoc s my-instrument-equalizer-alist))) + (if entry + (cdr entry)))) + +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Score.instrumentEqualizer = #my-instrument-equalizer + \set Staff.midiInstrument = #"flute" + \new Voice \relative c''' { + r2 g\mp g fis~ + 4 g8 fis e2~ + 4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { } +} diff --git a/Documentation/snippets/scheme-language.snippet-list b/Documentation/snippets/scheme-language.snippet-list index 848256fe66..2d8fa13178 100644 --- a/Documentation/snippets/scheme-language.snippet-list +++ b/Documentation/snippets/scheme-language.snippet-list @@ -5,6 +5,8 @@ center-text-below-hairpin-dynamics.ly changing--flageolet-mark-size.ly changing-properties-for-individual-grobs.ly creating-a-sequence-of-notes-on-various-pitches.ly +creating-custom-dynamics-in-midi-output.ly +creating-custom-dynamics-in-midi.ly creating-double-digit-fingerings.ly customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly displaying-grob-ancestry.ly @@ -14,6 +16,7 @@ generating-random-notes.ly generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly outputting-the-version-number.ly overriding-articulations-of-destinct-type.ly +replacing-default-midi-instrument-equalization.ly string-number-extender-lines.ly three-sided-box.ly transposing-pitches-with-minimum-accidentals-smart-transpose.ly diff --git a/Documentation/snippets/vocal-headword.ly b/Documentation/snippets/vocal-headword.ly index 2de2e86547..d1a6487d4c 100644 --- a/Documentation/snippets/vocal-headword.ly +++ b/Documentation/snippets/vocal-headword.ly @@ -1,9 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.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. +% 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.19.20 + \version "2.19.20" \header { @@ -16,6 +18,7 @@ Vocal headword doctitle = "Vocal headword" } % begin verbatim + %% http://lsr.di.unimi.it/LSR/Item?id=832 %% see also http://lilypond.org/doc/v2.18/Documentation/notation/vocal-music diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly index e7e06478df..2cd83c1bf5 100644 --- a/Documentation/snippets/wind-headword.ly +++ b/Documentation/snippets/wind-headword.ly @@ -1,9 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.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. +% 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.19.20 + \version "2.19.20" \header { @@ -16,6 +18,7 @@ Wind headword doctitle = "Wind headword" } % begin verbatim + %% http://lsr.di.unimi.it/LSR/Item?id=833 %% see also http://lilypond.org/doc/v2.18/Documentation/notation/wind-instruments -- 2.39.2