subst: Make PerhapsSubst::finish fallible

It is going to throw SubstError.

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

subst: Introduce PerhapsSubst which will let us have subst chaining

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

dice: d8 wip

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

dice: d8 wip

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

dice: d8 wip

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

otterlib: Show large objects a bit bigger

This algorithm is a bit paants.

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

otterlib: Show three views only for first two faces

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

otterlib: Fix column handling in preview

This was very confused.

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

dice: Get size right in preview with a special entrypoint

This is the code from
  dice: Get size right in preview by setting bbox, breaking other things
but in a new entrypoint used only for preview.  The comment explains why.

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

Revert "dice: Get size right in preview by setting bbox, breaking other things"

This reverts commit 1df93eed42dc37563a7bf5df825f800cb871396d.

dice: Get size right in preview by setting bbox, breaking other things

This is wrong.

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

dice: Unwrap surround_path

We're making changes here and it's confusing.  Make this more
prominent.

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

dice: Delegate our shape and bbox to outline

The bbox is still wrong.

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

dice: Preview partially-cooled-down

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

specs: Adjust shapes to be right with new code

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

dice: Adjust circle size to be right for images which are circles

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

Add shape method to OutlineTrait

dice will use this to decide their own outline.

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

impl OutlineTrait via ambassador for GenericSimpleShape

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

impl_via_ambassador: Support generics

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

impl OutlineTrait via ambassador for many types

We're going to add a method...

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

Move shapelib Outline structs into outline

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

Move outline into its own file

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

Unify outlines from shapelib and spec

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

Macro-ise spec::outline

We're going to do more here...

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

Rename RectOutline and CircleOutline

These are outlines and we are going to want an enum for just the
shapes.  Well, that's the Defn from shapelib but we want it more
generally.

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

shapelib: Rationalise some imports

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

otterlib: Show selection ring *over* the piece

This is what the game UI does.

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

piece API: rename save_reloaded_hook

This is clearer, given that we have load() for turning a spec into a
loaded piece.

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

support: Move slotmap

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

support: Move digestrw and timedfd

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

support: Move config

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

support: Rename PacketFrame errors

That's what they are.

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

support: Move packetframe et al.

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

support: Move childio and debugmutex

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

support: Move tz file to right directory

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

crate structure: Write down the import structure doctrine.

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

crate structure: Rename "prelude-part" to "imports"

This is less clumsy.

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

crate structure: Rename "imports" to "crates"

This will let us use "imports" for what is now "prelude-part".

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

crate structure: Introduce otter-support crate

Currently this only has tz.

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

Drop some unneeded re-exports, and make the use of imports::* pub

I think these re-exports were there because I thought the multiple
paths to import were making things ambiguous but actually,
experimentation shows that making the imports re-export pub works
and that it isn't possible to re-export things from the private use.

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

dice: Introduce die-d6-blue library item and use it

This moves the die spec into the library.  It works now!  Although
it's not cosmetically very nice.

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

shapelib: Do not "note" the nonexistent SVG for magic items

These do not need processing during bundle upload.  Indeed, attempting
it causes it to fail since there isn't actually any SVG.

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

shapelib: Break out LibrarySvgNoter

We're going to want a dummy one for magic library items.

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

shapelib: Substitute _colour multiple times if necessary

No, or many, is not an error here.

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

shapelib subst: Provide subst_general and change substn

We're going to want this convenience alias.  substn's previous
signature was not helpful.

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

shapelib subst: Provide subst arg to colour_subst_1

We're going to want to call substn too.

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

shapelib subst: Provide substn

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

shapelib subst: Add test cases for subst()

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

shapelib: magic: Actually substitute _colour in the template

This doesn't actually work because _colour appears multiple times and
subst insists on it being there only once.

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

shapelib: Add a trace call for the magic template

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

otterlib: Initialise the nwtemplates

Otherwise library items that depend on magical pieces that use these
templates (eg, dice) don't work correctly.

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

nwtemplates: Split init_from_config and init_from_dir

otterlib is going to call init_from_dir.

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

nwtemplates: Log a warning if there are no templates

This is probably an installation or usage error.  Reporting that helps
if subsequently a template isn't found.

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

otterlib: Pass opts to preview()

This is going to want the nwtemplates directory.

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

otterlib: Plumb gpc through from load to render

Some magical pieces require their xdata (which they set in load) for
rendering.  And now we can have library pieces which contain magical
pieces which otterlib must therefore handle.

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

Makefile: Break out NWTEMPLATEASSETS variable

