diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-02-20 20:23:46 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-02-20 20:23:46 (GMT) |
commit | a6083348a13f31728e72c5d99859c0dc8ea35013 (patch) | |
tree | 89c73ea7d1bc300e0c0923b3395c2e0ab6286764 | |
parent | ef6c0b40647c5c56f7e6f8289a4c2d61982763d1 (diff) | |
parent | 5d44acc0a49bd7b990bfe649efa312f5f0bb594b (diff) | |
download | Doxygen-a6083348a13f31728e72c5d99859c0dc8ea35013.zip Doxygen-a6083348a13f31728e72c5d99859c0dc8ea35013.tar.gz Doxygen-a6083348a13f31728e72c5d99859c0dc8ea35013.tar.bz2 |
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
-rw-r--r-- | src/htmlgen.cpp | 2 | ||||
-rw-r--r-- | src/index.cpp | 2 | ||||
-rw-r--r-- | src/perlmodgen.cpp | 2 | ||||
-rw-r--r-- | src/xmlgen.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index fa446ed..e21071c 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -1683,7 +1683,7 @@ void HtmlGenerator::startFile(const char *name,const char *, Doxygen::indexList->addIndexFile(fileName); lastFile = fileName; - t << substituteHtmlKeywords(g_header,convertToHtml(title),relPath); + t << substituteHtmlKeywords(g_header,convertToHtml(filterTitle(title)),relPath); t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " << versionString << " -->" << endl; diff --git a/src/index.cpp b/src/index.cpp index a283b0c..54839f3 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3102,7 +3102,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv) if (pd->title().isEmpty()) pageTitle=pd->name(); else - pageTitle=pd->title(); + pageTitle=filterTitle(pd->title()); if (ftv) { diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 7fa0153..1f8e713 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -2125,7 +2125,7 @@ void PerlModGenerator::generatePerlModForPage(PageDef *pd) SectionInfo *si = Doxygen::sectionDict->find(pd->name()); 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()); m_output.closeHash(); diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index c0bfd81..efddcd4 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -1845,7 +1845,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample) SectionInfo *si = Doxygen::sectionDict->find(pd->name()); if (si) { - t << " <title>" << convertToXML(convertCharEntitiesToUTF8(si->title)) + t << " <title>" << convertToXML(convertCharEntitiesToUTF8(filterTitle(si->title))) << "</title>" << endl; } } |