Commit 21d9bf2b authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge branch 'master' of github.com:doxygen/doxygen

parents 836af2f9 a6083348
......@@ -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;
......
......@@ -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)
{
......
......@@ -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 "";
......
......@@ -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;
};
......
......@@ -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();
......
......@@ -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;
}
}
......
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