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

Compare commits

base: boernel:0f41cde5f66157c772489c02c4725e345ecbbc9c
Branches Tags
boernel:main boernel:chord-spacing-reloaded boernel:nicer_toc_breaks boernel:chord-spacing-experimental boernel:secondVoiceStyle_for_rests boernel:yaml_parser boernel:include_refactoring boernel:chordExceptions boernel:set-spacing-for-rests-in-chordlyrics boernel:tocSubtitleText-Variable
..
compare: boernel:chord-spacing-reloaded
Branches Tags
boernel:chord-spacing-reloaded boernel:nicer_toc_breaks boernel:main boernel:chord-spacing-experimental boernel:secondVoiceStyle_for_rests boernel:yaml_parser boernel:include_refactoring boernel:chordExceptions boernel:set-spacing-for-rests-in-chordlyrics boernel:tocSubtitleText-Variable

2 Commits
0f41cde5f6 ... chord-spac

Author SHA1 Message Date
tux
23bc0db0da new engraver for spacing in chordlyrics 2025-11-24 20:45:12 +01:00
Christoph Wagner
3ff5a36106 better load song include data in windows 2025-11-24 16:47:13 +01:00
2 changed files with 11 additions and 5 deletions
Expand all files Collapse all files

13
private_includes/base/all.ily
View File

@@ -21,8 +21,17 @@
))))) )))))
(scm-load "resolve_inherits.scm") (scm-load "resolve_inherits.scm")
(scm-load "yaml_parser.scm"))) (scm-load "yaml_parser.scm")))
#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file "../../lilypond-song-includes/data/authors.yml")))
#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file "../../lilypond-song-includes/data/songs.yml"))) #(define (song-includes-data-path filename)
(string-join
(list
(dirname (dirname (dirname (dirname (current-filename)))))
"lilypond-song-includes"
"data"
filename)
file-name-separator-string))
#(define AUTHOR_DATA (if (defined? 'AUTHOR_DATA) AUTHOR_DATA (parse-yml-file (song-includes-data-path "authors.yml"))))
#(define SONG_DATA (if (defined? 'SONG_DATA) SONG_DATA (parse-yml-file (song-includes-data-path "songs.yml"))))
\include "merge_rests_engraver_override.ily" \include "merge_rests_engraver_override.ily"
\include "basic_format_and_style_settings.ily" \include "basic_format_and_style_settings.ily"

3
private_includes/base/verses_with_chords.ily
View File

@@ -256,7 +256,6 @@
Chord_lyrics_spacing_engraver = Chord_lyrics_spacing_engraver =
#(lambda (ctx) #(lambda (ctx)
(let ((last-lyric-syllable #f) (let ((last-lyric-syllable #f)
(last-lyric-syllable-width 0)
(lyric-width-since-last-chord 0) (lyric-width-since-last-chord 0)
(music-columns-for-last-syllable 0) (music-columns-for-last-syllable 0)
(last-printed-chord #f) (last-printed-chord #f)
@@ -284,7 +283,6 @@ Chord_lyrics_spacing_engraver =
) )
((break-event engraver event) ((break-event engraver event)
(set! last-lyric-syllable #f) (set! last-lyric-syllable #f)
(set! last-lyric-syllable-width 0)
(set! lyric-width-since-last-chord 0) (set! lyric-width-since-last-chord 0)
(set! music-columns-for-last-syllable 0) (set! music-columns-for-last-syllable 0)
(set! last-printed-chord #f) (set! last-printed-chord #f)
@@ -298,7 +296,6 @@ Chord_lyrics_spacing_engraver =
((lyric-syllable-interface this-engraver grob source-engraver) ((lyric-syllable-interface this-engraver grob source-engraver)
(let ((syllable-width (interval-length (ly:grob-extent grob grob X)))) (let ((syllable-width (interval-length (ly:grob-extent grob grob X))))
(set! lyric-width-since-last-chord (+ lyric-width-since-last-chord syllable-width)) (set! lyric-width-since-last-chord (+ lyric-width-since-last-chord syllable-width))
(set! last-lyric-syllable-width syllable-width)
) )
(if (> chord-width-since-last-lyric 0) (if (> chord-width-since-last-lyric 0)
(if lyrics-seen-since-break (if lyrics-seen-since-break