fix markup tag group trouble accross songs

private_includes/base/all.ily

@@ -39,6 +39,7 @@
 \include "title_with_category_images.ily"
 \include "chord_settings.ily"
 \include "transposition.ily"
+\include "markup_tag_groups_hack.ily"
 \include "verses_with_chords.ily"
 \include "arrows_in_scores.ily"
 \include "swing_style.ily"
@@ -56,3 +57,5 @@ TEXT_PAGES = #f
 verseChords = {}
 firstVoice = {}
 global = {}
+
+\resetTagGroups

private_includes/base/basic_format_and_style_settings.ily

@@ -149,10 +149,11 @@ override-stanza =
          (stanza-style (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
          (roman-format (lambda (stanzanumber) (format #f "~@r" stanzanumber))))
       (ly:context-set-property! context 'stanza
-        (number-formater
+        (make-pad-left-markup 1
-          (if (eq? stanza-style 'roman)
+          (number-formater
-              (map roman-format stanzanumbers)
+            (if (eq? stanza-style 'roman)
-              stanzanumbers)))))
+                (map roman-format stanzanumbers)
+                stanzanumbers))))))
 
 #(define (stanza . stanzanumbers)
 #{
@@ -221,7 +222,7 @@ repStopWithTag = \lyricmode {
   \tag #'repeats {
     \once \override StanzaNumber.font-series = #'normal
     \once \override StanzaNumber.direction = 1
-    \set stanza = \markup { \repStop }
+    \set stanza = \markup { \pad-x-right #1 \repStop }
   }
 }
 
@@ -304,4 +305,18 @@ rufWithMarkup =
    #})
 ruf =
 #(define-music-function (text) (string?)
-   (rufWithMarkup (make-ruf-style-markup text)))
+   (rufWithMarkup (make-ruf-style-markup text)))
+
+underlineOn =
+#(define-music-function () ()
+   #{
+     \override LyricText.stencil =
+     #(lambda (grob)
+        (grob-interpret-markup grob (make-underline-markup (ly:grob-property grob 'text))))
+   #})
+
+underlineOff =
+#(define-music-function () ()
+   #{
+     \revert LyricText.stencil
+   #})

private_includes/base/chord_settings.ily

@@ -80,41 +80,8 @@ capoTranspose =
     (ly:make-pitch 0 0)
     chords))
 
-% kleine Mollakkorde und Alteration ausgeschrieben
-#(define (note-name->german-markup-nosym pitch lowercase?)
-   (define (pitch-alteration-semitones pitch) (inexact->exact (round (* (ly:pitch-alteration pitch) 2))))
-   (define (accidental->markup alteration name)
-     (if (= alteration 0)
-         (make-line-markup (list empty-markup))
-          (if (= alteration FLAT)
-              (if (equal? name "B")
-                  ""
-              ;   (make-line-markup (list (make-hspace-markup 0.2)
-              ;     (make-tiny-markup (make-raise-markup 1.2
-              ;     (make-musicglyph-markup (assoc-get alteration standard-alteration-glyph-name-alist ""))))
-              ;   ))
-              (if (or (equal? name "E") (equal? name "A")) "s" "es"))
-              "is")
-         ))
-   (define (conditional-string-downcase str condition)
-     (if condition (string-downcase str) str))
-
-   (let* ((name (ly:pitch-notename pitch))
-         (alt-semitones  (pitch-alteration-semitones pitch))
-	 (n-a (if (member (cons name alt-semitones) `((6 . -1) (6 . -2)))
-		  (cons 7 (+ 0 alt-semitones))
-		  (cons name alt-semitones))))
-    (make-line-markup
-     (list
-      (make-simple-markup
-       (conditional-string-downcase
-		(vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a))
-		lowercase?))
-       (accidental->markup (/ (cdr n-a) 2) (vector-ref #("C" "D" "E" "F" "G" "A" "H" "B") (car n-a)) ))))
-)
-
 % additional bass notes should get uppercased
-#(define (bassnote-name->german-markup-nosym pitch lowercase?)(note-name->german-markup-nosym pitch #f))
+#(define (bassnote-name->german-markup-nosym pitch lowercase?)((chord-name:name-markup 'deutsch) pitch #f))
 
 defaultChordPrintings = {
   <c g>-\markup { \super "5" }
@@ -157,15 +124,15 @@ generalLayout = \layout {
   \generalLayout
   \context {
     \ChordNames
-    \semiGermanChords
     \override ChordName.font-size = \songScoreChordFontSize
     \override ChordName.font-series = \songChordFontSeries
     \override ChordName.font-family = #'serif
     chordNameLowercaseMinor = ##t
     chordChanges = ##t
-    % eigenen chordRootNamer damit F# = Fis und Gb = Ges (also alteration ausgeschrieben)
+    chordRootNamer = #(chord-name:name-markup 'deutsch)
-    chordRootNamer = #note-name->german-markup-nosym
     chordNoteNamer = #bassnote-name->german-markup-nosym
+    additionalPitchPrefix = ""
+
     majorSevenSymbol = "maj7"
     chordNameExceptions = \chordNameExceptions
   }
@@ -214,4 +181,4 @@ Ignoring_newline_chord_changes_engraver =
        ((chord-name-interface this-engraver grob source-engraver)
          (when (and (ly:context-property ctx 'chordChanges #f) (ly:grob-property grob 'begin-of-line-visible #f))
                   (ly:grob-suicide! grob)
-                )))))
+                )))))

private_includes/base/default_songinfo_style.ily

@@ -54,7 +54,7 @@
         (poetAndComposerEqualPrefix "")
         (poetPrefix "")
         (composerPrefix "")
-        (translationPrefix "")
+        (translationAuthorPrefix "")
         (pronunciationPrefix "")
         (compositionPrefix "")
         (adaptionTextPrefix "")
@@ -177,4 +177,4 @@
                   )))))
       (make-null-markup)
     )
-}
+}

private_includes/base/footer_with_songinfo.ily

@@ -116,7 +116,7 @@
         #:poetAndComposerEqualPrefix (ly:output-def-lookup layout 'poetAndComposerEqualPrefix)
         #:poetPrefix (ly:output-def-lookup layout 'poetPrefix)
         #:composerPrefix (ly:output-def-lookup layout 'composerPrefix)
-        #:translationPrefix (ly:output-def-lookup layout 'translationPrefix)
+        #:translationAuthorPrefix (ly:output-def-lookup layout 'translationAuthorPrefix)
         #:pronunciationPrefix (ly:output-def-lookup layout 'pronunciationPrefix)
         #:compositionPrefix (ly:output-def-lookup layout 'compositionPrefix)
         #:adaptionTextPrefix (ly:output-def-lookup layout 'adaptionTextPrefix)
@@ -213,4 +213,4 @@
       \line { \page-number-to-pdf-label \null }
     }
   }
-}
+}

private_includes/base/markup_tag_groups_hack.ily

@@ -0,0 +1,13 @@
+% We have to record the tag groups for markup, so we use the right tag groups during markup interpretiton.
+recordedTagGroups = #'()
+
+tagGroup =
+#(define-void-function (tags) (symbol-list?)
+   (let ((err (define-tag-group tags)))
+     (if err (ly:parser-error err (*location*))
+         (set! recordedTagGroups (cons tags recordedTagGroups)))))
+
+#(define-markup-command (handle-tag-groups layout props recorded-groups m) (list? markup?)
+   (resetTagGroups)
+   (every (lambda (group) (define-tag-group group)) recorded-groups)
+   (interpret-markup layout props m))

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))
@@ -118,4 +118,4 @@ swingMusic =
 #{
   \swing
   \applySwingWithOffset 8 #'(2 1) #(partial-duration-length music) #music
-#})
+#})

private_includes/base/title_with_category_images.ily

@@ -1,6 +1,5 @@
 #(define-markup-command (bookTitleMarkupCustom layout props)()
-   (interpret-markup layout
+   (interpret-markup layout props
-     (prepend-alist-chain 'songfilename (chain-assoc-get 'header:songfilename props "") props)
      (make-column-markup
        (list
          (make-vspace-markup (chain-assoc-get 'header:titletopspace props 0))
@@ -38,23 +37,24 @@
       ;'(0 . 0) '(0 . 0)
       )))
 
-#(define-markup-command (title-with-category-images layout props right)(boolean?)
+#(define-markup-command (build-full-title layout props right)(boolean?)
-   (interpret-markup layout props
+   (interpret-markup layout (prepend-alist-chain 'songfilename (chain-assoc-get 'header:songfilename props "") props)
      (let* ((title (chain-assoc-get 'header:title props ""))
             (starttext (chain-assoc-get 'header:starttext props #f))
-            (pdfbookmark (if starttext (string-append starttext " | " title) title)))
+            (pdfbookmark (if starttext (string-append starttext " | " title) title))
+            (title-markup (ly:output-def-lookup layout (if right 'oddTitleLineMarkup 'evenTitleLineMarkup))))
      (if title
-       (if right
+       (markup #:title-to-pdf-toc pdfbookmark title-markup)
-         #{\markup { \title-to-pdf-toc #pdfbookmark \fill-line \general-align #Y #UP { \null \bookTitleMarkupCustom \category-images } } #}
+       make-null-markup)
-         #{\markup { \title-to-pdf-toc #pdfbookmark \fill-line \general-align #Y #UP { \category-images \bookTitleMarkupCustom \null } } #})
-      #{ \markup { " " } #})
      )))
 
 \paper {
   bookTitleMarkup = \markup \null
   scoreTitleMarkup = \markup \null
-  oddHeaderMarkup = \markup { \if \on-first-page-of-part \title-with-category-images ##t }
+  oddHeaderMarkup = \markup { \if \on-first-page-of-part \build-full-title ##t }
-  evenHeaderMarkup = \markup { \if \on-first-page-of-part \title-with-category-images ##f }
+  evenHeaderMarkup = \markup { \if \on-first-page-of-part \build-full-title ##f }
+  oddTitleLineMarkup = \markup { \fill-line \general-align #Y #UP { \null \bookTitleMarkupCustom \category-images } }
+  evenTitleLineMarkup = \markup { \fill-line \general-align #Y #UP { \category-images \bookTitleMarkupCustom \null } }
   defaultTitleMarkup = \markup {
     \override #'(baseline-skip . 3.5)
     \center-column {
@@ -63,4 +63,4 @@
       \smaller \bold \fromproperty #'header:subsubtitle
     }
   }
-}
+}

private_includes/base/verses_with_chords.ily

@@ -203,23 +203,9 @@
 
 #(define-markup-command (pad-left layout props amount arg)
   (number? markup?)
-  (let* ((m (interpret-markup layout props arg))
-         (x (ly:stencil-extent m X))
-         (y (ly:stencil-extent m Y)))
     (ly:stencil-translate
-      (ly:make-stencil (ly:stencil-expr m)
+      (interpret-markup layout props (make-pad-x-left-markup amount arg))
-                       (cons (- (car x) amount) (cdr x))
+      `(,amount . 0)))
-                       y)
-      `(,amount . 0))))
-
-#(define-markup-command (pad-right layout props amount arg)
-  (number? markup?)
-  (let* ((m (interpret-markup layout props arg))
-         (x (ly:stencil-extent m X))
-         (y (ly:stencil-extent m Y)))
-      (ly:make-stencil (ly:stencil-expr m)
-                       (cons (car x) (+ (cdr x) amount))
-                       y)))
 
 #(define-markup-command (score-equal-height-with-indents layout props lines)
   (markup-list?)
@@ -250,7 +236,7 @@
   (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))
+                                    (make-pad-x-right-markup -0.1 (make-tied-lyric-markup text))
                                     text))))
 
 Chord_lyrics_spacing_engraver =
@@ -399,6 +385,7 @@ Chord_lyrics_spacing_engraver =
               \remove Volta_engraver
               \remove Parenthesis_engraver
               \remove Metronome_mark_engraver
+              \remove Text_mark_engraver
             }
             \context {
               \Staff

private_includes/book/toc_include.ily

@@ -441,6 +441,6 @@ headerToTOC = #(define-music-function (parser location header label) (ly:book? s
   ; we use a delayed stencil to have all the page references available
   (ly:make-stencil
     `(delay-stencil-evaluation
-      ,(delay (let* ((table (ly:output-def-lookup layout 'label-page-table)))
+      ,(delay (let* ((table (ly:output-def-lookup layout 'label-absolute-page-table)))
         (generate-toc-csv (if (list? table) table '()))
         empty-stencil)))))

public_includes/layout_bottom.ily

@@ -18,6 +18,7 @@ TEXT = \markuplist {
   \override #`(verselayout . ,verselayout)
   \override #`(verse-chords . ,#{ \chords { \verseChords } #})
   \override #`(verse-reference-voice . ,#{ \global \firstVoice  #})
+  \handle-tag-groups \recordedTagGroups
   \TEXT
 }
 
@@ -29,6 +30,7 @@ TEXT = \markuplist {
         \override #`(verselayout . ,verselayout)
         \override #`(verse-chords . ,#{ \chords { \verseChords } #})
         \override #`(verse-reference-voice . ,#{ \global \firstVoice  #})
+        \handle-tag-groups \recordedTagGroups
         #text
       }
     #})
@@ -75,4 +77,4 @@ TEXT = \markuplist {
         }
       }
     }#})
-))
+))