diff options
author | Karl Berry <karl@freefriends.org> | 2021-10-16 20:43:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-10-16 20:43:40 +0000 |
commit | 504647ec476fa56a0dac017351bfd6ee5aa993c4 (patch) | |
tree | 1c34e71129f408446367ed3722a41029f5e59f11 /Master/texmf-dist/source/latex/projlib | |
parent | 589a84efe2cdf12b3412a73d2991c69d5de89953 (diff) |
projlib (16oct21)
git-svn-id: svn://tug.org/texlive/trunk@60779 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/projlib')
-rw-r--r-- | Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx | 12 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/projlib/ProjLib.dtx | 51 |
2 files changed, 44 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx index c5d10d507c1..62ba754afce 100644 --- a/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx +++ b/Master/texmf-dist/source/latex/projlib/ProjLib-doc.dtx @@ -107,25 +107,25 @@ %<*ProjLib-doc-cn> \title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南} \author{许锦文} -\thanks{对应版本.~~\texttt{\ProjLib{}~2021/08/19}} +\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{2021年8月,北京} +\date{2021年10月,巴黎} %</ProjLib-doc-cn> % %<*ProjLib-doc-en> \title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\ProjLib{}~2021/08/19}} +\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} %</ProjLib-doc-en> % %<*ProjLib-doc-fr> \title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\ProjLib{}~2021/08/19}} +\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{Août 2021, à Pékin} +\date{Octobre 2021, à Paris} %</ProjLib-doc-fr> \maketitle diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx index fd3b252e1ff..2d3f53d48be 100644 --- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx +++ b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx @@ -18,47 +18,47 @@ % %<*ProjLib> \ProvidesPackage{ProjLib} - [2021/08/19 The collective interface of ProjLib toolkit] + [2021/10/16 The collective interface of ProjLib toolkit] %</ProjLib> % %<*PJLauthor> \ProvidesPackage{PJLauthor} - [2021/08/19 Enhanced author information block] + [2021/10/16 Enhanced author information block] %</PJLauthor> % %<*PJLdate> \ProvidesPackage{PJLdate} - [2021/08/19 Convert yyyy-mm-dd to normal datetime format] + [2021/10/16 Convert yyyy-mm-dd to normal datetime format] %</PJLdate> % %<*PJLdraft> \ProvidesPackage{PJLdraft} - [2021/08/19 Some useful macros for the draft stage] + [2021/10/16 Some useful macros for the draft stage] %</PJLdraft> % %<*PJLlang> \ProvidesPackage{PJLlang} - [2021/08/19 Multi-language configuration] + [2021/10/16 Multi-language configuration] %</PJLlang> % %<*PJLlogo> \ProvidesPackage{PJLlogo} - [2021/08/19 The ProjLib logo] + [2021/10/16 The ProjLib logo] %</PJLlogo> % %<*PJLmath> \ProvidesPackage{PJLmath} - [2021/08/19 Useful math macros and shortcuts] + [2021/10/16 Useful math macros and shortcuts] %</PJLmath> % %<*PJLpaper> \ProvidesPackage{PJLpaper} - [2021/08/19 Paper style configuration] + [2021/10/16 Paper style configuration] %</PJLpaper> % %<*PJLthm> \ProvidesPackage{PJLthm} - [2021/08/19 Theorem setup and configuration] + [2021/10/16 Theorem setup and configuration] %</PJLthm> % %# 下面两行引入宏包的代码是所有文件共用的。 @@ -67,10 +67,6 @@ \RequirePackage{etoolbox} % %<*PJLauthor> -%# 在 AMS 文档类中不执行任何操作 -%# Do nothing if AMS class detected -\ifdefined\subjclass\endinput\fi - %# 这段代码定义了宏包中的选项。 %# This code defines the options in the package. \SetupKeyvalOptions{ @@ -84,6 +80,10 @@ %# Process options \ProcessKeyvalOptions*\relax +%# 在 AMS 文档类中不执行任何操作 +%# Do nothing if AMS class detected +\ifdefined\subjclass\endinput\fi + %%================================ %% Font and style %%================================ @@ -776,6 +776,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} @@ -2234,6 +2248,7 @@ \DeclareBoolOption[true]{regionalref} \DeclareBoolOption[false]{originalref} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -2305,6 +2320,16 @@ % A message can then be shown as: Font "(font name)" has been set \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} |