include adaptions/editings in author system

all_base_includes.ly

@@ -28,15 +28,12 @@
 \include "arrows_in_scores.ly"
 \include "swing_style.ly"
 \include "inline_score.ly"
-\include "custom_indentation.ily"
-\include "include_from_song.ily"
 
 % reset important variables
 LAYOUT = \layout { \generalLayout }
 HEADER = {}
 MUSIC = {}
-TEXT = \markuplist {}
-TEXT_PAGES = #f
+TEXT = \markuplist {""}
 
 verseChords = {}
 firstVoice = {}

basic_format_and_style_settings.ly

@@ -43,7 +43,7 @@ generalLayout = \layout {
   }
   \context {
     \Staff
-    \accidentalStyle modern-voice-cautionary
+    \accidentalStyle modern
     \consists Merge_rests_engraver
   }
   \context {
@@ -71,7 +71,6 @@ generalLayout = \layout {
     \override Stem.layer = 2
     \override Flag.layer = 2
     \override Beam.layer = 2
-    \override Accidental.layer = 2
   }
 }
 
@@ -87,13 +86,11 @@ secondVoiceStyle = {
   \override Stem.color = #grey
   \override Flag.color = #grey
   \override Beam.color = #grey
-  \override Accidental.color = #grey
   \override NoteHead.layer = 1
   \override Dots.layer = 1
   \override Stem.layer = 1
   \override Flag.layer = 1
   \override Beam.layer = 1
-  \override Accidental.layer = 1
 }
 
 firstVoiceStyle = {
@@ -102,7 +99,6 @@ firstVoiceStyle = {
   \override Stem.color = #black
   \override Flag.color = #black
   \override Beam.color = #black
-  \override Accidental.color = #black
 }
 
 % Deprecated: einzelne Noten innerhalb von \secondVoiceStyle mit schwarzem statt grauem Kopf
@@ -215,19 +211,4 @@ dottedExtender = {
                (cons (car x-ext) 0)
                (cons (cdr x-ext) 0))
              grob))))
-}
-
-melisOff = \set ignoreMelismata = ##t
-melisOn = \unset ignoreMelismata
-
-cue =
-#(define-music-function (zahlen) (number-list?)
-  #{
-      \tag #'cues {
-        \tweak self-alignment-X #LEFT
-        \mark
-          #(make-on-the-fly-markup
-            (lambda (layout props m) (interpret-markup layout (prepend-alist-chain 'cues zahlen props) (ly:output-def-lookup layout 'cueMarkup)))
-            (make-null-markup))
-      }
-  #})
+}

book_include.ly

@@ -9,7 +9,7 @@
     	     (closedir dir)
     	     files)
     	    (else
-    	     (next (readdir dir) (if (ly:regex-match? (ly:regex-exec (ly:make-regex "^(0|\\.)") f)) files (cons f files))))))))
+    	     (next (readdir dir) (if (string-match "^(0|\\.)" f) files (cons f files))))))))
 
 #(define (file-to-stats filename)
    (set! song-list (cons filename song-list)))
@@ -114,7 +114,7 @@ width may require additional tweaking.)"
 
 
 includeSong =
-#(define-void-function (parser location filename) (string?)
+#(define-void-function (parser location textproc filename) ((procedure?) string?)
      #{
      \bookOutputName #filename
      #}
@@ -125,15 +125,7 @@ includeSong =
         (acons label additional-page-numbers additional-page-switch-label-list))
       (set! song-list
         (acons (string->symbol filename)
-          (acons 'label label
-            (acons 'header HEADER
-              (acons 'music MUSIC
-                (acons 'layout LAYOUT
-                  (acons 'text-pages
-                    (map (lambda (text)
-                      #{ \markuplist \setsongfilename $filename $text #})
-                      TEXT_PAGES)
-                    '())))))
+          (acons 'label label (acons 'header HEADER (acons 'music MUSIC (acons 'layout LAYOUT (acons 'text #{ \markuplist \setsongfilename $filename $(if textproc (textproc TEXT) TEXT) #} '())))))
           song-list))
     ))
 
@@ -192,14 +184,14 @@ songs =
                 ;(header (assq-ref songvars 'header))
                 (music (assq-ref songvars 'music))
                 (layout (assq-ref songvars 'layout))
-                (text-pages (assq-ref songvars 'text-pages))
+                (text (assq-ref songvars 'text))
                 (label (assq-ref songvars 'label)))
             #{
               \bookpart {
                 $header
                 \headerToTOC #header #label
                 \score { $music \layout { $layout } }
-                $(add-text-pages text-pages)
+                $text
               }
             #}))))))
    (reverse song-list)

chord_settings.ly

@@ -40,45 +40,30 @@ shiftChords = #(define-music-function (parser location xshift chords) (number? l
 
 altChord =
 #(define-music-function (parser location mainchord altchord) (ly:music? ly:music?)
-  (let* ((remove-point-and-click
-           (lambda (grob)
-             (ly:grob-set-property! grob 'cause #f)
-             (ly:text-interface::print grob)))
-         (chord-name (lambda (in-pitches bass inversion context) #{
-           \markup {
-             \translate #'(-0.5 . 0)
-             \score {
-               \chords { \transposable #(cons (car (music-pitches mainchord)) (car in-pitches)) { #(music-clone mainchord) \klamm #(music-clone altchord) } }
-               \layout {
-                 \LAYOUT
-                 \context {
-                   \ChordNames
-                   \override ChordName.extra-spacing-width = #'(0 . 0.3)
-                   \override ChordName.stencil = #remove-point-and-click
-                 }
-                 \context {
-                   \Score
-                   \override SpacingSpanner.spacing-increment = 0
-                 }
-               }
-             }
-           }#})))
-    #{
-      \once \set chordNameFunction = #chord-name
-      #mainchord
-    #}))
-
-% Akkorde werden so transponiert, dass sie passen, wenn man mit Kapo im angegebenen Bund spielt
-capoTranspose =
-#(define-music-function (fret chords) (number? ly:music?)
-  (define semi->pitch
-    (make-semitone->pitch
-      (music-pitches
-        #{ h b a gis g fis f e es d cis c #})))
-  (transpose
-    (ly:pitch-transpose (semi->pitch fret) (ly:make-pitch 0 0))
-    (ly:make-pitch 0 0)
-    chords))
+(define (chord-namer in-pitches bass inversion context)
+#{
+  \markup {
+    \translate #'(-0.5 . 0)
+    \score {
+      \chords { \transposable #TRANSPOSITION { #(music-clone mainchord) \klamm #(music-clone altchord) } }
+      \layout {
+        \LAYOUT
+        \context {
+          \ChordNames
+          \override ChordName.extra-spacing-width = #'(0 . 0.3)
+        }
+        \context {
+          \Score
+          \override SpacingSpanner.spacing-increment = 0
+        }
+      }
+    }
+  }
+#})
+#{
+  \once \set chordNameFunction = #chord-namer
+	#mainchord
+#})
 
 % kleine Mollakkorde und Alteration ausgeschrieben
 #(define (note-name->german-markup-nosym pitch lowercase?)
@@ -116,42 +101,11 @@ capoTranspose =
 % additional bass notes should get uppercased
 #(define (bassnote-name->german-markup-nosym pitch lowercase?)(note-name->german-markup-nosym pitch #f))
 
-defaultChordPrintings = {
-  <c g>-\markup { \super "5" }
-  %% Dur
-  <c e g a>-\markup { \super "6" } %Standardverhalten
-  <c e a >-\markup { \super "6(no5)" }
-  <c e g a d'>-\markup { \super "6/9" }
-  <c e g b d'>-\markup { \super "9" } %Standardverhalten
-  <c e g b d' f'>-\markup { \super "11" } %Standardverhalten
-  <c e g b d' a'>-\markup { \super "13" }
-  %add chords
-  <c e g d'>-\markup { \super "add9" }
-  <c e g f'>-\markup { \super "add11" }
-  <c e g a'>-\markup { \super "add13" }
-  %major chords
-  <c e g h d'>-\markup { \super "maj9" }
-  %% Moll
-  <c es g a>-\markup { \super "6" } %Standardverhalten
-  <c es a >-\markup { \super "6(no5)" }
-  <c es g a d'>-\markup { \super "6/9" }
-  <c es g b d'>-\markup { \super "9" } %Standardverhalten
-  <c es g b d' f'>-\markup { \super "11" } %Standardverhalten
-  <c es g b d' a'>-\markup { \super "13" }
-  %add chords
-  <c es g d'>-\markup { \super "add9" }
-  <c es g f'>-\markup { \super "add11" }
-  <c es g a'>-\markup { \super "add13" }
-  %major chords
-  <c es g h d'>-\markup { \super "maj9" }
-}
 
 #(define chordNameExceptions
-  (append
-    (if (defined? 'customChordPrintings)
-      (sequential-music-to-chord-exceptions customChordPrintings #t)
-      '())
-    (sequential-music-to-chord-exceptions defaultChordPrintings #t)))
+  (if (defined? 'customChordPrintings)
+  (sequential-music-to-chord-exceptions customChordPrintings #t)
+  '()))
 
 generalLayout = \layout {
   \generalLayout

custom_indentation.ily

@@ -1,135 +0,0 @@
-% https://lsr.di.unimi.it/LSR/Snippet?id=1098
-%%%%%%%% HEADER %%%%%%%%
-%
-% this code was prompted by
-% https://lists.gnu.org/archive/html/lilypond-user/2019-07/msg00139.html
-% and offers a pseudoIndent hack suitable for general use
-
-% keywords:
-% indent short-indent indentation system line
-% mid-score temporarily arbitrary individual single just only once
-% coda margin
-% mouse's tale acrostic mesostic spine
-
-%%%%%%%% PSEUDOINDENT FUNCTIONS %%%%%%%%
-
-% these two functions are for indenting individual systems
-% - to left-indent a system, apply \pseudoIndent before the music continues
-% - \pseudoIndents is similar, but lets you also indent on the right
-% - both provide an option for changing that system's instrument names
-
-% N.B. these functions
-% - assume application to non-ragged lines (generally the default)
-% - include a manual \break to ensure application at line start
-% - misbehave if called more than once at the same line start
-
-% the parameters of the (full) pseudoIndents function are:
-% 1: name-tweaks
-%      usually omitted; accepts replacement \markup for instrument names
-%      as an ordered list; starred elements leave their i-names unchanged.
-% 2: left-indent
-%      additional left-indentation, in staff-space units; can be negative,
-%      but avoid a total indentation which implies (unsupported) stretching.
-% 3: right-indent
-%      amount of right-indentation, in staff-space units; can be negative.
-%      - not offered by the (reduced) pseudoIndent function
-
-
-pseudoIndents = % inline alternative to a new \score, also with right-indent
-#(define-music-function (name-tweaks left-indent right-indent)
-  ((markup-list? '()) number? number?)
-  (define (warn-stretched p1 p2) (ly:input-warning (*location*) (G_
-    " pseudoIndents ~s ~s is stretching staff; expect distorted layout") p1 p2))
-  (let* (
-    (narrowing (+ left-indent right-indent)) ; of staff implied by args
-
-    (set-staffsymbol! (lambda (staffsymbol-grob) ; change staff to new width
-      (let* (
-        (left-bound (ly:spanner-bound staffsymbol-grob LEFT))
-        (left-moment (ly:grob-property left-bound 'when))
-        (capo? (moment<=? left-moment ZERO-MOMENT)) ; in first system of score
-        (layout (ly:grob-layout staffsymbol-grob))
-        (lw (ly:output-def-lookup layout 'line-width)) ; debugging info
-        (indent (ly:output-def-lookup layout (if capo? 'indent 'short-indent)))
-        (old-stil (ly:staff-symbol::print staffsymbol-grob))
-        (staffsymbol-x-ext (ly:stencil-extent old-stil X))
-        ;; >=2.19.16's first system has old-stil already narrowed [2]
-        ;; compensate for this (ie being not pristine) when calculating
-        ;; - old leftmost-x (its value is needed when setting so-called 'width)
-        ;; - the new width and position (via local variable narrowing_)
-        (ss-t (ly:staff-symbol-line-thickness staffsymbol-grob))
-        (pristine? (<= 0 (car staffsymbol-x-ext) ss-t)) ; would expect half
-        (leftmost-x (+ indent (if pristine? 0 narrowing)))
-        (narrowing_ (if pristine? narrowing 0)) ; uses 0 if already narrowed
-        (old-width (+ (interval-length staffsymbol-x-ext) ss-t))
-        (new-width (- old-width narrowing_))
-        (new-rightmost-x (+ leftmost-x new-width)) ; and set! this immediately
-        (junk (ly:grob-set-property! staffsymbol-grob 'width new-rightmost-x))
-        (in-situ-stil (ly:staff-symbol::print staffsymbol-grob))
-        (new-stil (ly:stencil-translate-axis in-situ-stil narrowing_ X))
-       ;(new-stil (stencil-with-color new-stil red)) ; for when debugging
-        (new-x-ext (ly:stencil-extent new-stil X)))
-      (ly:grob-set-property! staffsymbol-grob 'stencil new-stil)
-      (ly:grob-set-property! staffsymbol-grob 'X-extent new-x-ext)
-      )))
-
-    (set-X-offset! (lambda (margin-grob) ; move grob across to line start
-      (let* (
-        (old (ly:grob-property-data margin-grob 'X-offset))
-        (new (lambda (grob) (+ (if (procedure? old) (old grob) old) narrowing))))
-      (ly:grob-set-property! margin-grob 'X-offset new))))
-
-    (tweak-text! (lambda (i-name-grob mkup) ; tweak both instrumentname texts
-      (if (and (markup? mkup) (not (string=? (markup->string mkup) "*")))
-      (begin
-        (ly:grob-set-property! i-name-grob 'long-text mkup)
-        (ly:grob-set-property! i-name-grob 'text mkup)
-        )))) ; else retain existing text
-
-    (install-narrowing (lambda (leftedge-grob) ; on staves, + adapt left margin
-      (let* (
-        (sys (ly:grob-system leftedge-grob))
-        (all-grobs (ly:grob-array->list (ly:grob-object sys 'all-elements)))
-        (grobs-named (lambda (name)
-          (filter (lambda (x) (eq? name (grob::name x))) all-grobs)))
-        (first-leftedge-grob (list-ref (grobs-named 'LeftEdge) 0))
-        (relsys-x-of (lambda (g) (ly:grob-relative-coordinate g sys X)))
-        (leftedge-x (relsys-x-of first-leftedge-grob))
-        (leftedged? (lambda (g) (= (relsys-x-of g) leftedge-x)))
-        (leftedged-ss (filter leftedged? (grobs-named 'StaffSymbol))))
-      (if (eq? leftedge-grob first-leftedge-grob) ; ignore other leftedges [1]
-       (begin
-         (for-each set-staffsymbol! leftedged-ss)
-         (for-each set-X-offset! (grobs-named 'SystemStartBar))
-         (for-each set-X-offset! (grobs-named 'InstrumentName))
-         (for-each tweak-text! (grobs-named 'InstrumentName) name-tweaks)
-       ))))))
-
-  (if (negative? narrowing) (warn-stretched left-indent right-indent))
-  #{ % and continue anyway
-    % ensure that these overrides are applied only at begin-of-line
-    \break % (but this does not exclude unsupported multiple application)
-    % give the spacing engine notice regarding the loss of width for music
-    \once \override Score.LeftEdge.X-extent = #(cons narrowing narrowing)
-    % discard line start region of staff and reassemble left-margin elements
-    \once \override Score.LeftEdge.after-line-breaking = #install-narrowing
-    % shift the system to partition the narrowing between left and right
-    \overrideProperty Score.NonMusicalPaperColumn.line-break-system-details
-    .X-offset #(- right-indent)
-    % prevent a leftmost barnumber entering a stretched staff
-    \once \override Score.BarNumber.horizon-padding = #(max 1 (- 1 narrowing))
-  #}))
-
-pseudoIndent = % for changing just left-indent
-#(define-music-function (name-tweaks left-indent)
-  ((markup-list? '()) number?)
-  #{
-    \pseudoIndents $name-tweaks $left-indent 0
-  #})
-
-% [1] versions <2.19.1 can have end-of-line leftedges too
-%     - these were eliminated in issue 3761
-% [2] versions >=2.19.16: the first system behaves differently from the rest
-%     - a side effect of issue 660 ?
-% [3] versions >=2.23.0: LeftEdge's position may well differ in Y (but not in X)
-%     - a side effect of issue 6084 ?

default_songinfo_style.ly

@@ -43,16 +43,7 @@
               (poet-with-year (if (and poet-maybe-with-composer year_text) (string-append poet-maybe-with-composer ", " year_text) poet-maybe-with-composer))
               (composer-with-year (if (and composer year_melody) (string-append composer ", " year_melody) composer))
               (poet-and-composer-oneliner (if (and poet-with-year composer-with-year) (markup poet-with-year between-poet-and-composer-markup composer-with-year) #f))
-              (current-line-width (chain-assoc-get 'line-width props (ly:output-def-lookup layout 'line-width)))
-              (string-with-paragraphs->markuplist (lambda (prefix text)
-                (if text
-                  (apply append
-                    (map
-                      (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]*") text)))
-                  '()))))
+              (current-line-width (chain-assoc-get 'line-width props (ly:output-def-lookup layout 'line-width))))
           (stack-lines DOWN 0.0 (chain-assoc-get 'baseline-skip props)
             (interpret-markup-list layout props
               (append
@@ -63,11 +54,10 @@
                     (if composer-with-year (string-append "\n\n" composer-with-year) "")
                   )))
                 (make-wordwrap-string-internal-markup-list #t (string-append
-                  (if copyright (string-append "\n\n© " copyright) "")))
-                (string-with-paragraphs->markuplist "" infotext)
-                (string-with-paragraphs->markuplist "Übersetzung: " translation)
-                (string-with-paragraphs->markuplist "Aussprache: " pronunciation)
-                  )))))
+                  (if copyright (string-append "\n\n© " copyright) "")
+                  (if infotext (string-append "\n\n" infotext) "")
+                  (if translation (string-append "\n\nÜbersetzung: " translation) "")
+                  (if pronunciation (string-append "\n\nAussprache: " pronunciation) ""))))))))
       (make-null-markup)
     )
 }

default_style.ly

@@ -22,14 +22,3 @@ refStringWithNumbers = "Ref. ~a:"
 % hübsche Wiederholungszeichen für den Liedtext
 repStart = "𝄆"
 repStop = "𝄇"
-customChordPrintings = {}
-
-\paper {
-  cueMarkup = \markup {
-    \italic
-      #(make-on-the-fly-markup (lambda (layout props m)
-        (interpret-markup layout props
-          (string-join (map (lambda (n) (format #f "~@r." n)) (chain-assoc-get 'cues props)) ", ")))
-        (make-null-markup))
-  }
-}

footer_with_songinfo.ly

@@ -21,13 +21,11 @@
 
 #(define (find-author-id-with-part-numbers contributionType authors)
   (if authors
-    (sort-list
-      (filter-map (lambda (authordata)
-        (let ((contributionNumbers (filter-map (lambda (contribution) (if (and (list? contribution) (equal? contributionType (car contribution))) (cadr contribution) #f)) (cdr authordata)))
-              (authorId (car authordata)))
-          (if (null? contributionNumbers) #f (cons authorId (sort-list contributionNumbers <)))
-        )) authors)
-      (lambda (a b) (< (cadr a) (cadr b))))
+    (filter-map (lambda (authordata)
+      (let ((contributionNumbers (filter-map (lambda (contribution) (if (and (list? contribution) (equal? contributionType (car contribution))) (cadr contribution) #f)) (cdr authordata)))
+            (authorId (car authordata)))
+        (if (null? contributionNumbers) #f (cons authorId contributionNumbers))
+      )) authors)
     (list)))
 
 #(define-markup-command (print-songinfo layout props) ()
@@ -77,20 +75,22 @@
       (string-append contributionPrefix " " (string-join (format-authors authorIds) ", ")))
   )
 
-  (define (join-present items joiner)
-    (string-join (filter (lambda (item) (and (string? item) (not (string-null? (string-trim-both item))))) items) joiner)
-  )
-
   (define (render-partial-contribution-group prefixLookup authorData)
     (if (null? authorData)
       ""
       (let ((firstAuthorContributions (cdar authorData)))
         (receive (authorDataSame authorDataOther)
             (partition (lambda (authorEntry) (equal? (cdr authorEntry) firstAuthorContributions)) authorData)
-          (join-present (list
+          (string-append
             (render-contribution-group (numbered-contribution-prefix firstAuthorContributions prefixLookup) (map car authorDataSame))
+            " "
             (render-partial-contribution-group prefixLookup authorDataOther)
-            ) " ")))))
+          ))))
+  )
+
+  (define (join-present items joiner)
+    (string-join (filter (lambda (item) (and (string? item) (not (string-null? (string-trim-both item))))) items) joiner)
+  )
 
   (define (poet-and-composer-from-authors authors)
     (if authors

include_from_song.ily

@@ -1,7 +0,0 @@
-includeFromSong =
-#(define-void-function (filename) (string?)
-  (let ((noDefaultOutputBackup noDefaultOutput))
-    (set! noDefaultOutput #t)
-    (ly:parser-parse-string (ly:parser-clone)
-      (ly:format "\\include \"~a\"" filename))
-    (set! noDefaultOutput noDefaultOutputBackup)))

standalone_output.ly

@@ -26,34 +26,6 @@ TEXT = \markuplist {
   \TEXT
 }
 
-#(define TEXT_PAGES
-  (map
-    (lambda (text) #{
-      \markuplist {
-        \override #`(transposition . ,TRANSPOSITION)
-        \override #`(verselayout . ,verselayout)
-        \override #`(verse-chords . ,#{ \chords { \verseChords } #})
-        \override #`(verse-reference-voice . ,#{ \global \firstVoice  #})
-        #text
-      }
-    #})
-  (if
-    (and
-      (defined? 'TEXT_PAGES)
-      (pair? TEXT_PAGES))
-    TEXT_PAGES
-    (list TEXT))))
-
-#(define (add-text-pages text-pages)
-  (if (pair? text-pages)
-    (begin
-      (add-score (car text-pages))
-      (for-each
-        (lambda (text)
-          (add-music (pageBreak))
-          (add-score text))
-        (cdr text-pages)))))
-
 #(if (not noStandaloneOutput)
 (begin
   (let ((header (ly:book-header HEADER)) (paper (ly:book-paper HEADER)))
@@ -65,7 +37,7 @@ TEXT = \markuplist {
       \MUSIC
       \layout { \LAYOUT }
     }#})
-  (add-text-pages TEXT_PAGES)
+  (add-score TEXT)
   (add-score #{
     \score {
       \unfoldRepeats { \MUSIC \INLINESCOREMUSIC }

verses_with_chords.ly

@@ -221,28 +221,14 @@
                        (cons (car x) (+ (cdr x) amount))
                        y)))
 
-#(define-markup-command (score-equal-height-with-indents layout props lines)
-  (markup-list?)
+#(define-markup-command (score-equal-height layout props reference-height lines)
+  (number? markup-list?)
   #:category music
-  #:properties ((intraverse-vspace 0)
-                (verse-line-height songTextLineHeigth)
-                (line-indents '()))
-    (let ((indents-max-index (- (length line-indents) 1)))
-      (stack-stencils Y DOWN intraverse-vspace
-        (index-map
-          (lambda (index line)
-            (let ((stil
-                    (ly:make-stencil
-                      (ly:stencil-expr line)
-                      (ly:stencil-extent line X)
-                      `(,(/ verse-line-height -2.0) . ,(/ verse-line-height 2.0)))))
-              (if (<= index indents-max-index)
-                (ly:stencil-translate-axis
-                  stil
-                  (list-ref line-indents index)
-                  X)
-                stil)))
-          (interpret-markup-list layout props lines)))))
+  #:properties ((baseline-skip))
+    (stack-stencils Y DOWN baseline-skip
+      (map
+        (lambda (line) (ly:make-stencil (ly:stencil-expr line) (ly:stencil-extent line X) `(,(/ reference-height -2.0) . ,(/ reference-height 2.0))))
+        (interpret-markup-list layout props lines))))
 
 #(define-public (custom-lyric-text::print grob)
   "Allow interpretation of tildes as lyric tieing marks."
@@ -257,18 +243,22 @@
    #:properties ((verse-chords #{#})
                  (verse-reference-voice #{#})
                  (verse-break-voice #{#})
+                 (verse-line-height songTextLineHeigth)
                  (verse-text-chord-distance songTextChordDistance)
+                 (intraverse-vspace 0)
                  (transposition (cons #f #f))
                  (verselayout generalLayout))
   "Vers mit Akkorden"
   (interpret-markup layout props
     #{
       \markup {
-        \score-equal-height-with-indents \score-lines {
+        \override #`(baseline-skip . ,intraverse-vspace)
+        \score-equal-height #verse-line-height \score-lines {
+          \transposable #transposition
           <<
-            \new Devnull { #(music-clone verse-break-voice) }
-            \new NullVoice = "dummyvoice" { #(music-clone verse-reference-voice) }
-            \transposable #transposition #(music-clone verse-chords)
+            \new Devnull { #verse-break-voice }
+            \new NullVoice = "dummyvoice" { #verse-reference-voice }
+            #(music-clone verse-chords)
             \new Lyrics \lyricsto "dummyvoice" { #lyrics }
           >>
           \layout {
@@ -300,10 +290,8 @@
               \override SpacingSpanner.spacing-increment = 0
               \remove Bar_number_engraver
               \remove Mark_engraver
-              \remove Jump_engraver
               \remove Volta_engraver
               \remove Parenthesis_engraver
-              \remove Metronome_mark_engraver
             }
             \context {
               \Staff
@@ -330,9 +318,8 @@
               \NullVoice
               \consists Rest_engraver
               \omit Rest
-              \undo \omit NoteHead
-              \hide NoteHead
-              \override NoteHead.X-extent = #'(0 . 0)
+             % \undo \omit NoteHead
+             % \hide NoteHead
             }
           }
         }