From 504647ec476fa56a0dac017351bfd6ee5aa993c4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Oct 2021 20:43:40 +0000 Subject: projlib (16oct21) git-svn-id: svn://tug.org/texlive/trunk@60779 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/projlib/PJLauthor.sty | 6 +++--- Master/texmf-dist/tex/latex/projlib/PJLdate.sty | 2 +- Master/texmf-dist/tex/latex/projlib/PJLdraft.sty | 2 +- Master/texmf-dist/tex/latex/projlib/PJLlang.sty | 16 +++++++++++++++- Master/texmf-dist/tex/latex/projlib/PJLlogo.sty | 2 +- Master/texmf-dist/tex/latex/projlib/PJLmath.sty | 2 +- Master/texmf-dist/tex/latex/projlib/PJLpaper.sty | 2 +- Master/texmf-dist/tex/latex/projlib/PJLthm.sty | 2 +- Master/texmf-dist/tex/latex/projlib/ProjLib.sty | 13 ++++++++++++- 9 files changed, 36 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/projlib') diff --git a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty index 9c19fb6a6f3..60de131930a 100644 --- a/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty +++ b/Master/texmf-dist/tex/latex/projlib/PJLauthor.sty @@ -17,11 +17,9 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{PJLauthor} - [2021/08/19 Enhanced author information block] + [2021/10/16 Enhanced author information block] \RequirePackage{kvoptions} \RequirePackage{etoolbox} -\ifdefined\subjclass\endinput\fi - \SetupKeyvalOptions{ family = @PJLauthor, prefix = @PJLauthor@, @@ -29,6 +27,8 @@ \DeclareBoolOption[false]{amsfashion} \ProcessKeyvalOptions*\relax +\ifdefined\subjclass\endinput\fi + %%================================ %% Font and style %%================================ diff --git a/Master/texmf-dist/tex/latex/projlib/PJLdate.sty b/Master/texmf-dist/tex/latex/projlib/PJLdate.sty index 37f86dd4e73..f9c10a3352d 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/08/19 Convert yyyy-mm-dd to normal datetime format] + [2021/10/16 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 ae4e2284ce3..1baaa0dadad 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/08/19 Some useful macros for the draft stage] + [2021/10/16 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 f3ba03d344b..fb60c01520e 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/08/19 Multi-language configuration] + [2021/10/16 Multi-language configuration] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -222,6 +222,20 @@ \if@PJLlang@enable@FR \frenchsetup{PartNameFull=false} \fi + \if@PJLlang@enable@PT + \let\PJL@babelord\ord + \let\ord\relax + \AtBeginDocument{ + \@ifundefined{ord}{} + { + \let\PJL@userord\ord + \let\ord\relax + \newcommand{\ord}{% + \ifmmode\expandafter\PJL@userord\else\expandafter\PJL@babelord\fi% + } + } + } + \fi \babelprovide{schinese} \babelprovide{tchinese} diff --git a/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty b/Master/texmf-dist/tex/latex/projlib/PJLlogo.sty index 322e0023105..8540e0482cf 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/08/19 The ProjLib logo] + [2021/10/16 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 1318605ee63..4a490a372cd 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/08/19 Useful math macros and shortcuts] + [2021/10/16 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 67f105ba34f..d6f41498150 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/08/19 Paper style configuration] + [2021/10/16 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 262a45f806f..5349ec79c22 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/08/19 Theorem setup and configuration] + [2021/10/16 Theorem setup and configuration] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 40d9f2d9bec..930106ca211 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/08/19 The collective interface of ProjLib toolkit] + [2021/10/16 The collective interface of ProjLib toolkit] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{ @@ -35,6 +35,7 @@ \DeclareBoolOption[true]{regionalref} \DeclareBoolOption[false]{originalref} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -91,6 +92,16 @@ \ifdefined\PJL@font@alreadyset\else +\if@ProjLib@lmodern + \RequirePackage{amssymb} + \if@ProjLib@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@ProjLib@palatino % \RequirePackage{amssymb} \RequirePackage{mathpazo} -- cgit v1.2.3