projlib (31oct21)

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

9 files changed, 1540 insertions, 285 deletions

diff --git a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty
index d2fe7a0ff30..1f2917061cd 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/24 Enhanced author information block]
+    [2021/10/30 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 d5df7bcc895..a62d3394ec2 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/24 Convert yyyy-mm-dd to normal datetime format]
+    [2021/10/30 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 22d5b53a6d8..12ddfab1eb7 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/24 Some useful macros for the draft stage]
+    [2021/10/30 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 dd47775ded9..4617971f817 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/24 Multi-language configuration]
+    [2021/10/30 Multi-language configuration]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty
index c83689ef449..8d2ba6051ca 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/24 The ProjLib logo]
+    [2021/10/30 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 52e25401715..82a60894bb9 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/24 Useful math macros and shortcuts]
+    [2021/10/30 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 e1ff375af45..ce226cff0b4 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/24 Paper style configuration]
+    [2021/10/30 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 e69ffa995ee..2f47515877a 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/24 Theorem setup and configuration]
+    [2021/10/30 Theorem setup and configuration]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
@@ -32,10 +32,15 @@
 \DeclareBoolOption[false]{fast}
 \DeclareBoolOption[true]{regionalref}
 \DeclareBoolOption[false]{originalref}
+\DeclareBoolOption[true]{complexname}
+\DeclareBoolOption[false]{simplename}
 \ProcessKeyvalOptions*\relax
 \if@PJLthm@originalref
     \@PJLthm@regionalreffalse
 \fi
+\if@PJLthm@simplename
+    \@PJLthm@complexnamefalse
+\fi
 \if@PJLthm@draft
     \@PJLthm@fasttrue
 \fi
@@ -46,14 +51,25 @@
 \@ifclassloaded{beamer}{%
     \RequirePackage{silence}
     \WarningFilter{cleveref}{hyperref package loaded with implicit=false option}
+    \@PJLthm@nothmnumtrue%
+    \if@PJLthm@nothms\else%
+        \let\theorem\relax
+        \let\lemma\relax
+        \let\corollary\relax
+        \let\definition\relax
+        \let\fact\relax
+        \let\example\relax
+        \let\problem\relax
+    \fi
 }{}
 
 \RequirePackage{PJLlang}
 \RequirePackage{amsmath,amsthm}
 \RequirePackage{aliascnt}
 \PassOptionsToPackage{nameinlink}{cleveref}
-\RequirePackage{cleveref}
+\RequirePackage{ccref}
 
