From b89bc6e9445f3f76399443f3dd3cce48af54d49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Novotn=C3=BD?= <witiko@mail.muni.cz>
Date: Wed, 26 Dec 2018 00:44:43 +0100
Subject: [PATCH] Load packages associated with tables class option by default
This reverts commit 1f3cd34795db6fcbfdc94cd22772bc4dc24f392a.
---
example/mu/example.dtx | 3 ---
style/mu/base.dtx | 32 ++++++++++++++++----------------
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/example/mu/example.dtx b/example/mu/example.dtx
index eb33c35..7310c87 100644
--- a/example/mu/example.dtx
+++ b/example/mu/example.dtx
@@ -450,9 +450,6 @@
\usepackage{amsfonts}
\usepackage{url} %% Hyperlinks
\usepackage{markdown} %% Lightweight markup
-\usepackage{tabularx} %% Tables
-\usepackage{tabu}
-\usepackage{booktabs}
\usepackage{listings} %% Source code highlighting
\lstset{
basicstyle = \ttfamily,
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index 4f2a4bc..fdcb48a 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -7,7 +7,7 @@
% after \texttt{style/fithesis-base.sty}, regardless of the value
% of the |\thesis@style| macro.
% \begin{macrocode}
-\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/11/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/12/25]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
% The file recognizes the following options: \begin{itemize}
@@ -195,6 +195,17 @@
% metadata into the resulting PDF document.
% \item\textsf{keyval} -- Adds support for parsing
% comma-delimited lists of key-value pairs.
+% \item\textsf{tabularx} -- Provides the \texttt{tabularx}
+% environment, which enables the typesetting of tables with
+% flexible-width columns.
+% \changes{v0.4.0}{2018/12/25}{^^A
+% The packages \textsf{tabularx}, \textsf{tabu}, and
+% \textsf{booktabs} are loaded by default, not only when
+% the \texttt{table} class option has been specified. [VN]}
+% \item\textsf{tabu} -- Provides the \texttt{tabu} environment,
+% which enables the typesetting of complex tables.
+% \item\textsf{booktabs} -- A package, which allows the creation
+% of publication-quality tables in \LaTeX.
% \end{itemize}
% \begin{macrocode}
\thesis@require{xcolor}
@@ -204,6 +215,9 @@
\thesis@require{keyval}
\thesis@require{ifxetex}
\thesis@require{ifluatex}
+\thesis@require{tabularx}
+\thesis@require{tabu}
+\thesis@require{booktabs}
% \end{macrocode}
% If the |\thesis@microtype@| is set to true, then the
% \textsf{microtype} package gets loaded.
@@ -286,25 +300,11 @@
% \end{macrocode}
% If the |\thesis@newtable@| conditional is \texttt{true}, then
% some of the dimensions associated with tables are modified in
-% preparation for the coloring of the table cells. The following
-% packages are also loaded:
-% \begin{itemize}
-% \item\textsf{tabularx} -- Provides the \texttt{tabularx}
-% environment, which enables the typesetting of tables with
-% flexible-width columns.
-% \item\textsf{tabu} -- Provides the \texttt{tabu} environment,
-% which enables the typesetting of complex tables.
-% \item\textsf{booktabs} -- A package, which allows the creation
-% of publication-quality tables in \LaTeX.
-% \end{itemize}
+% preparation for the coloring of the table cells.
% \begin{macrocode}
\let\thesis@newtable@old\tabular
\let\endthesis@newtable@old\endtabular
\ifthesis@newtable@
- % Load the packages.
- \thesis@require{tabularx}
- \thesis@require{tabu}
- \thesis@require{booktabs}
% Adjust the measurements.
\setlength{\aboverulesep}{0pt}
\setlength{\belowrulesep}{0pt}
--
GitLab