merge server changes (basecampleft list and therion protractors).

Add 1:400 therion protractor.

documents/therionprotractors/Makefile

@@ -0,0 +1,32 @@
+all: therionpage250.pdf therionpage400.pdf therionpage500.pdf
+
+#If using windows uncomment this
+#LATEXTOOL=pdflatex.exe
+#If using linux or macos(?) uncomment this
+LATEXTOOL=pdflatex
+
+therionpage250.pdf: therionpage250.tex therionprotractor250.tex
+	$(LATEXTOOL) therionpage250.tex
+
+therionpage400.pdf: therionpage400.tex therionprotractor400.tex
+	$(LATEXTOOL) therionpage400.tex
+
+therionpage500.pdf: therionpage500.tex therionprotractor500.tex
+	$(LATEXTOOL) therionpage500.tex
+
+cleanpage250:
+	rm -f therionpage250.aux
+	rm -f therionpage250.log
+	rm -f therionpage250.pdf
+
+cleanpage400:
+	rm -f therionpage400.aux
+	rm -f therionpage400.log
+	rm -f therionpage400.pdf
+
+cleanpage500:
+	rm -f therionpage500.aux
+	rm -f therionpage500.log
+	rm -f therionpage500.pdf
+
+clean: cleanpage250 cleanpage400 cleanpage500

documents/therionprotractors/therionpage250.tex

@@ -0,0 +1,27 @@
+\documentclass[12pt,a4paper]{article}
+
+% packages
+\usepackage{tikz}
+\usepackage[outline]{contour}
+\usepackage{standalone}
+\usepackage[margin=10mm]{geometry}
+
+\begin{document}
+\begin{figure}
+\centering
+\begin{tikzpicture}
+
+\pgfmathsetmacro{\xdist}{8.5}
+\pgfmathsetmacro{\ydist}{4.5}
+
+\foreach \xval in {1,2}
+{
+	\foreach \yval in {1,2,...,6}
+	{
+		\node at (\xval*\xdist,\yval*\ydist) {\input{therionprotractor250.tex}};
+	}
+}
+
+\end{tikzpicture}
+\end{figure}
+\end{document}

documents/therionprotractors/therionpage400.tex

@@ -0,0 +1,27 @@
+\documentclass[12pt,a4paper]{article}
+
+% packages
+\usepackage{tikz}
+\usepackage[outline]{contour}
+\usepackage{standalone}
+\usepackage[margin=10mm]{geometry}
+
+\begin{document}
+\begin{figure}
+\centering
+\begin{tikzpicture}
+
+\pgfmathsetmacro{\xdist}{8.5}
+\pgfmathsetmacro{\ydist}{4.5}
+
+\foreach \xval in {1,2}
+{
+	\foreach \yval in {1,2,...,6}
+	{
+		\node at (\xval*\xdist,\yval*\ydist) {\input{therionprotractor400.tex}};
+	}
+}
+
+\end{tikzpicture}
+\end{figure}
+\end{document}

documents/therionprotractors/therionpage500.tex

@@ -1,11 +1,14 @@
-\documentclass[12pt]{standalone}
+\documentclass[12pt,a4paper]{article}
 
 % packages
 \usepackage{tikz}
 \usepackage[outline]{contour}
 \usepackage{standalone}
+\usepackage[margin=10mm]{geometry}
 
 \begin{document}
+\begin{figure}
+\centering
 \begin{tikzpicture}
 
 \pgfmathsetmacro{\xdist}{8.5}
@@ -13,11 +16,12 @@
 
 \foreach \xval in {1,2}
 {
-	\foreach \yval in {1,2,...,5}
+	\foreach \yval in {1,2,...,6}
 	{
-		\node at (\xval*\xdist,\yval*\ydist) {\input{therionprotractor.tex}};
+		\node at (\xval*\xdist,\yval*\ydist) {\input{therionprotractor500.tex}};
 	}
 }
 
 \end{tikzpicture}
