Refactor Include System

lilypond-custom-includes/base_config.ily

@@ -0,0 +1,14 @@
+#(ly:set-option 'relative-includes #t)
+#(define include-path-unextended (if (defined? 'include-path-unextended) include-path-unextended #t))
+#(if include-path-unextended
+   (let* ((custom-include-dir (dirname (current-filename)))
+          (project-dir (dirname custom-include-dir))
+          (pool-dir (string-append project-dir file-name-separator-string "lilypond-song-includes")))
+      (ly:parser-append-to-include-path custom-include-dir)
+      (ly:parser-append-to-include-path pool-dir))
+      (set! include-path-unextended #f))
+
+customStyleOverridesFile = "custom_style_overrides.ily"
+
+\include "categories.ily"
+\include "../lilypond-common-includes/public_includes/layout_top.ily"

lilypond-custom-includes/base_config.ly

@@ -1,6 +0,0 @@
-#(ly:set-option 'relative-includes #t)
-
-customStyleOverridesFile = "../lilypond-custom-includes/custom_style_overrides.ly"
-
-\include "categories.ly"
-\include "../lilypond-common-includes/general_include.ly"