Commit bca7909e authored by Crawford, Sam's avatar Crawford, Sam
Browse files

Lots of tweaks. Still fighting a hyperref vs. tocloft problem.

parent ea6df236
Loading
Loading
Loading
Loading
+61 −65
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass{ornltm}
\bibliography{ornltm}
\usepackage{lipsum}



% XXX temporary: show page margins
@@ -50,9 +52,8 @@
\phantomsection
\addcontentsline{toc}{section}{LIST OF FIGURES}

\begin{centering}
	\listoffigures
\end{centering}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


@@ -61,20 +62,15 @@
\phantomsection
\addcontentsline{toc}{section}{LIST OF TABLES}

\begin{centering}
	\listoftables
\end{centering}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% LIST OF ACRONYMS
\clearemptydoublepage
\phantomsection
\addcontentsline{toc}{section}{ACRONYMS}
%\clearemptydoublepage
%\phantomsection

\begin{center}
	{\textbf{ACRONYMS}}
\end{center}
\begin{listacronyms}

	\begin{table}[h]
		\vspace{-6pt}
@@ -83,20 +79,27 @@
			TNR & Times New Roman  \\
		\end{tabular}
	\end{table}
	
\end{listacronyms}


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


% ADD ACKNOWLEDGMENT
\begin{acknowledgment}
Add acknowledgment if applicable.
\end{acknowledgment}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


% ADDITIONAL FRONT MATTER (OPTIONAL)
\clearemptydoublepage
\phantomsection
\addcontentsline{toc}{section}{ADDITIONAL FRONT MATERIAL}
\begin{center}
	{\textbf{ADDITIONAL FRONT MATERIAL}}
\end{center}
\begin{foreward}

Material after the Contents, List of Figures, List of Tables, and the Acronym list may include any or all of the following sections and should begin on an odd-numbered page in the order listed below:

\noindent{FOREWORD {\color{blue}{\emph {[Note: Spelling is not ``FORWARD.'']}}}\\
\noindent{FOREWORD {\color{blue}{\emph {[Note: Spelling is not ``FORWARD.'']}}}}\\
	\noindent{PREFACE}\\
	\noindent{ACKNOWLEDGMENTS}\\
	\noindent{EXECUTIVE SUMMARY OR SUMMARY}\\
@@ -128,8 +131,7 @@ Material after the Contents, List of Figures, List of Tables, and the Acronym li
	
	Footnotes may be used in addition to the author-date citation method, in which case, the footnotes provide additional information to the text, not bibliographic citations.
	


\end{foreward}
	
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

@@ -137,16 +139,12 @@ Material after the Contents, List of Figures, List of Tables, and the Acronym li
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% ABSTRACT
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newpage
\clearemptydoublepage

\pagenumbering{arabic}
\setcounter{page}{1}

\begin{abstract}
The abstract, if short, is inserted here before the introduction section. If the
abstract is long, it should be inserted with the front material and page
numbered as such, then this page would begin with the introduction section.

\end{abstract}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -191,8 +189,6 @@ document?''


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newpage
\clearemptydoublepage

\section{Figure Placement}
\label{Figure Placement}
@@ -209,35 +205,30 @@ In this template, the image files for the figures are in the same directory as t
to also place them in a sub folder named "figures" or similar.

\begin{figure}[h]
	\centering
	\begin{center}
	\includegraphics[width=5.5in, height=2.5in]{Fig1.png}
	\vspace{-.1in}
	
	\flushleft\caption[All figure captions are 10 pt, bold, Times New Roman.]{All figure captions are 10 pt, bold, Times New Roman. \textmd{If you have a two-line or more figure caption it is flush left. Only the first sentence of a figure caption is bolded.}}
	\end{center}
\end{figure}

%Begin text here.
Text can go in between figures. LaTeX will pretty much place the figures wherever it wants unless you explicitly command it to do otherwise.

\begin{figure}[h]
	\centering
	\begin{center} 
	\includegraphics[width=6.2in, height=2.75in, keepaspectratio=true]{Fig1.png}
	\vspace{-.1in}
	\caption{One-line figure captions are centered.}
\end{figure}
\begin{center}
	\end{center}
\end{figure}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\newpage
\clearemptydoublepage

\section{Table Placement}
\label{Table Placement}

\subsection{Tables}
	

As with figures, tables are numbered consecutively, or consecutively by section, and should follow their call out (see  
Table \ref{tab:1}) in the text as closely as possible. (LaTeX automatically floats Tables and Figures, depending on how much
space is left on the page at the point that they are processed. If there is not enough room on the current page, the float is moved
@@ -338,13 +329,10 @@ the better control over changes and merges the author(s) will have. These breaks

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\newpage
\clearemptydoublepage

\section{Citations}
\label{Citations}

\subsection{Using in-text citations}
\subsection{Using In-Text Citations}
For the ORNL TM reports, \textit{Chicago Manual of Style} references and citations are preferred. Of these, you can choose 
between author-date + references cited or footnote + references cited.

@@ -361,9 +349,6 @@ file of this LaTeX template (ornltm.cls), in the section labeled ``Bibliography.

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\newpage
\clearemptydoublepage

\section{Lists}
\label{Lists}

@@ -413,25 +398,36 @@ Flanges used in ultra-high vacuum service are commonly closed with metallic gask

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

\paragraph{Fourth-order heading}

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

Flanges used in ultra-high vacuum service are commonly closed with metallic gaskets or seals. The geometry of the seal interface is critical for proper function. Experience has shown that flanges subjected to conventional welding techniques distort beyond a point that they can be sealed.

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% REFERENCES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% The bibliography styles and backend are set in the ``Bibliography'' section of the class file (ornltm.cls by default).

\newpage
\clearemptydoublepage

\section{References}
\label{References}

%The command below sets the reference name to blank so we can use our own section name to preserve TOC and the like.
%The vpsace command removes the space that the refname would occupy. To use the auto-generated reference title, comment
%the next two lines out of the document and comment out the section command above.
\renewcommand\refname{}
\vspace*{-1cm}

\begin{references}
%This prints the references.
	\printbibliography
\end{references}


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+111 −16
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@
  \fancyfoot[L]{\includegraphics[width=3.72in]{textlogo.png}}
}

% Set footrule width for pages w/footnotes.
% THIS DOESN'T WORK.
\renewcommand{\footrulewidth}{0.4pt}

% ORNL official green color
\definecolor{ornlgreen}{RGB}{0,121,52}

@@ -70,29 +74,62 @@
% Disable highlighting of links
\hypersetup{colorlinks=false}

% TITLE STYLES

% Show five levels of depth in title labels
\setcounter{secnumdepth}{5} 
            
% Title styles. You may need to use the \texorpdfstring when using hyperref and
% You may need to use the \texorpdfstring when using hyperref and
% unusual titles.
\titleformat{\phantomsection}{\centering\bf}{\thetitle.}{1ex}{\MakeUppercase}[]
\titleformat{\section}{\centering\bf}{\thetitle.}{1ex}{\MakeUppercase}[]
\titleformat{\subsection}{\bf}{\thetitle}{1ex}{\MakeUppercase}[]
\titleformat{\subsubsection}{\bf}{\thetitle}{1ex}{\MakeUppercase}[]
\titleformat{\paragraph}{\bf}{\thetitle}{1ex}{}[]
\titleformat{\subparagraph}{\bf\itshape}{\relax}{0pt}{}[]

% TOC styles
\renewcommand{\cfttoctitlefont}{\hfill\large\bfseries\MakeUppercase}
\renewcommand{\cftloftitlefont}{\hfill\large\bfseries\MakeUppercase}
\renewcommand{\cftlottitlefont}{\hfill\large\bfseries\MakeUppercase}
% Names index title and centers is with hfill. Pushes normalsize.
\renewcommand{\indexname}{\hfill\bfseries\normalsize INDEX\hfill}
\renewcommand{\cftaftertoctitle}{\hfill}

% Names list of figures title and centers is with hfill. Pushes normalsize.
\renewcommand{\listfigurename}{\hfill\bfseries\normalsize LIST OF FIGURES\hfill}
\renewcommand{\cftaftertoctitle}{\hfill}
\renewcommand{\cftafterloftitle}{\hfill}
\renewcommand{\cftafterlottitle}{\hfill}
\renewcommand{\cftsecfont}{\normalfont}
\renewcommand{\cftsubsecfont}{\normalfont}
\renewcommand{\cftsecpagefont}{\normalfont}
\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}
\renewcommand\@tocrmarg{.5in plus .5fil}

