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

fix: anchor #hashtag navigation failed to work

Browse source
This commit is contained in:
Xiao YiFang 2023-03-11 11:10:14 +08:00 committed by xiaoyifang
parent 61547dff03
commit eb5ae99da9
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mdx.cc
View file

@ -971,7 +971,6 @@ void MdxDictionary::replaceLinks( QString & id, const QString & articleId, QStri
QString articleNewText; QString articleNewText;
int linkPos = 0; int linkPos = 0;
QRegularExpressionMatchIterator it = RX::Mdx::allLinksRe.globalMatch( article ); QRegularExpressionMatchIterator it = RX::Mdx::allLinksRe.globalMatch( article );
QMap< QString, QString > idMap;
while( it.hasNext() ) while( it.hasNext() )
{ {
QRegularExpressionMatch allLinksMatch = it.next(); QRegularExpressionMatch allLinksMatch = it.next();
@ -988,23 +987,9 @@ void MdxDictionary::replaceLinks( QString & id, const QString & articleId, QStri
if( !linkType.isEmpty() && linkType.at( 0 ) == 'a' ) if( !linkType.isEmpty() && linkType.at( 0 ) == 'a' )
{ {
QRegularExpressionMatch match = RX::Mdx::anchorIdRe.match( linkTxt ); newLink = linkTxt;
if( match.hasMatch() )
{
auto wordMatch = RX::Mdx::anchorIdReWord.match( linkTxt );
if( wordMatch.hasMatch() )
{
idMap.insert( wordMatch.captured( 3 ), uniquePrefix + wordMatch.captured( 3 ) );
}
QString newText = match.captured( 1 ) + match.captured( 2 ) + uniquePrefix;
newLink = linkTxt.replace( match.capturedStart(), match.capturedLength(), newText );
}
else
newLink = linkTxt.replace( RX::Mdx::anchorIdRe2, "\\1\"" + uniquePrefix + "\\2\"" );
newLink = newLink.replace( RX::Mdx::anchorLinkRe, "\\1#" + uniquePrefix ); QRegularExpressionMatch match = RX::Mdx::audioRe.match( newLink );
match = RX::Mdx::audioRe.match( newLink );
if( match.hasMatch() ) if( match.hasMatch() )
{ {
// sounds and audio link script // sounds and audio link script
@ -1094,13 +1079,6 @@ void MdxDictionary::replaceLinks( QString & id, const QString & articleId, QStri
articleNewText += article.mid( linkPos ); articleNewText += article.mid( linkPos );
article = articleNewText; article = articleNewText;
} }
// some built-in javascript may reference this id. replace "idxxx" with "unique_idxxx"
foreach( const auto & key, idMap.keys() )
{
const auto & value = idMap[ key ];
article.replace( "\"" + key + "\"", "\"" + value + "\"" );
}
} }
void MdxDictionary::replaceStyleInHtml( QString & id, QString & article ) void MdxDictionary::replaceStyleInHtml( QString & id, QString & article )