Document diversion from GNU coding standards

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 74e1d01b61b54c6fa0e8dbbc82d8dff559e66641..0e41c169449efaeff3981c10c7482a162a3b16b7 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
@@ -132,19 +132,17 @@
 (define (embedded-ps string)
   string)
 
-
 (define (glyph-string
         postscript-font-name
         size cid?
         w-x-y-named-glyphs)
 
-  (format #f "gsave 1 output-scale div 1 output-scale div scale
-  /~a ~a ~a scalefont setfont\n~a grestore"
+  (format #f "gsave 
+  /~a ~a ~a output-scale div scalefont setfont\n~a grestore"
          postscript-font-name
          (if cid?
              " /CIDFont findresource "
              " findfont")
-         
          size
          (apply
           string-append
@@ -156,14 +154,8 @@
                       (g (cadddr item))
                       (prefix (if  (string? g) "/" "")))
 
-                   (if (and (= 0.0 x)
-                            (= 0.0 y))
-                       (format #f " ~a~a glyphshow\n" prefix g)
-;;                     (format #f " gsave ~a~a glyphshow grestore ~a 0 rmoveto \n" prefix g w)
-                       (format #f " ~a ~a rmoveto ~a~a glyphshow\n"
-                               x y
-                               prefix
-                               g))))
+                   (format #f " gsave ~a~a glyphshow grestore ~a ~a rmoveto \n" prefix g (+ w x) y)
+                   ))
                w-x-y-named-glyphs))))
 
 (define (grob-cause offset grob)
@@ -183,10 +175,10 @@
          (if (and (< 0 (interval-length x-ext))
                   (< 0 (interval-length y-ext)))
              (format "~a ~a ~a ~a (textedit://~a:~a:~a:~a) mark_URI\n"
-                     (+ (car offset) (car x-ext))
-                     (+ (cdr offset) (car y-ext))
-                     (+ (car offset) (cdr x-ext))
-                     (+ (cdr offset) (cdr y-ext))
+                     (ly:number->string (+ (car offset) (car x-ext)))
+                     (ly:number->string (+ (cdr offset) (car y-ext)))
+                     (ly:number->string (+ (car offset) (cdr x-ext)))
+                     (ly:number->string (+ (cdr offset) (cdr y-ext)))
 
                      ;; TODO
                      ;; full escaping.
@@ -213,14 +205,21 @@
   "")
 
 (define (placebox x y s) 
-  (string-append 
-   (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
+  (format
+   "gsave ~a ~a translate
+0 0 moveto
+~a
+grestore\n"
+
+   (ly:number->string x)
+   (ly:number->string y)
+   s))
 
-(define (polygon points blotdiameter filled?)
+(define (polygon points blot-diameter filled?)
   (string-append
    (ly:numbers->string points) " "
    (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
+   (ly:number->string blot-diameter)
    (if filled? " true " " false ")
    " draw_polygon"))