Skip to content

D
doxverilog
Commit 6f84cba4 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files
Options

Release-1.4.6-20060327

parent c8b3a0f8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2156 additions and 2881 deletions
INSTALL
View file @ 6f84cba4
DOXYGEN Version 1.4.6-20060227 DOXYGEN Version 1.4.6-20060327
Please read the installation section of the manual Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions. (http://www.doxygen.org/install.html) for instructions.
-------- --------
Dimitri van Heesch (27 February 2006) Dimitri van Heesch (27 March 2006)
README
View file @ 6f84cba4
DOXYGEN Version 1.4.6_20060227 DOXYGEN Version 1.4.6_20060327
Please read INSTALL for compilation instructions. Please read INSTALL for compilation instructions.
...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. ...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy, Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (27 February 2006) Dimitri van Heesch (dimitri@stack.nl) (27 March 2006)
configure
View file @ 6f84cba4
...@@ -20,7 +20,7 @@ doxygen_version_minor=4 ...@@ -20,7 +20,7 @@ doxygen_version_minor=4
doxygen_version_revision=6 doxygen_version_revision=6
#NOTE: Setting version_mmn to "NO" will omit mmn info from the package. #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
doxygen_version_mmn=20060227 doxygen_version_mmn=20060327
bin_dirs=`echo $PATH | sed -e "s/:/ /g"` bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
......
examples/example.tag
View file @ 6f84cba4
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<type>void</type> <type>void</type>
<name>example</name> <name>example</name>
<anchorfile>class_test.html</anchorfile> <anchorfile>class_test.html</anchorfile>
<anchor>f7c9e353df7549b5697c934fb0331252</anchor> <anchor>47b775f65718978f1ffcd96376f8ecfa</anchor>
<arglist>()</arglist> <arglist>()</arglist>
</member> </member>
</compound> </compound>
......
qtools/qvaluestack.h
View file @ 6f84cba4
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
{ {
T elem( this->last() ); T elem( this->last() );
if ( !this->isEmpty() ) if ( !this->isEmpty() )
remove( this->fromLast() ); this->remove( this->fromLast() );
return elem; return elem;
} }
T& top() { return this->last(); } T& top() { return this->last(); }
......
src/classdef.cpp
View file @ 6f84cba4
...@@ -1514,6 +1514,7 @@ void ClassDef::writeMemberDocumentation(OutputList &ol) ...@@ -1514,6 +1514,7 @@ void ClassDef::writeMemberDocumentation(OutputList &ol)
if (Config_getBool("SEPARATE_MEMBER_PAGES")) if (Config_getBool("SEPARATE_MEMBER_PAGES"))
{ {
ol.disable(OutputGenerator::Html); ol.disable(OutputGenerator::Html);
Doxygen::suppressDocWarnings = TRUE;
} }
typedefMembers.writeDocumentation(ol,name(),this, typedefMembers.writeDocumentation(ol,name(),this,
...@@ -1543,6 +1544,7 @@ void ClassDef::writeMemberDocumentation(OutputList &ol) ...@@ -1543,6 +1544,7 @@ void ClassDef::writeMemberDocumentation(OutputList &ol)
if (Config_getBool("SEPARATE_MEMBER_PAGES")) if (Config_getBool("SEPARATE_MEMBER_PAGES"))
{ {
ol.enable(OutputGenerator::Html); ol.enable(OutputGenerator::Html);
Doxygen::suppressDocWarnings = FALSE;
} }
} }
......
src/code.l
View file @ 6f84cba4
...@@ -1770,11 +1770,6 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} ...@@ -1770,11 +1770,6 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
<SkipCPP>\\[\r]?\n { <SkipCPP>\\[\r]?\n {
codifyLines(yytext); codifyLines(yytext);
} }
<SkipCPP>\n/.*\n {
codifyLines(yytext);
endFontClass();
BEGIN( g_lastSkipCppContext ) ;
}
<SkipCPP>"//" { <SkipCPP>"//" {
g_code->codify(yytext); g_code->codify(yytext);
} }
...@@ -2790,6 +2785,11 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} ...@@ -2790,6 +2785,11 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
BEGIN( g_lastCContext ) ; BEGIN( g_lastCContext ) ;
} }
} }
<SkipCPP>\n/.*\n {
codifyLines(yytext);
endFontClass();
BEGIN( g_lastSkipCppContext ) ;
}
<*>\n{B}*"//@"[{}].*\n { // remove one-line group marker <*>\n{B}*"//@"[{}].*\n { // remove one-line group marker
if (Config_getBool("STRIP_CODE_COMMENTS")) if (Config_getBool("STRIP_CODE_COMMENTS"))
{ {
......
src/dirdef.cpp
View file @ 6f84cba4
...@@ -561,8 +561,8 @@ void DirDef::writeDepGraph(QTextStream &t) ...@@ -561,8 +561,8 @@ void DirDef::writeDepGraph(QTextStream &t)
t << " bgcolor=transparent;\n"; t << " bgcolor=transparent;\n";
} }
t << " compound=true\n"; t << " compound=true\n";
t << " node [ fontsize=10, fontname=\"Helvetica\"];\n"; t << " node [ fontsize=10, fontname=\"FreeSans.ttf\"];\n";
t << " edge [ labelfontsize=9, labelfontname=\"Helvetica\"];\n"; t << " edge [ labelfontsize=9, labelfontname=\"FreeSans.ttf\"];\n";
QDict<DirDef> dirsInGraph(257); QDict<DirDef> dirsInGraph(257);
...@@ -572,7 +572,7 @@ void DirDef::writeDepGraph(QTextStream &t) ...@@ -572,7 +572,7 @@ void DirDef::writeDepGraph(QTextStream &t)
t << " subgraph cluster" << parent()->getOutputFileBase() << " {\n"; t << " subgraph cluster" << parent()->getOutputFileBase() << " {\n";
t << " graph [ bgcolor=\"#ddddee\", pencolor=\"black\", label=\"" t << " graph [ bgcolor=\"#ddddee\", pencolor=\"black\", label=\""
<< parent()->shortName() << parent()->shortName()
<< "\" fontname=\"Helvetica\", fontsize=10, URL=\""; << "\" fontname=\"FreeSans.ttf\", fontsize=10, URL=\"";
t << parent()->getOutputFileBase() << Doxygen::htmlFileExtension; t << parent()->getOutputFileBase() << Doxygen::htmlFileExtension;
t << "\"]\n"; t << "\"]\n";
} }
......
src/docparser.cpp
View file @ 6f84cba4
...@@ -377,6 +377,7 @@ static void detectNoDocumentedParams() ...@@ -377,6 +377,7 @@ static void detectNoDocumentedParams()
ArgumentList *al = g_memberDef->argumentList(); ArgumentList *al = g_memberDef->argumentList();
ArgumentList *declAl = g_memberDef->declArgumentList(); ArgumentList *declAl = g_memberDef->declArgumentList();
QString returnType = g_memberDef->typeString(); QString returnType = g_memberDef->typeString();
if (!g_memberDef->hasDocumentedParams() && if (!g_memberDef->hasDocumentedParams() &&
g_hasParamCommand) g_hasParamCommand)
{ {
......
src/dot.cpp
View file @ 6f84cba4
...@@ -74,9 +74,9 @@ static void writeGraphHeader(QTextStream &t) ...@@ -74,9 +74,9 @@ static void writeGraphHeader(QTextStream &t)
{ {
t << " bgcolor=\"transparent\";" << endl; t << " bgcolor=\"transparent\";" << endl;
} }
t << " edge [fontname=\"Helvetica\",fontsize=10," t << " edge [fontname=\"FreeSans.ttf\",fontsize=10,"
"labelfontname=\"Helvetica\",labelfontsize=10];\n"; "labelfontname=\"FreeSans.ttf\",labelfontsize=10];\n";
t << " node [fontname=\"Helvetica\",fontsize=10,shape=record];\n"; t << " node [fontname=\"FreeSans.ttf\",fontsize=10,shape=record];\n";
} }
static void writeGraphFooter(QTextStream &t) static void writeGraphFooter(QTextStream &t)
...@@ -274,10 +274,10 @@ static bool readBoundingBoxEPS(const char *fileName,int *width,int *height) ...@@ -274,10 +274,10 @@ static bool readBoundingBoxEPS(const char *fileName,int *width,int *height)
{ {
int numBytes = f.readLine(buf,maxLineLen); int numBytes = f.readLine(buf,maxLineLen);
buf[numBytes-1]='\0'; buf[numBytes-1]='\0';
if (strncmp(buf,"%%BoundingBox: ",15)==0) if (strncmp(buf,"%%PageBoundingBox: ",15)==0)
{ {
int x,y; int x,y;
if (sscanf(buf,"%%%%BoundingBox: %d %d %d %d",&x,&y,width,height)!=4) if (sscanf(buf,"%%%%PageBoundingBox: %d %d %d %d",&x,&y,width,height)!=4)
{ {
return FALSE; return FALSE;
} }
...@@ -667,7 +667,7 @@ void DotNode::writeBox(QTextStream &t, ...@@ -667,7 +667,7 @@ void DotNode::writeBox(QTextStream &t,
t << "\",height=0.2,width=0.4"; t << "\",height=0.2,width=0.4";
if (m_isRoot) if (m_isRoot)
{ {
t << ",color=\"white\", fillcolor=\"black\", style=\"filled\" fontcolor=\"white\""; t << ",color=\"black\", fillcolor=\"grey75\", style=\"filled\" fontcolor=\"black\"";
} }
else else
{ {
...@@ -729,7 +729,7 @@ void DotNode::writeArrow(QTextStream &t, ...@@ -729,7 +729,7 @@ void DotNode::writeArrow(QTextStream &t,
t << ",arrowhead=\"" << arrowStyle[ei->m_color] << "\""; t << ",arrowhead=\"" << arrowStyle[ei->m_color] << "\"";
} }
if (format==BITMAP) t << ",fontname=\"Helvetica\""; if (format==BITMAP) t << ",fontname=\"FreeSans.ttf\"";
t << "];" << endl; t << "];" << endl;
} }
...@@ -2552,23 +2552,23 @@ void generateGraphLegend(const char *path) ...@@ -2552,23 +2552,23 @@ void generateGraphLegend(const char *path)
} }
QTextStream dotText(&dotFile); QTextStream dotText(&dotFile);
writeGraphHeader(dotText); writeGraphHeader(dotText);
dotText << " Node9 [shape=\"box\",label=\"Inherited\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",style=\"filled\" fontcolor=\"white\"];\n"; dotText << " Node9 [shape=\"box\",label=\"Inherited\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",fillcolor=\"grey75\",style=\"filled\" fontcolor=\"black\"];\n";
dotText << " Node10 -> Node9 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"Helvetica\"];\n"; dotText << " Node10 -> Node9 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node10 [shape=\"box\",label=\"PublicBase\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",URL=\"$classPublicBase" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node10 [shape=\"box\",label=\"PublicBase\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"black\",URL=\"$classPublicBase" << Doxygen::htmlFileExtension << "\"];\n";
dotText << " Node11 -> Node10 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"Helvetica\"];\n"; dotText << " Node11 -> Node10 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node11 [shape=\"box\",label=\"Truncated\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"red\",URL=\"$classTruncated" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node11 [shape=\"box\",label=\"Truncated\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"red\",URL=\"$classTruncated" << Doxygen::htmlFileExtension << "\"];\n";
dotText << " Node13 -> Node9 [dir=back,color=\"darkgreen\",fontsize=10,style=\"solid\",fontname=\"Helvetica\"];\n"; dotText << " Node13 -> Node9 [dir=back,color=\"darkgreen\",fontsize=10,style=\"solid\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node13 [shape=\"box\",label=\"ProtectedBase\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",URL=\"$classProtectedBase" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node13 [shape=\"box\",label=\"ProtectedBase\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"black\",URL=\"$classProtectedBase" << Doxygen::htmlFileExtension << "\"];\n";
dotText << " Node14 -> Node9 [dir=back,color=\"firebrick4\",fontsize=10,style=\"solid\",fontname=\"Helvetica\"];\n"; dotText << " Node14 -> Node9 [dir=back,color=\"firebrick4\",fontsize=10,style=\"solid\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node14 [shape=\"box\",label=\"PrivateBase\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",URL=\"$classPrivateBase" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node14 [shape=\"box\",label=\"PrivateBase\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"black\",URL=\"$classPrivateBase" << Doxygen::htmlFileExtension << "\"];\n";
dotText << " Node15 -> Node9 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"Helvetica\"];\n"; dotText << " Node15 -> Node9 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node15 [shape=\"box\",label=\"Undocumented\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"grey75\"];\n"; dotText << " Node15 [shape=\"box\",label=\"Undocumented\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"grey75\"];\n";
dotText << " Node16 -> Node9 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"Helvetica\"];\n"; dotText << " Node16 -> Node9 [dir=back,color=\"midnightblue\",fontsize=10,style=\"solid\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node16 [shape=\"box\",label=\"Templ< int >\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",URL=\"$classTempl" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node16 [shape=\"box\",label=\"Templ< int >\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"black\",URL=\"$classTempl" << Doxygen::htmlFileExtension << "\"];\n";
dotText << " Node17 -> Node16 [dir=back,color=\"orange\",fontsize=10,style=\"dashed\",label=\"< int >\",fontname=\"Helvetica\"];\n"; dotText << " Node17 -> Node16 [dir=back,color=\"orange\",fontsize=10,style=\"dashed\",label=\"< int >\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node17 [shape=\"box\",label=\"Templ< T >\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",URL=\"$classTempl" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node17 [shape=\"box\",label=\"Templ< T >\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"black\",URL=\"$classTempl" << Doxygen::htmlFileExtension << "\"];\n";
dotText << " Node18 -> Node9 [dir=back,color=\"darkorchid3\",fontsize=10,style=\"dashed\",label=\"m_usedClass\",fontname=\"Helvetica\"];\n"; dotText << " Node18 -> Node9 [dir=back,color=\"darkorchid3\",fontsize=10,style=\"dashed\",label=\"m_usedClass\",fontname=\"FreeSans.ttf\"];\n";
dotText << " Node18 [shape=\"box\",label=\"Used\",fontsize=10,height=0.2,width=0.4,fontname=\"Helvetica\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n"; dotText << " Node18 [shape=\"box\",label=\"Used\",fontsize=10,height=0.2,width=0.4,fontname=\"FreeSans.ttf\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
writeGraphFooter(dotText); writeGraphFooter(dotText);
dotFile.close(); dotFile.close();
...@@ -3091,8 +3091,8 @@ void DotGroupCollaboration::writeGraphHeader(QTextStream &t) ...@@ -3091,8 +3091,8 @@ void DotGroupCollaboration::writeGraphHeader(QTextStream &t)
{ {
t << " bgcolor=\"transparent\";" << endl; t << " bgcolor=\"transparent\";" << endl;
} }
t << " edge [fontname=\"Helvetica\",fontsize=8," t << " edge [fontname=\"FreeSans.ttf\",fontsize=8,"
"labelfontname=\"Helvetica\",labelfontsize=8];\n"; "labelfontname=\"FreeSans.ttf\",labelfontsize=8];\n";
t << " node [fontname=\"Helvetica\",fontsize=10,shape=record];\n"; t << " node [fontname=\"FreeSans.ttf\",fontsize=10,shape=record];\n";
t << "rankdir=LR;\n"; t << "rankdir=LR;\n";
} }
src/doxygen.cpp
View file @ 6f84cba4
...@@ -125,6 +125,7 @@ DirSDict Doxygen::directories(17); ...@@ -125,6 +125,7 @@ DirSDict Doxygen::directories(17);
SDict<DirRelation> Doxygen::dirRelations(257); SDict<DirRelation> Doxygen::dirRelations(257);
ParserManager *Doxygen::parserManager = 0; ParserManager *Doxygen::parserManager = 0;
QCString Doxygen::htmlFileExtension; QCString Doxygen::htmlFileExtension;
bool Doxygen::suppressDocWarnings = FALSE;
// locally accessible globals // locally accessible globals
static QDict<Entry> classEntries(1009); static QDict<Entry> classEntries(1009);
...@@ -1750,7 +1751,7 @@ static MemberDef *addVariableToClass( ...@@ -1750,7 +1751,7 @@ static MemberDef *addVariableToClass(
} }
Debug::print(Debug::Variables,0, Debug::print(Debug::Variables,0,
" class variable:\n" " class variable:\n"
" %s' %s'::`%s' `%s' prot=`%d ann=%d init=%s\n", " `%s' `%s'::`%s' `%s' prot=`%d ann=%d init=%s\n",
root->type.data(), root->type.data(),
qualScope.data(), qualScope.data(),
name.data(), name.data(),
...@@ -4876,6 +4877,7 @@ static void findMember(Entry *root, ...@@ -4876,6 +4877,7 @@ static void findMember(Entry *root,
else else
{ {
scopeName = mergeScopes(root->parent->name,scopeName); scopeName = mergeScopes(root->parent->name,scopeName);
printf("joinedName=%s\n",scopeName.data());
} }
} }
else // see if we can prefix a namespace or class that is used from the file else // see if we can prefix a namespace or class that is used from the file
...@@ -9110,9 +9112,6 @@ void generateOutput() ...@@ -9110,9 +9112,6 @@ void generateOutput()
msg("Generating index page...\n"); msg("Generating index page...\n");
writeIndex(*outputList); writeIndex(*outputList);
msg("Generating file index...\n");
writeFileIndex(*outputList);
msg("Generating example documentation...\n"); msg("Generating example documentation...\n");
generateExampleDocs(); generateExampleDocs();
...@@ -9126,26 +9125,44 @@ void generateOutput() ...@@ -9126,26 +9125,44 @@ void generateOutput()
msg("Generating file documentation...\n"); msg("Generating file documentation...\n");
generateFileDocs(); generateFileDocs();
msg("Generating class documentation...\n");
generateClassDocs();
msg("Generating page documentation...\n"); msg("Generating page documentation...\n");
generatePageDocs(); generatePageDocs();
msg("Generating group documentation...\n"); msg("Generating group documentation...\n");
generateGroupDocs(); generateGroupDocs();
if (Config_getBool("SHOW_DIRECTORIES")) msg("Generating group index...\n");
writeGroupIndex(*outputList);
msg("Generating class documentation...\n");
generateClassDocs();
if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY"))
{ {
msg("Generating directory documentation...\n"); msg("Generating graphical class hierarchy...\n");
generateDirDocs(*outputList); writeGraphicalClassHierarchy(*outputList);
} }
msg("Generating namespace index...\n"); msg("Generating namespace index...\n");
generateNamespaceDocs(); generateNamespaceDocs();
msg("Generating group index...\n"); msg("Generating namespace member index...\n");
writeGroupIndex(*outputList); writeNamespaceMemberIndex(*outputList);
if (Config_getBool("GENERATE_LEGEND"))
{
msg("Generating graph info page...\n");
writeGraphInfo(*outputList);
}
if (Config_getBool("SHOW_DIRECTORIES"))
{
msg("Generating directory documentation...\n");
generateDirDocs(*outputList);
}
msg("Generating file index...\n");
writeFileIndex(*outputList);
if (Config_getBool("SHOW_DIRECTORIES")) if (Config_getBool("SHOW_DIRECTORIES"))
{ {
...@@ -9159,18 +9176,9 @@ void generateOutput() ...@@ -9159,18 +9176,9 @@ void generateOutput()
msg("Generating file member index...\n"); msg("Generating file member index...\n");
writeFileMemberIndex(*outputList); writeFileMemberIndex(*outputList);
msg("Generating namespace member index...\n");
writeNamespaceMemberIndex(*outputList);
msg("Generating page index...\n"); msg("Generating page index...\n");
writePageIndex(*outputList); writePageIndex(*outputList);
if (Config_getBool("GENERATE_LEGEND"))
{
msg("Generating graph info page...\n");
writeGraphInfo(*outputList);
}
//writeDirDependencyGraph(Config_getString("HTML_OUTPUT")); //writeDirDependencyGraph(Config_getString("HTML_OUTPUT"));
if (Config_getBool("GENERATE_RTF")) if (Config_getBool("GENERATE_RTF"))
...@@ -9182,12 +9190,6 @@ void generateOutput() ...@@ -9182,12 +9190,6 @@ void generateOutput()
} }
} }
if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY"))
{
msg("Generating graphical class hierarchy...\n");
writeGraphicalClassHierarchy(*outputList);
}
if (Doxygen::formulaList.count()>0 && Config_getBool("GENERATE_HTML")) if (Doxygen::formulaList.count()>0 && Config_getBool("GENERATE_HTML"))
{ {
msg("Generating bitmaps for formulas in HTML...\n"); msg("Generating bitmaps for formulas in HTML...\n");
......
src/doxygen.css
View file @ 6f84cba4
...@@ -343,3 +343,15 @@ HR { height: 1px; ...@@ -343,3 +343,15 @@ HR { height: 1px;
font-style: italic; font-style: italic;
} }
/* End Styling for detailed member documentation */ /* End Styling for detailed member documentation */
/* for the tree view */
.ftvtree {
font-family: sans-serif;
margin:0.5em;
}
.directory { font-size: 9pt; font-weight: bold; }
.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
.directory > h3 { margin-top: 0; }
.directory p { margin: 0px; white-space: nowrap; }
.directory div { display: none; margin: 0px; }
.directory img { vertical-align: -30%; }
src/doxygen.h
View file @ 6f84cba4
...@@ -117,6 +117,7 @@ class Doxygen ...@@ -117,6 +117,7 @@ class Doxygen
static DirSDict directories; static DirSDict directories;
static SDict<DirRelation> dirRelations; static SDict<DirRelation> dirRelations;
static ParserManager *parserManager; static ParserManager *parserManager;
static bool suppressDocWarnings;
}; };
void initDoxygen(); void initDoxygen();
......
src/doxygen_css.h
View file @ 6f84cba4
...@@ -343,3 +343,16 @@ ...@@ -343,3 +343,16 @@
" font-style: italic;\n" " font-style: italic;\n"
"}\n" "}\n"
"/* End Styling for detailed member documentation */\n" "/* End Styling for detailed member documentation */\n"
"\n"
"/* for the tree view */\n"
".ftvtree {\n"
" font-family: sans-serif;\n"
" margin:0.5em;\n"
"}\n"
".directory { font-size: 9pt; font-weight: bold; }\n"
".directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }\n"
".directory > h3 { margin-top: 0; }\n"
".directory p { margin: 0px; white-space: nowrap; }\n"
".directory div { display: none; margin: 0px; }\n"
".directory img { vertical-align: -30%; }\n"
"\n"
src/ftvhelp.cpp
View file @ 6f84cba4
...@@ -653,15 +653,6 @@ void FTVHelp::generateTreeView() ...@@ -653,15 +653,6 @@ void FTVHelp::generateTreeView()
} }
t << "\">" << endl; t << "\">" << endl;
t << " <title>TreeView</title>\n"; t << " <title>TreeView</title>\n";
t << " <style type=\"text/css\">\n";
t << " <!--\n";
t << " .directory { font-size: 10pt; font-weight: bold; }\n";
t << " .directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }\n";
t << " .directory p { margin: 0px; white-space: nowrap; }\n";
t << " .directory div { display: none; margin: 0px; }\n";
t << " .directory img { vertical-align: middle; }\n";
t << " -->\n";
t << " </style>\n";
t << " <script type=\"text/javascript\">\n"; t << " <script type=\"text/javascript\">\n";
t << " <!-- // Hide script from old browsers\n"; t << " <!-- // Hide script from old browsers\n";
t << " \n"; t << " \n";
...@@ -722,7 +713,7 @@ void FTVHelp::generateTreeView() ...@@ -722,7 +713,7 @@ void FTVHelp::generateTreeView()
t << " </script>\n"; t << " </script>\n";
t << " </head>\n"; t << " </head>\n";
t << "\n"; t << "\n";
t << " <body>\n"; t << " <body class=\"ftvtree\">\n";
t << " <div class=\"directory\">\n"; t << " <div class=\"directory\">\n";
t << " <h3>"; t << " <h3>";
QCString &projName = Config_getString("PROJECT_NAME"); QCString &projName = Config_getString("PROJECT_NAME");
......
src/latexgen.cpp
View file @ 6f84cba4
...@@ -186,7 +186,7 @@ void LatexGenerator::init() ...@@ -186,7 +186,7 @@ void LatexGenerator::init()
t << "refman.pdf: refman.tex" << endl; t << "refman.pdf: refman.tex" << endl;
t << "\tpdflatex refman.tex" << endl; t << "\tpdflatex refman.tex" << endl;
t << "\tmakeindex refman.idx" << endl; t << "\tmakeindex refman.idx" << endl;
t << "\tpdflatex refman.tex" << endl << endl t << "\tpdflatex refman.tex" << endl
<< "\tlatex_count=5 ; \\" << endl << "\tlatex_count=5 ; \\" << endl
<< "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\\" << endl << "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\\" << endl
<< "\t do \\" << endl << "\t do \\" << endl
......
src/logos.cpp
View file @ 6f84cba4
This diff is collapsed.
src/memberdef.cpp
View file @ 6f84cba4
...@@ -1931,7 +1931,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, ...@@ -1931,7 +1931,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
if (!Config_getBool("EXTRACT_ALL") && if (!Config_getBool("EXTRACT_ALL") &&
Config_getBool("WARN_IF_UNDOCUMENTED") && Config_getBool("WARN_IF_UNDOCUMENTED") &&
Config_getBool("WARN_NO_PARAMDOC")) Config_getBool("WARN_NO_PARAMDOC") &&
!Doxygen::suppressDocWarnings)
{ {
if (!hasDocumentedParams()) if (!hasDocumentedParams())
{ {
......
src/pyscanner.l
View file @ 6f84cba4
...@@ -660,7 +660,7 @@ STARTDOCSYMS ^{B}"##"/[^#] ...@@ -660,7 +660,7 @@ STARTDOCSYMS ^{B}"##"/[^#]
<SearchMemVars>{ <SearchMemVars>{
"self."{IDENTIFIER}/{B}"=" { "self."{IDENTIFIER}/{B}"=" {
//printf("Found member variable %s\n",&yytext[5]); //printf("Found member variable %s in %s\n",&yytext[5],current_root->name.data());
current->name=&yytext[5]; current->name=&yytext[5];
current->section=Entry::VARIABLE_SEC; current->section=Entry::VARIABLE_SEC;
current->fileName = yyFileName; current->fileName = yyFileName;
...@@ -900,15 +900,13 @@ STARTDOCSYMS ^{B}"##"/[^#] ...@@ -900,15 +900,13 @@ STARTDOCSYMS ^{B}"##"/[^#]
YY_CURRENT_BUFFER->yy_at_bol=TRUE; YY_CURRENT_BUFFER->yy_at_bol=TRUE;
BEGIN(Search); BEGIN(Search);
} }
/* \n/"##" { // start of a special comment at indent 0
^{B}/"##" { // start of a special comment
yyLineNr++; yyLineNr++;
endOfDef(); endOfDef();
g_hideClassDocs = FALSE; g_hideClassDocs = FALSE;
YY_CURRENT_BUFFER->yy_at_bol=TRUE; YY_CURRENT_BUFFER->yy_at_bol=TRUE;
BEGIN(Search); BEGIN(Search);
} }
*/
^{BB}/\n { // skip empty line ^{BB}/\n { // skip empty line
current->program+=yytext; current->program+=yytext;
} }
......
src/scanner.l
View file @ 6f84cba4
...@@ -559,6 +559,7 @@ TITLE [tT][iI][tT][lL][eE] ...@@ -559,6 +559,7 @@ TITLE [tT][iI][tT][lL][eE]
CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'")) CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;] PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
IDLATTR ("["[^\]]*"]"){BN}* IDLATTR ("["[^\]]*"]"){BN}*
TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
%option noyywrap %option noyywrap
...@@ -1168,8 +1169,8 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -1168,8 +1169,8 @@ IDLATTR ("["[^\]]*"]"){BN}*
BEGIN( CompoundName ); BEGIN( CompoundName );
} }
<FindMembers>"@class" | // for Objective C class declarations <FindMembers>"@class" | // for Objective C class declarations
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"class{" | <FindMembers>{B}*{TYPEDEFPREFIX}"class{" |
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"class"{BN}+ { <FindMembers>{B}*{TYPEDEFPREFIX}"class"{BN}+ {
isTypedef=((QCString)yytext).find("typedef")!=-1; isTypedef=((QCString)yytext).find("typedef")!=-1;
current->section = Entry::CLASS_SEC; current->section = Entry::CLASS_SEC;
addType( current ) ; addType( current ) ;
...@@ -1202,8 +1203,8 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -1202,8 +1203,8 @@ IDLATTR ("["[^\]]*"]"){BN}*
lineCount(); lineCount();
} }
} }
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"struct{" | <FindMembers>{B}*{TYPEDEFPREFIX}"struct{" |
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"struct"/{BN}+ { <FindMembers>{B}*{TYPEDEFPREFIX}"struct"/{BN}+ {
isTypedef=((QCString)yytext).find("typedef")!=-1; isTypedef=((QCString)yytext).find("typedef")!=-1;
current->section = Entry::STRUCT_SEC ; current->section = Entry::STRUCT_SEC ;
addType( current ) ; addType( current ) ;
...@@ -1215,8 +1216,8 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -1215,8 +1216,8 @@ IDLATTR ("["[^\]]*"]"){BN}*
if (yytext[yyleng-1]=='{') unput('{'); if (yytext[yyleng-1]=='{') unput('{');
BEGIN( CompoundName ) ; BEGIN( CompoundName ) ;
} }
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"union{" | <FindMembers>{B}*{TYPEDEFPREFIX}"union{" |
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"union"{BN}+ { <FindMembers>{B}*{TYPEDEFPREFIX}"union"{BN}+ {
isTypedef=((QCString)yytext).find("typedef")!=-1; isTypedef=((QCString)yytext).find("typedef")!=-1;
current->section = Entry::UNION_SEC ; current->section = Entry::UNION_SEC ;
addType( current ) ; addType( current ) ;
...@@ -1228,8 +1229,8 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -1228,8 +1229,8 @@ IDLATTR ("["[^\]]*"]"){BN}*
if (yytext[yyleng-1]=='{') unput('{'); if (yytext[yyleng-1]=='{') unput('{');
BEGIN( CompoundName ) ; BEGIN( CompoundName ) ;
} }
<FindMembers>{B}*(("typedef"{BN}+)?){IDLATTR}?"enum{" | <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum{" |
<FindMembers>{B}*(("typedef"{BN}+)?){IDLATTR}?"enum"{BN}+ { // for IDL: typedef [something] enum <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"{BN}+ { // for IDL: typedef [something] enum
isTypedef=((QCString)yytext).find("typedef")!=-1; isTypedef=((QCString)yytext).find("typedef")!=-1;
current->section = Entry::ENUM_SEC ; current->section = Entry::ENUM_SEC ;
addType( current ) ; addType( current ) ;
...@@ -3421,6 +3422,7 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -3421,6 +3422,7 @@ IDLATTR ("["[^\]]*"]"){BN}*
previous->inbodyLine = current->docLine; previous->inbodyLine = current->docLine;
previous->inbodyFile = current->docFile; previous->inbodyFile = current->docFile;
} }
//printf("*** inbodyDocs+=%s\n",current->doc.data());
previous->inbodyDocs += current->doc; previous->inbodyDocs += current->doc;
current->doc.resize(0); current->doc.resize(0);
} }
...@@ -3790,6 +3792,8 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -3790,6 +3792,8 @@ IDLATTR ("["[^\]]*"]"){BN}*
curlyCount=0; curlyCount=0;
if (current_root && // not a nested struct inside an @interface section if (current_root && // not a nested struct inside an @interface section
current_root->section!=Entry::INTERFACE_SEC && current_root->section!=Entry::INTERFACE_SEC &&
(current->section==Entry::INTERFACE_SEC ||
current->section==Entry::OBJCIMPL_SEC) &&
insideObjC insideObjC
) )
{ // ObjC body that ends with @end { // ObjC body that ends with @end
...@@ -4393,8 +4397,10 @@ static void newEntry() ...@@ -4393,8 +4397,10 @@ static void newEntry()
static void handleCommentBlock(const QCString &doc,bool brief) static void handleCommentBlock(const QCString &doc,bool brief)
{ {
static bool hideInBodyDocs = Config_getBool("HIDE_IN_BODY_DOCS");
int position=0; int position=0;
bool needsEntry=FALSE; bool needsEntry=FALSE;
if (docBlockInBody && hideInBodyDocs) return;
if (docBlockInBody) if (docBlockInBody)
{ {
if (previous==0) if (previous==0)
...@@ -4837,7 +4843,7 @@ bool CLanguageScanner::needsPreprocessing(const QCString &extension) ...@@ -4837,7 +4843,7 @@ bool CLanguageScanner::needsPreprocessing(const QCString &extension)
QCString fe=extension.lower(); QCString fe=extension.lower();
return return
!( fe==".java" || fe==".as" || fe==".cs" || fe==".d" || fe==".php" || !( fe==".java" || fe==".as" || fe==".cs" || fe==".d" || fe==".php" ||
fe==".php4" || fe==".inc" || fe==".phtml" || fe==".m" || fe==".mm" fe==".php4" || fe==".inc" || fe==".phtml"
); );
} }
......
src/translator_no.h
View file @ 6f84cba4
This diff is collapsed.
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