+/**
+ * \file lyxlex_pimpl.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
#include <config.h>
#include "lyxlex_pimpl.h"
+
#include "debug.h"
-#include "support/lyxalgo.h"
#include "support/filetools.h"
+#include "support/lyxalgo.h"
#include "support/lstrings.h"
-#include <algorithm>
-
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::getExtFromContents;
+using lyx::support::MakeDisplayPath;
+using lyx::support::split;
+using lyx::support::subst;
+using std::endl;
+using std::getline;
+using std::lower_bound;
using std::sort;
-using std::ostream;
+using std::string;
using std::ios;
using std::istream;
-using std::endl;
-using std::lower_bound;
-using std::vector;
-using std::getline;
+using std::ostream;
// namespace {
struct compare_tags {
void LyXLex::Pimpl::printTable(ostream & os)
{
- os << "\nNumber of tags: " << no_items << '\n';
+ os << "\nNumber of tags: " << no_items << endl;
for (int i= 0; i < no_items; ++i)
os << "table[" << i
<< "]: tag: `" << table[i].tag
lyxerr << "The table passed to LyXLex is not sorted!\n"
<< "Tell the developers to fix it!" << endl;
// We sort it anyway to avoid problems.
- lyxerr << "\nUnsorted:\n";
+ lyxerr << "\nUnsorted:" << endl;
printTable(lyxerr);
sort(table, table + no_items, compare_tags());
- lyxerr << "\nSorted:\n";
+ lyxerr << "\nSorted:" << endl;
printTable(lyxerr);
}
}
bool LyXLex::Pimpl::setFile(string const & filename)
{
- // Is this a compressed file or not?
- bool const compressed = (filename.substr(filename.size() - 3, 3) == ".gz");
- // The check only outputs a debug message, because it triggers
- // a bug in compaq cxx 6.2, where is_open() returns 'true' for a
- // fresh new filebuf. (JMarc)
- if (compressed) {
- lyxerr << "lyxlex: compressed" << endl;
+ // Check the format of the file.
+ string const format = getExtFromContents(filename);
+
+ if (format == "gzip" || format == "zip" || format == "compress") {
+ lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
- if (gz__.is_open() || is.tellg() > 0)
+ // The check only outputs a debug message, because it triggers
+ // a bug in compaq cxx 6.2, where is_open() returns 'true' for
+ // a fresh new filebuf. (JMarc)
+ if (gz__.is_open() || istream::off_type(is.tellg()) > -1)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
gz__.open(filename.c_str(), ios::in);
lineno = 0;
return gz__.is_open() && is.good();
} else {
- lyxerr << "lyxlex: UNcompressed" << endl;
+ lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;
- if (fb__.is_open() || is.tellg() > 0)
+ // The check only outputs a debug message, because it triggers
+ // a bug in compaq cxx 6.2, where is_open() returns 'true' for
+ // a fresh new filebuf. (JMarc)
+ if (fb__.is_open() || istream::off_type(is.tellg()) > 0)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
fb__.open(filename.c_str(), ios::in);
lineno = 0;
return fb__.is_open() && is.good();
}
-
}
void LyXLex::Pimpl::setStream(istream & i)
{
- if (fb__.is_open() || is.tellg() > 0)
+ if (fb__.is_open() || istream::off_type(is.tellg()) > 0)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setStream: "
"file or stream already set." << endl;
is.rdbuf(i.rdbuf());