Merge branch 'master' into android

Conflicts:
	README.md
This commit is contained in:
Reece H. Dunn
2014-02-27 12:51:01 +00:00
117 changed files with 312308 additions and 10804 deletions
+10 -10
View File
@@ -2529,6 +2529,16 @@ f_input = f_in; // for GetC etc
linelength++;
if((j = lookupwchar2(tr->chars_ignore,c1)) != 0)
{
if(j == 1)
{
// ignore this character (eg. zero-width-non-joiner U+200C)
continue;
}
c1 = j; // replace the character
}
if(iswalnum(c1))
any_alnum = 1;
else
@@ -2541,16 +2551,6 @@ f_input = f_in; // for GetC etc
c2 = ' ';
}
if((j = lookupwchar2(tr->chars_ignore,c1)) != 0)
{
if(j == 1)
{
// ignore this character (eg. zero-width-non-joiner U+200C)
continue;
}
c1 = j; // replace the character
}
if(c1 == 0xf0b)
c1 = ' '; // Tibet inter-syllabic mark, ?? replace by space ??