From ea67d15fd5b23efe7a17a24eceaced8f54b63fef Mon Sep 17 00:00:00 2001 From: tuckerjohnson Date: Wed, 3 Aug 2022 11:56:08 -0400 Subject: [PATCH] rename --- .../eng-files/pp-document-structure.ly | 2 +- lilypond-files/eng-files/pp-extweaks.ly | 48 ------------------- lilypond-files/eng-files/pp-paper.ly | 6 +-- lilypond-files/eng-files/pp-variables.ly | 6 +-- .../front-matter/pp-front-matter.ly | 13 +++-- lilypond-files/front-matter/pp-p-notes.ly | 2 +- lilypond-files/manuscripts/1i.ly | 37 ++++++++++---- 7 files changed, 43 insertions(+), 71 deletions(-) delete mode 100644 lilypond-files/eng-files/pp-extweaks.ly diff --git a/lilypond-files/eng-files/pp-document-structure.ly b/lilypond-files/eng-files/pp-document-structure.ly index f8cf9dc..90fece1 100644 --- a/lilypond-files/eng-files/pp-document-structure.ly +++ b/lilypond-files/eng-files/pp-document-structure.ly @@ -142,7 +142,7 @@ piece = \markup { \large { \bold "polar" } } >> } >> -\midi { } +%\midi { } \layout { \context { \Score diff --git a/lilypond-files/eng-files/pp-extweaks.ly b/lilypond-files/eng-files/pp-extweaks.ly deleted file mode 100644 index 616e90e..0000000 --- a/lilypond-files/eng-files/pp-extweaks.ly +++ /dev/null @@ -1,48 +0,0 @@ -\version "2.20.0" - -#(define ((flared-tie coords) grob) - - (define (pair-to-list pair) - (list (car pair) (cdr pair))) - - (define (normalize-coords goods x y dir) - (map - (lambda (coord) - ;(coord-scale coord (cons x (* y dir))) - (cons (* x (car coord)) (* y dir (cdr coord)))) - goods)) - - (define (my-c-p-s points thick) - (make-connected-path-stencil - points - thick - 1.0 - 1.0 - #f - #f)) - - ;; outer let to trigger suicide - (let ((sten (ly:tie::print grob))) - (if (grob::is-live? grob) - (let* ((layout (ly:grob-layout grob)) - (line-thickness (ly:output-def-lookup layout 'line-thickness)) - (thickness (ly:grob-property grob 'thickness 0.1)) - (used-thick (* line-thickness thickness)) - (dir (ly:grob-property grob 'direction)) - (xex (ly:stencil-extent sten X)) - (yex (ly:stencil-extent sten Y)) - (lenx (interval-length xex)) - (leny (interval-length yex)) - (xtrans (car xex)) - (ytrans (if (> dir 0)(car yex) (cdr yex))) - (uplist - (map pair-to-list - (normalize-coords coords lenx (* leny 2) dir)))) - - (ly:stencil-translate - (my-c-p-s uplist used-thick) - (cons xtrans ytrans))) - '()))) - -#(define flare-tie - (flared-tie '((0 . 0)(0.1 . 0.2) (0.9 . 0.2) (1.0 . 0.0)))) diff --git a/lilypond-files/eng-files/pp-paper.ly b/lilypond-files/eng-files/pp-paper.ly index d564866..1e28baf 100644 --- a/lilypond-files/eng-files/pp-paper.ly +++ b/lilypond-files/eng-files/pp-paper.ly @@ -57,7 +57,7 @@ (minimum-distance . 5) (padding . 8)) score-system-spacing = - #'((basic-distance . 10) - (minimum-distance . 10) - (padding . 10)) + #'((basic-distance . 4) + (minimum-distance . 4) + (padding . 5)) } diff --git a/lilypond-files/eng-files/pp-variables.ly b/lilypond-files/eng-files/pp-variables.ly index 40a705e..d9d34cb 100644 --- a/lilypond-files/eng-files/pp-variables.ly +++ b/lilypond-files/eng-files/pp-variables.ly @@ -1,11 +1,11 @@ \version "2.22.2" %texts -xtitle = \markup { Twenty-One Inventions } -xsub = \markup { in seven sequences } +xtitle = \markup { Fifteen Inventions } +xsub = \markup { \null } xcomp = \markup { Tucker Johnson } xinst = \markup { piano } -xdur = \markup { 25 minutes } +xdur = \markup { 20 minutes } xcr = \markup \tiny { Copyright Tucker Johnson MMXXII. All Rights Reserved } oddfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small { \xcomp } } \null } } evfoot = \markup { \fill-line { \null \center-column { \concat { " - " \fromproperty #'page:page-number-string " - " } \small { \xtitle } } \null } } diff --git a/lilypond-files/front-matter/pp-front-matter.ly b/lilypond-files/front-matter/pp-front-matter.ly index f2ee585..e7785da 100644 --- a/lilypond-files/front-matter/pp-front-matter.ly +++ b/lilypond-files/front-matter/pp-front-matter.ly @@ -32,37 +32,36 @@ front-matter = \markuplist { \line { \italic "sequence 3" } \line { \bold "7 cyme" } \line { \bold "8 polar" } - \line { \bold "9 circumnutation" } + \line { \bold "9 circumnutation" } \vspace #0.2 \line { \italic "sequence 4" } \line { \bold "10 panicle" } \line { \bold "11 composite" } - \line { \bold "12 circumnutation" } + \line { \bold "12 circumnutation" } \vspace #0.2 } \left-column { \line { \italic "sequence 5" } \line { \bold "13 composite" } \line { \bold "14 polar" } - \line { \bold "15 circumnutation" } + \line { \bold "15 circumnutation" } \vspace #0.2 \line { \italic "sequence 6" } \line { \bold "16 cyme" } \line { \bold "17 pappus" } - \line { \bold "18 circumnutation" } + \line { \bold "18 circumnutation" } \vspace #0.2 \line { \italic "sequence 7" } \line { \bold "19 panicle" } \line { \bold "20 cyme" } - \line { \bold "21 circumnutation" } + \line { \bold "21 circumnutation" } } \column { \null } } \vspace #0.5 \line { ================================= } \vspace #1.5 - } + } } \column { \null } } - diff --git a/lilypond-files/front-matter/pp-p-notes.ly b/lilypond-files/front-matter/pp-p-notes.ly index c266228..6752306 100644 --- a/lilypond-files/front-matter/pp-p-notes.ly +++ b/lilypond-files/front-matter/pp-p-notes.ly @@ -1,3 +1,3 @@ \version "2.20.0" -xpnote = \markup { \override #'(line-width . 90) \justify { \bold \italic "21 inventions" is a modular, multi-movement work for piano. The inventions are organized into seven, three-movement groups called sequences. These sequences can be played in any combination. I constructed each of the short inventions from one to seven contrapuntal strands. Inventions which share the same number of these strands are composed out in a similar fashion, and thus share a title. }} +xpnote = \markup { \override #'(line-width . 90) \justify { \bold \italic "Fifteen Inventions" is a modular, multi-movement work for piano. The inventions are organized into seven, three-movement groups called sequences. These sequences can be played in any combination. I constructed each of the short inventions from one to seven contrapuntal strands. Inventions which share the same number of these strands are composed out in a similar fashion, and thus share a title. }} diff --git a/lilypond-files/manuscripts/1i.ly b/lilypond-files/manuscripts/1i.ly index 18b765f..a381582 100644 --- a/lilypond-files/manuscripts/1i.ly +++ b/lilypond-files/manuscripts/1i.ly @@ -1,19 +1,40 @@ \version "2.20.0" %invention 1 manuscript: - + voiceApre = { \tmarkione \override Beam.auto-knee-gap = #6 \override Flag.stroke-style = #"grace" -\time 15/8 \change Staff = "di1" \stemUp gis8[\laissezVibrer\sustainOn_\markup { \bold "(" \dynamic pp \bold "-" \dynamic mf \bold ")" } a\laissezVibrer cis\laissezVibrer \change Staff = "ui1" fis\laissezVibrer \change Staff = "di1" b,\laissezVibrer dis,\laissezVibrer e,\laissezVibrer] \change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b''1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata^\markup { \tiny \italic "a piacere" } \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" \stemDown bes8[\laissezVibrer a\laissezVibrer \change Staff = "ui1" g'\laissezVibrer d'\laissezVibrer c\laissezVibrer f,\laissezVibrer e'\laissezVibrer] \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" \stemUp d,8[\laissezVibrer b'\laissezVibrer cis,\laissezVibrer fis,\laissezVibrer a\laissezVibrer e\laissezVibrer gis'\laissezVibrer] \change Staff = "ui1" \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" g,8[\laissezVibrer e'\laissezVibrer fis\laissezVibrer d\laissezVibrer b'\laissezVibrer \change Staff = "ui1" a'8\laissezVibrer cis\laissezVibrer] \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \offset X-offset #-3.4 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | -\change Staff = "di1" a,8[\laissezVibrer c\laissezVibrer g'\laissezVibrer b\laissezVibrer \change Staff = "ui1" d\laissezVibrer e\laissezVibrer fis\laissezVibrer] \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,1*1/2^~ 1*1/2 \offset X-offset #-2.5 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | - \change Staff = "di1" \stemDown cis,8[\laissezVibrer b'\laissezVibrer \change Staff = "ui1" e\laissezVibrer dis'\laissezVibrer fis\laissezVibrer gis\laissezVibrer ais\laissezVibrer] \override NoteHead #'no-ledgers = ##t \override NoteHead.transparent = ##t b,,1*1/2^~ 1*1/2 \offset X-offset #-2.5 \fermata \override NoteHead.transparent = ##f \override NoteHead #'no-ledgers = ##f | +\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 +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" } | } -- 2.39.5