Merge branch 'run_java_once_3rd_trial' of https://github.com/cheoljoo/doxygen into cheoljoo-run_java_once_3rd_trial

11 files changed, 368 insertions, 21 deletions

diff --git a/src/config.xml b/src/config.xml
index 00a972d..9720b78 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -3545,6 +3545,16 @@ to be found in the default search path.
 ]]>
       </docs>
     </option>
+    <option type='bool' id='PLANTUML_RUN_FAST' defval='0'>
+      <docs>
+<![CDATA[
+If the \c PLANTUML_RUN_FAST tag is set to \c YES, doxygen will run java once for improving the performance.
+This will run once at the end of process like dot graphics processing. 
+It will remove duplicated runs when you edit a little and it will support multiple thread for multi processor.
+Finally it will reduce the doxygen running time about plantuml.
+]]>
+      </docs>
+    </option>
     <option type='int' id='DOT_GRAPH_MAX_NODES' minval='0' maxval='10000' defval='50' depends='HAVE_DOT'>
       <docs>
 <![CDATA[
diff --git a/src/debug.cpp b/src/debug.cpp
index c81a1af..2f343ac 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -48,6 +48,7 @@ static LabelMap s_labels[] =
   { "markdown",     Debug::Markdown     },
   { "filteroutput", Debug::FilterOutput },
   { "lex",          Debug::Lex },
+  { "plantuml",     Debug::Plantuml },
   { 0,             (Debug::DebugMask)0  }
 };
 
diff --git a/src/debug.h b/src/debug.h
index 8a28c7a..9a2070c 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -37,7 +37,8 @@ class Debug
                      ExtCmd       = 0x00000400,
                      Markdown     = 0x00000800,
                      FilterOutput = 0x00001000,
-                     Lex          = 0x00002000
+                     Lex          = 0x00002000,
+                     Plantuml     = 0x00004000
                    };
     static void print(DebugMask mask,int prio,const char *fmt,...);
     static int  setFlag(const char *label);
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index 99df99c..d35e6ad 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -353,7 +353,7 @@ DB_VIS_C
     case DocVerbatim::PlantUML:
       {
         static QCString docbookOutput = Config_getString(DOCBOOK_OUTPUT);
-        QCString baseName = writePlantUMLSource(docbookOutput,s->exampleFile(),s->text());
+        QCString baseName = writePlantUMLSource(docbookOutput,s->exampleFile(),s->text(),PUML_BITMAP);
         QCString shortName = baseName;
         int i;
         if ((i=shortName.findRev('/'))!=-1)
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 2d55ae6..f3c09a8 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -104,6 +104,7 @@
 #include "context.h"
 #include "fileparser.h"
 #include "emoji.h"
+#include "plantuml.h"
 
 // provided by the generated file resources.cpp
 extern void initResources();
@@ -11924,6 +11925,13 @@ void generateOutput()
     g_s.end();
   }
 
+  if (Config_getBool(PLANTUML_RUN_FAST))
+  {
+    g_s.begin("Running plantuml with JAVA...\n");
+    PlantumlManager::instance()->run();
+    g_s.end();
+  }
+
   if (Config_getBool(HAVE_DOT))
   {
     g_s.begin("Running dot...\n");
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 6386cb8..996b5c4 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -590,7 +590,10 @@ void HtmlDocVisitor::visit(DocVerbatim *s)
         forceEndParagraph(s);
 
         static QCString htmlOutput = Config_getString(HTML_OUTPUT);
-        QCString baseName = writePlantUMLSource(htmlOutput,s->exampleFile(),s->text());
+		QCString imgExt = getDotImageExtension();
+		PlantUMLOutputFormat format = PUML_BITMAP;		// default : PUML_BITMAP
+		if (imgExt=="svg"){    format = PUML_SVG;   }
+        QCString baseName = writePlantUMLSource(htmlOutput,s->exampleFile(),s->text(),format);
         m_t << "<div class=\"plantumlgraph\">" << endl;
         writePlantUMLFile(baseName,s->relPath(),s->context());
         visitPreCaption(m_t, s);
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index 5be3fc9..4a5998e 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -428,7 +428,7 @@ void LatexDocVisitor::visit(DocVerbatim *s)
     case DocVerbatim::PlantUML: 
       {
         QCString latexOutput = Config_getString(LATEX_OUTPUT);
-        QCString baseName = writePlantUMLSource(latexOutput,s->exampleFile(),s->text());
+        QCString baseName = writePlantUMLSource(latexOutput,s->exampleFile(),s->text(),PUML_EPS);
 
         writePlantUMLFile(baseName, s);
       }
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index ada035b..c6ab7af 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -19,18 +19,27 @@
 #include "doxygen.h"
 #include "index.h"
 #include "message.h"
+#include "debug.h"
 
 #include <qdir.h>
+#include <qdict.h>
+#include <qlist.h>
 
 static const int maxCmdLine = 40960;
 
-QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,const QCString &content)
+QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,const QCString &content,PlantUMLOutputFormat format)
 {
   QCString baseName(4096);
+  QCString puName(4096);
+  QCString imgName(4096);
   static int umlindex=1;
 
+  Debug::print(Debug::Plantuml,0,"*** %s fileName: %s\n","writePlantUMLSource",qPrint(fileName));
+  Debug::print(Debug::Plantuml,0,"*** %s outDir: %s\n","writePlantUMLSource",qPrint(outDir));
+
   if (fileName.isEmpty()) // generate name
   {
+    puName = "inline_umlgraph_"+QCString().setNum(umlindex);
     baseName = outDir+"/inline_umlgraph_"+QCString().setNum(umlindex++);
   }
   else // user specified name
@@ -38,30 +47,59 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
     baseName = fileName;
     int i=baseName.findRev('.');
     if (i!=-1) baseName = baseName.left(i);
+    puName = baseName;
     baseName.prepend(outDir+"/");
   }
