Merge branch 'staged' into dev

This commit is contained in:
Xiao YiFang 2022-06-04 17:33:27 +08:00
commit fec256da4e

View file

@ -44,6 +44,12 @@ static QString makeHiliteRegExpString( QStringList const & words,
QString searchString( "(" ); QString searchString( "(" );
QString stripWords( "(?:\\W+\\w+){0," ); QString stripWords( "(?:\\W+\\w+){0," );
if( hasCJK )
{
stripWords = "(?:[\\W\\w]){0,";
}
if( distanceBetweenWords >= 0 ) if( distanceBetweenWords >= 0 )
stripWords += QString::number( distanceBetweenWords ); stripWords += QString::number( distanceBetweenWords );
stripWords += "}"; stripWords += "}";