Merge template changes

They seemed reasonable to take from this document to the template (and
back).

tex/header/stdmath.sty

@@ -51,8 +51,16 @@
 \ProcessOptions\relax
 
 \ifopt@pics\RequirePackage{graphicx}\fi
-\ifopt@tikz\RequirePackage{tikz}\RequirePackage{tikz-cd}\RequirePackage{pgfplots}\fi
-\ifopt@script\RequirePackage{mathrsfs}\newcommand{\scr}[1]{\mathscr{#1}}\fi % for script A (sigma-Algebra-A)
+\ifopt@tikz%
+  \RequirePackage{tikz}%
+  \RequirePackage{tikz-cd}%
+  \RequirePackage{pgfplots}%
+  \pgfplotsset{compat=1.18}% mentioned in a warning, should remove it
+\fi
+\ifopt@script%
+  \RequirePackage{mathrsfs}%
+  \newcommand{\scr}[1]{\mathscr{#1}}
+\fi % for script A (sigma-Algebra-A)
 
 % ---------
 % Packages