Compare commits
	
		
			14 Commits
		
	
	
		
			8d918d4ee4
			...
			toc-Variab
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | d5ecd49be8 | ||
| 0433dd67a9 | |||
| 7ab91abb3b | |||
| 16fd849b04 | |||
| 27f581f26b | |||
| ad699f1da6 | |||
| e668c4c150 | |||
| f5a2b943f2 | |||
| 72c6d9b696 | |||
| cc7aff0d43 | |||
| ec5acb1bc3 | |||
|  | 268ea90e50 | ||
| 75a7b5c7bc | |||
|  | 6da3d36769 | 
							
								
								
									
										14
									
								
								data/authors.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								data/authors.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| { | ||||
|   "dude": { | ||||
|     "name": "Krasser Dude", | ||||
|     "trail_name": "dud", | ||||
|     "birth_year": "1950", | ||||
|     "organization": "Bund der krassen Dudes" | ||||
|   }, | ||||
|   "kumpel": { | ||||
|     "name": "Krasser Kumpel", | ||||
|     "trail_name": "dudekumpel", | ||||
|     "death_year": "2050", | ||||
|     "organization": "Bund der krassen Kumpels" | ||||
|   } | ||||
| } | ||||
							
								
								
									
										7
									
								
								data/songs.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								data/songs.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | ||||
