chiark / gitweb /
Ian Jackson [Wed, 24 Mar 2021 12:01:16 +0000 (12:01 +0000)]
hidden recalc actually do: Provide occ not just notches from closure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:45:44 +0000 (11:45 +0000)]
hidden placement: Refactor to make a place to put things
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:33:09 +0000 (11:33 +0000)]
mao: Move badgers to bottom of initial deck layout
This is prettier.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:32:24 +0000 (11:32 +0000)]
mao: Change badger composition
Now 3 badgers per deck, as is common.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:30:00 +0000 (02:30 +0000)]
mao: Add another badger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:20:33 +0000 (02:20 +0000)]
library: Add another badger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:15:51 +0000 (02:15 +0000)]
mao: Add some jokers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:10:13 +0000 (02:10 +0000)]
cards: Add jokers by David Bellot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:08:09 +0000 (02:08 +0000)]
wikimedia: Licence PD-author|* is fine
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:07:36 +0000 (02:07 +0000)]
media-scraper: Tolerate * at the end of "licences" entries
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:42:24 +0000 (23:42 +0000)]
mao: Add text positions explicitly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:42:17 +0000 (23:42 +0000)]
hand: text, fix position
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:37:25 +0000 (23:37 +0000)]
hand: text seems to work in tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:12:39 +0000 (23:12 +0000)]
hand: wip text
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:53:01 +0000 (22:53 +0000)]
hand: Move owned to where we can reuse it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:48:52 +0000 (22:48 +0000)]
hidden: recalculate_occultation_general: tidy argument order
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:45:11 +0000 (22:45 +0000)]
hidden: recalculate_occultation_general: tidy argument formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:38:59 +0000 (22:38 +0000)]
hidden: Abolish now-unused log_visible
This is only used as part of log_vanilla. Don't pass it separately.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:23:43 +0000 (19:23 +0000)]
hidden: When one of the occultations is Visible, show it
We don't defer to the caller's log_visible here. (That is actually
misnamed.) The caller may have generated that from the old
occultation state.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:31:22 +0000 (22:31 +0000)]
hidden: Show sensible messages on occultation
Do not assume the most occulted is not visible. It might not be!
The previous code was all wrong.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:13:34 +0000 (19:13 +0000)]
mao: Adjust hand positions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:06:42 +0000 (19:06 +0000)]
mao: Fix brown hand y to be where orange is
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:06:20 +0000 (19:06 +0000)]
mao: Make hands smaller
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:03:48 +0000 (19:03 +0000)]
mao: Play with a double deck for now for perf reasons
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:00:20 +0000 (19:00 +0000)]
mao: Provide a whole deck
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:56:11 +0000 (18:56 +0000)]
Area: Fix overlaps
This never worked properly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:39:52 +0000 (18:39 +0000)]
mao: Tune the game
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:08:39 +0000 (18:08 +0000)]
deck: Fix ui activation sense
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:03:51 +0000 (18:03 +0000)]
mao: Provide a pickup deck
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:37:35 +0000 (03:37 +0000)]
hidden: note a bug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:26:52 +0000 (03:26 +0000)]
Tidy up, remove some warning suppressions
Ian Jackson [Mon, 22 Mar 2021 03:25:41 +0000 (03:25 +0000)]
deck: Implement ui_operation
This is most of the actual functionality
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:17:52 +0000 (03:17 +0000)]
Rectangle: Break out region() from hand.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:10:20 +0000 (03:10 +0000)]
deck: Insist that it must be a rectangle
We need this for the occultation region
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:03:57 +0000 (03:03 +0000)]
deck: Change names from "active" to "enabled"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:47:55 +0000 (02:47 +0000)]
deck: Skeleton
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:47:43 +0000 (02:47 +0000)]
pieces: Fix a style problem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:37:34 +0000 (02:37 +0000)]
Hand: Make colour be ColourSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:26:21 +0000 (02:26 +0000)]
cards: Make them be occultable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:25:16 +0000 (02:25 +0000)]
mao: Get rid of the silly two-backed card
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:18:50 +0000 (02:18 +0000)]
mao: Add some hands
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:16:33 +0000 (02:16 +0000)]
shapelib: Support occultation by back
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:16:03 +0000 (02:16 +0000)]
mao: Rename the file to match convention
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:14:29 +0000 (02:14 +0000)]
Make PieceTrait load occult return an Arc for occult
That will save cloning, in case it's expensive.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:59:23 +0000 (01:59 +0000)]
shapelib refactoring: transpose with the Arc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:52:08 +0000 (01:52 +0000)]
shapelib refactoring: Make OccData an enum
But we want to transpose with the Arc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:50:24 +0000 (01:50 +0000)]
shapelib refactoring: Do occult calculation later
It is going to want to look at back
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:45:18 +0000 (01:45 +0000)]
shapelib refactoring: Make back an Arc, so we can hand out clones
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:44:50 +0000 (01:44 +0000)]
traits: Sprinkle another Sync
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:35:37 +0000 (01:35 +0000)]
shapelib: Show things better when they are occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:30:17 +0000 (01:30 +0000)]
cards: Give them backs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 23:56:21 +0000 (23:56 +0000)]
shapelib: Honour "back" parameter for card backs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:25:23 +0000 (01:25 +0000)]
shapelib refactoring: Pass vpid to svg_face
We're going to need this when this starts to be able to call other
implementors of OccultedPieceTrait.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:08:58 +0000 (01:08 +0000)]
shapelib: Style: Remove some spurious spaces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:57:01 +0000 (00:57 +0000)]
shapelib: Implement load_occult for ItemSpec
Nothing calls this yet, but we will soon, ourselves.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:56:51 +0000 (00:56 +0000)]
shapelib refactoring: Break out svg_face and describe_face
We're going to want to reuse this.
Happily, this gets rid of a call to GPiece::dummy().
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:56:23 +0000 (00:56 +0000)]
shapelib refactoring: Rename find_load
The old name was very confusing. Now there are fewer functions called
`load`.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:42:28 +0000 (00:42 +0000)]
shapelib refactoring: Change return type of load1
We don't want this to be type-erased; we need to reuse it as a
different trait object.
This means making the `Item` struct public, but nothing else about it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:04:35 +0000 (00:04 +0000)]
Sprinkle some Send
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:03:15 +0000 (00:03 +0000)]
Sprinkle some 'static + Send + Debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 23:46:32 +0000 (23:46 +0000)]
mao: Start on a definition
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 23:46:16 +0000 (23:46 +0000)]
shapelib: Fix centre for `orig_size` pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 23:38:29 +0000 (23:38 +0000)]
library: Use default for centre
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 23:36:39 +0000 (23:36 +0000)]
shapelib: Provide sensible default for centre
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 22:58:52 +0000 (22:58 +0000)]
shapelib: Remove the default for `centre`
This is a useless default. We're about to introduce a non-useless
one, but removing this useless one first proves we're not using it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 22:56:46 +0000 (22:56 +0000)]
card backs: Use `orig_size` to match oxyomron
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 22:56:25 +0000 (22:56 +0000)]
shapelib: Provide orig_size option
This is often more convenient than `scale` plus `size`
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 22:13:45 +0000 (22:13 +0000)]
shapelib: Allow FaceTransform::from_group to throw
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 21:52:50 +0000 (21:52 +0000)]
cards: Some card backs in the library
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 21:35:56 +0000 (21:35 +0000)]
wikimedia: Tolerate AGPL3+, and LGPL tag, which means LGPLv2.1+
LGPL2.1+ is upgradeable to AGPLv3+.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 21:49:45 +0000 (21:49 +0000)]
media-scraper: wikimedia: Tolerate varying effective licence
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 21:07:37 +0000 (21:07 +0000)]
media-scraper: Remove a pointless \E
\l is one character only, so fine.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:18:20 +0000 (20:18 +0000)]
media-scraper etc.: rename cards-oxymoron "scraper"
This isn't generic to local-builds; it has special knowledge of the
gif pathnames.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:09:53 +0000 (20:09 +0000)]
cards-oxymoron: Increase the size of the cards a bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 16:56:17 +0000 (16:56 +0000)]
cards-oxymoron: wip toml definition
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:53:32 +0000 (20:53 +0000)]
media-scraper: Provide local-build scraper (is actually for oxymoron)
This is not as general as its name, but this is how I wrote it. It
will be renamed in a later commit.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:53:20 +0000 (20:53 +0000)]
media-scraper: Support scrapers with - in their name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:52:47 +0000 (20:52 +0000)]
media-scraper: Support "scrapers" that are just local massaging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:29:02 +0000 (20:29 +0000)]
shapelib: Support desc_template
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 20:15:25 +0000 (20:15 +0000)]
shapelib preview: Considerable increase only-show-one size limit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 15:20:54 +0000 (15:20 +0000)]
cards-oxymoron: Build arrangements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 15:10:27 +0000 (15:10 +0000)]
cards-oxymoron: Delete autogenerated files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 14:31:35 +0000 (14:31 +0000)]
cards-oxymoron: Commit downloaded files and add LICENCE
Downloaded this from
https://www.waste.org/~oxymoron/cards/
It's GPLv3+ so we can upgrade it to AGPLv3+.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 14:36:23 +0000 (14:36 +0000)]
LICENCE: Allow shapes to be AGPLv3+
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 12:34:35 +0000 (12:34 +0000)]
clock: Adjust and make consistent position of nick etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 12:32:50 +0000 (12:32 +0000)]
clock: Adjust position of (x) or (y)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 12:32:35 +0000 (12:32 +0000)]
clock: Swap x and y
It just makes more sense for White to be X.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 12:30:07 +0000 (12:30 +0000)]
clock: Show x and y when unclaimed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 12:25:21 +0000 (12:25 +0000)]
clock: Better handling when one player has flag up
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 12:04:42 +0000 (12:04 +0000)]
Update to modern wasm-bindgen
This involves
* Cargo.toml update to unpin the version
* Cargo.lock update, consequential
* Get rid of our ad-hoc kludge to get the wasm object into script.ts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:41:30 +0000 (11:41 +0000)]
cargo: Fix syntax for wasm-bindgen dependency
This meant what I meant, but it's strange.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:40:07 +0000 (11:40 +0000)]
README.md: Update dependency count
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:37:20 +0000 (11:37 +0000)]
Use stamp file for wasm-bindgen-cli
cargo doesn't always touch the file, so we end up with useless
rebuilds etherwise.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:20:00 +0000 (11:20 +0000)]
cargo: Rename lockfile to Cargo.lock
This is apparently recommended for a thing which is a program.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:19:05 +0000 (11:19 +0000)]
Makefile: Delete some obsolete commented-out stuff
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:18:25 +0000 (11:18 +0000)]
README.md: Mention bubblewrap dependency
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:17:19 +0000 (11:17 +0000)]
README.md: Remove references to wasm-pack
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 10:47:34 +0000 (10:47 +0000)]
Makefile: Drop use of wasm-pack
I'm told on Discord that this is obsolete. (The docs all still
mention it, though.)
Anyway, the only thing it was actually doing for us was obtaining and
running wasm-bindgen. We can do that ourselves.
At one time we were using it to get and run wasm-opt, saving 5k out of
50k in the wasm file, but that was broken so we disabled it a while
ago.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 10:21:38 +0000 (10:21 +0000)]
cargo: Add our dependency on wasm-bindgen-cli
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 11:10:14 +0000 (11:10 +0000)]
Makefile: introduce MAKEFILE_FIND_X
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>