anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx roundtrip: expand diff to bu usefull to files created by lyx

Browse Source 
Otherwise the comparision used by tex2lyx2lyx-tests would fail
This commit is contained in:
Kornel Benko 2013-08-04 15:57:01 +02:00
parent 39bef61e84
commit d3245d4cd2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tex2lyx/test/runtests.py
View File

@ -20,14 +20,15 @@ import os, string, sys, time, difflib, filecmp, subprocess, re
def usage(prog_name):
return "Usage: %s [uselyx2lyx] [<tex2lyx binary> [[<script dir>] [[<output dir>] [testfile]]]]" % prog_name
pat_fl = re.compile(r'^#LyX file created by tex2lyx .*$')
pat_fl1 = re.compile(r'^#LyX file created by tex2lyx .*$')
pat_fl2 = re.compile(r'^#LyX 2\.1 created this file.*$')
def compareLyx(lines1, lines2):
if lines1[1:] != lines2[1:]:
return False
if not pat_fl.match(lines1[0]):
if not pat_fl1.match(lines1[0]) and not pat_fl2.match(lines1[0]):
return False
if not pat_fl.match(lines2[0]):
if not pat_fl1.match(lines2[0]) and not pat_fl2.match(lines2[0]):
return False
return True
@ -92,6 +93,7 @@ def main(argv):
else:
lyxfile = os.path.join(outputdir, base + ".lyx")
cmd = '%s -roundtrip -copyfiles -f %s %s' % (tex2lyx, texfile, lyxfile)
print 'Executing: ' + cmd + "\n"
proc = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
proc.wait()
err = proc.returncode
@ -121,7 +123,8 @@ def main(argv):
lines2 = f2.readlines()
f1.close()
f2.close()
# ignore the first line i.e., the version of lyx
# ignore the first lone
# e.g. the version of lyx
if not compareLyx(lines1, lines2):
diff = difflib.unified_diff(lines1, lines2, lyxfile1, lyxfile2, t1, t2)
sys.stdout.writelines(diff)