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

* lib/lyx2lyx/lyx_1_5.py:

Browse Source 
- fix bug 4333.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@22020 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-12-08 15:39:39 +00:00
parent 0a93a5c1c3
commit 78e1ce79d4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/lyx2lyx/lyx_1_5.py
View File

@ -653,17 +653,17 @@ def convert_commandparams(document):
if commandparams_info[name][0] == "":
document.warning("Ignoring invalid option `%s' of command `%s'." % (option1, name))
else:
lines.append('%s "%s"' % (commandparams_info[name][0], option1.replace('"', '\\"')))
lines.append('%s "%s"' % (commandparams_info[name][0], option1.replace('\\', '\\\\').replace('"', '\\"')))
if option2 != "":
if commandparams_info[name][1] == "":
document.warning("Ignoring invalid second option `%s' of command `%s'." % (option2, name))
else:
lines.append('%s "%s"' % (commandparams_info[name][1], option2.replace('"', '\\"')))
lines.append('%s "%s"' % (commandparams_info[name][1], option2.replace('\\', '\\\\').replace('"', '\\"')))
if argument != "":
if commandparams_info[name][2] == "":
document.warning("Ignoring invalid argument `%s' of command `%s'." % (argument, name))
else:
lines.append('%s "%s"' % (commandparams_info[name][2], argument.replace('"', '\\"')))
lines.append('%s "%s"' % (commandparams_info[name][2], argument.replace('\\', '\\\\').replace('"', '\\"')))
document.body[i:i+1] = lines
i = i + 1
@ -690,13 +690,13 @@ def revert_commandparams(document):
preview_line = document.body[k]
elif (commandparams_info[name][0] != "" and
pname == commandparams_info[name][0]):
option1 = pvalue.strip('"').replace('\\"', '"')
option1 = pvalue.strip('"').replace('\\"', '"').replace('\\\\', '\\')
elif (commandparams_info[name][1] != "" and
pname == commandparams_info[name][1]):
option2 = pvalue.strip('"').replace('\\"', '"')
option2 = pvalue.strip('"').replace('\\"', '"').replace('\\\\', '\\')
elif (commandparams_info[name][2] != "" and
pname == commandparams_info[name][2]):
argument = pvalue.strip('"').replace('\\"', '"')
argument = pvalue.strip('"').replace('\\"', '"').replace('\\\\', '\\')
elif document.body[k].strip() != "":
document.warning("Ignoring unknown contents `%s' in command inset %s." % (document.body[k], name))
if name == "bibitem":

3
status.15x
View File

@ -98,6 +98,9 @@ What's new
- Fix a crash when exporting a file with a branch from the command line
(bug 4255).
- Fix a crash when importing an older LyX file (version < 1.5.0) that
contains index entries with escaped umlauts (bug 4333).
- Exit gracefully and give the user some information if LyX catches an
exception from an external program, such as iconv (part of bug 4385).