Adjust caption formatting; add wrapfig macro.

This commit is contained in:
Silcantar
2025-07-16 22:21:40 -05:00
parent 197af7bc3d
commit 6c35ab1a10
3 changed files with 28 additions and 23 deletions

View File

@@ -5,9 +5,17 @@
% Graphics package for including images % Graphics package for including images
\RequirePackage{graphicx} \RequirePackage{graphicx}
\RequirePackage[hypcap=true]{caption}
\RequirePackage[
hypcap=true,
justification = centering,
]{caption}
\captionsetup{font = {color=PrimeBlue}}
\RequirePackage{calc} \RequirePackage{calc}
\newcommand{\iconsize}{0.25in}
\newcommand{\ig}[2][0.5in]{ \newcommand{\ig}[2][0.5in]{
\includegraphics[keepaspectratio,width=#1]{#2} \includegraphics[keepaspectratio,width=#1]{#2}
} }
@@ -24,7 +32,7 @@
\end{figure}% \end{figure}%
} }
\newcommand{\bigfig}[4][\bigfloatwidth]{% \newcommand{\bigfig}[4][\bigfloatoverhang]{%
\bigfloat[#1]{figure}{htp}{% \bigfloat[#1]{figure}{htp}{%
\captionsetup{type=figure}% \captionsetup{type=figure}%
\includegraphics[keepaspectratio,width=\textwidth]{#2}% \includegraphics[keepaspectratio,width=\textwidth]{#2}%
@@ -33,7 +41,7 @@
}% }%
} }
\newcommand{\doublebigfig}[7][\bigfloatwidth]{% \newcommand{\doublebigfig}[7][\bigfloatoverhang]{%
\bigfloat[#1]{figure}{p}{% \bigfloat[#1]{figure}{p}{%
\captionsetup{type=figure}% \captionsetup{type=figure}%
\includegraphics[keepaspectratio,width=\textwidth]{#2}% \includegraphics[keepaspectratio,width=\textwidth]{#2}%
@@ -46,4 +54,14 @@
\label{fig:#6}% \label{fig:#6}%
}% }%
} }
%#endregion
\newcommand{\wrapfig}[6][0in]{%
\begin{wrapfigure}{#3}[#1]{#4}%
\includegraphics[%
keepaspectratio,%
width = #4,%
]{#2}%
\centering\caption{#6}%
\label{fig:#5}%
\end{wrapfigure}%
}

View File

@@ -33,10 +33,10 @@
\setlength{\bigfloatoffset}{0.25in} \setlength{\bigfloatoffset}{0.25in}
% Maximum width adjustment to fit 2 16x9 screensots on one page. % Maximum width adjustment to fit 2 16x9 screensots on one page.
\newlength{\bigfloatwidth} \newlength{\bigfloatoverhang}
\setlength{\bigfloatwidth}{0.81in} \setlength{\bigfloatoverhang}{0.81in}
\newcommand{\bigfloat}[4][\bigfloatwidth]{% \newcommand{\bigfloat}[4][\bigfloatoverhang]{%
\begin{#2}[#3]% \begin{#2}[#3]%
\begin{adjustwidth*}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}% \begin{adjustwidth*}{-#1+\bigfloatoffset}{-#1-\bigfloatoffset}%
\begin{minipage}{#1 * 2 + \textwidth}% \begin{minipage}{#1 * 2 + \textwidth}%
@@ -48,20 +48,7 @@
\RequirePackage{wrapfig} \RequirePackage{wrapfig}
% \newcommand{\boxout}[7][\bigfloatwidth]{ \newcommand{\boxout}[4][\bigfloatoverhang]{%
% \bigfloat[#1]{figure}{#2}{
% \captionlistentry[figure]{#6.}
% \label{fig:#5}
% \begin{tblrBoxout}{}
% \SetCell[c=2]{c}{\sbfamily\bfseries #6}\\
% \includegraphics[#4]{#3}
% & #7\\
% \end{tblrBoxout}
% }
% }
\newcommand{\boxout}[4][\bigfloatwidth]{%
\bigfloat[#1]{figure}{#2}{% \bigfloat[#1]{figure}{#2}{%
\fcolorbox{PrimeBlue}{PrimePaleBlue}{% \fcolorbox{PrimeBlue}{PrimePaleBlue}{%
\begin{minipage}{\textwidth}% \begin{minipage}{\textwidth}%

View File

@@ -48,13 +48,13 @@
\captionsetup{% \captionsetup{%
type = figure,% type = figure,%
font = {color=marginTextColor},% font = {color=marginTextColor},%
justification = raggedright,% justification = centering,%raggedright,%
}% }%
}{% }{%
\captionsetup{% \captionsetup{%
type = figure,% type = figure,%
font = {color=marginTextColor},% font = {color=marginTextColor},%
justification = raggedleft,% justification = centering,%raggedleft,%
}% }%
}% }%
{\centering\includegraphics[keepaspectratio,#3]{#2}\par}% {\centering\includegraphics[keepaspectratio,#3]{#2}\par}%