refactor title markup and allow songnumbers

This commit is contained in:
tux
2025-06-14 16:37:15 +02:00
parent 53c41bf5dc
commit 7a65d056d6
3 changed files with 26 additions and 25 deletions

View File

@ -1,4 +1,5 @@
#(define song-list '()) #(define song-list '())
#(define song-number 0)
#(define (files-in-directory dirname) #(define (files-in-directory dirname)
;;; Generate list containing filenames ;;; Generate list containing filenames
@ -185,15 +186,17 @@ songs =
\markup { \pagecenter { \epsfile #X #xsize #filename } } \markup { \pagecenter { \epsfile #X #xsize #filename } }
} #} } #}
) )
(let ((header #{ \bookpart { $(assq-ref songvars 'header) \header { (let* ((newnumber (+ 1 song-number))
(header #{ \bookpart { $(assq-ref songvars 'header) \header {
songfilename = $(symbol->string filename) songfilename = $(symbol->string filename)
myindexlabel = #(assq-ref songvars 'label) myindexlabel = #(assq-ref songvars 'label)
songnumber = #(number->string newnumber)
} } #}) } } #})
;(header (assq-ref songvars 'header))
(music (assq-ref songvars 'music)) (music (assq-ref songvars 'music))
(layout (assq-ref songvars 'layout)) (layout (assq-ref songvars 'layout))
(text-pages (assq-ref songvars 'text-pages)) (text-pages (assq-ref songvars 'text-pages))
(label (assq-ref songvars 'label))) (label (assq-ref songvars 'label)))
(set! song-number newnumber)
#{ #{
\bookpart { \bookpart {
$header $header

View File

@ -4,15 +4,15 @@
(interpret-markup-list layout (prepend-alist-chain 'songfilename songfilename props) markuplist)) (interpret-markup-list layout (prepend-alist-chain 'songfilename songfilename props) markuplist))
#(define-markup-command (customEps layout props ysize filename)(number? string?) #(define-markup-command (customEps layout props ysize filename)(number? string?)
#:properties ((songfilename "") #:properties ((songfilename ""))
(defaultmarkup #f))
(interpret-markup layout props (interpret-markup layout props
(let ((filepath (if (string-null? songfilename) (let ((defaulttitlemarkup (ly:output-def-lookup layout 'defaultTitleMarkup))
(filepath (if (string-null? songfilename)
filename filename
(ly:format "~a/~a/~a" songPath songfilename filename)))) (ly:format "~a/~a/~a" songPath songfilename filename))))
(if (file-exists? filepath) (if (file-exists? filepath)
(make-epsfile-markup Y ysize filepath) (make-epsfile-markup Y ysize filepath)
(if defaultmarkup (if defaulttitlemarkup
defaultmarkup defaulttitlemarkup
(ly:format "file does not exist ~a" filepath)) (ly:format "file does not exist ~a" filepath))
)))) ))))

View File

@ -1,16 +1,6 @@
#(define-markup-command (bookTitleMarkupCustom layout props)() #(define-markup-command (bookTitleMarkupCustom layout props)()
(interpret-markup layout (interpret-markup layout
(prepend-alist-chain 'defaultmarkup #{ (prepend-alist-chain 'songfilename (chain-assoc-get 'header:songfilename props "") props)
\markup {
\override #'(baseline-skip . 3.5)
\center-column {
\override #`(font-name . ,songTitleFont) { \fontsize #songTitleSize \fromproperty #'header:title }
\large \bold \fromproperty #'header:subtitle
\smaller \bold \fromproperty #'header:subsubtitle
}
}
#}
(prepend-alist-chain 'songfilename (chain-assoc-get 'header:songfilename props "") props))
(make-column-markup (make-column-markup
(list (list
(make-vspace-markup (chain-assoc-get 'header:titletopspace props 0)) (make-vspace-markup (chain-assoc-get 'header:titletopspace props 0))
@ -63,4 +53,12 @@
scoreTitleMarkup = \markup \null scoreTitleMarkup = \markup \null
oddHeaderMarkup = \markup { \if \on-first-page-of-part \title-with-category-images ##t } oddHeaderMarkup = \markup { \if \on-first-page-of-part \title-with-category-images ##t }
evenHeaderMarkup = \markup { \if \on-first-page-of-part \title-with-category-images ##f } evenHeaderMarkup = \markup { \if \on-first-page-of-part \title-with-category-images ##f }
defaultTitleMarkup = \markup {
\override #'(baseline-skip . 3.5)
\center-column {
\override #`(font-name . ,songTitleFont) { \fontsize #songTitleSize \fromproperty #'header:title }
\large \bold \fromproperty #'header:subtitle
\smaller \bold \fromproperty #'header:subsubtitle
}
}
} }