new engraver for spacing in chordlyrics

private_includes/base/basic_format_and_style_settings.ily

@@ -72,6 +72,8 @@ 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
   }
 }
@@ -89,6 +91,8 @@ 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
@@ -96,6 +100,8 @@ 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
 }
 
@@ -106,6 +112,8 @@ 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
 }
 

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 "\n[ \t\n]*\n[ \t\n]*") (string-append prefix text))))
+                      (ly:regex-split (ly:make-regex "\r?\n[ \t\r\n]*\n[ \t\r\n]*") (string-append prefix text))))
                   '())))
               (poet-and-composer-markup-list
                 (string-with-paragraphs->markuplist "" (string-append