diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-06-02 10:34:48 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-06-02 10:34:48 (GMT) |
| commit | 7403c9e4f7f05e4660ed6d3a54f3f935958b01fd (patch) | |
| tree | 8cc76edde22c0ed4b4498df78a37c70ba6fc05cf /src | |
| parent | a8b46600830be24ac189f798a1915f0ad1b86beb (diff) | |
| parent | 0a15da0120834a5cf7db20843b7d63f3c82f5f5d (diff) | |
| download | Doxygen-7403c9e4f7f05e4660ed6d3a54f3f935958b01fd.zip Doxygen-7403c9e4f7f05e4660ed6d3a54f3f935958b01fd.tar.gz Doxygen-7403c9e4f7f05e4660ed6d3a54f3f935958b01fd.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/doctokenizer.l | 3 | ||||
| -rw-r--r-- | src/dot.cpp | 6 | ||||
| -rw-r--r-- | src/doxygen.cpp | 12 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 7b402ca..5346c0a 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -658,7 +658,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->isEMailAddr=TRUE; return TK_URL; } -<St_Para>"$"{ID}":"[^\n$]+"$" { /* RCS tag */ +<St_Para>"$"{ID}":"[^:\n$][^\n$]*"$" { /* RCS tag */ QCString tagName(yytext+1); int index=tagName.find(':'); g_token->name = tagName.left(index); @@ -902,6 +902,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->sectionId = QCString(yytext).stripWhiteSpace(); return RetVal_OK; } +<St_PlantUMLOpt>"\n" | <St_PlantUMLOpt>. { g_token->sectionId = ""; unput(*yytext); diff --git a/src/dot.cpp b/src/dot.cpp index 1570abc..5aca277 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -231,6 +231,8 @@ static EdgeProperties umlEdgeProps = }; +static QCString convertLabel(const QCString &l); + static QCString getDotFontName() { static QCString dotFontName = Config_getString(DOT_FONTNAME); @@ -259,7 +261,7 @@ static void writeGraphHeader(FTextStream &t,const QCString &title=QCString()) } else { - t << "\"" << convertToXML(title) << "\""; + t << "\"" << convertLabel(title) << "\""; } t << endl << "{" << endl; if (interactiveSVG) // insert a comment to force regeneration when this @@ -4780,7 +4782,7 @@ void DotGroupCollaboration::writeGraphHeader(FTextStream &t, } else { - t << "\"" << convertToXML(title) << "\""; + t << "\"" << convertLabel(title) << "\""; } t << endl; t << "{" << endl; diff --git a/src/doxygen.cpp b/src/doxygen.cpp index f4ff579..30c2001 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -766,6 +766,16 @@ static void buildFileList(Entry *root) { bool ambig; FileDef *fd=findFileDef(Doxygen::inputNameDict,root->name,ambig); + if (!fd || ambig) + { + int save_ambig = ambig; + // use the directory of the file to see if the described file is in the same + // directory as the describing file. + QCString fn = root->fileName; + int newIndex=fn.findRev('/'); + fd=findFileDef(Doxygen::inputNameDict,fn.left(newIndex) + "/" + root->name,ambig); + if (!fd) ambig = save_ambig; + } //printf("**************** root->name=%s fd=%p\n",root->name.data(),fd); if (fd && !ambig) { @@ -795,7 +805,7 @@ static void buildFileList(Entry *root) const char *fn = root->fileName.data(); QCString text(4096); text.sprintf("the name `%s' supplied as " - "the second argument in the \\file statement ", + "the argument in the \\file statement ", qPrint(root->name)); if (ambig) // name is ambiguous { |