#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "chset.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include <fstream>
+using namespace lyx::support;
+
using std::ifstream;
using std::getline;
using std::pair;
using std::endl;
using boost::regex;
using boost::regex_match;
+
+#ifndef USE_INCLUDED_STRING
using boost::smatch;
+#else
+using boost::cmatch;
+#endif
+
bool CharacterSet::loadFile(string const & fname)
// without the use of a keyword table.
regex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
while (getline(ifs, line)) {
+#ifndef USE_INCLUDED_STRING
smatch sub;
- if (regex_match(line, sub, reg)) {
- int const n = lyx::atoi(sub.str(1));
- string const str = sub.str(2);
+#else
+ cmatch sub;
+#endif
+ if (regex_match(STRCONV(line), sub, reg)) {
+ int const n = atoi(STRCONV(sub.str(1)));
+ string const str = STRCONV(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);
}