use new lilypond 2.25 regexes and font definitions
This commit is contained in:
@ -1,18 +1,13 @@
|
||||
% guile regular expressions aktivieren:
|
||||
#(use-modules (ice-9 regex))
|
||||
|
||||
% parsing line by line
|
||||
#(define-markup-command (wrap-newline layout props text) (string?)
|
||||
"Text Zeile für Zeile parsen"
|
||||
(interpret-markup layout props
|
||||
#{ \markup { \column {
|
||||
$(let ((verse-markup-string (string-append "\\line { "
|
||||
(regexp-substitute/global #f "\n"
|
||||
text
|
||||
'pre " } \\line { " 'post )
|
||||
$(let ((verse-markup-string (
|
||||
string-append "\\line { "
|
||||
(ly:regex-replace (ly:make-regex "\n") text " } \\line { ")
|
||||
" \\size-box-to-box ##f ##t \"\" \"Agj\" }" )))
|
||||
;(ly:parse-string-expression (if (< (list-ref (ly:version) 1) 19) (ly:parser-clone parser) (ly:parser-clone)) verse-markup-string))
|
||||
(if (< (list-ref (ly:version) 1) 19) (ly:parser-include-string parser verse-markup-string) (ly:parser-include-string verse-markup-string)))
|
||||
(ly:parser-include-string verse-markup-string))
|
||||
}}#}
|
||||
)
|
||||
)
|
||||
@ -116,10 +111,10 @@
|
||||
(interpret-markup layout props
|
||||
(markup #:override `(baseline-skip . ,songTextLineHeigth) #:anchor-x-between #:stanza stanza
|
||||
(make-wrap-newline-markup
|
||||
(regexp-substitute/global #f "\\(( *)([^,()]*)( *),([^)]*)\\)"
|
||||
(regexp-substitute/global #f "(([^ \n]*\\([^()]*\\)[^ \n]*)+)" verse
|
||||
'pre " \\concat { " 1 " } " 'post)
|
||||
'pre "\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { \\transposable " transp " \\chords { s4 " 4 " } \\layout { \\verseChordLayout } }" 'post))
|
||||
(ly:regex-replace (ly:make-regex "\\(( *)([^,()]*)( *),([^)]*)\\)")
|
||||
(ly:regex-replace (ly:make-regex "(([^ \n]*\\([^()]*,[^()]+\\)[^ \n(]*)+)") verse " \\concat { " 1 " } ")
|
||||
"\\textup \\line { \"" 1 "\" " 2 " \"" 3 "\" } \\score { \\transposable " transp " \\chords { s4 " 4 " } \\layout { \\verseChordLayout } }")
|
||||
)
|
||||
))))
|
||||
|
||||
% Kompletter Vers aus dem Akkorde entfernt werden
|
||||
@ -127,7 +122,7 @@
|
||||
"Vers ohne Akkorde"
|
||||
(interpret-markup layout props
|
||||
(markup #:override '(baseline-skip . 3.0) #:anchor-x-between #:stanza stanza
|
||||
#:wrap-newline (regexp-substitute/global #f "\\(([^,]*),([^)]*)\\)" verse 'pre 1 'post )
|
||||
#:wrap-newline (ly:regex-replace (ly:make-regex "\\(([^,]*),([^)]*)\\)") verse 1)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
Reference in New Issue
Block a user