release: 1.5.43

[lilypond.git] / scm / tex.scm

diff --git a/scm/tex.scm b/scm/tex.scm
index 123f7dc4480605389de42f2ea8170cb380b5f4cd..79f6886422fe3a193d8c9c2ea8ecf95314beeaf6 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -130,7 +130,7 @@
     (define (embedded-ps expr)
       (let ((ps-string
             (with-output-to-string
-              (lambda () (ps-output-expression expr)))))
+              (lambda () (ps-output-expression expr (current-output-port))))))
        (string-append "\\embeddedps{" ps-string "}")))
     (define (embedded-ps expr)
       (let
@@ -175,7 +175,11 @@
        (ly-gulp-file "music-drawing-routines.ps"))
    (if (defined? 'ps-testing) "/testing true def%\n" "")
    "}"
-   "\\input lilyponddefs \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript"))
+   "\\input lilyponddefs \\outputscale=\\lilypondpaperoutputscale "
+   ;; "pt"
+   "mm"
+
+   "\\turnOnPostScript"))
 
 ;; Note: this string must match the string in ly2dvi.py!!!
 (define (header creator generate) 
@@ -186,12 +190,6 @@
   (string-append 
    "\n\\" s "{" (inexact->string i 10) "}" ))
 
-(define (invoke-dim1 s d)
-  (string-append
-   "\n\\" s "{" (number->dim d) "}"))
-(define (pt->sp x)
-  (* 65536 x))
-
 ;;
 ;; need to do something to make this really safe.
 ;;
@@ -259,7 +257,7 @@
   )
 (define (define-origin file line col)
   (if (procedure? point-and-click)
-      (string-append "\\special{src\\string:"
+      (string-append "\\special{src:" ;;; \\string ? 
                     (point-and-click line col file)
                     "}" )
       "")