chiark / gitweb /
otter.git
3 years agoinfopane: Move background colour to infopane from us
Ian Jackson [Wed, 13 Jan 2021 22:49:45 +0000 (22:49 +0000)]
infopane: Move background colour to infopane from us

No intentional resulting overall visual change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoinfopane: Move layout sizing to infopane from us
Ian Jackson [Wed, 13 Jan 2021 22:48:41 +0000 (22:48 +0000)]
infopane: Move layout sizing to infopane from us

No intentional resulting overall layout change.  Ha ha ha.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoinfopane: Start to split up, wrap in a new div, rename macro, nfc
Ian Jackson [Wed, 13 Jan 2021 22:26:21 +0000 (22:26 +0000)]
infopane: Start to split up, wrap in a new div, rename macro, nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoclick elsewhere, or on pinned piece, deselects all, only unshifted
Ian Jackson [Wed, 13 Jan 2021 22:19:38 +0000 (22:19 +0000)]
click elsewhere, or on pinned piece, deselects all, only unshifted

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoclick elsewhere, or on pinned piece, deselects all
Ian Jackson [Wed, 13 Jan 2021 22:18:12 +0000 (22:18 +0000)]
click elsewhere, or on pinned piece, deselects all

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoscript.ts: Expose `pieces` to global scope, for wdt
Ian Jackson [Wed, 13 Jan 2021 22:17:43 +0000 (22:17 +0000)]
script.ts: Expose `pieces` to global scope, for wdt

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoComment about alternatives we considered
Ian Jackson [Wed, 13 Jan 2021 21:58:45 +0000 (21:58 +0000)]
Comment about alternatives we considered

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDo not reset access tokens (ie, invalidate urls) if access is the same
Ian Jackson [Wed, 13 Jan 2021 21:36:24 +0000 (21:36 +0000)]
Do not reset access tokens (ie, invalidate urls) if access is the same