+\RequirePackage{xparse}
 \RequirePackage{xstring}
 \NewDocumentCommand{\NameTheorem}{omm}{%
     \protected@edef\PJLthm@temp{#2}%
@@ -135,18 +151,22 @@
                     \newaliascnt{#2#3}{PJL#2#3}%
                 }{%
                     \IfValueTF{#4}{%
-                            \newtheorem{PJL#2#3}[#4]{\csname#2name\csname\languagename ABBR\endcsname\endcsname}
+                            \newtheorem{PJL#2#3}[#4]{\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
                         }{%
-                            \newtheorem{PJL#2#3}{\csname#2name\csname\languagename ABBR\endcsname\endcsname}
+                            \newtheorem{PJL#2#3}{\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
                             \newaliascnt{#2#3}{PJL#2#3}%
                         }%
                 }%
-                \crefname{PJL#2#3}%
-                    {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
-                    {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
-                \Crefname{PJL#2#3}%
-                    {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
-                    {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+                \ifcsname cref@PJL#2#3@name\endcsname\else%
+                    \crefname{PJL#2#3}%
+                        {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+                        {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+                \fi%
+                \ifcsname Cref@PJL#2#3@name\endcsname\else%
+                    \Crefname{PJL#2#3}%
+                        {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+                        {\csname#2name\csname\languagename ABBR\endcsname\endcsname}%
+                \fi%
                 \NewDocumentEnvironment{#2#3}{}
                     {\begin{PJL#2#3}}
                     {\end{PJL#2#3}}
@@ -154,7 +174,7 @@
         }%
     }%
     \IfValueTF{#7}{%
-        \CreateTheoremSetKeys{#2}{#7}%
+        \NameTheorem{#2}{#7}%
     }{}%
 }%
 \else
@@ -236,23 +256,27 @@
         }%
     }%
     \IfValueTF{#7}{%
-        \CreateTheoremSetKeys{#2}{#7}%
+        \NameTheorem{#2}{#7}%
     }{}%
 }%
 \NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{%
     \newaliascnt{#1#2#3}{#1#3}%
     \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}{\newtheorem{#1#2#3}[{#1#2#3}]}%
     \aliascntresetthe{#1#2#3}%
-    \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}%
-    {%
+    \ifcsname cref@#1#2#3@name\endcsname\else%
         \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}%
-        {\crefname{#1#2#3}}%
-    }%
-    \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}%
-    {%
+        {%
+            \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}%
+            {\crefname{#1#2#3}}%
+        }%
+    \fi%
+    \ifcsname Cref@#1#2#3@name\endcsname\else%
         \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}%
-        {\Crefname{#1#2#3}}%
-    }%
+        {%
+            \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}%
+            {\Crefname{#1#2#3}}%
+        }%
+    \fi%
 }%
 \fi
 
@@ -269,8 +293,6 @@
 
 
 \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 }
@@ -278,29 +300,33 @@
 }
 
 \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 }
+                    { 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 }
     }%
 }%
+
 \keys_define:nn { PJLthm } {
   crefname.code:n  = \cs_if_exist:NTF \crefname  {
-                        \exp_args:Nx \crefname {\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+                        \ifbool{@PJLthm@regionalref}{
+                            \exp_args:Nx \PJLthm@setcrefinnername{PJL\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+                            \exp_args:Nx \PJLthm@setcrefname{PJL\__PJLthm_countername: }
+                        }{
+                            \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
+                        \ifbool{@PJLthm@regionalref}{
+                            \exp_args:Nx \PJLthm@setCrefinnername{PJL\__PJLthm_countername: \__PJLthm_languageprefix: }#1
+                            \exp_args:Nx \PJLthm@setCrefname{PJL\__PJLthm_countername: }
+                        }{
+                            \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},
@@ -322,247 +348,1467 @@
 
 \ExplSyntaxOff
 
-\def\theoremnameEN{{Theorem}}
-\def\lemmanameEN{{Lemma}}
-\def\propositionnameEN{{Proposition}}
-\def\corollarynameEN{{Corollary}}
-\def\propertynameEN{{Property}}
-\def\factnameEN{{Fact}}
-\def\conjecturenameEN{{Conjecture}}
-\def\definitionnameEN{{Definition}}
-\def\axiomnameEN{{Axiom}}
-\def\assumptionnameEN{{Assumption}}
-\def\conventionnameEN{{Convention}}
-\def\hypothesisnameEN{{Hypothesis}}
-\def\notationnameEN{{Notation}}
-\def\examplenameEN{{Example}}
-\def\problemnameEN{{Problem}}
-\def\questionnameEN{{Question}}
-\def\exercisenameEN{{Exercise}}
-\def\remarknameEN{{Remark}}
-\def\observationnameEN{{Observation}}
-\expandafter\def\csname definition-propositionnameEN\endcsname{\definitionnameEN-\propositionnameEN}
-\expandafter\def\csname definition-theoremnameEN\endcsname{\definitionnameEN-\theoremnameEN}
-
-\def\theoremnameFR{{Théorème}}
-\def\lemmanameFR{{Lemme}}
-\def\propositionnameFR{{Proposition}}
-\def\corollarynameFR{{Corollaire}}
-\def\propertynameFR{{Propriété}}
-\def\factnameFR{{Fait}}
-\def\conjecturenameFR{{Conjecture}}
-\def\definitionnameFR{{Définition}}
-\def\axiomnameFR{{Axiome}}
-\def\assumptionnameFR{{Supposition}}
-\def\conventionnameFR{{Convention}}
-\def\hypothesisnameFR{{Hypothèse}}
-\def\notationnameFR{{Notation}}
-\def\examplenameFR{{Exemple}}
-\def\problemnameFR{{Problème}}
-\def\questionnameFR{{Question}}
-\def\exercisenameFR{{Exercice}}
-\def\remarknameFR{{Remarque}}
-\def\observationnameFR{{Observation}}
-\expandafter\def\csname definition-propositionnameFR\endcsname{\definitionnameFR-\propositionnameFR}
-\expandafter\def\csname definition-theoremnameFR\endcsname{\definitionnameFR-\theoremnameFR}
-
-\def\theoremnameDE{{Satz}}
-\def\lemmanameDE{{Lemma}}
-\def\propositionnameDE{{Proposition}}
-\def\corollarynameDE{{Korollar}}
-\def\propertynameDE{{Eigenschaft}}
-\def\factnameDE{{Fakt}}
-\def\conjecturenameDE{{Vermutung}}
-\def\definitionnameDE{{Definition}}
-\def\axiomnameDE{{Axiom}}
-\def\assumptionnameDE{{Annahme}}
-\def\conventionnameDE{{Konvention}}
-\def\hypothesisnameDE{{Hypothese}}
-\def\notationnameDE{{Notation}}
-\def\examplenameDE{{Beispiel}}
-\def\problemnameDE{{Problem}}
-\def\questionnameDE{{Frage}}
-\def\exercisenameDE{{Übung}}
-\def\remarknameDE{{Bemerkung}}
-\def\observationnameDE{{Beobachtung}}
-\expandafter\def\csname definition-propositionnameDE\endcsname{\definitionnameDE-\propositionnameDE}
-\expandafter\def\csname definition-theoremnameDE\endcsname{\definitionnameDE-\theoremnameDE}
-
-\def\theoremnameIT{{Teorema}}
-\def\lemmanameIT{{Lemma}}
-\def\propositionnameIT{{Proposizione}}
-\def\corollarynameIT{{Corollario}}
-\def\propertynameIT{{Proprietà}}
-\def\factnameIT{{Fatto}}
-\def\conjecturenameIT{{Congettura}}
-\def\definitionnameIT{{Definizione}}
-\def\axiomnameIT{{Assioma}}
-\def\assumptionnameIT{{Supposizione}}
-\def\conventionnameIT{{Convenzione}}
-\def\hypothesisnameIT{{Ipotesi}}
-\def\notationnameIT{{Notazione}}
-\def\examplenameIT{{Esempio}}
-\def\problemnameIT{{Problema}}
-\def\questionnameIT{{Domanda}}
-\def\exercisenameIT{{Esercizio}}
-\def\remarknameIT{{Nota}}
-\def\observationnameIT{{Osservazione}}
-\expandafter\def\csname definition-propositionnameIT\endcsname{\definitionnameIT-\propositionnameIT}
-\expandafter\def\csname definition-theoremnameIT\endcsname{\definitionnameIT-\theoremnameIT}
-
-\def\theoremnamePT{{Teorema}}
-\def\lemmanamePT{{Lema}}
-\def\propositionnamePT{{Proposição}}
-\def\corollarynamePT{{Corolário}}
-\def\propertynamePT{{Propriedade}}
-\def\factnamePT{{Facto}}
-\def\conjecturenamePT{{Conjetura}}
-\def\definitionnamePT{{Definição}}
-\def\axiomnamePT{{Axioma}}
-\def\assumptionnamePT{{Suposição}}
-\def\conventionnamePT{{Convenção}}
-\def\hypothesisnamePT{{Hipótese}}
-\def\notationnamePT{{Notação}}
-\def\examplenamePT{{Exemplo}}
-\def\problemnamePT{{Problema}}
-\def\questionnamePT{{Pergunta}}
-\def\exercisenamePT{{Exercício}}
-\def\remarknamePT{{Comentário}}
-\def\observationnamePT{{Observação}}
-\expandafter\def\csname definition-propositionnamePT\endcsname{\definitionnamePT-\propositionnamePT}
-\expandafter\def\csname definition-theoremnamePT\endcsname{\definitionnamePT-\theoremnamePT}
-
-\def\theoremnameBR{{Teorema}}
-\def\lemmanameBR{{Lema}}
-\def\propositionnameBR{{Proposição}}
-\def\corollarynameBR{{Corolário}}
-\def\propertynameBR{{Propriedade}}
-\def\factnameBR{{Facto}}
-\def\conjecturenameBR{{Conjetura}}
-\def\definitionnameBR{{Definição}}
-\def\axiomnameBR{{Axioma}}
-\def\assumptionnameBR{{Suposição}}
-\def\conventionnameBR{{Convenção}}
-\def\hypothesisnameBR{{Hipótese}}
-\def\notationnameBR{{Notação}}
-\def\examplenameBR{{Exemplo}}
-\def\problemnameBR{{Problema}}
-\def\questionnameBR{{Pergunta}}
-\def\exercisenameBR{{Exercício}}
-\def\remarknameBR{{Comentário}}
-\def\observationnameBR{{Observação}}
-\expandafter\def\csname definition-propositionnameBR\endcsname{\definitionnameBR-\propositionnameBR}
-\expandafter\def\csname definition-theoremnameBR\endcsname{\definitionnameBR-\theoremnameBR}
-
-\def\theoremnameES{{Teorema}}
-\def\lemmanameES{{Lema}}
-\def\propositionnameES{{Proposición}}
-\def\corollarynameES{{Corolario}}
-\def\propertynameES{{Propiedad}}
-\def\factnameES{{Hecho}}
-\def\conjecturenameES{{Conjetura}}
-\def\definitionnameES{{Definición}}
-\def\axiomnameES{{Axioma}}
-\def\assumptionnameES{{Suposición}}
-\def\conventionnameES{{Convención}}
-\def\hypothesisnameES{{Hipótesis}}
-\def\notationnameES{{Notación}}
-\def\examplenameES{{Ejemplo}}
-\def\problemnameES{{Problema}}
-\def\questionnameES{{Pregunta}}
-\def\exercisenameES{{Ejercicio}}
-\def\remarknameES{{Comentario}}
-\def\observationnameES{{Observación}}
-\expandafter\def\csname definition-propositionnameES\endcsname{\definitionnameES-\propositionnameES}
-\expandafter\def\csname definition-theoremnameES\endcsname{\definitionnameES-\theoremnameES}
-
-\def\theoremnameCN{{定理}}
-\def\lemmanameCN{{引理}}
-\def\propositionnameCN{{命题}}
-\def\corollarynameCN{{推论}}
-\def\propertynameCN{{性质}}
-\def\factnameCN{{事实}}
-\def\conjecturenameCN{{猜想}}
-\def\definitionnameCN{{定义}}
-\def\axiomnameCN{{公理}}
-\def\assumptionnameCN{{假设}}
-\def\conventionnameCN{{约定}}
-\def\hypothesisnameCN{{假设}}
-\def\notationnameCN{{记号}}
-\def\examplenameCN{{例}}
-\def\problemnameCN{{问题}}
-\def\questionnameCN{{问题}}
-\def\exercisenameCN{{练习}}
-\def\remarknameCN{{备注}}
-\def\observationnameCN{{观察}}
-\expandafter\def\csname definition-propositionnameCN\endcsname{\definitionnameCN-\propositionnameCN}
-\expandafter\def\csname definition-theoremnameCN\endcsname{\definitionnameCN-\theoremnameCN}
-
-\def\theoremnameTC{{定理}}
-\def\lemmanameTC{{引理}}
-\def\propositionnameTC{{命題}}
-\def\corollarynameTC{{推論}}
-\def\propertynameTC{{性質}}
-\def\factnameTC{{事實}}
-\def\conjecturenameTC{{猜想}}
-\def\definitionnameTC{{定義}}
-\def\axiomnameTC{{公理}}
-\def\assumptionnameTC{{假設}}
-\def\conventionnameTC{{約定}}
-\def\hypothesisnameTC{{假設}}
-\def\notationnameTC{{記號}}
-\def\examplenameTC{{例}}
-\def\problemnameTC{{問題}}
-\def\questionnameTC{{問題}}
-\def\exercisenameTC{{練習}}
-\def\remarknameTC{{備註}}
-\def\observationnameTC{{觀察}}
-\expandafter\def\csname definition-propositionnameTC\endcsname{\definitionnameTC-\propositionnameTC}
-\expandafter\def\csname definition-theoremnameTC\endcsname{\definitionnameTC-\theoremnameTC}
-
-\def\theoremnameJP{{定理}}
-\def\lemmanameJP{{補題}}
-\def\propositionnameJP{{命題}}
-\def\corollarynameJP{{系}}
-\def\propertynameJP{{性質}}
-\def\factnameJP{{事実}}
-\def\conjecturenameJP{{予想}}
-\def\definitionnameJP{{定義}}
-\def\axiomnameJP{{公理}}
-\def\assumptionnameJP{{仮定}}
-\def\conventionnameJP{{慣例}}
-\def\hypothesisnameJP{{仮設}}
-\def\notationnameJP{{記法}}
-\def\examplenameJP{{例}}
-\def\problemnameJP{{問題}}
-\def\questionnameJP{{問題}}
-\def\exercisenameJP{{練習}}
-\def\remarknameJP{{注釈}}
-\def\observationnameJP{{観察}}
-\expandafter\def\csname definition-propositionnameJP\endcsname{\definitionnameJP-\propositionnameJP}
-\expandafter\def\csname definition-theoremnameJP\endcsname{\definitionnameJP-\theoremnameJP}
-
-\def\theoremnameRU{{Теорема}} % Теоре́ма
-\def\lemmanameRU{{Лемма}} % Ле́мма
-\def\propositionnameRU{{Предложение}} % Предложе́ние
-\def\corollarynameRU{{Следствие}} % Сле́дствие
-\def\propertynameRU{{Имущество}} % Иму́щество
-\def\factnameRU{{Факт}}
-\def\conjecturenameRU{{Гипотеза}} % Гипо́теза
-\def\definitionnameRU{{Определение}} % Определе́ние
-\def\axiomnameRU{{Аксиома}} % Аксио́ма
-\def\assumptionnameRU{{Предположение}} % Предположе́ние
-\def\conventionnameRU{{Конвенция}} % Конве́нция
-\def\hypothesisnameRU{{Гипотеза}} % Гипо́теза
-\def\notationnameRU{{Нотация}} % Нота́ция
-\def\examplenameRU{{Пример}} % Приме́р
-\def\problemnameRU{{Проблема}} % Пробле́ма
-\def\questionnameRU{{Вопрос}} % Вопро́с
-\def\exercisenameRU{{Упражнение}} % Упражне́ние
-\def\remarknameRU{{Замечание}} % Замеча́ние
-\def\observationnameRU{{Наблюдение}} % Наблюде́ние
-\expandafter\def\csname definition-propositionnameRU\endcsname{\definitionnameRU-\propositionnameRU}
-\expandafter\def\csname definition-theoremnameRU\endcsname{\definitionnameRU-\theoremnameRU}
+\newcommand{\PJLthm@setcrefinnername}[3]{%
+    \expandafter\def\csname PJLthm@cref@#1@name\endcsname{#2}%
+    \expandafter\def\csname PJLthm@cref@#1@name@plural\endcsname{#3}%
+}
+\newcommand{\PJLthm@setCrefinnername}[3]{%
+    \expandafter\def\csname PJLthm@Cref@#1@name\endcsname{#2}%
+    \expandafter\def\csname PJLthm@Cref@#1@name@plural\endcsname{#3}%
+}
+
+\newcommand{\PJLthm@setcrefname}[1]{%
+    \crefname{#1}%
+        {\csname PJLthm@cref@#1\csname\languagename ABBR\endcsname @name\endcsname}%
+        {\csname PJLthm@cref@#1\csname\languagename ABBR\endcsname @name@plural\endcsname}%
+}
+\newcommand{\PJLthm@setCrefname}[1]{%
+    \Crefname{#1}%
+        {\csname PJLthm@Cref@#1\csname\languagename ABBR\endcsname @name\endcsname}%
+        {\csname PJLthm@Cref@#1\csname\languagename ABBR\endcsname @name@plural\endcsname}%
+}
+
+\ifbool{@PJLthm@complexname}{
+    \NameTheorem{theorem}{
+        EN = {
+            name = {Theorem},
+            crefname = {theorem}{theorems},
+            Crefname = {Theorem}{Theorems},
+        },
+        FR = {
+            name = {Théorème},
+            crefname = {\ccmarkart{le} théorème}{\ccmarkart{les} théorèmes},
+            Crefname = {Le théorème}{Les théorèmes},
+        },
+        DE = {
+            name = {Satz},
+            crefname = {Satz}{Sätze},
+            Crefname = {Satz}{Sätze},
+        },
+        IT = {
+            name = {Teorema},
+            crefname = {\ccmarkart{il} teorema}{\ccmarkart{i} teoremi},
+            Crefname = {Il teorema}{I teoremi},
+        },
+        PT = {
+            name = {Teorema},
+            crefname = {\ccmarkart{o} teorema}{\ccmarkart{os} teoremas},
+            Crefname = {O teorema}{Os teoremas},
+        },
+        BR = {
+            name = {Teorema},
+            crefname = {\ccmarkart{o} teorema}{\ccmarkart{os} teoremas},
+            Crefname = {O teorema}{Os teoremas},
+        },
+        ES = {
+            name = {Teorema},
+            crefname = {\ccmarkart{el} teorema}{los teoremas},
+            Crefname = {El teorema}{Los teoremas},
+        },
+        CN = {
+            name = {定理},
+            crefname = {定理}{定理},
+            Crefname = {定理}{定理},
+        },
+        TC = {
+            name = {定理},
+            crefname = {定理}{定理},
+            Crefname = {定理}{定理},
+        },
+        JP = {
+            name = {定理},
+            crefname = {定理}{定理},
+            Crefname = {定理}{定理},
+        },
+        RU = {
+            name = {Теорема},
+            crefname = {теорема}{теоремы},
+            Crefname = {Теорема}{Теоремы},
+        },
+    }
+    \NameTheorem{lemma}{
+        EN = {
+            name = {Lemma},
+            crefname = {lemma}{Lemmas},
+            Crefname = {Lemma}{Lemmas},
+        },
+        FR = {
+            name = {Lemme},
+            crefname = {\ccmarkart{le} lemme}{\ccmarkart{les} lemmes},
+            Crefname = {Le lemme}{Les lemmes},
+        },
+        DE = {
+            name = {Lemma},
+            crefname = {Lemma}{Lemmata},
+            Crefname = {Lemma}{Lemmata},
+        },
+        IT = {
+            name = {Lemma},
+            crefname = {\ccmarkart{il} lemma}{\ccmarkart{i} lemmi},
+            Crefname = {Il lemma}{I lemmi},
+        },
+        PT = {
+            name = {Lema},
+            crefname = {\ccmarkart{o} lema}{\ccmarkart{os} lemas},
+            Crefname = {O lema}{Os lemas},
+        },
+        BR = {
+            name = {Lema},
+            crefname = {\ccmarkart{o} lema}{\ccmarkart{os} lemas},
+            Crefname = {O lema}{Os lemas},
+        },
+        ES = {
+            name = {Lema},
+            crefname = {\ccmarkart{el} lema}{las lemas},
+            Crefname = {El lema}{Las lemas},
+        },
+        CN = {
+            name = {引理},
+            crefname = {引理}{引理},
+            Crefname = {引理}{引理},
+        },
+        TC = {
+            name = {引理},
+            crefname = {引理}{引理},
+            Crefname = {引理}{引理},
+        },
+        JP = {
+            name = {補題},
+            crefname = {補題}{補題},
+            Crefname = {補題}{補題},
+        },
+        RU = {
+            name = {Лемма},
+            crefname = {лемма}{леммы},
+            Crefname = {Лемма}{Леммы},
+        },
+    }
+    \NameTheorem{proposition}{
+        EN = {
+            name = {Proposition},
+            crefname = {proposition}{propositions},
+            Crefname = {Proposition}{Propositions},
+        },
+        FR = {
+            name = {Proposition},
+            crefname = {\ccmarkart{la} proposition}{\ccmarkart{les} propositions},
+            Crefname = {La proposition}{Les propositions},
+        },
+        DE = {
+            name = {Proposition},
+            crefname = {Proposition}{Propositionen},
+            Crefname = {Proposition}{Propositionen},
+        },
+        IT = {
+            name = {Proposizione},
+            crefname = {\ccmarkart{la} proposizione}{\ccmarkart{le} proposte},
+            Crefname = {La proposizione}{Le proposte},
+        },
+        PT = {
+            name = {Proposição},
+            crefname = {\ccmarkart{a} proposição}{\ccmarkart{as} proposições},
+            Crefname = {A proposição}{As proposições},
+        },
+        BR = {
+            name = {Proposição},
+            crefname = {\ccmarkart{a} proposição}{\ccmarkart{as} proposições},
+            Crefname = {A proposição}{As proposições},
+        },
+        ES = {
+            name = {Proposición},
+            crefname = {la proposición}{las proposiciones},
+            Crefname = {La proposición}{Las proposiciones},
+        },
+        CN = {
+            name = {命题},
+            crefname = {命题}{命题},
+            Crefname = {命题}{命题},
+        },
+        TC = {
+            name = {命題},
+            crefname = {命題}{命題},
+            Crefname = {命題}{命題},
+        },
+        JP = {
+            name = {命題},
+            crefname = {命題}{命題},
+            Crefname = {命題}{命題},
+        },
+        RU = {
+            name = {Предложение},
+            crefname = {предложение}{предложения},
+            Crefname = {Предложение}{Предложения},
+        },
+    }
+    \NameTheorem{corollary}{
+        EN = {
+            name = {Corollary},
+            crefname = {corollary}{corollaries},
+            Crefname = {Corollary}{Corollaries},
+        },
+        FR = {
+            name = {Corollaire},
+            crefname = {\ccmarkart{le} corollaire}{\ccmarkart{les} corollaires},
+            Crefname = {Le corollaire}{Les corollaires},
+        },
+        DE = {
+            name = {Korollar},
+            crefname = {Korollar}{Korollare},
+            Crefname = {Korollar}{Korollare},
+        },
+        IT = {
+            name = {Corollario},
+            crefname = {\ccmarkart{il} corollario}{\ccmarkart{i} corollari},
+            Crefname = {Il corollario}{I corollari},
+        },
+        PT = {
+            name = {Corolário},
+            crefname = {\ccmarkart{o} corolário}{\ccmarkart{os} corolários},
+            Crefname = {O corolário}{Os corolários},
+        },
+        BR = {
+            name = {Corolário},
+            crefname = {\ccmarkart{o} corolário}{\ccmarkart{os} corolários},
+            Crefname = {O corolário}{Os corolários},
+        },
+        ES = {
+            name = {Corolario},
+            crefname = {\ccmarkart{el} corolario}{los corolarios},
+            Crefname = {El corolario}{Los corolarios},
+        },
+        CN = {
+            name = {推论},
+            crefname = {推论}{推论},
+            Crefname = {推论}{推论},
+        },
+        TC = {
+            name = {推論},
+            crefname = {推論}{推論},
+            Crefname = {推論}{推論},
+        },
+        JP = {
+            name = {系},
+            crefname = {系}{系},
+            Crefname = {系}{系},
+        },
+        RU = {
+            name = {Следствие},
+            crefname = {следствие}{следствия},
+            Crefname = {Следствие}{Следствия},
+        },
+    }
+    \NameTheorem{property}{
+        EN = {
+            name = {Property},
+            crefname = {property}{properties},
+            Crefname = {Property}{Properties},
+        },
+        FR = {
+            name = {Propriété},
+            crefname = {\ccmarkart{la} propriété}{\ccmarkart{les} propriétés},
+            Crefname = {La propriété}{Les propriétés},
+        },
+        DE = {
+            name = {Eigenschaft},
+            crefname = {Eigenschaft}{Eigenschaften},
+            Crefname = {Eigenschaft}{Eigenschaften},
+        },
+        IT = {
+            name = {Proprietà},
+            crefname = {\ccmarkart{la} proprietà}{\ccmarkart{le} proprietà},
+            Crefname = {La proprietà}{Le proprietà},
+        },
+        PT = {
+            name = {Propriedade},
+            crefname = {\ccmarkart{a} propriedade}{\ccmarkart{as} propriedades},
+            Crefname = {A propriedade}{As propriedades},
+        },
+        BR = {
+            name = {Propriedade},
+            crefname = {\ccmarkart{a} propriedade}{\ccmarkart{as} propriedades},
+            Crefname = {A propriedade}{As propriedades},
+        },
+        ES = {
+            name = {Propiedad},
+            crefname = {la propiedad}{las propiedades},
+            Crefname = {La propiedad}{Las propiedades},
+        },
+        CN = {
+            name = {性质},
+            crefname = {性质}{性质},
+            Crefname = {性质}{性质},
+        },
+        TC = {
+            name = {性質},
+            crefname = {性質}{性質},
+            Crefname = {性質}{性質},
+        },
+        JP = {
+            name = {性質},
+            crefname = {性質}{性質},
+            Crefname = {性質}{性質},
+        },
+        RU = {
+            name = {Имущество},
+            crefname = {имущество}{имущества},
+            Crefname = {Имущество}{Имущества},
+        },
+    }
+    \NameTheorem{fact}{
+        EN = {
+            name = {Fact},
+            crefname = {fact}{facts},
+            Crefname = {Fact}{Facts},
+        },
+        FR = {
+            name = {Fait},
+            crefname = {\ccmarkart{le} fait}{\ccmarkart{les} faits},
+            Crefname = {Le fait}{Les faits},
+        },
+        DE = {
+            name = {Fakt},
+            crefname = {Fakt}{Fakten},
+            Crefname = {Fakt}{Fakten},
+        },
+        IT = {
+            name = {Fatto},
+            crefname = {\ccmarkart{il} fatto}{\ccmarkart{i} fatti},
+            Crefname = {Il fatto}{I fatti},
+        },
+        PT = {
+            name = {Facto},
+            crefname = {\ccmarkart{o} facto}{\ccmarkart{os} factos},
+            Crefname = {O facto}{Os factos},
+        },
+        BR = {
+            name = {Fato},
+            crefname = {\ccmarkart{o} fato}{\ccmarkart{os} fatos},
+            Crefname = {O fato}{Os fatos},
+        },
+        ES = {
+            name = {Hecho},
+            crefname = {\ccmarkart{el} hecho}{los hechos},
+            Crefname = {El hecho}{Los hechos},
+        },
+        CN = {
+            name = {事实},
+            crefname = {事实}{事实},
+            Crefname = {事实}{事实},
+        },
+        TC = {
+            name = {事實},
+            crefname = {事實}{事實},
+            Crefname = {事實}{事實},
+        },
+        JP = {
+            name = {事実},
+            crefname = {事実}{事実},
+            Crefname = {事実}{事実},
+        },
+        RU = {
+            name = {Факт},
+            crefname = {факт}{факты},
+            Crefname = {Факт}{Факты},
+        },
+    }
+    \NameTheorem{conjecture}{
+        EN = {
+            name = {Conjecture},
+            crefname = {conjecture}{conjectures},
+            Crefname = {Conjecture}{Conjectures},
+        },
+        FR = {
+            name = {Conjecture},
+            crefname = {\ccmarkart{la} conjecture}{\ccmarkart{les} conjectures},
+            Crefname = {La conjecture}{Les conjectures},
+        },
+        DE = {
+            name = {Vermutung},
+            crefname = {Vermutung}{Vermutungen},
+            Crefname = {Vermutung}{Vermutungen},
+        },
+        IT = {
+            name = {Congettura},
+            crefname = {\ccmarkart{la} congettura}{\ccmarkart{le} congetture},
+            Crefname = {La congettura}{Le congetture},
+        },
+        PT = {
+            name = {Conjetura},
+            crefname = {\ccmarkart{a} conjetura}{\ccmarkart{as} conjeturas},
+            Crefname = {A conjetura}{As conjeturas},
+        },
+        BR = {
+            name = {Conjectura},
+            crefname = {\ccmarkart{a} conjectura}{\ccmarkart{as} conjecturas},
+            Crefname = {A conjectura}{As conjecturas},
+        },
+        ES = {
+            name = {Conjetura},
+            crefname = {la conjetura}{las conjeturas},
+            Crefname = {La conjetura}{Las conjeturas},
+        },
+        CN = {
+            name = {猜想},
+            crefname = {猜想}{猜想},
+            Crefname = {猜想}{猜想},
+        },
+        TC = {
+            name = {猜想},
+            crefname = {猜想}{猜想},
+            Crefname = {猜想}{猜想},
+        },
+        JP = {
+            name = {予想},
+            crefname = {予想}{予想},
+            Crefname = {予想}{予想},
+        },
+        RU = {
+            name = {Гипотеза},
+            crefname = {гипотеза}{гипотезы},
+            Crefname = {Гипотеза}{Гипотезы},
+        },
+    }
+    \NameTheorem{definition}{
+        EN = {
+            name = {Definition},
+            crefname = {definition}{definitions},
+            Crefname = {Definition}{Definitions},
+        },
+        FR = {
+            name = {Définition},
+            crefname = {\ccmarkart{la} définition}{\ccmarkart{les} définitions},
+            Crefname = {La définition}{Les définitions},
+        },
+        DE = {
+            name = {Definition},
+            crefname = {Definition}{Definitionen},
+            Crefname = {Definition}{Definitionen},
+        },
+        IT = {
+            name = {Definizione},
+            crefname = {\ccmarkart{la} definizione}{\ccmarkart{le} definizioni},
+            Crefname = {La definizione}{Le definizioni},
+        },
+        PT = {
+            name = {Definição},
+            crefname = {\ccmarkart{a} definição}{\ccmarkart{as} definições},
+            Crefname = {A definição}{As definições},
+        },
+        BR = {
+            name = {Definição},
+            crefname = {\ccmarkart{a} definição}{\ccmarkart{as} definições},
+            Crefname = {A definição}{As definições},
+        },
+        ES = {
+            name = {Definición},
+            crefname = {la definición}{las definiciones},
+            Crefname = {La definición}{Las definiciones},
+        },
+        CN = {
+            name = {定义},
+            crefname = {定义}{定义},
+            Crefname = {定义}{定义},
+        },
+        TC = {
+            name = {定義},
+            crefname = {定義}{定義},
+            Crefname = {定義}{定義},
+        },
+        JP = {
+            name = {定義},
+            crefname = {定義}{定義},
+            Crefname = {定義}{定義},
+        },
+        RU = {
+            name = {Определение},
+            crefname = {определение}{определения},
+            Crefname = {Определение}{Определения},
+        },
+    }
+    \NameTheorem{axiom}{
+        EN = {
+            name = {Axiom},
+            crefname = {axiom}{axioms},
+            Crefname = {Axiom}{Axioms},
+        },
+        FR = {
+            name = {Axiome},
+            crefname = {\ccmarkart{l'}axiome}{\ccmarkart{les} axiomes},
+            Crefname = {L'axiome}{Les axiomes},
+        },
+        DE = {
+            name = {Axiom},
+            crefname = {Axiom}{Axiome},
+            Crefname = {Axiom}{Axiome},
+        },
+        IT = {
+            name = {Assioma},
+            crefname = {\ccmarkart{l'}assioma}{\ccmarkart{gli} assiomi},
+            Crefname = {L'assioma}{Gli assiomi},
+        },
+        PT = {
+            name = {Axioma},
+            crefname = {\ccmarkart{o} axioma}{\ccmarkart{os} axiomas},
+            Crefname = {O axioma}{Os axiomas},
+        },
+        BR = {
+            name = {Axioma},
+            crefname = {\ccmarkart{o} axioma}{\ccmarkart{os} axiomas},
+            Crefname = {O axioma}{Os axiomas},
+        },
+        ES = {
+            name = {Axioma},
+            crefname = {\ccmarkart{el} axioma}{los axiomas},
+            Crefname = {El axioma}{Los axiomas},
+        },
+        CN = {
+            name = {公理},
+            crefname = {公理}{公理},
+            Crefname = {公理}{公理},
+        },
+        TC = {
+            name = {公理},
+            crefname = {公理}{公理},
+            Crefname = {公理}{公理},
+        },
+        JP = {
+            name = {公理},
+            crefname = {公理}{公理},
+            Crefname = {公理}{公理},
+        },
+        RU = {
+            name = {Аксиома},
+            crefname = {аксиома}{аксиомы},
+            Crefname = {Аксиома}{Аксиомы},
+        },
+    }
+    \NameTheorem{assumption}{
+        EN = {
+            name = {Assumption},
+            crefname = {assumption}{assumptions},
+            Crefname = {Assumption}{Assumptions},
+        },
+        FR = {
+            name = {Supposition},
+            crefname = {\ccmarkart{la} supposition}{\ccmarkart{les} suppositions},
+            Crefname = {La supposition}{Les suppositions},
+        },
+        DE = {
+            name = {Annahme},
+            crefname = {Annahme}{Annahmen},
+            Crefname = {Annahme}{Annahmen},
+        },
+        IT = {
+            name = {Supposizione},
+            crefname = {\ccmarkart{la} supposizione}{\ccmarkart{le} supposizioni},
+            Crefname = {La supposizione}{Le supposizioni},
+        },
+        PT = {
+            name = {Suposição},
+            crefname = {\ccmarkart{a} suposição}{\ccmarkart{as} suposições},
+            Crefname = {A suposição}{As suposições},
+        },
+        BR = {
+            name = {Suposição},
+            crefname = {\ccmarkart{a} suposição}{\ccmarkart{as} suposições},
+            Crefname = {A suposição}{As suposições},
+        },
+        ES = {
+            name = {Suposición},
+            crefname = {la suposición}{las suposiciones},
+            Crefname = {La suposición}{Las suposiciones},
+        },
+        CN = {
+            name = {假定},
+            crefname = {假定}{假定},
+            Crefname = {假定}{假定},
+        },
+        TC = {
+            name = {假定},
+            crefname = {假定}{假定},
+            Crefname = {假定}{假定},
+        },
+        JP = {
+            name = {仮定},
+            crefname = {仮定}{仮定},
+            Crefname = {仮定}{仮定},
+        },
+        RU = {
+            name = {Предположение},
+            crefname = {предположение}{предположения},
+            Crefname = {Предположение}{Предположения},
+        },
+    }
+    \NameTheorem{convention}{
+        EN = {
+            name = {Convention},
+            crefname = {convention}{conventions},
+            Crefname = {Convention}{Conventions},
+        },
+        FR = {
+            name = {Convention},
+            crefname = {\ccmarkart{la} convention}{\ccmarkart{les} conventions},
+            Crefname = {La convention}{Les conventions},
+        },
+        DE = {
+            name = {Konvention},
+            crefname = {Konvention}{Konventionen},
+            Crefname = {Konvention}{Konventionen},
+        },
+        IT = {
+            name = {Convenzione},
+            crefname = {\ccmarkart{la} convenzione}{\ccmarkart{le} convenzioni},
+            Crefname = {La convenzione}{Le convenzioni},
+        },
+        PT = {
+            name = {Convenção},
+            crefname = {\ccmarkart{a} convenção}{\ccmarkart{as} convenções},
+            Crefname = {A convenção}{As convenções},
+        },
+        BR = {
+            name = {Convenção},
+            crefname = {\ccmarkart{a} convenção}{\ccmarkart{as} convenções},
+            Crefname = {A convenção}{As convenções},
+        },
+        ES = {
+            name = {Convención},
+            crefname = {la convención}{las convenciones},
+            Crefname = {La convención}{Las convenciones},
+        },
+        CN = {
+            name = {约定},
+            crefname = {约定}{约定},
+            Crefname = {约定}{约定},
+        },
+        TC = {
+            name = {約定},
+            crefname = {約定}{約定},
+            Crefname = {約定}{約定},
+        },
+        JP = {
+            name = {慣例},
+            crefname = {慣例}{慣例},
+            Crefname = {慣例}{慣例},
+        },
+        RU = {
+            name = {Конвенция},
+            crefname = {конвенция}{конвенции},
+            Crefname = {Конвенция}{Конвенции},
+        },
+    }
+    \NameTheorem{hypothesis}{
+        EN = {
+            name = {Hypothesis},
+            crefname = {hypothesis}{hypotheses},
+            Crefname = {Hypothesis}{Hypotheses},
+        },
+        FR = {
+            name = {Hypothèse},
+            crefname = {\ccmarkart{l'}hypothèse}{\ccmarkart{les} hypothèses},
+            Crefname = {L'hypothèse}{Les hypothèses},
+        },
+        DE = {
+            name = {Hypothese},
+            crefname = {Hypothese}{Hypothesen},
+            Crefname = {Hypothese}{Hypothesen},
+        },
+        IT = {
+            name = {Ipotesi},
+            crefname = {\ccmarkart{l'}ipotesi}{\ccmarkart{le} ipotesi},
+            Crefname = {L'ipotesi}{Le ipotesi},
+        },
+        PT = {
+            name = {Hipótese},
+            crefname = {\ccmarkart{a} hipótese}{\ccmarkart{as} hipóteses},
+            Crefname = {A hipótese}{As hipóteses},
+        },
+        BR = {
+            name = {Hipótese},
+            crefname = {\ccmarkart{a} hipótese}{\ccmarkart{as} hipóteses},
+            Crefname = {A hipótese}{As hipóteses},
+        },
+        ES = {
+            name = {Hipótesis},
+            crefname = {la hipótesis}{las hipótesis},
+            Crefname = {La hipótesis}{Las hipótesis},
+        },
+        CN = {
+            name = {假设},
+            crefname = {假设}{假设},
+            Crefname = {假设}{假设},
+        },
+        TC = {
+            name = {假設},
+            crefname = {假設}{假設},
+            Crefname = {假設}{假設},
+        },
+        JP = {
+            name = {仮設},
+            crefname = {仮設}{仮設},
+            Crefname = {仮設}{仮設},
+        },
+        RU = {
+            name = {Гипотеза},
+            crefname = {гипотеза}{гипотезы},
+            Crefname = {Гипотеза}{Гипотезы},
+        },
+    }
+    \NameTheorem{notation}{
+        EN = {
+            name = {Notation},
+            crefname = {notation}{notations},
+            Crefname = {Notation}{Notations},
+        },
+        FR = {
+            name = {Notation},
+            crefname = {\ccmarkart{la} notation}{\ccmarkart{les} notations},
+            Crefname = {La notation}{Les notations},
+        },
+        DE = {
+            name = {Notation},
+            crefname = {Notation}{Notationen},
+            Crefname = {Notation}{Notationen},
+        },
+        IT = {
+            name = {Notazione},
+            crefname = {\ccmarkart{la} notazione}{\ccmarkart{le} notazioni},
+            Crefname = {La notazione}{Le notazioni},
+        },
+        PT = {
+            name = {Notação},
+            crefname = {\ccmarkart{a} notação}{\ccmarkart{as} notações},
+            Crefname = {A notação}{As notações},
+        },
+        BR = {
+            name = {Notação},
+            crefname = {\ccmarkart{a} notação}{\ccmarkart{as} notações},
+            Crefname = {A notação}{As notações},
+        },
+        ES = {
+            name = {Notación},
+            crefname = {la notación}{las notaciones},
+            Crefname = {La notación}{Las notaciones},
+        },
+        CN = {
+            name = {记号},
+            crefname = {记号}{记号},
+            Crefname = {记号}{记号},
+        },
+        TC = {
+            name = {記號},
+            crefname = {記號}{記號},
+            Crefname = {記號}{記號},
+        },
+        JP = {
+            name = {記法},
+            crefname = {記法}{記法},
+            Crefname = {記法}{記法},
+        },
+        RU = {
+            name = {Нотация},
+            crefname = {нотация}{нотации},
+            Crefname = {Нотация}{Нотации},
+        },
+    }
+    \NameTheorem{example}{
+        EN = {
+            name = {Example},
+            crefname = {example}{examples},
+            Crefname = {Example}{Examples},
+        },
+        FR = {
+            name = {Exemple},
+            crefname = {\ccmarkart{l'}example}{\ccmarkart{les} examples},
+            Crefname = {L'example}{Les examples},
+        },
+        DE = {
+            name = {Beispiel},
+            crefname = {Beispiel}{Beispiele},
+            Crefname = {Beispiel}{Beispiele},
+        },
+        IT = {
+            name = {Esempio},
+            crefname = {\ccmarkart{l'}esempio}{\ccmarkart{gli} esempi},
+            Crefname = {L'esempio}{Gli esempi},
+        },
+        PT = {
+            name = {Exemplo},
+            crefname = {\ccmarkart{o} exemplo}{\ccmarkart{os} exemplos},
+            Crefname = {O exemplo}{Os exemplos},
+        },
+        BR = {
+            name = {Exemplo},
+            crefname = {\ccmarkart{o} exemplo}{\ccmarkart{os} exemplos},
+            Crefname = {O exemplo}{Os exemplos},
+        },
+        ES = {
+            name = {Ejemplo},
+            crefname = {\ccmarkart{el} ejemplo}{los ejemplos},
+            Crefname = {El ejemplo}{Los ejemplos},
+        },
+        CN = {
+            name = {例},
+            crefname = {例}{例},
+            Crefname = {例}{例},
+        },
+        TC = {
+            name = {例},
+            crefname = {例}{例},
+            Crefname = {例}{例},
+        },
+        JP = {
+            name = {例},
+            crefname = {例}{例},
+            Crefname = {例}{例},
+        },
+        RU = {
+            name = {Пример},
+            crefname = {пример}{примеры},
+            Crefname = {Пример}{Примеры},
+        },
+    }
+    \NameTheorem{problem}{
+        EN = {
+            name = {Problem},
+            crefname = {problem}{problems},
+            Crefname = {Problem}{Problems},
+        },
+        FR = {
+            name = {Problème},
+            crefname = {\ccmarkart{le} problème}{\ccmarkart{les} problèmes},
+            Crefname = {Le problème}{Les problèmes},
+        },
+        DE = {
+            name = {Problem},
+            crefname = {Problem}{Probleme},
+            Crefname = {Problem}{Probleme},
+        },
+        IT = {
+            name = {Problema},
+            crefname = {\ccmarkart{il} problema}{\ccmarkart{i} problemi},
+            Crefname = {Il problema}{I problemi},
+        },
+        PT = {
+            name = {Problema},
+            crefname = {\ccmarkart{o} problema}{\ccmarkart{os} problemas},
+            Crefname = {O problema}{Os problemas},
+        },
+        BR = {
+            name = {Problema},
+            crefname = {\ccmarkart{o} problema}{\ccmarkart{os} problemas},
+            Crefname = {O problema}{Os problemas},
+        },
+        ES = {
+            name = {Problema},
+            crefname = {\ccmarkart{el} problema}{los problemas},
+            Crefname = {El problema}{Los problemas},
+        },
+        CN = {
+            name = {问题},
+            crefname = {问题}{问题},
+            Crefname = {问题}{问题},
+        },
+        TC = {
+            name = {問題},
+            crefname = {問題}{問題},
+            Crefname = {問題}{問題},
+        },
+        JP = {
+            name = {問題},
+            crefname = {問題}{問題},
+            Crefname = {問題}{問題},
+        },
+        RU = {
+            name = {Проблема},
+            crefname = {проблема}{проблемы},
+            Crefname = {Проблема}{Проблемы},
+        },
+    }
+    \NameTheorem{question}{
+        EN = {
+            name = {Question},
+            crefname = {question}{questions},
+            Crefname = {Question}{Questions},
+        },
+        FR = {
+            name = {Question},
+            crefname = {\ccmarkart{la} question}{\ccmarkart{les} questions},
+            Crefname = {La question}{Les questions},
+        },
+        DE = {
+            name = {Frage},
+            crefname = {Frage}{Fragen},
+            Crefname = {Frage}{Fragen},
+        },
+        IT = {
+            name = {Domanda},
+            crefname = {\ccmarkart{la} domanda}{\ccmarkart{le} domande},
+            Crefname = {La domanda}{Le domande},
+        },
+        PT = {
+            name = {Pergunta},
+            crefname = {\ccmarkart{a} pergunta}{\ccmarkart{as} perguntas},
+            Crefname = {A pergunta}{As perguntas},
+        },
+        BR = {
+            name = {Pergunta},
+            crefname = {\ccmarkart{a} pergunta}{\ccmarkart{as} perguntas},
+            Crefname = {A pergunta}{As perguntas},
+        },
+        ES = {
+            name = {Pregunta},
+            crefname = {la pregunta}{las preguntas},
+            Crefname = {La pregunta}{Las preguntas},
+        },
+        CN = {
+            name = {问题},
+            crefname = {问题}{问题},
+            Crefname = {问题}{问题},
+        },
+        TC = {
+            name = {問題},
+            crefname = {問題}{問題},
+            Crefname = {問題}{問題},
+        },
+        JP = {
+            name = {問題},
+            crefname = {問題}{問題},
+            Crefname = {問題}{問題},
+        },
+        RU = {
+            name = {Вопрос},
+            crefname = {вопрос}{вопросы},
+            Crefname = {Вопрос}{Вопросы},
+        },
+    }
+    \NameTheorem{exercise}{
+        EN = {
+            name = {Exercise},
+            crefname = {exercise}{exercises},
+            Crefname = {Exercise}{Exercises},
+        },
+        FR = {
+            name = {Exercice},
+            crefname = {\ccmarkart{l'}exercice}{\ccmarkart{les} exercices},
+            Crefname = {L'exercice}{Les exercices},
+        },
+        DE = {
+            name = {Übung},
+            crefname = {Übung}{Übungen},
+            Crefname = {Übung}{Übungen},
+        },
+        IT = {
+            name = {Esercizio},
+            crefname = {\ccmarkart{l'}esercizio}{\ccmarkart{gli} esercizi},
+            Crefname = {L'esercizio}{Gli esercizi},
+        },
+        PT = {
+            name = {Exercício},
+            crefname = {\ccmarkart{o} exercício}{\ccmarkart{os} exercícios},
+            Crefname = {O exercício}{Os exercícios},
+        },
+        BR = {
+            name = {Exercício},
+            crefname = {\ccmarkart{o} exercício}{\ccmarkart{os} exercícios},
+            Crefname = {O exercício}{Os exercícios},
+        },
+        ES = {
+            name = {Ejercicio},
+            crefname = {\ccmarkart{el} ejercicio}{los ejercicios},
+            Crefname = {El ejercicio}{Los ejercicios},
+        },
+        CN = {
+            name = {练习},
+            crefname = {练习}{练习},
+            Crefname = {练习}{练习},
+        },
+        TC = {
+            name = {練習},
+            crefname = {練習}{練習},
+            Crefname = {練習}{練習},
+        },
+        JP = {
+            name = {練習},
+            crefname = {練習}{練習},
+            Crefname = {練習}{練習},
+        },
+        RU = {
+            name = {Упражнение},
+            crefname = {упражнение}{упражнения},
+            Crefname = {Упражнение}{Упражнения},
+        },
+    }
+    \NameTheorem{remark}{
+        EN = {
+            name = {Remark},
+            crefname = {remark}{remarks},
+            Crefname = {Remark}{Remarks},
+        },
+        FR = {
+            name = {Remarque},
+            crefname = {\ccmarkart{la} remarque}{\ccmarkart{les} remarques},
+            Crefname = {La remarque}{Les remarques},
+        },
+        DE = {
+            name = {Bemerkung},
+            crefname = {Bemerkung}{Bemerkungen},
+            Crefname = {Bemerkung}{Bemerkungen},
+        },
+        IT = {
+            name = {Commento},
+            crefname = {\ccmarkart{il} commento}{\ccmarkart{i} commenti},
+            Crefname = {Il commento}{I commenti},
+        },
+        PT = {
+            name = {Comentário},
+            crefname = {\ccmarkart{o} comentário}{\ccmarkart{os} comentários},
+            Crefname = {O comentário}{Os comentários},
+        },
+        BR = {
+            name = {Comentário},
+            crefname = {\ccmarkart{o} comentário}{\ccmarkart{os} comentários},
+            Crefname = {O comentário}{Os comentários},
+        },
+        ES = {
+            name = {Comentario},
+            crefname = {\ccmarkart{el} comentario}{los comentarios},
+            Crefname = {El comentario}{Los comentarios},
+        },
+        CN = {
+            name = {备注},
+            crefname = {备注}{备注},
+            Crefname = {备注}{备注},
+        },
+        TC = {
+            name = {備註},
+            crefname = {備註}{備註},
+            Crefname = {備註}{備註},
+        },
+        JP = {
+            name = {注釈},
+            crefname = {注釈}{注釈},
+            Crefname = {注釈}{注釈},
+        },
+        RU = {
+            name = {Замечание},
+            crefname = {замечание}{замечания},
+            Crefname = {Замечание}{Замечания},
+        },
+    }
+    \NameTheorem{observation}{
+        EN = {
+            name = {Observation},
+            crefname = {observation}{observations},
+            Crefname = {Observation}{Observations},
+        },
+        FR = {
+            name = {Observation},
+            crefname = {\ccmarkart{la} observation}{\ccmarkart{les} observations},
+            Crefname = {La observation}{Les observations},
+        },
+        DE = {
+            name = {Beobachtung},
+            crefname = {Beobachtung}{Beobachtungen},
+            Crefname = {Beobachtung}{Beobachtungen},
+        },
+        IT = {
+            name = {Osservazione},
+            crefname = {\ccmarkart{l'}osservazione}{\ccmarkart{le} osservazioni},
+            Crefname = {L'osservazione}{Le osservazioni},
+        },
+        PT = {
+            name = {Observação},
+            crefname = {\ccmarkart{a} observação}{\ccmarkart{as} observações},
+            Crefname = {A observação}{As observações},
+        },
+        BR = {
+            name = {Observação},
+            crefname = {\ccmarkart{a} observação}{\ccmarkart{as} observações},
+            Crefname = {A observação}{As observações},
+        },
+        ES = {
+            name = {Observación},
+            crefname = {la observación}{las observaciones},
+            Crefname = {La observación}{Las observaciones},
+        },
+        CN = {
+            name = {观察},
+            crefname = {观察}{观察},
+            Crefname = {观察}{观察},
+        },
+        TC = {
+            name = {觀察},
+            crefname = {觀察}{觀察},
+            Crefname = {觀察}{觀察},
+        },
+        JP = {
+            name = {観察},
+            crefname = {観察}{観察},
+            Crefname = {観察}{観察},
+        },
+        RU = {
+            name = {Наблюдение},
+            crefname = {наблюдение}{наблюдения},
+            Crefname = {Наблюдение}{Наблюдения},
+        },
+    }
+    \NameTheorem{definition-proposition}{
+        EN = {
+            name = {\definitionnameEN-\propositionnameEN},
+            crefname = {definition-proposition}{definitions-propositions},
+            Crefname = {Definition-proposition}{Definitions-propositions},
+        },
+        FR = {
+            name = {\definitionnameFR-\propositionnameFR},
+            crefname = {\ccmarkart{la} définition-proposition}{\ccmarkart{les} définitions-propositions},
+            Crefname = {La définition-proposition}{Les définitions-propositions},
+        },
+        DE = {
+            name = {\definitionnameDE-\propositionnameDE},
+            crefname = {Definition-Proposition}{Definitionen-Propositionen},
+            Crefname = {Definition-Proposition}{Definitionen-Propositionen},
+        },
+        IT = {
+            name = {\definitionnameIT-\propositionnameIT},
+            crefname = {\ccmarkart{la} definizione-proposizione}{\ccmarkart{le} definizioni-proposte},
+            Crefname = {La definizione-proposizione}{Le definizioni-proposte},
+        },
+        PT = {
+            name = {\definitionnamePT-\propositionnamePT},
+            crefname = {\ccmarkart{a} definição-proposição}{\ccmarkart{as} definições-proposições},
+            Crefname = {A definição-proposição}{As definições-proposições},
+        },
+        BR = {
+            name = {\definitionnameBR-\propositionnameBR},
+            crefname = {\ccmarkart{a} definição-proposição}{\ccmarkart{as} definições-proposições},
+            Crefname = {A definição-proposição}{As definições-proposições},
+        },
+        ES = {
+            name = {\definitionnameES-\propositionnameES},
+            crefname = {la definición-proposición}{las definiciones-proposiciones},
+            Crefname = {La definición-proposición}{Las definiciones-proposiciones},
+        },
+        CN = {
+            name = {\definitionnameCN-\propositionnameCN},
+            crefname = {\definitionnameCN-\propositionnameCN}{\definitionnameCN-\propositionnameCN},
+            Crefname = {\definitionnameCN-\propositionnameCN}{\definitionnameCN-\propositionnameCN},
+        },
+        TC = {
+            name = {\definitionnameTC-\propositionnameTC},
+            crefname = {\definitionnameTC-\propositionnameTC}{\definitionnameTC-\propositionnameTC},
+            Crefname = {\definitionnameTC-\propositionnameTC}{\definitionnameTC-\propositionnameTC},
+        },
+        JP = {
+            name = {\definitionnameJP-\propositionnameJP},
+            crefname = {\definitionnameJP-\propositionnameJP}{\definitionnameJP-\propositionnameJP},
+            Crefname = {\definitionnameJP-\propositionnameJP}{\definitionnameJP-\propositionnameJP},
+        },
+        RU = {
+            name = {\definitionnameRU-\propositionnameRU},
+            crefname = {определение-предложение}{определения-предложения},
+            Crefname = {Определение-предложение}{Определения-предложение},
+        },
+    }
+    \NameTheorem{definition-theorem}{
+        EN = {
+            name = {\definitionnameEN-\theoremnameEN},
+            crefname = {definition-theorem}{definitions-theorems},
+            Crefname = {Definition-theorem}{Definitions-theorems},
+        },
+        FR = {
+            name = {\definitionnameFR-\theoremnameFR},
+            crefname = {\ccmarkart{la} définition-théorème}{\ccmarkart{les} définitions-théorèmes},
+            Crefname = {La définition-théorème}{Les définitions-théorèmes},
+        },
+        DE = {
+            name = {\definitionnameDE-\theoremnameDE},
+            crefname = {Definition-Satz}{Definitionen-Sätze},
+            Crefname = {Definition-Satz}{Definitionen-Sätze},
+        },
+        IT = {
+            name = {\definitionnameIT-\theoremnameIT},
+            crefname = {\ccmarkart{la} definizione-teorema}{\ccmarkart{le} definizioni-teoremi},
+            Crefname = {La definizione-teorema}{Le definizioni-teoremi},
+        },
+        PT = {
+            name = {\definitionnamePT-\theoremnamePT},
+            crefname = {\ccmarkart{a} definição-teorema}{\ccmarkart{as} definições-teoremas},
+            Crefname = {A definição-teorema}{As definições-teoremas},
+        },
+        BR = {
+            name = {\definitionnameBR-\theoremnameBR},
+            crefname = {\ccmarkart{a} definição-teorema}{\ccmarkart{as} definições-teoremas},
+            Crefname = {A definição-teorema}{As definições-teoremas},
+        },
+        ES = {
+            name = {\definitionnameES-\theoremnameES},
+            crefname = {la definición-teorema}{las definiciones-teoremas},
+            Crefname = {La definición-teorema}{Las definiciones-teoremas},
+        },
+        CN = {
+            name = {\definitionnameCN-\theoremnameCN},
+            crefname = {\definitionnameCN-\theoremnameCN}{\definitionnameCN-\theoremnameCN},
+            Crefname = {\definitionnameCN-\theoremnameCN}{\definitionnameCN-\theoremnameCN},
+        },
+        TC = {
+            name = {\definitionnameTC-\theoremnameTC},
+            crefname = {\definitionnameTC-\theoremnameTC}{\definitionnameTC-\theoremnameTC},
+            Crefname = {\definitionnameTC-\theoremnameTC}{\definitionnameTC-\theoremnameTC},
+        },
+        JP = {
+            name = {\definitionnameJP-\theoremnameJP},
+            crefname = {\definitionnameJP-\theoremnameJP}{\definitionnameJP-\theoremnameJP},
+            Crefname = {\definitionnameJP-\theoremnameJP}{\definitionnameJP-\theoremnameJP},
+        },
+        RU = {
+            name = {\definitionnameRU-\theoremnameRU},
+            crefname = {определение-теорема}{определения-теоремы},
+            Crefname = {Определение-теорема}{Определения-теорема},
+        },
+    }
+}{
+    \def\theoremnameEN{{Theorem}}
+    \def\lemmanameEN{{Lemma}}
+    \def\propositionnameEN{{Proposition}}
+    \def\corollarynameEN{{Corollary}}
+    \def\propertynameEN{{Property}}
+    \def\factnameEN{{Fact}}
+    \def\conjecturenameEN{{Conjecture}}
+    \def\definitionnameEN{{Definition}}
+    \def\axiomnameEN{{Axiom}}
+    \def\assumptionnameEN{{Assumption}}
+    \def\conventionnameEN{{Convention}}
+    \def\hypothesisnameEN{{Hypothesis}}
+    \def\notationnameEN{{Notation}}
+    \def\examplenameEN{{Example}}
+    \def\problemnameEN{{Problem}}
+    \def\questionnameEN{{Question}}
+    \def\exercisenameEN{{Exercise}}
+    \def\remarknameEN{{Remark}}
+    \def\observationnameEN{{Observation}}
+    \expandafter\def\csname definition-propositionnameEN\endcsname{\definitionnameEN-\propositionnameEN}
+    \expandafter\def\csname definition-theoremnameEN\endcsname{\definitionnameEN-\theoremnameEN}
+
+    \def\theoremnameFR{{Théorème}}
+    \def\lemmanameFR{{Lemme}}
+    \def\propositionnameFR{{Proposition}}
+    \def\corollarynameFR{{Corollaire}}
+    \def\propertynameFR{{Propriété}}
+    \def\factnameFR{{Fait}}
+    \def\conjecturenameFR{{Conjecture}}
+    \def\definitionnameFR{{Définition}}
+    \def\axiomnameFR{{Axiome}}
+    \def\assumptionnameFR{{Supposition}}
+    \def\conventionnameFR{{Convention}}
+    \def\hypothesisnameFR{{Hypothèse}}
+    \def\notationnameFR{{Notation}}
+    \def\examplenameFR{{Exemple}}
+    \def\problemnameFR{{Problème}}
+    \def\questionnameFR{{Question}}
+    \def\exercisenameFR{{Exercice}}
+    \def\remarknameFR{{Remarque}}
+    \def\observationnameFR{{Observation}}
+    \expandafter\def\csname definition-propositionnameFR\endcsname{\definitionnameFR-\propositionnameFR}
+    \expandafter\def\csname definition-theoremnameFR\endcsname{\definitionnameFR-\theoremnameFR}
+
+    \def\theoremnameDE{{Satz}}
+    \def\lemmanameDE{{Lemma}}
+    \def\propositionnameDE{{Proposition}}
+    \def\corollarynameDE{{Korollar}}
+    \def\propertynameDE{{Eigenschaft}}
+    \def\factnameDE{{Fakt}}
+    \def\conjecturenameDE{{Vermutung}}
+    \def\definitionnameDE{{Definition}}
+    \def\axiomnameDE{{Axiom}}
+    \def\assumptionnameDE{{Annahme}}
+    \def\conventionnameDE{{Konvention}}
+    \def\hypothesisnameDE{{Hypothese}}
+    \def\notationnameDE{{Notation}}
+    \def\examplenameDE{{Beispiel}}
+    \def\problemnameDE{{Problem}}
+    \def\questionnameDE{{Frage}}
+    \def\exercisenameDE{{Übung}}
+    \def\remarknameDE{{Bemerkung}}
+    \def\observationnameDE{{Beobachtung}}
+    \expandafter\def\csname definition-propositionnameDE\endcsname{\definitionnameDE-\propositionnameDE}
+    \expandafter\def\csname definition-theoremnameDE\endcsname{\definitionnameDE-\theoremnameDE}
+
+    \def\theoremnameIT{{Teorema}}
+    \def\lemmanameIT{{Lemma}}
+    \def\propositionnameIT{{Proposizione}}
+    \def\corollarynameIT{{Corollario}}
+    \def\propertynameIT{{Proprietà}}
+    \def\factnameIT{{Fatto}}
+    \def\conjecturenameIT{{Congettura}}
+    \def\definitionnameIT{{Definizione}}
+    \def\axiomnameIT{{Assioma}}
+    \def\assumptionnameIT{{Supposizione}}
+    \def\conventionnameIT{{Convenzione}}
+    \def\hypothesisnameIT{{Ipotesi}}
+    \def\notationnameIT{{Notazione}}
+    \def\examplenameIT{{Esempio}}
+    \def\problemnameIT{{Problema}}
+    \def\questionnameIT{{Domanda}}
+    \def\exercisenameIT{{Esercizio}}
+    \def\remarknameIT{{Commento}}
+    \def\observationnameIT{{Osservazione}}
+    \expandafter\def\csname definition-propositionnameIT\endcsname{\definitionnameIT-\propositionnameIT}
+    \expandafter\def\csname definition-theoremnameIT\endcsname{\definitionnameIT-\theoremnameIT}
+
+    \def\theoremnamePT{{Teorema}}
+    \def\lemmanamePT{{Lema}}
+    \def\propositionnamePT{{Proposição}}
+    \def\corollarynamePT{{Corolário}}
+    \def\propertynamePT{{Propriedade}}
+    \def\factnamePT{{Facto}}
+    \def\conjecturenamePT{{Conjetura}}
+    \def\definitionnamePT{{Definição}}
+    \def\axiomnamePT{{Axioma}}
+    \def\assumptionnamePT{{Suposição}}
+    \def\conventionnamePT{{Convenção}}
+    \def\hypothesisnamePT{{Hipótese}}
+    \def\notationnamePT{{Notação}}
+    \def\examplenamePT{{Exemplo}}
+    \def\problemnamePT{{Problema}}
+    \def\questionnamePT{{Pergunta}}
+    \def\exercisenamePT{{Exercício}}
+    \def\remarknamePT{{Comentário}}
+    \def\observationnamePT{{Observação}}
+    \expandafter\def\csname definition-propositionnamePT\endcsname{\definitionnamePT-\propositionnamePT}
+    \expandafter\def\csname definition-theoremnamePT\endcsname{\definitionnamePT-\theoremnamePT}
+
+    \def\theoremnameBR{{Teorema}}
+    \def\lemmanameBR{{Lema}}
+    \def\propositionnameBR{{Proposição}}
+    \def\corollarynameBR{{Corolário}}
+    \def\propertynameBR{{Propriedade}}
+    \def\factnameBR{{Fato}}
+    \def\conjecturenameBR{{Conjectura}}
+    \def\definitionnameBR{{Definição}}
+    \def\axiomnameBR{{Axioma}}
+    \def\assumptionnameBR{{Suposição}}
+    \def\conventionnameBR{{Convenção}}
+    \def\hypothesisnameBR{{Hipótese}}
+    \def\notationnameBR{{Notação}}
+    \def\examplenameBR{{Exemplo}}
+    \def\problemnameBR{{Problema}}
+    \def\questionnameBR{{Pergunta}}
+    \def\exercisenameBR{{Exercício}}
+    \def\remarknameBR{{Comentário}}
+    \def\observationnameBR{{Observação}}
+    \expandafter\def\csname definition-propositionnameBR\endcsname{\definitionnameBR-\propositionnameBR}
+    \expandafter\def\csname definition-theoremnameBR\endcsname{\definitionnameBR-\theoremnameBR}
+
+    \def\theoremnameES{{Teorema}}
+    \def\lemmanameES{{Lema}}
+    \def\propositionnameES{{Proposición}}
+    \def\corollarynameES{{Corolario}}
+    \def\propertynameES{{Propiedad}}
+    \def\factnameES{{Hecho}}
+    \def\conjecturenameES{{Conjetura}}
+    \def\definitionnameES{{Definición}}
+    \def\axiomnameES{{Axioma}}
+    \def\assumptionnameES{{Suposición}}
+    \def\conventionnameES{{Convención}}
+    \def\hypothesisnameES{{Hipótesis}}
+    \def\notationnameES{{Notación}}
+    \def\examplenameES{{Ejemplo}}
+    \def\problemnameES{{Problema}}
+    \def\questionnameES{{Pregunta}}
+    \def\exercisenameES{{Ejercicio}}
+    \def\remarknameES{{Comentario}}
+    \def\observationnameES{{Observación}}
+    \expandafter\def\csname definition-propositionnameES\endcsname{\definitionnameES-\propositionnameES}
+    \expandafter\def\csname definition-theoremnameES\endcsname{\definitionnameES-\theoremnameES}
+
+    \def\theoremnameCN{{定理}}
+    \def\lemmanameCN{{引理}}
+    \def\propositionnameCN{{命题}}
+    \def\corollarynameCN{{推论}}
+    \def\propertynameCN{{性质}}
+    \def\factnameCN{{事实}}
+    \def\conjecturenameCN{{猜想}}
+    \def\definitionnameCN{{定义}}
+    \def\axiomnameCN{{公理}}
+    \def\assumptionnameCN{{假定}}
+    \def\conventionnameCN{{约定}}
+    \def\hypothesisnameCN{{假设}}
+    \def\notationnameCN{{记号}}
+    \def\examplenameCN{{例}}
+    \def\problemnameCN{{问题}}
+    \def\questionnameCN{{问题}}
+    \def\exercisenameCN{{练习}}
+    \def\remarknameCN{{备注}}
+    \def\observationnameCN{{观察}}
+    \expandafter\def\csname definition-propositionnameCN\endcsname{\definitionnameCN-\propositionnameCN}
+    \expandafter\def\csname definition-theoremnameCN\endcsname{\definitionnameCN-\theoremnameCN}
+
+    \def\theoremnameTC{{定理}}
+    \def\lemmanameTC{{引理}}
+    \def\propositionnameTC{{命題}}
+    \def\corollarynameTC{{推論}}
+    \def\propertynameTC{{性質}}
+    \def\factnameTC{{事實}}
+    \def\conjecturenameTC{{猜想}}
+    \def\definitionnameTC{{定義}}
+    \def\axiomnameTC{{公理}}
+    \def\assumptionnameTC{{假定}}
+    \def\conventionnameTC{{約定}}
+    \def\hypothesisnameTC{{假設}}
+    \def\notationnameTC{{記號}}
+    \def\examplenameTC{{例}}
+    \def\problemnameTC{{問題}}
+    \def\questionnameTC{{問題}}
+    \def\exercisenameTC{{練習}}
+    \def\remarknameTC{{備註}}
+    \def\observationnameTC{{觀察}}
+    \expandafter\def\csname definition-propositionnameTC\endcsname{\definitionnameTC-\propositionnameTC}
+    \expandafter\def\csname definition-theoremnameTC\endcsname{\definitionnameTC-\theoremnameTC}
+
+    \def\theoremnameJP{{定理}}
+    \def\lemmanameJP{{補題}}
+    \def\propositionnameJP{{命題}}
+    \def\corollarynameJP{{系}}
+    \def\propertynameJP{{性質}}
+    \def\factnameJP{{事実}}
+    \def\conjecturenameJP{{予想}}
+    \def\definitionnameJP{{定義}}
+    \def\axiomnameJP{{公理}}
+    \def\assumptionnameJP{{仮定}}
+    \def\conventionnameJP{{慣例}}
+    \def\hypothesisnameJP{{仮設}}
+    \def\notationnameJP{{記法}}
+    \def\examplenameJP{{例}}
+    \def\problemnameJP{{問題}}
+    \def\questionnameJP{{問題}}
+    \def\exercisenameJP{{練習}}
+    \def\remarknameJP{{注釈}}
+    \def\observationnameJP{{観察}}
+    \expandafter\def\csname definition-propositionnameJP\endcsname{\definitionnameJP-\propositionnameJP}
+    \expandafter\def\csname definition-theoremnameJP\endcsname{\definitionnameJP-\theoremnameJP}
+
+    \def\theoremnameRU{{Теорема}} % Теоре́ма
+    \def\lemmanameRU{{Лемма}} % Ле́мма
+    \def\propositionnameRU{{Предложение}} % Предложе́ние
+    \def\corollarynameRU{{Следствие}} % Сле́дствие
+    \def\propertynameRU{{Имущество}} % Иму́щество
+    \def\factnameRU{{Факт}}
+    \def\conjecturenameRU{{Гипотеза}} % Гипо́теза % Конъектура Конъекту́ра
+    \def\definitionnameRU{{Определение}} % Определе́ние
+    \def\axiomnameRU{{Аксиома}} % Аксио́ма
+    \def\assumptionnameRU{{Предположение}} % Предположе́ние
+    \def\conventionnameRU{{Конвенция}} % Конве́нция
+    \def\hypothesisnameRU{{Гипотеза}} % Гипо́теза
+    \def\notationnameRU{{Нотация}} % Нота́ция
+    \def\examplenameRU{{Пример}} % Приме́р
+    \def\problemnameRU{{Проблема}} % Пробле́ма
+    \def\questionnameRU{{Вопрос}} % Вопро́с
+    \def\exercisenameRU{{Упражнение}} % Упражне́ние
+    \def\remarknameRU{{Замечание}} % Замеча́ние
+    \def\observationnameRU{{Наблюдение}} % Наблюде́ние
+    \expandafter\def\csname definition-propositionnameRU\endcsname{\definitionnameRU-\propositionnameRU}
+    \expandafter\def\csname definition-theoremnameRU\endcsname{\definitionnameRU-\theoremnameRU}
+}
 
 \newif\ifPJLthm@IsBook
 \ifdefined\c@chapter\PJLthm@IsBooktrue\else\PJLthm@IsBookfalse\fi
@@ -696,7 +1942,7 @@
     \def\creflastconjunction{~和~}%
     \def\crefpairgroupconjunction{~和~}%
     \def\crefmiddlegroupconjunction{、}%
-    \def\creflastgroupconjunction{~和~}%
+    \def\creflastgroupconjunction{~以及~}%
     \def\crefrangeconjunction{～}%
 }
 \gappto{\PJLlang@langconfig@TC}{%
@@ -713,7 +1959,7 @@
     \def\creflastconjunction{~與~}%
     \def\crefpairgroupconjunction{~與~}%
     \def\crefmiddlegroupconjunction{、}%
-    \def\creflastgroupconjunction{~與~}%
+    \def\creflastgroupconjunction{~以及~}%
     \def\crefrangeconjunction{～}%
 }
 \gappto{\PJLlang@langconfig@JP}{%
@@ -730,8 +1976,8 @@
     \def\creflastconjunction{~と~}%
     \def\crefpairgroupconjunction{~と~}%
     \def\crefmiddlegroupconjunction{~と~}%
-    \def\creflastgroupconjunction{~と~}%
-    \def\crefrangeconjunction{〜}%
+    \def\creflastgroupconjunction{~及び~}%
+    \def\crefrangeconjunction{～}%
 }
 \gappto{\PJLlang@langconfig@RU}{%
     \crefname{equation}{уравнение}{уравнения}%
diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
index 919c3fa5f89..3ece848a2f8 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/24 The collective interface of ProjLib toolkit]
+    [2021/10/30 The collective interface of ProjLib toolkit]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{
@@ -34,6 +34,8 @@
 \DeclareStringOption{thmnum}[PJL@thmnum@default]
 \DeclareBoolOption[true]{regionalref}
 \DeclareBoolOption[false]{originalref}
+\DeclareBoolOption[true]{complexname}
+\DeclareBoolOption[false]{simplename}
 \DeclareBoolOption[false]{useosf}
 \DeclareBoolOption[false]{lmodern}
 \DeclareBoolOption[false]{palatino}
@@ -46,6 +48,9 @@
 \if@ProjLib@originalref
     \@ProjLib@regionalreffalse
 \fi
+\if@ProjLib@simplename
+    \@ProjLib@complexnamefalse
+\fi
 \if@ProjLib@draft
     \@ProjLib@fasttrue
 \fi
@@ -75,6 +80,9 @@
 \if@ProjLib@regionalref\else
     \PassOptionsToPackage{originalref}{PJLthm}
 \fi
+\if@ProjLib@complexname\else
+    \PassOptionsToPackage{simplename}{PJLthm}
+\fi
 
 \if@ProjLib@amsfashion
     \PassOptionsToPackage{amsfashion}{PJLauthor}
@@ -169,6 +177,7 @@
 \fi
 
 \RequirePackage{microtype}
+\AtEndPreamble{\AtBeginDocument{\microtypesetup{disable}{\scshape}\microtypesetup{enable}}}
 
 \endinput
 %%