projlib (24oct21)

git-svn-id: svn://tug.org/texlive/trunk@60861 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 27 insertions, 14 deletions

diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx
index 62ba754afce..56c34a01a1d 100644
--- a/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx
+++ b/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx
@@ -107,7 +107,7 @@
 %<*ProjLib-doc-cn>
 \title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南}
 \author{许锦文}
-\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/16}}
+\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/24}}
 \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
 \date{2021年10月，巴黎}
 %</ProjLib-doc-cn>
@@ -115,7 +115,7 @@
 %<*ProjLib-doc-en>
 \title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual}
 \author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/16}}
+\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/24}}
 \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
 \date{October 2021, Paris}
 %</ProjLib-doc-en>
@@ -123,7 +123,7 @@
 %<*ProjLib-doc-fr>
 \title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation}
 \author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/16}}
+\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/24}}
 \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
 \date{Octobre 2021, à Paris}
 %</ProjLib-doc-fr>
diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
index 2d3f53d48be..27f8619edb5 100644
--- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
+++ b/Master/texmf-dist/source/latex/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]
 %</ProjLib>
 %
 %<*PJLauthor>
 \ProvidesPackage{PJLauthor}
-    [2021/10/16 Enhanced author information block]
+    [2021/10/24 Enhanced author information block]
 %</PJLauthor>
 %
 %<*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]
 %</PJLdate>
 %
 %<*PJLdraft>
 \ProvidesPackage{PJLdraft}
-    [2021/10/16 Some useful macros for the draft stage]
+    [2021/10/24 Some useful macros for the draft stage]
 %</PJLdraft>
 %
 %<*PJLlang>
 \ProvidesPackage{PJLlang}
-    [2021/10/16 Multi-language configuration]
+    [2021/10/24 Multi-language configuration]
 %</PJLlang>
 %
 %<*PJLlogo>
 \ProvidesPackage{PJLlogo}
-    [2021/10/16 The ProjLib logo]
+    [2021/10/24 The ProjLib logo]
 %</PJLlogo>
 %
 %<*PJLmath>
 \ProvidesPackage{PJLmath}
-    [2021/10/16 Useful math macros and shortcuts]
+    [2021/10/24 Useful math macros and shortcuts]
 %</PJLmath>
 %
 %<*PJLpaper>
 \ProvidesPackage{PJLpaper}
-    [2021/10/16 Paper style configuration]
+    [2021/10/24 Paper style configuration]
 %</PJLpaper>
 %
 %<*PJLthm>
 \ProvidesPackage{PJLthm}
-    [2021/10/16 Theorem setup and configuration]
+    [2021/10/24 Theorem setup and configuration]
 %</PJLthm>
 %
 %# 下面两行引入宏包的代码是所有文件共用的。
@@ -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 }