make comma a normal wordsplit char

This commit is contained in:
Jean-Francois Dockes 2013-03-22 10:06:02 +01:00
parent 2418dd787c
commit 76f3288fc8

View file

@ -90,7 +90,7 @@ public:
for (i = 0; i < strlen(wild); i++) for (i = 0; i < strlen(wild); i++)
charclasses[int(wild[i])] = WILD; charclasses[int(wild[i])] = WILD;
char special[] = ".@+-,#'_\n\r\f"; char special[] = ".@+-#'_\n\r\f";
for (i = 0; i < strlen(special); i++) for (i = 0; i < strlen(special); i++)
charclasses[int(special[i])] = special[i]; charclasses[int(special[i])] = special[i];
@ -460,14 +460,12 @@ bool TextSplit::text_to_words(const string &in)
break; break;
case '.': case '.':
case ',':
{ {
// Need a little lookahead here. At worse this gets the end null // Need a little lookahead here. At worse this gets the end null
int nextc = it[it.getCpos()+1]; int nextc = it[it.getCpos()+1];
int nextwhat = whatcc(nextc); int nextwhat = whatcc(nextc);
if (m_inNumber) { if (m_inNumber) {
// we're eliminating 132.jpg here. Good idea ? if (nextwhat != DIGIT)
if (nextwhat != DIGIT && nextc != 'e' && nextc != 'E')
goto SPACE; goto SPACE;
m_wordLen += it.appendchartostring(m_span); m_wordLen += it.appendchartostring(m_span);
curspanglue = cc; curspanglue = cc;