diff options
Diffstat (limited to 'macros/latex/contrib/realhats')
24 files changed, 70 insertions, 51 deletions
diff --git a/macros/latex/contrib/realhats/README.md b/macros/latex/contrib/realhats/README.md index 41c09d5fc9..b9b4adc5f5 100644 --- a/macros/latex/contrib/realhats/README.md +++ b/macros/latex/contrib/realhats/README.md @@ -13,13 +13,16 @@ Regretfully brought into the world by [Matthew Scroggs](https://github.com/mscro  ## 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/macros/latex/contrib/realhats/hats/realhats-beret.pdf b/macros/latex/contrib/realhats/hats/realhats-beret.pdf Binary files differnew file mode 100644 index 0000000000..da16354b97 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-beret.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-beret.png b/macros/latex/contrib/realhats/hats/realhats-beret.png Binary files differdeleted file mode 100644 index 238d2a0ce0..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-beret.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-cowboy.pdf b/macros/latex/contrib/realhats/hats/realhats-cowboy.pdf Binary files differnew file mode 100644 index 0000000000..8499ab5d38 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-cowboy.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-cowboy.png b/macros/latex/contrib/realhats/hats/realhats-cowboy.png Binary files differdeleted file mode 100644 index 32ba5646b3..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-cowboy.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-crown.pdf b/macros/latex/contrib/realhats/hats/realhats-crown.pdf Binary files differnew file mode 100644 index 0000000000..4505175117 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-crown.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-crown.png b/macros/latex/contrib/realhats/hats/realhats-crown.png Binary files differdeleted file mode 100644 index b250db4ac0..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-crown.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-dunce.pdf b/macros/latex/contrib/realhats/hats/realhats-dunce.pdf Binary files differnew file mode 100644 index 0000000000..325b6b5320 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-dunce.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-fez.pdf b/macros/latex/contrib/realhats/hats/realhats-fez.pdf Binary files differnew file mode 100644 index 0000000000..c8efd2de87 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-fez.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-fez.png b/macros/latex/contrib/realhats/hats/realhats-fez.png Binary files differdeleted file mode 100644 index 1efb0bd181..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-fez.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-makelatexgreatagain.pdf b/macros/latex/contrib/realhats/hats/realhats-makelatexgreatagain.pdf Binary files differnew file mode 100644 index 0000000000..a755199328 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-makelatexgreatagain.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-makelatexgreatagain.png b/macros/latex/contrib/realhats/hats/realhats-makelatexgreatagain.png Binary files differdeleted file mode 100644 index 71c7bc61b6..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-makelatexgreatagain.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-santa.pdf b/macros/latex/contrib/realhats/hats/realhats-santa.pdf Binary files differnew file mode 100644 index 0000000000..c33db2c98a --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-santa.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-santa.png b/macros/latex/contrib/realhats/hats/realhats-santa.png Binary files differdeleted file mode 100644 index 3b79c7030f..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-santa.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-scottish.png b/macros/latex/contrib/realhats/hats/realhats-scottish.png Binary files differdeleted file mode 100644 index 6f4cc15123..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-scottish.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-sombrero.pdf b/macros/latex/contrib/realhats/hats/realhats-sombrero.pdf Binary files differnew file mode 100644 index 0000000000..fa7b639cfa --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-sombrero.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-sombrero.png b/macros/latex/contrib/realhats/hats/realhats-sombrero.png Binary files differdeleted file mode 100644 index a84cf37e0a..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-sombrero.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-tophat.pdf b/macros/latex/contrib/realhats/hats/realhats-tophat.pdf Binary files differnew file mode 100644 index 0000000000..64c3846962 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-tophat.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-tophat.png b/macros/latex/contrib/realhats/hats/realhats-tophat.png Binary files differdeleted file mode 100644 index c861e34b56..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-tophat.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/hats/realhats-witch.pdf b/macros/latex/contrib/realhats/hats/realhats-witch.pdf Binary files differnew file mode 100644 index 0000000000..b875929a74 --- /dev/null +++ b/macros/latex/contrib/realhats/hats/realhats-witch.pdf diff --git a/macros/latex/contrib/realhats/hats/realhats-witch.png b/macros/latex/contrib/realhats/hats/realhats-witch.png Binary files differdeleted file mode 100644 index abcafa1030..0000000000 --- a/macros/latex/contrib/realhats/hats/realhats-witch.png +++ /dev/null diff --git a/macros/latex/contrib/realhats/readme_images/hats.png b/macros/latex/contrib/realhats/readme_images/hats.png Binary files differindex 5a99019bc7..74f159bdca 100644 --- a/macros/latex/contrib/realhats/readme_images/hats.png +++ b/macros/latex/contrib/realhats/readme_images/hats.png diff --git a/macros/latex/contrib/realhats/realhats.dtx b/macros/latex/contrib/realhats/realhats.dtx index 7380964e14..ac9d20c452 100644 --- a/macros/latex/contrib/realhats/realhats.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/realhats/realhats.pdf b/macros/latex/contrib/realhats/realhats.pdf Binary files differindex 4dec61a7dc..0600bb2b10 100644 --- a/macros/latex/contrib/realhats/realhats.pdf +++ b/macros/latex/contrib/realhats/realhats.pdf |
