Fixes to support nested tables again

2 files changed, 11 insertions, 1 deletions

diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index e41b0d7..8383f5a 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -832,6 +832,10 @@ address {
 	color: ##33;
 }
 
+table.doxtable caption {
+	caption-side: top;
+}
+
 table.doxtable {
 	border-collapse:collapse;
         margin-top: 4px;
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index 64fb0f0..803b662 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -11,6 +11,7 @@
 \RequirePackage[table]{xcolor}
 \RequirePackage{longtable}
 \RequirePackage{tabu}
+\RequirePackage{tabularx}
 
 %---------- Internal commands used in this style file ----------------
 
@@ -421,7 +422,7 @@
 \newcommand{\PBS}[1]{\let\temp=\\#1\let\\=\temp}%
 \newenvironment{TabularC}[1]%
 {\tabulinesep=1mm
-\begin{longtabu} spread 0pt [l]{*#1{|X[-1]}|}}%
+\begin{longtabu} spread 0pt [c]{*#1{|X[-1]}|}}%
 {\end{longtabu}\par}%
 
 \newenvironment{TabularNC}[1]%
@@ -444,6 +445,11 @@
   \textbf{#1} (\textnormal{#2}\,\pageref{#3})%
 }
 
+% Used to link to a table when hyperlinks are turned on
+\newcommand{\doxytablelink}[2]{%
+  \ref{#1}%
+}
+
 % Used to link to a table when hyperlinks are turned off
 \newcommand{\doxytableref}[3]{%
   \ref{#3}%