Move things between styles and class (b449b865) · Commits · Johnson, Seth R. / ornltm

ornltm/ornltm-style.sty

+45 −12

Original line number	Diff line number	Diff line
		@@ -30,20 +30,12 @@
		% Bold math must be loaded after Times font
		\RequirePackage{bm}

		% Bold sans-serif
		\newcommand{\textbsf}[1]{{\bfseries\sffamily #1}}
		% Bold italics
		\newcommand{\textbi}[1]{{\bfseries\itshape #1}}

		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		% COLORS
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		\RequirePackage{color} % colored fonts and boxes

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

		% Add pretty link colors if hyperref is loaded
		\@ifpackageloaded{hyperref}{\hypersetup{
		colorlinks,
		@@ -142,10 +134,51 @@
		\titlespacing{\subparagraph}{\z@}{0.5\parskip}{\z@}

		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		% CAPTION STYLES
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		\RequirePackage[font=bf,labelsep=period]{caption}
		% APPENDIX PAGE NUMBERING
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		% Define a ``section'' command for the appendix
		\newcommand\@appendixsection[1]{%
		\cleardoublepage
		% Call the ``section'' command, which will put the title on its own page
		\thispagestyle{empty}
		\@oldappendixsection{#1}
		% Increment page counter
		\stepcounter{page}%
		% Add a blank page after the title
		\cleardoublepage
		% Insert the appendix name at the top, with no number
		{\hfill\bf\appendixname~\thesection.\hspace{.5em}\MakeUppercase{#1}\hfill\null}
		}

		\renewcommand\appendixname{APPENDIX}

		% Change format for appendices: 'appendix' in title, title takes entire page,
		% is not numbered, followed by a blank unnumbered page.
		\renewcommand\appendix{%
		\cleardoublepage
		% Reset page style
		\pagenumbering{arabic}%
		\renewcommand\thepage{\thesection--\arabic{page}}%
		% Reset section numbering
		\gdef\thesection{\@Alph\c@section}%
		% Reset section formatting
		\setcounter{section}{0}%
		% Change equation numbering
		\gdef\theequation{\@Alph\c@section.\arabic{equation}}%
		% Reset page and equation numbers at the beginning of every section
		\@addtoreset{equation}{section}%
		\@addtoreset{page}{section}%
		% Change the title format so that the ``header'' is a standalone title page.
		% This allows section and page numbering to be correct, and we can use the
		% macros it defines to insert a ``regular'' appendix label afterward.
		\titleformat{\section}[block]{\null\vfill\bf\filcenter}%
		{\appendixname~\thesection.}{0.5em}{\bf\large\MakeUppercase}[\vfill\null]
		% Save the command we just defined; we'll use it in a command we defined above
		% outside the ``appendix'' macro.
		\let\@oldappendixsection\section
		\let\section\@appendixsection
		}

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

ornltm/ornltm.cls

+15 −46

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@
		\RequirePackage{emptypage} % hide footers on blank pages
		\RequirePackage[pdfusetitle]{hyperref} % url and links in PDF
		\RequirePackage[shortcuts,acronym,nonumberlist,nogroupskip,nopostdot]{glossaries} % acronym support
		\RequirePackage{tocloft} % table of contents styling
		\RequirePackage{color} % colored fonts and boxes

		% Load document style
		\RequirePackage{ornltm-style}
		@@ -62,6 +64,13 @@ treated as a draft.}}
		% COVER
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		% Bold sans-serif
		\newcommand{\textbsf}[1]{{\bfseries\sffamily #1}}
		% Bold italics
		\newcommand{\textbi}[1]{{\bfseries\itshape #1}}
		% ORNL official green color
		\definecolor{ornlgreen}{RGB}{0,121,52}

		% Footer for cover page
		\fancypagestyle{coverpage}
		{
		@@ -370,6 +379,12 @@ under contract DE-AC05-00OR22725
		\pagenumbering{arabic}%
		}

		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		% CAPTION STYLES
		%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		\RequirePackage[font=bf,labelsep=period]{caption}

		% 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
		@@ -377,52 +392,6 @@ under contract DE-AC05-00OR22725
		\newcommand\longcaption[2]{\caption[#1]{#1 \normalfont #2}}

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

		% Define a ``section'' command for the appendix
		\newcommand\@appendixsection[1]{%
		\cleardoublepage
		% Call the ``section'' command, which will put the title on its own page
		\thispagestyle{empty}
		\@oldappendixsection{#1}
		% Increment page counter
		\stepcounter{page}%
		% Add a blank page after the title
		\cleardoublepage
		% Insert the appendix name at the top, with no number
		{\hfill\bf\appendixname~\thesection.\hspace{.5em}\MakeUppercase{#1}\hfill\null}
		}

		\renewcommand\appendixname{APPENDIX}

		% Change format for appendices: 'appendix' in title, title takes entire page,
		% is not numbered, followed by a blank unnumbered page.
		\renewcommand\appendix{%
		\cleardoublepage
		% Reset page style
		\pagenumbering{arabic}%
		\renewcommand\thepage{\thesection--\arabic{page}}%
		% Reset section numbering
		\gdef\thesection{\@Alph\c@section}%
		% Reset section formatting
		\setcounter{section}{0}%
		% Change equation numbering
		\gdef\theequation{\@Alph\c@section.\arabic{equation}}%
		% Reset page and equation numbers at the beginning of every section
		\@addtoreset{equation}{section}%
		\@addtoreset{page}{section}%
		% Change the title format so that the ``header'' is a standalone title page.
		% This allows section and page numbering to be correct, and we can use the
		% macros it defines to insert a ``regular'' appendix label afterward.
		\titleformat{\section}[block]{\null\vfill\bf\filcenter}%
		{\appendixname~\thesection.}{0.5em}{\bf\large\MakeUppercase}[\vfill\null]
		% Save the command we just defined; we'll use it in a command we defined above
		% outside the ``appendix'' macro.
		\let\@oldappendixsection\section
		\let\section\@appendixsection
		}

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