Commit 14d0aa00 authored by Johnson, Seth R.'s avatar Johnson, Seth R.
Browse files

Fix caption and table formatting

parent d7f62699
Loading
Loading
Loading
Loading
+14 −15
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@
%\renewcommand\maketitlepage\relax

% Optional packages that are simply part of this example document
\usepackage{multirow}
\usepackage{threeparttable}
%\usepackage{rotating}
%\usepackage{enumitem}

\usepackage{threeparttable} % Table with captions and tablenotes
\usepackage{booktabs} % Toprule, midrule, bottomrule
\usepackage{multirow} % Extend table entries over multiple rows

% Bibliography styling: you can use your own if desired
\usepackage[authordate,strict,backend=biber,autolang=other,bibencoding=inputenc]{biblatex-chicago}

@@ -29,11 +31,6 @@
\definecolor{note}{RGB}{48,96,192}
\renewcommand{\marginpar}[1]{{\small\em\color{note}[#1]}}

% Caption with more than one sentence: the first sentence is the first argument,
% the rest are the second. This allows table of contents to just show the first
% sentence but display the whole thing in the text.
\newcommand\longcaption[2]{\caption[#1]{#1 #2}}

% Bibliography
\usepackage[authordate,strict,backend=biber,autolang=other,bibencoding=inputenc]{biblatex-chicago}

@@ -262,20 +259,22 @@ font size can be decreased and, if necessary, landscaped.
  \begin{threeparttable}
  \caption{Table caption is bold, centered, and initial cap with no period at
  end of title}\label{tab:1}
  \newcommand\tworow[1]{\multirow{2}{*}{#1}}
  \begin{tabular}{c c c c c c}
    \hline
    \multirow{2}{*}{\textbf{EM projects}\tnote{a}} & \textbf{Recycling} &  \textbf{Amount} &  \multirow{2}{*}{\textbf{Recycling}} &  \multirow{2}{*}{\textbf{Disposa}l}
    &  \multirow{2}{*}{\textbf{Storage}} \\
    &  \textbf{method} &  \textbf{recycled (lb)} & & &  \\ \hline
    \toprule
    \tworow{EM project\tnote{a}} & \tworow{Recycling method} & \tworow{Amount
    recycled (lb)} & \multicolumn{3}{c}{Cost (\$)} \\ \cline{4-6}
    &  &  & Recycling & Disposal &  Storage \\ \midrule
    Metals recycle & Smelting & 1,072,000 & 1,565,763 & 1,338,447 & 1,608,000 \\
    Cooling tower\tnote{b} & Decontamination & 459,000 & 605,880 & 573,120 & 688,500  \\
    Totals &   & 1,601,150 & 2,266,491 & 2,004,973 & 2,401,725 \\
    \hline
    Cooling tower\tnote{b} & Decontamination & 459,000 & 605,880 & 573,120 &
    688,500  \\
    \em{Total} &   & 1,601,150 & 2,266,491 & 2,004,973 & 2,401,725 \\
    \bottomrule
  \end{tabular}
  \begin{tablenotes}
    \item \emph{Note:} A general note to the table as a whole is not linked to
    a superscript letter. It is formatted like this note. Table footnotes are
  9 pt., or as with larger tables, 1 pt. smaller than the table body text.
  9~pt, or as with larger tables, 1~pt smaller than the table body text.
  \item[a] Footnote call-outs are lowercase, italic, superscript letters in
    sequence from left to right, then
  \item[b] For multipage tables, the footnote appears only on the last page of
+8 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@
\RequirePackage{wallpaper} % background on cover page
\RequirePackage{fancyhdr} % headers and footers
\RequirePackage{emptypage} % hide footers on blank pages
\RequirePackage[font=bf]{caption}
\RequirePackage[font=bf,labelsep=period]{caption}
\RequirePackage{titlesec} % title modification: use text size
\RequirePackage[pdfusetitle]{hyperref} % url and links in PDF
\RequirePackage{tocloft} % table of contents styling
@@ -444,6 +444,13 @@ under contract DE-AC05-00OR22725
  \pagenumbering{arabic}%
}


% Caption with more than one sentence: the first sentence is the first argument,
% the rest are the second. This allows table of contents to just show the first
% sentence but display the whole thing in the text. It also clears the boldface
% from the second 
\newcommand\longcaption[2]{\caption[#1]{#1 \normalfont #2}}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% APPENDIX PAGE NUMBERING
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%