handbook edits & fixes

Makefile

@@ -8,6 +8,8 @@ cavern_flags = -qq -s -v7
 tar_flags = -cz --exclude "*/CVS" --ignore-case -f
 svxtrace_cmd = ./svxtrace.py
 
+# 3dtopos = ?
+
 #things needed to run this stuff
 #python3 imaging library, freesans or arial truetype font, dump3d, cavestats
 #Debian packages: python3-imaging, ttf-freefont, perl, python3
@@ -60,6 +62,8 @@ folk/index.htm: folk/folk.csv scripts/make-folklist.py
 ###########
 #QM files are now outo built in troggle for all caves-1623/
 
+  qmlists: 1623/204/atoz.html 
+
 # qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html
 
 # 1623/204/qm.html: 1623/204/qm.csv 1623/204/tablize-qms.pl
@@ -76,6 +80,7 @@ folk/index.htm: folk/folk.csv scripts/make-folklist.py
 
 ###########
 #3d files are now outo built in troggle for all caves-1623/
+  3dfiles: noinfo/1623-and-1626.3d noinfo/alltracks.3d
 
 # 3dfiles: noinfo/1623-and-1626.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d noinfo/alltracks.3d
 
@@ -113,10 +118,12 @@ dump3d: noinfo/prospecting_guide_scripts/dump3d
 
 ###########
 # We don't do the tarfile thing anymore
+  tarfiles: noinfo/all.tgz 
+
 # tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz
 
-# noinfo/all.tgz: noinfo/1623-and-1626.3d
+  noinfo/all.tgz: noinfo/1623-and-1626.3d
-	# tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser
+	tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser
 
 # 1623/204/surveydata.tgz: 1623/204/204.3d
 	# tar $(tar_flags) 1623/204/surveydata.tgz -C $(dataset_path)/caves-1623/ 204

handbook/computing/basiclaptop.html

@@ -10,8 +10,30 @@
 
 <h1>Setting up a minimal Expo laptop</h1>
 
-<h2>Overview</h2>
+<h2>What you can do from any laptop</h2>
-<p>If you are new to expo please use the <em>expo laptop</em> first. You don't <em>need</em> to use your own laptop - which takes most of a day to do it properly.
+<p>There is a lot you can do without installing any software on your own machine. Using a browser, you can logon to the Expo online system ("the website", also known as "troggle") as user 'expo' at <a href="/accounts/login/">the Troggle User Login page</a>. (Ask another expoer for the 'cavey:beery' password.) You can:
+<ul>
+<li>Edit any HTML page in the online handbook: correct errors, update phone numbers
+<li>Edit existing Survex files in our complete Loser cave data repository
+<li>Create new Survex files - a template is provided - for new cave passages
+<li>Edit the cave description and entrance description text for existing caves
+<li>Create entirely new caves in the system by filling out online forms
+</ul>
+<p>And using email to send the results to an expo nerd, you can:
+<ul>
+<li>Type up your logbook entry for any trip you do (surface or underground), but please use <a href="../logbooks.html">our standard format</a>
+<li>Upload GPS tracks from your phone
+<li>Send photos of cave entrances and cavers doing mad things
+<li>Sketch rigging plans on paper, photograph them, and email them
+<li>Regularly take photos of pages of '<a href="../bierbook.html">the bier book</a>' and 'the sesh book' and email them, to protect against accidental 'G&ouml;ssering'
+<li>Regularly take photos of pages of '<a href="../logbooks.html">the handwritten expo logbook</a>', also to protect against accidental 'G&ouml;ssering' but also against permanent loss. We are missing several vital logbooks from past expos through carelessness.
+</ul>
+<p>and of course using your phone or laptop you can update entries on expo antics on public forums such as ukcaving.
+
+<p>We are actively working on increasing the number of expo activities that can be done with just a browser and no installed software.
+
+<h2>Your own laptop</h2>
+<p>If you are new to expo please use the <em>expo laptop</em> first. You don't <em>need</em> to use your own laptop - which takes most of a day to setup completely.
 <p>To set up your own laptop you need to do this:</p>
 <ol>
   <li>Register an SSH key</a> with an expo nerd i.e 'get a login'. (see "Key Configuration" below)</li>
@@ -27,7 +49,7 @@ And please <b>write some documentation for the next person</b> in your situation
 <h3>Cheat lists and quick reminders</h3>
 <ul>
 <li>Quick <a href="qstart-git.html">reminders for using git</a> at the command line.
-<li>Quick <a href="manual.html#quickstart">reminders for using rsync</a> at the command line.
+<li>Quick <a href="qstart-rsync.html">reminders for using rsync</a> at the command line.
 </ul>
 
 <h2 id="software">Software</h2>

handbook/computing/yourlaptop.html

