summaryrefslogtreecommitdiffstats
path: root/src/htmlgen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-06-10 09:28:22 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-06-10 09:28:22 (GMT)
commit0ce3aea886f4e95da56d164b3944fd54d3d68f89 (patch)
tree6709ddc7b1764dc3b20bbac7eb36c05edcc91e03 /src/htmlgen.cpp
parent1983c30b71bf92b3fa6bfedbb98451c3b7f74498 (diff)
downloadDoxygen-0ce3aea886f4e95da56d164b3944fd54d3d68f89.zip
Doxygen-0ce3aea886f4e95da56d164b3944fd54d3d68f89.tar.gz
Doxygen-0ce3aea886f4e95da56d164b3944fd54d3d68f89.tar.bz2
Release-1.8.1.1
Diffstat (limited to 'src/htmlgen.cpp')
-rw-r--r--src/htmlgen.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 63bff45..6cf31ad 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -2722,6 +2722,11 @@ void HtmlGenerator::writeSplitBar(const char *name)
t << writeSplitBarAsString(name,relPath);
}
+void HtmlGenerator::writeNavigationPath(const char *s)
+{
+ t << substitute(s,"$relpath$",relPath);
+}
+
void HtmlGenerator::startContents()
{
t << "<div class=\"contents\">" << endl;
@@ -3037,14 +3042,21 @@ void HtmlGenerator::endLabels()
t << "</span>";
}
-void HtmlGenerator::writeInheritedSectionTitle(const char *id,
- const char *file,const char *anchor,const char *title,
- const char *name)
+void HtmlGenerator::writeInheritedSectionTitle(
+ const char *id, const char *ref,
+ const char *file, const char *anchor,
+ const char *title, const char *name)
{
DBG_HTML(t << "<!-- writeInheritedSectionTitle -->" << endl;)
QCString a = anchor;
if (!a.isEmpty()) a.prepend("#");
- QCString classLink = QCString("<a class=\"el\" href=\"")+correctURL(file,relPath)+Doxygen::htmlFileExtension+a+"\">"+name+"</a>";
+ QCString classLink = QCString("<a class=\"el\" href=\"");
+ if (ref)
+ {
+ classLink+= externalLinkTarget() + externalRef(relPath,ref,TRUE);
+ }
+ classLink+=file+Doxygen::htmlFileExtension+a;
+ classLink+=QCString("\">")+name+"</a>";
t << "<tr class=\"inherit_header " << id << "\">"
<< "<td colspan=\"2\" onclick=\"javascript:toggleInherit('" << id << "')\">"
<< "<img src=\"" << relPath << "closed.png\" alt=\"-\"/>&nbsp;"