Author: rgheck
Date: Fri Nov 5 15:58:32 2010
New Revision: 36109
URL: http://www.lyx.org/trac/changeset/36109
Log:
Minor fixups for revert_splitindex.
Modified:
lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py
Modified: lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py
==============================================================================
--- lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py Fri Nov 5 15:50:27 2010
(r36108)
+++ lyx-devel/trunk/lib/lyx2lyx/lyx_2_0.py Fri Nov 5 15:58:32 2010
(r36109)
@@ -336,12 +336,11 @@
if i == -1:
document.warning("Malformed LyX document: Missing \\use_indices.")
return
- indices = get_value(document.header, "\\use_indices", i)
- preamble = ""
- useindices = (indices == "true")
- if useindices:
- preamble += "\\usepackage{splitidx}\n"
+ useindices = str2bool(get_value(document.header, "\\use_indices", i))
del document.header[i]
+ preamble = []
+ if useindices:
+ preamble.append("\\usepackage{splitidx})")
# deal with index declarations in the preamble
i = 0
@@ -360,9 +359,9 @@
iname = m.group(1)
ishortcut = get_value(document.header, '\\shortcut', i, k)
if ishortcut != "":
- preamble += "\\newindex[" + iname + "]{" + ishortcut + "}\n"
+ preamble.append("\\newindex[" + iname + "]{" + ishortcut + "}")
del document.header[i:k + 1]
- if preamble != "":
+ if preamble:
insert_to_preamble(0, document, preamble)
# deal with index insets
