r"(\s+(\\pextra_widthp?)\s+(\S*))?")
def get_width(mo):
- if mo.group(9) == "\\pextra_widthp":
- return mo.group(10)+"col%"
- elif mo.group(10):
- return mo.group(10)
+ if mo.group(10):
+ if mo.group(9) == "\\pextra_widthp":
+ return mo.group(10)+"col%"
+ else:
+ return mo.group(10)
else:
return "100col%"
j = find_token_backwards(lines,"\\layout", i-1)
j0 = j
- mid = lines[j:i]
j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
- # j can be -1, but this is still ok
- mid = mid+lines[i+1:j]
+ # j can be -1
count = 0
while 1:
if mo.group(7) == "1":
flag = 1
break
- j = find_token_backwards(lines,"\\layout", i-1)
- mid = mid+lines[j:i]
+ lines[i] = re.sub(pextra_rexp, "", lines[i])
j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
- mid = mid+lines[i+1:j]
+ mid = lines[j0:j]
end = ["\\end_inset "]
lines[j0:j] = start+mid+end
def is_empty(lines):
return filter(is_nonempty_line, lines) == []
-font_rexp = re.compile(r"\\(family|series|shape|size|emph|numeric|bar|noun)")
+move_rexp = re.compile(r"\\(family|series|shape|size|emph|numeric|bar|noun|end_deeper)")
ert_rexp = re.compile(r"\\begin_inset|.*\\SpecialChar")
spchar_rexp = re.compile(r"(.*)(\\SpecialChar.*)")
ert_begin = ["\\begin_inset ERT",
break
j = i+1
while 1:
- j = find_tokens(lines, ["\\latex default", "\\begin_inset", "\\layout", "\\end_float", "\\the_end"],
+ j = find_tokens(lines, ["\\latex default", "\\begin_inset", "\\layout", "\\end_inset", "\\end_float", "\\the_end"],
j)
if check_token(lines[j], "\\begin_inset"):
j = find_end_of_inset(lines, j)
tmp = []
for line in lines[k:k2]:
- if font_rexp.match(line):
+ # Move some lines outside the ERT inset:
+ if move_rexp.match(line):
if new2 == []:
# This is not necessary, but we want the output to be
# as similar as posible to the lyx format
lines[i:j+1] = new
i = i+1
+ # Delete remaining "\latex xxx" tokens
i = 0
while 1:
i = find_token(lines, "\\latex ", i)
break
del lines[i]
-
+# ERT insert are hidden feature of lyx 1.1.6. This might be removed in the future.
def remove_oldertinset(lines):
i = 0
while 1:
i = i+1
+# Figure insert are hidden feature of lyx 1.1.6. This might be removed in the future.
+def fix_oldfloatinset(lines):
+ i = 0
+ while 1:
+ i = find_token(lines, "\\begin_inset Float ", i)
+ if i == -1:
+ break
+ j = find_token(lines, "collapsed", i)
+ if j != -1:
+ lines[j:j] = ["wide false"]
+ sys.stderr.write("i,j=%d,%d\n" % (i,j))
+ i = i+1
+
+def change_listof(lines):
+ i = 0
+ while 1:
+ i = find_token(lines, "\\begin_inset LatexCommand \\listof", i)
+ if i == -1:
+ break
+ type = lines[i][33:-3]
+ lines[i] = "\\begin_inset FloatList "+type
+ i = i+1
+
def change_preamble(lines):
i = find_token(lines, "\\use_amsmath", 0)
if i == -1:
language = "english"
change_preamble(header)
+ change_listof(body)
+ fix_oldfloatinset(body)
update_tabular(body)
remove_oldminipage(body)
remove_oldfloat(body, language)