diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-02-21 20:10:10 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-02-21 20:10:10 (GMT) |
| commit | 9e8c96895318243719e7252006cf1cd86fc05597 (patch) | |
| tree | 0ed3b61a39964a2282568e940915e3794c3535f9 /src/doxygen.cpp | |
| parent | 725055fcd49230398f0db2a19edcb5bb5bcfd760 (diff) | |
| parent | be5cc75ffc2e0a95ecbf0ce8d918b070c276d3e5 (diff) | |
| download | Doxygen-9e8c96895318243719e7252006cf1cd86fc05597.zip Doxygen-9e8c96895318243719e7252006cf1cd86fc05597.tar.gz Doxygen-9e8c96895318243719e7252006cf1cd86fc05597.tar.bz2 | |
Merge pull request #273 from albert-github/feature/bug_config
Consistency in handling HTML and LaTeX in respect to header and footer
Diffstat (limited to 'src/doxygen.cpp')
| -rw-r--r-- | src/doxygen.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 667227f..35b66dc 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10322,16 +10322,19 @@ void readConfiguration(int argc, char **argv) } else if (qstricmp(formatName,"latex")==0) { - if (optind+4<argc) // use config file to get settings + if (optind+4<argc || QFileInfo("Doxyfile").exists()) { - if (!Config::instance()->parse(argv[optind+4])) + QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); + if (!Config::instance()->parse(df)) { err("error opening or reading configuration file %s!\n",argv[optind+4]); + cleanUpDoxygen(); exit(1); } Config::instance()->substituteEnvironmentVars(); Config::instance()->convertStrToVal(); Config_getString("LATEX_HEADER")=""; + Config_getString("LATEX_FOOTER")=""; Config::instance()->check(); } else // use default config |