diff --git a/packages/Boxout.sty b/packages/Boxout.sty index 654a219..bcbadbb 100644 --- a/packages/Boxout.sty +++ b/packages/Boxout.sty @@ -42,14 +42,14 @@ \NewDocumentEnvironment{BigBoxout}{ O{\bigfloatoverhang} O{htpb} - O{\bigfloatoffset} + O{\bigfloatoffsetratio} O{X[l,h]} >{\TrimSpaces}m +m +b }{ \begin{figure}[#2]% - \begin{adjustwidth}{-#1 + #3}{-#1 - #3}% + \begin{adjustwidth}{-#1 * \real{#3}}{-#1 / \real{#3}}% \begin{Boxout}[#4]{#5}{#6}% #7% \end{Boxout}% @@ -76,69 +76,4 @@ \end{Boxout}% \end{minipage}% \end{wrapfigure}% -}{} - -% \NewDocumentCommand{\Boxout}{ -% % width -% O{\textwidth} -% % label -% >{\TrimSpaces}m -% % heading -% +m -% % body -% +m -% }{% -% {% Temporarily set \fboxsep and \fboxrule. -% \setlength{\fboxrule}{\boxoutrule}% -% \setlength{\fboxsep}{\boxoutpadding}% -% \fcolorbox{boxoutfgcolor}{boxoutbgcolor}{% -% \begin{minipage}{#4 - \fboxrule * 2 - \fboxsep * 2}% -% %{\Centering% -% \captionlistentry[figure]{#3.}% -% \label{box:#1}% -% \setlength{\parskip}{\medskipamount}% -% {\Centering\slab{\strong{#2}}\par}% -% \justifying\small{}#3% -% %}% -% \end{minipage}% -% }% -% }% -% } - -% \NewDocumentCommand{\BigBoxout}{% -% % overhang -% O{\bigfloatoverhang} -% % Float position. -% O{htpb} -% % offset -% O{\bigfloatoffset} -% % label -% m -% % heading -% +m -% % body -% +m -% }{% -% \BigFloat[#1][#2][#3]{figure}{% -% \Boxout{#4}{#5}{#6}% -% }% -% } - -% \NewDocumentCommand{\WrapBoxout}{% -% % position [l,r,i,o] -% O{O} -% % offset -% O{\marparwidth} -% % width -% O{3in} -% % label -% m -% % heading -% +m -% % body -% +m -% }{% -% \begin{wrapfigure}{#1}[#2]% -% \Boxout[#3]{#4}{#5}{#6}% -% \end{wrapfigure}% -% } \ No newline at end of file +}{} \ No newline at end of file diff --git a/packages/Color.sty b/packages/Color.sty index fbdb2f2..0b1492e 100644 --- a/packages/Color.sty +++ b/packages/Color.sty @@ -46,14 +46,14 @@ \fcolorbox{boxedcoloroutline}{#2}{\color{#3}\strut{}#1}}% } -\providelength{\warningboxwidth}[\textwidth - \fboxsep * 2 - \fboxrule *2] +\providelength{\warningboxwidth}[ + \textwidth - \fboxsep * 2 - \fboxrule * 2 - 5.56pt % Magic number to make it fit. +] \NewDocumentCommand{\warningbox}{O{\warningboxwidth} +m}{% - \noindent% \fcolorbox{WarningBoxFGColor}{WarningBoxBGColor}{% - \noindent% \begin{minipage}{#1}% - \raggedbottom% + %\rule{\textwidth}{1pt}\zws% For debugging. #2% \end{minipage}% }% diff --git a/packages/Graphics.sty b/packages/Graphics.sty index 7d2aaba..f7514da 100644 --- a/packages/Graphics.sty +++ b/packages/Graphics.sty @@ -27,8 +27,8 @@ \NewDocumentCommand{\bigfig}{O{\bigfloatoverhang} m >{\TrimSpaces}m m}{% \BigFloat[#1]{figure}{% \captionsetup{type=figure}% - \includegraphics[keepaspectratio,width=\textwidth]{#2}% - \Centering\captionof{figure}{#4}\par% + \includegraphics[keepaspectratio,width=\linewidth]{#2}% + \Centering\captionof{figure}{#4}%\par \label{fig:#3}% }% } @@ -37,7 +37,7 @@ % BigFloat overhang. O{\bigfloatoverhang} % BigFloat offet. - O{\bigfloatoffset} + O{\bigfloatoffsetratio} % First graphic filename. m % First graphic label. @@ -76,10 +76,8 @@ }{% \BigFloat[#1]{table}{% \begin{tblr}{% - colspec = {% - *{2}{Q[c,m,wd=\twinfigwidth]}% - },% - %hlines,% For debugging. Comment out when done. + colspec = {*{2}{Q[c,m,wd=\twinfigwidth]}},% + hlines = {0pt}, %vlines,% For debugging. Comment out when done. hborder{1,Z} = {% abovespace = 0pt,% diff --git a/packages/Header.sty b/packages/Header.sty index 8f64686..0734cd3 100644 --- a/packages/Header.sty +++ b/packages/Header.sty @@ -1,6 +1,15 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{PrimeTeX/packages/Header}[2025-08-16] +\RequirePackage{PrimeTeX/packages/Layout} + +\providelength{\insideheaderoffset}[ + \bigfloatoverhang * \real{\bigfloatoffsetratio} +] +\providelength{\outsideheaderoffset}[ + \bigfloatoverhang / \real{\bigfloatoffsetratio} +] + % Header & Footer Options \RequirePackage{fancyhdr} \pagestyle{fancy} @@ -11,11 +20,6 @@ \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} -\newlength{\insideheaderoffset} -\setlength{\insideheaderoffset}{0.5in} -\newlength{\outsideheaderoffset} -\setlength{\outsideheaderoffset}{1.0in} - \NewDocumentCommand{\chapappname}{}{Chapter \thechapter{}: } \NewDocumentCommand{\partlabel}{}{\partname{} \thepart{}: \parttitle} diff --git a/packages/Layout.sty b/packages/Layout.sty index 0797314..dae4121 100644 --- a/packages/Layout.sty +++ b/packages/Layout.sty @@ -6,11 +6,11 @@ % Suppress "Underfull \hbox" infos. \hbadness=10000 % Suppress small overfull infos. -\hfuzz = 6.0pt +\hfuzz = 0.0pt \vfuzz = 0.0pt \NewDocumentCommand{\providelength}{m O{0pt}}{% - \ifdeflength{#2}{% It is already defined! + \ifdeflength{#1}{% It is already defined! }{% Not defined, so define it! \newlength{#1}% }% @@ -79,12 +79,10 @@ % Line-breaking dot \NewDocumentCommand{\bdot}{}{.\zws} -\newlength{\bigfloatoffset} -\setlength{\bigfloatoffset}{0.25in} +\newcommand{\bigfloatoffsetratio}{0.667} % Maximum width adjustment to fit 2 16x9 screensots on one page. -\newlength{\bigfloatoverhang} -\setlength{\bigfloatoverhang}{0.81in} +\providelength{\bigfloatoverhang}[0.81in] \providecommand{\adjwidthtype}{} @@ -97,7 +95,7 @@ O{htpb} % Offset: the distance to offset the center of the BigFloat from the center % of the text block. - O{\bigfloatoffset} + O{\bigfloatoffsetratio} % Float type: figure or table.t m % Content: what appears in the BigFloat. @@ -118,7 +116,7 @@ m }{ \begin{#4}[#2]% figure/table - \begin{#6}{-#1+#3}{-#1-#3}% adjustwidth(*) + \begin{#6}{-#1 * \real{#3}}{-#1 / \real{#3}}% adjustwidth(*) \begin{minipage}{#1 * 2 + \textwidth}% \ifthenelse{\boolean{isDraft}}{% \rule{\textwidth}{1pt}\zws%