Merge branch 'master' of github.com:doxygen/doxygen

4 files changed, 30 insertions, 18 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 721c4e9..d18474f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,25 +14,25 @@ environment:
     - VSVERSION: "15 2017"
     - VSVERSION: "14 2015"
 
+cache:
+  - C:\Users\Appveyor\.conan -> appveyor.yml
+  - c:\.conan -> appveyor.yml
+  - '%LOCALAPPDATA%\pip\Cache -> appveyor.yml'
+  - C:\miktex-repository -> appveyor.yml
+
+
 init:
   - cmake --version
   - perl --version
   - msbuild /version
 
 install:
-  - appveyor DownloadFile  https://miktex.org/download/win/basic-miktex-x32.exe
-  - basic-miktex-x32.exe --unattended --shared
-# Disabled this due to too slow download
-#  - ps: Invoke-WebRequest http://doxygen.nl/testing/miktex.zip -OutFile miktex.zip
-#  - 7z x miktex.zip -oC:\deps\miktex
-# Disabled MikTeX installed due to unreliable download
-#  - ps: Invoke-WebRequest https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs924/gs924w32.exe -OutFile gswin32c.exe
-#  - gswin32c /S /D=C:\deps\ghostscript
-#  - ps: if($env:platform -eq "x64") { Invoke-WebRequest https://miktex.org/download/win/miktexsetup-x64.zip -OutFile miktexsetup.zip }
-#  - ps: if($env:platform -eq "Win32") { Invoke-WebRequest https://miktex.org/download/win/miktexsetup-x86.zip -OutFile miktexsetup.zip }
-#  - 7z x miktexsetup.zip -oC:\tmpmiktex
-#  - C:\tmpmiktex\miktexsetup --local-package-repository=C:\temp\miktex --package-set=basic download
-#  - C:\tmpmiktex\miktexsetup --verbose --local-package-repository=C:\temp\miktex --package-set=basic install
+  # Static url: https://github.com/MiKTeX/miktex/issues/321#issuecomment-496286866
+  # The setup is small enough, and does not need to be cached
+  - appveyor DownloadFile  https://miktex.org/download/win/miktexsetup-x64.zip
+  - 7z e miktexsetup-x64.zip
+  - miktexsetup.exe --local-package-repository=C:\miktex-repository --package-set=essential download
+  - miktexsetup.exe --local-package-repository=C:\miktex-repository --package-set=essential --shared install
   - refreshenv
   - pip install conan
   - ps: |
@@ -41,7 +41,6 @@ install:
       winflexbison/2.5.16@bincrafters/stable" | Out-File -Encoding ASCII -FilePath conanfile.txt
   - conan install . -g virtualrunenv --build missing
   - activate_run.bat
-  - set "PATH=%PATH%;C:\deps\ghostscript\bin;C:\deps\miktex\miktex\bin"
 
 before_build:
   - if "%platform%"=="Win32" ( set "CMAKE_GENERATOR_NAME=Visual Studio %VSVERSION%" )
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
       {