j.lucas/PrimeTeX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add indented lines override to \wrapfig.

Browse Source
This commit is contained in:
Joshua Lucas
2025-09-05 16:30:35 -05:00
parent db078eb5df
commit 2cefebccd6
3 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Floats.sty
View File

@@ -142,15 +142,6 @@
\keys_define:nn{}{ \keys_define:nn{}{
BigFig .inherit:n = BigFloat, BigFig .inherit:n = BigFloat,
} }
% \keys_define:nn{BigFig}{
% overhang .dim_set:N = \l_BigFig_overhang_dim,
% overhang .initial:e = {\c_BigFloat_overhang_dim},
% placement .clist_set:N= \l_BigFig_placement_clist,
% offset .fp_set:N = \l_BigFig_offset_fp,
% offset .initial:e = {\c_BigFloat_offset_fp},
% }
\NewDocumentCommand{\BigFig}{ \NewDocumentCommand{\BigFig}{
% Key=value options. % Key=value options.

100
packages/Fonts.sty
View File

@@ -2,60 +2,62 @@
\ProvidesPackage{PrimeTeX/packages/Fonts}[2025-06-24] \ProvidesPackage{PrimeTeX/packages/Fonts}[2025-06-24]
% Specify Fonts % Specify Fonts
\RequirePackage{fontspec} \RequirePackage{fontspec}
\NewDocumentCommand{\fontpath}{}{PrimeTeX/fonts} \NewDocumentCommand{\fontpath}{}{PrimeTeX/fonts}
% Main font: Roboto Serif % Main font: Roboto Serif
\setmainfont{RobotoSerif}[ \setmainfont{RobotoSerif}[
Path = {\fontpath/RobotoSerif/}, Path = {\fontpath/RobotoSerif/},
Extension = .ttf, Extension = .ttf,
UprightFont = *-Light, UprightFont = *-Light,
BoldFont = *-SemiBold, BoldFont = *-SemiBold,
ItalicFont = *-LightItalic, ItalicFont = *-LightItalic,
BoldItalicFont = *-SemiBoldItalic, BoldItalicFont = *-SemiBoldItalic,
] ]
% Sans serif font: Roboto % Sans serif font: Roboto
\setsansfont{Roboto}[ \setsansfont{Roboto}[
Path = {\fontpath/Roboto/}, Path = {\fontpath/Roboto/},
Extension = .ttf, Extension = .ttf,
UprightFont = *-Regular, UprightFont = *-Regular,
BoldFont = *-Bold, BoldFont = *-Bold,
ItalicFont = *-Italic, ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic, BoldItalicFont = *-BoldItalic,
] ]
% Monospace font: Roboto Mono % Monospace font: Roboto Mono
\setmonofont{RobotoMono}[ \setmonofont{RobotoMono}[
Path = {\fontpath/RobotoMono/}, Path = {\fontpath/RobotoMono/},
Extension = .ttf, Extension = .ttf,
UprightFont = *-Regular, UprightFont = *-Regular,
BoldFont = *-Bold, BoldFont = *-Bold,
ItalicFont = *-Italic, ItalicFont = *-Italic,
BoldItalicFont = *-BoldItalic, BoldItalicFont = *-BoldItalic,
] ]
% Headings & Titles font: Roboto Slab % Headings & Titles font: Roboto Slab
\newfontfamily{\sbfamily}{RobotoSlab}[ \newfontfamily{\sbfamily}{RobotoSlab}[
Path = {\fontpath/}, Path = {\fontpath/},
Extension = .ttf, Extension = .ttf,
UprightFont = RobotoSlab/RobotoSlab-SemiBold, UprightFont = RobotoSlab/RobotoSlab-SemiBold,
BoldFont = RobotoSlab/RobotoSlab-Black, BoldFont = RobotoSlab/RobotoSlab-Black,
% Roboto Slab doesn't have any italic form, so use % Roboto Slab doesn't have any italic form, so use
% the Roboto Serif version. % the Roboto Serif version.
ItalicFont = RobotoSerif/RobotoSerif-SemiBoldItalic, ItalicFont = RobotoSerif/RobotoSerif-SemiBoldItalic,
BoldItalicFont = RobotoSerif/RobotoSerif-ExtraBoldItalic, BoldItalicFont = RobotoSerif/RobotoSerif-ExtraBoldItalic,
] ]
% Emoji font: Noto Emoji % Emoji font: Noto Emoji
\newfontfamily{\emfamily}{NotoEmoji}[ \newfontfamily{\emfamily}{NotoEmoji}[
Path = {\fontpath/}, Path = {\fontpath/},
Extension = .ttf, Extension = .ttf,
UprightFont = NotoEmoji/NotoEmoji-Regular, UprightFont = NotoEmoji/NotoEmoji-Regular,
BoldFont = NotoEmoji/NotoEmoji-Bold, BoldFont = NotoEmoji/NotoEmoji-Bold,
ItalicFont = NotoEmoji/NotoEmoji-Light, ItalicFont = NotoEmoji/NotoEmoji-Light,
] ]
\RequirePackage{amssymb}
\NewDocumentCommand{\serif}{m}{\textrm{#1}} \NewDocumentCommand{\serif}{m}{\textrm{#1}}
\NewDocumentCommand{\sans}{m}{\textsf{#1}} \NewDocumentCommand{\sans}{m}{\textsf{#1}}
@@ -64,8 +66,6 @@
\NewDocumentCommand{\code}{m}{\mono{\small{}#1}} \NewDocumentCommand{\code}{m}{\mono{\small{}#1}}
\NewDocumentCommand{\emoji}{m}{{\emfamily{}#1}} \NewDocumentCommand{\emoji}{m}{{\emfamily{}#1}}
\RequirePackage{amssymb}
\RequirePackage[os=win]{menukeys} \RequirePackage[os=win]{menukeys}
\renewmenumacro{\directory}[/]{hyphenatepaths} \renewmenumacro{\directory}[/]{hyphenatepaths}

60
packages/Graphics.sty
View File

@@ -44,28 +44,40 @@
\includegraphics[keepaspectratio,#1]{#2}% \includegraphics[keepaspectratio,#1]{#2}%
} }
\NewDocumentCommand{\wrapfig}{ \NewDocumentCommand{\@wrapfigbody}{m m m m}{
% alignment [l,r,i,o] \captionsetup{type=figure}%
O{O} \capstart%
% horizontal_offset \includegraphics[%
O{\marparwidth} keepaspectratio,%
% graphic_file #2%
m ]{#1}%
% (width|height)=lengthvalue \Centering\captionof{figure}{#4}%
O{} \label{fig:#3}%
% label }
>{\TrimSpaces}m
% caption \NewDocumentCommand{\wrapfig}{
m% % #1: alignment [l,r,i,o]
}{% O{O}
\begin{wrapfigure}{#1}[#2]% % #2: horizontal_offset
\captionsetup{type=figure}% O{\marparwidth}
\capstart% % #3: graphic_file
\includegraphics[% m
keepaspectratio,% % #4: (width|height)=lengthvalue
#4% O{}
]{#3}% % #5: label
\Centering\captionof{figure}{#6}% >{\TrimSpaces}m
\label{fig:#5}% % #6: caption
\end{wrapfigure}% m%
% #7: indented lines override
o
}{%
\IfNoValueTF{#7}{%
\begin{wrapfigure}{#1}[#2]%
\@wrapfigbody{#3}{#4}{#5}{#6}%
\end{wrapfigure}%
}{%
\begin{wrapfigure}[#7]{#1}[#2]%
\@wrapfigbody{#3}{#4}{#5}{#6}%
\end{wrapfigure}%
}%
} }