mformat 1: Drop the size parameter from load_mf1

This was introduced in
  size handling: Plumb svg size through to OutlineDefn
and it seemed a good idea at the time.  But when I wrote that I hadn't
decided that these entrypoints would be renamed and kept, rather than
start to contain conditionals.

The mf1 versions can't depend on the size, since in format 1 the SVG's
actual size wasn't used.

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

mformat 2: Provide OutlineDefn::load which takes an explicit size

For circles we no longer insist on width and height being equal (in
fact, insist on only being provided with one number), as we did for
mformat 1.  Rather we use the maximum of the two dimensions, for both.
As documented.

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

shapelib: outlines: Fold get* into load_mf1

Now that we are doing checking by loading with a dummy size, and the
separate check methods are gone, the get_mf1 and get_size functions
each only have one call site.

Removing them makes the code simpler.

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

mformat 2: Have resolve_square_size return Option

This moves the optional-ness handling into resolve_square_size, and
pushes the error into the call sites.

The mformat 2 callers are going to want to default this, so want an
Option.

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

mformat 2: Actually tolerate missing size during deser

We don't parse this properly yet, but we will.  This bug was found in
testing (with commits further down the branch) but I have rebased it
next to the code that introduces the bug.

Also explain that the weird scaling in GroupData only happens in mf1.

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

mformat 2: Deserialise the data that library format 2 needs

Introduce the various enums (including serde(untagged) ones) so that
we can deserialise all of the mf1 and mf2 formats into the same
structure.

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

mformat 2: Allow materials_format::Version to contain 2

Nothing changes in the behaviour yet - nothing checks this - so right
now, this format is not functioning as documented.

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

mformat 1: Have FaceTransform::from_group_mf1 take the GroupData

