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

Fix problem with verbatim reversion.

Browse Source
This commit is contained in:
Richard Heck 2014-04-11 13:55:18 -04:00
parent 1b4986793e
commit b5c2cba0b3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/lyx2lyx/lyx_2_1.py
View File

@ -741,10 +741,11 @@ def revert_verbatim(document):
'\\end_layout', '', '\\end_inset', '\\end_layout', '', '\\end_inset',
'', '', '\\end_layout'] '', '', '\\end_layout']
subst_begin = ['\\begin_layout Standard', '\\noindent', subst_begin = ['\\begin_layout Standard', '\\noindent',
'\\begin_inset ERT', 'status collapsed', '', '\\begin_inset ERT', 'status open', '',
'\\begin_layout Plain Layout', '', '', '\\backslash', '\\begin_layout Plain Layout', '', '', '\\backslash',
'begin{verbatim}', 'begin{verbatim}',
'\\end_layout', '', '\\begin_layout Plain Layout', ''] '\\end_layout', '', '\\begin_layout Plain Layout', '']
while 1: while 1:
i = find_token(document.body, "\\begin_layout Verbatim", i) i = find_token(document.body, "\\begin_layout Verbatim", i)
if i == -1: if i == -1:
@ -757,16 +758,17 @@ def revert_verbatim(document):
# delete all line breaks insets (there are no other insets) # delete all line breaks insets (there are no other insets)
l = i l = i
while 1: while 1:
n = find_token(document.body, "\\begin_inset Newline newline", l) n = find_token(document.body, "\\begin_inset Newline newline", l, j)
if n == -1: if n == -1:
n = find_token(document.body, "\\begin_inset Newline linebreak", l) n = find_token(document.body, "\\begin_inset Newline linebreak", l, j)
if n == -1: if n == -1:
break break
m = find_end_of_inset(document.body, n) m = find_end_of_inset(document.body, n)
del(document.body[m:m+1]) del(document.body[m:m+1])
document.body[n:n+1] = ['\end_layout', '', '\\begin_layout Plain Layout'] document.body[n:n+1] = ['\end_layout', '', '\\begin_layout Plain Layout']
l += 1 l += 1
j += 1 # we deleted a line, so the end of the inset moved forward.
j -= 1
# consecutive verbatim environments need to be connected # consecutive verbatim environments need to be connected
k = find_token(document.body, "\\begin_layout Verbatim", j) k = find_token(document.body, "\\begin_layout Verbatim", j)
if k == j + 2 and consecutive == False: if k == j + 2 and consecutive == False: