vim/indent/lilypond.vim: new file.

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

diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm
index ceb35e65d698006acc44b858c8740b9409d631e4..ad3e3469b51aa859c0ab7cc3daae63f22139dda9 100644 (file)
--- a/scm/output-pdftex.scm
+++ b/scm/output-pdftex.scm
@@ -1,11 +1,11 @@
-;;; pdftex.scm -- implement Scheme output routines for PDFTeX
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;;  modified from the existing tex.scm
-;;; 
-;;; (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
-;;; Stephen Peters <portnoy@portnoy.org>
+;;;; pdftex.scm -- implement Scheme output routines for PDFTeX
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;;  modified from the existing tex.scm
+;;;; 
+;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Stephen Peters <portnoy@portnoy.org>
 
 
 ;; TODO: port this  to the new module framework.
@@ -48,8 +48,8 @@
     
     ))
 
-(define (beam width slope thick)
-  (embedded-pdf (list 'beam  width slope thick)))
+(define (beam width slope thick blot)
+  (embedded-pdf (list 'beam  width slope thick blot)))
 
 (define (bracket arch_angle arch_width arch_height height arch_thick thick)
   (embedded-pdf (list 'bracket  arch_angle arch_width arch_height height arch_thick thick)))
@@ -93,19 +93,11 @@
   ""
   )
 
-(if (or (equal? (minor-version) "4.1")
-       (equal? (minor-version) "4")
-       (equal? (minor-version) "3.4"))
-    (define (embedded-pdf expr)
-      (let ((ps-string
-            (with-output-to-string
-              (lambda () (pdf-output-expression expr (current-output-port))))))
-       (string-append "\\embeddedpdf{" ps-string "}")))
-    (define (embedded-pdf expr)
-      (let
-         ((os (open-output-string)))
-       (pdf-output-expression expr os)
-       (string-append "\\embeddedpdf{" (get-output-string os) "}"))))
+(define (embedded-pdf expr)
+  (let
+      ((os (open-output-string)))
+    (pdf-output-expression expr os)
+    (string-append "\\embeddedpdf{" (get-output-string os) "}")))
 
 
 (define (comment s)
@@ -173,7 +165,7 @@
    "\\lilypondpostscript\n"
    "\\pdfcompresslevel=0"))
 
-;; Note: this string must match the string in ly2dvi.py!!!
+;; Note: this string must match the string in lilypond.py!!!
 (define (header creator generate) 
   (string-append
    "% Generated automatically by: " creator generate "\n"))
@@ -210,9 +202,6 @@
                 (ly:number->string x) "}{"
                 s "}%\n"))
 
-(define (bezier-bow l thick)
-  (embedded-pdf (list 'bezier-bow  `(quote ,l) thick)))
-
 (define (bezier-sandwich l thick)
   (embedded-pdf (list 'bezier-sandwich  `(quote ,l) thick)))
 
@@ -238,8 +227,8 @@
                 (ly:number->string depth) "}{"
                 (ly:number->string height) "}"))
 
-(define (roundfilledbox x y width height blotdiam)
-  (embedded-pdf (list 'roundfilledbox  x y width height blotdiam)))
+(define (round-filled-box x y width height blotdiam)
+  (embedded-pdf (list 'round-filled-box  x y width height blotdiam)))
 
 (define (text s)
   (string-append "\\hbox{" (output-tex-string s) "}"))