subst: Use ${...} format internally for most things

This saves allocating in the usual case and is also clearer.

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

subst tests: Add test cases for converting needles

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

subst: Have substitutor handle any needle syntax

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

subst: Have subst_general return the resolved needle

This corrects the error reporting to show what we actually looked for.

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

subst test: Add many dbg calls

It turns out that I can make these fail and having it debug is useful.

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

dice: Change the inner edges in the blue d8

This looks better.  We will have to recolour them for the red die.

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

subst: Substitute x* variables into magic template

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

dice: red wip

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

dice: d8 wip

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

subst: Allow non-'static keys

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

magic: Use new ${image} syntax

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

subst test: Test format 2 more thoroughly

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

subst tests: Disable under miri

We're going to add dbg! calls, which break.

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

subst test: Test format 2

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

subst test: Test mf1 Filename

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

subst test: Reintroduce and fix up for new API

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

subst: Make some things into methods

Wanted to do this for subst and substn but this terminally confuses
the borrow checker.

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

subst: Always substitute dollars in mformat 2 text

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

subst: Provide Dollars::enabled

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

subst: Hoist dollars into c_* aliases

So now colour_subst_1 knows if it's text or not.
No functional change.

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

subst: Demote PerhapsSubst

Reverts
  subst: Promote PerhapsSubst

We shouldn't do this for anything but colour specs.

And, really, we ought to do it only for the item name and not for the
other things, or the ${$} de-escaping is very confusing.

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

subst: Track whether we're working in a filename

Ie, we are going to do this in a principled way, depending on what
kind of thing we are trying to generate, rather than just whether we
saw something other than "_c".

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

subst: Provide and use internal_err()

We're going to have more things that might be wrong at runtime...

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

subst: Break out Substituting::err

We're going to want to reuse this.

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

Make InternalLogicError be Clone, with an Arc

shapelib wants this for SubstErrors which ought to be Clone.

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

subst: Implement format 2 and convert all libraries

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

subst: Have internal functions take borrows

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

subst: Plumb mformat into Substituting, and change it to be Cow

This will allow us to do know whether to use the new format.

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

subst: Temporarily comment out the test

There is so much reorg here.  I don't want to keep editing this.

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

subst: Track in type whether we're substituting

This stops us from failing to do a final cleanup step (which is going
to be replacing `${$}` when we have mformat 2 style.  It also stop us
restarting substitution unexpectedly, and marks places where text
enters the substitution machinery.

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

subst: Promote PerhapsSubst

I thought we wanted this for sorts.  I find we don't, but I don't want
to drop this change and deal with the conflicts.  I will revert it
later.  Much later.

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

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>