Erneuerungen Vorlagendateien

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "lilypond-common-includes"]
 	path = lilypond-common-includes
-	url = https://git.zahlenlabyrinth.de/Notenbund/lilypond-common-includes
-[submodule "lilypond-song-includes"]
-	path = lilypond-song-includes
-	url = ../lilypond-song-includes.git
+	url = https://git.zahlenlabyrinth.de/boernel/lilypond-common-includes

lieder/authors_sandbox/authors_sandbox.ly

@@ -1,6 +1,6 @@
 \version "2.25.8"
 
-\include "../../lilypond-custom-includes/base_config.ily"
+\include "../../lilypond-custom-includes/base_config.ly"
 
 #(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.ily"
+\include "../../lilypond-custom-includes/base_config.ly"
 \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 { \refLyrics }
+        \addlyrics { \secondVerse }
       >>
    >>
 }
@@ -45,7 +45,7 @@ TEXT = \markuplist
     \override #'(verse-vspace . 0.8) %abstand der Verse voneinander kleiner
     \chordverse #(stanza 3) \thirdVerseMarkup
 
-    \nochordverse \refString \fourthVerseMarkup
+    \nochordverse \ref \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 \refLyrics
+    \chordlyrics \secondVerse
     \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 "public_includes/layout_bottom.ily"
+\include "../../lilypond-common-includes/standalone_output.ly"

lieder/vorlage_light/vorlage_light.ly

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

lieder/vorlage_light/vorlage_light_old.ly

@@ -0,0 +1,40 @@
+\version "2.25.8"
+
+\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-song-includes/liedbausteine/"
+
+HEADER = \bookpart {
+  \paper {
+    %page-count = 1
+  }
+  \header {
+    \basicSongInfo
+    categories = ""
+    infotext = ""
+  }
+}
+
+breakVoice = \relative c' {
+  s1 \break
+}
+
+MUSIC = {
+  <<
+      \songChords
+      \new Staff = "firstStaff"
+      <<
+        \new Voice = "firstVoice" { \melodyVoice }
+        \addlyrics { \firstVerse \refLyrics }
+        %\new Voice { \breakVoice }
+      >>
+  >>
+}
+
+TEXT = \markuplist {
+  \group-verses {
+    \override #'(custom-verse-breaks "" "")
+    \chordverse #(stanza 2) \secondVerseMarkup
+  }
+}
+
+\include "../../lilypond-common-includes/standalone_output.ly"

liederbuecher/beispiel_liederbuch/beispiel_liederbuch.ly

@@ -1,4 +1,4 @@
-\version "2.25.80"
+\version "2.18"
 
 % point and click blows up the pdf
 \pointAndClickOff
@@ -6,8 +6,9 @@
 imagePagePath = "categories"
 songPath = "../../lieder"
 
-\include "../../lilypond-custom-includes/base_config.ily"
-\include "public_includes/book_top.ily"
+\include "../../lilypond-custom-includes/base_config.ly"
+\include "../../lilypond-common-includes/book_include.ly"
+\include "../../lilypond-common-includes/toc_include.ly"
 
 % Brauchen wir jedes Lied als Einzelausgabe mit Midi und PDF?
 #(define noStandaloneOutput #t)
@@ -17,7 +18,7 @@ songPath = "../../lieder"
 \blankpage
 \includeSong "vorlage_light"
 \imagepage #125 "see.eps"
-
+%}
 %Zur Übersichtlichkeit:
 %A
 %B
@@ -58,14 +59,16 @@ 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
@@ -74,12 +77,6 @@ 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
@@ -95,7 +92,7 @@ songPath = "../../lieder"
         \left-column {
           \justify-string #"
 Hier steht lustiger Text"
-          " "
+            " "
           \fill-line { "blublub" }
         }
       }
