texlive[60261] Master/texmf-dist: projlib (17aug21)
commits+karl at tug.org
commits+karl at tug.org
Tue Aug 17 22:50:27 CEST 2021
Revision: 60261
http://tug.org/svn/texlive?view=revision&revision=60261
Author: karl
Date: 2021-08-17 22:50:26 +0200 (Tue, 17 Aug 2021)
Log Message:
-----------
projlib (17aug21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex
trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex
trunk/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx
trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
trunk/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
trunk/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
Modified: trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-cn.tex 2021-08-17 20:50:26 UTC (rev 60261)
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
+\documentclass[allowbf,puretext]{lebhart}
%%================================
%% Import toolkit
@@ -85,7 +85,7 @@
\title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南}
\author{许锦文}
-\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/11}}
+\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/17}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
\date{2021年8月，北京}
@@ -124,7 +124,7 @@
加载 \ProjLib{} 工具箱十分容易，只需要在导言部分加入这一行即可：
\begin{code}
- \usepackage{ProjLib}
+\usepackage{ProjLib}
\end{code}
\begin{tip}[注意事项]
@@ -285,13 +285,13 @@
\PJLauthor{} 提供了 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 命令，并且允许输入多组用户信息。标准的输入方式是这样的：
\begin{code}
- \author{(*\meta{author 1}*)}
- \address{(*\meta{address 1}*)}
- \email{(*\meta{email 1}*)}
- \author{(*\meta{author 2}*)}
- \address{(*\meta{address 2}*)}
- \email{(*\meta{email 2}*)}
- ...
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
\end{code}
其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
@@ -391,17 +391,46 @@
\end{tip}
\medskip
-
-若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-\vspace{-.15\baselineskip}%
+若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称。有两种方式：
\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \item 简易设置：\lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \begin{itemize}
+ \item 这种方式只设置单独的显示名称，智能引用等名称与之取为相同（特别地，以这种方式设置时智能引用名称将不区分单复数）。当不指定 \meta{language name}时，会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}| 与 \lstinline|\NameTheorem{envname}| 效果相同。
+ \end{itemize}
+ \item 详细设置（推荐）：
+\begin{code}
+\NameTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+或
+\begin{code}
+\NameTheorem[(*\meta{language name}*)]{(*\meta{name of environment}*)}{
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+}
+\end{code}
+ \begin{itemize}
+ \item 这种方式可以具体设置各个名称。当不指定 \meta{language name}时，将允许使用完整界面；在指定语言时则只设定相应语言。同样，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}| 与 \lstinline|\NameTheorem{envname}| 效果相同。
+ \end{itemize}
\end{itemize}
-\vspace{-.15\baselineskip}%
-其中，\meta{language name} 可参阅关于 \PJLlang{} 的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-\bigskip
-然后用下面五种方式之一定义这一环境：
+\begin{tip}
+ 除此以外，你也可以在定义相应的定理类环境时为之命名，可以参见后文对 \lstinline|\CreateTheorem| 的说明。
+\end{tip}
+
+\clearpage
+然后，用下面五种方式之一定义这一环境：
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
\begin{itemize}
@@ -435,6 +464,21 @@
其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
\end{tip}
+\bigskip
+你也可以在定义定理类环境的同时为之命名，只需要在之后再加入一组括号进行设置：
+\begin{code}
+\CreateTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+
\NameTheorem[CN]{proofidea}{思路}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
@@ -442,11 +486,10 @@
\bigskip
下面提供一个例子。这三行代码：
\begin{code}
- \NameTheorem[CN]{proofidea}{思路}
- \CreateTheorem*{proofidea*}
- \CreateTheorem{proofidea}<subsection>
+\NameTheorem[CN]{proofidea}{思路}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
\end{code}
-\clearpage\noindent
可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 subsection 内编号)，它们支持在简体中文语境中使用，效果如下所示 (具体样式与所在的文档类有关) :
\begin{proofidea*}
@@ -457,8 +500,33 @@
\lstinline|proofidea| 环境。
\end{proofidea}
-\bigskip
+\medskip
+当然，你也可以使用更加精细的名称：
+\begin{code}
+\NameTheorem{proofidea}{
+ CN = {
+ name = 思路,
+ crefname = {思路}{思路},
+ Crefname = {思路}{思路},
+ }
+}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+\end{code}
+或者在定义时设置名称（对于 \lstinline|proofidea*| 与 \lstinline|proofidea| 只需要设置一次即可）：
+\begin{code}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>{
+ CN = {
+ name = 思路,
+ crefname = {思路}{思路},
+ Crefname = {思路}{思路},
+ }
+}
+\end{code}
+\clearpage
+
\subsection{次要功能}
\subsubsection{PJLdate：智能日期处理}
Modified: trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-en.tex 2021-08-17 20:50:26 UTC (rev 60261)
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
+\documentclass[allowbf,puretext]{lebhart}
%%================================
%% Import toolkit
@@ -85,7 +85,7 @@
\title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/11}}
+\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/17}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
\date{August 2021, Beijing}
@@ -124,7 +124,7 @@
Just add the following line to your preamble:
\begin{code}
- \usepackage{ProjLib}
+\usepackage{ProjLib}
\end{code}
\begin{tip}[Attention]
@@ -286,13 +286,13 @@
\PJLauthor{} offers \lstinline|\address|, \lstinline|\curraddr| and \lstinline|\email|, and allows you to enter multiple groups of author information. The standard usage is like this:
\begin{code}
- \author{(*\meta{author 1}*)}
- \address{(*\meta{address 1}*)}
- \email{(*\meta{email 1}*)}
- \author{(*\meta{author 2}*)}
- \address{(*\meta{address 2}*)}
- \email{(*\meta{email 2}*)}
- ...
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
\end{code}
The mutual order of \lstinline|\address|, \lstinline|\curraddr| and \lstinline|\email| is not important.
@@ -323,7 +323,7 @@
The language can be selected by the following macros:
\begin{itemize}
- \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding settings of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
\item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
\end{itemize}
@@ -389,14 +389,45 @@
When referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
\end{tip}
-
\bigskip
-If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use. There are two ways for this:
\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \item Simple settings: \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \begin{itemize}
+ \item This approach only sets one main name, the other names, such as those used for clever reference, are set to be the same (in particular, for clever reference, the singular and plural form will not be distinguished). When \meta{language name} is not specified, the name will be set for all supported languages. In addition, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}| has the same effect as \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
+ \item Detailed settings (recommended):
+\begin{code}
+\NameTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+or
+\begin{code}
+\NameTheorem[(*\meta{language name}*)]{(*\meta{name of environment}*)}{
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+}
+\end{code}
+ \begin{itemize}
+ \item This approach sets all the names. When \meta{language name} is not specified, the full interface will be enabled; when it is specified, only the names of the corresponding language are set. Similarly, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}| has the same effect as \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
\end{itemize}
-For \meta{language name}, please refer to the section on \PJLlang{}. When \meta{language name} is not specified, the name will be set for all supported languages. In addition, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}{...}| has the same effect as \lstinline|\NameTheorem{envname}{...}| .
+\begin{tip}
+ In addition, you can also name a theorem-like environment while defining it, see the description of \lstinline|\CreateTheorem| later.
+\end{tip}
+
And then define this environment in one of following five ways:
\vspace{-.3\baselineskip}
\begin{itemize}
@@ -432,6 +463,21 @@
This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
\end{tip}
+\bigskip
+You can also name a theorem-like environment while defining it, by adding afterwards a group of parentheses containing the settings:
+\begin{code}
+\CreateTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
@@ -439,9 +485,9 @@
\bigskip
Here is an example. The following code:
\begin{code}
- \NameTheorem[EN]{proofidea}{Idea}
- \CreateTheorem*{proofidea*}
- \CreateTheorem{proofidea}<subsection>
+\NameTheorem[EN]{proofidea}{Idea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
\end{code}
defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows (the actual style is related to the document class):
@@ -453,8 +499,33 @@
The \lstinline|proofidea| environment.
\end{proofidea}
-\bigskip
+\medskip
+Of course, you can also use a set of more detailed name:
+\begin{code}
+\NameTheorem{proofidea}{
+ EN = {
+ name = Idea,
+ crefname = {idea}{ideas},
+ Crefname = {Idea}{Ideas},
+ }
+}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+\end{code}
+or set the names while defining them (for \lstinline|proofidea*| and \lstinline|proofidea|, set once suffices):
+\begin{code}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>{
+ EN = {
+ name = Idea,
+ crefname = {idea}{ideas},
+ Crefname = {Idea}{Ideas},
+ }
+}
+\end{code}
+\clearpage
+
\subsection{Secondary functions}
\subsubsection{PJLdate: date-time processing}
Modified: trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/doc/latex/projlib/ProjLib-doc-fr.tex 2021-08-17 20:50:26 UTC (rev 60261)
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
+\documentclass[allowbf,puretext]{lebhart}
%%================================
%% Import toolkit
@@ -85,7 +85,7 @@
\title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation}
\author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/11}}
+\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/17}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
\date{Août 2021, à Pékin}
@@ -124,7 +124,7 @@
Ajoutez simplement la ligne suivante à votre préambule :
\begin{code}
- \usepackage{ProjLib}
+\usepackage{ProjLib}
\end{code}
\begin{tip}[Attention]
@@ -286,13 +286,13 @@
\PJLauthor{} propose les macros \lstinline|\address|, \lstinline|\curraddr| et \lstinline|\email|, et vous permet de saisir plusieurs groupes d'informations sur l'auteur. L'utilisation standard est comme ceci :
\begin{code}
- \author{(*\meta{author 1}*)}
- \address{(*\meta{address 1}*)}
- \email{(*\meta{email 1}*)}
- \author{(*\meta{author 2}*)}
- \address{(*\meta{address 2}*)}
- \email{(*\meta{email 2}*)}
- ...
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
\end{code}
L'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr| et \lstinline|\email| n'est pas important.
@@ -390,12 +390,44 @@
\end{tip}
\medskip
-Si vous avez besoin de définir un nouvel environnement de type théorème, vous devez d'abord définir le nom de l'environnement dans le langage à utiliser :
+Si vous avez besoin de définir un nouvel environnement de type théorème, vous devez d'abord définir le nom de l'environnement dans le langage à utiliser. Il y a deux façons pour cela:
\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \item Paramètres simples : \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \begin{itemize}
+ \item Cette approche ne définit qu'un seul nom principal. Les autres noms, tels que ceux utilisés pour référence intelligente, sont définis pour être identiques (en particulier, pour référence intelligente, les noms singulier et pluriel ne seront pas distingués). Lorsque \meta{language name} n'est pas spécifié, le nom sera défini pour toutes les langues prises en charge. De plus, les environnements avec ou sans astérisque partagent le même nom, donc, \lstinline|\NameTheorem{envname*}| a le même effet que \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
+ \item Paramètres détaillés (recommandés) :
+\begin{code}
+\NameTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+ou
+\begin{code}
+\NameTheorem[(*\meta{language name}*)]{(*\meta{name of environment}*)}{
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+}
+\end{code}
+ \begin{itemize}
+ \item Cette approche définit tous les noms. Lorsque \meta{language name} n'est pas spécifié, l'interface complète sera activée ; lorsqu'il est spécifié, seuls les noms de la langue correspondante sont définis. De même, les environnements avec ou sans astérisque partagent le même nom, donc \lstinline|\NameTheorem{envname*}| a le même effet que \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
\end{itemize}
-Pour \meta{language name}, veuillez vous référer à la section sur \PJLlang{}. Lorsque \meta{language name} n'est pas spécifié, le nom sera défini pour toutes les langues prises en charge. De plus, les environnements avec ou sans astérisque partagent le même nom, donc, \lstinline|\NameTheorem{envname*}{...}| a le même effet que \lstinline|\NameTheorem{envname}{...}| .
+\begin{tip}
+ De plus, vous pouvez également nommer un environnement de type théorème tout en le définissant, voir la description de \lstinline|\CreateTheorem| plus tard.
+\end{tip}
+
Ensuite, créez cet environnement de l'une des cinq manières suivantes :
\vspace{-.3\baselineskip}
\begin{itemize}
@@ -431,6 +463,21 @@
Cette macro utilise la fonctionnalité de \textsf{amsthm} en interne, donc le traditionnel \texttt{theoremstyle} lui est également applicable. Il suffit de déclarer le style avant les définitions pertinentes.
\end{tip}
+\bigskip
+Vous pouvez également nommer un environnement de type théorème lors de sa définition, en ajoutant ensuite un groupe de parenthèses contenant les paramètres :
+\begin{code}
+\CreateTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+
\NameTheorem[FR]{proofidea}{Idée}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
@@ -438,9 +485,9 @@
\bigskip
Voici un exemple. Le code suivant :
\begin{code}
- \NameTheorem[FR]{proofidea}{Idée}
- \CreateTheorem*{proofidea*}
- \CreateTheorem{proofidea}<subsection>
+\NameTheorem[FR]{proofidea}{Idée}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
\end{code}
définit un environnement non numéroté \lstinline|proofidea*| et un environnement numéroté \lstinline|proofidea| (numérotés dans la sous-section) respectivement. Ils peuvent être utilisés dans le contexte français. L'effet est le suivant (le style réel est lié à votre classe de document) :
@@ -452,8 +499,33 @@
La environnement \lstinline|proofidea| .
\end{proofidea}
-\bigskip
+\medskip
+Bien sûr, vous pouvez également utiliser un ensemble de nom plus détaillé :
+\begin{code}
+\NameTheorem{proofidea}{
+ FR = {
+ name = Idée,
+ crefname = {idée}{idées},
+ Crefname = {Idée}{Idées},
+ }
+}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+\end{code}
+ou définissez les noms en les définissant (pour \lstinline|proofidea*| et \lstinline|proofidea|, définir une fois suffit) :
+\begin{code}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>{
+ FR = {
+ name = Idée,
+ crefname = {idée}{idées},
+ Crefname = {Idée}{Idées},
+ }
+}
+\end{code}
+\clearpage
+
\subsection{Fonctions secondaires}
\subsubsection{PJLdate : traitement de date-heure}
Modified: trunk/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx 2021-08-17 20:50:26 UTC (rev 60261)
@@ -15,7 +15,7 @@
\ProvidesFile{ProjLib-doc.dtx}
%</driver>
%
-\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
+\documentclass[allowbf,puretext]{lebhart}
%%================================
%% Import toolkit
@@ -107,7 +107,7 @@
%<*ProjLib-doc-cn>
\title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南}
\author{许锦文}
-\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/11}}
+\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/17}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
\date{2021年8月，北京}
%</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/08/11}}
+\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/17}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
\date{August 2021, Beijing}
%</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/08/11}}
+\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/17}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
\date{Août 2021, à Pékin}
%</ProjLib-doc-fr>
@@ -221,7 +221,7 @@
加载 \ProjLib{} 工具箱十分容易，只需要在导言部分加入这一行即可：
\begin{code}
- \usepackage{ProjLib}
+\usepackage{ProjLib}
\end{code}
\begin{tip}[注意事项]
@@ -237,7 +237,7 @@
Just add the following line to your preamble:
\begin{code}
- \usepackage{ProjLib}
+\usepackage{ProjLib}
\end{code}
\begin{tip}[Attention]
@@ -253,7 +253,7 @@
Ajoutez simplement la ligne suivante à votre préambule :
\begin{code}
- \usepackage{ProjLib}
+\usepackage{ProjLib}
\end{code}
\begin{tip}[Attention]
@@ -708,13 +708,13 @@
\PJLauthor{} 提供了 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 命令，并且允许输入多组用户信息。标准的输入方式是这样的：
\begin{code}
- \author{(*\meta{author 1}*)}
- \address{(*\meta{address 1}*)}
- \email{(*\meta{email 1}*)}
- \author{(*\meta{author 2}*)}
- \address{(*\meta{address 2}*)}
- \email{(*\meta{email 2}*)}
- ...
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
\end{code}
其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
@@ -736,13 +736,13 @@
\PJLauthor{} offers \lstinline|\address|, \lstinline|\curraddr| and \lstinline|\email|, and allows you to enter multiple groups of author information. The standard usage is like this:
\begin{code}
- \author{(*\meta{author 1}*)}
- \address{(*\meta{address 1}*)}
- \email{(*\meta{email 1}*)}
- \author{(*\meta{author 2}*)}
- \address{(*\meta{address 2}*)}
- \email{(*\meta{email 2}*)}
- ...
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
\end{code}
The mutual order of \lstinline|\address|, \lstinline|\curraddr| and \lstinline|\email| is not important.
@@ -764,13 +764,13 @@
\PJLauthor{} propose les macros \lstinline|\address|, \lstinline|\curraddr| et \lstinline|\email|, et vous permet de saisir plusieurs groupes d'informations sur l'auteur. L'utilisation standard est comme ceci :
\begin{code}
- \author{(*\meta{author 1}*)}
- \address{(*\meta{address 1}*)}
- \email{(*\meta{email 1}*)}
- \author{(*\meta{author 2}*)}
- \address{(*\meta{address 2}*)}
- \email{(*\meta{email 2}*)}
- ...
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
\end{code}
L'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr| et \lstinline|\email| n'est pas important.
@@ -861,7 +861,7 @@
The language can be selected by the following macros:
\begin{itemize}
- \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding settings of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English" is selected by default.
\item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
\end{itemize}
@@ -979,27 +979,47 @@
\end{tip}
\medskip
-% 若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称 \lstinline|\|\meta{name of environment}\meta{language abbr}，其中 \meta{language abbr} 是语言的简写，分别为：
-% \begin{longtable}{ll|ll}
-% \texttt{CN} & 简体中文 & \texttt{DE} & 德文\\
-% \texttt{TC} & 繁体中文 & \texttt{JP} & 日文\\
-% \texttt{EN} & 英文 & \texttt{RU} & 俄文\\
-% \texttt{FR} & 法文 & &\\
-% \end{longtable}
-
-% \begin{tip}
-% 如果要定义名称后带有星号 \lstinline|*| 的环境，那么在上面的 \meta{name of environment} 中不用写星号。
-% \end{tip}
-若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-\vspace{-.15\baselineskip}%
+若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称。有两种方式：
\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \item 简易设置：\lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \begin{itemize}
+ \item 这种方式只设置单独的显示名称，智能引用等名称与之取为相同（特别地，以这种方式设置时智能引用名称将不区分单复数）。当不指定 \meta{language name}时，会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}| 与 \lstinline|\NameTheorem{envname}| 效果相同。
+ \end{itemize}
+ \item 详细设置（推荐）：
+\begin{code}
+\NameTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+或
+\begin{code}
+\NameTheorem[(*\meta{language name}*)]{(*\meta{name of environment}*)}{
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+}
+\end{code}
+ \begin{itemize}
+ \item 这种方式可以具体设置各个名称。当不指定 \meta{language name}时，将允许使用完整界面；在指定语言时则只设定相应语言。同样，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}| 与 \lstinline|\NameTheorem{envname}| 效果相同。
+ \end{itemize}
\end{itemize}
-\vspace{-.15\baselineskip}%
-其中，\meta{language name} 可参阅关于 \PJLlang{} 的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-\bigskip
-然后用下面五种方式之一定义这一环境：
+\begin{tip}
+ 除此以外，你也可以在定义相应的定理类环境时为之命名，可以参见后文对 \lstinline|\CreateTheorem| 的说明。
+\end{tip}
+
+\clearpage
+% \bigskip
+然后，用下面五种方式之一定义这一环境：
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
\begin{itemize}
@@ -1033,6 +1053,21 @@
其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
\end{tip}
+\bigskip
+你也可以在定义定理类环境的同时为之命名，只需要在之后再加入一组括号进行设置：
+\begin{code}
+\CreateTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+
% \def\proofideanameCN{思路}
\NameTheorem[CN]{proofidea}{思路}
\CreateTheorem*{proofidea*}
@@ -1041,11 +1076,10 @@
\bigskip
下面提供一个例子。这三行代码：
\begin{code}
- \NameTheorem[CN]{proofidea}{思路}
- \CreateTheorem*{proofidea*}
- \CreateTheorem{proofidea}<subsection>
+\NameTheorem[CN]{proofidea}{思路}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
\end{code}
-\clearpage\noindent
可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 subsection 内编号)，它们支持在简体中文语境中使用，效果如下所示 (具体样式与所在的文档类有关) :
\begin{proofidea*}
@@ -1055,6 +1089,31 @@
\begin{proofidea}
\lstinline|proofidea| 环境。
\end{proofidea}
+
+\medskip
+当然，你也可以使用更加精细的名称：
+\begin{code}
+\NameTheorem{proofidea}{
+ CN = {
+ name = 思路,
+ crefname = {思路}{思路},
+ Crefname = {思路}{思路},
+ }
+}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+\end{code}
+或者在定义时设置名称（对于 \lstinline|proofidea*| 与 \lstinline|proofidea| 只需要设置一次即可）：
+\begin{code}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>{
+ CN = {
+ name = 思路,
+ crefname = {思路}{思路},
+ Crefname = {思路}{思路},
+ }
+}
+\end{code}
%</ProjLib-doc-cn>
%
%<*ProjLib-doc-en>
@@ -1089,27 +1148,46 @@
\begin{tip}
When referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
\end{tip}
-%
-% If you need to define a new theorem-like environment, you must first define the name of the environment in the language used: \lstinline|\|\meta{name of environment}\meta{language abbr}, where \meta{language abbr} is the abbreviation of language, which can be:
-% % \vspace{-.5\baselineskip}
-% \begin{longtable}{ll|ll}
-% \texttt{CN} & Simplified Chinese & \texttt{DE} & German\\
-% \texttt{TC} & Traditional Chinese & \texttt{JP} & Japanese\\
-% \texttt{EN} & English & \texttt{RU} & Russian\\
-% \texttt{FR} & French & &\\
-% \end{longtable}
-% \begin{tip}
-% If you want to define an environment with an asterisk \lstinline|*| after the name, you don't need to write an asterisk in the \meta{name of environment} above. See the example below.
-% \end{tip}
-
\bigskip
-If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use:
+If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use. There are two ways for this:
\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \item Simple settings: \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \begin{itemize}
+ \item This approach only sets one main name, the other names, such as those used for clever reference, are set to be the same (in particular, for clever reference, the singular and plural form will not be distinguished). When \meta{language name} is not specified, the name will be set for all supported languages. In addition, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}| has the same effect as \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
+ \item Detailed settings (recommended):
+\begin{code}
+\NameTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+or
+\begin{code}
+\NameTheorem[(*\meta{language name}*)]{(*\meta{name of environment}*)}{
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+}
+\end{code}
+ \begin{itemize}
+ \item This approach sets all the names. When \meta{language name} is not specified, the full interface will be enabled; when it is specified, only the names of the corresponding language are set. Similarly, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}| has the same effect as \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
\end{itemize}
-For \meta{language name}, please refer to the section on \PJLlang{}. When \meta{language name} is not specified, the name will be set for all supported languages. In addition, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}{...}| has the same effect as \lstinline|\NameTheorem{envname}{...}| .
+\begin{tip}
+ In addition, you can also name a theorem-like environment while defining it, see the description of \lstinline|\CreateTheorem| later.
+\end{tip}
+
And then define this environment in one of following five ways:
\vspace{-.3\baselineskip}
\begin{itemize}
@@ -1145,7 +1223,21 @@
This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
\end{tip}
-% \def\proofideanameEN{Idea}
+\bigskip
+You can also name a theorem-like environment while defining it, by adding afterwards a group of parentheses containing the settings:
+\begin{code}
+\CreateTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
@@ -1153,9 +1245,9 @@
\bigskip
Here is an example. The following code:
\begin{code}
- \NameTheorem[EN]{proofidea}{Idea}
- \CreateTheorem*{proofidea*}
- \CreateTheorem{proofidea}<subsection>
+\NameTheorem[EN]{proofidea}{Idea}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
\end{code}
defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows (the actual style is related to the document class):
@@ -1166,6 +1258,31 @@
\begin{proofidea}
The \lstinline|proofidea| environment.
\end{proofidea}
+
+\medskip
+Of course, you can also use a set of more detailed name:
+\begin{code}
+\NameTheorem{proofidea}{
+ EN = {
+ name = Idea,
+ crefname = {idea}{ideas},
+ Crefname = {Idea}{Ideas},
+ }
+}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+\end{code}
+or set the names while defining them (for \lstinline|proofidea*| and \lstinline|proofidea|, set once suffices):
+\begin{code}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>{
+ EN = {
+ name = Idea,
+ crefname = {idea}{ideas},
+ Crefname = {Idea}{Ideas},
+ }
+}
+\end{code}
%</ProjLib-doc-en>
%
%<*ProjLib-doc-fr>
@@ -1202,12 +1319,44 @@
\end{tip}
\medskip
-Si vous avez besoin de définir un nouvel environnement de type théorème, vous devez d'abord définir le nom de l'environnement dans le langage à utiliser :
+Si vous avez besoin de définir un nouvel environnement de type théorème, vous devez d'abord définir le nom de l'environnement dans le langage à utiliser. Il y a deux façons pour cela:
\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \item Paramètres simples : \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+ \begin{itemize}
+ \item Cette approche ne définit qu'un seul nom principal. Les autres noms, tels que ceux utilisés pour référence intelligente, sont définis pour être identiques (en particulier, pour référence intelligente, les noms singulier et pluriel ne seront pas distingués). Lorsque \meta{language name} n'est pas spécifié, le nom sera défini pour toutes les langues prises en charge. De plus, les environnements avec ou sans astérisque partagent le même nom, donc, \lstinline|\NameTheorem{envname*}| a le même effet que \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
+ \item Paramètres détaillés (recommandés) :
+\begin{code}
+\NameTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+ou
+\begin{code}
+\NameTheorem[(*\meta{language name}*)]{(*\meta{name of environment}*)}{
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+}
+\end{code}
+ \begin{itemize}
+ \item Cette approche définit tous les noms. Lorsque \meta{language name} n'est pas spécifié, l'interface complète sera activée ; lorsqu'il est spécifié, seuls les noms de la langue correspondante sont définis. De même, les environnements avec ou sans astérisque partagent le même nom, donc \lstinline|\NameTheorem{envname*}| a le même effet que \lstinline|\NameTheorem{envname}| .
+ \end{itemize}
\end{itemize}
-Pour \meta{language name}, veuillez vous référer à la section sur \PJLlang{}. Lorsque \meta{language name} n'est pas spécifié, le nom sera défini pour toutes les langues prises en charge. De plus, les environnements avec ou sans astérisque partagent le même nom, donc, \lstinline|\NameTheorem{envname*}{...}| a le même effet que \lstinline|\NameTheorem{envname}{...}| .
+\begin{tip}
+ De plus, vous pouvez également nommer un environnement de type théorème tout en le définissant, voir la description de \lstinline|\CreateTheorem| plus tard.
+\end{tip}
+
Ensuite, créez cet environnement de l'une des cinq manières suivantes :
\vspace{-.3\baselineskip}
\begin{itemize}
@@ -1243,6 +1392,21 @@
Cette macro utilise la fonctionnalité de \textsf{amsthm} en interne, donc le traditionnel \texttt{theoremstyle} lui est également applicable. Il suffit de déclarer le style avant les définitions pertinentes.
\end{tip}
+\bigskip
+Vous pouvez également nommer un environnement de type théorème lors de sa définition, en ajoutant ensuite un groupe de parenthèses contenant les paramètres :
+\begin{code}
+\CreateTheorem{(*\meta{name of environment}*)}{
+ (*\meta{language name 1}*)={
+ name=(*\meta{Name}*),
+ crefname={(*\meta{name}*)}{(*\meta{names}*)},
+ Crefname={(*\meta{Name}*)}{(*\meta{Names}*)},
+ autorefname=(*\meta{name}*),
+ theoremheading=(*\meta{Name}*),
+ },
+ (*\meta{language name 2}*)={...},
+}
+\end{code}
+
\NameTheorem[FR]{proofidea}{Idée}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
@@ -1250,9 +1414,9 @@
\bigskip
Voici un exemple. Le code suivant :
\begin{code}
- \NameTheorem[FR]{proofidea}{Idée}
- \CreateTheorem*{proofidea*}
- \CreateTheorem{proofidea}<subsection>
+\NameTheorem[FR]{proofidea}{Idée}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
\end{code}
définit un environnement non numéroté \lstinline|proofidea*| et un environnement numéroté \lstinline|proofidea| (numérotés dans la sous-section) respectivement. Ils peuvent être utilisés dans le contexte français. L'effet est le suivant (le style réel est lié à votre classe de document) :
@@ -1263,11 +1427,36 @@
\begin{proofidea}
La environnement \lstinline|proofidea| .
\end{proofidea}
+
+\medskip
+Bien sûr, vous pouvez également utiliser un ensemble de nom plus détaillé :
+\begin{code}
+\NameTheorem{proofidea}{
+ FR = {
+ name = Idée,
+ crefname = {idée}{idées},
+ Crefname = {Idée}{Idées},
+ }
+}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+\end{code}
+ou définissez les noms en les définissant (pour \lstinline|proofidea*| et \lstinline|proofidea|, définir une fois suffit) :
+\begin{code}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>{
+ FR = {
+ name = Idée,
+ crefname = {idée}{idées},
+ Crefname = {Idée}{Idées},
+ }
+}
+\end{code}
%</ProjLib-doc-fr>
-\bigskip
+\clearpage
%<*ProjLib-doc-cn>
\subsection{次要功能}
Modified: trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2021-08-17 20:50:26 UTC (rev 60261)
@@ -18,47 +18,47 @@
%
%<*ProjLib>
\ProvidesPackage{ProjLib}
- [2021/08/11 The collective interface of ProjLib toolkit]
+ [2021/08/17 The collective interface of ProjLib toolkit]
%</ProjLib>
%
%<*PJLauthor>
\ProvidesPackage{PJLauthor}
- [2021/08/11 Enhanced author information block]
+ [2021/08/17 Enhanced author information block]
%</PJLauthor>
%
%<*PJLdate>
\ProvidesPackage{PJLdate}
- [2021/08/11 Convert yyyy-mm-dd to normal datetime format]
+ [2021/08/17 Convert yyyy-mm-dd to normal datetime format]
%</PJLdate>
%
%<*PJLdraft>
\ProvidesPackage{PJLdraft}
- [2021/08/11 Some useful macros for the draft stage]
+ [2021/08/17 Some useful macros for the draft stage]
%</PJLdraft>
%
%<*PJLlang>
\ProvidesPackage{PJLlang}
- [2021/08/11 Multi-language configuration]
+ [2021/08/17 Multi-language configuration]
%</PJLlang>
%
%<*PJLlogo>
\ProvidesPackage{PJLlogo}
- [2021/08/11 The ProjLib logo]
+ [2021/08/17 The ProjLib logo]
%</PJLlogo>
%
%<*PJLmath>
\ProvidesPackage{PJLmath}
- [2021/08/11 Useful math macros and shortcuts]
+ [2021/08/17 Useful math macros and shortcuts]
%</PJLmath>
%
%<*PJLpaper>
\ProvidesPackage{PJLpaper}
- [2021/08/11 Paper style configuration]
+ [2021/08/17 Paper style configuration]
%</PJLpaper>
%
%<*PJLthm>
\ProvidesPackage{PJLthm}
- [2021/08/11 Theorem setup and configuration]
+ [2021/08/17 Theorem setup and configuration]
%</PJLthm>
%
%# 下面两行引入宏包的代码是所有文件共用的。
@@ -1409,33 +1409,39 @@
%# 用于命名定理类环境的用户命令
%# Macro for naming theorems
+\RequirePackage{xstring}
\NewDocumentCommand{\NameTheorem}{omm}{%
\protected at edef\PJLthm at temp{#2}%
\expandafter\IfEndWith\expandafter{\PJLthm at temp}{*}{%
\expandafter\StrGobbleRight\expandafter{\PJLthm at temp}{1}[\PJLthm at temp]%
}{}%
- \IfValueTF{#1}{%
- \expandafter\def\expandafter\PJL at temp@abbr\expandafter%
- {\expandafter\StrToABBR\expandafter{#1}}%
- \expandafter\def\csname\PJLthm at temp name\PJL at temp@abbr\endcsname{#3}%
- }{%
- \expandafter\def\csname\PJLthm at temp nameEN\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameFR\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameDE\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameIT\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp namePT\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameBR\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameES\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameCN\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameTC\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameJP\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameRU\endcsname{#3}%
+ \IfSubStr{#3}{=}{% key-value mode
+ \IfValueTF{#1}{%
+ \CreateTheoremSetKeys{\PJLthm at temp}{#1={#3}}%
+ }{%
+ \CreateTheoremSetKeys{\PJLthm at temp}{#3}%
+ }%
+ }{% simple mode
+ \IfValueTF{#1}{%
+ \expandafter\def\csname\PJLthm at temp name\StrToABBR{#1}\endcsname{#3}%
+ }{%
+ \expandafter\def\csname\PJLthm at temp nameEN\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameFR\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameDE\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameIT\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp namePT\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameBR\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameES\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameCN\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameTC\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameJP\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameRU\endcsname{#3}%
+ }%
}%
}
%# 用于创建定理类环境的用户命令
%# Macro for creating theorems
-\RequirePackage{xstring}
\newcommand\PassFirstToSecond[2]{#2{#1}}%
\NewDocumentCommand{\CreateTheorem}{sm}{%
\begingroup
@@ -1450,7 +1456,7 @@
\expandafter{\PJLthm at temp}{\endgroup\InnerCreateTheorem{#1}}}%
}%
\if at PJLthm@regionalref
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()}{%
+\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()g}{%
% #1 = star or no star
% #2 = name of environment
% #3 = emptiness or star to append to name of environment
@@ -1457,6 +1463,7 @@
% #4 = numbered like
% #5 = numbered within
% #6 = existed environment
+% #7 = key-value configuration of names
\IfBooleanTF{#1}{%
\IfValueTF{#4}
{\@firstoftwo}
@@ -1510,9 +1517,12 @@
}%
}%
}%
+ \IfValueTF{#7}{%
+ \CreateTheoremSetKeys{#2}{#7}%
+ }{}%
}%
\else
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()}{%
+\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()g}{%
% #1 = Tokens denoting an xparse-boolean value;
% value "true" -> the call was \CreateTheorem*{...}...
% value "false" -> the call was \CreateTheorem{...}...
@@ -1532,6 +1542,7 @@
% to the environment's counter and whose stepping resets
% the environment's counter.
% #6 = existed environment name (the environment to copy)
+% #7 = key-value configuration of names
\IfBooleanTF{#1}{%
\IfValueTF{#4}
{\@firstoftwo}
@@ -1619,6 +1630,9 @@
{\csname end#2\csname\languagename ABBR\endcsname#3\endcsname}%
}%
}%
+ \IfValueTF{#7}{%
+ \CreateTheoremSetKeys{#2}{#7}%
+ }{}%
}%
\NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
\newaliascnt{#1#2#3}{#1#3}%
@@ -1644,6 +1658,84 @@
}%
\fi
+% See https://tex.stackexchange.com/a/610604
+\ExplSyntaxOn
+
+% Helper-macros/scratch-macros
+%-----------------------------
+\cs_new:Nn \PJLthm_exchange_i_iii_ii:nnn { #1 {#3} {#2} }
+\cs_new:Nn \__PJLthm_languageprefix: {}
+\cs_new:Nn \__PJLthm_countername: {}
+
+% Message-management:
+%--------------------
+\msg_new:nnnn {PJLthm}
+ {Undefined Language Dependent Specification Class}
+ {\token_to_str:N \CreateTheorem :\ Value\ `\tl_to_str:n{#2}'\ for\ invalid\ key\ `#1'.}
+ {Providing\ Language-dependent\ specifications\ for\ element\ `#1'\ is\ currently\ not\ implemented.}
+
+% Nested key=value-interface by means of package l3keys:
+%-------------------------------------------------------
+% (l3keys is similar to pgfkeys.)
+% The outer level of key=value-specifications, i.e., <language-ID>={...},
+% is processed via \keyval_parse:nnn which was added tpo expl3 in 2020/12/19.
+% The inner level of key=value-specifications,
+% i.e., the single keys whose values are to be specified dependant on the language,
+% i.e., the "..."-content of the outer lever's {...},
+% is processed via \keys_set:nn .
+% The keys for the inner level are defined via \keys_define:nn .
+
+\NewDocumentCommand \CreateTheoremSetKeys { mm } {
+ % #1 = name of counter
+ % #2 = keyval-list of language-specifications
+ \cs_set:Nn \__PJLthm_countername: {#1}
+ \keyval_parse:nnn { \PJLthm_exchange_i_iii_ii:nnn { \PJLthm_setlanguagespecificparameters:nn } {} }
+ { \PJLthm_setlanguagespecificparameters:nn }
+ { #2 }
+}
+
+\cs_new_protected:Nn \PJLthm_setlanguagespecificparameters:nn {
+ % #1 = language-prefix
+ % #2 = key-val-list for language whose prefix is language-prefix
+ \cs_set:Nx \__PJLthm_languageprefix: {\StrToABBR{#1}}
+ \exp_args:No \tl_if_empty:nTF {\__PJLthm_languageprefix:}
+ { \msg_error:nn { PJLthm }
+ { No language \exp_not:n{#1} defined }
+ }%
+ {%
+ \newaliascnt {\__PJLthm_countername: \__PJLthm_languageprefix:} {\__PJLthm_countername:}%
+ \aliascntresetthe {\__PJLthm_countername: \__PJLthm_languageprefix:}%
+ \keys_set:nn { PJLthm } { #2 }
+ }%
+}%
+\keys_define:nn { PJLthm } {
+ crefname.code:n = \cs_if_exist:NTF \crefname {
+ \exp_args:Nx \crefname {\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+ }{},
+ crefname.value_required:n = true,
+ Crefname.code:n = \cs_if_exist:NTF \Crefname {
+ \exp_args:Nx \Crefname {\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+ }{},
+ Crefname.value_required:n = true,
+ name.code:n = \exp_args:Nx \cs_set:cpn {\__PJLthm_countername: name \__PJLthm_languageprefix:} {#1},
+ name.value_required:n = true,
+ autorefname.code:n = \exp_args:Nx \cs_set:cpn {\__PJLthm_countername: \__PJLthm_languageprefix: autorefname} {#1},
+ autorefname.value_required:n = true,
+ theoremheading.code:n= \exp_args:Nx \cs_set:cpn {\__PJLthm_countername: \__PJLthm_languageprefix: heading} {#1},
+ theoremheading.value_required:n = true,
+ the.code:n= \exp_args:Nx \cs_set:cpn {the \__PJLthm_countername: \__PJLthm_languageprefix: } {#1},
+ the.value_required:n = true,
+ %
+ % Define keys for more Language Dependent Specification Classes.
+ %
+ unknown.code:n = \msg_error:nnxx {PJLthm}
+ {Undefined Language Dependent Specification Class}
+ {\exp_args:No \exp_not:n \l_keys_key_str}
+ {\exp_not:n{#1}},
+}
+
+\ExplSyntaxOff
+
%# 英文定理名称
%# English theorems names
\def\theoremnameEN{{Theorem}}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLauthor}
- [2021/08/11 Enhanced author information block]
+ [2021/08/17 Enhanced author information block]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\ifdefined\subjclass\endinput\fi
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLdate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLdate.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLdate.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLdate}
- [2021/08/11 Convert yyyy-mm-dd to normal datetime format]
+ [2021/08/17 Convert yyyy-mm-dd to normal datetime format]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLdraft.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLdraft}
- [2021/08/11 Some useful macros for the draft stage]
+ [2021/08/17 Some useful macros for the draft stage]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLlang.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLlang.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLlang.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLlang}
- [2021/08/11 Multi-language configuration]
+ [2021/08/17 Multi-language configuration]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLlogo}
- [2021/08/11 The ProjLib logo]
+ [2021/08/17 The ProjLib logo]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLmath.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLmath.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLmath}
- [2021/08/11 Useful math macros and shortcuts]
+ [2021/08/17 Useful math macros and shortcuts]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\RequirePackage{mathtools}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLpaper}
- [2021/08/11 Paper style configuration]
+ [2021/08/17 Paper style configuration]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\RequirePackage{ifthen}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/PJLthm.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/PJLthm.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/PJLthm.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{PJLthm}
- [2021/08/11 Theorem setup and configuration]
+ [2021/08/17 Theorem setup and configuration]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -49,31 +49,37 @@
\PassOptionsToPackage{nameinlink}{cleveref}
\RequirePackage{cleveref}
+\RequirePackage{xstring}
\NewDocumentCommand{\NameTheorem}{omm}{%
\protected at edef\PJLthm at temp{#2}%
\expandafter\IfEndWith\expandafter{\PJLthm at temp}{*}{%
\expandafter\StrGobbleRight\expandafter{\PJLthm at temp}{1}[\PJLthm at temp]%
}{}%
- \IfValueTF{#1}{%
- \expandafter\def\expandafter\PJL at temp@abbr\expandafter%
- {\expandafter\StrToABBR\expandafter{#1}}%
- \expandafter\def\csname\PJLthm at temp name\PJL at temp@abbr\endcsname{#3}%
- }{%
- \expandafter\def\csname\PJLthm at temp nameEN\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameFR\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameDE\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameIT\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp namePT\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameBR\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameES\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameCN\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameTC\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameJP\endcsname{#3}%
- \expandafter\def\csname\PJLthm at temp nameRU\endcsname{#3}%
+ \IfSubStr{#3}{=}{% key-value mode
+ \IfValueTF{#1}{%
+ \CreateTheoremSetKeys{\PJLthm at temp}{#1={#3}}%
+ }{%
+ \CreateTheoremSetKeys{\PJLthm at temp}{#3}%
+ }%
+ }{% simple mode
+ \IfValueTF{#1}{%
+ \expandafter\def\csname\PJLthm at temp name\StrToABBR{#1}\endcsname{#3}%
+ }{%
+ \expandafter\def\csname\PJLthm at temp nameEN\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameFR\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameDE\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameIT\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp namePT\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameBR\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameES\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameCN\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameTC\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameJP\endcsname{#3}%
+ \expandafter\def\csname\PJLthm at temp nameRU\endcsname{#3}%
+ }%
}%
}
-\RequirePackage{xstring}
\newcommand\PassFirstToSecond[2]{#2{#1}}%
\NewDocumentCommand{\CreateTheorem}{sm}{%
\begingroup
@@ -88,7 +94,7 @@
\expandafter{\PJLthm at temp}{\endgroup\InnerCreateTheorem{#1}}}%
}%
\if at PJLthm@regionalref
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()}{%
+\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()g}{%
\IfBooleanTF{#1}{%
\IfValueTF{#4}
{\@firstoftwo}
@@ -142,9 +148,12 @@
}%
}%
}%
+ \IfValueTF{#7}{%
+ \CreateTheoremSetKeys{#2}{#7}%
+ }{}%
}%
\else
-\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()}{%
+\NewDocumentCommand{\InnerCreateTheorem}{mmmod<>d()g}{%
\IfBooleanTF{#1}{%
\IfValueTF{#4}
{\@firstoftwo}
@@ -221,6 +230,9 @@
{\csname end#2\csname\languagename ABBR\endcsname#3\endcsname}%
}%
}%
+ \IfValueTF{#7}{%
+ \CreateTheoremSetKeys{#2}{#7}%
+ }{}%
}%
\NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
\newaliascnt{#1#2#3}{#1#3}%
@@ -239,6 +251,69 @@
}%
\fi
+\ExplSyntaxOn
+
+\cs_new:Nn \PJLthm_exchange_i_iii_ii:nnn { #1 {#3} {#2} }
+\cs_new:Nn \__PJLthm_languageprefix: {}
+\cs_new:Nn \__PJLthm_countername: {}
+
+\msg_new:nnnn {PJLthm}
+ {Undefined Language Dependent Specification Class}
+ {\token_to_str:N \CreateTheorem :\ Value\ `\tl_to_str:n{#2}'\ for\ invalid\ key\ `#1'.}
+ {Providing\ Language-dependent\ specifications\ for\ element\ `#1'\ is\ currently\ not\ implemented.}
+
+
+\NewDocumentCommand \CreateTheoremSetKeys { mm } {
+ % #1 = name of counter
+ % #2 = keyval-list of language-specifications
+ \cs_set:Nn \__PJLthm_countername: {#1}
+ \keyval_parse:nnn { \PJLthm_exchange_i_iii_ii:nnn { \PJLthm_setlanguagespecificparameters:nn } {} }
+ { \PJLthm_setlanguagespecificparameters:nn }
+ { #2 }
+}
+
+\cs_new_protected:Nn \PJLthm_setlanguagespecificparameters:nn {
+ % #1 = language-prefix
+ % #2 = key-val-list for language whose prefix is language-prefix
+ \cs_set:Nx \__PJLthm_languageprefix: {\StrToABBR{#1}}
+ \exp_args:No \tl_if_empty:nTF {\__PJLthm_languageprefix:}
+ { \msg_error:nn { PJLthm }
+ { No language \exp_not:n{#1} defined }
+ }%
+ {%
+ \newaliascnt {\__PJLthm_countername: \__PJLthm_languageprefix:} {\__PJLthm_countername:}%
+ \aliascntresetthe {\__PJLthm_countername: \__PJLthm_languageprefix:}%
+ \keys_set:nn { PJLthm } { #2 }
+ }%
+}%
+\keys_define:nn { PJLthm } {
+ crefname.code:n = \cs_if_exist:NTF \crefname {
+ \exp_args:Nx \crefname {\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+ }{},
+ crefname.value_required:n = true,
+ Crefname.code:n = \cs_if_exist:NTF \Crefname {
+ \exp_args:Nx \Crefname {\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+ }{},
+ Crefname.value_required:n = true,
+ name.code:n = \exp_args:Nx \cs_set:cpn {\__PJLthm_countername: name \__PJLthm_languageprefix:} {#1},
+ name.value_required:n = true,
+ autorefname.code:n = \exp_args:Nx \cs_set:cpn {\__PJLthm_countername: \__PJLthm_languageprefix: autorefname} {#1},
+ autorefname.value_required:n = true,
+ theoremheading.code:n= \exp_args:Nx \cs_set:cpn {\__PJLthm_countername: \__PJLthm_languageprefix: heading} {#1},
+ theoremheading.value_required:n = true,
+ the.code:n= \exp_args:Nx \cs_set:cpn {the \__PJLthm_countername: \__PJLthm_languageprefix: } {#1},
+ the.value_required:n = true,
+ %
+ % Define keys for more Language Dependent Specification Classes.
+ %
+ unknown.code:n = \msg_error:nnxx {PJLthm}
+ {Undefined Language Dependent Specification Class}
+ {\exp_args:No \exp_not:n \l_keys_key_str}
+ {\exp_not:n{#1}},
+}
+
+\ExplSyntaxOff
+
\def\theoremnameEN{{Theorem}}
\def\lemmanameEN{{Lemma}}
\def\propositionnameEN{{Proposition}}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2021-08-17 20:50:02 UTC (rev 60260)
+++ trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2021-08-17 20:50:26 UTC (rev 60261)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{ProjLib}
- [2021/08/11 The collective interface of ProjLib toolkit]
+ [2021/08/17 The collective interface of ProjLib toolkit]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{
More information about the tex-live-commits
mailing list.