+/**
+ * \file chset.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
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "chset.h"
-#include <fstream>
+#include "debug.h"
-#include "chset.h"
#include "support/filetools.h"
-#include "support/LRegex.h"
-#include "support/LSubstring.h"
#include "support/lyxlib.h"
-#include "debug.h"
-using std::ifstream;
+#include <boost/regex.hpp>
+
+#include <fstream>
+
+using lyx::support::atoi;
+using lyx::support::LibFileSearch;
+
+using boost::regex;
+using boost::smatch;
+
+using std::endl;
using std::getline;
-using std::pair;
using std::make_pair;
-using std::endl;
+
+using std::ifstream;
+using std::pair;
+using std::string;
+
bool CharacterSet::loadFile(string const & fname)
{
// the fastest way to parse the cdef files, but I though it
// was a bit neat. Anyway it is wrong to use the lyxlex parse
// without the use of a keyword table.
- LRegex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
+ regex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
while (getline(ifs, line)) {
- if (reg.exact_match(line)) {
- LRegex::SubMatches const & sub = reg.exec(line);
- int const n = lyx::atoi(line.substr(sub[1].first,
- sub[1].second));
- string const str = LSubstring(line, sub[2].first,
- sub[2].second);
+ smatch sub;
+ if (regex_match(line, sub, reg)) {
+ int const n = atoi(sub.str(1));
+ string const str = sub.str(2);
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "Chardef: " << n
- << " to [" << str << "]" << endl;
+ << " to [" << str << ']' << endl;
map_[str] = n;
}
}
pair<bool, int> const CharacterSet::encodeString(string const & str) const
{
- lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
+ lyxerr[Debug::KBMAP] << "Checking if we know [" << str << ']' << endl;
bool ret = false;
int val = 0;
Cdef::const_iterator cit = map_.find(str);
}
lyxerr[Debug::KBMAP] << " "
<< (ret ? "yes we" : "no we don't")
- << " know [" << str << "]" << endl;
+ << " know [" << str << ']' << endl;
return make_pair(ret, val);
}