summaryrefslogtreecommitdiffstats
path: root/src/rtfgen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-06-04 17:46:13 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-06-04 17:46:13 (GMT)
commitc6b7c8e7b6760ebfafa40a71eea48d1b46dec477 (patch)
tree85b63b795f663bb71c26c647948a085a3849177d /src/rtfgen.cpp
parent832e08dcc70203d84f75249583a95fa172492aa2 (diff)
downloadDoxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.zip
Doxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.tar.gz
Doxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.tar.bz2
Release-1.1.4
Diffstat (limited to 'src/rtfgen.cpp')
-rw-r--r--src/rtfgen.cpp57
1 files changed, 31 insertions, 26 deletions
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 86ff8c2..9ac69cf 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -46,20 +46,24 @@ static ListItemInfo listItemInfo[indentLevels];
static QCString formatBmkStr(const char *name)
{
QCString result=name;
- int i=0;
- char c;
- while ((c=result.at(i))!=0)
+ if (!result.isEmpty())
{
- switch(c)
+ char c;
+ char *p=result.data();
+ while ((c=*p))
{
- case '.':
- case ':':
- result.at(i)='_';
- break;
- default:
- break;
+ switch(c)
+ {
+ case '.':
+ // fall through
+ case ':':
+ *p='_';
+ break;
+ default:
+ break;
+ }
+ p++;
}
- i++;
}
return result;
}
@@ -1146,18 +1150,16 @@ void RTFGenerator::endTitleHead(const char *fileName,const char *name)
t << "}" << endl;
// make an index entry
- addToIndex(name,NULL);
+ addToIndex(name,0);
-
- if (fileName)
+ if (name)
{
- // doxygen expects different anchors for pdf and if "FULL PATHS"
- writeAnchor(fileName,0);
+ writeAnchor(0,name);
}
- else
+
+ if (Config::rtfHyperFlag && fileName)
{
- // make a bookmark for referencing
- writeAnchor(0,name);
+ writeAnchor(fileName,0);
}
}
}
@@ -1193,8 +1195,11 @@ void RTFGenerator::startMemberDoc(const char *clname,
const char *)
{
t << "{\\comment startMemberDoc}" << endl;
- addToIndex(memname,clname);
- addToIndex(clname,memname);
+ if (memname && memname[0]!='@')
+ {
+ addToIndex(memname,clname);
+ addToIndex(clname,memname);
+ }
//t << Rtf_Style_Reset << Rtf_Style_ListBullet1;
t << Rtf_Style_Reset << Rtf_Style_Heading4;
//styleStack.push(Rtf_Style_Heading4);
@@ -1352,7 +1357,7 @@ void RTFGenerator::startDescList()
{
t << "{\\comment (startDescList)}" << endl;
t << "{";
- ///*if (!m_omitParagraph)*/ newParagraph();
+ newParagraph();
}
void RTFGenerator::endDescTitle()
@@ -2027,11 +2032,11 @@ bool RTFGenerator::preProcessFileInplace(const char *path,const char *name)
return TRUE;
}
-void RTFGenerator::startMemberGroupHeader()
+void RTFGenerator::startMemberGroupHeader(bool hasHeader)
{
t << "{\\comment startMemberGroupHeader}" << endl;
t << "{" << endl;
- incrementIndentLevel();
+ if (hasHeader) incrementIndentLevel();
t << Rtf_Style_Reset << Rtf_Style_GroupHeader;
}
@@ -2061,10 +2066,10 @@ void RTFGenerator::startMemberGroup()
t << Rtf_Style_Reset << Rtf_BList_DepthStyle() << endl;
}
-void RTFGenerator::endMemberGroup(bool)
+void RTFGenerator::endMemberGroup(bool hasHeader)
{
t << "{\\comment endMemberGroup}" << endl;
- decrementIndentLevel();
+ if (hasHeader) decrementIndentLevel();
t << "}";
}