+
+  switch (format)
+  {
+    case PUML_BITMAP:
+      imgName =puName+".png";
+      break;
+    case PUML_EPS:
+      imgName =puName+".eps";
+      break;
+    case PUML_SVG:
+      imgName =puName+".svg";
+      break;
+  }
+  Debug::print(Debug::Plantuml,0,"*** %s baseName: %s\n","writePlantUMLSource",qPrint(baseName));
+  Debug::print(Debug::Plantuml,0,"*** %s puName: %s\n","writePlantUMLSource",qPrint(puName));
+  Debug::print(Debug::Plantuml,0,"*** %s imgName: %s\n","writePlantUMLSource",qPrint(imgName));
+
   QFile file(baseName+".pu");
   if (!file.open(IO_WriteOnly))
   {
     err("Could not open file %s for writing\n",baseName.data());
   }
-  QCString text = "@startuml\n";
+  QCString text = "@startuml "+imgName+"\n";
   text+=content;
   text+="\n@enduml\n";
   file.writeBlock( text, text.length() );
   file.close();
+  //Debug::print(Debug::Plantuml,0,"*** %s baseFileName text: %s\n","writePlantUMLSource",qPrint(text));
+
+  if(Config_getBool(PLANTUML_RUN_FAST)){
+    QCString qcOutDir(outDir);
+    uint pos = qcOutDir.findRev("/");
+    QCString generateType(qcOutDir.right(qcOutDir.length() - (pos + 1)) );
+    Debug::print(Debug::Plantuml,0,"*** %s generateType: %s\n","writePlantUMLSource",qPrint(generateType));
+    PlantumlManager::instance()->insert(generateType,puName,format,text);
+  } 
+
   return baseName;
 }
 
 void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutputFormat format)
 {
-  static QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
-  static QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE);
-  static QCString dotPath = Config_getString(DOT_PATH);
+  QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
+  QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE);
+  QCString dotPath = Config_getString(DOT_PATH);
 
   QCString pumlExe = "java";
   QCString pumlArgs = "";
 
+  //printf("*** %s %s\n","generatePlantUMLOutput",baseName);
   QStrList &pumlIncludePathList = Config_getList(PLANTUML_INCLUDE_PATH);
   char *s=pumlIncludePathList.first();
   if (s)
@@ -123,17 +161,19 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
   pumlArgs+=".pu\" ";
   pumlArgs+="-charset UTF-8 ";
   int exitCode;
-  //printf("*** running: %s %s outDir:%s %s\n",pumlExe.data(),pumlArgs.data(),outDir,baseName);
   msg("Running PlantUML on generated file %s.pu\n",baseName);
   portable_sysTimerStart();
-  if ((exitCode=portable_system(pumlExe,pumlArgs,TRUE))!=0)
-  {
-    err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
-        plantumlJarPath.data(),exitCode);
-  }
-  else if (Config_getBool(DOT_CLEANUP))
-  {
-    QFile(QCString(baseName)+".pu").remove();
+  if(!Config_getBool(PLANTUML_RUN_FAST)){    // ! Config_getBool(PLANTUML_RUN_FAST)
+    Debug::print(Debug::Plantuml,0,"*** running: %s %s outDir:%s %s\n",qPrint(pumlExe),qPrint(pumlArgs),outDir,baseName);
+    if ((exitCode=portable_system(pumlExe,pumlArgs,TRUE))!=0)
+    {
+      err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
+          plantumlJarPath.data(),exitCode);
+    }
+    else if (Config_getBool(DOT_CLEANUP))
+    {
+      QFile(QCString(baseName)+".pu").remove();
+    }
   }
   portable_sysTimerStop();
   if ( (format==PUML_EPS) && (Config_getBool(USE_PDFLATEX)) )
@@ -150,3 +190,259 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
   Doxygen::indexList->addImageFile(imgName);
 }
 
+//--------------------------------------------------------------------
+
+PlantumlManager *PlantumlManager::m_theInstance = 0;
+
+PlantumlManager *PlantumlManager::instance()
+{
+  if (!m_theInstance)
+  {
+    m_theInstance = new PlantumlManager;
+  }
+  return m_theInstance;
+}
+
+PlantumlManager::PlantumlManager()
+{
+}
+
+PlantumlManager::~PlantumlManager()
+{
+  {
+    QDictIterator< QList<QCString> > it( m_pngPlantumlFiles); // See QDictIterator
+    QList<QCString> *list;
+    for (it.toFirst();(list=it.current());++it)
+    {
+      (*list).clear();
+    }
+    m_pngPlantumlFiles.clear();
+    m_pngPlantumlContent.clear();
+  }
+  {
+    QDictIterator< QList<QCString> > it( m_epsPlantumlFiles); // See QDictIterator
+    QList<QCString> *list;
+    for (it.toFirst();(list=it.current());++it)
+    {
+      (*list).clear();
+    }
+    m_epsPlantumlFiles.clear();
+    m_epsPlantumlContent.clear();
+  }
+  {
+    QDictIterator< QList<QCString> > it( m_svgPlantumlFiles); // See QDictIterator
+    QList<QCString> *list;
+    for (it.toFirst();(list=it.current());++it)
+    {
+      (*list).clear();
+    }
+    m_svgPlantumlFiles.clear();
+    m_svgPlantumlContent.clear();
+  }
+}
+
+void PlantumlManager::runPlantumlContent(QDict< QList <QCString> > &PlantumlFiles,QDict< QCString > &PlantumlContent, const char *type)
+{
+  /* example : running: java -Djava.awt.headless=true -jar "/Users/cheoljoo/code/common_telltale/GP/Apps/Src/MgrTelltale/tools/plantuml.jar" -o "/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html" -tpng "/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html/A.pu" -charset UTF-8  outDir:/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html /Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html/A
+   */
+  int exitCode;
+  QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
+  QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE);
+  QCString dotPath = Config_getString(DOT_PATH);
+
+  QCString pumlExe = "java";
+  QCString pumlArgs = "";
+
+  QStrList &pumlIncludePathList = Config_getList(PLANTUML_INCLUDE_PATH);
+  char *s=pumlIncludePathList.first();
+  if (s)
+  {
+    pumlArgs += "-Dplantuml.include.path=\"";
+    pumlArgs += s;
+    s = pumlIncludePathList.next(); 
+  }
+  while (s)
+  {
+    pumlArgs += portable_pathListSeparator();
+    pumlArgs += s;
+    s = pumlIncludePathList.next(); 
+  }
+  if (pumlIncludePathList.first()) pumlArgs += "\" ";
+  pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" ";
+  if (!plantumlConfigFile.isEmpty())
+  {
+    pumlArgs += "-config \"";
+    pumlArgs += plantumlConfigFile;
+    pumlArgs += "\" ";
+  }
+  if (Config_getBool(HAVE_DOT) && !dotPath.isEmpty())
+  {
+    pumlArgs += "-graphvizdot \"";
+    pumlArgs += dotPath;
+    pumlArgs += "dot";
+    pumlArgs += portable_commandExtension();
+    pumlArgs += "\" ";
+  }
+
+  {
+    QDictIterator< QCString > it( PlantumlContent); // See QDictIterator
+    QCString *nb;
+    for (it.toFirst();(nb=it.current());++it)
+    {
+      QCString pumlArguments(pumlArgs);
+      msg("Running PlantUML on png PlantumlFiles in %s\n",qPrint(it.currentKey()));
+      pumlArguments+="-o \"";
+      pumlArguments+=Config_getString(OUTPUT_DIRECTORY);
+      pumlArguments+="/";
+      pumlArguments+=it.currentKey();
+      pumlArguments+="\" ";
+      pumlArguments+="-charset UTF-8 -t";
+      pumlArguments+=type;
+      pumlArguments+=" ";
+
+      QCString puFileName("");
+      puFileName+=Config_getString(OUTPUT_DIRECTORY);
+      puFileName+="/";
+      puFileName+=it.currentKey();
+      puFileName+="/";
+      puFileName+="inline_umlgraph_";
+      puFileName+=type;
+      puFileName+=it.currentKey();
+      puFileName+=".pu";
+
+      pumlArguments+="\"";
+      pumlArguments+=puFileName;
+      pumlArguments+="\" ";
+
+      QFile file(puFileName);
+      if (!file.open(IO_WriteOnly))
+      {
+        err("Could not open file %s for writing\n",puFileName.data());
+      }
+      file.writeBlock( *nb, nb->length() );
+      file.close();
+      Debug::print(Debug::Plantuml,0,"*** %s Running Plantuml arguments:%s\n","PlantumlManager::runPlantumlContent",qPrint(pumlArguments));
+      if ((exitCode=portable_system(pumlExe,pumlArguments,TRUE))!=0)
+      {
+        err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
+            plantumlJarPath.data(),exitCode);
+      }
+      else if (Config_getBool(DOT_CLEANUP))
+      {
+        file.remove();
+      }
+    }
+  }
+
+  {
+    QDictIterator< QList<QCString> > it( PlantumlFiles); // See QDictIterator
+    QList<QCString> *list;
+    for (it.toFirst();(list=it.current());++it)
+    {
+      QListIterator<QCString> li(*list);
+      QCString *nb;
+      if (Config_getBool(DOT_CLEANUP))
+      {
+        for (li.toFirst();(nb=li.current());++li)
+        {
+          QCString pumlName = "";
+          pumlName+=Config_getString(OUTPUT_DIRECTORY);
+          pumlName+="/";
+          pumlName+=it.currentKey();
+          pumlName+="/";
+          pumlName+=*nb;
+          pumlName+=".pu";
+          QFile(pumlName).remove();
+        }
+      }
+    }
+  }
+}
+
+void PlantumlManager::run()
+{
+  Debug::print(Debug::Plantuml,0,"*** %s\n","PlantumlManager::run");
+  runPlantumlContent(m_pngPlantumlFiles, m_pngPlantumlContent, "png");
+  runPlantumlContent(m_svgPlantumlFiles, m_svgPlantumlContent, "svg");
+  runPlantumlContent(m_epsPlantumlFiles, m_epsPlantumlContent, "eps");
+}
+
+void PlantumlManager::print(QDict< QList <QCString> > &PlantumlFiles)
+{
+  if (Debug::isFlagSet(Debug::Plantuml)){
+    QDictIterator< QList<QCString> > it( PlantumlFiles); // See QDictIterator
+    QList<QCString> *list;
+    for (it.toFirst();(list=it.current());++it)
+    {
+      Debug::print(Debug::Plantuml,0,"*** %s PlantumlFiles key:%s\n","PlantumlManager::print",qPrint(it.currentKey()));
+      QListIterator<QCString> li(*list);
+      QCString *nb;
+      for (li.toFirst();(nb=li.current());++li)
+      {
+        Debug::print(Debug::Plantuml,0,"*** %s             list:%s\n","PlantumlManager::print",qPrint(*nb));
+      }
+    }
+  }
+}
+
+void PlantumlManager::print(QDict<QCString> &PlantumlContent)
+{
+  if (Debug::isFlagSet(Debug::Plantuml)){
+    QDictIterator< QCString > it( PlantumlContent); // See QDictIterator
+    QCString *nb;
+    for (it.toFirst();(nb=it.current());++it)
+    {
+      Debug::print(Debug::Plantuml,0,"*** %s PlantumlContent key:%s\n","PlantumlManager::print",qPrint(it.currentKey()));
+      Debug::print(Debug::Plantuml,0,"*** %s                 Content :%s\n","PlantumlManager::print",qPrint(*nb));
+    }
+  }
+}
+
+void PlantumlManager::addPlantumlFiles(QDict< QList <QCString> > &PlantumlFiles,const QCString key , const QCString value)
+{
+  QList<QCString> *list = PlantumlFiles.find(key);
+  if (list==0)
+  {
+    list = new QList<QCString>;
+    PlantumlFiles.insert(key,list);
+  }
+  list->append(new QCString(value));
+}
+
+void PlantumlManager::addPlantumlContent(QDict< QCString > &PlantumlContent,const QCString key , const QCString &puContent)
+{
+  QCString* content = PlantumlContent.find(key);
+  if(content == 0){
+    content = new QCString("");
+    PlantumlContent.insert(key,content);
+  }
+  (*content)+=puContent;
+}
+
+void PlantumlManager::insert(const QCString key , const QCString value, PlantUMLOutputFormat format,const QCString &puContent)
+{
+  Debug::print(Debug::Plantuml,0,"*** %s key:%s ,value:%s\n","PlantumlManager::insert",qPrint(key),qPrint(value));
+  switch (format)
+  {
+    case PUML_BITMAP:
+      addPlantumlFiles(m_pngPlantumlFiles,key,value);
+      print(m_pngPlantumlFiles);
+      addPlantumlContent(m_pngPlantumlContent,key,puContent);
+      print(m_pngPlantumlContent);
+      break;
+    case PUML_EPS:
+      addPlantumlFiles(m_epsPlantumlFiles,key,value);
+      print(m_epsPlantumlFiles);
+      addPlantumlContent(m_epsPlantumlContent,key,puContent);
+      print(m_epsPlantumlContent);
+      break;
+    case PUML_SVG:
+      addPlantumlFiles(m_svgPlantumlFiles,key,value);
+      print(m_svgPlantumlFiles);
+      addPlantumlContent(m_svgPlantumlContent,key,puContent);
+      print(m_svgPlantumlContent);
+      break;
+  }
+}
+
+//--------------------------------------------------------------------
diff --git a/src/plantuml.h b/src/plantuml.h
index 54ab8a2..815bca9 100644
--- a/src/plantuml.h
+++ b/src/plantuml.h
@@ -16,6 +16,9 @@
 #ifndef PLANTUML_H
 #define PLANTUML_H
 
+#include <qdict.h>
+#include <qlist.h>
+
 class QCString;
 
 /** Plant UML output image formats */
@@ -25,9 +28,10 @@ enum PlantUMLOutputFormat { PUML_BITMAP, PUML_EPS, PUML_SVG };
  *  @param[in] outDir   the output directory to write the file to.
  *  @param[in] fileName the name of the file. If empty a name will be chosen automatically.
  *  @param[in] content  the contents of the PlantUML file.
+ *  @param[in] format   the image format to generate.
  *  @returns The name of the generated file.
  */
-QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,const QCString &content);
+QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,const QCString &content,PlantUMLOutputFormat format);
 
 /** Convert a PlantUML file to an image.
  *  @param[in] baseName the name of the generated file (as returned by writePlantUMLSource())
@@ -36,5 +40,29 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
  */
 void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutputFormat format);
 
+/** Singleton that manages plantuml relation actions */
+class PlantumlManager
+{
+  public:
+    static PlantumlManager *instance();
+    void run();
+   	void insert(const QCString key , const QCString value,PlantUMLOutputFormat format,const QCString &puContent);
+  private:
+    PlantumlManager();
+    virtual ~PlantumlManager();
+	  void addPlantumlFiles(QDict< QList <QCString> > &PlantumlFiles,const QCString key , const QCString value);
+	  void print(QDict< QList <QCString> > &PlantumlFiles);
+	  void addPlantumlContent(QDict< QCString > &PlantumlContent,const QCString key , const QCString &puContent);
+	  void print(QDict< QCString > &PlantumlContent);
+	  void runPlantumlContent(QDict< QList <QCString> > &PlantumlFiles,QDict< QCString > &PlantumlContent, const char *type);
+    static PlantumlManager     *m_theInstance;
+    QDict< QList<QCString> >       m_pngPlantumlFiles;
+    QDict< QList<QCString> >       m_svgPlantumlFiles;
+    QDict< QList<QCString> >       m_epsPlantumlFiles;
+    QDict< QCString >       m_pngPlantumlContent;
+    QDict< QCString >       m_svgPlantumlContent;
+    QDict< QCString >       m_epsPlantumlContent;
+};
+
 #endif
 
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index f2edf8b..b79af05 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -383,7 +383,7 @@ void RTFDocVisitor::visit(DocVerbatim *s)
     case DocVerbatim::PlantUML:
       {
         static QCString rtfOutput = Config_getString(RTF_OUTPUT);
-        QCString baseName = writePlantUMLSource(rtfOutput,s->exampleFile(),s->text());
+        QCString baseName = writePlantUMLSource(rtfOutput,s->exampleFile(),s->text(),PUML_BITMAP);
 
         writePlantUMLFile(baseName, s->hasCaption());
         visitCaption(this, s->children());
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index b18bd3f..c34f0b8 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -3774,7 +3774,7 @@ void  FlowChart::printUmlTree()
 
   QCString n=convertNameToFileName();
   QCString tmp=htmlOutDir;
-  n=writePlantUMLSource(tmp,n,qcs);
+  n=writePlantUMLSource(tmp,n,qcs,PUML_SVG);
   generatePlantUMLOutput(n.data(),tmp.data(),PUML_SVG);
 }