anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lyx2lyx/lyx_2_2.py: correct reversion for solution*

Browse Source 
- add reversion for the starred variant
- correct LaTeX output
This commit is contained in:
Uwe Stöhr 2015-11-29 03:51:57 +01:00
parent 299d7d70f0
commit 4ea80e077f
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/lyx2lyx/lyx_2_2.py
View File

@ -2112,9 +2112,9 @@ def revert_fontsettings(document):
def revert_solution(document): def revert_solution(document):
" Reverts the solution environmen of the theorem module to TeX code " " Reverts the solution environment of the theorem module to TeX code "
# Do we use theorems-std module? # Do we use one of the modules that provides Solution?
have_mod = False have_mod = False
mods = document.get_module_list() mods = document.get_module_list()
for mod in mods: for mod in mods:
@ -2125,34 +2125,48 @@ def revert_solution(document):
if not have_mod: if not have_mod:
return return
consecutive = False consecutive = False
is_starred = False
i = 0 i = 0
while True: while True:
i = find_token(document.body, "\\begin_layout Solution", i) i = find_token(document.body, "\\begin_layout Solution", i)
if i == -1: if i == -1:
return return
is_starred = document.body[i].startswith("\\begin_layout Solution*")
if is_starred == True:
LaTeXName = "sol*"
LyXName = "Solution*"
theoremName = "newtheorem*"
else:
LaTeXName = "sol"
LyXName = "Solution"
theoremName = "newtheorem"
j = find_end_of_layout(document.body, i) j = find_end_of_layout(document.body, i)
if j == -1: if j == -1:
document.warning("Malformed LyX document: Can't find end of Solution layout") if starred == True:
document.warning("Malformed LyX document: Can't find end of " + LyXName + " layout")
i += 1 i += 1
continue continue
# if this is not a consecutive env, add start command # if this is not a consecutive env, add start command
begcmd = [] begcmd = []
if not consecutive: if not consecutive:
begcmd = put_cmd_in_ert("\\begin{sol}") begcmd = put_cmd_in_ert("\\begin{" + LaTeXName + "}" )
# has this a consecutive theorem of same type? # has this a consecutive theorem of same type?
consecutive = False consecutive = False
consecutive = document.body[j + 2] == "\\begin_layout Solution" consecutive = document.body[j + 2] == "\\begin_layout " + LyXName
# if this is not followed by a consecutive env, add end command # if this is not followed by a consecutive env, add end command
if not consecutive: if not consecutive:
document.body[j : j + 1] = put_cmd_in_ert("\\end{sol}") + ["\\end_layout"] document.body[j : j + 1] = put_cmd_in_ert("\\end{" + LaTeXName + "}") + ["\\end_layout"]
document.body[i : i + 1] = ["\\begin_layout Standard", ""] + begcmd document.body[i : i + 1] = ["\\begin_layout Standard", ""] + begcmd
add_to_preamble(document, "\\providecommand{\solutionname}{Solution}") add_to_preamble(document, "\\theoremstyle{definition}")
if mod == "theorems-std" or mod == "theorems-ams": if mod == "theorems-std" or mod == "theorems-ams":
add_to_preamble(document, "\\theoremstyle{plain}\n" \ if is_starred:
"\\newtheorem{sol}[thm]{\\protect\\solutionname}") add_to_preamble(document, "\\" + theoremName + "{" + LaTeXName + "}{\\protect\\solutionname}")
else:
add_to_preamble(document, "\\" + theoremName + "{" + LaTeXName + "}[thm]{\\protect\\solutionname}")
if mod == "theorems-bytype" or mod == "theorems-ams-bytype": if mod == "theorems-bytype" or mod == "theorems-ams-bytype":
add_to_preamble(document, "\\theoremstyle{definition}\n" \ add_to_preamble(document, "\\" + theoremName + "{" + LaTeXName + "}{\\protect\\solutionname}")
"\\newtheorem{sol}{\\protect\\solutionname}") add_to_preamble(document, "\\providecommand{\solutionname}{Solution}")
i = j i = j