We're going to want this for the dependencies of the shapelib,
since otterlib will need to read this template.

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

shapelib magic: implement

This still has some bugs.  We mustn't invoke it just yet in our
library bundles, because it will fail.

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

spec: LibraryItemNotFound: Actually report the ItemSpec

This error message was hopeless.

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

Make TomlQuote pub

Like it should have been.

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

shapelib: Break out subst_item_name

Magic is going to want this.

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

shapelib: Break out format_item_name

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

shapelib: Rework colour substitution

There were too many repetitions of the variable names etc.

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

shapelib: Fix sort key colour abbrev

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

Provide TomlQuote instead

This is slightly better in terms of consing.

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

Provide toml_quote_string

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

Add lazy_regex dependency

Sadly we can't use this in spec.rs because it's not compatible with
concat!

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

shapelib: Break out Catalouge::add_item

We're going to want to call this again in add1, I think.

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

shapelib: Break out process_files_entry

load_catalogue was getting quite unwieldy.

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

shapelib: Implement Magic catalogue entries

But nothing constructs them.

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

shapelib: Remove now-needless type annotation

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

shapelib: Introduce CatalogueEntry enum

Currently it only has one variant, but this gets us the plumbing.

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

shapelib: Split find_then from find_load

This is preparatory to making the catalogue capable of holding magic
pieces.

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

shapelib catalogue: Get description from trait

We need to disambiguate this right now because we have a concrete
item here which impl both PieceTrait and InertPieceTrait.

That's going to change later.

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

shapelib catalogue: Get sortkey from trait

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

shapelib catalogue: Make ItemSpecLoaded and find_load private

We're going to make this more complicated.  Let's make it private and
have otterlib use the trait methods.

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

docs: Correct wrong bundle version

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

dice: d6: Tiny tweaks

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

dice: d6: image: Add to edited.toml and demo.toml

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

dice: d6: image: Put comment at the end

usvg seems to hate it at the start.

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

dice: d6: image: Rename output file to match intended recolouring

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

dice: d6: image: wip extraction

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

dice: d6: Add label to the die part of die.svg

This will let us extract it for use in a shape library.

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

shapelib: Rename OutlineDefnTrait

This is clearer as we have the Enum too.

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

mformat 2: Actually implement the outline resizing

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

shapelib: Fix an improperly quoted item in a doc comment

Without the quotes, rustdoc wants this to be a hyperlink.

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

mformat 2: Actually parse the outline properly

This turns out to be quite hard.

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

ambassador: impl_via_ambassador: Make it handle multiple

The result is quite nice.

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

ambassador: impl_via_ambassador: Put back the type name

IDK what ambassador's body_struct etc. macros might use this for in
the future.  Keeping to the pattern that was in response to my MR
seems wisest ?

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

ambassador: impl_via_ambassador: Introduce and use it once

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

ambassador: Remove some empirically-unnecessary arguments etc.

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

ambassador: Switch to upstream version of delegation to fn

Directly as per:
  https://github.com/hobofan/ambassador/pull/32#issuecomment-1121759145

Quite ugly, I think.  I will try to tidy it up somehow.

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

docs: Fix two Sphinx syntax errors

These just cause misrendering, at least in my version, not an error
message.

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

Document that we need Nightly Rust for the full tests

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

mformat 2: Declare provided table and game specs format=2

This has no functional change, but it sets a good example.

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

mformat 2: Insist that builtin libraries have an explicit version

We don't want to be setting the bad example of a missing `format`, and
of course we don't want to be using format=1 either.

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

mformat 2: Convert all builtin libraries

This mostly involves deleting (enables us to delete) various size
specifications which can be inferred from the SVGs.

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

MaterialsFormatVersionError: Improve messages

Well, I managed to produce these.  But the output was a bit ugly.

I think the stuff in Other about a "reasonable integer" is covered by
the specific strings we pass in the integer conversions, and there's
going to be a possibility of completely different kinds of problem:

Use of a format default in a builtin shape library is going to become
an error.  And we don't want to add a variant for it - that's
overkill.  So we'll reuse Other, and this message is not right.

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

mformat 2: Implement the new size handling

As documented.  This is a much less confusing approach and doesn't
involve recapitulating the SVG's size, which Otter now knows.

It is easier to provide a complete reimplementation than to refactor
and reuse bits of the old.

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

shapelib: Introduce and use LLE::InGroup

Otherwise bundle errors are really quite inscrutable.

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

shapelib: Introduce and use LLE::InLibrary

Otherwise bundle errors are really quite inscrutable.

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