Commit a6083348 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge pull request #121 from albert-github/feature/bug_674851

Bug 674851 - Percent to prevent auto-linking in page title is not removed for navpath
parents ef6c0b40 5d44acc0
...@@ -1683,7 +1683,7 @@ void HtmlGenerator::startFile(const char *name,const char *, ...@@ -1683,7 +1683,7 @@ void HtmlGenerator::startFile(const char *name,const char *,
Doxygen::indexList->addIndexFile(fileName); Doxygen::indexList->addIndexFile(fileName);
lastFile = fileName; lastFile = fileName;
t << substituteHtmlKeywords(g_header,convertToHtml(title),relPath); t << substituteHtmlKeywords(g_header,convertToHtml(filterTitle(title)),relPath);
t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
<< versionString << " -->" << endl; << versionString << " -->" << endl;
......
...@@ -3102,7 +3102,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv) ...@@ -3102,7 +3102,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
if (pd->title().isEmpty()) if (pd->title().isEmpty())
pageTitle=pd->name(); pageTitle=pd->name();
else else
pageTitle=pd->title(); pageTitle=filterTitle(pd->title());
if (ftv) if (ftv)
{ {
......
...@@ -2125,7 +2125,7 @@ void PerlModGenerator::generatePerlModForPage(PageDef *pd) ...@@ -2125,7 +2125,7 @@ void PerlModGenerator::generatePerlModForPage(PageDef *pd)
SectionInfo *si = Doxygen::sectionDict->find(pd->name()); SectionInfo *si = Doxygen::sectionDict->find(pd->name());
if (si) if (si)
m_output.addFieldQuotedString("title", si->title); m_output.addFieldQuotedString("title4", filterTitle(si->title));
addPerlModDocBlock(m_output,"detailed",pd->docFile(),pd->docLine(),0,0,pd->documentation()); addPerlModDocBlock(m_output,"detailed",pd->docFile(),pd->docLine(),0,0,pd->documentation());
m_output.closeHash(); m_output.closeHash();
......
...@@ -1845,7 +1845,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample) ...@@ -1845,7 +1845,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample)
SectionInfo *si = Doxygen::sectionDict->find(pd->name()); SectionInfo *si = Doxygen::sectionDict->find(pd->name());
if (si) if (si)
{ {
t << " <title>" << convertToXML(convertCharEntitiesToUTF8(si->title)) t << " <title>" << convertToXML(convertCharEntitiesToUTF8(filterTitle(si->title)))
<< "</title>" << endl; << "</title>" << endl;
} }
} }
......
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