fix spacing in new chordlyrics system

chord_settings.ly

@@ -100,6 +100,15 @@ generalLayout = \layout {
   }
 }
 
+#(define-public (custom-lyric-text::print grob)
+  "Allow interpretation of tildes as lyric tieing marks."
+  ;; See also similar code in Lyric_performer.
+  (let ((text (ly:grob-property grob 'text)))
+
+    (grob-interpret-markup grob (if (string? text)
+                                    (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
+                                    text))))
+
 lyricsWithChordsLayout = \layout {
   \generalLayout
   \context {
@@ -108,14 +117,16 @@ lyricsWithChordsLayout = \layout {
   }
   \context {
     \Lyrics
-    \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = 0
+    \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = #(- (- songTextLineHeigth songTextChordFontSize) 1)
     \override LyricText.parent-alignment-X = #LEFT
     \override LyricText.self-alignment-X = #LEFT
     \override LyricText.word-space = 0.8
     \override LyricSpace.minimum-distance = 0.8
+    \override LyricText.stencil = #custom-lyric-text::print
   }
   \context {
     \Score
+    \override PaperColumn.keep-inside-line = ##f
     \override SpacingSpanner.uniform-stretching = ##t
     \override SpacingSpanner.spacing-increment = 0
     \remove Bar_number_engraver