This means that if the user specifies an access option to
`otter --join-game` they don't get thrown off if it was the same as
before.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoAdd tmp to .gitignore
Ian Jackson [Wed, 13 Jan 2021 21:18:53 +0000 (21:18 +0000)]
Add tmp to .gitignore

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: Fix recent changes
Ian Jackson [Wed, 13 Jan 2021 21:11:37 +0000 (21:11 +0000)]
Makefile: Fix recent changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: Exclude */build/* from rsrcs
Ian Jackson [Wed, 13 Jan 2021 21:06:31 +0000 (21:06 +0000)]
Makefile: Exclude */build/* from rsrcs

When not using nailing-cargo we may run bits of make concurrently with
builds and we don't want to pick up any cargo-downloaded stuff.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: Fix a bare use of --just-run
Ian Jackson [Wed, 13 Jan 2021 21:01:55 +0000 (21:01 +0000)]
Makefile: Fix a bare use of --just-run

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoupdate to slotmap 1.x
Ian Jackson [Wed, 13 Jan 2021 18:19:50 +0000 (18:19 +0000)]
update to slotmap 1.x

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoupdate x11rb
Ian Jackson [Wed, 13 Jan 2021 02:02:04 +0000 (02:02 +0000)]
update x11rb

Prompted by
  nailing-cargo --subcommand-props='!locked,!target-dir,!offline' upgrades

Remaining are:

  slotmap >=0.4.0, <0.5.0 matches 0.4.0; latest is 1.0.2
             API break which affects us directly

  tera >=0.11.0, <0.12.0 matches 0.11.20; latest is 1.6.1
             we want to stay aligned with Rocket

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoupdate rmp-serde
Ian Jackson [Wed, 13 Jan 2021 02:00:32 +0000 (02:00 +0000)]
update rmp-serde

Prompted by
  nailing-cargo --subcommand-props='!locked,!target-dir,!offline' upgrades

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: drop "doc" from default build
Ian Jackson [Wed, 13 Jan 2021 01:56:12 +0000 (01:56 +0000)]
Makefile: drop "doc" from default build

It is slow and annoying

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoupdate itertools and nix
Ian Jackson [Wed, 13 Jan 2021 01:55:57 +0000 (01:55 +0000)]
update itertools and nix

Prompted by
  nailing-cargo --subcommand-props='!locked,!target-dir,!offline' upgrades

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoupdate flexi_logger
Ian Jackson [Wed, 13 Jan 2021 01:52:12 +0000 (01:52 +0000)]
update flexi_logger

Prompted by
  nailing-cargo --subcommand-props='!locked,!target-dir,!offline' upgrades

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocargo update
Ian Jackson [Wed, 13 Jan 2021 01:49:29 +0000 (01:49 +0000)]
cargo update

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoUpdate out of date "thirtyfour_sync" dependency
Ian Jackson [Wed, 13 Jan 2021 01:47:50 +0000 (01:47 +0000)]
Update out of date "thirtyfour_sync" dependency

This one got broken by a breaking change to a dependency (syn again I
think).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoUpdate out of date "delegate" dependency
Ian Jackson [Wed, 13 Jan 2021 01:40:34 +0000 (01:40 +0000)]
Update out of date "delegate" dependency

This old one which we were using by mistake got broken by a change to
syn.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib docs: Mention in README.md
Ian Jackson [Wed, 13 Jan 2021 01:10:25 +0000 (01:10 +0000)]
shapelib docs: Mention in README.md

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib docs: Update a bit
Ian Jackson [Wed, 13 Jan 2021 01:06:23 +0000 (01:06 +0000)]
shapelib docs: Update a bit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib docs: Much work
Ian Jackson [Wed, 13 Jan 2021 00:58:52 +0000 (00:58 +0000)]
shapelib docs: Much work

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agolibrary/edited: Remove unused remote filename information
Ian Jackson [Wed, 13 Jan 2021 00:58:28 +0000 (00:58 +0000)]
library/edited: Remove unused remote filename information

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoPrint url of shapelib_toml docs too
Ian Jackson [Wed, 13 Jan 2021 00:58:15 +0000 (00:58 +0000)]
Print url of shapelib_toml docs too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: Print shapelib preview url
Ian Jackson [Tue, 12 Jan 2021 23:36:29 +0000 (23:36 +0000)]
Makefile: Print shapelib preview url

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoREADME updates
Ian Jackson [Tue, 12 Jan 2021 23:33:54 +0000 (23:33 +0000)]
README updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomake (just) shapelib docs if you ask for shapelib
Ian Jackson [Tue, 12 Jan 2021 23:24:16 +0000 (23:24 +0000)]
make (just) shapelib docs if you ask for shapelib

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMove shapelib docs to shapelib-toml.rs
Ian Jackson [Tue, 12 Jan 2021 22:00:12 +0000 (22:00 +0000)]
Move shapelib docs to shapelib-toml.rs

This seems to be working, so commit it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoREADME: Adjust svg editing documentation
Ian Jackson [Tue, 12 Jan 2021 21:20:38 +0000 (21:20 +0000)]
README: Adjust svg editing documentation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoAdd-hoc rule for binaries (which does not depend on stamp files)
Ian Jackson [Tue, 12 Jan 2021 21:17:04 +0000 (21:17 +0000)]
Add-hoc rule for binaries (which does not depend on stamp files)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoShape library documentation editing
Ian Jackson [Tue, 12 Jan 2021 21:04:43 +0000 (21:04 +0000)]
Shape library documentation editing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshape library style slightly
Ian Jackson [Tue, 12 Jan 2021 20:20:53 +0000 (20:20 +0000)]
shape library style slightly

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoFix shape library dependency
Ian Jackson [Tue, 12 Jan 2021 20:18:43 +0000 (20:18 +0000)]
Fix shape library dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoDrop some not-needed unstable features
Ian Jackson [Tue, 12 Jan 2021 20:15:06 +0000 (20:15 +0000)]
Drop some not-needed unstable features

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoInclude shapelib top-level target
Ian Jackson [Tue, 12 Jan 2021 20:11:11 +0000 (20:11 +0000)]
Include shapelib top-level target

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoInclude shapelib link
Ian Jackson [Tue, 12 Jan 2021 20:10:15 +0000 (20:10 +0000)]
Include shapelib link

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoServe /_/shapelib.html
Ian Jackson [Tue, 12 Jan 2021 20:05:06 +0000 (20:05 +0000)]
Serve /_/shapelib.html

Nothing links to this yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoUpdate copyright notices for 2021 and other contributors
Ian Jackson [Tue, 12 Jan 2021 19:52:12 +0000 (19:52 +0000)]
Update copyright notices for 2021 and other contributors

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: Know how to make shapelib.html
Ian Jackson [Tue, 12 Jan 2021 19:38:15 +0000 (19:38 +0000)]
Makefile: Know how to make shapelib.html

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: Allow multiple libs separated with space or comma
Ian Jackson [Tue, 12 Jan 2021 19:37:45 +0000 (19:37 +0000)]
otterlib: Allow multiple libs separated with space or comma

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: Fix HTML <th>
Ian Jackson [Tue, 12 Jan 2021 19:20:28 +0000 (19:20 +0000)]
otterlib: Fix HTML <th>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: Sort items in preview
Ian Jackson [Tue, 12 Jan 2021 19:20:17 +0000 (19:20 +0000)]
otterlib: Sort items in preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: Include HTML prelude and trailer
Ian Jackson [Tue, 12 Jan 2021 19:19:59 +0000 (19:19 +0000)]
otterlib: Include HTML prelude and trailer

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoFix bbox for Square (!)
Ian Jackson [Tue, 12 Jan 2021 19:19:31 +0000 (19:19 +0000)]
Fix bbox for Square (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoCopyright: add some missing information
Ian Jackson [Tue, 12 Jan 2021 19:19:17 +0000 (19:19 +0000)]
Copyright: add some missing information

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, show uos
Ian Jackson [Tue, 12 Jan 2021 18:36:17 +0000 (18:36 +0000)]
otterlib: wip preview, show uos

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, show surround
Ian Jackson [Tue, 12 Jan 2021 18:30:47 +0000 (18:30 +0000)]
otterlib: wip preview, show surround

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoui: Break out player_dasharray
Ian Jackson [Tue, 12 Jan 2021 18:28:37 +0000 (18:28 +0000)]
ui: Break out player_dasharray

otterlib preview wants it

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, fix some escaping
Ian Jackson [Tue, 12 Jan 2021 18:28:12 +0000 (18:28 +0000)]
otterlib: wip preview, fix some escaping

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocargo: filter out stupid doc output warnings
Ian Jackson [Tue, 12 Jan 2021 18:27:52 +0000 (18:27 +0000)]
cargo: filter out stupid doc output warnings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoui: Move HELD_SURROUND_COLOUR into ui.rs
Ian Jackson [Tue, 12 Jan 2021 17:59:01 +0000 (17:59 +0000)]
ui: Move HELD_SURROUND_COLOUR into ui.rs

otterlib wants this, and we shouldn't specify it twice

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, wip inseveral
Ian Jackson [Tue, 12 Jan 2021 01:13:11 +0000 (01:13 +0000)]
otterlib: wip preview, wip inseveral

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, ready for inseveral
Ian Jackson [Tue, 12 Jan 2021 01:07:58 +0000 (01:07 +0000)]
otterlib: wip preview, ready for inseveral

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, reorg a bit nfc
Ian Jackson [Tue, 12 Jan 2021 00:56:27 +0000 (00:56 +0000)]
otterlib: wip preview, reorg a bit nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, reorg a bit nfc
Ian Jackson [Tue, 12 Jan 2021 00:54:59 +0000 (00:54 +0000)]
otterlib: wip preview, reorg a bit nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, reorg a bit nfc
Ian Jackson [Tue, 12 Jan 2021 00:50:25 +0000 (00:50 +0000)]
otterlib: wip preview, reorg a bit nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, reorg a bit nfc
Ian Jackson [Tue, 12 Jan 2021 00:49:44 +0000 (00:49 +0000)]
otterlib: wip preview, reorg a bit nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview, generates a thing
Ian Jackson [Tue, 12 Jan 2021 00:46:01 +0000 (00:46 +0000)]
otterlib: wip preview, generates a thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 22:05:20 +0000 (22:05 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 21:27:57 +0000 (21:27 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: Note rune in comment, for now
Ian Jackson [Mon, 11 Jan 2021 01:19:30 +0000 (01:19 +0000)]
otterlib: Note rune in comment, for now

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoadd doc to default target
Ian Jackson [Mon, 11 Jan 2021 01:07:48 +0000 (01:07 +0000)]
add doc to default target

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 01:07:10 +0000 (01:07 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agobreak out SVG_SCALE (nfc)
Ian Jackson [Mon, 11 Jan 2021 00:54:52 +0000 (00:54 +0000)]
break out SVG_SCALE (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agogamestate: a todo to add a fehler bug ref
Ian Jackson [Mon, 11 Jan 2021 00:50:11 +0000 (00:50 +0000)]
gamestate: a todo to add a fehler bug ref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 00:50:06 +0000 (00:50 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 00:29:39 +0000 (00:29 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 00:27:21 +0000 (00:27 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 00:21:35 +0000 (00:21 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip preview
Ian Jackson [Mon, 11 Jan 2021 00:20:58 +0000 (00:20 +0000)]
otterlib: wip preview

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip, ready for html
Ian Jackson [Mon, 11 Jan 2021 00:09:25 +0000 (00:09 +0000)]
otterlib: wip, ready for html

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agopenultimae: remove flags from example
Ian Jackson [Sun, 10 Jan 2021 23:48:19 +0000 (23:48 +0000)]
penultimae: remove flags from example

Black flags do not render well on light squares - the flagpole is
invisible.

Leave the in the library in case someone really wants them.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agolibrary: Harlequin pawn placeholder (todo list) entry
Ian Jackson [Sun, 10 Jan 2021 12:10:51 +0000 (12:10 +0000)]
library: Harlequin pawn placeholder (todo list) entry

To be nicely useable this SVG needs editing.  Really it should go in
library/edited/

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agolibrary: Adjust some chess piece colours to my liking
Ian Jackson [Sun, 10 Jan 2021 11:36:06 +0000 (11:36 +0000)]
library: Adjust some chess piece colours to my liking

* Make the pale edges of the black pieces less glowy, by using a grey
* Make the light blue a bit darker and thus better distinguished from white
* Make the purpe redder than therefore (IMO) more purpley

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agopenultima: Update the game's introductory set for new pices
Ian Jackson [Sun, 10 Jan 2021 23:31:01 +0000 (23:31 +0000)]
penultima: Update the game's introductory set for new pices

Additions:
 * Purple pieces
 * Giraffe, cannon, flag
 * Knights in the four extra colours
 * Ships in black and white

Removals (note: these can be added with library-add, but are not shown
on the playing field by default):
 * Ships in extra colours.  (We demo the black and white ships.)
 * Portals

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agolibrary: Adjust the cannon to be in the centre
Ian Jackson [Sun, 10 Jan 2021 23:38:26 +0000 (23:38 +0000)]
library: Adjust the cannon to be in the centre

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agowikimedia chess pieces: Add the size-26 cannon, siege engine, flag
Ian Jackson [Sun, 10 Jan 2021 12:16:02 +0000 (12:16 +0000)]
wikimedia chess pieces: Add the size-26 cannon, siege engine, flag

Suggested-by: Clare Boothby
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agowikimedia chess pieces: Add the giraffe
Ian Jackson [Sun, 10 Jan 2021 12:15:39 +0000 (12:15 +0000)]
wikimedia chess pieces: Add the giraffe

Suggested-by: Clare Boothby
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agowikimedia chess pieces: Import updated SVGs from Wikimedia
Ian Jackson [Sun, 10 Jan 2021 12:19:54 +0000 (12:19 +0000)]
wikimedia chess pieces: Import updated SVGs from Wikimedia

Done by removing the files locally and letting media-scraper download
them.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agowikimedia chess pieces: Use new recolouring system, change colours
Ian Jackson [Sun, 10 Jan 2021 12:05:24 +0000 (12:05 +0000)]
wikimedia chess pieces: Use new recolouring system, change colours

We replace red/yellow/green with red/yellow/light-blue/purple.

This provides, additionally, the missing colour variants.

Clare helpfully uploaded a white ship piece to Wikimedia, so we let
media-scraper download that.

The coloured pieces in Penultima are replaced by the ones we provide
here.  Mostly this is just a name change, but "g" are supplanted by
"blue".

The chess-w-* files are renamed.  The others are now obsolete.

Signed-off-by: Clare Boothby
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agorun1: Fold lines in log report
Ian Jackson [Sun, 10 Jan 2021 22:32:18 +0000 (22:32 +0000)]
run1: Fold lines in log report

Otherwise we can generate an unbounded amount of ouptut.  With very
very long lines, which can make emacs very slow.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agorun1: Put our log filename at the front
Ian Jackson [Sun, 10 Jan 2021 22:30:03 +0000 (22:30 +0000)]
run1: Put our log filename at the front

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agorun1: Fix log filename for lwdt-* (--as-if)
Ian Jackson [Sun, 10 Jan 2021 22:29:42 +0000 (22:29 +0000)]
run1: Fix log filename for lwdt-* (--as-if)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agosvg processing: Put through usvg before inkscape as well as after
Ian Jackson [Sun, 10 Jan 2021 22:04:47 +0000 (22:04 +0000)]
svg processing: Put through usvg before inkscape as well as after

Our copy of library/wikimedia/chess-_c-commoner.svg from
  https://upload.wikimedia.org/wikipedia/commons/7/7d/Commoner_Transparent.svg
generates this error from inkscape's color_replace extension:

  $ /usr/share/inkscape/extensions/color_replace.py -f 'ffffff' -t 'abcbfb' library/wikimedia/chess-_c-commoner.svg >library/wikimedia/chess-b-commoner.coloured.svg.0.tmp
  Traceback (most recent call last):
    File "/usr/share/inkscape/extensions/color_replace.py", line 25, in <module>
      c.affect()
    File "/usr/share/inkscape/extensions/inkex.py", line 283, in affect
      self.effect()
    File "/usr/share/inkscape/extensions/coloreffect.py", line 37, in effect
      self.getAttribs(self.document.getroot())
    File "/usr/share/inkscape/extensions/coloreffect.py", line 45, in getAttribs
      self.getAttribs(child)
    File "/usr/share/inkscape/extensions/coloreffect.py", line 45, in getAttribs
      self.getAttribs(child)
    File "/usr/share/inkscape/extensions/coloreffect.py", line 45, in getAttribs
      self.getAttribs(child)
    File "/usr/share/inkscape/extensions/coloreffect.py", line 45, in getAttribs
      self.getAttribs(child)
    File "/usr/share/inkscape/extensions/coloreffect.py", line 43, in getAttribs
      self.changeStyle(node)
    File "/usr/share/inkscape/extensions/coloreffect.py", line 55, in changeStyle
      if node.attrib.has_key('style'):
  AttributeError: '_ImmutableMapping' object has no attribute 'has_key'
  $

This is reproducible by hand via the inkscape GUI.

Emprically, running the file through usvg first fixes it.  *shrug*

We need to do this before we can start relying on the recolouring
support.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomgmtchanne: More helpfully report errors from AlterGame insns
Ian Jackson [Sun, 10 Jan 2021 21:49:51 +0000 (21:49 +0000)]
mgmtchanne: More helpfully report errors from AlterGame insns

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: sort things (again)
Ian Jackson [Sun, 10 Jan 2021 21:32:15 +0000 (21:32 +0000)]
otterlib: sort things (again)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: list lib along with item
Ian Jackson [Sun, 10 Jan 2021 18:12:09 +0000 (18:12 +0000)]
otterlib: list lib along with item

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: list all libs together
Ian Jackson [Sun, 10 Jan 2021 18:07:44 +0000 (18:07 +0000)]
otterlib: list all libs together

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: list option
Ian Jackson [Sun, 10 Jan 2021 16:39:25 +0000 (16:39 +0000)]
otterlib: list option

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: load shapes
Ian Jackson [Sun, 10 Jan 2021 15:59:50 +0000 (15:59 +0000)]
otterlib: load shapes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agootterlib: wip new arrangements
Ian Jackson [Sun, 10 Jan 2021 13:31:05 +0000 (13:31 +0000)]
otterlib: wip new arrangements

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib: Load from Vec<Config1> rather than config()
Ian Jackson [Sun, 10 Jan 2021 13:21:44 +0000 (13:21 +0000)]
shapelib: Load from Vec<Config1> rather than config()

This makes this function not tied to Config, which will be more
suitable for otterlib.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoLibraryItemNotFound: Include item name in error
Ian Jackson [Sun, 10 Jan 2021 21:24:06 +0000 (21:24 +0000)]
LibraryItemNotFound: Include item name in error

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agocmdlistener: Better debug reporting of executed commands
Ian Jackson [Sun, 10 Jan 2021 21:23:36 +0000 (21:23 +0000)]
cmdlistener: Better debug reporting of executed commands

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoshapelib: Allow colours = { }
Ian Jackson [Sun, 10 Jan 2021 12:06:02 +0000 (12:06 +0000)]
shapelib: Allow colours = { }

Option<> is bad because we can't override to absent.  And the Perl
code in media-scraper already treats an empty colours array as no
recolouring.  Do that here too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoMakefile: Build files.make at build-time, and do not commit it
Ian Jackson [Sun, 10 Jan 2021 11:59:05 +0000 (11:59 +0000)]
Makefile: Build files.make at build-time, and do not commit it

media-scraper can make this from library/*.toml without online access
so it's suitable for the build, now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomedia-scraper: offline mode
Ian Jackson [Sun, 10 Jan 2021 11:51:02 +0000 (11:51 +0000)]
media-scraper: offline mode

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agomedia-scraper: Properly include dependency on files.make
Ian Jackson [Sun, 10 Jan 2021 11:35:55 +0000 (11:35 +0000)]
media-scraper: Properly include dependency on files.make

Otherwise if you change colours, and rerun media-scraper, it doesn't
rebuild.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>