new engraver for spacing in chordlyrics

book_include.ly

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

eps_file_from_song_dir.ly

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

title_with_category_images.ly

@@ -1,6 +1,16 @@
 #(define-markup-command (bookTitleMarkupCustom layout props)()
    (interpret-markup layout
-     (prepend-alist-chain 'songfilename (chain-assoc-get 'header:songfilename props "") props)
+     (prepend-alist-chain 'defaultmarkup #{
+\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
        (list
          (make-vspace-markup (chain-assoc-get 'header:titletopspace props 0))
@@ -53,12 +63,4 @@
   scoreTitleMarkup = \markup \null
   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 }
-  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
-    }
-  }
 }

toc_include.ly

@@ -167,24 +167,22 @@
      (markup #:override (cons 'baseline-skip 3.5) (if catname (make-left-column-markup (string-split (cadr catname) #\newline)) category)))))
 
 #(define-markup-command (index-item-with-pattern layout props)()
-    #:properties ((index:text "")
-                  (index:alternative #f)
-                  (index:page #f)
-                  (line-width))
     (let* (
+            (text (chain-assoc-get 'index:text props))
+            (page (chain-assoc-get 'index:page props))
             (width (-
-                     line-width
+                     (chain-assoc-get 'line-width props)
                      (interval-length (ly:stencil-extent (interpret-markup layout props "XXXX") X))))
             (lines-reversed
-              (reverse (map (lambda (stil) (markup #:stencil stil))
-                (wordwrap-string-internal-markup-list layout
-                  (prepend-alist-chain 'line-width width
-                    (if index:alternative
-                        (prepend-alist-chain 'font-shape 'italic props)
-                        props))
-                  #f
-                  index:text))))
-            (last-line-with-dots (make-fill-with-pattern-markup 1 RIGHT "." (car lines-reversed) index:page))
+                (if (markup? text)
+                    (list text)
+                    (reverse (map (lambda (stil) (markup #:stencil stil))
+                      (wordwrap-string-internal-markup-list layout
+                        (cons (if (chain-assoc-get 'alternative text)
+                                (list (cons 'line-width width) (cons 'font-shape 'italic))
+                                (list (cons 'line-width width))) props) #f
+                        (chain-assoc-get 'rawtext text))))))
+            (last-line-with-dots (make-fill-with-pattern-markup 1 RIGHT "." (car lines-reversed) page))
             (lines-without-dots (cdr lines-reversed))
             (target-line-size-markup
                  (make-column-markup
@@ -206,7 +204,7 @@
 
 \paper {
   indexItemMarkup = \markup {
-    \sans \index-item-with-pattern
+    \index-item-with-pattern
   }
   indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \left-column {
     \sans \bold \fontsize #3 \fromproperty #'index:text
@@ -230,17 +228,12 @@
 
 #(define (prepare-item-markup items layout)
    (map (lambda (index-item)
-         (let* ((label (car index-item))
-                (index-markup (cadr index-item))
-                (textoptions (caddr index-item))
-                (text (chain-assoc-get 'rawtext textoptions))
-                (alternative (chain-assoc-get 'alternative textoptions))
-                (songnumber (chain-assoc-get 'songnumber textoptions)))
+         (let ((label (car index-item))
+               (index-markup (cadr index-item))
+               (text (caddr index-item)))
            (markup #:override (cons 'index:label label)
              #:override (cons 'index:page (markup #:custom-page-number label -1))
              #:override (cons 'index:text text)
-             #:override (cons 'index:alternative alternative)
-             #:override (cons 'index:songnumber songnumber)
              (ly:output-def-lookup layout index-markup))))
        (items)))
 
@@ -261,12 +254,12 @@
 indexItem =
 #(define-music-function (parser location sorttext text) (string? markup?)
    "Add a line to the alphabetical index, using the @code{indexItemMarkup} paper variable markup."
-   (add-index-item! 'indexItemMarkup (prepend-alist-chain 'rawtext text '()) sorttext))
+   (add-index-item! 'indexItemMarkup text sorttext))
 
 indexSection =
 #(define-music-function (parser location sorttext text) (string? markup?)
    "Add a section line to the alphabetical index, using @code{indexSectionMarkup} paper variable markup. This can be used to divide the alphabetical index into different sections, for example one section for each first letter."
-   (add-index-item! 'indexSectionMarkup (prepend-alist-chain 'rawtext text '()) sorttext))
+   (add-index-item! 'indexSectionMarkup text sorttext))
 
 #(define (extract-and-check-vars-from-header bookheader varlist)
   (let* ((headervars (hash-map->list cons (struct-ref (ly:book-header bookheader) 0)))
@@ -295,28 +288,26 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
     ))
     (let*
       (
-       (extractedheadervars (extract-and-check-vars-from-header header '(title starttext alttitle categorytitle categories authors songnumber)))
+       (extractedheadervars (extract-and-check-vars-from-header header '(title starttext alttitle categorytitle categories authors)))
        (title (assq-ref extractedheadervars 'title))
        (starttext (assq-ref extractedheadervars 'starttext))
        (alttitle (assq-ref extractedheadervars 'alttitle))
        (categorytitle (assq-ref extractedheadervars 'categorytitle))
        (categories (assq-ref extractedheadervars 'categories))
        (authors (assq-ref extractedheadervars 'authors))
-       (songnumber (assq-ref extractedheadervars 'songnumber))
-       (textoptions (lambda (text alternative) `(((rawtext . ,text) (alternative . ,alternative) (songnumber . ,songnumber)))))
-       (add-to-toc! (lambda (toctitle alternative)
-                      (add-index-item! 'indexItemMarkup (textoptions toctitle alternative) toctitle label)))
+       (add-to-toc! (lambda (toctitle tocmarkup)
+                      (add-index-item! 'indexItemMarkup tocmarkup toctitle label)))
        )
-           (if categories (add-category-index-item! (string-tokenize categories) 'indexItemMarkup (textoptions (if categorytitle categorytitle title) #f) label))
-           (if authors (add-author-index-item! (all-author-ids authors) 'indexItemMarkup (textoptions (if categorytitle categorytitle title) #f) label))
-           (if starttext (add-to-toc! starttext #t))
+           (if categories (add-category-index-item! (string-tokenize categories) 'indexItemMarkup (cons (list (cons 'rawtext (if categorytitle categorytitle title))) '()) label))
+           (if authors (add-author-index-item! (all-author-ids authors) 'indexItemMarkup (cons (list (cons 'rawtext (if categorytitle categorytitle title))) '()) label))
+           (if starttext (add-to-toc! starttext (cons (list (cons 'rawtext starttext) (cons 'alternative #t)) '())))
            (if alttitle
                (if (list? alttitle)
                    (for-each (lambda (alt)
-                                (add-to-toc! alt #t))
+                                (add-to-toc! alt (cons (list (cons 'rawtext alt) (cons 'alternative #t)) '())))
                              alttitle)
-                   (add-to-toc! alttitle #t)))
-           (if title (add-to-toc! title #f) #{ #})
+                   (add-to-toc! alttitle (cons (list (cons 'rawtext alttitle) (cons 'alternative #t)) '()))))
+           (if title (add-to-toc! title (cons (list (cons 'rawtext title)) '())) #{ #})
     ))