diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-06 20:50:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-06 20:50:59 +0000 |
commit | 7b2fd1316c3a4fcb2b48aac74298202b16bdbcb6 (patch) | |
tree | 6e378a6dea1a641fe9f809dd40c161eb69cedd2c /Master/texmf-dist/tex/latex/projlib | |
parent | af93d729e9f975d827a119a26b74de8769391322 (diff) |
projlib (6jun21)
git-svn-id: svn://tug.org/texlive/trunk@59495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/projlib')
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLamssim.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLauthor.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLdate.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLdraft.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLlang.sty | 45 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLlogo.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLpaper.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLthm.sty | 456 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty | 6 |
9 files changed, 370 insertions, 161 deletions
diff --git a/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty b/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty index 5cf772ea12b..1ba4da23cb5 100644 --- a/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty +++ b/Master/texmf-dist/tex/latex/projlib/PJLamssim.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{PJLamssim} - [2021/05/25 Simulate some features of amsart] + [2021/06/07 Simulate some features of amsart] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \ifdefined\subjclass\endinput\fi @@ -30,6 +30,10 @@ \def\keywordsnameEN{\textsc{Key words and phrases}} \def\keywordsnameFR{\textsc{Mots et phrases clés}} \def\keywordsnameDE{\textsc{Schlüsselwörter und Phrasen}} +\def\keywordsnameIT{\textsc{Parole e frasi chiave}} +\def\keywordsnamePT{\textsc{Palavras e frases chave}} +\def\keywordsnameBR{\textsc{Palavras e frases chave}} +\def\keywordsnameES{\textsc{Palabras y frases clave}} \def\keywordsnameCN{关键词} \def\keywordsnameTC{關鍵詞} \def\keywordsnameJP{キーワード} diff --git a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty index acaccec5111..3c9e6ba7a9b 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/05/25 Enhanced author information block] + [2021/06/07 Enhanced author information block] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \ifdefined\subjclass\endinput\fi diff --git a/Master/texmf-dist/tex/latex/projlib/PJLdate.sty b/Master/texmf-dist/tex/latex/projlib/PJLdate.sty index a408210489f..4ec0774d982 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/05/25 Convert yyyy-mm-dd to normal datetime format] + [2021/06/07 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 50437fa82d5..96958f03336 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/05/25 Some useful macros for the draft stage] + [2021/06/07 Some useful macros for the draft stage] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{ @@ -43,6 +43,14 @@ \def\needgraphTextFR{Il manque une image ici} \def\dnfTextDE{Nicht beendet} \def\needgraphTextDE{Benötigen Sie ein Bild} +\def\dnfTextIT{Per essere finito} +\def\needgraphTextIT{Manca un'immagine qui} +\def\dnfTextPT{Não terminou} +\def\needgraphTextPT{Precisa de uma foto aqui} +\def\dnfTextBR{Não terminou} +\def\needgraphTextBR{Precisa de uma foto aqui} +\def\dnfTextES{Estar terminado} +\def\needgraphTextES{Falta una imagen aquí} \def\dnfTextCN{这里尚未完成} \def\needgraphTextCN{这里需要一张图片} \def\dnfTextTC{這裡尚未完成} diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlang.sty b/Master/texmf-dist/tex/latex/projlib/PJLlang.sty index 2ab472e3800..013373b3d04 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/05/25 Multi-language configuration] + [2021/06/07 Multi-language configuration] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -30,6 +30,10 @@ \newcommand\englishABBR{EN} \newcommand\frenchABBR{FR} \newcommand\ngermanABBR{DE} +\newcommand\italianABBR{IT} +\newcommand\portugueseABBR{PT} +\newcommand\brazilianABBR{BR} +\newcommand\spanishABBR{ES} \newcommand\chineseABBR{CN} \newcommand\tchineseABBR{TC} \newcommand\japaneseABBR{JP} @@ -48,6 +52,7 @@ \setotherlanguage{ngerman} \setotherlanguage{spanish} \setotherlanguage{portuguese} + \setotherlanguage[variant=brazilian]{portuguese} \setotherlanguage{italian} \ifPDFTeX\else \setotherlanguage{russian} @@ -59,7 +64,7 @@ \ifPDFTeX\else \PassOptionsToPackage{japanese,russian}{babel} \fi - \PassOptionsToPackage{italian,portuguese,brazilian,spanish.noquoting,ngerman,french,english,shorthands=off}{babel} + \PassOptionsToPackage{italian,portuguese,brazilian,spanish,es-notilde,es-noquoting,ngerman,french,english,shorthands=off}{babel} \PassOptionsToPackage{italian,brazilian,spanish,ngerman,french,english}{cleveref} \RequirePackage{babel} \frenchsetup{PartNameFull=false} @@ -115,6 +120,18 @@ \newcommand{\PJLlang@langconfig@german}{% \selectlanguage{ngerman}% } +\newcommand{\PJLlang@langconfig@italian}{% + \selectlanguage{italian}% +} +\newcommand{\PJLlang@langconfig@portuguese}{% + \selectlanguage{portuguese}% +} +\newcommand{\PJLlang@langconfig@brazilian}{% + \selectlanguage{brazilian}% +} +\newcommand{\PJLlang@langconfig@spanish}{% + \selectlanguage{spanish}% +} \newcommand{\PJLlang@langconfig@russian}{% \selectlanguage{russian}% } @@ -140,6 +157,14 @@ {french}{\gappto{\PJLlang@langconfig@french}{#2}}% {de}{\gappto{\PJLlang@langconfig@german}{#2}}% {ngerman}{\gappto{\PJLlang@langconfig@german}{#2}}% + {it}{\gappto{\PJLlang@langconfig@italian}{#2}}% + {italian}{\gappto{\PJLlang@langconfig@italian}{#2}}% + {pt}{\gappto{\PJLlang@langconfig@portuguese}{#2}}% + {portuguese}{\gappto{\PJLlang@langconfig@portuguese}{#2}}% + {br}{\gappto{\PJLlang@langconfig@brazilian}{#2}}% + {brazilian}{\gappto{\PJLlang@langconfig@brazilian}{#2}}% + {es}{\gappto{\PJLlang@langconfig@spanish}{#2}}% + {spanish}{\gappto{\PJLlang@langconfig@spanish}{#2}}% {german}{\gappto{\PJLlang@langconfig@german}{#2}}% {ru}{\gappto{\PJLlang@langconfig@russian}{#2}}% {russian}{\gappto{\PJLlang@langconfig@russian}{#2}}% @@ -171,6 +196,14 @@ {de}{\PJL@config@linespacing\PJLlang@langconfig@german}% {ngerman}{\PJL@config@linespacing\PJLlang@langconfig@german}% {german}{\PJL@config@linespacing\PJLlang@langconfig@german}% + {it}{\PJL@config@linespacing\PJLlang@langconfig@italian}% + {italian}{\PJL@config@linespacing\PJLlang@langconfig@italian}% + {pt}{\PJL@config@linespacing\PJLlang@langconfig@portuguese}% + {portuguese}{\PJL@config@linespacing\PJLlang@langconfig@portuguese}% + {br}{\PJL@config@linespacing\PJLlang@langconfig@brazilian}% + {brazilian}{\PJL@config@linespacing\PJLlang@langconfig@brazilian}% + {es}{\PJL@config@linespacing\PJLlang@langconfig@spanish}% + {spanish}{\PJL@config@linespacing\PJLlang@langconfig@spanish}% {ru}{\PJL@config@linespacing\PJLlang@langconfig@russian}% {russian}{\PJL@config@linespacing\PJLlang@langconfig@russian}% }% @@ -202,6 +235,14 @@ {de}{\PJLlang@langconfig@german}% {ngerman}{\PJLlang@langconfig@german}% {german}{\PJLlang@langconfig@german}% + {it}{\PJLlang@langconfig@italian}% + {italian}{\PJLlang@langconfig@italian}% + {pt}{\PJLlang@langconfig@portuguese}% + {portuguese}{\PJLlang@langconfig@portuguese}% + {br}{\PJLlang@langconfig@brazilian}% + {brazilian}{\PJLlang@langconfig@brazilian}% + {es}{\PJLlang@langconfig@spanish}% + {spanish}{\PJLlang@langconfig@spanish}% {ru}{\PJLlang@langconfig@russian}% {russian}{\PJLlang@langconfig@russian}% }% diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty index f52e32bf00d..2ef31a5429e 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/05/25 The ProjLib logo] + [2021/06/07 The ProjLib logo] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{ diff --git a/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty b/Master/texmf-dist/tex/latex/projlib/PJLpaper.sty index 52763dc6beb..b7ff069e5d4 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/05/25 Paper style configuration] + [2021/06/07 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 c3adb950c7b..692afcab861 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/05/25 Theorem setup and configuration] + [2021/06/07 Theorem setup and configuration] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -25,9 +25,13 @@ prefix = @PJLthm@ } \DeclareBoolOption[false]{nothms} +\DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{regionalref} \ProcessKeyvalOptions*\relax +\if@PJLthm@draft + \@PJLthm@fasttrue +\fi \if@PJLthm@fast \@PJLthm@regionalreftrue \fi @@ -61,6 +65,14 @@ {de}{\def\PJL@temp@abbr{DE}}% {ngerman}{\def\PJL@temp@abbr{DE}}% {german}{\def\PJL@temp@abbr{DE}}% + {it}{\def\PJL@temp@abbr{IT}}% + {italian}{\def\PJL@temp@abbr{IT}}% + {pt}{\def\PJL@temp@abbr{PT}}% + {portuguese}{\def\PJL@temp@abbr{PT}}% + {br}{\def\PJL@temp@abbr{BR}}% + {brazilian}{\def\PJL@temp@abbr{BR}}% + {es}{\def\PJL@temp@abbr{ES}}% + {spanish}{\def\PJL@temp@abbr{ES}}% {ru}{\def\PJL@temp@abbr{RU}}% {russian}{\def\PJL@temp@abbr{RU}}% }% @@ -69,6 +81,10 @@ \expandafter\def\csname\PJLthm@temp nameEN\endcsname{#3}% \expandafter\def\csname\PJLthm@temp nameFR\endcsname{#3}% \expandafter\def\csname\PJLthm@temp nameDE\endcsname{#3}% + \expandafter\def\csname\PJLthm@temp nameIT\endcsname{#3}% + \expandafter\def\csname\PJLthm@temp namePT\endcsname{#3}% + \expandafter\def\csname\PJLthm@temp nameBR\endcsname{#3}% + \expandafter\def\csname\PJLthm@temp nameES\endcsname{#3}% \expandafter\def\csname\PJLthm@temp nameCN\endcsname{#3}% \expandafter\def\csname\PJLthm@temp nameTC\endcsname{#3}% \expandafter\def\csname\PJLthm@temp nameJP\endcsname{#3}% @@ -162,7 +178,14 @@ {\string\CreateTheorem\space syntax error\on@line}{% You cannot call the starred variant with optional argument,\MessageBreak nor call the unstarred variant with several optional arguments.}% - {}% + {% + Allowed usage:\MessageBreak\MessageBreak + \CreateTheorem*{(name of environment)}\MessageBreak + \CreateTheorem{(name of environment)}\MessageBreak + \CreateTheorem{(name of environment)}[(numbered like)]\MessageBreak + \CreateTheorem{(name of environment)}<(numbered within)>\MessageBreak + \CreateTheorem{(name of environment)}((existed environment))\MessageBreak + }% }{% \IfValueTF{#6}{% \IfBooleanTF{#1}{% @@ -176,13 +199,17 @@ } }{% \IfBooleanTF{#1}{% - \newtheorem*{#2EN#3}{\csname#2nameEN\endcsname} - \newtheorem*{#2FR#3}{\csname#2nameFR\endcsname} - \newtheorem*{#2DE#3}{\csname#2nameDE\endcsname} - \newtheorem*{#2CN#3}{\csname#2nameCN\endcsname} - \newtheorem*{#2TC#3}{\csname#2nameTC\endcsname} - \newtheorem*{#2JP#3}{\csname#2nameJP\endcsname} - \newtheorem*{#2RU#3}{\csname#2nameRU\endcsname} + \expandafter\PassFirstToSecond\expandafter{\csname#2nameEN\endcsname}{\newtheorem*{#2EN#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameFR\endcsname}{\newtheorem*{#2FR#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameDE\endcsname}{\newtheorem*{#2DE#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameIT\endcsname}{\newtheorem*{#2IT#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2namePT\endcsname}{\newtheorem*{#2PT#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameBR\endcsname}{\newtheorem*{#2BR#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameES\endcsname}{\newtheorem*{#2ES#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameCN\endcsname}{\newtheorem*{#2CN#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameTC\endcsname}{\newtheorem*{#2TC#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameJP\endcsname}{\newtheorem*{#2JP#3}}% + \expandafter\PassFirstToSecond\expandafter{\csname#2nameRU\endcsname}{\newtheorem*{#2RU#3}}% }{% \IfValueTF{#5}{% \newcounter{#2#3}[{#5}]% @@ -198,6 +225,10 @@ \CreateTheoremNumberedLikeAliasCounter{#2}{EN}{#3}% \CreateTheoremNumberedLikeAliasCounter{#2}{FR}{#3}% \CreateTheoremNumberedLikeAliasCounter{#2}{DE}{#3}% + \CreateTheoremNumberedLikeAliasCounter{#2}{IT}{#3}% + \CreateTheoremNumberedLikeAliasCounter{#2}{PT}{#3}% + \CreateTheoremNumberedLikeAliasCounter{#2}{BR}{#3}% + \CreateTheoremNumberedLikeAliasCounter{#2}{ES}{#3}% \CreateTheoremNumberedLikeAliasCounter{#2}{CN}{#3}% \CreateTheoremNumberedLikeAliasCounter{#2}{TC}{#3}% \CreateTheoremNumberedLikeAliasCounter{#2}{JP}{#3}% @@ -212,180 +243,283 @@ }% \NewDocumentCommand{\CreateTheoremNumberedLikeAliasCounter}{mmm}{% \newaliascnt{#1#2#3}{#1#3}% - \newtheorem{#1#2#3}[{#1#2#3}]{\csname#1name#2\endcsname}% + \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}{\newtheorem{#1#2#3}[{#1#2#3}]}% \aliascntresetthe{#1#2#3}% - \crefname{#1#2#3}% - {\csname#1name#2\endcsname}% - {\csname#1name#2\endcsname}% - \Crefname{#1#2#3}% - {\csname#1name#2\endcsname}% - {\csname#1name#2\endcsname}% + \expandafter\PassFirstToSecond\expandafter{\csname#1name#2\endcsname}% + {% + \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 %% English theorems names -\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\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} %% French theorems names -\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\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} %% German theorems names -\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\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} +%% Italian theorems names +\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} + +%% Portuguese theorems names +\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} + +%% Brazilian theorems names +\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} + +%% Spanish theorems names +\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} + %% Chinese theorems names -\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\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\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} %% Japanese theorems names -\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\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} %% Russian theorems names -\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\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\chapter\PJLthm@IsBooktrue\else\PJLthm@IsBookfalse\fi -\if@PJLthm@nothms\else +\ifdefined\c@chapter\PJLthm@IsBooktrue\else\PJLthm@IsBookfalse\fi %% Theorem environments \ifbool{PJLthm@IsBook}{ - \newaliascnt{highest}{chapter} + \newaliascnt{PJLthm@highest}{chapter} }{ - \newaliascnt{highest}{section} + \newaliascnt{PJLthm@highest}{section} } -\CreateTheorem{theorem}<highest> +\if@PJLthm@nothms\else +\CreateTheorem{theorem}<PJLthm@highest> \CreateTheorem{lemma}[theorem] \CreateTheorem{proposition}[theorem] \CreateTheorem{corollary}[theorem] @@ -427,11 +561,14 @@ \CreateTheorem*{exercise*} \theoremstyle{remark} -\CreateTheorem{remark}<highest> +\CreateTheorem{remark}<PJLthm@highest> \CreateTheorem*{remark*} -\numberwithin{equation}{highest} +\CreateTheorem{observation}<PJLthm@highest> +\CreateTheorem*{observation*} \fi +\numberwithin{equation}{PJLthm@highest} + \gappto{\PJLlang@langconfig@chinese}{% \crefname{equation}{式}{式}% \crefname{figure}{图}{图}% @@ -441,7 +578,7 @@ \Crefname{figure}{图}{图}% \Crefname{table}{表}{表}% \Crefname{appendix}{附录}{附录}% - \def\crefpairconjunction{~和~}% + \def\crefpairconjunction{、}% \def\crefmiddleconjunction{、}% \def\creflastconjunction{~和~}% \def\crefpairgroupconjunction{~和~}% @@ -458,7 +595,7 @@ \Crefname{figure}{圖}{圖}% \Crefname{table}{表}{表}% \Crefname{appendix}{附錄}{附錄}% - \def\crefpairconjunction{~與~}% + \def\crefpairconjunction{、}% \def\crefmiddleconjunction{、}% \def\creflastconjunction{~與~}% \def\crefpairgroupconjunction{~與~}% @@ -500,6 +637,23 @@ \def\creflastgroupconjunction{~и~}% \def\crefrangeconjunction{~\textasciitilde~}% } +\gappto{\PJLlang@langconfig@portuguese}{% + \crefname{equation}{eq.}{eqs.}% + \crefname{figure}{fig.}{figs.}% + \crefname{table}{tabela}{tabelas}% + \crefname{appendix}{apêndice}{apêndices}% + \Crefname{equation}{Eq.}{Eqs.}% + \Crefname{figure}{Fig.}{Figs.}% + \Crefname{table}{Tabela}{Tabelas}% + \Crefname{appendix}{Apêndice}{Apêndices}% + \def\crefpairconjunction{ e\nobreakspace}% + \def\crefmiddleconjunction{, }% + \def\creflastconjunction{ e\nobreakspace}% + \def\crefpairgroupconjunction{ e\nobreakspace}% + \def\crefmiddlegroupconjunction{, }% + \def\creflastgroupconjunction{ e\nobreakspace}% + \def\crefrangeconjunction{ a\nobreakspace}% +} \endinput %% diff --git a/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty b/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty index 899c9ed6866..3a0433a377e 100644 --- a/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty +++ b/Master/texmf-dist/tex/latex/projlib/PJLtoolkit.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{PJLtoolkit} - [2021/05/25 Collective interface of ProjLib Toolkit] + [2021/06/07 Collective interface of ProjLib Toolkit] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{ @@ -88,6 +88,7 @@ \if@PJLtoolkit@garamond \RequirePackage{amssymb} + \PassOptionsToPackage{lining}{ebgaramond} \RequirePackage{ebgaramond-maths} \RequirePackage{ebgaramond} % \RequirePackage{garamondlibre} @@ -96,7 +97,7 @@ \if@PJLtoolkit@biolinum \RequirePackage{amssymb} - \RequirePackage{mathpazo} + % \RequirePackage{mathpazo} % \RequirePackage[sansmath]{libertinust1math} \ifPDFTeX \RequirePackage{biolinum} @@ -110,6 +111,7 @@ BoldItalicFont = LinBiolinum_RBO.otf ] \fi \PJLsetlinespacing{\setstretch{1.05}} + \RequirePackage[italic,defaultmathsizes]{mathastext} \fi \fi |