(dir-join): Rename from path-join (joins

directories, not paths).

diff --git a/ChangeLog b/ChangeLog
index ae52fda3f45f0ef9e06ebab292542485a1864076..ff65d4599e7c9113c6af4f9db89ed1b4921aa728 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/framework-ps.scm (dir-join): Rename from path-join (joins
+       directories, not paths).
+
 2005-08-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/framework-ps.scm (munge-lily-font-name): Bugfix: Munge only

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 985b13bace7c23407caece9b3dfdab3f6e7a2a24..8e05912368ec655695d1d1df98dc065636592c94 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -1,9 +1,8 @@
-;;
-;; framework-ps.scm -- structure for PostScript output
-;;
-;;  source file of the GNU LilyPond music typesetter
-;;
-;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; framework-ps.scm -- structure for PostScript output
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-module (scm framework-ps))
 
@@ -239,7 +238,7 @@
       (format
        (if (string? name)
           "(~a) (r) file .loadfont\n"
-          "% fontfile ~a could not be found\n")
+          "% can't find font file: ~a\n")
        name))
 
     (let* ((font (car font-name-filename))
@@ -256,11 +255,10 @@
        ((string? bare-file-name)
         (ps-load-file (munge-lily-font-name file-name)))
        (else
-        (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+        (ly:warning (_ "can't embed ~S=~S") name file-name)
          "")))))
 
-  ;; ugh.  posix /windows/mingw? 
-  (define (path-join a b)
+  (define (dir-join a b)
     (if (equal? a "")
        b
        (string-append a "/" b)))
@@ -291,19 +289,19 @@
         (if (and (not embed)
                  (string-match (string-append name "\\.") f))
             (set! embed
-                  (font-file-as-ps-string name (path-join dir-name f))))
+                  (font-file-as-ps-string name (dir-join dir-name f))))
             
         (if (or (equal? "." f) 
                 (equal? ".." f))
             #t
-            (delete-file (path-join dir-name f))))
+            (delete-file (dir-join dir-name f))))
        files)
       (rmdir dir-name)
 
       (if (not embed)
          (begin
            (set! embed "% failed \n")
-           (ly:warning (_ "Couldn't extract file matching ~a from ~a") name filename)))
+           (ly:warning (_ "can't extract file matching ~a from ~a") name filename)))
       embed))
 
     (define (font-file-as-ps-string name file-name)
@@ -321,8 +319,7 @@
        (ps-embed-cff (ly:otf->cff file-name) name 0))
        (else
        (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
-       "")
-       )))
+       ""))))
       
   (define (load-font font-name-filename)
     (let* ((font (car font-name-filename))
@@ -411,6 +408,9 @@
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.ps" basename))
         (outputter (ly:make-paper-outputter
+                    ;; FIXME: better wrap open/open-file,
+                    ;; content-mangling is always bad.
+                    ;; MINGW hack: need to have "b"inary for embedding CFFs
                     (open-file filename "wb")
                     "ps"))
         (paper (ly:paper-book-paper book))
@@ -456,8 +456,9 @@
          (max (1+ (cadr box)) (cadddr box)))))
 
   (let* ((outputter (ly:make-paper-outputter
-
-                    ;; need to have binary for embedding CFFs
+                    ;; FIXME: better wrap open/open-file,
+                    ;; content-mangling is always bad.
+                    ;; MINGW hack: need to have "b"inary for embedding CFFs
                     (open-file (format "~a.eps" filename) "wb")
                     "ps"))
         (port (ly:outputter-port outputter))

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index a6b28b1d23f9bca887c56fc464f498df8c7e674a..2012acd19ce567d379b3c92bcdef3f5127b24c3c 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -1,9 +1,8 @@
-;;
-;; framework-tex.scm -- structure for TeX output
-;;
-;; source file of the GNU LilyPond music typesetter
-;;
-;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; framework-tex.scm -- structure for TeX output
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-module (scm framework-tex)
   #:export (output-framework-tex