Skip to content

Commit

Permalink
Merge pull request therion#610 from tristan0x/fix/thbook-typos
Browse files Browse the repository at this point in the history
thbook: fix some typos and add Ubuntu 24.10 prerequisites
  • Loading branch information
mbudaj authored Dec 6, 2024
2 parents c121596 + 0cd5d00 commit 546b95f
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 20 deletions.
12 changes: 6 additions & 6 deletions thbook/ch02.tex
Original file line number Diff line number Diff line change
Expand Up @@ -517,13 +517,13 @@
* |vthreshold <number> <units>| = threshold for interpreting LRUD readings
as left-right-front-back reading perpendicular to the shot.
If passeges are horizontal (|inclination < vthreshold|),
If passages are horizontal (|inclination < vthreshold|),
LR is perpendicular to the shot and UD is vertical.
If passages are more or less vertical (|inclination > vthreshold|), even UD
becomes perpendicular to the shot -- otherwise passages would not look very
good. In the case of vertical shots, UD is interpreted as north-south
dimension from the station to allow tube-like modelling of verticals.
dimension from the station to allow tube-like modeling of verticals.
* |extend <spec> [<station> [<station>]]| =
control how the centerline is extended. |<spec>| is one of the following
Expand Down Expand Up @@ -1318,7 +1318,7 @@
explanation.
(Note: |break| only changes level of maps of scraps and has no function when
used with maps of maps, as they will cause a |break| implicitely)
used with maps of maps, as they will cause a |break| implicitly)
\enddescription
\syntax
Expand Down Expand Up @@ -1810,7 +1810,7 @@
\subsubchapter Additional tools.
\NEW{5.3}{\bf Help/Calibrate bitmap} produces OziExplorer-compatible MAP file based
on georeferencig data included in PDF maps produced by Therion versions 5.3--6.2.\NEW{6.3}\[Calibration information for
on georeferencing data included in PDF maps produced by Therion versions 5.3--6.2.\NEW{6.3}\[Calibration information for
nine distinct points is present if the centreline contains
station(s) fixed using geodetic coordinate system(s).]\,\[Therion 6.3+ uses standard
geospatial PDF files where such a calibration is not needed.]
Expand All @@ -1828,8 +1828,8 @@
format which needs to be imported using XTherion and can not be processed
by Therion directly.]
from PocketTopo application can be imported in the text editor as well as in the map
editor ({\it File $\to$ Import $\to$ PocketTopo therion export} and
{\it Background Images $\to$ Insert $\to$ PocketTopo therion export}). The
editor ({\it File $\to$ Import $\to$ PocketTopo Therion export} and
{\it Background Images $\to$ Insert $\to$ PocketTopo Therion export}). The
same file is used for both imports. Importing the sketch does not create scrap
data directly. The drawing is just displayed on the background like scanned
bitmaps and should be digitized manually.
Expand Down
16 changes: 8 additions & 8 deletions thbook/ch03.tex
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
\subchapter Configuration file.

