diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-03-23 14:11:09 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-03-23 14:11:09 (GMT) |
| commit | 2a4c230bda1877024bfd2bc8b38a392b74bd2ea5 (patch) | |
| tree | f3a89b4a64800228147fa0ae378a02dc449c50ee | |
| parent | 2a22c7d4e71eb324ac82ac638fce89f8b04afdf0 (diff) | |
| parent | d2ec9b11f6d42991807e288e8e1891cd0b420d27 (diff) | |
| download | Doxygen-2a4c230bda1877024bfd2bc8b38a392b74bd2ea5.zip Doxygen-2a4c230bda1877024bfd2bc8b38a392b74bd2ea5.tar.gz Doxygen-2a4c230bda1877024bfd2bc8b38a392b74bd2ea5.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/doctokenizer.l | 10 | ||||
| -rw-r--r-- | src/index.cpp | 7 |
2 files changed, 13 insertions, 4 deletions
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; } <St_Para,St_HtmlOnly>"$("{ID}")" { /* environment variable */ diff --git a/src/index.cpp b/src/index.cpp index 9bbc4a4..2013a7c 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); } |