- Rename PrimeBright color set to PrimeMedium to get rid of oxymoronic PrimeBrightGray color.
- Add higher-contrast gray text color. - Fix the star argument for \CenterFig. - Add argument to \BigFig for keyvals passed to \includegraphics. - Adjust \InlineGraphic offset. - Adjust paragraph and line spacing.
This commit is contained in:
@@ -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},
|
||||
|
||||
Reference in New Issue
Block a user