diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-02-17 19:31:52 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-02-17 19:31:52 (GMT) |
commit | 597d113d52a25d5185c8fb1c1d3d3d7b8f1f4a90 (patch) | |
tree | bb38adc10e3de570266856371bfc211e14762ce2 /src/formula.cpp | |
parent | f39ee0710bff1d788a690d982a2e1312861c0f73 (diff) | |
parent | df3a465d0938aef44e8fc5d12a62ee16bc2420de (diff) | |
download | Doxygen-597d113d52a25d5185c8fb1c1d3d3d7b8f1f4a90.zip Doxygen-597d113d52a25d5185c8fb1c1d3d3d7b8f1f4a90.tar.gz Doxygen-597d113d52a25d5185c8fb1c1d3d3d7b8f1f4a90.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/formula.cpp')
-rw-r--r-- | src/formula.cpp | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/src/formula.cpp b/src/formula.cpp index 92647ed..de004ed 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -38,15 +38,6 @@ #define RM_TMP_FILES (true) //#define RM_TMP_FILES (false) -// for SVG output choose which tool to use -#define USE_PDF2SVG 1 -#define USE_INKSCAPE 0 - -#if (USE_PDF2SVG+USE_INKSCAPE!=1) -#error "Invalid configuration: either USE_PDF2SVG or USE_INKSCAPE should be 1" -#endif - - struct FormulaManager::Private { void storeDisplaySize(int id,int w,int h) @@ -303,31 +294,37 @@ void FormulaManager::generateImages(const char *path,Format format,HighDPI hd) c } Portable::sysTimerStop(); -#if USE_PDF2SVG - sprintf(args,"%s_tmp.pdf form_%d.svg",formBase.data(),pageNum); - Portable::sysTimerStart(); - if (Portable::system("pdf2svg",args)!=0) + if (Portable::checkForExecutable("pdf2svg")) { - err("Problems running pdf2svg. Check your installation!\n"); + sprintf(args,"%s_tmp.pdf form_%d.svg",formBase.data(),pageNum); + Portable::sysTimerStart(); + if (Portable::system("pdf2svg",args)!=0) + { + err("Problems running pdf2svg. Check your installation!\n"); + Portable::sysTimerStop(); + QDir::setCurrent(oldDir); + return; + } Portable::sysTimerStop(); - QDir::setCurrent(oldDir); - return; } - Portable::sysTimerStop(); -#endif - -#if USE_INKSCAPE // alternative using inkscape (does seem to work very well on my system) - sprintf(args,"-l -z %s_tmp.pdf -o form_%d.svg 2>%s",formBase.data(),pageNum,Portable::devNull()); - Portable::sysTimerStart(); - if (Portable::system("inkscape",args)!=0) + else if (Portable::checkForExecutable("inkscape")) { - err("Problems running inkscape. Check your installation!\n"); + sprintf(args,"-l form_%d.svg -z %s_tmp.pdf 2>%s",pageNum,formBase.data(),Portable::devNull()); + Portable::sysTimerStart(); + if (Portable::system("inkscape",args)!=0) + { + err("Problems running inkscape. Check your installation!\n"); + Portable::sysTimerStop(); + QDir::setCurrent(oldDir); + return; + } Portable::sysTimerStop(); - QDir::setCurrent(oldDir); + } + else + { + err("Neither 'pdf2svg' nor 'inkscape' present for conversion of formula to 'svg'\n"); return; } - Portable::sysTimerStop(); -#endif if (RM_TMP_FILES) { |