From 6164db9c11e987c1be39050daa377d17faa9d481 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 31 Mar 2022 00:22:05 +0100 Subject: [PATCH] weird characters replaced by UTF-8 --- handbook/finance.html | 2 +- handbook/flooding.html | 9 +++++++-- handbook/survey/newrig.html | 3 ++- handbook/survey/qmentry.html | 10 +++++----- handbook/travel.html | 5 +++-- handbook/troggle/scriptsqms.html | 18 +++++++++--------- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/handbook/finance.html b/handbook/finance.html index ebb4993c3..252a01e9d 100644 --- a/handbook/finance.html +++ b/handbook/finance.html @@ -92,7 +92,7 @@ After the expedition, the Expo treasurer processes this data to work out who owe
  • Pay a deposit.
  • Keep receipts, give them to the expedition treasurer.
  • If you are in any doubt whether the expedition will reimburse an expense do not incur
    • -it before obtaining the expedition treasurer’s agreement. +it before obtaining the expedition treasurer's agreement.
  • Fill in the relevant pages of the Bier Book fastidiously.
  • Where possible, enter details of your expenses on the Expo computer.
  • Leave money when you leave Austria in order to cover your share of the campsite bill.
    • diff --git a/handbook/flooding.html b/handbook/flooding.html index 0e50c0fce..949f4c146 100644 --- a/handbook/flooding.html +++ b/handbook/flooding.html @@ -9,7 +9,7 @@

    CUCC Expedition Handbook

    Flood Risk

    -

    The aim of this summary document is to pass on current knowledge, including between one year and the next year’s expedition, about pitches that have +

    The aim of this summary document is to pass on current knowledge, including between one year and the next year's expedition, about pitches that have significant flood hazards. The same info should also appear in each cave description, but sometimes they are out of date.

    Last updated July 2016

    @@ -20,7 +20,12 @@ significant flood hazards. The same info should also appear in each cave descrip
    Entrance Pitch
    -
    The lower two pitches of the entrance series become very wet or fully impassable. This includes the longest (~30m) hang – especially its lower part and ledge, and the final 10m pitch. A short period of rain can cause these pitches to become very drippy and unpleasant, but passable. However, heavy and/or sustained rainfall produces water spouts both on the main hang, and on the bottom pitch; thereby making the entrance series impassable. The response of these pitches to surface rain is quick. It can also take several (or more) hours for the water levels on the pitches to drop. Suitable kit for sitting out a flood (bothy bag, stove, food etc) should therefore be installed from start of expedition at the base of the entrance pitch.
    +
    The lower two pitches of the entrance series become very wet or fully impassable. This includes the longest (~30m) hang - especially its lower +part and ledge, and the final 10m pitch. A short period of rain can cause these pitches to become very drippy and unpleasant, but passable. However, +heavy and/or sustained rainfall produces water spouts both on the main hang, and on the bottom pitch; thereby making the entrance series impassable. +The response of these pitches to surface rain is quick. It can also take several (or more) hours for the water levels on the pitches to drop. +Suitable kit for sitting out a flood (bothy bag, stove, food etc) should therefore be installed from start of expedition at the base of the entrance +pitch.
    Darks Arts: final Lleft-hand pitch
    The left-hand and deeper (wet) pitch develops a water spout after only moderate rainfall, and responds quickly to surface rainfall.
    diff --git a/handbook/survey/newrig.html b/handbook/survey/newrig.html index 2a4349490..624ea6fc8 100644 --- a/handbook/survey/newrig.html +++ b/handbook/survey/newrig.html @@ -118,8 +118,9 @@ where they will be linked in to the HTML files for the cave descriptions, e.g.

    [ We could dream up some fancy scheme for indexing the rigging for every pitch in the system and add that into troggle but frankly we don't think it's worth the effort.] +

    Final editing of cave descriptions

    -

    If you look in detail at the description of Steinbrückenhöhle you will see rigging topos +

    If you look in detail at the description of Steinbrückenhöhle you will see rigging topos inline as pixel images (not vector files) in the passage descriptions. These are stored with the passage HTML files, e.g. in :expoweb:/1623/204/rigging/kiwi.png, whereas the master copy of this rigging diagram is the vector file at diff --git a/handbook/survey/qmentry.html b/handbook/survey/qmentry.html index 2b6af0755..db7a3f129 100644 --- a/handbook/survey/qmentry.html +++ b/handbook/survey/qmentry.html @@ -30,20 +30,20 @@ compared to including QMs only in survey drawings in Tunnel or writing a cave description then putting it on the expo website.

    Svx files are a very stable place to store the data long- -term: there is no need to rely on a ‘master file’ of any kind, which can be problematic if not everyone +term: there is no need to rely on a ‘master file' of any kind, which can be problematic if not everyone on expo has the same level of computer literacy, and requires just basic text entry to create and update the data after a trip. -

    How it’s done:

    +

    How it's done:

    -So, you’ve got your .svx file started (if entering new data), or located and opened (if updating a +So, you've got your .svx file started (if entering new data), or located and opened (if updating a previously surveyed bit of cave after checking out some QMs again), and it looks a bit like this (visual format will change depending on your preferred text editor):

    -If you don’t understand what is in front of you here, then you need to read the survey handbook guide on svx files which will lead you to the survex documentation, or ask +If you don't understand what is in front of you here, then you need to read the survey handbook guide on svx files which will lead you to the survex documentation, or ask someone about basic entry of survey leg and station data into the .svx file format.

    Near to the end of the text in the file, you will see a section that looks like this: @@ -107,7 +107,7 @@ If these data are not entered along with the rest of the survey data, it is as i some of the actual passage data you surveyed: information is being lost and someone will have to trawl back through all the survey data at a later time to keep it up-to-date, a very tedious task which is a very inefficient use of time. -

    Also if the person reading it hasn’t been to the bit of cave (which is, like, the whole point, then the data has a higher chance of being incorrect. It is not always easy to interpret Tunnel or Therion +

    Also if the person reading it hasn't been to the bit of cave (which is, like, the whole point, then the data has a higher chance of being incorrect. It is not always easy to interpret Tunnel or Therion drawings correctly with this sort of thing.

    Programming note

    diff --git a/handbook/travel.html b/handbook/travel.html index 88024734b..44c2019b8 100644 --- a/handbook/travel.html +++ b/handbook/travel.html @@ -1,6 +1,6 @@ - + CUCC's Austria expeditions: Travel @@ -80,7 +80,8 @@ even if you don't actually get off the train there, just change ticket! Book ear Salzburg has been annexed by DB and counts as Germany for train purposes. These are only available via Brussels so you need to add a stop of around an hour when searching for tickets.

    -

    Paul Fox just paid (2018) €70 all the way from Salzburg to London, including the Eurostar, booked only 3 days in advance. In comparison Eurostar want £88 for a seat on the same train from Brussels to London, so the journey across all of Germany was cheaper than free.

    +

    Paul Fox just paid (2018) €70 all the way from Salzburg to London, including the Eurostar, booked only 3 days in advance. +In comparison Eurostar want £ for a seat on the same train from Brussels to London, so the journey across all of Germany was cheaper than free.

    The only catch is that you need to check in with a human at Brussels / London as the Eurostar gates can't read DB ticket barcodes.

    diff --git a/handbook/troggle/scriptsqms.html b/handbook/troggle/scriptsqms.html index 7dd4b00c1..31b382ec7 100644 --- a/handbook/troggle/scriptsqms.html +++ b/handbook/troggle/scriptsqms.html @@ -72,7 +72,7 @@ C1999-204-09 C Wolp Hole in floor through dangerous boulders vei Fields in 258/qm.csv are: 
    Cave, year, number, Grade, nearest station, description, completion description, found by, completed by
 e.g.
-258  2006  27        C      258.gknodel.4    Small passage to E in Germkn”del          Sandeep Mavadia and Dave Loeffler
+258  2006  27        C      258.gknodel.4    Small passage to E in Germknödel          Sandeep Mavadia and Dave Loeffler
    Fields in 264/qm.csv are: 
    Year, number, Grade, Survey folder ref#, Surveyname, Nearest Station number, Area of the cave, Description, Y if marked on drawn-up survey,
@@ -132,7 +132,7 @@ The 2019 copies are online in /expofiles/:
 
 
    
 This will work on all survex *.svx files even those which have not yet been run through the troggle import process. 
-
    Phil says (13 April 2020): "The generated files are not meant to be served by the webserver, it’s a tool for people to run locally. Someone could modify it to create HTML output (or post-process the CSV output to do the same), but that is work still to be done."
+
    Phil says (13 April 2020): "The generated files are not meant to be served by the webserver, it's a tool for people to run locally. Someone could modify it to create HTML output (or post-process the CSV output to do the same), but that is work still to be done."
 
 
    troggle/parsers/survex.py
    
 
    The QMs inside the survex files are parsed by troggle along with all the other information
@@ -183,9 +183,9 @@ Subject: Re: svx2qm
 
 Hi Philip,
 
-Hope you’re well, thanks for getting in touch about this.
+Hope you're well, thanks for getting in touch about this.
 
-The generated files are not meant to be served by the webserver, it’s a tool for people to run locally. 
+The generated files are not meant to be served by the webserver, it's a tool for people to run locally. 
 Someone could modify it to create HTML output (or post-process the CSV output to do the same), 
 but that is work still to be done.
 
@@ -196,21 +196,21 @@ and it should go into the Makefile too at some point.
 
 Feel free to move it wherever; I am not planning on doing any further work on it. 
 The script itself just expects to be passed some (relative or absolute) paths to SVX files, 
-so can be placed wherever, as long as it’s passed appropriate relative paths.
+so can be placed wherever, as long as it's passed appropriate relative paths.
 
-I haven’t written any other scripts which post-process the data or otherwise format it.
+I haven't written any other scripts which post-process the data or otherwise format it.
 
 I guess it all depends on what questions people are trying to answer using the QM data, 
-as to how (and where) best to present it. I’m afraid I don’t have any suggestions there.
+as to how (and where) best to present it. I'm afraid I don't have any suggestions there.
 
 :Rob Watson wrote some documentation about QMs
 :http://expo.survex.com/handbook/survey/qmentry.html 
 :is there anything subtle missing  as to how they are used ?
 
-Nope, I think Rob’s page covers it all. That page also documents the correct QM format 
+Nope, I think Rob's page covers it all. That page also documents the correct QM format 
 which is what svx2qm.py understands. (There were some older or artisanal QM formats 
 floating around at one point, although I think I reformatted them all so the tool 
-would understand them, and so people would hopefully standardise on what Rob’s 
+would understand them, and so people would hopefully standardise on what Rob's 
 documented from then on.)
 
 Philip