add config.h

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

diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 3ca623d1d2dc1206b99e0712383716f4b087f3a0..0f0c45fc90971db8618294e538118c8b460425b0 100644 (file)
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -23,6 +23,7 @@
 #include "support/fs_extras.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
+#include "support/ExceptionMessage.h"
 #include "support/os.h"
 #include "support/package.h"
 #include "support/unicode.h"
@@ -381,8 +382,8 @@ void easyParse(int & argc, char * argv[])
                if (it == cmdmap.end())
                        continue;
 
-               string arg((i + 1 < argc) ? argv[i + 1] : "");
-               string arg2((i + 2 < argc) ? argv[i + 2] : "");
+               string arg(to_utf8(from_local8bit((i + 1 < argc) ? argv[i + 1] : "")));
+               string arg2(to_utf8(from_local8bit((i + 2 < argc) ? argv[i + 2] : "")));
 
                int const remove = 1 + it->second(arg, arg2);
 
@@ -456,17 +457,16 @@ void tex2lyx(std::istream &is, std::ostream &os)
 
 
 /// convert TeX from \p infilename to LyX and write it to \p os
-bool tex2lyx(string const &infilename, std::ostream &os)
+bool tex2lyx(FileName const & infilename, std::ostream &os)
 {
-       BOOST_ASSERT(lyx::support::absolutePath(infilename));
-       ifstream is(infilename.c_str());
+       ifstream is(infilename.toFilesystemEncoding().c_str());
        if (!is.good()) {
                cerr << "Could not open input file \"" << infilename
                     << "\" for reading." << endl;
                return false;
        }
        string const oldParentFilePath = parentFilePath;
-       parentFilePath = onlyPath(infilename);
+       parentFilePath = onlyPath(infilename.absFilename());
        tex2lyx(is, os);
        parentFilePath = oldParentFilePath;
        return true;
@@ -499,7 +499,7 @@ bool tex2lyx(string const &infilename, FileName const &outfilename)
        cerr << "Input file: " << infilename << "\n";
        cerr << "Output file: " << outfilename << "\n";
 #endif
-       return tex2lyx(infilename, os);
+       return tex2lyx(FileName(infilename), os);
 }
 
 } // namespace lyx
@@ -519,17 +519,25 @@ int main(int argc, char * argv[])
        }
 
        lyx::support::os::init(argc, argv);
-       lyx::support::init_package(argv[0], cl_system_support, cl_user_support,
-                                  lyx::support::top_build_dir_is_two_levels_up);
+
+       try { support::init_package(to_utf8(from_local8bit(argv[0])),
+               cl_system_support, cl_user_support,
+               support::top_build_dir_is_two_levels_up);
+       } catch (support::ExceptionMessage const & message) {
+               cerr << to_utf8(message.title_) << ":\n"
+                       << to_utf8(message.details_) << endl;
+               if (message.type_ == support::ErrorException)
+                       exit(1);
+       }
 
        // Now every known option is parsed. Look for input and output
        // file name (the latter is optional).
-       string const infilename = makeAbsPath(argv[1]);
+       string const infilename = makeAbsPath(to_utf8(from_local8bit(argv[1]))).absFilename();
        string outfilename;
        if (argc > 2) {
-               outfilename = argv[2];
+               outfilename = to_utf8(from_local8bit(argv[2]));
                if (outfilename != "-")
-                       outfilename = makeAbsPath(argv[2]);
+                       outfilename = makeAbsPath(to_utf8(from_local8bit(argv[2]))).absFilename();
        } else
                outfilename = changeExtension(infilename, ".lyx");
 
@@ -540,13 +548,13 @@ int main(int argc, char * argv[])
        }
        read_syntaxfile(system_syntaxfile);
        if (!syntaxfile.empty())
-               read_syntaxfile(FileName(makeAbsPath(syntaxfile)));
+               read_syntaxfile(makeAbsPath(syntaxfile));
 
        masterFilePath = onlyPath(infilename);
        parentFilePath = masterFilePath;
 
        if (outfilename == "-") {
-               if (tex2lyx(infilename, cout))
+               if (tex2lyx(FileName(infilename), cout))
                        return EXIT_SUCCESS;
                else
                        return EXIT_FAILURE;