X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.cpp;h=6a44f9bf9790eef4dcf61bb44b3d3e31bb0fe5b4;hb=28f43b18963a5088529d4ac7c165fa95e62fd02b;hp=1a2c0926b405ac350918548ba35c55e294379e57;hpb=138b23fac84930cdbfada0067c61480989041113;p=lyx.git diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 1a2c0926b4..6a44f9bf97 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,74 +13,43 @@ #include #include "tex2lyx.h" -#include "Context.h" -#include "debug.h" -#include "LyXTextClass.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/fs_extras.h" +#include "support/lassert.h" #include "support/lstrings.h" -#include "support/lyxlib.h" -#include "support/ExceptionMessage.h" #include "support/os.h" #include "support/Package.h" -#include "support/unicode.h" - -#include -#include -#include -#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::rtrim; -using support::isFileReadable; - -namespace fs = boost::filesystem; - - -// Hacks to allow the thing to link in the lyxlayout stuff -LyXErr lyxerr(std::cerr.rdbuf()); - - string const trim(string const & a, char const * p) { - // BOOST_ASSERT(p); + // LASSERT(p, /**/); if (a.empty() || !*p) return a; - string::size_type r = a.find_last_not_of(p); - string::size_type l = a.find_first_not_of(p); + 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) @@ -104,7 +73,7 @@ void split(string const & s, vector & result, char delim) string join(vector const & input, char const * delim) { ostringstream os; - for (size_t i = 0; i < input.size(); ++i) { + for (size_t i = 0; i != input.size(); ++i) { if (i) os << delim; os << input[i]; @@ -175,7 +144,8 @@ namespace { /*! * Read one command definition from the syntax file */ -void read_command(Parser & p, string command, CommandMap & commands) { +void read_command(Parser & p, string command, CommandMap & commands) +{ if (p.next_token().asInput() == "*") { p.get_token(); command += '*'; @@ -232,7 +202,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; @@ -271,7 +241,7 @@ bool overwrite_files = false; /// return the number of arguments consumed -typedef boost::function cmd_helper; +typedef int (*cmd_helper)(string const &, string const &); int parse_help(string const &, string const &) @@ -306,7 +276,7 @@ int parse_syntaxfile(string const & arg, string const &) cerr << "Missing syntaxfile string after -s switch" << endl; exit(1); } - syntaxfile = arg; + syntaxfile = internal_path(arg); return 1; } @@ -323,7 +293,7 @@ int parse_sysdir(string const & arg, string const &) cerr << "Missing directory for -sysdir switch" << endl; exit(1); } - cl_system_support = arg; + cl_system_support = internal_path(arg); return 1; } @@ -334,7 +304,7 @@ int parse_userdir(string const & arg, string const &) cerr << "Missing directory for -userdir switch" << endl; exit(1); } - cl_user_support = arg; + cl_user_support = internal_path(arg); return 1; } @@ -367,7 +337,7 @@ 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 @@ -419,13 +389,14 @@ 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) { Parser p(is); //p.dump(); stringstream ss; - LyXTextClass textclass = parse_preamble(p, ss, documentclass); + TeX2LyXDocClass textclass; + parse_preamble(p, ss, documentclass, textclass); active_environments.push_back("document"); Context context(true, textclass); @@ -440,7 +411,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 @@ -449,9 +420,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) { - 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; @@ -467,9 +441,9 @@ 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) { - if (isFileReadable(outfilename)) { + if (outfilename.isReadableFile()) { if (overwrite_files) { cerr << "Overwriting existing file " << outfilename << endl; @@ -500,7 +474,10 @@ bool tex2lyx(string const &infilename, FileName const &outfilename) int main(int argc, char * argv[]) { using namespace lyx; - fs::path::default_name_check(fs::no_check); + + //setlocale(LC_CTYPE, ""); + + lyxerr.setStream(cerr); easyParse(argc, argv); @@ -510,30 +487,34 @@ int main(int argc, char * argv[]) return 2; } - lyx::support::os::init(argc, argv); + os::init(argc, argv); - try { support::init_package(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 const infilename = makeAbsPath(to_utf8(from_local8bit(argv[1]))).absFilename(); + string infilename = internal_path(to_utf8(from_local8bit(argv[1]))); + infilename = makeAbsPath(infilename).absFilename(); + string outfilename; if (argc > 2) { - outfilename = to_utf8(from_local8bit(argv[2])); + outfilename = internal_path(to_utf8(from_local8bit(argv[2]))); if (outfilename != "-") - outfilename = makeAbsPath(to_utf8(from_local8bit(argv[2]))).absFilename(); + outfilename = makeAbsPath(outfilename).absFilename(); } 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); @@ -542,9 +523,24 @@ 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); + + // The real work now. masterFilePath = onlyPath(infilename); parentFilePath = masterFilePath; - if (outfilename == "-") { if (tex2lyx(FileName(infilename), cout)) return EXIT_SUCCESS;