summaryrefslogtreecommitdiffstats
path: root/src/docparser.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2009-04-30 15:16:33 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2009-04-30 15:16:33 (GMT)
commit94f3e728ee9a663c8b5fc7a557d3b930c6f3e5e5 (patch)
tree4bb6e32b230b56f394a686986392ebbd802fb63b /src/docparser.cpp
parent2ae3ed6594f3e4814b3b351eecc63b5e0be1bd37 (diff)
downloadDoxygen-94f3e728ee9a663c8b5fc7a557d3b930c6f3e5e5.zip
Doxygen-94f3e728ee9a663c8b5fc7a557d3b930c6f3e5e5.tar.gz
Doxygen-94f3e728ee9a663c8b5fc7a557d3b930c6f3e5e5.tar.bz2
Release-1.5.9
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r--src/docparser.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 8875369..0295ba0 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -978,9 +978,11 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children)
QString name = linkToText(g_token->name,TRUE);
int len = g_token->name.length();
ClassDef *cd=0;
+ bool ambig;
+ FileDef *fd = findFileDef(Doxygen::inputNameDict,g_fileName,ambig);
//printf("handleLinkedWord(%s) g_context=%s\n",name.data(),g_context.data());
if (!g_insideHtmlLink &&
- (resolveRef(g_context,g_token->name,g_inSeeBlock,&compound,&member)
+ (resolveRef(g_context,g_token->name,g_inSeeBlock,&compound,&member,TRUE,fd)
|| (!g_context.isEmpty() && // also try with global scope
resolveRef("",g_token->name,g_inSeeBlock,&compound,&member))
)
@@ -1412,7 +1414,7 @@ DocSymbol::SymType DocSymbol::decodeSymbol(const QString &symName,char *letter)
DBG(("decodeSymbol(%s) l=%d\n",symName.data(),l));
if (symName=="&copy;") return DocSymbol::Copy;
else if (symName=="&trade;") return DocSymbol::Tm;
- else if (symName=="&tm;") return DocSymbol::Tm; // alias for &trace;
+ else if (symName=="&tm;") return DocSymbol::Tm; // alias for &trade;
else if (symName=="&reg;") return DocSymbol::Reg;
else if (symName=="&lt;") return DocSymbol::Less;
else if (symName=="&gt;") return DocSymbol::Greater;
@@ -1427,6 +1429,8 @@ DocSymbol::SymType DocSymbol::decodeSymbol(const QString &symName,char *letter)
else if (symName=="&mdash;") return DocSymbol::Mdash;
else if (symName=="&szlig;") return DocSymbol::Szlig;
else if (symName=="&nbsp;") return DocSymbol::Nbsp;
+ else if (symName=="&AElig;") return DocSymbol::AElig;
+ else if (symName=="&aelig;") return DocSymbol::Aelig;
else if (l==6 && symName.right(4)=="uml;")
{
*letter=symName.at(1);