no breaks in toc after section title

private_includes/base/all.ily

@@ -21,8 +21,17 @@
     )))))
     (scm-load "resolve_inherits.scm")
     (scm-load "yaml_parser.scm")))
-#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
+
-#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))
+#(define (song-includes-data-path filename)
+  (string-join
+    (list
+      (dirname (dirname (dirname (dirname (current-filename)))))
+      "lilypond-song-includes"
+      "data"
+      filename)
+    file-name-separator-string))
+#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file (song-includes-data-path "authors.yml"))))
+#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file (song-includes-data-path "songs.yml"))))
 
 \include "merge_rests_engraver_override.ily"
 \include "basic_format_and_style_settings.ily"

private_includes/base/verses_with_chords.ily

@@ -253,113 +253,6 @@
                                     (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
                                     text))))
 
-Chord_lyrics_spacing_engraver =
-#(lambda (ctx)
-   (let ((last-note-head #f)
-         (note-head-extended #f)
-         (last-lyric-syllable-width 0)
-         (lyric-width-since-last-chord 0)
-         (notes-on-syllable-count 0)
-         (last-chord-name #f)
-         (remaining-chord-width 0)
-         (last-rest #f)
-         (rest-count 0)
-         (multi-measure-rest-count 0)
-         (stanza-shift 0))
-     (make-engraver
-      (listeners
-       ((multi-measure-rest-event engraver event)
-        (set! multi-measure-rest-count (+ multi-measure-rest-count 1))
-        )
-       ((break-event engraver event)
-        (set! last-note-head #f)
-        (set! note-head-extended #f)
-        (set! last-lyric-syllable-width 0)
-        (set! lyric-width-since-last-chord 0)
-        (set! notes-on-syllable-count 0)
-        (set! last-chord-name #f)
-        (set! remaining-chord-width 0)
-        (set! last-rest #f)
-        (set! rest-count 0)
-        (set! multi-measure-rest-count 0)
-        (set! stanza-shift 0)
-        ))
-      (acknowledgers
-       ((note-head-interface this-engraver grob source-engraver)
-        (if (and (> rest-count 0) (not last-note-head))
-            (let ((rest-spacing-on-line-start 1.2))
-              (ly:grob-set-property! grob 'minimum-X-extent (cons (- rest-spacing-on-line-start) 0))
-              (set! stanza-shift rest-spacing-on-line-start)
-              ))
-        (set! notes-on-syllable-count (+ 1 notes-on-syllable-count))
-        (set! last-note-head grob)
-        (set! note-head-extended #f)
-        (set! last-rest #f)
-        (set! rest-count 0)
-        (set! multi-measure-rest-count 0)
-        )
-       ((lyric-syllable-interface this-engraver grob source-engraver)
-        (set! remaining-chord-width (max 0 (- remaining-chord-width lyric-width-since-last-chord)))
-        (set! last-lyric-syllable-width (- (cdr (ly:grob-extent grob grob X)) 0.2))
-        (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord last-lyric-syllable-width))
-        (if last-note-head (set! notes-on-syllable-count 1))
-        )
-       ((chord-name-interface this-engraver grob source-engraver)
-        (if (not (and
-                  (boolean? (ly:grob-property grob 'begin-of-line-visible))
-                  (ly:grob-property grob 'begin-of-line-visible)))
-            (let ((on-a-rest (> rest-count 0)))
-              (if (not on-a-rest)
-                  (set! notes-on-syllable-count (- notes-on-syllable-count 1)))
-              (if (and last-chord-name (= multi-measure-rest-count 1) (> lyric-width-since-last-chord remaining-chord-width))
-                  (ly:grob-set-property! last-chord-name 'extra-spacing-width (cons -0.1 (+ 0.1 (- lyric-width-since-last-chord remaining-chord-width)))))
-              (if last-note-head
-                  (let* ((last-note-min-x-extent (ly:grob-property last-note-head 'minimum-X-extent))
-                         (last-note-min-x-lower (if (pair? last-note-min-x-extent) (car last-note-min-x-extent) 0))
-                         (last-note-min-x-upper (if (pair? last-note-min-x-extent) (cdr last-note-min-x-extent) 0)))
-                    (if on-a-rest
-                        (begin
-                         (if (not note-head-extended)
-                             (begin
-                              (ly:grob-set-property! last-note-head 'minimum-X-extent
-                                                     (cons last-note-min-x-lower (- last-lyric-syllable-width -2 (* 2.2 rest-count))))
-                              (set! note-head-extended #t)
-                              ))
-                         (ly:grob-set-property! last-rest 'minimum-X-extent (cons 0 2))
-                         )
-                        (if (and (> lyric-width-since-last-chord 0)
-                                 (> remaining-chord-width lyric-width-since-last-chord))
-                            (ly:grob-set-property! last-note-head 'minimum-X-extent
-                                                   (cons (- -1.2 (- remaining-chord-width lyric-width-since-last-chord)) last-note-min-x-upper))
-                            (let* ((width-per-note-head 0.5)
-                                   (note-width-since-last-chord (* width-per-note-head notes-on-syllable-count)))
-                              (if (> remaining-chord-width note-width-since-last-chord)
-                                  (ly:grob-set-property! last-note-head 'minimum-X-extent
-                                                         (cons (- note-width-since-last-chord remaining-chord-width) last-note-min-x-upper))
-                                  )
-                              )
-                            )
-                        )))
-              (set! last-chord-name grob)
-              (set! remaining-chord-width
-                    (if (and on-a-rest (equal? (ly:prob-property (ly:grob-property grob 'cause) 'duration) (ly:prob-property (ly:grob-property last-rest 'cause) 'duration)))
-                        0
-                        (cdr (ly:grob-extent grob grob X))))
-              (set! lyric-width-since-last-chord 0)
-              (set! notes-on-syllable-count (if on-a-rest 0 1))
-              ))
-        )
-       ((rest-interface this-engraver grob source-engraver)
-        (set! rest-count (+ 1 rest-count))
-        (set! last-rest grob)
-        (set! multi-measure-rest-count 0)
-        )
-       ((stanza-number-interface this-engraver grob source-engraver)
-        (ly:grob-set-property! grob 'padding (+ 1 stanza-shift)))
-       ))))
-
-%#(ly:set-option 'debug-skylines #t)
-
 #(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
    #:properties ((verse-chords #{#})
                  (verse-reference-voice #{#})
@@ -406,8 +299,6 @@ Chord_lyrics_spacing_engraver =
              % \override SpacingSpanner.strict-note-spacing = ##t
               \override SpacingSpanner.uniform-stretching = ##t
               \override SpacingSpanner.spacing-increment = 0
-              %\override SpacingSpanner.packed-spacing = ##t
-              \consists \Chord_lyrics_spacing_engraver
               \remove Bar_number_engraver
               \remove Mark_engraver
               \remove Jump_engraver
@@ -441,10 +332,9 @@ Chord_lyrics_spacing_engraver =
               \NullVoice
               \consists Rest_engraver
               \omit Rest
-              \override Rest.X-extent = #'(0 . 0)
               \undo \omit NoteHead
               \hide NoteHead
-              \override NoteHead.X-extent = #'(0 . 0.5)
+              \override NoteHead.X-extent = #'(0 . 0)
             }
           }
         }

private_includes/book/toc_include.ily

@@ -90,7 +90,7 @@
      (for-each (lambda (category)
             (let* ((catsym (string->symbol category))
                    (catlist (hashq-ref category-index-hash catsym
-                              (list (list label 'indexCategoryMarkup `(((rawtext . ,category))))))))
+                              (list (list label 'indexCategoryMarkup `(((combine-with-next . #t) (rawtext . ,category))))))))
               (if (assq catsym category-names)
                 (hashq-set! category-index-hash catsym
                   (cons (list label markup-symbol textoptions) catlist))
@@ -114,7 +114,7 @@
      (for-each (lambda (authorID)
             (let* ((authorsym (string->symbol authorID))
                    (authorlist (hashq-ref author-index-hash authorsym
-                              (list (list label 'indexAuthorMarkup `(((rawtext . ,authorID))))))))
+                              (list (list label 'indexAuthorMarkup `(((combine-with-next . #t) (rawtext . ,authorID))))))))
                 (hashq-set! author-index-hash authorsym
                   (cons (list label markup-symbol textoptions) authorlist))
                 ))
@@ -218,7 +218,7 @@
 }
 
 #(define (prepare-item-markup items layout)
-   (map (lambda (index-item)
+  (define (single-item-markup index-item)
     (let* ((label (car index-item))
            (index-markup (cadr index-item))
            (textoptions (caddr index-item))
@@ -231,7 +231,16 @@
         #:override (cons 'index:alternative alternative)
         #:override (cons 'index:songnumber songnumber)
         (ly:output-def-lookup layout index-markup))))
-       (items)))
+  (if (null? items)
+      items
+      (let* ((index-item (car items))
+             (combine-with-next (chain-assoc-get 'combine-with-next (caddr index-item) #f))
+             (restitems (cdr items))
+             (item-markup (single-item-markup index-item)))
+        (if (and combine-with-next (not (null? restitems)))
+            (cons (make-column-markup (list item-markup (single-item-markup (car restitems)))) (prepare-item-markup (cdr restitems) layout))
+            (cons item-markup (prepare-item-markup restitems layout))))
+      ))
 
 #(define-markup-list-command (index-in-columns-with-title layout props index-type title-markup) (symbol? markup?)
   ( _i "Outputs index alphabetical sorted or in categories" )
@@ -245,7 +254,7 @@
         (make-columnlayout-markup-list songTocColumns 2
           (let ((h (- (ly:output-def-lookup layout 'paper-height) 12)))
             (cons (- h (interval-length (ly:stencil-extent title Y))) h))
-          (prepare-item-markup items layout))))))
+          (prepare-item-markup (items) layout))))))
 
 indexItem =
 #(define-music-function (parser location sorttext text) (string? markup?)
@@ -255,7 +264,7 @@ indexItem =
 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 (prepend-alist-chain 'combine-with-next #t (prepend-alist-chain 'rawtext text '())) sorttext))
 
 #(define (extract-and-check-vars-from-header bookheader varlist)
   (let* ((headervars (hash-map->list cons (struct-ref (ly:book-header bookheader) 0)))