summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-02-22 12:26:08 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-02-22 12:26:08 (GMT)
commit21d9bf2b3988d3a965370e00fb09f43880d3a28d (patch)
treec3c64b7d1269742d5f85a65be360d0ecedb97fd4 /src
parent836af2f9510d10f2dd7d832025f214983387b3c6 (diff)
parenta6083348a13f31728e72c5d99859c0dc8ea35013 (diff)
downloadDoxygen-21d9bf2b3988d3a965370e00fb09f43880d3a28d.zip
Doxygen-21d9bf2b3988d3a965370e00fb09f43880d3a28d.tar.gz
Doxygen-21d9bf2b3988d3a965370e00fb09f43880d3a28d.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r--src/htmlgen.cpp2
-rw-r--r--src/index.cpp2
-rw-r--r--src/namespacedef.cpp10
-rw-r--r--src/namespacedef.h3
-rw-r--r--src/perlmodgen.cpp2
-rw-r--r--src/xmlgen.cpp2
6 files changed, 15 insertions, 6 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 a645051..2fdd0de 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/namespacedef.cpp b/src/namespacedef.cpp
index 21f925e..8236f70 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -68,6 +68,10 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc,
{
m_type = CONSTANT_GROUP;
}
+ else if (type && !strcmp("library", type))
+ {
+ m_type = LIBRARY;
+ }
else
{
m_type = NAMESPACE;
@@ -1117,9 +1121,13 @@ QCString NamespaceDef::compoundTypeString() const
{
return "constants";
}
+ else if (isLibrary())
+ {
+ return "library";
+ }
else
{
- err("Internal inconsistency: namespace in IDL not module or constant group\n");
+ err("Internal inconsistency: namespace in IDL not module, library or constant group\n");
}
}
return "";
diff --git a/src/namespacedef.h b/src/namespacedef.h
index fedd410..4613480 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -68,6 +68,7 @@ class NamespaceDef : public Definition
bool isConstantGroup() const { return CONSTANT_GROUP == m_type; }
bool isModule() const { return MODULE == m_type; }
+ bool isLibrary() const { return LIBRARY == m_type; }
bool isLinkableInProject() const;
bool isLinkable() const;
@@ -132,7 +133,7 @@ class NamespaceDef : public Definition
ClassSDict *classSDict;
NamespaceSDict *namespaceSDict;
bool m_subGrouping;
- enum { NAMESPACE, MODULE, CONSTANT_GROUP } m_type;
+ enum { NAMESPACE, MODULE, CONSTANT_GROUP, LIBRARY } m_type;
bool m_isPublished;
};
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;
}
}