[spec/methods] formatting fixes

diff --git a/methods/calculus.tex b/methods/calculus.tex
index 72b8bdbf1884c89160198dd2f9dba1b836bebe93..05bab2be0fadd4352cd7d2062f86a55a192ce9bb 100644 (file)
--- a/methods/calculus.tex
+++ b/methods/calculus.tex
@@ -53,8 +53,14 @@ Not differentiable at:
 (\(m_{{tan}} \cdot m_{\operatorname{norm}} = -1\))\\
 \textbf{Secant} \(={{f(x+h)-f(x)} \over h}\)
 
 (\(m_{{tan}} \cdot m_{\operatorname{norm}} = -1\))\\
 \textbf{Secant} \(={{f(x+h)-f(x)} \over h}\)
 

-\colorbox{cas}{On CAS:} \\ Action \(\rightarrow\) Calculation
-\(\rightarrow\) Line \(\rightarrow\) \texttt{tanLine} or \texttt{normal}
+\begin{cas}
+  \textbf{In main}: Interactive \(\rightarrow\) Calculation \(\rightarrow\) Line \\
+  \-\hspace{1em} \texttt{tanLine(f(x), x, p)} \\
+  \-\hspace{1em} \texttt{normal(f(x), x, p)} \\
+  where \texttt{p} is the \(x\)-value of the coordinate
+
+  \textbf{In graph}: define function, then Analysis \(\rightarrow\) Sketch \(\rightarrow\) (Normal \textbar{} Tan line). Type \(x\) value to solve for a point. Return to show equation for line.
+\end{cas}

 
 \subsection*{Strictly increasing/decreasing}
 
 
 \subsection*{Strictly increasing/decreasing}
 


@@ -67,15 +73,6 @@ For \(x_2\) and \(x_1\) where \(x_2 > x_1\):
   \item Endpoints are included, even where gradient \(=0\)
 \end{itemize}
 
   \item Endpoints are included, even where gradient \(=0\)
 \end{itemize}
 

-\begin{cas}
-  \colorbox{cas}{\textbf{In main}}: type function. Interactive
-  \(\rightarrow\) Calculation \(\rightarrow\) Line \(\rightarrow\) (Normal
-  \textbar{} Tan line)\\
-  \colorbox{cas}{\textbf{In graph}}: define function. Analysis
-  \(\rightarrow\) Sketch \(\rightarrow\) (Normal \textbar{} Tan line).
-  Type \(x\) value to solve for a point. Return to show equation for line.
-\end{cas}
-

 \subsection*{Stationary points}
 
 \begin{align*}
 \subsection*{Stationary points}
 
 \begin{align*}

diff --git a/methods/methods-collated.pdf b/methods/methods-collated.pdf
index 35e900eddb3c27d47ecc19c8f006267cf35a6eb8..6737a92da15778afc00115feb3b6ba902af4bdca 100644 (file)
Binary files a/methods/methods-collated.pdf and b/methods/methods-collated.pdf differ

diff --git a/methods/methods-collated.tex b/methods/methods-collated.tex
index 4a0403a6248f93e03ae0378cc2e6c106cda9b30e..b7accd12f1a571031926ac971b9abe565108ed05 100644 (file)
--- a/methods/methods-collated.tex
+++ b/methods/methods-collated.tex
@@ -7,9 +7,10 @@
 \usepackage{dblfloatfix}
 \usepackage{enumitem}
 \usepackage{fancyhdr}
 \usepackage{dblfloatfix}
 \usepackage{enumitem}
 \usepackage{fancyhdr}

-\usepackage[a4paper,margin=2cm]{geometry}
+\usepackage[a4paper,margin=1.8cm]{geometry}

 \usepackage{graphicx}
 \usepackage{harpoon}
 \usepackage{graphicx}
 \usepackage{harpoon}

+\usepackage{keystroke}

 \usepackage{listings}
 \usepackage{makecell}
 \usepackage{mathtools}
 \usepackage{listings}
 \usepackage{makecell}
 \usepackage{mathtools}


