diff --git a/basic_format_and_style_settings.ly b/basic_format_and_style_settings.ly index f5e6858..4cd80ef 100644 --- a/basic_format_and_style_settings.ly +++ b/basic_format_and_style_settings.ly @@ -3,6 +3,8 @@ \include "styles.ly" \include #(ly:format "styles/~a.ly" songStyle) +\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "void.ly") + #(set-default-paper-size songFormatAndSize) #(set-global-staff-size globalSize) diff --git a/chord_settings.ly b/chord_settings.ly index efe8710..c6d606b 100644 --- a/chord_settings.ly +++ b/chord_settings.ly @@ -52,6 +52,12 @@ bchord = % additional bass notes should get uppercased #(define (bassnote-name->german-markup-nosym pitch lowercase?)(note-name->german-markup-nosym pitch #f)) + +#(define chordNameExceptions + (if (defined? 'customChordPrintings) + (sequential-music-to-chord-exceptions customChordPrintings #t) + '())) + generalLayout = \layout { \generalLayout \context { @@ -66,6 +72,7 @@ generalLayout = \layout { chordRootNamer = #note-name->german-markup-nosym chordNoteNamer = #bassnote-name->german-markup-nosym majorSevenSymbol = "maj7" + chordNameExceptions = \chordNameExceptions % der baseline-skip der Akkorde beeinflusst, wie hoch die Hochstellung ist \override ChordName.baseline-skip = #1.0 } diff --git a/enable_custom_chord_settings.ly b/enable_custom_chord_settings.ly deleted file mode 100644 index c7ba858..0000000 --- a/enable_custom_chord_settings.ly +++ /dev/null @@ -1,15 +0,0 @@ -generalLayout = \layout { - \generalLayout - \context { - \ChordNames - chordNameExceptions = #(sequential-music-to-chord-exceptions customChordPrintings #t) - } -} - -verseChordLayout = \layout { - \verseChordLayout - \context { - \ChordNames - chordNameExceptions = #(sequential-music-to-chord-exceptions customChordPrintings #t) - } -} \ No newline at end of file