summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2009-08-14 14:49:07 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2009-08-14 14:49:07 (GMT)
commit8c6ca30831818a77a6947baad63ab99cb8cd8c31 (patch)
treefed426d0d7216311cbd009a1fcd2786176478b5e /src/commentscan.l
parent142b4807d2ae7479691bd0800d28364b9857b82f (diff)
downloadDoxygen-8c6ca30831818a77a6947baad63ab99cb8cd8c31.zip
Doxygen-8c6ca30831818a77a6947baad63ab99cb8cd8c31.tar.gz
Doxygen-8c6ca30831818a77a6947baad63ab99cb8cd8c31.tar.bz2
Release-1.5.9-20090814
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 0ddb9fa..88f4008 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -512,8 +512,8 @@ static void addXRefItem(const char *listName,const char *itemTitle,
{
if (strcmp(lii->type,listName)==0)
{
- //printf("found %s lii->type=%s\n",listName,lii->type);
- break;
+ //printf("found %s lii->type=%s\n",listName,lii->type);
+ break;
}
}
}
@@ -534,7 +534,8 @@ static void addXRefItem(const char *listName,const char *itemTitle,
// if we have already an item from the same list type (e.g. a second @todo)
// in the same Entry (i.e. lii!=0) then we reuse its link anchor.
char anchorLabel[1024];
- sprintf(anchorLabel,"_%s%06d",listName,lii ? lii->itemId : itemId);
+ //sprintf(anchorLabel,"_%s%06d",listName,lii ? lii->itemId : itemId);
+ sprintf(anchorLabel,"_%s%06d",listName,itemId);
RefItem *item = refList->getRefItem(itemId);
ASSERT(item!=0);
item->text = outputXRef;
@@ -621,7 +622,8 @@ static inline void setOutput(OutputContext ctx)
{
bool xrefAppendToPrev = xrefAppendFlag;
// determine append flag for the next item (i.e. the end of this item)
- xrefAppendFlag = inContext==OutputXRef && ctx==OutputXRef && // two consecutive xref items
+ xrefAppendFlag = !inBody &&
+ inContext==OutputXRef && ctx==OutputXRef && // two consecutive xref items
newXRefKind==xrefKind && // of the same kind
(xrefKind!=XRef_Item ||
newXRefItemKey==xrefItemKey); // with the same key if \xrefitem