| { | ||||
|   "a-song-id": { | ||||
|     "title": "Krasse Vorlage", | ||||
|     "composer": "kumpel", | ||||
|     "poet": "dude" | ||||
|   } | ||||
| } | ||||
| @@ -3,12 +3,6 @@ | ||||
|  | ||||
| \include "../../lilypond-custom-includes/base_config.ly" | ||||
|  | ||||
| customChordPrintings = { | ||||
|   <h dis' fis' e''>-\markup { \small "add11" } | ||||
|   <a cis' gis' h'>-\markup { \small "maj9" } | ||||
| } | ||||
| \include "../../lilypond-common-includes/enable_custom_chord_settings.ly" | ||||
|  | ||||
| HEADER = \bookpart { | ||||
|  | ||||
|   \paper { | ||||
| @@ -22,8 +16,8 @@ HEADER = \bookpart { | ||||
|     alttitle = "Alternativtitel" | ||||
|     titlesize = 11 | ||||
|     titletopspace = 2 | ||||
|     poet = "Worte: Christoph Wagner(tux), (1985‒20xx) oder (*1985), BdP Stamm Goldener Reiter, 2013" | ||||
|     composer = "Weise: Christoph" | ||||
|     poetId = "dude" | ||||
|     composerId = "dude" | ||||
|     copyright = "Fumpeverlag" | ||||
|     categories = "see" | ||||
|     songinfo = "Hintergrund | ||||
| @@ -42,6 +36,7 @@ LAYOUT = \layout { | ||||
|  | ||||
|  | ||||
| global = { | ||||
|   %\transposeGlobal a g | ||||
|   %Takt | ||||
|   \time 4/4 | ||||
|   %\set Timing.beatStructure = #'(3 2 2) 	% Befehl für manuelle Balkenverknüpfung (hier 7/8) | ||||
| @@ -95,7 +90,18 @@ firstVoice = \relative c' { | ||||
|   \bar "|." | ||||
| } | ||||
|  | ||||
| MUSIC = %\transpose g e | ||||
| bridge = \relative c' { | ||||
|   \global | ||||
|   \time 3/4 | ||||
|   a4 h c a h c | ||||
| } | ||||
|  | ||||
| bridgeVerse = \lyricmode { | ||||
|   \set stanza = "Bridge:" | ||||
|   Das hier ist ei -- ne Bridge | ||||
| } | ||||
|  | ||||
| MUSIC = | ||||
| { | ||||
|   << | ||||
|       \chords { | ||||
| @@ -112,13 +118,21 @@ MUSIC = %\transpose g e | ||||
|    >> | ||||
| } | ||||
|  | ||||
| BRIDGE = | ||||
| { | ||||
|   << | ||||
|     \chords { a2:m a:m a:m a:m } | ||||
|     \new Voice { \bridge } | ||||
|     \addlyrics { \bridgeVerse } | ||||
|   >> | ||||
| } | ||||
|  | ||||
| TEXT = \markuplist | ||||
| %\transpose g e | ||||
| { | ||||
| %\fontsize #-1		%Text in den Strophen kleiner | ||||
|  %\vspace #1.5		%Abstand zwischen Strophen | ||||
|   \group-verses { | ||||
|     \override #'(verse-vspace . 0.8) %abstand zeilen voneinander kleiner | ||||
|     \override #'(verse-vspace . 0.8) %abstand der Verse voneinander kleiner | ||||
|     \chordverse #"3." | ||||
|     #"Test (Akk,a:m)orde (ü,a:1.3.7+.9)ber    den (Stro,d:m)phen (test) | ||||
|       \\repStart sind (sup,e)er \\underline {(cool,a:m)} \\repStop | ||||
| @@ -164,6 +178,7 @@ TEXT = \markuplist | ||||
|     #"Stro(phen,a:m) können jetzt auch in (Spal,f)ten! | ||||
|       Voll (krass,e) (eh,a:m)!" | ||||
|  | ||||
|     \override #'(intraverse-vspace . 3) % Abstand der Zeilen eines Verses vergrößern | ||||
|     \chordverse #"10." | ||||
|     #"Stro(phen,a:m) können jetzt auch in (Spal,f)ten! | ||||
|       Voll (krass,e) (eh,a:m)!" | ||||
| @@ -176,6 +191,15 @@ TEXT = \markuplist | ||||
|     #"Stro(phen,a:m) können jetzt auch in (Spal,f)ten! | ||||
|       Voll (krass,e) (eh,a:m)" | ||||
|   } | ||||
|   \group-verses { | ||||
|     %\override #'(baseline-skip . 1) %Damit verändert man den Abstand der Notenzeilen | ||||
|     \score { | ||||
|       \inline-score | ||||
|       \BRIDGE | ||||
|       \layout { \generalLayout } | ||||
|     } | ||||
|   } | ||||
|   \fret-chord #"x;2;4;4;4;o;" #"h:1.3.5.11" | ||||
| } | ||||
|  | ||||
| \include "../../lilypond-common-includes/standalone_output.ly" | ||||
| @@ -4,9 +4,8 @@ | ||||
|  | ||||
| HEADER = \bookpart { | ||||
|   \header { | ||||
|     title = "Round and round" | ||||
|     poet = "Worte und Weise: unbekannt" | ||||
|     composer = " " | ||||
|     title = "Titel" | ||||
|     songId = "a-song-id" | ||||
|     categories = "" | ||||
|     songinfo = "wasauchimmer" | ||||
|   } | ||||
| @@ -16,32 +15,24 @@ global = { | ||||
|   %Takt | ||||
|   \time 4/4 | ||||
|   %Tonart | ||||
|   \key a \minor | ||||
|   \key c \major | ||||
| } | ||||
|  | ||||
| firstVerse = \lyricmode { | ||||
|   \set stanza = "1." | ||||
| Round and round the earth is tur -- ning | ||||
| tur -- ning al -- ways round to mor -- ning | ||||
| and from mor -- ning round to night. | ||||
|   Lyrics | ||||
| } | ||||
|  | ||||
| firstVoice = \relative c' { | ||||
|   \global | ||||
|   a4 a e' e | ||||
|   d c8 (h) a4 a | ||||
|   e' e a a | ||||
|   g f8 (e) e4 e | ||||
|   d h c d | ||||
|   h a8 (g) a2 | ||||
|   c | ||||
|   \bar "|." | ||||
| } | ||||
|  | ||||
| MUSIC = { | ||||
|   << | ||||
|       \chords { | ||||
|         a1:m g2 a1:m a2:m d2 a:m | ||||
|         g2 f e:m a:m | ||||
|         c | ||||
|       } | ||||
|       \new ChoirStaff = "firstStaff" | ||||
|       << | ||||
|   | ||||
| @@ -6,8 +6,8 @@ HEADER = \bookpart { | ||||
|   \header { | ||||
|     title = "Chorsatz" | ||||
|     alttitle = "" | ||||
|     poet = "Worte: " | ||||
|     composer = "Weise: " | ||||
|     composerId = "dude" | ||||
|     songId = "a-song-id" | ||||
|     categories = "" | ||||
|     songinfo = "" | ||||
|   } | ||||
|   | ||||
| @@ -4,20 +4,50 @@ | ||||
| \pointAndClickOff | ||||
|  | ||||
| imagePagePath = "categories" | ||||
| songPath = "lieder" | ||||
| songPath = "../../lieder" | ||||
|  | ||||
| \include "../../lilypond-common-includes/general_include.ly" | ||||
| \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) | ||||
|  | ||||
| %Liedteil -> hier werden alle Lieder inkludiert | ||||
| %Reihenfolge im Liederbuch: Von oben nach unten | ||||
| \includeSong "vorlage" | ||||
| \blankpage | ||||
| \includeSong "vorlage_light" | ||||
| \imagepage #125 "see.eps" | ||||
| \includeSong "vorlage_satz" | ||||
| %Zur Übersichtlichkeit: | ||||
| %A | ||||
| %B | ||||
| %C | ||||
| %D | ||||
| %E | ||||
| %F | ||||
| %G | ||||
| %H | ||||
| %I | ||||
| %J | ||||
| %K | ||||
| %L | ||||
| %M | ||||
| %N | ||||
| %O | ||||
| %P | ||||
| %Q | ||||
| %R | ||||
| %S | ||||
| %T | ||||
| %U | ||||
| %V | ||||
| %W | ||||
| %X | ||||
| %Y | ||||
| %Z | ||||
|  | ||||
|  | ||||
| \book { | ||||
|   % Dateiname | ||||
| @@ -30,7 +60,23 @@ songPath = "lieder" | ||||
|     pdfkeywords = "Liederbuch, Pfadfinder, bündisch" | ||||
|   } | ||||
|  | ||||
|   % Titelseite | ||||
|   %Eine Seite mit dem Cover könnte so aussehen: | ||||
|   \bookpart { | ||||
|     %\markup { \epsfile #X #120 #"images/front.eps" } | ||||
|     %\markup \fill-line { \center-column { \vspace #1 \pad-x #9 \customEps #95 #"Dateiname.dt" \vspace #1 } } | ||||
|     \paper { | ||||
|       print-page-number = ##f | ||||
|       inner-margin = 0 | ||||
|       outer-margin = 0 | ||||
|       binding-offset = 0 | ||||
|       top-margin = 0 | ||||
|       bottom-margin = 0 | ||||
|       last-bottom-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 0)) | ||||
|       page-count = 1 | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   % Seite | ||||
|   \bookpart { | ||||
|     \paper { print-page-number = ##f } | ||||
|     \markup { \vspace #2 \fill-line { \null | ||||
| @@ -44,6 +90,7 @@ songPath = "lieder" | ||||
|     % muss drinbleiben, damit die Kategoriebildchen alle reingeladen und referenziert werden können: | ||||
|     \markuplist { \embed-category-images } | ||||
|   } | ||||
|  | ||||
|   % die Liederausgabe | ||||
|   \songs | ||||
|  | ||||
|   | ||||
 Submodule lilypond-common-includes updated: eba0cc5375...55db0e0e31
									
								
							| @@ -1,6 +1,9 @@ | ||||
| #(ly:set-option 'relative-includes #t) | ||||
|  | ||||
| defaultSongStyle = #'börnel | ||||
| customStyleOverridesFile = "../lilypond-custom-includes/custom_style_overrides.ly" | ||||
|  | ||||
| \include "categories.ly" | ||||
| \include "../lilypond-common-includes/general_include.ly" | ||||
| \include "../lilypond-common-includes/general_include.ly" | ||||
| AUTHOR_DATA = #(call-with-input-file "../../data/authors.json" json->scm) | ||||
| SONG_DATA = #(call-with-input-file "../../data/songs.json" json->scm) | ||||
|   | ||||
							
								
								
									
										4
									
								
								lilypond-custom-includes/custom_style_overrides.ly
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								lilypond-custom-includes/custom_style_overrides.ly
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | ||||
| customChordPrintings = { | ||||
|   <h dis' fis' e''>-\markup { \small "add11" } | ||||
|   <a cis' gis' h'>-\markup { \small "maj9" } | ||||
| } | ||||
							
								
								
									
										11
									
								
								lilypond-custom-includes/toc_config.ly
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								lilypond-custom-includes/toc_config.ly
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | ||||
| tocSubtitleText = \markup \column { | ||||
|     \fontsize #5 \sans \bold \fill-line { \null \fromproperty #'index:text \null } | ||||
|     \vspace #.5 | ||||
|     \justify { | ||||
|         Da die allermeisten Lieder unter verschiedenen Namen bekannt sind, | ||||
|         wollen wir euch ein Inhaltsverzeichnis an die Hand geben, mit dem ihr hoffentlich auf verschiedene Arten fündig werdet. | ||||
|         Die Liedtitel, die auch die Überschriften sind, findet ihr normal gedruckt. | ||||
|         Alle weiteren Alternativtitel oder Liedanfänge sind zur Unterscheidung kursiv gedruckt. | ||||
|     } | ||||
|     \vspace #1 | ||||
| } | ||||
		Reference in New Issue
	
	Block a user