Mehrere Lieder auf eine Seite
This commit is contained in:
1 parent
809100b2f3
commit
2359a7c5ae
7 files changed
+243
-43
No files matched your search
@@ -33,7 +33,8 @@
|
||||
#(define (join-present items joiner)
|
||||
(string-join (filter (lambda (item) (and (string? item) (not (string-null? (string-trim-both item))))) items) joiner))
|
||||
|
||||
#(define-markup-command (print-songinfo layout props) ()
|
||||
% Songinfo aus den header:*-Properties, ohne Pruefung auf die letzte Seite.
|
||||
#(define-markup-command (songinfo-content layout props) ()
|
||||
(define (songinfo-from songId key)
|
||||
(let ((song (if (defined? 'SONG_DATA) (assoc-ref SONG_DATA songId) #f)))
|
||||
(if song
|
||||
@@ -131,7 +132,6 @@
|
||||
)
|
||||
|
||||
(interpret-markup layout props
|
||||
(if (chain-assoc-get 'page:is-bookpart-last-page props #f)
|
||||
(let* ((authors (chain-assoc-get 'header:authors props #f))
|
||||
(poet-and-composers (poet-and-composer-from-authors authors))
|
||||
(songId (chain-assoc-get 'header:songId props #f))
|
||||
@@ -167,10 +167,25 @@
|
||||
#:fontsize songInfoFontSize
|
||||
#:sans
|
||||
(ly:output-def-lookup layout 'songinfoMarkup)
|
||||
)))
|
||||
(make-null-markup)))
|
||||
))))
|
||||
)
|
||||
|
||||
% Songinfo im Footer, nur auf der letzten Seite des Bookparts. Gibt es
|
||||
% eingebettete Lieder (siehe embedded_songs.ily), steht hier die Songinfo des
|
||||
% letzten eingebetteten Lieds, ausser im Header ist footersong gesetzt
|
||||
% (##f = Hauptlied, oder ein mit \captureSong gesichertes Lied).
|
||||
#(define-markup-command (print-songinfo layout props) ()
|
||||
(if (chain-assoc-get 'page:is-bookpart-last-page props #f)
|
||||
(let* ((footersong (chain-assoc-get 'header:footersong props 'auto))
|
||||
(embedded (embedded-song-list (chain-assoc-get 'header:embeddedsongs props '())))
|
||||
(song (if (eq? footersong 'auto)
|
||||
(and (pair? embedded) (last embedded))
|
||||
footersong)))
|
||||
(interpret-markup layout
|
||||
(if (module? song) (header-module->props song props) props)
|
||||
(make-songinfo-content-markup)))
|
||||
(interpret-markup layout props (make-null-markup))))
|
||||
|
||||
#(define-markup-command (print-pagenumber layout props)()
|
||||
(let ((label (chain-assoc-get 'header:myindexlabel props #f)))
|
||||
(interpret-markup layout props
|
||||
|
||||
Reference in new issue
Block a user