anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to fix the PlainLayout issue a bit.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24276 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-04-15 17:59:01 +00:00
parent 8098065d59
commit 58d58dfe55
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/lyx2lyx/lyx_1_6.py
View File

@ -68,6 +68,16 @@ def len2value(len):
# No number means 1.0 # No number means 1.0
return 1.0 return 1.0
# Unfortunately, this doesn't really work, since Standard isn't always default.
# But it's as good as we can do right now.
def find_default_layout(doc, start, end):
l = find_token(document.body, "\\begin_layout Standard", start, end)
if l == -1:
l = find_token(document.body, "\\begin_layout PlainLayout", start, end)
if l == -1:
l = find_token(document.body, "\\begin_layout Plain Layout", start, end)
return l
#################################################################### ####################################################################
def get_option(document, m, option, default): def get_option(document, m, option, default):
@ -1276,9 +1286,7 @@ def revert_framed_notes(document):
document.warning("Malformed LyX document: Missing `status' tag in Box inset.") document.warning("Malformed LyX document: Missing `status' tag in Box inset.")
return return
status = document.body[k] status = document.body[k]
l = find_token(document.body, "\\begin_layout Standard", i + 1, j) l = find_default_layout(document, i + 1, j)
if l == -1:
l = find_token(document.body, "\\begin_layout Plain", i + 1, j)
if l == -1: if l == -1:
document.warning("Malformed LyX document: Missing `\\begin_layout' in Box inset.") document.warning("Malformed LyX document: Missing `\\begin_layout' in Box inset.")
return return
@ -1460,9 +1468,7 @@ def revert_rotfloat(document):
i = i + 1 i = i + 1
continue continue
if get_value(document.body, 'sideways', i, j) != "false": if get_value(document.body, 'sideways', i, j) != "false":
l = find_token(document.body, "\\begin_layout Standard", i + 1, j) l = find_default_layout(doc, i + 1, j)
if l == -1:
l = find_token(document.body, "\\begin_layout Plain", i + 1, j)
if l == -1: if l == -1:
document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.") document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.")
return return
@ -1508,9 +1514,7 @@ def revert_widesideways(document):
continue continue
if get_value(document.body, 'sideways', i, j) != "false": if get_value(document.body, 'sideways', i, j) != "false":
if get_value(document.body, 'wide', i, j) != "false": if get_value(document.body, 'wide', i, j) != "false":
l = find_token(document.body, "\\begin_layout Standard", i + 1, j) l = find_default_layout(document, i + 1, j)
if l == -1:
l = find_token(document.body, "\\begin_layout Plain", i + 1, j)
if l == -1: if l == -1:
document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.") document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.")
return return
@ -1596,7 +1600,7 @@ def revert_subfig(document):
document.warning("Malformed lyx document: Missing '\\end_inset' (embedded float).") document.warning("Malformed lyx document: Missing '\\end_inset' (embedded float).")
i = i + 1 i = i + 1
continue continue
m = find_token(document.body, "\\begin_layout Plain Layout", k + 1, l) m = find_default_layout(document.body, k + 1, l)
# caption? # caption?
cap = find_token(document.body, '\\begin_inset Caption', k + 1, l) cap = find_token(document.body, '\\begin_inset Caption', k + 1, l)
caption = '' caption = ''
@ -1629,9 +1633,9 @@ def revert_subfig(document):
if optend == -1: if optend == -1:
document.warning("Malformed lyx document: Missing '\\end_inset' (OptArg).") document.warning("Malformed lyx document: Missing '\\end_inset' (OptArg).")
return return
optc = find_token(document.body, "\\begin_layout Plain Layout", opt, optend) optc = find_default_layout(document.body, opt, optend)
if optc == -1: if optc == -1:
document.warning("Malformed LyX document: Missing `\\begin_layout Plain Layout' in Float inset.") document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.")
return return
optcend = find_end_of(document.body, optc, "\\begin_layout", "\\end_layout") optcend = find_end_of(document.body, optc, "\\begin_layout", "\\end_layout")
for line in document.body[optc:optcend]: for line in document.body[optc:optcend]: