From ce07680b939eecc96f42a3ee4e777c5c183503de Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 25 Oct 2021 03:03:38 +0000 Subject: CTAN sync 202110250303 --- macros/latex/contrib/projlib/ProjLib.dtx | 35 ++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-) (limited to 'macros/latex/contrib/projlib/ProjLib.dtx') diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 2d3f53d48b..27f8619edb 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -18,47 +18,47 @@ % %<*ProjLib> \ProvidesPackage{ProjLib} - [2021/10/16 The collective interface of ProjLib toolkit] + [2021/10/24 The collective interface of ProjLib toolkit] % % %<*PJLauthor> \ProvidesPackage{PJLauthor} - [2021/10/16 Enhanced author information block] + [2021/10/24 Enhanced author information block] % % %<*PJLdate> \ProvidesPackage{PJLdate} - [2021/10/16 Convert yyyy-mm-dd to normal datetime format] + [2021/10/24 Convert yyyy-mm-dd to normal datetime format] % % %<*PJLdraft> \ProvidesPackage{PJLdraft} - [2021/10/16 Some useful macros for the draft stage] + [2021/10/24 Some useful macros for the draft stage] % % %<*PJLlang> \ProvidesPackage{PJLlang} - [2021/10/16 Multi-language configuration] + [2021/10/24 Multi-language configuration] % % %<*PJLlogo> \ProvidesPackage{PJLlogo} - [2021/10/16 The ProjLib logo] + [2021/10/24 The ProjLib logo] % % %<*PJLmath> \ProvidesPackage{PJLmath} - [2021/10/16 Useful math macros and shortcuts] + [2021/10/24 Useful math macros and shortcuts] % % %<*PJLpaper> \ProvidesPackage{PJLpaper} - [2021/10/16 Paper style configuration] + [2021/10/24 Paper style configuration] % % %<*PJLthm> \ProvidesPackage{PJLthm} - [2021/10/16 Theorem setup and configuration] + [2021/10/24 Theorem setup and configuration] % % %# 下面两行引入宏包的代码是所有文件共用的。 @@ -885,8 +885,13 @@ \newcommand{\PJLsetCJKlinespacing}[1]{\renewcommand{\PJL@config@CJKlinespacing}{#1}} %# 缩进的设置 %# Parindent configuration -\def\PJL@config@parindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{1.5em}}} -\def\PJL@config@CJKparindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{2em}}} +\@ifclassloaded{beamer}{ + \def\PJL@config@parindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{0em}}} + \def\PJL@config@CJKparindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{0em}}} +}{ + \def\PJL@config@parindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{1.5em}}} + \def\PJL@config@CJKparindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{2em}}} +} \newcommand{\PJLsetparindent}[1]{\renewcommand{\PJL@config@parindent}{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{#1}}}} \newcommand{\PJLsetCJKparindent}[1]{\renewcommand{\PJL@config@CJKparindent}{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{#1}}}} %# 合并设置 @@ -1415,6 +1420,11 @@ \@PJLthm@regionalreftrue \fi +\@ifclassloaded{beamer}{% + \RequirePackage{silence} + \WarningFilter{cleveref}{hyperref package loaded with implicit=false option} +}{} + \RequirePackage{PJLlang} \RequirePackage{amsmath,amsthm} \RequirePackage{aliascnt} @@ -1717,6 +1727,9 @@ { No language \exp_not:n{#1} defined } }% {% + \ifcsname the\__PJLthm_countername:\endcsname\else + \newcounter{\__PJLthm_countername:}% + \fi \newaliascnt {\__PJLthm_countername: \__PJLthm_languageprefix:} {\__PJLthm_countername:}% \aliascntresetthe {\__PJLthm_countername: \__PJLthm_languageprefix:}% \keys_set:nn { PJLthm } { #2 } -- cgit v1.2.3