songinfogenerierung optimiert
This commit is contained in:
@ -32,7 +32,7 @@
|
||||
(poetId (chain-assoc-get 'header:poetId props (if songId (songinfo-from songId "poet") #f)))
|
||||
(composerId (chain-assoc-get 'header:composerId props (if songId (songinfo-from songId "composer") #f)))
|
||||
(poet-and-composer-same (equal? poetId composerId)))
|
||||
(let (
|
||||
(let ((blockwidth (* (chain-assoc-get 'header:songinfo-size-factor props 0.9) (ly:output-def-lookup layout 'line-width)))
|
||||
(infotext (chain-assoc-get 'header:infotext props (chain-assoc-get 'header:songinfo props #f)))
|
||||
(poet-maybe-with-composer (chain-assoc-get 'header:poet props (if poetId (if poet-and-composer-same (format-poet-and-composer poetId) (format-poet poetId)) #f)))
|
||||
(composer (chain-assoc-get 'header:composer props (if (and composerId (not poet-and-composer-same)) (format-composer composerId) #f)))
|
||||
@ -58,6 +58,10 @@
|
||||
(if (and year_text (not (and (string? year_text) (string-null? year_text)))) year_text #f))
|
||||
#:override (cons 'songinfo:year_melody
|
||||
(if (and year_melody (not (and (string? year_melody) (string-null? year_melody)))) year_melody #f))
|
||||
#:override '(baseline-skip . 3.0)
|
||||
#:override `(line-width . ,blockwidth)
|
||||
#:fontsize songInfoFontSize
|
||||
#:sans
|
||||
(ly:output-def-lookup layout 'songinfoMarkup)
|
||||
)))
|
||||
(make-null-markup)))
|
||||
|
Reference in New Issue
Block a user