font_tokens = ["\\family", "\\series", "\\shape", "\\size", "\\emph",
"\\bar", "\\noun", "\\color", "\\lang", "\\latex"]
-#
-# Change \begin_float .. \end_float into \begin_inset Float .. \end_inset
-#
-
pextra_type3_rexp = re.compile(r".*\\pextra_type\s+3")
pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\
r"(\s+\\pextra_alignment\s+(\S+))?"+\
else:
return "100col%"
+#
+# Change \begin_float .. \end_float into \begin_inset Float .. \end_inset
+#
+
def remove_oldfloat(lines, language):
i = 0
while 1:
lines[i:j+1] = new
i = i+1
-pextra_type2_rexp = re.compile(r".*\\pextra_type\s+2")
+pextra_type2_rexp = re.compile(r".*\\pextra_type\s+[12]")
pextra_type2_rexp2 = re.compile(r".*(\\layout|\\pextra_type\s+2)")
-def remove_oldminipage(lines):
+def remove_pextra(lines):
i = 0
flag = 0
while 1:
i = find_re(lines, pextra_type2_rexp, i)
if i == -1:
break
-
+
mo = pextra_rexp.search(lines[i])
+ width = get_width(mo)
+
+ if mo.group(1) == "1":
+ # handle \pextra_type 1 (indented paragraph)
+ lines[i] = re.sub(pextra_rexp, "\\leftindent "+width+" ", lines[i])
+ i = i+1
+ continue
+
+ # handle \pextra_type 2 (minipage)
position = mo.group(3)
hfill = mo.group(5)
- width = get_width(mo)
lines[i] = re.sub(pextra_rexp, "", lines[i])
start = ["\\begin_inset Minipage",
break
j = i+1
while 1:
- j = find_tokens(lines, ["\\latex default", "\\begin_inset", "\\layout", "\\end_inset", "\\end_float", "\\the_end"],
+ # \end_inset is for ert inside a tabular cell. The other tokens
+ # are obvious.
+ j = find_tokens(lines, ["\\latex default", "\\layout", "\\begin_inset", "\\end_inset", "\\end_float", "\\the_end"],
j)
if check_token(lines[j], "\\begin_inset"):
- j = find_end_of_inset(lines, j)
+ j = find_end_of_inset(lines, j)+1
else:
break
i = i+1
def is_ert_paragraph(lines, i):
+ if not check_token(lines[i], "\\layout Standard"):
+ return 0
+
i = find_nonempty_line(lines, i+1)
if not check_token(lines[i], "\\begin_inset ERT"):
return 0
+
j = find_end_of_inset(lines, i)
k = find_nonempty_line(lines, j+1)
return check_token(lines[k], "\\layout")
i = find_token(lines, "\\begin_inset ERT", i)
if i == -1:
break
- j = find_token_backwards(lines,"\\layout", i-1)
+ j = get_paragraph(lines, i)
count = 0
text = []
while is_ert_paragraph(lines, j):
break
j = find_end_of_inset(lines, i)
- lyxwidth = string.split(lines[i])[3]+"pt"
- lyxheight = string.split(lines[i])[4]+"pt"
+ if ( len(string.split(lines[i])) > 2 ):
+ lyxwidth = string.split(lines[i])[3]+"pt"
+ lyxheight = string.split(lines[i])[4]+"pt"
+ else:
+ lyxwidth = ""
+ lyxheight = ""
filename = get_value(lines, "file", i+1, j)
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 = find_token(lines, "\\begin_inset LatexCommand \\listof", i)
if i == -1:
break
- type = lines[i][33:-3]
+ type = re.search(r"listof(\w*)", lines[i]).group(1)[:-1]
lines[i] = "\\begin_inset FloatList "+type
i = i+1
change_listof(body)
fix_oldfloatinset(body)
update_tabular(body)
- remove_oldminipage(body)
+ remove_pextra(body)
remove_oldfloat(body, language)
remove_figinset(body)
remove_oldertinset(body)