diff options
Diffstat (limited to 'Master')
31 files changed, 230 insertions, 64 deletions
diff --git a/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf b/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf Binary files differindex b803b850103..763ab08460d 100644 --- a/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf +++ b/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf diff --git a/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex b/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex index c6da8832a03..321a22d5b76 100644 --- a/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex +++ b/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\colorist{}}\\write your articles or books in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\colorist{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\colorist{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle @@ -656,6 +656,7 @@ The author information can contain multiple groups, written as: Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important. \bigskip +\clearpage \LevelOneTitle{Known issues} \begin{itemize}[itemsep=.6em] diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf Binary files differindex 90d7c7c9a27..2b1962fa506 100644 --- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf +++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex index 43f93808311..67e5b151a3a 100644 --- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex +++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex @@ -98,9 +98,9 @@ \title{\einfart{}，以极简主义风格排版你的文章} \author{许锦文} -\thanks{对应版本. \texttt{\einfart{} 2021/08/11}} +\thanks{对应版本. \texttt{\einfart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{2021年8月，北京} +\date{2021年10月，巴黎} \maketitle diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf Binary files differindex ebf652ea5d0..bd79975c549 100644 --- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex index 83a421637d7..6996ab24f30 100644 --- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex +++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex @@ -98,9 +98,9 @@ \title{\einfart{}, write your articles in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\einfart{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\einfart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf Binary files differindex e66f64e7a7a..f999974aa28 100644 --- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf +++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex index f0217a97b61..b2e777c20df 100644 --- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex +++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex @@ -98,9 +98,9 @@ \title{\einfart{}, écrivez vos articles de manière simple et claire} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\einfart{} 2021/08/11}} +\thanks{Correspondant à : \texttt{\einfart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{Août 2021, à Pékin} +\date{Octobre 2021, à Paris} \maketitle diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf Binary files differindex d170416dea6..50a3107436c 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf +++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex index c307fda6b63..b85c421927d 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex +++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\以多彩的方式排版你的文章} \author{许锦文} -\thanks{对应版本. \texttt{\lebhart{} 2021/08/11}} +\thanks{对应版本. \texttt{\lebhart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{2021年8月，北京} +\date{2021年10月，巴黎} \maketitle diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf Binary files differindex 1bf78a225f3..c81f7719217 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex index 0b983789d57..a53e8dd5b21 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex +++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\write your articles in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\lebhart{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\lebhart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf Binary files differindex f6b06a01a46..f2770aa6216 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf +++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex index 1a1b43ecf40..6c1dc08b90e 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex +++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex @@ -93,9 +93,9 @@ \title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\écrivez vos articles de manière colorée} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\lebhart{} 2021/08/11}} +\thanks{Correspondant à : \texttt{\lebhart{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{Août 2021, à Pékin} +\date{Octobre 2021, à Paris} \maketitle diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf Binary files differindex 4beabecc199..3f494eeb60f 100644 --- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf +++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex index 6238f7b93b1..594fc99d4e1 100644 --- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex +++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex @@ -98,9 +98,9 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/11}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/10/23}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{August 2021, Beijing} +\date{October 2021, Paris} \maketitle diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf Binary files differindex eb643640651..8d3b68bdb79 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf +++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex index d7b6bf459e9..8d2b1f44763 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex +++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex @@ -103,9 +103,9 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/08/11}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/10/23}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}}; - \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年8月，北京}}; + \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年10月，巴黎}}; \end{tikzpicture}% \end{titlepage}% \cleardoublepage% diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf Binary files differindex 66babbedbb6..8bdb833fdbb 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex index aa00414e138..c6f2a944855 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex +++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex @@ -104,9 +104,9 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/08/11}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/10/23}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; - \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{August 2021, Beijing}}; + \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{October 2021, Paris}}; \end{tikzpicture}% \end{titlepage}% \cleardoublepage% diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf Binary files differindex 45a25ef1db5..6a4b397cd03 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf +++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex index d8cfcc840e0..178f1221092 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex +++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex @@ -103,9 +103,9 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/08/11}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/10/23}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; - \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Août 2021, à Pékin}}; + \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Octobre 2021, à Paris}}; \end{tikzpicture}% \end{titlepage}% \cleardoublepage% diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index e44367a8cab..52dd155072a 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorart} - [2021/08/11 A colorful article style] + [2021/10/23 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -120,6 +127,16 @@ \fi \RequirePackage{amssymb} +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index e07b345a91a..e2064dd0ee6 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorbook} - [2021/08/11 A colorful book style] + [2021/10/23 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -120,6 +127,16 @@ \fi \RequirePackage{amssymb} +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 348f23ee1a7..13aadd2605f 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{colorist} - [2021/08/11 A colorful style for articles and books] + [2021/10/23 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -391,12 +391,12 @@ \RequirePackage{enumitem} \setlist{noitemsep} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label = \arabic*., - ref = \arabic*} -\setlist[enumerate,2]{label = \emph{\alph*}), - ref = \theenumi.\emph{\alph*}} -\setlist[enumerate,3]{label = (\roman*), - ref = \theenumii.\roman*} +\setlist[enumerate,1]{label=\arabic*$)$, + ref = \arabic*$)$} +\setlist[enumerate,2]{label=\emph{\roman*}$)$, + ref = \arabic{enumi}.\emph{\roman*}$)$} +\setlist[enumerate,3]{label=\emph{\alph*}$)$, + ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} \setlist[itemize]{leftmargin=*} diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index 27363074fa0..c904d2b0746 100644 --- a/Master/texmf-dist/tex/latex/einfart/einfart.cls +++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{einfart} - [2021/08/11 A simple and clear article style] + [2021/10/23 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -382,6 +389,19 @@ \renewcommand{\mid}{\hspace{-.2em}\mid@original\hspace{-.2em}} \let\nmid@original\nmid \renewcommand{\nmid}{\hspace{-.2em}\nmid@original\hspace{-.2em}} +\renewcommand{\frac}[2]{\genfrac{}{}{}{}{ + \mathchoice + {\raisebox{-.15em}{$\displaystyle #1$}} + {\raisebox{-.15em}{$\textstyle #1$}} + {\raisebox{-.08em}{$\scriptstyle #1$}} + {\scriptscriptstyle #1} +}{ + \mathchoice + {\raisebox{.08em}{$\displaystyle #2$}} + {\raisebox{.08em}{$\textstyle #2$}} + {\raisebox{.05em}{$\scriptstyle #2$}} + {\scriptscriptstyle #2} +}} } \RequirePackage{tikz-cd} @@ -454,6 +474,16 @@ \fi \fi +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index a3a18edaabc..ea342e93fd4 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{lebhart} - [2021/08/11 A colorful article style] + [2021/10/23 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -48,6 +49,9 @@ \if@colorclass@draft \@colorclass@fasttrue \fi +\if@colorclass@lmodern + \@colorclass@customfonttrue +\fi \if@colorclass@palatino \@colorclass@customfonttrue \fi @@ -72,7 +76,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={8.5in,11in}, - total={47em,66em}, + % total={47em,66em}, + total={6.500in,9.130in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -80,7 +85,8 @@ \if@colorclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -89,7 +95,8 @@ \if@colorclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -373,6 +380,19 @@ \renewcommand{\mid}{\hspace{-.2em}\mid@original\hspace{-.2em}} \let\nmid@original\nmid \renewcommand{\nmid}{\hspace{-.2em}\nmid@original\hspace{-.2em}} +\renewcommand{\frac}[2]{\genfrac{}{}{}{}{ + \mathchoice + {\raisebox{-.15em}{$\displaystyle #1$}} + {\raisebox{-.15em}{$\textstyle #1$}} + {\raisebox{-.08em}{$\scriptstyle #1$}} + {\scriptscriptstyle #1} +}{ + \mathchoice + {\raisebox{.08em}{$\displaystyle #2$}} + {\raisebox{.08em}{$\textstyle #2$}} + {\raisebox{.05em}{$\scriptstyle #2$}} + {\scriptscriptstyle #2} +}} } \RequirePackage{tikz-cd} @@ -447,6 +467,16 @@ \fi \fi +\if@colorclass@lmodern + \RequirePackage{amssymb} + \if@colorclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@colorclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index 1892b05e4a8..953342a21c4 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/08/11 A simple and clear style for articles and books] + [2021/10/23 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -482,13 +482,20 @@ \RequirePackage{enumitem} \setlist{noitemsep} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label = \arabic*., - ref = \arabic*} -\setlist[enumerate,2]{label = \emph{\alph*}), - ref = \theenumi.\emph{\alph*}} -\setlist[enumerate,3]{label = (\roman*), - ref = \theenumii.\roman*} +\setlist[enumerate,1]{label=\arabic*$)$, + ref = \arabic*$)$} +\setlist[enumerate,2]{label=\emph{\roman*}$)$, + ref = \arabic{enumi}.\emph{\roman*}$)$} +\setlist[enumerate,3]{label=\emph{\alph*}$)$, + ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} +\if@minimalist@classical +\newcommand\desculine{\bgroup\markoverwith{\color{maintext!27!paper}% + \rule[-.45ex]{2pt}{.75pt}}\ULon} +\renewcommand{\descriptionlabel}[1]{% + \hspace{\labelsep}\normalfont\desculine{#1}% +} +\fi \setlist[itemize]{leftmargin=*} \gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index b35e37468c6..11e5e07d42c 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/08/11 A simple and clear article style] + [2021/10/23 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -127,6 +134,16 @@ \fi \RequirePackage{amssymb} +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index 0c50b2bb81d..e7bb0d8bb83 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/08/11 A simple and clear book style] + [2021/10/23 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -127,6 +134,16 @@ \fi \RequirePackage{amssymb} +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 84c21b30bb5..8ec380f257c 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{simplivre} - [2021/08/11 A simple and clear book style] + [2021/10/23 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -30,6 +30,7 @@ \DeclareBoolOption[false]{classical} \DeclareBoolOption[false]{useindent} \DeclareBoolOption[false]{useosf} +\DeclareBoolOption[false]{lmodern} \DeclareBoolOption[false]{palatino} \DeclareBoolOption[false]{times} \DeclareBoolOption[false]{garamond} @@ -53,6 +54,9 @@ \if@minimclass@classical\else \@minimclass@useindenttrue \fi +\if@minimclass@lmodern + \@minimclass@customfonttrue +\fi \if@minimclass@palatino \@minimclass@customfonttrue \fi @@ -77,7 +81,8 @@ \RequirePackage[heightrounded]{geometry} \geometry{ papersize={7in,10in}, - total={40em,60em}, + % total={40em,60em}, + total={5.535in,8.300in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -85,7 +90,8 @@ \if@minimclass@bfivepaper \geometry{ b5paper, - total={40em,59em}, + % total={40em,59em}, + total={5.535in,8.160in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -94,7 +100,8 @@ \if@minimclass@afourpaper \geometry{ a4paper, - total={47em,70em}, + % total={47em,70em}, + total={6.500in,9.685in}, hmarginratio=1:1, vmarginratio=1:1, footnotesep=2em plus 2pt minus 2pt, @@ -382,6 +389,19 @@ \renewcommand{\mid}{\hspace{-.2em}\mid@original\hspace{-.2em}} \let\nmid@original\nmid \renewcommand{\nmid}{\hspace{-.2em}\nmid@original\hspace{-.2em}} +\renewcommand{\frac}[2]{\genfrac{}{}{}{}{ + \mathchoice + {\raisebox{-.15em}{$\displaystyle #1$}} + {\raisebox{-.15em}{$\textstyle #1$}} + {\raisebox{-.08em}{$\scriptstyle #1$}} + {\scriptscriptstyle #1} +}{ + \mathchoice + {\raisebox{.08em}{$\displaystyle #2$}} + {\raisebox{.08em}{$\textstyle #2$}} + {\raisebox{.05em}{$\scriptstyle #2$}} + {\scriptscriptstyle #2} +}} } \RequirePackage{tikz-cd} @@ -454,6 +474,16 @@ \fi \fi +\if@minimclass@lmodern + \RequirePackage{amssymb} + \if@minimclass@useosf + \RequirePackage{cfr-lm} + \else + \RequirePackage{lmodern} + \fi + \PJLsetlinespacing{\setstretch{1.00}} +\fi + \if@minimclass@palatino \RequirePackage{amssymb} \RequirePackage{mathpazo} |