lyx2lyx/lyx_2_0.py:

- fix mathdots conversion routine
- fix typo in feyn reversion routine

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35462 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-09-20 02:24:03 +00:00
parent 1787e837e7
commit 4580296b8f

View File

@ -2067,14 +2067,34 @@ def convert_mathdots(document):
def revert_mathdots(document): def revert_mathdots(document):
" Load mathdots if used in the document " " Load mathdots if used in the document "
i = 0
ddots = re.compile(r'\\begin_inset Formula .*\\ddots', re.DOTALL)
vdots = re.compile(r'\\begin_inset Formula .*\\vdots', re.DOTALL)
iddots = re.compile(r'\\begin_inset Formula .*\\iddots', re.DOTALL)
mathdots = find_token(document.header, "\\use_mathdots" , 0)
no = find_token(document.header, "\\use_mathdots 0" , 0)
auto = find_token(document.header, "\\use_mathdots 1" , 0)
yes = find_token(document.header, "\\use_mathdots 2" , 0)
if mathdots != -1:
del document.header[mathdots]
while True: while True:
i = find_token(document.header, "\\use_mathdots" , 0) i = find_token(document.body, '\\begin_inset Formula', i)
if i != -1: if i == -1:
# use \@ifundefined to catch also the "auto" case return
add_to_preamble(document, ["% this command was inserted by lyx2lyx"]) j = find_end_of_inset(document.body, i)
add_to_preamble(document, ["\\@ifundefined{iddots}{\\usepackage{mathdots}}\n"]) if j == -1:
del document.header[i] document.warning("Malformed LyX document: Can't find end of Formula inset.")
break return
k = ddots.search("\n".join(document.body[i:j]))
l = vdots.search("\n".join(document.body[i:j]))
m = iddots.search("\n".join(document.body[i:j]))
if (yes == -1) and ((no != -1) or (not k and not l and not m) or (auto != -1 and not m)):
i += 1
continue
# use \@ifundefined to catch also the "auto" case
add_to_preamble(document, ["% this command was inserted by lyx2lyx"])
add_to_preamble(document, ["\\@ifundefined{iddots}{\\usepackage{mathdots}}\n"])
return
def convert_rule(document): def convert_rule(document):
@ -2170,7 +2190,7 @@ def revert_diagram(document):
return return
j = find_end_of_inset(document.body, i) j = find_end_of_inset(document.body, i)
if j == -1: if j == -1:
document.warning("Malformed LyX document: Can't find end of line inset.") document.warning("Malformed LyX document: Can't find end of Formula inset.")
return return
m = re_diagram.search("\n".join(document.body[i:j])) m = re_diagram.search("\n".join(document.body[i:j]))
if not m: if not m: