issue #6769 Tabu is broken

Based on comment `\usepackage` in refman.tex / doxygen_manual.tex has been replaced with `\RequirePackage` in doxygen.sty ("back to its old place").
doxygen · Jul 26, 2019 · 7afe0e4 · 7afe0e4
1 parent 3f5d4ac
commit 7afe0e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
@@ -14,7 +14,7 @@
 
 \batchmode
 \documentclass{book}
-%% moved from doxygen.sty due to workaround for LatEx 2019 version and unmaintained tabu package
+%% moved from doxygen.sty due to workaround for LaTex 2019 version and unmaintained tabu package
 \usepackage{ifthen}
 \ifx\requestedLaTeXdate\undefined
 \usepackage{array}
@@ -31,7 +31,7 @@
 \usepackage{geometry}
 \usepackage{listings}
 \usepackage{color}
-%%\usepackage{ifthen} %% moved to top due to workaround for LatEx 2019 version and unmaintained tabu package
+%%\usepackage{ifthen} %% moved to top due to workaround for LaTex 2019 version and unmaintained tabu package
 \usepackage[table]{xcolor}
 \PassOptionsToPackage{warn}{textcomp}
 \usepackage{textcomp}
@@ -63,10 +63,6 @@
 \usepackage{sectsty}
 \usepackage[titles]{tocloft}
 \usepackage{amssymb}
-%% moved from doxygen.sty due to workaround for LatEx 2019 version and unmaintained tabu package
-\usepackage{longtable_doxygen}
-\usepackage{tabu_doxygen}
-%%
 \usepackage{doxygen}
 \usepackage{manual}
 %%

diff --git a/src/latexgen.cpp b/src/latexgen.cpp
@@ -497,7 +497,7 @@ static void writeDefaultHeaderPart1(FTextStream &t)
     documentClass = "book";
   t << "\\documentclass[twoside]{" << documentClass << "}\n"
        "\n";
-  t << "%% moved from doxygen.sty due to workaround for LatEx 2019 version and unmaintained tabu package\n"
+  t << "%% moved from doxygen.sty due to workaround for LaTex 2019 version and unmaintained tabu package\n"
        "\\usepackage{ifthen}\n"
        "\\ifx\\requestedLaTeXdate\\undefined\n"
        "\\usepackage{array}\n"
@@ -510,10 +510,6 @@ static void writeDefaultHeaderPart1(FTextStream &t)
   t << "% Packages required by doxygen\n"
        "\\usepackage{fixltx2e}\n" // for \textsubscript
        "\\usepackage{calc}\n"
-       "%% moved from doxygen.sty due to workaround for LatEx 2019 version and unmaintained tabu package\n"
-       "\\usepackage{longtable_doxygen}\n"
-       "\\usepackage{tabu_doxygen}\n"
-       "%%\n"
        "\\usepackage{doxygen}\n";
   QStrList extraLatexStyle = Config_getList(LATEX_EXTRA_STYLESHEET);
   for (uint i=0; i<extraLatexStyle.count(); ++i)

diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
@@ -3,14 +3,14 @@
 
 % Packages used by this style file
 \RequirePackage{alltt}
-%%\RequirePackage{array} %% moved to refman.tex due to workaround for LatEx 2019 version and unmaintained tabu package
+%%\RequirePackage{array} %% moved to refman.tex due to workaround for LaTex 2019 version and unmaintained tabu package
 \RequirePackage{calc}
 \RequirePackage{float}
-%%\RequirePackage{ifthen} %% moved to refman.tex due to workaround for LatEx 2019 version and unmaintained tabu package
+%%\RequirePackage{ifthen} %% moved to refman.tex due to workaround for LaTex 2019 version and unmaintained tabu package
 \RequirePackage{verbatim}
 \RequirePackage[table]{xcolor}
-%%\RequirePackage{longtable} %% moved to refman.tex due to workaround for LatEx 2019 version and unmaintained tabu package
-%%\RequirePackage{tabu} %% moved to refman.tex due to workaround for LatEx 2019 version and unmaintained tabu package
+\RequirePackage{longtable_doxygen}
+\RequirePackage{tabu_doxygen}
 \RequirePackage{fancyvrb}
 \RequirePackage{tabularx}
 \RequirePackage{multirow}