CTAN sync 202104030300

6 files changed, 268 insertions, 52 deletions

diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index da2bdc9408..5c4ff2d70d 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index 82f4098531..c370712314 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -3,7 +3,7 @@
 % or later, see http://www.latex-project.org/lppl.txtf
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfCollege}[2021/04/01 v0.97 Aide pour l'utilisation de LaTeX au collège]
+\ProvidesPackage{ProfCollege}[2021/04/01 v0.98 Aide pour l'utilisation de LaTeX au collège]
 
 \RequirePackage{verbatim}
 
@@ -182,12 +182,135 @@
   }%
 }%
 
+\newcount\rappeljour
+
 \newcommand\Demain{%
-  \advance\day by 1%
-  \today%
-  \advance\day by -1%
+  \rappeljour=\day\relax%
+  \advance\day by 1\relax%
+  \ifnum\month=1\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=2\relax%
+  \ifnum\day>28\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=3\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=4\relax%
+  \ifnum\day>30\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=5\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=6\relax%
+  \ifnum\day>30\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=7\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+    \ifnum\month=8\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=9\relax%
+  \ifnum\day>30\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=10\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=11\relax%
+  \ifnum\day>30\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \ifnum\month=12\relax%
+  \ifnum\day>31\relax%
+  \day=\numexpr1\relax%
+  \advance\month by 1\relax%
+  \today\relax%
+  \advance\month by -1\relax%
+  \else%
+  \today\relax%
+  \fi%
+  \fi%
+  \day=\the\rappeljour\relax%
 }
 
+
 %%%
 % Tables Addition-Multiplication
 %%%
@@ -362,7 +485,7 @@
 %%%
 % Labyrinthe
 %%%
-\setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black},SensImpose=false}
+\setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black},SensImpose=false,Slop}
 
 \tikzset{FDirect/.style={-stealth}}
 \tikzset{FIndirect/.style={stealth-}}
@@ -374,6 +497,7 @@
   \setKV[Labyrinthe]{#1}%
   \setsepchar[*]{,*/}%
   \readlist*\ListeLaby{#2}%
+  \xdef\LabySlop{\ifboolKV[Labyrinthe]{Slop}{sloped}{}}%
   \ifboolKV[Labyrinthe]{Passages}{%
     \readlist*\ListeLabySol{#3}%
   }{}%
@@ -405,7 +529,7 @@
             \ifboolKV[Labyrinthe]{Passages}{%
               \xdef\NomNode{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)},1]}%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)},2]>0}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}%
-                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,midway]{\MotifTexte\NomNode}(A-\compteurh-\fpeval{\compteurv+1});%
+                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,midway,inner sep=2pt]{\MotifTexte\NomNode}(A-\compteurh-\fpeval{\compteurv+1});%
               }{}%
             }{%
               \xdef\NomNode{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)},1]}%
@@ -421,7 +545,7 @@
               \xdef\NomNode{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},1]}%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},2]>0}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}%
               \draw[\CouleurF,line width=3pt,\NomStyle]
-              (A-\compteurh-\compteurv) -- node[fill=white,midway,sloped]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\compteurv);}{}
+              (A-\compteurh-\compteurv) -- node[fill=white,midway,\LabySlop,inner sep=2pt]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\compteurv);}{}
             }{%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},2]>0}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\compteurh},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}%
                 \draw[\CouleurF,line width=3pt,\NomStyle]
@@ -435,7 +559,7 @@
             \ifboolKV[Labyrinthe]{Passages}{%
               \xdef\NomNode{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},1]}%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},2]>0}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}%
-                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,near start,sloped]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\fpeval{\compteurv-1});
+                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,near start,\LabySlop,inner sep=2pt]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\fpeval{\compteurv-1});
               }{}
             }{%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},2]>0}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-2)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+2},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}%
@@ -451,12 +575,12 @@
               \xdef\NomNode{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},1]}%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},2]>0}{%
                 \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}
