anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 10:47:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PlainLayout is now Plain Layout.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24272 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-04-15 15:53:35 +00:00
parent 0ccfa11dbc
commit 27dd040f6d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/lyx2lyx/lyx_1_6.py
View File

@ -1568,8 +1568,8 @@ def convert_subfig(document):
del document.body[l] del document.body[l]
del document.body[k] del document.body[k]
document.body[i] = '\\begin_inset Float figure\nwide false\nsideways false\n' \ document.body[i] = '\\begin_inset Float figure\nwide false\nsideways false\n' \
'status open\n\n\\begin_layout PlainLayout\n\\begin_inset Caption\n\n\\begin_layout PlainLayout\n' \ 'status open\n\n\\begin_layout Plain Layout\n\\begin_inset Caption\n\n\\begin_layout Plain Layout\n' \
+ caption + '\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout PlainLayout\n' + savestr + caption + '\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout Plain Layout\n' + savestr
savestr = document.body[j] savestr = document.body[j]
document.body[j] = '\n\\end_layout\n\n\\end_inset\n' + savestr document.body[j] = '\n\\end_layout\n\n\\end_inset\n' + savestr
@ -1596,7 +1596,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 PlainLayout", k + 1, l) m = find_token(document.body, "\\begin_layout Plain Layout", 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 +1629,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 PlainLayout", opt, optend) optc = find_token(document.body, "\\begin_layout Plain Layout", opt, optend)
if optc == -1: if optc == -1:
document.warning("Malformed LyX document: Missing `\\begin_layout PlainLayout' in Float inset.") document.warning("Malformed LyX document: Missing `\\begin_layout Plain 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]:
@ -1649,12 +1649,12 @@ def revert_subfig(document):
caption += line.strip() caption += line.strip()
if len(label) > 0: if len(label) > 0:
caption += "\\backslash\nlabel{" + label + "}" caption += "\\backslash\nlabel{" + label + "}"
document.body[l] = '\\begin_layout PlainLayout\n\\begin_inset ERT\nstatus collapsed\n\n' \ document.body[l] = '\\begin_layout Plain Layout\n\\begin_inset ERT\nstatus collapsed\n\n' \
'\\begin_layout PlainLayout\n\n}\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout PlainLayout\n' '\\begin_layout Plain Layout\n\n}\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout Plain Layout\n'
del document.body[cap:capend+1] del document.body[cap:capend+1]
del document.body[k+1:m-1] del document.body[k+1:m-1]
insertion = '\\begin_inset ERT\nstatus collapsed\n\n' \ insertion = '\\begin_inset ERT\nstatus collapsed\n\n' \
'\\begin_layout PlainLayout\n\n\\backslash\n' \ '\\begin_layout Plain Layout\n\n\\backslash\n' \
'subfloat' 'subfloat'
if len(shortcap) > 0: if len(shortcap) > 0:
insertion = insertion + "[" + shortcap + "]" insertion = insertion + "[" + shortcap + "]"