tex2lyx/text.cpp: a fix and a clarification

[lyx.git] / src / tex2lyx / text.cpp

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index e8180485e87418f54dcd03385625519b651c6933..2b5656c618a2297455c4c92d7c20503bc7c3c2f5 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -569,7 +569,7 @@ void skip_spaces_braces(Parser & p, bool keepws = false)
           should be handled by this function:
           - abc \j{} xyz
           - abc \j {} xyz
-          - abc \j 
+          - abc \j
             {} xyz
           - abc \j %comment
             {} xyz
@@ -613,7 +613,7 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
        while (optargs < context.layout->optargs) {
                eat_whitespace(p, os, context, false);
                if (p.next_token().cat() == catEscape ||
-                   p.next_token().character() != '[') 
+                   p.next_token().character() != '[')
                        break;
                p.get_token(); // eat '['
                begin_inset(os, "Argument\n");
@@ -930,7 +930,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                        // the inner env
                        if (!inner_type.empty() && (inner_flags & FLAG_END))
                                active_environments.pop_back();
-       
+
                        // Ensure that the end of the outer box is parsed correctly:
                        // The opening brace has been eaten by parse_outer_box()
                        if (!outer_type.empty() && (outer_flags & FLAG_ITEM)) {
@@ -1343,6 +1343,30 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                preamble.registerAutomaticallyLoadedPackage("verbatim");
        }
 
+       else if (name == "verbatim") {
+               os << "\n\\begin_layout Verbatim\n";
+               string const s = p.verbatimEnvironment("verbatim");
+               string::const_iterator it2 = s.begin();
+               for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
+                       if (*it == '\\')
+                               os << "\\backslash ";
+                       else if (*it == '\n') {
+                               it2 = it + 1;
+                               // avoid adding an empty paragraph at the end
+                               // FIXME: if there are 2 consecutive spaces at the end ignore it
+                               // because LyX will re-add a \n
+                               // This hack must be removed once bug 8049 is fixed!
+                               if ((it + 1 != et) && (it + 2 != et || *it2 != '\n'))
+                                       os << "\n\\end_layout\n\\begin_layout Verbatim\n";
+                       } else 
+                               os << *it;
+               }
+               os << "\n\\end_layout\n\n";
+               p.skip_spaces();
+               // reset to Standard layout
+               os << "\n\\begin_layout Standard\n";
+       }
+
        else if (name == "lyxgreyedout") {
                eat_whitespace(p, os, parent_context, false);
                parent_context.check_layout(os);
@@ -1480,7 +1504,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                        while (optargs < context.layout->optargs) {
                                eat_whitespace(p, os, context, false);
                                if (p.next_token().cat() == catEscape ||
-                                   p.next_token().character() != '[') 
+                                   p.next_token().character() != '[')
                                        break;
                                p.get_token(); // eat '['
                                if (need_layout) {
@@ -1935,7 +1959,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
        // Store the latest bibliographystyle and nocite{*} option
        // (needed for bibtex inset)
        string btprint;
-       string bibliographystyle;
+       string bibliographystyle = "default";
        bool const use_natbib = preamble.isPackageUsed("natbib");
        bool const use_jurabib = preamble.isPackageUsed("jurabib");
        string last_env;
@@ -2978,7 +3002,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        end_inset(os);
                        skip_spaces_braces(p);
                }
-               
+
                else if (t.cs() == "lyxline") {
                        // swallow size argument (it is not used anyway)
                        p.getArg('{', '}');
@@ -3178,12 +3202,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                btprint = key;
                }
 
-               else if (t.cs() == "index") {
+               else if (t.cs() == "index" ||
+                        (t.cs() == "sindex" && preamble.use_indices() == "true")) {
                        context.check_layout(os);
-                       begin_inset(os, "Index idx\n");
-                       os << "status collapsed\n";
+                       string const kind = (t.cs() == "index") ? "idx" : p.getArg('[', ']');
+                       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")
+                               preamble.registerAutomaticallyLoadedPackage("splitidx");
                }
 
                else if (t.cs() == "nomenclature") {
@@ -3200,7 +3228,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        end_inset(os);
                        preamble.registerAutomaticallyLoadedPackage("nomencl");
                }
-               
+
                else if (t.cs() == "label") {
                        context.check_layout(os);
                        begin_command_inset(os, "label", "label");
@@ -3347,7 +3375,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                else if (t.cs() == "selectlanguage") {
                        context.check_layout(os);
                        // save the language for the case that a
-                       // \foreignlanguage is used 
+                       // \foreignlanguage is used
 
                        context.font.language = babel2lyx(p.verbatim_item());
                        os << "\n\\lang " << context.font.language << "\n";
@@ -3454,12 +3482,12 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        handle_ert(os, t.asInput(), context);
 
                // accents (see Table 6 in Comprehensive LaTeX Symbol List)
-               else if (t.cs().size() == 1 
+               else if (t.cs().size() == 1
                         && contains("\"'.=^`bcdHkrtuv~", t.cs())) {
                        context.check_layout(os);
                        // try to see whether the string is in unicodesymbols
                        docstring rem;
-                       string command = t.asInput() + "{" 
+                       string command = t.asInput() + "{"
                                + trimSpaceAndEol(p.verbatim_item())
                                + "}";
                        set<string> req;
@@ -3467,7 +3495,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                Encodings::TEXT_CMD | Encodings::MATH_CMD, rem, &req);
                        if (!s.empty()) {
                                if (!rem.empty())
-                                       cerr << "When parsing " << command 
+                                       cerr << "When parsing " << command
                                             << ", result is " << to_utf8(s)
                                             << "+" << to_utf8(rem) << endl;
                                os << to_utf8(s);
@@ -4070,7 +4098,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                                                 Encodings::TEXT_CMD, rem, &req);
                        if (!s.empty()) {
                                if (!rem.empty())
-                                       cerr << "When parsing " << t.cs() 
+                                       cerr << "When parsing " << t.cs()
                                             << ", result is " << to_utf8(s)
                                             << "+" << to_utf8(rem) << endl;
                                context.check_layout(os);