diff -Nru goldendict-1.5.0~rc2+git20210309/article_maker.cc goldendict-1.5.0~rc2+git20210630/article_maker.cc --- goldendict-1.5.0~rc2+git20210309/article_maker.cc 2020-11-05 20:39:20.000000000 +0000 +++ goldendict-1.5.0~rc2+git20210630/article_maker.cc 2021-07-02 16:24:28.630231000 +0000 @@ -256,7 +256,8 @@ return result; } -sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor(QString const & inWord, unsigned groupId, +sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor( + Config::InputPhrase const & phrase, unsigned groupId, QMap< QString, QString > const & contexts, QSet< QString > const & mutedDicts, QStringList const & dictIDs , bool ignoreDiacritics ) const @@ -282,9 +283,9 @@ break; } - string header = makeHtmlHeader( inWord.trimmed(), QString(), true ); + string header = makeHtmlHeader( phrase.phrase, QString(), true ); - return new ArticleRequest( inWord.trimmed(), "", + return new ArticleRequest( phrase, "", contexts, ftsDicts, header, -1, true ); } @@ -292,9 +293,9 @@ if ( groupId == Instances::Group::HelpGroupId ) { // This is a special group containing internal welcome/help pages - string result = makeHtmlHeader( inWord, QString(), needExpandOptionalParts ); + string result = makeHtmlHeader( phrase.phrase, QString(), needExpandOptionalParts ); - if ( inWord == tr( "Welcome!" ) ) + if ( phrase.phrase == tr( "Welcome!" ) ) { result += tr( "