switch swingStyle to textMark

private_includes/base/swing_style.ily

@@ -1,4 +1,4 @@
-swing = \mark \markup {
+swing = \textMark \markup {
   \line \general-align #Y #DOWN {
     \score {
       \new Staff \with {
@@ -47,7 +47,7 @@ swing = \mark \markup {
   }
 }
 
-swingOff = \mark \markup {
+swingOff = \textMark \markup {
   \line \general-align #Y #DOWN {
     \score {
       \new Staff \with {
@@ -99,7 +99,7 @@ swingOff = \mark \markup {
 \include "swing.ly"
 
 swingMusic =
-#(define-music-function (parser location music) (ly:music?)
+#(define-music-function (music) (ly:music?)
   (define (partial-duration-length m)
     (let ((name (ly:music-property m 'name))
           (es (ly:music-property m 'elements))

private_includes/base/verses_with_chords.ily

@@ -385,6 +385,7 @@ Chord_lyrics_spacing_engraver =
               \remove Volta_engraver
               \remove Parenthesis_engraver
               \remove Metronome_mark_engraver
+              \remove Text_mark_engraver
             }
             \context {
               \Staff