This gives access to mformat, which is useful for error
reporting (since it allows us to use the standard "can't do that in
this mf version" constructor).

Of course this is an _mf1 function so it doesn't need the actual
value - it could perhaps have made do with a proof token of const
generic type, or something.  But I tried that and it was a palaver.

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

mformat 2: Rename various functions to have _mf1

These entrypoints are going to be specific to format 1.

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

mformat 2: Document new format

This is not yet implemented.  Documenting it first will make these
next commits have some sensible context.

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

mformat: Provide Incompat, utility functions, LLE variant, etc.

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

shapelib: Rename nominal arg to rect from centre

This is the nominal location, around which the rectangle is
centred.  This makes it clearer exp. for the call sites elsewhere,
where this parameter is just the piece position.

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

shapelib: Implement check() as load() with dummy size

We really want to know that we will be able to call load().  The
purpose is early detection of errors.

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

Fix BuiltinLibrary::default_materials_format

This needs to be 1, for now, since all our libraries are still in
format 1.

This was wrong since it was introduced in
  materials format: Plumb through to load_catalogue
but hasn't mattered because nothing in the shapelib code actually
looks at the format yet.

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

Makefile: Always run miri on nightly

It's not stable.

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

shapelib: Break out resolve_square_size

We're going to want to reuse this even more.

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

shapelib: Reorganise shape/outline handling (2)

Centralise this in two functiosn now associated with GroupData.

Now there is one place we can put new size and outline handling.

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

shapelib: Reorganise shape/outline handling (1)

Rename OutlineCalculable to ShapeCalculable.

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

shapelib::RectShape: Add a note

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

shapelib: Reorder file and introduce sections

This was getting quite hard to navigate.

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

shapelib: Promote call to group.d.outline.check()

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

geometry: Properly publish pos_zip_try_map etc., and use a bit more

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

geometry: Rename pos_zip_try_map, add infallible pos_zip_map, use

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

geometry: Introduce some affordances, and add a use case for each

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

docs: Document format compatibility

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

docs: Make room for format version in doc of bundle metadata

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

docs: Fix formatting of sub-entries in gamespec

Re-using the same bullet point symbol confuses Sphinx.

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

Makefile, make-release: Make published version current

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

Makefile: mkdir the version-specific sphinx output dir

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

Makefile: Break out PUBLISH_DOC_SPHINX_BASE and _TAIL

We're going to want this so we can mkdir.

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

Makefile, make-release: Publish to unreleased/docs/ by default

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

docs: Fix wrong information about builtin shape libraries

shapelib-toml.rs is basically obsolete now - we just haven't
dismantled it yet.  Now this is all in docs/shapelibs.rst.

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

docs: Fix an editing error in dev.md

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

shapelib: Plumb mformat through to OutlineDefn via GroupData

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

shapelib: Make fields of GroupData private

This was odd.  It compiles with them private, and it's not serde.
I want to add mformat here, which ought not to be pub here I think?
Anyway, I think this pubness was a mistake.

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

materials format: Read in game specs, but currently ignored

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

materials format: Plumb through to load_catalogue

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

materials format: Make constants be of type VERSION

This lets them be more easily used in constructors etc.

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

materials format: Provide try_from_integer

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

materials format: String parsing

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

materials format: Introduce version type

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

main lib.rs: Sort the hyphen imports

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

shapelib: Promote toplevel as table access

We're going to want to get more out of this.

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Switch to deriving Deref

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

Fix doc comment order

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

shapelib: Rename Catalogue from Contents

The old name was vague and confusing.

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

size handling: Centralise into Contents::load_image

This was duplicated code.  Now there is only one place that calls
OutlineTrait.

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

size handling: Make OutlineOccultable return type Copy

It is.  Declare it, so we can reuse it nicely.

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

shapelib: Rename ImageLoaded

From OccInertLoaded.  We are going to make this the return time from
load_image (previously, load_svg).

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

size handling: Rename OutlineCalculable::err_mapper

I think this is a less confusing name.

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

shapelib: Tidy a tiny bit of formatting

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

size handling: Sort out outline trait error handling

Instead of the `ought` function which can be applied anywhere, use the
OutlineCalculable proof token to map the error at the trait call site.

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

size handling: Drop From<Outline> for OutlineCalculable

We don't want this, because (in the new code structure) it could only
exist if we somehow loaded an SVG, calculated its outline, threw the
outline away, and then wanted to recalculate it.

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

size handling: Plumb svg size through to OutlineDefn

size handling: Postpone outline & xform calculations until svg load

We move the outline and xform out of the catalogue, which instead gets
a proof token showing that we did check the outline definition.

This will allow them to depend on the size read from the svg.

size handling: Introduce OccInertLoaded

This is going to contain size information.

No functional change yet.

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

utils: svg_parse_size: Take &HtmlStr, not &str

This is more correct.  And it will be more convenient shortly.

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

Remove some Arcs

The one around Html is getting in my way.  These are an optimisation
which is only effective until the first save/load, which seems
useless.

Putting a GoodItemName in an Arc seems overkill.

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

Provide todo function

Using the todo!() macro in fehler-annotated functions generates
annoying dead code warnings.

And, this will fail to build in release mode - yay!

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

svg size handling: Obtain transform a bit earlier

It will be convnient to have access to svg_data.

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

svg size handling: Replace bundles.rs version

All the good properties of bundles.rs's version are now in the
utils.rs version.  Just call it.

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

svg size handling: Make the size mandatory

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

svg size handling: Introduce SVGWidthOrHeight

This allows us to return errors without cloning.  It also means we
will be able to sensibly report missing attributes when we make the
size mandatory.

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

svg size handling: SVG is case sensitive

bundles.rs had this right.

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

svg size handling: Insist on having the SVG element first

And restructure the parsing to look like that in bundles.rs.

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

svg size handling: Insist on having an SVG element

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

svg size handling: Break out tokens as mut iterator

We're going to restructure this to be a bit more like the structure in
bundles.

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

svg size handling: Rename and move svg_parse_size

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

utils: Drop EmptyType

It turns out that there already weren't any use sites.

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

utils: Drop some unused bits

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

utils: Tidy up and move DigestRead and DigestWrite

Now this file is more navigable.

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

svg size handling: Introduce new size parser

We want to get the size out of the svg on load, to make the library
spec size attribute optional (and to make things less confusing).
So start by add code to parse size out of an SVG.

But in fact it turns out we have one of these in bundle processing
already.  The need to be combined.  But for now, commit what we have.

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

Fix an error message typo

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

usvg-processor: Be a bit more verbose in error messages

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

currency: Example

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

currency: Document

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

dice: Document

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

at-currency: Test merging properly

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

apitest: updates: handle Delete

We blank out the info in the slot.  That's probably the best we can do
with the current data model.

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

at-currency: Rename variables

This was getting quite confusing.  I think this scheme is less so.

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

at-currency: More test

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

apitest: updates: Recorded: Do not overwrite with nulls

Some of these fields are Option, and if None, should nto overwrite
existing data.

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

at-currency: Add spaces in desc patterns

We don't want to match numbers which happen to end with our pattern!

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

at-currency: Break out PieceInfo::assert_desc_contains

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

at-currency: rename bn to bn1

These are being taken in sequence.

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

Replace make_svg_defs with render

This now demonstrates that there aren't any more svg generation sites
that forget to propagate a possibly-changed desc.

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

at-currency: Check that descriptions (ie, qts) change

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

Properly update desc in Recorded updates

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

at-currency: Use find_by_desc_glob

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

at-currency: Use currency symbol to find in desc

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

script: Demonstrate that we can use the desc in a log message

We can now improve many more messages, but I have other fish to fry ATM.

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

Correct sense of pin/unpin log message

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