mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 15:24:05 +00:00
Full-text search: handle more block tags
This commit is contained in:
parent
ce0b2768ee
commit
11b333c2e8
|
@ -152,11 +152,11 @@ QString unescape( QString const & str, bool saveFormat )
|
|||
if( !saveFormat )
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
|
||||
tmp.replace( QRegularExpression( "<(?:\\s*(?:div|h[1-6]|p(?![alr])|br|li(?![ns])|td|blockquote|/ol))[^>]{0,}>",
|
||||
tmp.replace( QRegularExpression( "<(?:\\s*/?(?:div|h[1-6r]|p(?![alr])|br|li(?![ns])|td|blockquote|[uo]l|pre|d[dl]|nav|address))[^>]{0,}>",
|
||||
QRegularExpression::CaseInsensitiveOption ), " " );
|
||||
tmp.remove( QRegularExpression( "<[^>]*>" ) );
|
||||
#else
|
||||
tmp.replace( QRegExp( "<(?:\\s*(?:div|h[1-6]|p(?![alr])|br|li(?![ns])|td|blockquote|/ol))[^>]{0,}>",
|
||||
tmp.replace( QRegExp( "<(?:\\s*/?(?:div|h[1-6r]|p(?![alr])|br|li(?![ns])|td|blockquote|[uo]l|pre|d[dl]|nav|address))[^>]{0,}>",
|
||||
Qt::CaseInsensitive, QRegExp::RegExp2 ), " " );
|
||||
tmp.remove( QRegExp( "<[^>]*>", Qt::CaseSensitive, QRegExp::RegExp2 ) );
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue