X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftablature.scm;h=97f688c1d1e868d4242d3a085ab9d4856e3fddf3;hb=57a6fdce712bbdc538b712b319d28366e05b7495;hp=615a6dcdf0dd616fac330360c53b7897e485ac01;hpb=ae14152d6cb63504972ad2379d553581f36cbf08;p=lilypond.git

diff --git a/scm/tablature.scm b/scm/tablature.scm
index 615a6dcdf0..97f688c1d1 100644
--- a/scm/tablature.scm
+++ b/scm/tablature.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2009--2014 Marc Hohl <marc@hohlart.de>
+;;;; Copyright (C) 2009--2015 Marc Hohl <marc@hohlart.de>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
   (let ((style (ly:grob-property grob 'style)))
 
     (case style
-      ((cross slash) (stencil-whiteout (ly:note-head::print grob)))
+      ((cross slash) (stencil-whiteout-box (ly:note-head::print grob)))
       (else (tab-note-head::print grob)))))
 
 ;; definitions for the "moderntab" clef:
@@ -235,7 +235,7 @@
 
 ;; a callback for custom fret labels
 (define ((tab-note-head::print-custom-fret-label fret) grob)
-  (ly:grob-set-property! grob 'text fret)
+  (ly:grob-set-property! grob 'text (make-vcenter-markup fret))
   (tab-note-head::print grob))
 (export tab-note-head::print-custom-fret-label)
 
@@ -266,9 +266,7 @@
          (offset-factor (assoc-get 'head-offset details 3/5))
          (column-offset (* offset-factor
                            (interval-length
-                            (ly:stencil-extent
-                             (grob-interpret-markup grob "8")
-                             X)))))
+                            (ly:stencil-extent ref-grob X)))))
 
     (if (is-harmonic? grob)
         (set! output-grob (harmonic-proc output-grob
@@ -282,9 +280,10 @@
                                            cautionary-width
                                            cautionary-angularity
                                            cautionary-padding)))
-    (ly:stencil-translate-axis (centered-stencil output-grob)
-                               column-offset
-                               X)))
+    (ly:stencil-translate-axis
+     (ly:stencil-aligned-to output-grob X CENTER)
+     column-offset
+     X)))
 
 ;; Harmonic definitions