Skip to content

Commit a8479a7

Browse files
committed
Merge branch 'master' of github.com:doxygen/doxygen
2 parents 9defcc3 + fe16958 commit a8479a7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/docnode.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ DocRef::DocRef(DocParser *parser,DocNodeVariant *parent,const QCString &target,c
763763
(compound->definitionType()==Definition::TypeFile ||
764764
compound->definitionType()==Definition::TypePage ? TRUE : FALSE) :
765765
FALSE;
766+
if (compound && lang==SrcLangExt::Markdown) lang = compound->getLanguage();
766767
m_text = linkToText(lang,target,isFile);
767768
m_anchor = anchor;
768769
if (compound && compound->isLinkable()) // ref to compound

src/index.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4935,7 +4935,7 @@ static void writeIndex(OutputList &ol)
49354935
ol.startTitleHead(QCString());
49364936
ol.generateDoc(Doxygen::mainPage->docFile(),Doxygen::mainPage->getStartBodyLine(),
49374937
Doxygen::mainPage.get(),nullptr,Doxygen::mainPage->title(),false,false,
4938-
QCString(),true,false,Config_getBool(MARKDOWN_SUPPORT),false);
4938+
QCString(),true,false);
49394939
headerWritten = TRUE;
49404940
}
49414941
}
@@ -4971,8 +4971,7 @@ static void writeIndex(OutputList &ol)
49714971
ol.startTextBlock();
49724972
ol.generateDoc(defFileName,defLine,Doxygen::mainPage.get(),nullptr,
49734973
Doxygen::mainPage->documentation(),true,false,
4974-
QCString(),false,false,
4975-
Config_getBool(MARKDOWN_SUPPORT),false);
4974+
QCString(),false,false);
49764975
ol.endTextBlock();
49774976
ol.endPageDoc();
49784977
}

src/moduledef.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ void ModuleDefImpl::writeDeclarationLink(OutputList &ol,bool &found,const QCStri
896896
auto ast { validatingParseDoc(
897897
*parser.get(),briefFile(),briefLine(),this,nullptr,
898898
briefDescription(),FALSE,FALSE,
899-
QCString(),TRUE,FALSE,Config_getBool(MARKDOWN_SUPPORT)) };
899+
QCString(),TRUE,FALSE) };
900900
if (!ast->isEmpty())
901901
{
902902
ol.startMemberDescription(anchor());

0 commit comments

Comments
 (0)