native scheme yaml parser

private_includes/base/all.ily

@@ -24,7 +24,6 @@
 #(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
 #(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml")))
 
-\include "merge_rests_engraver_override.ily"
 \include "basic_format_and_style_settings.ily"
 \include "eps_file_from_song_dir.ily"
 \include "title_with_category_images.ily"

private_includes/base/basic_format_and_style_settings.ily

@@ -44,7 +44,7 @@ generalLayout = \layout {
   \context {
     \Staff
     \accidentalStyle modern-voice-cautionary
-    \consists \Better_Merge_rests_engraver
+    \consists Merge_rests_engraver
   }
   \context {
     \Score
@@ -67,13 +67,10 @@ generalLayout = \layout {
     % ich will lines breaken wie ich will!
     \remove "Forbid_line_break_engraver"
     \override NoteHead.layer = 2
-    \override Rest.layer = 2
     \override Dots.layer = 2
     \override Stem.layer = 2
     \override Flag.layer = 2
     \override Beam.layer = 2
-    \override Slur.layer = 2
-    \override Tie.layer = 2
     \override Accidental.layer = 2
   }
 }
@@ -86,34 +83,25 @@ textp = \lyricmode { \markup { \raise #1 \musicglyph #"rests.3" } }
 % zweite Stimme alles grau
 secondVoiceStyle = {
   \override NoteHead.color = #grey
-  \override Rest.color = #grey
   \override Dots.color = #grey
   \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
   \override Dots.layer = 1
   \override Stem.layer = 1
   \override Flag.layer = 1
   \override Beam.layer = 1
-  \override Slur.layer = 1
-  \override Tie.layer = 1
   \override Accidental.layer = 1
 }
 
 firstVoiceStyle = {
   \override NoteHead.color = #black
-  \override Rest.color = #black
   \override Dots.color = #black
   \override Stem.color = #black
   \override Flag.color = #black
   \override Beam.color = #black
-  \override Slur.color = #black
-  \override Tie.color = #black
   \override Accidental.color = #black
 }
 
@@ -127,23 +115,23 @@ romanStanza =
   #{ \override StanzaNumber.style = #'roman #})
 
 override-stanza =
-#(define-music-function (parser location stanzanumbers) (number-list?)
+#(define-music-function (parser location stanzanumber) (number?)
 #{
-  \once \override StanzaNumber.details.custom-stanzanumber-override = #stanzanumbers
+  \once \override StanzaNumber.forced-spacing = #stanzanumber % misuse property "forced-spacing" to override the stanzanumber
 #}
 )
 
 #(define (stanza . stanzanumbers)
 #{
-  \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
+  \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
   \applyContext
   #(lambda (context)
-    (let* ((stanzanumbers-override (ly:assoc-get 'custom-stanzanumber-override (ly:assoc-get 'details (ly:context-grob-definition context 'StanzaNumber) '()) #f))
+    (let* ((stanzanumber-override (ly:assoc-get 'forced-spacing (ly:context-grob-definition context 'StanzaNumber) #f))
            (stanza-style (ly:assoc-get 'style (ly:context-grob-definition context 'StanzaNumber)))
            (stanza-format (lambda (stanzanumber) (format #f (if (eq? stanza-style 'roman) romanStanzaFormat stanzaFormat) stanzanumber))))
         (ly:context-set-property! context 'stanza
           (string-join (map stanza-format
-                            (if stanzanumbers-override stanzanumbers-override stanzanumbers))
+                            (if stanzanumber-override (list stanzanumber-override) stanzanumbers))
                         ", "))))
 #}
 )
@@ -151,7 +139,7 @@ override-stanza =
 ref =
 #(define-music-function (stanzanumbers lyrics) ((number-list? (list)) ly:music?)
 #{ \lyricmode {
-    \once \override StanzaNumber.details.custom-realstanza = ##t % set this to signal that there is a real stanza and no repeat signs
+    \once \override StanzaNumber.layer = 23 % set this to signal that there is a real stanza and no repeat signs
     \set stanza = #(make-on-the-fly-markup (lambda (layout props m) ((ly:output-def-lookup layout 'refMarkupFormatter) layout props stanzanumbers)) (make-null-markup))
     #lyrics
   }
@@ -159,13 +147,13 @@ ref =
 )
 
 % prints a repStart Sign as stanza if the tag 'repeats is kept.
-% if there was a stanza already set by the stanza function with StanzaNumber.details.custom-realstanza = ##t we set that also as stanza.
+% if there was a stanza already set by the stanza function with StanzaNumber.layer = 23 we set that also as stanza.
 repStartWithTag = \lyricmode {
   \tag #'repeats {
     \applyContext
     #(lambda (context)
       (let ((lastStanza (ly:context-property context 'stanza))
-            (printLastStanza (ly:assoc-get 'custom-realstanza (ly:assoc-get 'details (ly:context-grob-definition context 'StanzaNumber) '()) #f))
+            (printLastStanza (= (ly:assoc-get 'layer (ly:context-grob-definition context 'StanzaNumber) 0) 23))
             (stanzaFontSeries (ly:assoc-get 'font-series (ly:context-grob-definition context 'StanzaNumber) 'normal)))
       (ly:context-set-property! context 'stanza
         (make-concat-markup

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

private_includes/base/footer_with_songinfo.ily

@@ -242,23 +242,13 @@
       `(line-width . ,(* (chain-assoc-get 'header:songinfo-size-factor props songInfoLineWidthFraction) (ly:output-def-lookup layout 'line-width)))
       arg)))
 
-#(define pdf-encode (@@ (lily framework-ps) pdf-encode))
-% PDF tags
-#(define-markup-command (page-number-to-pdf-label layout props) ()
-     (ly:make-stencil
-      (list 'embedded-ps
-             (ly:format
-              "[ /Label (~a) /PAGELABEL pdfmark\n" (pdf-encode (chain-assoc-get 'page:page-number-string props "?"))))
-      empty-interval empty-interval
-      ))
-
 \paper {
   print-first-page-number = ##t
   first-page-number = #0
 
   oddFooterMarkup = \markup {
     \fill-line {
-      \line { \page-number-to-pdf-label \null }
+      \line { \null }
       \line { \if \on-last-page-of-part \general-align #Y #DOWN \fractional-line-width \print-songinfo }
       \line { \if \should-print-page-number \print-pagenumber }
     }
@@ -267,7 +257,7 @@
     \fill-line {
       \line { \if \should-print-page-number \print-pagenumber }
       \line { \if \on-last-page-of-part \general-align #Y #DOWN \fractional-line-width \print-songinfo }
-      \line { \page-number-to-pdf-label \null }
+      \line { \null }
     }
   }
 }

private_includes/base/merge_rests_engraver_override.ily

@@ -1,86 +0,0 @@
-Better_Merge_rests_engraver =
-#(lambda (context)
-  (define (has-one-or-less? lst) (or (null? lst) (null? (cdr lst))))
-  (define (has-at-least-two? lst) (not (has-one-or-less? lst)))
-  (define (all-equal? lst pred)
-    (or (has-one-or-less? lst)
-        (and (pred (car lst) (cadr lst)) (all-equal? (cdr lst) pred))))
-  (define (measure-count-eqv? a b)
-    (eqv?
-     (ly:grob-property a 'measure-count)
-     (ly:grob-property b 'measure-count)))
-
-  (define (rests-all-unpitched? rests)
-    "Returns true when all rests do not override the staff-position grob
-    property. When a rest has a position set we do not want to merge rests at
-    that position."
-    (every (lambda (rest) (null? (ly:grob-property rest 'staff-position))) rests))
-
-  (define (less-by-layer a b)
-    (<
-      (ly:grob-property b 'layer 0)
-      (ly:grob-property a 'layer 0)))
-
-  (define (merge-mmrests mmrests)
-    "Move all multimeasure rests to the single voice location."
-    (if (all-equal? mmrests measure-count-eqv?)
-        (begin
-          (for-each
-           (lambda (rest) (ly:grob-set-property! rest 'direction CENTER))
-           mmrests)
-          (for-each
-           (lambda (rest) (ly:grob-set-property! rest 'transparent #t))
-           (cdr (sort mmrests less-by-layer))))))
-
-  (define (merge-rests rests)
-    (for-each
-     (lambda (rest) (ly:grob-set-property! rest 'staff-position 0))
-     rests)
-    (for-each
-     (lambda (rest) (ly:grob-set-property! rest 'transparent #t))
-     (cdr (sort rests less-by-layer))))
-
-  (let ((mmrests '())
-        (rests '())
-        (dots '()))
-    (make-engraver
-     ((start-translation-timestep translator)
-      (set! rests '())
-      (set! mmrests '())
-      (set! dots '()))
-     (acknowledgers
-      ((dot-column-interface engraver grob source-engraver)
-       (if (not (ly:context-property context 'suspendRestMerging #f))
-           (set!
-            dots
-            (append (ly:grob-array->list (ly:grob-object grob 'dots))
-                    dots))))
-      ((rest-interface engraver grob source-engraver)
-       (cond
-        ((ly:context-property context 'suspendRestMerging #f)
-         #f)
-        ((grob::has-interface grob 'multi-measure-rest-interface)
-         (set! mmrests (cons grob mmrests)))
-        (else
-         (set! rests (cons grob rests))))))
-     ((stop-translation-timestep translator)
-      (let (;; get a list of the rests 'duration-lengths, 'duration-log does
-            ;; not take dots into account
-            (durs
-             (map
-              (lambda (g)
-                (ly:duration->moment
-                 (ly:prob-property
-                  (ly:grob-property g 'cause)
-                  'duration)))
-              rests)))
-        (if (and
-             (has-at-least-two? rests)
-             (all-equal? durs equal?)
-             (rests-all-unpitched? rests))
-            (begin
-              (merge-rests rests)
-              ;; ly:grob-suicide! works nicely for dots, as opposed to rests.
-              (if (pair? dots) (for-each ly:grob-suicide! (cdr dots)))))
-        (if (has-at-least-two? mmrests)
-            (merge-mmrests mmrests)))))))

private_includes/base/scm/yaml_parser.scm

@@ -1,8 +1,5 @@
 (use-modules (ice-9 rdelim) (ice-9 regex) (ice-9 pretty-print) (srfi srfi-1))
 
-;; Hauptparsingfunktion
-(define (yml-file->scm filename)
-
 ;; Utility: Zeile einlesen
 (define (read-lines filename)
   (call-with-input-file filename
@@ -57,6 +54,10 @@
      ((string=? s "null") '())
      (else s))))
 
+;; Hauptparsingfunktion
+(define (yml-file->scm filename)
+  (let ((lines (read-lines filename)))
+    (parse-lines lines 0)))
 
 ;; Hilfsfunktion: Zeilen mit gleicher oder höherer Einrückung sammeln
 (define (take-indented lines min-indent)
@@ -148,7 +149,4 @@
                    (loop (cdr ls) result))))
            )))))
 
-  (let ((lines (read-lines filename)))
-    (parse-lines lines 0)))
-
 (define (parse-yml-file filename) (resolve-inherits (yml-file->scm filename)))

private_includes/base/title_with_category_images.ily

@@ -28,15 +28,13 @@
 #(define pdf-encode (@@ (lily framework-ps) pdf-encode))
 % PDF tags
 #(define-markup-command (title-to-pdf-toc layout props title) (string?)
-  (if (string-null? title)
-     empty-stencil
      (ly:make-stencil
       (list 'embedded-ps
              (ly:format
               "[/Action /GoTo /View [/XYZ -4 currentpagedevice /PageSize get 1 get 4 add null] /Title (~a) /OUT pdfmark" (pdf-encode title)))
       empty-interval empty-interval
       ;'(0 . 0) '(0 . 0)
-      )))
+      ))
 
 #(define-markup-command (title-with-category-images layout props right)(boolean?)
    (interpret-markup layout props

private_includes/base/verses_with_chords.ily

@@ -253,88 +253,6 @@
                                     (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
                                     text))))
 
-Chord_lyrics_spacing_engraver =
-#(lambda (ctx)
-   (let ((last-lyric-syllable #f)
-         (last-lyric-syllable-width 0)
-         (lyric-width-since-last-chord 0)
-         (last-printed-chord #f)
-         (chord-width-since-last-lyric 0)
-         (lyrics-seen-since-break #f)
-         (have-a-rest #f))
-     (make-engraver
-      (listeners
-       ((multi-measure-rest-event engraver event)
-        (set! have-a-rest #t)
-        )
-       ((rest-event engraver event)
-        (set! have-a-rest #t)
-        )
-       ((lyric-event engraver event)
-        (set! have-a-rest #f)
-        )
-       ((break-event engraver event)
-        (set! last-lyric-syllable #f)
-        (set! last-lyric-syllable-width 0)
-        (set! lyric-width-since-last-chord 0)
-        (set! last-printed-chord #f)
-        (set! chord-width-since-last-lyric 0)
-        (set! lyrics-seen-since-break #f)
-        ))
-      (acknowledgers
-       ((lyric-syllable-interface this-engraver grob source-engraver)
-        (let ((syllable-width (interval-length (ly:grob-extent grob grob X))))
-          (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord syllable-width))
-          (set! last-lyric-syllable-width syllable-width)
-          )
-        (if (> chord-width-since-last-lyric 0)
-            (if lyrics-seen-since-break
-                (ly:grob-set-property! grob 'extra-spacing-width
-                                       (cons (- chord-width-since-last-lyric) (cdr (ly:grob-property grob 'extra-spacing-width '(0 . 0)))))
-                (if last-printed-chord
-                    (let ((last-printed-chord-width (interval-length (ly:grob-extent last-printed-chord last-printed-chord X))))
-                      (ly:grob-set-parent! grob X last-printed-chord)
-                      (ly:grob-set-property! grob 'X-offset last-printed-chord-width)
-                      )))
-            )
-        (set! last-lyric-syllable grob)
-        (set! chord-width-since-last-lyric 0)
-        (set! lyrics-seen-since-break #t)
-        )
-       ((chord-name-interface this-engraver grob source-engraver)
-        (if (not (and
-                  (boolean? (ly:grob-property grob 'begin-of-line-visible))
-                  (ly:grob-property grob 'begin-of-line-visible)))
-            (let* ((last-printed-chord-width (if last-printed-chord (interval-length (ly:grob-extent last-printed-chord last-printed-chord X)) 0))
-                   (chord-overwidth (- last-printed-chord-width lyric-width-since-last-chord))
-                   (chord-gap 0.5))
-              (if have-a-rest
-                  (let ((chord-width (interval-length (ly:grob-extent grob grob X))))
-                    (if last-lyric-syllable
-                        (begin
-                         (ly:grob-set-parent! grob X last-lyric-syllable)
-                         (ly:grob-set-property! grob 'X-offset last-lyric-syllable-width)
-                         )
-                        (if last-printed-chord
-                            (begin
-                             (ly:grob-set-parent! grob X last-printed-chord)
-                             (ly:grob-set-property! grob 'X-offset (+ chord-gap last-printed-chord-width))
-                             )))
-                    (set! chord-width-since-last-lyric (+ chord-width-since-last-lyric chord-width chord-gap))
-                    ))
-              (if (and last-lyric-syllable last-printed-chord (> chord-overwidth 0))
-                      (ly:grob-set-property! last-lyric-syllable 'extra-spacing-width
-                                             (cons (car (ly:grob-property last-lyric-syllable 'extra-spacing-width '(0 . 0))) (+ chord-gap chord-overwidth)))
-                      )
-              (set! last-printed-chord grob)
-              (set! last-lyric-syllable #f)
-              (set! lyric-width-since-last-chord 0)
-              )
-            )
-        )
-       )
-      )))
-
 #(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
    #:properties ((verse-chords #{#})
                  (verse-reference-voice #{#})
@@ -362,7 +280,6 @@ Chord_lyrics_spacing_engraver =
             \context {
               \Lyrics
               \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = #verse-text-chord-distance
-              \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.padding = #(- verse-text-chord-distance songTextChordDistance)
               \override LyricText.parent-alignment-X = #LEFT
               \override LyricText.self-alignment-X = #LEFT
               \override LyricText.word-space = 0.8
@@ -381,8 +298,6 @@ Chord_lyrics_spacing_engraver =
              % \override SpacingSpanner.strict-note-spacing = ##t
               \override SpacingSpanner.uniform-stretching = ##t
               \override SpacingSpanner.spacing-increment = 0
-              % \override SpacingSpanner.packed-spacing = ##t
-              \consists \Chord_lyrics_spacing_engraver
               \remove Bar_number_engraver
               \remove Mark_engraver
               \remove Jump_engraver
@@ -412,6 +327,14 @@ Chord_lyrics_spacing_engraver =
               \remove Note_heads_engraver
               \remove Script_engraver
             }
+            \context {
+              \NullVoice
+              \consists Rest_engraver
+              \omit Rest
+              \undo \omit NoteHead
+              \hide NoteHead
+              \override NoteHead.X-extent = #'(0 . 0)
+            }
           }
         }
       }

private_includes/book/book_include.ily

@@ -65,10 +65,7 @@ additionalPageNumbers =
   display-pages-list
 )
 
-% TODO:
+
-% Eigentlich können wir das direkt in oddFooderMarkup und evenFooterMarkup aufrufen
-% vermutlich sogar ohne den delay kram. Wir sollten außerdem einfach nur die property
-% page:page-number-string setzen dann klappts auch mit PDF Seiten
 #(define-markup-command (custom-page-number layout props label real-current-page-number)
   (symbol? number?)
   #:category other
@@ -92,10 +89,9 @@ width may require additional tweaking.)"
         ,(delay (ly:stencil-expr
                  (let* ((display-page (assq-ref (build-display-pages-list layout) label))
                         (real-current-page (if (negative? real-current-page-number) (real-page-number layout label) real-current-page-number))
-                        (number-type (ly:output-def-lookup layout 'page-number-type))
                         (page-markup
                           (if (assq-ref additional-page-switch-label-list label)
-                              (make-concat-markup (list (number-format number-type display-page)
+                              (make-concat-markup (list (number-format 'arabic display-page)
                                 (make-char-markup (+ 97 (- real-current-page (real-page-number layout
                                   (let find-earliest-additional-label
                                        ((rest-additional-page-switch-label-list (member (cons label #t) additional-page-switch-label-list)))
@@ -103,7 +99,7 @@ width may require additional tweaking.)"
                                            (find-earliest-additional-label (cdr rest-additional-page-switch-label-list))
                                            (caar rest-additional-page-switch-label-list)))
                                 ))))))
-                              (number-format number-type (+ display-page (- real-current-page (real-page-number layout label))))
+                              (number-format 'arabic (+ display-page (- real-current-page (real-page-number layout label))))
                           ))
                         (page-stencil (interpret-markup layout props page-markup))
                         (gap (- (interval-length x-ext)

private_includes/book/toc_include.ily

@@ -61,9 +61,20 @@
        ;; We insert index items sorted from the beginning on and do
        ;; not sort them later - this saves pretty much computing time
        (insert-alphabetical-sorted! (list label markup-symbol textoptions
+        ;; this crazy hack is necessary because lilypond depends on guile 1.8 atm
+        ;; and so the cool unicode conversion functions cannot be used
           (ly:string-substitute " " ""
-          (ly:string-substitute "." ""
+          (ly:string-substitute "…" ""
-          (transliterate-de sorttext))))
+          (ly:string-substitute "Č" "C"
+          (ly:string-substitute "Đ" "D"
+          (ly:string-substitute "Š" "S"
+          (ly:string-substitute "Т" "T"
+          (ly:string-substitute "Ä" "Ae"
+          (ly:string-substitute "ä" "ae"
+          (ly:string-substitute "Ö" "O"
+          (ly:string-substitute "ö" "oe"
+          (ly:string-substitute "Ü" "U"
+          (ly:string-substitute "ü" "ue" sorttext)))))))))))))
         index-item-list))
        (make-music 'EventChord
          'page-marker #t

private_includes/book/transliteration.ily

@@ -1,65 +0,0 @@
-#(define (transliterate-de str)
-   "Gesamte Transliteration: entfernt Diakritika, ersetzt Sonderzeichen, ergibt ASCII-String."
-
-   (define (remove-diacritics s)
-     (string-join
-       (map (lambda (ch)
-             (let ((code (char->integer ch)))
-               ;; Unicode-Bereich 0300–036F = Combining Diacritical Marks
-               (if (and (>= code #x0300) (<= code #x036F))
-                   ""
-                   (string ch))))
-           (string->list (string-normalize-nfkd s)))
-       ""))
-
-   (define transliteration-table
-     '(
-      ;; Deutsche Umlaute & ß
-      ("ä" . "ae") ("ö" . "oe") ("ü" . "ue")
-      ("Ä" . "Ae") ("Ö" . "Oe") ("Ü" . "Ue")
-      ("ß" . "ss")
-
-      ;; Balkan & mitteleuropäische Sonderzeichen
-      ("Č" . "C") ("č" . "c")
-      ("Š" . "S") ("š" . "s")
-      ("Ž" . "Z") ("ž" . "z")
-      ("Đ" . "D") ("đ" . "d")
-      ("Ł" . "L") ("ł" . "l")
-      ("Ø" . "O") ("ø" . "o")
-      ("Æ" . "Ae") ("æ" . "ae")
-      ("Œ" . "Oe") ("œ" . "oe")
-
-      ;; Kyrillische Buchstaben mit lateinischen Pendants
-      ("А" . "A") ("а" . "a")
-      ("Б" . "B") ("б" . "b")
-      ("В" . "V") ("в" . "v")
-      ("Г" . "G") ("г" . "g")
-      ("Д" . "D") ("д" . "d")
-      ("Е" . "E") ("е" . "e")
-      ("З" . "Z") ("з" . "z")
-      ("И" . "I") ("и" . "i")
-      ("К" . "K") ("к" . "k")
-      ("Л" . "L") ("л" . "l")
-      ("М" . "M") ("м" . "m")
-      ("Н" . "N") ("н" . "n")
-      ("О" . "O") ("о" . "o")
-      ("П" . "P") ("п" . "p")
-      ("Р" . "R") ("р" . "r")
-      ("С" . "S") ("с" . "s")
-      ("Т" . "T") ("т" . "t")
-      ("У" . "U") ("у" . "u")
-      ("Ф" . "F") ("ф" . "f")
-      ("Х" . "Kh") ("х" . "kh")
-      ("Ц" . "Ts") ("ц" . "ts")
-      ("Ч" . "Ch") ("ч" . "ch")
-      ("Ш" . "Sh") ("ш" . "sh")
-      ("Щ" . "Sch") ("щ" . "sch")
-      ("Я" . "Ja") ("я" . "ja")
-      ("Ю" . "Ju") ("ю" . "ju")
-      ("Й" . "J") ("й" . "j")
-    ))
-
-  (remove-diacritics
-    (fold (lambda (pair acc)
-          (ly:string-substitute (car pair) (cdr pair) acc))
-        str transliteration-table)))

public_includes/book_top.ily

@@ -1,4 +1,3 @@
 \include "../private_includes/book/book_include.ily"
-\include "../private_includes/book/transliteration.ily"
 \include "../private_includes/book/toc_include.ily"
 \include "../private_includes/book/appendix.ily"