summaryrefslogtreecommitdiffstats
path: root/src/rtfgen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-10-03 19:57:09 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-10-03 19:57:09 (GMT)
commitc52e719895be2a133e6574573584df5a91b98ec6 (patch)
tree47b95a7c3d927d419d3628f528e311aa99356173 /src/rtfgen.cpp
parente174524c861548adb3cfd48ef59a7a4551cd2bfb (diff)
downloadDoxygen-c52e719895be2a133e6574573584df5a91b98ec6.zip
Doxygen-c52e719895be2a133e6574573584df5a91b98ec6.tar.gz
Doxygen-c52e719895be2a133e6574573584df5a91b98ec6.tar.bz2
Release-1.2.11-20011003
Diffstat (limited to 'src/rtfgen.cpp')
-rw-r--r--src/rtfgen.cpp63
1 files changed, 32 insertions, 31 deletions
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 5313f9b..338d889 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -985,16 +985,16 @@ void RTFGenerator::startIndexSection(IndexSections is)
case isNamespaceDocumentation:
{
// Namespace Documentation
- NamespaceDef *nd=Doxygen::namespaceList.first();
+ NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+ NamespaceDef *nd;
bool found=FALSE;
- while (nd && !found)
+ for (nli.toFirst();(nd=nli.current()) && !found;++nli)
{
if (nd->isLinkableInProject())
{
beginRTFChapter();
found=TRUE;
}
- nd=Doxygen::namespaceList.next();
}
}
break;
@@ -1202,9 +1202,10 @@ void RTFGenerator::endIndexSection(IndexSections is)
break;
case isNamespaceDocumentation:
{
- NamespaceDef *nd=Doxygen::namespaceList.first();
+ NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+ NamespaceDef *nd;
bool found=FALSE;
- while (nd && !found)
+ for (nli.toFirst();(nd=nli.current()) && !found;++nli)
{
if (nd->isLinkableInProject())
{
@@ -1214,9 +1215,8 @@ void RTFGenerator::endIndexSection(IndexSections is)
t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
found=TRUE;
}
- nd=Doxygen::namespaceList.next();
}
- while (nd)
+ while ((nd=nli.current()))
{
if (nd->isLinkableInProject())
{
@@ -1226,7 +1226,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
t << nd->getOutputFileBase();
t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
}
- nd=Doxygen::namespaceList.next();
+ ++nli;
}
}
break;
@@ -1578,15 +1578,16 @@ void RTFGenerator::endIndexKey()
{
}
-void RTFGenerator::startIndexValue()
+void RTFGenerator::startIndexValue(bool hasBrief)
{
- t << " (";
+ t << " ";
+ if (hasBrief) t << "(";
}
-void RTFGenerator::endIndexValue(const char *name)
+void RTFGenerator::endIndexValue(const char *name,bool hasBrief)
{
DBG_RTF(t << "{\\comment (endIndexKey)}" << endl)
- t << ")";
+ if (hasBrief) t << ")";
t << "} ";
if (name)
{
@@ -1967,42 +1968,41 @@ void RTFGenerator::startDescList(SectionTypes)
void RTFGenerator::endDescTitle()
{
DBG_RTF(t << "{\\comment (endDescTitle) }" << endl)
- //endBold();
+ endBold();
+ t << "}";
newParagraph();
- //t << Rtf_Style_Reset << styleStack.top();
incrementIndentLevel();
t << Rtf_Style_Reset << Rtf_DList_DepthStyle();
}
-void RTFGenerator::startParamList(ParamListTypes)
-{
- DBG_RTF(t << "{\\comment (startParamList)}" << endl)
- t << "{";
- incrementIndentLevel();
- newParagraph();
+void RTFGenerator::writeDescItem()
+{
+ DBG_RTF(t << "{\\comment (writeDescItem) }" << endl)
+ // incrementIndentLevel();
+ //t << Rtf_Style_Reset << Rtf_CList_DepthStyle();
}
-void RTFGenerator::endParamList()
+void RTFGenerator::endDescList()
{
- DBG_RTF(t << "{\\comment (endParamList)}" << endl)
+ DBG_RTF(t << "{\\comment (endDescList)}" << endl)
newParagraph();
- t << "}";
+ //t << "}";
decrementIndentLevel();
m_omitParagraph = TRUE;
//t << Rtf_Style_Reset << styleStack.top() << endl;
+ t << Rtf_Style_Reset << endl;
}
-
-void RTFGenerator::writeDescItem()
-{
- DBG_RTF(t << "{\\comment (writeDescItem) }" << endl)
- // incrementIndentLevel();
- //t << Rtf_Style_Reset << Rtf_CList_DepthStyle();
+void RTFGenerator::startParamList(ParamListTypes)
+{
+ DBG_RTF(t << "{\\comment (startParamList)}" << endl)
+ t << "{";
+ newParagraph();
}
-void RTFGenerator::endDescList()
+void RTFGenerator::endParamList()
{
- DBG_RTF(t << "{\\comment (endDescList)}" << endl)
+ DBG_RTF(t << "{\\comment (endParamList)}" << endl)
newParagraph();
t << "}";
decrementIndentLevel();
@@ -2010,6 +2010,7 @@ void RTFGenerator::endDescList()
//t << Rtf_Style_Reset << styleStack.top() << endl;
}
+
void RTFGenerator::startSection(const char *,const char *title,bool sub)
{
DBG_RTF(t << "{\\comment (startSection)}" << endl)