+\end{figure}
 \end{document}

documents/therionprotractors/therionprotractor400.tex

@@ -0,0 +1,189 @@
+% ********************************************************************************
+% Creates a therion protractor of set size and scale
+% ********************************************************************************
+
+\documentclass[12pt,border=0pt]{standalone}
+
+% packages
+\usepackage{tikz}
+\usepackage[outline]{contour}
+
+\begin{document}
+\begin{tikzpicture}[scale=1]
+
+\contourlength{1.2pt}
+
+% ********************************************************************************
+% Set the coordinates and dimensions to draw from
+% ********************************************************************************
+
+% Origin
+\coordinate (O) at (0,0);
+
+% Size and scale of the protractor
+\pgfmathsetmacro{\scaleto}{400}			% 1:scaleto
+\pgfmathsetmacro{\radius}{16}			% size in meters
+\pgfmathsetmacro{\majordivision}{2}		% size in meters
+\pgfmathsetmacro{\minordivision}{1}	% size in meters
+
+% Size of the text numbers
+\newcommand{\textsize}{\tiny}
+
+% Intrinisc dimensions and conversion factors
+\pgfmathsetmacro{\convert}{100}			% conversion from meters to centimeters
+\pgfmathsetmacro{\mintick}{0.1}			% size in centimeters
+\pgfmathsetmacro{\majtick}{0.2}			% size in centimeters
+\pgfmathsetmacro{\minradii}{0.5}		% fractional radius where dotted radial lines start
+\pgfmathsetmacro{\minradiiend}{1-\minradii}	% remainder
+
+% Size and scale of the drawing
+\pgfmathsetmacro{\rad}{\radius*\convert/\scaleto}
+\pgfmathsetmacro{\majdiv}{\majordivision*\convert/\scaleto}
+\pgfmathsetmacro{\mindiv}{\minordivision*\convert/\scaleto}
+
+% Slightly reduced radii for the scale bar
+\pgfmathsetmacro{\radscale}{\rad-\mindiv}
+
+
+% ********************************************************************************
+% Draw the foreshortening lines
+% ********************************************************************************
+
+% Vertical lines
+\foreach \var in {0,\mindiv,...,\radscale}
+{
+	\draw[gray] (O) ++ (\var,0) -- ++ (0,\rad);
+	\draw[gray] (O) ++ (-\var,0) -- ++ (0,\rad);
+}
+
+% White out the excess length
+\draw[thick,white,fill=white] (O) ++ (\rad,0) arc(0:180:\rad) -- ++ (0,\rad) -- ++ (2*\rad,0) -- cycle;
+
+
+% ********************************************************************************
+% Draw the circumcircles
+% ********************************************************************************
+
+\foreach \var in {0,\mindiv,...,\rad}
+{
+	\draw[gray] (O) ++ (\var,0) arc (0:180:\var);
+}
+
+
+% ********************************************************************************
+% Draw the radii
+% ********************************************************************************
+
+\foreach \theta in {10,40,...,160}
+{
+	\draw[green] (O) ++ (\theta:\mindiv) -- ++ (\theta:\radscale);
+}
+
+\foreach \theta in {20,50,...,170}
+{
+	\draw[purple] (O) ++ (\theta:\mindiv) -- ++ (\theta:\radscale);
+}
+
+\foreach \theta in {30,60,...,150}
+{
+	\draw[black] (O) ++ (\theta:\mindiv) -- ++ (\theta:\radscale);
+}
+
+\foreach \theta in {5,15,...,175}
+{
+	\draw[black,dotted] (O) ++ (\theta:\minradii*\rad) -- ++ (\theta:\minradiiend*\rad);
+}
+
+
+% ********************************************************************************
+% Draw the angular scale
+% ********************************************************************************
+
+\foreach \theta in {1,2,...,179}
+{
+	\draw[black,thick] (O) ++ (\theta:\rad) -- ++ (\theta:-\mintick);
+}
+
+\foreach \theta in {5,10,...,175}
+{
+	\draw[black,thick] (O) ++ (\theta:\rad) -- ++ (\theta:-\majtick);
+}
+
+
+% ********************************************************************************
+% Draw the linear scale
+% ********************************************************************************
+
+
+\foreach \var in {0,\mindiv,...,\radscale}
+{
+	\draw[black,thick] (O) ++ (\var,0) -- ++ (0,\mintick);
+	\draw[black,thick] (O) ++ (-\var,0) -- ++ (0,\mintick);
+}
+
+
+
+% ********************************************************************************
+% Draw the outline
+% ********************************************************************************
+
+\draw[black,thick] (O) ++ (\rad,0) arc (0:180:\rad) -- cycle;
+\draw[black,thick] (O) -- ++ (0,\majtick);
+
+
+% ********************************************************************************
+% Draw the angle numbers
+% ********************************************************************************
+
+\foreach \theta in {10,20,...,80}
+{
+	\pgfmathsetmacro{\thetaopposite}{\theta+180}
+	
+	\draw[black] (O) ++ (\theta:\rad) -- ++ (\theta:-\majtick) node[anchor=south,near start,sloped,rotate=90,text=black] {
+		\textsize
+		\begin{tabular}{c}
+			\contour{white}{\pgfmathprintnumber{\theta}}\\
+			\contour{white}{\pgfmathprintnumber{\thetaopposite}}
+		\end{tabular}
+	};
+}
+
+\foreach \theta in {90,100,...,170}
+{
+	\pgfmathsetmacro{\thetaopposite}{\theta+180}
+	
+	\draw[black] (O) ++ (\theta:\rad) -- ++ (\theta:-\majtick) node[anchor=south,near start,sloped,rotate=-90,text=black] {
+		\textsize
+		\begin{tabular}{c}
+			\contour{white}{\pgfmathprintnumber{\theta}}\\
+			\contour{white}{\pgfmathprintnumber{\thetaopposite}}
+		\end{tabular}
+	};
+};
+
+
+% ********************************************************************************
+% Draw the linear numbers
+% ********************************************************************************
+
+\pgfmathsetmacro{\labmax}{\radius-\majordivision}
+\pgfmathsetmacro{\labsecond}{\majordivision+\majordivision}
+
+\foreach \var in {\majordivision,\labsecond,...,\labmax}
+{
+	\pgfmathsetmacro{\varpos}{\var*\convert/\scaleto}
+	
+	\draw[black,thick] (O) ++ (\varpos,0) -- ++ (0,\mintick) node [above=-2pt] {\contour{white}{\textsize\pgfmathprintnumber{\var}}};
+	\draw[black,thick] (O) ++ (-\varpos,0) -- ++ (0,\mintick) node [above=-2pt] {\contour{white}{\textsize\pgfmathprintnumber{\var}}};
+}
+
+
+% ********************************************************************************
+% Draw the scale number
+% ********************************************************************************
+
+\draw[black] (O) ++ (0,\rad/3) -- ++ (0,\rad/3) node [midway,anchor=center,sloped,text=black] {\contour{white}{\textsize $1$:\pgfmathprintnumber{\scaleto}}};
+
+
+\end{tikzpicture}
+\end{document}

