#include "support/lyxalgo.h"
#include "support/lstrings.h"
+#include <functional>
+
using lyx::support::compare_ascii_no_case;
-using lyx::support::getExtFromContents;
-using lyx::support::MakeDisplayPath;
+using lyx::support::getFormatFromContents;
+using lyx::support::makeDisplayPath;
using lyx::support::split;
using lyx::support::subst;
using std::istream;
using std::ostream;
-// namespace {
-struct compare_tags {
+namespace {
+
+class compare_tags
+ : public std::binary_function<keyword_item, keyword_item, bool> {
+public:
// used by lower_bound, sort and sorted
- inline
- int operator()(keyword_item const & a, keyword_item const & b) const {
+ bool operator()(keyword_item const & a, keyword_item const & b) const
+ {
// we use the ascii version, because in turkish, 'i'
// is not the lowercase version of 'I', and thus
// turkish locale breaks parsing of tags.
return compare_ascii_no_case(a.tag, b.tag) < 0;
}
};
-// } // end of anon namespace
+
+} // end of anon namespace
LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
{
string const tmpmsg = subst(message, "$$Token", getString());
lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
- << " of file " << MakeDisplayPath(name) << ']' << endl;
+ << " of file " << makeDisplayPath(name) << ']' << endl;
}
bool LyXLex::Pimpl::setFile(string const & filename)
{
-
// Check the format of the file.
- string const format = getExtFromContents(filename);
+ string const format = getFormatFromContents(filename);
if (format == "gzip" || format == "zip" || format == "compress") {
lyxerr[Debug::LYXLEX] << "lyxlex: compressed" << endl;
+#ifdef USE_COMPRESSION
// 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)
name = filename;
lineno = 0;
return gz_.is_open() && is.good();
+#else
+ return false;
+#endif
} else {
lyxerr[Debug::LYXLEX] << "lyxlex: UNcompressed" << endl;