diff options
author | Norbert Preining <norbert@preining.info> | 2021-10-25 03:03:38 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-10-25 03:03:38 +0000 |
commit | ce07680b939eecc96f42a3ee4e777c5c183503de (patch) | |
tree | 7128b5cbde1df1ccd06fd06c861b799ae335f835 /macros | |
parent | 40f406b1e0017bdecc0890738274fc8e88c08486 (diff) |
CTAN sync 202110250303
Diffstat (limited to 'macros')
59 files changed, 410 insertions, 231 deletions
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index e44367a8ca..52dd155072 100644 --- a/macros/latex/contrib/colorist/colorart.cls +++ b/macros/latex/contrib/colorist/colorart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorart} - [2021/08/11 A colorful article style] + [2021/10/23 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -120,6 +127,16 @@ \fi \RequirePackage{amssymb} +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls index e07b345a91..e2064dd0ee 100644 --- a/macros/latex/contrib/colorist/colorbook.cls +++ b/macros/latex/contrib/colorist/colorbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorbook} - [2021/08/11 A colorful book style] + [2021/10/23 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -120,6 +127,16 @@ \fi \RequirePackage{amssymb} +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf Binary files differindex b803b85010..763ab08460 100644 --- a/macros/latex/contrib/colorist/colorist-doc.pdf +++ b/macros/latex/contrib/colorist/colorist-doc.pdf diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex index c6da8832a0..321a22d5b7 100644 --- a/macros/latex/contrib/colorist/colorist-doc.tex +++ b/macros/latex/contrib/colorist/colorist-doc.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\colorist{}}\\write your articles or books in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\colorist{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\colorist{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle @@ -656,6 +656,7 @@ The author information can contain multiple groups, written as: Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important. \bigskip +\clearpage \LevelOneTitle{Known issues} \begin{itemize}[itemsep=.6em] diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty index 348f23ee1a..13aadd2605 100644 --- a/macros/latex/contrib/colorist/colorist.sty +++ b/macros/latex/contrib/colorist/colorist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{colorist} - [2021/08/11 A colorful style for articles and books] + [2021/10/23 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -391,12 +391,12 @@ \RequirePackage{enumitem} \setlist{noitemsep} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label = \arabic*., - ref = \arabic*} -\setlist[enumerate,2]{label = \emph{\alph*}), - ref = \theenumi.\emph{\alph*}} -\setlist[enumerate,3]{label = (\roman*), - ref = \theenumii.\roman*} +\setlist[enumerate,1]{label=\arabic*$)$, + ref = \arabic*$)$} +\setlist[enumerate,2]{label=\emph{\roman*}$)$, + ref = \arabic{enumi}.\emph{\roman*}$)$} +\setlist[enumerate,3]{label=\emph{\alph*}$)$, + ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} \setlist[itemize]{leftmargin=*} diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 2872218cb2..325fce01e5 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/10/21}{1.40A} +\ProvidesExplClass{easybook}{2021/10/21}{1.40B} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -34,7 +34,7 @@ enmode .meta:n = { newline,scheme = plain }, font .choices:nn = - { noto,garamond,times,libertine,palatino,auto } + { noto,garamond,times,times*,libertine,palatino,auto } { \tl_set:Nn \l__eb_font_choice_tl {#1} }, font .value_required:n = true, font .initial:n = auto, @@ -169,6 +169,12 @@ Ligatures = CommonOff } } +\cs_new_protected:cpn { eb@font@load@times* } + { + \eb_setmainfont:nn { Times~New~Roman } { } + \eb_setsansfont:nn { Arial } { } + \eb_setmonofont:nn { Courier~New } { } + } \cs_new_protected:Npn \eb_font_load_libertinus_sans: { \eb_setsansfont:nn { LibertinusSans } @@ -319,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/10/21}{1.40A} +\ProvidesExplPackage{easybase}{2021/10/21}{1.40B} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -887,7 +893,7 @@ \clist_new:N \l__eb_footnote_mulchoice_clist \ctex_define:nn { hdrset } { - fnindent .dim_set:N = \footnoteindent, + fnindent .dim_set:N = \footindent, fnindent .initial:n = 0.75em, fnparskip .skip_set:N = \footparskip, fnparskip .initial:n = 0ex, @@ -995,8 +1001,8 @@ { \hbox_set:Nn \l_tmpa_box { - \dim_compare:nNnTF { \footnoteindent } > { 0pt } - { \hbox_to_wd:nn { \footnoteindent } { \eb@makefnmark\hss } } + \dim_compare:nNnTF { \footindent } > { 0pt } + { \hbox_to_wd:nn { \footindent } { \eb@makefnmark\hss } } { \eb@makefnmark } } \dim_set:Nn \leftmargin { \box_wd:N \l_tmpa_box } @@ -1012,19 +1018,19 @@ { \noindent \clist_if_in:NnT \l__eb_footnote_mulchoice_clist { flush } - { \dim_zero:N \footnoteindent } - \int_case:nn { \dim_sign:V \footnoteindent } + { \dim_zero:N \footindent } + \int_case:nn { \dim_sign:V \footindent } { { 1 } { \use_i:nnn } { 0 } { \use_ii:nnn } { -1 } { \use_iii:nnn } } - { \hbox_to_wd:nn { \footnoteindent } { \hss\eb@makefnmark } } + { \hbox_to_wd:nn { \footindent } { \hss\eb@makefnmark } } { \hbox_overlap_left:n { \eb@makefnmark } } { \hbox_overlap_left:n { - \hbox_to_wd:nn { -\footnoteindent } + \hbox_to_wd:nn { -\footindent } { \eb@makefnmark\hss } } } @@ -2459,7 +2465,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.40A} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.40B} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 6e88bcf6af..eb2b716b0c 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 4bb1025dcb..86cb8e5722 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -9,9 +9,9 @@ \definecolorscheme{blue} { cs => purple, - option => cnltxgreen, - cnltx => cnltxblue, - link => cnltxblue, + option => teal, + cnltx => Blue, + link => magenta, module => violet, meta => black } @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40A, + version = v1.40B, date = 2021/10/21, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -37,20 +37,20 @@ } \KOMAoptions{headsepline = 0.6pt,numbers = noenddot} \setfootnoterule[0.6pt]{0.4\columnwidth} -\addtokomafont{headsepline}{\color{cnltxblue}} -\addtokomafont{footnoterule}{\color{cnltxblue}} +\addtokomafont{headsepline}{\color{Blue}} +\addtokomafont{footnoterule}{\color{Blue}} \addtokomafont{section}{\normalfont\sffamily} \addtokomafont{subsection}{\normalfont\sffamily} \addtokomafont{subsubsection}{\normalfont\sffamily} \DeclareTOCStyleEntry[entryformat = \sffamily]{default}{section} \geometry{margin = 1in,marginparwidth = 0.65in} \setlist{nosep,labelindent = \parindent,leftmargin = *,labelsep = 0.5em} -\setlist[itemize,1]{label = \small\color{cnltxblue}\textbullet} +\setlist[itemize,1]{label = \small\color{Blue}\textbullet} \setcounter{tocdepth}{2} \ExplSyntaxOn\makeatletter \NewDocumentCommand{\passto}{smm} - {\IfBooleanF{#1}{\color{cnltxblue}}#3\ifblank{#2}{}{\ttfamily[#2]}} + {\IfBooleanF{#1}{\color{Blue}}#3\ifblank{#2}{}{\ttfamily[#2]}} \newcommand{\splitmeta}[2][\code{,}] { \clist_clear:N \l_tmpa_clist @@ -98,7 +98,7 @@ \DefineVerbatimEnvironment{frameverb}{Verbatim} { baselinestretch = 1.2,gobble = 2,fontsize = \small, - rulecolor = \color{cnltxblue},framerule = 0.6pt, + rulecolor = \color{Blue},framerule = 0.6pt, frame = single,framesep = 10pt, listparameters = { @@ -109,7 +109,7 @@ \DefineVerbatimEnvironment{ctexexam}{Verbatim} { baselinestretch = 1.2,gobble = 2,fontsize = \small, - rulecolor = \color{cnltxblue},framerule = 0.6pt, + rulecolor = \color{Blue},framerule = 0.6pt, frame = single,framesep = 10pt, label = \rule{0pt}{12pt}\textnormal{\bfseries 例 \arabic{ctexexam}}, listparameters = @@ -211,14 +211,14 @@ \subsection{英文字体} \begin{options} - \keychoice{font}{noto,garamond,times,libertine,palatino,auto}\Default{auto} + \keychoice{font}{noto,garamond,times,times*,libertine,palatino,auto}\Default{auto} 预置的英文字体相关配置方案如下表所示,这些字体已经包含在了 \TeX Live 发行版中,所以通常不需要再专门安装。如果您想使用其他英文字体,可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。 \begin{center} \begin{tblr} { colspec = @{}*{4}{c}@{}, - hline{1,7} = {1pt,cnltxblue}, - hline{2} = {0.6pt,cnltxblue}, + hline{1,8} = {1pt,Blue}, + hline{2} = {0.6pt,Blue}, row{1} = {font = \sffamily}, column{1} = {cmd = \code} } @@ -226,8 +226,9 @@ noto & Noto Serif & Noto Sans & Noto Sans Mono \\ garamond & EB Garamond & Libertinus Sans & LM Mono \\ palatino & TG Pagella & Libertinus Sans & LM Mono \\ - libertine & TG Pagella & Libertinus Sans & LM Mono \\ - times & XITS & TG Heros & TG Cursor + libertine & Libertinus Serif & Libertinus Sans & LM Mono \\ + times & XITS & TG Heros & TG Cursor \\ + times* & Times New Roman & Arial & Courier New \end{tblr} \end{center} \end{options} @@ -282,7 +283,7 @@ \opt{section}\Default! 使当前目录标题按照 \code{section} 节级别输出。 \keybool{multoc}\Default{false} - 与 \module*{style/}\option{multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否多栏排版,栏数默认为双栏,可使用 \option{columns} 更改。 + 与 \module*{style} 模块的 \option{multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否多栏排版,栏数默认为双栏,可使用 \option{columns} 更改。 \keyval-{columns}{目录栏数}\Default{2} 设置目录的栏数,仅在 \keyis-{multoc}{true} 时有效,默认为双栏。 \kvsplit{title}{中文目录标题,英文目录标题}\newline @@ -329,7 +330,7 @@ \command{sub}[\sarg\oarg{垂直偏移}\splitoarg{高度,深度}\darg{格式代码}\marg{内容}\oarg{水平偏移}] 下标命令,与简短命令 \cs{sp} 等效。水平和垂直偏移为正值时代表向下或向右移动,否则相反。其它用法和参数与上标命令 \cs{super} 类似。 \command{supersub}[\sarg\oarg{间距}\darg{对齐方式}\marg{上标内容}\marg{下标内容}\oarg{水平偏移}\splitdarg{上标代码,下标代码}] - 同时输出上标和下标的命令,与简短命令 \cs{spb} 等效。\meta{间距} 为上下标的垂直间距,\meta{对齐方式} 是下标的水平对齐方式,参数与 \module*{style/}\option{supersubalign} 相同,\meta{水平偏移} 默认为 \code{0pt}。 + 同时输出上标和下标的命令,与简短命令 \cs{spb} 等效。\meta{间距} 为上下标的垂直间距,\meta{对齐方式} 是下标的水平对齐方式,参数与 \option{supersubalign} 相同,\meta{水平偏移} 默认为 \code{0pt}。 \end{commands} \section{接口选项} @@ -341,9 +342,9 @@ \begin{tblr} { colspec = @{}*{5}{c}@{}, - hline{1,5} = {1pt,cnltxblue}, - hline{3} = {0.6pt,cnltxblue}, - row{1,3} = {font = \sffamily}, + hline{1,5} = {1pt,Blue}, + hline{3} = {0.6pt,Blue}, + row{1,3} = {font = \sffamily,belowsep = 0pt}, row{2,4} = {cmd = \module*} } \hyperref[subsec:style]{风格} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{行距} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{参考文献} \\ @@ -353,7 +354,7 @@ \end{tblr} \end{center} - 例如使用下面小节 \ref{subsec:style} 介绍的风格 \module*{style} 模块,路径名与所属下级选项之间可以 \code{/} 或 \code{=} 号分开,符号后不能有空格或者换行: + 例如使用下面小节 \ref{subsec:style} 介绍的风格 \module*{style} 模块,路径名与所属下级选项之间可以 \code{/} 或 \code{=} 号分开,斜线 \code{/} 后不能有空格或者换行: \begin{ctexexam} \ctexset { @@ -528,7 +529,7 @@ \end{options} \end{commands} -可能一些情况下您希望更加灵活地设置参考文献或有更多需求,下面举一个在导言区手动配置 \pkg*{biblatex} 宏包的例子: +可能在一些情况下您希望更加灵活地设置参考文献或有更多需求,下面举一个在导言区手动配置 \pkg*{biblatex} 宏包的例子: \begin{ctexexam} \usepackage[style = numeric]{biblatex} \addbibresource{myrefs.bib} @@ -639,7 +640,7 @@ \subsection{页眉页脚} \label{subsec:header and footer} -模块 \module*{hdrset} 设置的命令由 \pkg*{fancyhdr} 宏包提供支持。在 \cls*{book} 模式时使用章节标题标记选项 \option{chap-mark} 和 \option{sec-mark},在 \cls*{article} 模式时使用 \option{sec-mark} 和 \option{subsec-mark} 选项,这与标准文档类的行为一致。标题标记由标签和标题组成,选项中参数 \code{\#1} 代表当前章、节或小节的标题。也可以直接重新定义这些选项对应的标题标记命令,但此时标记大写选项 \module*{style/}\option{uppercase} 失效。 +模块 \module*{hdrset} 设置的命令由 \pkg*{fancyhdr} 宏包提供支持。在 \cls*{book} 模式时使用章节标题标记选项 \option{chap-mark} 和 \option{sec-mark},在 \cls*{article} 模式时使用 \option{sec-mark} 和 \option{subsec-mark} 选项,这与标准文档类的行为一致。标题标记由标签和标题组成,选项中参数 \code{\#1} 代表当前章、节或小节的标题。也可以直接重新定义这些选项对应的标题标记命令,但此时标记大写选项 \option{uppercase} 失效。 \begin{options} \keyval-{headfoot}{页眉页脚代码}\Module{hdrset} 设置页眉页脚的格式,使用 \pkg*{fancyhdr} 支持的 \cs*{fancyhead} 和 \cs*{fancyhead} 等命令,或在正文中使用这些命令改变其后的页面风格。 @@ -663,7 +664,7 @@ \kvsplit-{subsec-label}{\oarg{数字输出命令}\marg{距离命令}}\Default{\cs*{hspace}\Carg{0.5em}} 标题标记命令内容 \cs*{subsectionmark} 的标签,用法与 \option{chap-label} 类似。 \keyval-{headrule}{横线命令} - 绘制页眉横线的选项,可以使用 \cs*{hrule}、\cs*{rule} 或下述 \cs{markrule} 等画线命令来绘制横线。手动绘制横线时线条粗细选项 \module*{style/}\option{rulewidth} 会失效。 + 绘制页眉横线的选项,可以使用 \cs*{hrule}、\cs*{rule} 或下述 \cs{markrule} 等画线命令来绘制横线。手动绘制横线时线条粗细选项 \option{rulewidth} 会失效。 \keyval-{footrule}{横线命令}\Default 绘制页脚横线的选项,可以使用 \cs*{hrule}、\cs*{rule} 或下述 \cs{markrule} 等画线命令来绘制横线。 \keyval-{footnoterule}{横线命令} @@ -702,18 +703,18 @@ \subsubsection{脚注格式} 模块 \module*{hdrset} 还可以灵活调整脚注编号和内容的格式。格式主要包括脚注标记的编号类型、字体、附加符号、对齐方式和缩进距离等,以及脚注内容的首行缩进、行距和字体等。基本思想是默认脚注和自定义编号脚注标记的格式分离,两种类型脚注各自正文和内容的标记又共享格式,默认脚注中正文和内容标记的编号类型分离。 \begin{options} - \keyval-{fnindent}{刚性长度}\Module{hdrset}\Default{0.75em} - 脚注内容首段缩进距离,等于长度 \cs{footnoteindent} 的值。 - \keyval-{fnparskip}{弹性长度}\Default{0ex} - 脚注段落间距,等于长度 \cs{footparskip} 的值。 - \keyval-{fnparindent}{刚性长度}\Default{2em} - 脚注段落缩进,等于长度 \cs{footparindent} 的值。 - \keychoice{footnotetype}{hang,default,flush,bottom}\Default{hang} + \keychoice{footnotetype}{hang,default,flush,bottom}\Module{hdrset}\Default{hang} 脚注的类型,悬挂缩进 \code{hang} 是默认值,\code{default} 是原始的类型,在一些浮动体排版的情况下,脚注可能位于页面中间,\code{bottom} 使脚注始终位于页面底端,\code{flush} 使脚注内容标记位于脚注首行边缘外侧并右对齐。其中 \code{bottom} 是复合选项,可以与前三种类型重复或复合使用: \begin{ctexexam} \hdrset{footnotetype = default,footnotetype = bottom} \hdrset{footnotetype = {hang,bottom}} \end{ctexexam} + \keyval-{fnindent}{刚性长度}\Default{0.75em} + 脚注内容首段缩进距离,等于长度 \cs{footindent} 的值。 + \keyval-{fnparskip}{弹性长度}\Default{0ex} + 脚注段落间距,等于长度 \cs{footparskip} 的值。 + \keyval-{fnparindent}{刚性长度}\Default{2em} + 脚注段落缩进,等于长度 \cs{footparindent} 的值。 \keychoice{fntext-pos}{normal,super}\Default{super} 设置脚注内容标记的位置,正常文本或是上标形式。 \keychoice{fnmark-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain} @@ -747,9 +748,9 @@ \keychoice{fncust-form}{format code,match}\Default 单独设定自定义脚注标记的格式,\code{match} 可以匹配 \option*{super-format} 全局的值。自定义脚注的命令与用法见小节 \ref{subsubsec:custom footnotes}。 \keychoice{fnboth-form}{format code,match}\Default - 同时设定默认脚注标记 \option{fnmate-form} 和自定义脚注标记 \option{fncust-form} 的格式。两种脚注标记匹配上标格式 \option*{super-format} 的值是独立的,使用 \code{match} 则可以同时匹配。标记格式选项含有字体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注标记。 + 同时设定默认脚注标记 \option{fnmate-form} 和自定义脚注标记 \option{fncust-form} 的格式。两种脚注标记匹配上标格式 \option*{super-format} 的值是独立的,使用 \code{match} 则可以同时匹配。标记格式选项含有字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注标记。 \keyval-{fnpara-form}{格式代码}\Default - 脚注内容的格式,在此设置字体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注内容。 + 脚注内容的格式,在此设置字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注内容。 \kvsplit{fntext-code}{前代码,后代码}\newline 可以用 \meta{前代码} 与 \meta{后代码} 额外增加脚注内容标记前后的代码,也可以只有前部分,\meta{前代码} 中最后一个格式命令可以带有一个参数接受脚注内容标记。由于脚注标记处于水平模式,一般用于在脚注内容标记与脚注首行间插入一点距离,或与脚注正文标记的格式稍有不同。 \begin{ctexexam} @@ -853,7 +854,7 @@ } Alpha & Beta & Gamma & Delta \\ Epsilon & Zeta & Eta & Theta \\ - Iota & Kappa & \SetCell[r=2]{h,c,Cyan}Lambda & Mu \\ + Iota & Kappa & \SetCell[r = 2]{h,c,Cyan}Lambda & Mu \\ Nu & Xi & Omicron & Pi \\ Rho & Sigma & Tau & Upsilon \end{tblr} @@ -900,13 +901,13 @@ \environment{example}\default{} \environment{remark}\default{} \environment{proof} - 这些是预置的定理环境,可使用选项 \module*{thmset/}\option{thmframe} 为它们添加盒子边框,其中注与证明环境不编号,证明末尾会自动添加证明结束符,声明新的定理环境或更改定理盒子样式见小节 \ref{subsec:theorem of style}。环境名与之对应的定理名如下: + 这些是预置的定理环境,可使用选项 \option{thmframe} 为它们添加盒子边框,其中注与证明环境不编号,证明末尾会自动添加证明结束符,声明新的定理环境或更改定理盒子样式见小节 \ref{subsec:theorem of style}。环境名与之对应的定理名如下: \begin{center} \begin{tblr} { colspec = @{}*{8}{c}@{}, - hline{1,3} = {1pt,cnltxblue}, - hline{2} = {0.6pt,cnltxblue}, + hline{1,3} = {1pt,Blue}, + hline{2} = {0.6pt,Blue}, row{1} = {font = \sffamily}, row{2} = {cmd = \env} } @@ -982,9 +983,9 @@ \begin{options} \keyval-{color}{标题背景颜色名}\Default{DeepSkyBlue} 习题标题盒子背景颜色,可以使用 \pkg*{xcolor} 自定义颜色或使用色库。 - \keyval-{title}{环境标题}\Default{习题} + \keyval-{title}{环境标题} 习题的标题,可以匹配中英文模式,习题环境使用 \parg{} 参数时无效。 - \keyval-{number}{习题编号格式}\Default{\Carg{1.}} + \keyval-{number}{习题编号格式}\Default{1.} 标题编号输出选项 \option{number} 为短编号形式,应当包含 \code{A}、\code{a}、\code{I}、\code{i}、或 \code{1} 其中一个符号。 \keyval-{numsep}{编号与标题的间距}\Default{0.5em} 习题标题编号与后方标题文本的间距,习题环境使用星号参数时无效。 diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf Binary files differindex 4beabecc19..3f494eeb60 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.pdf +++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex index 6238f7b93b..594fc99d4e 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/minimalist/minimalist-doc.tex @@ -98,9 +98,9 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 1892b05e4a..953342a21c 100644 --- a/macros/latex/contrib/minimalist/minimalist.sty +++ b/macros/latex/contrib/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/08/11 A simple and clear style for articles and books] + [2021/10/23 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -482,13 +482,20 @@ \RequirePackage{enumitem} \setlist{noitemsep} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label = \arabic*., - ref = \arabic*} -\setlist[enumerate,2]{label = \emph{\alph*}), - ref = \theenumi.\emph{\alph*}} -\setlist[enumerate,3]{label = (\roman*), - ref = \theenumii.\roman*} +\setlist[enumerate,1]{label=\arabic*$)$, + ref = \arabic*$)$} +\setlist[enumerate,2]{label=\emph{\roman*}$)$, + ref = \arabic{enumi}.\emph{\roman*}$)$} +\setlist[enumerate,3]{label=\emph{\alph*}$)$, + ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} +\if@minimalist@classical +\newcommand\desculine{\bgroup\markoverwith{\color{maintext!27!paper}% + \rule[-.45ex]{2pt}{.75pt}}\ULon} +\renewcommand{\descriptionlabel}[1]{% + \hspace{\labelsep}\normalfont\desculine{#1}% +} +\fi \setlist[itemize]{leftmargin=*} \gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index b35e37468c..11e5e07d42 100644 --- a/macros/latex/contrib/minimalist/minimart.cls +++ b/macros/latex/contrib/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/08/11 A simple and clear article style] + [2021/10/23 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -127,6 +134,16 @@ \fi \RequirePackage{amssymb} +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index 0c50b2bb81..e7bb0d8bb8 100644 --- a/macros/latex/contrib/minimalist/minimbook.cls +++ b/macros/latex/contrib/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/08/11 A simple and clear book style] + [2021/10/23 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -127,6 +134,16 @@ \fi \RequirePackage{amssymb} +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf Binary files differindex a04f15a286..20cd5582ec 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf Binary files differindex 01e1ac5682..0e28bd0987 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf Binary files differindex 092e9a985e..969e963359 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc.dtx b/macros/latex/contrib/projlib/ProjLib-doc.dtx index 62ba754afc..56c34a01a1 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc.dtx +++ b/macros/latex/contrib/projlib/ProjLib-doc.dtx @@ -107,7 +107,7 @@ %<*ProjLib-doc-cn> \title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南} \author{许锦文} -\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/16}} +\thanks{对应版本.~~\texttt{\ProjLib{}~2021/10/24}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{2021年10月,巴黎} %</ProjLib-doc-cn> @@ -115,7 +115,7 @@ %<*ProjLib-doc-en> \title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/16}} +\thanks{Corresponding to: \texttt{\ProjLib{}~2021/10/24}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{October 2021, Paris} %</ProjLib-doc-en> @@ -123,7 +123,7 @@ %<*ProjLib-doc-fr> \title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/16}} +\thanks{Correspondant à : \texttt{\ProjLib{}~2021/10/24}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{Octobre 2021, à Paris} %</ProjLib-doc-fr> diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 2d3f53d48b..27f8619edb 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -18,47 +18,47 @@ % %<*ProjLib> \ProvidesPackage{ProjLib} - [2021/10/16 The collective interface of ProjLib toolkit] + [2021/10/24 The collective interface of ProjLib toolkit] %</ProjLib> % %<*PJLauthor> \ProvidesPackage{PJLauthor} - [2021/10/16 Enhanced author information block] + [2021/10/24 Enhanced author information block] %</PJLauthor> % %<*PJLdate> \ProvidesPackage{PJLdate} - [2021/10/16 Convert yyyy-mm-dd to normal datetime format] + [2021/10/24 Convert yyyy-mm-dd to normal datetime format] %</PJLdate> % %<*PJLdraft> \ProvidesPackage{PJLdraft} - [2021/10/16 Some useful macros for the draft stage] + [2021/10/24 Some useful macros for the draft stage] %</PJLdraft> % %<*PJLlang> \ProvidesPackage{PJLlang} - [2021/10/16 Multi-language configuration] + [2021/10/24 Multi-language configuration] %</PJLlang> % %<*PJLlogo> \ProvidesPackage{PJLlogo} - [2021/10/16 The ProjLib logo] + [2021/10/24 The ProjLib logo] %</PJLlogo> % %<*PJLmath> \ProvidesPackage{PJLmath} - [2021/10/16 Useful math macros and shortcuts] + [2021/10/24 Useful math macros and shortcuts] %</PJLmath> % %<*PJLpaper> \ProvidesPackage{PJLpaper} - [2021/10/16 Paper style configuration] + [2021/10/24 Paper style configuration] %</PJLpaper> % %<*PJLthm> \ProvidesPackage{PJLthm} - [2021/10/16 Theorem setup and configuration] + [2021/10/24 Theorem setup and configuration] %</PJLthm> % %# 下面两行引入宏包的代码是所有文件共用的。 @@ -885,8 +885,13 @@ \newcommand{\PJLsetCJKlinespacing}[1]{\renewcommand{\PJL@config@CJKlinespacing}{#1}} %# 缩进的设置 %# Parindent configuration -\def\PJL@config@parindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{1.5em}}} -\def\PJL@config@CJKparindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{2em}}} +\@ifclassloaded{beamer}{ + \def\PJL@config@parindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{0em}}} + \def\PJL@config@CJKparindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{0em}}} +}{ + \def\PJL@config@parindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{1.5em}}} + \def\PJL@config@CJKparindent{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{2em}}} +} \newcommand{\PJLsetparindent}[1]{\renewcommand{\PJL@config@parindent}{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{#1}}}} \newcommand{\PJLsetCJKparindent}[1]{\renewcommand{\PJL@config@CJKparindent}{\ltx@ifpackageloaded{parskip}{}{\setlength{\parindent}{#1}}}} %# 合并设置 @@ -1415,6 +1420,11 @@ \@PJLthm@regionalreftrue \fi +\@ifclassloaded{beamer}{% + \RequirePackage{silence} + \WarningFilter{cleveref}{hyperref package loaded with implicit=false option} +}{} + \RequirePackage{PJLlang} \RequirePackage{amsmath,amsthm} \RequirePackage{aliascnt} @@ -1717,6 +1727,9 @@ { 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 } diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README index f708f32afa..6ecb431970 100644 --- a/macros/luatex/generic/luatexja/README +++ b/macros/luatex/generic/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20210918.0 +The LuaTeX-ja Package 20211024.0 -------------------------------- Copyright (c) 2011--2021 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -42,9 +42,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20210918.0 in the Git repository by + or tagged as 20211024.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20210918.0;sf=tgz> + ;a=snapshot;h=refs/tags/20211024.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -93,4 +93,4 @@ Notes This file and ltj-kinsoku.lua are not used anymore. (Do not remove ltj-kinsoku.tex.) -Last commit date: Sat Sep 18 21:01:24 2021 +0900 +Last commit date: Sun Oct 24 13:28:03 2021 +0900 diff --git a/macros/luatex/generic/luatexja/doc/ltjclasses.pdf b/macros/luatex/generic/luatexja/doc/ltjclasses.pdf Binary files differindex bbae89d4e1..a199f6baef 100644 --- a/macros/luatex/generic/luatexja/doc/ltjclasses.pdf +++ b/macros/luatex/generic/luatexja/doc/ltjclasses.pdf diff --git a/macros/luatex/generic/luatexja/doc/ltjltxdoc.pdf b/macros/luatex/generic/luatexja/doc/ltjltxdoc.pdf Binary files differindex ebbd0df0c6..37de253554 100644 --- a/macros/luatex/generic/luatexja/doc/ltjltxdoc.pdf +++ b/macros/luatex/generic/luatexja/doc/ltjltxdoc.pdf diff --git a/macros/luatex/generic/luatexja/doc/ltjsclasses.pdf b/macros/luatex/generic/luatexja/doc/ltjsclasses.pdf Binary files differindex f599de9221..2c2a923de9 100644 --- a/macros/luatex/generic/luatexja/doc/ltjsclasses.pdf +++ b/macros/luatex/generic/luatexja/doc/ltjsclasses.pdf diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf Binary files differindex 146c837511..6f4ce08e8a 100644 --- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf +++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf Binary files differindex 299097de2d..cc188cb9d0 100644 --- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf +++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf Binary files differindex e3cea8d738..2dce1034fc 100644 --- a/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf +++ b/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx index 4b1dd88c84..46106f0930 100644 --- a/macros/luatex/generic/luatexja/doc/luatexja.dtx +++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx @@ -2657,69 +2657,23 @@ is controlled by the lowermost bit of the \Param{kcatcode} parameter. %</ja> %<*en> -Default setting of \cs{catcode} of Unicode characters are located in -\begin{description} - \item[plain \LuaTeX] \texttt{luatex-unicode-letters.tex}, which is based on \texttt{unicode-letters.tex} -(for \XeTeX). - \item[\LuaLaTeX] now included in \LaTeX\ kernel as~\texttt{unicode-letters.def}. -\end{description} -However, the default setting of \cs{catcode} differs -between \XeTeX\ and \LuaTeX, by the following reasons: -\begin{itemize} - \item (plain format) \texttt{luatex-unicode-letters.tex} is based on old \texttt{unicode-letters.tex}. - \item The latter half of \texttt{unicode-letters.tex}~and~\texttt{unicode-letters.def} -sets\cs{catcode} of several characters to 11, via setting \cs{XeTeXcharclass}. -However, this latter half does not exist (plain case), or not executed (\LaTeX~case) in \LuaTeX. -\end{itemize} -In other words, -\begin{description} -\item[plain \LuaTeX] -Kanji nor kana characters cannot be used in -a control word, in the default setting of plain \LuaTeX. -\item[\LuaLaTeX] -In recent (2015-10-01 or later) \LuaLaTeX, Kanji and kana characters in a control word is supported (these catcode are 11), -but not fullwidth alphanumerics and several other characters. -\end{description} - -This would be inconvenient for \pTeX~users to shifting to \LuaTeX-ja, -since several control words containing Kanji or other fullwidth characters, such as -\cs{西暦}~or~\cs{1年目西暦} are used in \pTeX. -Hence, \LuaTeX-ja have a counterpart of \texttt{unicode-letters.tex} -for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} +Default setting of \cs{catcode} of Unicode characters with \LuaTeX\ is slightly inconvenient +for \pTeX~users to shifting to \LuaTeX-ja, +because several fullwidth characters which can be used in a control word with \pTeX, +such as ``\texttt{1}''~(FULLWIDTH DIGIT ONE), cannnot be used in a control word with \LuaTeX. +Hence, \LuaTeX-ja changes the \cs{catcode} of some characters% +---whose line breaking class is ``ID''~(Ideographic) in UAX~\#14---, +to allow these characters in the control word. %</en> %<*ja> -ネイティブにUnicode全部の文字を扱える\XeTeX や\LuaTeX では, -文字が制御綴内で使用できるかは通常の欧文文字と同じく\cs{catcode}% -で指定することとなる.plain \XeTeX における\cs{catcode}の初期設定は% -\texttt{unicode-letters.tex}中に記述されており,plain \LuaTeX ではそれを -元にした\texttt{luatex-unicode-letters.tex}を用いている. -\LaTeX では\cs{catcode}の設定はカーネルに\texttt{unicode-letters.def}として統合され. -このファイルを\XeLaTeX, \LuaLaTeX の両方が用いている. +最近の(2015-10-01以降の)\LuaLaTeX では漢字や仮名を制御綴内に +使用することが可能であるが,全角英数字は使用できない. +これでは\pTeX で使用できた\cs{1年目西暦}\footnote{科研費\LaTeX で使用されているそうです.}などが使えないため, +\LuaTeX-jaへの移行で手間が生じることになる. -だが,\XeTeX における\cs{catcode}の初期設定と -\LuaTeX におけるそれは一致していない: -\begin{itemize} - \item \texttt{luatex-unicode-letters.tex} の元になった - \texttt{unicode-letters.tex}が古い - \item \texttt{unicode-letters.tex} 後半部や\texttt{unicode-letters.def}後半部では -\cs{XeTeXcharclass}の設定を行なっており, -それによって漢字や仮名,および全角英数字の\cs{catcode}が11に設定されている. -しかし,\texttt{luatex-unicode-letters.tex}ではこの「後半部」が -まるごと省略されており,また\LuaLaTeX でも\texttt{unicode-letters.def}後半部は実行されな - い. -\end{itemize} -言い換えると, -\begin{description} - \item[plain \LuaTeX] 漢字や仮名を制御綴内に -使用することはできない. - \item[\LuaLaTeX] 最近の(2015-10-01以降の) -\LuaLaTeX では漢字や仮名を制御綴内に -使用することが可能になったが,全角英数字は相変わらず使用できない, -\end{description} -これでは\pTeX で使用できた\cs{1年目西暦}\footnote{科研費\LaTeX で使用されているそうです.}などが使えないこととなり, -\LuaTeX-jaへの移行で手間が生じる.そのため,\LuaTeX-jaでは -\texttt{unicode-letters.tex}の後半部にあたる内容を自前でパッチし, -結果として\emph{\XeTeX における初期設定と同じになるようにしている.} +そのため,\LuaTeX-jaでは全角英数字など一部の文字 +\footnote{正確には,Unicodeの行分割アルゴリズム(UAX~\#14)で``ID''~(Ideographic)と指定されている文字.}の +\cs{catcode}を11に変更し,これらの文字を制御綴中で使用可能にしている. %</ja> \begin{table} @@ -2731,7 +2685,7 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} \def\D#1#2#3#4{% {\fboxsep0pt\fcolorbox{cyan}{white}% {\large\char"#1#2#3#4}}\ (\texttt{U+#1#2#3#4})} %" -\leavevmode\hbox to 0pt{\hss\begin{tabular}{cccccc} +\leavevmode\hbox to 0pt{\hss\begin{tabular}[t]{cccccc} \toprule %<en>&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\ %<ja>&\emph{区}&\emph{点}&\emph{\pTeX}&\emph{\upTeX}&\emph{\LuaTeX-ja}\\ @@ -2744,25 +2698,26 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} \D FF3E&1&16&N&N&Y\\ \D FFE3&1&17&N&N&Y\\ \D FF3F&1&18&N&N&Y\\ -%\D 30FD&1&19&N&Y&Y\\ -%\D 30FE&1&20&N&Y&Y\\ -%\D 309D&1&21&N&Y&Y\\ -%\D 309E&1&22&N&Y&Y\\ +\D 30FD&1&19&N&Y&Y\\ +\D 30FE&1&20&N&Y&Y\\ +\D 309D&1&21&N&Y&Y\\ +\D 309E&1&22&N&Y&Y\\ \D 3003&1&23&N&N&Y\\ \D 4EDD&1&24&N&Y&Y\\ \D 3005&1&25&N&N&Y\\ \D 3006&1&26&N&N&Y\\ \D 3007&1&27&N&N&Y\\ \D 30FC&1&28&N&Y&Y\\ -\D FF0F&1&31&N&N&Y\\ -\D FF3C&1&32&N&N&Y\\ \bottomrule \end{tabular}\qquad -\begin{tabular}{cccccc} +\begin{tabular}[t]{cccccc} \toprule %<en>&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\ %<ja>&\emph{区}&\emph{点}&\emph{\pTeX}&\emph{\upTeX}&\emph{\LuaTeX-ja}\\ \midrule +\D FF0F&1&31&N&N&Y\\ +\D FF3C&1&32&N&N&Y\\ +\D FF5E&1&33&N&N&Y\\ \D FF5C&1&35&N&N&Y\\ \D FF0B&1&60&N&N&Y\\ \D FF1D&1&65&N&N&Y\\ @@ -2786,11 +2741,13 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} %<*en> \subsection{Non-kanji characters in a control word} +{\def\D#1{% + {\fboxsep0pt\fcolorbox{cyan}{white}{#1}}}% Because the engine differ, so non-kanji JIS~X~0208 characters which can be used in a control word differ in \pTeX, in \upTeX,~and~in \LuaTeX-ja. \autoref{tab:kcat-diff} shows the difference. -Except for four characters ``・'',~``゛'', ``゜'',~``゠'', -\LuaTeX-ja admits more characters in a control word than \upTeX. +Except for three characters \D{・},~\D{゛},~and~`\D{゜}, +\LuaTeX-ja admits more characters in a control word than \upTeX.} Difference becomes larger, if we consider non-kanji JIS~X~0213 characters. @@ -2802,7 +2759,7 @@ For the detail, see \url{https://github.com/h-kitagawa/kct}. エンジンが異なるので,\pTeX, \upTeX, \LuaTeX-ja において制御綴中に使用可能なJIS~X~0208の文字は異なる. 異なっているところだけを載せると,\autoref{tab:kcat-diff}のようになる. -「・」「゛」「゜」「゠」を除けば,\LuaTeX-jaでは\upTeX より多くの文字が +「・」「゛」「゜」を除けば,\LuaTeX-jaでは\upTeX より多くの文字が 制御綴に使用可能になっている. JIS~X~0213の範囲に広げると,差異はさらに大きくなる. diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-adjust.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-adjust.sty index c4cc54c2f9..5636179464 100644 --- a/macros/luatex/generic/luatexja/src/addons/luatexja-adjust.sty +++ b/macros/luatex/generic/luatexja/src/addons/luatexja-adjust.sty @@ -64,7 +64,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-adjust}[2018/07/24] + \ProvidesPackage{luatexja-adjust}[2019-01-06] \fi %</LaTeX> % Load core module if not yet. diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-otf.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-otf.sty index e8cb01e4bb..6ac200b7e6 100644 --- a/macros/luatex/generic/luatexja/src/addons/luatexja-otf.sty +++ b/macros/luatex/generic/luatexja/src/addons/luatexja-otf.sty @@ -64,7 +64,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-otf}[2019/09/26] + \ProvidesPackage{luatexja-otf}[2019-09-26] \fi %</LaTeX> % Load core module if not yet. diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty index c8f933ec92..8367feb047 100644 --- a/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty +++ b/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty @@ -4,7 +4,7 @@ % LaTeX only! \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-ruby}[2021-05-04 v0.52] +\ProvidesPackage{luatexja-ruby}[2021-05-17 v0.52] \RequirePackage{luatexja} %%------------------ diff --git a/macros/luatex/generic/luatexja/src/jfm-ujisv.lua b/macros/luatex/generic/luatexja/src/jfm-ujisv.lua index 62becb25a3..2bfe670b9e 100644 --- a/macros/luatex/generic/luatexja/src/jfm-ujisv.lua +++ b/macros/luatex/generic/luatexja/src/jfm-ujisv.lua @@ -136,7 +136,7 @@ local t = { } }, - [5] = { -- -- 二分(二重)ダッシュ + [105] = { -- -- 二分(二重)ダッシュ chars = { '゠', '–' }, align = 'middle', left = 0.0, down = 0.0, width = 0.50, height = 0.50, depth = 0.50, italic=0.0, diff --git a/macros/luatex/generic/luatexja/src/ltj-latex.sty b/macros/luatex/generic/luatexja/src/ltj-latex.sty index 7e4ec507c6..4e89ecee61 100644 --- a/macros/luatex/generic/luatexja/src/ltj-latex.sty +++ b/macros/luatex/generic/luatexja/src/ltj-latex.sty @@ -12,7 +12,7 @@ \def\luatexjalatexLoaded{\endinput} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltj-latex}[2021-05-17 LaTeX support of LuaTeX-ja] +\ProvidesPackage{ltj-latex}[2021-10-24 LaTeX support of LuaTeX-ja] \endlinechar=13 @@ -60,15 +60,29 @@ %%% patching commands \ifltj@ltfilehook@avail - \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} - \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + %% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code> + %% no-starred version: do nothing if the <package> is loaded + %% starred version: do <code> right away if the <package> is loaded \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage} - \def\@@ltj@ExecuteAfterPackage@star#1#2{% - \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% - } \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage} - \def\@@ltj@ExecuteBeforePackage@star#1#2{% - \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15 + \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}} + \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}} + \long\def\@@ltj@ExecuteAfterPackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}% + } + }{ + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \long\def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } } \else \RequirePackage{filehook} diff --git a/macros/luatex/generic/luatexja/src/ltjltxdoc.dtx b/macros/luatex/generic/luatexja/src/ltjltxdoc.dtx index 9d4bf2114a..5e7424ba0e 100644 --- a/macros/luatex/generic/luatexja/src/ltjltxdoc.dtx +++ b/macros/luatex/generic/luatexja/src/ltjltxdoc.dtx @@ -25,12 +25,13 @@ % \changes{v1.0c}{2016/07/25}{docパッケージが上書きする\cs{verb}を再々定義} % \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}を追加} % \changes{v1.0d-ltj-3}{2018/01/01}{\cs{Cjascale}を追加} +% \changes{v1.0d-ltj-4}{2021-10-24}{HaranoAji fonts} % \fi % % \iffalse %<class> %<class>\NeedsTeXFormat{LaTeX2e} -%<class>\ProvidesClass{ltjltxdoc}[2018/01/01 v1.0d-ltj-3 Standard LuaLaTeX-ja file] +%<class>\ProvidesClass{ltjltxdoc}[2021-10-24 v1.0d-ltj-4 Standard LuaLaTeX-ja file] %<*driver> \documentclass{ltjltxdoc} \GetFileInfo{ltjltxdoc.cls} diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty index 77a955741a..5c86aa9b78 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.sty +++ b/macros/luatex/generic/luatexja/src/luatexja.sty @@ -26,6 +26,9 @@ \def\luatexjaLoaded{\endinput} \newif\ifltj@disablejfam +%%%% VERSION +\def\LuaTeXjaversion{20211024.0} + %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX> @@ -35,13 +38,17 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja}[2021-06-07 Japanese Typesetting with Lua(La)TeX] + \makeatletter + \def\ltj@@temp#1#2#3#4#5#6#7#8#9\@nil{% + \edef\ltj@@do{\noexpand\ProvidesPackage + {luatexja}[#1#2#3#4-#5#6-#7#8 Japanese Typesetting with Lua(La)TeX]% + }\ltj@@do\let\ltj@@do\undefined\let\ltj@@temp\undefined + } + \expandafter\ltj@@temp\LuaTeXjaversion\@nil \DeclareOption{disablejfam}{\ltj@disablejfamtrue} \DeclareOption*{} \ProcessOptions\relax \fi %</LaTeX> -%%%% VERSION -\def\LuaTeXjaversion{20210918.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty index 8bf6bac9f3..b76a3957a0 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2021-01-24 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2021-04-29 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-array.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-array.sty index 989fd8ce9d..9575dc3c04 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-array.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-array.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja] +\ProvidesPackage{lltjp-array}[2019-07-18 Patch to array for LuaTeX-ja] \RequirePackage{etoolbox,array} diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty index 27680205f6..c766ec4685 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-atbegshi}[2021-03-14 Patching \string\shipout\space hooks for LuaTeX-ja] +\ProvidesPackage{lltjp-atbegshi}[2021-04-29 Patching \string\shipout\space hooks for LuaTeX-ja] % concept: execute all hooks inside yoko direction \vbox diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-geometry.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-geometry.sty index 0be092eaaa..67b0f5de7f 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-geometry.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-geometry.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-geometry}[2020-12-29 Patch to geometry for LuaTeX-ja with vertical writing mode] +\ProvidesPackage{lltjp-geometry}[2021-10-24 Patch to geometry for LuaTeX-ja with vertical writing mode] \RequirePackage{expl3} \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi \newif\if@ltj@@geometry@tate @@ -40,15 +40,29 @@ }% }{} \ifltj@ltfilehook@avail - \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} - \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + %% \ltj@ExecuteBeforePackage <package><code> and \ltj@ExecuteAfterPackage <package><code> + %% no-starred version: do nothing if the <package> is loaded + %% starred version: do <code> right away if the <package> is loaded \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage} - \def\@@ltj@ExecuteAfterPackage@star#1#2{% - \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% - } \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage} - \def\@@ltj@ExecuteBeforePackage@star#1#2{% - \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15 + \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}} + \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}} + \long\def\@@ltj@ExecuteAfterPackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}% + } + }{ + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \long\def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } } \else \RequirePackage{filehook} diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-xunicode.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-xunicode.sty index 3d6e49fbaa..470534d628 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-xunicode.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-xunicode.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-xunicode}[2017/05/05 Patch to xunicode for LuaTeX-ja] +\ProvidesPackage{lltjp-xunicode}[2019-07-18 Patch to xunicode for LuaTeX-ja] \def\XeTeXpicfile{} \RequirePackage{xunicode} diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf Binary files differindex 90d7c7c9a2..2b1962fa50 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf +++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex index 43f9380831..67e5b151a3 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex +++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex @@ -98,9 +98,9 @@ \title{\einfart{},以极简主义风格排版你的文章} \author{许锦文} -\thanks{对应版本. \texttt{\einfart{} 2021/08/11}} +\thanks{对应版本. \texttt{\einfart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{2021年8月,北京} +\date{2021年10月,巴黎} \maketitle diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf Binary files differindex ebf652ea5d..bd79975c54 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf +++ b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.tex b/macros/unicodetex/latex/einfart/einfart-doc-en.tex index 83a421637d..6996ab24f3 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-en.tex +++ b/macros/unicodetex/latex/einfart/einfart-doc-en.tex @@ -98,9 +98,9 @@ \title{\einfart{}, write your articles in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\einfart{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\einfart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf b/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf Binary files differindex e66f64e7a7..f999974aa2 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf +++ b/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf diff --git a/macros/unicodetex/latex/einfart/einfart-doc-fr.tex b/macros/unicodetex/latex/einfart/einfart-doc-fr.tex index f0217a97b6..b2e777c20d 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-fr.tex +++ b/macros/unicodetex/latex/einfart/einfart-doc-fr.tex @@ -98,9 +98,9 @@ \title{\einfart{}, écrivez vos articles de manière simple et claire} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\einfart{} 2021/08/11}} +\thanks{Correspondant à : \texttt{\einfart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{Août 2021, à Pékin} +\date{Octobre 2021, à Paris} \maketitle diff --git a/macros/unicodetex/latex/einfart/einfart.cls b/macros/unicodetex/latex/einfart/einfart.cls index 27363074fa..c904d2b074 100644 --- a/macros/unicodetex/latex/einfart/einfart.cls +++ b/macros/unicodetex/latex/einfart/einfart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{einfart} - [2021/08/11 A simple and clear article style] + [2021/10/23 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -382,6 +389,19 @@ \renewcommand{\mid}{\hspace{-.2em}\mid@original\hspace{-.2em}} \let\nmid@original\nmid \renewcommand{\nmid}{\hspace{-.2em}\nmid@original\hspace{-.2em}} +\renewcommand{\frac}[2]{\genfrac{}{}{}{}{ + \mathchoice + {\raisebox{-.15em}{$\displaystyle #1$}} + {\raisebox{-.15em}{$\textstyle #1$}} + {\raisebox{-.08em}{$\scriptstyle #1$}} + {\scriptscriptstyle #1} +}{ + \mathchoice + {\raisebox{.08em}{$\displaystyle #2$}} + {\raisebox{.08em}{$\textstyle #2$}} + {\raisebox{.05em}{$\scriptstyle #2$}} + {\scriptscriptstyle #2} +}} } \RequirePackage{tikz-cd} @@ -454,6 +474,16 @@ \fi \fi +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf Binary files differindex d170416dea..50a3107436 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex index c307fda6b6..b85c421927 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\以多彩的方式排版你的文章} \author{许锦文} -\thanks{对应版本. \texttt{\lebhart{} 2021/08/11}} +\thanks{对应版本. \texttt{\lebhart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{2021年8月,北京} +\date{2021年10月,巴黎} \maketitle diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf Binary files differindex 1bf78a225f..c81f771921 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex index 0b983789d5..a53e8dd5b2 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\write your articles in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\lebhart{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\lebhart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf Binary files differindex f6b06a01a4..f2770aa621 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex index 1a1b43ecf4..6c1dc08b90 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\écrivez vos articles de manière colorée} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\lebhart{} 2021/08/11}} +\thanks{Correspondant à : \texttt{\lebhart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{Août 2021, à Pékin} +\date{Octobre 2021, à Paris} \maketitle diff --git a/macros/unicodetex/latex/lebhart/lebhart.cls b/macros/unicodetex/latex/lebhart/lebhart.cls index a3a18edaab..ea342e93fd 100644 --- a/macros/unicodetex/latex/lebhart/lebhart.cls +++ b/macros/unicodetex/latex/lebhart/lebhart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{lebhart} - [2021/08/11 A colorful article style] + [2021/10/23 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -373,6 +380,19 @@ \renewcommand{\mid}{\hspace{-.2em}\mid@original\hspace{-.2em}} \let\nmid@original\nmid \renewcommand{\nmid}{\hspace{-.2em}\nmid@original\hspace{-.2em}} +\renewcommand{\frac}[2]{\genfrac{}{}{}{}{ + \mathchoice + {\raisebox{-.15em}{$\displaystyle #1$}} + {\raisebox{-.15em}{$\textstyle #1$}} + {\raisebox{-.08em}{$\scriptstyle #1$}} + {\scriptscriptstyle #1} +}{ + \mathchoice + {\raisebox{.08em}{$\displaystyle #2$}} + {\raisebox{.08em}{$\textstyle #2$}} + {\raisebox{.05em}{$\scriptstyle #2$}} + {\scriptscriptstyle #2} +}} } \RequirePackage{tikz-cd} @@ -447,6 +467,16 @@ \fi \fi +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf Binary files differindex eb64364065..8d3b68bdb7 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex index d7b6bf459e..8d2b1f4476 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex @@ -103,9 +103,9 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/08/11}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/10/23}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}}; - \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年8月,北京}}; + \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年10月,巴黎}}; \end{tikzpicture}% \end{titlepage}% \cleardoublepage% diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf Binary files differindex 66babbedbb..8bdb833fdb 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex index aa00414e13..c6f2a94485 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex @@ -104,9 +104,9 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/08/11}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/10/23}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; - \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{August 2021, Beijing}}; + \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{October 2021, Paris}}; \end{tikzpicture}% \end{titlepage}% \cleardoublepage% diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf Binary files differindex 45a25ef1db..6a4b397cd0 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex index d8cfcc840e..178f122109 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex @@ -103,9 +103,9 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/08/11}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/10/23}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; - \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Août 2021, à Pékin}}; + \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Octobre 2021, à Paris}}; \end{tikzpicture}% \end{titlepage}% \cleardoublepage% diff --git a/macros/unicodetex/latex/simplivre/simplivre.cls b/macros/unicodetex/latex/simplivre/simplivre.cls index 84c21b30bb..8ec380f257 100644 --- a/macros/unicodetex/latex/simplivre/simplivre.cls +++ b/macros/unicodetex/latex/simplivre/simplivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{simplivre} - [2021/08/11 A simple and clear book style] + [2021/10/23 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -382,6 +389,19 @@ \renewcommand{\mid}{\hspace{-.2em}\mid@original\hspace{-.2em}} \let\nmid@original\nmid \renewcommand{\nmid}{\hspace{-.2em}\nmid@original\hspace{-.2em}} +\renewcommand{\frac}[2]{\genfrac{}{}{}{}{ + \mathchoice + {\raisebox{-.15em}{$\displaystyle #1$}} + {\raisebox{-.15em}{$\textstyle #1$}} + {\raisebox{-.08em}{$\scriptstyle #1$}} + {\scriptscriptstyle #1} +}{ + \mathchoice + {\raisebox{.08em}{$\displaystyle #2$}} + {\raisebox{.08em}{$\textstyle #2$}} + {\raisebox{.05em}{$\scriptstyle #2$}} + {\scriptscriptstyle #2} +}} } \RequirePackage{tikz-cd} @@ -454,6 +474,16 @@ \fi \fi +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} |