* lily/lookup.cc (slur): Invoke bezier-bow.

[lilypond.git] / scm / tex.scm

diff --git a/scm/tex.scm b/scm/tex.scm
index 4f1466880c178aff18141c9c7c443c37970833ed..4df648dd0b77833fbe098db6553342ab6e240399 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -85,10 +85,6 @@
 (define (dashed-slur thick dash l)
   (embedded-ps (list 'dashed-slur thick dash `(quote ,l))))
 
-(define (hairpin thick w sh eh)
-  (embedded-ps (list 'hairpin thick w sh eh))
-)
-
 (define (char i)
   (string-append "\\char" (inexact->string i 10) " "))
 
@@ -125,7 +121,8 @@
   ""
   )
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
     (define (embedded-ps expr)
       (let ((ps-string
@@ -165,6 +162,13 @@
 
 (define (header-end)
   (string-append
+   "\\def\\scaletounit{ "
+   (number->string (cond
+                    ((equal? (ly-unit) "mm") (/ 72.0  25.4))
+                    ((equal? (ly-unit) "pt") (/ 72.0  72.27))
+                    (else (error "unknown unit" (ly-unit)))
+                    ))
+    " mul }"
    "\\special{\\string! "
    
    ;; URG: ly-gulp-file: now we can't use scm output without Lily
@@ -175,7 +179,8 @@
        (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 \\lilypondpaperunit"
+   "\\turnOnPostScript"))
 
 ;; Note: this string must match the string in ly2dvi.py!!!
 (define (header creator generate) 
@@ -186,12 +191,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.
 ;;
@@ -224,15 +223,19 @@
    "\\placebox{"
    (number->dim y) "}{" (number->dim x) "}{" s "}%\n"))
 
+(define (bezier-bow l thick)
+  (embedded-ps (list 'bezier-bow  `(quote ,l) thick)))
+
 (define (bezier-sandwich l thick)
   (embedded-ps (list 'bezier-sandwich  `(quote ,l) thick)))
 
-(define (start-line ht)
-  (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n"))
+(define (start-system ht)
+  (string-append "\\vbox to " (number->dim ht) "{\\hbox{"
+                "%\n"))
 
-(define (stop-line) 
+(define (stop-system) 
   "}\\vss}\\interscoreline\n")
-(define (stop-last-line)
+(define (stop-last-system)
   "}\\vss}")
 
 (define (filledbox breapth width depth height)
@@ -246,20 +249,24 @@
        "depth " (number->dim depth)
        "height " (number->dim height) " ")))
 
+(define (roundfilledbox x y width height blotdiam)
+  (embedded-ps (list 'roundfilledbox  x y width height blotdiam)))
+
 (define (text s)
   (string-append "\\hbox{" (output-tex-string s) "}"))
 
 (define (tuplet ht gapx dx dy thick dir)
   (embedded-ps (list 'tuplet  ht gapx dx dy thick dir)))
 
-(define (volta h w thick vert_start vert_end)
-  (embedded-ps (list 'volta  h w thick vert_start vert_end)))
+(define (draw-line thick fx fy tx ty)
+  (embedded-ps (list 'draw-line thick fx fy tx ty)))
+
 (define (between-system-string string)
   string
   )
 (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)
                     "}" )
       "")
@@ -270,12 +277,10 @@
 
 (define my-eval-in-module eval)
 
-(if (or (equal? (minor-version) "4")
+(if (or (equal? (minor-version) "4.1")
+       (equal? (minor-version) "4")
        (equal? (minor-version) "3.4"))
-    (begin
-      (set! my-eval-in-module eval-in-module)
-
-    ))
+    (set! my-eval-in-module eval-in-module))
 
 (define-public (tex-output-expression expr port)
   (display (my-eval-in-module expr this-module) port )