@@ -75,11 +75,11 @@ but all the recommended software here is open source (and please don't install p
 <li><a href="http://www.thomas-holder.de/projects/inkscape-speleo/extensions/">inkscape-speleo</a> - plugin to import/export survex, therion and pockettopo files to the drawing package inkscape.
 <li><a href="https://imagemagick.org/script/">Imagemagick convert</a> for re-scaling photographs and scanned images and converting from PDF to JPG. (NB you may need to fix this <a href="https://stackoverflow.com/questions/52998331/imagemagick-security-policy-pdf-blocking-conversion">security issue</a>)
 </ul>
-<p>Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't.</p>
+<p>Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't. Expo has a policy decision on which to use: if it is an entirely new disconnected cave, then use Therion. If it is a passage in a cave where previously we used Tunnel, then use Tunnel. See also <a href="/expofiles/tunnelwiki/wiki/pages/Other_Cave_Software.html">Comparison of Tunnel to Other Cave Software</a>.
 
 <a href="https://therion.speleo.sk/2D.php"><img src="https://therion.speleo.sk/img/head.jpg" hspace="20"></a>
 
-<p>Note that on a Debian/Ubuntu machine you should normally install the versions that come with the distro, not be getting things from the above sites</p>
+<p>Note that on a Debian/Ubuntu machine you should normally install the versions that come with the distro (i.e. install using 'apt install xxx', not be downloading things from the above sites</p>
 
 <h4>For Linux users only:</h4>
 <ul>
@@ -161,7 +161,7 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
 a useful initial short-cut is to create 'mimic' symbolic links to directories to match those on the
 server and the <em>expo laptop</em>. 
 (You should not rely on these as other people will have set up their machines differently.) 
-So, assuming that your machine has 
+So, assuming that you are storing /expofiles/ on a different drive /mnt/f/ from everything else which is on /mnt/d/, and your machine has 
 no user <var>expo</var>:<pre><code>cd /home
 sudo mkdir expo
 cd expo
@@ -169,6 +169,10 @@ sudo ln -s /mnt/f/expofiles expofiles
 sudo ln -s /mnt/d/CUCC-Expo/expoweb expoweb
 sudo ln -s /mnt/d/CUCC-Expo/troggle troggle
 sudo ln -s /mnt/d/CUCC-Expo/loser loser
+cd ..
+sudo ln -s /mnt/d/CUCC-Expo/expowebcache expowebcache
+cd expowebcache
+mkdir 3d
 ls -tlA
 </code></pre>
 where obviously you will be using your own locations for expofiles, expoweb, loser etc. instead of <var>/mnt/d/CUCC...</var> etc. This creates valid directory paths for, e.g. <var>/home/expo/loser</var> etc.

handbook/survey/drawup.htm

@@ -40,45 +40,61 @@ survex format</a> , run
 <a href="https://survex.com/docs/manual/aven.htm">aven</a> (the GUI interface - installed when you installed survex) and print out a centre-line plan.
 
 <p>OK if this is your first time doing this, you need to go through the 
-<a href="usingsurvex.html">"How to use survex" training procedure</a>.
+<a href="newsurvex.html">"How to use survex" training procedure</a>.
 
 <h3 id="runsurvex">Running survex to create a centre-line</h3>
 <p><em>to be documented</em>
 
-
-
 <h3 id="rescan">Transcribing and re-scanning your sketches</h3>
-<p>The files of your scanned and re-scanned sketches should be stored in the same folder 
+<p>Use aven to print out the centre lines of the passages. Now you will have to decide whether to use Tunnel or Therion. Expo has a polciy decision on this: if it is an entirely new disconnected cave, then use Therion. If it is a passage in a cave where previously we used Tunnel, then use Tunnel. See also <a href="/expofiles/tunnelwiki/wiki/pages/Other_Cave_Software.html">Comparison of Tunnel to Other Cave Software</a>.
-as the scanned notes, i.e. (for wallet #19) you would put them in:
+<p>
-<tt>
+<div  class="onright">
-/home/expo/expofiles/surveyscans/2018/2018#19/
+<figure>
-</tt>
+<a href="/expofiles/tunnelwiki/wiki/pages/Tracing_the_Image.html">
-(but this is not where you will put your finished drawings.)
+<img src="sketch6.gif" ></a>
-<h3 id="therion">Using tunnel or therion for final survey production</h3>
+<figcaption style="font-variant-caps: small-caps;">
+<em>Tracing the image - click for tutorial</em>
+</figcaption>
+</figure>
+</div>
 
-<ul>
+Take the printed centre lines on paper and redraw the survey round it, working from
-    <li><a href="/expofiles/documents/surveying/tunnel-guide.pdf">How to use Tunnel</a> - PDF - Brendan's guide.
-     <li><a href="/expofiles/documents/surveying/tunnel-loefflerCP35-only.pdf">Guide to using Tunnel</a> - PDF - David Loeffler's documentation.
-     <li><a href="/expofiles/tunnelwiki/wiki/pages/Tunnel.html">Tunnel tutorial</a> - a wiki of examples and tutorials
-</ul>
-
-<p>Tunnel only produces plan surveys, but they are very pretty.
-
-<p>The tunnel (or therion) files should NOT stored in the same folder as the scanned notes. They will eventually 
-be uploaded to the version control repository 
-<var><a href="../computing/repos.html">drawings</a></var>
-but for a first attempt store them on the <em>expo laptop</em> in <var>/home/expo/drawings/{cavenumber}</var>. 
-Look at what is in there already and ask someone whcih directory to put them in. It will probably be a folder like this:
-<tt>
-/home/expo/drawings/264-and-258/toimport/ 
-</tt>
-
-<p>Take the printed centre lines and redraw the survey round it, working from
     the original sketches as if this was to be the final published survey. You
     can "invent" details like boulders in boulder-strewn passage, but otherwise,
     draw only what was recorded faithfully in the cave. If this makes your
     drawing look bad - record more next time! If things really are unclear,
     consider taking a copy of this drawing back into the cave to clarify it.</p>
+<p>Now scan your sketch, transfer the file to the <em>expo laptop</em> and open it in Tunnel (or Therion).
+Using a mouse on the screen within Tunnel (or Therion), you will then trace over the image and thus create a vector drawing of the cave.
+Very detailed instructions for doing this in Tunnel are in <a href="/expofiles/tunnelwiki/wiki/pages/File_Formats.html#Raw_Sketch_Data">Tunnel Wiki: Raw Sketch Data</a>
+
+<h3 id="filescans">Filing your sketches</h3>
+<p>The files of your scanned and re-scanned sketches should be stored in the same folder 
+as the scanned notes, i.e. (for wallet #19, for expo 2018) you would put them in:
+<tt>
+/home/expo/expofiles/surveyscans/2018/2018#19/
+</tt>
+(but this is not where you will put your finished Tunnel or Therion vector files.)
+<h3 id="therion">Using tunnel or therion for final survey production</h3>
+
+<ul>
+    <li><a href="/expofiles/documents/surveying/Tunnel_Guide.pdf">How to use Tunnel</a> - PDF - Brendan's guide.
+     <li><a href="/expofiles/documents/surveying/tunnel-loefflerCP35-only.pdf">Guide to using Tunnel</a> - PDF - David Loeffler's documentation.
+     <li><a href="/expofiles/tunnelwiki/wiki/pages/Tunnel.html#Tutorial">Tunnel tutorial</a> - an advanced tutorial with many examples
+</ul>
+
+<p>Tunnel only produces plan surveys, but they are very pretty.
+
+<p>The tunnel (or therion) vector files should NOT stored in the same folder as the scanned notes. They will eventually 
+be uploaded to the version control repository 
+<var><a href="../computing/repos.html">drawings</a></var>
+but for a first attempt store them on the <em>expo laptop</em> in <var>/home/expo/drawings/{cavenumber}</var>. 
+Look at what is in there already and ask someone which directory to put them in. It will probably be a folder like this:
+<tt>
+/home/expo/drawings/264-and-258/toimport/ 
+</tt>
+
+
 
 <h3>Guidebook description</h3>
 

handbook/survey/newsurvex.html

@@ -35,10 +35,20 @@ This page outlines step 3 of the survey production process. Each step is documen
 <ul>
 <li>Either you can create a new file and use a text-editor on the <em>expo laptop</em>, as described immediately below,
 <li>Or you can use the online system using a web browser from any computer anywhere. This is much, much easier. To do this you need to
-be somewhat confident of the name (the surveytripid) you will be using. Instructions are 
+be somewhat confident of the name (the 'surveytrip' id) you will be using. Instructions are 
 <a href="#onlinesvx">at the bottom of  this page</a>. <br>[This capability has been broken for many years. It is now fully restored in 2020.]
 </ul>
 
+<div  class="onleft">
+<figure>
+<a href="/survexfile/caves-1623/204/midlevel/110_bidet.svx">
+<img src="notex.jpg" width="700px"></a>
+<figcaption style="font-variant-caps: small-caps;">
+<em>Typical raw survex data - 'bidet' in Steinbr&uuml;ckenh&ouml;hle, Martin Green 14/8/2000</em>
+</figcaption>
+</figure>
+</div>
+
 <h3 id="survexformat">Typing in the survey data in survex format</h3>
 
 
@@ -65,6 +75,7 @@ ensure that it is <em>saved, committed, </em>and<em> pushed</em> appropriately t
 <li><font color=red>[survex software docm.]</font> <a href="https://survex.com/docs/manual/svxhowto.htm">Contents of .svx files</a> - How do I? 
 <li><font color=red>[survex software docm.]</font> <a href="https://survex.com/docs/manual/genhowto.htm">How do I Create a new survey</a> - example with several surveys joined  
 <li><font color=red>[survex software docm.]</font> <a href="https://survex.com/docs/manual/datafile.htm">Survex data files</a> - all the sections and keywords explained 
+<li><font color=red>[tunnel software docm.]</font> <a href="/expofiles/tunnelwiki/wiki/pages/File_Formats.html">Survex data files</a> - introduction and explanation 
 </ul>
 
 <p>Once you have created the .svx file you will run survex to check that your format is correct without typos 
@@ -75,7 +86,7 @@ scan it again and then use that scanned image to digitise passage layout into tu
 <ul>
 <li><a href="athome.htm">Back in the UK</a> - not really part of the process
 <li><a href="/expofiles/presentations/cave_surveying_20130626.pdf">Cave Surveying - training course slidepack</a>
-<li><a href="../survexhiustory96.htm">History of Survex (1996)</a></li>
+<li><a href="../survexhistory96.htm">History of Survex (1996)</a></li>
 </ul>
 
 <p>[Nerds: survex cave data belongs in the <a href="../computing/repos.html">repository</a> :loser: so e.g.
@@ -116,6 +127,7 @@ straighforward p10.
 </p>
 
 <h3><a id="onlinesvx">Using the direct online system</a></h3>
+<p>This is where you type up the hand-scrawled notes directly into a a web browser, creating a new online survex file automatically in the right place on the online system.
 <p>Having confirmed the right name to use for your cave, including whether it is in area 1623 or 1626, e.g. 
 <pre>
 caves-1623/2050-cucc-01/easybimble.svx
@@ -124,11 +136,12 @@ open a web browser on the equivalent page
 <pre>
 http://expo.suvex.com/survexfile/caves-{area}/{cave}/{surveytripid}.svx
 </pre>
-e.g.
+where {area} will be 1623 or 1626, and for a new discovery, {cave} will be something like 2050-BH-01  if it is the third cave disovered by 
+Dr. Bunsen Honeydew on the 2050 expo, e.g.
 <pre>
-<a href="/survexfile/caves-1623/2050-CUCC-01/easybimble.svx">/survexfile/caves-1623/2050-CUCC-01/easybimble.svx</a>
+<a href="/survexfile/caves-1623/2050-BH-03/easybimble.svx">/survexfile/caves-1623/2050-BH-03/easybimble.svx</a>
 </pre>
-and a suvex-file editing page will open, pre-populated with an example template 
+and a survex-file editing page will open, pre-populated with an example template 
 for survex data, most of which you will delete and replace. Edit this template and type in your own data.
 <p>You can save your work by pressing the "Save this edited svx file" button, but it
 will refuse to save until you have hand-edited out all the template material in [square brackets].
@@ -172,7 +185,7 @@ typing up your notes.
 <p>If you have a complex cave like 204 or 161 with many separate exploration zones then you can put subfolder names in the
 URL bar e.g. 
 <pre>
-<a href="/survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx">survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx</a>
+<a href="/survexfile/caves-1623/2050-BH-03/murderalley/killerclimb/easybimble.svx">survexfile/caves-1623/2050-BH-03/murderalley/killerclimb/easybimble.svx</a>
 </pre>
 and the intermediate directories will be created on the server if they don't already exist. This is in addition to 
 the directory name which is also the name of your new cave being created automatically.

handbook/survey/usingsurvex.html

@@ -1,32 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>Handbook placeholder page</title>
-<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
-</head>
-<body>
-<h2 id="tophead">CUCC Expedition Handbook</h2>
-
-<h1>Placeholder</h1>
-<p>This is not the page you were hoping for.
-<p>This will be replaced with the information you want as soon as someone gets around to writing it. Why not find out how to do this yourself ?
-
-<hr />
-
-<div id="menu">
-<ul id="links">
-<li><a href="../index.htm">Expedition Handbook</a>
-<ul>
-	<li><a href="../rig/rigit.html">Rigging guide</a></li>
-	<li><a href="../survey/index.htm">Surveying guide</a></li>
-	<li><a href="../look4.htm">Prospecting guide</a></li>
-	<li><a href="../rescue.htm">Rescue guide</a></li>
-</ul></li>
-<li><a href="../../infodx.htm">Main index</a></li>
-
-<li><a href="../../index.htm">Expo Home</a></li>
-<li><a href="https://camcaving.uk">CUCC Home</a></li>
-</ul>
-</div>
-</body>
-</html>