boernel/lilypond-common-includes
14
0
Fork 0
Code Issues 22 Pull Requests 1 Packages Projects Releases Wiki Activity

make verselayout really work

Browse Source
This commit is contained in:
Christoph Wagner
2025-12-15 00:50:07 +01:00
parent c97c856b05
commit e530bdf090
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
private_includes/base/verses_with_chords.ily
View File

@@ -60,19 +60,19 @@
% Text über Text mittig darstellen
#(define-markup-command (textup layout props text uptext) (markup? markup?)
#:properties ((verselayout generalLayout))
"Markup über Text mittig darstellen."
(let ((verselayout (chain-assoc-get 'verselayout props generalLayout)))
(interpret-markup layout props
#{\markup {
\size-box-to-box-style-dependent ##t ##f
\general-align #X #LEFT \override #`(direction . ,UP) \override #'(baseline-skip . 1.0) \dir-column \chord-alignment-style-dependent {
\pad-to-box #'(0 . 0) #'(0 . 2.0) { #text }
\size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { \verselayout } }
\size-box-to-box ##f ##t #uptext \score { \chords { g4:m a } \layout { $verselayout } }
}
#text
}
#}
)))
))
#(define-markup-command (anchor-x-between layout props arga argb)
(markup? markup?)
@@ -82,16 +82,15 @@
(ly:stencil-aligned-to m X (- (/ (* la 2) l) 1))
))
#(define-markup-command (stanza-raw layout props arg)
(string-or-music?)
(let ((verselayout (chain-assoc-get 'verselayout props generalLayout)))
#(define-markup-command (stanza-raw layout props arg) (string-or-music?)
#:properties ((verselayout generalLayout))
(interpret-markup layout props
(if (and (string? arg) (string-null? arg))
" "
#{\markup
\score { \new Lyrics { \lyricmode { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { \verselayout } }
\score { \new Lyrics { \lyricmode { #(if (ly:music? arg) arg #{ \set stanza = #arg #}) "" } } \layout { $verselayout } }
#}
))))
)))
#(define-markup-command (stanza layout props arg)
(string-or-music?)
@@ -141,7 +140,7 @@
(make-wrap-newline-markup
(ly:regex-replace (ly:make-regex "\\(( *)([^,()]*)( *),([^)]*)\\)")
(ly:regex-replace (ly:make-regex "(([^ \n]*\\([^()]*,[^()]+\\)[^ \n(]*)+)") (handle-custom-newlines custom-verse-breaks verse) " \\concat { " 1 " } ")
"\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { " transp " \\chords { s4 " 4 " } \\layout { \\verselayout } }")
"\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { " transp " \\chords { s4 " 4 " } \\layout { $verselayout } }")
)
))))
@@ -272,10 +271,7 @@
\new Lyrics \lyricsto "dummyvoice" { #lyrics }
>>
\layout {
\verselayout
#(let
((custom-size (ly:output-def-lookup verselayout 'size #f)))
(if custom-size (layout-set-staff-size custom-size)))
$verselayout
ragged-right = ##t
\context {
\Lyrics

14
public_includes/layout_bottom.ily
View File

@@ -1,5 +1,12 @@
MUSIC = { \transposable #TRANSPOSITION \MUSIC }
LAYOUT = \layout {
\LAYOUT
#(let
((custom-size (ly:output-def-lookup LAYOUT 'size #f)))
(if custom-size (layout-set-staff-size custom-size)))
}
verselayout = \layout {
\LAYOUT
\context {
@@ -8,13 +15,6 @@ verselayout = \layout {
}
}
LAYOUT = \layout {
\LAYOUT
#(let
((custom-size (ly:output-def-lookup LAYOUT 'size #f)))
(if custom-size (layout-set-staff-size custom-size)))
}
TEXT = \markuplist {
\override #`(transposition . ,TRANSPOSITION)
\override #`(verselayout . ,verselayout)