refactor and fix tagging bug
This commit is contained in:
		@@ -221,20 +221,21 @@
 | 
				
			|||||||
                       (cons (car x) (+ (cdr x) amount))
 | 
					                       (cons (car x) (+ (cdr x) amount))
 | 
				
			||||||
                       y)))
 | 
					                       y)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#(define-markup-command (score-equal-height-with-indents layout props reference-height lines)
 | 
					#(define-markup-command (score-equal-height-with-indents layout props lines)
 | 
				
			||||||
  (number? markup-list?)
 | 
					  (markup-list?)
 | 
				
			||||||
  #:category music
 | 
					  #:category music
 | 
				
			||||||
  #:properties ((baseline-skip)
 | 
					  #:properties ((intraverse-vspace 0)
 | 
				
			||||||
 | 
					                (verse-line-height songTextLineHeigth)
 | 
				
			||||||
                (line-indents '()))
 | 
					                (line-indents '()))
 | 
				
			||||||
    (let ((indents-max-index (- (length line-indents) 1)))
 | 
					    (let ((indents-max-index (- (length line-indents) 1)))
 | 
				
			||||||
      (stack-stencils Y DOWN baseline-skip
 | 
					      (stack-stencils Y DOWN intraverse-vspace
 | 
				
			||||||
        (index-map
 | 
					        (index-map
 | 
				
			||||||
          (lambda (index line)
 | 
					          (lambda (index line)
 | 
				
			||||||
            (let ((stil
 | 
					            (let ((stil
 | 
				
			||||||
                    (ly:make-stencil
 | 
					                    (ly:make-stencil
 | 
				
			||||||
                      (ly:stencil-expr line)
 | 
					                      (ly:stencil-expr line)
 | 
				
			||||||
                      (ly:stencil-extent line X)
 | 
					                      (ly:stencil-extent line X)
 | 
				
			||||||
                      `(,(/ reference-height -2.0) . ,(/ reference-height 2.0)))))
 | 
					                      `(,(/ verse-line-height -2.0) . ,(/ verse-line-height 2.0)))))
 | 
				
			||||||
              (if (<= index indents-max-index)
 | 
					              (if (<= index indents-max-index)
 | 
				
			||||||
                (ly:stencil-translate-axis
 | 
					                (ly:stencil-translate-axis
 | 
				
			||||||
                  stil
 | 
					                  stil
 | 
				
			||||||
@@ -256,20 +257,17 @@
 | 
				
			|||||||
   #:properties ((verse-chords #{#})
 | 
					   #:properties ((verse-chords #{#})
 | 
				
			||||||
                 (verse-reference-voice #{#})
 | 
					                 (verse-reference-voice #{#})
 | 
				
			||||||
                 (verse-break-voice #{#})
 | 
					                 (verse-break-voice #{#})
 | 
				
			||||||
                 (verse-line-height songTextLineHeigth)
 | 
					 | 
				
			||||||
                 (verse-text-chord-distance songTextChordDistance)
 | 
					                 (verse-text-chord-distance songTextChordDistance)
 | 
				
			||||||
                 (intraverse-vspace 0)
 | 
					 | 
				
			||||||
                 (transposition (cons #f #f))
 | 
					                 (transposition (cons #f #f))
 | 
				
			||||||
                 (verselayout generalLayout))
 | 
					                 (verselayout generalLayout))
 | 
				
			||||||
  "Vers mit Akkorden"
 | 
					  "Vers mit Akkorden"
 | 
				
			||||||
  (interpret-markup layout props
 | 
					  (interpret-markup layout props
 | 
				
			||||||
    #{
 | 
					    #{
 | 
				
			||||||
      \markup {
 | 
					      \markup {
 | 
				
			||||||
        \override #`(baseline-skip . ,intraverse-vspace)
 | 
					        \score-equal-height-with-indents \score-lines {
 | 
				
			||||||
        \score-equal-height-with-indents #verse-line-height \score-lines {
 | 
					 | 
				
			||||||
          <<
 | 
					          <<
 | 
				
			||||||
            \new Devnull { #verse-break-voice }
 | 
					            \new Devnull { #(music-clone verse-break-voice) }
 | 
				
			||||||
            \new NullVoice = "dummyvoice" { #verse-reference-voice }
 | 
					            \new NullVoice = "dummyvoice" { #(music-clone verse-reference-voice) }
 | 
				
			||||||
            \transposable #transposition #(music-clone verse-chords)
 | 
					            \transposable #transposition #(music-clone verse-chords)
 | 
				
			||||||
            \new Lyrics \lyricsto "dummyvoice" { #lyrics }
 | 
					            \new Lyrics \lyricsto "dummyvoice" { #lyrics }
 | 
				
			||||||
          >>
 | 
					          >>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user