realhats (3nov19)

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

25 files changed, 120 insertions, 85 deletions

diff --git a/Master/texmf-dist/doc/latex/realhats/README.md b/Master/texmf-dist/doc/latex/realhats/README.md
index 41c09d5fc9d..b9b4adc5f5f 100644
--- a/Master/texmf-dist/doc/latex/realhats/README.md
+++ b/Master/texmf-dist/doc/latex/realhats/README.md
@@ -13,13 +13,16 @@ Regretfully brought into the world by [Matthew Scroggs](https://github.com/mscro
 ![Letters with hats on](readme_images/hats.png)
 
 ## Changelog
-### Version 3.0
+### Version 4.0 (2019-11-02)
+* Vectorised the hats
+* Added dunce cap
+### Version 3.0 (2019-04-14)
 * Added optional parameters for `\hat` and `\usepackage` to control which hats are used.
 * Added crown
-### Version 2.0
+### Version 2.0 (2019-02-25)
 * Replaced tikz with stackengine
 * Added top hat, make LaTeX great again hat, fez, cowboy hat
-### Version 1.0
+### Version 1.0 (2019-02-05)
 * First working version of package
 * Added five hats
 * Added documentation
diff --git a/Master/texmf-dist/doc/latex/realhats/readme_images/hats.png b/Master/texmf-dist/doc/latex/realhats/readme_images/hats.png
index 5a99019bc76..74f159bdcae 100644
--- a/Master/texmf-dist/doc/latex/realhats/readme_images/hats.png
+++ b/Master/texmf-dist/doc/latex/realhats/readme_images/hats.png
diff --git a/Master/texmf-dist/doc/latex/realhats/realhats.pdf b/Master/texmf-dist/doc/latex/realhats/realhats.pdf
index 4dec61a7dcf..0600bb2b107 100644
--- a/Master/texmf-dist/doc/latex/realhats/realhats.pdf
+++ b/Master/texmf-dist/doc/latex/realhats/realhats.pdf
diff --git a/Master/texmf-dist/source/latex/realhats/realhats.dtx b/Master/texmf-dist/source/latex/realhats/realhats.dtx
index 7380964e141..ac9d20c452d 100644
--- a/Master/texmf-dist/source/latex/realhats/realhats.dtx
+++ b/Master/texmf-dist/source/latex/realhats/realhats.dtx
@@ -1,5 +1,5 @@
 %\iffalse meta-comment
-%Copyright (c) 2018 Matthew Scroggs & Adam Townsend
+%Copyright (c) 2019 Matthew Scroggs & Adam Townsend
 %
 %Permission is hereby granted, free of charge, to any person obtaining a copy
 %of this software and associated documentation files (the "Software"), to deal
@@ -27,32 +27,32 @@
 %To make a vector with a hat, the input \lstinline@\hat{\mathbf{a}}@ produces:
 %\[\hat{\mathbf{a}}\]
 %
-%The command \lstinline{\hat} will choose a hat randomly from six hats:
+%The command \lstinline{\hat} will choose a hat randomly from ten hats:
 %\begin{itemize}
-%\item \(\hatn{a}{0}\) - A beret
-%\item \(\hatn{a}{1}\) - A Santa hat
-%\item \(\hatn{a}{2}\) - A Scottish hat
-%\item \(\hatn{a}{3}\) - A sombrero
-%\item \(\hatn{a}{4}\) - A wizard's hat
-%\item \(\hatn{a}{5}\) - A top hat
-%\item \(\hatn{a}{6}\) - A make {\LaTeX} great again hat
-%\item \(\hatn{a}{7}\) - A fez
-%\item \(\hatn{a}{8}\) - A cowboy hat
-%\item \(\hatn{a}{9}\) - A crown
+%\item \(\hatn{a}{beret}\) - A beret
+%\item \(\hatn{a}{santa}\) - A Santa hat
+%\item \(\hatn{a}{sombrero}\) - A sombrero
+%\item \(\hatn{a}{witch}\) - A witch's hat
+%\item \(\hatn{a}{tophat}\) - A top hat
+%\item \(\hatn{a}{mlga}\) - A make {\LaTeX} great again hat
+%\item \(\hatn{a}{fez}\) - A fez
+%\item \(\hatn{a}{cowboy}\) - A cowboy hat
+%\item \(\hatn{a}{crown}\) - A crown
+%\item \(\hatn{a}{dunce}\) - A dunce's cap
 %\end{itemize}
 %
 %Variables can be given a non-random hat, using the command \lstinline{\hat} with an optional parameter:
 %\begin{itemize}
 %\item \lstinline@\hat[beret]{a}@ produces \(\hat[beret]{a}\)
 %\item \lstinline@\hat[santa]{a}@ produces \(\hat[santa]{a}\)
-%\item \lstinline@\hat[scottish]{a}@ produces \(\hat[scottish]{a}\)
 %\item \lstinline@\hat[sombrero]{a}@ produces \(\hat[sombrero]{a}\)
-%\item \lstinline@\hat[wizard]{a}@ produces \(\hat[wizard]{a}\)
+%\item \lstinline@\hat[witch]{a}@ produces \(\hat[witch]{a}\)
 %\item \lstinline@\hat[tophat]{a}@ produces \(\hat[tophat]{a}\)
 %\item \lstinline@\hat[mlga]{a}@ produces \(\hat[mlga]{a}\)
 %\item \lstinline@\hat[fez]{a}@ produces \(\hat[fez]{a}\)
 %\item \lstinline@\hat[cowboy]{a}@ produces \(\hat[cowboy]{a}\)
 %\item \lstinline@\hat[crown]{a}@ produces \(\hat[crown]{a}\)
+%\item \lstinline@\hat[dunce]{a}@ produces \(\hat[dunce]{a}\)
 %\end{itemize}
 %
 %You can also pass these same options when loading the package.
@@ -77,48 +77,63 @@
 %\iffalse
 %<*realhats>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{realhats}[2019/04/14 realhats]
+\ProvidesPackage{realhats}[2019/04/14 realhats 3.0]
 
 \RequirePackage{amsmath}
 \RequirePackage{graphicx}
 \RequirePackage{ifthen}
-\RequirePackage[first=0, last=8]{lcg}
+\RequirePackage[first=0, last=9, counter=hat]{lcg}
 \RequirePackage{calc}
 \RequirePackage{stackengine}
 
 \newcommand\myhat{}
+\newlength{\hatwidth} %hat width
 \newlength{\hshif} %horizontal shift
 \newlength{\vshif} %vertical shift
 
 \global\def\hatused{-1}
-\DeclareOption{beret}{\global\def\hatused{0}}
-\DeclareOption{santa}{\global\def\hatused{1}}
-\DeclareOption{scottish}{\global\def\hatused{2}}
-\DeclareOption{sombrero}{\global\def\hatused{3}}
-\DeclareOption{witch}{\global\def\hatused{4}}
-\DeclareOption{tophat}{\global\def\hatused{5}}
-\DeclareOption{mlga}{\global\def\hatused{6}}
-\DeclareOption{fez}{\global\def\hatused{7}}
-\DeclareOption{cowboy}{\global\def\hatused{8}}
-\DeclareOption{crown}{\global\def\hatused{9}}
+\DeclareOption{beret}{\global\def\hatused{beret}}
+\DeclareOption{santa}{\global\def\hatused{santa}}
+\DeclareOption{sombrero}{\global\def\hatused{sombrero}}
+\DeclareOption{witch}{\global\def\hatused{witch}}
+\DeclareOption{tophat}{\global\def\hatused{tophat}}
+\DeclareOption{mlga}{\global\def\hatused{mlga}}
+\DeclareOption{fez}{\global\def\hatused{fez}}
+\DeclareOption{cowboy}{\global\def\hatused{cowboy}}
+\DeclareOption{crown}{\global\def\hatused{crown}}
+\DeclareOption{dunce}{\global\def\hatused{dunce}}
 \ProcessOptions\relax
 
+\newcommand{\gethat}{%
+    \ifcase\thehat beret%
+        \or santa%
+        \or sombrero%
+        \or witch%
+        \or tophat%
+        \or mlga%
+        \or fez%
+        \or cowboy%
+        \or crown%
+        \or dunce%
+    \fi
+}
+
 \renewcommand{\hat}[2][]{%
     \ifthenelse{\equal{#1}{}}{%
         \ifthenelse{\equal{\hatused}{-1}}%
-        {\rand\hatn{#2}{\arabic{rand}}}%
+        {\rand\hatn{#2}{\gethat}}%
         {\hatn{#2}{\hatused}}%
     }{%
-        \ifthenelse{\equal{#1}{beret}}{\hatn{#2}{0}}{}%
-        \ifthenelse{\equal{#1}{santa}}{\hatn{#2}{1}}{}%
-        \ifthenelse{\equal{#1}{scottish}}{\hatn{#2}{2}}{}%
-        \ifthenelse{\equal{#1}{sombrero}}{\hatn{#2}{3}}{}%
-        \ifthenelse{\equal{#1}{witch}}{\hatn{#2}{4}}{}%
-        \ifthenelse{\equal{#1}{tophat}}{\hatn{#2}{5}}{}%
-        \ifthenelse{\equal{#1}{mlga}}{\hatn{#2}{6}}{}%
-        \ifthenelse{\equal{#1}{fez}}{\hatn{#2}{7}}{}%
-        \ifthenelse{\equal{#1}{cowboy}}{\hatn{#2}{8}}{}%
-        \ifthenelse{\equal{#1}{crown}}{\hatn{#2}{9}}{}%
+        \ifthenelse{\equal{#1}{beret}}{\hatn{#2}{beret}}{}%
+        \ifthenelse{\equal{#1}{santa}}{\hatn{#2}{santa}}{}%
+        \ifthenelse{\equal{#1}{sombrero}}{\hatn{#2}{sombrero}}{}%
+        \ifthenelse{\equal{#1}{witch}}{\hatn{#2}{witch}}{}%
+        \ifthenelse{\equal{#1}{tophat}}{\hatn{#2}{tophat}}{}%
+        \ifthenelse{\equal{#1}{mlga}}{\hatn{#2}{mlga}}{}%
+        \ifthenelse{\equal{#1}{fez}}{\hatn{#2}{fez}}{}%
+        \ifthenelse{\equal{#1}{cowboy}}{\hatn{#2}{cowboy}}{}%
+        \ifthenelse{\equal{#1}{crown}}{\hatn{#2}{crown}}{}%
+        \ifthenelse{\equal{#1}{dunce}}{\hatn{#2}{dunce}}{}%
     }%
 }
 
@@ -126,20 +141,21 @@
 
 \newcommand{\hatnoptions}[4]{%
 \setlength{\hshif}{1pt}
-\ifthenelse{\equal{#2}{0}}{\renewcommand\myhat{hats/realhats-beret}\setlength{\vshif}{-0.6ex} \setlength{\hshif}{0.5ex} }{}%
-\ifthenelse{\equal{#2}{1}}{\renewcommand\myhat{hats/realhats-santa}\setlength{\vshif}{-0.1ex} }{}%
-\ifthenelse{\equal{#2}{2}}{\renewcommand\myhat{hats/realhats-scottish}\setlength{\vshif}{-0.7ex} \setlength{\hshif}{0.6ex}}{}%
-\ifthenelse{\equal{#2}{3}}{\renewcommand\myhat{hats/realhats-sombrero}\setlength{\vshif}{-0.17ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{4}}{\renewcommand\myhat{hats/realhats-witch}\setlength{\vshif}{-0.12ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{5}}{\renewcommand\myhat{hats/realhats-tophat}\setlength{\vshif}{-0.6ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{6}}{\renewcommand\myhat{hats/realhats-makelatexgreatagain}\setlength{\vshif}{-0.6ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{7}}{\renewcommand\myhat{hats/realhats-fez}\setlength{\vshif}{-0.4ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{8}}{\renewcommand\myhat{hats/realhats-cowboy}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
-\ifthenelse{\equal{#2}{9}}{\renewcommand\myhat{hats/realhats-crown}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\setlength{\hatwidth}{2ex}
+\ifthenelse{\equal{#2}{beret}}{\renewcommand\myhat{hats/realhats-beret}\setlength{\vshif}{-0.6ex} \setlength{\hshif}{0.5ex} }{}%
+\ifthenelse{\equal{#2}{santa}}{\renewcommand\myhat{hats/realhats-santa}\setlength{\vshif}{-0.1ex} }{}%
+\ifthenelse{\equal{#2}{sombrero}}{\renewcommand\myhat{hats/realhats-sombrero}\setlength{\vshif}{-0.17ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{witch}}{\renewcommand\myhat{hats/realhats-witch}\setlength{\vshif}{-0.12ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{tophat}}{\renewcommand\myhat{hats/realhats-tophat}\setlength{\vshif}{-0.4ex} \setlength{\hatwidth}{1.8ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{mlga}}{\renewcommand\myhat{hats/realhats-makelatexgreatagain}\setlength{\vshif}{-0.6ex} \setlength{\hatwidth}{1.8ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{fez}}{\renewcommand\myhat{hats/realhats-fez}\setlength{\vshif}{-0.4ex} \setlength{\hatwidth}{1ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{cowboy}}{\renewcommand\myhat{hats/realhats-cowboy}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\ifthenelse{\equal{#2}{crown}}{\renewcommand\myhat{hats/realhats-crown}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\ifthenelse{\equal{#2}{dunce}}{\renewcommand\myhat{hats/realhats-dunce}\setlength{\vshif}{-0.3ex} \setlength{\hatwidth}{1.4ex}}{}%
 \addtolength{\hshif}{#3}%
 \addtolength{\vshif}{#4}%
 \stackMath %
-\stackon[\vshif]{#1}{\hspace{\hshif}\includegraphics[width=2ex]{\myhat}}
+\stackon[\vshif]{#1}{\hspace{\hshif}\includegraphics[width=\hatwidth]{\myhat}}
 }
 %</realhats>
 %\fi
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-beret.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-beret.pdf
new file mode 100644
index 00000000000..da16354b97d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-beret.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-beret.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-beret.png
deleted file mode 100644
index 238d2a0ce01..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-beret.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-cowboy.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-cowboy.pdf
new file mode 100644
index 00000000000..8499ab5d38b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-cowboy.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-cowboy.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-cowboy.png
deleted file mode 100644
index 32ba5646b37..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-cowboy.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-crown.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-crown.pdf
new file mode 100644
index 00000000000..4505175117d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-crown.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-crown.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-crown.png
deleted file mode 100644
index b250db4ac02..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-crown.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-dunce.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-dunce.pdf
new file mode 100644
index 00000000000..325b6b5320b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-dunce.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-fez.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-fez.pdf
new file mode 100644
index 00000000000..c8efd2de87e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-fez.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-fez.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-fez.png
deleted file mode 100644
index 1efb0bd181c..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-fez.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-makelatexgreatagain.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-makelatexgreatagain.pdf
new file mode 100644
index 00000000000..a7551993288
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-makelatexgreatagain.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-makelatexgreatagain.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-makelatexgreatagain.png
deleted file mode 100644
index 71c7bc61b6f..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-makelatexgreatagain.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-santa.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-santa.pdf
new file mode 100644
index 00000000000..c33db2c98ae
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-santa.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-santa.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-santa.png
deleted file mode 100644
index 3b79c7030f2..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-santa.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-scottish.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-scottish.png
deleted file mode 100644
index 6f4cc15123f..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-scottish.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-sombrero.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-sombrero.pdf
new file mode 100644
index 00000000000..fa7b639cfa7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-sombrero.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-sombrero.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-sombrero.png
deleted file mode 100644
index a84cf37e0ae..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-sombrero.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-tophat.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-tophat.pdf
new file mode 100644
index 00000000000..64c38469620
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-tophat.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-tophat.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-tophat.png
deleted file mode 100644
index c861e34b568..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-tophat.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-witch.pdf b/Master/texmf-dist/tex/latex/realhats/hats/realhats-witch.pdf
new file mode 100644
index 00000000000..b875929a747
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/realhats/hats/realhats-witch.pdf
diff --git a/Master/texmf-dist/tex/latex/realhats/hats/realhats-witch.png b/Master/texmf-dist/tex/latex/realhats/hats/realhats-witch.png
deleted file mode 100644
index abcafa1030a..00000000000
--- a/Master/texmf-dist/tex/latex/realhats/hats/realhats-witch.png
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/realhats/realhats.sty b/Master/texmf-dist/tex/latex/realhats/realhats.sty
index 171969837e4..9599bf62215 100644
--- a/Master/texmf-dist/tex/latex/realhats/realhats.sty
+++ b/Master/texmf-dist/tex/latex/realhats/realhats.sty
@@ -28,48 +28,63 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{realhats}[2019/04/14 realhats]
+\ProvidesPackage{realhats}[2019/04/14 realhats 3.0]
 
 \RequirePackage{amsmath}
 \RequirePackage{graphicx}
 \RequirePackage{ifthen}
-\RequirePackage[first=0, last=8]{lcg}
+\RequirePackage[first=0, last=9, counter=hat]{lcg}
 \RequirePackage{calc}
 \RequirePackage{stackengine}
 
 \newcommand\myhat{}
+\newlength{\hatwidth} %hat width
 \newlength{\hshif} %horizontal shift
 \newlength{\vshif} %vertical shift
 
 \global\def\hatused{-1}
-\DeclareOption{beret}{\global\def\hatused{0}}
-\DeclareOption{santa}{\global\def\hatused{1}}
-\DeclareOption{scottish}{\global\def\hatused{2}}
-\DeclareOption{sombrero}{\global\def\hatused{3}}
-\DeclareOption{witch}{\global\def\hatused{4}}
-\DeclareOption{tophat}{\global\def\hatused{5}}
-\DeclareOption{mlga}{\global\def\hatused{6}}
-\DeclareOption{fez}{\global\def\hatused{7}}
-\DeclareOption{cowboy}{\global\def\hatused{8}}
-\DeclareOption{crown}{\global\def\hatused{9}}
+\DeclareOption{beret}{\global\def\hatused{beret}}
+\DeclareOption{santa}{\global\def\hatused{santa}}
+\DeclareOption{sombrero}{\global\def\hatused{sombrero}}
+\DeclareOption{witch}{\global\def\hatused{witch}}
+\DeclareOption{tophat}{\global\def\hatused{tophat}}
+\DeclareOption{mlga}{\global\def\hatused{mlga}}
+\DeclareOption{fez}{\global\def\hatused{fez}}
+\DeclareOption{cowboy}{\global\def\hatused{cowboy}}
+\DeclareOption{crown}{\global\def\hatused{crown}}
+\DeclareOption{dunce}{\global\def\hatused{dunce}}
 \ProcessOptions\relax
 
+\newcommand{\gethat}{%
+    \ifcase\thehat beret%
+        \or santa%
+        \or sombrero%
+        \or witch%
+        \or tophat%
+        \or mlga%
+        \or fez%
+        \or cowboy%
+        \or crown%
+        \or dunce%
+    \fi
+}
+
 \renewcommand{\hat}[2][]{%
     \ifthenelse{\equal{#1}{}}{%
         \ifthenelse{\equal{\hatused}{-1}}%
-        {\rand\hatn{#2}{\arabic{rand}}}%
+        {\rand\hatn{#2}{\gethat}}%
         {\hatn{#2}{\hatused}}%
     }{%
-        \ifthenelse{\equal{#1}{beret}}{\hatn{#2}{0}}{}%
-        \ifthenelse{\equal{#1}{santa}}{\hatn{#2}{1}}{}%
-        \ifthenelse{\equal{#1}{scottish}}{\hatn{#2}{2}}{}%
-        \ifthenelse{\equal{#1}{sombrero}}{\hatn{#2}{3}}{}%
-        \ifthenelse{\equal{#1}{witch}}{\hatn{#2}{4}}{}%
-        \ifthenelse{\equal{#1}{tophat}}{\hatn{#2}{5}}{}%
-        \ifthenelse{\equal{#1}{mlga}}{\hatn{#2}{6}}{}%
-        \ifthenelse{\equal{#1}{fez}}{\hatn{#2}{7}}{}%
-        \ifthenelse{\equal{#1}{cowboy}}{\hatn{#2}{8}}{}%
-        \ifthenelse{\equal{#1}{crown}}{\hatn{#2}{9}}{}%
+        \ifthenelse{\equal{#1}{beret}}{\hatn{#2}{beret}}{}%
+        \ifthenelse{\equal{#1}{santa}}{\hatn{#2}{santa}}{}%
+        \ifthenelse{\equal{#1}{sombrero}}{\hatn{#2}{sombrero}}{}%
+        \ifthenelse{\equal{#1}{witch}}{\hatn{#2}{witch}}{}%
+        \ifthenelse{\equal{#1}{tophat}}{\hatn{#2}{tophat}}{}%
+        \ifthenelse{\equal{#1}{mlga}}{\hatn{#2}{mlga}}{}%
+        \ifthenelse{\equal{#1}{fez}}{\hatn{#2}{fez}}{}%
+        \ifthenelse{\equal{#1}{cowboy}}{\hatn{#2}{cowboy}}{}%
+        \ifthenelse{\equal{#1}{crown}}{\hatn{#2}{crown}}{}%
+        \ifthenelse{\equal{#1}{dunce}}{\hatn{#2}{dunce}}{}%
     }%
 }
 
@@ -77,20 +92,21 @@
 
 \newcommand{\hatnoptions}[4]{%
 \setlength{\hshif}{1pt}
-\ifthenelse{\equal{#2}{0}}{\renewcommand\myhat{hats/realhats-beret}\setlength{\vshif}{-0.6ex} \setlength{\hshif}{0.5ex} }{}%
-\ifthenelse{\equal{#2}{1}}{\renewcommand\myhat{hats/realhats-santa}\setlength{\vshif}{-0.1ex} }{}%
-\ifthenelse{\equal{#2}{2}}{\renewcommand\myhat{hats/realhats-scottish}\setlength{\vshif}{-0.7ex} \setlength{\hshif}{0.6ex}}{}%
-\ifthenelse{\equal{#2}{3}}{\renewcommand\myhat{hats/realhats-sombrero}\setlength{\vshif}{-0.17ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{4}}{\renewcommand\myhat{hats/realhats-witch}\setlength{\vshif}{-0.12ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{5}}{\renewcommand\myhat{hats/realhats-tophat}\setlength{\vshif}{-0.6ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{6}}{\renewcommand\myhat{hats/realhats-makelatexgreatagain}\setlength{\vshif}{-0.6ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{7}}{\renewcommand\myhat{hats/realhats-fez}\setlength{\vshif}{-0.4ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{8}}{\renewcommand\myhat{hats/realhats-cowboy}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
-\ifthenelse{\equal{#2}{9}}{\renewcommand\myhat{hats/realhats-crown}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\setlength{\hatwidth}{2ex}
+\ifthenelse{\equal{#2}{beret}}{\renewcommand\myhat{hats/realhats-beret}\setlength{\vshif}{-0.6ex} \setlength{\hshif}{0.5ex} }{}%
+\ifthenelse{\equal{#2}{santa}}{\renewcommand\myhat{hats/realhats-santa}\setlength{\vshif}{-0.1ex} }{}%
+\ifthenelse{\equal{#2}{sombrero}}{\renewcommand\myhat{hats/realhats-sombrero}\setlength{\vshif}{-0.17ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{witch}}{\renewcommand\myhat{hats/realhats-witch}\setlength{\vshif}{-0.12ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{tophat}}{\renewcommand\myhat{hats/realhats-tophat}\setlength{\vshif}{-0.4ex} \setlength{\hatwidth}{1.8ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{mlga}}{\renewcommand\myhat{hats/realhats-makelatexgreatagain}\setlength{\vshif}{-0.6ex} \setlength{\hatwidth}{1.8ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{fez}}{\renewcommand\myhat{hats/realhats-fez}\setlength{\vshif}{-0.4ex} \setlength{\hatwidth}{1ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{cowboy}}{\renewcommand\myhat{hats/realhats-cowboy}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\ifthenelse{\equal{#2}{crown}}{\renewcommand\myhat{hats/realhats-crown}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\ifthenelse{\equal{#2}{dunce}}{\renewcommand\myhat{hats/realhats-dunce}\setlength{\vshif}{-0.3ex} \setlength{\hatwidth}{1.4ex}}{}%
 \addtolength{\hshif}{#3}%
 \addtolength{\vshif}{#4}%
 \stackMath %
-\stackon[\vshif]{#1}{\hspace{\hshif}\includegraphics[width=2ex]{\myhat}}
+\stackon[\vshif]{#1}{\hspace{\hshif}\includegraphics[width=\hatwidth]{\myhat}}
 }
 \endinput
 %%