summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-24 21:00:28 +0000
committerKarl Berry <karl@freefriends.org>2021-10-24 21:00:28 +0000
commitb526eb56bc6b20eaf95b856cf7c9c4896c851f3b (patch)
tree54272ef88af5cab983a5dbe3253e8d3f4c9c832e
parentb251b2e6909dba293067e5e9c47f67d29f75ab7d (diff)
projlib (24oct21)
git-svn-id: svn://tug.org/texlive/trunk@60861 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdfbin319844 -> 319867 bytes
-rw-r--r--Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex2
-rw-r--r--Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdfbin199135 -> 199151 bytes
-rw-r--r--Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex2
-rw-r--r--Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdfbin200073 -> 200090 bytes
-rw-r--r--Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex2
-rw-r--r--Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx6
-rw-r--r--Master/texmf-dist/source/latex/projlib/ProjLib.dtx35
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLauthor.sty2
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLdate.sty2
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLdraft.sty2
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLlang.sty11
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLlogo.sty2
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLmath.sty2
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLpaper.sty2
-rw-r--r--Master/texmf-dist/tex/latex/projlib/PJLthm.sty10
-rw-r--r--Master/texmf-dist/tex/latex/projlib/ProjLib.sty2
17 files changed, 54 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdf b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdf
index a04f15a2863..20cd5582ec6 100644
--- a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex
index 548adbaf726..6da0131dd29 100644
--- a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex
+++ b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex
@@ -85,7 +85,7 @@
\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月,巴黎}
diff --git a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdf b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdf
index 01e1ac56824..0e28bd09874 100644
--- a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex
index 75fad5ef357..c4e4c6b35dc 100644
--- a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex
@@ -85,7 +85,7 @@
\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}
diff --git a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdf b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdf
index 092e9a985e8..969e9633593 100644
--- a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex
index 5101a1b06e4..90e094f1eb2 100644
--- a/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex
@@ -85,7 +85,7 @@
\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}
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 }
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
index 60de131930a..d2fe7a0ff30 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLauthor}
- [2021/10/16 Enhanced author information block]
+ [2021/10/24 Enhanced author information block]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLdate.sty b/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
index f9c10a3352d..d5df7bcc895 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLdate}
- [2021/10/16 Convert yyyy-mm-dd to normal datetime format]
+ [2021/10/24 Convert yyyy-mm-dd to normal datetime format]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty b/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
index 1baaa0dadad..22d5b53a6d8 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLdraft}
- [2021/10/16 Some useful macros for the draft stage]
+ [2021/10/24 Some useful macros for the draft stage]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlang.sty b/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
index fb60c01520e..dd47775ded9 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLlang}
- [2021/10/16 Multi-language configuration]
+ [2021/10/24 Multi-language configuration]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -320,8 +320,13 @@
\def\PJL@config@CJKlinespacing{\onehalfspacing}
\newcommand{\PJLsetlinespacing}[1]{\renewcommand{\PJL@config@linespacing}{#1}}
\newcommand{\PJLsetCJKlinespacing}[1]{\renewcommand{\PJL@config@CJKlinespacing}{#1}}
-\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}}}}
\def\PJL@config@CJK{\PJL@config@CJKlinespacing\PJL@config@CJKparindent}
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
index 8540e0482cf..c83689ef449 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLlogo}
- [2021/10/16 The ProjLib logo]
+ [2021/10/24 The ProjLib logo]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLmath.sty b/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
index 4a490a372cd..52e25401715 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLmath}
- [2021/10/16 Useful math macros and shortcuts]
+ [2021/10/24 Useful math macros and shortcuts]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\RequirePackage{mathtools}
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty b/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
index d6f41498150..e1ff375af45 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLpaper}
- [2021/10/16 Paper style configuration]
+ [2021/10/24 Paper style configuration]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\RequirePackage{ifthen}
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLthm.sty b/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
index 5349ec79c22..e69ffa995ee 100644
--- a/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
+++ b/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLthm}
- [2021/10/16 Theorem setup and configuration]
+ [2021/10/24 Theorem setup and configuration]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -43,6 +43,11 @@
\@PJLthm@regionalreftrue
\fi
+\@ifclassloaded{beamer}{%
+ \RequirePackage{silence}
+ \WarningFilter{cleveref}{hyperref package loaded with implicit=false option}
+}{}
+
\RequirePackage{PJLlang}
\RequirePackage{amsmath,amsthm}
\RequirePackage{aliascnt}
@@ -281,6 +286,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 }
diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
index 930106ca211..919c3fa5f89 100644
--- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
+++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{ProjLib}
- [2021/10/16 The collective interface of ProjLib toolkit]
+ [2021/10/24 The collective interface of ProjLib toolkit]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{