summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/arch.doc8
-rw-r--r--doc/faq.doc2
-rw-r--r--doc/grouping.doc2
-rw-r--r--src/context.cpp2
-rw-r--r--src/definition.cpp6
-rw-r--r--src/filedef.cpp23
-rw-r--r--src/htmlgen.cpp7
-rw-r--r--src/htmlgen.h2
-rw-r--r--src/latexdocvisitor.cpp6
-rw-r--r--src/latexgen.cpp8
-rw-r--r--src/latexgen.h2
-rw-r--r--src/mangen.cpp2
-rw-r--r--src/mangen.h2
-rw-r--r--src/outputgen.h2
-rw-r--r--src/outputlist.h4
-rw-r--r--src/rtfgen.cpp2
-rw-r--r--src/rtfgen.h2
-rw-r--r--src/scanner.l6
-rw-r--r--src/util.cpp1
-rw-r--r--src/vhdldocgen.h2
-rw-r--r--templates/html/doxygen.css4
-rw-r--r--templates/xml/compound.xsd1
22 files changed, 59 insertions, 37 deletions
diff --git a/doc/arch.doc b/doc/arch.doc
index 57d05d4..4b17d7c 100644
--- a/doc/arch.doc
+++ b/doc/arch.doc
@@ -188,7 +188,7 @@ could extract information from the XML output. Possible tools could be:
<h3>Debugging</h3>
Since doxygen uses a lot of \c flex code it is important to understand
-how \c flex works (for this one should read the man page)
+how \c flex works (for this one should read the \c man page)
and to understand what it is doing when \c flex is parsing some input.
Fortunately, when flex is used with the `-d` option it outputs what rules
matched. This makes it quite easy to follow what is going on for a
@@ -240,10 +240,10 @@ $now = time;
utime $now, $now, $file
\endverbatim
Another way to get rules matching / debugging information
-from the flex code is setting LEX_FLAGS with cmake.
+from the \c flex code is setting LEX_FLAGS with \c make (`make LEX_FLAGS=-d`).
-Note that by running doxygen with `-d lex` you get information about which flex
-codefile is used.
+Note that by running doxygen with `-d lex` you get information about which
+`flex codefile` is used.
\htmlonly
Return to the <a href="index.html">index</a>.
diff --git a/doc/faq.doc b/doc/faq.doc
index d1845e0..5af3db8 100644
--- a/doc/faq.doc
+++ b/doc/faq.doc
@@ -247,7 +247,7 @@ option \ref cfg_builtin_stl_support "BUILTIN_STL_SUPPORT" is turned on.
\section faq_search I have problems getting the search engine to work with PHP5 and/or windows
-Please read <a href="searchengine.html">this</a> for hints on where to look.
+Please read <a href="http://www.doxygen.org/searchengine.html">this</a> for hints on where to look.
\section faq_cmdline Can I configure doxygen from the command line?
diff --git a/doc/grouping.doc b/doc/grouping.doc
index bdb16e3..bbb577c 100644
--- a/doc/grouping.doc
+++ b/doc/grouping.doc
@@ -128,7 +128,7 @@ This is the \ref group_label "link" to this group.
The priorities of grouping definitions are (from highest to lowest):
\ref cmdingroup "\\ingroup", \ref cmddefgroup "\\defgroup",
\ref cmdaddtogroup "\\addtogroup", \ref cmdweakgroup "\\weakgroup".
-The last command is exactly like \ref cmdaddtogroup "\\addtogroup"
+The \ref cmdweakgroup "\\weakgroup" command is exactly like \ref cmdaddtogroup "\\addtogroup"
with a lower priority. It was added to allow "lazy" grouping
definitions: you can use commands with a higher priority in your .h
files to define the hierarchy and \ref cmdweakgroup "\\weakgroup"
diff --git a/src/context.cpp b/src/context.cpp
index 40c3b95..e5d98c1 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -3814,7 +3814,7 @@ class TextGeneratorLatex : public TextGeneratorIntf
}
else
{
- m_ts << "{\\bf ";
+ m_ts << "\\textbf{ ";
filterLatexString(m_ts,text);
m_ts << "}";
}
diff --git a/src/definition.cpp b/src/definition.cpp
index 7e6e8ec..68201da 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -933,7 +933,7 @@ void Definition::writeSourceDef(OutputList &ol,const char *)
QCString lineStr;
lineStr.sprintf("%d",m_impl->body->startLine);
QCString anchorStr = getSourceAnchor();
- ol.startParagraph();
+ ol.startParagraph("definition");
if (lineMarkerPos<fileMarkerPos) // line marker before file marker
{
// write text left from linePos marker
@@ -1067,7 +1067,7 @@ void Definition::writeSourceDef(OutputList &ol,const char *)
}
else
{
- err("translation error: invalid markers in trDefinedInSourceFile()\n");
+ err("translation error: invalid markers in trDefinedAtLineInSourceFile()\n");
}
}
ol.popGeneratorState();
@@ -1152,7 +1152,7 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName,
{
members->sort();
- ol.startParagraph();
+ ol.startParagraph("reference");
ol.parseText(text);
ol.docify(" ");
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 9c04dc8..2cfe37a 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -82,8 +82,8 @@ FileDef::FileDef(const char *p,const char *nm,
m_path=p;
m_filePath=m_path+nm;
m_fileName=nm;
- setDiskName(dn?dn:nm);
setReference(lref);
+ setDiskName(dn?dn:nm);
m_classSDict = 0;
m_includeList = 0;
m_includeDict = 0;
@@ -126,9 +126,18 @@ FileDef::~FileDef()
void FileDef::setDiskName(const QCString &name)
{
- m_outputDiskName = convertNameToFile(name);
- m_inclDepFileName = convertNameToFile(name+"_incl");
- m_inclByDepFileName = convertNameToFile(name+"_dep_incl");
+ if (isReference())
+ {
+ m_outputDiskName = name;
+ m_inclDepFileName = name+"_incl";
+ m_inclByDepFileName = name+"_dep_incl";
+ }
+ else
+ {
+ m_outputDiskName = convertNameToFile(name);
+ m_inclDepFileName = convertNameToFile(name+"_incl");
+ m_inclByDepFileName = convertNameToFile(name+"_dep_incl");
+ }
}
/*! Compute the HTML anchor names for all members in the class */
@@ -344,7 +353,7 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title)
ol.disable(OutputGenerator::RTF);
}
- ol.startParagraph();
+ ol.startParagraph("definition");
QCString refText = theTranslator->trDefinedInSourceFile();
int fileMarkerPos = refText.find("@0");
if (fileMarkerPos!=-1) // should always pass this.
@@ -355,6 +364,10 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title)
ol.parseText(refText.right(
refText.length()-fileMarkerPos-2)); // text right from marker 2
}
+ else
+ {
+ err("translation error: invalid marker in trDefinedInSourceFile()\n");
+ }
ol.endParagraph();
//Restore settings, bug_738548
ol.popGeneratorState();
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index a5ec7ff..28a363b 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1052,9 +1052,12 @@ void HtmlGenerator::endDoxyAnchor(const char *,const char *)
// t << endl << "<p>" << endl;
//}
-void HtmlGenerator::startParagraph()
+void HtmlGenerator::startParagraph(const char *classDef)
{
- t << endl << "<p>";
+ if (classDef)
+ t << endl << "<p class=\"" << classDef << "\">";
+ else
+ t << endl << "<p>";
}
void HtmlGenerator::endParagraph()
diff --git a/src/htmlgen.h b/src/htmlgen.h
index 30f54f4..70e4b5f 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -140,7 +140,7 @@ class HtmlGenerator : public OutputGenerator
void startTitle() { t << "<div class=\"title\">"; }
void endTitle() { t << "</div>"; }
- void startParagraph();
+ void startParagraph(const char *classDef);
void endParagraph();
void writeString(const char *text);
void startIndexListItem();
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index 048deb7..9016c25 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -1169,7 +1169,7 @@ void LatexDocVisitor::visitPre(DocHtmlCell *c)
}
if (c->isHeading())
{
- m_t << "{\\bf ";
+ m_t << "\\textbf{ ";
}
if (cs>1)
{
@@ -1566,7 +1566,7 @@ void LatexDocVisitor::visitPre(DocXRefItem *x)
}
else
{
- m_t << "{\\bf ";
+ m_t << "\\textbf{ ";
}
m_insideItem=TRUE;
filter(x->title());
@@ -1674,7 +1674,7 @@ void LatexDocVisitor::startLink(const QCString &ref,const QCString &file,const Q
}
else // external link
{
- m_t << "{\\bf ";
+ m_t << "\\textbf{ ";
}
}
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 37eacdb..8d338ae 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1256,7 +1256,7 @@ void LatexGenerator::newParagraph()
t << endl << endl;
}
-void LatexGenerator::startParagraph()
+void LatexGenerator::startParagraph(const char *)
{
t << endl << endl;
}
@@ -1379,7 +1379,7 @@ void LatexGenerator::startTextLink(const char *f,const char *anchor)
}
else
{
- t << "{\\bf ";
+ t << "\\textbf{ ";
}
}
@@ -1404,7 +1404,7 @@ void LatexGenerator::writeObjectLink(const char *ref, const char *f,
}
else
{
- t << "{\\bf ";
+ t << "\\textbf{ ";
docify(text);
t << "}";
}
@@ -1907,7 +1907,7 @@ void LatexGenerator::endMemberList()
void LatexGenerator::startMemberGroupHeader(bool hasHeader)
{
if (hasHeader) t << "\\begin{Indent}";
- t << "{\\bf ";
+ t << "\\textbf{ ";
// changed back to rev 756 due to bug 660501
//if (Config_getBool(COMPACT_LATEX))
//{
diff --git a/src/latexgen.h b/src/latexgen.h
index 7b21ea4..430d250 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -135,7 +135,7 @@ class LatexGenerator : public OutputGenerator
void endTitle() { t << "}"; }
void newParagraph();
- void startParagraph();
+ void startParagraph(const char *classDef);
void endParagraph();
void writeString(const char *text);
void startIndexListItem() {}
diff --git a/src/mangen.cpp b/src/mangen.cpp
index 2f4d3ae..17e6003 100644
--- a/src/mangen.cpp
+++ b/src/mangen.cpp
@@ -208,7 +208,7 @@ void ManGenerator::newParagraph()
paragraph=TRUE;
}
-void ManGenerator::startParagraph()
+void ManGenerator::startParagraph(const char *)
{
if (!paragraph)
{
diff --git a/src/mangen.h b/src/mangen.h
index daaae0c..b3b9f76 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -62,7 +62,7 @@ class ManGenerator : public OutputGenerator
void endTitle();
void newParagraph();
- void startParagraph();
+ void startParagraph(const char *classDef);
void endParagraph();
void writeString(const char *text);
void startIndexListItem() {}
diff --git a/src/outputgen.h b/src/outputgen.h
index 830fd49..7e28bac 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -188,7 +188,7 @@ class BaseOutputDocInterface : public CodeOutputInterface
//virtual void newParagraph() = 0;
/*! Starts a new paragraph */
- virtual void startParagraph() = 0;
+ virtual void startParagraph(const char *classDef) = 0;
/*! Ends a paragraph */
virtual void endParagraph() = 0;
diff --git a/src/outputlist.h b/src/outputlist.h
index 78a2ea0..5cec439 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -112,8 +112,8 @@ class OutputList : public OutputDocInterface
{ forall(&OutputGenerator::endTitle); }
//void newParagraph()
//{ forall(&OutputGenerator::newParagraph); }
- void startParagraph()
- { forall(&OutputGenerator::startParagraph); }
+ void startParagraph(const char *classDef=0)
+ { forall(&OutputGenerator::startParagraph,classDef); }
void endParagraph()
{ forall(&OutputGenerator::endParagraph); }
void writeString(const char *text)
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 053d450..349d97d 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -2144,7 +2144,7 @@ void RTFGenerator::newParagraph()
m_omitParagraph = FALSE;
}
-void RTFGenerator::startParagraph()
+void RTFGenerator::startParagraph(const char *)
{
DBG_RTF(t << "{\\comment startParagraph}" << endl)
newParagraph();
diff --git a/src/rtfgen.h b/src/rtfgen.h
index 27dd490..d8f6ca7 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -62,7 +62,7 @@ class RTFGenerator : public OutputGenerator
void endTitle() {}
void newParagraph();
- void startParagraph();
+ void startParagraph(const char *classDef);
void endParagraph();
void writeString(const char *text);
void startIndexListItem();
diff --git a/src/scanner.l b/src/scanner.l
index 1fe5667..14bf3fc 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1014,7 +1014,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
current->name = yytext;
}
<CliPropertyType>"[" { // C++/CLI indexed property
- current->name += yytext;
+ current->args = "[";
BEGIN( CliPropertyIndex );
}
<CliPropertyType>"{" {
@@ -1037,10 +1037,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
<CliPropertyIndex>"]" {
BEGIN( CliPropertyType );
- current->name+=yytext;
+ current->args+=yytext;
}
<CliPropertyIndex>. {
- current->name+=yytext;
+ current->args+=yytext;
}
/*
<FindMembers>{B}*"property"{BN}+ {
diff --git a/src/util.cpp b/src/util.cpp
index 94c6bd7..0d45758 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8190,6 +8190,7 @@ QCString langToString(SrcLangExt lang)
case SrcLangExt_Fortran: return "Fortran";
case SrcLangExt_VHDL: return "VHDL";
case SrcLangExt_XML: return "XML";
+ case SrcLangExt_SQL: return "SQL";
case SrcLangExt_Tcl: return "Tcl";
case SrcLangExt_Markdown: return "Markdown";
}
diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h
index 36d97a7..bd190ca 100644
--- a/src/vhdldocgen.h
+++ b/src/vhdldocgen.h
@@ -315,7 +315,7 @@ class FlowChart
static void delFlowList();
static const char* getNodeType(int c);
- static void addFlowChart(int type,const char* text,const char* exp,const char * label=NULL);
+ static void addFlowChart(int type,const char* text,const char* exp,const char * label=0);
static void moveToPrevLevel();
static int getTimeStamp();
static void writeFlowChart();
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index db80bc8..26169de 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -4,6 +4,10 @@ body, table, div, p, dl {
font: 400 14px/22px Roboto,sans-serif;
}
+p.reference, p.definition {
+ font: 400 14px/22px Roboto,sans-serif;
+}
+
/* @group Heading Levels */
h1.groupheader {
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index f2ab42c..29eb1db 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -712,6 +712,7 @@
<xsd:enumeration value="Fortran" />
<xsd:enumeration value="VHDL" />
<xsd:enumeration value="XML" />
+ <xsd:enumeration value="SQL" />
<xsd:enumeration value="Tcl" />
<xsd:enumeration value="Markdown" />
</xsd:restriction>
generated by cgit v0.12 at 2024-07-08 09:36:01 (GMT)