remove split around-space hack.

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

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index bd839657dea9feed5890ccae96308b1bce8cc672..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:get-grob-property grob 'text)
-                   )))
-    stencil ; return the stencil.
-    ))
 
 ; The TabNoteHead tablatureFormat callback.
 ; Compute the text grob-property
@@ -32,13 +23,13 @@
       ) ) ) 
 
 (define-public (hammer-print-function grob)
-  (let* ((note-collums (ly:get-grob-property grob 'note-columns))
+  (let* ((note-collums (ly:grob-property grob 'note-columns))
          (note-column1 (cadr note-collums))
          (note-column2 (car  note-collums))
-         (note1        (car (ly:get-grob-property note-column1 'note-heads)))
-         (note2        (car (ly:get-grob-property note-column2 'note-heads)))
-        (text1  (ly:get-grob-property note1 'text))
-        (text2  (ly:get-grob-property note2 'text))
+         (note1        (car (ly:grob-property note-column1 'note-heads)))
+         (note2        (car (ly:grob-property note-column2 'note-heads)))
+        (text1  (ly:grob-property note1 'text))
+        (text2  (ly:grob-property note2 'text))
          (fret1        (if (string? text1) (string->number text1) 0))
          (fret2        (if (string? text2) (string->number text2) 0))
          (letter       (cond
@@ -47,11 +38,15 @@
                        (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-get-extent slur 0)) 
-                     (/ (cdr (ly:stencil-get-extent text 0)) 2.0)
+      (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 
+                     (/ (cdr (ly:stencil-extent text 0)) 2.0)
                      )
                   -2.0)))
       
@@ -75,8 +70,8 @@
   (let*
    (
     (mol    (callback grob))
-    (x-ext (interval-widen (ly:stencil-get-extent mol 0) x-padding))
-    (y-ext (interval-widen (ly:stencil-get-extent mol 1) y-padding))
+    (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding))
+    (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding))
     (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick)
                               (cons 0 line-thick)))
     (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext))
@@ -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
@@ -201,8 +193,8 @@ centered, X==1 is at the right, X == -1 is at the left."
 (define-public ((modulo-bar-number-visible n m) barnum) (and (> barnum 1) (= m (modulo barnum n))))
 
 (define-public ((set-bar-number-visibility n) tr)
-  (let* ((bn (ly:get-context-property tr 'currentBarNumber)))
-   (ly:set-context-property! tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n)))))
+  (let* ((bn (ly:context-property tr 'currentBarNumber)))
+   (ly:context-set-property! tr 'barNumberVisibility (modulo-bar-number-visible n (modulo bn n)))))
 
 (define-public (default-bar-number-visibility barnum) (> barnum 1))
 
@@ -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?
                          (".|" . ("|" . ".|"))
                          (":|" . (":|" . ()))
                          ("||" . ("||" . ()))