refactor include system

private_includes/base/all.ily

@@ -1,3 +1,9 @@
+#(define include_dir_not_added? (if (defined? 'include_dir_not_added?) include_dir_not_added? #t))
+#(if include_dir_not_added?
+   (let* ((common-include-dir (dirname (dirname (dirname (current-filename))))))
+      (ly:parser-append-to-include-path common-include-dir)
+      (set! include_dir_not_added? #f)))
+
 #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
 
 #(define windows? (string-prefix-ci? "windows" (utsname:sysname (uname))))
@@ -19,15 +25,15 @@
 #(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 "basic_format_and_style_settings.ly"
-\include "eps_file_from_song_dir.ly"
-\include "title_with_category_images.ly"
-\include "chord_settings.ly"
-\include "transposition.ly"
-\include "verses_with_chords.ly"
-\include "arrows_in_scores.ly"
-\include "swing_style.ly"
-\include "inline_score.ly"
+\include "basic_format_and_style_settings.ily"
+\include "eps_file_from_song_dir.ily"
+\include "title_with_category_images.ily"
+\include "chord_settings.ily"
+\include "transposition.ily"
+\include "verses_with_chords.ily"
+\include "arrows_in_scores.ily"
+\include "swing_style.ily"
+\include "inline_score.ily"
 \include "custom_indentation.ily"
 \include "include_from_song.ily"
 

private_includes/base/basic_format_and_style_settings.ily

@@ -1,10 +1,10 @@
 \language "deutsch"
 
-\include "default_style.ly"
-\include "default_songinfo_style.ly"
-\include "footer_with_songinfo.ly"
+\include "default_style.ily"
+\include "default_songinfo_style.ily"
+\include "footer_with_songinfo.ily"
 
-\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "void.ly")
+\include #(if (defined? 'customStyleOverridesFile) customStyleOverridesFile "../void.ily")
 
 #(set-default-paper-size songFormatAndSize)
 #(set-global-staff-size globalSize)

private_includes/base/include_from_song.ily

@@ -5,7 +5,7 @@ includeFromSong =
     (ly:parser-parse-string (ly:parser-clone)
       (ly:format "\\include \"~a\""
       (string-append
-        (dirname (dirname (current-filename)))
+        (dirname (dirname (dirname (dirname (current-filename)))))
         file-name-separator-string
         "lilypond-song-includes"
         file-name-separator-string

private_includes/base/verses_with_chords.ily

@@ -253,113 +253,6 @@
                                     (make-pad-right-markup -0.1 (make-tied-lyric-markup text))
                                     text))))
 
