X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=20e28319c5bb4b3b01cbb0ff5178bfb123de6015;hb=9833278ed8cd7f85dbabcfe0e2e8747c5db2db3d;hp=b2b6a5ebe02757300af8c65f57d422823e55b044;hpb=77e706c44175f3cf71473a42d5db890c77b3b7b3;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index b2b6a5ebe0..20e28319c5 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -4,52 +4,66 @@
 #pragma implementation
 #endif
 
-#include <fstream>
-
 #include "chset.h"
 #include "support/filetools.h"
-#include "support/LRegex.h"
-#include "support/LSubstring.h"
+#include "support/lyxlib.h"
 #include "debug.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;
+
+#ifndef USE_INCLUDED_STRING
+using boost::smatch;
+#else
+using boost::cmatch;
+#endif
+
+
 
 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 character set file " << fname << ".cdef" << endl;
-	string filename = LibFileSearch("kbd", fname.c_str(), "cdef");
+	string const filename = LibFileSearch("kbd", fname, "cdef");
 	ifstream ifs(filename.c_str());
 	if (!ifs) {
 		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)) {
-		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);
+	// 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 (lyxerr.debugging(Debug::KBMAP))
 				lyxerr << "Chardef: " << n
 				       << " to [" << str << "]" << endl;
@@ -61,7 +75,7 @@ bool CharacterSet::loadFile(string const & fname)
 }
 
 
-pair<bool, int> 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;
@@ -69,7 +83,7 @@ pair<bool, int> CharacterSet::encodeString(string & str) const
 	Cdef::const_iterator cit = map_.find(str);
 	if (cit != map_.end()) {
 		ret =  true;
-		val = (*cit).second;
+		val = cit->second;
 	}
 	lyxerr[Debug::KBMAP] << "   "
 			     << (ret ? "yes we" : "no we don't")