texlive[63098] Master/texmf-dist: jxu (21apr22)
commits+karl at tug.org
commits+karl at tug.org
Thu Apr 21 22:13:21 CEST 2022
Revision: 63098
http://tug.org/svn/texlive?view=revision&revision=63098
Author: karl
Date: 2022-04-21 22:13:21 +0200 (Thu, 21 Apr 2022)
Log Message:
-----------
jxu (21apr22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
trunk/Master/texmf-dist/doc/latex/projlib/README.md
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty
trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls
trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{Chinese}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\frontmatter
@@ -99,8 +101,8 @@
{
, title = \beaulivre{}
, subtitle = {
- \textsc{以多彩的方式排版你的图书}\\[10pt]
- \tiny 对应版本. \texttt{\beaulivre{} \PackageVersion}
+ \textsc{以多彩的方式排版你的图书}\\[20pt]
+ \smaller[3] 对应版本. \texttt{\beaulivre{} \PackageVersion}
}
, author = 许锦文
, date = {\TheDate{\PackageVersion}[only-year-month]，巴黎}
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{English}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\frontmatter
@@ -99,8 +101,8 @@
{
, title = \beaulivre{}
, subtitle = {
- \textsc{Write your books in \\a colorful way}\\[10pt]
- \tiny Corresponding to: \texttt{\beaulivre{} \PackageVersion}
+ \textsc{Write your books in \\a colorful way}\\[20pt]
+ \smaller[3] Corresponding to: \texttt{\beaulivre{} \PackageVersion}
}
, author = Jinwen XU
, date = {\TheDate{\PackageVersion}[only-year-month], in Paris}
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{French}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\frontmatter
@@ -99,8 +101,8 @@
{
, title = \beaulivre{}
, subtitle = {
- \textsc{Écrivez vos livres \\de manière colorée}\\[10pt]
- \tiny Correspondant à : \texttt{\beaulivre{} \PackageVersion}
+ \textsc{Écrivez vos livres \\de manière colorée}\\[20pt]
+ \smaller[3] Correspondant à : \texttt{\beaulivre{} \PackageVersion}
}
, author = Jinwen XU
, date = {\TheDate{\PackageVersion}[only-year-month], à Paris}
Modified: trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{English}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{{\normalfont\bfseries\color{main-text}\colorist{}}\\write your articles or books in a colorful way}
\author{Jinwen XU}
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{Chinese}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{\einfart{}，以极简主义风格排版你的文章}
\author{许锦文}
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{English}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{\einfart{}, write your articles in a simple and clear way}
\author{Jinwen XU}
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{French}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{\einfart{}, écrivez vos articles de manière simple et claire}
\author{Jinwen XU}
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{Chinese}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\以多彩的方式排版你的文章}
\author{许锦文}
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{English}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\write your articles in a colorful way}
\author{Jinwen XU}
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -8,6 +8,8 @@
\usepackage{hologo} % more TeX logo
\usetikzlibrary{calc}
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{French}
@@ -91,7 +93,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\écrivez vos articles de manière colorée}
\author{Jinwen XU}
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{English}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\title{\minimalist{}, write your articles or books in a simple and clear way}
\author{Jinwen XU}
Modified: trunk/Master/texmf-dist/doc/latex/projlib/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/projlib/README.md 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/projlib/README.md 2022-04-21 20:13:21 UTC (rev 63098)
@@ -6,7 +6,7 @@
> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French, meaning "*Free Project*").
-**This bundle is dated 2022/04/03. Please note that the documentations are not yet up-to-date.**
+**This bundle is dated 2022/04/18. Please note that the documentations are not yet up-to-date.**
## Introduction
@@ -46,12 +46,15 @@
- Draw the `ProjLib` logo in colorful or colorless fashion.
1. module `math` - *Efficient math setup*
- `\DefineOperator` and `\DefineShortcut` for setting up math macros efficiently
- - `\ListOfSymbols` for printing list of symboks
+ - `\ListOfSymbols` for printing list of symbols
1. module `paper` - *Configuration of the paper style*
- Paper style configuration, with the themes `yellow`, `green`, `light gray`, `gray`, `dark`, etc.
1. module `theorem` - *Configuration of theorem-like environments*
- - `\CreateTheorem`, `\SetTheorem` and more: setting up theorem-like environments based on the package `create-theorem`, and in particular, supporting the modes `name as is` and `name as context` for referencing names
- - Support options `simple name` and `complex name` for referencing names
+ - Setting up theorem-like environments based on the package `create-theorem`
+ - `\CreateTheorem`, `\SetTheorem` and more...
+ - In particular, supporting the modes `name as is` and `name as context` for referencing names.
+ - Supporting the modes `simple name` and `complex name` for the referencing names.
+ - `\SwitchTheoremNumbering` and `\DisableTheoremNumbering` for manipulating the numbering.
- Preset environments include: `assertion`, `assumption`, `axiom`, `conclusion`, `conjecture`, `convention`, `corollary`, `definition`, `definition-proposition`, `definition-theorem`, `example`, `exercise`, `fact`, `hypothesis`, `lemma`, `notation`, `observation`, `postulate`, `problem`, `property`, `proposition`, `question`, `remark`, `theorem`, and the corresponding unnumbered version with an asterisk `*` in the name.
1. module `titlepage` - *Commands for rendering the title page*
- Currently support two title page styles: `default` and `simple`.
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{Chinese}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\frontmatter
\LocallyStopLineNumbers
@@ -104,8 +106,8 @@
{
, title = \simplivre{}
, subtitle = {
- \textsc{以极简主义风格排版你的图书}\\[10pt]
- \tiny 对应版本. \texttt{\simplivre{} \PackageVersion}
+ \textsc{以极简主义风格排版你的图书}\\[20pt]
+ \smaller[3] 对应版本. \texttt{\simplivre{} \PackageVersion}
}
, author = 许锦文
, date = {\TheDate{\PackageVersion}[only-year-month]，巴黎}
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{English}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\LocallyStopLineNumbers
@@ -105,8 +107,8 @@
{
, title = \simplivre{}
, subtitle = {
- \textsc{Write your books in \\a simple and clear way}\\[10pt]
- \tiny Corresponding to: \texttt{\simplivre{} \PackageVersion}
+ \textsc{Write your books in \\a simple and clear way}\\[20pt]
+ \smaller[3] Corresponding to: \texttt{\simplivre{} \PackageVersion}
}
, author = Jinwen XU
, date = {\TheDate{\PackageVersion}[only-year-month], in Paris}
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex 2022-04-21 20:13:21 UTC (rev 63098)
@@ -9,6 +9,8 @@
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usepackage{relsize}
+
\usepackage{blindtext}
\UseLanguage{French}
@@ -95,7 +97,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/04/03}
+\def\PackageVersion{2022/04/17}
\frontmatter
\LocallyStopLineNumbers
@@ -104,8 +106,8 @@
{
, title = \simplivre{}
, subtitle = {
- \textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]
- \tiny Correspondant à : \texttt{\simplivre{} \PackageVersion}
+ \textsc{Écrivez vos livres \\de manière simple et claire}\\[20pt]
+ \smaller[3] Correspondant à : \texttt{\simplivre{} \PackageVersion}
}
, author = Jinwen XU
, date = {\TheDate{\PackageVersion}[only-year-month], à Paris}
Modified: trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2022-04-21 20:13:21 UTC (rev 63098)
@@ -20,7 +20,7 @@
%<*ProjLib>
\ProvidesExplPackage
{ProjLib}
- {2022/04/03} {}
+ {2022/04/18} {}
{Collective interface of the ProjLib toolkit}
%</ProjLib>
%
@@ -27,7 +27,7 @@
%<*projlib-author>
\ProvidesExplPackage
{projlib-author}
- {2022/04/03} {}
+ {2022/04/18} {}
{Enhanced author information block}
%</projlib-author>
%
@@ -34,7 +34,7 @@
%<*projlib-datetime>
\ProvidesExplPackage
{projlib-datetime}
- {2022/04/03} {}
+ {2022/04/18} {}
{Convert numeric date-time string to natural language}
%</projlib-datetime>
%
@@ -41,7 +41,7 @@
%<*projlib-draft>
\ProvidesExplPackage
{projlib-draft}
- {2022/04/03} {}
+ {2022/04/18} {}
{Useful commands during draft stage}
%</projlib-draft>
%
@@ -48,7 +48,7 @@
%<*projlib-font>
\ProvidesExplPackage
{projlib-font}
- {2022/04/03} {}
+ {2022/04/18} {}
{Font selection and configuration}
%</projlib-font>
%
@@ -55,7 +55,7 @@
%<*projlib-language>
\ProvidesExplPackage
{projlib-language}
- {2022/04/03} {}
+ {2022/04/18} {}
{Multi-language configuration}
%</projlib-language>
%
@@ -62,7 +62,7 @@
%<*projlib-logo>
\ProvidesExplPackage
{projlib-logo}
- {2022/04/03} {}
+ {2022/04/18} {}
{The ProjLib logo}
%</projlib-logo>
%
@@ -69,7 +69,7 @@
%<*projlib-math>
\ProvidesExplPackage
{projlib-math}
- {2022/04/03} {}
+ {2022/04/18} {}
{Efficient math setup}
%</projlib-math>
%
@@ -76,7 +76,7 @@
%<*projlib-paper>
\ProvidesExplPackage
{projlib-paper}
- {2022/04/03} {}
+ {2022/04/18} {}
{Configuration of the paper style}
%</projlib-paper>
%
@@ -83,7 +83,7 @@
%<*projlib-theorem>
\ProvidesExplPackage
{projlib-theorem}
- {2022/04/03} {}
+ {2022/04/18} {}
{Configuration of theorem-like environments}
%</projlib-theorem>
%
@@ -90,7 +90,7 @@
%<*projlib-titlepage>
\ProvidesExplPackage
{projlib-titlepage}
- {2022/04/03} {}
+ {2022/04/18} {}
{Commands for rendering the title page}
%</projlib-titlepage>
@@ -264,7 +264,7 @@
\bool_if:NT \l__projlib_author_amsfashion_bool
{
- \RequirePackage{ projlib-language }
+ \RequirePackage { projlib-language }
\tl_const:Nn \c_projlib_author_dot_tl { . }
@@ -354,9 +354,8 @@
\bool_new:N \g__projlib_author_abstract_before_maketitle_bool
\bool_gset_false:N \g__projlib_author_abstract_before_maketitle_bool
- \msg_redirect_name:nnn { scontents } { unsupported-verbatim } { info }
- \RequirePackage{ scontents }
- \newenvsc{abstract}[store-env=projlib-author-abstract,print-env=false]
+ \RequirePackage { scontents }
+ \newenvsc { abstract } [ store-env = projlib-author-abstract, print-env = false ]
\hook_gput_code:nnn { env/abstract/after } { projlib-author }
{
@@ -851,7 +850,7 @@
\group_begin:
\tl_if_blank:eF { #1 } { \keys_set:nn { projlib-datetime-command } { #1 } }
\tl_if_blank:eF { #3 } { \keys_set:nn { projlib-datetime-command } { #3 } }
- \tl_set:Nx \l_tmpa_tl { #2 }
+ \tl_set:Nx \l_tmpa_tl { \exp_args:Ne \tl_trim_spaces:n { #2 } }
\regex_replace_all:nnN { \D } { - } \l_tmpa_tl
\exp_args:Ne \__projlib_datetime_display_date_according_to_format:nn { \l_tmpa_tl } {}
\group_end:
@@ -862,7 +861,7 @@
\group_begin:
\tl_if_blank:eF { #1 } { \keys_set:nn { projlib-datetime-command } { #1 } }
\tl_if_blank:eF { #3 } { \keys_set:nn { projlib-datetime-command } { #3 } }
- \tl_set:Nx \l_tmpa_tl { #2 }
+ \tl_set:Nx \l_tmpa_tl { \exp_args:Ne \tl_trim_spaces:n { #2 } }
\regex_replace_all:nnN { \D } { - } \l_tmpa_tl
\exp_args:Ne \__projlib_datetime_display_date_according_to_format:nn { \l_tmpa_tl } { _uppercase }
\group_end:
@@ -2239,6 +2238,11 @@
\group_begin:
\projlib_draft_DNF_font
\stepcounter { projlib_draft_DNF_counter }
+ \raisebox{\baselineskip}{
+ \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {}
+ \label { DNF. \arabic { projlib_draft_DNF_counter } }
+ }
+ \nobreak
\projlib_draft_plain_box:nn { projlib_draft_DNF_color }
{
\projlib_draft_DNF_text
@@ -2248,26 +2252,38 @@
\tl_trim_spaces:n { #1 }
}
\group_end:
- \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
+ \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
{
\noindent
\# \,
+ }
+ \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
+ {
\int_value:w \theprojlib_draft_DNF_counter
+ }
+ \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
+ {
\c_space_tl \c_space_tl
$\langle$
\skip_horizontal:n { 0.1em }
+ }
+ \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
+ {
\cs_if_exist:cTF { hyperlink }
{
- \exp_not:N \hyperlink { page.\thepage } { \thepage }
+ \exp_not:N \hyperlink { DNF. \int_value:w \theprojlib_draft_DNF_counter } { \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter } }
}
{
- \thepage
+ \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter }
}
+ }
+ \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
+ {
\skip_horizontal:n { 0.1em }
$\rangle$
\nobreakspace
- \exp_not:n { \tl_if_blank:nF { #1 } { : ~ } }
- \exp_not:n { \tl_trim_spaces:n { #1 } }
+ \tl_if_blank:nF { #1 } { : ~ }
+ \tl_trim_spaces:n { #1 }
\par \skip_vertical:n { -\parskip }
\skip_vertical:n { .15\baselineskip }
}
@@ -2280,6 +2296,7 @@
\tl_if_blank:VF \g__projlib_draft_DNF_report_tl
{
\clearpage
+ \addtocounter{page}{-1}
\pagestyle { empty }
\color { projlib_draft_DNF_color }
\noindent
@@ -2678,7 +2695,7 @@
\cs_new:Nn \projlib_language_str_to_languagename:n
{
- \str_case_e:nnF { \str_foldcase:n { #1 } }
+ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } }
{
{ all } { common }
{ common } { common }
@@ -2716,7 +2733,7 @@
\cs_new:Nn \projlib_language_str_to_languagetype:n
{
- \str_case_e:nn { \str_foldcase:n { #1 } }
+ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } }
{
{ cn } { cjk }
{ chinese } { cjk }
@@ -2747,6 +2764,7 @@
{ ru } { latin }
{ russian } { latin }
}
+ { latin }
}
\sys_if_engine_pdftex:T
@@ -2814,9 +2832,9 @@
}
}
+
\tl_gput_right:Nn \g_projlib_language_settings_schinese_tl
{
- \g_projlib_language_settings_common_tl
\tl_set:Nn \languagename { schinese }
\tl_set:cn { abstractname } { 摘要 }
\tl_set:cn { proofname } { 证明 }
@@ -2830,10 +2848,22 @@
\tl_set:cn { refname } { 参考文献 }
\tl_set:cn { bibname } { 参考文献 }
}
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_schinese:
+ {
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_schinese_tl
+ }
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_schinese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_schinese_tl
+ #1
+ \group_end:
+ }
\tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl
{
- \g_projlib_language_settings_common_tl
\tl_set:Nn \languagename { tchinese }
\tl_set:cn { abstractname } { 摘要 }
\tl_set:cn { proofname } { 證明 }
@@ -2847,61 +2877,158 @@
\tl_set:cn { refname } { 參考文獻 }
\tl_set:cn { bibname } { 參考文獻 }
}
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_tchinese:
+ {
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_tchinese_tl
+ }
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_tchinese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_tchinese_tl
+ #1
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_japanese_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_japanese:
{
\selectlanguage { japanese }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_japanese_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_japanese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_japanese_tl
+ \foreignlanguage { japanese } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_english_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_english:
{
\selectlanguage { english }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_english_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_english:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_english_tl
+ \foreignlanguage { english } { #1 }
+ \group_end:
+ }
\tl_gput_right:Nn \g_projlib_language_settings_french_tl
{
+ \tl_gset:cn { frenchpartname } { Partie }
+ }
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_french:
+ {
\selectlanguage { french }
\g_projlib_language_settings_common_tl
- \tl_gset:cn { frenchpartname } { Partie }
+ \g_projlib_language_settings_french_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_french:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_french_tl
+ \foreignlanguage { french } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_ngerman_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_ngerman:
{
\selectlanguage { ngerman }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_ngerman_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_ngerman:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_ngerman_tl
+ \foreignlanguage { ngerman } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_italian_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_italian:
{
\selectlanguage { italian }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_italian_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_italian:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_italian_tl
+ \foreignlanguage { italian } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_portuguese_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_portuguese:
{
\selectlanguage { portuguese }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_portuguese_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_portuguese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_portuguese_tl
+ \foreignlanguage { portuguese } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_brazilian_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_brazilian:
{
\selectlanguage { brazilian }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_brazilian_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_brazilian:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_brazilian_tl
+ \foreignlanguage { brazilian } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_spanish_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_spanish:
{
\selectlanguage { spanish }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_spanish_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_spanish:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_spanish_tl
+ \foreignlanguage { spanish } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_russian_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_russian:
{
\selectlanguage { russian }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_russian_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_russian:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_russian_tl
+ \foreignlanguage { russian } { #1 }
+ \group_end:
+ }
\NewDocumentCommand \AddLanguageSetting { O{} m }
{
@@ -2914,7 +3041,6 @@
}
}
-
\RequirePackage { setspace }
\tl_new:N \g_projlib_language_linespacing_latin_tl
@@ -2995,24 +3121,34 @@
\use:c { projlib_language_set_ #1 _ #2 :n } { #3 }
}
+\msg_new:nnn { projlib-language }
+ { language-not-support }
+ { The~language~"#1"~is~not~supported. }
-\cs_new:Nn \projlib_language_use_language_pure:n
+\cs_new:Nn \projlib_language_use_language_locally:nn
{
- \tl_use:c { g_projlib_language_settings_ \projlib_language_str_to_languagename:n { #1 } _tl }
+ \cs_if_exist_use:cF { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n }
+ {
+ \msg_warning:nnn { projlib-language } { language-not-support } { #1 }
+ }
+ { #2 }
}
-\cs_generate_variant:Nn \projlib_language_use_language_pure:n { e }
+\cs_generate_variant:Nn \projlib_language_use_language_locally:nn { e }
\cs_new:Nn \projlib_language_use_language:n
{
- \projlib_language_use_language_pure:n { #1 }
- \tl_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl }
- \tl_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl }
+ \cs_if_exist_use:cF { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : }
+ {
+ \msg_warning:nnn { projlib-language } { language-not-support } { #1 }
+ }
+ \cs_if_exist_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl }
+ \cs_if_exist_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl }
}
\cs_generate_variant:Nn \projlib_language_use_language:n { e }
\NewDocumentCommand \UseLanguage { m }
{
- \hook_gput_code:nnn { begindocument } { projlib-language }
+ \hook_gput_code:nnn { begindocument/end } { projlib-language }
{
\projlib_language_use_language:e { #1 }
}
@@ -3020,8 +3156,7 @@
\NewDocumentCommand \UseOtherLanguage { m m }
{
\group_begin:
- \projlib_language_use_language_pure:e { #1 }
- #2
+ \projlib_language_use_language_locally:en { #1 } { #2 }
\group_end:
}
@@ -3288,7 +3423,7 @@
}
\cs_generate_variant:Nn \__projlib_math_define_operator:nnn { nee }
-\NewDocumentCommand \DefineOperator { s O{} m O{} }
+\NewDocumentCommand \DefineMathOperator { s O{} m O{} }
{
\tl_if_blank:nTF { #2 }
{
@@ -3298,15 +3433,16 @@
\projlib_math_define_operator:nnn { #1 } { #3 } { #2 }
}
}
+\NewCommandCopy \DefineOperator \DefineMathOperator
\msg_new:nnn { projlib-math }
{ shortcut-not-define }
- { The~shortcut~"\iow_char:N \\#1"~cannot~be~defined,~a~command~with~the~same~name~has~already~existed. }
+ { The~symbol~/~shortcut~"\iow_char:N \\#1"~cannot~be~defined,~a~command~with~the~same~name~has~already~existed. }
\msg_new:nnn { projlib-math }
{ shortcut-type-not-define }
- { The~shortcut~type~"#1"~is~not~available,~a~command~with~the~same~name~has~already~existed. }
+ { The~symbol~/~shortcut~type~"#1"~is~not~available,~a~command~with~the~same~name~has~already~existed. }
\keys_define:nn { projlib-math-shortcut }
{
@@ -3381,7 +3517,7 @@
{
\cs_if_exist:cTF { #1 }
{
- \msg_warning:nnn { projlib-math } { shortcut-type-not-define } { #1 }
+ \msg_warning:nnn { projlib-math } { shortcut-not-define } { #1 }
}
{
\exp_args:Nno \use:n
@@ -3391,7 +3527,7 @@
}
\cs_generate_variant:Nn \__projlib_math_define_shortcut:nn { ee }
-\NewDocumentCommand \DefineShortcut { s O{} m O{} }
+\NewDocumentCommand \DefineMathSymbol { s O{} m O{} }
{
\tl_if_blank:nTF { #2 }
{
@@ -3401,6 +3537,7 @@
\projlib_math_define_shortcut:nnn { #1 } { #3 } { #2 }
}
}
+\NewCommandCopy \DefineShortcut \DefineMathSymbol
\cs_new:Nn \__projlib_math_list_of_symbols_entry:nnnn
@@ -3595,6 +3732,7 @@
\clist_const:Nn \c_projlib_theorem_supported_clist
{
+ application ,
assertion ,
assumption ,
axiom ,
@@ -3619,6 +3757,8 @@
theorem ,
definition-proposition ,
definition-theorem ,
+ proposition-definition ,
+ theorem-definition ,
}
\@ifclassloaded { beamer }
@@ -3692,6 +3832,67 @@
}
+\tl_new:N \l_projlib_theorem_name_of_theorem_with_name_tl
+\CreateTheorem { theorem-with-name_inner } { name = { heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } }, create-starred-version }
+
+\NewDocumentEnvironment { theorem-with-name } { m O{} }
+ {
+ \tl_set:Nn \l_projlib_theorem_name_of_theorem_with_name_tl { #1 }
+ \begin { theorem-with-name_inner } [ #2 ]
+ }
+ {
+ \end { theorem-with-name_inner }
+ }
+\NewDocumentEnvironment { theorem-with-name* } { m O{} }
+ {
+ \tl_set:Nn \l_projlib_theorem_name_of_theorem_with_name_tl { #1 }
+ \begin { theorem-with-name_inner* } [ #2 ]
+ }
+ {
+ \end { theorem-with-name_inner* }
+ }
+
+
+\cs_new_protected:Nn \projlib_theorem_disable_theorem_numbering:n
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \__projlib_theorem_disable_theorem_numbering_do:n { ##1 }
+ }
+ }
+\cs_new_protected:Nn \__projlib_theorem_disable_theorem_numbering_do:n
+ {
+ \CreateTheorem { #1 } { copy-existed = #1* }
+ }
+
+\NewDocumentCommand \DisableTheoremNumbering { m }
+ {
+ \projlib_theorem_disable_theorem_numbering:n { #1 }
+ }
+
+
+\cs_new_protected:Nn \projlib_theorem_switch_theorem_numbering:n
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \__projlib_theorem_switch_theorem_numbering_do:n { ##1 }
+ }
+ }
+\cs_new_protected:Nn \__projlib_theorem_switch_theorem_numbering_do:n
+ {
+ \CreateTheorem { #1_projlib_theorem_temp } { copy-existed = #1* }
+ \CreateTheorem { #1* } { copy-existed = #1 }
+ \CreateTheorem { #1 } { copy-existed = #1_projlib_theorem_temp }
+ }
+
+\NewDocumentCommand \SwitchTheoremNumbering { m }
+ {
+ \projlib_theorem_switch_theorem_numbering:n { #1 }
+ }
+
+\SwitchTheoremNumbering { theorem-with-name }
+
+
\AddLanguageSetting [ schinese ]
{
\crefname { equation } { 式 } { 式 }
@@ -3791,6 +3992,48 @@
\bool_if:NF \l__projlib_theorem_presetname_bool { \endinput }
\bool_if:NT \l__projlib_theorem_complexname_bool { \endinput }
+\NameTheorem { application }
+ {
+ , heading = {
+ , english = Application
+ , french = Application
+ , ngerman = Anwendung
+ , italian = Applicazione
+ , portuguese = Aplicação
+ , brazilian = Aplicação
+ , spanish = Aplicación
+ , schinese = 应用
+ , tchinese = 應用
+ , japanese = 応用
+ , russian = Применение
+ }
+ , crefname = {
+ , english = {Application}{Application}
+ , french = [l']{Application}[les]{Application}
+ , ngerman = {Anwendung}{Anwendung}
+ , italian = [l']{Applicazione}[le]{Applicazione}
+ , portuguese = [a]{Aplicação}[as]{Aplicação}
+ , brazilian = [a]{Aplicação}[as]{Aplicação}
+ , spanish = [la]{Aplicación}[las]{Aplicación}
+ , schinese = {应用}{应用}
+ , tchinese = {應用}{應用}
+ , japanese = {応用}{応用}
+ , russian = {Применение}{Применение}
+ }
+ , Crefname = {
+ , english = {Application}{Application}
+ , french = [L']{Application}[Les]{Application}
+ , ngerman = {Anwendung}{Anwendung}
+ , italian = [L']{Applicazione}[Le]{Applicazione}
+ , portuguese = [A]{Aplicação}[As]{Aplicação}
+ , brazilian = [A]{Aplicação}[As]{Aplicação}
+ , spanish = [La]{Aplicación}[Las]{Aplicación}
+ , schinese = {应用}{应用}
+ , tchinese = {應用}{應用}
+ , japanese = {応用}{応用}
+ , russian = {Применение}{Применение}
+ }
+ }
\NameTheorem { assertion }
{
@@ -4738,91 +4981,11 @@
}
}
-\NameTheorem { definition-proposition }
- {
- , heading = {
- , english = Definition-Proposition
- , french = Définition-Proposition
- , ngerman = Definition-Proposition
- , italian = Definizione-Proposizione
- , portuguese = Definição-Proposição
- , brazilian = Definição-Proposição
- , spanish = Definición-Proposición
- , schinese = 定义-命题
- , tchinese = 定義-命題
- , japanese = 定義-命題
- , russian = Определение-Предложение
- }
- , crefname = {
- , english = {Definition-Proposition}{Definition-Proposition}
- , french = [la]{Définition-Proposition}[les]{Définition-Proposition}
- , ngerman = {Definition-Proposition}{Definition-Proposition}
- , italian = [la]{Definizione-Proposizione}[le]{Definizione-Proposizione}
- , portuguese = [a]{Definição-Proposição}[as]{Definição-Proposição}
- , brazilian = [a]{Definição-Proposição}[as]{Definição-Proposição}
- , spanish = [la]{Definición-Proposición}[las]{Definición-Proposición}
- , schinese = {定义-命题}{定义-命题}
- , tchinese = {定義-命題}{定義-命題}
- , japanese = {定義-命題}{定義-命題}
- , russian = {Определение-Предложение}{Определение-Предложение}
- }
- , Crefname = {
- , english = {Definition-Proposition}{Definition-Proposition}
- , french = [La]{Définition-Proposition}[Les]{Définition-Proposition}
- , ngerman = {Definition-Proposition}{Definition-Proposition}
- , italian = [La]{Definizione-Proposizione}[Le]{Definizione-Proposizione}
- , portuguese = [A]{Definição-Proposição}[As]{Definição-Proposição}
- , brazilian = [A]{Definição-Proposição}[As]{Definição-Proposição}
- , spanish = [La]{Definición-Proposición}[Las]{Definición-Proposición}
- , schinese = {定义-命题}{定义-命题}
- , tchinese = {定義-命題}{定義-命題}
- , japanese = {定義-命題}{定義-命題}
- , russian = {Определение-Предложение}{Определение-Предложение}
- }
- }
+\NameTheorem { definition-proposition } { combined = { definition ; proposition } }
+\NameTheorem { definition-theorem } { combined = { definition ; theorem } }
-\NameTheorem { definition-theorem }
- {
- , heading = {
- , english = Definition-Theorem
- , french = Définition-Théorème
- , ngerman = Definition-Satz
- , italian = Definizione-Teorema
- , portuguese = Definição-Teorema
- , brazilian = Definição-Teorema
- , spanish = Definición-Teorema
- , schinese = 定义-定理
- , tchinese = 定義-定理
- , japanese = 定義-定理
- , russian = Определение-Теорема
- }
- , crefname = {
- , english = {Definition-Theorem}{Definition-Theorem}
- , french = [la]{Définition-Théorème}[les]{Définition-Théorème}
- , ngerman = {Definition-Satz}{Definition-Satz}
- , italian = [la]{Definizione-Teorema}[le]{Definizione-Teorema}
- , portuguese = [a]{Definição-Teorema}[as]{Definição-Teorema}
- , brazilian = [a]{Definição-Teorema}[as]{Definição-Teorema}
- , spanish = [la]{Definición-Teorema}[las]{Definición-Teorema}
- , schinese = {定义-定理}{定义-定理}
- , tchinese = {定義-定理}{定義-定理}
- , japanese = {定義-定理}{定義-定理}
- , russian = {Определение-Теорема}{Определение-Теорема}
- }
- , Crefname = {
- , english = {Definition-Theorem}{Definition-Theorem}
- , french = [La]{Définition-Théorème}[Les]{Définition-Théorème}
- , ngerman = {Definition-Satz}{Definition-Satz}
- , italian = [La]{Definizione-Teorema}[Le]{Definizione-Teorema}
- , portuguese = [A]{Definição-Teorema}[As]{Definição-Teorema}
- , brazilian = [A]{Definição-Teorema}[As]{Definição-Teorema}
- , spanish = [La]{Definición-Teorema}[Las]{Definición-Teorema}
- , schinese = {定义-定理}{定义-定理}
- , tchinese = {定義-定理}{定義-定理}
- , japanese = {定義-定理}{定義-定理}
- , russian = {Определение-Теорема}{Определение-Теорема}
- }
- }
+\NameTheorem { proposition-definition } { combined = { proposition ; definition } }
+\NameTheorem { theorem-definition } { combined = { theorem ; definition } }
%</projlib-theorem>
%
%<*projlib-titlepage>
@@ -4900,8 +5063,8 @@
\fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
\fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
\node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl };
- \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.67\paperwidth,-.15\paperheight)$) {\textcolor{titlepage-back}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
- \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.57\paperwidth,-.33\paperheight)$) {\textcolor{titlepage-back}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
\end{tikzpicture}
}
@@ -4909,9 +5072,9 @@
{
\begin{tikzpicture}[overlay,remember~picture]
\fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
- \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl };
- \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.63\paperwidth,-.15\paperheight)$) {\textcolor{paper}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
- \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{paper}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl };
+ \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.52\paperwidth,-.33\paperheight)$) {\textcolor{paper}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{paper}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
\end{tikzpicture}
}
%</projlib-titlepage>
Modified: trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{beaulivre}
- {2022/04/03} {}
+ {2022/04/17} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
@@ -258,7 +258,7 @@
}
\setsansfont { SourceSansPro-Regular.otf }
[
- Scale = MatchLowercase ,
+ Scale = 1.05 ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ,
@@ -554,23 +554,18 @@
[
range = { \sum, \prod, \coprod }
]
- \__colorclass_if_font_exist:nnn { Neo~Euler }
- {
- \setmathfont { Neo~Euler }
- [
- range = { up / { Latin, latin, Greek, greek },
- bfup / { Latin, latin, Greek, greek },
- `(, `), `[, `], `\{, `\}
- },
- Scale = 1.05,
- ]
- }{}
\setmathfont { latinmodern-math.otf }
[
- range = { cal, bfcal, frak, bffrak }
+ range = { frak, bffrak }
]
+ \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n}
\setmathfont { texgyrepagella-math.otf }
[
+ range = { `(, `) } ,
+ Scale = 1.10
+ ]
+ \setmathfont { texgyrepagella-math.otf }
+ [
range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
@@ -585,6 +580,7 @@
}
\RequirePackage { tikz-cd }
+ \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } }
\box_new:N \l__colorclass_xarrows_above_box
\box_new:N \l__colorclass_xarrows_below_box
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{colorart}
- {2022/04/03} {}
+ {2022/04/17} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{colorbook}
- {2022/04/03} {}
+ {2022/04/17} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{colorist-fancy}
- {2022/04/03} {}
+ {2022/04/17} {}
{The fancy style of colorist}
\@ifpackageloaded { colorist } {}
@@ -36,9 +36,22 @@
%%================================
\RequirePackage { anyfontsize }
+\NewCommandCopy \colorist_original_bfseries: \bfseries
+\bool_new:N \l_colorist_is_under_bfseries_bool
+\bool_set_false:N \l_colorist_is_under_bfseries_bool
+\RenewDocumentCommand \bfseries { }
+ {
+ \bool_if:NF \l_colorist_is_under_bfseries_bool
+ {
+ \colorlet{colorist-temp-color}{.}
+ \color{colorist-temp-color!90!paper}
+ }
+ \colorist_original_bfseries:
+ \bool_set_true:N \l_colorist_is_under_bfseries_bool
+ }
\bool_if:NTF \l__colorist_use_boldface_bool
{
- \cs_new:Nn \colorist_bfseries: { \bfseries \colorlet{colorist-temp-color}{.} \color{colorist-temp-color!90!paper} }
+ \cs_new:Nn \colorist_bfseries: { \bfseries }
}
{
\cs_new:Nn \colorist_bfseries: {}
@@ -198,7 +211,7 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc ] { titlesec }
+\RequirePackage [ explicit, newparttoc, nobottomtitles ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
@@ -408,22 +421,22 @@
{\hspace*{-2em}}
{\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage}
\titlecontents{section}
- [4em] % i.e., 2em (chapter) + 2em
+ [5em] % i.e., 2em (chapter) + 3em
{\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
- {\contentslabel{1.75em}}
- {\hspace*{-1.75em}}
+ {\contentslabel{2.75em}}
+ {\hspace*{-2.75em}}
{\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage}
\titlecontents{subsection}
- [7em] % i.e., 4em (section) + 3em
+ [8.75em] % i.e., 5em (section) + 3.75em
{\addvspace{.15pc}\normalfont\sffamily}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
+ {\contentslabel{3.50em}}
+ {\hspace*{-3.50em}}
{\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage}
\titlecontents{subsubsection}
- [10em] % i.e., 7em (subsection) + 3em
+ [12.75em] % i.e., 8.75em (subsection) + 4em
{\normalfont\sffamily}
- {\contentslabel{3.25em}}
- {\hspace*{-3.25em}}
+ {\contentslabel{3.75em}}
+ {\hspace*{-3.75em}}
{\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage}
}
{
@@ -451,7 +464,8 @@
%% Lists
%%================================
\RequirePackage { enumitem }
-\setlist{noitemsep}
+\setlistdepth{10}
+\setlist{noitemsep, topsep=.33\topsep}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
ref = \arabic*$)$}
@@ -461,11 +475,13 @@
ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$}
\setlist[description]{font=\normalfont\colorist_bfseries:}
-\setlist[itemize]{leftmargin=*}
+\renewlist{itemize}{itemize}{10}
+\setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!55!paper}{---}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} }
\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
-\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}}
+\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
+\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
%%================================
%% Blank page
@@ -555,12 +571,30 @@
\par
\vspace{.3\baselineskip}
}
+
\renewcommand*{\indexspace}
{
\par
- \vspace{2pc~plus~.5pc~minus~.3pc}
+ \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc}
}
+\bool_new:N \l__colorist_if_first_subitem_bool
+\renewcommand*{\@idxitem}
+ {
+ \par\hangindent40\p@
+ \bool_set_true:N \l__colorist_if_first_subitem_bool
+ }
+\renewcommand*{\subitem}
+ {
+ \par\hangindent40\p@
+ \bool_if:NT \l__colorist_if_first_subitem_bool
+ {
+ \nobreak
+ \bool_set_false:N \l__colorist_if_first_subitem_bool
+ }
+ \hspace*{20\p@}
+ }
+
%%================================
%% Draft mark
%%================================
@@ -621,7 +655,7 @@
{\normalfont}{}
{\newline}
{{\thmname{#1}\nobreakspace\thmnumber{#2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\smallskip}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\smallskip}
}
{
\newtheoremstyle{simple}
@@ -630,7 +664,7 @@
{\normalfont}{}
{0pt}
{{\thmname{#1}\nobreakspace\thmnumber{#2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
}
\renewcommand{\qedsymbol}{
@@ -698,6 +732,8 @@
\RequirePackage { projlib-theorem }
+\tl_gset:Nn \g_crthm_combined_name_sep_tl { \textcolor{main-text}{-} }
+
\SetTheorem { theorem, lemma, proposition, corollary, property, axiom, definition-theorem, definition-proposition }
{
name style = {
@@ -712,7 +748,7 @@
}
}
-\SetTheorem { fact, example, problem, question, exercise }
+\SetTheorem { application, fact, example, problem, question, exercise }
{
name style = {
heading style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
@@ -726,44 +762,6 @@
}
}
-\SetTheorem { definition-proposition }
- {
- name = {
- heading = {
- , english = \color{forestgreen}Definition\color{main-text}-\color{orange}Proposition
- , french = \color{forestgreen}Définition\color{main-text}-\color{orange}Proposition
- , ngerman = \color{forestgreen}Definition\color{main-text}-\color{orange}Proposition
- , italian = \color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione
- , portuguese = \color{forestgreen}Definição\color{main-text}-\color{orange}Proposição
- , brazilian = \color{forestgreen}Definição\color{main-text}-\color{orange}Proposição
- , spanish = \color{forestgreen}Definición\color{main-text}-\color{orange}Proposición
- , schinese = \color{forestgreen}定义\color{main-text}-\color{orange}命题
- , tchinese = \color{forestgreen}定義\color{main-text}-\color{orange}命題
- , japanese = \color{forestgreen}定義\color{main-text}-\color{orange}命題
- , russian = \color{forestgreen}Определение\color{main-text}-\color{orange}Предложение
- }
- }
- }
-
-\SetTheorem { definition-theorem }
- {
- name = {
- heading = {
- , english = \color{forestgreen}Definition\color{main-text}-\color{orange}Theorem
- , french = \color{forestgreen}Définition\color{main-text}-\color{orange}Théorème
- , ngerman = \color{forestgreen}Definition\color{main-text}-\color{orange}Satz
- , italian = \color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema
- , portuguese = \color{forestgreen}Definição\color{main-text}-\color{orange}Teorema
- , brazilian = \color{forestgreen}Definição\color{main-text}-\color{orange}Teorema
- , spanish = \color{forestgreen}Definición\color{main-text}-\color{orange}Teorema
- , schinese = \color{forestgreen}定义\color{main-text}-\color{orange}定理
- , tchinese = \color{forestgreen}定義\color{main-text}-\color{orange}定理
- , japanese = \color{forestgreen}定義\color{main-text}-\color{orange}定理
- , russian = \color{forestgreen}Определение\color{main-text}-\color{orange}Теорема
- }
- }
- }
-
\bool_if:NF \l__projlib_theorem_complexname_bool
{
\SetTheorem { theorem, lemma, proposition, corollary, property, axiom, definition-theorem, definition-proposition }
@@ -784,7 +782,7 @@
}
}
- \SetTheorem { fact, example, problem, question, exercise }
+ \SetTheorem { application, fact, example, problem, question, exercise }
{
name style = {
, crefname style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
@@ -801,70 +799,6 @@
, numbering style = { \color{purple}\colorist_bfseries:\g_colorist_title_font_common_tl }
}
}
-
- \SetTheorem { definition-proposition }
- {
- name = {
- , crefname = {
- , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
- , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}
- , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
- , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}
- , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
- , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
- , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}
- , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}命题}{\color{forestgreen}定义\color{main-text}-\color{orange}命题}
- , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
- , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
- , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}{\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}
- }
- , Crefname = {
- , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
- , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}
- , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
- , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}
- , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
- , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
- , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}
- , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}命题}{\color{forestgreen}定义\color{main-text}-\color{orange}命题}
- , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
- , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
- , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}{\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}
- }
- }
- }
-
- \SetTheorem { definition-theorem }
- {
- name = {
- , crefname = {
- , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}{\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}
- , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}
- , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}{\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}
- , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}
- , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
- , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
- , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}
- , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}定理}{\color{forestgreen}定义\color{main-text}-\color{orange}定理}
- , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
- , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
- , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}{\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}
- }
- , Crefname = {
- , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}{\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}
- , french = [La]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}[Les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}
- , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}{\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}
- , italian = [La]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}[Le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}
- , portuguese = [A]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[As]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
- , brazilian = [A]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[As]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
- , spanish = [La]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}[Las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}
- , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}定理}{\color{forestgreen}定义\color{main-text}-\color{orange}定理}
- , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
- , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
- , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}{\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}
- }
- }
- }
}
\RequirePackage { marginnote }
@@ -968,35 +902,31 @@
\colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, definition-proposition, definition-theorem }
{
- enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ enhanced~jigsaw, breakable, lines~before~break=3,
left=3.5mm, right=3.5mm,
- before=\par\medskip\noindent,
colback=main-text!3!paper,
opacityframe=0.9, colframe=orange, arc=.7mm
}
-\colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation }
+ \colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation, proposition-definition, theorem-definition }
{
- enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ enhanced~jigsaw, breakable, lines~before~break=3,
left=4mm, right=4mm, top=1mm, bottom=1mm,
- before=\par\medskip\noindent,
colback=lightorange!10!paper, boxrule=0pt, frame~hidden,
borderline~west={1.5mm}{0mm}{forestgreen}, arc=.7mm
}
-\colorist_add_colorbox:nn { fact, example }
+\colorist_add_colorbox:nn { application, fact, example }
{
- enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ enhanced~jigsaw, breakable, lines~before~break=3,
colback=main-text!5!paper,
- before=\par\medskip\noindent,
boxrule=0pt, frame~hidden, arc=.7mm
}
\colorist_add_colorbox:nn { conjecture }
{
- enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ enhanced~jigsaw, breakable, lines~before~break=3,
left=3.5mm, right=3.5mm,
- before=\par\medskip\noindent,
colback=main-text!3!paper,
opacityframe=0.7, colframe=purple, arc=.7mm
}
@@ -1003,18 +933,16 @@
\colorist_add_colorbox:nn { problem }
{
- enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ enhanced~jigsaw, breakable, lines~before~break=3,
colback=yellow!25!paper,
- before=\par\medskip\noindent,
boxrule=0pt, frame~hidden, arc=.7mm
}
\colorist_add_colorbox:nn { question, exercise, remark, observation }
{
- enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ enhanced~jigsaw, breakable, lines~before~break=3,
oversize,
top=0mm, bottom=0mm,
- before=\par\medskip\noindent,
opacityframe=0, opacityback=0
}
@@ -1100,6 +1028,22 @@
\theoremstyle{simple}
+\NewDocumentEnvironment { emphasis } { }
+ {
+ \enlargethispage{2mm}
+ \begin{tcolorbox}
+ [
+ enhanced ~ jigsaw, enforce~breakable, oversize,
+ % nobeforeafter,
+ left = 1em, right=0mm, top=.5mm, bottom=0mm, boxrule=0pt,
+ colback=maintheme!3!paper, frame ~ hidden,
+ borderline ~ west = {.3em} {0mm} {maintheme!90!paper}, arc = 0.2mm,
+ ]
+ }
+ {
+ \end{tcolorbox}
+ }
+
\hook_gput_code:nnn { env/quote/begin } { colorist } { \small }
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{colorist}
- {2022/04/03} {}
+ {2022/04/17} {}
{A colorful style for articles and books}
\keys_define:nn { colorist }
Modified: trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{einfart}
- {2022/04/03} {}
+ {2022/04/17} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -279,7 +279,7 @@
}
\setsansfont { SourceSansPro-Regular.otf }
[
- Scale = MatchLowercase ,
+ Scale = 1.05 ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ,
@@ -577,23 +577,18 @@
[
range = { \sum, \prod, \coprod }
]
- \__minimclass_if_font_exist:nnn { Neo~Euler }
- {
- \setmathfont { Neo~Euler }
- [
- range = { up / { Latin, latin, Greek, greek },
- bfup / { Latin, latin, Greek, greek },
- `(, `), `[, `], `\{, `\}
- },
- Scale = 1.05,
- ]
- }{}
\setmathfont { latinmodern-math.otf }
[
- range = { cal, bfcal, frak, bffrak }
+ range = { frak, bffrak }
]
+ \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n}
\setmathfont { texgyrepagella-math.otf }
[
+ range = { `(, `) } ,
+ Scale = 1.10
+ ]
+ \setmathfont { texgyrepagella-math.otf }
+ [
range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
@@ -608,6 +603,7 @@
}
\RequirePackage { tikz-cd }
+ \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } }
\box_new:N \l__minimclass_xarrows_above_box
\box_new:N \l__minimclass_xarrows_below_box
Modified: trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{lebhart}
- {2022/04/03} {}
+ {2022/04/17} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
@@ -258,7 +258,7 @@
}
\setsansfont { SourceSansPro-Regular.otf }
[
- Scale = MatchLowercase ,
+ Scale = 1.05 ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ,
@@ -554,23 +554,18 @@
[
range = { \sum, \prod, \coprod }
]
- \__colorclass_if_font_exist:nnn { Neo~Euler }
- {
- \setmathfont { Neo~Euler }
- [
- range = { up / { Latin, latin, Greek, greek },
- bfup / { Latin, latin, Greek, greek },
- `(, `), `[, `], `\{, `\}
- },
- Scale = 1.05,
- ]
- }{}
\setmathfont { latinmodern-math.otf }
[
- range = { cal, bfcal, frak, bffrak }
+ range = { frak, bffrak }
]
+ \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n}
\setmathfont { texgyrepagella-math.otf }
[
+ range = { `(, `) } ,
+ Scale = 1.10
+ ]
+ \setmathfont { texgyrepagella-math.otf }
+ [
range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
@@ -585,6 +580,7 @@
}
\RequirePackage { tikz-cd }
+ \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } }
\box_new:N \l__colorclass_xarrows_above_box
\box_new:N \l__colorclass_xarrows_below_box
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-classical}
- {2022/04/03} {}
+ {2022/04/17} {}
{The classical style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -36,9 +36,22 @@
%%================================
\RequirePackage { anyfontsize }
+\NewCommandCopy \minimalist_original_bfseries: \bfseries
+\bool_new:N \l_minimalist_is_under_bfseries_bool
+\bool_set_false:N \l_minimalist_is_under_bfseries_bool
+\RenewDocumentCommand \bfseries { }
+ {
+ \bool_if:NF \l_minimalist_is_under_bfseries_bool
+ {
+ \colorlet{minimalist-temp-color}{.}
+ \color{minimalist-temp-color!70!paper}
+ }
+ \minimalist_original_bfseries:
+ \bool_set_true:N \l_minimalist_is_under_bfseries_bool
+ }
\bool_if:NTF \l__minimalist_use_boldface_bool
{
- \cs_new:Nn \minimalist_bfseries: { \bfseries \colorlet{minimalist-temp-color}{.} \color{minimalist-temp-color!70!paper} }
+ \cs_new:Nn \minimalist_bfseries: { \bfseries }
}
{
\cs_new:Nn \minimalist_bfseries: {}
@@ -54,7 +67,7 @@
\tl_new:N \g_minimalist_title_font_paragraph_tl
\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
-\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
+\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: }
\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: }
\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \itshape }
@@ -251,7 +264,7 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc ] { titlesec }
+\RequirePackage [ explicit, newparttoc, nobottomtitles ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
@@ -322,17 +335,17 @@
\titleformat{\chapter}
{\thispagestyle{fancy}
\LocallyStopLineNumbers
- \color{main-text!80!paper}\g_minimalist_title_font_chapter_tl\fontsize{16}{0}\selectfont}{}{0em}
+ \color{main-text!80!paper}\fontsize{16}{0}\selectfont}{}{0em}
{\rlap{\hspace*{-.5em}{\color{main-text!12!paper}
- \fontsize{80}{0}\selectfont\raisebox{-7pt}{\thechapter}}}#1}
+ \fontsize{80}{0}\selectfont\raisebox{-7pt}{\thechapter}}} \g_minimalist_title_font_chapter_tl #1}
[\ResumeLineNumbers]
\titleformat{name=\chapter,numberless}
{\thispagestyle{fancy}
\LocallyStopLineNumbers
% \phantomsection\addcontentsline{toc}{chapter}{#1}
- \color{main-text!80!paper}\g_minimalist_title_font_chapter_tl\fontsize{16}{0}\selectfont}{}{0em}
+ \color{main-text!80!paper}\fontsize{16}{0}\selectfont}{}{0em}
{\rlap{\hspace*{-.5em}{\color{main-text!12!paper}
- \fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{*}}}#1}
+ \fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{*}}} \g_minimalist_title_font_chapter_tl #1}
[\ResumeLineNumbers]
}
{
@@ -455,22 +468,22 @@
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{section}
- [4em] % i.e., 2em (chapter) + 2em
+ [5em] % i.e., 2em (chapter) + 3em
{\normalfont}
- {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2em}}
- {\hspace*{-2em}}
+ {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2.75em}}
+ {\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [7em] % i.e., 4em (section) + 3em
+ [8em] % i.e., 5em (section) + 3em
{\normalfont}
{\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [9.5em] % i.e., 7em (subsection) + 3.5em
+ [12em] % i.e., 8em (subsection) + 4em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}}
- {\hspace*{-3.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}}
+ {\hspace*{-3.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
{
@@ -481,16 +494,16 @@
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [4.5em] % i.e., 2em (section) + 2.5em
+ [4.75em] % i.e., 2em (section) + 2.75em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.25em}}
- {\hspace*{-2.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.50em}}
+ {\hspace*{-2.50em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [7.5em] % i.e., 4.5em (subsection) + 3em
+ [8.25em] % i.e., 4.75em (subsection) + 3.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
- {\hspace*{-2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}}
+ {\hspace*{-3.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -498,7 +511,8 @@
%% Lists
%%================================
\RequirePackage { enumitem }
-\setlist{noitemsep}
+\setlistdepth{9}
+\setlist{noitemsep, topsep=.33\topsep}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
ref = \arabic*$)$}
@@ -515,10 +529,16 @@
\setlist[itemize]{leftmargin=*}
\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!55!paper}{---}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} }
\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
-\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}}
+\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
+\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
+\setlist[itemize,5]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
+\setlist[itemize,6]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
+\setlist[itemize,7]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
+\renewlist{itemize}{itemize}{9}
+
%%================================
%% Blank page
%%================================
@@ -598,12 +618,30 @@
\par
\vspace{.3\baselineskip}
}
+
\renewcommand*{\indexspace}
{
\par
- \vspace{2pc~plus~.5pc~minus~.3pc}
+ \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc}
}
+\bool_new:N \l__minimalist_if_first_subitem_bool
+\renewcommand*{\@idxitem}
+ {
+ \par\hangindent40\p@
+ \bool_set_true:N \l__minimalist_if_first_subitem_bool
+ }
+\renewcommand*{\subitem}
+ {
+ \par\hangindent40\p@
+ \bool_if:NT \l__minimalist_if_first_subitem_bool
+ {
+ \nobreak
+ \bool_set_false:N \l__minimalist_if_first_subitem_bool
+ }
+ \hspace*{20\p@}
+ }
+
\hook_gput_code:nnn { begindocument/before } { minimalist }
{
\hook_gput_code:nnn { cmd/printindex/before } { minimalist } { \LocallyStopLineNumbers }
@@ -631,8 +669,8 @@
{\normalfont}{}
{\newline}
{ \global\let\qedsymbol\simpleqedsymbol
- {\thmname{#1}\nobreakspace\thmnumber{#2}}
- \thmnote{\hspace{.4em}\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}\color{main-text!50!paper}\ensuremath{(\text{#3})}}
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
+ \thmnote{\hspace{.4em}\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}\color{main-text!50!paper}$($#3$)$}
\smallskip
\pushQED{\qed}
}
@@ -644,9 +682,9 @@
{\normalfont}{}
{0pt}
{ \global\let\qedsymbol\simpleqedsymbol
- {\thmname{#1}\nobreakspace\thmnumber{#2}}\hspace{.4em}
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}\hspace{.4em}
\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}
- \color{main-text!50!paper}\thmnote{\ensuremath{(\text{#3})}\nobreakspace\nobreakspace}
+ \color{main-text!50!paper}\thmnote{$($#3$)$\nobreakspace\nobreakspace}
\pushQED{\qed}
}
}
@@ -811,12 +849,14 @@
}
}
+\PassOptionsToPackage { many } { tcolorbox }
+\RequirePackage { tcolorbox }
+\bool_if:NT \l__minimalist_fast_bool { \tcbstartdraftmode }
+
\bool_if:NF \l__minimalist_fast_bool
{
\bool_if:NT \l__minimalist_theorem_in_new_line_bool
{
- \PassOptionsToPackage { many } { tcolorbox }
- \RequirePackage { tcolorbox }
\cs_new_protected:Nn \minimclass_box_environment:n
{
\hook_gput_code:nnn { env/#1/before } { minimalist }
@@ -832,7 +872,7 @@
boxrule = 0pt, boxsep = 0pt,
before~skip = \parskip+\topsep+.25\baselineskip,
after~skip = \parskip+\topsep+.25\baselineskip,
- breakable, lines~before~break=3,
+ enforce~breakable, lines~before~break=3,
]
}
\hook_gput_code:nnn { env/#1/after } { minimalist }
@@ -849,7 +889,25 @@
}
}
+\NewDocumentEnvironment { emphasis } { }
+ {
+ \LocallyStopLineNumbers
+ \enlargethispage{2mm}
+ \begin{tcolorbox}
+ [
+ enhanced ~ jigsaw, enforce~breakable, oversize,
+ % nobeforeafter,
+ left = .5em, right=0mm, top=0.5mm, bottom=0mm, boxrule=0pt,
+ colback=main-text!2!paper, frame ~ hidden,
+ borderline ~ west = {.3em} {0mm} {main-text!25!paper}, arc = 0.2mm,
+ ]
+ }
+ {
+ \end{tcolorbox}
+ \ResumeLineNumbers
+ }
+
%%================================
%% Title block style
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-plain}
- {2022/04/03} {}
+ {2022/04/17} {}
{The plain style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -36,9 +36,22 @@
%%================================
\RequirePackage { anyfontsize }
+\NewCommandCopy \minimalist_original_bfseries: \bfseries
+\bool_new:N \l_minimalist_is_under_bfseries_bool
+\bool_set_false:N \l_minimalist_is_under_bfseries_bool
+\RenewDocumentCommand \bfseries { }
+ {
+ \bool_if:NF \l_minimalist_is_under_bfseries_bool
+ {
+ \colorlet{minimalist-temp-color}{.}
+ \color{minimalist-temp-color!70!paper}
+ }
+ \minimalist_original_bfseries:
+ \bool_set_true:N \l_minimalist_is_under_bfseries_bool
+ }
\bool_if:NTF \l__minimalist_use_boldface_bool
{
- \cs_new:Nn \minimalist_bfseries: { \bfseries \colorlet{minimalist-temp-color}{.} \color{minimalist-temp-color!70!paper} }
+ \cs_new:Nn \minimalist_bfseries: { \bfseries }
}
{
\cs_new:Nn \minimalist_bfseries: {}
@@ -237,7 +250,7 @@
%%================================
%% Title format
%%================================
-\RequirePackage [ explicit, newparttoc ] { titlesec }
+\RequirePackage [ explicit, newparttoc, nobottomtitles ] { titlesec }
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
@@ -429,22 +442,22 @@
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{section}
- [4em] % i.e., 2em (chapter) + 2em
+ [5em] % i.e., 2em (chapter) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}}
- {\hspace*{-2em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
+ {\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [7em] % i.e., 4em (section) + 3em
+ [9em] % i.e., 5em (section) + 4em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
- {\hspace*{-2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}}
+ {\hspace*{-3.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [9.5em] % i.e., 7em (subsection) + 3.5em
+ [13.5em] % i.e., 9em (subsection) + 4.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}}
- {\hspace*{-3.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{4.25em}}
+ {\hspace*{-4.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
{
@@ -455,16 +468,16 @@
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
- [4.5em] % i.e., 2em (section) + 2.5em
+ [5em] % i.e., 2em (section) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.25em}}
- {\hspace*{-2.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
+ {\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
- [7.5em] % i.e., 4.5em (subsection) + 3em
+ [9em] % i.e., 5em (subsection) + 4em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
- {\hspace*{-2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.75em}}
+ {\hspace*{-3.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -472,7 +485,8 @@
%% Lists
%%================================
\RequirePackage { enumitem }
-\setlist{noitemsep}
+\setlistdepth{9}
+\setlist{noitemsep, topsep=.33\topsep}
\setlist[enumerate]{labelsep=*, leftmargin=*}
\setlist[enumerate,1]{label=\arabic*$)$,
ref = \arabic*$)$}
@@ -484,10 +498,16 @@
\setlist[itemize]{leftmargin=*}
\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} }
-\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!55!paper}{---}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{---}} }
\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
-\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}}
+\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}}
+\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}}
+\setlist[itemize,5]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
+\setlist[itemize,6]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
+\setlist[itemize,7]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}}
+\renewlist{itemize}{itemize}{9}
+
%%================================
%% Blank page
%%================================
@@ -567,12 +587,30 @@
\par
\vspace{.3\baselineskip}
}
+
\renewcommand*{\indexspace}
{
\par
- \vspace{2pc~plus~.5pc~minus~.3pc}
+ \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc}
}
+\bool_new:N \l__minimalist_if_first_subitem_bool
+\renewcommand*{\@idxitem}
+ {
+ \par\hangindent40\p@
+ \bool_set_true:N \l__minimalist_if_first_subitem_bool
+ }
+\renewcommand*{\subitem}
+ {
+ \par\hangindent40\p@
+ \bool_if:NT \l__minimalist_if_first_subitem_bool
+ {
+ \nobreak
+ \bool_set_false:N \l__minimalist_if_first_subitem_bool
+ }
+ \hspace*{20\p@}
+ }
+
\hook_gput_code:nnn { begindocument/before } { minimalist }
{
\hook_gput_code:nnn { cmd/printindex/before } { minimalist } { \LocallyStopLineNumbers }
@@ -597,8 +635,8 @@
{\normalfont}{}
{\normalfont}{}
{\newline}
- {{\thmname{#1}\nobreakspace\thmnumber{#2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\smallskip}
+ {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\smallskip}
}
{
\newtheoremstyle{simple}
@@ -606,8 +644,8 @@
{\normalfont}{}
{\normalfont}{}
{0pt}
- {{\thmname{#1}\nobreakspace\thmnumber{#2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
}
\theoremstyle{simple}
@@ -767,12 +805,14 @@
}
}
+\PassOptionsToPackage { many } { tcolorbox }
+\RequirePackage { tcolorbox }
+\bool_if:NT \l__minimalist_fast_bool { \tcbstartdraftmode }
+
\bool_if:NF \l__minimalist_fast_bool
{
\bool_if:NT \l__minimalist_theorem_in_new_line_bool
{
- \PassOptionsToPackage { many } { tcolorbox }
- \RequirePackage { tcolorbox }
\cs_new_protected:Nn \minimclass_box_environment:n
{
\hook_gput_code:nnn { env/#1/before } { minimalist }
@@ -788,7 +828,7 @@
boxrule = 0pt, boxsep = 0pt,
before~skip = \parskip+\topsep+.25\baselineskip,
after~skip = \parskip+\topsep+.25\baselineskip,
- breakable, lines~before~break=3,
+ enforce~breakable, lines~before~break=3,
]
}
\hook_gput_code:nnn { env/#1/after } { minimalist }
@@ -805,6 +845,24 @@
}
}
+\NewDocumentEnvironment { emphasis } { }
+ {
+ \LocallyStopLineNumbers
+ \enlargethispage{2mm}
+ \begin{tcolorbox}
+ [
+ enhanced ~ jigsaw, enforce~breakable, oversize,
+ % nobeforeafter,
+ left = .5em, right=0mm, top=0.5mm, bottom=0mm, boxrule=0pt,
+ colback=main-text!2!paper, frame ~ hidden,
+ borderline ~ west = {.3em} {0mm} {main-text!25!paper}, arc = 0.2mm,
+ ]
+ }
+ {
+ \end{tcolorbox}
+ \ResumeLineNumbers
+ }
+
\hook_gput_code:nnn { env/quote/begin } { minimalist } { \small }
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist}
- {2022/04/03} {}
+ {2022/04/17} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimart}
- {2022/04/03} {}
+ {2022/04/17} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimbook}
- {2022/04/03} {}
+ {2022/04/17} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{ProjLib}
- {2022/04/03} {}
+ {2022/04/18} {}
{Collective interface of the ProjLib toolkit}
\keys_define:nn { ProjLib }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-author}
- {2022/04/03} {}
+ {2022/04/18} {}
{Enhanced author information block}
\keys_define:nn { projlib-author }
@@ -133,7 +133,7 @@
\bool_if:NT \l__projlib_author_amsfashion_bool
{
- \RequirePackage{ projlib-language }
+ \RequirePackage { projlib-language }
\tl_const:Nn \c_projlib_author_dot_tl { . }
@@ -222,9 +222,8 @@
\bool_new:N \g__projlib_author_abstract_before_maketitle_bool
\bool_gset_false:N \g__projlib_author_abstract_before_maketitle_bool
- \msg_redirect_name:nnn { scontents } { unsupported-verbatim } { info }
- \RequirePackage{ scontents }
- \newenvsc{abstract}[store-env=projlib-author-abstract,print-env=false]
+ \RequirePackage { scontents }
+ \newenvsc { abstract } [ store-env = projlib-author-abstract, print-env = false ]
\hook_gput_code:nnn { env/abstract/after } { projlib-author }
{
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-datetime}
- {2022/04/03} {}
+ {2022/04/18} {}
{Convert numeric date-time string to natural language}
\tl_new:N \g__projlib_datetime_input_format_tl
@@ -405,7 +405,7 @@
\group_begin:
\tl_if_blank:eF { #1 } { \keys_set:nn { projlib-datetime-command } { #1 } }
\tl_if_blank:eF { #3 } { \keys_set:nn { projlib-datetime-command } { #3 } }
- \tl_set:Nx \l_tmpa_tl { #2 }
+ \tl_set:Nx \l_tmpa_tl { \exp_args:Ne \tl_trim_spaces:n { #2 } }
\regex_replace_all:nnN { \D } { - } \l_tmpa_tl
\exp_args:Ne \__projlib_datetime_display_date_according_to_format:nn { \l_tmpa_tl } {}
\group_end:
@@ -416,7 +416,7 @@
\group_begin:
\tl_if_blank:eF { #1 } { \keys_set:nn { projlib-datetime-command } { #1 } }
\tl_if_blank:eF { #3 } { \keys_set:nn { projlib-datetime-command } { #3 } }
- \tl_set:Nx \l_tmpa_tl { #2 }
+ \tl_set:Nx \l_tmpa_tl { \exp_args:Ne \tl_trim_spaces:n { #2 } }
\regex_replace_all:nnN { \D } { - } \l_tmpa_tl
\exp_args:Ne \__projlib_datetime_display_date_according_to_format:nn { \l_tmpa_tl } { _uppercase }
\group_end:
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-draft}
- {2022/04/03} {}
+ {2022/04/18} {}
{Useful commands during draft stage}
\keys_define:nn { projlib-draft }
@@ -145,6 +145,11 @@
\group_begin:
\projlib_draft_DNF_font
\stepcounter { projlib_draft_DNF_counter }
+ \raisebox{\baselineskip}{
+ \hypertarget { DNF. \arabic { projlib_draft_DNF_counter } } {}
+ \label { DNF. \arabic { projlib_draft_DNF_counter } }
+ }
+ \nobreak
\projlib_draft_plain_box:nn { projlib_draft_DNF_color }
{
\projlib_draft_DNF_text
@@ -154,26 +159,38 @@
\tl_trim_spaces:n { #1 }
}
\group_end:
- \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
+ \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
{
\noindent
\# \,
+ }
+ \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
+ {
\int_value:w \theprojlib_draft_DNF_counter
+ }
+ \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
+ {
\c_space_tl \c_space_tl
$\langle$
\skip_horizontal:n { 0.1em }
+ }
+ \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
+ {
\cs_if_exist:cTF { hyperlink }
{
- \exp_not:N \hyperlink { page.\thepage } { \thepage }
+ \exp_not:N \hyperlink { DNF. \int_value:w \theprojlib_draft_DNF_counter } { \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter } }
}
{
- \thepage
+ \exp_not:N \pageref* { DNF. \int_value:w \theprojlib_draft_DNF_counter }
}
+ }
+ \tl_gput_right:Nn \g__projlib_draft_DNF_report_tl
+ {
\skip_horizontal:n { 0.1em }
$\rangle$
\nobreakspace
- \exp_not:n { \tl_if_blank:nF { #1 } { : ~ } }
- \exp_not:n { \tl_trim_spaces:n { #1 } }
+ \tl_if_blank:nF { #1 } { : ~ }
+ \tl_trim_spaces:n { #1 }
\par \skip_vertical:n { -\parskip }
\skip_vertical:n { .15\baselineskip }
}
@@ -186,6 +203,7 @@
\tl_if_blank:VF \g__projlib_draft_DNF_report_tl
{
\clearpage
+ \addtocounter{page}{-1}
\pagestyle { empty }
\color { projlib_draft_DNF_color }
\noindent
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-font}
- {2022/04/03} {}
+ {2022/04/18} {}
{Font selection and configuration}
\keys_define:nn { projlib-font }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-language}
- {2022/04/03} {}
+ {2022/04/18} {}
{Multi-language configuration}
\clist_const:Nn \c__projlib_language_supported_clist
@@ -145,7 +145,7 @@
\cs_new:Nn \projlib_language_str_to_languagename:n
{
- \str_case_e:nnF { \str_foldcase:n { #1 } }
+ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } }
{
{ all } { common }
{ common } { common }
@@ -183,7 +183,7 @@
\cs_new:Nn \projlib_language_str_to_languagetype:n
{
- \str_case_e:nn { \str_foldcase:n { #1 } }
+ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } }
{
{ cn } { cjk }
{ chinese } { cjk }
@@ -214,6 +214,7 @@
{ ru } { latin }
{ russian } { latin }
}
+ { latin }
}
\sys_if_engine_pdftex:T
@@ -281,7 +282,6 @@
\tl_gput_right:Nn \g_projlib_language_settings_schinese_tl
{
- \g_projlib_language_settings_common_tl
\tl_set:Nn \languagename { schinese }
\tl_set:cn { abstractname } { 摘要 }
\tl_set:cn { proofname } { 证明 }
@@ -295,10 +295,22 @@
\tl_set:cn { refname } { 参考文献 }
\tl_set:cn { bibname } { 参考文献 }
}
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_schinese:
+ {
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_schinese_tl
+ }
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_schinese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_schinese_tl
+ #1
+ \group_end:
+ }
\tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl
{
- \g_projlib_language_settings_common_tl
\tl_set:Nn \languagename { tchinese }
\tl_set:cn { abstractname } { 摘要 }
\tl_set:cn { proofname } { 證明 }
@@ -312,61 +324,158 @@
\tl_set:cn { refname } { 參考文獻 }
\tl_set:cn { bibname } { 參考文獻 }
}
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_tchinese:
+ {
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_tchinese_tl
+ }
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_tchinese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_tchinese_tl
+ #1
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_japanese_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_japanese:
{
\selectlanguage { japanese }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_japanese_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_japanese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_japanese_tl
+ \foreignlanguage { japanese } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_english_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_english:
{
\selectlanguage { english }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_english_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_english:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_english_tl
+ \foreignlanguage { english } { #1 }
+ \group_end:
+ }
\tl_gput_right:Nn \g_projlib_language_settings_french_tl
{
+ \tl_gset:cn { frenchpartname } { Partie }
+ }
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_french:
+ {
\selectlanguage { french }
\g_projlib_language_settings_common_tl
- \tl_gset:cn { frenchpartname } { Partie }
+ \g_projlib_language_settings_french_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_french:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_french_tl
+ \foreignlanguage { french } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_ngerman_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_ngerman:
{
\selectlanguage { ngerman }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_ngerman_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_ngerman:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_ngerman_tl
+ \foreignlanguage { ngerman } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_italian_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_italian:
{
\selectlanguage { italian }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_italian_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_italian:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_italian_tl
+ \foreignlanguage { italian } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_portuguese_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_portuguese:
{
\selectlanguage { portuguese }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_portuguese_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_portuguese:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_portuguese_tl
+ \foreignlanguage { portuguese } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_brazilian_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_brazilian:
{
\selectlanguage { brazilian }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_brazilian_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_brazilian:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_brazilian_tl
+ \foreignlanguage { brazilian } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_spanish_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_spanish:
{
\selectlanguage { spanish }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_spanish_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_spanish:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_spanish_tl
+ \foreignlanguage { spanish } { #1 }
+ \group_end:
+ }
-\tl_gput_right:Nn \g_projlib_language_settings_russian_tl
+\cs_new_protected:Nn \projlib_language_apply_settings_globally_russian:
{
\selectlanguage { russian }
\g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_russian_tl
}
+\cs_new_protected:Nn \projlib_language_apply_settings_locally_russian:n
+ {
+ \group_begin:
+ \g_projlib_language_settings_common_tl
+ \g_projlib_language_settings_russian_tl
+ \foreignlanguage { russian } { #1 }
+ \group_end:
+ }
\NewDocumentCommand \AddLanguageSetting { O{} m }
{
@@ -459,23 +568,34 @@
\use:c { projlib_language_set_ #1 _ #2 :n } { #3 }
}
-\cs_new:Nn \projlib_language_use_language_pure:n
+\msg_new:nnn { projlib-language }
+ { language-not-support }
+ { The~language~"#1"~is~not~supported. }
+
+\cs_new:Nn \projlib_language_use_language_locally:nn
{
- \tl_use:c { g_projlib_language_settings_ \projlib_language_str_to_languagename:n { #1 } _tl }
+ \cs_if_exist_use:cF { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n }
+ {
+ \msg_warning:nnn { projlib-language } { language-not-support } { #1 }
+ }
+ { #2 }
}
-\cs_generate_variant:Nn \projlib_language_use_language_pure:n { e }
+\cs_generate_variant:Nn \projlib_language_use_language_locally:nn { e }
\cs_new:Nn \projlib_language_use_language:n
{
- \projlib_language_use_language_pure:n { #1 }
- \tl_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl }
- \tl_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl }
+ \cs_if_exist_use:cF { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : }
+ {
+ \msg_warning:nnn { projlib-language } { language-not-support } { #1 }
+ }
+ \cs_if_exist_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl }
+ \cs_if_exist_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl }
}
\cs_generate_variant:Nn \projlib_language_use_language:n { e }
\NewDocumentCommand \UseLanguage { m }
{
- \hook_gput_code:nnn { begindocument } { projlib-language }
+ \hook_gput_code:nnn { begindocument/end } { projlib-language }
{
\projlib_language_use_language:e { #1 }
}
@@ -483,8 +603,7 @@
\NewDocumentCommand \UseOtherLanguage { m m }
{
\group_begin:
- \projlib_language_use_language_pure:e { #1 }
- #2
+ \projlib_language_use_language_locally:en { #1 } { #2 }
\group_end:
}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-logo}
- {2022/04/03} {}
+ {2022/04/18} {}
{The ProjLib logo}
\keys_define:nn { projlib-logo }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-math}
- {2022/04/03} {}
+ {2022/04/18} {}
{Efficient math setup}
\keys_define:nn { projlib-math }
@@ -92,7 +92,7 @@
}
\cs_generate_variant:Nn \__projlib_math_define_operator:nnn { nee }
-\NewDocumentCommand \DefineOperator { s O{} m O{} }
+\NewDocumentCommand \DefineMathOperator { s O{} m O{} }
{
\tl_if_blank:nTF { #2 }
{
@@ -102,14 +102,15 @@
\projlib_math_define_operator:nnn { #1 } { #3 } { #2 }
}
}
+\NewCommandCopy \DefineOperator \DefineMathOperator
\msg_new:nnn { projlib-math }
{ shortcut-not-define }
- { The~shortcut~"\iow_char:N \\#1"~cannot~be~defined,~a~command~with~the~same~name~has~already~existed. }
+ { The~symbol~/~shortcut~"\iow_char:N \\#1"~cannot~be~defined,~a~command~with~the~same~name~has~already~existed. }
\msg_new:nnn { projlib-math }
{ shortcut-type-not-define }
- { The~shortcut~type~"#1"~is~not~available,~a~command~with~the~same~name~has~already~existed. }
+ { The~symbol~/~shortcut~type~"#1"~is~not~available,~a~command~with~the~same~name~has~already~existed. }
\keys_define:nn { projlib-math-shortcut }
{
@@ -184,7 +185,7 @@
{
\cs_if_exist:cTF { #1 }
{
- \msg_warning:nnn { projlib-math } { shortcut-type-not-define } { #1 }
+ \msg_warning:nnn { projlib-math } { shortcut-not-define } { #1 }
}
{
\exp_args:Nno \use:n
@@ -194,7 +195,7 @@
}
\cs_generate_variant:Nn \__projlib_math_define_shortcut:nn { ee }
-\NewDocumentCommand \DefineShortcut { s O{} m O{} }
+\NewDocumentCommand \DefineMathSymbol { s O{} m O{} }
{
\tl_if_blank:nTF { #2 }
{
@@ -204,6 +205,7 @@
\projlib_math_define_shortcut:nnn { #1 } { #3 } { #2 }
}
}
+\NewCommandCopy \DefineShortcut \DefineMathSymbol
\cs_new:Nn \__projlib_math_list_of_symbols_entry:nnnn
% #1 = column one width
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-paper}
- {2022/04/03} {}
+ {2022/04/18} {}
{Configuration of the paper style}
\keys_define:nn { projlib-paper }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-theorem}
- {2022/04/03} {}
+ {2022/04/18} {}
{Configuration of theorem-like environments}
\keys_define:nn { projlib-theorem }
@@ -66,6 +66,7 @@
\clist_const:Nn \c_projlib_theorem_supported_clist
{
+ application ,
assertion ,
assumption ,
axiom ,
@@ -90,6 +91,8 @@
theorem ,
definition-proposition ,
definition-theorem ,
+ proposition-definition ,
+ theorem-definition ,
}
\@ifclassloaded { beamer }
@@ -157,6 +160,64 @@
}
}
+\tl_new:N \l_projlib_theorem_name_of_theorem_with_name_tl
+\CreateTheorem { theorem-with-name_inner } { name = { heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } }, create-starred-version }
+
+\NewDocumentEnvironment { theorem-with-name } { m O{} }
+ {
+ \tl_set:Nn \l_projlib_theorem_name_of_theorem_with_name_tl { #1 }
+ \begin { theorem-with-name_inner } [ #2 ]
+ }
+ {
+ \end { theorem-with-name_inner }
+ }
+\NewDocumentEnvironment { theorem-with-name* } { m O{} }
+ {
+ \tl_set:Nn \l_projlib_theorem_name_of_theorem_with_name_tl { #1 }
+ \begin { theorem-with-name_inner* } [ #2 ]
+ }
+ {
+ \end { theorem-with-name_inner* }
+ }
+
+\cs_new_protected:Nn \projlib_theorem_disable_theorem_numbering:n
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \__projlib_theorem_disable_theorem_numbering_do:n { ##1 }
+ }
+ }
+\cs_new_protected:Nn \__projlib_theorem_disable_theorem_numbering_do:n
+ {
+ \CreateTheorem { #1 } { copy-existed = #1* }
+ }
+
+\NewDocumentCommand \DisableTheoremNumbering { m }
+ {
+ \projlib_theorem_disable_theorem_numbering:n { #1 }
+ }
+
+\cs_new_protected:Nn \projlib_theorem_switch_theorem_numbering:n
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \__projlib_theorem_switch_theorem_numbering_do:n { ##1 }
+ }
+ }
+\cs_new_protected:Nn \__projlib_theorem_switch_theorem_numbering_do:n
+ {
+ \CreateTheorem { #1_projlib_theorem_temp } { copy-existed = #1* }
+ \CreateTheorem { #1* } { copy-existed = #1 }
+ \CreateTheorem { #1 } { copy-existed = #1_projlib_theorem_temp }
+ }
+
+\NewDocumentCommand \SwitchTheoremNumbering { m }
+ {
+ \projlib_theorem_switch_theorem_numbering:n { #1 }
+ }
+
+\SwitchTheoremNumbering { theorem-with-name }
+
\AddLanguageSetting [ schinese ]
{
\crefname { equation } { 式 } { 式 }
@@ -255,6 +316,49 @@
\bool_if:NF \l__projlib_theorem_presetname_bool { \endinput }
\bool_if:NT \l__projlib_theorem_complexname_bool { \endinput }
+\NameTheorem { application }
+ {
+ , heading = {
+ , english = Application
+ , french = Application
+ , ngerman = Anwendung
+ , italian = Applicazione
+ , portuguese = Aplicação
+ , brazilian = Aplicação
+ , spanish = Aplicación
+ , schinese = 应用
+ , tchinese = 應用
+ , japanese = 応用
+ , russian = Применение
+ }
+ , crefname = {
+ , english = {Application}{Application}
+ , french = [l']{Application}[les]{Application}
+ , ngerman = {Anwendung}{Anwendung}
+ , italian = [l']{Applicazione}[le]{Applicazione}
+ , portuguese = [a]{Aplicação}[as]{Aplicação}
+ , brazilian = [a]{Aplicação}[as]{Aplicação}
+ , spanish = [la]{Aplicación}[las]{Aplicación}
+ , schinese = {应用}{应用}
+ , tchinese = {應用}{應用}
+ , japanese = {応用}{応用}
+ , russian = {Применение}{Применение}
+ }
+ , Crefname = {
+ , english = {Application}{Application}
+ , french = [L']{Application}[Les]{Application}
+ , ngerman = {Anwendung}{Anwendung}
+ , italian = [L']{Applicazione}[Le]{Applicazione}
+ , portuguese = [A]{Aplicação}[As]{Aplicação}
+ , brazilian = [A]{Aplicação}[As]{Aplicação}
+ , spanish = [La]{Aplicación}[Las]{Aplicación}
+ , schinese = {应用}{应用}
+ , tchinese = {應用}{應用}
+ , japanese = {応用}{応用}
+ , russian = {Применение}{Применение}
+ }
+ }
+
\NameTheorem { assertion }
{
, heading = {
@@ -1201,91 +1305,11 @@
}
}
-\NameTheorem { definition-proposition }
- {
- , heading = {
- , english = Definition-Proposition
- , french = Définition-Proposition
- , ngerman = Definition-Proposition
- , italian = Definizione-Proposizione
- , portuguese = Definição-Proposição
- , brazilian = Definição-Proposição
- , spanish = Definición-Proposición
- , schinese = 定义-命题
- , tchinese = 定義-命題
- , japanese = 定義-命題
- , russian = Определение-Предложение
- }
- , crefname = {
- , english = {Definition-Proposition}{Definition-Proposition}
- , french = [la]{Définition-Proposition}[les]{Définition-Proposition}
- , ngerman = {Definition-Proposition}{Definition-Proposition}
- , italian = [la]{Definizione-Proposizione}[le]{Definizione-Proposizione}
- , portuguese = [a]{Definição-Proposição}[as]{Definição-Proposição}
- , brazilian = [a]{Definição-Proposição}[as]{Definição-Proposição}
- , spanish = [la]{Definición-Proposición}[las]{Definición-Proposición}
- , schinese = {定义-命题}{定义-命题}
- , tchinese = {定義-命題}{定義-命題}
- , japanese = {定義-命題}{定義-命題}
- , russian = {Определение-Предложение}{Определение-Предложение}
- }
- , Crefname = {
- , english = {Definition-Proposition}{Definition-Proposition}
- , french = [La]{Définition-Proposition}[Les]{Définition-Proposition}
- , ngerman = {Definition-Proposition}{Definition-Proposition}
- , italian = [La]{Definizione-Proposizione}[Le]{Definizione-Proposizione}
- , portuguese = [A]{Definição-Proposição}[As]{Definição-Proposição}
- , brazilian = [A]{Definição-Proposição}[As]{Definição-Proposição}
- , spanish = [La]{Definición-Proposición}[Las]{Definición-Proposición}
- , schinese = {定义-命题}{定义-命题}
- , tchinese = {定義-命題}{定義-命題}
- , japanese = {定義-命題}{定義-命題}
- , russian = {Определение-Предложение}{Определение-Предложение}
- }
- }
+\NameTheorem { definition-proposition } { combined = { definition ; proposition } }
+\NameTheorem { definition-theorem } { combined = { definition ; theorem } }
-\NameTheorem { definition-theorem }
- {
- , heading = {
- , english = Definition-Theorem
- , french = Définition-Théorème
- , ngerman = Definition-Satz
- , italian = Definizione-Teorema
- , portuguese = Definição-Teorema
- , brazilian = Definição-Teorema
- , spanish = Definición-Teorema
- , schinese = 定义-定理
- , tchinese = 定義-定理
- , japanese = 定義-定理
- , russian = Определение-Теорема
- }
- , crefname = {
- , english = {Definition-Theorem}{Definition-Theorem}
- , french = [la]{Définition-Théorème}[les]{Définition-Théorème}
- , ngerman = {Definition-Satz}{Definition-Satz}
- , italian = [la]{Definizione-Teorema}[le]{Definizione-Teorema}
- , portuguese = [a]{Definição-Teorema}[as]{Definição-Teorema}
- , brazilian = [a]{Definição-Teorema}[as]{Definição-Teorema}
- , spanish = [la]{Definición-Teorema}[las]{Definición-Teorema}
- , schinese = {定义-定理}{定义-定理}
- , tchinese = {定義-定理}{定義-定理}
- , japanese = {定義-定理}{定義-定理}
- , russian = {Определение-Теорема}{Определение-Теорема}
- }
- , Crefname = {
- , english = {Definition-Theorem}{Definition-Theorem}
- , french = [La]{Définition-Théorème}[Les]{Définition-Théorème}
- , ngerman = {Definition-Satz}{Definition-Satz}
- , italian = [La]{Definizione-Teorema}[Le]{Definizione-Teorema}
- , portuguese = [A]{Definição-Teorema}[As]{Definição-Teorema}
- , brazilian = [A]{Definição-Teorema}[As]{Definição-Teorema}
- , spanish = [La]{Definición-Teorema}[Las]{Definición-Teorema}
- , schinese = {定义-定理}{定义-定理}
- , tchinese = {定義-定理}{定義-定理}
- , japanese = {定義-定理}{定義-定理}
- , russian = {Определение-Теорема}{Определение-Теорема}
- }
- }
+\NameTheorem { proposition-definition } { combined = { proposition ; definition } }
+\NameTheorem { theorem-definition } { combined = { theorem ; definition } }
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-titlepage}
- {2022/04/03} {}
+ {2022/04/18} {}
{Commands for rendering the title page}
\keys_define:nn { projlib-titlepage }
@@ -96,8 +96,8 @@
\fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
\fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
\node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl };
- \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.67\paperwidth,-.15\paperheight)$) {\textcolor{titlepage-back}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
- \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.57\paperwidth,-.33\paperheight)$) {\textcolor{titlepage-back}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
\end{tikzpicture}
}
@@ -105,9 +105,9 @@
{
\begin{tikzpicture}[overlay,remember~picture]
\fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
- \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl };
- \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.63\paperwidth,-.15\paperheight)$) {\textcolor{paper}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
- \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{paper}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl };
+ \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.52\paperwidth,-.33\paperheight)$) {\textcolor{paper}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{paper}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
\end{tikzpicture}
}
Modified: trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2022-04-21 20:11:57 UTC (rev 63097)
+++ trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2022-04-21 20:13:21 UTC (rev 63098)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{simplivre}
- {2022/04/03} {}
+ {2022/04/17} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -279,7 +279,7 @@
}
\setsansfont { SourceSansPro-Regular.otf }
[
- Scale = MatchLowercase ,
+ Scale = 1.05 ,
BoldFont = SourceSansPro-Bold.otf ,
ItalicFont = SourceSansPro-RegularIt.otf ,
BoldItalicFont = SourceSansPro-BoldIt.otf ,
@@ -577,23 +577,18 @@
[
range = { \sum, \prod, \coprod }
]
- \__minimclass_if_font_exist:nnn { Neo~Euler }
- {
- \setmathfont { Neo~Euler }
- [
- range = { up / { Latin, latin, Greek, greek },
- bfup / { Latin, latin, Greek, greek },
- `(, `), `[, `], `\{, `\}
- },
- Scale = 1.05,
- ]
- }{}
\setmathfont { latinmodern-math.otf }
[
- range = { cal, bfcal, frak, bffrak }
+ range = { frak, bffrak }
]
+ \DeclareMathAlphabet{\mathcal}{OMS}{cmsy}{m}{n}
\setmathfont { texgyrepagella-math.otf }
[
+ range = { `(, `) } ,
+ Scale = 1.10
+ ]
+ \setmathfont { texgyrepagella-math.otf }
+ [
range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
@@ -608,6 +603,7 @@
}
\RequirePackage { tikz-cd }
+ \tikzcdset { arrow~style = tikz, diagrams = { >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} } }
\box_new:N \l__minimclass_xarrows_above_box
\box_new:N \l__minimclass_xarrows_below_box
More information about the tex-live-commits
mailing list.