X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=c27f0c0886e8217e8b29973e441adf2d5c9147ff;hb=d9e4ced1d417f99c4cfc277fffd05ae7ebe97b3c;hp=32a06c6bde868e717e1b00c1ce217fe77ea36a07;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 32a06c6bde..c27f0c0886 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -13,62 +13,52 @@ #include #include "tex2lyx.h" -#include "Context.h" -#include "TextClass.h" +#include "Context.h" +#include "Encoding.h" #include "Layout.h" +#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/lyxlib.h" +#include "support/Messages.h" #include "support/os.h" #include "support/Package.h" -#include "support/unicode.h" -#include +#include #include #include #include #include #include +using namespace std; +using namespace lyx::support; +using namespace lyx::support::os; namespace lyx { -using std::endl; -using std::cout; -using std::cerr; -using std::getline; - -using std::ifstream; -using std::ofstream; -using std::istringstream; -using std::ostringstream; -using std::stringstream; -using std::string; -using std::vector; -using std::map; - -using support::changeExtension; -using support::FileName; -using support::isStrUnsignedInt; -using support::ltrim; -using support::makeAbsPath; -using support::onlyPath; -using support::os::internal_path; -using support::rtrim; +// Dummy translation support +Messages messages_; +Messages & getMessages(std::string const &) +{ + return messages_; +} -// Hacks to allow the thing to link in the lyxlayout stuff -LayoutPtr captionlayout; +Messages & getGuiMessages() +{ + return messages_; +} string const trim(string const & a, char const * p) { - // BOOST_ASSERT(p); + // LASSERT(p, /**/); if (a.empty() || !*p) return a; @@ -227,7 +217,7 @@ void read_environment(Parser & p, string const & begin, */ void read_syntaxfile(FileName const & file_name) { - ifstream is(file_name.toFilesystemEncoding().c_str()); + ifdocstream is(file_name.toFilesystemEncoding().c_str()); if (!is.good()) { cerr << "Could not open syntax file \"" << file_name << "\" for reading." << endl; @@ -261,9 +251,10 @@ void read_syntaxfile(FileName const & file_name) string documentclass; +string default_encoding; string syntaxfile; bool overwrite_files = false; - +int error_code = 0; /// return the number of arguments consumed typedef int (*cmd_helper)(string const &, string const &); @@ -271,36 +262,51 @@ typedef int (*cmd_helper)(string const &, string const &); int parse_help(string const &, string const &) { - cerr << "Usage: tex2lyx [ command line switches ] []\n" - "Command line switches (case sensitive):\n" - "\t-help summarize tex2lyx usage\n" - "\t-f Force creation of .lyx files even if they exist already\n" - "\t-userdir dir try to set user directory to dir\n" - "\t-sysdir dir try to set system directory to dir\n" - "\t-c textclass declare the textclass\n" + cerr << "Usage: tex2lyx [options] infile.tex [outfile.lyx]\n" + "Options:\n" + "\t-c textclass Declare the textclass.\n" + "\t-e encoding Set the default encoding (latex name).\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-s syntaxfile read additional syntax file" << endl; - exit(0); + "\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." + << endl; + exit(error_code); +} + + +void error_message(string const & message) +{ + cerr << "tex2lyx: " << message << "\n\n"; + error_code = 1; + parse_help(string(), string()); } int parse_class(string const & arg, string const &) { - if (arg.empty()) { - cerr << "Missing textclass string after -c switch" << endl; - exit(1); - } + if (arg.empty()) + error_message("Missing textclass string after -c switch"); documentclass = arg; return 1; } +int parse_encoding(string const & arg, string const &) +{ + if (arg.empty()) + error_message("Missing encoding string after -e switch"); + default_encoding = arg; + return 1; +} + + int parse_syntaxfile(string const & arg, string const &) { - if (arg.empty()) { - cerr << "Missing syntaxfile string after -s switch" << endl; - exit(1); - } + if (arg.empty()) + error_message("Missing syntaxfile string after -s switch"); syntaxfile = internal_path(arg); return 1; } @@ -314,10 +320,8 @@ string cl_user_support; int parse_sysdir(string const & arg, string const &) { - if (arg.empty()) { - cerr << "Missing directory for -sysdir switch" << endl; - exit(1); - } + if (arg.empty()) + error_message("Missing directory for -sysdir switch"); cl_system_support = internal_path(arg); return 1; } @@ -325,10 +329,8 @@ int parse_sysdir(string const & arg, string const &) int parse_userdir(string const & arg, string const &) { - if (arg.empty()) { - cerr << "Missing directory for -userdir switch" << endl; - exit(1); - } + if (arg.empty()) + error_message("Missing directory for -userdir switch"); cl_user_support = internal_path(arg); return 1; } @@ -353,6 +355,7 @@ void easyParse(int & argc, char * argv[]) map cmdmap; cmdmap["-c"] = parse_class; + cmdmap["-e"] = parse_encoding; cmdmap["-f"] = parse_force; cmdmap["-s"] = parse_syntaxfile; cmdmap["-help"] = parse_help; @@ -362,12 +365,16 @@ void easyParse(int & argc, char * argv[]) cmdmap["-userdir"] = parse_userdir; for (int i = 1; i < argc; ++i) { - std::map::const_iterator it + map::const_iterator it = cmdmap.find(argv[i]); // don't complain if not found - may be parsed later - if (it == cmdmap.end()) - continue; + if (it == cmdmap.end()) { + if (argv[i][0] == '-') + error_message(string("Unknown option `") + argv[i] + "'."); + else + continue; + } string arg(to_utf8(from_local8bit((i + 1 < argc) ? argv[i + 1] : ""))); string arg2(to_utf8(from_local8bit((i + 2 < argc) ? argv[i + 2] : ""))); @@ -414,14 +421,16 @@ namespace { * You must ensure that \p parentFilePath is properly set before calling * this function! */ -void tex2lyx(std::istream & is, std::ostream & os) +void tex2lyx(idocstream & is, ostream & os, string const & encoding) { Parser p(is); + if (!encoding.empty()) + p.setEncoding(encoding); //p.dump(); stringstream ss; - TextClass textclass = parse_preamble(p, ss, documentclass); - captionlayout = LayoutPtr(Layout::forCaption()); + TeX2LyXDocClass textclass; + parse_preamble(p, ss, documentclass, textclass); active_environments.push_back("document"); Context context(true, textclass); @@ -436,7 +445,7 @@ void tex2lyx(std::istream & is, std::ostream & os) os << ss.str(); #ifdef TEST_PARSER p.reset(); - ofstream parsertest("parsertest.tex"); + ofdocstream parsertest("parsertest.tex"); while (p.good()) parsertest << p.get_token().asInput(); // and parsertest.tex should now have identical content @@ -445,9 +454,12 @@ void tex2lyx(std::istream & is, std::ostream & os) /// convert TeX from \p infilename to LyX and write it to \p os -bool tex2lyx(FileName const & infilename, std::ostream & os) +bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding) { - ifstream is(infilename.toFilesystemEncoding().c_str()); + ifdocstream is; + // forbid buffering on this stream + is.rdbuf()->pubsetbuf(0,0); + is.open(infilename.toFilesystemEncoding().c_str()); if (!is.good()) { cerr << "Could not open input file \"" << infilename << "\" for reading." << endl; @@ -455,7 +467,7 @@ bool tex2lyx(FileName const & infilename, std::ostream & os) } string const oldParentFilePath = parentFilePath; parentFilePath = onlyPath(infilename.absFilename()); - tex2lyx(is, os); + tex2lyx(is, os, encoding); parentFilePath = oldParentFilePath; return true; } @@ -463,7 +475,8 @@ bool tex2lyx(FileName const & infilename, std::ostream & os) } // anonymous namespace -bool tex2lyx(string const & infilename, FileName const & outfilename) +bool tex2lyx(string const & infilename, FileName const & outfilename, + string const & encoding) { if (outfilename.isReadableFile()) { if (overwrite_files) { @@ -487,7 +500,7 @@ bool tex2lyx(string const & infilename, FileName const & outfilename) cerr << "Input file: " << infilename << "\n"; cerr << "Output file: " << outfilename << "\n"; #endif - return tex2lyx(FileName(infilename), os); + return tex2lyx(FileName(infilename), os, encoding); } } // namespace lyx @@ -497,33 +510,32 @@ int main(int argc, char * argv[]) { using namespace lyx; - lyxerr.setStream(std::cerr); + //setlocale(LC_CTYPE, ""); - easyParse(argc, argv); + lyxerr.setStream(cerr); - if (argc <= 1) { - cerr << "Usage: tex2lyx [ command line switches ] []\n" - "See tex2lyx -help." << endl; - return 2; - } + easyParse(argc, argv); - lyx::support::os::init(argc, argv); + if (argc <= 1) + error_message("Not enough arguments."); + os::init(argc, argv); - try { support::init_package(internal_path(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) { + try { + init_package(internal_path(to_utf8(from_local8bit(argv[0]))), + cl_system_support, cl_user_support, + top_build_dir_is_two_levels_up); + } catch (ExceptionMessage const & message) { cerr << to_utf8(message.title_) << ":\n" - << to_utf8(message.details_) << endl; - if (message.type_ == support::ErrorException) + << to_utf8(message.details_) << endl; + if (message.type_ == ErrorException) exit(1); } - + // Now every known option is parsed. Look for input and output // file name (the latter is optional). string infilename = internal_path(to_utf8(from_local8bit(argv[1]))); infilename = makeAbsPath(infilename).absFilename(); - + string outfilename; if (argc > 2) { outfilename = internal_path(to_utf8(from_local8bit(argv[2]))); @@ -532,7 +544,8 @@ int main(int argc, char * argv[]) } else outfilename = changeExtension(infilename, ".lyx"); - FileName const system_syntaxfile = lyx::support::libFileSearch("", "syntax.default"); + // Read the syntax tables + FileName const system_syntaxfile = libFileSearch("", "syntax.default"); if (system_syntaxfile.empty()) { cerr << "Error: Could not find syntax file \"syntax.default\"." << endl; exit(1); @@ -541,16 +554,33 @@ int main(int argc, char * argv[]) if (!syntaxfile.empty()) read_syntaxfile(makeAbsPath(syntaxfile)); + // Read the encodings table. + FileName const symbols_path = libFileSearch(string(), "unicodesymbols"); + if (symbols_path.empty()) { + cerr << "Error: Could not find file \"unicodesymbols\"." + << endl; + exit(1); + } + FileName const enc_path = libFileSearch(string(), "encodings"); + if (enc_path.empty()) { + cerr << "Error: Could not find file \"encodings\"." + << endl; + exit(1); + } + encodings.read(enc_path, symbols_path); + if (!default_encoding.empty() && !encodings.fromLaTeXName(default_encoding)) + error_message("Unknown LaTeX encoding `" + default_encoding + "'"); + + // The real work now. masterFilePath = onlyPath(infilename); parentFilePath = masterFilePath; - if (outfilename == "-") { - if (tex2lyx(FileName(infilename), cout)) + if (tex2lyx(FileName(infilename), cout, default_encoding)) return EXIT_SUCCESS; else return EXIT_FAILURE; } else { - if (tex2lyx(infilename, FileName(outfilename))) + if (tex2lyx(infilename, FileName(outfilename), default_encoding)) return EXIT_SUCCESS; else return EXIT_FAILURE;