X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=cbdd7500b6b9e0c4dcc7b03eec19d75b66a1cd71;hb=59449063dfba5f29fe46b8f497ce5d5dffc9b99a;hp=384c22836d02e6ab4a113a193d60c2000caf20c8;hpb=24181cf28e697c88be5fc7308a8ad016169012bc;p=lyx.git diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 384c22836d..cbdd7500b6 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -24,18 +24,19 @@ #include "Preamble.h" #include "TextClass.h" +#include "support/ConsoleApplication.h" #include "support/convert.h" -#include "support/debug.h" #include "support/ExceptionMessage.h" #include "support/filetools.h" #include "support/lassert.h" #include "support/lstrings.h" -#include "support/Messages.h" #include "support/os.h" #include "support/Package.h" #include "support/Systemcall.h" #include +#include +#include #include #include #include @@ -48,53 +49,6 @@ using namespace lyx::support::os; namespace lyx { -namespace frontend { -namespace Alert { - void warning(docstring const & title, docstring const & message, - bool const &) - { - LYXERR0(title); - LYXERR0(message); - } -} -} - - -// 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 &) -{ - return messages_; -} - - -Messages const & getGuiMessages() -{ - return messages_; -} - - -// Keep the linker happy on Windows -void lyx_exit(int) -{} - - string const trimSpaceAndEol(string const & a) { return trim(a, " \t\n\r"); @@ -150,10 +104,12 @@ CommandMap known_environments; CommandMap known_math_environments; FullCommandMap possible_textclass_commands; FullEnvironmentMap possible_textclass_environments; +FullCommandMap possible_textclass_theorems; int const LYX_FORMAT = LYX_FORMAT_TEX2LYX; /// used modules LayoutModuleList used_modules; +vector preloaded_modules; void convertArgs(string const & o1, bool o2, vector & arguments) @@ -205,6 +161,17 @@ void add_known_environment(string const & environment, string const & o1, } +void add_known_theorem(string const & theorem, string const & o1, + bool o2, docstring const & definition) +{ + vector arguments; + convertArgs(o1, o2, arguments); + if (!definition.empty()) + possible_textclass_theorems[theorem] = + FullCommand(arguments, definition); +} + + Layout const * findLayoutWithoutModule(TextClass const & textclass, string const & name, bool command) { @@ -234,28 +201,79 @@ InsetLayout const * findInsetLayoutWithoutModule(TextClass const & textclass, } -bool checkModule(string const & name, bool command) -{ - // Cache to avoid slowdown by repated searches - static set failed[2]; +namespace { - // Only add the module if the command was actually defined in the LyX preamble - if (command) { - if (possible_textclass_commands.find('\\' + name) == possible_textclass_commands.end()) - return false; - } else { - if (possible_textclass_environments.find(name) == possible_textclass_environments.end()) - return false; +typedef map ModuleMap; +ModuleMap modules; + + +bool addModule(string const & module, LayoutFile const & baseClass, LayoutModuleList & m, vector & visited) +{ + // avoid endless loop for circular dependency + vector::const_iterator const vb = visited.begin(); + vector::const_iterator const ve = visited.end(); + if (find(vb, ve, module) != ve) { + cerr << "Circular dependency detected for module " << module << '\n'; + return false; } - if (failed[command].find(name) != failed[command].end()) + LyXModule const * const lm = theModuleList[module]; + if (!lm) { + cerr << "Could not find module " << module << " in module list.\n"; + return false; + } + bool foundone = false; + LayoutModuleList::const_iterator const exclmodstart = baseClass.excludedModules().begin(); + LayoutModuleList::const_iterator const exclmodend = baseClass.excludedModules().end(); + LayoutModuleList::const_iterator const provmodstart = baseClass.providedModules().begin(); + LayoutModuleList::const_iterator const provmodend = baseClass.providedModules().end(); + vector const reqs = lm->getRequiredModules(); + if (reqs.empty()) + foundone = true; + else { + LayoutModuleList::const_iterator mit = m.begin(); + LayoutModuleList::const_iterator men = m.end(); + vector::const_iterator rit = reqs.begin(); + vector::const_iterator ren = reqs.end(); + for (; rit != ren; ++rit) { + if (find(mit, men, *rit) != men) { + foundone = true; + break; + } + if (find(provmodstart, provmodend, *rit) != provmodend) { + foundone = true; + break; + } + } + if (!foundone) { + visited.push_back(module); + for (rit = reqs.begin(); rit != ren; ++rit) { + if (find(exclmodstart, exclmodend, *rit) == exclmodend) { + if (addModule(*rit, baseClass, m, visited)) { + foundone = true; + break; + } + } + } + visited.pop_back(); + } + } + if (!foundone) { + cerr << "Could not add required modules for " << module << ".\n"; + return false; + } + if (!m.moduleCanBeAdded(module, &baseClass)) return false; + m.push_back(module); + return true; +} + +void initModules() +{ // Create list of dummy document classes if not already done. // This is needed since a module cannot be read on its own, only as // part of a document class. LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()]; - typedef map ModuleMap; - static ModuleMap modules; static bool init = true; if (init) { baseClass.load(); @@ -264,14 +282,62 @@ bool checkModule(string const & name, bool command) for (; it != end; ++it) { string const module = it->getID(); LayoutModuleList m; - // FIXME this excludes all modules that depend on another one - if (!m.moduleCanBeAdded(module, &baseClass)) + LayoutModuleList c; + vector v; + if (!addModule(module, baseClass, m, v)) continue; - m.push_back(module); - modules[module] = getDocumentClass(baseClass, m); + modules[module] = getDocumentClass(baseClass, m, c); } init = false; } +} + + +bool addModule(string const & module) +{ + initModules(); + LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()]; + if (!used_modules.moduleCanBeAdded(module, &baseClass)) + return false; + FileName layout_file = libFileSearch("layouts", module, "module"); + if (textclass.read(layout_file, TextClass::MODULE)) { + used_modules.push_back(module); + // speed up further searches: + // the module does not need to be checked anymore. + ModuleMap::iterator const it = modules.find(module); + if (it != modules.end()) + modules.erase(it); + return true; + } + return false; +} + +} // namespace + + +bool checkModule(string const & name, bool command) +{ + // Cache to avoid slowdown by repated searches + static set failed[2]; + + // Only add the module if the command was actually defined in the LyX preamble + bool theorem = false; + if (command) { + if (possible_textclass_commands.find('\\' + name) == possible_textclass_commands.end()) + return false; + } else { + if (possible_textclass_environments.find(name) == possible_textclass_environments.end()) { + if (possible_textclass_theorems.find(name) != possible_textclass_theorems.end()) + theorem = true; + else + return false; + } + } + if (failed[command].find(name) != failed[command].end()) + return false; + + initModules(); + LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()]; // Try to find a module that defines the command. // Only add it if the definition can be found in the preamble of the @@ -283,13 +349,13 @@ bool checkModule(string const & name, bool command) ModuleMap::iterator const end = modules.end(); for (ModuleMap::iterator it = modules.begin(); it != end; ++it) { string const module = it->first; - if (!used_modules.moduleCanBeAdded(module, &baseClass)) + if (used_modules.moduleConflicts(module, &baseClass)) continue; if (findLayoutWithoutModule(textclass, name, command)) continue; if (findInsetLayoutWithoutModule(textclass, name, command)) continue; - DocumentClassConstPtr c = it->second; + DocumentClassConstPtr c = it->second; Layout const * layout = findLayoutWithoutModule(*c, name, command); InsetLayout const * insetlayout = layout ? 0 : findInsetLayoutWithoutModule(*c, name, command); @@ -306,6 +372,11 @@ bool checkModule(string const & name, bool command) possible_textclass_commands['\\' + name]; if (preamble.find(cmd.def) != docstring::npos) add = true; + } else if (theorem) { + FullCommand const & thm = + possible_textclass_theorems[name]; + if (preamble.find(thm.def) != docstring::npos) + add = true; } else { FullEnvironment const & env = possible_textclass_environments[name]; @@ -329,10 +400,16 @@ bool checkModule(string const & name, bool command) } +bool isProvided(string const & name) +{ + // This works only for features that are named like the LaTeX packages + return textclass.provides(name) || preamble.isPackageUsed(name); +} + + bool noweb_mode = false; bool pdflatex = false; bool xetex = false; -bool have_CJK = false; bool is_nonCJKJapanese = false; bool roundtrip = false; @@ -408,19 +485,19 @@ void read_environment(Parser & p, string const & begin, * has almost all of them listed. For the same reason the reLyX-specific * reLyXre environment is ignored. */ -void read_syntaxfile(FileName const & file_name) +bool read_syntaxfile(FileName const & file_name) { ifdocstream is(file_name.toFilesystemEncoding().c_str()); if (!is.good()) { cerr << "Could not open syntax file \"" << file_name << "\" for reading." << endl; - exit(2); + return false; } // We can use our TeX parser, since the syntax of the layout file is // modeled after TeX. // Unknown tokens are just silently ignored, this helps us to skip some // reLyX specific things. - Parser p(is); + Parser p(is, string()); while (p.good()) { Token const & t = p.get_token(); if (t.cat() == catEscape) { @@ -440,30 +517,74 @@ void read_syntaxfile(FileName const & file_name) } } } + return true; } string documentclass; string default_encoding; +bool fixed_encoding = false; string syntaxfile; bool copy_files = false; bool overwrite_files = false; +bool skip_children = false; int error_code = 0; /// return the number of arguments consumed typedef int (*cmd_helper)(string const &, string const &); +class StopException : public exception +{ + public: + StopException(int status) : status_(status) {} + int status() const { return status_; } + private: + int status_; +}; + + +/// The main application class +class TeX2LyXApp : public ConsoleApplication +{ +public: + TeX2LyXApp(int & argc, char * argv[]) + : ConsoleApplication("tex2lyx" PROGRAM_SUFFIX, argc, argv), + argc_(argc), argv_(argv) + { + } + void doExec() + { + try { + int const exit_status = run(); + exit(exit_status); + } + catch (StopException & e) { + exit(e.status()); + } + } +private: + void easyParse(); + /// Do the real work + int run(); + int & argc_; + char ** argv_; +}; + + int parse_help(string const &, string const &) { - cerr << "Usage: tex2lyx [options] infile.tex [outfile.lyx]\n" + cout << "Usage: tex2lyx [options] infile.tex [outfile.lyx]\n" "Options:\n" "\t-c textclass Declare the textclass.\n" + "\t-m mod1[,mod2...] Load the given modules.\n" "\t-copyfiles Copy all included files to the directory of outfile.lyx.\n" "\t-e encoding Set the default encoding (latex name).\n" + "\t-fixedenc encoding Like -e, but ignore encoding changing commands while parsing.\n" "\t-f Force overwrite of .lyx files.\n" "\t-help Print this message and quit.\n" - "\t-n translate a noweb (aka literate programming) file.\n" + "\t-n translate literate programming (noweb, sweave,... ) file.\n" + "\t-skipchildren Do not translate included child documents.\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 SYSDIR Set system directory to SYSDIR.\n" @@ -478,25 +599,24 @@ int parse_help(string const &, string const &) "\tand \"SYSDIR/layouts\" are searched for layout and module files.\n" "Check the tex2lyx man page for more details." << endl; - exit(error_code); + throw StopException(error_code); } int parse_version(string const &, string const &) { - lyxerr << "tex2lyx " << lyx_version - << " (" << lyx_release_date << ")" << endl; - lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl; + cout << "tex2lyx " << lyx_version + << " (" << lyx_release_date << ")" << endl; - lyxerr << lyx_version_info << endl; - exit(error_code); + cout << lyx_version_info << endl; + throw StopException(error_code); } void error_message(string const & message) { cerr << "tex2lyx: " << message << "\n\n"; - error_code = 1; + error_code = EXIT_FAILURE; parse_help(string(), string()); } @@ -510,6 +630,15 @@ int parse_class(string const & arg, string const &) } +int parse_module(string const & arg, string const &) +{ + if (arg.empty()) + error_message("Missing modules string after -m switch"); + split(arg, preloaded_modules, ','); + return 1; +} + + int parse_encoding(string const & arg, string const &) { if (arg.empty()) @@ -519,6 +648,16 @@ int parse_encoding(string const & arg, string const &) } +int parse_fixed_encoding(string const & arg, string const &) +{ + if (arg.empty()) + error_message("Missing encoding string after -fixedenc switch"); + default_encoding = arg; + fixed_encoding = true; + return 1; +} + + int parse_syntaxfile(string const & arg, string const &) { if (arg.empty()) @@ -566,6 +705,13 @@ int parse_noweb(string const &, string const &) } +int parse_skipchildren(string const &, string const &) +{ + skip_children = true; + return 0; +} + + int parse_roundtrip(string const &, string const &) { roundtrip = true; @@ -580,7 +726,7 @@ int parse_copyfiles(string const &, string const &) } -void easyParse(int & argc, char * argv[]) +void TeX2LyXApp::easyParse() { map cmdmap; @@ -591,38 +737,41 @@ void easyParse(int & argc, char * argv[]) cmdmap["-version"] = parse_version; cmdmap["--version"] = parse_version; cmdmap["-c"] = parse_class; + cmdmap["-m"] = parse_module; cmdmap["-e"] = parse_encoding; + cmdmap["-fixedenc"] = parse_fixed_encoding; cmdmap["-f"] = parse_force; cmdmap["-s"] = parse_syntaxfile; cmdmap["-n"] = parse_noweb; + cmdmap["-skipchildren"] = parse_skipchildren; cmdmap["-sysdir"] = parse_sysdir; cmdmap["-userdir"] = parse_userdir; cmdmap["-roundtrip"] = parse_roundtrip; cmdmap["-copyfiles"] = parse_copyfiles; - for (int i = 1; i < argc; ++i) { + for (int i = 1; i < argc_; ++i) { map::const_iterator it - = cmdmap.find(argv[i]); + = cmdmap.find(argv_[i]); // don't complain if not found - may be parsed later if (it == cmdmap.end()) { - if (argv[i][0] == '-') - error_message(string("Unknown option `") + argv[i] + "'."); + if (argv_[i][0] == '-') + error_message(string("Unknown option `") + argv_[i] + "'."); else continue; } - string arg = (i + 1 < argc) ? os::utf8_argv(i + 1) : string(); - string arg2 = (i + 2 < argc) ? os::utf8_argv(i + 2) : string(); + string arg = (i + 1 < argc_) ? os::utf8_argv(i + 1) : string(); + string arg2 = (i + 2 < argc_) ? os::utf8_argv(i + 2) : string(); int const remove = 1 + it->second(arg, arg2); // Now, remove used arguments by shifting // the following ones remove places down. os::remove_internal_args(i, remove); - argc -= remove; - for (int j = i; j < argc; ++j) - argv[j] = argv[j + remove]; + argc_ -= remove; + for (int j = i; j < argc_; ++j) + argv_[j] = argv_[j + remove]; --i; } } @@ -668,6 +817,18 @@ bool overwriteFiles() } +bool skipChildren() +{ + return skip_children; +} + + +bool roundtripMode() +{ + return roundtrip; +} + + namespace { /*! @@ -679,34 +840,46 @@ namespace { * You must ensure that \p parentFilePathTeX is properly set before calling * this function! */ -bool tex2lyx(idocstream & is, ostream & os, string encoding) +bool tex2lyx(idocstream & is, ostream & os, string const & encoding, + string const & outfiledir) { - // 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 (preamble.inputencoding() == "auto") - encoding = "latin1"; - else - encoding = preamble.inputencoding(); - } - - Parser p(is); + Parser p(is, fixed_encoding ? default_encoding : string()); p.setEncoding(encoding); //p.dump(); preamble.parse(p, documentclass, textclass); + list removed_modules; + LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()]; + if (!used_modules.adaptToBaseClass(&baseClass, removed_modules)) { + cerr << "Could not load default modules for text class." << endl; + return false; + } + + // Load preloaded modules. + // This needs to be done after the preamble is parsed, since the text + // class may not be known before. It neds to be done before parsing + // body, since otherwise the commands/environments provided by the + // modules would be parsed as ERT. + for (size_t i = 0; i < preloaded_modules.size(); ++i) { + if (!addModule(preloaded_modules[i])) { + cerr << "Error: Could not load module \"" + << preloaded_modules[i] << "\"." << endl; + return false; + } + } + // Ensure that the modules are not loaded again for included files + preloaded_modules.clear(); active_environments.push_back("document"); Context context(true, textclass); stringstream ss; // store the document language in the context to be able to handle the // commands like \foreignlanguage and \textenglish etc. - context.font.language = preamble.language(); + context.font.language = preamble.defaultLanguage(); // parse the main text parse_text(p, ss, FLAG_END, true, context); + // check if we need a commented bibtex inset (biblatex) + check_comment_bib(ss, context); if (Context::empty) // Empty document body. LyX needs at least one paragraph. context.check_layout(ss); @@ -721,8 +894,8 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding) for (; it != end; ++it) preamble.addModule(*it); } - if (!preamble.writeLyXHeader(os, !active_environments.empty())) { - cerr << "Could write LyX file header." << endl; + if (!preamble.writeLyXHeader(os, !active_environments.empty(), outfiledir)) { + cerr << "Could not write LyX file header." << endl; return false; } @@ -740,11 +913,45 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding) /// convert TeX from \p infilename to LyX and write it to \p os -bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding) +bool tex2lyx(FileName const & infilename, ostream & os, string encoding, + string const & outfiledir) { - ifdocstream is; + // Set a sensible default encoding. + // This is used until an encoding command is found. + // For child documents use the encoding of the master, else try to + // detect it from the preamble, since setting an encoding of an open + // fstream does currently not work on OS X. + // Always start with ISO-8859-1, (formerly known by its latex name + // latin1), since ISO-8859-1 does not cause an iconv error if the + // actual encoding is different (bug 7509). + if (encoding.empty()) { + Encoding const * enc = 0; + if (preamble.inputencoding() == "auto") { + ifdocstream is(setEncoding("ISO-8859-1")); + // forbid buffering on this stream + is.rdbuf()->pubsetbuf(0, 0); + is.open(infilename.toFilesystemEncoding().c_str()); + if (is.good()) { + Parser ep(is, string()); + ep.setEncoding("ISO-8859-1"); + Preamble encodingpreamble; + string const e = encodingpreamble + .parseEncoding(ep, documentclass); + if (!e.empty()) + enc = encodings.fromLyXName(e, true); + } + } else + enc = encodings.fromLyXName( + preamble.inputencoding(), true); + if (enc) + encoding = enc->iconvName(); + else + encoding = "ISO-8859-1"; + } + + ifdocstream is(setEncoding(encoding)); // forbid buffering on this stream - is.rdbuf()->pubsetbuf(0,0); + is.rdbuf()->pubsetbuf(0, 0); is.open(infilename.toFilesystemEncoding().c_str()); if (!is.good()) { cerr << "Could not open input file \"" << infilename @@ -753,7 +960,7 @@ bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding) } string const oldParentFilePath = parentFilePathTeX; parentFilePathTeX = onlyPath(infilename.absFileName()); - bool retval = tex2lyx(is, os, encoding); + bool retval = tex2lyx(is, os, encoding, outfiledir); parentFilePathTeX = oldParentFilePath; return retval; } @@ -761,7 +968,7 @@ bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding) } // anonymous namespace -bool tex2lyx(string const & infilename, FileName const & outfilename, +bool tex2lyx(string const & infilename, FileName const & outfilename, string const & encoding) { if (outfilename.isReadableFile()) { @@ -786,7 +993,8 @@ bool tex2lyx(string const & infilename, FileName const & outfilename, cerr << "Input file: " << infilename << "\n"; cerr << "Output file: " << outfilename << "\n"; #endif - return tex2lyx(FileName(infilename), os, encoding); + return tex2lyx(FileName(infilename), os, encoding, + outfilename.onlyPath().absFileName() + '/'); } @@ -814,18 +1022,13 @@ bool tex2tex(string const & infilename, FileName const & outfilename, return false; } -} // namespace lyx +namespace { -int main(int argc, char * argv[]) +int TeX2LyXApp::run() { - using namespace lyx; - - //setlocale(LC_CTYPE, ""); - - lyxerr.setStream(cerr); - - os::init(argc, argv); + // qt changes this, and our numeric conversions require the C locale + setlocale(LC_NUMERIC, "C"); try { init_package(internal_path(os::utf8_argv(0)), string(), string()); @@ -836,9 +1039,9 @@ int main(int argc, char * argv[]) return EXIT_FAILURE; } - easyParse(argc, argv); + easyParse(); - if (argc <= 1) + if (argc_ <= 1) error_message("Not enough arguments."); try { @@ -851,13 +1054,29 @@ int main(int argc, char * argv[]) return EXIT_FAILURE; } + // Check that user LyX directory is ok. + FileName const sup = package().user_support(); + if (sup.exists() && sup.isDirectory()) { + string const lock_file = package().getConfigureLockName(); + int fd = fileLock(lock_file.c_str()); + if (configFileNeedsUpdate("lyxrc.defaults") || + configFileNeedsUpdate("lyxmodules.lst") || + configFileNeedsUpdate("textclass.lst") || + configFileNeedsUpdate("packages.lst") || + configFileNeedsUpdate("lyxciteengines.lst") || + configFileNeedsUpdate("xtemplates.lst")) + package().reconfigureUserLyXDir(""); + fileUnlock(fd, lock_file.c_str()); + } else + error_message("User directory does not exist."); + // Now every known option is parsed. Look for input and output // file name (the latter is optional). string infilename = internal_path(os::utf8_argv(1)); infilename = makeAbsPath(infilename).absFileName(); string outfilename; - if (argc > 2) { + if (argc_ > 2) { outfilename = internal_path(os::utf8_argv(2)); if (outfilename != "-") outfilename = makeAbsPath(outfilename).absFileName(); @@ -888,26 +1107,35 @@ int main(int argc, char * argv[]) cerr << "Error: Could not find syntax file \"syntax.default\"." << endl; return EXIT_FAILURE; } - read_syntaxfile(system_syntaxfile); + if (!read_syntaxfile(system_syntaxfile)) + return 2; if (!syntaxfile.empty()) - read_syntaxfile(makeAbsPath(syntaxfile)); + if (!read_syntaxfile(makeAbsPath(syntaxfile))) + return 2; // Read the encodings table. FileName const symbols_path = libFileSearch(string(), "unicodesymbols"); if (symbols_path.empty()) { - cerr << "Error: Could not find file \"unicodesymbols\"." + cerr << "Error: Could not find file \"unicodesymbols\"." << endl; return EXIT_FAILURE; } FileName const enc_path = libFileSearch(string(), "encodings"); if (enc_path.empty()) { - cerr << "Error: Could not find file \"encodings\"." + cerr << "Error: Could not find file \"encodings\"." << endl; return EXIT_FAILURE; } encodings.read(enc_path, symbols_path); - if (!default_encoding.empty() && !encodings.fromLaTeXName(default_encoding)) - error_message("Unknown LaTeX encoding `" + default_encoding + "'"); + if (!default_encoding.empty()) { + Encoding const * const enc = encodings.fromLaTeXName( + default_encoding, Encoding::any, true); + if (!enc) + error_message("Unknown LaTeX encoding `" + default_encoding + "'"); + default_encoding = enc->iconvName(); + if (fixed_encoding) + preamble.setInputencoding(enc->name()); + } // Load the layouts LayoutFileList::get().read(); @@ -920,19 +1148,45 @@ int main(int argc, char * argv[]) if (outfilename == "-") { // assume same directory as input file masterFilePathLyX = masterFilePathTeX; - if (tex2lyx(FileName(infilename), cout, default_encoding)) + if (tex2lyx(FileName(infilename), cout, default_encoding, masterFilePathLyX)) return EXIT_SUCCESS; } else { masterFilePathLyX = onlyPath(outfilename); + if (copy_files) { + FileName const path(masterFilePathLyX); + if (!path.isDirectory()) { + if (!path.createPath()) { + cerr << "Warning: Could not create directory for file `" + << masterFilePathLyX << "´." << endl; + return EXIT_FAILURE; + } + } + } if (roundtrip) { if (tex2tex(infilename, FileName(outfilename), default_encoding)) return EXIT_SUCCESS; } else { - if (tex2lyx(infilename, FileName(outfilename), default_encoding)) + if (lyx::tex2lyx(infilename, FileName(outfilename), default_encoding)) return EXIT_SUCCESS; } } return EXIT_FAILURE; } +} // anonymous namespace +} // namespace lyx + + +int main(int argc, char * argv[]) +{ + //setlocale(LC_CTYPE, ""); + + lyx::lyxerr.setStream(cerr); + + os::init(argc, &argv); + + lyx::TeX2LyXApp app(argc, argv); + return app.exec(); +} + // }])