def usage(prog_name):
return "Usage: %s [uselyx2lyx] [<tex2lyx binary> [[<script dir>] [[<output dir>] [testfile]]]]" % prog_name
+pat_fl1 = re.compile(r'^#LyX file created by tex2lyx .*$')
+pat_fl2 = re.compile(r'^#LyX \d+\.\d+ created this file.*$')
+
+def compareLyx(lines1, lines2):
+ if lines1[1:] != lines2[1:]:
+ return False
+ if not pat_fl1.match(lines1[0]) and not pat_fl2.match(lines1[0]):
+ return False
+ if not pat_fl1.match(lines2[0]) and not pat_fl2.match(lines2[0]):
+ return False
+ return True
def main(argv):
# Parse and manipulate the command line arguments.
files = [sys.argv[4+skipcount]]
else:
files = ['test.ltx', \
+ 'algo2e.tex', \
'box-color-size-space-align.tex', \
'CJK.tex', \
'CJKutf8.tex', \
'test-insets.tex', \
+ 'test-insets-basic.tex', \
+ 'test-memoir.tex', \
'test-modules.tex', \
'test-refstyle-theorems.tex', \
+ 'test-scr.tex', \
'test-structure.tex', \
'verbatim.tex', \
'XeTeX-polyglossia.tex']
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
os.path.join(outputdir, base + ".lyx2.lyx"), uselyx2lyx)
if lyxfile2 is None:
errors.append(f)
- elif not filecmp.cmp(lyxfile1, lyxfile2, False):
+ else:
t1 = time.ctime(os.path.getmtime(lyxfile1))
t2 = time.ctime(os.path.getmtime(lyxfile2))
f1 = open(lyxfile1, 'r')
f2 = open(lyxfile2, 'r')
lines1 = f1.readlines()
+ i1 = 0
+ for linex in lines1:
+ if linex[:-1] == '\origin ' + inputdir + '/':
+ lines1[i1] = '\origin ' + outputdir + '/' + "\n"
+ break
+ i1 = i1+1
lines2 = f2.readlines()
- diff = difflib.unified_diff(lines1, lines2, lyxfile1, lyxfile2, t1, t2)
f1.close()
f2.close()
- sys.stdout.writelines(diff)
- errors.append(f)
+ # ignore the first line 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)
+ errors.append(f)
+
if len(errors) > 0:
error('Converting the following files failed: %s' % ', '.join(errors))
if uselyx2lyx:
cmd = '%s -E lyx %s %s' % (lyx, lyxf, lyxfx)
sys.stdout.writelines(cmd)
+ sys.stdout.writelines("\n")
if os.system(cmd) != 0:
return None
return lyxf