The configuration filename can be given as an
argument to therion. By default Therion searches for file named |thconfig|
in the current working directory. It is read like any other therion file
argument to Therion. By default Therion searches for file named |thconfig|
in the current working directory. It is read like any other Therion file
(i.e.~one command per line; empty lines or lines starting with `|#|' are ignored;
lines ended with a backslash continue on the next line.) A list of currently
supported commands follow.


\subsubchapter `system'.
Allows to execute system commands during therion compilation.\[E.g. to open or
Allows to execute system commands during Therion compilation.\[E.g. to open or
refresh external PDF viewer.] Normally Therion waits until the subprocess is
finished. If you want to continue compilation without break, use |<command> &|
syntax on Linux and |start <command>| syntax on Windows.
Expand Down Expand Up @@ -56,7 +56,7 @@
It is not possible to specify more coordinate systems for different outputs (the
last occurrence of |cs| is used for all output files).
If no |cs| is defined in the configuration file, the first |cs| therion
If no |cs| is defined in the configuration file, the first |cs| Therion
encounters in the data files is used as an output |cs|.
Inside
Expand Down Expand Up @@ -172,7 +172,7 @@
\description
Turns processing of maps on (default) or off. If you turn if off,
all scraps from selected surveys will be used in the output, no map
definitions are taken into account. Usefull for debugging map definitions.
definitions are taken into account. Useful for debugging map definitions.
\enddescription
\syntax
Expand Down Expand Up @@ -207,7 +207,7 @@
\subsubchapter `text'.
\description
Specifies translation of any default therion text in output.
Specifies translation of any default Therion text in output.
\enddescription
\syntax
Expand Down Expand Up @@ -554,7 +554,7 @@
using the colour of associated scrap.
* \NEW{6.0}|smooth-shading <off/quick>| =
set the mode of smooth scrap backgroud shading. By default, altitude and depth
set the mode of smooth scrap background shading. By default, altitude and depth
colour is interpolated across the scrap the |quick| way. Some issues are present if
transparent symbol colours are used.\[Coloured scrap background is visible underneath
the semitransparent areas, although only lower-scrap-drawings should be visible.]
Expand Down Expand Up @@ -885,7 +885,7 @@
Create reproducible PDF and SVG files.
No volatile information is included (e.g. creation date or software
version is omitted from the metadata). \TeX\ variables |\thversion|
and |\currentdate| are set to predefined constatnts.
and |\currentdate| are set to predefined constants.
This option enforces the use of Therion loop closure.
To get the same output files on different platforms, it's
Expand Down
2 changes: 1 addition & 1 deletion thbook/ch04.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Besides the messages from Therion and other programs used, the log file
contains information about computed values of magnetic declination and meridian
convergence, loop errors, scrap distortions and transformations beetwen
convergence, loop errors, scrap distortions and transformations between
coordinate reference systems chosen by the Proj library.

Absolute loop error is $\sqrt{\Delta x^2+\Delta y^2+\Delta z^2}$, where
Expand Down
2 changes: 1 addition & 1 deletion thbook/ch05.tex
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
* |\cavelength|, |\cavedepth| = approximate length and depth of the displayed map
* |\cavelengthtitle|, |\cavedepthtitle| = translated labels
* \NEW{5.4}|\cavemaxz|, |\caveminz| = altitude max/min value
* \NEW{5.4}|\thversion| = current therion version
* \NEW{5.4}|\thversion| = current Therion version
* \NEW{5.4}|\currentdate| = current date
* \NEW{5.4}|\outcscode|, |\outcsname| = output coordinate system code and name
* \NEW{5.4}|\northdir| = `true' or `grid'
Expand Down
33 changes: 29 additions & 4 deletions thbook/ch06.tex
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,32 @@
|tcl-dev|
|texlive-binaries|
|texlive-metapost|
|zlib1g-dev|.
|zlib1g-dev|
\par}

Installing dependencies on Ubuntu 24.10:

{\rightskip 0pt plus 3cm
|sudo apt install|
|bwidget|
|catch2|
|cmake|
|gcc|
|ghostscript|
|imagemagick|
|lcdf-typetools|
|libfmt-dev|
|libfreetype-dev|
|libjpeg-dev|
|libpng-dev|
|libproj-dev|
|libtk-img-dev|
|libvtk9-dev|
|libwxgtk3.2-dev|
|tcl-dev|
|texlive-binaries|
|texlive-metapost|
|zlib1g-dev|
\par}

Installing dependencies in Fedora 37:
Expand Down Expand Up @@ -176,7 +201,7 @@

\endlist

The following cmake components can be used to selectively install a part of the package: th-runtime, loch-runtime,
The following CMake components can be used to selectively install a part of the package: th-runtime, loch-runtime,
th-docs, loch-docs.

\subsubchapter Legacy approach: using make.
Expand All @@ -195,7 +220,7 @@

{\it Make parameters}

Therion's {\it makefile} may take some optional parameters.
Therion's {\it Makefile} may take some optional parameters.

\list
* |config-linux|, |config-macosx|, |config-win32| = configure Therion for a
Expand Down Expand Up @@ -424,7 +449,7 @@
* |cs-trans <cs1> <cs2> <proj-pipeline>|\NEW{6.1.0}
Define a transforamation pipeline between two coordinate systems.
Define a transformation pipeline between two coordinate systems.
\[See \www{https://proj.org/usage/transformation.html} for details of pipelines
definition.] Both |cs1| and |cs2| can be lists of aliases
enclosed in brackets.
Expand Down

0 comments on commit 546b95f

Please sign in to comment.