@@ -96,8 +97,8 @@
 \definecolor{peach}{HTML}{e6beb2}
 \definecolor{lblue}{HTML}{e5e9f0}
 
 \definecolor{peach}{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}
+\newtcolorbox{cas}{colframe=cas!75!black, fonttitle=\sffamily\bfseries, title=On CAS, left*=3mm}
+\newtcolorbox{warning}{colback=white!90!black, leftrule=3mm, colframe=important, coltext=darkgray, fontupper=\sffamily\bfseries}

 \newtcolorbox{theorembox}[1]{colback=green!10!white, colframe=blue!20!white, coltitle=black, fontupper=\sffamily, fonttitle=\sffamily, #1}
 
 
 \newtcolorbox{theorembox}[1]{colback=green!10!white, colframe=blue!20!white, coltitle=black, fontupper=\sffamily, fonttitle=\sffamily, #1}
 
 


@@ -121,15 +122,11 @@
 \subsection*{One to one functions}
 
 \begin{itemize} \tightlist
 \subsection*{One to one functions}
 
 \begin{itemize} \tightlist

-  \item
-    \(f(x)\) is \emph{one to one} if \(f(a) \ne f(b)\) if
-    \(a, b \in \operatorname{dom}(f)\) and \(a \ne b\)\\
-    \(\implies\) unique \(y\) for each \(x\) (\(\sin x\) is not 1:1,
-    \(x^3\) is)
-  \item
-    horizontal line test
-  \item
-    if not one to one, it is many to one
+  \item \(f(x)\) is 1:1 if \(f(a) \ne f(b) \> \forall \>\{a,b\} \in \operatorname{dom}(f)\) \\
+        \(\implies\) unique \(y\) for each \(x\)
+  \item e.g. \(\sin x\) is not 1:1, \(x^3\) is
+  \item horizontal line test
+  \item if not one to one, it is many to one

 \end{itemize}
 
 \subsection*{Odd and even functions}
 \end{itemize}
 
 \subsection*{Odd and even functions}


@@ -258,8 +255,10 @@ For \(x^n\), parity of \(n \equiv\) parity of function
       \begin{figure*}[ht]
         \centering
 
       \begin{figure*}[ht]
         \centering
 

-        \begin{tabularx}{\textwidth}{r|Y|Y}
+        \begin{tabularx}{\textwidth}{|r|Y|Y|}

 
 

+          \hline
+          \rowcolor{lblue}

           & \(n\) is even & \(n\) is odd \\ \hline
 
           \centering \(x^n, n \in \mathbb{Z}^+\) & 
           & \(n\) is even & \(n\) is odd \\ \hline
 
           \centering \(x^n, n \in \mathbb{Z}^+\) & 

diff --git a/methods/statistics-ref.tex b/methods/statistics-ref.tex
index 87319996ce78586398711d71132ff817f9babf6d..ec728d8e52d0c226f98e1b1a3ae8e4459e6c6a38 100644 (file)
--- a/methods/statistics-ref.tex
+++ b/methods/statistics-ref.tex
@@ -24,11 +24,17 @@ Independent events:
 
 \subsection*{Combinatorics}
 
 
 \subsection*{Combinatorics}
 

-\begin{itemize} \tightlist
-  \item Arrangements \({n \choose k} = \frac{n!}{(n-k)}\)
-  \item \colorbox{highlight}{Combinations} \({n \choose k} = \frac{n!}{k!(n-k)!}\)
-  \item Note \({n \choose k} = {n \choose k-1}\)
-\end{itemize}
+\begin{align*}
+  \text{Arrangements} && {n \choose k} & = \frac{n!}{(n-k)} \\
+  \text{Combinations} && {n \choose k} & = \frac{n!}{k!(n-k)!}
+\end{align*}
+
+Note \({n \choose k} = {n \choose k-1}\)
+
+\begin{cas}
+  Keyboard \(\rightarrow\) Advance \(\rightarrow\) \keystroke{nCr}/\keystroke{nPr} \\
+  \-\hspace{1em} \texttt{nCr(n, r)} or \texttt{nPr(n, r)}
+\end{cas}

 
 \subsection*{Distributions}
 
 
 \subsection*{Distributions}
 

diff --git a/methods/transformations.tex b/methods/transformations.tex
index 00428e3ac84f325d0db94eec90b4a4f790a325b8..96b520aec5aaa1bed088249388dc506dc601cb80 100644 (file)
--- a/methods/transformations.tex
+++ b/methods/transformations.tex
@@ -17,12 +17,11 @@
 \item
   if \(a<0\), graph is reflected over \(x\)-axis
 \item
 \item
   if \(a<0\), graph is reflected over \(x\)-axis
 \item

-  translation of \(k\) units parallel to \(y\)-axis or from \(x\)-axis
+  translation of \(k\) units \(\parallel y\)-axis/from \(x\)-axis

 \item
 \item

-  translation of \(h\) units parallel to \(x\)-axis or from \(y\)-axis
+  translation of \(h\) units \(\parallel x\)-axis/from \(y\)-axis

 \item
 \item

-  for \((ax)^n\), dilation factor is \(1 \over a\) parallel to
-  \(x\)-axis or from \(y\)-axis
+  for \((ax)^n\), dilation factor is \(1 \over a \> \parallel x\)-axis/from \(y\)-axis

 \item
   when \(0 < |a| < 1\), graph becomes closer to axis
 \end{itemize}
 \item
   when \(0 < |a| < 1\), graph becomes closer to axis
 \end{itemize}

diff --git a/spec/spec-collated.pdf b/spec/spec-collated.pdf
index 7b998a92be779cb72a149b61be13c27b80ef4a20..1a674192724f96f6140f8f7b6ef89768db68d21e 100644 (file)
Binary files a/spec/spec-collated.pdf and b/spec/spec-collated.pdf differ

diff --git a/spec/spec-collated.tex b/spec/spec-collated.tex
index 94d61876d683d0dd35373e447df8d2f1ff0f4207..e084adbe3b00bfbf96abe5203c14a0d184bcbb29 100644 (file)
--- a/spec/spec-collated.tex
+++ b/spec/spec-collated.tex
@@ -1,5 +1,6 @@
 \documentclass[a4paper]{article}
 \usepackage[dvipsnames, table]{xcolor}
 \documentclass[a4paper]{article}
 \usepackage[dvipsnames, table]{xcolor}

+\usepackage{adjustbox}

 \usepackage{amsmath}
 \usepackage{amssymb}
 \usepackage{array}
 \usepackage{amsmath}
 \usepackage{amssymb}
 \usepackage{array}


@@ -7,7 +8,7 @@
 \usepackage{dblfloatfix}
 \usepackage{enumitem}
 \usepackage{fancyhdr}
 \usepackage{dblfloatfix}
 \usepackage{enumitem}
 \usepackage{fancyhdr}

-\usepackage[a4paper,margin=2cm]{geometry}
+\usepackage[a4paper,margin=1.8cm]{geometry}

 \usepackage{graphicx}
 \usepackage{harpoon}
 \usepackage{hhline}
 \usepackage{graphicx}
 \usepackage{harpoon}
 \usepackage{hhline}


@@ -52,11 +53,11 @@
 \usepgflibrary{arrows.meta}
 \pgfplotsset{compat=1.16}
 \pgfplotsset{every axis/.append style={
 \usepgflibrary{arrows.meta}
 \pgfplotsset{compat=1.16}
 \pgfplotsset{every axis/.append style={

-  axis x line=middle,    % put the x axis in the middle
-  axis y line=middle,    % put the y axis in the middle
-  axis line style={->}, % arrows on the axis
-  xlabel={$x$},          % default put x on x-axis
-  ylabel={$y$},          % default put y on y-axis
+  axis x line=middle,
+  axis y line=middle,
+  axis line style={->},
+  xlabel={$x$},
+  ylabel={$y$},

 }}
 
 \psset{dimen=monkey,fillstyle=solid,opacity=.5}
 }}
 
 \psset{dimen=monkey,fillstyle=solid,opacity=.5}


@@ -81,6 +82,7 @@
 
 \newcolumntype{L}[1]{>{\hsize=#1\hsize\raggedright\arraybackslash}X}%
 \newcolumntype{R}[1]{>{\hsize=#1\hsize\raggedleft\arraybackslash}X}%
 
 \newcolumntype{L}[1]{>{\hsize=#1\hsize\raggedright\arraybackslash}X}%
 \newcolumntype{R}[1]{>{\hsize=#1\hsize\raggedleft\arraybackslash}X}%

+\newcolumntype{Y}{>{\centering\arraybackslash}X}

 
 \definecolor{cas}{HTML}{e6f0fe}
 \definecolor{important}{HTML}{fc9871}
 
 \definecolor{cas}{HTML}{e6f0fe}
 \definecolor{important}{HTML}{fc9871}


@@ -876,13 +878,25 @@
                   \emph{Point of inflection} - max \(|\)gradient\(|\) (i.e.
                   \(f^{\prime\prime} = 0\))
 
                   \emph{Point of inflection} - max \(|\)gradient\(|\) (i.e.
                   \(f^{\prime\prime} = 0\))
 

+                  \subsubsection*{Strictly increasing/decreasing}
+
+                  For \(x_2\) and \(x_1\) where \(x_2 > x_1\):
+
+                  \textbf{Strictly increasing}\\
+                  \hspace{1em}where \(f(x_2) > f(x_1)\) or \(f^\prime(x)>0\)
+                  \textbf{strictly decreasing}\\
+                  \hspace{1em}where \(f(x_2) < f(x_1)\) or \(f^\prime(x)<0\)
+                  \begin{warning}
+                    Endpoints are included, even where gradient \(=0\)
+                  \end{warning}
+

 
                   \begin{table*}[ht]
                     \centering
 
                   \begin{table*}[ht]
                     \centering

-                    \begin{tabularx}{\textwidth}{rXXX}
+                    \begin{tabularx}{\textwidth}{rYYY}

                       \hline
                       \rowcolor{shade2}
                       \hline
                       \rowcolor{shade2}

-                      & \centering\(\dfrac{d^2 y}{dx^2} > 0\)  & \centering \(\dfrac{d^2y}{dx^2}<0\) & \(\dfrac{d^2y}{dx^2}=0\) (inflection) \\[1.5em]
+                      & \adjustbox{margin=0 1ex, valign=m}{\centering\(\dfrac{d^2 y}{dx^2} > 0\)}  & \adjustbox{margin=0 1ex, valign=m}{\centering \(\dfrac{d^2y}{dx^2}<0\)} & \adjustbox{margin=0 1ex, valign=m}{\(\dfrac{d^2y}{dx^2}=0\) (inflection)} \\

                       \hline
                       \(\dfrac{dy}{dx}>0\) &
                       \makecell{\\\begin{tikzpicture}\begin{axis}[axis x line=none, axis y line=none, xmin=-3,  xmax=0.8, scale=0.2, samples=50, unbounded coords=jump] \addplot[blue] {(e^(x)};  \addplot[red] {x/2.5+0.75}; \end{axis}\end{tikzpicture} \\Rising (concave up)}&
                       \hline
                       \(\dfrac{dy}{dx}>0\) &
                       \makecell{\\\begin{tikzpicture}\begin{axis}[axis x line=none, axis y line=none, xmin=-3,  xmax=0.8, scale=0.2, samples=50, unbounded coords=jump] \addplot[blue] {(e^(x)};  \addplot[red] {x/2.5+0.75}; \end{axis}\end{tikzpicture} \\Rising (concave up)}&