@@ -130,33 +127,33 @@ Hier steht lustiger Text"
 
   % Inhaltsverzeichnis
   \bookpart {
-    \indexSection #"A" \markup { "A" }
-    \indexSection #"B" \markup { "B" }
-    \indexSection #"C" \markup { "C" }
-    \indexSection #"D" \markup { "D" }
-    \indexSection #"E" \markup { "E" }
-    \indexSection #"F" \markup { "F" }
-    \indexSection #"G" \markup { "G" }
-    \indexSection #"H" \markup { "H" }
-    \indexSection #"I" \markup { "I" }
-    \indexSection #"J" \markup { "J" }
-    \indexSection #"K" \markup { "K" }
-    \indexSection #"L" \markup { "L" }
-    \indexSection #"M" \markup { "M" }
-    \indexSection #"N" \markup { "N" }
-    \indexSection #"O" \markup { "O" }
-    \indexSection #"P" \markup { "P" }
-    \indexSection #"Q" \markup { "Q" }
-    \indexSection #"R" \markup { "R" }
-    \indexSection #"S" \markup { "S" }
-    \indexSection #"T" \markup { "T" }
-    \indexSection #"U" \markup { "U" }
-    \indexSection #"V" \markup { "V" }
-    \indexSection #"W" \markup { "W" }
-    \indexSection #"X" \markup { "X" }
-    \indexSection #"Y" \markup { "Y" }
-    \indexSection #"Z" \markup { "Z" }
-    \markuplist {
+     \indexSection #"A" \markup { "A" }
+     \indexSection #"B" \markup { "B" }
+     \indexSection #"C" \markup { "C" }
+     \indexSection #"D" \markup { "D" }
+     \indexSection #"E" \markup { "E" }
+     \indexSection #"F" \markup { "F" }
+     \indexSection #"G" \markup { "G" }
+     \indexSection #"H" \markup { "H" }
+     \indexSection #"I" \markup { "I" }
+     \indexSection #"J" \markup { "J" }
+     \indexSection #"K" \markup { "K" }
+     \indexSection #"L" \markup { "L" }
+     \indexSection #"M" \markup { "M" }
+     \indexSection #"N" \markup { "N" }
+     \indexSection #"O" \markup { "O" }
+     \indexSection #"P" \markup { "P" }
+     \indexSection #"Q" \markup { "Q" }
+     \indexSection #"R" \markup { "R" }
+     \indexSection #"S" \markup { "S" }
+     \indexSection #"T" \markup { "T" }
+     \indexSection #"U" \markup { "U" }
+     \indexSection #"V" \markup { "V" }
+     \indexSection #"W" \markup { "W" }
+     \indexSection #"X" \markup { "X" }
+     \indexSection #"Y" \markup { "Y" }
+     \indexSection #"Z" \markup { "Z" }
+     \markuplist {
       \index-in-columns-with-title #'alphabetical \column {
         \title-to-pdf-toc "Inhaltsverzeichnis"
         \fontsize #5 \sans \bold \fill-line { \null "Inhaltsverzeichnis" \null }

lilypond-custom-includes/base_config.ily

@@ -1,14 +0,0 @@
-#(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

@@ -0,0 +1,6 @@
+#(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.ly

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

lilypond-song-includes/data/authors.yml

@@ -0,0 +1,17 @@
+dude:
+  birth_year: '1950'
+  name: Krasser Dude
+  organization: Bund der krassen Dudes
+  trail_name: dud
+kumpel:
+  death_year: '2050'
+  name: Krasser Kumpel
+  organization: Bund der krassen Kumpels
+  trail_name: dudekumpel
+kumpelerbe:
+  inherits: kumpel
+  organization: Bund der crazy Kumpels
+nocheiner:
+  death_year: '2050'
+  name: Jemand anderes
+

lilypond-song-includes/data/songs.yml

@@ -0,0 +1,5 @@
+a-song-id:
+  composer: kumpel
+  poet: dude
+  title: Krasse Vorlage
+

lilypond-song-includes/liedbausteine/sandbox.ly

@@ -0,0 +1,175 @@
+\version "2.25.8"
+
+\include "../../lilypond-common-includes/snippet_include.ly"
+
+basicSongInfo = \header {
+  title = "Liedtitel"
+  alttitle = "Alternativtitel"
+  authors = #'(
+   ("kumpel" melody)
+   ("dude" text composition))
+  infotext = "
+    Also zu der Sandbox gibts echt verdammt viel zu sagen, aber wär zu krass das hier alles reinzuschreiben. Zum Testen muss hier aber mal viel stehen, damit man das mit dem automatischen Zeilenumbruch gut sieht und das mit den Abständen gut debuggen kann.
+
+    Sogar manuelle Zeilenumbrüche gehen hier."
+  copyright = "Fumpeverlag"
+  translation = "sandkasten"
+  pronunciation = "wie mans spricht halt"
+  year_text = "2023"
+  year_melody = "2012"
+}
+
+global = {
+  %Takt
+  \time 4/4
+  %Tonart
+  \key c \major
+}
+
+firstVerse = \lyricmode {
+  \ref
+  Hier \repeat unfold 6 { _ } ist der Text für Stro -- phe eins. \set ignoreMelismata = ##t  \unset ignoreMelismata % Bindebögen irgnorieren
+}
+
+secondVerse = \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
+}
+
+firstVoice = \relative c' {
+  \global
+  %\clef "bass"			% Bassschlüssel
+  \partial 4			% Auftakt
+  a'4				% mit ' und , oktaviert man
+  \repeat volta 2 {		% Wiederholung
+  d,4 e fis g
+  a8 a (a) a d,4~d		% Bindebögen
+   << { \voiceTwo
+       g4. c,8 c4 d
+      }
+      \new Voice { \voiceOne \secondVoiceStyle
+       g4. g8 g4 f
+   }
+   >> \oneVoice
+  }
+  \alternative {			%Klammer eins und zwei
+    {e2. a4}
+    {e2. r4}
+  }
+  e1
+  e1
+  e2^\markup \bold "I. hier einsetzen!" (f)
+  e1 \mark \markup { \italic { fine } }
+  a1_\markup { \italic Zwischenspiel } a1
+   \once \override Score.TimeSignature.stencil = ##f \time 2/4 %unsichtbarer Taktwechsel (ansonsten nur \time macht sichtbaren Taktwechsel)
+ a2 <a c>2
+  r2 \once \override Score.RehearsalMark.break-visibility = #end-of-line-visible
+  \once \override Score.RehearsalMark.self-alignment-X = #RIGHT
+  \mark "D.C. al Fine"
+
+  \bar "|."
+}
+
+bridge = \relative c' {
+  \global
+  \time 3/4
+  a4 h c a h c
+}
+
+bridgeVerse = \lyricmode {
+  \set stanza = "Bridge:"
+  Das hier ist ei -- ne Bridge
+}
+
+
+verseChords = \chordmode {
+  s4 d2 h:m fis:m b g1 \klamm{a2. d4}  c1/h
+  e \once \set chordChanges = ##f e	%gleichbl. Akkord sichtbar machen
+  h:1.3.5.11
+}
+
+songChords = \chords { \verseChords }
+
+bridgeChords = \chords { a2:m a:m a:m a:m }
+
+thirdVerseMarkup =
+"Test (Akk,a:m)orde (ü,a:1.3.7+.9)ber    den (Stro,d:m)phen (test)
+\\repStart sind (sup,e)er \\underline {(cpjl,a:m)} \\repStop
+und (sie,a:m) sind (jetzt,\\klamm{d:m}) auch (klam,\\klamm { d })mer(bar,\\klamm g)
+\\italic  { hier i(s,fis)t mal was (kur,d:m)siv } – das k(lLA,g:m)pt (je,a)tzt"
+
+fourthVerseMarkup =
+"Hier ist leider nicht genug (Platz,g)
+für (Akk,a:m)orde über den (Stro,d:m)phen
+\\repStart deswegen \\concat{ \\underline { wer } den } die hier mittels \\bold { nochordverse } automatisch
+entfernt! \\repStop"
+
+fifthVerseMarkup =
+"Hier geht die 5. Strophe los, die zusammen mit der 6. und 7. auf
+eine Seite soll"
+
+sixthVerseMarkup =
+"Strophen in einer \\concat{\\char ##x5C group-verses} Umgebung werden aneinander
+ausgerichtet und auf der Seite zentriert.
+Man beachte auch wie widerlich der Backslash
+vor group-verses eingegeben werden muss!
+Falls ihr mal runde (Klammern) braucht: \\concat{\\char ##x28 Klammer} auf und Klammer \\concat{zu \\char ##x29 }"
+
+seventhVerseMarkup =
+"Wir achten bitte auch auf typografisch korrekte Zeichen.
+Ein deutsches Apostroph sieht so aus ’ und nicht so '
+Ein Gedankenstrich, wie er auch zur Trennung von Jahreszahlen
+genutzt wird ist so – und nicht so -
+Anführungszeichen sind so „ und so “"
+
+columnVerseMarkup =
+"Stro(phen,a:m) können jetzt auch in (Spal,f)ten!
+Voll (krass,e) (eh,a:m)!"
+
+BRIDGE =
+{
+  <<
+    \bridgeChords
+    \new Voice { \bridge }
+    \addlyrics { \bridgeVerse }
+  >>
+}
+
+bridgeverse = \markup {
+  \score {
+    \inline-score
+    \BRIDGE
+    \layout { \generalLayout }
+  }
+}
+
+MUSIC =
+{
+  <<
+      \songChords
+      \new ChoirStaff = "firstStaff"
+      <<
+        \new Voice = "firstVoice" { \firstVoice }
+        \addlyrics { \firstVerse }
+        \addlyrics { \secondVerse }
+      >>
+   >>
+}
+
+TEXT = \markuplist
+{
+  \group-verses {
+    \chordverse #(stanza 3) \thirdVerseMarkup
+    \chordverse #(stanza 4) \fourthVerseMarkup
+    \chordverse #(stanza 5) \fifthVerseMarkup
+  }
+  \group-verses {
+    \chordverse #(stanza 6) \sixthVerseMarkup
+    \chordverse #(stanza 7) \seventhVerseMarkup
+    \chordverse #(stanza 8) \columnVerseMarkup
+    \bridgeverse
+  }
+}
+
+\include "../../lilypond-common-includes/default_output.ly"