4 Commits

Author SHA1 Message Date
tux
b4690f63bc Alternativchords mit Klammern 2024-09-04 09:39:57 +02:00
tux
958efca6aa set spacing for rests in chordlyrics 2024-09-03 12:13:23 +02:00
tux
81a5676965 more precise Links in PDF toc 2024-07-19 14:32:41 +02:00
tux
5ee1a7b6be show year also for same author on text and melody 2024-07-17 13:34:00 +02:00
4 changed files with 50 additions and 10 deletions

View File

@ -38,6 +38,32 @@ shiftChords = #(define-music-function (parser location xshift chords) (number? l
$chords $chords
#}) #})
altChord = #(define-music-function (parser location mainchord altchord) (ly:music? ly:music?)
(define (chord-namer in-pitches bass inversion context)
#{
\markup {
\translate #'(-0.5 . 0)
\score {
\chords { #mainchord \klamm #altchord }
\layout {
\LAYOUT
\context {
\ChordNames
\override ChordName.extra-spacing-width = #'(0 . 0.3)
}
\context {
\Score
\override SpacingSpanner.spacing-increment = 0
}
}
}
}
#})
#{
\once \set chordNameFunction = #chord-namer
#mainchord
#})
% kleine Mollakkorde und Alteration ausgeschrieben % kleine Mollakkorde und Alteration ausgeschrieben
#(define (note-name->german-markup-nosym pitch lowercase?) #(define (note-name->german-markup-nosym pitch lowercase?)
(define (pitch-alteration-semitones pitch) (inexact->exact (round (* (ly:pitch-alteration pitch) 2)))) (define (pitch-alteration-semitones pitch) (inexact->exact (round (* (ly:pitch-alteration pitch) 2))))

View File

@ -104,7 +104,10 @@
) )
(if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (null? bridgeIds) (null? interludeIds)) (if (and (equal? poetIds composerIds) (null? translatorIds) (null? versePoetData) (null? verseComposerData) (null? voiceComposerData) (null? compositionIds) (null? bridgeIds) (null? interludeIds))
(list (list
(render-contribution-group (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) poetIds) (join-present (list
(render-contribution-group (ly:output-def-lookup layout 'poetAndComposerEqualPrefix) poetIds)
(if (equal? year_text year_melody) year_text (join-present (list year_text year_melody) "/"))
) ", ")
#f) #f)
(list (list
(if (and (null? poetIds) (null? versePoetData) (null? translatorIds)) #f (if (and (null? poetIds) (null? versePoetData) (null? translatorIds)) #f

View File

@ -167,11 +167,11 @@
(reverse (map (lambda (m) (reverse (map (lambda (m)
(make-size-box-to-box-markup #f #t m target-size-markup)) (make-size-box-to-box-markup #f #t m target-size-markup))
(cons (cons
(make-fill-with-pattern-markup 1 RIGHT "." (car revlist) page) (make-with-link-symbol-ref-markup 'index:label (make-fill-with-pattern-markup 1 RIGHT "." (car revlist) page))
(cdr revlist))))))))) (cdr revlist)))))))))
\paper { \paper {
indexItemMarkup = \markup \with-link-symbol-ref #'index:label { indexItemMarkup = \markup {
\index-item-with-pattern \index-item-with-pattern
} }
indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \left-column { indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \left-column {

View File

@ -253,21 +253,17 @@
#{ #{
\markup { \markup {
\override #`(baseline-skip . ,intraverse-vspace) \override #`(baseline-skip . ,intraverse-vspace)
\pad-left #-7
\score-equal-height #verse-line-height \score-lines { \score-equal-height #verse-line-height \score-lines {
\transposable #transposition \transposable #transposition
<< <<
\new Devnull { #verse-break-voice } \new Devnull { #verse-break-voice }
\new NullVoice = "dummyvoice" { #verse-reference-voice }
#(music-clone verse-chords) #(music-clone verse-chords)
\new NullVoice { #verse-reference-voice } \new Lyrics \lyricsto "dummyvoice" { #lyrics }
\addlyrics { #lyrics }
>> >>
\layout { \layout {
\verselayout \verselayout
\context { ragged-right = ##t
\Staff
\override LeftEdge.space-alist.first-note = #'(fixed-space . 7.0)
}
\context { \context {
\Lyrics \Lyrics
\override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = #verse-text-chord-distance \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = #verse-text-chord-distance
@ -277,9 +273,15 @@
\override LyricSpace.minimum-distance = 0.8 \override LyricSpace.minimum-distance = 0.8
\override LyricText.stencil = #custom-lyric-text::print \override LyricText.stencil = #custom-lyric-text::print
} }
\context {
\ChordNames
\override VerticalAxisGroup.staff-affinity = ##f
\override ChordName.extra-spacing-width = #'(-0.1 . 0.1)
}
\context { \context {
\Score \Score
\override PaperColumn.keep-inside-line = ##f \override PaperColumn.keep-inside-line = ##f
% \override SpacingSpanner.strict-note-spacing = ##t
\override SpacingSpanner.uniform-stretching = ##t \override SpacingSpanner.uniform-stretching = ##t
\override SpacingSpanner.spacing-increment = 0 \override SpacingSpanner.spacing-increment = 0
\remove Bar_number_engraver \remove Bar_number_engraver
@ -292,6 +294,8 @@
\remove Staff_symbol_engraver \remove Staff_symbol_engraver
\remove Clef_engraver \remove Clef_engraver
\remove Time_signature_engraver \remove Time_signature_engraver
\remove Bar_engraver
\remove Separating_line_group_engraver
\omit KeySignature \omit KeySignature
\omit KeyCancellation \omit KeyCancellation
} }
@ -306,6 +310,13 @@
\remove Dynamic_engraver \remove Dynamic_engraver
\remove Note_heads_engraver \remove Note_heads_engraver
} }
\context {
\NullVoice
\consists Rest_engraver
\omit Rest
% \undo \omit NoteHead
% \hide NoteHead
}
} }
} }
} }