summaryrefslogtreecommitdiff
path: root/macros/unicodetex/latex/simplivre
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-17 03:01:24 +0000
committerNorbert Preining <norbert@preining.info>2022-06-17 03:01:24 +0000
commitf9418ac1e9385653cfa09da311bb2d405a936334 (patch)
tree764fc072c0bea51901ba3ef3a6dd915400df47c5 /macros/unicodetex/latex/simplivre
parentb83d15e1ff2e551eb7391d45becd87dce59d39b8 (diff)
CTAN sync 202206170301
Diffstat (limited to 'macros/unicodetex/latex/simplivre')
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdfbin337254 -> 257013 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex2
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.pdfbin230651 -> 137475 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.tex2
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdfbin230716 -> 139916 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex2
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre.cls126
7 files changed, 77 insertions, 55 deletions
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
index 02fc3bdb47..4d831c22cc 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 a0f6e3432b..e49bd7a2b0 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
@@ -97,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/24}
+\def\PackageVersion{2022/06/16}
\frontmatter
\LocallyStopLineNumbers
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
index 6470a1ba61..7d769103fc 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 172e5e8d8d..a607310484 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
@@ -97,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/24}
+\def\PackageVersion{2022/06/16}
\LocallyStopLineNumbers
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
index e90a0ae4ad..ceba510095 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
index ca1cae66f1..72156379c9 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
@@ -97,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/24}
+\def\PackageVersion{2022/06/16}
\frontmatter
\LocallyStopLineNumbers
diff --git a/macros/unicodetex/latex/simplivre/simplivre.cls b/macros/unicodetex/latex/simplivre/simplivre.cls
index 07780bdd10..25377b24b8 100644
--- a/macros/unicodetex/latex/simplivre/simplivre.cls
+++ b/macros/unicodetex/latex/simplivre/simplivre.cls
@@ -1,7 +1,7 @@
%%
%% This is file `simplivre/simplivre.cls',
%% generated with the docstrip utility.
-
+%%
%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the minimalist class series.
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{simplivre}
- {2022/04/24} {}
+ {2022/06/16} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -250,43 +250,39 @@
\__minimclass_load_file_or_config:Nnn \l__minimclass_load_custom_font_file_latin_bool { \l__minimclass_custom_font_file_latin_str }
{
- \__minimclass_if_font_exist:nnn { Palatino~Linotype }
+ \bool_if:NTF \l__projlib_font_useosf_bool
{
- \bool_if:NTF \l__projlib_font_useosf_bool
- {
- \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ]
- }
- {
- \setmainfont { Palatino~Linotype }
- }
+ \setmainfont { TeXGyrePagellaX-Regular.otf }
+ [
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
+ Numbers = OldStyle ,
+ ]
+ \setsansfont { SourceSansPro-Regular.otf }
+ [
+ Scale = 1.05 ,
+ BoldFont = SourceSansPro-Semibold.otf ,
+ ItalicFont = SourceSansPro-RegularIt.otf ,
+ BoldItalicFont = SourceSansPro-SemiboldIt.otf ,
+ Numbers = OldStyle ,
+ ]
}
{
- \bool_if:NTF \l__projlib_font_useosf_bool
- {
- \setmainfont { TeXGyrePagellaX-Regular.otf }
- [
- BoldFont = TeXGyrePagellaX-Bold.otf ,
- ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
- Numbers = OldStyle ,
- ]
- }
- {
- \setmainfont { TeXGyrePagellaX-Regular.otf }
- [
- BoldFont = TeXGyrePagellaX-Bold.otf ,
- ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
- ]
- }
+ \setmainfont { TeXGyrePagellaX-Regular.otf }
+ [
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
+ ]
+ \setsansfont { SourceSansPro-Regular.otf }
+ [
+ Scale = 1.05 ,
+ BoldFont = SourceSansPro-Semibold.otf ,
+ ItalicFont = SourceSansPro-RegularIt.otf ,
+ BoldItalicFont = SourceSansPro-SemiboldIt.otf ,
+ ]
}
- \setsansfont { SourceSansPro-Regular.otf }
- [
- Scale = 1.05 ,
- BoldFont = SourceSansPro-Bold.otf ,
- ItalicFont = SourceSansPro-RegularIt.otf ,
- BoldItalicFont = SourceSansPro-BoldIt.otf ,
- ]
\setmonofont { NewCMMono10-Regular.otf }
[
Scale = 1.05 ,
@@ -567,10 +563,8 @@
{
\bool_if:NF \g_projlib_font_already_set_bool
{
- \bool_if:NTF \l__minimclass_fast_bool
- {
- \RequirePackage { amssymb }
- }
+ \RequirePackage { amssymb }
+ \bool_if:NF \l__minimclass_fast_bool
{
\PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
\RequirePackage { unicode-math }
@@ -582,6 +576,11 @@
]
\setmathfont { latinmodern-math.otf }
[
+ range = { \ast } ,
+ Scale = 1.10
+ ]
+ \setmathfont { latinmodern-math.otf }
+ [
range = { frak, bffrak }
]
\DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n}
@@ -594,17 +593,34 @@
[
range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
+ \setmathfont { KpMath-Regular.otf } [ range = {} ]
+
+ \sys_if_engine_luatex:T
+ {
+ \mathitalicsmode=1
+ }
\hook_gput_code:nnn { begindocument } { minimclass }
{
- \NewCommandCopy \minimclass_backup_mid: \mid
- \RenewDocumentCommand \mid {}
- { \skip_horizontal:n {-.1em} \minimclass_backup_mid: \skip_horizontal:n {-.1em} }
- \NewCommandCopy \minimclass_backup_nmid: \nmid
- \RenewDocumentCommand \nmid {}
- { \skip_horizontal:n {-.1em} \minimclass_backup_nmid: \skip_horizontal:n {-.1em} }
+ \cs_gset_eq:NN \overline \wideoverbar
+ \cs_gset_eq:NN \square \mdwhtsquare
}
+ % A temporary hack proposed in https://tex.stackexchange.com/a/647789
+ \hook_gput_code:nnn { begindocument } { minimclass }
+ {
+ \NewCommandCopy\unicodevdots\vdots
+ \RenewDocumentCommand{\vdots}{}{\mathrel{\loweredvdots}}
+ }
+ \newcommand{\loweredvdots}{\mathpalette\loweredvdots@\relax}
+ \newcommand{\loweredvdots@}[2]{%
+ \begingroup
+ \sbox\z@{$\m@th#1\unicodevdots$}%
+ \vrule width \z@ height 2.25\ht\z@ depth 0.012\ht\z@
+ \raisebox{0.25\height}{\usebox\z@}%
+ \endgroup
+ }
+
\RequirePackage { tikz-cd }
\tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } }
@@ -673,21 +689,27 @@
}
}
+\char_set_catcode_active:n { `\· }
+\cs_new_protected:Npn · { \ensuremath\cdot }
+
\PassOptionsToPackage { all } { nowidow }
\RequirePackage { nowidow }
-\RequirePackage { regexpatch }
-\skip_new:N \g_minimclass_parfillskip_skip
-\xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{}
-\hook_gput_code:nnn { begindocument } { minimclass }
+\sys_if_engine_xetex:T
{
- \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 2\parindent } }
- \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ \RequirePackage { regexpatch }
+ \skip_new:N \g_minimclass_parfillskip_skip
+ \xpatchcmd{\@trivlist}{\@flushglue}{\g_minimclass_parfillskip_skip}{}{}
+ \hook_gput_code:nnn { begindocument } { minimclass }
+ {
+ \skip_gset:Nn \g_minimclass_parfillskip_skip { 0pt plus \dim_eval:n { \linewidth - 3em } }
+ \skip_gset_eq:NN \parfillskip \g_minimclass_parfillskip_skip
+ }
}
\hook_gput_code:nnn { begindocument/before } { minimclass }
{
- \@ifpackageloaded { biblatex }
+ \IfPackageLoadedTF { biblatex }
{
\PassOptionsToPackage { biblatex } { embrac }
} {}