summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-24 03:04:59 +0000
committerNorbert Preining <norbert@preining.info>2021-06-24 03:04:59 +0000
commit1a77d17b8844e0cdad3a4851d5cb3a95b703a4df (patch)
tree8efd430bf6e5066743f396c3b58a95a84311af53 /macros
parenta809a190ff669feb11cb64db915b763abd0bed81 (diff)
CTAN sync 202106240304
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/apxproof/README.md2
-rw-r--r--macros/latex/contrib/apxproof/apxproof.dtx67
-rw-r--r--macros/latex/contrib/apxproof/apxproof.ins4
-rw-r--r--macros/latex/contrib/apxproof/apxproof.pdfbin563983 -> 566581 bytes
-rw-r--r--macros/latex/contrib/colorist/colorart.cls31
-rw-r--r--macros/latex/contrib/colorist/colorbook.cls31
-rw-r--r--macros/latex/contrib/colorist/colorist-doc.pdfbin82011 -> 82469 bytes
-rw-r--r--macros/latex/contrib/colorist/colorist-doc.tex55
-rw-r--r--macros/latex/contrib/colorist/colorist.sty434
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx26
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin530362 -> 530358 bytes
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.pdfbin81350 -> 82352 bytes
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.tex45
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty244
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls36
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls36
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdfbin303218 -> 309464 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex47
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdfbin187642 -> 193582 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex50
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre.cls144
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-cn.pdfbin238357 -> 239385 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-cn.tex67
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-en.pdfbin146880 -> 148100 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-en.tex61
-rw-r--r--macros/unicodetex/latex/einfart/einfart.cls166
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdfbin281832 -> 286456 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex51
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-en.pdfbin170165 -> 171812 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-en.tex59
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart.cls144
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdfbin286356 -> 289392 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex57
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.pdfbin192861 -> 194551 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.tex58
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre.cls166
36 files changed, 1318 insertions, 763 deletions
diff --git a/macros/latex/contrib/apxproof/README.md b/macros/latex/contrib/apxproof/README.md
index f57a89624c..c36cb1411a 100644
--- a/macros/latex/contrib/apxproof/README.md
+++ b/macros/latex/contrib/apxproof/README.md
@@ -34,7 +34,7 @@ in any other directory where LaTeX searches for packages.
## License
-Copyright © 2016-2020 by Pierre Senellart.
+Copyright © 2016-2021 by Pierre Senellart.
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License, either version 1.3 of this license or (at
diff --git a/macros/latex/contrib/apxproof/apxproof.dtx b/macros/latex/contrib/apxproof/apxproof.dtx
index d02bb77435..307934752d 100644
--- a/macros/latex/contrib/apxproof/apxproof.dtx
+++ b/macros/latex/contrib/apxproof/apxproof.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2016-2020 by Pierre Senellart
+% Copyright (C) 2016-2021 by Pierre Senellart
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{apxproof}
-%<package> [2020/10/15 v1.2.1 Automatic proofs in appendix]
+%<package> [2021/06/23 v1.2.2 Automatic proofs in appendix]
%
%<*driver>
\documentclass{ltxdoc}
@@ -45,7 +45,7 @@
%</driver>
% \fi
%
-% \CheckSum{813}
+% \CheckSum{828}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -468,7 +468,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% Issues not listed here should be reported to the author.
%
% \section{License}
-% Copyright \textcopyright{} 2016--2020 by Pierre Senellart.
+% Copyright \textcopyright{} 2016--2021 by Pierre Senellart.
%
% This work may be distributed and/or modified under the conditions of the
% \LaTeX{} Project Public License, either version 1.3 of this license or (at
@@ -526,6 +526,11 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \begin{macrocode}
\RequirePackage{kvoptions}
% \end{macrocode}
+% \item \textsf{catchfile} to be able to check the content of files
+% |\input| within appendix content.
+% \begin{macrocode}
+\RequirePackage{catchfile}
+% \end{macrocode}
% \item \textsf{amsthm} for its |\newteorem| macro.
% Some document classes (e.g., \textsf{lipics})
% preload \textsf{amsthm}: this is fine, |\RequirePackage{amsthm}|
@@ -968,7 +973,6 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\def\FV@ProcessLine{\immediate\write\axp@proofsfile}%
\let\FV@FontScanPrep\relax
\let\@noligs\relax
- \immediate\write\axp@proofsfile{\noexpand\makeatother}%
\def\FV@CatCodesHook{}%
\FV@Scan}
\def\FVE@axp@VerbatimOut{%
@@ -1035,6 +1039,8 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% We save the equation counter
% before typesetting the theorem environment, to reset it to the same
% value in the repeated environment when |repeqn| is set to |same|.
+% \changes{v1.2.2}{2020/11/25}{Fix handling of optional arguments of
+% repeated theorems containing optional arguments}
% \begin{macrocode}
\NewEnviron{#1rep}[1][]{%
\ifthenelse{\equal{\axp@repeqn}{same}}{%
@@ -1044,7 +1050,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\ifx\relax##1\relax
\axp@with@forward{#1}{\begin{#1}}\label{axp@r\roman{axp@rpcounter}}%
\else
- \axp@with@forward{#1}{\begin{#1}[##1]}\label{axp@r\roman{axp@rpcounter}}%
+ \axp@with@forward{#1}{\begin{#1}[{##1}]}\label{axp@r\roman{axp@rpcounter}}%
\fi
\mainbodyrepeatedtheorem
\BODY\end{#1}%
@@ -1081,6 +1087,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \changes{v1.2.0}{2019/10/07}{Fix display of theorem notes}
% \begin{macrocode}
\axp@writesection%
+ \immediate\write\axp@proofsfile{\noexpand\makeatletter}%
\ifthenelse{\equal{\axp@repeqn}{same}}{%
\immediate\write\axp@proofsfile{%
\noexpand\setcounter{axp@equationx}{\value{equation}}%
@@ -1112,7 +1119,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\noexpand\fi
\fi
\fi
- {} (\unexpanded{##1})%
+ {} (\unexpanded{{##1}})%
}%
]%
\noexpand\axp@forward@target{axp@fw@r\roman{axp@rpcounter}}{}%
@@ -1256,7 +1263,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
{%
\axp@writesection
\immediate\write\axp@proofsfile{%
- \noexpand\begin{axp@oldproof}%
+ \noexpand\makeatletter\noexpand\begin{axp@oldproof}\noexpand\makeatother%
}%
\axp@VerbatimOut
}
@@ -1316,21 +1323,28 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \end{macrocode}
% \end{macro}
% \begin{macro}{\axp@section}
-% \begin{macro}{\axp@@ssection}
-% \begin{macro}{\axp@@section}
-% This command behaves similarly to |\axp@oldsection|, except that it first
-% tests whether a |\section| follows, and if so, does not produce
-% anything. This is useful to avoid producing empty sections in the
-% appendix. As usual, we have to process starred and unstarred version
-% separately.
+% \changes{v1.2.2}{2021/06/23}{Detect a section within an included
+% file to avoid produced useless sections}
+% \begin{macro}{\axp@@sectiontestinput}
+% \begin{macro}{\axp@@sectiontestsection}
+% This command |\axp@section| behaves similarly to |\axp@oldsection|,
+% except that it first tests whether a |\section| follows, and if so,
+% does not produce anything. This is useful to avoid producing empty
+% sections in the appendix. Using the \textsf{catchfile} package, we
+% also check whether a |\section| is within an |\input| that immediately
+% follows.
% \begin{macrocode}
- \def\axp@section{\@ifstar\axp@@ssection\axp@@section}
- \def\axp@@ssection#1{%
- \@ifnextchar\section{}{\axp@oldsection*{#1}}%
+ \def\axp@section#1{%
+ \@ifnextchar\input
+ {\axp@@sectiontestinput{#1}}%
+ {\axp@@sectiontestsection{#1}}%
}
- \def\axp@@section#1{%
- \@ifnextchar\section{}{\axp@oldsection{#1}}%
+ \def\axp@@sectiontestinput#1\input#2{%
+ \CatchFileDef{\axp@tmp}{#2}{}%
+ \def\axp@tmptmp{\axp@@sectiontestsection{#1}}%
+ \expandafter\axp@tmptmp\axp@tmp%
}
+ \def\axp@@sectiontestsection#1{\@ifnextchar\section{\makeatother}{\axp@oldsection{#1}\makeatother}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1457,7 +1471,14 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% |\appendixprelim| is issued)
% within a |bibunit| environment so as to typeset
% a separate bibliography for the appendix (unless the |bibliography|
-% option is set to |common|). There is an extra test to
+% option is set to |common|). This is done using |\pretocmd| on
+% |\@enddocumenthook| instead of |\AtEndDocument| because we want the
+% code to be run before any code in the |\@enddocumenthook| that has
+% been set in the document class, as in the \textsf{amsart} document
+% class.
+% \changes{v1.2.2}{2021/03/23}{Compatibility with AMS document classes: do not
+% use \texttt{\textbackslash AtEndDocument}}
+% There is an extra test to
% ensure an empty bibliography environment is not produced.
% The name of the bibliography is changed to |\appendixrefname|; in most
% document classes, it is called |\refname| but it is occasionally
@@ -1469,7 +1490,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
% \changes{v1.2.1}{2020/02/27}{Ad hoc fix for \textsf{natbib}
% package conflict}
% \begin{macrocode}
- \AtEndDocument{
+ \pretocmd{\@enddocumenthook}{%
\ifdefined\NAT@testdef
\renewcommand\bibcite[2]{%
\global\@namedef{b@#1\@extra@binfo}{#2}%
@@ -1498,7 +1519,7 @@ This is a citation in the appendix~\cite{proofsAreHard}.
\let\bibcite\NAT@testdef
\fi
}{}
- }
+ }{}{}
% \end{macrocode}
% \begin{macrocode}
}{}
diff --git a/macros/latex/contrib/apxproof/apxproof.ins b/macros/latex/contrib/apxproof/apxproof.ins
index 23cc7248a0..d563944d94 100644
--- a/macros/latex/contrib/apxproof/apxproof.ins
+++ b/macros/latex/contrib/apxproof/apxproof.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2016-2019 by Pierre Senellart
+%% Copyright (C) 2016-2021 by Pierre Senellart
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
\preamble
-Copyright (C) 2016-2019 by Pierre Senellart
+Copyright (C) 2016-2021 by Pierre Senellart
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/apxproof/apxproof.pdf b/macros/latex/contrib/apxproof/apxproof.pdf
index d4123c8d11..48f0d4638e 100644
--- a/macros/latex/contrib/apxproof/apxproof.pdf
+++ b/macros/latex/contrib/apxproof/apxproof.pdf
Binary files differ
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls
index c0040549ce..3e07d9b5aa 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/06/07a A colorful article style]
+ [2021/06/23 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,7 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -94,7 +95,7 @@
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
\RequirePackage{colorist}
@@ -112,17 +113,15 @@
\fi
\RequirePackage{amssymb}
-\let\colorist@sffamily\sffamily
-\let\colorist@textsc\textsc
-
\if@colorclass@palatino
\RequirePackage{amssymb}
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@colorclass@useosf\useosf\fi
\fi
\if@colorclass@times
@@ -132,12 +131,15 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@colorclass@useosf\useosf\fi
\let\colorist@textsc\relax
\fi
\if@colorclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@colorclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -150,6 +152,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@colorclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -158,7 +163,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@colorclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -166,8 +172,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -179,11 +189,6 @@
\RequirePackage{caption}
\captionsetup{font=small}
-%%================================
-%% Index
-%%================================
-\RequirePackage{imakeidx}
-
\endinput
%%
%% End of file `colorist/colorart.cls'.
diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls
index 78d7969e64..e99f673051 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/06/07a A colorful book style]
+ [2021/06/23 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,7 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -94,7 +95,7 @@
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
\RequirePackage{colorist}
@@ -112,17 +113,15 @@
\fi
\RequirePackage{amssymb}
-\let\colorist@sffamily\sffamily
-\let\colorist@textsc\textsc
-
\if@colorclass@palatino
\RequirePackage{amssymb}
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@colorclass@useosf\useosf\fi
\fi
\if@colorclass@times
@@ -132,12 +131,15 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@colorclass@useosf\useosf\fi
\let\colorist@textsc\relax
\fi
\if@colorclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@colorclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -150,6 +152,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@colorclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -158,7 +163,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@colorclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -166,8 +172,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -179,11 +189,6 @@
\RequirePackage{caption}
\captionsetup{font=small}
-%%================================
-%% Index
-%%================================
-\RequirePackage{imakeidx}
-
\endinput
%%
%% End of file `colorist/colorbook.cls'.
diff --git a/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf
index cb99ee3a3a..8ba3ed3295 100644
--- a/macros/latex/contrib/colorist/colorist-doc.pdf
+++ b/macros/latex/contrib/colorist/colorist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex
index 38db3b3d8c..a6b226644b 100644
--- a/macros/latex/contrib/colorist/colorist-doc.tex
+++ b/macros/latex/contrib/colorist/colorist-doc.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[allowbf,puretext]{colorart}
+\documentclass[English,French,allowbf,puretext]{colorart}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -44,7 +44,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,subsection,href,
+ {linenumbers,nolinenumbers,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
@@ -88,7 +88,7 @@
\title{{\normalfont\textbf{\textsf{colorist}}}, write your articles or books in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\colorist{} 2021/06/07a}}
+\thanks{Corresponding to: \texttt{\colorist{} 2021/06/23}}
\date{June 2021, Beijing}
\maketitle
@@ -143,6 +143,22 @@ And of course, you can also use the default classes \textsf{article} or \textsf{
\begin{itemize}
\item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
\end{itemize}
\begin{tip}
@@ -158,10 +174,11 @@ Additionally, \colorart{} and \colorbook{} offers the following options:
\begin{itemize}
\item Optional paper size. The default paper size is 8.5in $\times$ 11in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
- \begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
- \end{itemize}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
+ \end{itemize}
\end{itemize}
@@ -308,7 +325,6 @@ And then define this environment in one of following five ways:
\begin{itemize}
\item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
\end{itemize}
- \clearpage
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
\lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
\begin{itemize}
@@ -321,7 +337,7 @@ And then define this environment in one of following five ways:
\end{itemize}
\end{itemize}
-\medskip
+% \medskip
\begin{tip}
This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
\end{tip}
@@ -331,7 +347,7 @@ And then define this environment in one of following five ways:
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
-\bigskip
+\medskip
Here is an example. The following code:
\begin{code}
\NameTheorem[EN]{proofidea}{Idea}
@@ -348,7 +364,7 @@ defines an unnumbered environment \lstinline|proofidea*| and a numbered environm
The \lstinline|proofidea| environment.
\end{proofidea}
-\bigskip
+\smallskip
\subsection{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -358,10 +374,10 @@ You can use \lstinline|\dnf| to mark the unfinished part. For example:
Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \vspace{-.3\baselineskip}\needgraph \vspace{-.5\baselineskip} or \vspace{-.5\baselineskip} \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\clearpage
+% \clearpage
\subsection{On the title, abstract and keywords}
\colorart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -423,7 +439,8 @@ Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \ls
\item There are still many things that can be optimized in the code.
\end{itemize}
-\clearpage
+% \clearpage
+\medskip
\section{Document templates}
\subsection{The standard way}
@@ -432,7 +449,7 @@ If you want to write in the standard way, you can refer to the following example
\begin{code}
\documentclass{colorart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -470,7 +487,7 @@ If you wish to switch to the standard class later, just replace the first two li
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -481,7 +498,7 @@ If you intend to switch to the journal template in the future and thus want to u
\begin{code}
\documentclass{colorart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -523,7 +540,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty
index 5ced409d17..6875a1596c 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/06/07a A colorful style for articles and books]
+ [2021/06/23 A colorful style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -28,7 +28,9 @@
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{puretext}
\DeclareBoolOption[false]{nothms}
+\DeclareBoolOption[false]{nothmnum}
\DeclareBoolOption[false]{allowbf}
+\DeclareBoolOption[false]{runin}
\ProcessKeyvalOptions*\relax
\if@colorist@draft
@@ -47,6 +49,9 @@
\newif\ifIsBook
\ifdefined\c@chapter\IsBooktrue\else\IsBookfalse\fi
+\let\colorist@sffamily\sffamily
+\let\colorist@textsc\textsc
+
%%================================
%% Title fonts
%%================================
@@ -79,14 +84,14 @@
\fancypagestyle{fancy}{
\fancyhf{}
\if@twoside
- \fancyfoot[RO]{\small\textcolor{black!30!paper}{\lastrightmark}%
- ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ \fancyfoot[RO]{\small\textcolor{maintext!30!paper}{\lastrightmark}%
+ ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fancyfoot[LE]{\small\leavevmode\llap{\thepage%
- ~~\textcolor{gray!55!paper}{$|$}}%
- ~~\textcolor{black!30!paper}{\lastleftmark}}
+ ~~\textcolor{maintext!27!paper}{$|$}}%
+ ~~\textcolor{maintext!30!paper}{\lastleftmark}}
\else
- \fancyfoot[R]{\small\textcolor{black!30!paper}{\lastrightmark}%
- ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ \fancyfoot[R]{\small\textcolor{maintext!30!paper}{\lastrightmark}%
+ ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -95,12 +100,12 @@
\fancyhf{}
\if@twoside
\fancyfoot[RO]{\small%
- ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fancyfoot[LE]{\small\leavevmode\llap{\thepage%
- ~~\textcolor{gray!55!paper}{$|$}}}
+ ~~\textcolor{maintext!27!paper}{$|$}}}
\else
\fancyfoot[R]{\small%
- ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -168,7 +173,7 @@
\vfill%
\begin{flushright}%
\begin{minipage}{0.833\textwidth}%
- \color{black!80!paper}\raggedleft#1%
+ \color{maintext!80!paper}\raggedleft#1%
\end{minipage}%
\end{flushright}%
\vfill\vfill%
@@ -262,7 +267,7 @@
\newcommand{\parttext}[1]{%
\begin{flushright}%
\begin{minipage}{0.833\textwidth}%
- \color{black!80!paper}\raggedleft#1%
+ \color{maintext!80!paper}\raggedleft#1%
\end{minipage}%
\end{flushright}%
}
@@ -280,9 +285,19 @@
}
%% Subsubsection
+\if@colorist@runin
+\titleformat{\subsubsection}[runin]
+ {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
+ {#1.}[\hspace*{.3em}]
+\else
\titleformat{\subsubsection}
- {\color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{.5em}
+ {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
{#1}
+\fi
+
+%% Paragraph
+\titleformat{\paragraph}[runin]
+ {\conditionalbfseries\scshape}{\theparagraph}{1em}{#1}
\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
@@ -305,44 +320,44 @@
{\addvspace{1pc}\normalfont\color{maintheme}\colorist@sffamily\conditionalbfseries}
{\contentslabel{2em}}
{\hspace*{-2em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
{\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage}
\titlecontents{subsection}
[7em] % i.e., 4em (section) + 3em
{\addvspace{.15pc}\normalfont\colorist@sffamily}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage}
\titlecontents{subsubsection}
[9em] % i.e., 7em (subsection) + 2em
{\normalfont\colorist@sffamily}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage}
}{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
{\addvspace{.3pc}\normalfont\color{maintheme}\colorist@sffamily}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{maintheme}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintheme}\contentspage}
\titlecontents{subsection}
[5em] % i.e., 2em (section) + 3em
{\addvspace{.15pc}\normalfont\colorist@sffamily}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\color{paper!55!-paper}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage}
\titlecontents{subsubsection}
[7em] % i.e., 5em (subsection) + 2em
{\normalfont\colorist@sffamily}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\color{maintext!45!paper}\contentspage}
}
%%================================
@@ -350,9 +365,10 @@
%%================================
\RequirePackage{enumitem}
\setlist{noitemsep,leftmargin=2em}
-\renewcommand\labelitemi{\color{gray!50}$\bullet$}
-\renewcommand\labelitemii{\color{gray!55}--}
-\renewcommand\labelitemiii{\color{gray!55}\texttt{*}}
+\gappto{\PJLlang@langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}}
+\gappto{\PJLlang@langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}}
+\renewcommand\labelitemii{\textcolor{maintext!27}{--}}
+\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}}
%%================================
%% Blank page
@@ -365,7 +381,7 @@
\AddToHookNext{shipout/background}
{%
\put(0.5\paperwidth,-0.5\paperheight){%
- \makebox[0pt]{\large\color{gray!20!paper}\blinkpagetext}}}
+ \makebox[0pt]{\large\color{maintext!10!paper}\blinkpagetext}}}
\null\newpage\fi\fi}
%%================================
@@ -412,7 +428,7 @@
\RequirePackage{mathtools}
\RequirePackage{amsthm}
\def\simpleqedsymbol{%
- \makebox[1em]{\rlap{\textcolor{gray!25!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+ \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
\newtheoremstyle{simple}%
{}{}%
{\normalfont}{}%
@@ -420,26 +436,26 @@
{0pt}%
{\global\let\qedsymbol\simpleqedsymbol%
{\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
- \textcolor{gray!55!paper}{$|$}\hspace{.4em}%
- \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}%
+ \textcolor{maintext!27!paper}{$|$}\hspace{.4em}%
+ \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}%
\pushQED{\qed}%
}
\def\@endtheorem{\popQED\endtrivlist\@endpefalse
\global\let\qedsymbol\qedsymbolOriginal}
\renewcommand{\qedsymbol}{%
- \makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
+ \makebox[1em]{\color{maintext!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbolOriginal\qedsymbol
\newtheoremstyle{basic}
{0pt}{0pt}{\normalfont}{0pt}
{}{\;}{0.25em}
{{\thmname{#1}~\thmnumber{\textup{#2}}}
- \thmnote{\normalfont\colorist@sffamily\color{black}~(#3)}}
+ \thmnote{\normalfont\colorist@sffamily\color{maintext}~(#3)}}
\newtheoremstyle{emphasis}
{0pt}{0pt}{\itshape}{0pt}{}{}{0pt}
- {\thmnote{\normalfont\colorist@sffamily\color{black}#3\hspace*{0.5em}}}
+ {\thmnote{\normalfont\colorist@sffamily\color{maintext}#3\hspace*{0.5em}}}
\if@colorist@fast
\providecommand{\phantomsection}{}
@@ -460,7 +476,7 @@
\pretocmd{\propositionnameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenameEN}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnameEN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -468,12 +484,12 @@
\pretocmd{\conventionnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnameEN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnameEN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnameEN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnameEN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\propositionnameEN}
\expandafter\def\csname definition-theoremnameEN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\theoremnameEN}
@@ -483,7 +499,7 @@
\pretocmd{\propositionnameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenameFR}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnameFR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -491,12 +507,12 @@
\pretocmd{\conventionnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnameFR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnameFR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnameFR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnameFR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Définition}-\propositionnameFR}
\expandafter\def\csname definition-theoremnameFR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Définition}-\theoremnameFR}
@@ -506,7 +522,7 @@
\pretocmd{\propositionnameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenameDE}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnameDE}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -514,12 +530,12 @@
\pretocmd{\conventionnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnameDE}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnameDE}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnameDE}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnameDE\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\propositionnameDE}
\expandafter\def\csname definition-theoremnameDE\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definition}-\theoremnameDE}
@@ -529,7 +545,7 @@
\pretocmd{\propositionnameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenameIT}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnameIT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -537,12 +553,12 @@
\pretocmd{\conventionnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnameIT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnameIT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnameIT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnameIT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definizione}-\propositionnameIT}
\expandafter\def\csname definition-theoremnameIT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definizione}-\theoremnameIT}
@@ -552,7 +568,7 @@
\pretocmd{\propositionnamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenamePT}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnamePT}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -560,12 +576,12 @@
\pretocmd{\conventionnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnamePT}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnamePT}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnamePT}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnamePT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\propositionnamePT}
\expandafter\def\csname definition-theoremnamePT\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\theoremnamePT}
@@ -575,7 +591,7 @@
\pretocmd{\propositionnameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenameBR}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnameBR}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -583,12 +599,12 @@
\pretocmd{\conventionnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnameBR}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnameBR}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnameBR}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnameBR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\propositionnameBR}
\expandafter\def\csname definition-theoremnameBR\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\theoremnameBR}
@@ -598,7 +614,7 @@
\pretocmd{\propositionnameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\corollarynameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\propertynameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\factnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\factnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\conjecturenameES}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\definitionnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\axiomnameES}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc}{}{\FAIL}
@@ -606,12 +622,12 @@
\pretocmd{\conventionnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\hypothesisnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\pretocmd{\notationnameES}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\examplenameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\problemnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\questionnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\exercisenameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\remarknameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
-\pretocmd{\observationnameES}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\examplenameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\problemnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\questionnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\exercisenameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\remarknameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
+\pretocmd{\observationnameES}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries\colorist@textsc}{}{\FAIL}
\expandafter\def\csname definition-propositionnameES\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\propositionnameES}
\expandafter\def\csname definition-theoremnameES\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries\colorist@textsc{Definição}-\theoremnameES}
@@ -621,7 +637,7 @@
\pretocmd{\propositionnameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\corollarynameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propertynameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\factnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\pretocmd{\conjecturenameCN}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
\pretocmd{\definitionnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\axiomnameCN}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -629,12 +645,12 @@
\pretocmd{\conventionnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\hypothesisnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\notationnameCN}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameCN}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\examplenameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\problemnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\questionnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\exercisenameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\remarknameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\observationnameCN}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\expandafter\def\csname definition-propositionnameCN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定义}-\propositionnameCN}
\expandafter\def\csname definition-theoremnameCN\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定义}-\theoremnameCN}
@@ -643,7 +659,7 @@
\pretocmd{\propositionnameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\corollarynameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propertynameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\factnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\pretocmd{\conjecturenameTC}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
\pretocmd{\definitionnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\axiomnameTC}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -651,12 +667,12 @@
\pretocmd{\conventionnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\hypothesisnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\notationnameTC}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameTC}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\examplenameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\problemnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\questionnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\exercisenameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\remarknameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\observationnameTC}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\expandafter\def\csname definition-propositionnameTC\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\propositionnameTC}
\expandafter\def\csname definition-theoremnameTC\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\theoremnameTC}
@@ -666,7 +682,7 @@
\pretocmd{\propositionnameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\corollarynameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propertynameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\factnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\pretocmd{\conjecturenameJP}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
\pretocmd{\definitionnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\axiomnameJP}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -674,12 +690,12 @@
\pretocmd{\conventionnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\hypothesisnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\notationnameJP}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameJP}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\examplenameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\problemnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\questionnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\exercisenameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\remarknameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\observationnameJP}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\expandafter\def\csname definition-propositionnameJP\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\propositionnameJP}
\expandafter\def\csname definition-theoremnameJP\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{定義}-\theoremnameJP}
@@ -689,7 +705,7 @@
\pretocmd{\propositionnameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\corollarynameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propertynameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\factnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\pretocmd{\conjecturenameRU}{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
\pretocmd{\definitionnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\axiomnameRU}{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -697,12 +713,12 @@
\pretocmd{\conventionnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\hypothesisnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
\pretocmd{\notationnameRU}{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameRU}{\normalfont\colorist@sffamily\color{black}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\examplenameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\problemnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\questionnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\exercisenameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\remarknameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
+\pretocmd{\observationnameRU}{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
\expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\propositionnameRU}
\expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU}
@@ -714,6 +730,17 @@
\newaliascnt{highest}{section}
}
\if@colorist@nothms\else
+\if@colorist@nothmnum
+\CreateTheorem*{theorem}
+\CreateTheorem*{lemma}
+\CreateTheorem*{proposition}
+\CreateTheorem*{corollary}
+\CreateTheorem*{definition-proposition}
+\CreateTheorem*{definition-theorem}
+\CreateTheorem*{property}
+\CreateTheorem*{fact}
+\CreateTheorem*{conjecture}
+\else
\CreateTheorem{theorem}<highest>
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
@@ -723,6 +750,7 @@
\CreateTheorem{property}[theorem]
\CreateTheorem{fact}[theorem]
\CreateTheorem{conjecture}[theorem]
+\fi
\CreateTheorem*{theorem*}
\CreateTheorem*{lemma*}
\CreateTheorem*{proposition*}
@@ -732,6 +760,18 @@
\CreateTheorem*{property*}
\CreateTheorem*{fact*}
\CreateTheorem*{conjecture*}
+\if@colorist@nothmnum
+\CreateTheorem*{definition}
+\CreateTheorem*{axiom}
+\CreateTheorem*{assumption}
+\CreateTheorem*{convention}
+\CreateTheorem*{hypothesis}
+\CreateTheorem*{notation}
+\CreateTheorem*{example}
+\CreateTheorem*{problem}
+\CreateTheorem*{question}
+\CreateTheorem*{exercise}
+\else
\CreateTheorem{definition}[theorem]
\CreateTheorem{axiom}[theorem]
\CreateTheorem{assumption}[theorem]
@@ -742,6 +782,7 @@
\CreateTheorem{problem}[theorem]
\CreateTheorem{question}[theorem]
\CreateTheorem{exercise}[theorem]
+\fi
\CreateTheorem*{definition*}
\CreateTheorem*{axiom*}
\CreateTheorem*{assumption*}
@@ -754,9 +795,14 @@
\CreateTheorem*{exercise*}
\theoremstyle{emphasis}
+\if@colorist@nothmnum
+\CreateTheorem*{remark}
+\CreateTheorem*{observation}
+\else
\CreateTheorem{remark}<highest>
-\CreateTheorem*{remark*}
\CreateTheorem{observation}<highest>
+\fi
+\CreateTheorem*{remark*}
\CreateTheorem*{observation*}
\fi
@@ -768,7 +814,7 @@
\creflabelformat{PJLproposition}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{PJLcorollary}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{PJLproperty}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{PJLfact}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{PJLfact}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{PJLconjecture}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{PJLdefinition}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{PJLaxiom}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -776,10 +822,10 @@
\creflabelformat{PJLconvention}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{PJLhypothesis}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{PJLnotation}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{PJLexample}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{PJLproblem}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{PJLquestion}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{PJLexercise}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{PJLexample}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{PJLproblem}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{PJLquestion}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{PJLexercise}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{PJLdefinition-theorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{PJLdefinition-proposition}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -788,7 +834,7 @@
\creflabelformat{propositionEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureEN}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -796,10 +842,10 @@
\creflabelformat{conventionEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationEN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseEN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseEN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionEN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -808,7 +854,7 @@
\creflabelformat{propositionFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureFR}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -816,10 +862,10 @@
\creflabelformat{conventionFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationFR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseFR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseFR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionFR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -828,7 +874,7 @@
\creflabelformat{propositionDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureDE}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -836,10 +882,10 @@
\creflabelformat{conventionDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationDE}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseDE}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseDE}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionDE}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -848,7 +894,7 @@
\creflabelformat{propositionIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureIT}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -856,10 +902,10 @@
\creflabelformat{conventionIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationIT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseIT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseIT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionIT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -868,7 +914,7 @@
\creflabelformat{propositionPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factPT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factPT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjecturePT}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -876,10 +922,10 @@
\creflabelformat{conventionPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationPT}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{examplePT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemPT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionPT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exercisePT}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{examplePT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemPT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionPT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exercisePT}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionPT}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -888,7 +934,7 @@
\creflabelformat{propositionBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureBR}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -896,10 +942,10 @@
\creflabelformat{conventionBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationBR}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseBR}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseBR}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionBR}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -908,7 +954,7 @@
\creflabelformat{propositionES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureES}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -916,10 +962,10 @@
\creflabelformat{conventionES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationES}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseES}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseES}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionES}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -928,7 +974,7 @@
\creflabelformat{propositionCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureCN}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -936,10 +982,10 @@
\creflabelformat{conventionCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationCN}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseCN}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseCN}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionCN}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -948,7 +994,7 @@
\creflabelformat{propositionTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureTC}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -956,10 +1002,10 @@
\creflabelformat{conventionTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationTC}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseTC}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseTC}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionTC}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -968,7 +1014,7 @@
\creflabelformat{propositionJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureJP}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -976,10 +1022,10 @@
\creflabelformat{conventionJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationJP}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseJP}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseJP}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionJP}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -988,7 +1034,7 @@
\creflabelformat{propositionRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{corollaryRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{propertyRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{factRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{conjectureRU}{#2{\normalfont\colorist@sffamily\color{purple}\conditionalbfseries#1}#3}
\creflabelformat{definitionRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{axiomRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -996,10 +1042,10 @@
\creflabelformat{conventionRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{hypothesisRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
\creflabelformat{notationRU}{#2{\normalfont\colorist@sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{problemRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{questionRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseRU}{#2{\normalfont\colorist@sffamily\color{black}\conditionalbfseries#1}#3}
+\creflabelformat{exampleRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{problemRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{questionRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
+\creflabelformat{exerciseRU}{#2{\normalfont\colorist@sffamily\color{maintext}\conditionalbfseries#1}#3}
\creflabelformat{definition-theoremRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionRU}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -1081,7 +1127,7 @@
\item[\hskip\labelsep
\itshape
#1\hspace{.4em}%
- \textcolor{gray!55!paper}{$|$}]\ignorespaces
+ \textcolor{maintext!27!paper}{$|$}]\ignorespaces
}{%
\popQED\endtrivlist\@endpefalse
}
@@ -1091,83 +1137,83 @@
\tcbstartdraftmode
\fi
\tcolorboxenvironment{theorem}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{theorem*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{lemma}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{lemma*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{proposition}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{proposition*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{corollary}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{corollary*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{property}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{property*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{axiom}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{axiom*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{definition-proposition}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{definition-proposition*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{definition-theorem}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{definition-theorem*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.9,colframe=orange,arc=.7mm}
\tcolorboxenvironment{fact}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
boxrule=0pt,frame hidden,arc=.7mm}
\tcolorboxenvironment{fact*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
boxrule=0pt,frame hidden,arc=.7mm}
\tcolorboxenvironment{conjecture}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.7,colframe=purple,arc=.7mm}
\tcolorboxenvironment{conjecture*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=black!3!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
left=3.5mm,right=3.5mm,
opacityframe=0.7,colframe=purple,arc=.7mm}
@@ -1223,10 +1269,10 @@
borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
\tcolorboxenvironment{example}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
boxrule=0pt,frame hidden,arc=.7mm,lines before break=3}
\tcolorboxenvironment{example*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=gray!10!paper,
+ {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
boxrule=0pt,frame hidden,arc=.7mm,lines before break=3}
\tcolorboxenvironment{problem}
@@ -1356,7 +1402,7 @@
\begin{center}%
\color{maintheme}%
{\Large\colorist@sffamily\scshape\conditionalbfseries\@title}\\\bigskip%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
{\scshape\@author}\\\smallskip%
{\@date}%
\end{center}%
@@ -1370,7 +1416,7 @@
%%================================
\renewenvironment{abstract}
{\small{\centerline{\textsc{\conditionalbfseries\abstractname}}\vspace{-0.3\baselineskip}}
- \color{black!80!paper}\begin{quotation}}
+ \color{maintext!80!paper}\begin{quotation}}
{\end{quotation}\medskip}
%%================================
@@ -1386,7 +1432,7 @@
\newenvironment{keyword}
{\small{\centerline{{\conditionalbfseries\csname keywordname\csname\languagename ABBR\endcsname\endcsname}}\vspace{-0.3\baselineskip}}
- \color{black!80!paper}\begin{center}}
+ \color{maintext!80!paper}\begin{center}}
{\end{center}\medskip}
%%================================
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index db28ac77ab..57707bba37 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -28,7 +28,7 @@
%
% \title{\sffamily easybook 文档类手册}
% \author{瞿毅}
-% \date{2021/06/22\hskip\ccwd\relax v1.26g\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/06/23\hskip\ccwd\relax v1.26h\thanks{\url{https://gitee.com/texl3/easybook}}}
%
% \maketitle
% \begin{abstract}
@@ -157,7 +157,7 @@
% floatpage = <true|(false)>
% \end{syntax}
% 开启这个选项后浮动环境 \env{table} 和 \env{figure} 的比例参数会使用默认值,关闭它则尽可能避免出现浮动页,使图表环境与正文段落更加紧凑,减少多余的空白版面。
-% \changes{v1.26g}{2021/06/15}{增加浮动环境比例参数选项 \opt{floatpage}。}
+% \changes{v1.26h}{2021/06/15}{增加浮动环境比例参数选项 \opt{floatpage}。}
% \end{function}
%
% \subsection{article 模式}
@@ -239,7 +239,7 @@
% \tn{EBeforeAddBitoc*}\marg{加入目录英文标题前的代码}
% \end{syntax}
% \tn{appendix} 命令后的章节标题变为附录形式。英文目录中附录标题的格式用可选参数修改,英文附录目录前名字默认为 Appendix\tn{space},后名字默认为空,名字之间用一个半角逗号分开,也可以只有一部分,表示英文附录目录前名字。英文附录目录数字输出命令默认为 \tn{Alph}\{chapter\}。
-% \changes{v1.26g}{2021/06/13}{增加调整英文目录格式的钩子 \tn{EBeforeAddBitoc}。}
+% \changes{v1.26h}{2021/06/13}{增加调整英文目录格式的钩子 \tn{EBeforeAddBitoc}。}
% \end{function}
%
% \tn{EBeforeAddBitoc} 是一个作用于局部范围的英文目录钩子,可以插入标题或目录设置的命令改变英文目录中标题的显示格式,也可以覆盖上述的目录前后名字和编号等设置,带有星号的命令会重置之前的代码,放置在导言区或 \tn{bichapter} 等命令前生效。
@@ -482,7 +482,7 @@
% 文档类已预置8个定理环境,环境名及对应的定理标题名见小节 \ref{subsec:theorem},如果需要新的定理标题名或定理样式可使用这两个命令,由 \pkg{thmtools} 提供支持,用法与它的同名命令一致。
% \changes{v1.23}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。}
% \changes{v1.24}{2021/04/25}{增加定义定理环境命令 \tn{EBNewTheorem}。}
-% \changes{v1.26g}{2021/06/15}{定义新定理环境的命令调整为 \tn{declaretheorem}。}
+% \changes{v1.26h}{2021/06/15}{定义新定理环境的命令调整为 \tn{declaretheorem}。}
% \end{function}
%
% \begin{optdesc}
@@ -588,7 +588,7 @@
% \tn{markrule}\oarg{长度|(\tn{textwidth})}\parg{颜色名}\marg{线宽|(0.75pt)}[<上间距>+<下间距>]
% \end{syntax}
% 命令 \tn{easyhead} 和 \tn{easyfoot} 的使用方法与 \tn{fancyhead} 和 \tn{fancyfoot} 完全相同,它们需要在 \opt{head-foot} 选项中使用,设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页(odd)、偶数页(even)共12个部分,可选参数中E、O代表偶数、奇数,L、C、R代表左、中、右部分。单面打印时,含有偶数的选项无效。
-% \changes{v1.26g}{2021/06/14}{增加页眉页脚的横线绘制命令 \tn{markrule}。}
+% \changes{v1.26h}{2021/06/14}{增加页眉页脚的横线绘制命令 \tn{markrule}。}
% \end{function}
%
% 命令 \tn{markrule} 用于绘制页眉页脚横线,长度默认为页面文本区的宽度,上下间距为横线与上下方部件的间距,带有长度单位,间距长度之间用+号分开,若只有一部分则表示上间距,这个命令也可以在正文中绘制横线。下面举一个设置页眉内容的例子:
@@ -959,14 +959,14 @@
% 命令 \tn{marginnote} 可以生成简单的边注,如果只给定了 \meta{右文本},那么边注在奇偶数页文字相同。如果同时给定了 \meta{左文本},则偶数页使用 \meta{左文本} 的文字。
% \end{function}
%
-% \subsection{双语标题}
+% \subsection{双语题注}
% \begin{function}[added = 2021-03-19]{\bicaption,\bicaptionbox}
% \begin{syntax}
% \tn{bicaption}\oarg{目录标题1}\marg{标题2}\oarg{目录标题1}\marg{标题2}
% \tn{bicaptionbox}\oarg{目录标题1}\marg{标题2}\oarg{目录标题1}\marg{标题2}
% \ \oarg{宽度}\oarg{内部位置}\marg{内容}
% \end{syntax}
-% 可以实现图表浮动环境的中英文双语标题,使用此功能需要在导言区载入 \pkg{bicaption} 宏包,具体用法见说明文档。
+% 可以实现图表浮动环境的中英文双语题注,使用此功能需要在导言区载入 \pkg{bicaption} 宏包,具体用法见说明文档。
% \end{function}
%
% \subsection{插入文档}
@@ -1035,8 +1035,8 @@
% \bibitem{CTeX}
% \textsc{CTEX.ORG}.
% \newblock \textit{\CTeX 宏集手册} [EB/OL].
-% \newblock version 2.5.6,
-% \newblock (2021-03-14)
+% \newblock version 2.5.7,
+% \newblock (2021-06-20)
% \urlprefix\url{https://ctan.org/pkg/ctex}
%
% \bibitem{fduthesis}
@@ -1081,7 +1081,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/06/22}{1.26g}{beta}
+\ProvidesExplClass{easybook}{2021/06/23}{1.26h}{beta}
\bool_set_false:N \l__eb_compile_draft_bool
\bool_set_false:N \l__eb_title_newline_bool
@@ -1328,7 +1328,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2021/06/22}{1.26g}{beta}
+\ProvidesExplPackage{easybase}{2021/06/23}{1.26h}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
\cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -1545,10 +1545,10 @@
{ expl3 } { 2020/10/27 },
{ xparse } { 2020/10/27 },
{ l3keys2e } { 2020/10/27 },
- { ctex } { 2021/03/14 },
{ thmtools } { 2020/08/01 },
{ caption } { 2020/08/24 },
- { siunitx } { 2021/05/17 }
+ { fancyhdr } { 2021/01/28 },
+ { siunitx } { 2021/06/22 }
}
{ \eb_package_later_bool:nn #1 }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 0ec6db64d7..32f553a6bb 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf
index 8835eef229..a2b78dd03e 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.pdf
+++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex
index 0d1fc5d29f..b201d4c9b7 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.tex
+++ b/macros/latex/contrib/minimalist/minimalist-doc.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[puretext]{minimart}
+\documentclass[English,French,puretext]{minimart}
\CreateTheorem{definition}<highest>
\CreateTheorem{theorem}<highest>
@@ -9,7 +9,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -37,7 +37,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,subsection,href,
+ {linenumbers,nolinenumbers,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
@@ -85,7 +85,7 @@
\title{\minimalist{}, write your articles or books in a simple and clear way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/07a}}
+\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/23}}
\date{June 2021, Beijing}
\maketitle
@@ -146,8 +146,25 @@ And of course, you can also use the default classes \textsf{article} or \textsf{
\begin{itemize}
\item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
\end{itemize}
+\medskip
\begin{tip}
\begin{itemize}
\item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
@@ -155,16 +172,21 @@ And of course, you can also use the default classes \textsf{article} or \textsf{
\end{itemize}
\end{tip}
-\bigskip
+\clearpage
Additionally, \minimart{} and \minimbook{} offers the following options:
\begin{itemize}
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
\item Optional paper size. The default paper size is 7in $\times$ 10in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
+ \end{itemize}
+ \item \texttt{useindent}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item Use paragraph indentation instead of inter-paragraph spacing.
\end{itemize}
\end{itemize}
@@ -269,7 +291,6 @@ And then define this environment in one of following five ways:
\begin{itemize}
\item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
\end{itemize}
- \clearpage
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
\item Define a numbered environment \meta{name of environment}, numbered within the counter \meta{numbered within}
@@ -408,7 +429,7 @@ If you want to write in the standard way, you can refer to the following example
\begin{code}
\documentclass{minimart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -446,7 +467,7 @@ If you wish to switch to the standard class later, just replace the first two li
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -457,7 +478,7 @@ If you intend to switch to the journal template in the future and thus want to u
\begin{code}
\documentclass{minimart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -499,7 +520,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index fdea2527fb..90b8b1564c 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/06/07a A simple and clear style for articles and books]
+ [2021/06/23 A simple and clear style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -28,8 +28,10 @@
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{puretext}
\DeclareBoolOption[false]{nothms}
+\DeclareBoolOption[false]{nothmnum}
\DeclareBoolOption[false]{allowbf}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{runin}
\ProcessKeyvalOptions*\relax
\if@minimalist@draft
@@ -48,22 +50,24 @@
\newif\ifIsBook
\ifdefined\c@chapter\IsBooktrue\else\IsBookfalse\fi
+\def\minimalist@titlefontshape{}
+
%%================================
%% Title fonts
%%================================
\RequirePackage{anyfontsize}
\if@minimalist@classical
-\newcommand{\partfont}{\conditionalbfseries\sffamily}
-\newcommand{\chapfont}{\conditionalbfseries\sffamily}
-\newcommand{\secfont}{\conditionalbfseries\sffamily}
-\newcommand{\subsecfont}{\conditionalbfseries\sffamily}
-\newcommand{\subsubsecfont}{\conditionalbfseries\sffamily}
+\newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape}
+\newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape}
+\newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape}
+\newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape}
+\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape}
\else
-\newcommand{\partfont}{\conditionalbfseries\sffamily}
-\newcommand{\chapfont}{\conditionalbfseries\sffamily}
+\newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape}
+\newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape}
\newcommand{\secfont}{\conditionalbfseries}
\newcommand{\subsecfont}{\conditionalbfseries}
-\newcommand{\subsubsecfont}{\conditionalbfseries}
+\newcommand{\subsubsecfont}{\conditionalbfseries\itshape}
\fi
%%================================
@@ -81,14 +85,14 @@
\fancypagestyle{fancy}{
\fancyhf{}
\if@twoside
- \fancyfoot[RO]{\small\textcolor{black!30!paper}{\lastrightmark}%
- ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ \fancyfoot[RO]{\small\textcolor{maintext!30!paper}{\lastrightmark}%
+ ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fancyfoot[LE]{\small\leavevmode\llap{\thepage%
- ~~\textcolor{gray!55!paper}{$|$}}%
- ~~\textcolor{black!30!paper}{\lastleftmark}}
+ ~~\textcolor{maintext!27!paper}{$|$}}%
+ ~~\textcolor{maintext!30!paper}{\lastleftmark}}
\else
- \fancyfoot[R]{\small\textcolor{black!30!paper}{\lastrightmark}%
- ~~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ \fancyfoot[R]{\small\textcolor{maintext!30!paper}{\lastrightmark}%
+ ~~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -97,12 +101,12 @@
\fancyhf{}
\if@twoside
\fancyfoot[RO]{\small%
- ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fancyfoot[LE]{\small\leavevmode\llap{\thepage%
- ~~\textcolor{gray!55!paper}{$|$}}}
+ ~~\textcolor{maintext!27!paper}{$|$}}}
\else
\fancyfoot[R]{\small%
- ~\rlap{\textcolor{gray!55!paper}{$|$}~~\thepage}}
+ ~\rlap{\textcolor{maintext!27!paper}{$|$}~~\thepage}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -121,12 +125,12 @@
+(-\i*0.5em-.025em,-10pt+\i*1.1pt)$)
rectangle ($(current page text area.south east)
+(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
- \shade[top color=paper,bottom color=black,opacity=0.12-0.02*\i]
+ \shade[top color=paper,bottom color=maintext,opacity=0.12-0.02*\i]
($(current page text area.north east)
+(-\i*0.5em-.025em,2pt)$)
rectangle ($(current page text area.north east)
+(-\i*0.5em+.025em,-10pt+\i*1.1pt)$);
- \shade[top color=black,bottom color=paper,opacity=0.12-0.02*\i]
+ \shade[top color=maintext,bottom color=paper,opacity=0.12-0.02*\i]
($(current page text area.south east)
+(-\i*0.5em-.025em,-2pt)$)
rectangle ($(current page text area.south east)
@@ -169,7 +173,7 @@
%%================================
\PassOptionsToPackage{pagewise,mathlines}{lineno}
\RequirePackage{lineno}
-\renewcommand\linenumberfont{\ttfamily\color{gray!15!paper}\footnotesize}
+\renewcommand\linenumberfont{\ttfamily\color{maintext!7!paper}\footnotesize}
\setlength\linenumbersep{1em}
\RequirePackage{mathtools}
@@ -259,7 +263,7 @@
\LocallyStopLineNumbers%
\begin{flushright}%
\begin{minipage}{0.833\textwidth}%
- \color{black!80!paper}\raggedleft#1%
+ \color{maintext!80!paper}\raggedleft#1%
\end{minipage}%
\end{flushright}%
\ResumeLineNumbers%
@@ -271,16 +275,16 @@
\titleformat{\chapter}
{\thispagestyle{fancy}%
\LocallyStopLineNumbers%
- \color{black!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
- {\rlap{\hspace*{-.5em}{\color{gray!25!paper}%
+ \color{maintext!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
+ {\rlap{\hspace*{-.5em}{\color{maintext!12!paper}%
\fontsize{80}{0}\selectfont\raisebox{-7pt}{\thechapter}}}#1}
[\ResumeLineNumbers]
\titleformat{name=\chapter,numberless}
{\thispagestyle{fancy}%
\LocallyStopLineNumbers%
% \phantomsection\addcontentsline{toc}{chapter}{#1}%
- \color{black!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
- {\rlap{\hspace*{-.5em}{\color{gray!25!paper}%
+ \color{maintext!80!paper}\chapfont\fontsize{16}{0}\selectfont}{}{0em}
+ {\rlap{\hspace*{-.5em}{\color{maintext!12!paper}%
\fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{*}}}#1}
[\ResumeLineNumbers]
}{
@@ -305,7 +309,7 @@
\LocallyStopLineNumbers%
\begin{flushright}%
\begin{minipage}{0.833\textwidth}%
- \color{black!80!paper}\raggedleft#1%
+ \color{maintext!80!paper}\raggedleft#1%
\end{minipage}%
\end{flushright}%
\ResumeLineNumbers%
@@ -323,15 +327,15 @@
{#1}
[\ResumeLineNumbers]
\else
-\newcommand\seculine{\bgroup\markoverwith{\color{gray!55!paper}%
+\newcommand\seculine{\bgroup\markoverwith{\color{maintext!27!paper}%
\rule[-0.9ex]{2pt}{.6pt}\hspace{-2pt}\rule[-1.2ex]{2pt}{.6pt}}\ULon}
\newcommand\sec@decochar{\raisebox{.03em}{\normalfont\footnotesize/}}
\titleformat{\section}
{\LocallyStopLineNumbers%
\secfont\centering}{}{0em}
- {{\small\textcolor{gray!55!paper}{\sec@decochar}%
- \,\,\textcolor{black!90!paper}{\conditionalbfseries\arabic{section}}%
- \,\,\textcolor{gray!55!paper}{\sec@decochar}}\\
+ {{\small\textcolor{maintext!27!paper}{\sec@decochar}%
+ \,\,\textcolor{maintext!90!paper}{\conditionalbfseries\arabic{section}}%
+ \,\,\textcolor{maintext!27!paper}{\sec@decochar}}\\
\seculine{#1}}
[\ResumeLineNumbers]
\titleformat{name=\section,numberless}
@@ -353,12 +357,12 @@
{#1}
[\ResumeLineNumbers]
\else
-\newcommand\subseculine{\bgroup\markoverwith{\color{gray!55!paper}%
+\newcommand\subseculine{\bgroup\markoverwith{\color{maintext!27!paper}%
\rule[-1ex]{2pt}{.75pt}}\ULon}
\titleformat{\subsection}
{\LocallyStopLineNumbers%
\subsecfont}{}{0em}
- {\subseculine{\thesubsection~\textcolor{gray!55!paper}{$|$}~#1}}
+ {\subseculine{\thesubsection~\textcolor{maintext!27!paper}{$|$}~#1}}
[\ResumeLineNumbers]
\titleformat{name=\subsection,numberless}
{\LocallyStopLineNumbers%
@@ -368,11 +372,21 @@
\fi
%% Subsubsection
+\if@minimalist@runin
+\titleformat{\subsubsection}[runin]
+ {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
+ {#1.}[\hspace*{.3em}]
+\else
\titleformat{\subsubsection}
{\LocallyStopLineNumbers%
- \color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{.6em}
+ \color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
{#1}
[\ResumeLineNumbers]
+\fi
+
+%% Paragraph
+\titleformat{\paragraph}[runin]
+ {\scshape}{\theparagraph}{1em}{#1}
\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
@@ -395,44 +409,44 @@
{\addvspace{.5pc}\normalfont}
{\contentslabel{2em}}
{\hspace*{-2em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
{\normalfont}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [7em] % i.e., 4em (section) + 3em
+ [6.5em] % i.e., 4em (section) + 2.5em
{\normalfont}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\contentslabel{2.25em}}
+ {\hspace*{-2.25em}}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [9em] % i.e., 7em (subsection) + 2em
+ [8.5em] % i.e., 6.5em (subsection) + 3em
{\normalfont}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
}{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
{\normalfont}
{\contentslabel{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [5em] % i.e., 2em (section) + 3em
+ [4.5em] % i.e., 2em (section) + 2.5em
{\normalfont}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\contentslabel{2.25em}}
+ {\hspace*{-2.25em}}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [7em] % i.e., 5em (subsection) + 2em
+ [7.5em] % i.e., 4.5em (subsection) + 3em
{\normalfont}
{\contentslabel{2.75em}}
{\hspace*{-2.75em}}
- {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+ {\titlerule*[1em]{\textcolor{maintext!15!paper}{.}}\contentspage}
}
%%================================
@@ -440,9 +454,10 @@
%%================================
\RequirePackage{enumitem}
\setlist{noitemsep,leftmargin=2em}
-\renewcommand\labelitemi{\color{gray!50}$\bullet$}
-\renewcommand\labelitemii{\color{gray!55}--}
-\renewcommand\labelitemiii{\color{gray!55}\texttt{*}}
+\gappto{\PJLlang@langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}}
+\gappto{\PJLlang@langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}}
+\renewcommand\labelitemii{\textcolor{maintext!27}{--}}
+\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}}
%%================================
%% Blank page
@@ -455,7 +470,7 @@
\AddToHookNext{shipout/background}
{%
\put(0.5\paperwidth,-0.5\paperheight){%
- \makebox[0pt]{\large\color{gray!20!paper}\blinkpagetext}}}
+ \makebox[0pt]{\large\color{maintext!10!paper}\blinkpagetext}}}
\null\newpage\fi\fi}
%%================================
@@ -468,45 +483,33 @@
%%================================
\RequirePackage{amsthm}
\if@minimalist@classical
- \if@minimalist@allowbf
\newtheoremstyle{simple}%
{}{}%
{\normalfont}{}%
{\normalfont}{}%
{0pt}%
- {{\conditionalbfseries\sffamily\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
- {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
- \else
- \newcommand\thmuline{\bgroup\markoverwith{\color{gray!55!paper}%
- \rule[-.6ex]{2pt}{.5pt}}\ULon}
+ {{\conditionalbfseries\minimalist@titlefontshape\thmname{#1}\thmnumber{ #2}}%
+ {\color{maintext!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}~~{\normalfont---}~~}
+\else
+ \def\simpleqedsymbol{%
+ \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
\newtheoremstyle{simple}%
{}{}%
{\normalfont}{}%
{\normalfont}{}%
{0pt}%
- {{\sffamily\thmuline{\thmname{\textsc{#1}}\thmnumber{ #2}}}\hspace{.4em}%
- {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
- \fi
-\else
-\def\simpleqedsymbol{%
- \makebox[1em]{\rlap{\textcolor{gray!25!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
-\newtheoremstyle{simple}%
- {}{}%
- {\normalfont}{}%
- {\normalfont}{}%
- {0pt}%
- {\global\let\qedsymbol\simpleqedsymbol%
- {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
- \textcolor{gray!55!paper}{$|$}\hspace{.4em}%
- \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}%
- \pushQED{\qed}%
- }
-\def\@endtheorem{\popQED\endtrivlist\@endpefalse
-\global\let\qedsymbol\qedsymbolOriginal}
+ {\global\let\qedsymbol\simpleqedsymbol%
+ {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
+ \textcolor{maintext!27!paper}{$|$}\hspace{.4em}%
+ \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}%
+ \pushQED{\qed}%
+ }
+ \def\@endtheorem{\popQED\endtrivlist\@endpefalse
+ \global\let\qedsymbol\qedsymbolOriginal}
\fi
\renewcommand{\qedsymbol}{%
- \makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
+ \makebox[1em]{\color{maintext!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbolOriginal\qedsymbol
\if@minimalist@fast
@@ -540,8 +543,8 @@
\pretocmd{\problemnameEN}{\textsc}{}{\FAIL}
\pretocmd{\questionnameEN}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameEN}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameEN}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameEN}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameEN}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameEN}{\itshape}{}{\FAIL}
%% Adjust French theorems names
\pretocmd{\theoremnameFR}{\textsc}{}{\FAIL}
@@ -561,8 +564,8 @@
\pretocmd{\problemnameFR}{\textsc}{}{\FAIL}
\pretocmd{\questionnameFR}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameFR}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameFR}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameFR}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameFR}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameFR}{\itshape}{}{\FAIL}
%% Adjust German theorems names
\pretocmd{\theoremnameDE}{\textsc}{}{\FAIL}
@@ -582,8 +585,8 @@
\pretocmd{\problemnameDE}{\textsc}{}{\FAIL}
\pretocmd{\questionnameDE}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameDE}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameDE}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameDE}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameDE}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameDE}{\itshape}{}{\FAIL}
%% Adjust Italian theorems names
\pretocmd{\theoremnameIT}{\textsc}{}{\FAIL}
@@ -603,8 +606,8 @@
\pretocmd{\problemnameIT}{\textsc}{}{\FAIL}
\pretocmd{\questionnameIT}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameIT}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameIT}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameIT}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameIT}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameIT}{\itshape}{}{\FAIL}
%% Adjust Portuguese theorems names
\pretocmd{\theoremnamePT}{\textsc}{}{\FAIL}
@@ -624,8 +627,8 @@
\pretocmd{\problemnamePT}{\textsc}{}{\FAIL}
\pretocmd{\questionnamePT}{\textsc}{}{\FAIL}
\pretocmd{\exercisenamePT}{\textsc}{}{\FAIL}
-\pretocmd{\remarknamePT}{\textsc}{}{\FAIL}
-\pretocmd{\observationnamePT}{\textsc}{}{\FAIL}
+\pretocmd{\remarknamePT}{\itshape}{}{\FAIL}
+\pretocmd{\observationnamePT}{\itshape}{}{\FAIL}
%% Adjust Brazilian theorems names
\pretocmd{\theoremnameBR}{\textsc}{}{\FAIL}
@@ -645,8 +648,8 @@
\pretocmd{\problemnameBR}{\textsc}{}{\FAIL}
\pretocmd{\questionnameBR}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameBR}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameBR}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameBR}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameBR}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameBR}{\itshape}{}{\FAIL}
%% Adjust Spanish theorems names
\pretocmd{\theoremnameES}{\textsc}{}{\FAIL}
@@ -666,8 +669,8 @@
\pretocmd{\problemnameES}{\textsc}{}{\FAIL}
\pretocmd{\questionnameES}{\textsc}{}{\FAIL}
\pretocmd{\exercisenameES}{\textsc}{}{\FAIL}
-\pretocmd{\remarknameES}{\textsc}{}{\FAIL}
-\pretocmd{\observationnameES}{\textsc}{}{\FAIL}
+\pretocmd{\remarknameES}{\itshape}{}{\FAIL}
+\pretocmd{\observationnameES}{\itshape}{}{\FAIL}
%% Theorem environments
\theoremstyle{simple}
@@ -677,6 +680,17 @@
\newaliascnt{highest}{section}
}
\if@minimalist@nothms\else
+\if@minimalist@nothmnum
+\CreateTheorem*{theorem}
+\CreateTheorem*{lemma}
+\CreateTheorem*{proposition}
+\CreateTheorem*{corollary}
+\CreateTheorem*{definition-proposition}
+\CreateTheorem*{definition-theorem}
+\CreateTheorem*{property}
+\CreateTheorem*{fact}
+\CreateTheorem*{conjecture}
+\else
\CreateTheorem{theorem}<highest>
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
@@ -686,6 +700,7 @@
\CreateTheorem{property}[theorem]
\CreateTheorem{fact}[theorem]
\CreateTheorem{conjecture}[theorem]
+\fi
\CreateTheorem*{theorem*}
\CreateTheorem*{lemma*}
\CreateTheorem*{proposition*}
@@ -695,6 +710,18 @@
\CreateTheorem*{property*}
\CreateTheorem*{fact*}
\CreateTheorem*{conjecture*}
+\if@minimalist@nothmnum
+\CreateTheorem*{definition}
+\CreateTheorem*{axiom}
+\CreateTheorem*{assumption}
+\CreateTheorem*{convention}
+\CreateTheorem*{hypothesis}
+\CreateTheorem*{notation}
+\CreateTheorem*{example}
+\CreateTheorem*{problem}
+\CreateTheorem*{question}
+\CreateTheorem*{exercise}
+\else
\CreateTheorem{definition}[theorem]
\CreateTheorem{axiom}[theorem]
\CreateTheorem{assumption}[theorem]
@@ -705,6 +732,7 @@
\CreateTheorem{problem}[theorem]
\CreateTheorem{question}[theorem]
\CreateTheorem{exercise}[theorem]
+\fi
\CreateTheorem*{definition*}
\CreateTheorem*{axiom*}
\CreateTheorem*{assumption*}
@@ -715,14 +743,17 @@
\CreateTheorem*{problem*}
\CreateTheorem*{question*}
\CreateTheorem*{exercise*}
+\if@minimalist@nothmnum
+\CreateTheorem*{remark}
+\CreateTheorem*{observation}
+\else
\CreateTheorem{remark}<highest>
-\CreateTheorem*{remark*}
\CreateTheorem{observation}<highest>
+\fi
+\CreateTheorem*{remark*}
\CreateTheorem*{observation*}
\fi
-\setlength{\parindent}{2em}
-
\ifbool{IsBook}{}{%
%%================================
@@ -732,8 +763,8 @@
\renewcommand{\@maketitle}{%
\LocallyStopLineNumbers%
\begin{center}%
- {\conditionalbfseries\sffamily\large\@title}\\\bigskip%
- \color{black!80!paper}%
+ {\conditionalbfseries\minimalist@titlefontshape\large\@title}\\\bigskip%
+ \color{maintext!80!paper}%
{\small\scshape\@author}\\[2pt]%
{\small\@date}%
\end{center}%
@@ -745,12 +776,12 @@
\renewcommand{\@maketitle}{%
\LocallyStopLineNumbers%
\noindent%
- {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}}%
+ {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}}%
% \vspace{-\parskip}%
\vspace{-.5\baselineskip}%
\begin{flushright}%
{\conditionalbfseries\@title}\\\medskip%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
{\small\scshape\@author}%
\par\vspace{-\parskip}\vspace{2pt}%
{\small\@date}%
@@ -758,11 +789,12 @@
% \vspace{-\parskip}%
\vspace{-.5\baselineskip}%
\ifx\@date\@empty%
- \vspace{1.6\baselineskip}%
+ \vspace{\baselineskip}%
+ \vspace{1.2\parskip}%
\else%
\vspace{-.5\baselineskip}%
\fi%
- {\textcolor{gray!55!paper}{\rule{\textwidth}{0.75pt}}\par}%
+ {\textcolor{maintext!27!paper}{\rule{\textwidth}{0.75pt}}\par}%
\ResumeLineNumbers%
}
\fi
@@ -780,7 +812,7 @@
\vspace{-.3\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
}{%
@@ -798,7 +830,7 @@
\vspace{-.25\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
}{%
@@ -829,7 +861,7 @@
\vspace{-.3\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
\begin{center}%
@@ -850,7 +882,7 @@
\vspace{-.30\baselineskip}%
\begin{minipage}[t]{.833\textwidth}%
\vspace{0pt}%
- \color{black!80!paper}%
+ \color{maintext!80!paper}%
\footnotesize%
\parindent=2em
\raggedleft%
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index e3babb2c3d..180f2b3cb6 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/06/07a A simple and clear article style]
+ [2021/06/23 A simple and clear article style]
\def\minimclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -28,6 +28,8 @@
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{useindent}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -45,6 +47,9 @@
\if@minimclass@draft
\@minimclass@fasttrue
\fi
+\if@minimclass@classical
+ \@minimclass@useindenttrue
+\fi
\if@minimclass@palatino
\@minimclass@customfonttrue
\fi
@@ -93,9 +98,9 @@
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
-\if@minimclass@classical
+\if@minimclass@useindent
\RequirePackage{indentfirst}
\else
\AtEndPreamble{\RequirePackage{parskip}}
@@ -121,9 +126,10 @@
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@times
@@ -133,11 +139,14 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@minimclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -149,6 +158,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@minimclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -157,7 +169,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@minimclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -165,8 +178,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -181,9 +198,10 @@
%%================================
%% Index
%%================================
-\RequirePackage{imakeidx}
-\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
-\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
+\AtEndPreamble{
+\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{}
+\apptocmd{\printindex}{\ResumeLineNumbers}{}{}
+}
\endinput
%%
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index 5091782a7d..80b3be27c2 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/06/07a A simple and clear book style]
+ [2021/06/23 A simple and clear book style]
\def\minimclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -28,6 +28,8 @@
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{useindent}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -45,6 +47,9 @@
\if@minimclass@draft
\@minimclass@fasttrue
\fi
+\if@minimclass@classical
+ \@minimclass@useindenttrue
+\fi
\if@minimclass@palatino
\@minimclass@customfonttrue
\fi
@@ -93,9 +98,9 @@
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
-\if@minimclass@classical
+\if@minimclass@useindent
\RequirePackage{indentfirst}
\else
\AtEndPreamble{\RequirePackage{parskip}}
@@ -121,9 +126,10 @@
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@times
@@ -133,11 +139,14 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@minimclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -149,6 +158,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@minimclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -157,7 +169,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@minimclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -165,8 +178,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -181,9 +198,10 @@
%%================================
%% Index
%%================================
-\RequirePackage{imakeidx}
-\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
-\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
+\AtEndPreamble{
+\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{}
+\apptocmd{\printindex}{\ResumeLineNumbers}{}{}
+}
\endinput
%%
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
index 0ce2263737..be8d0073e0 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
index 5e97911426..cdef90570e 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[allowbf,puretext]{beaulivre}
+\documentclass[Chinese,English,allowbf,puretext]{beaulivre}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
%%================================
%% 引入工具集
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -46,7 +46,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
+ {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -104,7 +104,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-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,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/06/07}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/06/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年6月,北京}};
\end{tikzpicture}%
@@ -164,30 +164,45 @@
\item 启用 \ProjLib{} 工具箱的快速模式。
\end{itemize}
\end{itemize}
+\begin{tip}
+ 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+\end{tip}
\item \texttt{a4paper} 或 \texttt{b5paper}
\begin{itemize}
\item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
\end{itemize}
- \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum}
+ \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
\item 字体选项。顾名思义,会加载相应名称的字体。
+ \item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
+ \clearpage
\item \texttt{allowbf}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item \lstinline|\subsubsection| 采用 ``runin'' 风格。
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item 纯文本模式,不加载定理类环境。
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item 定理类环境不编号。
+ \end{itemize}
+ \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等
+ \begin{itemize}
+ \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+ \end{itemize}
\end{itemize}
-\begin{tip}
- \begin{itemize}
- \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
- \end{itemize}
-\end{tip}
-
\bigskip
另外,排版图书时常用的 \texttt{oneside}、\texttt{twoside} 选项也是可以使用的。默认采用双页排版。
-\chapter{关于文档类中使用的字体}
+\chapter{关于默认字体}
\beaulivre{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
\begin{tip}[字体演示]
@@ -477,7 +492,7 @@
\begin{code}
\documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -508,7 +523,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{book}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -519,7 +534,7 @@ Référence du théorème: \cref{thm:abc}
\begin{code}
\documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -557,7 +572,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{amsbook}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\blinddocument
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
index 2876e0abbe..e03e93518e 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
index a09b697d61..f056cd76a6 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[allowbf,puretext]{beaulivre}
+\documentclass[English,French,allowbf,puretext]{beaulivre}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -44,7 +44,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
+ {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -102,7 +102,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-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,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/06/07}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/06/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}{June 2021, Beijing}};
\end{tikzpicture}%
@@ -160,30 +160,46 @@ as the first line to use the \beaulivre{} class.
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
+\begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+\end{tip}
+\medskip
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
\item Optional paper size. The default paper size is 8.5in $\times$ 11in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \clearpage
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
\end{itemize}
-\begin{tip}
- \begin{itemize}
- \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
- \end{itemize}
-\end{tip}
-
\bigskip
In addition, the commonly used \texttt{oneside} and \texttt{twoside} options are also available. Two-page layout is used by default.
-\chapter{On the fonts}
+\chapter{On the default fonts}
By default, \beaulivre{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
\medskip
@@ -467,7 +483,7 @@ If you want to write in the standard way, you can refer to the following example
\begin{code}
\documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -498,7 +514,7 @@ If you wish to switch to the standard class later, just replace the first two li
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -509,7 +525,7 @@ If you intend to switch to the journal template in the future and thus want to u
\begin{code}
\documentclass{beaulivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -548,7 +564,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\blinddocument
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre.cls b/macros/unicodetex/latex/beaulivre/beaulivre.cls
index 68555495d2..0088213600 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre.cls
+++ b/macros/unicodetex/latex/beaulivre/beaulivre.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{beaulivre}
- [2021/06/07 A colorful book style]
+ [2021/06/23 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,7 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -94,7 +95,7 @@
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
\RequirePackage{colorist}
@@ -113,11 +114,13 @@
\RequirePackage{fontspec}
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
+ [\if@colorclass@useosf Numbers = OldStyle\fi]
}{
\setmainfont{TeXGyrePagellaX-Regular.otf}[
BoldFont = TeXGyrePagellaX-Bold.otf ,
ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
+ \if@colorclass@useosf Numbers = OldStyle\fi ]
}
\setsansfont{SourceSansPro-Regular.otf}[
Scale = MatchLowercase ,
@@ -193,59 +196,92 @@
\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler}
- [range={"0000-"0001,"0020-"007E,
- "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
- "00D7,"00F7,
- "0131,
- "0237,"02C6-"02C7,"02D8-"02DA,"02DC,
- "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338,
- "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB,
- "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5,
- "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044,
- "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF,
- "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128,
- "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199,
- "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5,
- "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E,
- "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D,
- "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E,
- "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5,
- "22DC-"22DD,"22EF,"22F0-"22F1,
- "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE,
- "23DC-"23DF,
- "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A,
- "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,
- "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505,
- "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
- "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
- "1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
-\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+\setmathfont[range={up/{Latin,latin,Greek,greek},
+ bfup/{Latin,latin,Greek,greek},
+ cal, bfcal, frak, bffrak,
+ `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash,
+ \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
+ \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
+ \sum,\prod,\coprod,
+ \sqrt,\int,\iint,\iiint,\oint},
+ script-features={},
+ sscript-features={},
+ Scale = 1.05,
]{Neo Euler}
-\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
- script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
- sfup, sfit, bfsfup, bfsfit, tt}
- ]{Asana-Math.otf}
-\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
+\setmathfont[range={up/num, bfup/num}
+ ]{texgyrepagella-math.otf}
+
+\newbox\xratbelow
+\newbox\xratabove
+\renewcommand{\xrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xmapsto}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\newcommand{\xlongequal}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
\fi
\fi
-\let\colorist@sffamily\sffamily
-\let\colorist@textsc\textsc
-
\if@colorclass@palatino
\RequirePackage{amssymb}
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@colorclass@useosf\useosf\fi
\fi
\if@colorclass@times
@@ -255,12 +291,15 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@colorclass@useosf\useosf\fi
\let\colorist@sffamily\relax
\fi
\if@colorclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@colorclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -273,6 +312,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@colorclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -281,7 +323,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@colorclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -289,8 +332,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -302,11 +349,6 @@
\RequirePackage{caption}
\captionsetup{font=small}
-%%================================
-%% Index
-%%================================
-\RequirePackage{imakeidx}
-
\endinput
%%
%% End of file `beaulivre/beaulivre.cls'.
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
index 9981934f23..dccd7ba29b 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
index ca0fdf1df0..a1265d2ff6 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[puretext]{einfart}
+\documentclass[Chinese,English,puretext]{einfart}
\CreateTheorem{definition}<highest>
\CreateTheorem{theorem}<highest>
@@ -9,7 +9,7 @@
%%================================
%% 引入工具集
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -39,12 +39,12 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,subsection,href,
+ {linenumbers,nolinenumbers,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
-{\LocallyStopLineNumbers%
+{\setstretch{1.07}\LocallyStopLineNumbers%
\setkeys{lst}{columns=fullflexible,keepspaces=true}%
}
{\ResumeLineNumbers}
@@ -87,7 +87,7 @@
\title{\einfart{},以极简主义风格排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\einfart{} 2021/06/07}}
+\thanks{对应版本. \texttt{\einfart{} 2021/06/23}}
\date{2021年6月,北京}
\maketitle
@@ -134,14 +134,18 @@
\item 启用 \ProjLib{} 工具箱的快速模式。
\end{itemize}
\end{itemize}
+\begin{tip}
+ 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+\end{tip}
\item \texttt{a4paper} 或 \texttt{b5paper}
\begin{itemize}
\item 可选的纸张大小。默认的纸张大小为 7in $\times$ 10in。
\end{itemize}
- \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum}
- \begin{itemize}
- \item 字体选项。顾名思义,会加载相应名称的字体。
- \end{itemize}
+ \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \item 字体选项。顾名思义,会加载相应名称的字体。
+ \item \texttt{useosf} 选项用来启用“旧式”数字。
+ \end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
@@ -150,16 +154,33 @@
\begin{itemize}
\item 经典模式。启用这一选项时,样式会变得更加中规中矩:段落呈首行缩进样式、各类下划线减少、标题样式改变、定理类环境的样式也会更贴近常见的设置。
\end{itemize}
-\end{itemize}
-
\begin{tip}
- \begin{itemize}
- \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
- \item 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。
- \end{itemize}
+ 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。
\end{tip}
+ \item \texttt{useindent}
+ \begin{itemize}
+ \item 采用段首缩进而不是段间间距。
+ \end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item \lstinline|\subsubsection| 采用 ``runin'' 风格。
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item 纯文本模式,不加载定理类环境。
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item 定理类环境不编号。
+ \end{itemize}
+ \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等
+ \begin{itemize}
+ \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+ \end{itemize}
+\end{itemize}
+
-\section{关于文档类中使用的字体}
+\section{关于默认字体}
\einfart{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
% \begin{itemize}
@@ -227,6 +248,7 @@
在引用定理类环境时,建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
+\medskip
\begin{tip}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
@@ -250,7 +272,7 @@
\UseLanguage{Chinese}
-
+\clearpage
\subsection{定义新的定理型环境}
若需要定义新的定理类环境,首先要定义这个环境在所用语言下的名称:
@@ -311,10 +333,11 @@
可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 subsection 内编号),它们支持在简体中文语境中使用,效果如下所示:
+\vspace{-.3\baselineskip}
\begin{proofidea*}
\lstinline|proofidea*| 环境。
\end{proofidea*}
-
+\vspace{-.5\baselineskip}
\begin{proofidea}
\lstinline|proofidea| 环境。
\end{proofidea}
@@ -417,7 +440,7 @@
\begin{code}
\documentclass{einfart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -455,7 +478,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -466,7 +489,7 @@ Référence du théorème: \cref{thm:abc}
\begin{code}
\documentclass{einfart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -508,7 +531,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
index 6123cb245a..658da1098e 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.tex b/macros/unicodetex/latex/einfart/einfart-doc-en.tex
index f984c7eb10..d92668f4cd 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-en.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-en.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[puretext]{einfart}
+\documentclass[English,French,puretext]{einfart}
\CreateTheorem{definition}<highest>
\CreateTheorem{theorem}<highest>
@@ -9,7 +9,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -37,7 +37,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,subsection,href,
+ {linenumbers,nolinenumbers,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
@@ -85,7 +85,7 @@
\title{\einfart{}, write your articles in a simple and clear way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\einfart{} 2021/06/07}}
+\thanks{Corresponding to: \texttt{\einfart{} 2021/06/23}}
\date{June 2021, Beijing}
\maketitle
@@ -130,14 +130,18 @@ as the first line to use the \einfart{} class. Please note that you need to use
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
+\begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+\end{tip}
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
\item Optional paper size. The default paper size is 7in $\times$ 10in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
- \begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
- \end{itemize}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
+ \end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
@@ -146,16 +150,33 @@ as the first line to use the \einfart{} class. Please note that you need to use
\begin{itemize}
\item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
\end{itemize}
-\end{itemize}
-
\begin{tip}
- \begin{itemize}
- \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
- \item \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
- \end{itemize}
+ \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
\end{tip}
+ \item \texttt{useindent}
+ \begin{itemize}
+ \item Use paragraph indentation instead of inter-paragraph spacing.
+ \end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \clearpage
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
+\end{itemize}
-\section{On the fonts}
+\section{On the default fonts}
By default, \einfart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
% \begin{itemize}
@@ -242,7 +263,7 @@ By default, when referenced, the name of the theorem always matches the language
\UseLanguage{English}
-
+\clearpage
\subsection{Define a new theorem-like environment}
If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use:
@@ -407,7 +428,7 @@ If you want to write in the standard way, you can refer to the following example
\begin{code}
\documentclass{einfart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -445,7 +466,7 @@ If you wish to switch to the standard class later, just replace the first two li
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -456,7 +477,7 @@ If you intend to switch to the journal template in the future and thus want to u
\begin{code}
\documentclass{einfart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -498,7 +519,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/einfart/einfart.cls b/macros/unicodetex/latex/einfart/einfart.cls
index 46afa4f549..f3d52b2bb3 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/06/07 A simple and clear article style]
+ [2021/06/23 A simple and clear article style]
\def\minimclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -28,6 +28,8 @@
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{useindent}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -45,6 +47,9 @@
\if@minimclass@draft
\@minimclass@fasttrue
\fi
+\if@minimclass@classical
+ \@minimclass@useindenttrue
+\fi
\if@minimclass@palatino
\@minimclass@customfonttrue
\fi
@@ -93,9 +98,9 @@
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
-\if@minimclass@classical
+\if@minimclass@useindent
\RequirePackage{indentfirst}
\else
\AtEndPreamble{\RequirePackage{parskip}}
@@ -117,11 +122,13 @@
\RequirePackage{fontspec}
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
+ [\if@minimclass@useosf Numbers = OldStyle\fi]
}{
\setmainfont{TeXGyrePagellaX-Regular.otf}[
BoldFont = TeXGyrePagellaX-Bold.otf ,
ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
+ \if@minimclass@useosf Numbers = OldStyle\fi ]
}
\setsansfont{SourceSansPro-Regular.otf}[
Scale = MatchLowercase ,
@@ -171,8 +178,14 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{%
- \setCJKsansfont{FZYOUHK_506L--GBK1-0}[
+\IfFontExistsTF{FZYOUHK_508R--GBK1-0}{%
+ \setCJKsansfont{FZYOUHK_508R--GBK1-0}[
+ BoldFont = FZYOUHK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
+ ItalicFont = * ,
+ BoldItalicFont = FZYOUHK_509R--GBK1-0 ,
+ SmallCapsFont = * ]
+ \setCJKfamilyfont{zhhei}{FZYOUHK_508R--GBK1-0}[
BoldFont = FZYOUHK_509R--GBK1-0 ,
BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
@@ -184,8 +197,15 @@
ItalicFont = * ,
BoldItalicFont = FandolHei-Bold.otf ,
SmallCapsFont = * ]
+ \setCJKfamilyfont{zhhei}{FandolHei-Regular.otf}[
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ SmallCapsFont = * ]
}
+\def\minimalist@titlefontshape{\CJKfamily{zhhei}}
+
%% Math font
\if@minimclass@customfont\else
\if@minimclass@fast
@@ -197,45 +217,80 @@
\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler}
- [range={"0000-"0001,"0020-"007E,
- "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
- "00D7,"00F7,
- "0131,
- "0237,"02C6-"02C7,"02D8-"02DA,"02DC,
- "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338,
- "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB,
- "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5,
- "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044,
- "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF,
- "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128,
- "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199,
- "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5,
- "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E,
- "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D,
- "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E,
- "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5,
- "22DC-"22DD,"22EF,"22F0-"22F1,
- "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE,
- "23DC-"23DF,
- "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A,
- "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,
- "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505,
- "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
- "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
- "1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
-\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
+\setmathfont[range={up/{Latin,latin,Greek,greek},
+ bfup/{Latin,latin,Greek,greek},
+ cal, bfcal, frak, bffrak,
+ `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash,
+ \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
+ \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
+ \sum,\prod,\coprod,
+ \sqrt,\int,\iint,\iiint,\oint},
+ script-features={},
+ sscript-features={},
+ Scale = 1.05,
]{Neo Euler}
-\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
- script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
- sfup, sfit, bfsfup, bfsfit, tt}
- ]{Asana-Math.otf}
-\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
+\setmathfont[range={up/num, bfup/num}
+ ]{texgyrepagella-math.otf}
+
+\newbox\xratbelow
+\newbox\xratabove
+\renewcommand{\xrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xmapsto}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\newcommand{\xlongequal}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
\fi
\fi
@@ -244,9 +299,10 @@
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@times
@@ -256,11 +312,14 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@minimclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -272,6 +331,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@minimclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -280,7 +342,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@minimclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -288,8 +351,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -304,9 +371,10 @@
%%================================
%% Index
%%================================
-\RequirePackage{imakeidx}
-\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
-\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
+\AtEndPreamble{
+\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{}
+\apptocmd{\printindex}{\ResumeLineNumbers}{}{}
+}
\endinput
%%
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
index 16e1ded147..aacdaf3644 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
index 3006ee300b..8bd4523d44 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[allowbf,puretext]{lebhart}
+\documentclass[Chinese,English,allowbf,puretext]{lebhart}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
%%================================
%% 引入工具集
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -46,7 +46,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
+ {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -88,7 +88,7 @@
\title{{\normalfont\textbf{\textsf{lebhart}}},以多彩的方式排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\lebhart{} 2021/06/07}}
+\thanks{对应版本. \texttt{\lebhart{} 2021/06/23}}
\date{2021年6月,北京}
\maketitle
@@ -135,28 +135,42 @@
\item 启用 \ProjLib{} 工具箱的快速模式。
\end{itemize}
\end{itemize}
+\begin{tip}
+ 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+\end{tip}
\item \texttt{a4paper} 或 \texttt{b5paper}
\begin{itemize}
\item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
\end{itemize}
- \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum}
+ \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
\item 字体选项。顾名思义,会加载相应名称的字体。
+ \item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item \lstinline|\subsubsection| 采用 ``runin'' 风格。
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item 纯文本模式,不加载定理类环境。
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item 定理类环境不编号。
+ \end{itemize}
+ \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等
+ \begin{itemize}
+ \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+ \end{itemize}
\end{itemize}
-\begin{tip}
- \begin{itemize}
- \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
- \end{itemize}
-\end{tip}
-\medskip
-\section{关于文档类中使用的字体}
+\section{关于默认字体}
\lebhart{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费的,需要自行购买使用,可在方正字库网站查询详细信息:\url{https://www.foundertype.com}。
\begin{tip}[字体演示]
@@ -204,6 +218,7 @@
\item 俄文:\texttt{RU} 或 \texttt{Russian}
\end{itemize}
+\clearpage
另外,还可以通过下面的方式来填加相应语言的设置:
\begin{itemize}
\item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
@@ -339,7 +354,8 @@
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
-\bigskip
+% \bigskip
+\clearpage
下面提供一个例子。这三行代码:
\begin{code}
@@ -391,6 +407,7 @@
\end{keyword}
\end{code}
+\clearpage
也可以按照 \AmS{} 文档类的方式来写:
\begin{code}
@@ -446,7 +463,7 @@
\begin{code}
\documentclass{lebhart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -484,7 +501,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -495,7 +512,7 @@ Référence du théorème: \cref{thm:abc}
\begin{code}
\documentclass{lebhart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -537,7 +554,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
index 7d3e18422f..2f76f1714f 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
index 12af55b452..cab423c8c5 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[allowbf,puretext]{lebhart}
+\documentclass[English,French,allowbf,puretext]{lebhart}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
@@ -16,7 +16,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -44,7 +44,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
+ {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib
}
}
\lstnewenvironment{code}%
@@ -86,7 +86,7 @@
\title{{\normalfont\textbf{\textsf{lebhart}}}, write your articles in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\lebhart{} 2021/06/07}}
+\thanks{Corresponding to: \texttt{\lebhart{} 2021/06/23}}
\date{June 2021, Beijing}
\maketitle
@@ -132,27 +132,43 @@ as the first line to use the \lebhart{} class. Please note that you need to use
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
+\begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+\end{tip}
+\medskip
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
\item Optional paper size. The default paper size is 8.5in $\times$ 11in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
\end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
\end{itemize}
-\begin{tip}
- \begin{itemize}
- \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
- \end{itemize}
-\end{tip}
-
-\section{On the fonts}
+\clearpage
+\section{On the default fonts}
By default, \lebhart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
\begin{tip}[Font demonstration]
@@ -194,7 +210,8 @@ Many of the features described next are provided by the \ProjLib{} toolkit. Only
\item Russian: \texttt{RU} or \texttt{Russian}
\end{itemize}
-\medskip
+% \medskip
+\clearpage
In addition, you can also add new settings to selected language:
\begin{itemize}
\item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
@@ -330,7 +347,8 @@ And then define this environment in one of following five ways:
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
-\bigskip
+% \bigskip
+\clearpage
Here is an example. The following code:
\begin{code}
\NameTheorem[EN]{proofidea}{Idea}
@@ -347,6 +365,7 @@ defines an unnumbered environment \lstinline|proofidea*| and a numbered environm
The \lstinline|proofidea| environment.
\end{proofidea}
+\medskip
\subsection{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -377,7 +396,7 @@ Therefore, the title part can either be written in the usual way, in accordance
(*\meta{keywords}*)
\end{keyword}
\end{code}
-
+\clearpage
or written in the way of \AmS{} classes:
\begin{code}
@@ -429,7 +448,7 @@ If you want to write in the standard way, you can refer to the following example
\begin{code}
\documentclass{lebhart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -467,7 +486,7 @@ If you wish to switch to the standard class later, just replace the first two li
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -478,7 +497,7 @@ If you intend to switch to the journal template in the future and thus want to u
\begin{code}
\documentclass{lebhart}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -520,7 +539,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\end{document}
diff --git a/macros/unicodetex/latex/lebhart/lebhart.cls b/macros/unicodetex/latex/lebhart/lebhart.cls
index 799021b560..65c479eaf9 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/06/07 A colorful article style]
+ [2021/06/23 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -27,6 +27,7 @@
}
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -94,7 +95,7 @@
\if@colorclass@fast
\PassOptionsToPackage{fast}{colorist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
\RequirePackage{colorist}
@@ -113,11 +114,13 @@
\RequirePackage{fontspec}
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
+ [\if@colorclass@useosf Numbers = OldStyle\fi]
}{
\setmainfont{TeXGyrePagellaX-Regular.otf}[
BoldFont = TeXGyrePagellaX-Bold.otf ,
ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
+ \if@colorclass@useosf Numbers = OldStyle\fi ]
}
\setsansfont{SourceSansPro-Regular.otf}[
Scale = MatchLowercase ,
@@ -193,59 +196,92 @@
\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler}
- [range={"0000-"0001,"0020-"007E,
- "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
- "00D7,"00F7,
- "0131,
- "0237,"02C6-"02C7,"02D8-"02DA,"02DC,
- "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338,
- "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB,
- "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5,
- "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044,
- "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF,
- "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128,
- "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199,
- "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5,
- "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E,
- "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D,
- "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E,
- "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5,
- "22DC-"22DD,"22EF,"22F0-"22F1,
- "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE,
- "23DC-"23DF,
- "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A,
- "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,
- "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505,
- "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
- "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
- "1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
-\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
+\setmathfont[range={up/{Latin,latin,Greek,greek},
+ bfup/{Latin,latin,Greek,greek},
+ cal, bfcal, frak, bffrak,
+ `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash,
+ \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
+ \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
+ \sum,\prod,\coprod,
+ \sqrt,\int,\iint,\iiint,\oint},
+ script-features={},
+ sscript-features={},
+ Scale = 1.05,
]{Neo Euler}
-\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
- script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
- sfup, sfit, bfsfup, bfsfit, tt}
- ]{Asana-Math.otf}
-\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
+\setmathfont[range={up/num, bfup/num}
+ ]{texgyrepagella-math.otf}
+
+\newbox\xratbelow
+\newbox\xratabove
+\renewcommand{\xrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xmapsto}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\newcommand{\xlongequal}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
\fi
\fi
-\let\colorist@sffamily\sffamily
-\let\colorist@textsc\textsc
-
\if@colorclass@palatino
\RequirePackage{amssymb}
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@colorclass@useosf\useosf\fi
\fi
\if@colorclass@times
@@ -255,12 +291,15 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@colorclass@useosf\useosf\fi
\let\colorist@sffamily\relax
\fi
\if@colorclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@colorclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -273,6 +312,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@colorclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -281,7 +323,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@colorclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -289,8 +332,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -302,11 +349,6 @@
\RequirePackage{caption}
\captionsetup{font=small}
-%%================================
-%% Index
-%%================================
-\RequirePackage{imakeidx}
-
\endinput
%%
%% End of file `lebhart/lebhart.cls'.
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
index 583248861b..1f609aa520 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
index 2261d59a63..82c7ec769b 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
@@ -9,7 +9,7 @@
%%================================
%% 引入工具集
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -39,7 +39,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,part,chapter,section,subsection,href,
+ {linenumbers,nolinenumbers,part,chapter,section,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib,parttext
}
}
@@ -102,7 +102,7 @@
\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{}\\\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/06/07}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/06/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年6月,北京}};
\end{tikzpicture}%
@@ -159,14 +159,19 @@
\item 启用 \ProjLib{} 工具箱的快速模式。
\end{itemize}
\end{itemize}
+\begin{tip}
+ 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
+\end{tip}
\item \texttt{a4paper} 或 \texttt{b5paper}
\begin{itemize}
\item 可选的纸张大小。默认的纸张大小为 7in $\times$ 10in。
\end{itemize}
- \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum}
- \begin{itemize}
- \item 字体选项。顾名思义,会加载相应名称的字体。
- \end{itemize}
+ \clearpage
+ \item \texttt{palatino}、\texttt{times}、\texttt{garamond}、\texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \item 字体选项。顾名思义,会加载相应名称的字体。
+ \item \texttt{useosf} 选项用来启用“旧式”数字。
+ \end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
@@ -175,19 +180,35 @@
\begin{itemize}
\item 经典模式。启用这一选项时,样式会变得更加中规中矩:段落呈首行缩进样式、各类下划线减少、标题样式改变、定理类环境的样式也会更贴近常见的设置。
\end{itemize}
-\end{itemize}
-
\begin{tip}
- \begin{itemize}
- \item 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。
- \item 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。
- \end{itemize}
+ 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。
\end{tip}
+ \item \texttt{useindent}
+ \begin{itemize}
+ \item 采用段首缩进而不是段间间距。
+ \end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item \lstinline|\subsubsection| 采用 ``runin'' 风格。
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item 纯文本模式,不加载定理类环境。
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item 定理类环境不编号。
+ \end{itemize}
+ \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等
+ \begin{itemize}
+ \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+ \end{itemize}
+\end{itemize}
\bigskip
另外,排版图书时常用的 \texttt{oneside}、\texttt{twoside} 选项也是可以使用的。默认采用双页排版。
-\chapter{关于文档类中使用的字体}
+\chapter{关于默认字体}
\simplivre{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体,需要自行购买使用。可以在方正字库网站查询详细资料:\url{https://www.foundertype.com}。
\begin{tip}[字体演示]
@@ -452,7 +473,7 @@
\begin{code}
\documentclass{simplivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -483,7 +504,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{book}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -494,7 +515,7 @@ Référence du théorème: \cref{thm:abc}
\begin{code}
\documentclass{simplivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -532,7 +553,7 @@ Référence du théorème: \cref{thm:abc}
\documentclass{amsbook}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\blinddocument
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
index aab038e356..5189455739 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
index 89fcf0812b..426eab8e33 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
@@ -1,5 +1,5 @@
%! TEX program = xelatex
-\documentclass[puretext]{simplivre}
+\documentclass[English,French,puretext]{simplivre}
\CreateTheorem{definition}<highest>
\CreateTheorem{theorem}<highest>
@@ -9,7 +9,7 @@
%%================================
%% Import toolkit
%%================================
-\usepackage{PJLtoolkit}
+\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
@@ -37,7 +37,7 @@
}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,part,chapter,section,subsection,href,
+ {linenumbers,nolinenumbers,part,chapter,section,subsection,subsubsection,href,
color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib,parttext
}
}
@@ -101,7 +101,7 @@
\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{}\\\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/06/07}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/06/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}{June 2021, Beijing}};
\end{tikzpicture}%
@@ -156,14 +156,18 @@ as the first line to use the \simplivre{} class.
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
+\begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+\end{tip}
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
\item Optional paper size. The default paper size is 7in $\times$ 10in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum}
- \begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
- \end{itemize}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \item The \texttt{useosf} option is used to enable the old-style figures.
+ \end{itemize}
\item \texttt{allowbf}
\begin{itemize}
\item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
@@ -172,19 +176,35 @@ as the first line to use the \simplivre{} class.
\begin{itemize}
\item Classic mode. When this option is enabled, the style will become more regular: paragraphs are indented, the use of underlines are reduced, heading styles are changed, and the theorem styles will be much closer to common styles.
\end{itemize}
-\end{itemize}
-
\begin{tip}
- \begin{itemize}
- \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
- \item \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
- \end{itemize}
+ \texttt{allowbf} + \texttt{classical} is probably a good choice if you prefer traditional style.
\end{tip}
+ \item \texttt{useindent}
+ \begin{itemize}
+ \item Use paragraph indentation instead of inter-paragraph spacing.
+ \end{itemize}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Use the ``runin'' style for \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} or \texttt{nothms}
+ \begin{itemize}
+ \item Pure text mode. Does not load theorem-like environments.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Theorem-like environments will not be numbered.
+ \end{itemize}
+ \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \end{itemize}
+\end{itemize}
\bigskip
In addition, the commonly used \texttt{oneside} and \texttt{twoside} options are also available. Two-page layout is used by default.
-\chapter{On the fonts}
+\chapter{On the default fonts}
By default, \simplivre{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
\begin{tip}[Font demonstration]
@@ -442,7 +462,7 @@ If you want to write in the standard way, you can refer to the following example
\begin{code}
\documentclass{simplivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -473,7 +493,7 @@ If you wish to switch to the standard class later, just replace the first two li
\documentclass{article}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
@@ -484,7 +504,7 @@ If you intend to switch to the journal template in the future and thus want to u
\begin{code}
\documentclass{simplivre}
-\usepackage{PJLtoolkit} % Load ProjLib toolkit
+\usepackage{ProjLib} % Load ProjLib toolkit
\UseLanguage{French} % Use French from here
@@ -523,7 +543,7 @@ In this way, if you wish to switch to \AmS{} class later, just replace the first
\documentclass{amsart}
\usepackage[a4paper,margin=1in]{geometry}
\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{PJLtoolkit} % Load ProjLib toolkit
+\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
\end{code}
\blinddocument
diff --git a/macros/unicodetex/latex/simplivre/simplivre.cls b/macros/unicodetex/latex/simplivre/simplivre.cls
index 89c47fa8ec..7c1db4ff46 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/06/07 A simple and clear book style]
+ [2021/06/23 A simple and clear book style]
\def\minimclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -28,6 +28,8 @@
\DeclareBoolOption[false]{draft}
\DeclareBoolOption[false]{fast}
\DeclareBoolOption[false]{classical}
+\DeclareBoolOption[false]{useindent}
+\DeclareBoolOption[false]{useosf}
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
@@ -45,6 +47,9 @@
\if@minimclass@draft
\@minimclass@fasttrue
\fi
+\if@minimclass@classical
+ \@minimclass@useindenttrue
+\fi
\if@minimclass@palatino
\@minimclass@customfonttrue
\fi
@@ -93,9 +98,9 @@
\if@minimclass@fast
\PassOptionsToPackage{fast}{minimalist}
\RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},colorspec=0.95}
+ \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
-\if@minimclass@classical
+\if@minimclass@useindent
\RequirePackage{indentfirst}
\else
\AtEndPreamble{\RequirePackage{parskip}}
@@ -117,11 +122,13 @@
\RequirePackage{fontspec}
\IfFontExistsTF{Palatino Linotype}{%
\setmainfont{Palatino Linotype}
+ [\if@minimclass@useosf Numbers = OldStyle\fi]
}{
\setmainfont{TeXGyrePagellaX-Regular.otf}[
BoldFont = TeXGyrePagellaX-Bold.otf ,
ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ]
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
+ \if@minimclass@useosf Numbers = OldStyle\fi ]
}
\setsansfont{SourceSansPro-Regular.otf}[
Scale = MatchLowercase ,
@@ -171,8 +178,14 @@
BoldItalicFeatures = {FakeBold=4} ,
SmallCapsFont = * ]
}
-\IfFontExistsTF{FZYOUHK_506L--GBK1-0}{%
- \setCJKsansfont{FZYOUHK_506L--GBK1-0}[
+\IfFontExistsTF{FZYOUHK_508R--GBK1-0}{%
+ \setCJKsansfont{FZYOUHK_508R--GBK1-0}[
+ BoldFont = FZYOUHK_509R--GBK1-0 ,
+ BoldFeatures = {FakeBold=4} ,
+ ItalicFont = * ,
+ BoldItalicFont = FZYOUHK_509R--GBK1-0 ,
+ SmallCapsFont = * ]
+ \setCJKfamilyfont{zhhei}{FZYOUHK_508R--GBK1-0}[
BoldFont = FZYOUHK_509R--GBK1-0 ,
BoldFeatures = {FakeBold=4} ,
ItalicFont = * ,
@@ -184,8 +197,15 @@
ItalicFont = * ,
BoldItalicFont = FandolHei-Bold.otf ,
SmallCapsFont = * ]
+ \setCJKfamilyfont{zhhei}{FandolHei-Regular.otf}[
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ SmallCapsFont = * ]
}
+\def\minimalist@titlefontshape{\CJKfamily{zhhei}}
+
%% Math font
\if@minimclass@customfont\else
\if@minimclass@fast
@@ -197,45 +217,80 @@
\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
\setmathfont{Asana-Math.otf}
\IfFontExistsTF{Neo Euler}{%
-\setmathfont{Neo Euler}
- [range={"0000-"0001,"0020-"007E,
- "00A0,"00A7-"00A8,"00AC,"00AF,"00B1,"00B4-"00B5,"00B7,
- "00D7,"00F7,
- "0131,
- "0237,"02C6-"02C7,"02D8-"02DA,"02DC,
- "0300-"030C,"030F,"0311,"0323-"0325,"032E-"0332,"0338,
- "0391-"0393,"0395-"03A1,"03A3-"03A8,"03B1-"03BB,
- "03BD-"03C1,"03C3-"03C9,"03D1,"03D5-"03D6,"03F5,
- "2016,"2018-"2019,"2021,"2026-"202C,"2032-"2037,"2044,
- "2057,"20D6-"20D7,"20DB-"20DD,"20E1,"20EE-"20EF,
- "210B-"210C,"210E-"2113,"2118,"211B-"211C,"2126-"2128,
- "212C-"212D,"2130-"2131,"2133,"2135,"2190-"2199,
- "21A4,"21A6,"21A9-"21AA,"21BC-"21CC,"21D0-"21D5,
- "2200,"2202-"2209,"220B-"220C,"220F-"2213,"2215-"221E,
- "2223,"2225,"2227-"222E,"2234-"2235,"2237-"223D,
- "2240-"224C,"2260-"2269,"226E-"2279,"2282-"228B,"228E,
- "2291-"2292,"2295-"2299,"22A2-"22A5,"22C0-"22C5,
- "22DC-"22DD,"22EF,"22F0-"22F1,
- "2308-"230B,"2320-"2321,"2329-"232A,"239B-"23AE,
- "23DC-"23DF,
- "27E8-"27E9,"27F5-"27FE,"2A0C,"2B1A,
- "1D400-"1D433,"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,
- "1D4A9-"1D4AC,"1D4AE-"1D4B5,"1D4D0-"1D4E9,"1D504-"1D505,
- "1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D537,
- "1D56C-"1D59F,"1D6A8-"1D6B8,"1D6BA-"1D6D2,"1D6D4-"1D6DD,
- "1D6DF,"1D6E1,"1D7CE-"1D7D7 }]
-\setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range=up/{latin,Latin}, script-features={}, sscript-features={}
+\setmathfont[range={up/{Latin,latin,Greek,greek},
+ bfup/{Latin,latin,Greek,greek},
+ cal, bfcal, frak, bffrak,
+ `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash,
+ \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
+ \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
+ \sum,\prod,\coprod,
+ \sqrt,\int,\iint,\iiint,\oint},
+ script-features={},
+ sscript-features={},
+ Scale = 1.05,
]{Neo Euler}
-\setmathfont[range={bfup/{latin, Latin, greek, Greek}, frak, bffrak, cal},
- script-features={}, sscript-features={}
- ]{Neo Euler}
-\setmathfont[range={up/num, bfup/num, it, bfit, scr, bfscr,
- sfup, sfit, bfsfup, bfsfit, tt}
- ]{Asana-Math.otf}
-\setmathfont[range=bfcal, Scale=MatchUppercase, Alternate]{Asana-Math.otf}
}{}
+\setmathfont[range={up/num, bfup/num}
+ ]{texgyrepagella-math.otf}
+
+\newbox\xratbelow
+\newbox\xratabove
+\renewcommand{\xrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xleftrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) -- node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookrightarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xhookleftarrow}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\renewcommand{\xmapsto}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
+\newcommand{\xlongequal}[2][]{%
+ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
+ \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
+ \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
+ \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}]
+ \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
+ node[above=2pt] {\box\xratabove}
+ (\xratlen,0) ;}}
\fi
\fi
@@ -244,9 +299,10 @@
\RequirePackage{mathpazo}
\PassOptionsToPackage{defaultsups}{newpxtext}
\RequirePackage{newpxtext}
- \RequirePackage{newpxmath}
+ % \RequirePackage{newpxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.07}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@times
@@ -256,11 +312,14 @@
\RequirePackage{newtxmath}
\let\openbox\relax
\PJLsetlinespacing{\setstretch{1.00}}
+ \if@minimclass@useosf\useosf\fi
\fi
\if@minimclass@garamond
\RequirePackage{amssymb}
- \PassOptionsToPackage{lining}{ebgaramond}
+ \if@minimclass@useosf\else
+ \PassOptionsToPackage{lining}{ebgaramond}
+ \fi
\RequirePackage{ebgaramond-maths}
\RequirePackage{ebgaramond}
% \RequirePackage{garamondlibre}
@@ -272,6 +331,9 @@
% \RequirePackage{mathpazo}
% \RequirePackage[sansmath]{libertinust1math}
\ifPDFTeX
+ \if@minimclass@useosf
+ \PassOptionsToPackage{osf}{biolinum}
+ \fi
\RequirePackage{biolinum}
\renewcommand*\familydefault{\biolinum@family}
\else
@@ -280,7 +342,8 @@
\setmainfont{LinBiolinum_R.otf}[
BoldFont = LinBiolinum_RB.otf ,
ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf ]
+ BoldItalicFont = LinBiolinum_RBO.otf,
+ \if@minimclass@useosf Numbers = OldStyle\fi ]
\fi
\PJLsetlinespacing{\setstretch{1.05}}
\RequirePackage[italic,defaultmathsizes]{mathastext}
@@ -288,8 +351,12 @@
\def\PJL@font@alreadyset{}
+%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
+\PassOptionsToPackage{all}{nowidow}
+\RequirePackage{nowidow}
+\RequirePackage{embrac}
%%================================
%% Graphics
@@ -304,9 +371,10 @@
%%================================
%% Index
%%================================
-\RequirePackage{imakeidx}
-\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{\FAIL}
-\apptocmd{\printindex}{\ResumeLineNumbers}{}{\FAIL}
+\AtEndPreamble{
+\pretocmd{\printindex}{\LocallyStopLineNumbers}{}{}
+\apptocmd{\printindex}{\ResumeLineNumbers}{}{}
+}
\endinput
%%