X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=2ef209fc42305fc03731aa0a84da5197c6637535;hb=5bfd1c22d25e992ff0519931e1fb5590fc1e9024;hp=756177463340788be00e1c31169c8db8a2538e94;hpb=46a5f60d3d0a13197dd52bdb23d3067607bca994;p=lyx.git diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 7561774633..2ef209fc42 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -25,17 +25,16 @@ #include "TextClass.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 @@ -48,53 +47,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,6 +102,7 @@ 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 @@ -206,6 +159,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) { @@ -239,6 +203,69 @@ namespace { 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; + } + 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. @@ -253,10 +280,9 @@ void initModules() 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)) + vector v; + if (!addModule(module, baseClass, m, v)) continue; - m.push_back(module); modules[module] = getDocumentClass(baseClass, m); } init = false; @@ -292,12 +318,17 @@ bool checkModule(string const & name, bool command) 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()) - return false; + 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; @@ -315,7 +346,7 @@ 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; @@ -338,6 +369,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]; @@ -361,6 +397,13 @@ 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; @@ -451,7 +494,7 @@ void read_syntaxfile(FileName const & file_name) // 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) { @@ -476,6 +519,7 @@ void read_syntaxfile(FileName const & file_name) string documentclass; string default_encoding; +bool fixed_encoding = false; string syntaxfile; bool copy_files = false; bool overwrite_files = false; @@ -488,15 +532,16 @@ typedef int (*cmd_helper)(string const &, string const &); 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" @@ -518,11 +563,12 @@ int parse_help(string const &, string const &) 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; + cout << "Built on " << lyx_build_date << ", " << lyx_build_time + << endl; - lyxerr << lyx_version_info << endl; + cout << lyx_version_info << endl; exit(error_code); } @@ -562,6 +608,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()) @@ -643,6 +699,7 @@ void easyParse(int & argc, char * argv[]) 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; @@ -726,6 +783,20 @@ bool skipChildren() } +bool roundtripMode() +{ + return roundtrip; +} + + +string fixedEncoding() +{ + if (fixed_encoding) + return default_encoding; + return ""; +} + + namespace { /*! @@ -741,21 +812,30 @@ bool 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). + // For child documents use the encoding of the master, else ISO8859-1, + // (formerly known by its latex name latin1), since ISO8859-1 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(); + encoding = "ISO8859-1"; + else { + Encoding const * const enc = encodings.fromLyXName( + preamble.inputencoding(), true); + encoding = enc->iconvName(); + } } - 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 @@ -795,7 +875,7 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding) preamble.addModule(*it); } if (!preamble.writeLyXHeader(os, !active_environments.empty())) { - cerr << "Could write LyX file header." << endl; + cerr << "Could not write LyX file header." << endl; return false; } @@ -834,7 +914,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()) { @@ -911,7 +991,7 @@ int main(int argc, char * argv[]) easyParse(argc, argv); - if (argc <= 1) + if (argc <= 1) error_message("Not enough arguments."); try { @@ -968,19 +1048,24 @@ int main(int argc, char * argv[]) // 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(); + } // Load the layouts LayoutFileList::get().read();