* scm/framework-ps.scm (write-preamble): use ly:system.

(write-preamble): verbosity.

* scripts/convert-ly.py: cleanup. Use lilylib. Use convertrules.

diff --git a/ChangeLog b/ChangeLog
index 9dbec453b7b7ec46c07fd0f81e70fe3b69dc14a0..2c3c606fc5df380b4b518284ca622af8cc2bd0b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/framework-ps.scm (write-preamble): use ly:system.
+       (write-preamble): verbosity.
+
        * scripts/convert-ly.py: cleanup. Use lilylib. Use convertrules.
 
        * python/convertrules.py: new file. Store conversion rules

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 061eb3948a12b4a45cc23e5347cfbfcff1c9ac84..6ba4744975a159728a79b095ec09420090783e1a 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -272,14 +272,14 @@
        ((dir-name  (tmpnam))
         (files '())
         (status 0)
-        (embed ""))
+        (embed #f))
 
 
       (display (list filename name))
       (mkdir dir-name #o700)
 
-      (set! status (system
-                   (format "cd ~a && fondu -force ~a" dir-name filename)))
+      (set! status (ly:system
+                   (format "cd ~a && fondu -force '~a'" dir-name filename)))
 
       (if (!= status 0)
          (ly:error "Fondu failed."))
@@ -298,6 +298,11 @@
             (delete-file (path-join dir-name f))))
        files)
       (rmdir dir-name)
+
+      (if (not embed)
+         (begin
+           (set! embed "% failed \n")
+           (ly:warn (_ "Couldn't extract file matching ~a from ~a") name filename)))
       embed))
 
     (define (font-file-as-ps-string name file-name)

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 95316c5a0e53417938ebc3f6c8ce9b739c9b61b8..ef18ac1922369f030bee13dd6b4678d81185850a 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -162,7 +162,7 @@ def do_options ():
                        ly.help ()
                        sys.exit (0)
                elif o == '--version' or o == '-v':
-                       print_version ()
+                       ly.identify (sys.stdout)
                        sys.exit (0)
                elif o== '--from' or o=='-f':
                        from_version = str_to_tuple (a)