-                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,near start,sloped]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\fpeval{\compteurv+1});
+                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,near start,\LabySlop,inner sep=2pt]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\fpeval{\compteurv+1});
               }{}%
             }{%
               \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},2]>0}{%
                 \xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},2]=1}{\xdef\NomStyle{FDirect}}{\xintifboolexpr{\ListeLabySol[\fpeval{\TotalLaby*(\compteurv-1)+\useKV[Labyrinthe]{Colonnes}+3*(\compteurh-1)+1},2]=2}{\xdef\NomStyle{FIndirect}}{\xdef\NomStyle{FBidirect}}}
-                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,near start,sloped]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\fpeval{\compteurv+1});
+                \draw[\CouleurF,line width=3pt,\NomStyle] (A-\compteurh-\compteurv) -- node[fill=white,near start,\LabySlop]{\MotifTexte\NomNode}(A-\fpeval{\compteurh+1}-\fpeval{\compteurv+1});
               }{}%
             }%          
           }%
@@ -12740,8 +12864,8 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Origine=0,Angl
         \hline
         \multicolumn{3}{|c|}{km$^3$}&\multicolumn{3}{c|}{hm$^3$}&\multicolumn{3}{c|}{dam$^3$}&\multicolumn{3}{c|}{m$^3$}&\multicolumn{3}{c|}{dm$^3$}&\multicolumn{3}{c|}{cm$^3$}&\multicolumn{3}{c|}{mm$^3$}\\
         \ifboolKV[ClesTableaux]{Capacite}{%
-        \cline{10-15}
-        \multicolumn{3}{|c|}{}&\multicolumn{3}{c|}{}&\multicolumn{3}{c|}{}&{\scriptsize hL}&{\scriptsize daL}&{\scriptsize L}&{\scriptsize dL}&{\scriptsize cL}&{\scriptsize mL}&\multicolumn{3}{c|}{}&\multicolumn{3}{c|}{}\\
+        \cline{13-18}
+        \multicolumn{3}{|c|}{}&\multicolumn{3}{c|}{}&\multicolumn{3}{c|}{}&\multicolumn{3}{c|}{}&{\scriptsize hL}&{\scriptsize daL}&{\scriptsize L}&{\scriptsize dL}&{\scriptsize cL}&{\scriptsize mL}&\multicolumn{3}{c|}{}\\
         }{}%
         \hline
         \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesTableaux]{NbLignes}}}\do{%
diff --git a/macros/latex/contrib/suppose/README.md b/macros/latex/contrib/suppose/README.md
index b7d2316ab7..f607b2fe13 100644
--- a/macros/latex/contrib/suppose/README.md
+++ b/macros/latex/contrib/suppose/README.md
@@ -1,11 +1,14 @@
 # the ``suppose`` package
 ## Andrew Lounsbury
 ### Licensed with LPPL 1.3c
-### 1.1 2021/03/26
+### 1.2 2021/04/01
 
 This package provides abbreviations of the word "Suppose" in various fonts and styles. \
-See the documentation `suppose-doc.pdf` for demonstration. 
+See the documentation `suppose-doc.pdf` for a demonstration. 
 
 |Change log         | Info                                                                           |
 |-------------------|--------------------------------------------------------------------------------|
-|**1.1 2021/03/26**| Added options for setting `\supp`, `\bsup`, `\ssup`, and `\sbsup` to one font. |
+|**1.1 2021/03/26** | Added options for setting `\supp`, `\bsup`, `\ssup`, and `\sbsup` to one font  |
+|**1.2 2021/04/01** | Added `slant` option                                                           |
+|                   | Fixed bug in `\PackageWarning` message for unknown options                     |
+|                   | Adjusted placement of the `\rule` for each font                                |
diff --git a/macros/latex/contrib/suppose/suppose-doc.pdf b/macros/latex/contrib/suppose/suppose-doc.pdf
index 20b9b66c2d..55bf001e0d 100644
--- a/macros/latex/contrib/suppose/suppose-doc.pdf
+++ b/macros/latex/contrib/suppose/suppose-doc.pdf
diff --git a/macros/latex/contrib/suppose/suppose-doc.tex b/macros/latex/contrib/suppose/suppose-doc.tex
index e0e1a72033..533c374125 100644
--- a/macros/latex/contrib/suppose/suppose-doc.tex
+++ b/macros/latex/contrib/suppose/suppose-doc.tex
@@ -1,22 +1,29 @@
 \documentclass{article}
+\usepackage{xcolor}
 \usepackage{hyperref}
-\usepackage{suppose}
-\setlength{\textwidth}{14.75cm}
+\usepackage[tt]{suppose}
+\setlength{\textwidth}{15.75cm}
 \setlength{\oddsidemargin}{0.75cm}
 
 \begin{document}
 \title{The \texttt{suppose} package}
-\author{1.1 \ 2021/03/26}
+\author{1.2 \ 2021/04/01}
 \date{Andrew Lounsbury, \href{mailto:alounsbury8@gmail.com}{alounsbury8@gmail.com}}
 \maketitle
 
-This package is licensed with LPPL 1.3c, and provides the following abbreviations for the word ``Suppose.'' I recommend only using these commands when the immediately succeeding strings are mathematical in nature, and I recommend choosing one font with the options and then using that same one throughout whatever you're writing. I do not recommend using these symbols in formal work. \par
-The options will re-define the commands \texttt{\textbackslash supp}, \texttt{\textbackslash bsup}, \texttt{\textbackslash ssup}, and \texttt{\textbackslash sbsup} to the desired font so that we can use it consistently. However, every symbol provided here can be hard-coded with the following commands. 
+This package is licensed with LPPL 1.3c, and provides the following abbreviations of the word ``Suppose.'' I recommend only using these symbols when the immediately succeeding strings are mathematical in nature. I do not recommend using them in formal work. \par
+The two main commands are \texttt{\textbackslash supp} and \texttt{\textbackslash bsup}, whose style and font may be specified with the options so that we can use them consistently. For example, 
+\begin{verbatim}
+    \usepackage[dutchcal, slant]{suppose}
+\end{verbatim}
+will make \texttt{\textbackslash supp} print in the \texttt{dutchcal} font with a slanted line and make \texttt{\textbackslash bsup} print the bold version of the same thing. The default font is the regular \texttt{mathit} serif font, and the vertical line is upright by default. 
+
+Though it is better to use the options with \texttt{\textbackslash supp} and \texttt{\textbackslash bsup}, every combination of font and style provided here can be hard-coded with the following commands. 
 \begin{center}
     \begin{tabular}{|c|c|c|c|c|c|}
         \hline
         \textbf{Option} & \textbf{Font} & \textbf{Command} & \textbf{Bold} & \textbf{Slanted Line} & \textbf{Slanted \& Bold} \\ \hline\hline
-        default & normal & \texttt{\textbackslash supp} & \texttt{\textbackslash bsup} & \texttt{\textbackslash ssup}  & \texttt{\textbackslash sbsup}  \\ \hline
+        default & normal & \texttt{\textbackslash plainsupp} & \texttt{\textbackslash plainbsup} & \texttt{\textbackslash ssup}  & \texttt{\textbackslash sbsup}  \\ \hline
         \texttt{mathcal} & mathcal & \texttt{\textbackslash csup} & \texttt{\textbackslash bcsup} & \texttt{\textbackslash scsup} & \texttt{\textbackslash sbcsup}  \\ \hline
         \texttt{dutchcal} & dutchcal & \texttt{\textbackslash dsup} & \texttt{\textbackslash bdsup} & \texttt{\textbackslash sdsup} & \texttt{\textbackslash sbdsup}  \\ \hline
         \texttt{eulerscript} & eulerscript & \texttt{\textbackslash esup} & \texttt{\textbackslash besup}  & \texttt{\textbackslash sesup}  & \texttt{\textbackslash sbesup}  \\ \hline
@@ -28,7 +35,7 @@ The options will re-define the commands \texttt{\textbackslash supp}, \texttt{\t
 \[
     \begin{array}{c|c|c|l}
         & \text{Regular} & \textbf{Bold} & \text{Font} \\ \hline
-        & \supp x < y & \bsup x < y & NORMAL \\
+        & \plainsupp x < y & \plainbsup x < y & NORMAL \\
         & \csup x < y & \bcsup x < y & \mathcal{MATHCAL} \\
         \text{Straight} & \dsup x < y & \bdsup x < y & \mathdutchcal{DUTCHCAL} \\
         \text{Line} & \esup x < y & \besup x < y & \EuScript{EULERSCRIPT} \\
@@ -39,7 +46,7 @@ The options will re-define the commands \texttt{\textbackslash supp}, \texttt{\t
         \textsl{Slanted} & \sdsup x < y & \sbdsup x < y & \mathdutchcal{DUTCHCAL} \\
         \textsl{Line} & \sesup x < y & \sbesup x < y & \EuScript{EULERSCRIPT} \\
         & \svsup x < y & \sbvsup x < y & \mathsf{SANS\ SERIF} \\
-        & \stsup x < y & \sbtsup x < y & \mathtt{TYPERWRITER}
+        &\ \stsup x < y & \sbtsup x < y & \mathtt{TYPERWRITER}
     \end{array}
 \]
 \end{document}
\ No newline at end of file
diff --git a/macros/latex/contrib/suppose/suppose.sty b/macros/latex/contrib/suppose/suppose.sty
index fb2235e01a..e0df512bfc 100644
--- a/macros/latex/contrib/suppose/suppose.sty
+++ b/macros/latex/contrib/suppose/suppose.sty
@@ -1,4 +1,4 @@
-% suppose.sty    1.1  2021/03/26
+% suppose.sty    1.2  2021/04/01
 % Andrew Lounsbury
 
 %************************************************************************
@@ -17,57 +17,139 @@
 % 
 % The Current Maintainer of this work is A. W. Lounsbury.
 %
-% This work consists of the files suppose.sty. 
+% This work consists of the file suppose.sty. 
 %************************************************************************
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{suppose}[2021/03/26 1.1 supposition symbols]
+\ProvidesPackage{suppose}[2021/04/01 1.2 supposition symbols]
 %
 \RequirePackage{amsmath, euscript, graphicx}%
 %
+\DeclareMathAlphabet{\mathbfcal}{OMS}{cmsy}{b}{n}%
 \DeclareMathAlphabet{\mathdutchcal}{U}{dutchcal}{m}{n}%
 \DeclareMathAlphabet{\mathdutchbfcal}{U}{dutchcal}{b}{n}%
+\newcommand*{\bfeuscript}[1]{\boldsymbol{\EuScript{#1}}}%
+\newcommand*{\sansserif}[1]{\textit{{\fontfamily{lmss}\selectfont #1}}}%
+\newcommand*{\bfsansserif}[1]{\textbf{\textit{{\fontfamily{lmss}\selectfont #1}}}}%
 %
 \font\btt=rm-lmtk10 % bold typewriter font
 \font\bitt=rm-lmtko10 % bold italicized typewriter font
+\newcommand*{\itt}[1]{\scalebox{1.11}{\textit{\texttt{#1}}}}%
+\newcommand*{\bolditt}[1]{$\scalebox{1.11}{\bitt #1}$}%
 %
+\newcounter{angle} % angle at which the \rule's are rotated
+\setcounter{angle}{0}%
+\newlength{\shift} % horizontal shift of \rule's
+\setlength{\shift}{-0.0025in}%
+\newlength{\boldshift}%
+\setlength{\boldshift}{0.0485in}%
+\newlength{\rulelength}%
+\setlength{\rulelength}{1.3ex}%
+\newlength{\boldrulelength}%
+\setlength{\boldrulelength}{1.3ex}%
+\newcommand{\curfont}{\mathnormal}%
+\newcommand{\curboldfont}{\boldsymbol}%
+%
+\DeclareOption{slant}{%
+    \setcounter{angle}{-15}%
+    \setlength{\shift}{-0.0075in}%
+    \setlength{\boldshift}{0.0425in}%
+}%
+\DeclareOption{mathcal}{%
+    \ifdim\boldshift = 0.0425in % if slant option selected
+        \addtolength{\shift}{0.00225in}%
+        \addtolength{\boldshift}{0.00225in}%
+    \fi%
+    \renewcommand{\curfont}{\mathcal}%
+    \renewcommand{\curboldfont}{\mathbfcal}%
+    \addtolength{\rulelength}{0.1ex}%
+    \addtolength{\boldrulelength}{0.15ex}%
+    \addtolength{\shift}{-0.00125in}%
+}%
+\DeclareOption{dutchcal}{%
+    \ifdim\boldshift = 0.0425in%
+        \addtolength{\shift}{0.0025in}%
+        \addtolength{\boldshift}{0.002in}%
+    \fi%
+    \renewcommand{\curfont}{\mathdutchcal}%
+    \renewcommand{\curboldfont}{\mathdutchbfcal}%
+    \addtolength{\rulelength}{0.1ex}%
+    \addtolength{\shift}{0.0025in}%
+    \addtolength{\boldrulelength}{0.1ex}%
+    \addtolength{\boldshift}{-0.003in}%
+}%
+\DeclareOption{eulerscript}{%
+    \ifdim\boldshift = 0.0425in%
+        \addtolength{\shift}{0.0000000000000000001in}% 
+        \addtolength{\boldshift}{0.0015in}%
+    \fi%
+    \renewcommand{\curfont}{\EuScript}%
+    \renewcommand{\curboldfont}{\bfeuscript}%
+    \addtolength{\rulelength}{0.1ex}%
+    \addtolength{\shift}{-0.01275in}%
+    \addtolength{\boldshift}{-0.015in}%
+}%
+\DeclareOption{sans-serif}{%
+    \ifdim\boldshift = 0.0425in%
+        \addtolength{\shift}{0.001in}%
+    \fi%
+    \renewcommand{\curfont}{\sansserif}%
+    \renewcommand{\curboldfont}{\bfsansserif}%
+    \addtolength{\shift}{-0.01375in}%
+    \addtolength{\boldshift}{-0.006in}%
+}%
+\DeclareOption{tt}{%
+    \renewcommand{\curfont}{\itt}%
+    \renewcommand{\curboldfont}{\bolditt}%
+    \addtolength{\shift}{0.0114in}%
+    \addtolength{\boldrulelength}{0.1ex}%
+    \addtolength{\boldshift}{-0.0185in}%
+}%
+% The two main commands
 \newlength{\Swidth}%
 \settowidth{\Swidth}{S}%
 \newcommand{\supp}{%
     \makebox[\Swidth][r]{%
-        \ $\rule[-0.5ex]{0.15ex}{1.3ex}\mspace{-0.25mu}$\ %
-    }\llap{$S$}\mspace{5mu}%
+        $\rotatebox{\value{angle}}{%
+            \rule[-0.5ex]{0.15ex}{\rulelength}%
+        }$\hspace{\shift}\ %
+    }\llap{$\curfont{S}$}\mspace{5mu}%
 }%
-\newcommand{\csup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.45ex}\mspace{9mu}$}\llap{$\mathcal{S}$}\mspace{5mu}}%
+\newcommand{\bsup}{%
+    \makebox[\Swidth][r]{%
+        $\rotatebox{\value{angle}}{%
+            \rule[-0.5ex]{0.2ex}{\boldrulelength}%
+        }$\hspace{\boldshift}%
+    }\llap{$\curboldfont{S}$%
+}\mspace{5mu}}%
+% Commands for hard-coding
+\newcommand{\plainsupp}{\makebox[\Swidth][r]{$\rule[-0.5ex]{0.15ex}{1.3ex}\mspace{-0.25mu}$\ }\llap{$S$}\mspace{5mu}}%
+\newcommand{\csup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.45ex}\mspace{8.5mu}$}\llap{$\mathcal{S}$}\mspace{5mu}}%
 \newcommand{\dsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.45ex}\mspace{9.5mu}$}\llap{$\mathdutchcal{S}$}\mspace{5mu}}%
 \newcommand{\esup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.35ex}\mspace{5.25mu}$}\llap{$\EuScript{S}$}\mspace{5mu}}%
-\newcommand{\tsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.3ex}\mspace{4.5mu}$\ }\llap{\textit{\texttt{S}}}\mspace{5mu}}%
-\newcommand{\vsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.45ex}\mspace{8mu}$}\llap{\textit{{\fontfamily{lmss}\selectfont S}}}\mspace{5mu}}%
-% Bold version
-\newcommand{\bsup}{\makebox[\Swidth][r]{\ $\rule[-0.5ex]{0.20ex}{1.3ex}\mspace{6.5mu}$}\llap{$\boldsymbol{S}$}\mspace{5mu}}%
+\newcommand{\tsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.3ex}\mspace{5.5mu}$\ }\llap{\scalebox{1.1}{\textit{\texttt{S}}}}\mspace{5mu}}%
+
+\newcommand{\vsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.15ex}{1.45ex}\mspace{7.75mu}$}\llap{\textit{{\fontfamily{lmss}\selectfont S}}}\mspace{5mu}}%
+% Bold
+\newcommand{\plainbsup}{\makebox[\Swidth][r]{$\rule[-0.5ex]{0.20ex}{1.3ex}\mspace{6.3mu}$}\llap{$\boldsymbol{S}$}\mspace{5mu}}%
 \newcommand{\bcsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.20ex}{1.5ex}\mspace{10mu}$}\llap{$\boldsymbol{\mathcal{S}}$}\mspace{5mu}}%
-\newcommand{\bdsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.20ex}{1.5ex}\mspace{10.125mu}$}\llap{$\mathdutchbfcal{S}$}\mspace{5mu}}%
+\newcommand{\bdsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.20ex}{1.5ex}\mspace{9.5mu}$}\llap{$\mathdutchbfcal{S}$}\mspace{5mu}}%
 \newcommand{\besup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.20ex}{1.35ex}\mspace{6mu}$}\llap{$\boldsymbol{\EuScript{S}}$}\mspace{5mu}}%
-\newcommand{\btsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.2ex}{1.3ex}\mspace{-1mu}$\ }\llap{\scalebox{1.2}{\bitt S}}\mspace{5mu}}%
-\newcommand{\bvsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.20ex}{1.45ex}\mspace{9.5mu}$}\llap{\textbf{\textit{{\fontfamily{lmss}\selectfont S}}}}\mspace{5mu}}%
+\newcommand{\btsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.2ex}{1.3ex}\mspace{-0.7mu}$\ }\llap{\scalebox{1.11}{\bitt S}}\mspace{5mu}}%
+\newcommand{\bvsup}{\makebox[\Swidth][c]{\ $\rule[-0.5ex]{0.20ex}{1.45ex}\mspace{8.75mu}$}\llap{\textbf{\textit{{\fontfamily{lmss}\selectfont S}}}}\mspace{5mu}}%
 % Slanted rule
-\newcommand{\ssup}{\makebox[\Swidth][r]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.3ex}}\mspace{5mu}$}\llap{$S$}\mspace{5mu}}%
+\newcommand{\ssup}{\makebox[\Swidth][r]{$\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.3ex}}\mspace{5mu}$}\llap{$S$}\mspace{5mu}}%
 \newcommand{\scsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.45ex}}\mspace{10mu}$}\llap{$\mathcal{S}$}\mspace{5mu}}%
-\newcommand{\sdsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.45ex}}\mspace{11mu}$}\llap{$\mathdutchcal{S}$}\mspace{5mu}}%
-\newcommand{\sesup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.45ex}}\mspace{7mu}$}\llap{$\EuScript{S}$}\mspace{5mu}}%
-\newcommand{\stsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.3ex}}\mspace{5.5mu}$\ }\llap{\textit{\texttt{S}}}\mspace{5mu}}%
-\newcommand{\svsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.45ex}}\mspace{8.5mu}$}\llap{\textit{{\fontfamily{lmss}\selectfont S}}}\mspace{5mu}}%
+\newcommand{\sdsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.35ex}}\mspace{11mu}$}\llap{$\mathdutchcal{S}$}\mspace{5mu}}%
+\newcommand{\sesup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.4ex}}\mspace{6.6mu}$}\llap{$\EuScript{S}$}\mspace{5mu}}%
+\newcommand{\stsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.3ex}}\mspace{6.5mu}$\ }\llap{\scalebox{1.11}{\textit{\texttt{S}}}}\mspace{5mu}}%
+\newcommand{\svsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.15ex}{1.45ex}}\mspace{9mu}$}\llap{\textit{{\fontfamily{lmss}\selectfont S}}}\mspace{5mu}}%
 % Slanted & bold
-\newcommand{\sbsup}{\makebox[\Swidth][r]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.3ex}}\mspace{5.5mu}$}\llap{$\boldsymbol{S}$}\mspace{5mu}}%
+\newcommand{\sbsup}{\makebox[\Swidth][r]{$\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.3ex}}\mspace{5.5mu}$}\llap{$\boldsymbol{S}$}\mspace{5mu}}%
 \newcommand{\sbcsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.45ex}}\mspace{12mu}$}\llap{$\boldsymbol{\mathcal{S}}$}\mspace{5mu}}%
 \newcommand{\sbdsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.4ex}}\mspace{11mu}$}\llap{$\mathdutchbfcal{S}$}\mspace{5mu}}%
-\newcommand{\sbesup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.45ex}}\mspace{8mu}$}\llap{$\boldsymbol{\EuScript{S}}$}\mspace{5mu}}%
-\newcommand{\sbtsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.2ex}{1.3ex}}$\ }\llap{\scalebox{1.2}{\bitt S}}\mspace{5mu}}%
+\newcommand{\sbesup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.45ex}}\mspace{7.2mu}$}\llap{$\boldsymbol{\EuScript{S}}$}\mspace{5mu}}%
+\newcommand{\sbtsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.2ex}{1.4ex}}\mspace{0.25mu}$\ }\llap{\scalebox{1.11}{\bitt S}}\mspace{5mu}}%
 \newcommand{\sbvsup}{\makebox[\Swidth][c]{\ $\rotatebox{-15}{\rule[-0.5ex]{0.20ex}{1.45ex}}\mspace{10mu}$}\llap{\textbf{\textit{{\fontfamily{lmss}\selectfont S}}}}\mspace{5mu}}%
