*** empty log message ***

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

diff --git a/scm/output-pdf.scm b/scm/output-pdf.scm
index 4ca3f8991f919a5d070e9dc87e1095c6982b9768..691e8f3c558e2a9267208a0c2312d8ac6080c99a 100644 (file)
--- a/scm/output-pdf.scm
+++ b/scm/output-pdf.scm
@@ -1,8 +1,8 @@
-;;; pdf.scm -- implement Scheme output routines for PDF.
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c)  2001--2003 Stephen Peters <portnoy@portnoy.org>
+;;;; pdf.scm -- implement Scheme output routines for PDF.
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c)  2001--2004 Stephen Peters <portnoy@portnoy.org>
 
 
 ;currently no font commands; this is a helper for pdftex.scm.
@@ -24,7 +24,7 @@
 
 (define currentpoint (cons 0 0))
 (define (showcp) 
-  (string-append (number-pair->string currentpoint) " "))
+  (string-append (ly:number-pair->string currentpoint) " "))
 (define (moveto x y)
   (set! currentpoint (cons x y))
   (string-append (showcp) "m "))
@@ -41,15 +41,15 @@
   (lineto (+ x (car currentpoint)) (+ y (cdr currentpoint))))
 (define (curveto x1 y1 x2 y2 x y)
   (set! currentpoint (cons x y))
-  (string-append (ly:number->string x1) (ly:number->string y1)
-                (ly:number->string x2) (ly:number->string y2)
-                (ly:number->string x) (ly:number->string y) "c "))
+  (string-append (ly:number->string x1) " " (ly:number->string y1) " "
+                (ly:number->string x2) " " (ly:number->string y2) " "
+                (ly:number->string x) " " (ly:number->string y) " c "))
 (define (curveto-pairs pt1 pt2 pt)
   (curveto (car pt1) (cdr pt1) (car pt2) (cdr pt2) (car pt) (cdr pt)))
 (define (closefill) "h f ")
 (define (closestroke) "S ")
-(define (setlinewidth w) (string-append (ly:number->string w) "w "))
-(define (setgray g) (string-append (ly:number->string g) "g "))
+(define (setlinewidth w) (string-append (ly:number->string w) " w "))
+(define (setgray g) (string-append (ly:number->string g) " g "))
 (define (setlineparams) "1 j 1 J ")
 
 (define (beam width slope thick blot)
@@ -60,9 +60,6 @@
                   (lineto 0 (/ thick 2))
                   (closefill))))
 
-(define (comment s) 
-  (string-append "% " s "\n"))
-
 (define (brack-traject pair ds alpha)
   (let ((alpha-rad (* alpha (/ 3.141592654 180))))
     (cons (+ (car pair) (* (cos alpha-rad) ds))
@@ -131,14 +128,13 @@
                   (rlineto (- xwid) 0)
                   (closefill))))
 
-(define (end-output) "")
 
 (define (experimental-on) "")
 
 (define (filledbox breadth width depth height) 
-  (string-append (ly:number->string (- breadth))
-                (ly:number->string (- depth))
-                (ly:number->string (+ breadth width))
+  (string-append (ly:number->string (- breadth)) " " 
+                (ly:number->string (- depth)) " "
+                (ly:number->string (+ breadth width)) " "
                 (ly:number->string (+ depth height))
                 " re f "))
 
@@ -188,7 +184,7 @@
 
 (define (invoke-char s i)
   (string-append 
-   "(\\" (inexact->string i 8) ") " s " " ))
+   "(\\" (ly:inexact->string i 8) ") " s " " ))
 
 (define (placebox x y s) "")