-Chord_lyrics_spacing_engraver =
-#(lambda (ctx)
-   (let ((last-note-head #f)
-         (note-head-extended #f)
-         (last-lyric-syllable-width 0)
-         (lyric-width-since-last-chord 0)
-         (notes-on-syllable-count 0)
-         (last-chord-name #f)
-         (remaining-chord-width 0)
-         (last-rest #f)
-         (rest-count 0)
-         (multi-measure-rest-count 0)
-         (stanza-shift 0))
-     (make-engraver
-      (listeners
-       ((multi-measure-rest-event engraver event)
-        (set! multi-measure-rest-count (+ multi-measure-rest-count 1))
-        )
-       ((break-event engraver event)
-        (set! last-note-head #f)
-        (set! note-head-extended #f)
-        (set! last-lyric-syllable-width 0)
-        (set! lyric-width-since-last-chord 0)
-        (set! notes-on-syllable-count 0)
-        (set! last-chord-name #f)
-        (set! remaining-chord-width 0)
-        (set! last-rest #f)
-        (set! rest-count 0)
-        (set! multi-measure-rest-count 0)
-        (set! stanza-shift 0)
-        ))
-      (acknowledgers
-       ((note-head-interface this-engraver grob source-engraver)
-        (if (and (> rest-count 0) (not last-note-head))
-            (let ((rest-spacing-on-line-start 1.2))
-              (ly:grob-set-property! grob 'minimum-X-extent (cons (- rest-spacing-on-line-start) 0))
-              (set! stanza-shift rest-spacing-on-line-start)
-              ))
-        (set! notes-on-syllable-count (+ 1 notes-on-syllable-count))
-        (set! last-note-head grob)
-        (set! note-head-extended #f)
-        (set! last-rest #f)
-        (set! rest-count 0)
-        (set! multi-measure-rest-count 0)
-        )
-       ((lyric-syllable-interface this-engraver grob source-engraver)
-        (set! remaining-chord-width (max 0 (- remaining-chord-width lyric-width-since-last-chord)))
-        (set! last-lyric-syllable-width (- (cdr (ly:grob-extent grob grob X)) 0.2))
-        (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord last-lyric-syllable-width))
-        (if last-note-head (set! notes-on-syllable-count 1))
-        )
-       ((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 ((on-a-rest (> rest-count 0)))
-              (if (not on-a-rest)
-                  (set! notes-on-syllable-count (- notes-on-syllable-count 1)))
-              (if (and last-chord-name (= multi-measure-rest-count 1) (> lyric-width-since-last-chord remaining-chord-width))
-                  (ly:grob-set-property! last-chord-name 'extra-spacing-width (cons -0.1 (+ 0.1 (- lyric-width-since-last-chord remaining-chord-width)))))
-              (if last-note-head
-                  (let* ((last-note-min-x-extent (ly:grob-property last-note-head 'minimum-X-extent))
-                         (last-note-min-x-lower (if (pair? last-note-min-x-extent) (car last-note-min-x-extent) 0))
-                         (last-note-min-x-upper (if (pair? last-note-min-x-extent) (cdr last-note-min-x-extent) 0)))
-                    (if on-a-rest
-                        (begin
-                         (if (not note-head-extended)
-                             (begin
-                              (ly:grob-set-property! last-note-head 'minimum-X-extent
-                                                     (cons last-note-min-x-lower (- last-lyric-syllable-width -2 (* 2.2 rest-count))))
-                              (set! note-head-extended #t)
-                              ))
-                         (ly:grob-set-property! last-rest 'minimum-X-extent (cons 0 2))
-                         )
-                        (if (and (> lyric-width-since-last-chord 0)
-                                 (> remaining-chord-width lyric-width-since-last-chord))
-                            (ly:grob-set-property! last-note-head 'minimum-X-extent
-                                                   (cons (- -1.2 (- remaining-chord-width lyric-width-since-last-chord)) last-note-min-x-upper))
-                            (let* ((width-per-note-head 0.5)
-                                   (note-width-since-last-chord (* width-per-note-head notes-on-syllable-count)))
-                              (if (> remaining-chord-width note-width-since-last-chord)
-                                  (ly:grob-set-property! last-note-head 'minimum-X-extent
-                                                         (cons (- note-width-since-last-chord remaining-chord-width) last-note-min-x-upper))
-                                  )
-                              )
-                            )
-                        )))
-              (set! last-chord-name grob)
-              (set! remaining-chord-width
-                    (if (and on-a-rest (equal? (ly:prob-property (ly:grob-property grob 'cause) 'duration) (ly:prob-property (ly:grob-property last-rest 'cause) 'duration)))
-                        0
-                        (cdr (ly:grob-extent grob grob X))))
-              (set! lyric-width-since-last-chord 0)
-              (set! notes-on-syllable-count (if on-a-rest 0 1))
-              ))
-        )
-       ((rest-interface this-engraver grob source-engraver)
-        (set! rest-count (+ 1 rest-count))
-        (set! last-rest grob)
-        (set! multi-measure-rest-count 0)
-        )
-       ((stanza-number-interface this-engraver grob source-engraver)
-        (ly:grob-set-property! grob 'padding (+ 1 stanza-shift)))
-       ))))
-
-%#(ly:set-option 'debug-skylines #t)
-
 #(define-markup-command (chordlyrics layout props lyrics) (ly:music?)
    #:properties ((verse-chords #{#})
                  (verse-reference-voice #{#})
@@ -405,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
@@ -440,10 +331,9 @@ Chord_lyrics_spacing_engraver =
               \NullVoice
               \consists Rest_engraver
               \omit Rest
-              \override Rest.X-extent = #'(0 . 0)
               \undo \omit NoteHead
               \hide NoteHead
-              \override NoteHead.X-extent = #'(0 . 0.5)
+              \override NoteHead.X-extent = #'(0 . 0)
             }
           }
         }

public_includes/book_top.ily

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

public_includes/layout_top.ily

@@ -1,6 +1,5 @@
-\version "2.25.8"
 #(ly:set-option 'relative-includes #t)
 
 #(define noDefaultOutput #t)
 
-\include "all_base_includes.ly"
+\include "../private_includes/base/all.ily"

public_includes/pool_bottom.ily

@@ -4,4 +4,4 @@ HEADER = \bookpart {
     \basicSongInfo
   }
 }
-\include #(if noDefaultOutput "void.ly" "standalone_output.ly")
+\include #(if noDefaultOutput "../private_includes/void.ily" "layout_bottom.ily")

public_includes/pool_top.ily

@@ -2,4 +2,4 @@
 
 #(define noDefaultOutput (if (defined? 'noDefaultOutput) noDefaultOutput #f))
 
-\include #(if noDefaultOutput "void.ly" "all_base_includes.ly")
+\include #(if noDefaultOutput "../private_includes/void.ily" "../private_includes/base/all.ily")

styles.ly

@@ -1,16 +0,0 @@
-#(define bookStyle
-  (if (not (defined? 'bookStyle))
-      #f
-      bookStyle))
-
-#(define songStyle
-  (if (not (defined? 'songStyle))
-      (if (not (defined? 'defaultSongStyle)) 'default defaultSongStyle)
-      songStyle))
-
-#(if (not (boolean? bookStyle))
-         (set! songStyle bookStyle))
-
-#(define (bock-style layout props)
-  "Whether we have bockstyle or not"
-  (eq? songStyle 'bock))