Commit 93d1c462 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 709803 - Generated hhc file contains an error for a section of a mainpage

parent 9631035b
...@@ -8592,7 +8592,7 @@ static void findMainPage(EntryNav *rootNav) ...@@ -8592,7 +8592,7 @@ static void findMainPage(EntryNav *rootNav)
indexName, root->brief+root->doc+root->inbodyDocs,title); indexName, root->brief+root->doc+root->inbodyDocs,title);
//setFileNameForSections(root->anchors,"index",Doxygen::mainPage); //setFileNameForSections(root->anchors,"index",Doxygen::mainPage);
Doxygen::mainPage->setBriefDescription(root->brief,root->briefFile,root->briefLine); Doxygen::mainPage->setBriefDescription(root->brief,root->briefFile,root->briefLine);
Doxygen::mainPage->setFileName(indexName); Doxygen::mainPage->setFileName(indexName,TRUE);
Doxygen::mainPage->setShowToc(root->stat); Doxygen::mainPage->setShowToc(root->stat);
addPageToContext(Doxygen::mainPage,rootNav); addPageToContext(Doxygen::mainPage,rootNav);
...@@ -8790,7 +8790,7 @@ static void buildExampleList(EntryNav *rootNav) ...@@ -8790,7 +8790,7 @@ static void buildExampleList(EntryNav *rootNav)
PageDef *pd=new PageDef(root->fileName,root->startLine, PageDef *pd=new PageDef(root->fileName,root->startLine,
root->name,root->brief+root->doc+root->inbodyDocs,root->args); root->name,root->brief+root->doc+root->inbodyDocs,root->args);
pd->setBriefDescription(root->brief,root->briefFile,root->briefLine); pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
pd->setFileName(convertNameToFile(pd->name()+"-example",FALSE,TRUE)); pd->setFileName(convertNameToFile(pd->name()+"-example",FALSE,TRUE),FALSE);
pd->addSectionsToDefinition(root->anchors); pd->addSectionsToDefinition(root->anchors);
pd->setLanguage(root->lang); pd->setLanguage(root->lang);
//pi->addSections(root->anchors); //pi->addSections(root->anchors);
......
...@@ -61,10 +61,10 @@ QCString PageDef::getOutputFileBase() const ...@@ -61,10 +61,10 @@ QCString PageDef::getOutputFileBase() const
return m_fileName; return m_fileName;
} }
void PageDef::setFileName(const char *name) void PageDef::setFileName(const char *name,bool dontEscape)
{ {
static bool shortNames = Config_getBool("SHORT_NAMES"); static bool shortNames = Config_getBool("SHORT_NAMES");
if (shortNames) if (shortNames && !dontEscape)
{ {
m_fileName = convertNameToFile(name); m_fileName = convertNameToFile(name);
} }
......
...@@ -32,7 +32,7 @@ class PageDef : public Definition ...@@ -32,7 +32,7 @@ class PageDef : public Definition
~PageDef(); ~PageDef();
// setters // setters
void setFileName(const char *name); void setFileName(const char *name,bool dontEscape);
void setShowToc(bool b); void setShowToc(bool b);
// getters // getters
......
...@@ -6316,11 +6316,11 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle, ...@@ -6316,11 +6316,11 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle,
if (tagInfo) if (tagInfo)
{ {
pd->setReference(tagInfo->tagName); pd->setReference(tagInfo->tagName);
pd->setFileName(tagInfo->fileName); pd->setFileName(tagInfo->fileName,TRUE);
} }
else else
{ {
pd->setFileName(convertNameToFile(pd->name(),FALSE,TRUE)); pd->setFileName(convertNameToFile(pd->name(),FALSE,TRUE),FALSE);
} }
//printf("Appending page `%s'\n",baseName.data()); //printf("Appending page `%s'\n",baseName.data());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment