texlive[71191] Master/texmf-dist: litesolution (6may24)

commits+karl at tug.org commits+karl at tug.org
Mon May 6 22:17:25 CEST 2024


Revision: 71191
          https://tug.org/svn/texlive?view=revision&revision=71191
Author:   karl
Date:     2024-05-06 22:17:24 +0200 (Mon, 06 May 2024)
Log Message:
-----------
litesolution (6may24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/litesolution/README.md
    trunk/Master/texmf-dist/doc/latex/litesolution/figure/universe.pdf
    trunk/Master/texmf-dist/doc/latex/litesolution/figure/universe.tex
    trunk/Master/texmf-dist/doc/latex/litesolution/litesolution.pdf
    trunk/Master/texmf-dist/doc/latex/litesolution/litesolution.tex
    trunk/Master/texmf-dist/tex/latex/litesolution/litesolution.cls

Modified: trunk/Master/texmf-dist/doc/latex/litesolution/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/litesolution/README.md	2024-05-06 20:17:16 UTC (rev 71190)
+++ trunk/Master/texmf-dist/doc/latex/litesolution/README.md	2024-05-06 20:17:24 UTC (rev 71191)
@@ -1,17 +1,19 @@
-# The `LiteSolution` package
+# The `LiteSolution` class
 
-This template provides a fresh design for typesetting solutions of midterm or final exam, textbooks and other exercises.
+The LiteSolution class is designed for typesetting solutions of problems in exams, textbooks, etc.
 
-**Welcome to pull requests
-[here](https://github.com/xiamyphys/litesolution).**
+**Welcome to pull requests [here](https://github.com/xiamyphys/litesolution/pulls).**
 
 ## License
 
-This work may be distributed and/or modified under the conditions of the
-[LaTeX Project Public License](http://www.latex-project.org/lppl.txt),
-either version 1.3c of this license or (at your option) any later version.
+This work may be distributed and/or modified under the conditions of the [LaTeX Project Public License](http://www.latex-project.org/lppl.txt), either version 1.3c of this license or (at your option) any later version.
 
 This work has the LPPL maintenance status `maintained`.
 
-The Current Maintainer of this work is
-[Mingyu Hsia](https://www.ctan.org/author/xia-my).
\ No newline at end of file
+The Current Maintainer of this work is [Mingyu Hsia](https://www.ctan.org/author/xia-my).
+
+## Derivative Works
+
+- [notebeamer](https://ctan.org/pkg/notebeamer): Package provides macros for inputting slides on note papers quickly.
+
+- [fadingimage](https://ctan.org/pkg/fadingimage): Package provides macros for inputting full width picture at the edges of pages quickly.

Modified: trunk/Master/texmf-dist/doc/latex/litesolution/figure/universe.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/litesolution/figure/universe.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/litesolution/figure/universe.tex	2024-05-06 20:17:16 UTC (rev 71190)
+++ trunk/Master/texmf-dist/doc/latex/litesolution/figure/universe.tex	2024-05-06 20:17:24 UTC (rev 71191)
@@ -1,14 +1,14 @@
 \documentclass[svgnames,tikz]{standalone}
 
-\usepackage{xcolor}\let\Bbbk\relax
+\usepackage{xcolor}
 \usepackage{newtxtext,mtpro2,cancel,physics2,xfrac}
 \usephysicsmodule{ab.legacy}
 \usetikzlibrary{tikzmark}
-\tikzset{every node/.style={align=center,MidnightBlue!30},
-          every path/.style={MidnightBlue!30,line cap=round}}
+\tikzset{every node/.style={align=center,DarkSlateGray!30},
+          every path/.style={DarkSlateGray!30,line cap=round}}
 
 \begin{document}\tikz{
-    \node [above right] at (0,0) {$\color{MidnightBlue!30}
+    \node [above right] at (0,0) {$\color{DarkSlateGray!30}
       \tikzmarknode a\Psi=\displaystyle\tikzmarknode b\int
       \tikzmarknode c{\mathrm e}^{
         \sfrac{\tikzmarknode d{\mathrm i}}{\tikzmarknode e\hbar}
@@ -40,5 +40,5 @@
        node [scale=.45,above] {\footnotesize $\varphi$ - $\psi$ interaction\\Yukawa};
       \draw ([yshift=-1ex] l.south) coordinate (L) --++ (0,-.3)
        node [scale=.45,below] {Higgs\\\footnotesize Boson};
-      \foreach \x in {A,B,...,L}\fill [MidnightBlue!30] (\x) circle (.025);}
+      \foreach \x in {A,B,...,L}\fill [DarkSlateGray!30] (\x) circle (.025);}
 \end{document}
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/latex/litesolution/litesolution.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/litesolution/litesolution.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/litesolution/litesolution.tex	2024-05-06 20:17:16 UTC (rev 71190)
+++ trunk/Master/texmf-dist/doc/latex/litesolution/litesolution.tex	2024-05-06 20:17:24 UTC (rev 71191)
@@ -1,27 +1,26 @@
-\documentclass[ans,mtpro2]{litesolution}
+\documentclass[mtpro2]{litesolution}
 
 \usepackage[listings]{tcolorbox}
-\usepackage{fancyvrb}
+\lstset{language=[LaTeX]TeX,basicstyle=\small\ttfamily,breaklines=true,columns=flexible}
 
-\lstset{language=[LaTeX]TeX,basicstyle=\small\ttfamily,breaklines=true,columns=flexible}
 \title{\sffamily The \pkg{LiteSolution} Class}
 \subtitle{\sffamily\scshape Hangzhou Dianzi University}
-\bioinfo{\scshape\sffamily Mingyu Hsia, \href{mailto:xiamyphys at gmail.com}{\ttfamily xiamyphys at gmail.com} | \today, Version 2.1c}
-\cover[checkerboard]{schrodinger}\coverhead[5]{universe}
+\bioinfo{Mingyu Hsia (\mailto{xiamyphys at hdu.edu.cn})\quad|\quad\today\quad|\quad Version 2.2a}
+\cover[checkerboard]{schrodinger}\coverhead[3]{universe}
 
 \begin{document}
-\maketitle[MidnightBlue]
+\maketitle[DarkSlateGray]
 
-\chapterimage{\UPFadingImage[trim={0 {.9\paperheight} 0 0},clip]{Beautiful-realities}}
-\chapter{An Introduction to The \pkg{LiteSolution} Class}
+\chapterimage{\UPFadingImage*[trim={0 {.9\paperheight} 0 0},clip]{Beautiful-realities}}
+\chapter{User Manual For The \pkg{LiteSolution} Class}
 
 \section{Introduction}
 
-This is the document for the \pkg{litesolution} class, which provides a lite design for typesetting solutions of exams, textbooks or other exercises.
+This is the document for the \pkg{LiteSolution} class, which is designed for typesetting solutions of problems in exams, textbooks, etc.
 
-Welcome to feedback bugs or ideas via email \href{mailto:xiamyphys at gmail.com}{\ttfamily xiamyphys at gmail.com} or \href{https://github.com/xiamyphys/litesolution}{GitHub}.
+Welcome to feedback bugs or ideas via email \href{mailto:xiamyphys at hdu.edu.cn}{\ttfamily xiamyphys at hdu.edu.cn} or \href{https://github.com/xiamyphys/litesolution}{GitHub}.
 
-\subsection{Installing \pkg{litesolution} and loading it}
+\subsection{Installing \pkg{LiteSolution} and loading it}
 
 Simply download \verb|litesolution.cls| file from \href{https://github.com/xiamyphys/litesolution}{GitHub} or \href{https://ctan.org/pkg/litesolution}{CTAN} and save it under your working directory. However, I strongly suggest to use terminal to install and update all packages to the latest version
 
@@ -43,36 +42,38 @@
 
 \subsection{The \mode{answer} option}
 
-The \mode{ans} and \mode{noans} modes can show or hide contents in \cmd{solution} environment and \cmd{ans} command.
+The \mode{hideanswer} mode can hide contents in \cmd{solution} environment and \cmd{ans} command.
 
-\subsection{The \mode{counter} option}
+\subsection{The \mode{math} option}
 
-The \mode{separate} and \mode{continuous} modes can make the page number between chapters be reset or continuous.
+The \mode{mtpro2}, \mode{newtx} and \mode{newtxsf} modes can format the font of formulas in the document. Please check if mtpro2 font has been installed on your computer correctly before using \mode{mtpro2} mode.
 
-\subsection{The \mode{math} option}
+\section{Related packages}
+\begin{description}
+    \item[Package \pkg{notebeamer}] provides macros for inputting slides on note papers quickly.
+    \item[Package \pkg{fadingimage}] provides macros for inputting full width picture at the edges of pages quickly.
+\end{description}
 
-The \mode{mtpro2} and \mode{newtx} modes can format the font of formulas in the document. Please check if mtpro2 font has been installed on your computer correctly before using \mode{mtpro2} mode.
-
 \section{Cover Configurations}
 
 \subsection{The cover page configurations}
 
 \begin{verbatim}
-    \title{<content>}               \subtitle{<content>}
-    \bioinfo{<content>}             \cover[<pattern>]{<image>}
-    \coverhead[<angle>]{<image>}    \coverhead*[<angle>]{<content>}
+    \title{<content>}                 \subtitle{<content>}
+    \bioinfo{<content>}               \cover[<pattern>]{<image>}
+    \coverhead[<angle>]{<image>}      \coverhead*[<angle>]{<content>}
 
-    \begin{document}                \maketitle[<color>]
+    \begin{document}                  \maketitle[<color>]
 \end{verbatim}
 
 \begin{verbatim}
-    \title{\sffamily The \pkg{litesolution} Class}
+    \title{\sffamily The \pkg{LiteSolution} Class}
     \subtitle{\sffamily\scshape Hangzhou Dianzi University}
-    \bioinfo{\scshape\sffamily Mingyu Hsia, \href{mailto:xiamyphys at gmail.com}
-            {\ttfamily xiamyphys at gmail.com} | \today, Version 2.1a}
-    \cover[checkerboard]{schrodinger}       \coverhead[5]{universe}
+    \bioinfo{Mingyu Hsia (\mailto{xiamyphys at hdu.edu.cn})
+            \quad|\quad\today\quad|\quad Version 2.2a}
+    \cover[checkerboard]{schrodinger} \coverhead[5]{universe}
 
-    \begin{document}                \maketitle[Midnightblue]
+    \begin{document}                  \maketitle[Midnightblue]
 \end{verbatim}
 
 \subsection{The chapter head configurations}
@@ -105,7 +106,7 @@
 
 \begin{verbatim}
     \def\i{\mathrm i}       \def\e{\mathrm e}       \def\T{\mathsf T}
-    \let\leq\leqslant       \let\geq\geqslant
+    \let\leq\leqslant       \let\geq\geqslant       \let\vec\vv
 \end{verbatim}
 
 \section{Preset \pkg{amsthm} Environments}
@@ -113,7 +114,7 @@
 \subsection{The \cmd{problem} environment}
 
 \begin{tcblisting}{sidebyside,colback=DarkGreen!5,colframe=DarkGreen!80}
-\begin{problem}\leavevmode
+\begin{problem}[Keywords]\leavevmode
 \begin{tasks}(2)
   \task Choice A  \task[\true] Choice B
   \task Choice C  \task Choice D
@@ -148,30 +149,27 @@
 This template has preset many packages. The following packages are the common ones
 
 \begin{table}[htbp]
-    \centering
+    \centering\small
     \begin{tabular}{l l l l l l l l}
         \toprule
-        \pkg{amsthm} & \pkg{bm} & \pkg{booktabs} & \pkg{cancel} & \pkg{caption} & \pkg{circuitikz} & \pkg{datetime} & \pkg{derivative}\\
+        \pkg{amsthm}      & \pkg{amssymb}    & \pkg{bm}         & \pkg{booktabs} &
+        \pkg{cancel}      & \pkg{caption}    & \pkg{circuitikz} & \pkg{datetime} \\
         \midrule
-        \pkg{diagbox} & \pkg{esvect} & \pkg{extarrows} & \pkg{fancyhdr} & \pkg{fixdif} & \pkg{fontawesome5} & \pkg{geometry} & \pkg{indentfirst}\\
+        \pkg{derivative}  & \pkg{diagbox}    & \pkg{esvect}     & \pkg{extarrows} &
+        \pkg{fadingimage} & \pkg{fancyhdr}   & \pkg{fixdif}     & \pkg{fontawesome5} \\
         \midrule
-        \pkg{lipsum} & \pkg{multicol} & \pkg{multirow} & \pkg{nicematrix} & \pkg{paracol} & \pkg{pgfplots} & \pkg{physics2} & \pkg{refstyle} \\
+        \pkg{geometry}    & \pkg{graphics}   & \pkg{graphicx}   & \pkg{hyperref} &
+        \pkg{indentfirst} & \pkg{lipsum}     & \pkg{mathtools}  & \pkg{multicol} \\
         \midrule
-        \pkg{setspace} & \pkg{siunitx} & \pkg{tabularx} & \pkg{tasks} & \pkg{wallpaper} & \pkg{xcolor} & \pkg{xeCJK} & \pkg{xfrac}\\
+        \pkg{multirow}    & \pkg{nicematrix} & \pkg{notebeamer} & \pkg{paracol} &
+        \pkg{pgfplots}    & \pkg{physics2}   & \pkg{qrcode}     & \pkg{refstyle} \\
+        \midrule
+        \pkg{setspace}    & \pkg{siunitx}    & \pkg{tabularx}   & \pkg{tasks} &
+        \pkg{wallpaper}   & \pkg{xcolor}     & \pkg{xeCJK}      & \pkg{xfrac} \\
         \bottomrule
     \end{tabular}
 \end{table}
 
-\section{Related packages}
-
-\subsection{The \pkg{notebeamer} package}
-
-This package provides an easy way to input slides on note papers quickly for making annotations.
-
-\subsection{The \pkg{fadingimage} package}
-
-This package provides three commands for adding fading full width picture at the top or bottom of a page.
-
 \clearpage\appendix\def\thesection{Appendix}
 
 \section{Original code for the cover head}

Modified: trunk/Master/texmf-dist/tex/latex/litesolution/litesolution.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/litesolution/litesolution.cls	2024-05-06 20:17:16 UTC (rev 71190)
+++ trunk/Master/texmf-dist/tex/latex/litesolution/litesolution.cls	2024-05-06 20:17:24 UTC (rev 71191)
@@ -1,5 +1,5 @@
 %% ***********************************************************
-%%   Copyright 2024 by Mingyu Hsia <xiamyphys at gmail.com>     *
+%%   Copyright 2024 by Mingyu Hsia <xiamyphys at hdu.edu.cn>    *
 %%                                                           *
 %%   This work may be distributed and/or modified under      *
 %%   the conditions of the LaTeX Project Public License      *
@@ -19,34 +19,33 @@
 %% ***********************************************************
 % !Mode:: "TeX:UTF-8"
 \NeedsTeXFormat{LaTeX2e}
+\PassOptionsToPackage{no-math}{fontspec}
 \PassOptionsToPackage{svgnames}{xcolor}
-\ProvidesClass{litesolution}[2024/04/20 v2.1c LiteSolution document class]
+\ProvidesClass{litesolution}[2024/05/06 v2.2a LiteSolution document class]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{family=LITE, prefix=LITE@, setkeys=\kvsetkeys}
 \def\ekv#1{\kvsetkeys{LITE}{#1}}
 
-\DeclareStringOption[ans]{answer}
-\DeclareVoidOption{ans}{\ekv{answer=ans}}
-\DeclareVoidOption{noans}{\ekv{answer=noans}}
+\DeclareStringOption{answer}
+\DeclareVoidOption{hideanswer}{\ekv{answer=hideanswer}}
 
 \DeclareStringOption[newtx]{math}
 \DeclareVoidOption{newtx}{\ekv{math=newtx}}
+\DeclareVoidOption{newtxsf}{\ekv{math=newtxsf}}
 \DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
 
-\DeclareStringOption[separate]{counter}
-\DeclareVoidOption{separate}{\ekv{counter=separate}}
-\DeclareVoidOption{continuous}{\ekv{counter=continuous}}
-
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{book}}
 \ProcessKeyvalOptions*\relax
 \LoadClass[letterpaper,11pt,openany]{book}
 
-\RequirePackage{setspace,datetime,caption,booktabs,multicol,diagbox,paracol,enumitem}
+\RequirePackage{setspace,datetime,caption,booktabs,multicol,diagbox,paracol}
+\RequirePackage[inline]{enumitem}
 \RequirePackage[notelinecolor=MidnightBlue,notemargin=.75in]{notebeamer}
 \RequirePackage[nokeyprefix]{refstyle}
-\newref{fig}{name={\sffamily\bfseries Figure~}}
-\newref{tab}{name={\sffamily\bfseries Table~}}
+\newref{eq}{refcmd=(\ref{#1}),name={\sffamily eq.~},Name={\sffamily Eq.~}}
+\newref{fig}{name={\sffamily fig.~},Name={\sffamily Fig.~}}
+\newref{tab}{name={\sffamily tab.~},Name={\sffamily Tab.~}}
 \geometry{margin=1in}
 \linespread{1.3}
 \ddmmyyyydate
@@ -70,19 +69,32 @@
 \fi
 
 \ifdefstring{\LITE at math}{mtpro2}{%
-  \RequirePackage{amssymb}
+  \RequirePackage[mtpscr,mtpccal,mtpfrak]{mtpro2}
   \let\Bbbk\relax
-  \RequirePackage[mtpscr,mtpccal,mtpfrak]{mtpro2}
   \RequirePackage[mono=false]{libertine}
 }{\relax}
 
 \ifdefstring{\LITE at math}{newtx}{%
   \RequirePackage[libertine,mono=false]{newtx}
+  \let\Bbbk\relax
 }{\relax}
+
+\ifdefstring{\LITE at math}{newtxsf}{%
+  \RequirePackage{newtxsf,mathrsfs}
+  \RequirePackage[mono=false]{libertine}
+}{\relax}
 \let\openbox\relax\def\hmmax{0}\def\bmmax{0}
-\RequirePackage{amsthm,physics2,bm,fixdif,derivative,cancel,extarrows,siunitx,xfrac,nicematrix}
+\RequirePackage{amsthm,amssymb,mathtools,physics2,bm,fixdif,derivative,cancel,extarrows,siunitx,xfrac,nicematrix}
+\renewcommand\qedsymbol{$\color{gray}\blacksquare$}
 \usephysicsmodule{ab,braket,diagmat,doubleprod,xmat,ab.legacy,op.legacy}
 \RequirePackage[e]{esvect}
+\let\vec\vv
+\renewcommand*\env at cases[1][.84]{%
+  \let\@ifnextchar\new at ifnextchar
+  \left\lbrace
+  \def\arraystretch{#1}%
+  \array{@{}l@{\quad}l@{}}%
+}
 \AtBeginDocument{%
   \def\i{\mathrm i}\def\e{\mathrm e}\def\T{\mathsf T}
   \let\leq\leqslant\let\geq\geqslant
@@ -91,6 +103,7 @@
 }
 
 \RequirePackage[hidelinks]{hyperref}
+\def\mailto#1{\href{mailto:#1}{\ttfamily #1}}
 \RequirePackage{fontawesome5}
 \AddToHook{cmd/faIcon/before}{%
   \begingroup\fontsize{\fpeval{\f at size*.8}}{0}\selectfont
@@ -98,7 +111,7 @@
 \AddToHook{cmd/faIcon/after}{\endgroup}
 
 \RequirePackage{circuitikz,pgfplots,fadingimage}
-\usetikzlibrary{arrows,tikzmark,patterns,calc,fadings,angles,quotes,intersections}
+\usetikzlibrary{arrows,tikzmark,patterns,calc,angles,quotes,intersections}
 \tikzset{>=stealth',
 every picture/.append style={%
     line join=round,line cap=round,thick
@@ -124,13 +137,9 @@
 
 \def\subtitle#1{\gdef\@subtitle{#1}}
 \def\bioinfo#1{\gdef\@bioinfo{#1}}
-\NewDocumentCommand\coverhead{ s O{0} m }{
-  \IfBooleanTF{#1}{
-    \gdef\s at coverheadrotate{#2}
-    \gdef\s at coverhead{#3}}{
-    \gdef\@coverheadrotate{#2}
-    \gdef\@coverhead{#3}
-    }}
+\NewDocumentCommand\coverhead{ O{0} m }{
+  \gdef\@coverheadrotate{#1}\gdef\@coverhead{#2}
+}
 \NewDocumentCommand\cover{ o m }{
   \IfValueT{#1}{\gdef\@coverpattern{#1}}
   \gdef\@cover{#2}}
@@ -140,9 +149,6 @@
     \ifcsname @coverhead\endcsname
       \node[rotate=\@coverheadrotate] at ($(current page.center)+(0,.35*\paperheight)$) {\includegraphics[width=\paperwidth]{\@coverhead}};
     \fi
-    \ifcsname s at coverhead\endcsname
-      \node[scale=2,color=#1!30,rotate=\s at coverheadrotate] at ($(current page.center)+(0,.35*\paperheight)$) {\s at coverhead};
-    \fi
     \fill [white,opacity=.5] ($(current page.south west)+(.2*\paperwidth,.6*\paperheight)$) rectangle (current page.south east);
     \fill [white,opacity=.5] ($(current page.south west)+(.3*\paperwidth,.7*\paperheight)$) rectangle (current page.south east);
     \ifcsname @cover\endcsname
@@ -159,62 +165,76 @@
     \fi}\restoregeometry\restorepagecolor
 }
 
+\let\@chapapptmp\@chapapp
+\def\@chapapp{\textsc{\@chapapptmp}}
 \def\chapterimage#1{\gdef\@chapterimage{#1}}
+\def\HUGE{\@setfontsize\HUGE{30}{40}}
 \def\@makechapterhead#1{%
+  \def\thesection{\arabic{chapter}.\arabic{section}}
+  \def\theproblem{\thechapter.\arabic{problem}}
+  \vspace*{-36\p@}{%
+  \parindent \z@ \raggedright \normalfont
+    \ifcsname @chapterimage\endcsname
+      \@chapterimage
+      \else\leavevmode
+    \fi
+    \ifnum \c at secnumdepth >\m at ne
+            \if at mainmatter
+        \parbox{2cm}
+        {\centering\HUGE\normalfont\bfseries\textcolor{darkgray}\thechapter\vskip4\p@\normalsize\bfseries\textcolor{darkgray}{\bfseries\sffamily\@chapapp}}%
+            \fi
+    \fi
+    \interlinepenalty\@M\hspace*{3ex}
+    \huge\bfseries #1\par\nobreak
+    \vskip 36\p@
+}}
+\def\@makeschapterhead#1{%
+  \def\thesection{\arabic{section}}
+  \def\theproblem{\arabic{problem}}
   \setcounter{section}{0}
   \setcounter{problem}{0}
-  \setcounter{page}{1}{\centering
+  {\centering
   \ifcsname @chapterimage\endcsname
     \@chapterimage
-  \fi\leavevmode\vskip-42\p@
+  \fi\vskip-40\p@
     \parindent \z@ \normalfont
       \interlinepenalty\@M
       \huge \bfseries #1\par\nobreak
-    \vskip 26\p@}}
+    \vskip 28\p@}}
 
-\def\mailto#1{\href{mailto:#1}{\ttfamily #1}}
-\def\thesection{\arabic{section}}
-\def\ans#1{\underline{~#1~}}
-\AddToHook{cmd/section/before}{\setcounter{problem}{0}}
-
 \RequirePackage{fancyhdr}
 \pagestyle{fancy}
   \let\oldheadrule\headrule
   \renewcommand{\headrule}{{\color{gray}\oldheadrule}}
   \renewcommand{\headrulewidth}{1pt}\cfoot{}
-  \fancyhead[OL]{\textsc{\color{darkgray}\nouppercase\leftmark}}
+  \fancyhead[OL]{\color{darkgray}\nouppercase\leftmark}
   \fancyhead[OR]{\color{darkgray}\sffamily\thepage}
-  \fancyhead[ER]{\textsc{\color{darkgray}\nouppercase\rightmark}}
+  \fancyhead[ER]{\color{darkgray}\nouppercase\rightmark}
   \fancyhead[EL]{\color{darkgray}\sffamily\thepage}
   \setlength{\headheight}{14pt}
 
 \RequirePackage{comment}
-\ifdefstring{\LITE at answer}{ans}{%
-  \def\ans#1{\underline{~#1~}}
-  \def\s at solute#1{\relax}\def\@solute#1{\relax}
-  \AtBeginDocument{%
-    \excludecomment{draft}
-    \let\enddraft\relax}
-  \def\true{%
-    \addtocounter{task}{1}%
-    \faIcon{check-circle}}
-}{\relax}
-
-\ifdefstring{\LITE at answer}{noans}{%
+\ifdefstring{\LITE at answer}{hideanswer}{%
   \def\ans#1{\underline{\phantom{#1}}}
   \def\choiceans#1{\phantom{#1}}
-  \def\s at solute#1{\begin{draft}#1\end{draft}}
-  \def\@solute#1{\begin{draft}\leavevmode\vspace*{#1ex}\end{draft}}
+  \def\s at solute#1{\begin{scratch}#1\end{scratch}}
+  \def\@solute#1{\begin{scratch}\leavevmode\vspace*{#1ex}\end{scratch}}
   \AtBeginDocument{%
     \excludecomment{solution}\excludecomment{note}
     \let\endsolution\relax\let\endnote\relax}
   \def\true{\addtocounter{task}{1}\thetask}
-}{\relax}
-\def\solute{\@ifstar\s at solute\@solute}
+}{
+  \def\ans#1{\underline{~#1~}}
+  \def\s at solute#1{\relax}\def\@solute#1{\relax}
+  \AtBeginDocument{%
+    \excludecomment{scratch}
+    \let\endscratch\relax}
+  \def\true{\addtocounter{task}{1}\faIcon{check-circle}}
+}
+\DeclareRobustCommand\solute{\@ifstar\s at solute\@solute}
 
 \theoremstyle{definition}
-\newtheorem{problem}{\scshape\sffamily\color{DarkGreen}\faIcon{pen-square}~\scshape Problem}[chapter]
-\def\theproblem{\arabic{problem}}
-\newtheorem*{solution}{\scshape\sffamily\color{MidnightBlue}\faIcon{check-square}~\scshape Solution}
-\newtheorem*{draft}{\scshape\sffamily\color{MidnightBlue}\faIcon{check-square}~\scshape Solution}
-\newtheorem*{note}{\scshape\sffamily\color{DarkRed}\faIcon{info-circle}~\scshape Note}
\ No newline at end of file
+\newtheorem{problem}{\color{DarkGreen}\faIcon{pen-square}~\textsc{\textsf{Problem}}}[chapter]
+\newtheorem*{solution}{\color{MidnightBlue}\faIcon{check-square}~\textsc{\textsf{Solution}}}
+\newtheorem*{scratch}{\color{MidnightBlue}\faIcon{check-square}~\textsc{\textsf{Scratch}}}
+\newtheorem*{note}{\color{DarkRed}\faIcon{info-circle}~\textsc{\textsf{Note}}}
\ No newline at end of file



More information about the tex-live-commits mailing list.