[methods] clean up

diff --git a/methods/methods-collated.tex b/methods/methods-collated.tex
index b0641308c27af5346bcda07e675f0124b9def6ef..42fac1dab4a6d55093b8209e31129b76ca7e9b40 100644 (file)
--- a/methods/methods-collated.tex
+++ b/methods/methods-collated.tex
@@ -4,15 +4,16 @@
 \usepackage{amsmath}
 \usepackage{amssymb}
 \usepackage{blindtext}
+\usepackage{dblfloatfix}
 \usepackage{enumitem}
 \usepackage{fancyhdr}
 \usepackage[a4paper,margin=2cm]{geometry}
 \usepackage{graphicx}
 \usepackage{harpoon}
 \usepackage{listings}
-\usepackage{longtable}
 \usepackage{makecell}
 \usepackage{mathtools}
+\usepackage{mathtools}
 \usepackage{multicol}
 \usepackage{multirow}
 \usepackage{newclude}
@@ -32,17 +33,30 @@
 
 \usetikzlibrary{%
   angles,
+  arrows,
+  arrows.meta,
   calc,
   datavisualization.formats.functions,
   decorations,
   decorations.markings,
+  decorations.text,
   decorations.pathreplacing,
   decorations.text,
   scopes
 }
+
 \newcommand{\midarrow}{\tikz \draw[-triangle 90] (0,0) -- +(.1,0);}
+
 \usepgflibrary{arrows.meta}
-\pgfplotsset{compat=1.6}
+\pgfplotsset{compat=1.16}
+\pgfplotsset{every axis/.append style={
+  axis x line=middle,    % centre axes
+  axis y line=middle,
+  axis line style={->},  % arrows on axes
+  xlabel={$x$},          % axes labels
+  ylabel={$y$}
+}}
+
 \psset{dimen=monkey,fillstyle=solid,opacity=.5}
 \def\object{%
     \psframe[linestyle=none,fillcolor=blue](-2,-1)(2,1)
@@ -51,29 +65,23 @@
         \psline{->}(0,-2)%
         \uput[-90]{*0}(0,-2){$\vec{w}$}}
 }
-\newcommand{\tg}{\mathop{\mathrm{tg}}}
-\newcommand{\cotg}{\mathop{\mathrm{cotg}}}
-\newcommand{\arctg}{\mathop{\mathrm{arctg}}}
-\newcommand{\arccotg}{\mathop{\mathrm{arccotg}}}
-\pgfplotsset{every axis/.append style={
-  axis x line=middle,    % centre axes
-  axis y line=middle,
-  axis line style={->},  % arrows on axes
-  xlabel={$x$},          % axes labels
-  ylabel={$y$}
-}}
 
 \pagestyle{fancy}
 \fancyhead[LO,LE]{Year 12 Methods}
 \fancyhead[CO,CE]{Andrew Lorimer}
 \fancypagestyle{plain}{\fancyhead[LO,LE]{} \fancyhead[CO,CE]{}} % rm title & author for first page
 
+\newcommand{\tg}{\mathop{\mathrm{tg}}}
+\newcommand{\cotg}{\mathop{\mathrm{cotg}}}
+\newcommand{\arctg}{\mathop{\mathrm{arctg}}}
+\newcommand{\arccotg}{\mathop{\mathrm{arccotg}}}
+
 \providecommand{\tightlist}{\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
+\newcommand*\leftlap[3][\,]{#1\hphantom{#2}\mathllap{#3}}
+\newcommand*\rightlap[2]{\mathrlap{#2}\hphantom{#1}}
 \linespread{1.5}
 \setlength{\parindent}{0cm}
 \setlength\fboxsep{0pt} \setlength\fboxrule{.2pt} % for the \fboxes
-\newcommand*\leftlap[3][\,]{#1\hphantom{#2}\mathllap{#3}}
-\newcommand*\rightlap[2]{\mathrlap{#2}\hphantom{#1}}
 
 \newcolumntype{L}[1]{>{\hsize=#1\hsize\raggedright\arraybackslash}X}
 \newcolumntype{R}[1]{>{\hsize=#1\hsize\raggedleft\arraybackslash}X}
@@ -82,9 +90,8 @@
 \definecolor{cas}{HTML}{e6f0fe}
 \definecolor{important}{HTML}{fc9871}
 \definecolor{dark-gray}{gray}{0.2}
-\definecolor{shade1}{HTML}{ffffff}
-\definecolor{shade2}{HTML}{e6f2ff}
-\definecolor{shade3}{HTML}{cce2ff}
+\definecolor{orange}{HTML}{e6beb2}
+\definecolor{lblue}{HTML}{e5e9f0}
 
 \newtcolorbox{cas}{colframe=cas!75!black, title=On CAS, left*=3mm}
 \newtcolorbox{warning}{colback=white!90!black, leftrule=3mm, colframe=important, coltext=important, fontupper=\sffamily\bfseries}