chiark / gitweb /
Ian Jackson [Sun, 23 May 2021 14:58:00 +0000 (15:58 +0100)]
Makefile: Hardlink example bundles into docs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:51:13 +0000 (15:51 +0100)]
Makefile: Provide EXAMPLE_BUNDLE_FILES
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:46:51 +0000 (15:46 +0100)]
docs: Document aliases
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:36:58 +0000 (15:36 +0100)]
docs: Remove obsolete `Advanced` section
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:36:30 +0000 (15:36 +0100)]
docs: Work and tidying
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:27:22 +0000 (15:27 +0100)]
docs: Work on specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:22:47 +0000 (15:22 +0100)]
docs: Work on specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:03:48 +0000 (15:03 +0100)]
docs: Clarify zipfile contents
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:02:54 +0000 (15:02 +0100)]
docs: Some todos
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 14:02:25 +0000 (15:02 +0100)]
docs: TOML terminology
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 13:55:14 +0000 (14:55 +0100)]
docs: Rename mandatory -> required
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 13:54:37 +0000 (14:54 +0100)]
docs: piece specs wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 13:38:31 +0000 (14:38 +0100)]
docs: piece specs wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 11:59:23 +0000 (12:59 +0100)]
docs: sort out cross-referencing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 11:47:55 +0000 (12:47 +0100)]
docs: wip document specs etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 02:06:06 +0000 (03:06 +0100)]
docs: wip document specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 02:01:18 +0000 (03:01 +0100)]
docs: wip document specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:58:19 +0000 (02:58 +0100)]
docs: wip document specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:58:00 +0000 (02:58 +0100)]
gamestate: Change default table size to match mao and penultima
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:48:44 +0000 (02:48 +0100)]
docs: wip document shapelibs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:45:08 +0000 (02:45 +0100)]
docs: wip document shapelibs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:37:27 +0000 (02:37 +0100)]
docs: wip document shapelibs, reorder
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:30:47 +0000 (02:30 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:27:12 +0000 (02:27 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:10:29 +0000 (02:10 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 01:06:09 +0000 (02:06 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:56:22 +0000 (01:56 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:52:36 +0000 (01:52 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:45:54 +0000 (01:45 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:40:49 +0000 (01:40 +0100)]
docs: wip document shapelibs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:40:03 +0000 (01:40 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:37:50 +0000 (01:37 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:35:05 +0000 (01:35 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:30:08 +0000 (01:30 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:26:47 +0000 (01:26 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:19:45 +0000 (01:19 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:17:11 +0000 (01:17 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 May 2021 00:03:07 +0000 (01:03 +0100)]
docs: wip document shapelibs, move from shapelib-toml
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 23:43:54 +0000 (00:43 +0100)]
docs: wip document shapelibs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 23:25:43 +0000 (00:25 +0100)]
docs: wip document bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 23:20:26 +0000 (00:20 +0100)]
docs: wip document bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 23:10:11 +0000 (00:10 +0100)]
docs: wip document bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 22:14:56 +0000 (23:14 +0100)]
bundles: Improve metadata in bundle-generated svgs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 22:06:51 +0000 (23:06 +0100)]
bundles: Include some metadata in bundle-generated svgs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:48:46 +0000 (22:48 +0100)]
termprogress::Nest: Show outer phase number only if count>1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:46:04 +0000 (22:46 +0100)]
termprogress::Nest: Show outer phase number in phase desc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:43:26 +0000 (22:43 +0100)]
otter: Show upload progress bar by default
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:21:32 +0000 (22:21 +0100)]
bundles: base64 the SVGs from bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:33:24 +0000 (22:33 +0100)]
bundles: Make Base64Meta sizes be f64
We'll want this in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:27:54 +0000 (22:27 +0100)]
bundles: Move BufReader back into image_usvg
It's base64_usvg that the actual-svg will want.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:26:54 +0000 (22:26 +0100)]
bundles: Split out base64_usvg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:18:25 +0000 (22:18 +0100)]
bundles: Move BufReader out of image_usvg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 21:16:16 +0000 (22:16 +0100)]
bundles: Parse size: Small refactoring
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 20:07:52 +0000 (21:07 +0100)]
bundles: Parse size of out of our generated usvgs, wip for base64
This is not really useful atm, but it proves the principle.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 19:33:15 +0000 (20:33 +0100)]
example bundle: Test alternative file name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 19:30:06 +0000 (20:30 +0100)]
bundles: Allow differing source file name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 19:29:12 +0000 (20:29 +0100)]
shapelib: Plumb src_name through to make_usvg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 19:48:51 +0000 (20:48 +0100)]
example bundle: sed - into the src_file_spec field in duped toml
We are going to interpret this as a source file name.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 19:48:46 +0000 (20:48 +0100)]
Makefile: Small refactoring to support more seddery
Don't use next if ...; instead, put our work in a conditional block.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 19:16:14 +0000 (20:16 +0100)]
shapelib: Include original input in SubstError
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 18:38:50 +0000 (19:38 +0100)]
shapelib: Make note_svg fallible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 18:35:44 +0000 (19:35 +0100)]
shapelib: Rename src_file_spec from r_file_spec
It will be the source file for bundled libs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 18:22:44 +0000 (19:22 +0100)]
shapelib: Pass src file name to note_svg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 18:33:05 +0000 (19:33 +0100)]
shapelib: Break out c_sbbrev in colour handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 18:26:09 +0000 (19:26 +0100)]
shapelib: Break out SubstError
We are going to want to clone this, so it has to be separate from
LibraryLoadError which contains an io::Error and can't be cloned.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:39:59 +0000 (18:39 +0100)]
shapelib: Parse the r_file_spec into the Filedata
Nothing uses this yet. We're going to use it for bundle shapes.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:34:45 +0000 (18:34 +0100)]
Revert "images in bundles: Support jpeg"
jpeg has no alpha channel so is not suitable.
This reverts commit
33ae3656071c964de995c6f6e42cec3a8f909950.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:34:10 +0000 (18:34 +0100)]
images in bundles: Example non-svg images, sort out sizes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:24:04 +0000 (18:24 +0100)]
images in bundles: Example non-svg images, make into pngs with alpha
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:09:51 +0000 (18:09 +0100)]
images in bundles: Example non-svg images in library
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:07:51 +0000 (18:07 +0100)]
images in bundles: Support jpeg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 17:06:41 +0000 (18:06 +0100)]
bundles: When we didn't find the file, lowercase the extensions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 16:58:37 +0000 (17:58 +0100)]
exmaple images: Move into library
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 15:23:20 +0000 (16:23 +0100)]
exmaple images: Photograph of a dried lemon
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 14:53:43 +0000 (15:53 +0100)]
exmaple images: Photograph of a moebius object
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 12:32:06 +0000 (13:32 +0100)]
images in bundles: Support png
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 12:43:15 +0000 (13:43 +0100)]
images: Add dependency on image library
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 May 2021 13:20:03 +0000 (14:20 +0100)]
bundles: Introduce local PictureFormat alias
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:51:44 +0000 (20:51 +0100)]
apitest: Check that unavilable spec doesn't load
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:44:36 +0000 (20:44 +0100)]
apitest: Use new OtterArgsSpec in a few places
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:42:13 +0000 (20:42 +0100)]
apitest: Use new OtterArgsSpec in a few places
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:40:56 +0000 (20:40 +0100)]
apitest: Provide OtterArgsSpec for &str and a new G(&str)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:40:35 +0000 (20:40 +0100)]
apitest: Remove some Sized foolishness
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:39:16 +0000 (20:39 +0100)]
apitest: Remove some Sized foolishness
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:30:46 +0000 (20:30 +0100)]
apitest: Make OtterArgsSpec take &dyn Substitutor
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:11:33 +0000 (20:11 +0100)]
apitest: Pass ds into OtterArgsSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:10:06 +0000 (20:10 +0100)]
apitest: Rework OtterArgsSpec trait slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:08:03 +0000 (20:08 +0100)]
apitest: Introduce OtterArgsSpec trait
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:44:32 +0000 (19:44 +0100)]
apitest: Rename reset_game() to otter_resetting()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:41:17 +0000 (19:41 +0100)]
apitest: Use new ds in a couple of places
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:39:52 +0000 (19:39 +0100)]
apitest: Provide UsualCtx::ds
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:35:04 +0000 (19:35 +0100)]
bundles: Test reset with bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:34:31 +0000 (19:34 +0100)]
apitest: Adjust table width
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:31:05 +0000 (19:31 +0100)]
apitest: Break out clear_reset_to_demo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:02:03 +0000 (19:02 +0100)]
bundles: Call updated() when clearing bundles
Oops!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 17:43:17 +0000 (18:43 +0100)]
bundles: Add a missing Derive
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 17:42:56 +0000 (18:42 +0100)]
bundles: Clear: Do not produce spurious error in log about .d
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 14:16:04 +0000 (15:16 +0100)]
otter(1): Provide --bundles-always
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:40:23 +0000 (14:40 +0100)]
test bundle: Add demo-in-test-bundle game spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:40:03 +0000 (14:40 +0100)]
Makefile: Do not put symlinks in example and test bundles
Instead, follow the links.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log