jxu (24oct21)

git-svn-id: svn://tug.org/texlive/trunk@60863 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 34 insertions, 4 deletions

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}