another compile fix from herbert

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index a6ac394b4be33c1a47b4d3ad55709251fe9b2acd..20e28319c5bb4b3b01cbb0ff5178bfb123de6015 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -4,29 +4,40 @@
 #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_.erase();
-       
-       if (fname.empty() || fname == "ascii") 
-               return true;    // ascii 7-bit
-       
+
+       // ascii 7-bit
+       if (fname.empty() || fname == "ascii")
+               return true;
+
        // open definition file
        lyxerr[Debug::KBMAP]
                << "Reading character set file " << fname << ".cdef" << endl;
@@ -37,20 +48,22 @@ bool CharacterSet::loadFile(string const & fname)
                return true;            // no definition, use 7-bit ascii
        }
        name_ = fname;
-       
+
        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);
-                       int const n = lyx::atoi(line.substr(sub[1].first,
-                                                 sub[1].second));
-                       string const 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;
@@ -70,7 +83,7 @@ pair<bool, int> const CharacterSet::encodeString(string const & 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")