diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2005-06-21 23:58:19 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2005-06-21 23:58:19 +0000 |
| commit | 48e056b5b40cca48470866ffa7a13ff1d4fa4963 (patch) | |
| tree | 2498f452a0525baebdd8930175d4b74ef0ec108d /scm | |
| parent | 1e631c87d1f5c1e5c448c8604e1d2f7b2ff9b5be (diff) | |
* scm/output-lib.scm (fret-number-tablature-format): vcenter and
whiteout for markups.
* buildscripts/substitute-encoding.py (note_glyph): include _ in
regex too. This fixes change clef appearance in PDF.
Diffstat (limited to 'scm')
| -rw-r--r-- | scm/define-grobs.scm | 2 | ||||
| -rw-r--r-- | scm/output-lib.scm | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index d30edcfa7e..99fa123ef8 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1298,7 +1298,7 @@ (font-series . bold) (meta . ((interfaces . (rhythmic-head-interface - font-interface + font-interface note-head-interface staff-symbol-referencer-interface text-interface item-interface )))) )) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 9b24de88ec..4ee8e0f996 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -15,11 +15,13 @@ ;; The TabNoteHead tablatureFormat callback. ;; Compute the text grob-property (define-public (fret-number-tablature-format string tuning pitch) - (number->string - (- (ly:pitch-semitones pitch) - (list-ref tuning - ;; remove 1 because list index starts at 0 and guitar string at 1. - (- string 1))))) + (make-whiteout-markup + (make-vcenter-markup + (number->string + (- (ly:pitch-semitones pitch) + (list-ref tuning + ;; remove 1 because list index starts at 0 and guitar string at 1. + (- string 1))))))) ;; The 5-string banjo has got a extra string, the fifth (duh), wich ;; starts at the fifth fret on the neck. Frets on the fifth string @@ -28,11 +30,13 @@ ;; on the banjo neck. ;; We solve this by defining a new fret-number-tablature function: (define-public (fret-number-tablature-format-banjo string tuning pitch) + (make-whiteout-markup + (make-vcenter-markup (let ((fret (- (ly:pitch-semitones pitch) (list-ref tuning (- string 1))))) - (number->string (cond - ((and (> fret 0) (= string 5)) - (+ fret 5)) - (else fret))))) + (number->string (cond + ((and (> fret 0) (= string 5)) + (+ fret 5)) + (else fret))))))) (define-public (hammer-print-function grob) (let* ((note-collums (ly:grob-property grob 'note-columns)) |