*** empty log message ***

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

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 943cf4c39092a342fefaa1aab8c2867f96c5f97e..1128d68b6e5586f6b4838f48863d8b03bd0bcbc9 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -38,11 +38,17 @@
                        (else "")))
                                    
          )
-    (let* ((slur (Slur::print grob))
-          (paper (ly:grob-paper grob))
+    (let* (
+          (slur ; (Slur::print grob)
+
+           ;; 
+           ;; FIXME: a hammer is not a slur.
+           ;; 
+           (ly:make-stencil '() '(0 . 0) '(0 . 0)))
+          (layout (ly:grob-layout grob))
           (text (interpret-markup
-                 paper
-                 (ly:grob-alist-chain grob (ly:paper-lookup paper 'text-font-defaults))
+                 layout
+                 (ly:grob-alist-chain grob (ly:output-def-lookup layout 'text-font-defaults))
                  letter)))
     
       (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 
@@ -54,7 +60,7 @@
         (ly:stencil-align-to! text 0 1)
         )
 
-      (ly:stencil-combine-at-edge slur 1 1 text -0.6)
+;      (ly:stencil-combine-at-edge slur 1 1 text -0.6)
       ) ) )
 
 
@@ -103,7 +109,6 @@
 ;;  (* (/ 72.27 25.40) x))
 
 ;; do nothing in .scm output
-(define-public (comment s) "")
 
 (define-public (ly:numbers->string lst)
   (string-join (map ly:number->string lst) " "))
@@ -145,11 +150,11 @@
     ;; brevis, longa and maxima from the neo-mensural font and all
     ;; other note heads from the default font.  -- jr
     (if (< duration 0)
-       (string-append (number->string duration) "neo_mensural")
+       (string-append (number->string duration) "neomensural")
        (number->string duration)))
    ((mensural)
     (string-append (number->string duration) (symbol->string style)))
-   ((neo_mensural)
+   ((neomensural)
     (string-append (number->string duration) (symbol->string style)))
    ((default)
     ;; The default font in mf/feta-bolletjes.mf defines a brevis, but
@@ -159,7 +164,7 @@
     ;; should look exactly like the brevis of the default font, but
     ;; with a stem exactly like that of the quarter note. -- jr
     (if (< duration -1)
-       (string-append (number->string duration) "neo_mensural")
+       (string-append (number->string duration) "neomensural")
        (number->string duration)))
    (else
     (if (string-match "vaticana*|hufnagel*|medicaea*" (symbol->string style))
@@ -238,7 +243,7 @@ centered, X==1 is at the right, X == -1 is at the left."
                        )))
 
      (if (equal? result #f)
-        (ly:warn (string-append "Unknown bar glyph: `" glyph "'"))
+        (ly:warn "Unknown bar glyph: `~S'" glyph)
         (index-cell (cdr result) dir))
      ) )