no breaks in toc after section title

private_includes/base/verses_with_chords.ily

@@ -253,99 +253,6 @@
                                     (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
                                     text))))
 
-Chord_lyrics_spacing_engraver =
-#(lambda (ctx)
-   (let ((last-lyric-syllable #f)
-         (lyric-width-since-last-chord 0)
-         (music-columns-for-last-syllable 0)
-         (last-printed-chord #f)
-         (chord-width-since-last-lyric 0)
-         (lyrics-seen-since-break #f)
-         (have-a-rest #f)
-         (stanza #f)
-         (place-at-right-edge
-          (lambda (grob anchor padding)
-            (let ((anchor-width (interval-length (ly:grob-extent anchor anchor X))))
-              (ly:grob-set-parent! grob X anchor)
-              (ly:grob-set-property! grob 'X-offset (+ padding anchor-width))
-              ))))
-     (make-engraver
-      (listeners
-       ((multi-measure-rest-event engraver event)
-        (set! have-a-rest #t)
-        )
-       ((rest-event engraver event)
-        (set! have-a-rest #t)
-        )
-       ((lyric-event engraver event)
-        (set! have-a-rest #f)
-        (set! music-columns-for-last-syllable 0)
-        )
-       ((break-event engraver event)
-        (set! last-lyric-syllable #f)
-        (set! lyric-width-since-last-chord 0)
-        (set! music-columns-for-last-syllable 0)
-        (set! last-printed-chord #f)
-        (set! chord-width-since-last-lyric 0)
-        (set! lyrics-seen-since-break #f)
-        ))
-      (acknowledgers
-       ((musical-paper-column-interface this-engraver grob source-engraver)
-        (set! music-columns-for-last-syllable (+ 1 music-columns-for-last-syllable))
-        )
-       ((lyric-syllable-interface this-engraver grob source-engraver)
-        (let ((syllable-width (interval-length (ly:grob-extent grob grob X))))
-          (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord syllable-width))
-          )
-        (if (> chord-width-since-last-lyric 0)
-            (if lyrics-seen-since-break
-                (ly:grob-set-property! grob 'extra-spacing-width
-                                       (cons (- chord-width-since-last-lyric) (cdr (ly:grob-property grob 'extra-spacing-width '(0 . 0)))))
-                (if last-printed-chord
-                  (begin
-                    (if stanza (ly:grob-set-property! stanza 'padding chord-width-since-last-lyric))
-                    (place-at-right-edge grob last-printed-chord 0)
-                    )))
-            )
-        (set! last-lyric-syllable grob)
-        (set! chord-width-since-last-lyric 0)
-        (set! lyrics-seen-since-break #t)
-        )
-       ((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)
-                  lyrics-seen-since-break))
-            (let* ((last-printed-chord-width (if last-printed-chord (interval-length (ly:grob-extent last-printed-chord last-printed-chord X)) 0))
-                   (chord-overwidth (- last-printed-chord-width lyric-width-since-last-chord))
-                   (chord-gap 0.5))
-              (if have-a-rest
-                  (let ((chord-width (interval-length (ly:grob-extent grob grob X))))
-                    (if last-lyric-syllable
-                        (if (and last-printed-chord (> chord-overwidth 0))
-                          (place-at-right-edge grob last-printed-chord chord-gap)
-                          (place-at-right-edge grob last-lyric-syllable 0))
-                        (if last-printed-chord
-                            (place-at-right-edge grob last-printed-chord chord-gap)))
-                    (set! chord-width-since-last-lyric (+ chord-width-since-last-lyric chord-width chord-gap))
-                    ))
-              (if (and last-lyric-syllable last-printed-chord (> chord-overwidth 0))
-                      (ly:grob-set-property! last-lyric-syllable 'extra-spacing-width
-                                             (cons (car (ly:grob-property last-lyric-syllable 'extra-spacing-width '(0 . 0))) (+ chord-gap chord-overwidth)))
-                      )
-              (set! lyric-width-since-last-chord (* (if last-lyric-syllable (interval-length (ly:grob-extent last-lyric-syllable last-lyric-syllable X)) 0) (- 1 (/ 1.0 music-columns-for-last-syllable))))
-              (set! last-printed-chord grob)
-              (set! last-lyric-syllable #f)
-              )
-            (ly:grob-set-property! grob 'X-extent '(+inf.0 . -inf.0))
-            )
-        )
-        ((stanza-number-interface this-engraver grob source-engraver)
-          (set! stanza grob)
-          )
-       )
-      )))
-
 #(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
    #:properties ((verse-chords #{#})
                  (verse-reference-voice #{#})
@@ -389,11 +296,9 @@ Chord_lyrics_spacing_engraver =
             \context {
               \Score
               \override PaperColumn.keep-inside-line = ##f
-              % \override SpacingSpanner.strict-note-spacing = ##t
+             % \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
@@ -423,6 +328,14 @@ Chord_lyrics_spacing_engraver =
               \remove Note_heads_engraver
               \remove Script_engraver
             }
+            \context {
+              \NullVoice
+              \consists Rest_engraver
+              \omit Rest
+              \undo \omit NoteHead
+              \hide NoteHead
+              \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,20 +218,29 @@
 }
 
 #(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)))
-           (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)))
+  (define (single-item-markup 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)))
+      (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))))
+  (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)))