Update Common Includes

lieder/authors_sandbox/authors_sandbox.ly

@@ -1,6 +1,6 @@
 \version "2.25.8"
 
-\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-custom-includes/base_config.ily"
 
 #(set! paper-alist (cons '("testformat" . (cons (* 176 mm) (* 15 mm))) paper-alist))
 \paper {

lieder/sandbox/sandbox.ly

@@ -1,7 +1,7 @@
 \version "2.25.8"
 %songStyle = #'büdel
 
-\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-custom-includes/base_config.ily"
 \include "../../lilypond-song-includes/liedbausteine/sandbox.ly"
 
 HEADER = \bookpart {
@@ -31,7 +31,7 @@ MUSIC =
       <<
         \new Voice = "firstVoice" { << \firstVoice { s4 \repeat unfold 4 { s1 } \break } >> }
         \addlyrics { \firstVerse }
-        \addlyrics { \secondVerse }
+        \addlyrics { \refLyrics }
       >>
    >>
 }
@@ -45,7 +45,7 @@ TEXT = \markuplist
     \override #'(verse-vspace . 0.8) %abstand der Verse voneinander kleiner
     \chordverse #(stanza 3) \thirdVerseMarkup
 
-    \nochordverse \ref \fourthVerseMarkup
+    \nochordverse \refString \fourthVerseMarkup
   }
 
   \group-verses {
@@ -64,7 +64,7 @@ TEXT = \markuplist
    %\translate #'(2 . 0) %das nächste was er printed, printed er nicht dahin wo es eigentlich hinkommt sondern verschiebt es um (x.y)
   \group-verses {
     \override #`(verse-break-voice . ,#{ s4 \repeat unfold 2 { s1 } \break #})
-    \chordlyrics \secondVerse
+    \chordlyrics \refLyrics
     \chordverse #(stanza 8) \columnVerseMarkup
 
     \chordverse #(stanza 9) \columnVerseMarkup
@@ -90,4 +90,4 @@ TEXT = \markuplist
   \fret-chord #"x;2;4;4;4;o;" #"h:1.3.5.11"
 }
 
-\include "../../lilypond-common-includes/standalone_output.ly"
+\include "public_includes/layout_bottom.ily"

lieder/vorlage_light/vorlage_light.ly

@@ -1,7 +1,7 @@
-\version "2.25.8"
+\version "2.25.27"
 
-\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-custom-includes/base_config.ily"
-\include "../../lilypond-song-includes/liedbausteine/sandbox.ly"
+\include "../../lilypond-song-includes/liedbausteine/00_vorlage_light.ly"
 
 HEADER = \bookpart {
   \header {
@@ -11,4 +11,4 @@ HEADER = \bookpart {
   }
 }
 
-\include "../../lilypond-common-includes/standalone_output.ly"
+\include "public_includes/layout_bottom.ily"

lieder/vorlage_light/vorlage_light_old.ly

@@ -1,12 +1,9 @@
 \version "2.25.8"
 
-\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-custom-includes/base_config.ily"
-\include "../../lilypond-song-includes/liedbausteine/"
+\include "../../lilypond-song-includes/liedbausteine/sandbox.ly"
 
 HEADER = \bookpart {
-  \paper {
-    %page-count = 1
-  }
   \header {
     \basicSongInfo
     categories = ""
@@ -33,8 +30,8 @@ MUSIC = {
 TEXT = \markuplist {
   \group-verses {
     \override #'(custom-verse-breaks "" "")
-    \chordverse #(stanza 2) \secondVerseMarkup
+    \chordverse #(stanza 3) \thirdVerseMarkup
   }
 }
 
-\include "../../lilypond-common-includes/standalone_output.ly"
+\include "public_includes/layout_bottom.ily"

liederbuecher/beispiel_liederbuch/beispiel_liederbuch.ly

@@ -6,9 +6,8 @@
 imagePagePath = "categories"
 songPath = "../../lieder"
 
-\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-custom-includes/base_config.ily"
-\include "../../lilypond-common-includes/book_include.ly"
+\include "public_includes/book_top.ily"
-\include "../../lilypond-common-includes/toc_include.ly"
 
 % Brauchen wir jedes Lied als Einzelausgabe mit Midi und PDF?
 #(define noStandaloneOutput #t)
@@ -18,7 +17,7 @@ songPath = "../../lieder"
 \blankpage
 \includeSong "vorlage_light"
 \imagepage #125 "see.eps"
-%}
+
 %Zur Übersichtlichkeit:
 %A
 %B
@@ -59,16 +58,14 @@ songPath = "../../lieder"
     pdfkeywords = "Liederbuch, Pfadfinder, bündisch"
   }
 
+  \paper {
+    first-page-number = 1
+  }
+
   %Eine Seite mit dem Cover könnte so aussehen:
   \bookpart {
-    \markup {
-      %\epsfile #X #120 #"images/front.eps"
-      %\fill-line { \center-column { \vspace #1 \pad-x #9 \customEps #95 #"Dateiname.dt" \vspace #1 } }
-      \title-to-pdf-toc "Titelseite"
-    }
     \paper {
       print-page-number = ##f
-      first-page-number = 1
       inner-margin = 0
       outer-margin = 0
       binding-offset = 0
@@ -77,6 +74,12 @@ songPath = "../../lieder"
       last-bottom-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 0))
       page-count = 1
     }
+    \markup {
+      \title-to-pdf-toc "Titelseite"
+      " "
+      %\epsfile #X #120 #"images/front.eps"
+      %\fill-line { \center-column { \vspace #1 \pad-x #9 \customEps #95 #"Dateiname.dt" \vspace #1 } }
+    }
   }
 
   % Seite

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"

lilypond-custom-includes/custom_style_overrides.ily

@@ -24,5 +24,5 @@ repStart = "𝄆"
 repStop = "𝄇"
 
 customChordPrintings = {
-  %<c g>-\markup { \super "5" }
+  <c g>-\markup { \super "4" }
 }

lilypond-song-includes/liedbausteine/00_vorlage_light.ly

@@ -0,0 +1,86 @@
+\version "2.25.27"
+
+\include "../../lilypond-common-includes/public_includes/pool_top.ily"
+
+%midiQuarterNoteSpeed =
+
+basicSongInfo = \header {
+  title = "Titel"
+  starttext = "Liedanfang"
+  alttitle = #'("Alternativtitel")
+  authors =
+  #'(("" text)
+     ("" melody))
+  year_text = ""
+  year_melody = ""
+  infotext = ""
+  source = ""
+}
+
+global = {
+  \time 4/4
+  \key c \major
+}
+
+firstVerse = \lyricmode {
+  #(stanza 1)
+  Ly
+}
+
+refLyrics = \lyricmode {
+  \ref
+  Ly
+}
+
+firstVoice = \relative c' {
+  c
+}
+
+refVoice = \relative c' {
+  c
+}
+
+melodyVoice = \relative c' {
+  \global
+  \firstVoice
+  \refVoice
+  \bar "|."
+}
+
+verseChords = \chordmode {
+  c
+}
+
+refChords = \chordmode {
+  c
+}
+
+songChords = \chords {
+  \verseChords \refChords
+}
+
+MUSIC = {
+  <<
+    \songChords
+    \new ChoirStaff = "firstStaff"
+    <<
+      \new Voice = "firstVoice" { \melodyVoice }
+      \addlyrics { \firstVerse \refLyrics }
+    >>
+  >>
+}
+
+verse-breaks = {
+  s1 \break
+}
+
+TEXT = \markuplist {
+  %\override #`(verse-chords . ,verse-chords)
+  %\override #`(verse-reference-voice . ,verse-voice)
+  \override #`(verse-break-voice . ,verse-breaks)
+  \group-verses {
+    \chordlyrics \firstVerse
+  }
+}
+
+\include "public_includes/pool_bottom.ily"

lilypond-song-includes/liedbausteine/sandbox.ly

@@ -31,7 +31,7 @@ firstVerse = \lyricmode {
   Hier \repeat unfold 6 { _ } ist der Text für Stro -- phe eins. \set ignoreMelismata = ##t  \unset ignoreMelismata % Bindebögen irgnorieren
 }
 
-secondVerse = \lyricmode {
+refLyrics = \lyricmode {
   #(stanza 2)
   Mit _ ü -- ber -- springt man No -- ten. \markup { \bold { fett! krass } }
   "Mehrere Silben" auf ei -- ne No -- te. Me -- lis -- ma -- \set ignoreMelismata = ##t ta aus \unset ignoreMelismata und wieder an
@@ -144,6 +144,8 @@ bridgeverse = \markup {
   }
 }
 
+melodyVoice = { \firstVoice }
+
 MUSIC =
 {
   <<
@@ -152,7 +154,7 @@ MUSIC =
       <<
         \new Voice = "firstVoice" { \firstVoice }
         \addlyrics { \firstVerse }
-        \addlyrics { \secondVerse }
+        \addlyrics { \refLyrics }
       >>
    >>
 }