From ea1ee635fccbba4273a922dab3d092dd75b195e0 Mon Sep 17 00:00:00 2001 From: rkawulak Date: Mon, 17 Mar 2014 03:58:07 +0100 Subject: Update doctokenizer.l Added support for Subversion fixed-length keyword syntax (see: http://sourceforge.net/p/doxygen/discussion/130996/thread/1c641a9f/). --- src/doctokenizer.l | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/doctokenizer.l b/src/doctokenizer.l index a4e6c4a..7ebe7d3 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -628,7 +628,15 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2} QCString tagName(yytext+1); int index=tagName.find(':'); g_token->name = tagName.left(index+1); - g_token->text = tagName.mid(index+2,tagName.length()-index-3); + int text_begin = index+2; + int text_end = tagName.length()-1; + if (tagName[text_begin-1]==':') /* check for Subversion fixed-length keyword */ + { + ++text_begin; + if (tagName[text_end-1]=='#') + --text_end; + } + g_token->text = tagName.mid(text_begin,text_end-text_begin); return TK_RCSTAG; } "$("{ID}")" { /* environment variable */ -- cgit v0.12 From a2c7f91d6320f72951f1e3ef092e077a89562670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Tue, 18 Mar 2014 11:16:06 +0100 Subject: List only the project pages in "Related Pages" This avoids cluttering "Related Pages" with links to pages from external projects. --- src/index.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/index.cpp b/src/index.cpp index 2fdd0de..50c3250 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3173,9 +3173,10 @@ static void writePageIndex(OutputList &ol) PageDef *pd=0; for (pdi.toFirst();(pd=pdi.current());++pdi) { - if (pd->getOuterScope()==0 || - pd->getOuterScope()->definitionType()!=Definition::TypePage - ) // not a sub page + if ((pd->getOuterScope()==0 || + pd->getOuterScope()->definitionType()!=Definition::TypePage) && // not a sub page + !pd->isReference() // not an external page + ) { writePages(pd,ftv); } -- cgit v0.12