* 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.

diff --git a/ChangeLog b/ChangeLog
index 5d31e6ab435537e8b52bd2cfa8664a64de2ebecb..5e463fa83b8f6bbd0629030c2c0c684b0c5db9e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-06-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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. 
+
+       * ttftool/include/*: remove.
+
        * configure.in (reloc_b): remove TTFTOOL_ENDIAN
 
        * config.make.in (WINDRES): remove TTFTOOL_ENDIAN.
@@ -70,7 +78,7 @@
 
        * scm/editor.scm (editor-command-template-alist): Use char iso
        column, except for Emacs.
-       (get-editor-command): Substitute char too (Bert).
+       (get-editor-command): Substitute char too (Bertalan Fodor).
 
 2005-06-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/buildscripts/substitute-encoding.py b/buildscripts/substitute-encoding.py
index 8b8ae4c504b026eab245d0db5c879eee2ea03a7c..6cb7f20cc1a314780b5695fedc5cd9a52640856d 100644 (file)
--- a/buildscripts/substitute-encoding.py
+++ b/buildscripts/substitute-encoding.py
@@ -28,7 +28,7 @@ def get_glyph_names (enc_name):
                glyphs.append (nm)
 
 
-       m = re.sub ("(/[a-z-.A-Z0-9]+) %", note_glyph, enc_str )
+       m = re.sub ("(/[a-z.A-Z0-9_]+) %", note_glyph, enc_str )
 
        glyphs = filter (lambda x: None == re.match (r'/\.notdef', x),
                         glyphs)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d30edcfa7e5f7c29317baf670e6fe3af1531cf14..99fa123ef8e68e8cb39bc6557028fe859e0d4db2 100644 (file)
--- 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 9b24de88ecef092e4925259dc34dae2ba14ad046..4ee8e0f996e55b13c52e6b7874c4499f03357be0 100644 (file)
--- 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))