diff --git a/packages/Color.sty b/packages/Color.sty index d9ec907..34024a8 100644 --- a/packages/Color.sty +++ b/packages/Color.sty @@ -55,7 +55,7 @@ } % Lightness ≈ 49% -\definecolorset{HTML}{PrimeBright}{}{% +\definecolorset{HTML}{PrimeMedium}{}{% Gray, 717588;% #717588 Yellow, d4b725;% #d4b725 Lime, 9ad425;% #9ad425 @@ -133,7 +133,8 @@ \colorlet{linkColor}{PrimeLightBlue} - \colorlet{grayTextColor}{PrimeGray} + \colorlet{textDullGrayColor}{PrimeGray} + \colorlet{textGrayColor}{PrimeMediumGray} % Banded table rows. \colorlet{bandedRowColor}{PrimeGray} @@ -175,7 +176,8 @@ \colorlet{linkColor}{PrimeBlue} - \colorlet{grayTextColor}{PrimeLightGray} + \colorlet{textDullGrayColor}{PrimeLightGray} + \colorlet{textGrayColor}{PrimeGray} % Banded table rows. \colorlet{bandedRowColor}{PrimePaleGray} @@ -186,16 +188,16 @@ % Warning Box colors. \colorlet{dangerBGColor}{PrimePastelRed} - \colorlet{dangerFGColor}{PrimeBrightRed} + \colorlet{dangerFGColor}{PrimeMediumRed} \colorlet{warningBGColor}{PrimePastelOrange} - \colorlet{warningFGColor}{PrimeBrightOrange} + \colorlet{warningFGColor}{PrimeMediumOrange} \colorlet{infoBGColor}{PrimePastelYellow} - \colorlet{infoFGColor}{PrimeBrightYellow} + \colorlet{infoFGColor}{PrimeMediumYellow} \colorlet{tipBGColor}{PrimePastelMint} - \colorlet{tipFGColor}{PrimeBrightMint} + \colorlet{tipFGColor}{PrimeMediumMint} % Layout preview frame color. \colorlet{layoutColor}{PrimePaleBlue} @@ -215,7 +217,7 @@ \NewDocumentCommand{\ColorText}{ O{PrimeBlue} - O{PrimeBrightBlue} + O{PrimeMediumBlue} O{} +m }{ diff --git a/packages/Floats.sty b/packages/Floats.sty index e6e90d2..35237f4 100644 --- a/packages/Floats.sty +++ b/packages/Floats.sty @@ -134,16 +134,17 @@ }{ \group_begin: \keys_set:nn{CenterFig}{#2} \str_set:Nn \l_CenterFig_passed_keys_str {#4} - % \bool_if:nT {#1} { - % \str_put_left:Nn \l_CenterFig_passed_keys_str {width=\linewidth,} - % } \clist_use_default:Nnnn \l_CenterFig_placement_str {\l_Float_placement_clist} {\c_Float_placement_clist} \expanded{\noexpand\begin{figure}[\l_CenterFig_placement_str]} \begin{MyCaption}{fig:#5}{#6} \Centering - \includegraphics[keepaspectratio,#4]{#3} + \bool_if:nTF {#1} { + \includegraphics[keepaspectratio,width=\linewidth,#4]{#3} + }{ + \includegraphics[keepaspectratio,#4]{#3} + } \end{MyCaption} \end{figure} \group_end: } @@ -169,42 +170,47 @@ \dim_new:N \l_BigFig_overhang_dim \NewDocumentCommand{\BigFig}{ - % Key=value options. + % #1: Key=value options. O{} - % Graphic file. + % #2: Graphic file. m - % Label. + % #3: Key-value options passed to \includegraphics. + O{width=\linewidth} + % #4: Label. >{\TrimSpaces}m - % Caption. + % #5: Caption. m -}{ \group_begin: - \keys_set:nn{BigFig}{#1} - \fp_compare:nNnTF {\l_BigFig_hres_fp} = {0} { - \dim_set:Nn \l_BigFig_overhang_dim {\l_BigFloat_overhang_dim} - }{ - \dim_set:Nn \l_BigFig_overhang_dim { - \dim_eval:n{ - (\fp_to_dim:n{ - \l_BigFig_scale_fp - * \l_BigFig_hres_fp - / \l_BigFig_dpi_fp - * 72.27 - } - - \linewidth) - / 3} - } - }{} - \begin{BigFloat}[ - type = figure, - overhang = \l_BigFig_overhang_dim, - placement:e = \l_Float_placement_clist, - offset = \l_BigFloat_offset_fp, - ] - \begin{MyCaption}{fig:#3}{#4} - \includegraphics[keepaspectratio,width=\linewidth]{#2} - \end{MyCaption} - \end{BigFloat} -\group_end: } +}{ + \group_begin: + \keys_set:nn{BigFig}{#1} + \fp_compare:nNnTF {\l_BigFig_hres_fp} = {0} { + \dim_set:Nn \l_BigFig_overhang_dim {\l_BigFloat_overhang_dim} + }{ + \dim_set:Nn \l_BigFig_overhang_dim { + \dim_eval:n{ + (\fp_to_dim:n{ + \l_BigFig_scale_fp + * \l_BigFig_hres_fp + / \l_BigFig_dpi_fp + * 72.27 + } + - \linewidth) + / 3} + } + }{} + \begin{BigFloat}[ + type = figure, + overhang = \l_BigFig_overhang_dim, + placement:e = \l_Float_placement_clist, + offset = \l_BigFloat_offset_fp, + ] + \begin{MyCaption}{fig:#4}{#5} + \Centering + \includegraphics[keepaspectratio,#3]{#2} + \end{MyCaption} + \end{BigFloat} + \group_end: +} \keys_define:nn{}{ DoubleBigFig .inherit:n = {BigFloat}, diff --git a/packages/Fonts.sty b/packages/Fonts.sty index 24d2a46..43471e6 100644 --- a/packages/Fonts.sty +++ b/packages/Fonts.sty @@ -106,6 +106,11 @@ \NewDocumentCommand{\slab}{+m}{{\sbfamily{}#1}} \NewDocumentCommand{\code}{+m}{\mono{\small{}#1}} +% \AtBeginDocument{ +% \fontsize{9pt}{12pt} +% \selectfont +% } + %------------------------------- Symbol Commands ------------------------------- % Line-breaking zero-width space. diff --git a/packages/Graphics.sty b/packages/Graphics.sty index 476d8f9..cc97018 100644 --- a/packages/Graphics.sty +++ b/packages/Graphics.sty @@ -5,7 +5,7 @@ \dim_const:Nn \c_Graphics_icon_dim {0.25in} -\dim_const:Nn \c_InlineGraphic_offset_dim {-2pt} +\dim_const:Nn \c_InlineGraphic_offset_dim {-0.2em} \NewDocumentCommand{\IconSize}{}{\c_Graphics_icon_dim} diff --git a/packages/Layout.sty b/packages/Layout.sty index d091c7e..df5d0ab 100644 --- a/packages/Layout.sty +++ b/packages/Layout.sty @@ -74,7 +74,8 @@ % Paragraph formatting. \setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 3pt minus 3pt} +\setlength{\parskip}{0.5em plus 0.25em minus 0.25em} +\renewcommand{\baselinestretch}{1.08} % Float Page Configuration \renewcommand{\topfraction}{0.9} % max fraction of floats at top