From 6071b0091ad52854084da01a38a3b639608c4243 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 2 Jul 2012 03:06:16 +0200 Subject: [PATCH] A compass, map, and course loggbook is added --- lathund/Makefile | 9 ++++++- lathund/fig/compass.fig | 26 +++++++++++++++++++ lathund/fig/orientation-map.fig | 55 +++++++++++++++++++++++++++++++++++++++++ lathund/lathund.tex | 40 +++++++++++++++++++++++++++++- 4 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 lathund/fig/compass.fig create mode 100644 lathund/fig/orientation-map.fig diff --git a/lathund/Makefile b/lathund/Makefile index 9c9caf6..00de8c9 100644 --- a/lathund/Makefile +++ b/lathund/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -lathund.pdf: lathund.tex ../preamble/preamble.tex input/course_reckoner.tex +lathund.pdf: lathund.tex ../preamble/preamble.tex input/course_reckoner.tex input/compass.pdftex input/orientation_map.pdftex pdflatex lathund.tex latex_count=5 ; \ while egrep -s 'Rerun (LaTeX|to get cross-references right)' lathund.log && [ $$latex_count -gt 0 ] ;\ @@ -9,6 +9,13 @@ lathund.pdf: lathund.tex ../preamble/preamble.tex input/course_reckoner.tex input/course_reckoner.tex: m/course_reckoner.m input cd m; octave --silent --eval "course_reckoner ();" > ../input/course_reckoner.tex; cd -; +input/compass.pdftex: fig/compass.fig + fig2dev -L pdftex fig/compass.fig > input/compass.pdf + fig2dev -L pdftex_t -F -p input/compass.pdf fig/compass.fig > input/compass.pdftex +input/orientation_map.pdftex: fig/orientation-map.fig + fig2dev -L pdftex fig/orientation-map.fig > input/orientation_map.pdf + fig2dev -L pdftex_t -F -p input/orientation_map.pdf fig/orientation-map.fig > input/orientation_map.pdftex + input: mkdir input diff --git a/lathund/fig/compass.fig b/lathund/fig/compass.fig new file mode 100644 index 0000000..91994b6 --- /dev/null +++ b/lathund/fig/compass.fig @@ -0,0 +1,26 @@ +#FIG 3.2 Produced by xfig version 3.2.5b +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 1800 1800 900 900 1800 1800 2700 1800 +4 1 0 50 -1 0 12 0.0000 2 165 975 874 939 $315^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 825 1800 225 \\textsc{n}\001 +4 1 0 50 -1 0 12 0.0000 2 165 870 2756 925 $45^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 930 3020 658 \\textsc{no}\001 +4 1 0 50 -1 0 12 0.0000 2 165 900 3045 3098 \\textsc{so}\001 +4 1 0 50 -1 0 12 0.0000 2 165 795 1805 3484 \\textsc{s}\001 +4 1 0 50 -1 0 12 0.0000 2 165 975 811 2805 $225^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 900 601 3082 \\textsc{sv}\001 +4 1 0 50 -1 0 12 0.0000 2 165 975 2750 2833 $135^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 930 564 645 \\textsc{nv}\001 +4 1 0 50 -1 0 12 0.0000 2 165 975 300 1706 $270^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 765 1834 511 $0^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 975 1835 3215 $180^\\circ$\001 +4 1 0 50 -1 0 12 0.0000 2 165 825 260 1991 \\textsc{v}\001 +4 1 0 50 -1 0 12 0.0000 2 165 1140 3273 1705 \\textsc{\\"{o}}\001 +4 1 0 50 -1 0 12 0.0000 10 165 870 3335 1990 $90^\\circ$\001 diff --git a/lathund/fig/orientation-map.fig b/lathund/fig/orientation-map.fig new file mode 100644 index 0000000..a3e0d07 --- /dev/null +++ b/lathund/fig/orientation-map.fig @@ -0,0 +1,55 @@ +#FIG 3.2 Produced by xfig version 3.2.5b +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +6 1186 2699 1330 2934 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4 + 1325 2924 1325 2699 1186 2733 1325 2789 +2 1 2 1 0 7 50 -1 -1 1.000 0 0 -1 0 0 4 + 1330 2934 1330 2709 1191 2743 1330 2799 +-6 +6 2176 2699 2320 2934 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4 + 2315 2924 2315 2699 2176 2733 2315 2789 +2 1 2 1 0 7 50 -1 -1 1.000 0 0 -1 0 0 4 + 2320 2934 2320 2709 2181 2743 2320 2799 +-6 +6 1913 1187 3125 3309 +1 1 1 1 0 7 50 -1 -1 2.000 1 0.0000 2519 2248 606 1061 2519 2248 3125 1187 +4 1 0 50 -1 0 12 0.0000 2 180 810 2527 2181 H\\"{o}ger\001 +4 1 0 50 -1 0 12 0.0000 2 165 825 2525 2448 \\textsc{h}\001 +-6 +6 518 1199 1700 3319 +1 1 1 1 0 7 50 -1 -1 2.000 1 0.0000 1109 2259 591 1060 1109 2259 1700 1199 +4 1 0 50 -1 0 12 0.0000 2 165 825 1105 2455 \\textsc{v}\001 +4 1 0 50 -1 0 12 0.0000 2 165 930 1105 2169 V\\"{a}nster\001 +-6 +6 830 2786 2768 3830 +6 1680 3526 1962 3713 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4 + 1815 3526 1680 3706 1950 3706 1815 3526 +2 1 2 1 0 7 50 -1 -1 1.000 0 0 -1 0 0 4 + 1827 3533 1692 3713 1962 3713 1827 3533 +-6 +1 1 1 1 0 7 50 -1 -1 2.000 1 0.0000 1799 3308 969 522 1799 3308 2768 3830 +4 1 0 50 -1 0 12 0.0000 2 135 375 1807 3129 Nere\001 +4 1 0 50 -1 0 12 0.0000 2 165 825 1807 3360 \\textsc{n}\001 +-6 +6 844 645 2756 1669 +6 1660 670 1942 857 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4 + 1795 670 1660 850 1930 850 1795 670 +2 1 2 1 0 7 50 -1 -1 1.000 0 0 -1 0 0 4 + 1807 677 1672 857 1942 857 1807 677 +-6 +1 1 1 1 0 7 50 -1 -1 2.000 1 0.0000 1800 1157 956 512 1800 1157 2756 645 +4 1 0 50 -1 0 12 0.0000 2 165 825 1803 1393 \\textsc{u}\001 +4 1 0 50 -1 0 12 0.0000 2 180 435 1802 1092 Uppe\001 +-6 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 1 + 900 2250 diff --git a/lathund/lathund.tex b/lathund/lathund.tex index 6a2b875..0ced6e6 100644 --- a/lathund/lathund.tex +++ b/lathund/lathund.tex @@ -1,5 +1,5 @@ \input{../preamble/preamble} - +\geometry{right=1.4cm, left=1.4cm, top=1.5cm, bottom=1.5cm} \pagestyle{empty} \begin{document} @@ -13,4 +13,42 @@ \input {input/course_reckoner.tex} \end{center} \end{Large} + +\vspace{4cm} + +\begin{center} + \begin{minipage}[t]{6.5cm} + \section*{\centering Orienteringskarta} + \begin{center} + \input {input/orientation_map.pdftex} + \end{center} + \end{minipage} + \hspace{1cm} + \begin{minipage}[t]{8cm} + \section*{\centering Kompassen} + \begin{center} + \input {input/compass.pdftex} + \end{center} + \end{minipage} +\end{center} + +\newpage + +\begin{center} +\begin{sideways} +\begin{minipage}[t]{\linewidth} +\newlength \tempsep +\setlength{\tempsep}{.8\linewidth} +\section*{\centering Riktningslogg} +\begin{large} +\begin{tabular}{>{\centering}p{5em}|c|>{\centering}p{5em}|>{\centering}p{5em} c >{\centering}p{5em}|c|>{\centering}p{5em}|p{5em}} +\multicolumn{4}{c}{\textbf{Styrbord} (mot vänstra sidan)} && \multicolumn{4}{c}{\textbf{Barbord} (mot högra sidan)} \\[.5em] +Tid & Pla& Kurs & Medelvind && Tid & Pla & Kurs & Medelvind \\\cline{1-4}\cline{6-9} +& & & && & & & \\[\tempsep] +\end{tabular} +\end{large} +\end{minipage} +\end{sideways} +\end{center} + \end{document} -- 2.11.4.GIT