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

Simplify the logic

Browse Source
This commit is contained in:
Juergen Spitzmueller 2015-12-28 16:11:26 +01:00
parent 2e6f54b37f
commit 61b54f87df
1 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
lib/lyx2lyx/lyx_2_1.py
View File

@ -1699,38 +1699,39 @@ def revert_IEEEtran(document):
if document.textclass != "IEEEtran":
return
i = 0
i2 = 0
j = 0
k = 0
while True:
if i != -1:
i = find_token(document.body, "\\begin_layout Page headings", i)
if i != -1:
revert_Argument_to_TeX_brace(document, i, 0, 1, 1, False, False)
layouts = {"Page headings": False,
"Biography without photo": True}
for layout in list(layouts.keys()):
i = 0
while True:
i = find_token(document.body, '\\begin_layout ' + layout, i)
if i == -1:
break
revert_Argument_to_TeX_brace(document, i, 0, 1, 1, layouts[layout], False)
i += 1
if i2 != -1:
i2 = find_token(document.body, "\\begin_inset Flex Paragraph Start", i2)
if i2 != -1:
revert_Argument_to_TeX_brace(document, i2, 0, 1, 1, False, False)
i2 = i2 + 1
if j != -1:
j = find_token(document.body, "\\begin_layout Biography without photo", j)
if j != -1:
revert_Argument_to_TeX_brace(document, j, 0, 1, 1, True, False)
j += 1
if k != -1:
k = find_token(document.body, "\\begin_layout Biography", k)
kA = find_token(document.body, "\\begin_layout Biography without photo", k)
if k == kA and k != -1:
k += 1
continue
if k != -1:
# start with the second argument, therefore 2
revert_Argument_to_TeX_brace(document, k, 0, 2, 2, True, False)
k += 1
if i == -1 and i2 == -1 and j == -1 and k == -1:
return
i = 0
while True:
i = find_token(document.body, '\\begin_inset Flex Paragraph Start', i)
if i == -1:
break
revert_Argument_to_TeX_brace(document, i, 0, 1, 1, False, False)
i += 1
i = 0
while True:
i = find_token_exact(document.body, "\\begin_layout Biography", i)
if i == -1:
break
if document.body[i] == "\\begin_layout Biography without photo":
i += 1
continue
# start with the second argument, therefore 2
revert_Argument_to_TeX_brace(document, i, 0, 2, 2, True, False)
i += 1
def revert_IEEEtran_2(document):
@ -1760,33 +1761,31 @@ def convert_IEEEtran(document):
if document.textclass != "IEEEtran":
return
i = 0
j = 0
k = 0
while True:
if i != -1:
i = find_token(document.body, "\\begin_layout Page headings", i)
if i != -1:
convert_TeX_brace_to_Argument(document, i, 1, 1, False, False, False)
layouts = {"Page headings": False,
"Biography without photo": True}
for layout in list(layouts.keys()):
i = 0
while True:
i = find_token(document.body, '\\begin_layout ' + layout, i)
if i == -1:
break
convert_TeX_brace_to_Argument(document, i, 1, 1, False, layouts[layout], False)
i += 1
i = 0
while True:
i = find_token_exact(document.body, "\\begin_layout Biography", i)
if i == -1:
break
if document.body[i] == "\\begin_layout Biography without photo":
i += 1
if j != -1:
j = find_token(document.body, "\\begin_layout Biography without photo", j)
if j != -1:
convert_TeX_brace_to_Argument(document, j, 1, 1, False, True, False)
j += 1
if k != -1:
# assure that we don't handle Biography Biography without photo
k = find_token(document.body, "\\begin_layout Biography", k)
kA = find_token(document.body, "\\begin_layout Biography without photo", k - 1)
if k == kA and k != -1:
k += 1
continue
if k != -1:
# the argument we want to convert is the second one
convert_TeX_brace_to_Argument(document, k, 2, 2, False, True, False)
k += 1
if i == -1 and j == -1 and k == -1:
return
# the argument we want to convert is the second one
convert_TeX_brace_to_Argument(document, i, 2, 2, False, True, False)
i += 1
def revert_AASTeX(document):