Increase tex2lyx output format to 393.

389: Nothing to do (html output changes)
390: Nothing to do (empty lyx2lyx conversion)
391: Nothing to do (empty lyx2lyx conversion)
392: Activated already prepared required arguments code
393: Renamed OptArg inset to Argument

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39915 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 0b46ee6ca81be9f07e94f5b56143d7c22598fd58..9c564b583e5b6debb700b0f4a29b1d3832ae5b9f 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -86,4 +86,7 @@ Format LaTeX feature                        LyX feature
 386    LyX version                          InsetInfo
 388    page sizes A0-3, A6, B0-3, B6,       \papersize
        JIS B0-6
+390    forward/reverse search               \forward_search, \forward_macro
+391    decimal alignment in tables          InsetTabular
+392    new beamer format                    InsetLayout
 

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index b2a67b49f8969d2ab6d3e83df2511bfa45cecadd..9d0e4a192380fd426b0ecfdf9cdb3abd2c2739a7 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -165,7 +165,7 @@ extern bool noweb_mode;
 /// Did we recognize any pdflatex-only construct?
 extern bool pdflatex;
 /// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 388;
+int const LYX_FORMAT = 393;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 449e50034809b0d035b1f3312d2a32847645306d..1f2d5420149beb20154ad6f9bf46bf93293cec38 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -577,7 +577,7 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
                    p.next_token().character() != '[') 
                        break;
                p.get_token(); // eat '['
-               begin_inset(os, "OptArg\n");
+               begin_inset(os, "Argument\n");
                os << "status collapsed\n\n";
                parse_text_in_inset(p, os, FLAG_BRACK_LAST, outer, context);
                end_inset(os);
@@ -585,12 +585,12 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
                ++optargs;
        }
        unsigned int reqargs = 0;
-       while (LYX_FORMAT >= 392 && reqargs < context.layout->reqargs) {
+       while (reqargs < context.layout->reqargs) {
                eat_whitespace(p, os, context, false);
                if (p.next_token().cat() != catBegin)
                        break;
                p.get_token(); // eat '{'
-               begin_inset(os, "OptArg\n");
+               begin_inset(os, "Argument\n");
                os << "status collapsed\n\n";
                parse_text_in_inset(p, os, FLAG_BRACE_LAST, outer, context);
                end_inset(os);
@@ -1219,7 +1219,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                                        context.check_layout(os);
                                        need_layout = false;
                                }
-                               begin_inset(os, "OptArg\n");
+                               begin_inset(os, "Argument\n");
                                os << "status collapsed\n\n";
                                parse_text_in_inset(p, os, FLAG_BRACK_LAST, outer, context);
                                end_inset(os);
@@ -1227,7 +1227,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                                ++optargs;
                        }
                        unsigned int reqargs = 0;
-                       while (LYX_FORMAT >= 392 && reqargs < context.layout->reqargs) {
+                       while (reqargs < context.layout->reqargs) {
                                eat_whitespace(p, os, context, false);
                                if (p.next_token().cat() != catBegin)
                                        break;
@@ -1236,7 +1236,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                                        context.check_layout(os);
                                        need_layout = false;
                                }
-                               begin_inset(os, "OptArg\n");
+                               begin_inset(os, "Argument\n");
                                os << "status collapsed\n\n";
                                parse_text_in_inset(p, os, FLAG_BRACE_LAST, outer, context);
                                end_inset(os);
@@ -2078,7 +2078,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        if (p.next_token().cat() != catEscape &&
                            p.next_token().character() == '[') {
                                p.get_token(); // eat '['
-                               begin_inset(os, "OptArg\n");
+                               begin_inset(os, "Argument\n");
                                os << "status collapsed\n";
                                parse_text_in_inset(p, os, FLAG_BRACK_LAST, outer, context);
                                end_inset(os);