forgot that

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

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 8ea27a832215538e58006af64f207c0770bdbd1f..4c1366d85bee49791371f7a0a0f02db8e004f983 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,11 +13,12 @@
 #include <config.h>
 
 #include "tex2lyx.h"
-#include "Context.h"
 
+#include "Context.h"
 #include "TextClass.h"
 #include "Layout.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
@@ -42,7 +43,7 @@ namespace lyx {
 
 string const trim(string const & a, char const * p)
 {
-       // BOOST_ASSERT(p);
+       // LASSERT(p, /**/);
 
        if (a.empty() || !*p)
                return a;
@@ -107,7 +108,7 @@ CommandMap known_math_environments;
 
 
 void add_known_command(string const & command, string const & o1,
-       unsigned optionalsNum)
+                      bool o2)
 {
        // We have to handle the following cases:
        // definition                      o1    o2    invocation result
@@ -116,14 +117,14 @@ void add_known_command(string const & command, string const & o1,
        // \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
-       // and the same with \newlyxcommand
        unsigned int nargs = 0;
        vector<ArgumentType> arguments;
        string const opt1 = rtrim(ltrim(o1, "["), "]");
        if (isStrUnsignedInt(opt1)) {
                // The command has arguments
                nargs = convert<unsigned int>(opt1);
-               for (unsigned int i = 0; i < optionalsNum; ++i) {
+               if (nargs > 0 && o2) {
+                       // The first argument is optional
                        arguments.push_back(optional);
                        --nargs;
                }
@@ -471,6 +472,8 @@ int main(int argc, char * argv[])
 {
        using namespace lyx;
 
+       //setlocale(LC_CTYPE, "");
+
        lyxerr.setStream(cerr);
 
        easyParse(argc, argv);
@@ -483,7 +486,8 @@ int main(int argc, char * argv[])
 
        os::init(argc, argv);
 
-       try { init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
+       try {
+               init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
                cl_system_support, cl_user_support,
                top_build_dir_is_two_levels_up);
        } catch (ExceptionMessage const & message) {