Compare commits

..

No commits in common. "main" and "chordExceptions" have entirely different histories.

3 changed files with 17 additions and 42 deletions

View File

@ -68,18 +68,6 @@ altChord =
#mainchord #mainchord
#})) #}))
% Akkorde werden so transponiert, dass sie passen, wenn man mit Kapo im angegebenen Bund spielt
capoTranspose =
#(define-music-function (fret chords) (number? ly:music?)
(define semi->pitch
(make-semitone->pitch
(music-pitches
#{ h b a gis g fis f e es d cis c #})))
(transpose
(ly:pitch-transpose (semi->pitch fret) (ly:make-pitch 0 0))
(ly:make-pitch 0 0)
chords))
% 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

@ -221,28 +221,14 @@
(cons (car x) (+ (cdr x) amount)) (cons (car x) (+ (cdr x) amount))
y))) y)))
#(define-markup-command (score-equal-height-with-indents layout props lines) #(define-markup-command (score-equal-height layout props reference-height lines)
(markup-list?) (number? markup-list?)
#:category music #:category music
#:properties ((intraverse-vspace 0) #:properties ((baseline-skip))
(verse-line-height songTextLineHeigth) (stack-stencils Y DOWN baseline-skip
(line-indents '())) (map
(let ((indents-max-index (- (length line-indents) 1))) (lambda (line) (ly:make-stencil (ly:stencil-expr line) (ly:stencil-extent line X) `(,(/ reference-height -2.0) . ,(/ reference-height 2.0))))
(stack-stencils Y DOWN intraverse-vspace (interpret-markup-list layout props lines))))
(index-map
(lambda (index line)
(let ((stil
(ly:make-stencil
(ly:stencil-expr line)
(ly:stencil-extent line X)
`(,(/ verse-line-height -2.0) . ,(/ verse-line-height 2.0)))))
(if (<= index indents-max-index)
(ly:stencil-translate-axis
stil
(list-ref line-indents index)
X)
stil)))
(interpret-markup-list layout props lines)))))
#(define-public (custom-lyric-text::print grob) #(define-public (custom-lyric-text::print grob)
"Allow interpretation of tildes as lyric tieing marks." "Allow interpretation of tildes as lyric tieing marks."
@ -257,17 +243,20 @@
#:properties ((verse-chords #{#}) #:properties ((verse-chords #{#})
(verse-reference-voice #{#}) (verse-reference-voice #{#})
(verse-break-voice #{#}) (verse-break-voice #{#})
(verse-line-height songTextLineHeigth)
(verse-text-chord-distance songTextChordDistance) (verse-text-chord-distance songTextChordDistance)
(intraverse-vspace 0)
(transposition (cons #f #f)) (transposition (cons #f #f))
(verselayout generalLayout)) (verselayout generalLayout))
"Vers mit Akkorden" "Vers mit Akkorden"
(interpret-markup layout props (interpret-markup layout props
#{ #{
\markup { \markup {
\score-equal-height-with-indents \score-lines { \override #`(baseline-skip . ,intraverse-vspace)
\score-equal-height #verse-line-height \score-lines {
<< <<
\new Devnull { #(music-clone verse-break-voice) } \new Devnull { #verse-break-voice }
\new NullVoice = "dummyvoice" { #(music-clone verse-reference-voice) } \new NullVoice = "dummyvoice" { #verse-reference-voice }
\transposable #transposition #(music-clone verse-chords) \transposable #transposition #(music-clone verse-chords)
\new Lyrics \lyricsto "dummyvoice" { #lyrics } \new Lyrics \lyricsto "dummyvoice" { #lyrics }
>> >>
@ -303,7 +292,6 @@
\remove Jump_engraver \remove Jump_engraver
\remove Volta_engraver \remove Volta_engraver
\remove Parenthesis_engraver \remove Parenthesis_engraver
\remove Metronome_mark_engraver
} }
\context { \context {
\Staff \Staff
@ -330,9 +318,8 @@
\NullVoice \NullVoice
\consists Rest_engraver \consists Rest_engraver
\omit Rest \omit Rest
\undo \omit NoteHead % \undo \omit NoteHead
\hide NoteHead % \hide NoteHead
\override NoteHead.X-extent = #'(0 . 0)
} }
} }
} }