hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

fix:mdict compact html parse style error

Browse source
This commit is contained in:
Xiao YiFang 2022-06-16 08:00:24 +08:00
parent 5fa479b127
commit f52251d640
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
mdictparser.cc
View file

@ -336,6 +336,23 @@ bool MdictParser::readHeader( QDataStream & in )
headerTextUtf16.clear();
in.setByteOrder( QDataStream::BigEndian );
//parse stylesheet
QString styleSheets;
if( headerText.contains( "StyleSheet" ) )
{
// a workaround to bypass https://bugreports.qt.io/browse/QTBUG-102612
QRegularExpression rx( "StyleSheet=\"([^\"]*?)\"", QRegularExpression::CaseInsensitiveOption );
auto match = rx.match( headerText );
if( match.hasMatch() || match.hasPartialMatch() )
{
styleSheets = match.captured( 1 );
}
}
//with this control character ,qt6.x can not parse attribute value.
headerText.remove(QRegularExpression("\\p{C}"));
@ -355,32 +372,14 @@ bool MdictParser::readHeader( QDataStream & in )
// styleId # 1-255
// style.prefix
// style.suffix
if ( headerAttributes.contains( "StyleSheet" ) )
if ( !styleSheets.isEmpty() )
{
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
//a workaround to bypass https://bugreports.qt.io/browse/QTBUG-102612
QRegularExpression rx( "StyleSheet=\"([^\"]*?)\"", QRegularExpression::CaseInsensitiveOption );
auto match = rx.match( headerText );
QString styleSheets;
if( match.hasMatch() || match.hasPartialMatch() )
{
styleSheets = match.captured( 1 );
}
#else
QString styleSheets = headerAttributes.namedItem( "StyleSheet" ).toAttr().value();
#endif
QStringList lines = styleSheets.split( QRegularExpression( "[\r\n]" ), Qt::KeepEmptyParts );
for( int i = 0; i < lines.size() - 3; i += 3 )
{
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
styleSheets_[ lines[ i ].toInt() ] =
pair< QString, QString >( Html::fromHtmlEscaped( lines[ i + 1 ] ), Html::fromHtmlEscaped( lines[ i + 2 ] ) );
#else
styleSheets_[ lines[ i ].toInt() ] = pair< QString, QString >( lines[ i + 1 ], lines[ i + 2 ] );
#endif
pair( Html::fromHtmlEscaped( lines[ i + 1 ] ), Html::fromHtmlEscaped( lines[ i + 2 ] ) );
}
}