add default chordName exceptions

all_base_includes.ly

@@ -28,6 +28,7 @@
 \include "arrows_in_scores.ly"
 \include "swing_style.ly"
 \include "inline_score.ly"
+\include "custom_indentation.ily"
 
 % reset important variables
 LAYOUT = \layout { \generalLayout }

basic_format_and_style_settings.ly

@@ -43,7 +43,7 @@ generalLayout = \layout {
   }
   \context {
     \Staff
-    \accidentalStyle modern
+    \accidentalStyle modern-voice-cautionary
     \consists Merge_rests_engraver
   }
   \context {
@@ -71,6 +71,7 @@ generalLayout = \layout {
     \override Stem.layer = 2
     \override Flag.layer = 2
     \override Beam.layer = 2
+    \override Accidental.layer = 2
   }
 }
 
@@ -86,11 +87,13 @@ 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 = {
@@ -99,6 +102,7 @@ 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
@@ -211,4 +215,19 @@ 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 (string-match "^(0|\\.)" f) files (cons f files))))))))
+    	     (next (readdir dir) (if (ly:regex-match? (ly:regex-exec (ly:make-regex "^(0|\\.)") f)) files (cons f files))))))))
 
 #(define (file-to-stats filename)
    (set! song-list (cons filename song-list)))

chord_settings.ly

@@ -38,31 +38,35 @@ shiftChords = #(define-music-function (parser location xshift chords) (number? l
 	$chords
 #})
 
-altChord = #(define-music-function (parser location mainchord altchord) (ly:music? ly:music?)
-(define (chord-namer in-pitches bass inversion context)
-#{
-  \markup {
-    \translate #'(-0.5 . 0)
-    \score {
-      \chords { #mainchord \klamm #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
-#})
+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
+    #}))
 
 % kleine Mollakkorde und Alteration ausgeschrieben
 #(define (note-name->german-markup-nosym pitch lowercase?)
@@ -100,11 +104,42 @@ altChord = #(define-music-function (parser location mainchord altchord) (ly:musi
 % 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
-  (if (defined? 'customChordPrintings)
-  (sequential-music-to-chord-exceptions customChordPrintings #t)
-  '()))
+  (append
+    (if (defined? 'customChordPrintings)
+      (sequential-music-to-chord-exceptions customChordPrintings #t)
+      '())
+    (sequential-music-to-chord-exceptions defaultChordPrintings #t)))
 
 generalLayout = \layout {
   \generalLayout

custom_indentation.ily

@@ -0,0 +1,135 @@
+% 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

@@ -42,7 +42,16 @@
               (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))))
+              (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)))
+                  '()))))
           (stack-lines DOWN 0.0 (chain-assoc-get 'baseline-skip props)
             (interpret-markup-list layout props
               (append
@@ -53,10 +62,11 @@
                     (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) "")
-                  (if infotext (string-append "\n\n" infotext) "")
-                  (if translation (string-append "\n\nÜbersetzung: " translation) "")
-                  (if pronunciation (string-append "\n\nAussprache: " pronunciation) ""))))))))
+                  (if copyright (string-append "\n\n© " copyright) "")))
+                (string-with-paragraphs->markuplist "" infotext)
+                (string-with-paragraphs->markuplist "Übersetzung: " translation)
+                (string-with-paragraphs->markuplist "Aussprache: " pronunciation)
+                  )))))
       (make-null-markup)
     )
 }

default_style.ly

@@ -22,3 +22,14 @@ 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

@@ -10,7 +10,9 @@
         (assoc-ref author "death_year")
         (assoc-ref author "organization")
       )
-      "unbekannt")))
+      (if (string-null? authorId)
+          "unbekannt"
+          authorId))))
 
 #(define (find-author-ids-by contributionType authors)
   (if authors
@@ -19,11 +21,13 @@
 
 #(define (find-author-id-with-part-numbers contributionType authors)
   (if authors
-    (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)
+    (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))))
     (list)))
 
 #(define-markup-command (print-songinfo layout props) ()
