X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=2ef209fc42305fc03731aa0a84da5197c6637535;hb=5bfd1c22d25e992ff0519931e1fb5590fc1e9024;hp=ceb4e92ed3d0cad4ce5e7069bdc33eb645fd253f;hpb=f775add258e8c20de7216694d16c36a701afdec5;p=lyx.git diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index ceb4e92ed3..2ef209fc42 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -25,12 +25,10 @@ #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" @@ -49,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"); @@ -254,7 +205,7 @@ typedef map ModuleMap; ModuleMap modules; -bool addModule(string const module, LayoutFile const & baseClass, LayoutModuleList & m, vector & visited) +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(); @@ -446,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; @@ -536,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) { @@ -561,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; @@ -573,12 +532,13 @@ 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 literate programming (noweb, sweave,... ) file.\n" @@ -603,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); } @@ -647,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()) @@ -728,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; @@ -811,6 +783,20 @@ bool skipChildren() } +bool roundtripMode() +{ + return roundtrip; +} + + +string fixedEncoding() +{ + if (fixed_encoding) + return default_encoding; + return ""; +} + + namespace { /*! @@ -826,17 +812,20 @@ 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(); @@ -1070,8 +1059,13 @@ int main(int argc, char * argv[]) 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();