#endif
#include <fstream>
-using std::ifstream;
#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;
+using std::getline;
+using std::pair;
+using std::make_pair;
+using std::endl;
+
bool CharacterSet::loadFile(string const & fname)
{
map_.clear();
- name_.clear();
+ name_.erase();
if (fname.empty() || fname == "ascii")
return true; // ascii 7-bit
// open definition file
lyxerr[Debug::KBMAP]
- << "Reading keymap file " << fname << ".cdef" << endl;
- string filename = LibFileSearch("kbd", fname.c_str(), "cdef");
+ << "Reading character set file " << fname << ".cdef" << endl;
+ string const filename = LibFileSearch("kbd", fname, "cdef");
ifstream ifs(filename.c_str());
if (!ifs) {
- lyxerr << "Unable to open keymap file" << endl;
+ lyxerr << "Unable to open character set file" << endl;
return true; // no definition, use 7-bit ascii
}
name_ = fname;
- string str;
- int n;
string line;
+ // Ok, I'll be the first to admit that this is probably not
+ // 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]+\"([^ ]+)\".*");
- while(getline(ifs, line)) {
+ while (getline(ifs, line)) {
if (reg.exact_match(line)) {
LRegex::SubMatches const & sub = reg.exec(line);
- n = atoi(line.substr(sub[1].first,
- sub[1].second).c_str());
- str = LSubstring(line, sub[2].first, sub[2].second);
+ int const n = lyx::atoi(line.substr(sub[1].first,
+ sub[1].second));
+ string const str = LSubstring(line, sub[2].first,
+ sub[2].second);
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "Chardef: " << n
<< " to [" << str << "]" << endl;
}
-bool CharacterSet::encodeString(string & str) const
+pair<bool, int> const CharacterSet::encodeString(string const & str) const
{
+ lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
+ bool ret = false;
+ int val = 0;
Cdef::const_iterator cit = map_.find(str);
- if (cit != map_.end()) return true;
- return false;
+ if (cit != map_.end()) {
+ ret = true;
+ val = cit->second;
+ }
+ lyxerr[Debug::KBMAP] << " "
+ << (ret ? "yes we" : "no we don't")
+ << " know [" << str << "]" << endl;
+ return make_pair(ret, val);
}