Skip to content

Commit 0829265

Browse files
doxygendoxygen
authored
Merge pull request doxygen#11734 from albert-github/feature/bug_mj_source_files
Don't load Mathjax in source browser files
2 parents 4e3bfe1 + 30cee47 commit 0829265

25 files changed

+64
-63
lines changed

‎src/classdef.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2995,7 +2995,7 @@ void ClassDefImpl::writeDocumentation(OutputList &ol) const
29952995
{
29962996
memListFile = getMemberListFileName();
29972997
}
2998-
startFile(ol,getOutputFileBase(),name(),pageTitle,hli,!generateTreeView,QCString(),0,memListFile);
2998+
startFile(ol,getOutputFileBase(),false,name(),pageTitle,hli,!generateTreeView,QCString(),0,memListFile);
29992999
if (!generateTreeView)
30003000
{
30013001
if (getOuterScope()!=Doxygen::globalScope)
@@ -3143,7 +3143,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
31433143
}
31443144

31453145
QCString memListFile = getMemberListFileName();
3146-
startFile(ol,memListFile,memListFile,theTranslator->trMemberList(),hli,!generateTreeView,getOutputFileBase());
3146+
startFile(ol,memListFile,false,memListFile,theTranslator->trMemberList(),hli,!generateTreeView,getOutputFileBase());
31473147
if (!generateTreeView)
31483148
{
31493149
if (getOuterScope()!=Doxygen::globalScope)

‎src/conceptdef.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ void ConceptDefImpl::writeDocumentation(OutputList &ol)
529529
{
530530
pageTitle = theTranslator->trConceptReference(displayName());
531531
}
532-
startFile(ol,getOutputFileBase(),name(),pageTitle,HighlightedItem::ConceptVisible,!generateTreeView);
532+
startFile(ol,getOutputFileBase(),false,name(),pageTitle,HighlightedItem::ConceptVisible,!generateTreeView);
533533

534534
// ---- navigation part
535535
if (!generateTreeView)

‎src/dirdef.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ void DirDefImpl::writeDocumentation(OutputList &ol)
565565
title=theTranslator->trDirReference(m_dispName);
566566
}
567567
AUTO_TRACE("title={}",title);
568-
startFile(ol,getOutputFileBase(),name(),title,HighlightedItem::Files,!generateTreeView);
568+
startFile(ol,getOutputFileBase(),false,name(),title,HighlightedItem::Files,!generateTreeView);
569569

