]> git.lyx.org Git - features.git/commitdiff
backport r40826.
authorGeorg Baum <georg.baum@post.rwth-aachen.de>
Thu, 1 Mar 2012 20:39:46 +0000 (20:39 +0000)
committerGeorg Baum <georg.baum@post.rwth-aachen.de>
Thu, 1 Mar 2012 20:39:46 +0000 (20:39 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40827 a592a061-630c-0410-9148-cb99ea01b6c8

src/tex2lyx/text.cpp

index bdfc59624e79a04e0f09ea340df65d693b4b2a36..95ea75c9f1a09bd196c923d93be5f120bfc842cf 100644 (file)
@@ -3151,12 +3151,14 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                else if (t.cs() == "index" ||
                         (t.cs() == "sindex" && preamble.use_indices() == "true")) {
                        context.check_layout(os);
-                       string const kind = (t.cs() == "index") ? "idx" : p.getArg('[', ']');
+                       string const arg = (t.cs() == "sindex" && p.hasOpt()) ?
+                               p.getArg('[', ']') : "";
+                       string const kind = arg.empty() ? "idx" : arg;
                        begin_inset(os, "Index ");
                        os << kind << "\nstatus collapsed\n";
                        parse_text_in_inset(p, os, FLAG_ITEM, false, context, "Index");
                        end_inset(os);
-                       if (t.cs() == "sindex")
+                       if (kind != "idx")
                                preamble.registerAutomaticallyLoadedPackage("splitidx");
                }