@@ -73,22 +77,20 @@
       (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)
-          (string-append
+          (join-present (list
             (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

inline_score.ly

@@ -6,3 +6,8 @@ inline-score =
     #{
       \transposable #TRANSPOSITION #music
     #})
+
+fill-midi =
+#(define-void-function (music) (ly:music?)
+   (set! INLINESCOREMUSIC #{ \INLINESCOREMUSIC #music #})
+)

scm/yaml_parser.scm

@@ -1,20 +1,23 @@
 (if (not windows?) (use-modules (ice-9 popen)))
 (use-modules (ice-9 textual-ports) (json parser))
 
+; We use Python to convert the data yamls like the authors.yml to json, that we can parse in scheme.
+; Windows does not like Pipes, so we use a tmpfile instead.
+; Be sure you have PyYAML installed. On Windows that could be done for example like "py -m pip install PyYAML"
 (define (yml-file->scm filename)
   (if windows?
-    (let* ((tmpdir (or (getenv "TMPDIR") (getenv "TEMP") "/tmp"))
-            (port (mkstemp (string-append tmpdir file-name-separator-string (basename filename) "-XXXXXX") "r"))
+    (let* ((port (make-tmpfile #f))
             (tmpfilepath (port-filename port))
-            (python_code (string-append "import sys, yaml, json; f = open('" tmpfilepath "', 'w'); f.write(json.dumps(yaml.safe_load(open('" filename "')))); f.close()"))
-            (status (system (string-append "py -X utf8 -c \"" python_code "\"")))
-            (json (get-string-all port)))
+            (ignore (close-port port))
+            (python_code (string-append "import sys, yaml, json; f = open(r'" tmpfilepath "', 'w'); f.write(json.dumps(yaml.safe_load(open(r'" filename "')))); f.close()"))
+            (status (system (string-append (search-executable '("python3" "python" "py")) " -X utf8 -c \"" python_code "\"")))
+            (readport (open-file tmpfilepath "r" #:encoding "UTF-8"))
+            (json (get-string-all readport)))
+      (close-port readport)
       (delete-file tmpfilepath)
       (json-string->scm (if (status:exit-val status) json "{}")))
-    (let* ((python_code (string-append "import sys, yaml, json; print(json.dumps(yaml.safe_load(open('" filename "'))))"))
-            ; WTF? On Windows there is "py" and we need to specify the encoding, on linux there is "python3" or "python"
-            ; but "python3" seems to work better. Be sure you have PyYAML installed.
-            (pipe (open-pipe (string-append "PYTHONHOME='' " (if windows? "py" "python3") " -X utf8 -c \"" python_code "\"") OPEN_READ))
+    (let* ((python_code (string-append "import sys, yaml, json; print(json.dumps(yaml.safe_load(open(r'" filename "'))))"))
+            (pipe (open-pipe (string-append "PYTHONHOME='' " (search-executable '("python3" "python" "py")) " -X utf8 -c \"" python_code "\"") OPEN_READ))
             (json (get-string-all pipe)))
       (close-pipe pipe)
       (json-string->scm json))))

verses_with_chords.ly

@@ -254,11 +254,10 @@
       \markup {
         \override #`(baseline-skip . ,intraverse-vspace)
         \score-equal-height #verse-line-height \score-lines {
-          \transposable #transposition
           <<
             \new Devnull { #verse-break-voice }
             \new NullVoice = "dummyvoice" { #verse-reference-voice }
-            #(music-clone verse-chords)
+            \transposable #transposition #(music-clone verse-chords)
             \new Lyrics \lyricsto "dummyvoice" { #lyrics }
           >>
           \layout {
@@ -290,6 +289,7 @@
               \override SpacingSpanner.spacing-increment = 0
               \remove Bar_number_engraver
               \remove Mark_engraver
+              \remove Jump_engraver
               \remove Volta_engraver
               \remove Parenthesis_engraver
             }