From 20c34d6fab3bac883c0977501e1a340a61e51965 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 15 Jun 2005 00:39:48 +0000
Subject: [PATCH] * scm/framework-ps.scm (write-preamble): use ly:system.
(write-preamble): verbosity.
* scripts/convert-ly.py: cleanup. Use lilylib. Use convertrules.
---
ChangeLog | 3 +++
scm/framework-ps.scm | 11 ++++++++---
scripts/convert-ly.py | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9dbec453b7..2c3c606fc5 100644
--- 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 061eb3948a..6ba4744975 100644
--- 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 95316c5a0e..ef18ac1922 100644
--- 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)
--
2.39.5