-% Options
-\DeclareOption{mathcal}{\renewcommand{\supp}{\csup}\renewcommand{\bsup}{\bcsup}\renewcommand{\ssup}{\scsup}\renewcommand{\sbsup}{\sbcsup}}%
-\DeclareOption{dutchcal}{\renewcommand{\supp}{\dsup}\renewcommand{\bsup}{\bdsup}\renewcommand{\ssup}{\sdsup}\renewcommand{\sbsup}{\sbdsup}}%
-\DeclareOption{eulerscript}{\renewcommand{\supp}{\esup}\renewcommand{\bsup}{\besup}\renewcommand{\ssup}{\sesup}\renewcommand{\sbsup}{\sbesup}}%
-\DeclareOption{tt}{\renewcommand{\supp}{\tsup}\renewcommand{\bsup}{\btsup}\renewcommand{\ssup}{\stsup}\renewcommand{\sbsup}{\sbtsup}}%
-\DeclareOption{sans-serif}{\renewcommand{\supp}{\vsup}\renewcommand{\bsup}{\bvsup}\renewcommand{\ssup}{\svsup}\renewcommand{\sbsup}{\sbvsup}}%
-\DeclareOption*{\PackageWarning{suppose}{Unknown ‘\CurrentOption’}}%
-\ProcessOptions\relax%
\ No newline at end of file
+%
+\DeclareOption*{\PackageWarning{suppose}{Unknown '\CurrentOption'}}%
+\ProcessOptions\relax%