documents/therionprotractors/therionprotractor500.tex

@@ -0,0 +1,189 @@
+% ********************************************************************************
+% Creates a therion protractor of set size and scale
+% ********************************************************************************
+
+\documentclass[12pt,border=0pt]{standalone}
+
+% packages
+\usepackage{tikz}
+\usepackage[outline]{contour}
+
+\begin{document}
+\begin{tikzpicture}[scale=1]
+
+\contourlength{1.2pt}
+
+% ********************************************************************************
+% Set the coordinates and dimensions to draw from
+% ********************************************************************************
+
+% Origin
+\coordinate (O) at (0,0);
+
+% Size and scale of the protractor
+\pgfmathsetmacro{\scaleto}{500}			% 1:scaleto
+\pgfmathsetmacro{\radius}{20}			% size in meters
+\pgfmathsetmacro{\majordivision}{2}		% size in meters
+\pgfmathsetmacro{\minordivision}{1}	% size in meters
+
+% Size of the text numbers
+\newcommand{\textsize}{\tiny}
+
+% Intrinisc dimensions and conversion factors
+\pgfmathsetmacro{\convert}{100}			% conversion from meters to centimeters
+\pgfmathsetmacro{\mintick}{0.1}			% size in centimeters
+\pgfmathsetmacro{\majtick}{0.2}			% size in centimeters
+\pgfmathsetmacro{\minradii}{0.5}		% fractional radius where dotted radial lines start
+\pgfmathsetmacro{\minradiiend}{1-\minradii}	% remainder
+
+% Size and scale of the drawing
+\pgfmathsetmacro{\rad}{\radius*\convert/\scaleto}
+\pgfmathsetmacro{\majdiv}{\majordivision*\convert/\scaleto}
+\pgfmathsetmacro{\mindiv}{\minordivision*\convert/\scaleto}
+
+% Slightly reduced radii for the scale bar
+\pgfmathsetmacro{\radscale}{\rad-\mindiv}
+
+
+% ********************************************************************************
+% Draw the foreshortening lines
+% ********************************************************************************
+
+% Vertical lines
+\foreach \var in {0,\mindiv,...,\radscale}
+{
+	\draw[gray] (O) ++ (\var,0) -- ++ (0,\rad);
+	\draw[gray] (O) ++ (-\var,0) -- ++ (0,\rad);
+}
+
+% White out the excess length
+\draw[thick,white,fill=white] (O) ++ (\rad,0) arc(0:180:\rad) -- ++ (0,\rad) -- ++ (2*\rad,0) -- cycle;
+
+
+% ********************************************************************************
+% Draw the circumcircles
+% ********************************************************************************
+
+\foreach \var in {0,\mindiv,...,\rad}
+{
+	\draw[gray] (O) ++ (\var,0) arc (0:180:\var);
+}
+
+
+% ********************************************************************************
+% Draw the radii
+% ********************************************************************************
+
+\foreach \theta in {10,40,...,160}
+{
+	\draw[green] (O) ++ (\theta:\mindiv) -- ++ (\theta:\radscale);
+}
+
+\foreach \theta in {20,50,...,170}
+{
+	\draw[purple] (O) ++ (\theta:\mindiv) -- ++ (\theta:\radscale);
+}
+
+\foreach \theta in {30,60,...,150}
+{
+	\draw[black] (O) ++ (\theta:\mindiv) -- ++ (\theta:\radscale);
+}
+
+\foreach \theta in {5,15,...,175}
+{
+	\draw[black,dotted] (O) ++ (\theta:\minradii*\rad) -- ++ (\theta:\minradiiend*\rad);
+}
+
+
+% ********************************************************************************
+% Draw the angular scale
+% ********************************************************************************
+
+\foreach \theta in {1,2,...,179}
+{
+	\draw[black,thick] (O) ++ (\theta:\rad) -- ++ (\theta:-\mintick);
+}
+
+\foreach \theta in {5,10,...,175}
+{
+	\draw[black,thick] (O) ++ (\theta:\rad) -- ++ (\theta:-\majtick);
+}
+
+
+% ********************************************************************************
+% Draw the linear scale
+% ********************************************************************************
+
+
+\foreach \var in {0,\mindiv,...,\radscale}
+{
+	\draw[black,thick] (O) ++ (\var,0) -- ++ (0,\mintick);
+	\draw[black,thick] (O) ++ (-\var,0) -- ++ (0,\mintick);
+}
+
+
+
+% ********************************************************************************
+% Draw the outline
+% ********************************************************************************
+
+\draw[black,thick] (O) ++ (\rad,0) arc (0:180:\rad) -- cycle;
+\draw[black,thick] (O) -- ++ (0,\majtick);
+
+
+% ********************************************************************************
+% Draw the angle numbers
+% ********************************************************************************
+
+\foreach \theta in {10,20,...,80}
+{
+	\pgfmathsetmacro{\thetaopposite}{\theta+180}
+	
+	\draw[black] (O) ++ (\theta:\rad) -- ++ (\theta:-\majtick) node[anchor=south,near start,sloped,rotate=90,text=black] {
+		\textsize
+		\begin{tabular}{c}
+			\contour{white}{\pgfmathprintnumber{\theta}}\\
+			\contour{white}{\pgfmathprintnumber{\thetaopposite}}
+		\end{tabular}
+	};
+}
+
+\foreach \theta in {90,100,...,170}
+{
+	\pgfmathsetmacro{\thetaopposite}{\theta+180}
+	
+	\draw[black] (O) ++ (\theta:\rad) -- ++ (\theta:-\majtick) node[anchor=south,near start,sloped,rotate=-90,text=black] {
+		\textsize
+		\begin{tabular}{c}
+			\contour{white}{\pgfmathprintnumber{\theta}}\\
+			\contour{white}{\pgfmathprintnumber{\thetaopposite}}
+		\end{tabular}
+	};
+};
+
+
+% ********************************************************************************
+% Draw the linear numbers
+% ********************************************************************************
+
+\pgfmathsetmacro{\labmax}{\radius-\majordivision}
+\pgfmathsetmacro{\labsecond}{\majordivision+\majordivision}
+
+\foreach \var in {\majordivision,\labsecond,...,\labmax}
+{
+	\pgfmathsetmacro{\varpos}{\var*\convert/\scaleto}
+	
+	\draw[black,thick] (O) ++ (\varpos,0) -- ++ (0,\mintick) node [above=-2pt] {\contour{white}{\textsize\pgfmathprintnumber{\var}}};
+	\draw[black,thick] (O) ++ (-\varpos,0) -- ++ (0,\mintick) node [above=-2pt] {\contour{white}{\textsize\pgfmathprintnumber{\var}}};
+}
+
+
+% ********************************************************************************
+% Draw the scale number
+% ********************************************************************************
+
+\draw[black] (O) ++ (0,\rad/3) -- ++ (0,\rad/3) node [midway,anchor=center,sloped,text=black] {\contour{white}{\textsize $1$:\pgfmathprintnumber{\scaleto}}};
+
+
+\end{tikzpicture}
+\end{document}

