From: Tucker Johnson Date: Thu, 27 Feb 2025 05:56:48 +0000 (-0500) Subject: measure 1-12 X-Git-Url: https://git.newer.systems/?a=commitdiff_plain;h=cadffc00ad29704b0b25488f435f10007d827292;p=apples-and-pairs.git measure 1-12 --- diff --git a/applesAndPairs.ly b/applesAndPairs.ly index ba467af..518c0c0 100644 --- a/applesAndPairs.ly +++ b/applesAndPairs.ly @@ -270,8 +270,7 @@ \romanStringNumbers \override StringNumber.padding = 1 \override StringNumber.font-size = -3 - \override TextSpanner.style = #'dashed-line - \override TextSpanner.dash-period = 1 + \override TupletNumber.font-shape = #'bold } } } diff --git a/general/aliases.ly b/general/aliases.ly index eda3fa1..398a0d6 100644 --- a/general/aliases.ly +++ b/general/aliases.ly @@ -9,28 +9,31 @@ phds = #3.9 %notation marks pizz = ^\markup { "pizz" } arco = ^\markup { "arco" } -pont = ^\markup { \bold \italic "sul pont" } -tasto = ^\markup { \bold \italic "sul tasto" } -ord = ^\markup { \bold \italic "ord" } -lsp = \override TextSpanner.bound-details.left.text = \markup { \bold "sul pont" } -rsp = \override TextSpanner.bound-details.right.text = \markup { \bold "sul pont" } -lst = \override TextSpanner.bound-details.left.text = \markup { \bold "sul tasto" } -rst = \override TextSpanner.bound-details.right.text = \markup { \bold "sul tasto" } -lord = \override TextSpanner.bound-details.left.text = \markup { \bold "ord" } -rord = \override TextSpanner.bound-details.right.text = \markup { \bold "ord" } -rit = \override TextSpanner.bound-details.left.text = \markup { \upright "rit. " } -ritPoc = \override TextSpanner.bound-details.left.text = \markup { \upright "ritardando poco a poco " } -molRit = \override TextSpanner.bound-details.left.text = \markup { \upright "molto rit. " } -pocRit = \override TextSpanner.bound-details.left.text = \markup { \upright "poco rit. " } -ace = \override TextSpanner.bound-details.left.text = \markup { \upright "accel. " } -pocAce = \override TextSpanner.bound-details.left.text = \markup { \upright "poco accel. " } -acePoc = \override TextSpanner.bound-details.left.text = \markup { \upright "accelerando poco a poco " } -molAce = \override TextSpanner.bound-details.left.text = \markup { \upright "molto accel. " } +pont = ^\markup { \italic "sul pont" } +tasto = ^\markup { \italic "sul tasto" } +ord = ^\markup { \italic "ord" } sD = \stemDown sU = \stemUp sN = \stemNeutral +twoWayFermata = { + \once \set Staff.caesuraType = #'((underlying-bar-line . ".")) + \once \set Staff.caesuraTypeTransform = ##f + \caesura ^\shortfermata _\shortfermata +} + +glissandoSkipOn = { + \override NoteColumn.glissando-skip = ##t + \hide NoteHead + \override NoteHead.no-ledgers = ##t +} + +glissandoSkipOff = { + \revert NoteColumn.glissando-skip + \undo \hide NoteHead + \revert NoteHead.no-ledgers +} \defineBarLine "|" #'(#t #f " ") diff --git a/general/scripts.ly b/general/scripts.ly index 5d9b16e..4f49cf0 100644 --- a/general/scripts.ly +++ b/general/scripts.ly @@ -1,25 +1,65 @@ -to-internal-ts = -#(define-scheme-function - (top partial bottom) - (integer? rational? integer?) - (let - ((internal-ts - (+ (/ top bottom) (* partial (/ 1 bottom))))) - (cons (numerator internal-ts) (denominator internal-ts)))) +timeSpanner = + #(define-music-function (left) (string?) + #{ + \once { + \override TextSpanner.staff-padding = 5 + \override TextSpanner.outside-staff-priority = 1000 + \override TextSpanner.style = #'dashed-line + \override TextSpanner.dash-period = 3 + \override TextSpanner.dash-fraction = 0.25 + \override TextSpanner.font-size = #1 + \override TextSpanner.bound-details.left.text = \markup { \bold $left } + \override TextSpanner.bound-details.left-broken.text = ##f + \override TextSpanner.bound-details.right-broken.text = ##f + } + #}) +markSpanner = + #(define-music-function (left right) (string? string?) + #{ + \once { + \override TextSpanner.style = #'dashed-line + \override TextSpanner.outside-staff-priority = 550 + \override TextSpanner.dash-period = 2 + \override TextSpanner.dash-fraction = 0.5 + \override TextSpanner.font-size = #0.5 + \override TextSpanner.bound-details.left.stencil-align-dir-y = #CENTER + \override TextSpanner.bound-details.right.stencil-align-dir-y = #CENTER + \override TextSpanner.bound-details.left.text = \markup { \bold \italic $left } + \override TextSpanner.bound-details.right.text = + \markup { \general-align #Y #-1 \arrow-head #X #RIGHT ##t \italic $right } + \override TextSpanner.bound-details.left-broken.text = ##f + \override TextSpanner.bound-details.right-broken.text = ##f + } + #}) -fractionalTime = -#(define-music-function - (top partial bottom) - (integer? rational? integer?) - #{ - \once \override Staff.TimeSignature.stencil = #ly:text-interface::print - \once \override Staff.TimeSignature.text = - \markup \override #'(baseline-skip . 0) \center-column \number { - \concat { #(number->string top) \magnify #0.5 \pad-x #-.2 { - \translate #'(0 . 1) #(number->string (numerator partial)) - \translate #'(-1 . 0) \override #'(thickness . 2) \draw-line #'(1 . 2) - \translate #'(0 . 0) #(number->string (denominator partial)) }} #(number->string bottom) - } - \time #(to-internal-ts top partial bottom) +stringNumberSpanner = + #(define-music-function (StringNumber) (string?) + #{ + \once { + \override TextSpanner.style = #'solid + \override TextSpanner.outside-staff-priority = 500 + \override TextSpanner.font-size = #-3 + \override TextSpanner.bound-details.left.stencil-align-dir-y = #CENTER + \override TextSpanner.bound-details.left.text = \markup { $StringNumber \hspace #0.25 } + \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } + \override TextSpanner.bound-details.right-broken.text = ##f + } #}) + + + +lsp = \override TextSpanner.bound-details.left.text = \markup { \bold "sul pont" } +rsp = \override TextSpanner.bound-details.right.text = \markup { \bold "sul pont" } +lst = \override TextSpanner.bound-details.left.text = \markup { \bold "sul tasto" } +rst = \override TextSpanner.bound-details.right.text = \markup { \bold "sul tasto" } +lord = \override TextSpanner.bound-details.left.text = \markup { \bold "ord" } +rord = \override TextSpanner.bound-details.right.text = \markup { \bold "ord" } +rit = \override TextSpanner.bound-details.left.text = \markup { \upright "rit. " } +ritPoc = \override TextSpanner.bound-details.left.text = \markup { \upright "ritardando poco a poco " } +molRit = \override TextSpanner.bound-details.left.text = \markup { \upright "molto rit. " } +pocRit = \override TextSpanner.bound-details.left.text = \markup { \upright "poco rit. " } +ace = \override TextSpanner.bound-details.left.text = \markup { \upright "accel. " } +pocAce = \override TextSpanner.bound-details.left.text = \markup { \upright "poco accel. " } +acePoc = \override TextSpanner.bound-details.left.text = \markup { \upright "accelerando poco a poco " } +molAce = \override TextSpanner.bound-details.left.text = \markup { \upright "molto accel. " } diff --git a/manuscripts/violinI.ly b/manuscripts/violinI.ly index dfe07c0..13849a8 100644 --- a/manuscripts/violinI.ly +++ b/manuscripts/violinI.ly @@ -1,8 +1,8 @@ % root = ../applesAndPairs.ly \new Staff \with { - instrumentName = \markup { violin I } - shortInstrumentName = \markup { "I " } + instrumentName = \markup { violin \bold I } + shortInstrumentName = \markup { \bold "I " } \override DynamicLineSpanner.staff-padding = \sods \consists Text_mark_engraver } @@ -11,13 +11,30 @@ \clef treble \tempo Rubato 2=32 \time 5/4 - aes''8[\2\tasto\p ges f ees] d4.\< c8 b4\mf\> | %001 - \after 4 \p a2\3\ord r8 bes'8(\1\mp\< \tuplet 3/2 { g4) fis( dis')\mf\> } | %002 - \harm \after 2 \p e2. cis4(\mf\>\glissando c8) \ace \harm a8~\2\p\startTextSpan | %003 + \stringNumberSpanner "II" aes''8[\tasto\p\startTextSpan ges f ees] d4.\< c8 b4\mf\>\stopTextSpan | %001 + \after 4 \p a2\3\ord r8 bes'8(\1\mp\< \tuplet 3/2 { g4) fis(\glissando dis')\mf\> } | %002 + \once \override TextSpanner.outside-staff-priority = 500 + \harm \after 2 \p e2. cis4(\mf\>\glissando c8-.) \timeSpanner "accel." \harm a8~\2\p\startTextSpan | %003 \time 2/2 \harm a4 gis2.~\mf\> | %004 - \time 3/4 gis8\p\stopTextSpan \rit r8\startTextSpan r4 r4 | %005 - \time 2/2 2->\f\pont r8 8~\p\ord 4\stopTextSpan\fermata \bar "." | %006 + \time 3/4 gis8\p\stopTextSpan + \timeSpanner "rit." r8\startTextSpan r4 r4 | %005 + \time 2/2 2->\f\pont r8 8~\p\ord 4\stopTextSpan\fermata \twoWayFermata \bar "." | %006 + \tempo "a tempo" r8 d8~\tasto d2. | %007 - + \time 5/4 r8 \stringNumberSpanner "II" fis8(\mf\ord\startTextSpan dis-.)\stopTextSpan + \stringNumberSpanner "III" ais8\pizz\glissando\startTextSpan + \glissandoSkipOn b4 \glissandoSkipOff \tuplet 3/2 { e4\>\arco cis4 gis4~\p } | %008 + \time 2/2 gis2 \tuplet 3/2 { g2\glissando\pizz b4\<\arco } | %009 + \set glissandoMap = #'((1 . 1)) + fis4. d8\stopTextSpan 4\glissando 4\mf | %010 + << + { + \stringNumberSpanner "III" g8(\>\startTextSpan bes) 4\p\< \tuplet 3/2 { c4\stopTextSpan cis,4( b4) } | %011 + aes4\mf g2.\p\ord-\tweak outside-staff-priority 100 \fermata \twoWayFermata \bar "." | %012 + } + \new Voice { + s4 \markSpanner "" "sul pont" s4\startTextSpan s4 s4 | s4\stopTextSpan + } +>> } diff --git a/manuscripts/violinII.ly b/manuscripts/violinII.ly index a4fb8c8..4b8f3da 100644 --- a/manuscripts/violinII.ly +++ b/manuscripts/violinII.ly @@ -1,8 +1,8 @@ % root = ../applesAndPairs.ly \new Staff \with { - instrumentName = \markup { violin II } - shortInstrumentName = \markup { "II " } + instrumentName = \markup { violin \bold II } + shortInstrumentName = \markup { \bold "II " } \override DynamicLineSpanner.staff-padding = \sods \consists Text_mark_engraver } @@ -12,11 +12,19 @@ \time 5/4 R1*5/4 | %001 \tuplet 3/2 { r4 2~\p } 4~ 8 r8 r4 | %002 - r4 aes'8\mf g f4 b,8(\glissando bes4)\> d8(\p\< | %003 - \time 2/2 \tuplet 3/2 { fis4) b( f4~\mf } f8) e8(\> ees c | %004 - \time 3/4 a)\p\< \lord \rsp \startTextSpan d'4~\f\stopTextSpan | %005 - \override BarLine.allow-span-bar = ##t - \time 2/2 \tuplet 3/2 { d4 g,2\pizz } r4 bes,4\mp\fermata \bar "." %006 - r8 fis'8\p\arco\tasto gis8 a8 c8\< dis8(\glissando b4)\mf | %007 + r4 \stringNumberSpanner "II" aes'8\mf\startTextSpan g f4(\glissando b,8) bes4\> d8(\p\< | %003 + \time 2/2 \tuplet 3/2 { fis4)\stopTextSpan \stringNumberSpanner "I" b(\startTextSpan f4~\mf } f8)\stopTextSpan + \stringNumberSpanner "II" e8(\>\startTextSpan ees c | %004 + \time 3/4 a)\p\<\stopTextSpan \markSpanner "" "sul pont" \startTextSpan d'4~\f\stopTextSpan | %005 + \time 2/2 \tuplet 3/2 { d2 g,4\glissando\pizz } + \glissandoSkipOn e4 \glissandoSkipOff bes4\mp\fermata \twoWayFermata \bar "." %006 + \tempo "a tempo" + r8 fis'8\p\arco\tasto gis8 a8 c8\< dis8\glissando b4\mf | %007 + \time 5/4 a,4.\3(\glissando\>\ord c8~ c2~ c8)\p r8 | %008 + d'2. \tuplet 3/2 { r8 \stringNumberSpanner "II" e,8\<\startTextSpan cis } | %009 + a4 4~ 8 c8~\mf c4\stopTextSpan | %010 + r4 \markSpanner "" "sul pont" ges4\p\<\startTextSpan ees'4 f,4 | %011 + 4\mf\stopTextSpan 2.\p\ord-\tweak outside-staff-priority 100 \fermata \twoWayFermata \bar "." %012 + }