X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=2815485bf16d60108bb78784eee91429a96496fd;hb=98c966c64594611e469313314abd1e59524adb4a;hp=94ed5a3b68ef7793907b76d278b635949db35a70;hpb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index 94ed5a3b68..2815485bf1 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -10,37 +10,48 @@
 #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();
-	
-	if (fname.empty() || fname == "ascii") 
-		return true;	// ascii 7-bit
-	
+	name_.erase();
+
+	// ascii 7-bit
+	if (fname.empty() || fname == "ascii")
+		return true;
+
 	// 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;
@@ -52,11 +63,20 @@ bool CharacterSet::loadFile(string const & fname)
 }
 
 
-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);
 }