fix bug 1750

[lyx.git] / src / tex2lyx / tex2lyx.C

diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 264ba0491208d9620922e79a5f7a7fd2632b3941..62c99b4922f3f737b040a1383d66f8121bf396ce 100644 (file)
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -19,6 +19,7 @@
 #include "lyxtextclass.h"
 #include "support/path_defines.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/os.h"
 
@@ -46,6 +47,10 @@ using std::string;
 using std::vector;
 using std::map;
 
+using lyx::support::isStrUnsignedInt;
+using lyx::support::ltrim;
+using lyx::support::rtrim;
+using lyx::support::strToUnsignedInt;
 using lyx::support::system_lyxdir;
 using lyx::support::user_lyxdir;
 using lyx::support::IsFileReadable;
@@ -119,6 +124,34 @@ string active_environment()
 map<string, vector<ArgumentType> > known_commands;
 
 
+void add_known_command(string const & command, string const & o1,
+                       bool o2)
+{
+       // We have to handle the following cases:
+       // definition                      o1    o2    invocation result
+       // \newcommand{\foo}{bar}          ""    false \foo       bar
+       // \newcommand{\foo}[1]{bar #1}    "[1]" false \foo{x}    bar x
+       // \newcommand{\foo}[1][]{bar #1}  "[1]" true  \foo       bar 
+       // \newcommand{\foo}[1][]{bar #1}  "[1]" true  \foo[x]    bar x
+       // \newcommand{\foo}[1][x]{bar #1} "[1]" true  \foo[x]    bar x
+       unsigned int nargs = 0;
+       vector<ArgumentType> arguments;
+       string const opt1 = rtrim(ltrim(o1, "["), "]");
+       if (isStrUnsignedInt(opt1)) {
+               // The command has arguments
+               nargs = strToUnsignedInt(opt1);
+               if (nargs > 0 && o2) {
+                       // The first argument is optional
+                       arguments.push_back(optional);
+                       --nargs;
+               }
+       }
+       for (unsigned int i = 0; i < nargs; ++i)
+               arguments.push_back(required);
+       known_commands[command] = arguments;
+}
+
+
 namespace {
 
 
@@ -347,7 +380,7 @@ int main(int argc, char * argv[])
                return 2;
        }
 
-       lyx::support::os::init(&argc, &argv);
+       lyx::support::os::init(argc, argv);
        lyx::support::setLyxPaths();
 
        string const system_syntaxfile = lyx::support::LibFileSearch("reLyX", "syntax.default");