From 88fbd64be6b98b133d3aec559af2db7246f8bcc2 Mon Sep 17 00:00:00 2001 From: Michael at Laptop Date: Thu, 23 Jun 2016 16:41:35 +0100 Subject: [PATCH 1/3] Therion protractors for 1-500 added, pages now a4, makefile made --- documents/therionprotractors/Makefile | 24 +++ documents/therionprotractors/therionpage.tex | 8 +- .../therionprotractors/therionpage500.tex | 27 +++ .../therionprotractor500.tex | 189 ++++++++++++++++++ 4 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 documents/therionprotractors/Makefile create mode 100644 documents/therionprotractors/therionpage500.tex create mode 100644 documents/therionprotractors/therionprotractor500.tex diff --git a/documents/therionprotractors/Makefile b/documents/therionprotractors/Makefile new file mode 100644 index 000000000..7816ca861 --- /dev/null +++ b/documents/therionprotractors/Makefile @@ -0,0 +1,24 @@ +all: therionpage.pdf therionpage500.pdf + +#If using windows uncomment this +#LATEXTOOL=pdflatex.exe +#If using linux or macos(?) uncomment this +LATEXTOOL=pdflatex + +therionpage.pdf: therionpage.tex therionprotractor.tex + $(LATEXTOOL) therionpage.tex + +therionpage500.pdf: therionpage500.tex therionprotractor500.tex + $(LATEXTOOL) therionpage500.tex + +cleanpage: + rm -f therionpage.aux + rm -f therionpage.log + rm -f therionpage.pdf + +cleanpage500: + rm -f therionpage500.aux + rm -f therionpage500.log + rm -f therionpage500.pdf + +clean: cleanpage cleanpage500 diff --git a/documents/therionprotractors/therionpage.tex b/documents/therionprotractors/therionpage.tex index e2e463858..21facdf85 100644 --- a/documents/therionprotractors/therionpage.tex +++ b/documents/therionprotractors/therionpage.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}}; } } \end{tikzpicture} +\end{figure} \end{document} \ No newline at end of file diff --git a/documents/therionprotractors/therionpage500.tex b/documents/therionprotractors/therionpage500.tex new file mode 100644 index 000000000..6a2ad27c5 --- /dev/null +++ b/documents/therionprotractors/therionpage500.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{therionprotractor500.tex}}; + } +} + +\end{tikzpicture} +\end{figure} +\end{document} \ No newline at end of file diff --git a/documents/therionprotractors/therionprotractor500.tex b/documents/therionprotractors/therionprotractor500.tex new file mode 100644 index 000000000..f5b57eca5 --- /dev/null +++ b/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} From a98bb2eca712feee8b6daafc09851d52a26aa1eb Mon Sep 17 00:00:00 2001 From: davidwalker Date: Fri, 24 Jun 2016 21:41:50 +0100 Subject: [PATCH 2/3] added food left at base camp 2015 --- years/2015/index.html | 3 ++- years/2015/stuffleftatbasecamp.html | 13 +++++++++++++ ...fleftattopcamp.html => stuffleftattopcamp .html} | 0 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 years/2015/stuffleftatbasecamp.html rename years/2015/{stuffleftattopcamp.html => stuffleftattopcamp .html} (100%) diff --git a/years/2015/index.html b/years/2015/index.html index 2509af6a8..de7ed94cc 100644 --- a/years/2015/index.html +++ b/years/2015/index.html @@ -18,7 +18,8 @@ + + diff --git a/years/2015/stuffleftattopcamp .html b/years/2015/stuffleftattopcamp.html similarity index 100% rename from years/2015/stuffleftattopcamp .html rename to years/2015/stuffleftattopcamp.html