new engraver for spacing in chordlyrics

private_includes/base/basic_format_and_style_settings.ily

@@ -72,8 +72,6 @@ generalLayout = \layout {
     \override Stem.layer = 2
     \override Flag.layer = 2
     \override Beam.layer = 2
-    \override Slur.layer = 2
-    \override Tie.layer = 2
     \override Accidental.layer = 2
   }
 }
@@ -91,8 +89,6 @@ secondVoiceStyle = {
   \override Stem.color = #grey
   \override Flag.color = #grey
   \override Beam.color = #grey
-  \override Slur.color = #grey
-  \override Tie.color = #grey
   \override Accidental.color = #grey
   \override NoteHead.layer = 1
   \override Rest.layer = 1
@@ -100,8 +96,6 @@ secondVoiceStyle = {
   \override Stem.layer = 1
   \override Flag.layer = 1
   \override Beam.layer = 1
-  \override Slur.layer = 1
-  \override Tie.layer = 1
   \override Accidental.layer = 1
 }
 
@@ -112,8 +106,6 @@ firstVoiceStyle = {
   \override Stem.color = #black
   \override Flag.color = #black
   \override Beam.color = #black
-  \override Slur.color = #black
-  \override Tie.color = #black
   \override Accidental.color = #black
 }
 
@@ -127,23 +119,23 @@ romanStanza =
   #{ \override StanzaNumber.style = #'roman #})
 
 override-stanza =
-#(define-music-function (parser location stanzanumbers) (number-list?)
+#(define-music-function (parser location stanzanumber) (number?)
 #{
-  \once \override StanzaNumber.details.custom-stanzanumber-override = #stanzanumbers
+  \once \override StanzaNumber.forced-spacing = #stanzanumber % misuse property "forced-spacing" to override the stanzanumber
 #}
 )
 
 #(define (stanza . stanzanumbers)
 #{
-  \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
+  \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
   \applyContext
   #(lambda (context)
-    (let* ((stanzanumbers-override (ly:assoc-get 'custom-stanzanumber-override (ly:assoc-get 'details (ly:context-grob-definition context 'StanzaNumber) '()) #f))
+    (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 stanzanumbers-override stanzanumbers-override stanzanumbers))
+                            (if stanzanumber-override (list stanzanumber-override) stanzanumbers))
                         ", "))))
 #}
 )
@@ -151,7 +143,7 @@ override-stanza =
 ref =
 #(define-music-function (stanzanumbers lyrics) ((number-list? (list)) ly:music?)
 #{ \lyricmode {
-    \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
+    \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
     \set stanza = #(make-on-the-fly-markup (lambda (layout props m) ((ly:output-def-lookup layout 'refMarkupFormatter) layout props stanzanumbers)) (make-null-markup))
     #lyrics
   }
@@ -159,13 +151,13 @@ ref =
 )
 
 % prints a repStart Sign as stanza if the tag 'repeats is kept.
-% if there was a stanza already set by the stanza function with StanzaNumber.details.custom-realstanza = ##t we set that also as stanza.
+% if there was a stanza already set by the stanza function with StanzaNumber.layer = 23 we set that also as stanza.
 repStartWithTag = \lyricmode {
   \tag #'repeats {
     \applyContext
     #(lambda (context)
       (let ((lastStanza (ly:context-property context 'stanza))
-            (printLastStanza (ly:assoc-get 'custom-realstanza (ly:assoc-get 'details (ly:context-grob-definition context 'StanzaNumber) '()) #f))
+            (printLastStanza (= (ly:assoc-get 'layer (ly:context-grob-definition context 'StanzaNumber) 0) 23))
             (stanzaFontSeries (ly:assoc-get 'font-series (ly:context-grob-definition context 'StanzaNumber) 'normal)))
       (ly:context-set-property! context 'stanza
         (make-concat-markup

private_includes/base/default_songinfo_style.ily

@@ -52,7 +52,7 @@
                       (lambda (paragraph)
                         (make-wordwrap-internal-markup-list #t
                           #{ \markuplist { $(ly:parser-include-string paragraph) } #}))
-                      (ly:regex-split (ly:make-regex "\r?\n[ \t\r\n]*\n[ \t\r\n]*") (string-append prefix text))))
+                      (ly:regex-split (ly:make-regex "\n[ \t\n]*\n[ \t\n]*") (string-append prefix text))))
                   '())))
               (poet-and-composer-markup-list
                 (string-with-paragraphs->markuplist "" (string-append