% Names list of tables title and centers is with hfill. Pushes normalsize.
\renewcommand{\listtablename}{\hfill\bfseries\normalsize LIST OF TABLES\hfill}
\renewcommand{\cftaftertoctitle}{\hfill}

% Names TOC title and centers is with hfill. Pushes normalsize.
\renewcommand{\contentsname}{\hfill\bfseries\normalsize CONTENTS\hfill}
\renewcommand{\cftaftertoctitle}{\hfill}

% TOC styles

% Removes vertical space between sections in TOC.
\setlength{\cftbeforesecskip}{0pt}

% Add leaders to all sections and subsections in the TOC.
\renewcommand\cftsecleader{\cftdotfill{\cftdotsep}}

% Add low caps to titles in TOC.
\renewcommand{\cftsecfont}{\scshape}
\renewcommand{\cftsubsecfont}{\scshape}
\renewcommand{\cftsubsubsecfont}{\scshape}



%\renewcommand{\cfttoctitlefont}{\hfill\large\bfseries\MakeUppercase}
%\renewcommand{\cftloftitlefont}{\hfill\large\bfseries\MakeUppercase}
%\renewcommand{\cftlottitlefont}{\hfill\large\bfseries\MakeUppercase}
%\renewcommand{\cftaftertoctitle}{\hfill}
%\renewcommand{\cftafterloftitle}{\hfill}
%\renewcommand{\cftafterlottitle}{\hfill}
%\renewcommand{\cftsecfont}{\normalfont}
%\renewcommand{\cftsubsecfont}{\normalfont}
%\renewcommand{\cftsecpagefont}{\normalfont}
%\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}
%\renewcommand\@tocrmarg{.5in plus .5fil}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% VARIABLES
@@ -330,11 +367,63 @@ under contract DE-AC05-00OR22725
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% ENVIRONMENT OVERRIDES
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

% Adding an environment for a list of acronyms.
\newenvironment{listacronyms}{%
	\newpage
	\clearemptydoublepage
	\phantomsection
	\addcontentsline{toc}{section}{LIST OF ACRONYMS}
	\section*{List of Acronyms}%
}{}

% Adding an envrionment for a summary.
\newenvironment{summary}{%
	\newpage
	\clearemptydoublepage
	\phantomsection
	\addcontentsline{toc}{section}{Summary}
	\section*{Summary}%	
}{}

% Adding an environment for a foreward.
\newenvironment{foreward}{%
	\newpage
	\clearemptydoublepage
	\phantomsection
	\addcontentsline{toc}{section}{Foreward}
	\section*{Foreward}%
}{}

% Adding an environment for an acknowledgment.
\newenvironment{acknowledgment}{%
	\newpage
	\clearemptydoublepage
	\phantomsection
	\addcontentsline{toc}{section}{Acknowledgment}
	\section*{Acknowledgment}%
}{}

%\renewcommand\section{\newpage\clearemptydoublepage}

%\let\oldsection\section
%\renewcommand\section{\clearpage\oldsection}

% Specify some behavior for the abstract.
\renewenvironment{abstract}{%
  \addcontentsline{toc}{section}{Abstract}
  \section*{Abstract}%
	\newpage
	\clearemptydoublepage
	\pagenumbering{arabic}
	\setcounter{page}{1}
	\phantomsection
	\addcontentsline{toc}{section}{ABSTRACT}
  \section*{ABSTRACT}%
}{}
\renewcommand\contentsname{Contents}

% Adding a page break after every section by default.
% Still needs work.
\let\oldsection\section
\renewcommand\section{\newpage\clearemptydoublepage\oldsection}



@@ -403,7 +492,13 @@ under contract DE-AC05-00OR22725
%Use the command below for author-date style w/reference list.
\usepackage[authordate,strict,backend=biber,autolang=other,bibencoding=inputenc]{biblatex-chicago}


%The variables below allow you to define some things about the references list, including the name.
\newenvironment{references}{%
	%\renewcommand\refname{References}
	%\phantomsection
	\addcontentsline{toc}{section}{References}
	%\printbibliography
}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% end of Exnihilo/environment/latex/ornltm.cls