years/2015/index.html

@@ -18,7 +18,8 @@
 <ul>
 <li><a href="required_first_aid.html">First aid items needed</a>
 <li><a href="/expofiles/surveyscans/2015/">Survey scans</a></li>
-<li><a href="stuffleftattopcamp.html">stuff left at top camp</a></li>
+<li><a href="stuffleftattopcamp.html">Stuff left at top camp</a></li>
+<li><a href="stuffleftatbasecamp.html">Stuff left at base camp</a></li>
 <li><a href="biertent.html">Bier tent survey</a></li>
 <li><a href="logbook.html">Logbook</a> (incomplete)</li>
 <li><a href="stuffbought.html">Things bought 2015</a></li>

years/2015/stuffleftatbasecamp.html

@@ -0,0 +1,15 @@
+<html><head><title>Stuff left at base camp</title></head><body>
+<h1>Stuff left at base camp</h1>
+<h2>Food</h2>
+<ul>
+<li>337 noodles</li>
+<li>13kg couscous</li>
+<li>40 pesto</li>
+<li>114 curries</li>
+<li>89 cup-a-soups</li>
+<li>4kg hot chocolate</li>
+<li>10.5kg the right custard</li>
+<li>aprox 5kg the wrong custard</li>
+</ul>
+
+</body></html>