mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-01 13:40:39 +00:00
Fix for problem when subfigures in 1.5 don't have captions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27108 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c0940ae2c5
commit
e171ec6929
@ -253,7 +253,7 @@ def latex2lyx(data):
|
|||||||
lines, suitable for insertion into document.body.'''
|
lines, suitable for insertion into document.body.'''
|
||||||
|
|
||||||
if not data:
|
if not data:
|
||||||
return []
|
return [""]
|
||||||
retval = []
|
retval = []
|
||||||
|
|
||||||
# Convert LaTeX to Unicode
|
# Convert LaTeX to Unicode
|
||||||
@ -2119,6 +2119,7 @@ def convert_subfig(document):
|
|||||||
" Convert subfigures to subfloats. "
|
" Convert subfigures to subfloats. "
|
||||||
i = 0
|
i = 0
|
||||||
while 1:
|
while 1:
|
||||||
|
addedLines = 0
|
||||||
i = find_token(document.body, '\\begin_inset Graphics', i)
|
i = find_token(document.body, '\\begin_inset Graphics', i)
|
||||||
if i == -1:
|
if i == -1:
|
||||||
return
|
return
|
||||||
@ -2133,13 +2134,13 @@ def convert_subfig(document):
|
|||||||
continue
|
continue
|
||||||
l = find_token(document.body, '\tsubcaptionText', i, endInset)
|
l = find_token(document.body, '\tsubcaptionText', i, endInset)
|
||||||
if l == -1:
|
if l == -1:
|
||||||
document.warning("Malformed lyx document: Can't find subcaptionText!")
|
caption = ""
|
||||||
i = endInset
|
else:
|
||||||
continue
|
caption = document.body[l][16:].strip('"')
|
||||||
caption = document.body[l][16:].strip('"')
|
del document.body[l]
|
||||||
del document.body[l]
|
addedLines -= 1
|
||||||
del document.body[k]
|
del document.body[k]
|
||||||
addedLines = -2
|
addedLines -= 1
|
||||||
subst = ['\\begin_inset Float figure', 'wide false', 'sideways false',
|
subst = ['\\begin_inset Float figure', 'wide false', 'sideways false',
|
||||||
'status open', '', '\\begin_layout Plain Layout', '\\begin_inset Caption',
|
'status open', '', '\\begin_layout Plain Layout', '\\begin_inset Caption',
|
||||||
'', '\\begin_layout Plain Layout'] + latex2lyx(caption) + \
|
'', '\\begin_layout Plain Layout'] + latex2lyx(caption) + \
|
||||||
|
Loading…
Reference in New Issue
Block a user