Compare commits
	
		
			5 Commits
		
	
	
		
			e2dc938c02
			...
			05ea776add
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 05ea776add | |||
| 7ddd597bed | |||
| 
						 | 
					5c6fde06cc | ||
| 
						 | 
					973d72301c | ||
| fbf273dae9 | 
@@ -16,6 +16,12 @@ bchord =
 | 
			
		||||
	\revert ChordName.font-series
 | 
			
		||||
#})
 | 
			
		||||
 | 
			
		||||
shiftChord = #(define-music-function (parser location xshift chord) (number? ly:music?)
 | 
			
		||||
#{
 | 
			
		||||
	\once \override ChordName.extra-offset = #`(,xshift . 0)
 | 
			
		||||
	$chord
 | 
			
		||||
#})
 | 
			
		||||
 | 
			
		||||
% kleine Mollakkorde und Alteration ausgeschrieben
 | 
			
		||||
#(define (note-name->german-markup-nosym pitch lowercase?)
 | 
			
		||||
   (define (pitch-alteration-semitones pitch) (inexact->exact (round (* (ly:pitch-alteration pitch) 2))))
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ songChordFontSeries = #'bold
 | 
			
		||||
songTextChordAlignment = #'left
 | 
			
		||||
songScoreChordFontSize = 2
 | 
			
		||||
songTextChordFontSize = 2
 | 
			
		||||
songTextLineHeigth = 5
 | 
			
		||||
songTextLineHeigth = 5.3
 | 
			
		||||
songInfoPoetAndComposerStacked = ##t
 | 
			
		||||
songTocColumns = 2
 | 
			
		||||
globalSize = 14
 | 
			
		||||
 
 | 
			
		||||
@@ -44,14 +44,7 @@
 | 
			
		||||
     (ly:make-stencil
 | 
			
		||||
      (list 'embedded-ps
 | 
			
		||||
             (ly:format
 | 
			
		||||
              "[/Action /GoTo /View [/Fit] /Title <~a> /OUT pdfmark"
 | 
			
		||||
               (fold
 | 
			
		||||
                (lambda (ch hexout)
 | 
			
		||||
                  (string-append hexout
 | 
			
		||||
                   (format #f "~2,'0x" (char->integer ch))))
 | 
			
		||||
                 ""
 | 
			
		||||
                 (string->list
 | 
			
		||||
                   (pdf-encode title)))))
 | 
			
		||||
              "[/Action /GoTo /View [/Fit] /Title (~a) /OUT pdfmark" (pdf-encode title)))
 | 
			
		||||
      empty-interval empty-interval
 | 
			
		||||
      ;'(0 . 0) '(0 . 0)
 | 
			
		||||
      ))
 | 
			
		||||
 
 | 
			
		||||
@@ -19,13 +19,20 @@
 | 
			
		||||
        (map (lambda (foo)
 | 
			
		||||
         (make-general-align-markup Y UP (make-override-markup '(baseline-skip . 1) (make-column-markup
 | 
			
		||||
          (let add-to-col ((lines restlines) (height-left height))
 | 
			
		||||
            (let* ((finished (null? lines))
 | 
			
		||||
                   (linestencil (if (not finished) (interpret-markup layout (cons (list (cons 'line-width line-width) (cons 'baseline-skip 1)) props) (markup #:center-align (car lines)))))
 | 
			
		||||
                   (calc-height (- height-left (if finished 0 (interval-length (ly:stencil-extent linestencil Y))))))
 | 
			
		||||
              (set! restlines lines)
 | 
			
		||||
              (if (or (< calc-height 0) (null? lines))
 | 
			
		||||
                (list)
 | 
			
		||||
                (cons (markup #:stencil linestencil) (add-to-col (cdr lines) calc-height)))))))))
 | 
			
		||||
            (set! restlines lines)
 | 
			
		||||
            (if (null? lines)
 | 
			
		||||
              '()
 | 
			
		||||
              (let* ((line-to-stencil (lambda (line) (interpret-markup layout (cons (list (cons 'line-width line-width) (cons 'baseline-skip 1)) props) (markup line))))
 | 
			
		||||
                     (stencil-height (lambda (stencil) (interval-length (ly:stencil-extent stencil Y))))
 | 
			
		||||
                     (linestencil (line-to-stencil (car lines)))
 | 
			
		||||
                     (current-line-height (stencil-height linestencil))
 | 
			
		||||
                     (new-height-left (- height-left current-line-height))
 | 
			
		||||
                     (next-line-height (if (null? (cdr lines)) current-line-height (stencil-height (line-to-stencil (cadr lines)))))
 | 
			
		||||
                     (no-space-for-next-line (and (< next-line-height current-line-height) (< new-height-left next-line-height)))
 | 
			
		||||
                     )
 | 
			
		||||
                (if (or (< new-height-left 0) no-space-for-next-line)
 | 
			
		||||
                  '()
 | 
			
		||||
                  (cons (markup #:stencil linestencil) (add-to-col (cdr lines) new-height-left))))))))))
 | 
			
		||||
          (make-list cols))))
 | 
			
		||||
     (if (null? restlines)
 | 
			
		||||
         (list)
 | 
			
		||||
@@ -182,8 +189,8 @@
 | 
			
		||||
  indexItemMarkup = \markup \with-link-symbol-ref #'index:label {
 | 
			
		||||
    \index-item-with-pattern
 | 
			
		||||
  }
 | 
			
		||||
  indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \column {
 | 
			
		||||
    \fill-line { \sans \bold \fontsize #3 \fromproperty #'index:text \null }
 | 
			
		||||
  indexSectionMarkup = \markup \override #'(baseline-skip . 1.5) \left-column {
 | 
			
		||||
    \sans \bold \fontsize #3 \fromproperty #'index:text
 | 
			
		||||
    \null
 | 
			
		||||
  }
 | 
			
		||||
  indexCategoryMarkup = \markup \override #'(baseline-skip . 1.5) \column {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user