intraverse-vspace eingebaut, um Zeilenabstand zu beeinflussen
This commit is contained in:
parent
301681fffb
commit
e2dc938c02
@ -103,13 +103,14 @@
|
|||||||
|
|
||||||
% Kompletten Vers mit Akkorden
|
% Kompletten Vers mit Akkorden
|
||||||
#(define-markup-command (chordverse layout props stanza verse) (markup? string?)
|
#(define-markup-command (chordverse layout props stanza verse) (markup? string?)
|
||||||
|
#:properties ((intraverse-vspace 0))
|
||||||
"Vers mit Akkorden"
|
"Vers mit Akkorden"
|
||||||
(let* ((fromto (chain-assoc-get 'transposition props #f))
|
(let* ((fromto (chain-assoc-get 'transposition props #f))
|
||||||
(transp (if fromto
|
(transp (if fromto
|
||||||
(string-append "\\transpose " (car fromto) " " (cdr fromto))
|
(string-append "\\transpose " (car fromto) " " (cdr fromto))
|
||||||
"")))
|
"")))
|
||||||
(interpret-markup layout props
|
(interpret-markup layout props
|
||||||
(markup #:override `(baseline-skip . ,songTextLineHeigth) #:anchor-x-between #:stanza stanza
|
(markup #:override `(baseline-skip . ,(+ intraverse-vspace songTextLineHeigth)) #:anchor-x-between #:stanza stanza
|
||||||
(make-wrap-newline-markup
|
(make-wrap-newline-markup
|
||||||
(ly:regex-replace (ly:make-regex "\\(( *)([^,()]*)( *),([^)]*)\\)")
|
(ly:regex-replace (ly:make-regex "\\(( *)([^,()]*)( *),([^)]*)\\)")
|
||||||
(ly:regex-replace (ly:make-regex "(([^ \n]*\\([^()]*,[^()]+\\)[^ \n(]*)+)") verse " \\concat { " 1 " } ")
|
(ly:regex-replace (ly:make-regex "(([^ \n]*\\([^()]*,[^()]+\\)[^ \n(]*)+)") verse " \\concat { " 1 " } ")
|
||||||
@ -119,9 +120,10 @@
|
|||||||
|
|
||||||
% Kompletter Vers aus dem Akkorde entfernt werden
|
% Kompletter Vers aus dem Akkorde entfernt werden
|
||||||
#(define-markup-command (nochordverse layout props stanza verse) (markup? string?)
|
#(define-markup-command (nochordverse layout props stanza verse) (markup? string?)
|
||||||
|
#:properties ((intraverse-vspace 0))
|
||||||
"Vers ohne Akkorde"
|
"Vers ohne Akkorde"
|
||||||
(interpret-markup layout props
|
(interpret-markup layout props
|
||||||
(markup #:override '(baseline-skip . 3.0) #:anchor-x-between #:stanza stanza
|
(markup #:override `(baseline-skip . ,(+ intraverse-vspace 3.0)) #:anchor-x-between #:stanza stanza
|
||||||
#:wrap-newline (ly:regex-replace (ly:make-regex "\\(([^,]*),([^)]*)\\)") verse 1)
|
#:wrap-newline (ly:regex-replace (ly:make-regex "\\(([^,]*),([^)]*)\\)") verse 1)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user