Compare commits
1 Commits
85c05cec5d
...
603b25831a
| Author | SHA1 | Date | |
|---|---|---|---|
| 603b25831a |
@@ -40,7 +40,6 @@
|
||||
\include "chord_settings.ily"
|
||||
\include "chordpro.ily"
|
||||
\include "transposition.ily"
|
||||
\include "markup_tag_groups_hack.ily"
|
||||
\include "verses_with_chords.ily"
|
||||
\include "arrows_in_scores.ily"
|
||||
\include "swing_style.ily"
|
||||
|
||||
@@ -486,7 +486,50 @@
|
||||
(cons (list (car pending-syllable) (cadr pending-syllable) #f (caddr pending-syllable))
|
||||
chordpro-syllables-collected))
|
||||
(set! pending-syllable #f))
|
||||
)))))
|
||||
|
||||
;; Write debug output (overwrite each time, final version will be complete)
|
||||
(with-output-to-file "/tmp/chordpro_debug.txt"
|
||||
(lambda ()
|
||||
(display (format #f "ChordPro: Collected ~a syllables, ~a chords (unfiltered), ~a breaks, ~a verses\n"
|
||||
(length chordpro-syllables-collected)
|
||||
(length chordpro-chords-collected)
|
||||
(length chordpro-breaks-collected)
|
||||
chordpro-current-verse-index))
|
||||
(display "All syllables:\n")
|
||||
(for-each
|
||||
(lambda (syl)
|
||||
(display (format #f " V~a: '~a' hyphen=~a at ~a\n"
|
||||
(cadddr syl) (cadr syl) (if (caddr syl) "YES" "NO") (car syl))))
|
||||
(reverse chordpro-syllables-collected))
|
||||
(newline)
|
||||
(display "Breaks:\n")
|
||||
(for-each
|
||||
(lambda (brk)
|
||||
(display (format #f " V~a at ~a\n" (cdr brk) (car brk))))
|
||||
(reverse chordpro-breaks-collected))
|
||||
(newline)
|
||||
(display "All chords (after visibility filtering):\n")
|
||||
(for-each
|
||||
(lambda (chord)
|
||||
(display (format #f " V~a: ~a at ~a\n"
|
||||
(caddr chord) (cadr chord) (car chord))))
|
||||
(reverse chordpro-chords-collected))
|
||||
(newline)
|
||||
(display "Stanza numbers:\n")
|
||||
(for-each
|
||||
(lambda (stanza-entry)
|
||||
(display (format #f " V~a: '~a' (type: ~a, real: ~a)\n"
|
||||
(car stanza-entry) (cadr stanza-entry) (caddr stanza-entry) (cadddr stanza-entry))))
|
||||
(reverse chordpro-stanza-numbers))
|
||||
(newline)
|
||||
(display "Inline texts (repStart/repStop etc.):\n")
|
||||
(for-each
|
||||
(lambda (inline-entry)
|
||||
(display (format #f " V~a: '~a' at ~a (dir: ~a)\n"
|
||||
(cadr inline-entry) (caddr inline-entry) (car inline-entry) (cadddr inline-entry))))
|
||||
(reverse chordpro-inline-texts-collected)))))
|
||||
|
||||
))))
|
||||
|
||||
%% Helper functions to format and write ChordPro
|
||||
#(define (chordpro-write-from-engraver-data num-verses)
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
% We have to record the tag groups for markup, so we use the right tag groups during markup interpretiton.
|
||||
recordedTagGroups = #'()
|
||||
|
||||
tagGroup =
|
||||
#(define-void-function (tags) (symbol-list?)
|
||||
(let ((err (define-tag-group tags)))
|
||||
(if err (ly:parser-error err (*location*))
|
||||
(set! recordedTagGroups (cons tags recordedTagGroups)))))
|
||||
|
||||
#(define-markup-command (handle-tag-groups layout props recorded-groups m) (list? markup?)
|
||||
(resetTagGroups)
|
||||
(every (lambda (group) (define-tag-group group)) recorded-groups)
|
||||
(interpret-markup layout props m))
|
||||
@@ -18,7 +18,6 @@ TEXT = \markuplist {
|
||||
\override #`(verselayout . ,verselayout)
|
||||
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
|
||||
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
|
||||
\handle-tag-groups \recordedTagGroups
|
||||
\TEXT
|
||||
}
|
||||
|
||||
@@ -30,7 +29,6 @@ TEXT = \markuplist {
|
||||
\override #`(verselayout . ,verselayout)
|
||||
\override #`(verse-chords . ,#{ \chords { \verseChords } #})
|
||||
\override #`(verse-reference-voice . ,#{ \global \firstVoice #})
|
||||
\handle-tag-groups \recordedTagGroups
|
||||
#text
|
||||
}
|
||||
#})
|
||||
|
||||
Reference in New Issue
Block a user