CVSROOT: /cvsroot/lilypond
Module name: mftrace
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/15 14:18:45
Modified files:
. : ChangeLog configure.in mftrace.py
Log message:
release commit
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/mftrace/ChangeLog.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/mftrace/configure.in.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/mftrace/mftrace.py.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
Patches:
Index: mftrace/ChangeLog
diff -u mftrace/ChangeLog:1.63 mftrace/ChangeLog:1.64
--- mftrace/ChangeLog:1.63 Mon Aug 15 13:21:59 2005
+++ mftrace/ChangeLog Mon Aug 15 14:18:45 2005
@@ -1,3 +1,9 @@
+2005-08-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * configure.in: release 1.1.15
+
+ * mftrace.py (shell_escape_filename): put offending chars in group.
+
2005-08-14 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* mftrace.py (make_outputs): escape file names with spaces on
Index: mftrace/configure.in
diff -u mftrace/configure.in:1.35 mftrace/configure.in:1.36
--- mftrace/configure.in:1.35 Mon Aug 15 13:14:55 2005
+++ mftrace/configure.in Mon Aug 15 14:18:45 2005
@@ -6,7 +6,7 @@
AC_PATH_PROG(POTRACE, potrace, none)
AC_SUBST(PYTHON)
-export VERSION="1.1.14"
+export VERSION="1.1.15"
AC_SUBST(VERSION)
AC_SUBST(EXEEXT)
Index: mftrace/mftrace.py
diff -u mftrace/mftrace.py:1.60 mftrace/mftrace.py:1.61
--- mftrace/mftrace.py:1.60 Sun Aug 14 22:17:52 2005
+++ mftrace/mftrace.py Mon Aug 15 14:18:45 2005
@@ -98,9 +98,8 @@
return s
def shell_escape_filename (str):
- str = re.sub ('[\'" ]', r'\\\1', str)
+ str = re.sub ('([\'" ])', r'\\\1', str)
return str
-
def identify (port):
port.write ('%s %s\n' % (program_name, program_version))
@@ -307,7 +306,7 @@
except IOError:
pass
- p = popen ('kpsewhich %s' % nm).read ()[:-1]
+ p = popen ('kpsewhich %s' % shell_escape_filename (nm)).read ()[:-1]
# urg. Did I do this ?
if dos_kpath_p:
@@ -1346,7 +1345,7 @@
tfmfile = find_file (basename + '.tfm')
if not tfmfile:
- tfmfile = popen ("mktextfm %s 2>/dev/null" % basename).read ()
+ tfmfile = popen ("mktextfm %s 2>/dev/null" %
shell_escape_filename (basename)).read ()
if tfmfile:
tfmfile = tfmfile[:-1]
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
