new engraver for spacing in chordlyrics

basic_format_and_style_settings.ly

@@ -121,18 +121,16 @@ override-stanza =
 #}
 )
 
-#(define (stanza . stanzanumbers)
+stanza =
+#(define-music-function (parser location stanzanumber) (number?)
 #{
   \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
   \applyContext
   #(lambda (context)
-    (let* ((stanzanumber-override (ly:assoc-get 'forced-spacing (ly:context-grob-definition context 'StanzaNumber) #f))
-           (stanza-style (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
-           (stanza-format (lambda (stanzanumber) (format #f (if (eq? stanza-style 'roman) romanStanzaFormat stanzaFormat) stanzanumber))))
-        (ly:context-set-property! context 'stanza
-          (string-join (map stanza-format
-                            (if stanzanumber-override (list stanzanumber-override) stanzanumbers))
-                        ", "))))
+    (let* ((stanzanumber (ly:assoc-get 'forced-spacing (ly:context-grob-definition context 'StanzaNumber) stanzanumber))
+           (stanzastyle (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
+           (formattedStanzaNumber (format #f (if (eq? stanzastyle 'roman) romanStanzaFormat stanzaFormat) stanzanumber)))
+        (ly:context-set-property! context 'stanza formattedStanzaNumber)))
 #}
 )
 
@@ -194,16 +192,12 @@ alt =
 
 updown =
 #(define-music-function (parser location word) (string?)
-(let ((first-char (string-take word 1))
-      (rest (substring word 1 (string-length word))))
 #{
   \lyricmode {
-    \markup {
-      \tag #'up #(string-append (string-capitalize first-char) rest)
-      \tag #'down #(string-append (string-downcase first-char) rest)
-    }
+    \tag #'up { \markup { #(string-capitalize word) } }
+    \tag #'down { \markup { #(string-downcase word) } }
   }
-#}))
+#})
 
 dottedExtender = {
   \override LyricExtender.style = #'dotted-line
@@ -237,19 +231,3 @@ cue =
             (make-null-markup))
       }
   #})
-
-#(define-markup-command (ruf-style layout props text) (string?)
-   (interpret-markup layout props
-                     (markup #:italic (string-append "(" text ")"))))
-rufWithMarkup =
-#(define-music-function (text) (markup?)
-   #{
-     \lyricmode {
-       \once \override StanzaNumber.font-series = #'normal
-       \once \override StanzaNumber.direction = 1
-       \set stanza = #text
-     }
-   #})
-ruf =
-#(define-music-function (text) (string?)
-   (rufWithMarkup (make-ruf-style-markup text)))

include_from_song.ily

@@ -3,13 +3,5 @@ includeFromSong =
   (let ((noDefaultOutputBackup noDefaultOutput))
     (set! noDefaultOutput #t)
     (ly:parser-parse-string (ly:parser-clone)
-      (ly:format "\\include \"~a\""
-      (string-append
-        (dirname (dirname (current-filename)))
-        file-name-separator-string
-        "lilypond-song-includes"
-        file-name-separator-string
-        "liedbausteine"
-        file-name-separator-string
-        filename)))
+      (ly:format "\\include \"~a\"" filename))
     (set! noDefaultOutput noDefaultOutputBackup)))

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)) '())) #{ #})
     ))
 
 

verses_with_chords.ly

@@ -434,7 +434,6 @@ Chord_lyrics_spacing_engraver =
               \remove Tie_engraver
               \remove Dynamic_engraver
               \remove Note_heads_engraver
-              \remove Script_engraver
             }
             \context {
               \NullVoice