Imported sources

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

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 87017e644efb25422a0032c68b72edeb0d91eb76..2128cec4fe592babcd9fbc6840e75d1d96689624 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -1,9 +1,8 @@
-
 ;;; tex.scm -- implement Scheme output routines for TeX
 ;;;
 ;;;  source file of the GNU LilyPond music typesetter
 ;;; 
-;;; (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
@@ -67,20 +66,24 @@
 
     (if (eq? c #f)
        (begin
-         (display "FAILED\n")
-         (display (object-type (car name-mag-pair)))
-         (display (object-type (caaar font-name-alist)))
-
          (ly:warn (string-append
                    "Programming error: No such font known "
                    (car name-mag-pair) " "
-                   (ly:number->string (cdr name-mag-pair))
-                   ))
-         "") ; issue no command
-       (string-append "\\" (cddr c)))
-    
-    
-    ))
+                   (ly:number->string (cdr name-mag-pair))))
+         
+         (display "FAILED\n" (current-error-port))
+         (if #f ;(pair? name-mag-pair))
+             (display (object-type (car name-mag-pair)) (current-error-port))
+             (write name-mag-pair (current-error-port)))
+         (if #f ;  (pair? font-name-alist)
+             (display
+              (object-type (caaar font-name-alist)) (current-error-port))
+             (write font-name-alist (current-error-port)))
+
+         ;; (format #f "\n%FAILED: (select-font ~S)\n" name-mag-pair))
+         "")
+       
+       (string-append "\\" (cddr c)))))
 
 (define (blank)
   "")
@@ -88,8 +91,8 @@
 (define (dot x y radius)
   (embedded-ps (list 'dot x y radius)))
 
-(define (beam width slope thick)
-  (embedded-ps (list 'beam  width slope thick)))
+(define (beam width slope thick blot)
+  (embedded-ps (list 'beam  width slope thick blot)))
 
 (define (bracket arch_angle arch_width arch_height height arch_thick thick)
   (embedded-ps (list 'bracket  arch_angle arch_width arch_height height arch_thick thick)))