diff --git a/fonts/RobotoSerif/RobotoSerif-Italic-Variable.ttf b/fonts/RobotoSerif/RobotoSerif-Italic-Variable.ttf new file mode 100644 index 0000000..86d11b7 Binary files /dev/null and b/fonts/RobotoSerif/RobotoSerif-Italic-Variable.ttf differ diff --git a/fonts/RobotoSerif/RobotoSerif-Variable.ttf b/fonts/RobotoSerif/RobotoSerif-Variable.ttf new file mode 100644 index 0000000..2ae12da Binary files /dev/null and b/fonts/RobotoSerif/RobotoSerif-Variable.ttf differ diff --git a/packages/Color.sty b/packages/Color.sty index 6f72372..d9ec907 100644 --- a/packages/Color.sty +++ b/packages/Color.sty @@ -133,6 +133,8 @@ \colorlet{linkColor}{PrimeLightBlue} + \colorlet{grayTextColor}{PrimeGray} + % Banded table rows. \colorlet{bandedRowColor}{PrimeGray} @@ -173,6 +175,8 @@ \colorlet{linkColor}{PrimeBlue} + \colorlet{grayTextColor}{PrimeLightGray} + % Banded table rows. \colorlet{bandedRowColor}{PrimePaleGray} diff --git a/packages/Floats.sty b/packages/Floats.sty index 65ef98a..e6e90d2 100644 --- a/packages/Floats.sty +++ b/packages/Floats.sty @@ -362,24 +362,31 @@ \end{BigFloat} \group_end: } +\tl_new:N \l_CodeFloat_text_tl + \NewDocumentEnvironment{CodeFloat}{ - % #1: Label. + % #1: Star - Show whitespace if present (not working). + s + % #2: Additional Tabularray inner specifications. + O{} + % #3: Label. >{\TrimSpaces}m - % #2: Caption. + % #4: Caption. +m - % #3: Number of indentations. - m - % #4: Body text. + % #5: Number of indentations. + O{1} + % #6: Body text. +b }{ \begin{figure} - \begin{MyCaption}{fig:#1}{#2} + \begin{MyCaption}{fig:#3}{#4} \Centering \begin{tblrCode}{ - colspec = {*{#3}{l}}, + colspec = {*{#5}{l}}, hline{1,Z} = {0.6pt}, + #2 } - #4 + #6 \end{tblrCode} \end{MyCaption} \end{figure} diff --git a/packages/Fonts.sty b/packages/Fonts.sty index e4243fa..24d2a46 100644 --- a/packages/Fonts.sty +++ b/packages/Fonts.sty @@ -60,6 +60,11 @@ BoldSlantFont = RobotoSlab-Black, RawFeature = {fallback=RobotoSerif}, ] +% \setmainfont{Roboto~Serif}[ +% Weight = 300, +% Width = 85, +% RawFeature = {fallback=RobotoSerif}, +% ] % % Sans serif font: Roboto (Medium). \setsansfont{Roboto}[ @@ -157,4 +162,31 @@ \NewDocumentCommand{\TabKey}{}{\keys{\TabString}} % Suppress warning about obsolete font encodings because we're using Unicode. -\@tw@hyphenatepaths@warnigfalse % [sic] \ No newline at end of file +\@tw@hyphenatepaths@warnigfalse % [sic] + +%------------------------- Custom Directory Formatting ------------------------- + +% The MenuKeys approach is too complicated for directory formatting. This is a +% simpler method. + +\tl_new:N \l_@@_dir_tl + +\keys_define:nn {Dir} { + font .tl_set:N = \l_Dir_font_tl, + font .initial:n = {\sffamily}, + + separator .tl_set:N = \l_Dir_separator_tl, + separator .initial:n = {\thinspaceāµ\hspace{0.17em}}, +} + +\NewDocumentCommand{\Dir}{O{} m}{ + \group_begin: + \keys_set:nn {Dir} {#1} + + \str_set:Nn \l_@@_dir_tl {#2} + \tl_replace_all:Nnn \l_@@_dir_tl {/} {\l_Dir_separator_tl} + + \tl_use:N \l_Dir_font_tl + \tl_use:N \l_@@_dir_tl + \group_end: +} \ No newline at end of file diff --git a/packages/Marginalia.sty b/packages/Marginalia.sty index d5b7b66..19e8b71 100644 --- a/packages/Marginalia.sty +++ b/packages/Marginalia.sty @@ -57,11 +57,11 @@ } % Put a footnote in a margin paragraph. -\NewDocumentCommand{\MarginNote}{O{} +m}{ +\NewDocumentCommand{\MarginNote}{O{} >{\TrimSpaces}+m}{ \footnotemark \marginalia[#1]{ \MarginHyperSetup - \footnotemark[\value{footnote}]#2 + \footnotemark[\value{footnote}]~#2 } } diff --git a/packages/Tables.sty b/packages/Tables.sty index 9683537..eefebd5 100644 --- a/packages/Tables.sty +++ b/packages/Tables.sty @@ -45,4 +45,6 @@ } } -\NewTblrColumnType{a}[1][]{X[#1,l,m]} \ No newline at end of file +\NewTblrTableCommand{\hrf}{\hrulefill} + +\NewTblrColumnType{a}[1][]{X[#1,l,m]}