From 8e5f4480d30f3ba6a11d684f039a359dba50e5da Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 24 Dec 2006 03:36:38 +0100 Subject: [PATCH] input/midi/ directory --- input/GNUmakefile | 2 +- input/midi/GNUmakefile | 8 +++++ input/{no-notation => midi}/midi-drums.ly | 0 input/{no-notation => midi}/midi-grace.ly | 1 - .../midi-lyric-barcheck.ly | 2 +- input/{no-notation => midi}/midi-scales.ly | 0 input/{no-notation => midi}/midi-tuplets.ly | 1 - .../midi-volume-equaliser.ly | 34 ++++++++----------- input/no-notation/midi-transposing.ly | 25 -------------- 9 files changed, 24 insertions(+), 49 deletions(-) create mode 100644 input/midi/GNUmakefile rename input/{no-notation => midi}/midi-drums.ly (100%) rename input/{no-notation => midi}/midi-grace.ly (92%) rename input/{no-notation => midi}/midi-lyric-barcheck.ly (79%) rename input/{no-notation => midi}/midi-scales.ly (100%) rename input/{no-notation => midi}/midi-tuplets.ly (94%) rename input/{no-notation => midi}/midi-volume-equaliser.ly (87%) delete mode 100644 input/no-notation/midi-transposing.ly diff --git a/input/GNUmakefile b/input/GNUmakefile index e096a73471..4a45b45f4a 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS = test regression tutorial no-notation mutopia manual +SUBDIRS = test regression tutorial midi no-notation mutopia manual examples = typography-demo les-nereides wilhelmus proportional bach-schenker cary diff --git a/input/midi/GNUmakefile b/input/midi/GNUmakefile new file mode 100644 index 0000000000..37d97aa000 --- /dev/null +++ b/input/midi/GNUmakefile @@ -0,0 +1,8 @@ +depth = ../.. + +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + +include $(depth)/make/stepmake.make +TITLE=LilyPond MIDI Tests + diff --git a/input/no-notation/midi-drums.ly b/input/midi/midi-drums.ly similarity index 100% rename from input/no-notation/midi-drums.ly rename to input/midi/midi-drums.ly diff --git a/input/no-notation/midi-grace.ly b/input/midi/midi-grace.ly similarity index 92% rename from input/no-notation/midi-grace.ly rename to input/midi/midi-grace.ly index 108b03b2f0..213de79e37 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/midi/midi-grace.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "2.10.0" \header{ texidoc = "Tests MIDI output with grace notes. " } diff --git a/input/no-notation/midi-lyric-barcheck.ly b/input/midi/midi-lyric-barcheck.ly similarity index 79% rename from input/no-notation/midi-lyric-barcheck.ly rename to input/midi/midi-lyric-barcheck.ly index 7c22ef1fda..5c06916af0 100644 --- a/input/no-notation/midi-lyric-barcheck.ly +++ b/input/midi/midi-lyric-barcheck.ly @@ -17,7 +17,7 @@ this examples causes no bar checks in MIDI. c1 } - \lyricsto "A" \lyricmode\new Lyrics { bla bla | bla bla | bla bla | bla } + \lyricsto "A" \lyrics { bla bla | bla bla | bla bla | bla } >> \layout {} \midi {} diff --git a/input/no-notation/midi-scales.ly b/input/midi/midi-scales.ly similarity index 100% rename from input/no-notation/midi-scales.ly rename to input/midi/midi-scales.ly diff --git a/input/no-notation/midi-tuplets.ly b/input/midi/midi-tuplets.ly similarity index 94% rename from input/no-notation/midi-tuplets.ly rename to input/midi/midi-tuplets.ly index 8169f36a45..0a0f5ef1a9 100644 --- a/input/no-notation/midi-tuplets.ly +++ b/input/midi/midi-tuplets.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "2.10.0" \header { texidoc = " diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/midi/midi-volume-equaliser.ly similarity index 87% rename from input/no-notation/midi-volume-equaliser.ly rename to input/midi/midi-volume-equaliser.ly index 73c4f708e3..0ad06cb931 100644 --- a/input/no-notation/midi-volume-equaliser.ly +++ b/input/midi/midi-volume-equaliser.ly @@ -1,7 +1,6 @@ -#(ly:set-option 'old-relative) \version "2.10.0" \header { -texidoc = "@cindex Midi Volume Equaliser + texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a notes, where groups stop one after another. Use this to tune equalizer settings. " } @@ -13,11 +12,11 @@ another. Use this to tune equalizer settings. " Override, see scm/midi.scm: #(set! instrument-equalizer-alist - (append - '( - ("flute" . (0 . 0.7)) - ) - instrument-equalizer-alist)) + (append + '( + ("flute" . (0 . 0.7)) + ) + instrument-equalizer-alist)) %} @@ -91,7 +90,7 @@ violinoII = \relative c' { \set Staff.midiInstrument = #"violin" \set Staff.instrumentName = #"Violino II " \set Staff.shortInstrumentName = #"Vl. II " - + R1*8 c1\f R1*2 } @@ -106,7 +105,7 @@ viola = \relative c' { violoncello = \relative c' { \set Staff.midiInstrument = #"cello" - %\set Staff.midiInstrument = #"contrabass" + %\set Staff.midiInstrument = #"contrabass" \set Staff.instrumentName = #"Violoncello" \set Staff.shortInstrumentName = #"Vc." @@ -129,11 +128,11 @@ violoncello = \relative c' { >> \new StaffGroup = "timpani" << \new Staff = "timpani" \timpani - { - \skip 1 - % Hmm: this forces a staff-bracket, that's good! - % However, I can't find where is decided on staff-bracket yes/no - } + { + \skip 1 + %% Hmm: this forces a staff-bracket, that's good! + %% However, I can't find where is decided on staff-bracket yes/no + } >> \new StaffGroup = "archi" << \new GrandStaff = "violini" << @@ -146,9 +145,6 @@ violoncello = \relative c' { >> \layout { - \layoutSixteen - indent=100.0\mm - line-width=150.0\mm \context { \RemoveEmptyStaffContext } @@ -158,10 +154,8 @@ violoncello = \relative c' { \context { \Score tempoWholesPerMinute = #(ly:make-moment 60 1) - } } - - + } } diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly deleted file mode 100644 index 3bf8b4104c..0000000000 --- a/input/no-notation/midi-transposing.ly +++ /dev/null @@ -1,25 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.10.0" - -\header { texidoc = "@cindex Transposing -The transposing property leaves output invariant, but has effect on MIDI. " -} - -\score { - \context Voice \relative c { - % btw: this is not how transposing is done in lilypond - % this is a transposing performer, i.e. for midi-output only - \set Staff.transposing = #0 c - \set Staff.transposing = #2 c - \set Staff.transposing = #4 c - \set Staff.transposing = #5 c - \set Staff.transposing = #7 c - \set Staff.transposing = #9 c - \set Staff.transposing = #11 c - \set Staff.transposing = #12 c - - } - \layout { ragged-right = ##t } - \midi { } -} - -- 2.39.5