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

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"