From b5f85c1e9225b4632ce7ce20621c9f26380ea69a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 21 Jun 2005 23:58:19 +0000
Subject: [PATCH] * 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.
---
 ChangeLog                           | 10 +++++++++-
 buildscripts/substitute-encoding.py |  2 +-
 scm/define-grobs.scm                |  2 +-
 scm/output-lib.scm                  | 22 +++++++++++++---------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d31e6ab43..5e463fa83b 100644
--- 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 8b8ae4c504..6cb7f20cc1 100644
--- 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 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))
-- 
2.39.2