From 02c64ad63888825db477bf2de6ffac466205b5ee Mon Sep 17 00:00:00 2001 From: tuckerjohnson Date: Sun, 14 Aug 2022 19:01:27 -0400 Subject: [PATCH] mid-re-structure --- arrays/13-composite-array.mkd | 7 -- arrays/4-polar.mkd | 7 -- arrays/d-sets.mkd | 14 --- arrays/i-1.md | 5 - arrays/i-19.md | 26 ------ arrays/i-2.md | 34 ------- arrays/i-20.md | 9 -- arrays/i-21.md | 22 ----- arrays/i-3.md | 12 --- arrays/i-4.md | 14 --- arrays/m-order.md | 9 -- lilypond-files/eng-files/ms-paper.ly | 26 ++++++ lilypond-files/eng-files/pp-paper.ly | 24 +---- lilypond-files/fifteen-inventions.ly | 20 ---- .../{pp-back-cover.ly => back-cover.ly} | 0 .../front-matter/{pp-bio.ly => bio.ly} | 0 .../{pp-front-matter.ly => front-matter.ly} | 0 .../{pp-inside-cover.ly => inside-cover.ly} | 0 .../{pp-outside-cover.ly => outside-cover.ly} | 0 .../{pp-p-notes.ly => p-notes.ly} | 0 lilypond-files/manuscripts/1i.ly | 91 +++++++++++-------- lilypond-files/manuscripts/2i.ly | 8 +- 22 files changed, 83 insertions(+), 245 deletions(-) delete mode 100644 arrays/13-composite-array.mkd delete mode 100644 arrays/4-polar.mkd delete mode 100644 arrays/d-sets.mkd delete mode 100644 arrays/i-1.md delete mode 100644 arrays/i-19.md delete mode 100644 arrays/i-2.md delete mode 100644 arrays/i-20.md delete mode 100644 arrays/i-21.md delete mode 100644 arrays/i-3.md delete mode 100644 arrays/i-4.md delete mode 100644 arrays/m-order.md create mode 100644 lilypond-files/eng-files/ms-paper.ly delete mode 100644 lilypond-files/fifteen-inventions.ly rename lilypond-files/front-matter/{pp-back-cover.ly => back-cover.ly} (100%) rename lilypond-files/front-matter/{pp-bio.ly => bio.ly} (100%) rename lilypond-files/front-matter/{pp-front-matter.ly => front-matter.ly} (100%) rename lilypond-files/front-matter/{pp-inside-cover.ly => inside-cover.ly} (100%) rename lilypond-files/front-matter/{pp-outside-cover.ly => outside-cover.ly} (100%) rename lilypond-files/front-matter/{pp-p-notes.ly => p-notes.ly} (100%) diff --git a/arrays/13-composite-array.mkd b/arrays/13-composite-array.mkd deleted file mode 100644 index f5a1484..0000000 --- a/arrays/13-composite-array.mkd +++ /dev/null @@ -1,7 +0,0 @@ -| | | | | | | | | -|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:| -| *(0* | *7* | *83* | *t5* | *2)* | *(68* | *4e* | *t* | -| *(42* | *e0* | *96* | *7)* | *(9* | *t* | *0* | *42* | -| *(5* | *4* | *e* | *2* | *70)* | *(34* | *7* | *5* | -| *(79* | *52* | *4* | *0* | *e)* | *(1* | *2* | *79* | -| *(e* | *9* | *1* | *38* | *46)* | *(e* | *69 | *0* | diff --git a/arrays/4-polar.mkd b/arrays/4-polar.mkd deleted file mode 100644 index ae79416..0000000 --- a/arrays/4-polar.mkd +++ /dev/null @@ -1,7 +0,0 @@ -| *2176543* | *2176543* | *2176543* | *2176543* | *2176543* | *2176543* | *2176543* | *2176543* | *1765432* | *1765432* | *1765432* | *1765432* | *1765432* | *1765432* | *1765432* | *1765432* | *7654321* | *7654321* | *7654321* | *7654321* | *7654321* | *7654321* | *7654321* | *7654321* | -|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:|-----------:| -| | | | | | | | | | | | | | | | | | | | | | | | | -| *2e974* | *16* | *30t85* | *27* | *41e96* | *38* | *520t7* | *49* | *31e86* | *5t* | *42097* | *6e* | *531t8* | *70* | *642e9* | *81* | *7530t* | *92* | *8641e* | *t3* | *97520* | *e4* | *t8631* | *50* | -| *05* | *42e97* | *16* | *530t8* | *27* | *641e9* | *38* | *7520t* | *49* | *631e8* | *5t* | *74209* | *6e* | *8531t* | *70* | *9642e* | *18* | *7530t* | *29* | *8641e* | *3t* | *97520* | *4e* | *t8631* | -| | | | | | | | | | | | | | | | | | | | | | | | | -| *(34)* | *(34)* | *(34)* | *(24)* | *(24)* | *(23)* | *(23)* | *(14)* | *(14)* | *(13)* | *(13)* | *(12)* | *(12)* | *(12)* | *(12)* | *(23)* | *(23)* | *(14)* | *(14)* | *(24)* | *(24)* | *(13)* | *(13)* | *(34)* | diff --git a/arrays/d-sets.mkd b/arrays/d-sets.mkd deleted file mode 100644 index 5212e93..0000000 --- a/arrays/d-sets.mkd +++ /dev/null @@ -1,14 +0,0 @@ -| [1234567] | -|-----------:| -| *024579e* | -| *13568t0* | -| *24679e1* | -| *3578t02* | -| *4689e13* | -| *579t024* | -| *68te135* | -| *79e0246* | -| *8t01357* | -| *9e12468* | -| *t023579* | -| *e13468t* | diff --git a/arrays/i-1.md b/arrays/i-1.md deleted file mode 100644 index e479cbf..0000000 --- a/arrays/i-1.md +++ /dev/null @@ -1,5 +0,0 @@ -### m-1 - -| 3462571 | 4326517 | 4236157 | 4231657 | 2413567 | 2143567 | 1234567 | -|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:| -| 8916e34 | t972054 | 2e16948 | 7462e91 | 907e246 | 1e4368t | 024579e | diff --git a/arrays/i-19.md b/arrays/i-19.md deleted file mode 100644 index cc61bc7..0000000 --- a/arrays/i-19.md +++ /dev/null @@ -1,26 +0,0 @@ -### m 19 - - -| *e024579* | *9t02357* | *89e1246* | *78t0135* | *79t0235* | *8te1346* | -|:---------:|:---------:|:---------:|:---------:|:---------:|:---------:| -| {e209- | -9057} | {e146 | 8t3}{5 | 7902 | e1}{36 | -| {05 | t3 | 82 | 7}{1 | t3 | 84 | -| {7 | 2 | 9 | 0 | 5 | t | -| (7123456) | (7123456) | (7123456) | (7123456) | (6712345) | (6712345) | - - -| *3568te1* | *e124679* | *4689e12* | *79e0245* | *468te13* | *024579e* | -|:---------:|:---------:|:---------:|:---------:|:---------:|:---------:| -| 58t1 | e}{467 | 9e12} | {7e90 | 461}{3 | 0279 | -| 6e} | {12 | 68 | 45 | e}{8 | 4e | -| 3} | {9 | 4 | 2 | t | 5 | -| (6712345) | (6712345) | (5671234) | (5671234) | (4567123) | (5671234) | - - -| *t024579* | *679e124* | | -|:---------:|:---------:|:----:| -| t5}{47 | 9e24 | (6) | -| 29 | 61} | | -| 0 | 7} | | -| (4567123) | (3456712) | | - diff --git a/arrays/i-2.md b/arrays/i-2.md deleted file mode 100644 index 1552c63..0000000 --- a/arrays/i-2.md +++ /dev/null @@ -1,34 +0,0 @@ -### m 2 (331) - -| *024579e* | *e024579* | *4579t02* | *023578t* | *4579t02* | -|:---------:|:---------:|:---------:|:---------:|:---------:| -| {079 | e24 | 5}{70- | -038 | 5t2} | -| {24e | 057 | 9}{t2- | -257 | 94{0} | -| {5 | 9 | 4 | t | 7- | -| (1234567) | (7123456) | (7123456) | (6712345) | (7123456) | - - -| *e124679* | *9e02457* | *78t0135* | *t013568* | *68te134* | -|:---------:|:---------:|:---------:|:---------:|:---------:| -| {126 | 9e4 | 8}{35 | 018 | 6t}{e | -| e49 | 257} | {701 | t35 | 8}{14- | -| -7 | 0 | t | 6 | 3- | -| (6712345) | (6712345) | (7123456) | (6712345) | (5671234) | - - -| *134689e* | *9e12467* | *79e0245* | *579t023* | *8t02357* | -|:---------:|:---------:|:---------:|:---------:|:---------:| -| 169- | -947- | -72}{4 | 590- | -027 | -| -48e- | -e26 | 9}{05 | 723 | 8t}{5 | -| -3} | {1 | e | t | 3- | -| (6712345) | (5671234) | (5671234) | (5671234) | (4567123) | - - -| *68te134* | *468te13* | *024679e* | *024679e* | *579e024* | -|:---------:|:---------:|:---------:|:---------:|:---------:| -| e}{14 | 68e | 2{9}e | 024 | 57}(9) | -| 68t- | -t13 | 0}{67- | -79e | 024} | -| -3 | 4- | -4 | 6} | (e) | -| (5671234) | (4567123) | (4567123) | (4567123) | (4567123) | - - diff --git a/arrays/i-20.md b/arrays/i-20.md deleted file mode 100644 index c973fb0..0000000 --- a/arrays/i-20.md +++ /dev/null @@ -1,9 +0,0 @@ -### mov 20 array - -| *1e97642* | *86421e9* | *875310t* | *431et86* | *86531et* | *1et8643* | *86431e9* | | -|:--------- |:--------- |:--------- |:--------- |:--------- |:--------- |:--------- |:---- | -| {(6)42 | 1e9 | 7}{30 | t86 | 51}{3 | et8- | -841 | (6)} | -| {(1)e | 86 | 5t | 3}{1 | 8t | 43 | 6e} | | -| {(9) | 4 | 1 | e | 6 | 1 | 3} | | -| {(7) | 2 | 8 | 4 | e | 6 | 9} | | -| (7654321) | (7654321) | (1765432) | (1765432) | (2176543) | (2176543) | (3217654) | | diff --git a/arrays/i-21.md b/arrays/i-21.md deleted file mode 100644 index 9e0b861..0000000 --- a/arrays/i-21.md +++ /dev/null @@ -1,22 +0,0 @@ - ### "Ionian" Array - -| (15) | (8) | (13) | (6) | (5) | (10) | (9) | (12) | (2) | (3) | (14) | (7) | (4) | (11) | (1) | -|:---- |:--- |:---- |:----- |:----- |:---- |:---- |:---- |:------- |:------ |:----- |:------ |:----- |:----- |:-------- | -| {9 | e12 | | 46 | | 8- | | | | | -8} | | | (6) | | -| {7 | 9 | e | | 024 | | 6}{8 | t | | 01357} | {2- | 2- | | | 24679e1} | -| {5 | | 79 | | | t0 | 24- | | | | -4} | {0 | 24579 | e} | | -| {2 | 467 | | | | | 9e1} | {20 | | t8- | | -8753} | | (7) | | -| {0 | | 24 | | 579e- | | | | | | -e- | | -e} | (9) | | -| {4 | | 6 | 89e1- | | -1 | | 3}{5 | 7 | | 9 | t | 0- | -024} | | -| {t | | 0 | 2 | | 357 | | 9}{7 | 9e0246- | | 6}(1) | | | | | - - -| (15) | (8) | (13) | (6) | -|:---- |:--- |:---- |:----- | -| {t | 024 | | 57 | -| {8 | t | 0 | | -| {6 | | 8t | | -| {3 | 579 | | | -| {1 | | 35 | | -| {5 | | 7 | 9e02- | -| {e | | 1 | 3 | diff --git a/arrays/i-3.md b/arrays/i-3.md deleted file mode 100644 index c8a9955..0000000 --- a/arrays/i-3.md +++ /dev/null @@ -1,12 +0,0 @@ -### Invention 3 - -| 1^7^ | 2^2^1^3^| 3^2^1 | 52 | 43 | 421 | 322 | 21^6^ | 321^2^ | 31^3^ | 2^3^1 | 41^3^ | 51^2^ | 61 | 7 | -|:----:|:-------:|:-----:|:------:|:-----:|:-----:|:----:|:------:|:------:|:-----:|:-----:|:-----:|:-------:|:-------:|:---------:| -| {3 | 46 | | | 8te1} | | | | {0t | 975- | -5 | 3 | | 2} | | -| {8 | 9 | e | | | 13 | 46- | -6} | {754 | 2 | 0t | | | | (9) | -| {5 | | 68t | | | 0 | 13- | -3} | | | | {2 | | 0e9754} | | -| {6 | 7- | | -79e12 | | | | 4} | | | | | | | {3468te1} | -| {0 | | 135 | | | 578t- | | -t}{1 | 2 | 4 | 68 | | 9 | | (e) | -| {t | e1 | | | 356 | | | 8} | {9 | t | | 0- | -02457} | | | -| {1 | 2 | | 46 | | | 89e- | -e} | | 0 | 13 | 578t- | -t} | | | - diff --git a/arrays/i-4.md b/arrays/i-4.md deleted file mode 100644 index c70cf8f..0000000 --- a/arrays/i-4.md +++ /dev/null @@ -1,14 +0,0 @@ -| | | | | | | | | | | | | | | | | -| ''1765432'' | ''1765432'' | ''1765432'' | ''1765432'' | ''1765432'' | ''1765432'' | ''1765432'' | ''1765432'' | | | | | | | | | -| :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | | | | | | | | | -| ''31e86'' | ''5t'' | ''42097'' | ''6e'' | ''531t8'' | ''70'' | ''642e9'' | ''81'' | | | | | | | | | -| ''49'' | ''631e8'' | ''5t'' | ''74209'' | ''6e'' | ''8531t'' | ''70'' | ''9642e'' | | | | | | | | | -| | | | | | | | | | | | | | | | | -| ''(14)'' | ''(13)'' | ''(13)'' | ''(12)'' | ''(12)'' | ''(12)'' | ''(12)'' | ''(23)'' | | | | | | | | | -| | | | | | | | | | | | | | | | | -| ''7654321'' | ''7654321'' | ''7654321'' | ''7654321'' | ''7654321'' | ''7654321'' | ''7654321'' | ''7654321'' | | | | | | | | | -| :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | :-----: | | | | | | | | | -| ''7530t'' | ''92'' | ''8641e'' | ''t3'' | ''97520'' | ''e4'' | ''t8631'' | ''50'' | | | | | | | | | -| ''18'' | ''7530t'' | ''29'' | ''8641e'' | ''3t'' | ''97520'' | ''4e'' | ''t8631'' | | | | | | | | | -| | | | | | | | | | | | | | | | | -| ''(23)'' | ''(14)'' | ''(14)'' | ''(24)'' | ''(24)'' | ''(13)'' | ''(13)'' | ''(34)'' | | | | | | | | | diff --git a/arrays/m-order.md b/arrays/m-order.md deleted file mode 100644 index 86e09e1..0000000 --- a/arrays/m-order.md +++ /dev/null @@ -1,9 +0,0 @@ -### sequences order - -2 -3 -5 -1 -4 -6 -0 diff --git a/lilypond-files/eng-files/ms-paper.ly b/lilypond-files/eng-files/ms-paper.ly new file mode 100644 index 0000000..12a6072 --- /dev/null +++ b/lilypond-files/eng-files/ms-paper.ly @@ -0,0 +1,26 @@ +\version "2.22.2" +\paper { + #(set-paper-size "letter") + print-all-headers = ##t + top-margin = 0.8\cm + bottom-margin = 0.8\cm + left-margin = 2\cm + right-margin = 2\cm + indent = 1.3\cm + short-indent = 0\cm + #(define fonts + (set-global-fonts + #:music "haydn" + #:brace "haydn" + #:roman "Junicode" + )) + max-systems-per-page = #7 + system-system-spacing = + #'((basic-distance . 5) + (minimum-distance . 5) + (padding . 8)) + score-system-spacing = + #'((basic-distance . 4) + (minimum-distance . 4) + (padding . 5)) +} diff --git a/lilypond-files/eng-files/pp-paper.ly b/lilypond-files/eng-files/pp-paper.ly index 1e28baf..bc27ba0 100644 --- a/lilypond-files/eng-files/pp-paper.ly +++ b/lilypond-files/eng-files/pp-paper.ly @@ -37,27 +37,5 @@ \concat { \on-the-fly #(on-page 26) \evfoot } \concat { \on-the-fly #(on-page 28) \evfoot } } - #(set-paper-size "letter") - print-all-headers = ##t - top-margin = 0.8\cm - bottom-margin = 0.8\cm - left-margin = 2\cm - right-margin = 2\cm - indent = 1.3\cm - short-indent = 0\cm - #(define fonts - (set-global-fonts - #:music "haydn" - #:brace "haydn" - #:roman "Junicode" - )) - max-systems-per-page = #7 - system-system-spacing = - #'((basic-distance . 5) - (minimum-distance . 5) - (padding . 8)) - score-system-spacing = - #'((basic-distance . 4) - (minimum-distance . 4) - (padding . 5)) + } diff --git a/lilypond-files/fifteen-inventions.ly b/lilypond-files/fifteen-inventions.ly deleted file mode 100644 index 73be912..0000000 --- a/lilypond-files/fifteen-inventions.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.20.0" %commonplace Common Tones engraver file - -%------called files------ -\include "eng-files/pp-variables.ly" -\include "eng-files/pp-paper.ly" -\include "front-matter/pp-p-notes.ly" -\include "front-matter/pp-bio.ly" -\include "front-matter/pp-back-cover.ly" -\include "front-matter/pp-outside-cover.ly" -\include "front-matter/pp-inside-cover.ly" -\include "front-matter/pp-front-matter.ly" -\include "manuscripts/1i.ly" -\include "manuscripts/2i.ly" -\include "manuscripts/3i.ly" -\include "manuscripts/4i.ly" -\include "manuscripts/13i.ly" -\include "manuscripts/pp-i19.ly" -\include "manuscripts/pp-i20.ly" -\include "manuscripts/pp-i21.ly" -\include "eng-files/pp-document-structure.ly" diff --git a/lilypond-files/front-matter/pp-back-cover.ly b/lilypond-files/front-matter/back-cover.ly similarity index 100% rename from lilypond-files/front-matter/pp-back-cover.ly rename to lilypond-files/front-matter/back-cover.ly diff --git a/lilypond-files/front-matter/pp-bio.ly b/lilypond-files/front-matter/bio.ly similarity index 100% rename from lilypond-files/front-matter/pp-bio.ly rename to lilypond-files/front-matter/bio.ly diff --git a/lilypond-files/front-matter/pp-front-matter.ly b/lilypond-files/front-matter/front-matter.ly similarity index 100% rename from lilypond-files/front-matter/pp-front-matter.ly rename to lilypond-files/front-matter/front-matter.ly diff --git a/lilypond-files/front-matter/pp-inside-cover.ly b/lilypond-files/front-matter/inside-cover.ly similarity index 100% rename from lilypond-files/front-matter/pp-inside-cover.ly rename to lilypond-files/front-matter/inside-cover.ly diff --git a/lilypond-files/front-matter/pp-outside-cover.ly b/lilypond-files/front-matter/outside-cover.ly similarity index 100% rename from lilypond-files/front-matter/pp-outside-cover.ly rename to lilypond-files/front-matter/outside-cover.ly diff --git a/lilypond-files/front-matter/pp-p-notes.ly b/lilypond-files/front-matter/p-notes.ly similarity index 100% rename from lilypond-files/front-matter/pp-p-notes.ly rename to lilypond-files/front-matter/p-notes.ly diff --git a/lilypond-files/manuscripts/1i.ly b/lilypond-files/manuscripts/1i.ly index a381582..1fefa7f 100644 --- a/lilypond-files/manuscripts/1i.ly +++ b/lilypond-files/manuscripts/1i.ly @@ -1,40 +1,53 @@ -\version "2.20.0" %invention 1 manuscript: +\version "2.22.2" %invention 1 manuscript: -voiceApre = { \tmarkione \override Beam.auto-knee-gap = #6 \override Flag.stroke-style = #"grace" -\time 15/8 \change Staff = "di1" \stemUp d8[\laissezVibrer\sustainOn_\markup { \bold "(" \dynamic pp \bold "-" \dynamic mf \bold ")" } a'\laissezVibrer e\laissezVibrer g\laissezVibrer fis\laissezVibrer b\laissezVibrer c\laissezVibrer] -\change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b1*1/2^~ 1*1/2 \offset X-offset #-3.4 ^\markup { \tiny \italic "a piacere" } \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "ui1" \stemDown f'8[\laissezVibrer bes\laissezVibrer ees\laissezVibrer des\laissezVibrer aes'\laissezVibrer ces\laissezVibrer ges\laissezVibrer] -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,,1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -f''8[\laissezVibrer g,\laissezVibrer ees\laissezVibrer c\laissezVibrer \change Staff = "di1" bes\laissezVibrer aes\laissezVibrer \change Staff = "ui1" d\laissezVibrer] -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\stemUp \change Staff = "di1" e,8[\laissezVibrer a,\laissezVibrer cis,\laissezVibrer dis\laissezVibrer fis\laissezVibrer gis\laissezVibrer b\laissezVibrer] -\change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b'1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" g,8[\laissezVibrer bes\laissezVibrer f'\laissezVibrer a\laissezVibrer \change Staff = "ui1" e'\laissezVibrer d\laissezVibrer c'\laissezVibrer] -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\stemDown des''8[\laissezVibrer f\laissezVibrer g,\laissezVibrer bes,\laissezVibrer ees,\laissezVibrer \change Staff = "di1" c\laissezVibrer aes\laissezVibrer] -\change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\stemUp \change Staff = "di1" a8[\laissezVibrer fis\laissezVibrer e\laissezVibrer b\laissezVibrer cis,\laissezVibrer d,\laissezVibrer g\laissezVibrer] \change Staff = "ui1" -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b''1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" a,,8[\laissezVibrer fis'\laissezVibrer gis\laissezVibrer cis\laissezVibrer e\laissezVibrer \change Staff = "ui1" d'\laissezVibrer b'\laissezVibrer] -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\stemDown c'8[\laissezVibrer f\laissezVibrer ees'\laissezVibrer bes'\laissezVibrer ges,\laissezVibrer des\laissezVibrer aes\laissezVibrer] -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\stemUp bes'8[\laissezVibrer f\laissezVibrer g\laissezVibrer c,\laissezVibrer \change Staff = "di1" ees,\laissezVibrer a,\laissezVibrer d\laissezVibrer] \change Staff = "ui1" -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b'1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" \stemUp b,8[\laissezVibrer e,\laissezVibrer cis\laissezVibrer dis\laissezVibrer fis\laissezVibrer gis\laissezVibrer ais\laissezVibrer] \change Staff = "ui1" -\override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b'1*1/2^~ 1*1/2 \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\time 7/8 \stemUp \change Staff = "di1" c,8[\laissezVibrer\sustainOff\sustainOn d\laissezVibrer e\laissezVibrer f\laissezVibrer g\laissezVibrer a\laissezVibrer b\laissezVibrer] \bar "|." } - -voiceBpre = { \tmarkione \override NoteHead #'no-ledgers = ##t \override Score.SustainPedalLineSpanner #'padding = #'3 -\time 15/8 \set Staff.pedalSustainStyle = #'bracket \override NoteHead.transparent = ##t s4.\sustainOn s4 s4 d'1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -s4.\sustainOff\sustainOn s4 s4 d1*1/2_~ 1*1/2 | -\time 7/8 \change Staff = "ui1" s8^\markup { \italic "poco rit." } s8 s8 s8 s8 s8 s8 \offset X-offset -2 ^\markup { "attacca" } | } +\new PianoStaff \with { \consists "Merge_rests_engraver" } << +\set PianoStaff.connectArpeggios = ##t +\override PianoStaff.Arpeggio.arpeggio-direction = #UP +\new Staff = "ui1" { + \accidentalStyle modern-cautionary + << + \relative { \tempo "Presto" + \time 7/16 s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 | + s16 s16 s16 s16 s16 s16 s16 \bar "|." + } + >> +} +\new Staff = "di1" { \clef bass + \accidentalStyle modern-cautionary + << + \relative { \tempo "Presto" + \time 7/16 e,16[\p fis g a b c d] | + ees16[ f aes bes \change Staff = "ui1" des ces \change Staff = "di1" ges] | + f16[ ees d c bes aes g] | + e16[ cis a b dis fis gis] | + a16[ bes c d e f g] | + \change Staff = "ui1" des'[ ees c \change Staff = "di1" bes aes g f] | + fis[ e d cis b a g] | + gis[ a b cis d e fis] | + bes[ c \change Staff = "ui1" ees f ges des \change Staff = "di1" aes] | + g[ f ees d c bes a] | + b[ e, dis fis gis ais cis] | + d[ e f g a b c] \bar "|." + } +>> +} +>> +\midi { } +\layout { +\context { +\Score +\override BarNumber.font-size = #1 +\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) +\override TimeSignature.stencil = ##f +} +} diff --git a/lilypond-files/manuscripts/2i.ly b/lilypond-files/manuscripts/2i.ly index 409d246..a997c10 100644 --- a/lilypond-files/manuscripts/2i.ly +++ b/lilypond-files/manuscripts/2i.ly @@ -1,11 +1,11 @@ \version "2.20.0" %Invention 2 manuscript: - + utwo = \change Staff = "ui2" dtwo = \change Staff = "di2" -voiceAitwo = { \tmarktthree -\omit Staff.BarLine -\override Staff.BarLine.allow-span-bar = ##f +voiceAitwo = { \tmarktthree +\omit Staff.BarLine +\override Staff.BarLine.allow-span-bar = ##f \override DynamicLineSpanner.staff-padding = \phds \time 7/8 c'8[\offset X-offset #-2.5 \f d-- e f->-. \change Staff = "di2" g,-. a-. b-.] | b8[-. \change Staff = "ui2" c-.\> d-. e-. f-. g-. a->-.] | -- 2.39.5