tex2lyx: support for subfloats

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

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 8f373d83edb59a699e8ef5e4a22978dfcfd02f5a..8e3809cadcaf2eee13f48fc610a9b7106e15c0c2 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -11,6 +11,7 @@
 // {[(
 
 #include <config.h>
+#include <version.h>
 
 #include "tex2lyx.h"
 
@@ -58,6 +59,22 @@ namespace Alert {
 }
 
 
+// Dummy texrow support
+void TexRow::newline()
+{}
+
+
+void TexRow::newlines(int)
+{}
+
+
+// Dummy LyXRC support
+class LyXRC {
+public:
+       string icon_set;
+} lyxrc;
+
+
 // Dummy translation support
 Messages messages_;
 Messages const & getMessages(std::string const &)
@@ -77,21 +94,9 @@ void lyx_exit(int)
 {}
 
 
-string const trim(string const & a, char const * p)
+string const trimSpaceAndEol(string const & a)
 {
-       // LASSERT(p, /**/);
-
-       if (a.empty() || !*p)
-               return a;
-
-       size_t r = a.find_last_not_of(p);
-       size_t l = a.find_first_not_of(p);
-
-       // Is this the minimal test? (lgb)
-       if (r == string::npos && l == string::npos)
-               return string();
-
-       return a.substr(l, r - l + 1);
+       return trim(a, " \t\n\r");
 }
 
 
@@ -144,6 +149,7 @@ CommandMap known_environments;
 CommandMap known_math_environments;
 FullCommandMap possible_textclass_commands;
 FullEnvironmentMap possible_textclass_environments;
+int const LYX_FORMAT = LYX_FORMAT_TEX2LYX;
 
 /// used modules
 LayoutModuleList used_modules;
@@ -448,13 +454,33 @@ int parse_help(string const &, string const &)
                "\t-n                 translate a noweb (aka literate programming) file.\n"
                "\t-roundtrip         re-export created .lyx file infile.lyx.lyx to infile.lyx.tex.\n"
                "\t-s syntaxfile      read additional syntax file.\n"
-               "\t-sysdir dir        Set system directory to DIR.\n"
-               "\t-userdir DIR       Set user directory to DIR."
+               "\t-sysdir SYSDIR     Set system directory to SYSDIR.\n"
+               "\t                   Default: " << package().system_support() << "\n"
+               "\t-userdir USERDIR   Set user directory to USERDIR.\n"
+               "\t                   Default: " << package().user_support() << "\n"
+               "\t-version           Summarize version and build info.\n"
+               "Paths:\n"
+               "\tThe program searches for the files \"encodings\", \"lyxmodules.lst\",\n"
+               "\t\"textclass.lst\", \"syntax.default\", and \"unicodesymbols\", first in\n"
+               "\t\"USERDIR\", then in \"SYSDIR\". The subdirectories \"USERDIR/layouts\"\n"
+               "\tand \"SYSDIR/layouts\" are searched for layout and module files.\n"
+               "Check the tex2lyx man page for more details."
             << endl;
        exit(error_code);
 }
 
 
+int parse_version(string const &, string const &)
+{
+       lyxerr << "tex2lyx " << lyx_version
+              << " (" << lyx_release_date << ")" << endl;
+       lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
+
+       lyxerr << lyx_version_info << endl;
+       exit(error_code);
+}
+
+
 void error_message(string const & message)
 {
        cerr << "tex2lyx: " << message << "\n\n";
@@ -539,12 +565,16 @@ void easyParse(int & argc, char * argv[])
 {
        map<string, cmd_helper> cmdmap;
 
+       cmdmap["-h"] = parse_help;
+       cmdmap["-help"] = parse_help;
+       cmdmap["--help"] = parse_help;
+       cmdmap["-v"] = parse_version;
+       cmdmap["-version"] = parse_version;
+       cmdmap["--version"] = parse_version;
        cmdmap["-c"] = parse_class;
        cmdmap["-e"] = parse_encoding;
        cmdmap["-f"] = parse_force;
        cmdmap["-s"] = parse_syntaxfile;
-       cmdmap["-help"] = parse_help;
-       cmdmap["--help"] = parse_help;
        cmdmap["-n"] = parse_noweb;
        cmdmap["-sysdir"] = parse_sysdir;
        cmdmap["-userdir"] = parse_userdir;
@@ -608,11 +638,22 @@ namespace {
  *  You must ensure that \p parentFilePath is properly set before calling
  *  this function!
  */
-void tex2lyx(idocstream & is, ostream & os, string const & encoding)
-{
+void tex2lyx(idocstream & is, ostream & os, string encoding)
+{
+       // Set a sensible default encoding.
+       // This is used until an encoding command is found.
+       // For child documents use the encoding of the master, else latin1,
+       // since latin1 does not cause an iconv error if the actual encoding
+       // is different (bug 7509).
+       if (encoding.empty()) {
+               if (h_inputencoding == "auto")
+                       encoding = "latin1";
+               else
+                       encoding = h_inputencoding;
+       }
+
        Parser p(is);
-       if (!encoding.empty())
-               p.setEncoding(encoding);
+       p.setEncoding(encoding);
        //p.dump();
 
        ostringstream ps;
@@ -739,6 +780,15 @@ int main(int argc, char * argv[])
 
        os::init(argc, argv);
 
+       try {
+               init_package(internal_path(os::utf8_argv(0)), string(), string());
+       } catch (ExceptionMessage const & message) {
+               cerr << to_utf8(message.title_) << ":\n"
+                    << to_utf8(message.details_) << endl;
+               if (message.type_ == ErrorException)
+                       return EXIT_FAILURE;
+       }
+
        easyParse(argc, argv);
 
        if (argc <= 1) 
@@ -746,8 +796,7 @@ int main(int argc, char * argv[])
 
        try {
                init_package(internal_path(os::utf8_argv(0)),
-                            cl_system_support, cl_user_support,
-                            top_build_dir_is_two_levels_up);
+                            cl_system_support, cl_user_support);
        } catch (ExceptionMessage const & message) {
                cerr << to_utf8(message.title_) << ":\n"
                     << to_utf8(message.details_) << endl;