summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-11-17 03:02:29 +0000
committerNorbert Preining <norbert@preining.info>2023-11-17 03:02:29 +0000
commitd91bb5cad66508ec34d77ea60c0a02c79308edef (patch)
tree69c363099e912a77d55b67d891020bcc1f407d80 /macros/latex/contrib
parente0db3f0709a737e7258fd40a7cbfe9a461ea0756 (diff)
CTAN sync 202311170302
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx170
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.pdfbin959106 -> 964932 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin594905 -> 596890 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex55
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin610574 -> 615920 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.tex49
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdfbin2958248 -> 2963011 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex4
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdfbin3026901 -> 3033387 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex67
-rw-r--r--macros/latex/contrib/notebeamer/tex/notebeamer.cls110
-rw-r--r--macros/latex/contrib/xfakebold/Changes1
-rw-r--r--macros/latex/contrib/xfakebold/README2
-rw-r--r--macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdfbin98301 -> 98642 bytes
-rw-r--r--macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex7
-rw-r--r--macros/latex/contrib/xfakebold/latex/xfakebold.sty12
16 files changed, 343 insertions, 134 deletions
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 6e883a8b82..d70404e997 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.25a}
-\def\myfiledate{2023/11/03}
+\def\myfileversion{6.25b}
+\def\myfiledate{2023/11/16}
%
%
%<*batchfile>
@@ -2294,7 +2294,7 @@ version 2005/12/01 or later.
% array).
% \begin{macrocode}
\tl_new:N \l_@@_baseline_tl
-\tl_set:Nn \l_@@_baseline_tl c
+\tl_set:Nn \l_@@_baseline_tl { c }
% \end{macrocode}
%
% \bigskip
@@ -3795,6 +3795,7 @@ version 2005/12/01 or later.
\cs_set_eq:NN \multicolumn \@@_multicolumn:nnn
\hook_gput_code:nnn { env / tabular / begin } { . }
{ \cs_set_eq:NN \multicolumn \@@_old_multicolumn }
+ \@@_revert_colortbl:
% \end{macrocode}
% If there is one or several commands |\tabularnote| in the caption specified
% by the key |caption| and if that caption has to be composed above the tabular,
@@ -4027,7 +4028,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_CodeBefore_Body:w #1 \Body
{
- \tl_gput_left:Nn \g_@@_pre_code_before_tl { #1 }
+ \tl_set:Nn \l_tmpa_tl { #1 }
+ \int_compare:nNnT { \char_value_catcode:n { 60 } } = { 13 }
+ { \@@_rescan_for_spanish:N \l_tmpa_tl }
+ \tl_gput_left:NV \g_@@_pre_code_before_tl \l_tmpa_tl
\bool_set_true:N \l_@@_code_before_bool
% \end{macrocode}
% We go on with |\@@_pre_array:| which will (among other) execute the
@@ -4040,6 +4044,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
%
+%
% \bigskip
% \section{The \textbackslash CodeBefore}
%
@@ -4156,11 +4161,8 @@ version 2005/12/01 or later.
% \textsc{ascci} 60) and |>| are activated and Tikz is not able to solve the
% problem (even with the Tikz library \pkg{babel}).
% \begin{macrocode}
- \int_compare:nNnT { \char_value_catcode:n { 60 } } = { 13 }
- {
- \@@_rescan_for_spanish:N \g_@@_pre_code_before_tl
- \@@_rescan_for_spanish:N \l_@@_code_before_tl
- }
+ \int_compare:nNnT { \char_value_catcode:n { 60 } } = { 13 }
+ { \@@_rescan_for_spanish:N \l_@@_code_before_tl }
% \end{macrocode}
%
% Here is the |\CodeBefore|. The construction is a bit complicated because
@@ -5951,7 +5953,8 @@ version 2005/12/01 or later.
\multispan { #1 }
\cs_set_eq:NN \@@_update_max_cell_width: \prg_do_nothing: % added 2023-10-04
\begingroup
- \cs_set:Npn \@addamp { \if@firstamp \@firstampfalse \else \@preamerr 5 \fi }
+ \cs_set:Npn \@addamp
+ { \legacy_if:nTF { @firstamp } { \@firstampfalse } { \@preamerr 5 } }
% \end{macrocode}
%
% \medskip
@@ -7049,6 +7052,7 @@ version 2005/12/01 or later.
\hbox_overlap_right:n
{
\skip_horizontal:N \g_@@_width_last_col_dim
+ \skip_horizontal:N \col@sep % added 2023-11-05
\bool_if:NT \l_@@_code_before_bool
{
\pgfsys@markposition
@@ -9880,6 +9884,47 @@ version 2005/12/01 or later.
% \bigskip
% \section{The command \textbackslash RowStyle}
%
+%
+% |\g_@@_row_style_tl| may contain several instructions of the form:
+%
+% \qquad |\@@_if_row_less_than:nn { number } { instructions }|
+%
+% \smallskip
+% Then, |\g_@@_row_style_tl| will be inserted in all the cells of the array (and
+% also in both components of a |\diagbox| in a cell of in a mono-row block).
+%
+% The test |\@@_if_row_less_then:nn| ensures that the instructions are inserted
+% only if you are in a row which is (still) in the scope of that instructions
+% (which depends on the value of the key |nb-rows| of |\RowStyle|).
+%
+% That test will be active even in an expandable context because
+% |\@@_if_row_less_then:nn| is \emph{not} protected.
+%
+% |#1| is the first row \emph{after} the scope of the instructions in |#2|
+% \begin{macrocode}
+\cs_new:Npn \@@_if_row_less_than:nn #1 #2
+ { \int_compare:nNnT { \int_use:N \c@iRow } < { #1 } { #2 } }
+% \end{macrocode}
+%
+% \bigskip
+% |\@@_put_in_row_style| will be used several times by |\RowStyle|.
+% \begin{macrocode}
+\cs_set_protected:Npn \@@_put_in_row_style:n #1
+ {
+ \tl_gput_right:Nx \g_@@_row_style_tl
+ {
+% \end{macrocode}
+% Be careful, |\exp_not:N \@@_if_row_less_than:nn| can't be replaced by a
+% protected version of |\@@_if_row_less_than:nn|.
+% \begin{macrocode}
+ \exp_not:N
+ \@@_if_row_less_than:nn
+ { \int_eval:n { \c@iRow + \l_@@_key_nb_rows_int } }
+ { \exp_not:n { #1 } }
+ }
+ }
+\cs_generate_variant:Nn \@@_put_in_row_style:n { e }
+% \end{macrocode}
% \medskip
% \begin{macrocode}
\keys_define:nn { NiceMatrix / RowStyle }
@@ -9954,21 +9999,21 @@ version 2005/12/01 or later.
}
}
}
- \tl_gput_right:Nn \g_@@_row_style_tl { \ifnum \c@iRow < }
- \tl_gput_right:Nx \g_@@_row_style_tl
- { \int_eval:n { \c@iRow + \l_@@_key_nb_rows_int } }
- \tl_gput_right:Nn \g_@@_row_style_tl { #2 }
+ \@@_put_in_row_style:n { \exp_not:n { #2 } }
% \end{macrocode}
% |\l_tmpa_dim| is the value of the key |cell-space-top-limit| of |\RowStyle|.
% \begin{macrocode}
\dim_compare:nNnT \l_tmpa_dim > \c_zero_dim
{
- \tl_gput_right:Nx \g_@@_row_style_tl
+ \@@_put_in_row_style:n
{
- \tl_gput_right:Nn \exp_not:N \g_@@_cell_after_hook_tl
- {
- \dim_set:Nn \l_@@_cell_space_top_limit_dim
- { \dim_use:N \l_tmpa_dim }
+ \exp_not:n
+ {
+ \tl_gput_right:Nn \g_@@_cell_after_hook_tl
+ {
+ \dim_set:Nn \l_@@_cell_space_top_limit_dim
+ { \dim_use:N \l_tmpa_dim }
+ }
}
}
}
@@ -9977,12 +10022,15 @@ version 2005/12/01 or later.
% \begin{macrocode}
\dim_compare:nNnT \l_tmpb_dim > \c_zero_dim
{
- \tl_gput_right:Nx \g_@@_row_style_tl
+ \@@_put_in_row_style:n
{
- \tl_gput_right:Nn \exp_not:N \g_@@_cell_after_hook_tl
- {
- \dim_set:Nn \l_@@_cell_space_bottom_limit_dim
- { \dim_use:N \l_tmpb_dim }
+ \exp_not:n
+ {
+ \tl_gput_right:Nn \g_@@_cell_after_hook_tl
+ {
+ \dim_set:Nn \l_@@_cell_space_bottom_limit_dim
+ { \dim_use:N \l_tmpb_dim }
+ }
}
}
}
@@ -9991,7 +10039,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_if_empty:NF \l_@@_color_tl
{
- \tl_gput_right:Nx \g_@@_row_style_tl
+ \@@_put_in_row_style:e
{
\mode_leave_vertical:
\@@_color:n { \l_@@_color_tl }
@@ -10002,24 +10050,27 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:NT \l_tmpa_bool
{
- \tl_gput_right:Nn \g_@@_row_style_tl
+ \@@_put_in_row_style:n
{
- \if_mode_math:
- \c_math_toggle_token
- \bfseries \boldmath
- \c_math_toggle_token
- \else:
- \bfseries \boldmath
- \fi:
+ \exp_not:n
+ {
+ \if_mode_math:
+ \c_math_toggle_token
+ \bfseries \boldmath
+ \c_math_toggle_token
+ \else:
+ \bfseries \boldmath
+ \fi:
+ }
}
}
- \tl_gput_right:Nn \g_@@_row_style_tl { \fi }
\group_end:
\g_@@_row_style_tl
\ignorespaces
}
% \end{macrocode}
%
+%
% \bigskip
% \section{Colors of cells, rows and columns}
%
@@ -10578,8 +10629,8 @@ version 2005/12/01 or later.
{ \tl_if_blank_p:V \l_tmpb_tl }
{ \str_if_eq_p:Vn \l_tmpb_tl { * } }
{ \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
- \int_compare:nNnT \l_tmpb_tl > \c@jCol
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
+ \int_compare:nNnT \l_tmpb_tl > \g_@@_col_total_int
+ { \tl_set:Nx \l_tmpb_tl { \int_use:N \g_@@_col_total_int } }
% \end{macrocode}
% |\l_@@_tmpc_tl| will contain the number of column.
% \begin{macrocode}
@@ -10608,8 +10659,8 @@ version 2005/12/01 or later.
\tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } }
\tl_if_empty:NT \l_tmpb_tl
{ \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } }
- \int_compare:nNnT \l_tmpb_tl > \c@iRow
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } }
+ \int_compare:nNnT \l_tmpb_tl > \g_@@_row_total_int
+ { \tl_set:Nx \l_tmpb_tl { \int_use:N \g_@@_row_total_int } }
% \end{macrocode}
% Now, the numbers of both rows are in |\l_tmpa_tl| and |\l_tmpb_tl|.
% \begin{macrocode}
@@ -10858,6 +10909,26 @@ version 2005/12/01 or later.
% \end{macrocode}
%
%
+% \bigskip
+% \begin{macrocode}
+\hook_gput_code:nnn { begindocument } { . }
+ {
+ \IfPackageLoadedTF { colortbl }
+ {
+ \cs_set_eq:NN \@@_old_cellcolor \cellcolor
+ \cs_set_eq:NN \@@_old_rowcolor \rowcolor
+ \cs_new_protected:Npn \@@_revert_colortbl:
+ {
+ \hook_gput_code:nnn { env / tabular / begin } { . }
+ {
+ \cs_set_eq:NN \cellcolor \@@_old_cellcolor
+ \cs_set_eq:NN \rowcolor \@@_old_rowcolor
+ }
+ }
+ }
+ { \cs_new_protected:Npn \@@_revert_colortbl: { } }
+ }
+% \end{macrocode}
%
% \bigskip
% \section{The vertical and horizontal rules}
@@ -12840,15 +12911,15 @@ version 2005/12/01 or later.
{ \int_use:N \c@jCol }
{ \int_eval:n { \c@iRow + #1 - 1 } }
{ \int_eval:n { \c@jCol + #2 - 1 } }
- { \exp_not:n { ##1 } }
- { \exp_not:n { ##2 } }
+ { \g_@@_row_style_tl \exp_not:n { ##1 } }
+ { \g_@@_row_style_tl \exp_not:n { ##2 } }
}
}
\box_gclear_new:c
{ g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box }
% \end{macrocode}
% Now, we will actually compose the content of the |\Block| in a TeX box.
-% \emph{Be careful}: if after, the construction of the box, the boolean
+% \emph{Be careful}: if after the construction of the box, the boolean
% |\g_@@_rotate_bool| is raised (which means that the command |\rotate| was
% present in the content of the |\Block|) we will rotate the box but also,
% maybe, change the position of the baseline!
@@ -14296,8 +14367,17 @@ version 2005/12/01 or later.
{ \int_use:N \c@jCol }
{ \int_use:N \c@iRow }
{ \int_use:N \c@jCol }
- { \exp_not:n { #1 } }
- { \exp_not:n { #2 } }
+% \end{macrocode}
+% |\g_@@_row_style_tl| contains several instructions of the form:
+%
+% \qquad |\@@_if_row_less_than:nn { number } { instructions }|
+%
+% The command |\@@_if_row_less:nn| is fully expandable and, thus, the
+% instructions will be inserted in the |\g_@@_pre_code_after_tl| only if
+% |\diagbox| is used in a row which is the scope of that chunck of instructions.
+% \begin{macrocode}
+ { \g_@@_row_style_tl \exp_not:n { #1 } }
+ { \g_@@_row_style_tl \exp_not:n { #2 } }
}
% \end{macrocode}
% We put the cell with |\diagbox| in the sequence |\g_@@_pos_of_blocks_seq|
@@ -16448,6 +16528,7 @@ version 2005/12/01 or later.
Block~too~large.\\
You~try~to~draw~a~block~in~the~cell~#1-#2~of~your~matrix~but~the~matrix~is~
too~small~for~that~block. \\
+ This~block~and~maybe~others~will~be~ignored.
}
% \end{macrocode}
%
@@ -16459,8 +16540,7 @@ version 2005/12/01 or later.
\g_@@_static_num_of_col_int\
columns~but~you~use~only~\int_use:N \c@jCol\ and~that's~why~a~block~
specified~in~the~cell~#1-#2~can't~be~drawn.~You~should~add~some~ampersands~
- (&)~at~the~end~of~the~first~row~of~your~
- \@@_full_name_env:.\\
+ (&)~at~the~end~of~the~first~row~of~your~\@@_full_name_env:.\\
This~block~and~maybe~others~will~be~ignored.
}
% \end{macrocode}
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
index 61c9ca2acb..acdf19c303 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 5182d3d966..1217b82fdf 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index ea91158d20..b81d87457f 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -1875,8 +1875,7 @@ De nouvelles commandes sont disponibles dans ce |\CodeBefore|: |\cellcolor|,
\index{arraycolor@\texttt{\textbackslash arraycolor} (commande du \texttt{\textbackslash
CodeBefore)}}
-Les noms de ces commandes sont inspirés des noms des commandes de \pkg{colortbl}.
-
+Les noms de certaines de ces commandes sont inspirés des noms des commandes de \pkg{colortbl}.
\medskip
Ces commandes ne colorient pas les cases qui se trouvent dans les «coins» si la
@@ -2290,6 +2289,56 @@ utilise la clé |corners| pour demander de considérer le coin \emph{north east}
\end{NiceTabular}
\end{scope}
+\medskip
+L'exemple précédent utilise les clés |first-row| et |first-col| qui sont
+décrites dans la partie sur les rangées et colonnes «extérieures» (cf.~p.~\pageref{exterior}).
+
+Comme on le voit, \emph{par défaut}, les commandes de coloriage décrites précédemment ne
+s'appliquent pas dans ces rangées et colonnes «extérieures».
+
+Mais on peut \emph{quand même} colorier dans ces rangées et colonnes en
+donnant aux commandes précédentes les numéros explicites de ces rangées et
+colonnes extérieures.
+
+Dans l'exemple suivant, on demande explicitement le coloriage de la colonne~$0$
+(qui est la «première colonne» et qui existe du fait de la clé |first-col|).
+
+\medskip
+\begin{scope}
+\hfuzz=11cm
+\begin{BVerbatim}[boxwidth=9cm,baseline=c]
+\begin{NiceTabular}{cccccc}[~emphase#corners=NE@,margin,hvlines,first-row,first-col]
+\CodeBefore
+ \rowlistcolors{1}{blue!15, }
+ ~emphase#\columncolor{red!15}{0}@
+\Body
+ & 0 & 1 & 2 & 3 & 4 & 5 & 6 \\
+0 & 1 \\
+1 & 1 & 1 \\
+2 & 1 & 2 & 1 \\
+3 & 1 & 3 & 3 & 1 \\
+4 & 1 & 4 & 6 & 4 & 1 \\
+5 & 1 & 5 & 10 & 10 & 5 & 1 \\
+6 & 1 & 6 & 15 & 20 & 15 & 6 & 1 \\
+\end{NiceTabular}
+\end{BVerbatim}
+\begin{NiceTabular}{ccccccc}[corners=NE,margin,hvlines,first-row,first-col]
+\CodeBefore
+ \rowlistcolors{1}{blue!15, }
+ \columncolor{red!15}{0}
+\Body
+ & 0 & 1 & 2 & 3 & 4 & 5 & 6 \\
+0 & 1 \\
+1 & 1 & 1 \\
+2 & 1 & 2 & 1 \\
+3 & 1 & 3 & 3 & 1 \\
+4 & 1 & 4 & 6 & 4 & 1 \\
+5 & 1 & 5 & 10 & 10 & 5 & 1 \\
+6 & 1 & 6 & 15 & 20 & 15 & 6 & 1 \\
+\end{NiceTabular}
+\end{scope}
+
+
\bigskip
On remarquera que ces commandes sont compatibles avec les commandes de
\pkg{booktabs} (|\toprule|, |\midrule|, |\bottomrule|, etc). Néanmoins,
@@ -2344,7 +2393,7 @@ spécial & 12 & 12 & 0.5 & 70 \\
\index{S (les colonnes S de \pkg{siunitx})|textit}
\medskip
-On a utilisé le type de colonne |S| de \pkg{siunitx}.
+On a utilisé le type de colonne |S| de \pkg{siunitx} (qu'il faut avoir chargé).
\subsection{Outils de coloriage en tableau}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index c7eeb39bf4..051d396651 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index 7eb8e1783e..64aaf68522 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -2227,6 +2227,55 @@ which are in the ``corners''. In the following example, we use the key
\end{NiceTabular}
\end{scope}
+\medskip
+The previous example uses the keys |first-row| and |first-col| which are
+described in the chapter concerning the «exterior» rows and columns
+(cf.~p.~\pageref{exterior}).
+
+As one can see, \emph{by default}, the coloring commands that we have described
+don't apply in those exterior rows and columns.
+
+However, it may still be possible to color in those rows and columns by
+providing explicity the numbers of those rows and columns.
+
+In the following example, we require a color in the column~$0$ (which is the
+«first column» and which exists because the key |first-col| has been used).
+
+\medskip
+\begin{scope}
+\hfuzz=11cm
+\begin{BVerbatim}[boxwidth=9cm,baseline=c]
+\begin{NiceTabular}{cccccc}[~emphase#corners=NE@,margin,hvlines,first-row,first-col]
+\CodeBefore
+ \rowlistcolors{1}{blue!15, }
+ ~emphase#\columncolor{red!15}{0}@
+\Body
+ & 0 & 1 & 2 & 3 & 4 & 5 & 6 \\
+0 & 1 \\
+1 & 1 & 1 \\
+2 & 1 & 2 & 1 \\
+3 & 1 & 3 & 3 & 1 \\
+4 & 1 & 4 & 6 & 4 & 1 \\
+5 & 1 & 5 & 10 & 10 & 5 & 1 \\
+6 & 1 & 6 & 15 & 20 & 15 & 6 & 1 \\
+\end{NiceTabular}
+\end{BVerbatim}
+\begin{NiceTabular}{ccccccc}[corners=NE,margin,hvlines,first-row,first-col]
+\CodeBefore
+ \rowlistcolors{1}{blue!15, }
+ \columncolor{red!15}{0}
+\Body
+ & 0 & 1 & 2 & 3 & 4 & 5 & 6 \\
+0 & 1 \\
+1 & 1 & 1 \\
+2 & 1 & 2 & 1 \\
+3 & 1 & 3 & 3 & 1 \\
+4 & 1 & 4 & 6 & 4 & 1 \\
+5 & 1 & 5 & 10 & 10 & 5 & 1 \\
+6 & 1 & 6 & 15 & 20 & 15 & 6 & 1 \\
+\end{NiceTabular}
+\end{scope}
+
\bigskip
One should remark that all the previous commands are compatible with the
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
index c6752e931b..ffb1857726 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
index 3d4b7136b9..4944572ba3 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
@@ -1,4 +1,4 @@
-\documentclass[darker,libertinus]{notebeamer}
+\documentclass[darker,libertinus,colorful]{notebeamer}
\begin{document}
% Assign the author & mail address
\author{Axia} \mail{xiamyphys@gmail.com}
@@ -19,7 +19,7 @@
\chapter[Introduction \& Fundamental Concepts]{newnote3sdemo.pdf}
% Insert the page 1--2, 4--6 of the file with the format 3 images per page
\newnotesss{1}{2} \newnotesss{3}{6}
- \chapter[SPD Basic: Transport]{newnote4sdemo.pdf}
+ \chapter*[SPD Basic: Transport]{newnote4sdemo.pdf}
% Insert the page 1--2, 4--6, 7--10 of the file with the format 4 images per page
\newnotessss{1}{2} \newnotessss{4}{6} \newnotessss{7}{10}
% Create an empty note paper with no page number
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
index ace62f54d5..5d7eac9fb8 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
index a0668e292c..8df6c4bb8a 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
@@ -61,17 +61,18 @@
\title{The \pkg{NoteBeamer} Template}
\author[1]{Xia Ming Yu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
-\ddmmyyyydate
+\yyyymmdddate
\date{\today}
\affil[1]{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}}
-\date{\today\quad Version 2.2b\thanks{%
- \url{https://github.com/xiamyphys/NoteBeamer}}}
+\date{\today\quad Version 2.3a}
\begin{document}
\maketitle
\begin{abstract}
This is the document for \pkg{NoteBeamer} template, which provides a method to input Beamers on note papers and make notebook quickly.
+GitHub issues: \url{https://github.com/xiamyphys/NoteBeamer/issues}
+
\end{abstract}
\tableofcontents
@@ -81,12 +82,12 @@ This is the document for \pkg{NoteBeamer} template, which provides a method to i
\subsection{The purpose of this template}
This template provides an easy way to input Beamers on note papers and make notebook quickly. It's optimized for Goodnotes' default paper size and there won't have difference between papers.
-If you meet bugs when using this template, or you have better suggestions or ideas, or you want to participate in the development of the template or other templates by me, welcome to contact via email \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}.
+If you meet bugs when using this template, or you have better suggestions or ideas, or you want to participate in the development of the template or other templates by me, feel free to contact me on GitHub \href{https://github.com/xiamyphys/NoteBeamer/issues}{issues} or via email \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}.
Also, you can join my \textsf\LaTeX{} Template Discussion \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} to communicate with me and get the insider preview edition of the template.
\subsection{Packages required}
-This template is based on the template \pkg{standalone}. And it requires \pkg{tikz} package to plot some graphics, \pkg{kvoptions} and \pkg{etoolbox} packages to provide global opinions, \pkg{graphics} package to provides the \mode{draft} mode, \pkg{xparse} to provide the commands with star, \pkg{hyperref} package provides link jump function, \pkg{ctex} package to supports the \textbf{Chinese, Simplified} language and \pkg{fontawesome5} package to provides a set of beautiful icons.
+This template is based on the template \pkg{standalone}. And it requires \pkg{tikz} package to plot some graphics, \pkg{kvoptions} and \pkg{etoolbox} packages to provide global options, \pkg{graphics} package to provide the \mode{draft} mode, \pkg{hyperref} package provides link jump function, \pkg{ctex} package to support the \textbf{Chinese, Simplified} language and \pkg{fontawesome5} package to provide a set of beautiful icons.
I strongly suggest that you should use cmd to implement the commands to update all the packages to the latest version or switch to portable version instead.
\begin{verbatim}
@@ -102,7 +103,7 @@ Update your \sffamily\TeX distribution or just save the file \verb|notebeamer.cl
The template provides three modes: \mode{draft}, \mode{color} and \mode{font}. Just add the options of the modes separately by commas in the square bracket of the command in your \verb|.tex| file, such as
\begin{verbatim}
- \documentclass[draft,dark,libertinus]{notebeamer}
+ \documentclass[draft,darker,libertinus]{notebeamer}
\end{verbatim}
\section{Modes of \pkg{NoteBeamer}}
@@ -111,15 +112,18 @@ The template provides three modes: \mode{draft}, \mode{color} and \mode{font}. J
\subsection{The \mode{draft} mode}
Like most of the templates, this template also provide all modes provided by \pkg{graphics} package such as \mode{draft}, \sffamily\TeX{} will only read for size info of pages you input, and a box of the correct size is printed with the filename in.
-This can accelerate the speed of compile and you can preview the effect quickly when you input a file with too many pages and (or) its size is too large. After you make sure that there's no formatting errors, you can cancel this mode just to wait until compiled.
+This can accelerate the speed of compile, and you can preview the effect quickly when you input a file with too many pages and (or) its size is too large. After you make sure that there's no formatting errors, you can cancel this mode just to wait until compiled.
The files corresponding to the commands \cmd{sticker}, \cmd{logo} and \cmd{flyleaf} can be stored in a folder named \verb|figure(s)|, \verb|image(s)|, \verb|graphic(s)| or \verb|picture(s)|, and you needn't to write these directories again in these commands because this template has already set these directories as indexes. Just as shown in the file tree in the example in \nameref{dirtree}.
+\subsection{The \mode{saturation} mode}
+This mode has three options, \mode{lighter} \mode{light}, \mode{normal}, \mode{dark} and \mode{darker}, which can make the color of the covers you create in this template get lighter or darker, and the default option is \mode{normal}.
+
\subsection{The \mode{color} mode}
-This mode has three opinions, \mode{normal}, \mode{lighter} and \& \mode{darker}, which can make the color of the covers you create in this template get lighter or darker, and the default opinion is \mode{normal}.
+This mode has two options, \mode{main} and \mode{colorful}, which can make the color of the note line remains or keep the same hues as the cover, and the default option is \mode{main}.
\subsection{The \mode{font} mode}
-This mode has two opinions, \mode{times} and \mode{libertinus}, which can deside which font the notebook will use: The default \emph{New Times Roman} font or the \emph{Libertinus} font. You can use Libertinus fonts if you've installed it on your computer, and the default opinion is \mode{times}.
+This mode has two options, \mode{times} and \mode{libertinus}, which can deside which font the notebook will use: The default \emph{New Times Roman} font or the \emph{Libertinus} font. You can use Libertinus fonts if you've installed it on your computer, and the default option is \mode{times}.
\section{Commands of \pkg{NoteBeamer}}
@@ -132,11 +136,11 @@ This mode has two opinions, \mode{times} and \mode{libertinus}, which can deside
\begin{itemize}
\item \cmd{author}, \cmd{mail} and \cmd{flyleaf} command.
- There will be an author's name or (and) mail on the cover page after you use the command \cmd{author} or (and) \cmd{mail}, also a hyperlink will be added to the email address. A titlepage will automatically be added after the cover page after you use the command \cmd{flyleaf}.
+ There will be an author's name or (and) mail on the cover page after you use the command \cmd{author} or (and) \cmd{mail}, also a hyperlink will be added to the email address. A title page will automatically be added after the cover page after you use the command \cmd{flyleaf}.
\item \cmd{sticker} and \cmd{logo} command.
- There will be a sticker on the south east of the note paper after you add, and there will be a logo on the north west corner of the cover page and HDU note paper; otherwise it won't.
+ There will be a sticker on the southeast of the note paper after you add, and there will be a logo on the northwest corner of the cover page and HDU note paper; otherwise it won't.
The first and third variable of the command \cmd{logo} can assign the link and info of the logo, which are optional.
\end{itemize}
@@ -149,9 +153,11 @@ This mode has two opinions, \mode{times} and \mode{libertinus}, which can deside
\notebook[color]{title}[subtitle]
\end{verbatim}
-This command can create a cover. There're 7 colors for the cover, these colors' Hues are from Hangzhou MTR line 1 -- 7, they are \textcolor{H1}{H1. \textsf{\href{https://en.wikipedia.org/wiki/Malus_spectabilis}{Haitang} Red}}, \textcolor{H2}{H2. \textsf{Dangui orange}}, \textcolor{H3}{H3. \textsf{Lemon yellow}}, \textcolor{H4}{H4. \textsf{Camphor green}}, \textcolor{H5}{H5. \textsf{Cyan}}, \textcolor{H6}{H6.\textsf{ Ocean Blue}} and \textcolor{H7}{H7. \textsf{Romantic purple}}.
+This command can create a cover. There are 7 colors for the cover, these colors' Hues are from Hangzhou MTR line 1 -- 7, they are \textcolor{H1}{H1. \textsf{\href{https://en.wikipedia.org/wiki/Malus_spectabilis}{Haitang} Red}}, \textcolor{H2}{H2. \textsf{Dangui orange}}, \textcolor{H3}{H3. \textsf{Lemon yellow}}, \textcolor{H4}{H4. \textsf{Camphor green}}, \textcolor{H5}{H5. \textsf{Cyan}}, \textcolor{H6}{H6.\textsf{ Ocean Blue}} and \textcolor{H7}{H7. \textsf{Romantic purple}}.
-Here, the second value \verb|title| is mandatory and it can add the title above the center of the cover page while the third value \verb|subtitle| is optional and it can add the subtitle vertically to the lower left of the center. The first variable is from \textcolor{H1}{H1} to \textcolor{H7}{H7} and the default value is \textcolor{H5}{H5}.
+Here, the second value \verb|title| is mandatory, and it can add the title above the center of the cover page while the third value \verb|subtitle| is optional, and it can add the subtitle vertically to the lower left of the center. The first variable is from \textcolor{H1}{H1} to \textcolor{H7}{H7} and the default value is \textcolor{H5}{H5}.
+
+If a star (*) is added after this command, there will be an empty note after the cover page (or the title page if you assigned in the command \cmd{flyleaf}) automatically.
\subsection{The \cmd{chapter} command}
\begin{verbatim}
@@ -162,7 +168,7 @@ This command has 2 variables: \verb|chaptertitle| and \verb|filename|, will assi
If a star (*) is added after this command, the counter \verb|chap| won't take effect.
-\subsection{The \cmd{emptynote} \& \cmd{emptyhdunote} command}
+\subsection{The \cmd{emptynote} \& \cmd{emptyhdunote} commands}
\begin{verbatim}
\emptynote \emptynote* \emptyhdunote \emptyhdunote*
\emptynote[1] \emptynote*[2] \emptyhdunote[3] \emptyhdunote*[4]
@@ -172,7 +178,7 @@ Command \cmd{emptynote} will create an empty note paper with the chapter title b
If a star (*) is added after this command, then the note paper created won't include the chapter title and page number. Also, the counter \verb|page| won't take effect.
-There's one optional variable of these command, it decides the number of note papers you will create, and the default value is 1 certainly.
+There's one optional variable of these command, it decides the number of note papers you will create, and the default value is 1, certainly.
\subsection{The \cmd{newnote (sss) (ssss)} commands}
\begin{verbatim}
@@ -185,22 +191,24 @@ These commands will create note papers that were inserted images on the left sid
\section{Version History}
-In the Advanced Quantum Mechanics class on 19 October, 2023, my \emph{obsessive-compulsive disorder} forced me to copy all the content projected by the teacher onto the whiteboard on my iPad, and I found that I only got a few pages full of notes without any knowledge understood in my brain after a class is over. Then, an idea suddenly occurred me: Why not create an automated program to quickly insert the Beamers given by the teacher before class with the format of several images per page? So I can just annotate on it and pay more attention to listen to the teacher. After the class ended that day, I went back to my dormitory and started writing programs in \textsf\LaTeX{}.
+In the Advanced Quantum Mechanics class on 19 October 2023, my \emph{obsessive-compulsive disorder} forced me to copy all the content projected by the teacher onto the whiteboard on my iPad, and I found that I only got a few pages full of notes without any knowledge understood in my brain after a class is over. Then, an idea suddenly occurred me: Why not create an automated program to quickly insert the Beamers given by the teacher before class with the format of several images per page? So I can just annotate on it and pay more attention to listen to the teacher. After the class ended that day, I went back to my dormitory and started writing programs in \textsf\LaTeX{}.
+
+\textsf{\bfseries Version 1.0} was finished developing on 22 October 2023 and released on \href{https://www.latexstudio.net/index/details/index/mid/3720.html}{LaTeX Studio} (Xiaoshan, Hangzhou) and \href{https://www.xiaohongshu.com/user/profile/61e7ad870000000010005642}{Xiaohongshu}, where won the favor of many people and even some people who have already retired from \textsf\LaTeX{} want to re-enter.
-\textsf{\bfseries Version 1.0} was finished on 22 October, 2023 and released on \href{https://www.latexstudio.net/index/details/index/mid/3720.html}{LaTeX Studio} (Xiaoshan, Hangzhou) and \href{https://www.xiaohongshu.com/user/profile/61e7ad870000000010005642}{Xiaohongshu}, where won the favor of many people and even some people who have already retired from \textsf\LaTeX{} want to re-enter.
+On 24 October 2023, a member in the CMC competition WeChat group praised for my template, and proposed his idea: the template could be magically changed to insert a slightly smaller page of notes on the left side and take notes on the right side, because he found that he can only write in the corners when annotating some notes. It's a good idea, then I'm setting about developing the next version of the template.
-On 24 October, 2023, a member in the CMC competition WeChat group praised for my template, and proposed his idea: the template could be magically changed to insert a slightly smaller page of notes on the left side and take notes on the right side, because he found that he can only write in the corners when annotating some notes. It's a good idea, then I'm setting about developing the next version of the template.
+While considering the suggestions from friends, I am also thinking about how to simplify the previous code. Because in version 1.0, if one want to insert a Beamer with 78 images and make 3 images per page, then he should write the command \cmd{newnotesss} for 26 times, it's so inelegant... However, no matter how I write the loop, it can't meet my expectations or report errors. Then, I asked stackexchange for help, and finally a LaTeX programmer \href{https://tex.stackexchange.com/users/51799/wipet}{wipet} wrote the loop module for me. Here, I want to express my gratitude to him.
-While considering the suggestions from friends, I am also thinking about how to simplify the previous code. Because in version 1.0, if one want to insert a Beamer with 78 images and make 3 images per page, then he should write the command \cmd{newnotesss} for 26 times, it's so inelegant... However, no matter how I write the loop, it's can't meet my expectations or report errors. Then, I asked stackexchange for help, and finally a LaTeX programmer \href{https://tex.stackexchange.com/users/51799/wipet}{wipet} wrote the loop module for me. Here, I want to express my gratitude to him.
+\textsf{\bfseries Version 2.0a} was finished developing on 1 November 2023. This version not only simplified the commands to insert Beamers from to dozens of commands to only 1 command, but redesigned some details and functions. Firstly, this version supports to insert only one page of notes on the left side. What's more, this version supports to insert your school's logo on the cover page and empty note paper. Also, this version supports insert empty note papers without page number and chapter title with just add a star (*) after the command. Finally, this version can add a subtitle on the cover page, and redesign the colors (chosen from Hangzhou MTR) of the cover pages.
-\textsf{\bfseries Version 2.0a} was finished developing on 1 November, 2023. This version not only simplified the commands to insert Beamers from to dozens of commands to only 1 command, but redesigned some details and functions. Firstly, this version supports to insert only one page of notes on the left side. What's more, this version supports to insert your school's logo on the cover page and empty note paper. Also, this version supports insert empty note papers without page number and chapter title with just add a star (*) after the command. Finally, this version can add a subtitle on the cover page, and redesign the colors (chosen from Hangzhou MTR) of the cover pages.
+\textsf{\bfseries Version 2.1a} was finished developing on 9 November 2023. This version has fixed some bugs, and now supports inserting non-consecutive page numbers of the same file, and you can insert a certain number of empty note papers with only one command. Also, this version has redesigned the top and bottom margins and the height between note lines in response to the suggestion from \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group} member. What's more, this version supports the `Libertinus' font, which can make users have a better visual effect.
-\textsf{\bfseries Version 2.1a} was finished developing on 9 November, 2023. This version has fixed some bugs, and now supports inserting non-consecutive page numbers of the same file, and you can inserting a certain number of empty note papers with only one command. Also, this version has redesigned the top and bottom margins and the height between note lines in response to the suggestion from \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group} member. What's more, this version supports the `Libertinus' font, which can make users have a better visual effect.
+\textsf{\bfseries Version 2.2b} was finished developing on 11 November 2023. This version has fixed some bugs, and partial commands in this version has changed to use \sffamily\LaTeX{2e} original commands.
-\textsf{\bfseries Version 2.2b} was finished developing on 11 November, 2023. This version has fixed some bugs, and partical commands in this version has changed to use \sffamily\LaTeX{2e} original commands.
+\textsf{\bfseries Version 2.3a} was finished developing on 15 November 2023. This version added the option to make the note lines colorful, and removed the packages that already available in the kernel.
\newpage
-\datechange{01/11/2023}{Version 2.0a}
+\datechange{2023/11/01}{Version 2.0a}
\begin{itemize}
\item Simplify the command of inserting 3 \& 4 images per page.
\item Redesign the cover page \& note paper title.
@@ -208,9 +216,9 @@ While considering the suggestions from friends, I am also thinking about how to
\item Add commands to create empty note paper with logo and info on the top.
\end{itemize}
-\datechange{09/11/2023}{Version 2.1a}
+\datechange{2023/11/09}{Version 2.1a}
\begin{itemize}
- \item Fixed the bug of page number errors when inserting the titlepage.
+ \item Fixed the bug of page number errors when inserting the title page.
\item Fixed the bug of picture string position when inserting the first page number of courseware when the page number is not 1.
\item Supports inserting non-consecutive page numbers of the same file.
\item Supports inserting a certain number of empty note papers \& HDU empty note papers with only one command.
@@ -219,12 +227,19 @@ While considering the suggestions from friends, I am also thinking about how to
\item Other detailed adjustments.
\end{itemize}
-\datechange{\today}{Version 2.2b}
+\datechange{2023/11/11}{Version 2.2b}
\begin{itemize}
\item Fixed the image position error when inserting 3 and 4 images per note page.
\item Partially using \sffamily\LaTeX{2e} original commands.
\end{itemize}
+\datechange{\today}{Version 2.3a}
+\begin{itemize}
+ \item Added the option to make the note lines colorful.
+ \item Added another options in the mode \mode{saturation}.
+ \item Removed the packages that already available in the kernel.
+\end{itemize}
+
\newpage
\appendix
\section{Document Example}
diff --git a/macros/latex/contrib/notebeamer/tex/notebeamer.cls b/macros/latex/contrib/notebeamer/tex/notebeamer.cls
index e748552164..fef627cad0 100644
--- a/macros/latex/contrib/notebeamer/tex/notebeamer.cls
+++ b/macros/latex/contrib/notebeamer/tex/notebeamer.cls
@@ -14,7 +14,7 @@
%% ************************************************************************************************************
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{notebeamer}[11/11/2023 v2.2b NoteBeamer document class]
+\ProvidesClass{notebeamer}[2023/11/15 v2.3a NoteBeamer document class]
%% Global opinions
\RequirePackage{kvoptions}
@@ -22,10 +22,16 @@
\SetupKeyvalOptions{family=NB, prefix=NB@, setkeys=\kvsetkeys}
\def\ekv#1{\kvsetkeys{NB}{#1}}
-\DeclareStringOption[normal]{color}
-\DeclareVoidOption{lighter}{\ekv{color=lighter}}
-\DeclareVoidOption{normal}{\ekv{color=normal}}
-\DeclareVoidOption{darker}{\ekv{color=darker}}
+\DeclareStringOption[normal]{saturation}
+\DeclareVoidOption{lighter}{\ekv{saturation=lighter}}
+\DeclareVoidOption{light}{\ekv{saturation=light}}
+\DeclareVoidOption{normal}{\ekv{saturation=normal}}
+\DeclareVoidOption{dark}{\ekv{saturation=dark}}
+\DeclareVoidOption{darker}{\ekv{saturation=darker}}
+
+\DeclareStringOption[main]{color}
+\DeclareVoidOption{main}{\ekv{color=main}}
+\DeclareVoidOption{colorful}{\ekv{color=colorful}}
\DeclareStringOption[times]{font}
\DeclareVoidOption{times}{\ekv{font=times}}
@@ -37,7 +43,6 @@
\LoadClass[tikz]{standalone}
%% Packages
-\RequirePackage{xparse}
\RequirePackage[colorlinks,linkcolor=black,urlcolor=black]{hyperref}
\RequirePackage{ctex}
\RequirePackage{fontawesome5}
@@ -48,9 +53,7 @@
\def\author#1{\gdef\@author{#1}}
\def\mail#1{\gdef\@mail{\href{mailto:#1}{\nolinkurl{#1}}}}
\NewDocumentCommand\chapter{s o m}{
- \IfBooleanTF{#1}{}{
- \refstepcounter{chap}
- }
+ \IfBooleanTF{#1}{}{\refstepcounter{chap}}
\gdef\@chapter{#2}
\gdef\@courseware{#3}
\setcounter{note}{0}
@@ -74,8 +77,8 @@
%% notepages
\RequirePackage{graphics}
\graphicspath{{./beamer/}{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}% Paths
-\definecolor{lightyellow}{HTML}{F7F6E9}
-\definecolor{紺色}{HTML}{223A70}
+\definecolor{pagecolor}{HTML}{F7F6E9}
+\definecolor{main}{HTML}{223A70}
\newcounter{chap}
\newcounter{note}
\def\chaptername{\faIcon{seedling} Chapter}
@@ -86,7 +89,7 @@
\addtocounter{note}{-1}
\foreach \n in {#1,...,#2}{
\begin{tikzpicture}
- \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+ \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
\ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
%%%%%% imput file
@@ -95,22 +98,22 @@
%%%%%% draw lines & dots: right
\foreach \a in {9,...,33}
\foreach \b in {24,...,29}
- \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+ \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
\foreach \a in {9,...,32}
- \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.75*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.2*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
+ \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.75*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.2*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
%%%%%% draw lines & dots: bottom
\foreach \a in {0,...,8,8}
\foreach \b in {1,...,29}
- \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+ \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
\foreach \a in {1,...,8,8}
- \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
+ \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
- \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+ \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
- \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+ \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
- \draw [line cap=round,thick,opacity=0.4,gray] (0.75*\notewidth in,0.038*\noteheight in+8.25*0.028*\noteheight in) -- (0.75*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
+ \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.75*\notewidth in,0.038*\noteheight in+8.25*0.028*\noteheight in) -- (0.75*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
\end{tikzpicture}
}
}
@@ -119,7 +122,7 @@
\def\threebeamers#1#2#3{
\refstepcounter{note}
\begin{tikzpicture}
- \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+ \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
\ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
%%%%%% imput file
@@ -129,15 +132,15 @@
%%%%%% draw lines & dots
\foreach \a in {0,...,33}
\foreach \b in {18,...,29}
- \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+ \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
\foreach \a in {1,...,32}
- \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
+ \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
- \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+ \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
- \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+ \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
- \draw [line cap=round,thick,opacity=0.4,gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
+ \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
\end{tikzpicture}
}
@@ -160,7 +163,7 @@
\def\fourbeamers#1#2#3#4{
\refstepcounter{note}
\begin{tikzpicture}
- \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+ \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
\ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
%%%%%% imput file
\foreach \n in {#1,#2,#3,#4}
@@ -168,15 +171,15 @@
\foreach \a in {0,...,33}
\foreach \b in {18,...,29}
- \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+ \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
\foreach \a in {1,...,32}
- \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
+ \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
- \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+ \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
- \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+ \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
- \draw [line cap=round,thick,opacity=0.4,gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
+ \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
\end{tikzpicture}
}
@@ -198,25 +201,25 @@
%%%% emptynote (*without chapter title & page number)
\NewDocumentCommand\clearnote{s}{
\begin{tikzpicture}
- \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+ \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
\ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
\foreach \a in {0,...,33}
\foreach \b in {1,...,29}
- \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+ \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
\foreach \a in {1,...,32}
- \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
+ \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
- \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+ \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
\IfBooleanTF{#1}
{
- \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 顶部粗线
+ \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 顶部粗线
}
{
- \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+ \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
}
- \draw [line cap=round,thick,opacity=0.4,gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
+ \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
\end{tikzpicture}
}
@@ -231,24 +234,24 @@
%%%% emptynote with school title (*without chapter title & page number)
\NewDocumentCommand\clearhdunote{s}{
\begin{tikzpicture}
- \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+ \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
\ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
\foreach \a in {0,...,32}
\foreach \b in {1,...,29}
- \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+ \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
\foreach \a in {1,...,31}
- \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
+ \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
\IfBooleanTF{#1}
{
- \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{紺色}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 底部粗线
+ \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{main}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 底部粗线
}{
- \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 底部粗线
+ \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 底部粗线
}
- \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=32*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0)\ifcsname @logo\endcsname node [anchor=west,at start,yshift=0.033*\noteheight in,inner sep=0pt] {\href{\@edu}{\includegraphics[height=0.45808 in]{\@logo}}} node [anchor=east,yshift=0.033*\noteheight in] {\bfseries\heiti\color{紺色}\faIcon{map-pin} \@address\quad\quad}\fi;% 顶部粗线
+ \draw [line cap=round,main!80,thick,yshift=32*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0)\ifcsname @logo\endcsname node [anchor=west,at start,yshift=0.033*\noteheight in,inner sep=0pt] {\href{\@edu}{\includegraphics[height=0.45808 in]{\@logo}}} node [anchor=east,yshift=0.033*\noteheight in] {\bfseries\heiti\color{main}\faIcon{map-pin} \@address\quad\quad}\fi;% 顶部粗线
- \draw [line cap=round,thick,opacity=0.4,gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+31.75*0.028*\noteheight in);% 分栏线
+ \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+31.75*0.028*\noteheight in);% 分栏线
\end{tikzpicture}
}
@@ -261,17 +264,26 @@
}
%% covers
-\ifdefstring{\NB@color}{lighter}{\def\@saturation{.16}}{\relax}
-\ifdefstring{\NB@color}{normal}{\def\@saturation{.12}}{\relax}
-\ifdefstring{\NB@color}{darker}{\def\@saturation{.08}}{\relax}
+\ifdefstring{\NB@saturation}{lighter}{\def\@saturation{.18}}{\relax}
+\ifdefstring{\NB@saturation}{light}{\def\@saturation{.15}}{\relax}
+\ifdefstring{\NB@saturation}{normal}{\def\@saturation{.12}}{\relax}
+\ifdefstring{\NB@saturation}{dark}{\def\@saturation{.09}}{\relax}
+\ifdefstring{\NB@saturation}{darker}{\def\@saturation{.06}}{\relax}
\definecolor{H1}{Hsb}{349,\@saturation,.9}% 海棠紅 (Hangzhou MTR L 1 )
+\definecolor{H1*}{HTML}{702230}
\definecolor{H2}{Hsb}{23, \@saturation,.9}% 丹桂橙 (Hangzhou Metro 2 )
+\definecolor{H2*}{HTML}{703F22}
\definecolor{H3}{Hsb}{48, \@saturation,.9}% 柠檬黄 (Hangzhou Metro 3 )
+\definecolor{H3*}{HTML}{706022}
\definecolor{H4}{Hsb}{103,\@saturation,.9}% 香樟绿 (Hangzhou Metro 4 )
+\definecolor{H4*}{HTML}{387022}
\definecolor{H5}{Hsb}{188,\@saturation,.9}% 青藍色 (Hangzhou MTR L 5 )
+\definecolor{H5*}{HTML}{226570}
\definecolor{H6}{Hsb}{207,\@saturation,.9}% 海洋蓝 (Hangzhou Metro 6 )
+\definecolor{H6*}{HTML}{224C70}
\definecolor{H7}{Hsb}{290,\@saturation,.9}% 浪漫紫 (Hangzhou Metro 7 )
+\definecolor{H7*}{HTML}{632270}
\NewDocumentCommand\notebook{s O{H5} m O{}}{
\setcounter{chap}{0}
@@ -285,6 +297,8 @@
\draw [thick,line cap=round] (0.65*\notewidth in,0.05*\noteheight in) --++ (0.25*\notewidth in,0) node [anchor=south west] {\large\faIcon{feather-alt}} \ifcsname @mail\endcsname node [midway,anchor=south] {\bfseries\texttt{\@mail}}\fi node [midway,anchor=south,yshift=2em] {\bfseries\sffamily\large\ifcsname @author\endcsname\@author\fi};
\ifcsname @logo\endcsname\node [anchor=north west] at (0.025*\notewidth in,0.991*\noteheight in) {\href{\@edu}{\includegraphics[width=2.212 in]{\@logo}}};\fi
\end{tikzpicture}
+ \ifdefstring{\NB@color}{colorful}{\colorlet{main}{main}}{\relax}
+ \ifdefstring{\NB@color}{colorful}{\colorlet{main}{#2*}}{\relax}
\ifcsname @flyleaf\endcsname
\addtocounter{page}{-1}
\begin{tikzpicture}
diff --git a/macros/latex/contrib/xfakebold/Changes b/macros/latex/contrib/xfakebold/Changes
index 498c9e66fe..752716181a 100644
--- a/macros/latex/contrib/xfakebold/Changes
+++ b/macros/latex/contrib/xfakebold/Changes
@@ -1,5 +1,6 @@
xfakebold.sty ----------------
+v 0.09 2023-11-16 fix bug with \@ifpackagelater
v 0.08 2020-06-24 use colorstack to allow a page break
v 0.07 2020-06-22 fix bug for pdflatex (thanks to Scott Pakin)
v 0.06 2019-12-29 support for xetex and ptex with (x)dvipdfmx
diff --git a/macros/latex/contrib/xfakebold/README b/macros/latex/contrib/xfakebold/README
index c4fd11bbf5..8554144764 100644
--- a/macros/latex/contrib/xfakebold/README
+++ b/macros/latex/contrib/xfakebold/README
@@ -7,7 +7,7 @@ AutoFakeBold from package fontspec.
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
index 8195a0f488..a4fac458f0 100644
--- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
+++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
index b60ab25316..477dd3922b 100644
--- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
+++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
@@ -1,4 +1,4 @@
-% $Id: xfakebold-doc.tex 11 2020-06-24 06:56:41Z herbert $
+% $Id: xfakebold-doc.tex 814 2023-11-16 10:15:07Z herbert $
\listfiles
\documentclass[english]{article}
\usepackage{dejavu-otf}
@@ -12,7 +12,7 @@
\usepackage{babel}
\usepackage[a4paper,tmargin=1cm,bmargin=1.5cm,includeheadfoot]{geometry}
\usepackage{listings}
-\title{\texttt{xfakebold}, v. 0.08\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}}
+\title{\texttt{xfakebold}, v. 0.09\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}}
\author{Herbert Voß}
\lstset{basicstyle=\ttfamily\small,language={[LaTeX]TeX},frame=lrtb}
@@ -35,7 +35,8 @@ math mode where only some free math fonts provide a bold version.
\end{abstract}
\vfill
-\small Thanks to: Heiko Oberdiek; Scott Pakin, Will Robertson; Yusuke Terada;
+\small Thanks to: Martin Münch; Heiko Oberdiek;
+Scott Pakin, Will Robertson; Yusuke Terada;
%\meaning\setBold
%\meaning\unsetBold
diff --git a/macros/latex/contrib/xfakebold/latex/xfakebold.sty b/macros/latex/contrib/xfakebold/latex/xfakebold.sty
index b4c2dff90f..1307d3ba72 100644
--- a/macros/latex/contrib/xfakebold/latex/xfakebold.sty
+++ b/macros/latex/contrib/xfakebold/latex/xfakebold.sty
@@ -1,27 +1,27 @@
-% $Id: xfakebold.sty 11 2020-06-24 06:56:41Z herbert $
+% $Id: xfakebold.sty 814 2023-11-16 10:15:07Z herbert $
%%
%% This is file `xfakebold.sty',
%%
-%% Copyright (C) 2019, 2020 Herbert Voss
+%% Copyright (C) 2019, ..., 2023 Herbert Voss
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xfakebold}[2020/06/24 v0.08 using bold characters]
+\ProvidesPackage{xfakebold}[2023/11/16 v0.09 using bold characters]
\RequirePackage{xkeyval}
\RequirePackage{pdfrender}
\@ifpackagelater{iftex}{2019/10/24}{%
- \RequirePackage{ifxetex,ifluatex,ifpdf}
-}{%
\RequirePackage{iftex}
+}{%
+ \RequirePackage{ifxetex,ifluatex,ifpdf}
}
\def\fkbld@bold{0.3}%