diff --git a/Pembaur_VierteLateinischeMesse_01_Kyrie.ly b/Pembaur_VierteLateinischeMesse_01_Kyrie.ly index 0d961c30888accd0e712d59651f5e5b29f41a364..39a74b648295c883ba4fb858047640763c95197b 100644 --- a/Pembaur_VierteLateinischeMesse_01_Kyrie.ly +++ b/Pembaur_VierteLateinischeMesse_01_Kyrie.ly @@ -201,7 +201,7 @@ IKyrieCorIIMusic = \relative g' { g2\f g4 g4 | % 13 c,2. r4 | % 14 g'2 g4 g4 | % 15 - g,2 r4 r4 | % 16 + g,2. r4 | % 16 % FIXED: In CorII score g,2 r4 (i.e. one beat is missing) g'2 g4 g4 | % 17 d4 r4 r2 | R1*7 | % 25 e2. \f r4 | R1 | % 27 diff --git a/Pembaur_VierteLateinischeMesse_Settings_Global.ly b/Pembaur_VierteLateinischeMesse_Settings_Global.ly index 1cd83753e86b48a97b396cb059cdfb3a242a017b..c3632fda39e58eb5a43c897b76b5d63939fd1bdb 100644 --- a/Pembaur_VierteLateinischeMesse_Settings_Global.ly +++ b/Pembaur_VierteLateinischeMesse_Settings_Global.ly @@ -125,12 +125,6 @@ MaleClef = \clef "bass" } -dynamicsX = #(define-music-function (parser location offset) (number?) -#{ - \once \override DynamicText #'X-offset = $offset - \once \override DynamicLineSpanner #'Y-offset = #0 -#}) - dynamicsXY = #(define-music-function (parser location offsetX offsetY) (number? number?) #{ @@ -148,16 +142,6 @@ dynamicsInside = #(define-music-function (parser location offsetX shiftY height) \once \override DynamicText #'extra-offset = #(cons 0 $shiftY ) #}) -% dynamicsAllInside = #(define-music-function (parser location offsetX shiftY) -% (number? number?) -% #{ -% \once \override DynamicText #'X-offset = $offsetX -% % \once \override DynamicLineSpanner #'Y-offset = #0 -% \once \override DynamicText #'Y-extent = #(cons 1 -1) -% \once \override DynamicLineSpanner #'Y-extent = #(cons 1 -1) -% \once \override DynamicText #'extra-offset = #(cons 0 $shiftY ) -% #}) - dynamicsInsideX = #(define-music-function (parser location offsetX) (number?) #{ \once \override DynamicText #'X-offset = $offsetX @@ -167,37 +151,15 @@ dynamicsInsideX = #(define-music-function (parser location offsetX) (number?) \once \override DynamicText #'extra-offset = #(cons 0 $shiftY ) #}) +% ignoreItem = #(define-music-function (parser location type) (symbol?) +% #{ +% \once \override $type #'Y-extent = #(cons +0 -0.01) +% #}) +% +% ignoreFermata = \ignoreItem #'Script +% ignoreMMNumber = \ignoreItem #'MultiMeasureRestNumber +% ignoreSlur = \ignoreItem #'Slur -% Move the dynamic sign inside the staff to a fixed staff-relative position -% posY (where 0 means vertically starts at the middle staff line) -dynamicsAllInside = #(define-music-function (parser location offsetX posY) -(number? number?) -#{ - % Invalid y-extent -> hidden from skyline calculation and collisions - \once \override DynamicLineSpanner #'Y-extent = #(cons +0 -0.01) - % move by X offset and to fixed Y-position (use Y-offset of parent!) - \once \override DynamicText #'X-offset = $offsetX - \once \override DynamicText #'Y-offset = - $(lambda (grob) - (let* ((head (ly:grob-parent grob Y)) - (offset (ly:grob-property head 'Y-offset))) - (- posY offset (- 0.6)))) - \once \override DynamicLineSpanner #'Y-offset = $posY -#}) - -dynamicsUpInside = #(define-music-function (parser location offsetX) (number?) - ((ly:music-function-extract dynamicsAllInside) parser location offsetX 1.5) -) - -dynamicsDownInside = #(define-music-function (parser location offsetX) (number?) - ((ly:music-function-extract dynamicsAllInside) parser location offsetX -3.5) -) - -hairpinOffset = #(define-music-function (parser location posY) (number?) -#{ - \once \override DynamicLineSpanner #'Y-offset = $posY - \once \override DynamicLineSpanner #'Y-extent = #(cons +0 -0.01) -#}) ignoreFermata = #(define-music-function (parser location) () #{ @@ -214,21 +176,3 @@ ignoreSlur = #(define-music-function (parser location) () \once \override Slur #'Y-extent = #(cons +0 -0.01) #}) - - -#(define ((line-break-offset before after) grob) - (let* ((orig (ly:grob-original grob)) - ; All siblings if line-broken: - (siblings (if (ly:grob? orig) (ly:spanner-broken-into orig) '() ))) - (if (>= (length siblings) 2) - ; We have been line-broken - (if (eq? (car (last-pair siblings)) grob) - ; Last sibling: - (ly:grob-set-property! grob 'Y-offset after) - ; Others get the before value: - (ly:grob-set-property! grob 'Y-offset before) - ) - ) - ) -) -