diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-20 14:04:50 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-20 14:04:50 (GMT) |
commit | 67e8d626fec0c4365106902dcd16b988b8cceb10 (patch) | |
tree | dab43c4c97739308cd75399c7c88cf0f954af6b5 /src/latexgen.cpp | |
parent | c09f84c27bd916342ca0e8fdcb5244cd902f8e09 (diff) | |
parent | 329a4ddc036ac9dfe72b11d62cb4043bc8488c20 (diff) | |
download | Doxygen-67e8d626fec0c4365106902dcd16b988b8cceb10.zip Doxygen-67e8d626fec0c4365106902dcd16b988b8cceb10.tar.gz Doxygen-67e8d626fec0c4365106902dcd16b988b8cceb10.tar.bz2 |
Merge branch 'feature/bug_size_latex' of https://github.com/albert-github/doxygen into albert-github-feature/bug_size_latex
Conflicts:
src/doctokenizer.h
src/latexgen.cpp
Diffstat (limited to 'src/latexgen.cpp')
-rw-r--r-- | src/latexgen.cpp | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 148bd0d..a62cdb7 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -269,28 +269,29 @@ static void writeDefaultHeaderPart1(FTextStream &t) t << "% Packages required by doxygen\n" "\\usepackage{fixltx2e}\n" // for \textsubscript "\\usepackage{calc}\n" - "\\usepackage{doxygen}\n"; - QStrList extraLatexStyle = Config_getList("LATEX_EXTRA_STYLESHEET"); - for (uint i=0; i<extraLatexStyle.count(); ++i) - { - QCString fileName(extraLatexStyle.at(i)); - if (!fileName.isEmpty()) - { - QFileInfo fi(fileName); - if (fi.exists()) - { - if (checkExtension(fi.fileName().data(), latexStyleExtension)) - { - // strip the extension, it will be added by the usepackage in the tex conversion process - t << "\\usepackage{" << stripExtensionGeneral(fi.fileName().data(), latexStyleExtension) << "}\n"; - } - else - { - t << "\\usepackage{" << fi.fileName().utf8() << "}\n"; - } - } - } - } + "\\usepackage{doxygen}\n" + "\\usepackage[export]{adjustbox} % also loads graphicx\n"; + QStrList extraLatexStyle = Config_getList("LATEX_EXTRA_STYLESHEET"); + for (uint i=0; i<extraLatexStyle.count(); ++i) + { + QCString fileName(extraLatexStyle.at(i)); + if (!fileName.isEmpty()) + { + QFileInfo fi(fileName); + if (fi.exists()) + { + if (checkExtension(fi.fileName().data(), latexStyleExtension)) + { + // strip the extension, it will be added by the usepackage in the tex conversion process + t << "\\usepackage{" << stripExtensionGeneral(fi.fileName().data(), latexStyleExtension) << "}\n"; + } + else + { + t << "\\usepackage{" << fi.fileName().utf8() << "}\n"; + } + } + } + } t << "\\usepackage{graphicx}\n" "\\usepackage[utf8]{inputenc}\n" "\\usepackage{makeidx}\n" |