Merge pull request doxygen#11324 from albert-github/feature/issue_11308_svg

issue doxygen#11308 SVG dot graphs have added padding

Author: doxygen

src/config.xml

@@ -4050,8 +4050,10 @@ UML notation for the relationships.
 <![CDATA[
  The \c DOT_IMAGE_FORMAT tag can be used to set the image format of the images
  generated by \c dot. For an explanation of the image formats see the section output formats
- in the documentation of the \c dot tool
- (<a href="https://www.graphviz.org/">Graphviz</a>).
+ in the documentation of the \c dot tool (<a href="https://www.graphviz.org/">Graphviz</a>).
+ <br>Note the formats `svg:cairo` and `svg:cairo:cairo` cannot be used in combination with
+ \ref cfg_interactive_svg "INTERACTIVE_SVG" (the \ref cfg_interactive_svg "INTERACTIVE_SVG"
+ will be set to `NO`).
 ]]>
       </docs>
       <value name='png'/>
@@ -4066,14 +4068,35 @@ UML notation for the relationships.
       <value name='png:cairo:gdiplus'/>
       <value name='png:gdiplus'/>
       <value name='png:gdiplus:gdiplus'/>
+      <value name='svg:cairo'/>
+      <value name='svg:cairo:cairo'/>
+      <value name='svg:svg'/>
+      <value name='svg:svg:core'/>
+      <value name='gif:cairo'/>
+      <value name='gif:cairo:gd'/>
+      <value name='gif:cairo:gdiplus'/>
+      <value name='gif:gdiplus'/>
+      <value name='gif:gdiplus:gdiplus'/>
+      <value name='gif:gd'/>
+      <value name='gif:gd:gd'/>
+      <value name='jpg:cairo'/>
+      <value name='jpg:cairo:gd'/>
+      <value name='jpg:cairo:gdiplus'/>
+      <value name='jpg:gd'/>
+      <value name='jpg:gd:gd'/>
+      <value name='jpg:gdiplus'/>
+      <value name='jpg:gdiplus:gdiplus'/>
     </option>
     <option type='bool' id='INTERACTIVE_SVG' defval='0' depends='HAVE_DOT'>
       <docs>
 <![CDATA[
- If \ref cfg_dot_image_format "DOT_IMAGE_FORMAT" is set to \c svg, then this option can be set to \c YES to
+ If \ref cfg_dot_image_format "DOT_IMAGE_FORMAT" is set to `svg` or `svg:svg` or `svg:svg:core`,
+ then this option can be set to \c YES to
  enable generation of interactive SVG images that allow zooming and panning.
  <br>Note that this requires a modern browser other than Internet Explorer.
  Tested and working are Firefox, Chrome, Safari, and Opera.
+ <br>Note This option will be automatically disabled when \ref cfg_dot_image_format "DOT_IMAGE_FORMAT"
+ is set to `svg:cairo` or `svg:cairo:cairo`.
 ]]>
       </docs>
     </option>

src/configimpl.l

@@ -2189,6 +2189,19 @@ void Config::checkAndCorrect(bool quiet, const bool check)
     Config_updateInt(MAX_DOT_GRAPH_DEPTH,1000);
   }
 
+  //------------------------
+  if (Config_getBool(INTERACTIVE_SVG))
+  {
+    // issue 11308
+    if ((Config_getEnum(DOT_IMAGE_FORMAT) == DOT_IMAGE_FORMAT_t::svg_cairo) ||
+        (Config_getEnum(DOT_IMAGE_FORMAT) == DOT_IMAGE_FORMAT_t::svg_cairo_cairo))
+    {
+      err("When using DOT_IMAGE_FORMAT with %s the %s option should be %s. I'll adjust it for you.\n",
+          qPrint(Config_getEnumAsString(DOT_IMAGE_FORMAT)),"INTERACTIVE_SVG","disabled");
+      Config_updateBool(INTERACTIVE_SVG,FALSE);
+    }
+  }
+
   //------------------------
   // check for settings that are inconsistent with having OPTIMIZED_OUTPUT_VHDL enabled
   if (Config_getBool(OPTIMIZE_OUTPUT_VHDL))

src/dotfilepatcher.cpp

@@ -361,6 +361,7 @@ bool DotFilePatcher::run() const
         if (line.find("<svg")!=-1 && !replacedHeader)
         {
           int count = sscanf(line.data(),"<svg width=\"%dpt\" height=\"%dpt\"",&width,&height);
+          if (count != 2) count = sscanf(line.data(),"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"%d\" height=\"%d\"",&width,&height);
           //printf("width=%d height=%d\n",width,height);
           useNagivation = count==2 && (width>500 || height>450);
           insideHeader = count==2;
@@ -562,6 +563,10 @@ static bool readSVGSize(const QCString &fileName,int *width,int *height)
     {
       found=true;
     }
+    else if (sscanf(line.c_str(),"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"%d\" height=\"%d\"",width,height)==2)
+    {
+      found=true;
+    }
   }
   return true;
 }