remove split around-space hack.

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 1f70e44e62d469df4f8cb891faaa317cf23b6498..3c55c436593a1809e15cd78c77ae3e8095961c02 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -11,15 +11,6 @@
 (define (tablature-stem-attachment-function style duration)
   (cons 0.0 0.5))
 
-; The TabNoteHead stencil callback.
-; Create a text stencil
-(define-public (tablature-print-function grob)
-  (let ((stencil (fontify-text
-                   (ly:get-default-font grob)
-                   (ly:grob-property grob 'text)
-                   )))
-    stencil ; return the stencil.
-    ))
 
 ; The TabNoteHead tablatureFormat callback.
 ; Compute the text grob-property
@@ -47,8 +38,12 @@
                        (else "")))
                                    
          )
-    (let ((slur (Slur::print grob))
-          (text (fontify-text (ly:get-default-font grob) letter)))
+    (let* ((slur (Slur::print grob))
+          (paper (ly:grob-paper grob))
+          (text (interpret-markup
+                 paper
+                 (ly:grob-alist-chain grob (ly:paper-lookup paper 'text-font-defaults))
+                 letter)))
     
       (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 
                      (/ (cdr (ly:stencil-extent text 0)) 2.0)
@@ -93,7 +88,7 @@
  )
 
 (define-public (arg->string arg)
-  (cond ((number? arg) (inexact->string arg 10))
+  (cond ((number? arg) (ly:inexact->string arg 10))
        ((string? arg) (string-append "\"" arg "\""))
        ((symbol? arg) (string-append "\"" (symbol->string arg) "\""))))
 
@@ -112,10 +107,8 @@
 ;; do nothing in .scm output
 (define-public (comment s) "")
 
-(define-public (numbers->string l)
-  (apply string-append (map ly:number->string l)))
-
-; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x))
+(define-public (ly:numbers->string lst)
+  (string-join (map ly:number->string lst) " "))
 
 (define (number->octal-string x)
   (let* ((n (inexact->exact x))
@@ -126,14 +119,13 @@
      (number->string n8)
      (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8)))))
 
-(define-public (inexact->string x radix)
+(define-public (ly:inexact->string x radix)
   (let ((n (inexact->exact x)))
     (number->string n radix)))
 
-
-(define-public (number-pair->string c)
+(define-public (ly:number-pair->string c)
   (string-append (ly:number->string (car c)) " "
-                (ly:number->string (cdr c)) " "))
+                (ly:number->string (cdr c))))
 
 (define (font i)
   (string-append
@@ -234,7 +226,7 @@ centered, X==1 is at the right, X == -1 is at the left."
                          ("|:" . ("|" . "|:"))
                          ("|." . ("|." . ()))
 
-                         ;; hmm... should we end with a barline here?
+                         ;; hmm... should we end with a bar line here?
                          (".|" . ("|" . ".|"))
                          (":|" . (":|" . ()))
                          ("||" . ("||" . ()))