570570
if (!generateTreeView)
571571
{
@@ -957,7 +957,7 @@ void DirRelation::writeDocumentation(OutputList &ol)
957957
QCString title=theTranslator->trDirRelation(
958958
(m_src->displayName()+" -> "+m_dst->dir()->shortName()));
959959
AUTO_TRACE("title={}",title);
960-
startFile(ol,getOutputFileBase(),getOutputFileBase(),
960+
startFile(ol,getOutputFileBase(),false,getOutputFileBase(),
961961
title,HighlightedItem::None,!generateTreeView,m_src->getOutputFileBase());
962962

963963
if (!generateTreeView)

‎src/docbookgen.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ void DocbookGenerator::cleanup()
392392
}
393393

394394

395-
void DocbookGenerator::startFile(const QCString &name,const QCString &,const QCString &,int,int)
395+
void DocbookGenerator::startFile(const QCString &name,bool,const QCString &,const QCString &,int,int)
396396
{
397397
DB_GEN_C
398398
QCString fileName=name;

‎src/docbookgen.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class DocbookGenerator : public OutputGenerator, public OutputGenIntf
122122
void addCodeGen(OutputCodeList &list) override;
123123
void cleanup() override;
124124
void writeDoc(const IDocNodeAST *node,const Definition *ctx,const MemberDef *md,int id) override;
125-
void startFile(const QCString &name,const QCString &manName,const QCString &title,int id,int hierarchyLevel) override;
125+
void startFile(const QCString &name,bool isSource,const QCString &manName,const QCString &title,int id,int hierarchyLevel) override;
126126
void endFile() override;
127127

128128
void writeSearchInfo() override {DB_GEN_EMPTY}

‎src/doxygen.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9966,7 +9966,7 @@ static void generateExampleDocs()
99669966
intf->resetCodeParserState();
99679967
}
99689968
QCString n=pd->getOutputFileBase();
9969-
startFile(*g_outputList,n,n,pd->name());
9969+
startFile(*g_outputList,n,false,n,pd->name());
99709970
startTitle(*g_outputList,n);
99719971
g_outputList->docify(pd->name());
99729972
endTitle(*g_outputList,n,QCString());

‎src/filedef.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ void FileDefImpl::writeDocumentation(OutputList &ol)
885885

886886
if (getDirDef())
887887
{
888-
startFile(ol,getOutputFileBase(),name(),pageTitle,HighlightedItem::FileVisible,!generateTreeView);
888+
startFile(ol,getOutputFileBase(),false,name(),pageTitle,HighlightedItem::FileVisible,!generateTreeView);
889889
if (!generateTreeView)
890890
{
891891
getDirDef()->writeNavigationPath(ol);
@@ -922,7 +922,7 @@ void FileDefImpl::writeDocumentation(OutputList &ol)
922922
}
923923
else
924924
{
925-
startFile(ol,getOutputFileBase(),name(),pageTitle,HighlightedItem::FileVisible,!generateTreeView);
925+
startFile(ol,getOutputFileBase(),false,name(),pageTitle,HighlightedItem::FileVisible,!generateTreeView);
926926
if (!generateTreeView)
927927
{
928928
ol.endQuickIndices();
@@ -1152,7 +1152,7 @@ void FileDefImpl::writeSourceHeader(OutputList &ol)
11521152
bool genSourceFile = !isDocFile && generateSourceFile();
11531153
if (getDirDef())
11541154
{
1155-
startFile(ol,getSourceFileBase(),QCString(),pageTitle,HighlightedItem::FileVisible,
1155+
startFile(ol,getSourceFileBase(),true,QCString(),pageTitle,HighlightedItem::FileVisible,
11561156
!generateTreeView,
11571157
!isDocFile && genSourceFile ? QCString() : getOutputFileBase(),
11581158
0);
@@ -1167,7 +1167,7 @@ void FileDefImpl::writeSourceHeader(OutputList &ol)
11671167
}
11681168
else
11691169
{
1170-
startFile(ol,getSourceFileBase(),QCString(),pageTitle,HighlightedItem::FileVisible,false,
1170+
startFile(ol,getSourceFileBase(),true,QCString(),pageTitle,HighlightedItem::FileVisible,false,
11711171
!isDocFile && genSourceFile ? QCString() : getOutputFileBase(),
11721172
0);
11731173
startTitle(ol,getSourceFileBase());

‎src/groupdef.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ void GroupDefImpl::writeDocumentation(OutputList &ol)
11881188
++hierarchyLevel;
11891189
}
11901190

1191-
startFile(ol,getOutputFileBase(),name(),m_title,HighlightedItem::Topics,
1191+
startFile(ol,getOutputFileBase(),false,name(),m_title,HighlightedItem::Topics,
11921192
FALSE /* additionalIndices*/, QCString() /*altSidebarName*/, hierarchyLevel);
11931193

11941194
ol.startHeaderSection();

‎src/htmlgen.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,8 @@ static QCString substituteHtmlKeywords(const QCString &file,
325325
const QCString &str,
326326
const QCString &title,
327327
const QCString &relPath,
328-
const QCString &navPath=QCString())
328+
const QCString &navPath=QCString(),
329+
bool isSource = false)
329330
{
330331
// Build CSS/JavaScript tags depending on treeview, search engine settings
331332
QCString cssFile;
@@ -452,7 +453,7 @@ static QCString substituteHtmlKeywords(const QCString &file,
452453
searchBox = getSearchBox(serverBasedSearch, relPath, FALSE);
453454
}
454455

455-
if (mathJax)
456+
if (mathJax && !isSource)
456457
{
457458
auto mathJaxVersion = Config_getEnum(MATHJAX_VERSION);
458459
QCString path = Config_getString(MATHJAX_RELPATH);
@@ -1541,7 +1542,7 @@ void HtmlGenerator::writeFooterFile(TextStream &t)
15411542

15421543
static std::mutex g_indexLock;
15431544

1544-
void HtmlGenerator::startFile(const QCString &name,const QCString &,
1545+
void HtmlGenerator::startFile(const QCString &name,bool isSource,const QCString &,
15451546
const QCString &title,int /*id*/, int /*hierarchyLevel*/)
15461547
{
15471548
//printf("HtmlGenerator::startFile(%s)\n",qPrint(name));
@@ -1559,7 +1560,7 @@ void HtmlGenerator::startFile(const QCString &name,const QCString &,
15591560
}
15601561

15611562
m_lastFile = fileName;
1562-
m_t << substituteHtmlKeywords(g_header_file,g_header,convertToHtml(filterTitle(title)),m_relPath);
1563+
m_t << substituteHtmlKeywords(g_header_file,g_header,convertToHtml(filterTitle(title)),m_relPath,QCString(),isSource);
15631564

15641565
m_t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
15651566
<< getDoxygenVersion() << " -->\n";

‎src/htmlgen.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class HtmlGenerator : public OutputGenerator, public OutputGenIntf
124124
void addCodeGen(OutputCodeList &list) override;
125125
void cleanup() override;
126126
void writeDoc(const IDocNodeAST *node,const Definition *,const MemberDef *,int id) override;
127-
void startFile(const QCString &name,const QCString &manName,const QCString &title,int id, int hierarchyLevel) override;
127+
void startFile(const QCString &name,bool isSource,const QCString &manName,const QCString &title,int id, int hierarchyLevel) override;
128128
void endFile() override;
129129

130130
void writeFooter(const QCString &navPath) override;

0 commit comments

Comments
 (0)