CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/15 00:39:48
Modified files:
. : ChangeLog
scm : framework-ps.scm
scripts : convert-ly.py
Log message:
* scm/framework-ps.scm (write-preamble): use ly:system.
(write-preamble): verbosity.
* scripts/convert-ly.py: cleanup. Use lilylib. Use convertrules.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3781&tr2=1.3782&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/convert-ly.py.diff?tr1=1.247&tr2=1.248&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3781 lilypond/ChangeLog:1.3782
--- lilypond/ChangeLog:1.3781 Tue Jun 14 23:01:53 2005
+++ lilypond/ChangeLog Wed Jun 15 00:39:47 2005
@@ -1,5 +1,8 @@
2005-06-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.118 lilypond/scm/framework-ps.scm:1.119
--- lilypond/scm/framework-ps.scm:1.118 Tue Jun 14 00:22:03 2005
+++ lilypond/scm/framework-ps.scm Wed Jun 15 00:39:48 2005
@@ -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)
Index: lilypond/scripts/convert-ly.py
diff -u lilypond/scripts/convert-ly.py:1.247
lilypond/scripts/convert-ly.py:1.248
--- lilypond/scripts/convert-ly.py:1.247 Tue Jun 14 23:01:53 2005
+++ lilypond/scripts/convert-ly.py Wed Jun 15 00:39:48 2005
@@ -162,7 +162,7 @@
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)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
