Permalink
Browse files

Style fixes and added numbering to overloaded members

  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Jul 30, 2016
1 parent 98f0816 commit 5af8d5e87657a2d3986783493c618df335b3771c
Showing with 204 additions and 86 deletions.
  1. +1 −1 src/classdef.cpp
  2. +1 −1 src/fortrancode.l
  3. +10 −4 src/htmlgen.cpp
  4. +3 −1 src/htmlgen.h
  5. +14 −9 src/latexgen.cpp
  6. +1 −1 src/latexgen.h
  7. +1 −1 src/mangen.cpp
  8. +1 −1 src/mangen.h
  9. +9 −7 src/memberdef.cpp
  10. +1 −1 src/memberdef.h
  11. +104 −21 src/memberlist.cpp
  12. +15 −4 src/memberlist.h
  13. +1 −1 src/outputgen.h
  14. +1 −0 src/outputlist.cpp
  15. +4 −2 src/outputlist.h
  16. +2 −0 src/rtfgen.cpp
  17. +1 −1 src/rtfgen.h
  18. +6 −6 src/util.cpp
  19. +28 −24 templates/html/doxygen.css
View
@@ -1706,7 +1706,7 @@ void ClassDef::writeInlineDocumentation(OutputList &ol)
ol.disableAllBut(OutputGenerator::Html);
{ // only HTML only
ol.writeAnchor(0,anchor());
ol.startMemberDoc(0,0,0,0,FALSE);
ol.startMemberDoc(0,0,anchor(),name(),1,1,FALSE);
ol.startMemberDocName(FALSE);
ol.parseText(s);
ol.endMemberDocName();
View
@@ -484,7 +484,7 @@ static bool getFortranDefs(const QCString &memberName, const QCString &moduleNam
if (mn) // name is known
{
MemberListIterator mli(*mn);
MemberNameIterator mli(*mn);
for (mli.toFirst();(md=mli.current());++mli) // all found functions with given name
{
FileDef *fd=md->getFileDef();
View
@@ -1552,12 +1552,18 @@ void HtmlGenerator::endMemberDocList()
}
void HtmlGenerator::startMemberDoc( const char *clName, const char *memName,
const char *anchor, const char *title, bool showInline)
const char *anchor, const char *title,
int memCount, int memTotal, bool showInline)
{
DBG_HTML(t << "<!-- startMemberDoc -->" << endl;)
t << "\n<h2 class=\"memtitle\">" << title << " "
<< "<a href=\"#" << anchor << "\" class=\"permantlink\"" "title=\"Permalink to this headline\">&#9854;</a>"
<< "</h2>"
t << "\n<h2 class=\"memtitle\">"
<< "<span class=\"permalink\"><a href=\"#" << anchor << "\">&sect;&nbsp;</a></span>"
<< title;
if (memTotal>1)
{
t << " <span class=\"overload\">[" << memCount << "/" << memTotal <<"]</span>";
}
t << "</h2>"
<< endl;
t << "\n<div class=\"memitem\">" << endl;
t << "<div class=\"memproto\">" << endl;
View
@@ -225,7 +225,9 @@ class HtmlGenerator : public OutputGenerator
void endDescForItem() { t << "</dd>\n"; }
void lineBreak(const char *style);
void writeChar(char c);
void startMemberDoc(const char *clName, const char *memName, const char *anchor, const char *title, bool showInline);
void startMemberDoc(const char *clName, const char *memName,
const char *anchor, const char *title,
int memCount, int memTotal, bool showInline);
void endMemberDoc(bool);
void startDoxyAnchor(const char *fName,const char *manName,
const char *anchor,const char *name,
View
@@ -1522,8 +1522,10 @@ void LatexGenerator::startMemberDoc(const char *clname,
const char *memname,
const char *,
const char *title,
int memCount,
int memTotal,
bool showInline)
{
{
if (memname && memname[0]!='@')
{
t << "\\index{";
@@ -1550,7 +1552,7 @@ void LatexGenerator::startMemberDoc(const char *clname,
t << latexEscapeLabelName(clname,insideTabbing);
t << "@{";
t << latexEscapeIndexChars(clname,insideTabbing);
t << "}";
t << "}";
}
t << "}" << endl;
}
@@ -1560,7 +1562,7 @@ void LatexGenerator::startMemberDoc(const char *clname,
int level=0;
if (showInline) level+=2;
if (compactLatex) level++;
t << "\\" << levelLab[level];
t << "\\" << levelLab[level];
t << "{";
if (pdfHyperlinks)
@@ -1572,6 +1574,10 @@ void LatexGenerator::startMemberDoc(const char *clname,
{
t << "}{" << latexEscapePDFString(title) << "}";
}
if (memTotal>1)
{
t << "\\hspace{0.1cm}{\\footnotesize\\ttfamily [" << memCount << "/" << memTotal << "]}";
}
t << "}";
t << "\n{\\ttfamily ";
//disableLinks=TRUE;
@@ -1580,7 +1586,7 @@ void LatexGenerator::startMemberDoc(const char *clname,
void LatexGenerator::endMemberDoc(bool)
{
disableLinks=FALSE;
t << "}";
t << "}\n\n";
//if (Config_getBool(COMPACT_LATEX)) t << "\\hfill";
}
@@ -1992,7 +1998,7 @@ void LatexGenerator::startParameterList(bool openBracket)
{
/* start of ParameterType ParameterName list */
if (openBracket) t << "(";
t << endl << "\\begin{DoxyParamCaption}" << endl;
t << "\\begin{DoxyParamCaption}";
}
void LatexGenerator::endParameterList()
@@ -2015,13 +2021,12 @@ void LatexGenerator::startParameterName(bool /*oneArgOnly*/)
t << "{";
}
void LatexGenerator::endParameterName(bool last,bool /* emptyList */,bool closeBracket)
void LatexGenerator::endParameterName(bool last,bool /*emptyList*/,bool closeBracket)
{
t << "}" << endl;
t << " }";
if (last)
{
t << "\\end{DoxyParamCaption}" << endl;
t << "\\end{DoxyParamCaption}";
if (closeBracket) t << ")";
}
}
View
@@ -208,7 +208,7 @@ class LatexGenerator : public OutputGenerator
void startDescItem();
void endDescItem();
void lineBreak(const char *style=0);
void startMemberDoc(const char *,const char *,const char *,const char *,bool);
void startMemberDoc(const char *,const char *,const char *,const char *,int,int,bool);
void endMemberDoc(bool);
void startDoxyAnchor(const char *,const char *,const char *,const char *,const char *);
void endDoxyAnchor(const char *,const char *);
View
@@ -418,7 +418,7 @@ void ManGenerator::endCodeFragment()
col=0;
}
void ManGenerator::startMemberDoc(const char *,const char *,const char *,const char *,bool)
void ManGenerator::startMemberDoc(const char *,const char *,const char *,const char *,int,int,bool)
{
if (!firstCol) t << endl;
t << ".SS \"";
View
@@ -144,7 +144,7 @@ class ManGenerator : public OutputGenerator
void endDescItem();
void lineBreak(const char *) { t << "\n.br" << endl; }
void writeChar(char c);
void startMemberDoc(const char *,const char *,const char *,const char *,bool);
void startMemberDoc(const char *,const char *,const char *,const char *,int,int,bool);
void endMemberDoc(bool);
void startDoxyAnchor(const char *,const char *,const char *,const char *,const char *);
void endDoxyAnchor(const char *,const char *) {}
View
@@ -2528,7 +2528,9 @@ void MemberDef::_writeGroupInclude(OutputList &ol,bool inGroup)
/*! Writes the "detailed documentation" section of this member to
* all active output formats.
*/
void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
void MemberDef::writeDocumentation(MemberList *ml,
int memCount,int memTotal,
OutputList &ol,
const char *scName,
Definition *container,
bool inGroup,
@@ -2544,8 +2546,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
//printf("MemberDef::writeDocumentation(): name=`%s' hasDocs=`%d' containerType=%d inGroup=%d sectionLinkable=%d\n",
// name().data(),hasDocs,container->definitionType(),inGroup,isDetailedSectionLinkable());
if ( !hasDocs ) return;
if (isEnumValue() && !showEnumValues) return;
//if ( !hasDocs ) return;
//if (isEnumValue() && !showEnumValues) return;
SrcLangExt lang = getLanguage();
//printf("member=%s lang=%d\n",name().data(),lang);
@@ -2624,15 +2626,15 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
if ((isVariable() || isTypedef()) && (i=r.match(ldef,0,&l))!=-1)
{
// find enum type and insert it in the definition
QListIterator<MemberDef> vmli(*ml);
MemberListIterator vmli(*ml);
MemberDef *vmd;
bool found=FALSE;
for ( ; (vmd=vmli.current()) && !found ; ++vmli)
{
if (vmd->isEnumerate() && ldef.mid(i,l)==vmd->name())
{
ol.startDoxyAnchor(cfname,cname,memAnchor,doxyName,doxyArgs);
ol.startMemberDoc(ciname,name(),memAnchor,name(),showInline);
ol.startMemberDoc(ciname,name(),memAnchor,name(),memCount,memTotal,showInline);
linkifyText(TextGeneratorOLImpl(ol),scopedContainer,getBodyDef(),this,ldef.left(i));
vmd->writeEnumDeclaration(ol,getClassDef(),getNamespaceDef(),getFileDef(),getGroupDef());
linkifyText(TextGeneratorOLImpl(ol),scopedContainer,getBodyDef(),this,ldef.right(ldef.length()-i-l));
@@ -2644,7 +2646,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
{
//printf("Anonymous compound `%s'\n",cname.data());
ol.startDoxyAnchor(cfname,cname,memAnchor,doxyName,doxyArgs);
ol.startMemberDoc(ciname,name(),memAnchor,name(),showInline);
ol.startMemberDoc(ciname,name(),memAnchor,name(),memCount,memTotal,showInline);
// search for the last anonymous compound name in the definition
int si=ldef.find(' '),pi,ei=i+l;
if (si==-1) si=0;
@@ -2666,7 +2668,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
else // not an enum value or anonymous compound
{
ol.startDoxyAnchor(cfname,cname,memAnchor,doxyName,doxyArgs);
ol.startMemberDoc(ciname,name(),memAnchor,title,showInline);
ol.startMemberDoc(ciname,name(),memAnchor,title,memCount,memTotal,showInline);
ClassDef *cd=getClassDef();
NamespaceDef *nd=getNamespaceDef();
View
@@ -380,7 +380,7 @@ class MemberDef : public Definition
void writeDeclaration(OutputList &ol,
ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
bool inGroup, ClassDef *inheritFrom=0,const char *inheritId=0);
void writeDocumentation(MemberList *ml,OutputList &ol,
void writeDocumentation(MemberList *ml,int memCount,int memTotal,OutputList &ol,
const char *scopeName,Definition *container,
bool inGroup,bool showEnumValues=FALSE,bool
showInline=FALSE);
Oops, something went wrong.

0 comments on commit 5af8d5e

Please sign in to comment.