-#include <config.h>
+/**
+ * \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.
+ */
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
#include "chset.h"
-#include "support/filetools.h"
-#include "support/lyxlib.h"
+
#include "debug.h"
+#include "support/convert.h"
+#include "support/filetools.h"
+
#include <boost/regex.hpp>
#include <fstream>
-using std::ifstream;
-using std::getline;
-using std::pair;
-using std::make_pair;
-using std::endl;
-using boost::regex;
-using boost::regex_match;
+using lyx::support::libFileSearch;
-#ifndef USE_INCLUDED_STRING
+using boost::regex;
using boost::smatch;
-#else
-using boost::cmatch;
-#endif
+using std::endl;
+using std::getline;
+using std::make_pair;
+
+using std::ifstream;
+using std::pair;
+using std::string;
bool CharacterSet::loadFile(string const & fname)
// open definition file
lyxerr[Debug::KBMAP]
<< "Reading character set file " << fname << ".cdef" << endl;
- string const filename = LibFileSearch("kbd", fname, "cdef");
+ string const filename = libFileSearch("kbd", fname, "cdef");
ifstream ifs(filename.c_str());
if (!ifs) {
lyxerr << "Unable to open character set file" << endl;
// 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;
-#else
- cmatch sub;
-#endif
- if (regex_match(STRCONV(line), sub, reg)) {
- int const n = lyx::atoi(STRCONV(sub.str(1)));
- string const str = STRCONV(sub.str(2));
+ if (regex_match(line, sub, reg)) {
+ int const n = convert<int>(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);
}