Index: README.md
==================================================================
--- README.md
+++ README.md
@@ -21,7 +21,6 @@
 
 The software, including the manual, is licensed
 under the [European Union Public License 1.2 (or
 later)](https://zettelstore.de/home/file?name=LICENSE.txt&ci=trunk).
 
-[Stay](https://twitter.com/zettelstore)
-<a rel="me" href="https://nerdculture.de/@zettelstore">tuned</a>&nbsp;&hellip;
+[Stay tuned](https://mastodon.social/tags/Zettelstore)&nbsp;&hellip;

Index: VERSION
==================================================================
--- VERSION
+++ VERSION
@@ -1,1 +1,1 @@
-0.11.0
+0.17.0-dev

Index: ast/ast.go
==================================================================
--- ast/ast.go
+++ ast/ast.go
@@ -12,20 +12,20 @@
 package ast
 
 import (
 	"net/url"
 
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // ZettelNode is the root node of the abstract syntax tree.
 // It is *not* part of the visitor pattern.
 type ZettelNode struct {
 	Meta    *meta.Meta     // Original metadata
-	Content domain.Content // Original content
+	Content zettel.Content // Original content
 	Zid     id.Zid         // Zettel identification.
 	InhMeta *meta.Meta     // Metadata of the zettel, with inherited values.
 	Ast     BlockSlice     // Zettel abstract syntax tree is a sequence of block nodes.
 	Syntax  string         // Syntax / parser that produced the Ast
 }

Index: ast/block.go
==================================================================
--- ast/block.go
+++ ast/block.go
@@ -8,11 +8,11 @@
 // under this license.
 //-----------------------------------------------------------------------------
 
 package ast
 
-import "zettelstore.de/c/attrs"
+import "zettelstore.de/client.fossil/attrs"
 
 // Definition of Block nodes.
 
 // BlockSlice is a slice of BlockNodes.
 type BlockSlice []BlockNode

Index: ast/inline.go
==================================================================
--- ast/inline.go
+++ ast/inline.go
@@ -11,11 +11,11 @@
 package ast
 
 import (
 	"unicode/utf8"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 )
 
 // Definitions of inline nodes.
 
 // InlineSlice is a list of BlockNodes.
@@ -193,18 +193,19 @@
 type FormatKind int
 
 // Constants for FormatCode
 const (
 	_            FormatKind = iota
-	FormatEmph              // Emphasized text.
-	FormatStrong            // Strongly emphasized text.
-	FormatInsert            // Inserted text.
-	FormatDelete            // Deleted text.
-	FormatSuper             // Superscripted text.
-	FormatSub               // SubscriptedText.
-	FormatQuote             // Quoted text.
-	FormatSpan              // Generic inline container.
+	FormatEmph              // Emphasized text
+	FormatStrong            // Strongly emphasized text
+	FormatInsert            // Inserted text
+	FormatDelete            // Deleted text
+	FormatSuper             // Superscripted text
+	FormatSub               // SubscriptedText
+	FormatQuote             // Quoted text
+	FormatMark              // Marked text
+	FormatSpan              // Generic inline container
 )
 
 func (*FormatNode) inlineNode() { /* Just a marker */ }
 
 // WalkChildren walks to the formatted text.

Index: ast/ref.go
==================================================================
--- ast/ref.go
+++ ast/ref.go
@@ -12,11 +12,11 @@
 
 import (
 	"net/url"
 	"strings"
 
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 // QueryPrefix is the prefix that denotes a query expression.
 const QueryPrefix = "query:"
 

Index: ast/walk_test.go
==================================================================
--- ast/walk_test.go
+++ ast/walk_test.go
@@ -11,11 +11,11 @@
 package ast_test
 
 import (
 	"testing"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
 )
 
 func BenchmarkWalk(b *testing.B) {
 	root := ast.BlockSlice{

Index: auth/auth.go
==================================================================
--- auth/auth.go
+++ auth/auth.go
@@ -14,12 +14,12 @@
 import (
 	"time"
 
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // BaseManager allows to check some base auth modes.
 type BaseManager interface {
 	// IsReadonly returns true, if the systems is configured to run in read-only-mode.
@@ -40,12 +40,12 @@
 type TokenKind int
 
 // Allowed values of token kind
 const (
 	_ TokenKind = iota
-	KindJSON
-	KindHTML
+	KindAPI
+	KindwebUI
 )
 
 // TokenData contains some important elements from a token.
 type TokenData struct {
 	Token   []byte

Index: auth/cred/cred.go
==================================================================
--- auth/cred/cred.go
+++ auth/cred/cred.go
@@ -13,11 +13,11 @@
 
 import (
 	"bytes"
 
 	"golang.org/x/crypto/bcrypt"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 // HashCredential returns a hashed vesion of the given credential
 func HashCredential(zid id.Zid, ident, credential string) (string, error) {
 	fullCredential := createFullCredential(zid, ident, credential)
@@ -42,12 +42,12 @@
 	return false, err
 }
 
 func createFullCredential(zid id.Zid, ident, credential string) []byte {
 	var buf bytes.Buffer
-	buf.WriteString(zid.String())
+	buf.Write(zid.Bytes())
 	buf.WriteByte(' ')
 	buf.WriteString(ident)
 	buf.WriteByte(' ')
 	buf.WriteString(credential)
 	return buf.Bytes()
 }

ADDED   auth/impl/digest.go
Index: auth/impl/digest.go
==================================================================
--- auth/impl/digest.go
+++ auth/impl/digest.go
@@ -0,0 +1,83 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package impl
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/hmac"
+	"encoding/base64"
+
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/sx.fossil/sxreader"
+)
+
+var encoding = base64.RawURLEncoding
+
+const digestAlg = crypto.SHA384
+
+func sign(claim sx.Object, secret []byte) ([]byte, error) {
+	var buf bytes.Buffer
+	sx.Print(&buf, claim)
+	token := make([]byte, encoding.EncodedLen(buf.Len()))
+	encoding.Encode(token, buf.Bytes())
+
+	digest := hmac.New(digestAlg.New, secret)
+	_, err := digest.Write(buf.Bytes())
+	if err != nil {
+		return nil, err
+	}
+	dig := digest.Sum(nil)
+	encDig := make([]byte, encoding.EncodedLen(len(dig)))
+	encoding.Encode(encDig, dig)
+
+	token = append(token, '.')
+	token = append(token, encDig...)
+	return token, nil
+}
+
+func check(token []byte, secret []byte) (sx.Object, error) {
+	i := bytes.IndexByte(token, '.')
+	if i <= 0 || 1024 < i {
+		return nil, ErrMalformedToken
+	}
+	buf := make([]byte, len(token))
+	n, err := encoding.Decode(buf, token[:i])
+	if err != nil {
+		return nil, err
+	}
+	rdr := sxreader.MakeReader(bytes.NewReader(buf[:n]))
+	obj, err := rdr.Read()
+	if err != nil {
+		return nil, err
+	}
+
+	var objBuf bytes.Buffer
+	_, err = sx.Print(&objBuf, obj)
+	if err != nil {
+		return nil, err
+	}
+
+	digest := hmac.New(digestAlg.New, secret)
+	_, err = digest.Write(objBuf.Bytes())
+	if err != nil {
+		return nil, err
+	}
+
+	n, err = encoding.Decode(buf, token[i+1:])
+	if err != nil {
+		return nil, err
+	}
+	if !hmac.Equal(buf[:n], digest.Sum(nil)) {
+		return nil, ErrMalformedToken
+	}
+	return obj, nil
+}

Index: auth/impl/impl.go
==================================================================
--- auth/impl/impl.go
+++ auth/impl/impl.go
@@ -15,20 +15,20 @@
 	"errors"
 	"hash/fnv"
 	"io"
 	"time"
 
-	"github.com/pascaldekloe/jwt"
-
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/sexp"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/auth/policy"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type myAuth struct {
 	readonly bool
 	owner    id.Zid
@@ -65,11 +65,12 @@
 }
 
 // IsReadonly returns true, if the systems is configured to run in read-only-mode.
 func (a *myAuth) IsReadonly() bool { return a.readonly }
 
-const reqHash = jwt.HS512
+// ErrMalformedToken signals a broken token.
+var ErrMalformedToken = errors.New("auth: malformed token")
 
 // ErrNoIdent signals that the 'ident' key is missing.
 var ErrNoIdent = errors.New("auth: missing ident")
 
 // ErrOtherKind signals that the token was defined for another token kind.
@@ -84,68 +85,66 @@
 	if !ok || subject == "" {
 		return nil, ErrNoIdent
 	}
 
 	now := time.Now().Round(time.Second)
-	claims := jwt.Claims{
-		Registered: jwt.Registered{
-			Subject: subject,
-			Expires: jwt.NewNumericTime(now.Add(d)),
-			Issued:  jwt.NewNumericTime(now),
-		},
-		Set: map[string]interface{}{
-			"zid": ident.Zid.String(),
-			"_tk": int(kind),
-		},
-	}
-	token, err := claims.HMACSign(reqHash, a.secret)
-	if err != nil {
-		return nil, err
-	}
-	return token, nil
+	sClaim := sx.MakeList(
+		sx.Int64(kind),
+		sx.String(subject),
+		sx.Int64(now.Unix()),
+		sx.Int64(now.Add(d).Unix()),
+		sx.Int64(ident.Zid),
+	)
+	return sign(sClaim, a.secret)
 }
 
 // ErrTokenExpired signals an exired token
 var ErrTokenExpired = errors.New("auth: token expired")
 
 // CheckToken checks the validity of the token and returns relevant data.
-func (a *myAuth) CheckToken(token []byte, k auth.TokenKind) (auth.TokenData, error) {
-	h, err := jwt.NewHMAC(reqHash, a.secret)
-	if err != nil {
-		return auth.TokenData{}, err
-	}
-	claims, err := h.Check(token)
-	if err != nil {
-		return auth.TokenData{}, err
-	}
-	now := time.Now().Round(time.Second)
-	expires := claims.Expires.Time()
-	if expires.Before(now) {
-		return auth.TokenData{}, ErrTokenExpired
-	}
-	ident := claims.Subject
+func (a *myAuth) CheckToken(tok []byte, k auth.TokenKind) (auth.TokenData, error) {
+	var tokenData auth.TokenData
+
+	obj, err := check(tok, a.secret)
+	if err != nil {
+		return tokenData, err
+	}
+
+	tokenData.Token = tok
+	err = setupTokenData(obj, k, &tokenData)
+	return tokenData, err
+}
+
+func setupTokenData(obj sx.Object, k auth.TokenKind, tokenData *auth.TokenData) error {
+	vals, err := sexp.ParseList(obj, "isiii")
+	if err != nil {
+		return ErrMalformedToken
+	}
+	if auth.TokenKind(vals[0].(sx.Int64)) != k {
+		return ErrOtherKind
+	}
+	ident := vals[1].(sx.String)
 	if ident == "" {
-		return auth.TokenData{}, ErrNoIdent
-	}
-	if zidS, ok := claims.Set["zid"].(string); ok {
-		if zid, err2 := id.Parse(zidS); err2 == nil {
-			if kind, ok2 := claims.Set["_tk"].(float64); ok2 {
-				if auth.TokenKind(kind) == k {
-					return auth.TokenData{
-						Token:   token,
-						Now:     now,
-						Issued:  claims.Issued.Time(),
-						Expires: expires,
-						Ident:   ident,
-						Zid:     zid,
-					}, nil
-				}
-			}
-			return auth.TokenData{}, ErrOtherKind
-		}
-	}
-	return auth.TokenData{}, ErrNoZid
+		return ErrNoIdent
+	}
+	issued := time.Unix(int64(vals[2].(sx.Int64)), 0)
+	expires := time.Unix(int64(vals[3].(sx.Int64)), 0)
+	now := time.Now().Round(time.Second)
+	if expires.Before(now) {
+		return ErrTokenExpired
+	}
+	zid := id.Zid(vals[4].(sx.Int64))
+	if !zid.IsValid() {
+		return ErrNoZid
+	}
+
+	tokenData.Ident = ident.String()
+	tokenData.Issued = issued
+	tokenData.Now = now
+	tokenData.Expires = expires
+	tokenData.Zid = zid
+	return nil
 }
 
 func (a *myAuth) Owner() id.Zid { return a.owner }
 
 func (a *myAuth) IsOwner(zid id.Zid) bool {

Index: auth/policy/anon.go
==================================================================
--- auth/policy/anon.go
+++ auth/policy/anon.go
@@ -11,11 +11,11 @@
 package policy
 
 import (
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type anonPolicy struct {
 	authConfig config.AuthConfig
 	pre        auth.Policy

Index: auth/policy/box.go
==================================================================
--- auth/policy/box.go
+++ auth/policy/box.go
@@ -14,23 +14,19 @@
 	"context"
 
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/query"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // BoxWithPolicy wraps the given box inside a policy box.
-func BoxWithPolicy(
-	manager auth.AuthzManager,
-	box box.Box,
-	authConfig config.AuthConfig,
-) (box.Box, auth.Policy) {
+func BoxWithPolicy(manager auth.AuthzManager, box box.Box, authConfig config.AuthConfig) (box.Box, auth.Policy) {
 	pol := newPolicy(manager, authConfig)
 	return newBox(box, pol), pol
 }
 
 // polBox implements a policy box.
@@ -53,33 +49,37 @@
 
 func (pp *polBox) CanCreateZettel(ctx context.Context) bool {
 	return pp.box.CanCreateZettel(ctx)
 }
 
-func (pp *polBox) CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) {
+func (pp *polBox) CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) {
 	user := server.GetUser(ctx)
 	if pp.policy.CanCreate(user, zettel.Meta) {
 		return pp.box.CreateZettel(ctx, zettel)
 	}
 	return id.Invalid, box.NewErrNotAllowed("Create", user, id.Invalid)
 }
 
-func (pp *polBox) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) {
-	zettel, err := pp.box.GetZettel(ctx, zid)
+func (pp *polBox) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) {
+	z, err := pp.box.GetZettel(ctx, zid)
 	if err != nil {
-		return domain.Zettel{}, err
+		return zettel.Zettel{}, err
 	}
 	user := server.GetUser(ctx)
-	if pp.policy.CanRead(user, zettel.Meta) {
-		return zettel, nil
+	if pp.policy.CanRead(user, z.Meta) {
+		return z, nil
 	}
-	return domain.Zettel{}, box.NewErrNotAllowed("GetZettel", user, zid)
+	return zettel.Zettel{}, box.NewErrNotAllowed("GetZettel", user, zid)
 }
 
-func (pp *polBox) GetAllZettel(ctx context.Context, zid id.Zid) ([]domain.Zettel, error) {
+func (pp *polBox) GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error) {
 	return pp.box.GetAllZettel(ctx, zid)
 }
+
+func (pp *polBox) FetchZids(ctx context.Context) (id.Set, error) {
+	return nil, box.NewErrNotAllowed("fetch-zids", server.GetUser(ctx), id.Invalid)
+}
 
 func (pp *polBox) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
 	m, err := pp.box.GetMeta(ctx, zid)
 	if err != nil {
 		return nil, err
@@ -89,41 +89,33 @@
 		return m, nil
 	}
 	return nil, box.NewErrNotAllowed("GetMeta", user, zid)
 }
 
-func (pp *polBox) GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error) {
-	return pp.box.GetAllMeta(ctx, zid)
-}
-
-func (pp *polBox) FetchZids(ctx context.Context) (id.Set, error) {
-	return nil, box.NewErrNotAllowed("fetch-zids", server.GetUser(ctx), id.Invalid)
-}
-
-func (pp *polBox) SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) {
+func (pp *polBox) SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error) {
 	user := server.GetUser(ctx)
 	canRead := pp.policy.CanRead
 	q = q.SetPreMatch(func(m *meta.Meta) bool { return canRead(user, m) })
-	return pp.box.SelectMeta(ctx, q)
+	return pp.box.SelectMeta(ctx, metaSeq, q)
 }
 
-func (pp *polBox) CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool {
+func (pp *polBox) CanUpdateZettel(ctx context.Context, zettel zettel.Zettel) bool {
 	return pp.box.CanUpdateZettel(ctx, zettel)
 }
 
-func (pp *polBox) UpdateZettel(ctx context.Context, zettel domain.Zettel) error {
+func (pp *polBox) UpdateZettel(ctx context.Context, zettel zettel.Zettel) error {
 	zid := zettel.Meta.Zid
 	user := server.GetUser(ctx)
 	if !zid.IsValid() {
-		return &box.ErrInvalidID{Zid: zid}
+		return box.ErrInvalidZid{Zid: zid.String()}
 	}
 	// Write existing zettel
-	oldMeta, err := pp.box.GetMeta(ctx, zid)
+	oldZettel, err := pp.box.GetZettel(ctx, zid)
 	if err != nil {
 		return err
 	}
-	if pp.policy.CanWrite(user, oldMeta, zettel.Meta) {
+	if pp.policy.CanWrite(user, oldZettel.Meta, zettel.Meta) {
 		return pp.box.UpdateZettel(ctx, zettel)
 	}
 	return box.NewErrNotAllowed("Write", user, zid)
 }
 
@@ -130,16 +122,16 @@
 func (pp *polBox) AllowRenameZettel(ctx context.Context, zid id.Zid) bool {
 	return pp.box.AllowRenameZettel(ctx, zid)
 }
 
 func (pp *polBox) RenameZettel(ctx context.Context, curZid, newZid id.Zid) error {
-	meta, err := pp.box.GetMeta(ctx, curZid)
+	z, err := pp.box.GetZettel(ctx, curZid)
 	if err != nil {
 		return err
 	}
 	user := server.GetUser(ctx)
-	if pp.policy.CanRename(user, meta) {
+	if pp.policy.CanRename(user, z.Meta) {
 		return pp.box.RenameZettel(ctx, curZid, newZid)
 	}
 	return box.NewErrNotAllowed("Rename", user, curZid)
 }
 
@@ -146,16 +138,16 @@
 func (pp *polBox) CanDeleteZettel(ctx context.Context, zid id.Zid) bool {
 	return pp.box.CanDeleteZettel(ctx, zid)
 }
 
 func (pp *polBox) DeleteZettel(ctx context.Context, zid id.Zid) error {
-	meta, err := pp.box.GetMeta(ctx, zid)
+	z, err := pp.box.GetZettel(ctx, zid)
 	if err != nil {
 		return err
 	}
 	user := server.GetUser(ctx)
-	if pp.policy.CanDelete(user, meta) {
+	if pp.policy.CanDelete(user, z.Meta) {
 		return pp.box.DeleteZettel(ctx, zid)
 	}
 	return box.NewErrNotAllowed("Delete", user, zid)
 }
 
@@ -163,6 +155,14 @@
 	user := server.GetUser(ctx)
 	if pp.policy.CanRefresh(user) {
 		return pp.box.Refresh(ctx)
 	}
 	return box.NewErrNotAllowed("Refresh", user, id.Invalid)
+}
+func (pp *polBox) ReIndex(ctx context.Context, zid id.Zid) error {
+	user := server.GetUser(ctx)
+	if pp.policy.CanRefresh(user) {
+		// If a user is allowed to refresh all data, it it also allowed to re-index a zettel.
+		return pp.box.ReIndex(ctx, zid)
+	}
+	return box.NewErrNotAllowed("ReIndex", user, zid)
 }

Index: auth/policy/default.go
==================================================================
--- auth/policy/default.go
+++ auth/policy/default.go
@@ -9,13 +9,13 @@
 //-----------------------------------------------------------------------------
 
 package policy
 
 import (
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type defaultPolicy struct {
 	manager auth.AuthzManager
 }

Index: auth/policy/owner.go
==================================================================
--- auth/policy/owner.go
+++ auth/policy/owner.go
@@ -9,14 +9,14 @@
 //-----------------------------------------------------------------------------
 
 package policy
 
 import (
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type ownerPolicy struct {
 	manager    auth.AuthzManager
 	authConfig config.AuthConfig

Index: auth/policy/policy.go
==================================================================
--- auth/policy/policy.go
+++ auth/policy/policy.go
@@ -12,11 +12,11 @@
 package policy
 
 import (
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // newPolicy creates a policy based on given constraints.
 func newPolicy(manager auth.AuthzManager, authConfig config.AuthConfig) auth.Policy {
 	var pol auth.Policy

Index: auth/policy/policy_test.go
==================================================================
--- auth/policy/policy_test.go
+++ auth/policy/policy_test.go
@@ -12,14 +12,14 @@
 
 import (
 	"fmt"
 	"testing"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func TestPolicies(t *testing.T) {
 	t.Parallel()
 	testScene := []struct {

Index: auth/policy/readonly.go
==================================================================
--- auth/policy/readonly.go
+++ auth/policy/readonly.go
@@ -8,15 +8,15 @@
 // under this license.
 //-----------------------------------------------------------------------------
 
 package policy
 
-import "zettelstore.de/z/domain/meta"
+import "zettelstore.de/z/zettel/meta"
 
 type roPolicy struct{}
 
 func (*roPolicy) CanCreate(_, _ *meta.Meta) bool   { return false }
 func (*roPolicy) CanRead(_, _ *meta.Meta) bool     { return true }
 func (*roPolicy) CanWrite(_, _, _ *meta.Meta) bool { return false }
 func (*roPolicy) CanRename(_, _ *meta.Meta) bool   { return false }
 func (*roPolicy) CanDelete(_, _ *meta.Meta) bool   { return false }
 func (*roPolicy) CanRefresh(user *meta.Meta) bool  { return user != nil }

Index: box/box.go
==================================================================
--- box/box.go
+++ box/box.go
@@ -16,41 +16,25 @@
 	"errors"
 	"fmt"
 	"io"
 	"time"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // BaseBox is implemented by all Zettel boxes.
 type BaseBox interface {
 	// Location returns some information where the box is located.
 	// Format is dependent of the box.
 	Location() string
 
-	// CanCreateZettel returns true, if box could possibly create a new zettel.
-	CanCreateZettel(ctx context.Context) bool
-
-	// CreateZettel creates a new zettel.
-	// Returns the new zettel id (and an error indication).
-	CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error)
-
 	// GetZettel retrieves a specific zettel.
-	GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error)
-
-	// GetMeta retrieves just the meta data of a specific zettel.
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-
-	// CanUpdateZettel returns true, if box could possibly update the given zettel.
-	CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool
-
-	// UpdateZettel updates an existing zettel.
-	UpdateZettel(ctx context.Context, zettel domain.Zettel) error
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
 
 	// AllowRenameZettel returns true, if box will not disallow renaming the zettel.
 	AllowRenameZettel(ctx context.Context, zid id.Zid) bool
 
 	// RenameZettel changes the current Zid to a new Zid.
@@ -60,10 +44,26 @@
 	CanDeleteZettel(ctx context.Context, zid id.Zid) bool
 
 	// DeleteZettel removes the zettel from the box.
 	DeleteZettel(ctx context.Context, zid id.Zid) error
 }
+
+// WriteBox is a box that can create / update zettel content.
+type WriteBox interface {
+	// CanCreateZettel returns true, if box could possibly create a new zettel.
+	CanCreateZettel(ctx context.Context) bool
+
+	// CreateZettel creates a new zettel.
+	// Returns the new zettel id (and an error indication).
+	CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error)
+
+	// CanUpdateZettel returns true, if box could possibly update the given zettel.
+	CanUpdateZettel(ctx context.Context, zettel zettel.Zettel) bool
+
+	// UpdateZettel updates an existing zettel.
+	UpdateZettel(ctx context.Context, zettel zettel.Zettel) error
+}
 
 // ZidFunc is a function that processes identifier of a zettel.
 type ZidFunc func(id.Zid)
 
 // MetaFunc is a function that processes metadata of a zettel.
@@ -70,10 +70,13 @@
 type MetaFunc func(*meta.Meta)
 
 // ManagedBox is the interface of managed boxes.
 type ManagedBox interface {
 	BaseBox
+
+	// HasZettel returns true, if box conains zettel with given identifier.
+	HasZettel(context.Context, id.Zid) bool
 
 	// Apply identifier of every zettel to the given function, if predicate returns true.
 	ApplyZid(context.Context, ZidFunc, query.RetrievePredicate) error
 
 	// Apply metadata of every zettel to the given function, if predicate returns true.
@@ -127,25 +130,30 @@
 }
 
 // Box is to be used outside the box package and its descendants.
 type Box interface {
 	BaseBox
+	WriteBox
 
 	// FetchZids returns the set of all zettel identifer managed by the box.
 	FetchZids(ctx context.Context) (id.Set, error)
+
+	// GetMeta returns the metadata of the zettel with the given identifier.
+	GetMeta(context.Context, id.Zid) (*meta.Meta, error)
 
 	// SelectMeta returns a list of metadata that comply to the given selection criteria.
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
+	// If `metaSeq` is `nil`, the box assumes metadata of all available zettel.
+	SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error)
 
 	// GetAllZettel retrieves a specific zettel from all managed boxes.
-	GetAllZettel(ctx context.Context, zid id.Zid) ([]domain.Zettel, error)
-
-	// GetAllMeta retrieves the meta data of a specific zettel from all managed boxes.
-	GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error)
+	GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error)
 
 	// Refresh the data from the box and from its managed sub-boxes.
 	Refresh(context.Context) error
+
+	// ReIndex one zettel to update its index data.
+	ReIndex(context.Context, id.Zid) error
 }
 
 // Stats record stattistics about a box.
 type Stats struct {
 	// ReadOnly indicates that boxes cannot be modified.
@@ -298,19 +306,21 @@
 var ErrStopped = errors.New("box is stopped")
 
 // ErrReadOnly is returned if there is an attepmt to write to a read-only box.
 var ErrReadOnly = errors.New("read-only box")
 
-// ErrNotFound is returned if a zettel was not found in the box.
-var ErrNotFound = errors.New("zettel not found")
+// ErrZettelNotFound is returned if a zettel was not found in the box.
+type ErrZettelNotFound struct{ Zid id.Zid }
+
+func (eznf ErrZettelNotFound) Error() string { return "zettel not found: " + eznf.Zid.String() }
 
 // ErrConflict is returned if a box operation detected a conflict..
 // One example: if calculating a new zettel identifier takes too long.
 var ErrConflict = errors.New("conflict")
 
 // ErrCapacity is returned if a box has reached its capacity.
 var ErrCapacity = errors.New("capacity exceeded")
 
-// ErrInvalidID is returned if the zettel id is not appropriate for the box operation.
-type ErrInvalidID struct{ Zid id.Zid }
+// ErrInvalidZid is returned if the zettel id is not appropriate for the box operation.
+type ErrInvalidZid struct{ Zid string }
 
-func (err *ErrInvalidID) Error() string { return "invalid Zettel id: " + err.Zid.String() }
+func (err ErrInvalidZid) Error() string { return "invalid Zettel id: " + err.Zid }

Index: box/compbox/compbox.go
==================================================================
--- box/compbox/compbox.go
+++ box/compbox/compbox.go
@@ -13,19 +13,19 @@
 
 import (
 	"context"
 	"net/url"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	manager.Register(
 		" comp",
@@ -68,52 +68,37 @@
 // Setup remembers important values.
 func Setup(cfg *meta.Meta) { myConfig = cfg.Clone() }
 
 func (*compBox) Location() string { return "" }
 
-func (*compBox) CanCreateZettel(context.Context) bool { return false }
-
-func (cb *compBox) CreateZettel(context.Context, domain.Zettel) (id.Zid, error) {
-	cb.log.Trace().Err(box.ErrReadOnly).Msg("CreateZettel")
-	return id.Invalid, box.ErrReadOnly
-}
-
-func (cb *compBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) {
+func (cb *compBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) {
 	if gen, ok := myZettel[zid]; ok && gen.meta != nil {
 		if m := gen.meta(zid); m != nil {
 			updateMeta(m)
 			if genContent := gen.content; genContent != nil {
-				cb.log.Trace().Msg("GetMeta/Content")
-				return domain.Zettel{
-					Meta:    m,
-					Content: domain.NewContent(genContent(m)),
-				}, nil
-			}
-			cb.log.Trace().Msg("GetMeta/NoContent")
-			return domain.Zettel{Meta: m}, nil
-		}
-	}
-	cb.log.Trace().Err(box.ErrNotFound).Msg("GetZettel/Err")
-	return domain.Zettel{}, box.ErrNotFound
-}
-
-func (cb *compBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) {
-	if gen, ok := myZettel[zid]; ok {
-		if genMeta := gen.meta; genMeta != nil {
-			if m := genMeta(zid); m != nil {
-				updateMeta(m)
-				cb.log.Trace().Msg("GetMeta")
-				return m, nil
-			}
-		}
-	}
-	cb.log.Trace().Err(box.ErrNotFound).Msg("GetMeta/Err")
-	return nil, box.ErrNotFound
+				cb.log.Trace().Msg("GetZettel/Content")
+				return zettel.Zettel{
+					Meta:    m,
+					Content: zettel.NewContent(genContent(m)),
+				}, nil
+			}
+			cb.log.Trace().Msg("GetZettel/NoContent")
+			return zettel.Zettel{Meta: m}, nil
+		}
+	}
+	err := box.ErrZettelNotFound{Zid: zid}
+	cb.log.Trace().Err(err).Msg("GetZettel/Err")
+	return zettel.Zettel{}, err
+}
+
+func (*compBox) HasZettel(_ context.Context, zid id.Zid) bool {
+	_, found := myZettel[zid]
+	return found
 }
 
 func (cb *compBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error {
-	cb.log.Trace().Int("entries", int64(len(myZettel))).Msg("ApplyMeta")
+	cb.log.Trace().Int("entries", int64(len(myZettel))).Msg("ApplyZid")
 	for zid, gen := range myZettel {
 		if !constraint(zid) {
 			continue
 		}
 		if genMeta := gen.meta; genMeta != nil {
@@ -140,37 +125,32 @@
 		}
 	}
 	return nil
 }
 
-func (*compBox) CanUpdateZettel(context.Context, domain.Zettel) bool { return false }
-
-func (cb *compBox) UpdateZettel(context.Context, domain.Zettel) error {
-	cb.log.Trace().Err(box.ErrReadOnly).Msg("UpdateZettel")
-	return box.ErrReadOnly
-}
-
 func (*compBox) AllowRenameZettel(_ context.Context, zid id.Zid) bool {
 	_, ok := myZettel[zid]
 	return !ok
 }
 
-func (cb *compBox) RenameZettel(_ context.Context, curZid, _ id.Zid) error {
-	err := box.ErrNotFound
+func (cb *compBox) RenameZettel(_ context.Context, curZid, _ id.Zid) (err error) {
 	if _, ok := myZettel[curZid]; ok {
 		err = box.ErrReadOnly
+	} else {
+		err = box.ErrZettelNotFound{Zid: curZid}
 	}
 	cb.log.Trace().Err(err).Msg("RenameZettel")
 	return err
 }
 
 func (*compBox) CanDeleteZettel(context.Context, id.Zid) bool { return false }
 
-func (cb *compBox) DeleteZettel(_ context.Context, zid id.Zid) error {
-	err := box.ErrNotFound
+func (cb *compBox) DeleteZettel(_ context.Context, zid id.Zid) (err error) {
 	if _, ok := myZettel[zid]; ok {
 		err = box.ErrReadOnly
+	} else {
+		err = box.ErrZettelNotFound{Zid: zid}
 	}
 	cb.log.Trace().Err(err).Msg("DeleteZettel")
 	return err
 }
 

Index: box/compbox/config.go
==================================================================
--- box/compbox/config.go
+++ box/compbox/config.go
@@ -11,14 +11,14 @@
 package compbox
 
 import (
 	"bytes"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func genConfigZettelM(zid id.Zid) *meta.Meta {
 	if myConfig == nil {
 		return nil

Index: box/compbox/keys.go
==================================================================
--- box/compbox/keys.go
+++ box/compbox/keys.go
@@ -12,14 +12,14 @@
 
 import (
 	"bytes"
 	"fmt"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func genKeysM(zid id.Zid) *meta.Meta {
 	m := meta.New(zid)
 	m.Set(api.KeyTitle, "Zettelstore Supported Metadata Keys")
@@ -32,9 +32,9 @@
 	keys := meta.GetSortedKeyDescriptions()
 	var buf bytes.Buffer
 	buf.WriteString("|=Name<|=Type<|=Computed?:|=Property?:\n")
 	for _, kd := range keys {
 		fmt.Fprintf(&buf,
-			"|%v|%v|%v|%v\n", kd.Name, kd.Type.Name, kd.IsComputed(), kd.IsProperty())
+			"|[[%v|query:%v?]]|%v|%v|%v\n", kd.Name, kd.Name, kd.Type.Name, kd.IsComputed(), kd.IsProperty())
 	}
 	return buf.Bytes()
 }

Index: box/compbox/log.go
==================================================================
--- box/compbox/log.go
+++ box/compbox/log.go
@@ -11,22 +11,22 @@
 package compbox
 
 import (
 	"bytes"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func genLogM(zid id.Zid) *meta.Meta {
 	m := meta.New(zid)
 	m.Set(api.KeyTitle, "Zettelstore Log")
 	m.Set(api.KeySyntax, meta.SyntaxText)
 	m.Set(api.KeyCreated, kernel.Main.GetConfig(kernel.CoreService, kernel.CoreStarted).(string))
-	m.Set(api.KeyModified, kernel.Main.GetLastLogTime().Local().Format(id.ZidLayout))
+	m.Set(api.KeyModified, kernel.Main.GetLastLogTime().Local().Format(id.TimestampLayout))
 	return m
 }
 
 func genLogC(*meta.Meta) []byte {
 	const tsFormat = "2006-01-02 15:04:05.999999"

Index: box/compbox/manager.go
==================================================================
--- box/compbox/manager.go
+++ box/compbox/manager.go
@@ -12,14 +12,14 @@
 
 import (
 	"bytes"
 	"fmt"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func genManagerM(zid id.Zid) *meta.Meta {
 	m := meta.New(zid)
 	m.Set(api.KeyTitle, "Zettelstore Box Manager")

Index: box/compbox/parser.go
==================================================================
--- box/compbox/parser.go
+++ box/compbox/parser.go
@@ -14,15 +14,15 @@
 	"bytes"
 	"fmt"
 	"sort"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func genParserM(zid id.Zid) *meta.Meta {
 	m := meta.New(zid)
 	m.Set(api.KeyTitle, "Zettelstore Supported Parser")

Index: box/compbox/version.go
==================================================================
--- box/compbox/version.go
+++ box/compbox/version.go
@@ -9,14 +9,14 @@
 //-----------------------------------------------------------------------------
 
 package compbox
 
 import (
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func getVersionMeta(zid id.Zid, title string) *meta.Meta {
 	m := meta.New(zid)
 	m.Set(api.KeyTitle, title)

Index: box/constbox/base.css
==================================================================
--- box/constbox/base.css
+++ box/constbox/base.css
@@ -81,10 +81,11 @@
   h3 { font-size:1.15rem; margin:.75rem 0 }
   h4 { font-size:1.05rem; margin:.8rem 0; font-weight: bold }
   h5 { font-size:1.05rem; margin:.8rem 0 }
   h6 { font-size:1.05rem; margin:.8rem 0; font-weight: lighter }
   p { margin: .5rem 0 0 0 }
+  p.zs-meta-zettel { margin-top: .5rem; margin-left: 0.5rem }
   li,figure,figcaption,dl { margin: 0 }
   dt { margin: .5rem 0 0 0 }
   dt+dd { margin-top: 0 }
   dd { margin: .5rem 0 0 2rem }
   dd > p:first-child { margin: 0 0 0 0 }

DELETED box/constbox/base.mustache
Index: box/constbox/base.mustache
==================================================================
--- box/constbox/base.mustache
+++ box/constbox/base.mustache
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html{{#Lang}} lang="{{Lang}}"{{/Lang}}>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Zettelstore">
-<meta name="format-detection" content="telephone=no">
-{{{MetaHeader}}}
-<link rel="stylesheet" href="{{{CSSBaseURL}}}">
-<link rel="stylesheet" href="{{{CSSUserURL}}}">
-{{#CSSRoleURL}}<link rel="stylesheet" href="{{{CSSRoleURL}}}">{{/CSSRoleURL}}
-<title>{{Title}}</title>
-</head>
-<body>
-<nav class="zs-menu">
-<a href="{{{HomeURL}}}">Home</a>
-{{#WithUser}}
-<div class="zs-dropdown">
-<button>User</button>
-<nav class="zs-dropdown-content">
-{{#WithAuth}}
-{{#UserIsValid}}
-<a href="{{{UserZettelURL}}}">{{UserIdent}}</a>
-{{/UserIsValid}}
-{{^UserIsValid}}
-<a href="{{{LoginURL}}}">Login</a>
-{{/UserIsValid}}
-{{#UserIsValid}}
-<a href="{{{LogoutURL}}}">Logout</a>
-{{/UserIsValid}}
-{{/WithAuth}}
-</nav>
-</div>
-{{/WithUser}}
-<div class="zs-dropdown">
-<button>Lists</button>
-<nav class="zs-dropdown-content">
-<a href="{{{ListZettelURL}}}">List Zettel</a>
-<a href="{{{ListRolesURL}}}">List Roles</a>
-<a href="{{{ListTagsURL}}}">List Tags</a>
-{{#CanRefresh}}
-<a href="{{{RefreshURL}}}">Refresh</a>
-{{/CanRefresh}}
-</nav>
-</div>
-{{#NewZettelLinks.Has}}
-<div class="zs-dropdown">
-<button>New</button>
-<nav class="zs-dropdown-content">
-{{#NewZettelLinks.Links}}
-<a href="{{{URL}}}">{{Text}}</a>
-{{/NewZettelLinks.Links}}
-</nav>
-</div>
-{{/NewZettelLinks.Has}}
-<form action="{{{SearchURL}}}">
-<input type="text" placeholder="Search.." name="{{QueryKeyQuery}}">
-</form>
-</nav>
-<main class="content">
-{{{Content}}}
-</main>
-{{#FooterHTML}}<footer><hr>{{{FooterHTML}}}</footer>{{/FooterHTML}}
-{{#DebugMode}}<div><b>WARNING: Debug mode is enabled. DO NOT USE IN PRODUCTION!</b></div>{{/DebugMode}}
-</body>
-</html>

ADDED   box/constbox/base.sxn
Index: box/constbox/base.sxn
==================================================================
--- box/constbox/base.sxn
+++ box/constbox/base.sxn
@@ -0,0 +1,48 @@
+`(@@@@
+(html ,@(if lang `((@ (lang ,lang))))
+(head
+  (meta (@ (charset "utf-8")))
+  (meta (@ (name "viewport") (content "width=device-width, initial-scale=1.0")))
+  (meta (@ (name "generator") (content "Zettelstore")))
+  (meta (@ (name "format-detection") (content "telephone=no")))
+  ,@META-HEADER
+  (link (@ (rel "stylesheet") (href ,css-base-url)))
+  (link (@ (rel "stylesheet") (href ,css-user-url)))
+  ,@(ROLE-DEFAULT-meta (current-environment))
+  (title ,title))
+(body
+  (nav (@ (class "zs-menu"))
+    (a (@ (href ,home-url)) "Home")
+    ,@(if with-auth
+      `((div (@ (class "zs-dropdown"))
+        (button "User")
+        (nav (@ (class "zs-dropdown-content"))
+          ,@(if user-is-valid
+            `((a (@ (href ,user-zettel-url)) ,user-ident)
+              (a (@ (href ,logout-url)) "Logout"))
+            `((a (@ (href ,login-url)) "Login"))
+          )
+      )))
+    )
+    (div (@ (class "zs-dropdown"))
+      (button "Lists")
+      (nav (@ (class "zs-dropdown-content"))
+        (a (@ (href ,list-zettel-url)) "List Zettel")
+        (a (@ (href ,list-roles-url)) "List Roles")
+        (a (@ (href ,list-tags-url)) "List Tags")
+        ,@(if (bound? 'refresh-url) `((a (@ (href ,refresh-url)) "Refresh")))
+    ))
+    ,@(if new-zettel-links
+      `((div (@ (class "zs-dropdown"))
+        (button "New")
+        (nav (@ (class "zs-dropdown-content"))
+          ,@(map wui-link new-zettel-links)
+       )))
+    )
+    (form (@ (action ,search-url))
+      (input (@ (type "text") (placeholder "Search..") (name ,query-key-query) (dir "auto"))))
+  )
+  (main (@ (class "content")) ,DETAIL)
+  ,@(if FOOTER `((footer (hr) ,@FOOTER)))
+  ,@(if debug-mode '((div (b "WARNING: Debug mode is enabled. DO NOT USE IN PRODUCTION!"))))
+)))

Index: box/constbox/constbox.go
==================================================================
--- box/constbox/constbox.go
+++ box/constbox/constbox.go
@@ -14,19 +14,19 @@
 import (
 	"context"
 	_ "embed" // Allow to embed file content
 	"net/url"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	manager.Register(
 		" const",
@@ -43,11 +43,11 @@
 
 type constHeader map[string]string
 
 type constZettel struct {
 	header  constHeader
-	content domain.Content
+	content zettel.Content
 }
 
 type constBox struct {
 	log      *logger.Logger
 	number   int
@@ -55,33 +55,23 @@
 	enricher box.Enricher
 }
 
 func (*constBox) Location() string { return "const:" }
 
-func (*constBox) CanCreateZettel(context.Context) bool { return false }
-
-func (cb *constBox) CreateZettel(context.Context, domain.Zettel) (id.Zid, error) {
-	cb.log.Trace().Err(box.ErrReadOnly).Msg("CreateZettel")
-	return id.Invalid, box.ErrReadOnly
-}
-
-func (cb *constBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) {
+func (cb *constBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) {
 	if z, ok := cb.zettel[zid]; ok {
 		cb.log.Trace().Msg("GetZettel")
-		return domain.Zettel{Meta: meta.NewWithData(zid, z.header), Content: z.content}, nil
-	}
-	cb.log.Trace().Err(box.ErrNotFound).Msg("GetZettel")
-	return domain.Zettel{}, box.ErrNotFound
-}
-
-func (cb *constBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) {
-	if z, ok := cb.zettel[zid]; ok {
-		cb.log.Trace().Msg("GetMeta")
-		return meta.NewWithData(zid, z.header), nil
-	}
-	cb.log.Trace().Err(box.ErrNotFound).Msg("GetMeta")
-	return nil, box.ErrNotFound
+		return zettel.Zettel{Meta: meta.NewWithData(zid, z.header), Content: z.content}, nil
+	}
+	err := box.ErrZettelNotFound{Zid: zid}
+	cb.log.Trace().Err(err).Msg("GetZettel/Err")
+	return zettel.Zettel{}, err
+}
+
+func (cb *constBox) HasZettel(_ context.Context, zid id.Zid) bool {
+	_, found := cb.zettel[zid]
+	return found
 }
 
 func (cb *constBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error {
 	cb.log.Trace().Int("entries", int64(len(cb.zettel))).Msg("ApplyZid")
 	for zid := range cb.zettel {
@@ -102,37 +92,32 @@
 		}
 	}
 	return nil
 }
 
-func (*constBox) CanUpdateZettel(context.Context, domain.Zettel) bool { return false }
-
-func (cb *constBox) UpdateZettel(context.Context, domain.Zettel) error {
-	cb.log.Trace().Err(box.ErrReadOnly).Msg("UpdateZettel")
-	return box.ErrReadOnly
-}
-
 func (cb *constBox) AllowRenameZettel(_ context.Context, zid id.Zid) bool {
 	_, ok := cb.zettel[zid]
 	return !ok
 }
 
-func (cb *constBox) RenameZettel(_ context.Context, curZid, _ id.Zid) error {
-	err := box.ErrNotFound
+func (cb *constBox) RenameZettel(_ context.Context, curZid, _ id.Zid) (err error) {
 	if _, ok := cb.zettel[curZid]; ok {
 		err = box.ErrReadOnly
+	} else {
+		err = box.ErrZettelNotFound{Zid: curZid}
 	}
 	cb.log.Trace().Err(err).Msg("RenameZettel")
 	return err
 }
 
 func (*constBox) CanDeleteZettel(context.Context, id.Zid) bool { return false }
 
-func (cb *constBox) DeleteZettel(_ context.Context, zid id.Zid) error {
-	err := box.ErrNotFound
+func (cb *constBox) DeleteZettel(_ context.Context, zid id.Zid) (err error) {
 	if _, ok := cb.zettel[zid]; ok {
 		err = box.ErrReadOnly
+	} else {
+		err = box.ErrZettelNotFound{Zid: zid}
 	}
 	cb.log.Trace().Err(err).Msg("DeleteZettel")
 	return err
 }
 
@@ -149,11 +134,11 @@
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxNone,
 			api.KeyCreated:    "20200804111624",
 			api.KeyVisibility: api.ValueVisibilityOwner,
 		},
-		domain.NewContent(nil)},
+		zettel.NewContent(nil)},
 	id.MustParse(api.ZidLicense): {
 		constHeader{
 			api.KeyTitle:      "Zettelstore License",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxText,
@@ -161,11 +146,11 @@
 			api.KeyLang:       api.ValueLangEN,
 			api.KeyModified:   "20220131153422",
 			api.KeyReadOnly:   api.ValueTrue,
 			api.KeyVisibility: api.ValueVisibilityPublic,
 		},
-		domain.NewContent(contentLicense)},
+		zettel.NewContent(contentLicense)},
 	id.MustParse(api.ZidAuthors): {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Contributors",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxZmk,
@@ -172,169 +157,219 @@
 			api.KeyCreated:    "20210504135842",
 			api.KeyLang:       api.ValueLangEN,
 			api.KeyReadOnly:   api.ValueTrue,
 			api.KeyVisibility: api.ValueVisibilityLogin,
 		},
-		domain.NewContent(contentContributors)},
+		zettel.NewContent(contentContributors)},
 	id.MustParse(api.ZidDependencies): {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Dependencies",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxZmk,
 			api.KeyLang:       api.ValueLangEN,
 			api.KeyReadOnly:   api.ValueTrue,
-			api.KeyVisibility: api.ValueVisibilityLogin,
+			api.KeyVisibility: api.ValueVisibilityPublic,
 			api.KeyCreated:    "20210504135842",
-			api.KeyModified:   "20221013105100",
+			api.KeyModified:   "20230601163100",
 		},
-		domain.NewContent(contentDependencies)},
+		zettel.NewContent(contentDependencies)},
 	id.BaseTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Base HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
-			api.KeyCreated:    "20210504135842",
+			api.KeySyntax:     meta.SyntaxSxn,
+			api.KeyCreated:    "20230510155100",
+			api.KeyModified:   "20230827212200",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentBaseMustache)},
+		zettel.NewContent(contentBaseSxn)},
 	id.LoginTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Login Form HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
+			api.KeySyntax:     meta.SyntaxSxn,
 			api.KeyCreated:    "20200804111624",
+			api.KeyModified:   "20230527144100",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentLoginMustache)},
+		zettel.NewContent(contentLoginSxn)},
 	id.ZettelTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Zettel HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
-			api.KeyCreated:    "20200804111624",
+			api.KeySyntax:     meta.SyntaxSxn,
+			api.KeyCreated:    "20230510155300",
+			api.KeyModified:   "20231126180500",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentZettelMustache)},
+		zettel.NewContent(contentZettelSxn)},
 	id.InfoTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Info HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
+			api.KeySyntax:     meta.SyntaxSxn,
 			api.KeyCreated:    "20200804111624",
+			api.KeyModified:   "20231023152000",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentInfoMustache)},
-	id.ContextTemplateZid: {
-		constHeader{
-			api.KeyTitle:      "Zettelstore Context HTML Template",
-			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
-			api.KeyCreated:    "20210218181140",
-			api.KeyVisibility: api.ValueVisibilityExpert,
-		},
-		domain.NewContent(contentContextMustache)},
+		zettel.NewContent(contentInfoSxn)},
 	id.FormTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Form HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
+			api.KeySyntax:     meta.SyntaxSxn,
 			api.KeyCreated:    "20200804111624",
+			api.KeyModified:   "20230621132600",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentFormMustache)},
+		zettel.NewContent(contentFormSxn)},
 	id.RenameTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Rename Form HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
+			api.KeySyntax:     meta.SyntaxSxn,
 			api.KeyCreated:    "20200804111624",
+			api.KeyModified:   "20230707190246",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentRenameMustache)},
+		zettel.NewContent(contentRenameSxn)},
 	id.DeleteTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Delete HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
+			api.KeySyntax:     meta.SyntaxSxn,
 			api.KeyCreated:    "20200804111624",
+			api.KeyModified:   "20230621133100",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentDeleteMustache)},
+		zettel.NewContent(contentDeleteSxn)},
 	id.ListTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore List Zettel HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
-			api.KeyCreated:    "20200804111624",
+			api.KeySyntax:     meta.SyntaxSxn,
+			api.KeyCreated:    "20230704122100",
+			api.KeyModified:   "20231129112800",
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentListZettelMustache)},
+		zettel.NewContent(contentListZettelSxn)},
 	id.ErrorTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Error HTML Template",
 			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxMustache,
+			api.KeySyntax:     meta.SyntaxSxn,
 			api.KeyCreated:    "20210305133215",
+			api.KeyModified:   "20230527224800",
+			api.KeyVisibility: api.ValueVisibilityExpert,
+		},
+		zettel.NewContent(contentErrorSxn)},
+	id.StartSxnZid: {
+		constHeader{
+			api.KeyTitle:      "Zettelstore Sxn Start Code",
+			api.KeyRole:       api.ValueRoleConfiguration,
+			api.KeySyntax:     meta.SyntaxSxn,
+			api.KeyCreated:    "20230824160700",
+			api.KeyVisibility: api.ValueVisibilityExpert,
+			api.KeyPrecursor:  string(api.ZidSxnBase),
+		},
+		zettel.NewContent(contentStartCodeSxn)},
+	id.BaseSxnZid: {
+		constHeader{
+			api.KeyTitle:      "Zettelstore Sxn Base Code",
+			api.KeyRole:       api.ValueRoleConfiguration,
+			api.KeySyntax:     meta.SyntaxSxn,
+			api.KeyCreated:    "20230619132800",
+			api.KeyModified:   "20231012154500",
+			api.KeyReadOnly:   api.ValueTrue,
+			api.KeyVisibility: api.ValueVisibilityExpert,
+			api.KeyPrecursor:  string(api.ZidSxnPrelude),
+		},
+		zettel.NewContent(contentBaseCodeSxn)},
+	id.PreludeSxnZid: {
+		constHeader{
+			api.KeyTitle:      "Zettelstore Sxn Prelude",
+			api.KeyRole:       api.ValueRoleConfiguration,
+			api.KeySyntax:     meta.SyntaxSxn,
+			api.KeyCreated:    "20231006181700",
+			api.KeyModified:   "20231019140400",
+			api.KeyReadOnly:   api.ValueTrue,
 			api.KeyVisibility: api.ValueVisibilityExpert,
 		},
-		domain.NewContent(contentErrorMustache)},
+		zettel.NewContent(contentPreludeSxn)},
 	id.MustParse(api.ZidBaseCSS): {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Base CSS",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxCSS,
 			api.KeyCreated:    "20200804111624",
+			api.KeyModified:   "20231129112800",
 			api.KeyVisibility: api.ValueVisibilityPublic,
 		},
-		domain.NewContent(contentBaseCSS)},
+		zettel.NewContent(contentBaseCSS)},
 	id.MustParse(api.ZidUserCSS): {
 		constHeader{
 			api.KeyTitle:      "Zettelstore User CSS",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxCSS,
 			api.KeyCreated:    "20210622110143",
 			api.KeyVisibility: api.ValueVisibilityPublic,
 		},
-		domain.NewContent([]byte("/* User-defined CSS */"))},
-	id.RoleCSSMapZid: {
-		constHeader{
-			api.KeyTitle:      "Zettelstore Role to CSS Map",
-			api.KeyRole:       api.ValueRoleConfiguration,
-			api.KeySyntax:     meta.SyntaxNone,
-			api.KeyCreated:    "20220321183214",
-			api.KeyVisibility: api.ValueVisibilityExpert,
-		},
-		domain.NewContent(nil)},
+		zettel.NewContent([]byte("/* User-defined CSS */"))},
 	id.EmojiZid: {
 		constHeader{
 			api.KeyTitle:      "Zettelstore Generic Emoji",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxGif,
 			api.KeyReadOnly:   api.ValueTrue,
 			api.KeyCreated:    "20210504175807",
 			api.KeyVisibility: api.ValueVisibilityPublic,
 		},
-		domain.NewContent(contentEmoji)},
+		zettel.NewContent(contentEmoji)},
 	id.TOCNewTemplateZid: {
 		constHeader{
 			api.KeyTitle:      "New Menu",
 			api.KeyRole:       api.ValueRoleConfiguration,
 			api.KeySyntax:     meta.SyntaxZmk,
 			api.KeyLang:       api.ValueLangEN,
 			api.KeyCreated:    "20210217161829",
+			api.KeyModified:   "20231129111800",
 			api.KeyVisibility: api.ValueVisibilityCreator,
 		},
-		domain.NewContent(contentNewTOCZettel)},
+		zettel.NewContent(contentNewTOCZettel)},
 	id.MustParse(api.ZidTemplateNewZettel): {
 		constHeader{
-			api.KeyTitle:      "New Zettel",
-			api.KeyRole:       api.ValueRoleZettel,
-			api.KeySyntax:     meta.SyntaxZmk,
-			api.KeyCreated:    "20201028185209",
-			api.KeyVisibility: api.ValueVisibilityCreator,
+			api.KeyTitle:                 "New Zettel",
+			api.KeyRole:                  api.ValueRoleConfiguration,
+			api.KeySyntax:                meta.SyntaxZmk,
+			api.KeyCreated:               "20201028185209",
+			api.KeyModified:              "20230929132900",
+			meta.NewPrefix + api.KeyRole: api.ValueRoleZettel,
+			api.KeyVisibility:            api.ValueVisibilityCreator,
+		},
+		zettel.NewContent(nil)},
+	id.MustParse(api.ZidTemplateNewRole): {
+		constHeader{
+			api.KeyTitle:                  "New Role",
+			api.KeyRole:                   api.ValueRoleConfiguration,
+			api.KeySyntax:                 meta.SyntaxZmk,
+			api.KeyCreated:                "20231129110800",
+			meta.NewPrefix + api.KeyRole:  api.ValueRoleRole,
+			meta.NewPrefix + api.KeyTitle: "",
+			api.KeyVisibility:             api.ValueVisibilityCreator,
+		},
+		zettel.NewContent(nil)},
+	id.MustParse(api.ZidTemplateNewTag): {
+		constHeader{
+			api.KeyTitle:                  "New Tag",
+			api.KeyRole:                   api.ValueRoleConfiguration,
+			api.KeySyntax:                 meta.SyntaxZmk,
+			api.KeyCreated:                "20230929132400",
+			meta.NewPrefix + api.KeyRole:  api.ValueRoleTag,
+			meta.NewPrefix + api.KeyTitle: "#",
+			api.KeyVisibility:             api.ValueVisibilityCreator,
 		},
-		domain.NewContent(nil)},
+		zettel.NewContent(nil)},
 	id.MustParse(api.ZidTemplateNewUser): {
 		constHeader{
 			api.KeyTitle:                       "New User",
 			api.KeyRole:                        api.ValueRoleConfiguration,
 			api.KeySyntax:                      meta.SyntaxNone,
@@ -342,20 +377,60 @@
 			meta.NewPrefix + api.KeyCredential: "",
 			meta.NewPrefix + api.KeyUserID:     "",
 			meta.NewPrefix + api.KeyUserRole:   api.ValueUserRoleReader,
 			api.KeyVisibility:                  api.ValueVisibilityOwner,
 		},
-		domain.NewContent(nil)},
+		zettel.NewContent(nil)},
+	id.MustParse(api.ZidRoleZettelZettel): {
+		constHeader{
+			api.KeyTitle:      api.ValueRoleZettel,
+			api.KeyRole:       api.ValueRoleRole,
+			api.KeySyntax:     meta.SyntaxZmk,
+			api.KeyCreated:    "20231129161400",
+			api.KeyLang:       api.ValueLangEN,
+			api.KeyVisibility: api.ValueVisibilityLogin,
+		},
+		zettel.NewContent(contentRoleZettel)},
+	id.MustParse(api.ZidRoleConfigurationZettel): {
+		constHeader{
+			api.KeyTitle:      api.ValueRoleConfiguration,
+			api.KeyRole:       api.ValueRoleRole,
+			api.KeySyntax:     meta.SyntaxZmk,
+			api.KeyCreated:    "20231129162800",
+			api.KeyLang:       api.ValueLangEN,
+			api.KeyVisibility: api.ValueVisibilityLogin,
+		},
+		zettel.NewContent(contentRoleConfiguration)},
+	id.MustParse(api.ZidRoleRoleZettel): {
+		constHeader{
+			api.KeyTitle:      api.ValueRoleRole,
+			api.KeyRole:       api.ValueRoleRole,
+			api.KeySyntax:     meta.SyntaxZmk,
+			api.KeyCreated:    "20231129162900",
+			api.KeyLang:       api.ValueLangEN,
+			api.KeyVisibility: api.ValueVisibilityLogin,
+		},
+		zettel.NewContent(contentRoleRole)},
+	id.MustParse(api.ZidRoleTagZettel): {
+		constHeader{
+			api.KeyTitle:      api.ValueRoleTag,
+			api.KeyRole:       api.ValueRoleRole,
+			api.KeySyntax:     meta.SyntaxZmk,
+			api.KeyCreated:    "20231129162000",
+			api.KeyLang:       api.ValueLangEN,
+			api.KeyVisibility: api.ValueVisibilityLogin,
+		},
+		zettel.NewContent(contentRoleTag)},
 	id.DefaultHomeZid: {
 		constHeader{
 			api.KeyTitle:   "Home",
 			api.KeyRole:    api.ValueRoleZettel,
 			api.KeySyntax:  meta.SyntaxZmk,
 			api.KeyLang:    api.ValueLangEN,
 			api.KeyCreated: "20210210190757",
 		},
-		domain.NewContent(contentHomeZettel)},
+		zettel.NewContent(contentHomeZettel)},
 }
 
 //go:embed license.txt
 var contentLicense []byte
 
@@ -363,46 +438,64 @@
 var contentContributors []byte
 
 //go:embed dependencies.zettel
 var contentDependencies []byte
 
-//go:embed base.mustache
-var contentBaseMustache []byte
-
-//go:embed login.mustache
-var contentLoginMustache []byte
-
-//go:embed zettel.mustache
-var contentZettelMustache []byte
-
-//go:embed info.mustache
-var contentInfoMustache []byte
-
-//go:embed context.mustache
-var contentContextMustache []byte
-
-//go:embed form.mustache
-var contentFormMustache []byte
-
-//go:embed rename.mustache
-var contentRenameMustache []byte
-
-//go:embed delete.mustache
-var contentDeleteMustache []byte
-
-//go:embed listzettel.mustache
-var contentListZettelMustache []byte
-
-//go:embed error.mustache
-var contentErrorMustache []byte
+//go:embed base.sxn
+var contentBaseSxn []byte
+
+//go:embed login.sxn
+var contentLoginSxn []byte
+
+//go:embed zettel.sxn
+var contentZettelSxn []byte
+
+//go:embed info.sxn
+var contentInfoSxn []byte
+
+//go:embed form.sxn
+var contentFormSxn []byte
+
+//go:embed rename.sxn
+var contentRenameSxn []byte
+
+//go:embed delete.sxn
+var contentDeleteSxn []byte
+
+//go:embed listzettel.sxn
+var contentListZettelSxn []byte
+
+//go:embed error.sxn
+var contentErrorSxn []byte
+
+//go:embed start.sxn
+var contentStartCodeSxn []byte
+
+//go:embed wuicode.sxn
+var contentBaseCodeSxn []byte
+
+//go:embed prelude.sxn
+var contentPreludeSxn []byte
 
 //go:embed base.css
 var contentBaseCSS []byte
 
 //go:embed emoji_spin.gif
 var contentEmoji []byte
 
 //go:embed newtoc.zettel
 var contentNewTOCZettel []byte
+
+//go:embed rolezettel.zettel
+var contentRoleZettel []byte
+
+//go:embed roleconfiguration.zettel
+var contentRoleConfiguration []byte
+
+//go:embed rolerole.zettel
+var contentRoleRole []byte
+
+//go:embed roletag.zettel
+var contentRoleTag []byte
 
 //go:embed home.zettel
 var contentHomeZettel []byte

DELETED box/constbox/context.mustache
Index: box/constbox/context.mustache
==================================================================
--- box/constbox/context.mustache
+++ box/constbox/context.mustache
@@ -1,13 +0,0 @@
-<article>
-<header>
-<h1>{{Title}}</h1>
-<div class="zs-meta">
-<a href="{{{InfoURL}}}">Info</a>
-&#183; <a href="?dir=backward">Backward</a>
-&#183; <a href="?dir=both">Both</a>
-&#183; <a href="?dir=forward">Forward</a>
-&#183; Cost:{{#Costs}}&#x2000;<a href="{{{URL}}}">{{{Text}}}</a>{{/Costs}}
-</div>
-</header>
-{{{Content}}}
-</article>

DELETED box/constbox/delete.mustache
Index: box/constbox/delete.mustache
==================================================================
--- box/constbox/delete.mustache
+++ box/constbox/delete.mustache
@@ -1,42 +0,0 @@
-<article>
-<header>
-<h1>Delete Zettel {{Zid}}</h1>
-</header>
-<p>Do you really want to delete this zettel?</p>
-{{#HasShadows}}
-<div class="zs-info">
-<h2>Infomation</h2>
-<p>If you delete this zettel, the previoulsy shadowed zettel from overlayed box {{ShadowedBox}} becomes available.</p>
-</div>
-{{/HasShadows}}
-{{#Incoming.Has}}
-<div class="zs-warning">
-<h2>Warning!</h2>
-<p>If you delete this zettel, incoming references from the following zettel will become invalid.</p>
-<ul>
-{{#Incoming.Links}}
-<li><a href="{{{URL}}}">{{Text}}</a></li>
-{{/Incoming.Links}}
-</ul>
-</div>
-{{/Incoming.Has}}
-{{#HasUselessFiles}}
-<div class="zs-warning">
-<h2>Warning!</h2>
-<p>Deleting this zettel will also delete the following files, so that they will not be interpreted as content for this zettel.</p>
-<ul>
-{{#UselessFiles}}
-<li>{{{.}}}</li>
-{{/UselessFiles}}
-</ul>
-</div>
-{{/HasUselessFiles}}
-<dl>
-{{#MetaPairs}}
-<dt>{{Key}}:</dt><dd>{{Value}}</dd>
-{{/MetaPairs}}
-</dl>
-<form method="POST">
-<input class="zs-primary" type="submit" value="Delete">
-</form>
-</article>

ADDED   box/constbox/delete.sxn
Index: box/constbox/delete.sxn
==================================================================
--- box/constbox/delete.sxn
+++ box/constbox/delete.sxn
@@ -0,0 +1,26 @@
+`(article
+  (header (h1 "Delete Zettel " ,zid))
+  (p "Do you really want to delete this zettel?")
+  ,@(if shadowed-box
+    `((div (@ (class "zs-info"))
+      (h2 "Information")
+      (p "If you delete this zettel, the previously shadowed zettel from overlayed box " ,shadowed-box " becomes available.")
+    ))
+  )
+  ,@(if incoming
+    `((div (@ (class "zs-warning"))
+      (h2 "Warning!")
+      (p "If you delete this zettel, incoming references from the following zettel will become invalid.")
+      (ul ,@(map wui-item-link incoming))
+    ))
+  )
+  ,@(if (and (bound? 'useless) useless)
+    `((div (@ (class "zs-warning"))
+      (h2 "Warning!")
+      (p "Deleting this zettel will also delete the following files, so that they will not be interpreted as content for this zettel.")
+      (ul ,@(map wui-item useless))
+    ))
+  )
+  ,(wui-meta-desc metapairs)
+  (form (@ (method "POST")) (input (@ (class "zs-primary") (type "submit") (value "Delete"))))
+)

Index: box/constbox/dependencies.zettel
==================================================================
--- box/constbox/dependencies.zettel
+++ box/constbox/dependencies.zettel
@@ -99,55 +99,10 @@
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ```
 
-=== hoisie/mustache / cbroglie/mustache
-; URL & Source
-: [[https://github.com/hoisie/mustache]] / [[https://github.com/cbroglie/mustache]]
-; License
-: MIT License
-; Remarks
-: cbroglie/mustache is a fork from hoisie/mustache (starting with commit [f9b4cbf]).
-  cbroglie/mustache does not claim a copyright and includes just the license file from hoisie/mustache.
-  cbroglie/mustache obviously continues with the original license.
-
-```
-Copyright (c) 2009 Michael Hoisie
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-```
-
-===  pascaldekloe/jwt
-; URL & Source
-: [[https://github.com/pascaldekloe/jwt]]
-; License
-: [[CC0 1.0 Universal|https://creativecommons.org/publicdomain/zero/1.0/legalcode]]
-```
-To the extent possible under law, Pascal S. de Kloe has waived all
-copyright and related or neighboring rights to JWT. This work is
-published from The Netherlands.
-
-https://creativecommons.org/publicdomain/zero/1.0/legalcode
-```
-
 === yuin/goldmark
 ; URL & Source
 : [[https://github.com/yuin/goldmark]]
 ; License
 : MIT License
@@ -172,5 +127,16 @@
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
+
+=== sx, zettelstore-client
+These are companion projects, written by the current main developer of Zettelstore.
+They are published under the same license, [[EUPL v1.2, or later|00000000000004]].
+
+; URL & Source sx
+: [[https://zettelstore.de/sx]]
+; URL & Source zettelstore-client
+: [[https://zettelstore.de/client/]]
+; License:
+: European Union Public License, version 1.2 (EUPL v1.2), or later.

DELETED box/constbox/error.mustache
Index: box/constbox/error.mustache
==================================================================
--- box/constbox/error.mustache
+++ box/constbox/error.mustache
@@ -1,6 +0,0 @@
-<article>
-<header>
-<h1>{{ErrorTitle}}</h1>
-</header>
-{{ErrorText}}
-</article>

ADDED   box/constbox/error.sxn
Index: box/constbox/error.sxn
==================================================================
--- box/constbox/error.sxn
+++ box/constbox/error.sxn
@@ -0,0 +1,4 @@
+`(article
+  (header (h1 ,heading))
+  ,message
+)

DELETED box/constbox/form.mustache
Index: box/constbox/form.mustache
==================================================================
--- box/constbox/form.mustache
+++ box/constbox/form.mustache
@@ -1,55 +0,0 @@
-<article>
-<header>
-<h1>{{Heading}}</h1>
-</header>
-<form action="{{FormActionURL}}" method="POST" enctype="multipart/form-data">
-<div>
-<label for="zs-title">Title <a title="Main heading of this zettel. You can use inline zettelmarkup.">&#9432;</a></label>
-<input class="zs-input" type="text" id="zs-title" name="title" placeholder="Title.." value="{{MetaTitle}}" autofocus>
-</div>
-<div>
-<div>
-<label for="zs-role">Role <a title="One word, without spaces, to set the main role of this zettel.">&#9432;</a></label>
-<input class="zs-input" type="text" id="zs-role" {{#HasRoleData}}list="zs-role-data"{{/HasRoleData}} name="role" placeholder="role.." value="{{MetaRole}}">
-{{#HasRoleData}}
-<datalist id="zs-role-data">
-{{#RoleData}}
-<option value="{{.}}">
-{{/RoleData}}
-</datalist>
-{{/HasRoleData}}
-</div>
-<label for="zs-tags">Tags <a title="Tags must begin with an '#' sign. They are separated by spaces.">&#9432;</a></label>
-<input class="zs-input" type="text" id="zs-tags" name="tags" placeholder="#tag" value="{{MetaTags}}">
-</div>
-<div>
-<label for="zs-meta">Metadata <a title="Other metadata for this zettel. Each line contains a key/value pair, separated by a colon ':'.">&#9432;</a></label>
-<textarea class="zs-input" id="zs-meta" name="meta" rows="4" placeholder="metakey: metavalue">
-{{#MetaPairsRest}}
-{{Key}}: {{Value}}
-{{/MetaPairsRest}}
-</textarea>
-</div>
-<div>
-<label for="zs-syntax">Syntax <a title="Syntax of zettel content below, one word. Typically 'zmk' (for zettelmarkup).">&#9432;</a></label>
-<input class="zs-input" type="text" id="zs-syntax" {{#HasSyntaxData}}list="zs-syntax-data"{{/HasSyntaxData}} name="syntax" placeholder="syntax.." value="{{MetaSyntax}}">
-{{#HasSyntaxData}}
-<datalist id="zs-syntax-data">
-{{#SyntaxData}}
-<option value="{{.}}">
-{{/SyntaxData}}
-</datalist>
-{{/HasSyntaxData}}</div>
-<div>
-{{#IsTextContent}}
-<label for="zs-content">Content <a title="Content for this zettel, according to above syntax.">&#9432;</a></label>
-<textarea class="zs-input zs-content" id="zs-content" name="content" rows="20" placeholder="Your content..">{{Content}}</textarea>
-{{/IsTextContent}}
-</div>
-<div>
-<input class="zs-primary" type="submit" value="Submit">
-<input class="zs-secondary" type="submit" value="Save" formaction="?save">
-<input class="zs-upload" type="file" id="zs-file" name="file">
-</div>
-</form>
-</article>

ADDED   box/constbox/form.sxn
Index: box/constbox/form.sxn
==================================================================
--- box/constbox/form.sxn
+++ box/constbox/form.sxn
@@ -0,0 +1,38 @@
+`(article
+  (header (h1 ,heading))
+  (form (@ (action ,form-action-url) (method "POST") (enctype "multipart/form-data"))
+  (div
+    (label (@ (for "zs-title")) "Title " (a (@ (title "Main heading of this zettel.")) (@H "&#9432;")))
+    (input (@ (class "zs-input") (type "text") (id "zs-title") (name "title") (placeholder "Title..") (value ,meta-title) (dir "auto") (autofocus))))
+  (div
+    (label (@ (for "zs-role")) "Role " (a (@ (title "One word, without spaces, to set the main role of this zettel.")) (@H "&#9432;")))
+    (input (@ (class "zs-input") (type "text") (id "zs-role") (name "role") (placeholder "role..") (value ,meta-role) (dir "auto")
+      ,@(if role-data '((list "zs-role-data")))
+    ))
+    ,@(wui-datalist "zs-role-data" role-data)
+  )
+  (div
+    (label (@ (for "zs-tags")) "Tags " (a (@ (title "Tags must begin with an '#' sign. They are separated by spaces.")) (@H "&#9432;")))
+    (input (@ (class "zs-input") (type "text") (id "zs-tags") (name "tags") (placeholder "#tag") (value ,meta-tags) (dir "auto"))))
+  (div
+    (label (@ (for "zs-meta")) "Metadata " (a (@ (title "Other metadata for this zettel. Each line contains a key/value pair, separated by a colon ':'.")) (@H "&#9432;")))
+    (textarea (@ (class "zs-input") (id "zs-meta") (name "meta") (rows "4") (placeholder "metakey: metavalue") (dir "auto")) ,meta))
+  (div
+    (label (@ (for "zs-syntax")) "Syntax " (a (@ (title "Syntax of zettel content below, one word. Typically 'zmk' (for zettelmarkup).")) (@H "&#9432;")))
+    (input (@ (class "zs-input") (type "text") (id "zs-syntax") (name "syntax") (placeholder "syntax..") (value ,meta-syntax) (dir "auto")
+      ,@(if syntax-data '((list "zs-syntax-data")))
+    ))
+    ,@(wui-datalist "zs-syntax-data" syntax-data)
+  )
+  ,@(if (bound? 'content)
+    `((div
+      (label (@ (for "zs-content")) "Content " (a (@ (title "Content for this zettel, according to above syntax.")) (@H "&#9432;")))
+      (textarea (@ (class "zs-input zs-content") (id "zs-content") (name "content") (rows "20") (placeholder "Zettel content..") (dir "auto")) ,content)
+    ))
+  )
+  (div
+    (input (@ (class "zs-primary") (type "submit") (value "Submit")))
+    (input (@ (class "zs-secondary") (type "submit") (value "Save") (formaction "?save")))
+    (input (@ (class "zs-upload") (type "file") (id "zs-file") (name "file")))
+  ))
+)

DELETED box/constbox/info.mustache
Index: box/constbox/info.mustache
==================================================================
--- box/constbox/info.mustache
+++ box/constbox/info.mustache
@@ -1,74 +0,0 @@
-<article>
-<header>
-<h1>Information for Zettel {{Zid}}</h1>
-<a href="{{{WebURL}}}">Web</a>
-&#183; <a href="{{{ContextURL}}}">Context</a>
-{{#CanWrite}} &#183; <a href="{{{EditURL}}}">Edit</a>{{/CanWrite}}
-{{#CanCopy}} &#183; <a href="{{{CopyURL}}}">Copy</a>{{/CanCopy}}
-{{#CanVersion}} &#183; <a href="{{{VersionURL}}}">Version</a>{{/CanVersion}}
-{{#CanFolge}} &#183; <a href="{{{FolgeURL}}}">Folge</a>{{/CanFolge}}
-{{#CanRename}}&#183; <a href="{{{RenameURL}}}">Rename</a>{{/CanRename}}
-{{#CanDelete}}&#183; <a href="{{{DeleteURL}}}">Delete</a>{{/CanDelete}}
-</header>
-<h2>Interpreted Metadata</h2>
-<table>
-{{#MetaData}}<tr><td>{{Key}}</td><td>{{{Value}}}</td></tr>
-{{/MetaData}}</table>
-<h2>References</h2>
-{{#HasLocLinks}}
-<h3>Local</h3>
-<ul>
-{{#LocLinks}}
-{{#Valid}}<li><a href="{{{Zid}}}">{{Zid}}</a></li>{{/Valid}}
-{{^Valid}}<li>{{Zid}}</li>{{/Valid}}
-{{/LocLinks}}
-</ul>
-{{/HasLocLinks}}
-{{#QueryLinks.Has}}
-<h3>Queries</h3>
-<ul>
-{{#QueryLinks.Links}}
-<li><a href="{{{URL}}}">{{Text}}</a></li>
-{{/QueryLinks.Links}}
-</ul>
-{{/QueryLinks.Has}}
-{{#HasExtLinks}}
-<h3>External</h3>
-<ul>
-{{#ExtLinks}}
-<li><a href="{{{.}}}"{{{ExtNewWindow}}}>{{.}}</a></li>
-{{/ExtLinks}}
-</ul>
-{{/HasExtLinks}}
-<h3>Unlinked</h3>
-{{{UnLinksContent}}}
-<form>
-<label for="phrase">Search Phrase</label>
-<input class="zs-input" type="text" id="phrase" name="{{QueryKeyPhrase}}" placeholder="Phrase.." value="{{UnLinksPhrase}}">
-</form>
-<h2>Parts and encodings</h2>
-<table>
-{{#EvalMatrix}}
-<tr>
-<th>{{Header}}</th>
-{{#Elements}}<td><a href="{{{URL}}}">{{Text}}</a></td>
-{{/Elements}}
-</tr>
-{{/EvalMatrix}}
-</table>
-<h3>Parsed (not evaluated)</h3>
-<table>
-{{#ParseMatrix}}
-<tr>
-<th>{{Header}}</th>
-{{#Elements}}<td><a href="{{{URL}}}">{{Text}}</a></td>
-{{/Elements}}
-</tr>
-{{/ParseMatrix}}
-</table>
-{{#HasShadowLinks}}
-<h2>Shadowed Boxes</h2>
-<ul>{{#ShadowLinks}}<li>{{.}}</li>{{/ShadowLinks}}</ul>
-{{/HasShadowLinks}}
-{{#Endnotes}}{{{Endnotes}}}{{/Endnotes}}
-</article>

ADDED   box/constbox/info.sxn
Index: box/constbox/info.sxn
==================================================================
--- box/constbox/info.sxn
+++ box/constbox/info.sxn
@@ -0,0 +1,34 @@
+`(article
+  (header (h1 "Information for Zettel " ,zid)
+    (p
+      (a (@ (href ,web-url)) "Web")
+      (@H " &#183; ") (a (@ (href ,context-url)) "Context")
+      ,@(if (bound? 'edit-url) `((@H " &#183; ") (a (@ (href ,edit-url)) "Edit")))
+      ,@(ROLE-DEFAULT-actions (current-environment))
+      ,@(if (bound? 'reindex-url) `((@H " &#183; ") (a (@ (href ,reindex-url)) "Reindex")))
+      ,@(if (bound? 'rename-url) `((@H " &#183; ") (a (@ (href ,rename-url)) "Rename")))
+      ,@(if (bound? 'delete-url) `((@H " &#183; ") (a (@ (href ,delete-url)) "Delete")))
+    )
+  )
+  (h2 "Interpreted Metadata")
+  (table ,@(map wui-table-row metadata))
+  (h2 "References")
+  ,@(if local-links `((h3 "Local")    (ul ,@(map wui-valid-link local-links))))
+  ,@(if query-links `((h3 "Queries")  (ul ,@(map wui-item-link query-links))))
+  ,@(if ext-links   `((h3 "External") (ul ,@(map wui-item-popup-link ext-links))))
+  (h3 "Unlinked")
+  ,@unlinked-content
+  (form
+    (label (@ (for "phrase")) "Search Phrase")
+    (input (@ (class "zs-input") (type "text") (id "phrase") (name ,query-key-phrase) (placeholder "Phrase..") (value ,phrase)))
+  )
+  (h2 "Parts and encodings")
+  ,(wui-enc-matrix enc-eval)
+  (h3 "Parsed (not evaluated)")
+  ,(wui-enc-matrix enc-parsed)
+  ,@(if shadow-links
+    `((h2 "Shadowed Boxes")
+      (ul ,@(map wui-item shadow-links))
+    )
+  )
+)

DELETED box/constbox/listzettel.mustache
Index: box/constbox/listzettel.mustache
==================================================================
--- box/constbox/listzettel.mustache
+++ box/constbox/listzettel.mustache
@@ -1,14 +0,0 @@
-<article>
-<header>
-<h1>{{Title}}</h1>
-</header>
-<form action="{{{SearchURL}}}">
-<input class="zs-input" type="text" placeholder="Search.." name="{{QueryKeyQuery}}" value="{{QueryValue}}">
-</form>
-{{{Content}}}
-{{#CanCreate}}<form action="{{{CreateURL}}}">
-<input type="hidden" name="{{QueryKeyQuery}}" value="{{QueryValue}}">
-<input type="hidden" name="{{QueryKeySeed}}" value="{{Seed}}">
-<input class="zs-primary" type="submit" value="Save As Zettel">
-</form>{{/CanCreate}}
-</article>

ADDED   box/constbox/listzettel.sxn
Index: box/constbox/listzettel.sxn
==================================================================
--- box/constbox/listzettel.sxn
+++ box/constbox/listzettel.sxn
@@ -0,0 +1,31 @@
+`(article
+  (header (h1 ,heading))
+  (form (@ (action ,search-url))
+    (input (@ (class "zs-input") (type "text") (placeholder "Search..") (name ,query-key-query) (value ,query-value) (dir "auto"))))
+  ,@(if (bound? 'tag-zettel)
+     `((p (@ (class "zs-meta-zettel")) "Tag zettel: " ,@tag-zettel))
+    )
+  ,@(if (bound? 'create-tag-zettel)
+     `((p (@ (class "zs-meta-zettel")) "Create tag zettel: " ,@create-tag-zettel))
+    )
+  ,@(if (bound? 'role-zettel)
+     `((p (@ (class "zs-meta-zettel")) "Role zettel: " ,@role-zettel))
+    )
+  ,@(if (bound? 'create-role-zettel)
+     `((p (@ (class "zs-meta-zettel")) "Create role zettel: " ,@create-role-zettel))
+    )
+  ,@content
+  ,@endnotes
+  (form (@ (action ,(if (bound? 'create-url) create-url)))
+      "Other encodings: "
+      (a (@ (href ,data-url)) "data")
+      ", "
+      (a (@ (href ,plain-url)) "plain")
+      ,@(if (bound? 'create-url)
+        `((input (@ (type "hidden") (name ,query-key-query) (value ,query-value)))
+          (input (@ (type "hidden") (name ,query-key-seed) (value ,seed)))
+          (input (@ (class "zs-primary") (type "submit") (value "Save As Zettel")))
+        )
+      )
+  )
+)

DELETED box/constbox/login.mustache
Index: box/constbox/login.mustache
==================================================================
--- box/constbox/login.mustache
+++ box/constbox/login.mustache
@@ -1,19 +0,0 @@
-<article>
-<header>
-<h1>{{Title}}</h1>
-</header>
-{{#Retry}}
-<div class="zs-indication zs-error">Wrong user name / password. Try again.</div>
-{{/Retry}}
-<form method="POST" action="">
-<div>
-<label for="username">User name:</label>
-<input class="zs-input" type="text" id="username" name="username" placeholder="Your user name.." autofocus>
-</div>
-<div>
-<label for="password">Password:</label>
-<input class="zs-input" type="password" id="password" name="password" placeholder="Your password..">
-</div>
-<div><input class="zs-primary" type="submit" value="Login"></div>
-</form>
-</article>

ADDED   box/constbox/login.sxn
Index: box/constbox/login.sxn
==================================================================
--- box/constbox/login.sxn
+++ box/constbox/login.sxn
@@ -0,0 +1,14 @@
+`(article
+  (header (h1 "Login"))
+  ,@(if retry '((div (@ (class "zs-indication zs-error")) "Wrong user name / password. Try again.")))
+  (form (@ (method "POST") (action ""))
+    (div
+      (label (@ (for "username")) "User name:")
+      (input (@ (class "zs-input") (type "text") (id "username") (name "username") (placeholder "Your user name..") (autofocus))))
+    (div
+      (label (@ (for "password")) "Password:")
+      (input (@ (class "zs-input") (type "password") (id "password") (name "password") (placeholder "Your password.."))))
+    (div
+      (input (@ (class "zs-primary") (type "submit") (value "Login"))))
+  )
+)

Index: box/constbox/newtoc.zettel
==================================================================
--- box/constbox/newtoc.zettel
+++ box/constbox/newtoc.zettel
@@ -1,4 +1,6 @@
 This zettel lists all zettel that should act as a template for new zettel.
 These zettel will be included in the ""New"" menu of the WebUI.
 * [[New Zettel|00000000090001]]
+* [[New Role|00000000090004]]
+* [[New Tag|00000000090003]]
 * [[New User|00000000090002]]

ADDED   box/constbox/prelude.sxn
Index: box/constbox/prelude.sxn
==================================================================
--- box/constbox/prelude.sxn
+++ box/constbox/prelude.sxn
@@ -0,0 +1,61 @@
+;;;----------------------------------------------------------------------------
+;;; Copyright (c) 2023-present Detlef Stern
+;;;
+;;; This file is part of Zettelstore.
+;;;
+;;; Zettelstore is licensed under the latest version of the EUPL (European
+;;; Union Public License). Please see file LICENSE.txt for your rights and
+;;; obligations under this license.
+;;;----------------------------------------------------------------------------
+
+;;; This zettel contains all sxn definitions that are independent of specific
+;;; subsystems, such as WebUI, API, or other. It just contains generic code to
+;;; be used elsewhere.
+
+;; Constants NIL and T
+(defconst NIL ())
+(defconst T   'T)
+
+;; Function not
+(defun not (x) (if x NIL T))
+(defconst not not)
+
+;; defunconst macro to define functions that are bound as a constant.
+;;
+;; (defunconst NAME ARGS EXPR ...)
+(defmacro defunconst (name args . body)
+    `(begin (defun ,name ,args ,@body) (defconst ,name ,name)))
+
+;; let macro
+;;
+;; (let (BINDING ...) EXPR ...), where BINDING is a list of two elements
+;;   (SYMBOL EXPR)
+(defmacro let (bindings . body)
+    `((lambda ,(map car bindings) ,@body) ,@(map cadr bindings)))
+
+;; let* macro
+;;
+;; (let* (BINDING ...) EXPR ...), where SYMBOL may occur in later bindings.
+(defmacro let* (bindings . body)
+    (if (null? bindings)
+        `((lambda () ,@body))
+        `((lambda (,(caar bindings))
+                  (let* ,(cdr bindings) ,@body))
+                  ,(cadar bindings))))
+
+;; and macro
+;;
+;; (and EXPR ...)
+(defmacro and args
+    (cond ((null? args)       T)
+          ((null? (cdr args)) (car args))
+          (T                  `(if ,(car args) (and ,@(cdr args))))))
+
+
+;; or macro
+;;
+;; (or EXPR ...)
+(defmacro or args
+    (cond ((null? args)       NIL)
+          ((null? (cdr args)) (car args))
+          (T                  `(if ,(car args) T (or ,@(cdr args))))))

DELETED box/constbox/rename.mustache
Index: box/constbox/rename.mustache
==================================================================
--- box/constbox/rename.mustache
+++ box/constbox/rename.mustache
@@ -1,41 +0,0 @@
-<article>
-<header>
-<h1>Rename Zettel {{Zid}}</h1>
-</header>
-<p>Do you really want to rename this zettel?</p>
-{{#Incoming.Has}}
-<div class="zs-warning">
-<h2>Warning!</h2>
-<p>If you rename this zettel, incoming references from the following zettel will become invalid.</p>
-<ul>
-{{#Incoming.Links}}
-<li><a href="{{{URL}}}">{{Text}}</a></li>
-{{/Incoming.Links}}
-</ul>
-</div>
-{{/Incoming.Has}}
-{{#HasUselessFiles}}
-<div class="zs-warning">
-<h2>Warning!</h2>
-<p>Renaming this zettel will also delete the following files, so that they will not be interpreted as content for a zettel with identifier {{Zid}}.</p>
-<ul>
-{{#UselessFiles}}
-<li>{{{.}}}</li>
-{{/UselessFiles}}
-</ul>
-</div>
-{{/HasUselessFiles}}
-<form method="POST">
-<div>
-<label for="newid">New zettel id</label>
-<input class="zs-input" type="text" id="newzid" name="newzid" placeholder="ZID.." value="{{Zid}}" autofocus>
-</div>
-<input type="hidden" id="curzid" name="curzid" value="{{Zid}}">
-<div><input class="zs-primary" type="submit" value="Rename"></div>
-</form>
-<dl>
-{{#MetaPairs}}
-<dt>{{Key}}:</dt><dd>{{Value}}</dd>
-{{/MetaPairs}}
-</dl>
-</article>

ADDED   box/constbox/rename.sxn
Index: box/constbox/rename.sxn
==================================================================
--- box/constbox/rename.sxn
+++ box/constbox/rename.sxn
@@ -0,0 +1,26 @@
+`(article
+  (header (h1 "Rename Zettel " ,zid))
+  (p "Do you really want to rename this zettel?")
+  ,@(if incoming
+    `((div (@ (class "zs-warning"))
+      (h2 "Warning!")
+      (p "If you rename this zettel, incoming references from the following zettel will become invalid.")
+      (ul ,@(map wui-item-link incoming))
+    ))
+  )
+  ,@(if (and (bound? 'useless) useless)
+    `((div (@ (class "zs-warning"))
+      (h2 "Warning!")
+      (p "Renaming this zettel will also delete the following files, so that they will not be interpreted as content for this zettel.")
+      (ul ,@(map wui-item useless))
+    ))
+  )
+  (form (@ (method "POST"))
+    (input (@ (type "hidden") (id "curzid") (name "curzid") (value ,zid)))
+    (div
+      (label (@ (for "newzid")) "New zettel id")
+      (input (@ (class "zs-input") (type "text") (id "newzid") (name "newzid") (placeholder "ZID..") (value ,zid) (autofocus))))
+    (div (input (@ (class "zs-primary") (type "submit") (value "Rename"))))
+  )
+  ,(wui-meta-desc metapairs)
+)

ADDED   box/constbox/roleconfiguration.zettel
Index: box/constbox/roleconfiguration.zettel
==================================================================
--- box/constbox/roleconfiguration.zettel
+++ box/constbox/roleconfiguration.zettel
@@ -0,0 +1,20 @@
+Zettel with role ""configuration"" are used within Zettelstore to manage and to show the current configuration of the software.
+
+Typically, there are some public zettel that show the license of this software, its dependencies, some CSS code to make the default web user interface a litte bit nicer, and the defult image to singal a broken image.
+
+Other zettel are only visible if an user has authenticated itself, or if there is no authentication enabled.
+In this case, one additional configuration zettel is the zettel containing the version number of this software.
+Other zettel are showing the supported metadata keys and supported syntax values.
+Zettel that allow to configure the menu of template to create new zettel are also using the role ""configuration"".
+
+Most important is the zettel that contains the runtime configuration.
+You may change its metadata value to change the behaviour of the software.
+
+One configuration is the ""expert mode"".
+If enabled, and if you are authorized so see them, you will discover some more zettel.
+For example, HTML templates to customize the default web user interface, to show the application log, to see statistics about zettel boxes, to show the host name and it operating system, and many more.
+
+You are allowed to add your own configuration zettel, for example if you want to customize the look and feel of zettel by placing relevant data into your own zettel.
+
+By default, user zettel (for authentification) use also the role ""configuration"".
+However, you are allowed to change this.

ADDED   box/constbox/rolerole.zettel
Index: box/constbox/rolerole.zettel
==================================================================
--- box/constbox/rolerole.zettel
+++ box/constbox/rolerole.zettel
@@ -0,0 +1,10 @@
+A zettel with the role ""role"" describes a specific role.
+The described role must be the title of such a zettel.
+
+This zettel is such a zettel, as it describes the meaning of the role ""role"".
+Therefore it has the title ""role"" too.
+If you like, this zettel is a meta-role.
+
+You are free to create your own role-describing zettel.
+For example, you want to document the intended meaning of the role.
+You might also be interested to describe needed metadata so that some software is enabled to analyse or to process your zettel.

ADDED   box/constbox/roletag.zettel
Index: box/constbox/roletag.zettel
==================================================================
--- box/constbox/roletag.zettel
+++ box/constbox/roletag.zettel
@@ -0,0 +1,6 @@
+A zettel with role ""tag"" is a zettel that describes specific tag.
+The tag name must be the title of such a zettel.
+
+Such zettel are similar to this specific zettel: this zettel describes zettel with a role ""tag"".
+These zettel with the role ""tag"" describe specific tags.
+These might form a hierarchy of meta-tags (and meta-roles).

ADDED   box/constbox/rolezettel.zettel
Index: box/constbox/rolezettel.zettel
==================================================================
--- box/constbox/rolezettel.zettel
+++ box/constbox/rolezettel.zettel
@@ -0,0 +1,7 @@
+A zettel with the role ""zettel"" is typically used to document your own thoughts.
+Such zettel are the main reason to use the software Zettelstore.
+
+The only predefined zettel with the role ""zettel"" is the [[default home zettel|00010000000000]], which contains some welcome information.
+
+You are free to change this.
+In this case you should modify this zettel too, so that it reflects your own use of zettel with the role ""zettel"".

ADDED   box/constbox/start.sxn
Index: box/constbox/start.sxn
==================================================================
--- box/constbox/start.sxn
+++ box/constbox/start.sxn
@@ -0,0 +1,14 @@
+;;;----------------------------------------------------------------------------
+;;; Copyright (c) 2023-present Detlef Stern
+;;;
+;;; This file is part of Zettelstore.
+;;;
+;;; Zettelstore is licensed under the latest version of the EUPL (European
+;;; Union Public License). Please see file LICENSE.txt for your rights and
+;;; obligations under this license.
+;;;----------------------------------------------------------------------------
+
+;;; This zettel is the start of the loading sequence for Sx code used in the
+;;; Zettelstore. Via the precursor metadata, dependend zettel are evaluated
+;;; before this zettel. You must always depend, directly or indirectly on the
+;;; "Zettelstore Sxn Base Code" zettel. It provides the base definitions.

ADDED   box/constbox/wuicode.sxn
Index: box/constbox/wuicode.sxn
==================================================================
--- box/constbox/wuicode.sxn
+++ box/constbox/wuicode.sxn
@@ -0,0 +1,124 @@
+;;;----------------------------------------------------------------------------
+;;; Copyright (c) 2023-present Detlef Stern
+;;;
+;;; This file is part of Zettelstore.
+;;;
+;;; Zettelstore is licensed under the latest version of the EUPL (European
+;;; Union Public License). Please see file LICENSE.txt for your rights and
+;;; obligations under this license.
+;;;----------------------------------------------------------------------------
+
+;; Contains WebUI specific code, but not related to a specific template.
+
+;; wui-list-item returns the argument as a HTML list item.
+(defunconst wui-item (s) `(li ,s))
+
+;; wui-table-row takes a pair and translates it into a HTML table row with
+;; two columns.
+(defunconst wui-table-row (p)
+    `(tr (td ,(car p)) (td ,(cdr p))))
+
+;; wui-valid-link translates a local link into a HTML link. A link is a pair
+;; (valid . url). If valid is not truish, only the invalid url is returned.
+(defunconst wui-valid-link (l)
+    (if (car l)
+        `(li (a (@ (href ,(cdr l))) ,(cdr l)))
+        `(li ,(cdr l))))
+
+;; wui-link takes a link (title . url) and returns a HTML reference.
+(defunconst wui-link (q)
+    `(a (@ (href ,(cdr q))) ,(car q)))
+
+;; wui-item-link taks a pair (text . url) and returns a HTML link inside
+;; a list item.
+(defunconst wui-item-link (q) `(li ,(wui-link q)))
+
+;; wui-tdata-link taks a pair (text . url) and returns a HTML link inside
+;; a table data item.
+(defunconst wui-tdata-link (q) `(td ,(wui-link q)))
+
+;; wui-item-popup-link is like 'wui-item-link, but the HTML link will open
+;; a new tab / window.
+(defunconst wui-item-popup-link (e)
+    `(li (a (@ (href ,e) (target "_blank") (rel "noopener noreferrer")) ,e)))
+
+;; wui-option-value returns a value for an HTML option element.
+(defunconst wui-option-value (v) `(option (@ (value ,v))))
+
+;; wui-datalist returns a HTML datalist with the given HTML identifier and a
+;; list of values.
+(defunconst wui-datalist (id lst)
+    (if lst
+        `((datalist (@ (id ,id)) ,@(map wui-option-value lst)))))
+
+;; wui-pair-desc-item takes a pair '(term . text) and returns a list with
+;; a HTML description term and a HTML description data. 
+(defunconst wui-pair-desc-item (p) `((dt ,(car p)) (dd ,(cdr p))))
+
+;; wui-meta-desc returns a HTML description list made from the list of pairs
+;; given.
+(defunconst wui-meta-desc (l)
+    `(dl ,@(apply append (map wui-pair-desc-item l))))
+
+;; wui-enc-matrix returns the HTML table of all encodings and parts.
+(defunconst wui-enc-matrix (matrix)
+    `(table
+      ,@(map
+         (lambda (row) `(tr (th ,(car row)) ,@(map wui-tdata-link (cdr row))))
+         matrix)))
+
+;; CSS-ROLE-map is a mapping (pair list, assoc list) of role names to zettel
+;; identifier. It is used in the base template to update the metadata of the
+;; HTML page to include some role specific CSS code.
+;; Referenced in function "ROLE-DEFAULT-meta".
+(defvar CSS-ROLE-map '())
+
+;; ROLE-DEFAULT-meta returns some metadata for the base template. Any role
+;; specific code should include the returned list of this function.
+(defunconst ROLE-DEFAULT-meta (env)
+    `(,@(let* ((meta-role (environment-lookup 'meta-role env))
+               (entry (assoc CSS-ROLE-map meta-role)))
+              (if (pair? entry)
+                  `((link (@ (rel "stylesheet") (href ,(zid-content-path (cdr entry))))))
+              )
+        )
+    )
+)
+
+;;; ACTION-SEPARATOR defines a HTML value that separates actions links.
+(defvar ACTION-SEPARATOR '(@H " &#183; "))
+
+;;; ROLE-DEFAULT-actions returns the default text for actions.
+(defunconst ROLE-DEFAULT-actions (env)
+    `(,@(let ((copy-url (environment-lookup 'copy-url env)))
+             (if (defined? copy-url) `((@H " &#183; ") (a (@ (href ,copy-url)) "Copy"))))
+      ,@(let ((version-url (environment-lookup 'version-url env)))
+             (if (defined? version-url) `((@H " &#183; ") (a (@ (href ,version-url)) "Version"))))
+      ,@(let ((child-url (environment-lookup 'child-url env)))
+             (if (defined? child-url) `((@H " &#183; ") (a (@ (href ,child-url)) "Child"))))
+      ,@(let ((folge-url (environment-lookup 'folge-url env)))
+             (if (defined? folge-url) `((@H " &#183; ") (a (@ (href ,folge-url)) "Folge"))))
+    )
+)
+
+;;; ROLE-tag-actions returns an additional action "Zettel" for zettel with role "tag".
+(defunconst ROLE-tag-actions (env)
+    `(,@(ROLE-DEFAULT-actions env)
+      ,@(let ((title (environment-lookup 'title env)))
+             (if (and (defined? title) title)
+                 `(,ACTION-SEPARATOR (a (@ (href ,(query->url (string-append "tags:" title)))) "Zettel"))
+             )
+        )
+    )
+)
+
+;;; ROLE-DEFAULT-heading returns the default text for headings, below the
+;;; references of a zettel. In most cases it should be called from an
+;;; overwriting function.
+(defunconst ROLE-DEFAULT-heading (env)
+    `(,@(let ((meta-url (environment-lookup 'meta-url env)))
+           (if (defined? meta-url) `((br) "URL: " ,(url-to-html meta-url))))
+      ,@(let ((meta-author (environment-lookup 'meta-author env)))
+           (if (and (defined? meta-author) meta-author) `((br) "By " ,meta-author)))
+    )
+)

DELETED box/constbox/zettel.mustache
Index: box/constbox/zettel.mustache
==================================================================
--- box/constbox/zettel.mustache
+++ box/constbox/zettel.mustache
@@ -1,52 +0,0 @@
-<article>
-<header>
-<h1>{{Heading}}</h1>
-<div class="zs-meta">
-{{#CanWrite}}<a href="{{{EditURL}}}">Edit</a> &#183;{{/CanWrite}}
-{{Zid}} &#183;
-<a href="{{{InfoURL}}}">Info</a> &#183;
-(<a href="{{{RoleURL}}}">{{RoleText}}</a>)
-{{#Tags.Has}}&#183; {{#Tags.Links}} <a href="{{{URL}}}">{{Text}}</a>{{/Tags.Links}}{{/Tags.Has}}
-{{#CanCopy}}&#183; <a href="{{{CopyURL}}}">Copy</a>{{/CanCopy}}
-{{#CanVersion}}&#183; <a href="{{{VersionURL}}}">Version</a>{{/CanVersion}}
-{{#CanFolge}}&#183; <a href="{{{FolgeURL}}}">Folge</a>{{/CanFolge}}
-{{#PredecessorRefs}}<br>Predecessor: {{{PredecessorRefs}}}{{/PredecessorRefs}}
-{{#PrecursorRefs}}<br>Precursor: {{{PrecursorRefs}}}{{/PrecursorRefs}}
-{{#HasExtURL}}<br>URL: {{{ExtURL}}}{{/HasExtURL}}
-{{#Author}}<br>By {{Author}}{{/Author}}
-</div>
-</header>
-{{{Content}}}
-</article>
-{{#NeedBottomNav}}<nav>{{/NeedBottomNav}}
-{{#FolgeLinks.Has}}
-<details open>
-<summary>Folgezettel</summary>
-<ul>
-{{#FolgeLinks.Links}}
-<li><a href="{{{URL}}}">{{Text}}</a></li>
-{{/FolgeLinks.Links}}
-</ul>
-</details>
-{{/FolgeLinks.Has}}
-{{#BackLinks.Has}}
-<details open>
-<summary>Incoming</summary>
-<ul>
-{{#BackLinks.Links}}
-<li><a href="{{{URL}}}">{{Text}}</a></li>
-{{/BackLinks.Links}}
-</ul>
-</details>
-{{/BackLinks.Has}}
-{{#SuccessorLinks.Has}}
-<details open>
-<summary>Successors</summary>
-<ul>
-{{#SuccessorLinks.Links}}
-<li><a href="{{{URL}}}">{{Text}}</a></li>
-{{/SuccessorLinks.Links}}
-</ul>
-</details>
-{{/SuccessorLinks.Has}}
-{{#NeedBottomNav}}</nav>{{/NeedBottomNav}}

ADDED   box/constbox/zettel.sxn
Index: box/constbox/zettel.sxn
==================================================================
--- box/constbox/zettel.sxn
+++ box/constbox/zettel.sxn
@@ -0,0 +1,30 @@
+`(article
+  (header
+    (h1 ,heading)
+    (div (@ (class "zs-meta"))
+      ,@(if (bound? 'edit-url) `((a (@ (href ,edit-url)) "Edit") (@H " &#183; ")))
+      ,zid (@H " &#183; ")
+      (a (@ (href ,info-url)) "Info") (@H " &#183; ")
+      "(" ,@(if (bound? 'role-url) `((a (@ (href ,role-url)) ,meta-role)))
+          ,@(if (and (bound? 'folge-role-url) (bound? 'meta-folge-role))
+                `((@H " &rarr; ") (a (@ (href ,folge-role-url)) ,meta-folge-role)))
+      ")"
+      ,@(if tag-refs `((@H " &#183; ") ,@tag-refs))
+      ,@(ROLE-DEFAULT-actions (current-environment))
+      ,@(if predecessor-refs `((br) "Predecessor: " ,predecessor-refs))
+      ,@(if precursor-refs `((br) "Precursor: " ,precursor-refs))
+      ,@(if superior-refs `((br) "Superior: " ,superior-refs))
+      ,@(ROLE-DEFAULT-heading (current-environment))
+    )
+  )
+  ,@content
+  ,endnotes
+  ,@(if (or folge-links subordinate-links back-links successor-links)
+    `((nav
+      ,@(if folge-links `((details (@ (,folge-open)) (summary "Folgezettel") (ul ,@(map wui-item-link folge-links)))))
+      ,@(if subordinate-links `((details (@ (,subordinate-open)) (summary "Subordinates") (ul ,@(map wui-item-link subordinate-links)))))
+      ,@(if back-links `((details (@ (,back-open)) (summary "Incoming") (ul ,@(map wui-item-link back-links)))))
+      ,@(if successor-links `((details (@ (,successor-open)) (summary "Successors") (ul ,@(map wui-item-link successor-links)))))
+     ))
+  )
+)

Index: box/dirbox/dirbox.go
==================================================================
--- box/dirbox/dirbox.go
+++ box/dirbox/dirbox.go
@@ -20,16 +20,16 @@
 	"sync"
 
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager"
 	"zettelstore.de/z/box/notify"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	manager.Register("dir", func(u *url.URL, cdata *manager.ConnectData) (box.ManagedBox, error) {
 		var log *logger.Logger
@@ -221,11 +221,11 @@
 
 func (dp *dirBox) CanCreateZettel(_ context.Context) bool {
 	return !dp.readonly
 }
 
-func (dp *dirBox) CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) {
+func (dp *dirBox) CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) {
 	if dp.readonly {
 		return id.Invalid, box.ErrReadOnly
 	}
 
 	newZid, err := dp.dirSrv.SetNewDirEntry()
@@ -244,39 +244,26 @@
 	dp.notifyChanged(meta.Zid)
 	dp.log.Trace().Err(err).Zid(meta.Zid).Msg("CreateZettel")
 	return meta.Zid, err
 }
 
-func (dp *dirBox) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) {
+func (dp *dirBox) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) {
 	entry := dp.dirSrv.GetDirEntry(zid)
 	if !entry.IsValid() {
-		return domain.Zettel{}, box.ErrNotFound
+		return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid}
 	}
 	m, c, err := dp.srvGetMetaContent(ctx, entry, zid)
 	if err != nil {
-		return domain.Zettel{}, err
+		return zettel.Zettel{}, err
 	}
-	zettel := domain.Zettel{Meta: m, Content: domain.NewContent(c)}
+	zettel := zettel.Zettel{Meta: m, Content: zettel.NewContent(c)}
 	dp.log.Trace().Zid(zid).Msg("GetZettel")
 	return zettel, nil
 }
 
-func (dp *dirBox) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
-	m, err := dp.doGetMeta(ctx, zid)
-	dp.log.Trace().Zid(zid).Err(err).Msg("GetMeta")
-	return m, err
-}
-func (dp *dirBox) doGetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
-	entry := dp.dirSrv.GetDirEntry(zid)
-	if !entry.IsValid() {
-		return nil, box.ErrNotFound
-	}
-	m, err := dp.srvGetMeta(ctx, entry, zid)
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
+func (dp *dirBox) HasZettel(_ context.Context, zid id.Zid) bool {
+	return dp.dirSrv.GetDirEntry(zid).IsValid()
 }
 
 func (dp *dirBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error {
 	entries := dp.dirSrv.GetDirEntries(constraint)
 	dp.log.Trace().Int("entries", int64(len(entries))).Msg("ApplyZid")
@@ -301,23 +288,23 @@
 		handle(m)
 	}
 	return nil
 }
 
-func (dp *dirBox) CanUpdateZettel(context.Context, domain.Zettel) bool {
+func (dp *dirBox) CanUpdateZettel(context.Context, zettel.Zettel) bool {
 	return !dp.readonly
 }
 
-func (dp *dirBox) UpdateZettel(ctx context.Context, zettel domain.Zettel) error {
+func (dp *dirBox) UpdateZettel(ctx context.Context, zettel zettel.Zettel) error {
 	if dp.readonly {
 		return box.ErrReadOnly
 	}
 
 	meta := zettel.Meta
 	zid := meta.Zid
 	if !zid.IsValid() {
-		return &box.ErrInvalidID{Zid: zid}
+		return box.ErrInvalidZid{Zid: zid.String()}
 	}
 	entry := dp.dirSrv.GetDirEntry(zid)
 	if !entry.IsValid() {
 		// Existing zettel, but new in this box.
 		entry = &notify.DirEntry{Zid: zid}
@@ -330,11 +317,11 @@
 	}
 	dp.log.Trace().Zid(zid).Err(err).Msg("UpdateZettel")
 	return err
 }
 
-func (dp *dirBox) updateEntryFromMetaContent(entry *notify.DirEntry, m *meta.Meta, content domain.Content) {
+func (dp *dirBox) updateEntryFromMetaContent(entry *notify.DirEntry, m *meta.Meta, content zettel.Content) {
 	entry.SetupFromMetaContent(m, content, dp.cdata.Config.GetZettelFileSyntax)
 }
 
 func (dp *dirBox) AllowRenameZettel(context.Context, id.Zid) bool {
 	return !dp.readonly
@@ -344,19 +331,19 @@
 	if curZid == newZid {
 		return nil
 	}
 	curEntry := dp.dirSrv.GetDirEntry(curZid)
 	if !curEntry.IsValid() {
-		return box.ErrNotFound
+		return box.ErrZettelNotFound{Zid: curZid}
 	}
 	if dp.readonly {
 		return box.ErrReadOnly
 	}
 
 	// Check whether zettel with new ID already exists in this box.
-	if _, err := dp.doGetMeta(ctx, newZid); err == nil {
-		return &box.ErrInvalidID{Zid: newZid}
+	if dp.HasZettel(ctx, newZid) {
+		return box.ErrInvalidZid{Zid: newZid.String()}
 	}
 
 	oldMeta, oldContent, err := dp.srvGetMetaContent(ctx, curEntry, curZid)
 	if err != nil {
 		return err
@@ -365,11 +352,11 @@
 	newEntry, err := dp.dirSrv.RenameDirEntry(curEntry, newZid)
 	if err != nil {
 		return err
 	}
 	oldMeta.Zid = newZid
-	newZettel := domain.Zettel{Meta: oldMeta, Content: domain.NewContent(oldContent)}
+	newZettel := zettel.Zettel{Meta: oldMeta, Content: zettel.NewContent(oldContent)}
 	if err = dp.srvSetZettel(ctx, &newEntry, newZettel); err != nil {
 		// "Rollback" rename. No error checking...
 		dp.dirSrv.RenameDirEntry(&newEntry, curZid)
 		return err
 	}
@@ -395,11 +382,11 @@
 		return box.ErrReadOnly
 	}
 
 	entry := dp.dirSrv.GetDirEntry(zid)
 	if !entry.IsValid() {
-		return box.ErrNotFound
+		return box.ErrZettelNotFound{Zid: zid}
 	}
 	err := dp.dirSrv.DeleteDirEntry(zid)
 	if err != nil {
 		return nil
 	}

Index: box/dirbox/service.go
==================================================================
--- box/dirbox/service.go
+++ box/dirbox/service.go
@@ -17,23 +17,23 @@
 	"path/filepath"
 	"time"
 
 	"zettelstore.de/z/box/filebox"
 	"zettelstore.de/z/box/notify"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func fileService(i uint32, log *logger.Logger, dirPath string, cmds <-chan fileCmd) {
 	// Something may panic. Ensure a running service.
 	defer func() {
-		if r := recover(); r != nil {
-			kernel.Main.LogRecover("FileService", r)
+		if ri := recover(); ri != nil {
+			kernel.Main.LogRecover("FileService", ri)
 			go fileService(i, log, dirPath, cmds)
 		}
 	}()
 
 	log.Trace().Uint("i", uint64(i)).Str("dirpath", dirPath).Msg("File service started")
@@ -166,11 +166,11 @@
 
 // COMMAND: srvSetZettel ----------------------------------------
 //
 // Writes a new or exsting zettel.
 
-func (dp *dirBox) srvSetZettel(ctx context.Context, entry *notify.DirEntry, zettel domain.Zettel) error {
+func (dp *dirBox) srvSetZettel(ctx context.Context, entry *notify.DirEntry, zettel zettel.Zettel) error {
 	rc := make(chan resSetZettel, 1)
 	dp.getFileChan(zettel.Meta.Zid) <- &fileSetZettel{entry, zettel, rc}
 	ctx, cancel := context.WithTimeout(ctx, serviceTimeout)
 	defer cancel()
 	select {
@@ -181,11 +181,11 @@
 	}
 }
 
 type fileSetZettel struct {
 	entry  *notify.DirEntry
-	zettel domain.Zettel
+	zettel zettel.Zettel
 	rc     chan<- resSetZettel
 }
 type resSetZettel = error
 
 func (cmd *fileSetZettel) run(log *logger.Logger, dirPath string) {

Index: box/filebox/filebox.go
==================================================================
--- box/filebox/filebox.go
+++ box/filebox/filebox.go
@@ -15,16 +15,16 @@
 	"errors"
 	"net/url"
 	"path/filepath"
 	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	manager.Register("file", func(u *url.URL, cdata *manager.ConnectData) (box.ManagedBox, error) {
 		path := getFilepathFromURL(u)

Index: box/filebox/zipbox.go
==================================================================
--- box/filebox/zipbox.go
+++ box/filebox/zipbox.go
@@ -16,16 +16,16 @@
 	"io"
 	"strings"
 
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/notify"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type zipBox struct {
 	log      *logger.Logger
 	number   int
@@ -80,26 +80,18 @@
 func (zb *zipBox) Stop(context.Context) {
 	zb.dirSrv.Stop()
 	zb.dirSrv = nil
 }
 
-func (*zipBox) CanCreateZettel(context.Context) bool { return false }
-
-func (zb *zipBox) CreateZettel(context.Context, domain.Zettel) (id.Zid, error) {
-	err := box.ErrReadOnly
-	zb.log.Trace().Err(err).Msg("CreateZettel")
-	return id.Invalid, err
-}
-
-func (zb *zipBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) {
+func (zb *zipBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) {
 	entry := zb.dirSrv.GetDirEntry(zid)
 	if !entry.IsValid() {
-		return domain.Zettel{}, box.ErrNotFound
+		return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid}
 	}
 	reader, err := zip.OpenReader(zb.name)
 	if err != nil {
-		return domain.Zettel{}, err
+		return zettel.Zettel{}, err
 	}
 	defer reader.Close()
 
 	var m *meta.Meta
 	var src []byte
@@ -110,11 +102,11 @@
 		if contentName == "" {
 			zb.log.Panic().Zid(zid).Msg("No meta, no content in zipBox.GetZettel")
 		}
 		src, err = readZipFileContent(reader, entry.ContentName)
 		if err != nil {
-			return domain.Zettel{}, err
+			return zettel.Zettel{}, err
 		}
 		if entry.HasMetaInContent() {
 			inp := input.NewInput(src)
 			m = meta.NewFromInput(zid, inp)
 			src = src[inp.Pos:]
@@ -122,39 +114,28 @@
 			m = CalcDefaultMeta(zid, entry.ContentExt)
 		}
 	} else {
 		m, err = readZipMetaFile(reader, zid, metaName)
 		if err != nil {
-			return domain.Zettel{}, err
+			return zettel.Zettel{}, err
 		}
 		inMeta = true
 		if contentName != "" {
 			src, err = readZipFileContent(reader, entry.ContentName)
 			if err != nil {
-				return domain.Zettel{}, err
+				return zettel.Zettel{}, err
 			}
 		}
 	}
 
 	CleanupMeta(m, zid, entry.ContentExt, inMeta, entry.UselessFiles)
 	zb.log.Trace().Zid(zid).Msg("GetZettel")
-	return domain.Zettel{Meta: m, Content: domain.NewContent(src)}, nil
-}
-
-func (zb *zipBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) {
-	entry := zb.dirSrv.GetDirEntry(zid)
-	if !entry.IsValid() {
-		return nil, box.ErrNotFound
-	}
-	reader, err := zip.OpenReader(zb.name)
-	if err != nil {
-		return nil, err
-	}
-	defer reader.Close()
-	m, err := zb.readZipMeta(reader, zid, entry)
-	zb.log.Trace().Err(err).Zid(zid).Msg("GetMeta")
-	return m, err
+	return zettel.Zettel{Meta: m, Content: zettel.NewContent(src)}, nil
+}
+
+func (zb *zipBox) HasZettel(_ context.Context, zid id.Zid) bool {
+	return zb.dirSrv.GetDirEntry(zid).IsValid()
 }
 
 func (zb *zipBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error {
 	entries := zb.dirSrv.GetDirEntries(constraint)
 	zb.log.Trace().Int("entries", int64(len(entries))).Msg("ApplyZid")
@@ -184,18 +165,10 @@
 		handle(m)
 	}
 	return nil
 }
 
-func (*zipBox) CanUpdateZettel(context.Context, domain.Zettel) bool { return false }
-
-func (zb *zipBox) UpdateZettel(context.Context, domain.Zettel) error {
-	err := box.ErrReadOnly
-	zb.log.Trace().Err(err).Msg("UpdateZettel")
-	return err
-}
-
 func (zb *zipBox) AllowRenameZettel(_ context.Context, zid id.Zid) bool {
 	entry := zb.dirSrv.GetDirEntry(zid)
 	return !entry.IsValid()
 }
 
@@ -204,11 +177,11 @@
 	if curZid == newZid {
 		err = nil
 	}
 	curEntry := zb.dirSrv.GetDirEntry(curZid)
 	if !curEntry.IsValid() {
-		err = box.ErrNotFound
+		err = box.ErrZettelNotFound{Zid: curZid}
 	}
 	zb.log.Trace().Err(err).Msg("RenameZettel")
 	return err
 }
 
@@ -216,11 +189,11 @@
 
 func (zb *zipBox) DeleteZettel(_ context.Context, zid id.Zid) error {
 	err := box.ErrReadOnly
 	entry := zb.dirSrv.GetDirEntry(zid)
 	if !entry.IsValid() {
-		err = box.ErrNotFound
+		err = box.ErrZettelNotFound{Zid: zid}
 	}
 	zb.log.Trace().Err(err).Msg("DeleteZettel")
 	return err
 }
 

Index: box/helper.go
==================================================================
--- box/helper.go
+++ box/helper.go
@@ -13,11 +13,11 @@
 import (
 	"net/url"
 	"strconv"
 	"time"
 
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 // GetNewZid calculates a new and unused zettel identifier, based on the current date and time.
 func GetNewZid(testZid func(id.Zid) (bool, error)) (id.Zid, error) {
 	withSeconds := false

Index: box/manager/anteroom.go
==================================================================
--- box/manager/anteroom.go
+++ box/manager/anteroom.go
@@ -11,11 +11,11 @@
 package manager
 
 import (
 	"sync"
 
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 type arAction int
 
 const (
@@ -23,28 +23,26 @@
 	arReload
 	arZettel
 )
 
 type anteroom struct {
-	num     uint64
 	next    *anteroom
 	waiting id.Set
 	curLoad int
 	reload  bool
 }
 
-type anterooms struct {
+type anteroomQueue struct {
 	mx      sync.Mutex
-	nextNum uint64
 	first   *anteroom
 	last    *anteroom
 	maxLoad int
 }
 
-func newAnterooms(maxLoad int) *anterooms { return &anterooms{maxLoad: maxLoad} }
+func newAnteroomQueue(maxLoad int) *anteroomQueue { return &anteroomQueue{maxLoad: maxLoad} }
 
-func (ar *anterooms) EnqueueZettel(zid id.Zid) {
+func (ar *anteroomQueue) EnqueueZettel(zid id.Zid) {
 	if !zid.IsValid() {
 		return
 	}
 	ar.mx.Lock()
 	defer ar.mx.Unlock()
@@ -61,59 +59,51 @@
 			// Zettel is already waiting. Nothing to do.
 			return
 		}
 	}
 	if room := ar.last; !room.reload && (ar.maxLoad == 0 || room.curLoad < ar.maxLoad) {
-		room.waiting.Zid(zid)
+		room.waiting.Add(zid)
 		room.curLoad++
 		return
 	}
 	room := ar.makeAnteroom(zid)
 	ar.last.next = room
 	ar.last = room
 }
 
-func (ar *anterooms) makeAnteroom(zid id.Zid) *anteroom {
-	ar.nextNum++
-	if zid == id.Invalid {
-		return &anteroom{num: ar.nextNum, next: nil, waiting: nil, curLoad: 0, reload: true}
-	}
-	c := ar.maxLoad
-	if c == 0 {
-		c = 100
-	}
-	waiting := id.NewSetCap(ar.maxLoad, zid)
-	return &anteroom{num: ar.nextNum, next: nil, waiting: waiting, curLoad: 1, reload: false}
-}
-
-func (ar *anterooms) Reset() {
-	ar.mx.Lock()
-	defer ar.mx.Unlock()
-	ar.first = ar.makeAnteroom(id.Invalid)
+func (ar *anteroomQueue) makeAnteroom(zid id.Zid) *anteroom {
+	if zid == id.Invalid {
+		panic(zid)
+	}
+	waiting := id.NewSetCap(max(ar.maxLoad, 100), zid)
+	return &anteroom{next: nil, waiting: waiting, curLoad: 1, reload: false}
+}
+
+func (ar *anteroomQueue) Reset() {
+	ar.mx.Lock()
+	defer ar.mx.Unlock()
+	ar.first = &anteroom{next: nil, waiting: nil, curLoad: 0, reload: true}
 	ar.last = ar.first
 }
 
-func (ar *anterooms) Reload(newZids id.Set) uint64 {
+func (ar *anteroomQueue) Reload(allZids id.Set) {
 	ar.mx.Lock()
 	defer ar.mx.Unlock()
 	ar.deleteReloadedRooms()
 
-	if ns := len(newZids); ns > 0 {
-		ar.nextNum++
-		ar.first = &anteroom{num: ar.nextNum, next: ar.first, waiting: newZids, curLoad: ns, reload: true}
+	if ns := len(allZids); ns > 0 {
+		ar.first = &anteroom{next: ar.first, waiting: allZids, curLoad: ns, reload: true}
 		if ar.first.next == nil {
 			ar.last = ar.first
 		}
-		return ar.nextNum
+	} else {
+		ar.first = nil
+		ar.last = nil
 	}
-
-	ar.first = nil
-	ar.last = nil
-	return 0
 }
 
-func (ar *anterooms) deleteReloadedRooms() {
+func (ar *anteroomQueue) deleteReloadedRooms() {
 	room := ar.first
 	for room != nil && room.reload {
 		room = room.next
 	}
 	ar.first = room
@@ -120,33 +110,32 @@
 	if room == nil {
 		ar.last = nil
 	}
 }
 
-func (ar *anterooms) Dequeue() (arAction, id.Zid, uint64) {
+func (ar *anteroomQueue) Dequeue() (arAction, id.Zid, bool) {
 	ar.mx.Lock()
 	defer ar.mx.Unlock()
-	if ar.first == nil {
-		return arNothing, id.Invalid, 0
-	}
-	roomNo := ar.first.num
-	if ar.first.waiting == nil {
-		ar.removeFirst()
-		return arReload, id.Invalid, roomNo
-	}
-	for zid := range ar.first.waiting {
-		delete(ar.first.waiting, zid)
-		if len(ar.first.waiting) == 0 {
-			ar.removeFirst()
-		}
-		return arZettel, zid, roomNo
-	}
-	ar.removeFirst()
-	return arNothing, id.Invalid, 0
-}
-
-func (ar *anterooms) removeFirst() {
+	first := ar.first
+	if first != nil {
+		if first.waiting == nil && first.reload {
+			ar.removeFirst()
+			return arReload, id.Invalid, false
+		}
+		for zid := range first.waiting {
+			delete(first.waiting, zid)
+			if len(first.waiting) == 0 {
+				ar.removeFirst()
+			}
+			return arZettel, zid, first.reload
+		}
+		ar.removeFirst()
+	}
+	return arNothing, id.Invalid, false
+}
+
+func (ar *anteroomQueue) removeFirst() {
 	ar.first = ar.first.next
 	if ar.first == nil {
 		ar.last = nil
 	}
 }

Index: box/manager/anteroom_test.go
==================================================================
--- box/manager/anteroom_test.go
+++ box/manager/anteroom_test.go
@@ -11,20 +11,20 @@
 package manager
 
 import (
 	"testing"
 
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 func TestSimple(t *testing.T) {
 	t.Parallel()
-	ar := newAnterooms(2)
+	ar := newAnteroomQueue(2)
 	ar.EnqueueZettel(id.Zid(1))
-	action, zid, rno := ar.Dequeue()
-	if zid != id.Zid(1) || action != arZettel || rno != 1 {
-		t.Errorf("Expected arZettel/1/1, but got %v/%v/%v", action, zid, rno)
+	action, zid, lastReload := ar.Dequeue()
+	if zid != id.Zid(1) || action != arZettel || lastReload {
+		t.Errorf("Expected arZettel/1/false, but got %v/%v/%v", action, zid, lastReload)
 	}
 	_, zid, _ = ar.Dequeue()
 	if zid != id.Invalid {
 		t.Errorf("Expected invalid Zid, but got %v", zid)
 	}
@@ -50,11 +50,11 @@
 	}
 }
 
 func TestReset(t *testing.T) {
 	t.Parallel()
-	ar := newAnterooms(1)
+	ar := newAnteroomQueue(1)
 	ar.EnqueueZettel(id.Zid(1))
 	ar.Reset()
 	action, zid, _ := ar.Dequeue()
 	if action != arReload || zid != id.Invalid {
 		t.Errorf("Expected reload & invalid Zid, but got %v/%v", action, zid)
@@ -83,11 +83,11 @@
 	action, zid, _ = ar.Dequeue()
 	if action != arNothing || zid != id.Invalid {
 		t.Errorf("Expected nothing & invalid Zid, but got %v/%v", action, zid)
 	}
 
-	ar = newAnterooms(1)
+	ar = newAnteroomQueue(1)
 	ar.Reload(id.NewSet(id.Zid(6)))
 	action, zid, _ = ar.Dequeue()
 	if zid != id.Zid(6) || action != arZettel {
 		t.Errorf("Expected 6/arZettel, but got %v/%v", zid, action)
 	}
@@ -94,13 +94,13 @@
 	action, zid, _ = ar.Dequeue()
 	if action != arNothing || zid != id.Invalid {
 		t.Errorf("Expected nothing & invalid Zid, but got %v/%v", action, zid)
 	}
 
-	ar = newAnterooms(1)
+	ar = newAnteroomQueue(1)
 	ar.EnqueueZettel(id.Zid(8))
 	ar.Reload(nil)
 	action, zid, _ = ar.Dequeue()
 	if action != arNothing || zid != id.Invalid {
 		t.Errorf("Expected nothing & invalid Zid, but got %v/%v", action, zid)
 	}
 }

Index: box/manager/box.go
==================================================================
--- box/manager/box.go
+++ box/manager/box.go
@@ -14,14 +14,14 @@
 	"context"
 	"errors"
 	"strings"
 
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Conatains all box.Box related functions
 
 // Location returns some information where the box is located.
@@ -39,101 +39,75 @@
 	return sb.String()
 }
 
 // CanCreateZettel returns true, if box could possibly create a new zettel.
 func (mgr *Manager) CanCreateZettel(ctx context.Context) bool {
+	if mgr.State() != box.StartStateStarted {
+		return false
+	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
-	return mgr.State() == box.StartStateStarted && mgr.boxes[0].CanCreateZettel(ctx)
+	if box, isWriteBox := mgr.boxes[0].(box.WriteBox); isWriteBox {
+		return box.CanCreateZettel(ctx)
+	}
+	return false
 }
 
 // CreateZettel creates a new zettel.
-func (mgr *Manager) CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) {
+func (mgr *Manager) CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) {
 	mgr.mgrLog.Debug().Msg("CreateZettel")
 	if mgr.State() != box.StartStateStarted {
 		return id.Invalid, box.ErrStopped
 	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
-	return mgr.boxes[0].CreateZettel(ctx, zettel)
+	if box, isWriteBox := mgr.boxes[0].(box.WriteBox); isWriteBox {
+		zettel.Meta = mgr.cleanMetaProperties(zettel.Meta)
+		zid, err := box.CreateZettel(ctx, zettel)
+		if err == nil {
+			mgr.idxUpdateZettel(ctx, zettel)
+		}
+		return zid, err
+	}
+	return id.Invalid, box.ErrReadOnly
 }
 
 // GetZettel retrieves a specific zettel.
-func (mgr *Manager) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) {
+func (mgr *Manager) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) {
 	mgr.mgrLog.Debug().Zid(zid).Msg("GetZettel")
 	if mgr.State() != box.StartStateStarted {
-		return domain.Zettel{}, box.ErrStopped
+		return zettel.Zettel{}, box.ErrStopped
 	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
 	for i, p := range mgr.boxes {
-		if z, err := p.GetZettel(ctx, zid); err != box.ErrNotFound {
+		var errZNF box.ErrZettelNotFound
+		if z, err := p.GetZettel(ctx, zid); !errors.As(err, &errZNF) {
 			if err == nil {
 				mgr.Enrich(ctx, z.Meta, i+1)
 			}
 			return z, err
 		}
 	}
-	return domain.Zettel{}, box.ErrNotFound
+	return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid}
 }
 
 // GetAllZettel retrieves a specific zettel from all managed boxes.
-func (mgr *Manager) GetAllZettel(ctx context.Context, zid id.Zid) ([]domain.Zettel, error) {
+func (mgr *Manager) GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error) {
 	mgr.mgrLog.Debug().Zid(zid).Msg("GetAllZettel")
 	if mgr.State() != box.StartStateStarted {
 		return nil, box.ErrStopped
 	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
-	var result []domain.Zettel
+	var result []zettel.Zettel
 	for i, p := range mgr.boxes {
 		if z, err := p.GetZettel(ctx, zid); err == nil {
 			mgr.Enrich(ctx, z.Meta, i+1)
 			result = append(result, z)
 		}
 	}
-	return result, nil
-}
-
-// GetMeta retrieves just the meta data of a specific zettel.
-func (mgr *Manager) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
-	mgr.mgrLog.Debug().Zid(zid).Msg("GetMeta")
-	if mgr.State() != box.StartStateStarted {
-		return nil, box.ErrStopped
-	}
-	mgr.mgrMx.RLock()
-	defer mgr.mgrMx.RUnlock()
-	return mgr.doGetMeta(ctx, zid)
-}
-
-func (mgr *Manager) doGetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
-	for i, p := range mgr.boxes {
-		if m, err := p.GetMeta(ctx, zid); err != box.ErrNotFound {
-			if err == nil {
-				mgr.Enrich(ctx, m, i+1)
-			}
-			return m, err
-		}
-	}
-	return nil, box.ErrNotFound
-}
-
-// GetAllMeta retrieves the meta data of a specific zettel from all managed boxes.
-func (mgr *Manager) GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error) {
-	mgr.mgrLog.Debug().Zid(zid).Msg("GetAllMeta")
-	if mgr.State() != box.StartStateStarted {
-		return nil, box.ErrStopped
-	}
-	mgr.mgrMx.RLock()
-	defer mgr.mgrMx.RUnlock()
-	var result []*meta.Meta
-	for i, p := range mgr.boxes {
-		if m, err := p.GetMeta(ctx, zid); err == nil {
-			mgr.Enrich(ctx, m, i+1)
-			result = append(result, m)
-		}
-	}
 	return result, nil
 }
 
 // FetchZids returns the set of all zettel identifer managed by the box.
 func (mgr *Manager) FetchZids(ctx context.Context) (id.Set, error) {
@@ -143,39 +117,70 @@
 	}
 	result := id.Set{}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
 	for _, p := range mgr.boxes {
-		err := p.ApplyZid(ctx, func(zid id.Zid) { result.Zid(zid) }, func(id.Zid) bool { return true })
+		err := p.ApplyZid(ctx, func(zid id.Zid) { result.Add(zid) }, func(id.Zid) bool { return true })
 		if err != nil {
 			return nil, err
 		}
 	}
 	return result, nil
 }
 
-type metaMap map[id.Zid]*meta.Meta
+func (mgr *Manager) HasZettel(ctx context.Context, zid id.Zid) bool {
+	mgr.mgrLog.Debug().Zid(zid).Msg("HasZettel")
+	if mgr.State() != box.StartStateStarted {
+		return false
+	}
+	mgr.mgrMx.RLock()
+	defer mgr.mgrMx.RUnlock()
+	for _, bx := range mgr.boxes {
+		if bx.HasZettel(ctx, zid) {
+			return true
+		}
+	}
+	return false
+}
+
+func (mgr *Manager) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
+	mgr.mgrLog.Debug().Zid(zid).Msg("GetMeta")
+	if mgr.State() != box.StartStateStarted {
+		return nil, box.ErrStopped
+	}
+
+	m, err := mgr.idxStore.GetMeta(ctx, zid)
+	if err != nil {
+		return nil, err
+	}
+	mgr.Enrich(ctx, m, 0)
+	return m, nil
+}
 
 // SelectMeta returns all zettel meta data that match the selection
 // criteria. The result is ordered by descending zettel id.
-func (mgr *Manager) SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) {
+func (mgr *Manager) SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error) {
 	if msg := mgr.mgrLog.Debug(); msg.Enabled() {
 		msg.Str("query", q.String()).Msg("SelectMeta")
 	}
 	if mgr.State() != box.StartStateStarted {
 		return nil, box.ErrStopped
 	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
 
-	compSearch := q.RetrieveAndCompile(mgr)
-	selected := metaMap{}
+	compSearch := q.RetrieveAndCompile(ctx, mgr, metaSeq)
+	if result := compSearch.Result(); result != nil {
+		mgr.mgrLog.Trace().Int("count", int64(len(result))).Msg("found without ApplyMeta")
+		return result, nil
+	}
+	selected := map[id.Zid]*meta.Meta{}
 	for _, term := range compSearch.Terms {
 		rejected := id.Set{}
 		handleMeta := func(m *meta.Meta) {
 			zid := m.Zid
-			if rejected.Contains(zid) {
+			if rejected.ContainsOrNil(zid) {
 				mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/alreadyRejected")
 				return
 			}
 			if _, ok := selected[zid]; ok {
 				mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/alreadySelected")
@@ -183,48 +188,58 @@
 			}
 			if compSearch.PreMatch(m) && term.Match(m) {
 				selected[zid] = m
 				mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/match")
 			} else {
-				rejected.Zid(zid)
+				rejected.Add(zid)
 				mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/reject")
 			}
 		}
 		for _, p := range mgr.boxes {
-			if err := p.ApplyMeta(ctx, handleMeta, term.Retrieve); err != nil {
-				return nil, err
+			if err2 := p.ApplyMeta(ctx, handleMeta, term.Retrieve); err2 != nil {
+				return nil, err2
 			}
 		}
 	}
 	result := make([]*meta.Meta, 0, len(selected))
 	for _, m := range selected {
 		result = append(result, m)
 	}
-	return q.AfterSearch(result), nil
+	result = compSearch.AfterSearch(result)
+	mgr.mgrLog.Trace().Int("count", int64(len(result))).Msg("found with ApplyMeta")
+	return result, nil
 }
 
 // CanUpdateZettel returns true, if box could possibly update the given zettel.
-func (mgr *Manager) CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool {
+func (mgr *Manager) CanUpdateZettel(ctx context.Context, zettel zettel.Zettel) bool {
+	if mgr.State() != box.StartStateStarted {
+		return false
+	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
-	return mgr.State() == box.StartStateStarted && mgr.boxes[0].CanUpdateZettel(ctx, zettel)
+	if box, isWriteBox := mgr.boxes[0].(box.WriteBox); isWriteBox {
+		return box.CanUpdateZettel(ctx, zettel)
+	}
+	return false
+
 }
 
 // UpdateZettel updates an existing zettel.
-func (mgr *Manager) UpdateZettel(ctx context.Context, zettel domain.Zettel) error {
+func (mgr *Manager) UpdateZettel(ctx context.Context, zettel zettel.Zettel) error {
 	mgr.mgrLog.Debug().Zid(zettel.Meta.Zid).Msg("UpdateZettel")
 	if mgr.State() != box.StartStateStarted {
 		return box.ErrStopped
 	}
-	// Remove all (computed) properties from metadata before storing the zettel.
-	zettel.Meta = zettel.Meta.Clone()
-	for _, p := range zettel.Meta.ComputedPairsRest() {
-		if mgr.propertyKeys.Has(p.Key) {
-			zettel.Meta.Delete(p.Key)
-		}
-	}
-	return mgr.boxes[0].UpdateZettel(ctx, zettel)
+	if box, isWriteBox := mgr.boxes[0].(box.WriteBox); isWriteBox {
+		zettel.Meta = mgr.cleanMetaProperties(zettel.Meta)
+		if err := box.UpdateZettel(ctx, zettel); err != nil {
+			return err
+		}
+		mgr.idxUpdateZettel(ctx, zettel)
+		return nil
+	}
+	return box.ErrReadOnly
 }
 
 // AllowRenameZettel returns true, if box will not disallow renaming the zettel.
 func (mgr *Manager) AllowRenameZettel(ctx context.Context, zid id.Zid) bool {
 	if mgr.State() != box.StartStateStarted {
@@ -248,17 +263,19 @@
 	}
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
 	for i, p := range mgr.boxes {
 		err := p.RenameZettel(ctx, curZid, newZid)
-		if err != nil && !errors.Is(err, box.ErrNotFound) {
+		var errZNF box.ErrZettelNotFound
+		if err != nil && !errors.As(err, &errZNF) {
 			for j := 0; j < i; j++ {
 				mgr.boxes[j].RenameZettel(ctx, newZid, curZid)
 			}
 			return err
 		}
 	}
+	mgr.idxRenameZettel(ctx, curZid, newZid)
 	return nil
 }
 
 // CanDeleteZettel returns true, if box could possibly delete the given zettel.
 func (mgr *Manager) CanDeleteZettel(ctx context.Context, zid id.Zid) bool {
@@ -284,13 +301,26 @@
 	mgr.mgrMx.RLock()
 	defer mgr.mgrMx.RUnlock()
 	for _, p := range mgr.boxes {
 		err := p.DeleteZettel(ctx, zid)
 		if err == nil {
+			mgr.idxDeleteZettel(ctx, zid)
 			return nil
 		}
-		if !errors.Is(err, box.ErrNotFound) && !errors.Is(err, box.ErrReadOnly) {
+		var errZNF box.ErrZettelNotFound
+		if !errors.As(err, &errZNF) && !errors.Is(err, box.ErrReadOnly) {
 			return err
 		}
 	}
-	return box.ErrNotFound
+	return box.ErrZettelNotFound{Zid: zid}
+}
+
+// Remove all (computed) properties from metadata before storing the zettel.
+func (mgr *Manager) cleanMetaProperties(m *meta.Meta) *meta.Meta {
+	result := m.Clone()
+	for _, p := range result.ComputedPairsRest() {
+		if mgr.propertyKeys.Has(p.Key) {
+			result.Delete(p.Key)
+		}
+	}
+	return result
 }

Index: box/manager/collect.go
==================================================================
--- box/manager/collect.go
+++ box/manager/collect.go
@@ -13,12 +13,12 @@
 import (
 	"strings"
 
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/box/manager/store"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
 )
 
 type collectData struct {
 	refs  id.Set
 	words store.WordSet
@@ -74,8 +74,8 @@
 	}
 	if !ref.IsZettel() {
 		return
 	}
 	if zid, err := id.Parse(ref.URL.Path); err == nil {
-		data.refs.Zid(zid)
+		data.refs.Add(zid)
 	}
 }

Index: box/manager/enrich.go
==================================================================
--- box/manager/enrich.go
+++ box/manager/enrich.go
@@ -12,14 +12,14 @@
 
 import (
 	"context"
 	"strconv"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Enrich computes additional properties and updates the given metadata.
 func (mgr *Manager) Enrich(ctx context.Context, m *meta.Meta, boxNumber int) {
 
@@ -32,11 +32,13 @@
 		// Enrich is called indirectly via indexer or enrichment is not requested
 		// because of other reasons -> ignore this call, do not update metadata
 		return
 	}
 	computePublished(m)
-	m.Set(api.KeyBoxNumber, strconv.Itoa(boxNumber))
+	if boxNumber > 0 {
+		m.Set(api.KeyBoxNumber, strconv.Itoa(boxNumber))
+	}
 	mgr.idxStore.Enrich(ctx, m)
 }
 
 func computeCreated(zid id.Zid) string {
 	if zid <= 10101000000 {

Index: box/manager/indexer.go
==================================================================
--- box/manager/indexer.go
+++ box/manager/indexer.go
@@ -16,16 +16,16 @@
 	"net/url"
 	"time"
 
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager/store"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // SearchEqual returns all zettel that contains the given exact word.
 // The word must be normalized through Unicode NKFD, trimmed and not empty.
 func (mgr *Manager) SearchEqual(word string) id.Set {
@@ -73,12 +73,12 @@
 // idxIndexer runs in the background and updates the index data structures.
 // This is the main service of the idxIndexer.
 func (mgr *Manager) idxIndexer() {
 	// Something may panic. Ensure a running indexer.
 	defer func() {
-		if r := recover(); r != nil {
-			kernel.Main.LogRecover("Indexer", r)
+		if ri := recover(); ri != nil {
+			kernel.Main.LogRecover("Indexer", ri)
 			go mgr.idxIndexer()
 		}
 	}()
 
 	timerDuration := 15 * time.Second
@@ -91,25 +91,21 @@
 		}
 	}
 }
 
 func (mgr *Manager) idxWorkService(ctx context.Context) {
-	var roomNum uint64
 	var start time.Time
 	for {
-		switch action, zid, arRoomNum := mgr.idxAr.Dequeue(); action {
+		switch action, zid, lastReload := mgr.idxAr.Dequeue(); action {
 		case arNothing:
 			return
 		case arReload:
 			mgr.idxLog.Debug().Msg("reload")
-			roomNum = 0
 			zids, err := mgr.FetchZids(ctx)
 			if err == nil {
 				start = time.Now()
-				if rno := mgr.idxAr.Reload(zids); rno > 0 {
-					roomNum = rno
-				}
+				mgr.idxAr.Reload(zids)
 				mgr.idxMx.Lock()
 				mgr.idxLastReload = time.Now().Local()
 				mgr.idxSinceReload = 0
 				mgr.idxMx.Unlock()
 			}
@@ -117,24 +113,21 @@
 			mgr.idxLog.Debug().Zid(zid).Msg("zettel")
 			zettel, err := mgr.GetZettel(ctx, zid)
 			if err != nil {
 				// Zettel was deleted or is not accessible b/c of other reasons
 				mgr.idxLog.Trace().Zid(zid).Msg("delete")
-				mgr.idxMx.Lock()
-				mgr.idxSinceReload++
-				mgr.idxMx.Unlock()
-				mgr.idxDeleteZettel(zid)
+				mgr.idxDeleteZettel(ctx, zid)
 				continue
 			}
 			mgr.idxLog.Trace().Zid(zid).Msg("update")
+			mgr.idxUpdateZettel(ctx, zettel)
 			mgr.idxMx.Lock()
-			if arRoomNum == roomNum {
+			if lastReload {
 				mgr.idxDurReload = time.Since(start)
 			}
 			mgr.idxSinceReload++
 			mgr.idxMx.Unlock()
-			mgr.idxUpdateZettel(ctx, zettel)
 		}
 	}
 }
 
 func (mgr *Manager) idxSleepService(timer *time.Timer, timerDuration time.Duration) bool {
@@ -155,17 +148,17 @@
 		return false
 	}
 	return true
 }
 
-func (mgr *Manager) idxUpdateZettel(ctx context.Context, zettel domain.Zettel) {
+func (mgr *Manager) idxUpdateZettel(ctx context.Context, zettel zettel.Zettel) {
 	var cData collectData
 	cData.initialize()
 	collectZettelIndexData(parser.ParseZettel(ctx, zettel, "", mgr.rtConfig), &cData)
 
 	m := zettel.Meta
-	zi := store.NewZettelIndex(m.Zid)
+	zi := store.NewZettelIndex(m)
 	mgr.idxCollectFromMeta(ctx, m, zi, &cData)
 	mgr.idxProcessData(ctx, zi, &cData)
 	toCheck := mgr.idxStore.UpdateReferences(ctx, zi)
 	mgr.idxCheckZettel(toCheck)
 }
@@ -189,20 +182,34 @@
 		case meta.TypeURL:
 			if _, err := url.Parse(pair.Value); err == nil {
 				cData.urls.Add(pair.Value)
 			}
 		default:
-			for _, word := range strfun.NormalizeWords(pair.Value) {
-				cData.words.Add(word)
+			if descr.Type.IsSet {
+				for _, val := range meta.ListFromValue(pair.Value) {
+					idxCollectMetaValue(cData.words, val)
+				}
+			} else {
+				idxCollectMetaValue(cData.words, pair.Value)
 			}
 		}
 	}
 }
+
+func idxCollectMetaValue(stWords store.WordSet, value string) {
+	if words := strfun.NormalizeWords(value); len(words) > 0 {
+		for _, word := range words {
+			stWords.Add(word)
+		}
+	} else {
+		stWords.Add(value)
+	}
+}
 
 func (mgr *Manager) idxProcessData(ctx context.Context, zi *store.ZettelIndex, cData *collectData) {
 	for ref := range cData.refs {
-		if _, err := mgr.GetMeta(ctx, ref); err == nil {
+		if mgr.HasZettel(ctx, ref) {
 			zi.AddBackRef(ref)
 		} else {
 			zi.AddDeadRef(ref)
 		}
 	}
@@ -213,26 +220,31 @@
 func (mgr *Manager) idxUpdateValue(ctx context.Context, inverseKey, value string, zi *store.ZettelIndex) {
 	zid, err := id.Parse(value)
 	if err != nil {
 		return
 	}
-	if _, err = mgr.GetMeta(ctx, zid); err != nil {
+	if !mgr.HasZettel(ctx, zid) {
 		zi.AddDeadRef(zid)
 		return
 	}
 	if inverseKey == "" {
 		zi.AddBackRef(zid)
 		return
 	}
-	zi.AddMetaRef(inverseKey, zid)
+	zi.AddInverseRef(inverseKey, zid)
+}
+
+func (mgr *Manager) idxRenameZettel(ctx context.Context, curZid, newZid id.Zid) {
+	toCheck := mgr.idxStore.RenameZettel(ctx, curZid, newZid)
+	mgr.idxCheckZettel(toCheck)
 }
 
-func (mgr *Manager) idxDeleteZettel(zid id.Zid) {
-	toCheck := mgr.idxStore.DeleteZettel(context.Background(), zid)
+func (mgr *Manager) idxDeleteZettel(ctx context.Context, zid id.Zid) {
+	toCheck := mgr.idxStore.DeleteZettel(ctx, zid)
 	mgr.idxCheckZettel(toCheck)
 }
 
 func (mgr *Manager) idxCheckZettel(s id.Set) {
 	for zid := range s {
 		mgr.idxAr.EnqueueZettel(zid)
 	}
 }

Index: box/manager/manager.go
==================================================================
--- box/manager/manager.go
+++ box/manager/manager.go
@@ -16,21 +16,21 @@
 	"io"
 	"net/url"
 	"sync"
 	"time"
 
-	"zettelstore.de/c/maps"
+	"zettelstore.de/client.fossil/maps"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager/memstore"
 	"zettelstore.de/z/box/manager/store"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // ConnectData contains all administration related values.
 type ConnectData struct {
 	Number   int // number of the box, starting with 1.
@@ -97,11 +97,11 @@
 	propertyKeys strfun.Set // Set of property key names
 
 	// Indexer data
 	idxLog   *logger.Logger
 	idxStore store.Store
-	idxAr    *anterooms
+	idxAr    *anteroomQueue
 	idxReady chan struct{} // Signal a non-empty anteroom to background task
 
 	// Indexer stats data
 	idxMx          sync.RWMutex
 	idxLastReload  time.Time
@@ -138,11 +138,11 @@
 		infos:        make(chan box.UpdateInfo, len(boxURIs)*10),
 		propertyKeys: propertyKeys,
 
 		idxLog:   boxLog.Clone().Str("box", "index").Child(),
 		idxStore: memstore.New(),
-		idxAr:    newAnterooms(1000),
+		idxAr:    newAnteroomQueue(1000),
 		idxReady: make(chan struct{}, 1),
 	}
 	cdata := ConnectData{Number: 1, Config: rtConfig, Enricher: mgr, Notify: mgr.infos}
 	boxes := make([]box.ManagedBox, 0, len(boxURIs)+2)
 	for _, uri := range boxURIs {
@@ -181,12 +181,12 @@
 }
 
 func (mgr *Manager) notifier() {
 	// The call to notify may panic. Ensure a running notifier.
 	defer func() {
-		if r := recover(); r != nil {
-			kernel.Main.LogRecover("Notifier", r)
+		if ri := recover(); ri != nil {
+			kernel.Main.LogRecover("Notifier", ri)
 			go mgr.notifier()
 		}
 	}()
 
 	tsLastEvent := time.Now()
@@ -299,20 +299,32 @@
 	}
 	mgr.idxAr.Reset() // Ensure an initial index run
 	mgr.done = make(chan struct{})
 	go mgr.notifier()
 
-	for !mgr.allBoxesStarted() {
-		mgr.mgrLog.Trace().Msg("Wait for boxes to start")
-		time.Sleep(time.Second)
-	}
+	mgr.waitBoxesAreStarted()
 	mgr.setState(box.StartStateStarted)
 	mgr.notifyObserver(&box.UpdateInfo{Box: mgr, Reason: box.OnReady})
 
 	go mgr.idxIndexer()
 	return nil
 }
+
+func (mgr *Manager) waitBoxesAreStarted() {
+	const waitTime = 10 * time.Millisecond
+	const waitLoop = int(1 * time.Second / waitTime)
+	for i := 1; !mgr.allBoxesStarted(); i++ {
+		if i%waitLoop == 0 {
+			if time.Duration(i)*waitTime > time.Minute {
+				mgr.mgrLog.Warn().Msg("Waiting for more than one minute to start")
+			} else {
+				mgr.mgrLog.Trace().Msg("Wait for boxes to start")
+			}
+		}
+		time.Sleep(waitTime)
+	}
+}
 
 func (mgr *Manager) allBoxesStarted() bool {
 	for _, bx := range mgr.boxes {
 		if b, ok := bx.(box.StartStopper); ok && b.State() != box.StartStateStarted {
 			return false
@@ -342,20 +354,30 @@
 func (mgr *Manager) Refresh(ctx context.Context) error {
 	mgr.mgrLog.Debug().Msg("Refresh")
 	if mgr.State() != box.StartStateStarted {
 		return box.ErrStopped
 	}
+	mgr.infos <- box.UpdateInfo{Reason: box.OnReload, Zid: id.Invalid}
 	mgr.mgrMx.Lock()
 	defer mgr.mgrMx.Unlock()
-	mgr.infos <- box.UpdateInfo{Reason: box.OnReload, Zid: id.Invalid}
 	for _, bx := range mgr.boxes {
 		if rb, ok := bx.(box.Refresher); ok {
 			rb.Refresh(ctx)
 		}
 	}
 	return nil
 }
+
+// ReIndex data of the given zettel.
+func (mgr *Manager) ReIndex(_ context.Context, zid id.Zid) error {
+	mgr.mgrLog.Debug().Msg("ReIndex")
+	if mgr.State() != box.StartStateStarted {
+		return box.ErrStopped
+	}
+	mgr.infos <- box.UpdateInfo{Reason: box.OnReload, Zid: zid}
+	return nil
+}
 
 // ReadStats populates st with box statistics.
 func (mgr *Manager) ReadStats(st *box.Stats) {
 	mgr.mgrLog.Debug().Msg("ReadStats")
 	mgr.mgrMx.RLock()

Index: box/manager/memstore/memstore.go
==================================================================
--- box/manager/memstore/memstore.go
+++ box/manager/memstore/memstore.go
@@ -17,66 +17,74 @@
 	"io"
 	"sort"
 	"strings"
 	"sync"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/maps"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/maps"
+	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager/store"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
-type metaRefs struct {
+type bidiRefs struct {
 	forward  id.Slice
 	backward id.Slice
 }
 
-type zettelIndex struct {
-	dead     id.Slice
-	forward  id.Slice
-	backward id.Slice
-	meta     map[string]metaRefs
-	words    []string
-	urls     []string
-}
-
-func (zi *zettelIndex) isEmpty() bool {
-	if len(zi.forward) > 0 || len(zi.backward) > 0 || len(zi.dead) > 0 || len(zi.words) > 0 {
-		return false
-	}
-	return len(zi.meta) == 0
+type zettelData struct {
+	meta      *meta.Meta // a local copy of the metadata, without computed keys
+	dead      id.Slice   // list of dead references in this zettel
+	forward   id.Slice   // list of forward references in this zettel
+	backward  id.Slice   // list of zettel that reference with zettel
+	otherRefs map[string]bidiRefs
+	words     []string // list of words of this zettel
+	urls      []string // list of urls of this zettel
 }
 
 type stringRefs map[string]id.Slice
 
 type memStore struct {
-	mx    sync.RWMutex
-	idx   map[id.Zid]*zettelIndex
-	dead  map[id.Zid]id.Slice // map dead refs where they occur
-	words stringRefs
-	urls  stringRefs
+	mx     sync.RWMutex
+	intern map[string]string // map to intern strings
+	idx    map[id.Zid]*zettelData
+	dead   map[id.Zid]id.Slice // map dead refs where they occur
+	words  stringRefs
+	urls   stringRefs
 
 	// Stats
+	mxStats sync.Mutex
 	updates uint64
 }
 
 // New returns a new memory-based index store.
 func New() store.Store {
 	return &memStore{
-		idx:   make(map[id.Zid]*zettelIndex),
-		dead:  make(map[id.Zid]id.Slice),
-		words: make(stringRefs),
-		urls:  make(stringRefs),
+		intern: make(map[string]string, 1024),
+		idx:    make(map[id.Zid]*zettelData),
+		dead:   make(map[id.Zid]id.Slice),
+		words:  make(stringRefs),
+		urls:   make(stringRefs),
+	}
+}
+
+func (ms *memStore) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) {
+	ms.mx.RLock()
+	defer ms.mx.RUnlock()
+	if zi, found := ms.idx[zid]; found && zi.meta != nil {
+		// zi.meta is nil, if zettel was referenced, but is not indexed yet.
+		return zi.meta.Clone(), nil
 	}
+	return nil, box.ErrZettelNotFound{Zid: zid}
 }
 
 func (ms *memStore) Enrich(_ context.Context, m *meta.Meta) {
 	if ms.doEnrich(m) {
-		ms.mx.Lock()
+		ms.mxStats.Lock()
 		ms.updates++
-		ms.mx.Unlock()
+		ms.mxStats.Unlock()
 	}
 }
 
 func (ms *memStore) doEnrich(m *meta.Meta) bool {
 	ms.mx.RLock()
@@ -88,21 +96,21 @@
 	var updated bool
 	if len(zi.dead) > 0 {
 		m.Set(api.KeyDead, zi.dead.String())
 		updated = true
 	}
-	back := removeOtherMetaRefs(m, zi.backward.Copy())
+	back := removeOtherMetaRefs(m, zi.backward.Clone())
 	if len(zi.backward) > 0 {
 		m.Set(api.KeyBackward, zi.backward.String())
 		updated = true
 	}
 	if len(zi.forward) > 0 {
 		m.Set(api.KeyForward, zi.forward.String())
 		back = remRefs(back, zi.forward)
 		updated = true
 	}
-	for k, refs := range zi.meta {
+	for k, refs := range zi.otherRefs {
 		if len(refs.backward) > 0 {
 			m.Set(k, refs.backward.String())
 			back = remRefs(back, refs.backward)
 			updated = true
 		}
@@ -119,14 +127,14 @@
 func (ms *memStore) SearchEqual(word string) id.Set {
 	ms.mx.RLock()
 	defer ms.mx.RUnlock()
 	result := id.NewSet()
 	if refs, ok := ms.words[word]; ok {
-		result.AddSlice(refs)
+		result.CopySlice(refs)
 	}
 	if refs, ok := ms.urls[word]; ok {
-		result.AddSlice(refs)
+		result.CopySlice(refs)
 	}
 	zid, err := id.Parse(word)
 	if err != nil {
 		return result
 	}
@@ -221,27 +229,27 @@
 	result := id.NewSet()
 	for word, refs := range ms.words {
 		if !pred(word, s) {
 			continue
 		}
-		result.AddSlice(refs)
+		result.CopySlice(refs)
 	}
 	for u, refs := range ms.urls {
 		if !pred(u, s) {
 			continue
 		}
-		result.AddSlice(refs)
+		result.CopySlice(refs)
 	}
 	return result
 }
 
-func addBackwardZids(result id.Set, zid id.Zid, zi *zettelIndex) {
+func addBackwardZids(result id.Set, zid id.Zid, zi *zettelData) {
 	// Must only be called if ms.mx is read-locked!
-	result.Zid(zid)
-	result.AddSlice(zi.backward)
-	for _, mref := range zi.meta {
-		result.AddSlice(mref.backward)
+	result.Add(zid)
+	result.CopySlice(zi.backward)
+	for _, mref := range zi.otherRefs {
+		result.CopySlice(mref.backward)
 	}
 }
 
 func removeOtherMetaRefs(m *meta.Meta, back id.Slice) id.Slice {
 	for _, p := range m.PairsRest() {
@@ -262,13 +270,14 @@
 }
 
 func (ms *memStore) UpdateReferences(_ context.Context, zidx *store.ZettelIndex) id.Set {
 	ms.mx.Lock()
 	defer ms.mx.Unlock()
+	m := ms.makeMeta(zidx)
 	zi, ziExist := ms.idx[zidx.Zid]
 	if !ziExist || zi == nil {
-		zi = &zettelIndex{}
+		zi = &zettelData{}
 		ziExist = false
 	}
 
 	// Is this zettel an old dead reference mentioned in other zettel?
 	var toCheck id.Set
@@ -276,25 +285,65 @@
 		// These must be checked later again
 		toCheck = id.NewSet(refs...)
 		delete(ms.dead, zidx.Zid)
 	}
 
+	zi.meta = m
 	ms.updateDeadReferences(zidx, zi)
-	ms.updateForwardBackwardReferences(zidx, zi)
-	ms.updateMetadataReferences(zidx, zi)
-	zi.words = updateWordSet(zidx.Zid, ms.words, zi.words, zidx.GetWords())
-	zi.urls = updateWordSet(zidx.Zid, ms.urls, zi.urls, zidx.GetUrls())
+	ids := ms.updateForwardBackwardReferences(zidx, zi)
+	toCheck = toCheck.Copy(ids)
+	ids = ms.updateMetadataReferences(zidx, zi)
+	toCheck = toCheck.Copy(ids)
+	zi.words = updateStrings(zidx.Zid, ms.words, zi.words, zidx.GetWords())
+	zi.urls = updateStrings(zidx.Zid, ms.urls, zi.urls, zidx.GetUrls())
 
 	// Check if zi must be inserted into ms.idx
-	if !ziExist && !zi.isEmpty() {
+	if !ziExist {
 		ms.idx[zidx.Zid] = zi
 	}
 
 	return toCheck
 }
 
-func (ms *memStore) updateDeadReferences(zidx *store.ZettelIndex, zi *zettelIndex) {
+var internableKeys = map[string]bool{
+	api.KeyRole:      true,
+	api.KeySyntax:    true,
+	api.KeyFolgeRole: true,
+	api.KeyLang:      true,
+	api.KeyReadOnly:  true,
+}
+
+func isInternableValue(key string) bool {
+	if internableKeys[key] {
+		return true
+	}
+	return strings.HasSuffix(key, "-role")
+}
+
+func (ms *memStore) internString(s string) string {
+	if is, found := ms.intern[s]; found {
+		return is
+	}
+	ms.intern[s] = s
+	return s
+}
+
+func (ms *memStore) makeMeta(zidx *store.ZettelIndex) *meta.Meta {
+	origM := zidx.GetMeta()
+	copyM := meta.New(origM.Zid)
+	for _, p := range origM.Pairs() {
+		key := ms.internString(p.Key)
+		if isInternableValue(key) {
+			copyM.Set(key, ms.internString(p.Value))
+		} else if key == api.KeyBoxNumber || !meta.IsComputed(key) {
+			copyM.Set(key, p.Value)
+		}
+	}
+	return copyM
+}
+
+func (ms *memStore) updateDeadReferences(zidx *store.ZettelIndex, zi *zettelData) {
 	// Must only be called if ms.mx is write-locked!
 	drefs := zidx.GetDeadRefs()
 	newRefs, remRefs := refsDiff(drefs, zi.dead)
 	zi.dead = drefs
 	for _, ref := range remRefs {
@@ -303,58 +352,71 @@
 	for _, ref := range newRefs {
 		ms.dead[ref] = addRef(ms.dead[ref], zidx.Zid)
 	}
 }
 
-func (ms *memStore) updateForwardBackwardReferences(zidx *store.ZettelIndex, zi *zettelIndex) {
+func (ms *memStore) updateForwardBackwardReferences(zidx *store.ZettelIndex, zi *zettelData) id.Set {
 	// Must only be called if ms.mx is write-locked!
 	brefs := zidx.GetBackRefs()
 	newRefs, remRefs := refsDiff(brefs, zi.forward)
 	zi.forward = brefs
+
+	var toCheck id.Set
 	for _, ref := range remRefs {
-		bzi := ms.getEntry(ref)
+		bzi := ms.getOrCreateEntry(ref)
 		bzi.backward = remRef(bzi.backward, zidx.Zid)
+		if bzi.meta == nil {
+			toCheck = toCheck.Add(ref)
+		}
 	}
 	for _, ref := range newRefs {
-		bzi := ms.getEntry(ref)
+		bzi := ms.getOrCreateEntry(ref)
 		bzi.backward = addRef(bzi.backward, zidx.Zid)
+		if bzi.meta == nil {
+			toCheck = toCheck.Add(ref)
+		}
 	}
+	return toCheck
 }
 
-func (ms *memStore) updateMetadataReferences(zidx *store.ZettelIndex, zi *zettelIndex) {
+func (ms *memStore) updateMetadataReferences(zidx *store.ZettelIndex, zi *zettelData) id.Set {
 	// Must only be called if ms.mx is write-locked!
-	metarefs := zidx.GetMetaRefs()
-	for key, mr := range zi.meta {
-		if _, ok := metarefs[key]; ok {
+	inverseRefs := zidx.GetInverseRefs()
+	for key, mr := range zi.otherRefs {
+		if _, ok := inverseRefs[key]; ok {
 			continue
 		}
 		ms.removeInverseMeta(zidx.Zid, key, mr.forward)
 	}
-	if zi.meta == nil {
-		zi.meta = make(map[string]metaRefs)
+	if zi.otherRefs == nil {
+		zi.otherRefs = make(map[string]bidiRefs)
 	}
-	for key, mrefs := range metarefs {
-		mr := zi.meta[key]
+	var toCheck id.Set
+	for key, mrefs := range inverseRefs {
+		mr := zi.otherRefs[key]
 		newRefs, remRefs := refsDiff(mrefs, mr.forward)
 		mr.forward = mrefs
-		zi.meta[key] = mr
+		zi.otherRefs[key] = mr
 
 		for _, ref := range newRefs {
-			bzi := ms.getEntry(ref)
-			if bzi.meta == nil {
-				bzi.meta = make(map[string]metaRefs)
+			bzi := ms.getOrCreateEntry(ref)
+			if bzi.otherRefs == nil {
+				bzi.otherRefs = make(map[string]bidiRefs)
 			}
-			bmr := bzi.meta[key]
+			bmr := bzi.otherRefs[key]
 			bmr.backward = addRef(bmr.backward, zidx.Zid)
-			bzi.meta[key] = bmr
+			bzi.otherRefs[key] = bmr
+			if bzi.meta == nil {
+				toCheck = toCheck.Add(ref)
+			}
 		}
 		ms.removeInverseMeta(zidx.Zid, key, remRefs)
 	}
+	return toCheck
 }
 
-func updateWordSet(zid id.Zid, srefs stringRefs, prev []string, next store.WordSet) []string {
-	// Must only be called if ms.mx is write-locked!
+func updateStrings(zid id.Zid, srefs stringRefs, prev []string, next store.WordSet) []string {
 	newWords, removeWords := next.Diff(prev)
 	for _, word := range newWords {
 		if refs, ok := srefs[word]; ok {
 			srefs[word] = addRef(refs, zid)
 			continue
@@ -374,42 +436,115 @@
 		srefs[word] = refs2
 	}
 	return next.Words()
 }
 
-func (ms *memStore) getEntry(zid id.Zid) *zettelIndex {
+func (ms *memStore) getOrCreateEntry(zid id.Zid) *zettelData {
 	// Must only be called if ms.mx is write-locked!
 	if zi, ok := ms.idx[zid]; ok {
 		return zi
 	}
-	zi := &zettelIndex{}
+	zi := &zettelData{}
 	ms.idx[zid] = zi
 	return zi
 }
+
+func (ms *memStore) RenameZettel(_ context.Context, curZid, newZid id.Zid) id.Set {
+	ms.mx.Lock()
+	defer ms.mx.Unlock()
+
+	curZi, curFound := ms.idx[curZid]
+	_, newFound := ms.idx[newZid]
+	if !curFound || newFound {
+		return nil
+	}
+	newZi := &zettelData{
+		meta:      copyMeta(curZi.meta, newZid),
+		dead:      ms.copyDeadReferences(curZi.dead),
+		forward:   ms.copyForward(curZi.forward, newZid),
+		backward:  nil, // will be done through tocheck
+		otherRefs: nil, // TODO: check if this will be done through toCheck
+		words:     copyStrings(ms.words, curZi.words, newZid),
+		urls:      copyStrings(ms.urls, curZi.urls, newZid),
+	}
+
+	ms.idx[newZid] = newZi
+	toCheck := ms.doDeleteZettel(curZid)
+	toCheck = toCheck.CopySlice(ms.dead[newZid])
+	delete(ms.dead, newZid)
+	toCheck = toCheck.Add(newZid) // should update otherRefs
+	return toCheck
+}
+func copyMeta(m *meta.Meta, newZid id.Zid) *meta.Meta {
+	result := m.Clone()
+	result.Zid = newZid
+	return result
+}
+func (ms *memStore) copyDeadReferences(curDead id.Slice) id.Slice {
+	// Must only be called if ms.mx is write-locked!
+	if l := len(curDead); l > 0 {
+		result := make(id.Slice, l)
+		for i, ref := range curDead {
+			result[i] = ref
+			ms.dead[ref] = addRef(ms.dead[ref], ref)
+		}
+		return result
+	}
+	return nil
+}
+func (ms *memStore) copyForward(curForward id.Slice, newZid id.Zid) id.Slice {
+	// Must only be called if ms.mx is write-locked!
+	if l := len(curForward); l > 0 {
+		result := make(id.Slice, l)
+		for i, ref := range curForward {
+			result[i] = ref
+			if fzi, found := ms.idx[ref]; found {
+				fzi.backward = addRef(fzi.backward, newZid)
+			}
+		}
+		return result
+	}
+	return nil
+}
+func copyStrings(msStringMap stringRefs, curStrings []string, newZid id.Zid) []string {
+	// Must only be called if ms.mx is write-locked!
+	if l := len(curStrings); l > 0 {
+		result := make([]string, l)
+		for i, s := range curStrings {
+			result[i] = s
+			msStringMap[s] = addRef(msStringMap[s], newZid)
+		}
+		return result
+	}
+	return nil
+}
 
 func (ms *memStore) DeleteZettel(_ context.Context, zid id.Zid) id.Set {
 	ms.mx.Lock()
 	defer ms.mx.Unlock()
+	return ms.doDeleteZettel(zid)
+}
 
+func (ms *memStore) doDeleteZettel(zid id.Zid) id.Set {
+	// Must only be called if ms.mx is write-locked!
 	zi, ok := ms.idx[zid]
 	if !ok {
 		return nil
 	}
 
 	ms.deleteDeadSources(zid, zi)
 	toCheck := ms.deleteForwardBackward(zid, zi)
-	if len(zi.meta) > 0 {
-		for key, mrefs := range zi.meta {
-			ms.removeInverseMeta(zid, key, mrefs.forward)
-		}
+	for key, mrefs := range zi.otherRefs {
+		ms.removeInverseMeta(zid, key, mrefs.forward)
 	}
-	ms.deleteWords(zid, zi.words)
+	deleteStrings(ms.words, zi.words, zid)
+	deleteStrings(ms.urls, zi.urls, zid)
 	delete(ms.idx, zid)
 	return toCheck
 }
 
-func (ms *memStore) deleteDeadSources(zid id.Zid, zi *zettelIndex) {
+func (ms *memStore) deleteDeadSources(zid id.Zid, zi *zettelData) {
 	// Must only be called if ms.mx is write-locked!
 	for _, ref := range zi.dead {
 		if drefs, ok := ms.dead[ref]; ok {
 			drefs = remRef(drefs, zid)
 			if len(drefs) > 0 {
@@ -419,76 +554,75 @@
 			}
 		}
 	}
 }
 
-func (ms *memStore) deleteForwardBackward(zid id.Zid, zi *zettelIndex) id.Set {
+func (ms *memStore) deleteForwardBackward(zid id.Zid, zi *zettelData) id.Set {
 	// Must only be called if ms.mx is write-locked!
-	var toCheck id.Set
 	for _, ref := range zi.forward {
 		if fzi, ok := ms.idx[ref]; ok {
 			fzi.backward = remRef(fzi.backward, zid)
 		}
 	}
+	var toCheck id.Set
 	for _, ref := range zi.backward {
 		if bzi, ok := ms.idx[ref]; ok {
 			bzi.forward = remRef(bzi.forward, zid)
-			if toCheck == nil {
-				toCheck = id.NewSet()
-			}
-			toCheck.Zid(ref)
+			toCheck = toCheck.Add(ref)
 		}
 	}
 	return toCheck
 }
 
 func (ms *memStore) removeInverseMeta(zid id.Zid, key string, forward id.Slice) {
 	// Must only be called if ms.mx is write-locked!
 	for _, ref := range forward {
 		bzi, ok := ms.idx[ref]
-		if !ok || bzi.meta == nil {
+		if !ok || bzi.otherRefs == nil {
 			continue
 		}
-		bmr, ok := bzi.meta[key]
+		bmr, ok := bzi.otherRefs[key]
 		if !ok {
 			continue
 		}
 		bmr.backward = remRef(bmr.backward, zid)
 		if len(bmr.backward) > 0 || len(bmr.forward) > 0 {
-			bzi.meta[key] = bmr
+			bzi.otherRefs[key] = bmr
 		} else {
-			delete(bzi.meta, key)
-			if len(bzi.meta) == 0 {
-				bzi.meta = nil
+			delete(bzi.otherRefs, key)
+			if len(bzi.otherRefs) == 0 {
+				bzi.otherRefs = nil
 			}
 		}
 	}
 }
 
-func (ms *memStore) deleteWords(zid id.Zid, words []string) {
+func deleteStrings(msStringMap stringRefs, curStrings []string, zid id.Zid) {
 	// Must only be called if ms.mx is write-locked!
-	for _, word := range words {
-		refs, ok := ms.words[word]
+	for _, word := range curStrings {
+		refs, ok := msStringMap[word]
 		if !ok {
 			continue
 		}
 		refs2 := remRef(refs, zid)
 		if len(refs2) == 0 {
-			delete(ms.words, word)
+			delete(msStringMap, word)
 			continue
 		}
-		ms.words[word] = refs2
+		msStringMap[word] = refs2
 	}
 }
 
 func (ms *memStore) ReadStats(st *store.Stats) {
 	ms.mx.RLock()
 	st.Zettel = len(ms.idx)
-	st.Updates = ms.updates
 	st.Words = uint64(len(ms.words))
 	st.Urls = uint64(len(ms.urls))
 	ms.mx.RUnlock()
+	ms.mxStats.Lock()
+	st.Updates = ms.updates
+	ms.mxStats.Unlock()
 }
 
 func (ms *memStore) Dump(w io.Writer) {
 	ms.mx.RLock()
 	defer ms.mx.RUnlock()
@@ -516,11 +650,11 @@
 		if len(zi.dead) > 0 {
 			fmt.Fprintln(w, "* Dead:", zi.dead)
 		}
 		dumpZids(w, "* Forward:", zi.forward)
 		dumpZids(w, "* Backward:", zi.backward)
-		for k, fb := range zi.meta {
+		for k, fb := range zi.otherRefs {
 			fmt.Fprintln(w, "* Meta", k)
 			dumpZids(w, "** Forward:", fb.forward)
 			dumpZids(w, "** Backward:", fb.backward)
 		}
 		dumpStrings(w, "* Words", "", "", zi.words)

Index: box/manager/memstore/refs.go
==================================================================
--- box/manager/memstore/refs.go
+++ box/manager/memstore/refs.go
@@ -8,11 +8,15 @@
 // under this license.
 //-----------------------------------------------------------------------------
 
 package memstore
 
-import "zettelstore.de/z/domain/id"
+import (
+	"slices"
+
+	"zettelstore.de/z/zettel/id"
+)
 
 func refsDiff(refsN, refsO id.Slice) (newRefs, remRefs id.Slice) {
 	npos, opos := 0, 0
 	for npos < len(refsN) && opos < len(refsO) {
 		rn, ro := refsN[npos], refsO[opos]
@@ -48,13 +52,11 @@
 			lo = m + 1
 		} else {
 			hi = m
 		}
 	}
-	refs = append(refs, id.Invalid)
-	copy(refs[hi+1:], refs[hi:])
-	refs[hi] = ref
+	refs = slices.Insert(refs, hi, ref)
 	return refs
 }
 
 func remRefs(refs, rem id.Slice) id.Slice {
 	if len(refs) == 0 || len(rem) == 0 {

Index: box/manager/memstore/refs_test.go
==================================================================
--- box/manager/memstore/refs_test.go
+++ box/manager/memstore/refs_test.go
@@ -11,11 +11,11 @@
 package memstore
 
 import (
 	"testing"
 
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 func assertRefs(t *testing.T, i int, got, exp id.Slice) {
 	t.Helper()
 	if got == nil && exp != nil {

Index: box/manager/store/store.go
==================================================================
--- box/manager/store/store.go
+++ box/manager/store/store.go
@@ -13,13 +13,13 @@
 
 import (
 	"context"
 	"io"
 
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Stats records statistics about the store.
 type Stats struct {
 	// Zettel is the number of zettel managed by the indexer.
@@ -38,16 +38,23 @@
 // Store all relevant zettel data. There may be multiple implementations, i.e.
 // memory-based, file-based, based on SQLite, ...
 type Store interface {
 	query.Searcher
 
+	// GetMeta returns the metadata of the zettel with the given identifier.
+	GetMeta(context.Context, id.Zid) (*meta.Meta, error)
+
 	// Entrich metadata with data from store.
 	Enrich(ctx context.Context, m *meta.Meta)
 
 	// UpdateReferences for a specific zettel.
 	// Returns set of zettel identifier that must also be checked for changes.
 	UpdateReferences(context.Context, *ZettelIndex) id.Set
+
+	// RenameZettel changes all references of current zettel identifier to new
+	// zettel identifier.
+	RenameZettel(_ context.Context, curZid, newZid id.Zid) id.Set
 
 	// DeleteZettel removes index data for given zettel.
 	// Returns set of zettel identifier that must also be checked for changes.
 	DeleteZettel(context.Context, id.Zid) id.Set
 

Index: box/manager/store/zettel.go
==================================================================
--- box/manager/store/zettel.go
+++ box/manager/store/zettel.go
@@ -8,76 +8,80 @@
 // under this license.
 //-----------------------------------------------------------------------------
 
 package store
 
-import "zettelstore.de/z/domain/id"
+import (
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
 
 // ZettelIndex contains all index data of a zettel.
 type ZettelIndex struct {
-	Zid      id.Zid            // zid of the indexed zettel
-	backrefs id.Set            // set of back references
-	metarefs map[string]id.Set // references to inverse keys
-	deadrefs id.Set            // set of dead references
-	words    WordSet
-	urls     WordSet
+	Zid         id.Zid            // zid of the indexed zettel
+	meta        *meta.Meta        // full metadata
+	backrefs    id.Set            // set of back references
+	inverseRefs map[string]id.Set // references of inverse keys
+	deadrefs    id.Set            // set of dead references
+	words       WordSet
+	urls        WordSet
 }
 
 // NewZettelIndex creates a new zettel index.
-func NewZettelIndex(zid id.Zid) *ZettelIndex {
+func NewZettelIndex(m *meta.Meta) *ZettelIndex {
 	return &ZettelIndex{
-		Zid:      zid,
-		backrefs: id.NewSet(),
-		metarefs: make(map[string]id.Set),
-		deadrefs: id.NewSet(),
+		Zid:         m.Zid,
+		meta:        m,
+		backrefs:    id.NewSet(),
+		inverseRefs: make(map[string]id.Set),
+		deadrefs:    id.NewSet(),
 	}
 }
 
 // AddBackRef adds a reference to a zettel where the current zettel links to
 // without any more information.
 func (zi *ZettelIndex) AddBackRef(zid id.Zid) {
-	zi.backrefs.Zid(zid)
+	zi.backrefs.Add(zid)
 }
 
-// AddMetaRef adds a named reference to a zettel. On that zettel, the given
+// AddInverseRef adds a named reference to a zettel. On that zettel, the given
 // metadata key should point back to the current zettel.
-func (zi *ZettelIndex) AddMetaRef(key string, zid id.Zid) {
-	if zids, ok := zi.metarefs[key]; ok {
-		zids.Zid(zid)
+func (zi *ZettelIndex) AddInverseRef(key string, zid id.Zid) {
+	if zids, ok := zi.inverseRefs[key]; ok {
+		zids.Add(zid)
 		return
 	}
-	zi.metarefs[key] = id.NewSet(zid)
+	zi.inverseRefs[key] = id.NewSet(zid)
 }
 
 // AddDeadRef adds a dead reference to a zettel.
 func (zi *ZettelIndex) AddDeadRef(zid id.Zid) {
-	zi.deadrefs.Zid(zid)
+	zi.deadrefs.Add(zid)
 }
 
 // SetWords sets the words to the given value.
 func (zi *ZettelIndex) SetWords(words WordSet) { zi.words = words }
 
 // SetUrls sets the words to the given value.
 func (zi *ZettelIndex) SetUrls(urls WordSet) { zi.urls = urls }
 
 // GetDeadRefs returns all dead references as a sorted list.
-func (zi *ZettelIndex) GetDeadRefs() id.Slice {
-	return zi.deadrefs.Sorted()
-}
+func (zi *ZettelIndex) GetDeadRefs() id.Slice { return zi.deadrefs.Sorted() }
+
+// GetMeta return just the raw metadata.
+func (zi *ZettelIndex) GetMeta() *meta.Meta { return zi.meta }
 
 // GetBackRefs returns all back references as a sorted list.
-func (zi *ZettelIndex) GetBackRefs() id.Slice {
-	return zi.backrefs.Sorted()
-}
+func (zi *ZettelIndex) GetBackRefs() id.Slice { return zi.backrefs.Sorted() }
 
-// GetMetaRefs returns all meta references as a map of strings to a sorted list of references
-func (zi *ZettelIndex) GetMetaRefs() map[string]id.Slice {
-	if len(zi.metarefs) == 0 {
+// GetInverseRefs returns all inverse meta references as a map of strings to a sorted list of references
+func (zi *ZettelIndex) GetInverseRefs() map[string]id.Slice {
+	if len(zi.inverseRefs) == 0 {
 		return nil
 	}
-	result := make(map[string]id.Slice, len(zi.metarefs))
-	for key, refs := range zi.metarefs {
+	result := make(map[string]id.Slice, len(zi.inverseRefs))
+	for key, refs := range zi.inverseRefs {
 		result[key] = refs.Sorted()
 	}
 	return result
 }
 

Index: box/membox/membox.go
==================================================================
--- box/membox/membox.go
+++ box/membox/membox.go
@@ -16,16 +16,15 @@
 	"net/url"
 	"sync"
 
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
 )
 
 func init() {
 	manager.Register(
 		"mem",
@@ -46,11 +45,11 @@
 	u         *url.URL
 	cdata     manager.ConnectData
 	maxZettel int
 	maxBytes  int
 	mx        sync.RWMutex // Protects the following fields
-	zettel    map[id.Zid]domain.Zettel
+	zettel    map[id.Zid]zettel.Zettel
 	curBytes  int
 }
 
 func (mb *memBox) notifyChanged(zid id.Zid) {
 	if chci := mb.cdata.Notify; chci != nil {
@@ -71,11 +70,11 @@
 	return box.StartStateStarted
 }
 
 func (mb *memBox) Start(context.Context) error {
 	mb.mx.Lock()
-	mb.zettel = make(map[id.Zid]domain.Zettel)
+	mb.zettel = make(map[id.Zid]zettel.Zettel)
 	mb.curBytes = 0
 	mb.mx.Unlock()
 	mb.log.Trace().Int("max-zettel", int64(mb.maxZettel)).Int("max-bytes", int64(mb.maxBytes)).Msg("Start Box")
 	return nil
 }
@@ -90,11 +89,11 @@
 	mb.mx.RLock()
 	defer mb.mx.RUnlock()
 	return len(mb.zettel) < mb.maxZettel
 }
 
-func (mb *memBox) CreateZettel(_ context.Context, zettel domain.Zettel) (id.Zid, error) {
+func (mb *memBox) CreateZettel(_ context.Context, zettel zettel.Zettel) (id.Zid, error) {
 	mb.mx.Lock()
 	newBytes := mb.curBytes + zettel.Length()
 	if mb.maxZettel < len(mb.zettel) || mb.maxBytes < newBytes {
 		mb.mx.Unlock()
 		return id.Invalid, box.ErrCapacity
@@ -116,31 +115,27 @@
 	mb.notifyChanged(zid)
 	mb.log.Trace().Zid(zid).Msg("CreateZettel")
 	return zid, nil
 }
 
-func (mb *memBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) {
-	mb.mx.RLock()
-	zettel, ok := mb.zettel[zid]
-	mb.mx.RUnlock()
-	if !ok {
-		return domain.Zettel{}, box.ErrNotFound
-	}
-	zettel.Meta = zettel.Meta.Clone()
-	mb.log.Trace().Msg("GetZettel")
-	return zettel, nil
-}
-
-func (mb *memBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) {
-	mb.mx.RLock()
-	zettel, ok := mb.zettel[zid]
-	mb.mx.RUnlock()
-	if !ok {
-		return nil, box.ErrNotFound
-	}
-	mb.log.Trace().Msg("GetMeta")
-	return zettel.Meta.Clone(), nil
+func (mb *memBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) {
+	mb.mx.RLock()
+	z, ok := mb.zettel[zid]
+	mb.mx.RUnlock()
+	if !ok {
+		return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid}
+	}
+	z.Meta = z.Meta.Clone()
+	mb.log.Trace().Msg("GetZettel")
+	return z, nil
+}
+
+func (mb *memBox) HasZettel(_ context.Context, zid id.Zid) bool {
+	mb.mx.RLock()
+	_, found := mb.zettel[zid]
+	mb.mx.RUnlock()
+	return found
 }
 
 func (mb *memBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error {
 	mb.mx.RLock()
 	defer mb.mx.RUnlock()
@@ -165,11 +160,11 @@
 		}
 	}
 	return nil
 }
 
-func (mb *memBox) CanUpdateZettel(_ context.Context, zettel domain.Zettel) bool {
+func (mb *memBox) CanUpdateZettel(_ context.Context, zettel zettel.Zettel) bool {
 	mb.mx.RLock()
 	defer mb.mx.RUnlock()
 	zid := zettel.Meta.Zid
 	if !zid.IsValid() {
 		return false
@@ -180,14 +175,14 @@
 		newBytes -= prevZettel.Length()
 	}
 	return newBytes < mb.maxBytes
 }
 
-func (mb *memBox) UpdateZettel(_ context.Context, zettel domain.Zettel) error {
+func (mb *memBox) UpdateZettel(_ context.Context, zettel zettel.Zettel) error {
 	m := zettel.Meta.Clone()
 	if !m.Zid.IsValid() {
-		return &box.ErrInvalidID{Zid: m.Zid}
+		return box.ErrInvalidZid{Zid: m.Zid.String()}
 	}
 
 	mb.mx.Lock()
 	newBytes := mb.curBytes + zettel.Length()
 	if prevZettel, found := mb.zettel[m.Zid]; found {
@@ -212,17 +207,17 @@
 func (mb *memBox) RenameZettel(_ context.Context, curZid, newZid id.Zid) error {
 	mb.mx.Lock()
 	zettel, ok := mb.zettel[curZid]
 	if !ok {
 		mb.mx.Unlock()
-		return box.ErrNotFound
+		return box.ErrZettelNotFound{Zid: curZid}
 	}
 
 	// Check that there is no zettel with newZid
 	if _, ok = mb.zettel[newZid]; ok {
 		mb.mx.Unlock()
-		return &box.ErrInvalidID{Zid: newZid}
+		return box.ErrInvalidZid{Zid: newZid.String()}
 	}
 
 	meta := zettel.Meta.Clone()
 	meta.Zid = newZid
 	zettel.Meta = meta
@@ -245,11 +240,11 @@
 func (mb *memBox) DeleteZettel(_ context.Context, zid id.Zid) error {
 	mb.mx.Lock()
 	oldZettel, found := mb.zettel[zid]
 	if !found {
 		mb.mx.Unlock()
-		return box.ErrNotFound
+		return box.ErrZettelNotFound{Zid: zid}
 	}
 	delete(mb.zettel, zid)
 	mb.curBytes -= oldZettel.Length()
 	mb.mx.Unlock()
 	mb.notifyChanged(zid)

Index: box/notify/directory.go
==================================================================
--- box/notify/directory.go
+++ box/notify/directory.go
@@ -17,16 +17,16 @@
 	"regexp"
 	"strings"
 	"sync"
 
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/query"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
 )
 
 type entrySet map[id.Zid]*DirEntry
 
 // DirServiceState signal the internal state of the service.
@@ -189,11 +189,11 @@
 	defer ds.mx.Unlock()
 	if ds.entries == nil {
 		return DirEntry{}, ds.logMissingEntry("rename")
 	}
 	if _, found := ds.entries[newZid]; found {
-		return DirEntry{}, &box.ErrInvalidID{Zid: newZid}
+		return DirEntry{}, box.ErrInvalidZid{Zid: newZid.String()}
 	}
 	oldZid := oldEntry.Zid
 	newEntry := DirEntry{
 		Zid:         newZid,
 		MetaName:    renameFilename(oldEntry.MetaName, oldZid, newZid),
@@ -225,12 +225,12 @@
 }
 
 func (ds *DirService) updateEvents(newEntries entrySet) {
 	// Something may panic. Ensure a running service.
 	defer func() {
-		if r := recover(); r != nil {
-			kernel.Main.LogRecover("DirectoryService", r)
+		if ri := recover(); ri != nil {
+			kernel.Main.LogRecover("DirectoryService", ri)
 			go ds.updateEvents(newEntries)
 		}
 	}()
 
 	for ev := range ds.notifier.Events() {

Index: box/notify/directory_test.go
==================================================================
--- box/notify/directory_test.go
+++ box/notify/directory_test.go
@@ -11,18 +11,18 @@
 package notify
 
 import (
 	"testing"
 
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	_ "zettelstore.de/z/parser/blob"       // Allow to use BLOB parser.
 	_ "zettelstore.de/z/parser/draw"       // Allow to use draw parser.
 	_ "zettelstore.de/z/parser/markdown"   // Allow to use markdown parser.
 	_ "zettelstore.de/z/parser/none"       // Allow to use none parser.
 	_ "zettelstore.de/z/parser/plain"      // Allow to use plain parser.
 	_ "zettelstore.de/z/parser/zettelmark" // Allow to use zettelmark parser.
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func TestSeekZid(t *testing.T) {
 	testcases := []struct {
 		name string
@@ -49,12 +49,12 @@
 func TestNewExtIsBetter(t *testing.T) {
 	extVals := []string{
 		// Main Formats
 		meta.SyntaxZmk, meta.SyntaxDraw, meta.SyntaxMarkdown, meta.SyntaxMD,
 		// Other supported text formats
-		meta.SyntaxCSS, meta.SyntaxTxt, meta.SyntaxHTML,
-		meta.SyntaxMustache, meta.SyntaxText, meta.SyntaxPlain,
+		meta.SyntaxCSS, meta.SyntaxSxn, meta.SyntaxTxt, meta.SyntaxHTML,
+		meta.SyntaxText, meta.SyntaxPlain,
 		// Supported text graphics formats
 		meta.SyntaxSVG,
 		meta.SyntaxNone,
 		// Supported binary graphic formats
 		meta.SyntaxGif, meta.SyntaxPNG, meta.SyntaxJPEG, meta.SyntaxWebp, meta.SyntaxJPG,

Index: box/notify/entry.go
==================================================================
--- box/notify/entry.go
+++ box/notify/entry.go
@@ -11,15 +11,15 @@
 package notify
 
 import (
 	"path/filepath"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 const (
 	extZettel = "zettel" // file contains metadata and content
 	extBin    = "bin"    // file contains binary content
@@ -46,11 +46,11 @@
 func (e *DirEntry) HasMetaInContent() bool {
 	return e.IsValid() && extIsMetaAndContent(e.ContentExt)
 }
 
 // SetupFromMetaContent fills entry data based on metadata and zettel content.
-func (e *DirEntry) SetupFromMetaContent(m *meta.Meta, content domain.Content, getZettelFileSyntax func() []string) {
+func (e *DirEntry) SetupFromMetaContent(m *meta.Meta, content zettel.Content, getZettelFileSyntax func() []string) {
 	if e.Zid != m.Zid {
 		panic("Zid differ")
 	}
 	if contentName := e.ContentName; contentName != "" {
 		if !extIsMetaAndContent(e.ContentExt) && e.MetaName == "" {
@@ -78,11 +78,11 @@
 			e.MetaName = e.calcBaseName(e.ContentName)
 		}
 	}
 }
 
-func contentExtWithMeta(syntax string, content domain.Content) string {
+func contentExtWithMeta(syntax string, content zettel.Content) string {
 	p := parser.Get(syntax)
 	if content.IsBinary() {
 		if p.IsImageFormat {
 			return syntax
 		}

Index: box/notify/fsdir.go
==================================================================
--- box/notify/fsdir.go
+++ box/notify/fsdir.go
@@ -165,11 +165,11 @@
 	}
 
 	if ev.Has(fsnotify.Create) {
 		err := fsdn.base.Add(fsdn.path)
 		if err != nil {
-			fsdn.log.IfErr(err).Str("name", fsdn.path).Msg("Unable to add directory")
+			fsdn.log.Error().Err(err).Str("name", fsdn.path).Msg("Unable to add directory")
 			select {
 			case fsdn.events <- Event{Op: Error, Err: err}:
 			case <-fsdn.done:
 				fsdn.log.Trace().Int("i", 2).Msg("done dir event processing")
 				return false

Index: cmd/cmd_file.go
==================================================================
--- cmd/cmd_file.go
+++ cmd/cmd_file.go
@@ -15,17 +15,17 @@
 	"flag"
 	"fmt"
 	"io"
 	"os"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // ---------- Subcommand: file -----------------------------------------------
 
 func cmdFile(fs *flag.FlagSet) (int, error) {
@@ -34,18 +34,18 @@
 	if m == nil {
 		return 2, err
 	}
 	z := parser.ParseZettel(
 		context.Background(),
-		domain.Zettel{
+		zettel.Zettel{
 			Meta:    m,
-			Content: domain.NewContent(inp.Src[inp.Pos:]),
+			Content: zettel.NewContent(inp.Src[inp.Pos:]),
 		},
 		m.GetDefault(api.KeySyntax, meta.SyntaxZmk),
 		nil,
 	)
-	encdr := encoder.Create(api.Encoder(enc))
+	encdr := encoder.Create(api.Encoder(enc), &encoder.CreateParameter{Lang: m.GetDefault(api.KeyLang, api.ValueLangEN)})
 	if encdr == nil {
 		fmt.Fprintf(os.Stderr, "Unknown format %q\n", enc)
 		return 2, nil
 	}
 	_, err = encdr.WriteZettel(os.Stdout, z, parser.ParseMetadata)

Index: cmd/cmd_password.go
==================================================================
--- cmd/cmd_password.go
+++ cmd/cmd_password.go
@@ -15,13 +15,13 @@
 	"fmt"
 	"os"
 
 	"golang.org/x/term"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth/cred"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel/id"
 )
 
 // ---------- Subcommand: password -------------------------------------------
 
 func cmdPassword(fs *flag.FlagSet) (int, error) {

Index: cmd/cmd_run.go
==================================================================
--- cmd/cmd_run.go
+++ cmd/cmd_run.go
@@ -16,16 +16,16 @@
 	"net/http"
 
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter/api"
 	"zettelstore.de/z/web/adapter/webui"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // ---------- Subcommand: run ------------------------------------------------
 
 func flgRun(fs *flag.FlagSet) {
@@ -54,27 +54,29 @@
 	webLog := kern.GetLogger(kernel.WebService)
 
 	var getUser getUserImpl
 	logAuth := kern.GetLogger(kernel.AuthService)
 	logUc := kern.GetLogger(kernel.CoreService).WithUser(&getUser)
-	ucAuthenticate := usecase.NewAuthenticate(logAuth, authManager, authManager, boxManager)
+	ucGetUser := usecase.NewGetUser(authManager, boxManager)
+	ucAuthenticate := usecase.NewAuthenticate(logAuth, authManager, &ucGetUser)
 	ucIsAuth := usecase.NewIsAuthenticated(logUc, &getUser, authManager)
 	ucCreateZettel := usecase.NewCreateZettel(logUc, rtConfig, protectedBoxManager)
-	ucGetMeta := usecase.NewGetMeta(protectedBoxManager)
-	ucGetAllMeta := usecase.NewGetAllMeta(protectedBoxManager)
+	ucGetAllZettel := usecase.NewGetAllZettel(protectedBoxManager)
 	ucGetZettel := usecase.NewGetZettel(protectedBoxManager)
 	ucParseZettel := usecase.NewParseZettel(rtConfig, ucGetZettel)
-	ucListMeta := usecase.NewListMeta(protectedBoxManager)
-	ucEvaluate := usecase.NewEvaluate(rtConfig, ucGetZettel, ucGetMeta, ucListMeta)
+	ucQuery := usecase.NewQuery(protectedBoxManager)
+	ucEvaluate := usecase.NewEvaluate(rtConfig, &ucGetZettel, &ucQuery)
+	ucQuery.SetEvaluate(&ucEvaluate)
+	ucTagZettel := usecase.NewTagZettel(protectedBoxManager, &ucQuery)
+	ucRoleZettel := usecase.NewRoleZettel(protectedBoxManager, &ucQuery)
 	ucListSyntax := usecase.NewListSyntax(protectedBoxManager)
 	ucListRoles := usecase.NewListRoles(protectedBoxManager)
-	ucZettelContext := usecase.NewZettelContext(protectedBoxManager, rtConfig)
 	ucDelete := usecase.NewDeleteZettel(logUc, protectedBoxManager)
 	ucUpdate := usecase.NewUpdateZettel(logUc, protectedBoxManager)
 	ucRename := usecase.NewRenameZettel(logUc, protectedBoxManager)
-	ucUnlinkedRefs := usecase.NewUnlinkedReferences(protectedBoxManager, rtConfig)
 	ucRefresh := usecase.NewRefresh(logUc, protectedBoxManager)
+	ucReIndex := usecase.NewReIndex(logUc, protectedBoxManager)
 	ucVersion := usecase.NewVersion(kernel.Main.GetConfig(kernel.CoreService, kernel.CoreVersion).(string))
 
 	a := api.New(
 		webLog.Clone().Str("adapter", "api").Child(),
 		webSrv, authManager, authManager, rtConfig, authPolicy)
@@ -89,43 +91,37 @@
 		webSrv.Handle("/favicon.ico", wui.MakeFaviconHandler(assetDir))
 	}
 
 	// Web user interface
 	if !authManager.IsReadonly() {
-		webSrv.AddZettelRoute('b', server.MethodGet, wui.MakeGetRenameZettelHandler(ucGetMeta))
+		webSrv.AddZettelRoute('b', server.MethodGet, wui.MakeGetRenameZettelHandler(ucGetZettel))
 		webSrv.AddZettelRoute('b', server.MethodPost, wui.MakePostRenameZettelHandler(&ucRename))
-		webSrv.AddListRoute('c', server.MethodGet, wui.MakeGetZettelFromListHandler(ucListMeta, &ucEvaluate, ucListRoles, ucListSyntax))
+		webSrv.AddListRoute('c', server.MethodGet, wui.MakeGetZettelFromListHandler(&ucQuery, &ucEvaluate, ucListRoles, ucListSyntax))
 		webSrv.AddListRoute('c', server.MethodPost, wui.MakePostCreateZettelHandler(&ucCreateZettel))
 		webSrv.AddZettelRoute('c', server.MethodGet, wui.MakeGetCreateZettelHandler(
 			ucGetZettel, &ucCreateZettel, ucListRoles, ucListSyntax))
 		webSrv.AddZettelRoute('c', server.MethodPost, wui.MakePostCreateZettelHandler(&ucCreateZettel))
-		webSrv.AddZettelRoute('d', server.MethodGet, wui.MakeGetDeleteZettelHandler(ucGetMeta, ucGetAllMeta))
+		webSrv.AddZettelRoute('d', server.MethodGet, wui.MakeGetDeleteZettelHandler(ucGetZettel, ucGetAllZettel))
 		webSrv.AddZettelRoute('d', server.MethodPost, wui.MakePostDeleteZettelHandler(&ucDelete))
 		webSrv.AddZettelRoute('e', server.MethodGet, wui.MakeEditGetZettelHandler(ucGetZettel, ucListRoles, ucListSyntax))
 		webSrv.AddZettelRoute('e', server.MethodPost, wui.MakeEditSetZettelHandler(&ucUpdate))
 	}
 	webSrv.AddListRoute('g', server.MethodGet, wui.MakeGetGoActionHandler(&ucRefresh))
-	webSrv.AddListRoute('h', server.MethodGet, wui.MakeListHTMLMetaHandler(ucListMeta, &ucEvaluate))
-	webSrv.AddZettelRoute('h', server.MethodGet, wui.MakeGetHTMLZettelHandler(&ucEvaluate, ucGetMeta))
+	webSrv.AddListRoute('h', server.MethodGet, wui.MakeListHTMLMetaHandler(&ucQuery, &ucTagZettel, &ucRoleZettel, &ucReIndex))
+	webSrv.AddZettelRoute('h', server.MethodGet, wui.MakeGetHTMLZettelHandler(&ucEvaluate, ucGetZettel))
 	webSrv.AddListRoute('i', server.MethodGet, wui.MakeGetLoginOutHandler())
 	webSrv.AddListRoute('i', server.MethodPost, wui.MakePostLoginHandler(&ucAuthenticate))
 	webSrv.AddZettelRoute('i', server.MethodGet, wui.MakeGetInfoHandler(
-		ucParseZettel, &ucEvaluate, ucGetMeta, ucGetAllMeta, ucUnlinkedRefs))
-	webSrv.AddZettelRoute('k', server.MethodGet, wui.MakeZettelContextHandler(
-		ucZettelContext, &ucEvaluate))
+		ucParseZettel, &ucEvaluate, ucGetZettel, ucGetAllZettel, &ucQuery))
 
 	// API
 	webSrv.AddListRoute('a', server.MethodPost, a.MakePostLoginHandler(&ucAuthenticate))
 	webSrv.AddListRoute('a', server.MethodPut, a.MakeRenewAuthHandler())
-	webSrv.AddZettelRoute('o', server.MethodGet, a.MakeGetOrderHandler(
-		usecase.NewZettelOrder(protectedBoxManager, ucEvaluate)))
-	webSrv.AddZettelRoute('u', server.MethodGet, a.MakeListUnlinkedMetaHandler(ucGetMeta, ucUnlinkedRefs))
 	webSrv.AddListRoute('x', server.MethodGet, a.MakeGetDataHandler(ucVersion))
 	webSrv.AddListRoute('x', server.MethodPost, a.MakePostCommandHandler(&ucIsAuth, &ucRefresh))
-	webSrv.AddZettelRoute('x', server.MethodGet, a.MakeZettelContextHandler(ucZettelContext))
-	webSrv.AddListRoute('z', server.MethodGet, a.MakeQueryHandler(ucListMeta))
-	webSrv.AddZettelRoute('z', server.MethodGet, a.MakeGetZettelHandler(ucGetMeta, ucGetZettel, ucParseZettel, ucEvaluate))
+	webSrv.AddListRoute('z', server.MethodGet, a.MakeQueryHandler(&ucQuery, &ucTagZettel, &ucRoleZettel, &ucReIndex))
+	webSrv.AddZettelRoute('z', server.MethodGet, a.MakeGetZettelHandler(ucGetZettel, ucParseZettel, ucEvaluate))
 	if !authManager.IsReadonly() {
 		webSrv.AddListRoute('z', server.MethodPost, a.MakePostCreateZettelHandler(&ucCreateZettel))
 		webSrv.AddZettelRoute('z', server.MethodPut, a.MakeUpdateZettelHandler(&ucUpdate))
 		webSrv.AddZettelRoute('z', server.MethodDelete, a.MakeDeleteZettelHandler(&ucDelete))
 		webSrv.AddZettelRoute('z', server.MethodMove, a.MakeRenameZettelHandler(&ucRename))

Index: cmd/command.go
==================================================================
--- cmd/command.go
+++ cmd/command.go
@@ -11,11 +11,11 @@
 package cmd
 
 import (
 	"flag"
 
-	"zettelstore.de/c/maps"
+	"zettelstore.de/client.fossil/maps"
 	"zettelstore.de/z/logger"
 )
 
 // Command stores information about commands / sub-commands.
 type Command struct {

Index: cmd/main.go
==================================================================
--- cmd/main.go
+++ cmd/main.go
@@ -20,23 +20,23 @@
 	"runtime/debug"
 	"strconv"
 	"strings"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/auth/impl"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/compbox"
 	"zettelstore.de/z/box/manager"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 const strRunSimple = "run-simple"
 
 func init() {
@@ -86,19 +86,19 @@
 		Name: "password",
 		Func: cmdPassword,
 	})
 }
 
-func fetchStartupConfiguration(fs *flag.FlagSet) (cfg *meta.Meta) {
+func fetchStartupConfiguration(fs *flag.FlagSet) (string, *meta.Meta) {
 	if configFlag := fs.Lookup("c"); configFlag != nil {
 		if filename := configFlag.Value.String(); filename != "" {
 			content, err := readConfiguration(filename)
-			return createConfiguration(content, err)
+			return filename, createConfiguration(content, err)
 		}
 	}
-	content, err := searchAndReadConfiguration()
-	return createConfiguration(content, err)
+	filename, content, err := searchAndReadConfiguration()
+	return filename, createConfiguration(content, err)
 }
 
 func createConfiguration(content []byte, err error) *meta.Meta {
 	if err != nil {
 		return meta.New(id.Invalid)
@@ -106,21 +106,21 @@
 	return meta.NewFromInput(id.Invalid, input.NewInput(content))
 }
 
 func readConfiguration(filename string) ([]byte, error) { return os.ReadFile(filename) }
 
-func searchAndReadConfiguration() ([]byte, error) {
-	for _, filename := range []string{"zettelstore.cfg", "zsconfig.txt", "zscfg.txt", "_zscfg"} {
+func searchAndReadConfiguration() (string, []byte, error) {
+	for _, filename := range []string{"zettelstore.cfg", "zsconfig.txt", "zscfg.txt", "_zscfg", ".zscfg"} {
 		if content, err := readConfiguration(filename); err == nil {
-			return content, nil
+			return filename, content, nil
 		}
 	}
-	return readConfiguration(".zscfg")
+	return "", nil, os.ErrNotExist
 }
 
-func getConfig(fs *flag.FlagSet) *meta.Meta {
-	cfg := fetchStartupConfiguration(fs)
+func getConfig(fs *flag.FlagSet) (string, *meta.Meta) {
+	filename, cfg := fetchStartupConfiguration(fs)
 	fs.Visit(func(flg *flag.Flag) {
 		switch flg.Name {
 		case "p":
 			cfg.Set(keyListenAddr, net.JoinHostPort("127.0.0.1", flg.Value.String()))
 		case "a":
@@ -142,11 +142,11 @@
 			cfg.Set(keyReadOnly, flg.Value.String())
 		case "v":
 			cfg.Set(keyVerbose, flg.Value.String())
 		}
 	})
-	return cfg
+	return filename, cfg
 }
 
 func deleteConfiguredBoxes(cfg *meta.Meta) {
 	for _, p := range cfg.PairsRest() {
 		if key := p.Key; strings.HasPrefix(key, kernel.BoxURIs) {
@@ -249,11 +249,11 @@
 	fs := command.GetFlags()
 	if err := fs.Parse(args); err != nil {
 		fmt.Fprintf(os.Stderr, "%s: unable to parse flags: %v %v\n", name, args, err)
 		return 1
 	}
-	cfg := getConfig(fs)
+	filename, cfg := getConfig(fs)
 	if !setServiceConfig(cfg) {
 		fs.Usage()
 		return 2
 	}
 
@@ -288,11 +288,11 @@
 	)
 
 	if command.Simple {
 		kern.SetConfig(kernel.ConfigService, kernel.ConfigSimpleMode, "true")
 	}
-	kern.Start(command.Header, command.LineServer)
+	kern.Start(command.Header, command.LineServer, filename)
 	exitCode, err := command.Func(fs)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%s: %v\n", name, err)
 	}
 	kern.Shutdown(true)
@@ -300,11 +300,11 @@
 }
 
 // runSimple is called, when the user just starts the software via a double click
 // or via a simple call “./zettelstore“ on the command line.
 func runSimple() int {
-	if _, err := searchAndReadConfiguration(); err == nil {
+	if _, _, err := searchAndReadConfiguration(); err == nil {
 		return executeCommand(strRunSimple)
 	}
 	dir := "./zettel"
 	if err := os.MkdirAll(dir, 0750); err != nil {
 		fmt.Fprintf(os.Stderr, "Unable to create zettel directory %q (%s)\n", dir, err)

Index: cmd/register.go
==================================================================
--- cmd/register.go
+++ cmd/register.go
@@ -18,12 +18,12 @@
 	_ "zettelstore.de/z/box/dirbox"        // Allow to use directory box.
 	_ "zettelstore.de/z/box/filebox"       // Allow to use file box.
 	_ "zettelstore.de/z/box/membox"        // Allow to use in-memory box.
 	_ "zettelstore.de/z/encoder/htmlenc"   // Allow to use HTML encoder.
 	_ "zettelstore.de/z/encoder/mdenc"     // Allow to use markdown encoder.
-	_ "zettelstore.de/z/encoder/sexprenc"  // Allow to use sexpr encoder.
 	_ "zettelstore.de/z/encoder/shtmlenc"  // Allow to use SHTML encoder.
+	_ "zettelstore.de/z/encoder/szenc"     // Allow to use Sz encoder.
 	_ "zettelstore.de/z/encoder/textenc"   // Allow to use text encoder.
 	_ "zettelstore.de/z/encoder/zmkenc"    // Allow to use zmk encoder.
 	_ "zettelstore.de/z/kernel/impl"       // Allow kernel implementation to create itself
 	_ "zettelstore.de/z/parser/blob"       // Allow to use BLOB parser.
 	_ "zettelstore.de/z/parser/draw"       // Allow to use draw parser.

Index: config/config.go
==================================================================
--- config/config.go
+++ config/config.go
@@ -12,17 +12,21 @@
 package config
 
 import (
 	"context"
 
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Key values that are supported by Config.Get
 const (
-	KeyFooterZettel = "footer-zettel"
-	KeyHomeZettel   = "home-zettel"
+	KeyFooterZettel         = "footer-zettel"
+	KeyHomeZettel           = "home-zettel"
+	KeyShowBackLinks        = "show-back-links"
+	KeyShowFolgeLinks       = "show-folge-links"
+	KeyShowSubordinateLinks = "show-subordinate-links"
+	KeyShowSuccessorLinks   = "show-successor-links"
 	// api.KeyLang
 )
 
 // Config allows to retrieve all defined configuration values that can be changed during runtime.
 type Config interface {

Index: docs/development/20210916193200.zettel
==================================================================
--- docs/development/20210916193200.zettel
+++ docs/development/20210916193200.zettel
@@ -1,23 +1,28 @@
 id: 20210916193200
 title: Required Software
 role: zettel
 syntax: zmk
 created: 20210916193200
-modified: 20230327165135
+modified: 20230405150541
 
 The following software must be installed:
 
 * A current, supported [[release of Go|https://go.dev/doc/devel/release]],
-* [[shadow|https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/shadow]] via ``go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest``,
-* [[staticcheck|https://staticcheck.io/]] via ``go install honnef.co/go/tools/cmd/staticcheck@latest``,
-* [[unparam|https://mvdan.cc/unparam]][^[[GitHub|https://github.com/mvdan/unparam]]] via ``go install mvdan.cc/unparam@latest``,
-* [[govulncheck|https://golang.org/x/vuln/cmd/govulncheck]] via ``go install golang.org/x/vuln/cmd/govulncheck@latest``,
 * [[Fossil|https://fossil-scm.org/]],
 * [[Git|https://git-scm.org/]] (most dependencies are accessible via Git only).
 
 Make sure that the software is in your path, e.g. via:
-
 ```sh
 export PATH=$PATH:/usr/local/go/bin
 export PATH=$PATH:$(go env GOPATH)/bin
 ```
+
+The internal build tool need the following software.
+It can be installed / updated via the build tool itself: ``go run tools/build.go tools``.
+
+Otherwise you can install the software by hand:
+
+* [[shadow|https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/shadow]] via ``go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest``,
+* [[staticcheck|https://staticcheck.io/]] via ``go install honnef.co/go/tools/cmd/staticcheck@latest``,
+* [[unparam|https://mvdan.cc/unparam]][^[[GitHub|https://github.com/mvdan/unparam]]] via ``go install mvdan.cc/unparam@latest``,
+* [[govulncheck|https://golang.org/x/vuln/cmd/govulncheck]] via ``go install golang.org/x/vuln/cmd/govulncheck@latest``,

Index: docs/development/20210916194900.zettel
==================================================================
--- docs/development/20210916194900.zettel
+++ docs/development/20210916194900.zettel
@@ -1,10 +1,11 @@
 id: 20210916194900
 title: Checklist for Release
 role: zettel
 syntax: zmk
-modified: 20220309105459
+created: 20210916194900
+modified: 20230402181229
 
 # Sync with the official repository
 #* ``fossil sync -u``
 # Make sure that there is no workspace defined.
 #* ``ls ..`` must not have a file ''go.work'', in no parent folder.
@@ -47,12 +48,12 @@
 # Create the release:
 #* ``go run tools/build.go release`` (alternatively: ``make release``).
 # Remove previous executables:
 #* ``fossil uv remove --glob '*-PREVVERSION*'``
 # Add executables for release:
-#* ``cd release``
+#* ``cd releases``
 #* ``fossil uv add *.zip``
 #* ``cd ..``
 #* Synchronize with main repository:
 #* ``fossil sync -u``
 # Enable autosync:
 #* ``fossil setting autosync on``

Index: docs/manual/00001000000000.zettel
==================================================================
--- docs/manual/00001000000000.zettel
+++ docs/manual/00001000000000.zettel
@@ -1,11 +1,13 @@
 id: 00001000000000
 title: Zettelstore Manual
 role: manual
 tags: #manual #zettelstore
 syntax: zmk
-modified: 20220803183647
+created: 20210301190630
+modified: 20231125185455
+show-back-links: false
 
 * [[Introduction|00001001000000]]
 * [[Design goals|00001002000000]]
 * [[Installation|00001003000000]]
 * [[Configuration|00001004000000]]
@@ -17,7 +19,9 @@
 * [[API|00001012000000]]
 * [[Web user interface|00001014000000]]
 * [[Tips and Tricks|00001017000000]]
 * [[Troubleshooting|00001018000000]]
 * Frequently asked questions
+
+Version: {{00001000000001}}.
 
 Licensed under the EUPL-1.2-or-later.

ADDED   docs/manual/00001000000001.zettel
Index: docs/manual/00001000000001.zettel
==================================================================
--- docs/manual/00001000000001.zettel
+++ docs/manual/00001000000001.zettel
@@ -0,0 +1,8 @@
+id: 00001000000001
+title: Manual Version
+role: configuration
+syntax: zmk
+created: 20231002142915
+modified: 20231002142948
+
+To be set by build tool.

Index: docs/manual/00001002000000.zettel
==================================================================
--- docs/manual/00001002000000.zettel
+++ docs/manual/00001002000000.zettel
@@ -2,17 +2,21 @@
 title: Design goals for the Zettelstore
 role: manual
 tags: #design #goal #manual #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20221018105415
+modified: 20230624171152
 
 Zettelstore supports the following design goals:
 
 ; Longevity of stored notes / zettel
 : Every zettel you create should be readable without the help of any tool, even without Zettelstore.
 : It should be not hard to write other software that works with your zettel.
+: Normal zettel should be stored in a single file.
+  If this is not possible: at most in two files: one for the metadata, one for the content.
+  The only exception are [[predefined zettel|00001005090000]] stored in the Zettelstore executable.
+: There is no additional database.
 ; Single user
 : All zettel belong to you, only to you.
   Zettelstore provides its services only to one person: you.
   If the computer running Zettelstore is securely configured, there should be no risk that others are able to read or update your zettel.
 : If you want, you can customize Zettelstore in a way that some specific or all persons are able to read some of your zettel.
@@ -33,5 +37,7 @@
 : External software can be written to deeply analyze your zettel and the structures they form.
 ; Security by default
 : Without any customization, Zettelstore provides its services in a safe and secure manner and does not expose you (or other users) to security risks.
 : If you know what use are doing, Zettelstore allows you to relax some security-related preferences.
   However, even in this case, the more secure way is chosen.
+: The Zettelstore software uses a minimal design and uses other software dependencies only is essential needed.
+: There will be no plugin mechanism, which allows external software to control the inner workings of the Zettelstore software.

Index: docs/manual/00001004020000.zettel
==================================================================
--- docs/manual/00001004020000.zettel
+++ docs/manual/00001004020000.zettel
@@ -2,11 +2,12 @@
 title: Configure the running Zettelstore
 role: manual
 tags: #configuration #manual #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20230317183435
+modified: 20231126180829
+show-back-links: false
 
 You can configure a running Zettelstore by modifying the special zettel with the ID [[00000000000100]].
 This zettel is called __configuration zettel__.
 The following metadata keys change the appearance / behavior of Zettelstore.
 Some of them can be overwritten in an [[user zettel|00001010040200]], a subset of those may be overwritten in zettel that is currently used.
@@ -18,21 +19,24 @@
 
   Default: (the empty string).
 ; [!default-license|''default-license'']
 : License value to be used when rendering content.
   Can be overwritten in a zettel with [[meta key|00001006020000]] ''license''.
+
   Default: (the empty string).
 ; [!default-visibility|''default-visibility'']
 : Visibility to be used, if zettel does not specify a value for the [[''visibility''|00001006020000#visibility]] metadata key.
+
   Default: ""login"".
 ; [!expert-mode|''expert-mode'']
 : If set to a [[boolean true value|00001006030500]], all zettel with [[visibility ""expert""|00001010070200]] will be shown (to the owner, if [[authentication is enabled|00001010040100]]; to all, otherwise).
   This affects most computed zettel.
+
   Default: ""False"".
 ; [!footer-zettel|''footer-zettel'']
 : Identifier of a zettel that is rendered as HTML and will be placed as the footer of every zettel in the [[web user interface|00001014000000]].
-  Zettel content, delivered via the [[API|00001012000000]] as JSON, etc. is not affected.
+  Zettel content, delivered via the [[API|00001012000000]] as symbolic expressions, etc. is not affected.
   If the zettel identifier is invalid or references a zettel that could not be read (possibly because of a limited [[visibility setting|00001010070200]]), nothing is written as the footer.
 
   May be [[overwritten|00001004020200]] in a user zettel.
 
   Default: (an invalid zettel identifier)
@@ -52,17 +56,34 @@
 
   Use values according to the language definition of [[RFC-5646|https://tools.ietf.org/html/rfc5646]].
 ; [!max-transclusions|''max-transclusions'']
 : Maximum number of indirect transclusion.
   This is used to avoid an exploding ""transclusion bomb"", a form of a [[billion laughs attack|https://en.wikipedia.org/wiki/Billion_laughs_attack]].
+
   Default: ""1024"".
+; [!show-back-links|''show-back-links''], [!show-folge-links|''show-folge-links''], [!show-subordinate-links|''show-subordinate-links''], [!show-successor-links|''show-successor-links'']
+: When displaying a zettel in the web user interface, references to other zettel are normally shown below the content of the zettel.
+  This affects the metadata keys [[''back''|00001006020000#back]], [[''folge''|00001006020000#folge]], [[''subordinates''|00001006020000#subordinates]], and  [[''successors''|00001006020000#successors]].
+
+  These configuration keys may be used to show, not to show, or to close the list of referenced zettel.
+
+  Allowed values are: ""false"" (will not show the list), ""close"" (will show the list closed), and ""open"" / """" (will show the list).
+
+  Default: """".
+
+  May be [[overwritten|00001004020200]] in a user zettel, so that setting will only affect the given user.
+  Alternatively, it may be overwritten in a zettel, so that that the setting will affect only the given zettel.
+
+  This zettel is an example of a zettel that sets ''show-back-links'' to ""false"".
 ; [!site-name|''site-name'']
 : Name of the Zettelstore instance.
   Will be used when displaying some lists.
+
   Default: ""Zettelstore"".
 ; [!yaml-header|''yaml-header'']
 : If [[true|00001006030500]], metadata and content will be separated by ''---\\n'' instead of an empty line (''\\n\\n'').
+
   Default: ""False"".
 
   You will probably use this key, if you are working with another software processing [[Markdown|https://daringfireball.net/projects/markdown/]] that uses a subset of [[YAML|https://yaml.org/]] to specify metadata.
 ; [!zettel-file-syntax|''zettel-file-syntax'']
 : If you create a new zettel with a syntax different to ""zmk"", Zettelstore will store the zettel as two files:

Index: docs/manual/00001004020200.zettel
==================================================================
--- docs/manual/00001004020200.zettel
+++ docs/manual/00001004020200.zettel
@@ -2,11 +2,11 @@
 title: Runtime configuration data that may be user specific or zettel specific
 role: manual
 tags: #configuration #manual #zettelstore
 syntax: zmk
 created: 20221205155521
-modified: 20230317183403
+modified: 20231126180752
 
 Some metadata of the [[runtime configuration|00001004020000]] may be overwritten in an [[user zettel|00001010040200]].
 A subset of those may be overwritten in zettel that is currently used.
 This allows to specify user specific or zettel specific behavior.
 
@@ -14,5 +14,9 @@
 
 |=Key|User:|Zettel:|Remarks
 |[[''footer-zettel''|00001004020000#footer-zettel]]|Y|N|
 |[[''home-zettel''|00001004020000#home-zettel]]|Y|N|
 |[[''lang''|00001004020000#lang]]|Y|Y|Making it user-specific could make zettel for other user less useful
+|[[''show-back-links''|00001004020000#show-back-links]]|Y|Y|
+|[[''show-folge-links''|00001004020000#show-folge-links]]|Y|Y|
+|[[''show-subordinate-links''|00001004020000#show-subordinate-links]]|Y|Y|
+|[[''show-successor-links''|00001004020000#show-successor-links]]|Y|Y|

Index: docs/manual/00001004051200.zettel
==================================================================
--- docs/manual/00001004051200.zettel
+++ docs/manual/00001004051200.zettel
@@ -15,16 +15,16 @@
 ; ''-t FORMAT''
 : Specifies the output format.
   Supported values are:
   [[''html''|00001012920510]] (default),
   [[''md''|00001012920513]],
-  [[''sexpr''|00001012920516]],
   [[''shtml''|00001012920525]],
+  [[''sz''|00001012920516]],
   [[''text''|00001012920519]],
   and [[''zmk''|00001012920522]].
 ; ''file-1''
 : Specifies the file name, where at least metadata is read.
   If ''file-2'' is not given, the zettel content is also read from here.
 ; ''file-2''
 : File name where the zettel content is stored.
 
 If neither ''file-1'' nor ''file-2'' are given, metadata and zettel content are read from standard input / stdin.

Index: docs/manual/00001005090000.zettel
==================================================================
--- docs/manual/00001005090000.zettel
+++ docs/manual/00001005090000.zettel
@@ -2,11 +2,11 @@
 title: List of predefined zettel
 role: manual
 tags: #manual #reference #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20220909180240
+modified: 20231129173425
 
 The following table lists all predefined zettel with their purpose.
 
 |= Identifier :|= Title | Purpose
 | [[00000000000001]] | Zettelstore Version | Contains the version string of the running Zettelstore
@@ -27,17 +27,25 @@
 | [[00000000010401]] | Zettelstore Detail HTML Template | Layout for the HTML detail view of one zettel
 | [[00000000010402]] | Zettelstore Info HTML Template | Layout for the information view of a specific zettel
 | [[00000000010403]] | Zettelstore Form HTML Template | Form that is used to create a new or to change an existing zettel that contains text
 | [[00000000010404]] | Zettelstore Rename Form HTML Template | View that is displayed to change the [[zettel identifier|00001006050000]]
 | [[00000000010405]] | Zettelstore Delete HTML Template | View to confirm the deletion of a zettel
+| [[00000000010700]] | Zettelstore Error HTML Template | View to show an error message
+| [[00000000019000]] | Zettelstore Sxn Start Code | Starting point of sxn functions to build the templates
+| [[00000000019990]] | Zettelstore Sxn Base Code | Base sxn functions to build the templates
 | [[00000000020001]] | Zettelstore Base CSS | System-defined CSS file that is included by the [[Base HTML Template|00000000010100]]
 | [[00000000025001]] | Zettelstore User CSS | User-defined CSS file that is included by the [[Base HTML Template|00000000010100]]
-| [[00000000029000]] | Zettelstore Role to CSS Map | [[Maps|00001017000000#role-css]] [[role|00001006020000#role]] to a zettel identifier that is included by the [[Base HTML Template|00000000010100]] as an CSS file 
 | [[00000000040001]] | Generic Emoji | Image that is shown if [[original image reference|00001007040322]] is invalid
-| [[00000000090000]] | New Menu | Contains items that should contain in the zettel template menu
-| [[00000000090001]] | New Zettel | Template for a new zettel with role ""[[zettel|00001006020100]]""
+| [[00000000060010]] | zettel | [[Role zettel|00001012051800]] for the role ""[[zettel|00001006020100#zettel]]""
+| [[00000000060020]] | confguration | [[Role zettel|00001012051800]] for the role ""[[confguration|00001006020100#confguration]]""
+| [[00000000060030]] | role | [[Role zettel|00001012051800]] for the role ""[[role|00001006020100#role]]""
+| [[00000000060040]] | tag | [[Role zettel|00001012051800]] for the role ""[[tag|00001006020100#tag]]""
+| [[00000000090000]] | New Menu | Contains items that should be in the zettel template menu
+| [[00000000090001]] | New Zettel | Template for a new zettel with role ""[[zettel|00001006020100#zettel]]""
 | [[00000000090002]] | New User | Template for a new [[user zettel|00001010040200]]
+| [[00000000090003]] | New Tag | Template for a new [[tag zettel|00001006020100#tag]]
+| [[00000000090004]] | New Role | Template for a new [[role zettel|00001006020100#role]]
 | [[00010000000000]] | Home | Default home zettel, contains some welcome information
 
 If a zettel is not linked, it is not accessible for the current user.
 
 **Important:** All identifier may change until a stable version of the software is released.

Index: docs/manual/00001006000000.zettel
==================================================================
--- docs/manual/00001006000000.zettel
+++ docs/manual/00001006000000.zettel
@@ -2,11 +2,11 @@
 title: Layout of a Zettel
 role: manual
 tags: #design #manual #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20221219162703
+modified: 20230403123541
 
 A zettel consists of two parts: the metadata and the zettel content.
 Metadata gives some information mostly about the zettel content, how it should be interpreted, how it is sorted within Zettelstore.
 The zettel content is, well, the actual content.
 In many cases, the content is in plain text form.
@@ -30,14 +30,14 @@
 And there is support for some binary image formats, like GIF, PNG, and JPEG.
 
 === Plain, parsed, and evaluated zettel
 Zettelstore may present your zettel in various forms, typically retrieved with the [[endpoint|00001012920000]] ''/z/{ID}''.
 One way is to present the zettel as it was read by Zettelstore.
-This is called ""[[plain zettel|00001003000000]]"".
+This is called ""[[plain zettel|00001012053300]]"".
 
 The second way is to present the zettel as it was recognized by Zettelstore.
-This is called ""[[parsed zettel|00001012053600]]"", also retrieved with the [[endpoint|00001012920000]] ''/z/{ID}'', but with additional query parameter.
+This is called ""[[parsed zettel|00001012053600]]"", also retrieved with the [[endpoint|00001012920000]] ''/z/{ID}'', but with the additional query parameter ''parseonly''.
 Such a zettel was read and analyzed.
 It can be presented in various [[encodings|00001012920500]].[^The [[zmk encoding|00001012920522]] allows you to compare the plain, the parsed, and the evaluated form of a zettel.]
 
 However, a zettel such as this one you are currently reading, is a ""[[evaluated zettel|00001012053500]]"", also retrieved with the [[endpoint|00001012920000]] ''/z/{ID}'' and specifying an encoding.
 The biggest difference to a parsed zettel is the inclusion of [[block transclusions|00001007031100]] or [[inline transclusions|00001007040324]] for an evaluated zettel.

Index: docs/manual/00001006020000.zettel
==================================================================
--- docs/manual/00001006020000.zettel
+++ docs/manual/00001006020000.zettel
@@ -2,11 +2,11 @@
 title: Supported Metadata Keys
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20230320150950
+modified: 20230704161159
 
 Although you are free to define your own metadata, by using any key (according to the [[syntax|00001006010000]]), some keys have a special meaning that is enforced by Zettelstore.
 See the [[computed list of supported metadata keys|00000000000090]] for details.
 
 Most keys conform to a [[type|00001006030000]].
@@ -42,12 +42,21 @@
   It is internally created by hashing the password, the [[zettel identifier|00001006050000]], and the value of the ''ident'' key.
 
   It is only used for zettel with a ''role'' value of ""user"".
 ; [!dead|''dead'']
 : Property that contains all references that does __not__ identify a zettel.
+; [!expire|''expire'']
+: A user-entered time stamp that document the point in time when the zettel should expire.
+  When a zettel is expires, Zettelstore does nothing.
+  It is up to you to define required actions.
+  ''expire'' is just a documentation.
+  You could define a query and execute it regularly, for example [[query:expire? ORDER expire]].
+  Alternatively, a Zettelstore client software could define some actions when it detects expired zettel.
 ; [!folge|''folge'']
 : Is a property that contains identifier of all zettel that reference this zettel through the [[''precursor''|#precursor]] value.
+; [!folge-role|''folge-role'']
+: Specifies a suggested [[''role''|#role]] the zettel should use in the future, if zettel currently has a preliminary role.
 ; [!forward|''forward'']
 : Property that contains all references that identify another zettel within the content of the zettel.
 ; [!id|''id'']
 : Contains the [[zettel identifier|00001006050000]], as given by the Zettelstore.
   It cannot be set manually, because it is a computed value.
@@ -94,19 +103,24 @@
 ; [!role|''role'']
 : Defines the role of the zettel.
   Can be used for selecting zettel.
   See [[supported zettel roles|00001006020100]].
   If not given, it is ignored.
+; [!subordinates|''subordinates'']
+: Is a property that contains identifier of all zettel that reference this zettel through the [[''superior''|#superior]] value.
 ; [!successors|''successors'']
 : Is a property that contains identifier of all zettel that reference this zettel through the [[''predecessor''|#predecessor]] value.
   Therefore, it references all zettel that contain a new version of the content and/or metadata.
   In contrast to [[''folge''|#folge]], these are references because of technical reasons, not because of content-related reasons.
   In most cases, zettel referencing the current zettel should be updated to reference a successor zettel.
   The [[query reference|00001007040310]] [[query:backward? successors?]] lists all such zettel.
 ; [!summary|''summary'']
 : Summarizes the content of the zettel.
   You may use all [[inline-structued elements|00001007040000]] of Zettelmarkup.
+; [!superior|''superior'']
+: Specifies a zettel that is conceptually a superior zettel.
+  This might be a more abstract zettel, or a zettel that should be higher in a hierarchy.
 ; [!syntax|''syntax'']
 : Specifies the syntax that should be used for interpreting the zettel.
   The zettel about [[other markup languages|00001008000000]] defines supported values.
   If it is not given, it defaults to ''plain''.
 ; [!tags|''tags'']

Index: docs/manual/00001006020100.zettel
==================================================================
--- docs/manual/00001006020100.zettel
+++ docs/manual/00001006020100.zettel
@@ -1,24 +1,34 @@
 id: 00001006020100
 title: Supported Zettel Roles
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
-modified: 20220623183234
+created: 20210126175322
+modified: 20231129173620
 
 The [[''role'' key|00001006020000#role]] defines what kind of zettel you are writing.
 You are free to define your own roles.
 It is allowed to set an empty value or to omit the role.
 
 Some roles are defined for technical reasons:
 
 ; [!configuration|''configuration'']
-: A zettel that contains some configuration data for the Zettelstore.
+: A zettel that contains some configuration data / information for the Zettelstore.
   Most prominent is [[00000000000100]], as described in [[00001004020000]].
 ; [!manual|''manual'']
 : All zettel that document the inner workings of the Zettelstore software.
   This role is only used in this specific Zettelstore.
+; [!role|''role'']
+: A zettel with the role ""role"" and a title, which names a [[role|00001006020000#role]], is treated as a __role zettel__.
+  Basically, role zettel describe the role, and form a hierarchiy of meta-roles.
+; [!tag|''tag'']
+: A zettel with the role ""tag"" and a title, which names a [[tag|00001006020000#tags]], is treated as a __tag zettel__.
+  Basically, tag zettel describe the tag, and form a hierarchiy of meta-tags.
+; [!zettel|''zettel'']
+: A zettel that contains your own thoughts.
+  The real reason to use this software.
 
 If you adhere to the process outlined by Niklas Luhmann, a zettel could have one of the following three roles:
 
 ; [!note|''note'']
 : A small note, to remember something.
@@ -25,9 +35,9 @@
   Notes are not real zettel, they just help to create a real zettel.
   Think of them as Post-it notes.
 ; [!literature|''literature'']
 : Contains some remarks about a book, a paper, a web page, etc.
   You should add a citation key for citing it.
-; [!zettel|''zettel'']
-: A real zettel that contains your own thoughts.
+; ''zettel''
+: (as described above)
 
 However, you are free to define additional roles, e.g. ''material'' for literature that is web-based only, ''slide'' for presentation slides, ''paper'' for the text of a scientific paper, ''project'' to define a project, ...

Index: docs/manual/00001006030000.zettel
==================================================================
--- docs/manual/00001006030000.zettel
+++ docs/manual/00001006030000.zettel
@@ -1,20 +1,23 @@
 id: 00001006030000
 title: Supported Key Types
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
-modified: 20220304114106
+created: 20210126175322
+modified: 20230612183742
 
 All [[supported metadata keys|00001006020000]] conform to a type.
 
 User-defined metadata keys conform also to a type, based on the suffix of the key.
 
 |=Suffix|Type
+| ''-date'' | [[Timestamp|00001006034500]]
 | ''-number'' | [[Number|00001006033000]]
 | ''-role'' | [[Word|00001006035500]]
 | ''-set'' | [[WordSet|00001006036000]]
+| ''-time'' | [[Timestamp|00001006034500]]
 | ''-title'' | [[Zettelmarkup|00001006036500]]
 | ''-url'' | [[URL|00001006035000]]
 | ''-zettel''  | [[Identifier|00001006032000]]
 | ''-zid''  | [[Identifier|00001006032000]]
 | ''-zids''  | [[IdentifierSet|00001006032500]]
@@ -21,11 +24,11 @@
 | any other suffix | [[EString|00001006031500]]
 
 The name of the metadata key is bound to the key type
 
 Every key type has an associated validation rule to check values of the given type.
-There is also a rule how values are matched, e.g. against a search term when selecting some zettel.
+There is also a rule how values are matched, e.g. against a [[search value|00001007706000]] when selecting some zettel.
 And there is a rule how values compare for sorting.
 
 * [[Credential|00001006031000]]
 * [[EString|00001006031500]]
 * [[Identifier|00001006032000]]

Index: docs/manual/00001006031000.zettel
==================================================================
--- docs/manual/00001006031000.zettel
+++ docs/manual/00001006031000.zettel
@@ -2,19 +2,19 @@
 title: Credential Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130324
+modified: 20230419175515
 
 Values of this type denote a credential value, e.g. an encrypted password.
 
 === Allowed values
 All printable characters are allowed.
 Since a credential contains some kind of secret, the sequence of characters might have some hidden syntax to be interpreted by other parts of Zettelstore.
 
-=== Query operators
+=== Query comparison
 A credential never compares to any other value.
 A comparison will never match in any way.
 
 === Sorting
 If a list of zettel should be sorted based on a credential value, the identifier of the respective zettel is used instead.

Index: docs/manual/00001006031500.zettel
==================================================================
--- docs/manual/00001006031500.zettel
+++ docs/manual/00001006031500.zettel
@@ -2,24 +2,24 @@
 title: EString Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130448
+modified: 20230419175525
 
 Values of this type are just a sequence of character, possibly an empty sequence.
 
 An EString is the most general metadata key type, as it places no restrictions to the character sequence.[^Well, there are some minor restrictions that follow from the [[metadata syntax|00001006010000]].]
 
 === Allowed values
 All printable characters are allowed.
 
-=== Query operator
+=== Query comparison
 All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""Hello"".
 
 === Sorting
 To sort two values, the underlying encoding is used to determine which value is less than the other.
 
 Uppercase letters are typically interpreted as less than their corresponding lowercase letters, i.e. ``A < a``.
 
 Comparison is done character-wise by finding the first difference in the respective character sequence.
 For example, ``abc > aBc``.

Index: docs/manual/00001006032000.zettel
==================================================================
--- docs/manual/00001006032000.zettel
+++ docs/manual/00001006032000.zettel
@@ -2,20 +2,30 @@
 title: Identifier Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914134914
+modified: 20230612183459
 
 Values of this type denote a [[zettel identifier|00001006050000]].
 
 === Allowed values
 Must be a sequence of 14 digits (""0""--""9"").
 
-=== Query operator
-Comparison is done with the string representation of the identifiers.
+=== Query comparison
+[[Search values|00001007706000]] with more than 14 characters are truncated to contain exactly 14 characters.
+
+When the [[search operators|00001007705000]] ""less"", ""not less"", ""greater"", and ""not greater"" are given, the length of the search value is checked.
+If it contains less than 14 digits, zero digits (""0"") are appended, until it contains exactly 14 digits.
+
+All other comparisons assume that up to 14 characters are given.
+
+Comparison is done through the string representation.
+
+In case of the search operators ""less"", ""not less"", ""greater"", and ""not greater"", this is the same as a numerical comparison.
+
 For example, ""000010"" matches ""[[00001006032000]]"".
 
 === Sorting
 Sorting is done by comparing the [[String|00001006033500]] values.
 
 If both values are identifiers, this works well because both have the same length.

Index: docs/manual/00001006032500.zettel
==================================================================
--- docs/manual/00001006032500.zettel
+++ docs/manual/00001006032500.zettel
@@ -2,21 +2,21 @@
 title: IdentifierSet Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914131354
+modified: 20230419175551
 
 Values of this type denote a (sorted) set of [[zettel identifier|00001006050000]].
 
 A set is different to a list, as no duplicate values are allowed.
 
 === Allowed values
 Must be at least one sequence of 14 digits (""0""--""9""), separated by space characters.
 
-=== Query operator
+=== Query comparison
 A value matches an identifier set value, if the value matches any of the identifier set values.
 
 For example, ""000010060325"" is a prefix ""[[00001006032000]] [[00001006032500]]"".
 
 === Sorting
 Sorting is done by comparing the [[String|00001006033500]] values.

Index: docs/manual/00001006033000.zettel
==================================================================
--- docs/manual/00001006033000.zettel
+++ docs/manual/00001006033000.zettel
@@ -2,17 +2,23 @@
 title: Number Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914131211
+modified: 20230612183900
 
 Values of this type denote a numeric integer value.
 
 === Allowed values
 Must be a sequence of digits (""0""--""9""), optionally prefixed with a ""-"" or a ""+"" character.
 
-=== Query operator
-All comparisons are done on the given string representation of the number, ""+12"" will be treated as a different number of ""12"".
+=== Query comparison
+[[Search operators|00001007705000]] for equality (""equal"" or ""not equal"", ""has"" or ""not has""), for lesser values (""less"" or ""not less""), or for greater values (""greater"" or ""not greater"") are executed by converting both the [[search value|00001007706000]] and the metadata value into integer values and then comparing them numerically.
+Integer values must be in the range -9223372036854775808 &hellip; 9223372036854775807.
+Comparisons with metadata values outside this range always returns a negative match.
+Comparisons with search values outside this range will be executed as a comparison of the string representation values.
+
+All other comparisons (""match"", ""not match"", ""prefix"", ""not prefix"", ""suffix"", and ""not suffix"") are done on the given string representation of the number.
+In this case, the number ""+12"" will be treated as different to the number ""12"".
 
 === Sorting
 Sorting is done by comparing the numeric values.

Index: docs/manual/00001006033500.zettel
==================================================================
--- docs/manual/00001006033500.zettel
+++ docs/manual/00001006033500.zettel
@@ -2,23 +2,23 @@
 title: String Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130505
+modified: 20230419175633
 
 Values of this type are just a sequence of character, but not an empty sequence.
 
 === Allowed values
 All printable characters are allowed.
 There must be at least one such character.
 
-=== Query operator
+=== Query comparison
 All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""Hello"".
 
 === Sorting
 To sort two values, the underlying encoding is used to determine which value is less than the other.
 
 Uppercase letters are typically interpreted as less than their corresponding lowercase letters, i.e. ``A < a``.
 
 Comparison is done character-wise by finding the first difference in the respective character sequence.
 For example, ``abc > aBc``.

Index: docs/manual/00001006034000.zettel
==================================================================
--- docs/manual/00001006034000.zettel
+++ docs/manual/00001006034000.zettel
@@ -2,11 +2,11 @@
 title: TagSet Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914131048
+modified: 20230419175642
 
 Values of this type denote a (sorted) set of tags.
 
 A set is different to a list, as no duplicate values are allowed.
 
@@ -14,10 +14,10 @@
 Every tag must must begin with the number sign character (""''#''"", U+0023), followed by at least one printable character.
 Tags are separated by space characters.
 
 All characters are mapped to their lower case values.
 
-=== Query operator
+=== Query comparison
 All comparisons are done case-sensitive, i.e. ""#hell"" will not be the prefix of ""#Hello"".
 
 === Sorting
 Sorting is done by comparing the [[String|00001006033500]] values.

Index: docs/manual/00001006034500.zettel
==================================================================
--- docs/manual/00001006034500.zettel
+++ docs/manual/00001006034500.zettel
@@ -2,26 +2,36 @@
 title: Timestamp Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130919
+modified: 20231030182858
 
 Values of this type denote a point in time.
 
 === Allowed values
-Must be a sequence of 14 digits (""0""--""9"") (same as an [[Identifier|00001006032000]]), with the restriction that is conforms to the pattern ""YYYYMMDDhhmmss"".
+Must be a sequence of 4, 6, 8, 10, 12, or 14 digits (""0""--""9"") (similar to an [[Identifier|00001006032000]]), with the restriction that it must conform to the pattern ""YYYYMMDDhhmmss"".
 
 * YYYY is the year,
 * MM is the month,
 * DD is the day,
 * hh is the hour,
 * mm is the minute,
 * ss is the second.
 
-=== Query operator
-All comparisons assume that up to 14 digits are given.
+If the sequence is less than 14 digits, they are expanded with the following rule:
+
+* YYYY is expanded to YYYY0101000000
+* YYYYMM is expanded to YYYYMM01000000
+* YYYYMMDD is expanded to YYYYMMDD000000
+* YYYYMMDDhh is expanded to YYYYMMDDhh0000
+* YYYYMMDDhhmm is expanded to YYYYMMDDhhmm00
+
+=== Query comparison
+[[Search values|00001007706000]] with more than 14 characters are truncated to contain exactly 14 characters.
+Then, they are treated as timestamp data, as describe above, if they contain 4, 6, 8, 10, or 12 digits.
+
+Comparison is done through the string representation.
+In case of the search operators ""less"", ""not less"", ""greater"", and ""not greater"", this is the same as a numerical comparison.
 
 === Sorting
-Sorting is done by comparing the [[String|00001006033500]] values.
-
-If both values are timestamp values, this works well because both have the same length.
+Sorting is done by comparing the possibly expanded values.

Index: docs/manual/00001006035000.zettel
==================================================================
--- docs/manual/00001006035000.zettel
+++ docs/manual/00001006035000.zettel
@@ -2,18 +2,18 @@
 title: URL Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130809
+modified: 20230419175725
 
 Values of this type denote an URL.
 
 === Allowed values
 All characters of an URL / URI are allowed.
 
-=== Query operator
+=== Query comparison
 All comparisons are done case-insensitive.
 For example, ""hello"" is the suffix of ""http://example.com/Hello"".
 
 === Sorting
 Sorting is done by comparing the [[String|00001006033500]] values.

Index: docs/manual/00001006035500.zettel
==================================================================
--- docs/manual/00001006035500.zettel
+++ docs/manual/00001006035500.zettel
@@ -2,19 +2,19 @@
 title: Word Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130655
+modified: 20230419175735
 
 Values of this type denote a single word.
 
 === Allowed values
 Must be a non-empty sequence of characters, but without the space character.
 
 All characters are mapped to their lower case values.
 
-=== Query operator
+=== Query comparison
 All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""Hello"".
 
 === Sorting
 Sorting is done by comparing the [[String|00001006033500]] values.

Index: docs/manual/00001006036000.zettel
==================================================================
--- docs/manual/00001006036000.zettel
+++ docs/manual/00001006036000.zettel
@@ -2,19 +2,19 @@
 title: WordSet Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914130725
+modified: 20230419175745
 
 Values of this type denote a (sorted) set of [[words|00001006035500]].
 
 A set is different to a list, as no duplicate values are allowed.
 
 === Allowed values
 Must be a sequence of at least one word, separated by space characters.
 
-=== Query operator
+=== Query comparison
 All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""World, Hello"".
 
 === Sorting
 Sorting is done by comparing the [[String|00001006033500]] values.

Index: docs/manual/00001006036500.zettel
==================================================================
--- docs/manual/00001006036500.zettel
+++ docs/manual/00001006036500.zettel
@@ -2,19 +2,19 @@
 title: Zettelmarkup Key Type
 role: manual
 tags: #manual #meta #reference #zettel #zettelstore
 syntax: zmk
 created: 20210212135017
-modified: 20220914135405
+modified: 20230419175441
 
 Values of this type are [[String|00001006033500]] values, interpreted as [[Zettelmarkup|00001007000000]].
 
 === Allowed values
 All printable characters are allowed.
 There must be at least one such character.
 
-=== Query operator
+=== Query comparison
 Comparison is done similar to the full-text search: both the value to compare and the metadata value are normalized according to Unicode NKFD, ignoring everything except letters and numbers.
 Letters are mapped to the corresponding lower-case value.
 
 For example, ""Brücke"" will be the prefix of ""(Bruckenpfeiler,"".
 

Index: docs/manual/00001007030900.zettel
==================================================================
--- docs/manual/00001007030900.zettel
+++ docs/manual/00001007030900.zettel
@@ -1,20 +1,21 @@
 id: 00001007030900
 title: Zettelmarkup: Comment Blocks
 role: manual
 tags: #manual #zettelmarkup #zettelstore
 syntax: zmk
-modified: 20220218130330
+created: 20210126175322
+modified: 20230807170858
 
 Comment blocks are quite similar to [[verbatim blocks|00001007030500]]: both are used to enter text that should not be interpreted.
 While the text entered inside a verbatim block will be processed somehow, text inside a comment block will be ignored[^Well, not completely ignored: text is read, but it will typically not rendered visible.].
 Comment blocks are typically used to give some internal comments, e.g. the license of a text or some internal remarks.
 
 Comment blocks begin with at least three percent sign characters (""''%''"", U+0025) at the first position of a line.
 You can add some [[attributes|00001007050000]] on the beginning line of a comment block, following the initiating characters.
 The comment block supports the default attribute: when given, the text will be rendered, e.g. as an HTML comment.
-When rendered to JSON, the comment block will not be ignored but it will output some JSON text.
+When rendered to a symbolic expression, the comment block will not be ignored but it will output some text.
 Same for other renderer.
 
 Any other character in this line will be ignored
 
 Text following the beginning line will not be interpreted, until a line begins with at least the same number of the same characters given at the beginning line.

Index: docs/manual/00001007031140.zettel
==================================================================
--- docs/manual/00001007031140.zettel
+++ docs/manual/00001007031140.zettel
@@ -2,11 +2,11 @@
 title: Zettelmarkup: Query Transclusion
 role: manual
 tags: #manual #search #zettelmarkup #zettelstore
 syntax: zmk
 created: 20220809132350
-modified: 20230116183656
+modified: 20231023163751
 
 A query transclusion is specified by the following sequence, starting at the first position in a line: ''{{{query:query-expression}}}''.
 The line must literally start with the sequence ''{{{query:''.
 Everything after this prefix is interpreted as a [[query expression|00001007700000]].
 
@@ -47,10 +47,13 @@
 ; ''RSS'' (aggregate)
 : Transform the zettel list into a [[RSS 2.0|https://www.rssboard.org/rss-specification]]-conformant document / feed.
   The document is embedded into the referencing zettel.
 ; ''KEYS'' (aggregate)
 : Emit a list of all metadata keys, together with the number of zettel having the key.
+; ''REINDEX'' (aggregate)
+: Will be ignored.
+  This action may have been copied from an existing [[API query call|00001012051400]] (or from a WebUI query), but is here superfluous (and possibly harmful).
 ; Any [[metadata key|00001006020000]] of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]] (aggregates)
 : Emit an aggregate of the given metadata key.
   The key can be given in any letter case[^Except if the key name collides with one of the above names. In this case use at least one lower case letter.].
 
 Example:

Index: docs/manual/00001007031300.zettel
==================================================================
--- docs/manual/00001007031300.zettel
+++ docs/manual/00001007031300.zettel
@@ -12,11 +12,11 @@
 You can add some [[attributes|00001007050000]] on the beginning line of a verbatim block, following the initiating characters.
 The evaluation block supports the default attribute[^Depending on the syntax value.]: when given, all spaces in the text are rendered in HTML as open box characters (U+2423).
 If you want to give only one attribute and this attribute is the generic attribute, you can omit the most of the attribute syntax and just specify the value.
 It will be interpreted as a [[syntax|00001008000000]] value to evaluate its content.
 Not all syntax values are supported by Zettelstore.[^Currently just ""[[draw|00001008050000]]"".]
-The main reason for an evaluation block is to be used with external software via the [[Sexpr encoding|00001012920516]].
+The main reason for an evaluation block is to be used with external software via the [[sz encoding|00001012920516]].
 
 Any other character in this line will be ignored
 
 Text following the beginning line will not be interpreted, until a line begins with at least the same number of the same characters given at the beginning line.
 This allows to enter some tilde characters in the text that should not be interpreted.

Index: docs/manual/00001007031400.zettel
==================================================================
--- docs/manual/00001007031400.zettel
+++ docs/manual/00001007031400.zettel
@@ -14,11 +14,11 @@
 A math-mode block supports the default attribute[^Depending on the syntax value.]: when given, all spaces in the text are rendered in HTML as open box characters (U+2423).
 If you want to give only one attribute and this attribute is the generic attribute, you can omit the most of the attribute syntax and just specify the value.
 It will be interpreted as a [[syntax|00001008000000]] value to evaluate its content.
 Alternatively, you could provide an attribute with the key ""syntax"" and use the value to specify the syntax.
 Not all syntax values are supported by Zettelstore.[^Currently: none.]
-External software might support several values via the [[Sexpr encoding|00001012920516]].
+External software might support several values via the [[sz encoding|00001012920516]].
 
 Any other character in this line will be ignored
 
 Text following the beginning line will not be interpreted, until a line begins with at least the same number of the same characters given at the beginning line.
 This allows to enter some dollar-sign characters in the text that should not be interpreted.

Index: docs/manual/00001007040100.zettel
==================================================================
--- docs/manual/00001007040100.zettel
+++ docs/manual/00001007040100.zettel
@@ -1,11 +1,12 @@
 id: 00001007040100
 title: Zettelmarkup: Text Formatting
 role: manual
 tags: #manual #zettelmarkup #zettelstore
 syntax: zmk
-modified: 20220218131003
+created: 20210126175322
+modified: 20231113191353
 
 Text formatting is the way to make your text visually different.
 Every text formatting element begins with two same characters.
 It ends when these two same characters occur the second time.
 It is possible that some [[attributes|00001007050000]] follow immediately, without any separating character.
@@ -27,7 +28,10 @@
 * The comma character (""'',''"", U+002C) produces sub-scripted text.
 ** Example: ``H,,2,,O`` is rendered in HTML as: ::H,,2,,O::{=example}.
 * The quotation mark character (""''"''"", U+0022) marks an inline quotation, according to the [[specified language|00001007050100]].
 ** Example: ``""To be or not""`` is rendered in HTML as: ::""To be or not""::{=example}.
 ** Example: ``""Sein oder nicht""{lang=de}`` is rendered in HTML as: ::""Sein oder nicht""{lang=de}::{=example}.
+* The number sign (""''#''"", U+0023) marks the text visually, where the mark does not belong to the text itself.
+  It is typically used to highlight some text that is important for you, but was not important for the original author.
+** Example: ``abc ##def## ghi`` is rendered in HTML as: ::abc ##def## ghi::{=example}.
 * The colon character (""'':''"", U+003A) mark some text that should belong together. It fills a similar role as [[region blocks|00001007030800]], but just for inline elements.
 ** Example: ``abc ::def::{=example} ghi`` is rendered in HTML as: abc ::def::{=example} ghi.

Index: docs/manual/00001007700000.zettel
==================================================================
--- docs/manual/00001007700000.zettel
+++ docs/manual/00001007700000.zettel
@@ -1,49 +1,30 @@
 id: 00001007700000
-title: Query expression
+title: Query Expression
 role: manual
 tags: #manual #search #zettelstore
 syntax: zmk
 created: 20220805150154
-modified: 20220913135434
+modified: 20230731161954
 
 A query expression allows you to search for specific zettel and to perform some actions on them.
-You may select zettel based on a full-text search, based on specific metadata values, or both.
+You may select zettel based on a list of [[zettel identifier|00001006050000]], based on a query directive, based on a full-text search, based on specific metadata values, or some or all of them.
 
-A query expression consists of a __search expression__ and of an optional __action list__.
-Both are separated by a vertical bar character (""''|''"", U+007C).
+A query expression consists of an optional __[[zettel identifier list|00001007710000]]__, zero or more __[[query directives|00001007720000]]__, an optional __[[search expression|00001007701000]]__, and an optional __[[action list|00001007770000]]__.
+The latter two are separated by a vertical bar character (""''|''"", U+007C).
 
 A query expression follows a [[formal syntax|00001007780000]].
 
-=== Search expression
-
-In its simplest form, a search expression just contains a string to be search for with the help of a full-text search.
-For example, the string ''syntax'' will search for all zettel containing the word ""syntax"".
-
-If you want to search for all zettel with a title containing the word ""syntax"", you must specify ''title:syntax''.
-""title"" names the [[metadata key|00001006010000]], in this case the [[supported metadata key ""title""|00001006020000#title]].
-The colon character (""'':''"") is a [[search operator|00001007705000]], in this example to specify a match.
-""syntax"" is the [[search value|00001007706000]] that must match to the value of the given metadata key, here ""title"".
-
-A search expression may contain more than one search term, such as ''title:syntax''.
-Search terms must be separated by one or more space characters, for example ''title:syntax title:search''.
-All terms of a select expression must be true so that a zettel is selected.
-
-* [[Search terms|00001007702000]]
-* [[Search operator|00001007705000]]
-* [[Search value|00001007706000]]
-
-Here are [[some examples|00001007790000]] of search expressions, which can be used to manage a Zettelstore:
-{{{00001007790000}}}
-
-=== Action List
-
-With a search expression, a list of zettel is selected.
-Actions allow to modify this list to a certain degree.
-
-Which actions are allowed depends on the context.
-However, actions are further separated into __parameter action__ and __aggregate actions__.
-A parameter action just sets a parameter for an aggregate action.
-An aggregate action transforms the list of selected zettel into a different, aggregate form.
-Only the first aggregate form is executed, following aggregate actions are ignored.
-
-In most contexts, valid actions include the name of metadata keys, at least of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]].
+* [[List of zettel identifier|00001007710000]]
+* [[Query directives|00001007720000]]
+** [[Context directive|00001007720300]]
+** [[Ident directive|00001007720600]]
+** [[Items directive|00001007720900]]
+** [[Unlinked directive|00001007721200]]
+* [[Search expression|00001007701000]]
+** [[Search term|00001007702000]]
+** [[Search operator|00001007705000]]
+** [[Search value|00001007706000]]
+* [[Action list|00001007770000]]
+
+Here are [[some examples|00001007790000]], which can be used to manage a Zettelstore:
+{{{00001007790000}}}

ADDED   docs/manual/00001007701000.zettel
Index: docs/manual/00001007701000.zettel
==================================================================
--- docs/manual/00001007701000.zettel
+++ docs/manual/00001007701000.zettel
@@ -0,0 +1,26 @@
+id: 00001007701000
+title: Query: Search Expression
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 20230707205043
+modified: 20230707210039
+
+In its simplest form, a search expression just contains a string to be search for with the help of a full-text search.
+For example, the string ''syntax'' will search for all zettel containing the word ""syntax"".
+
+If you want to search for all zettel with a title containing the word ""syntax"", you must specify ''title:syntax''.
+""title"" denotes the [[metadata key|00001006010000]], in this case the [[supported metadata key ""title""|00001006020000#title]].
+The colon character (""'':''"") is a [[search operator|00001007705000]], in this example to specify a match.
+""syntax"" is the [[search value|00001007706000]] that must match to the value of the given metadata key, here ""title"".
+
+A search expression may contain more than one search term, such as ''title:syntax''.
+Search terms must be separated by one or more space characters, for example ''title:syntax title:search''.
+All terms of a select expression must be true so that a zettel is selected.
+
+Above sequence of search expressions may be combined by specifying the keyword ''OR''.
+At most one of those sequences must be true so that a zettel is selected.
+
+* [[Search term|00001007702000]]
+* [[Search operator|00001007705000]]
+* [[Search value|00001007706000]]

Index: docs/manual/00001007702000.zettel
==================================================================
--- docs/manual/00001007702000.zettel
+++ docs/manual/00001007702000.zettel
@@ -2,11 +2,11 @@
 title: Search term
 role: manual
 tags: #manual #search #zettelstore
 syntax: zmk
 created: 20220805150154
-modified: 20230327123724
+modified: 20230925173539
 
 A search term allows you to specify one search restriction.
 The result [[search expression|00001007700000]], which contains more than one search term, will be the applications of all restrictions.
 
 A search term can be one of the following (the first three term are collectively called __search literals__):
@@ -16,10 +16,14 @@
 
   If no search value is given, then all zettel containing the given metadata key are selected (or ignored, for a negated search operator).
 * An optional [[search operator|00001007705000]], followed by a [[search value|00001007706000]].
 
   This specifies a full-text search for the given search value.
+
+  However, the operators ""less"" and ""greater"" are not supported, they are internally translated into the ""match"" operators.
+  Similar, ""not less"" and ""not greater"" are translated into ""not match"".
+  It simply does not make sense to search the content of all zettel for words less than a specific word, for example.
 
   **Note:** the search value will be normalized according to Unicode NKFD, ignoring everything except letters and numbers.
   Therefore, the following search expression are essentially the same: ''"search syntax"'' and ''search syntax''.
   The first is a search expression with one search value, which is normalized to two strings to be searched for.
   The second is a search expression containing two search values, giving two string to be searched for.
@@ -32,19 +36,19 @@
   Any search expression will be in a [[disjunctive normal form|https://en.wikipedia.org/wiki/Disjunctive_normal_form]].
 
   It has no effect on the following search terms initiated with a special uppercase word.
 * The string ''PICK'', followed by a non-empty sequence of spaces and a number greater zero (called ""N"").
 
-  This will pick randomly N elements of the result list.
+  This will pick randomly N elements of the result list, preserving the order of that list.
   A zero value of N will produce the same result as if nothing was specified.
   If specified multiple times, the lower value takes precedence.
 
   Example: ''PICK 5 PICK 3'' will be interpreted as ''PICK 3''.
 * The string ''ORDER'', followed by a non-empty sequence of spaces and the name of a metadata key, will specify an ordering of the result list.
   If you include the string ''REVERSE'' after ''ORDER'' but before the metadata key, the ordering will be reversed.
 
-  Example: ''ORDER published'' will order the resulting list based on the publishing data, while ''ORDER REVERSED published'' will return a reversed result order.
+  Example: ''ORDER published'' will order the resulting list based on the publishing data, while ''ORDER REVERSE published'' will return a reversed result order.
 
   An explicit order field will take precedence over the random order described below.
 
   If no random order is effective, a ``ORDER REVERSE id`` will be added.
   This makes the sort stable.
@@ -57,13 +61,13 @@
 * The string ''RANDOM'' will provide a random order of the resulting list.
 
   Currently, only the first term specifying the order of the resulting list will be used.
   Other ordering terms will be ignored.
 
-  A random order specification will be ignored, if there is an explicit ordering given or if the specification contains a valid ''PICK''.
+  A random order specification will be ignored, if there is an explicit ordering given.
 
-  Example: ''RANDOM ORDER published'' will be interpreted as ''ORDER published'', ''PICK 3 RANDOM'' will be interpreted as ''PICK 3''.
+  Example: ''RANDOM ORDER published'' will be interpreted as ''ORDER published''.
 * The string ''OFFSET'', followed by a non-empty sequence of spaces and a number greater zero (called ""N"").
 
   This will ignore the first N elements of the result list, based on the specified sort order.
   A zero value of N will produce the same result as if nothing was specified.
   If specified multiple times, the higher value takes precedence.
@@ -83,10 +87,6 @@
 * The first search operator character found in a search term divides the term into two pieces.
   If the first piece, from the beginning of the search term to the search operator character, is syntactically a metadata key, the search term is treated as a metadata-based search.
 * Otherwise, the search term is treated as a full-text search.
 
 If a term like ''PICK'', ''ORDER'', ''ORDER REVERSE'', ''OFFSET'', or ''LIMIT'' is not followed by an appropriate value, it is interpreted as a search value for a full-text search.
-For example, ''ORDER 123'' will search for a zettel conatining the strings ""ORDER"" (case-insensitive) and ""123"".
-
-A specification ''RANDOM LIMIT n'' (with some valid value of ''n'') will be interpreted as ''PICK n''.
-Similar, a specification ''PICK n'', where ''n'' is greater or equal to the length of the result list, will be interpreted as ''RANDOM''.
-A specification ''LIMIT n'', where ''n'' is greater or equal to the length of the result list, will be ignored effectively.
+For example, ''ORDER 123'' will search for a zettel containing the strings ""ORDER"" (case-insensitive) and ""123"".

Index: docs/manual/00001007705000.zettel
==================================================================
--- docs/manual/00001007705000.zettel
+++ docs/manual/00001007705000.zettel
@@ -1,32 +1,44 @@
 id: 00001007705000
 title: Search operator
 role: manual
 tags: #manual #search #zettelstore
 syntax: zmk
-modified: 20220819194709
+created: 20220805150154
+modified: 20230612180539
 
 A search operator specifies how the comparison of a search value and a zettel should be executed.
 Every comparison is done case-insensitive, treating all uppercase letters the same as lowercase letters.
 
 The following are allowed search operator characters:
-* The exclamation mark character (""!"", U+0021) negates the meaning
-* The tilde character (""''~''"", U+007E) compares on matching (""match operator"")
-* The greater-than sign character (""''>''"", U+003E) matches if there is some prefix (""prefix operator"")
-* The less-than sign character (""''<''"", U+003C) compares a suffix relationship (""suffix operator"")
-* The colon character (""'':''"", U+003A) compares on equal words (""has operator"")
-* The question mark (""''?''"", U+003F) checks for an existing metadata key (""exist operator"")
-
-Since the exclamation mark character can be combined with the other, there are 10 possible combinations:
+* The exclamation mark character (""''!''"", U+0021) negates the meaning.
+* The equal sign character (""''=''"", U+003D) compares on equal content (""equals operator"").
+* The tilde character (""''~''"", U+007E) compares on matching (""match operator"").
+* The left square bracket character (""''[''"", U+005B) matches if there is some prefix (""prefix operator"").
+* The right square bracket character (""'']''"", U+005D) compares a suffix relationship (""suffix operator"").
+* The colon character (""'':''"", U+003A) compares depending on the on the actual [[key type|00001006030000]] (""has operator"").
+  In most cases, it acts as a equals operator, but for some type it acts as the match operator.
+* The less-than sign character (""''<''"", U+003C) matches if the search value is somehow less then the metadata value (""less operator"").
+* The greater-than sign character (""''>''"", U+003E) matches if the search value is somehow greater then the metadata value (""greater operator"").
+* The question mark (""''?''"", U+003F) checks for an existing metadata key (""exist operator"").
+  In this case no [[search value|00001007706000]] must be given.
+
+Since the exclamation mark character can be combined with the other, there are 18 possible combinations:
 # ""''!''"": is an abbreviation of the ""''!~''"" operator.
 # ""''~''"": is successful if the search value matched the value to be compared.
 # ""''!~''"": is successful if the search value does not match the value to be compared.
-# ""'':''"": is successful if the search value is equal to one word of the value to be compared.
-# ""''!:''"": is successful if the search value is not equal to any word of the value to be compared.
-# ""''>''"": is successful if the search value is a prefix of the value to be compared.
-# ""''!>''"": is successful if the search value is not a prefix of the value to be compared.
-# ""''<''"": is successful if the search value is a suffix of the value to be compared.
-# ""''!<''"": is successful if the search value is not a suffix of the value to be compared.
+# ""''=''"": is successful if the search value is equal to one word of the value to be compared.
+# ""''!=''"": is successful if the search value is not equal to any word of the value to be compared.
+# ""''[''"": is successful if the search value is a prefix of the value to be compared.
+# ""''![''"": is successful if the search value is not a prefix of the value to be compared.
+# ""'']''"": is successful if the search value is a suffix of the value to be compared.
+# ""''!]''"": is successful if the search value is not a suffix of the value to be compared.
+# ""'':''"": is successful if the search value is has/match one word of the value to be compared.
+# ""''!:''"": is successful if the search value is not match/has to any word of the value to be compared.
+# ""''<''"": is successful if the search value is less than the value to be compared.
+# ""''!<''"": is successful if the search value is not less than, e.g. greater or equal than the value to be compared.
+# ""''>''"": is successful if the search value is greater than the value to be compared.
+# ""''!>''"": is successful if the search value is not greater than, e.g. less or equal than the value to be compared.
 # ""''?''"": is successful if the metadata contains the given key.
 # ""''!?''"": is successful if the metadata does not contain the given key.
 # ""''''"": a missing search operator can only occur for a full-text search.
   It is equal to the ""''~''"" operator.

ADDED   docs/manual/00001007710000.zettel
Index: docs/manual/00001007710000.zettel
==================================================================
--- docs/manual/00001007710000.zettel
+++ docs/manual/00001007710000.zettel
@@ -0,0 +1,17 @@
+id: 20230707202600
+title: Query: List of Zettel Identifier
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 20230707202652
+
+A query may start with a list of [[zettel identifier|00001006050000]], where the identifier are separated by one ore more space characters.
+
+If you specify at least one query directive, this list acts as a input for the first query directive.
+Otherwise, only the zettel of the given list are used to evaluated the search expression or the action list (if no search expression was given).
+
+Some examples:
+* [[query:00001007700000 CONTEXT]] returns the context of this zettel.
+* [[query:00001007700000 00001007031140 man]] searches the given two zettel for a string ""man"".
+* [[query:00001007700000 00001007031140 | tags]] return a tag cloud with tags from those two zettel.
+* [[query:00001007700000 00001007031140]] returns a list with the two zettel.

ADDED   docs/manual/00001007720000.zettel
Index: docs/manual/00001007720000.zettel
==================================================================
--- docs/manual/00001007720000.zettel
+++ docs/manual/00001007720000.zettel
@@ -0,0 +1,19 @@
+id: 00001007720000
+title: Query Directives
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 20230707203135
+modified: 20230731162002
+
+A query directive transforms a list of zettel identifier into a list of zettel identifiert.
+It is only valid if a list of zettel identifier is specified at the beginning of the query expression.
+Otherwise the text of the directive is interpreted as a search expression.
+For example, ''CONTEXT'' is interpreted as a full-text search for the word ""context"".
+
+Every query directive therefore consumes a list of zettel, and it produces a list of zettel according to the specific directive.
+
+* [[Context directive|00001007720300]]
+* [[Ident directive|00001007720600]]
+* [[Items directive|00001007720900]]
+* [[Unlinked directive|00001007721200]]

ADDED   docs/manual/00001007720300.zettel
Index: docs/manual/00001007720300.zettel
==================================================================
--- docs/manual/00001007720300.zettel
+++ docs/manual/00001007720300.zettel
@@ -0,0 +1,37 @@
+id: 00001007720300
+title: Query: Context Directive
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 20230707204706
+modified: 20230724153832
+
+A context directive calculates the __context__ of a list of zettel identifier.
+It starts with the keyword ''CONTEXT''.
+
+Optionally you may specify some context details, after the keyword ''CONTEXT'', separated by space characters.
+These are:
+* ''BACKWARD'': search for context only though backward links,
+* ''FORWARD'': search for context only through forward links,
+* ''COST'', one or more space characters, and a positive integer: set the maximum __cost__ (default: 17),
+* ''MAX'', one or more space characters, and a positive integer: set the maximum number of context zettel (default: 200).
+
+If no ''BACKWARD'' and ''FORWARD'' is specified, a search for context zettel will be done though backward and forward links.
+
+The cost of a context zettel is calculated iteratively:
+* Each of the specified zettel hast a cost of one.
+* A zettel found as a single folge zettel or single precursor zettel has the cost of the originating zettel, plus one.
+* A zettel found as a single successor zettel or single predecessor zettel has the cost of the originating zettel, plus two.
+* A zettel found via another link without being part of a [[set of zettel identifier|00001006032500]], has the cost of the originating zettel, plus three.
+* A zettel which is part of a set of zettel identifier, has the cost of the originating zettel, plus one of the three choices above and multiplied with roughly a logarithmic value based on the size of the set.
+* A zettel with the same tag, has the cost of the originating zettel, plus the number of zettel with the same tag (if it is less than eight), or the cost of the originating zettel plus two, multiplied by number of zettel with the same tag divided by four.
+
+The maximum cost is only checked for all zettel that are not directly reachable from the initial, specified list of zettel.
+This ensures that initial zettel that have only a highly used tag, will also produce some context zettel.
+
+Despite its possibly complicated structure, this algorithm ensures in practice that the zettel context is a list of zettel, where the first elements are ""near"" to the specified zettel and the last elements are more ""distant"" to the specified zettel.
+It also penalties zettel that acts as a ""hub"" to other zettel, to make it more likely that only relevant zettel appear on the context list.
+
+This directive may be specified only once as a query directive.
+A second occurence of ''CONTEXT'' is interpreted as a [[search expression|00001007701000]].
+In most cases it is easier to adjust the maximum cost than to perform another context search, which is relatively expensive in terms of retrieving power.

ADDED   docs/manual/00001007720600.zettel
Index: docs/manual/00001007720600.zettel
==================================================================
--- docs/manual/00001007720600.zettel
+++ docs/manual/00001007720600.zettel
@@ -0,0 +1,12 @@
+id: 00001007720600
+title: Query: Ident Directive
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 20230724153018
+modified: 20230724154015
+
+An ident directive is needed if you want to specify just a list of zettel identifier.
+It starts with / consists of the keyword ''IDENT''.
+
+When not using the ident directive, zettel identifier are interpreted as a [[search expression|00001007701000]].

ADDED   docs/manual/00001007720900.zettel
Index: docs/manual/00001007720900.zettel
==================================================================
--- docs/manual/00001007720900.zettel
+++ docs/manual/00001007720900.zettel
@@ -0,0 +1,39 @@
+id: 00001007720900
+title: Query: Items Directive
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 00010101000000
+modified: 20230729120755
+
+The items directive works on zettel that act as a ""table of contents"" for other zettel.
+The [[initial zettel|00001000000000]] of this manual is one example, the [[general API description|00001012000000]] is another.
+Every zettel with a certain internal structure can act as the ""table of contents"" for others.
+
+What is a ""table of contents""?
+Basically, it is just a list of references to other zettel.
+
+To retrieve the items of a zettel, the software looks at first level [[list items|00001007030200]].
+If an item contains a valid reference to a zettel, this reference will be interpreted as an item in the items list, in the ""table of contents"".
+
+This applies only to first level list items (ordered or unordered list), but not to deeper levels.
+Only the first reference to a valid zettel is collected for the table of contents.
+Following references to zettel within such an list item are ignored.
+
+
+````
+# curl 'http://127.0.0.1:23123/z?q=00001000000000+ITEMS'
+00001001000000 Introduction to the Zettelstore
+00001002000000 Design goals for the Zettelstore
+00001003000000 Installation of the Zettelstore software
+00001004000000 Configuration of Zettelstore
+00001005000000 Structure of Zettelstore
+00001006000000 Layout of a Zettel
+00001007000000 Zettelmarkup
+00001008000000 Other Markup Languages
+00001010000000 Security
+00001012000000 API
+00001014000000 Web user interface
+00001017000000 Tips and Tricks
+00001018000000 Troubleshooting
+````

ADDED   docs/manual/00001007721200.zettel
Index: docs/manual/00001007721200.zettel
==================================================================
--- docs/manual/00001007721200.zettel
+++ docs/manual/00001007721200.zettel
@@ -0,0 +1,44 @@
+id: 00001007721200
+title: Query: Unlinked Directive
+role: manual
+tags: #manual #zettelstore
+syntax: zmk
+created: 20211119133357
+modified: 20230928190540
+
+The value of a personal Zettelstore is determined in part by explicit connections between related zettel.
+If the number of zettel grow, some of these connections are missing.
+There are various reasons for this.
+Maybe, you forgot that a zettel exists.
+Or you add a zettel later, but forgot that previous zettel already mention its title.
+
+__Unlinked references__ are phrases in a zettel that mention the title of another, currently unlinked zettel.
+
+To retrieve unlinked references to an existing zettel, use the query ''{ID} UNLINKED''.
+
+````
+# curl 'http://127.0.0.1:23123/z?q=00001012000000+UNLINKED'
+00001012921200 API: Encoding of Zettel Access Rights
+````
+
+This returns all zettel (in this case: only one) that references the title of the given Zettel, but does not references it directly.
+
+In addition you may add __phrases__ if you do not want to scan for the title of the given zettel.
+
+```
+# curl 'http://localhost:23123/z?q=00001012054400+UNLINKED+PHRASE+API'
+00001012050600 API: Provide an access token
+00001012921200 API: Encoding of Zettel Access Rights
+00001012080200 API: Check for authentication
+00001012080500 API: Refresh internal data
+00001012050200 API: Authenticate a client
+00001010040700 Access token
+```
+
+This finds all zettel that does contain the phrase ""API"" but does not directly reference the given zettel.
+
+The directive searches within all zettel whether the title of the specified zettel occurs there.
+The other zettel must not link to the specified zettel.
+The title must not occur within a link (e.g. to another zettel), in a [[heading|00001007030300]], in a [[citation|00001007040340]], and must have a uniform formatting.
+The match must be exact, but is case-insensitive.
+For example ""API"" does not match ""API:"".

ADDED   docs/manual/00001007770000.zettel
Index: docs/manual/00001007770000.zettel
==================================================================
--- docs/manual/00001007770000.zettel
+++ docs/manual/00001007770000.zettel
@@ -0,0 +1,18 @@
+id: 00001007770000
+title: Query: Action List
+role: manual
+tags: #manual #search #zettelstore
+syntax: zmk
+created: 20230707205246
+modified: 20230707205532
+
+With a [[list of zettel identifier|00001007710000]], a [[query directives|00001007720000]], or a [[search expression|00001007701000]], a list of zettel is selected.
+__Actions__ allow to modify this list to a certain degree.
+
+Which actions are allowed depends on the context.
+However, actions are further separated into __parameter action__ and __aggregate actions__.
+A parameter action just sets a parameter for an aggregate action.
+An aggregate action transforms the list of selected zettel into a different, aggregate form.
+Only the first aggregate form is executed, following aggregate actions are ignored.
+
+In most contexts, valid actions include the name of metadata keys, at least of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]].

Index: docs/manual/00001007780000.zettel
==================================================================
--- docs/manual/00001007780000.zettel
+++ docs/manual/00001007780000.zettel
@@ -2,30 +2,45 @@
 title: Formal syntax of query expressions
 role: manual
 tags: #manual #reference #search #zettelstore
 syntax: zmk
 created: 20220810144539
-modified: 20230327122634
+modified: 20230731160413
 
 ```
-QueryExpression  := SearchExpression ActionExpression?
-SearchExpression := SearchTerm (SPACE+ SearchTerm)*.
-SearchTerm       := SearchOperator? SearchValue
-                  | SearchKey SearchOperator SearchValue?
-                  | SearchKey ExistOperator
-                  | "OR"
-                  | "RANDOM"
-                  | "PICK" SPACE+ PosInt
-                  | "ORDER" SPACE+ ("REVERSE" SPACE+)? SearchKey
-                  | "OFFSET" SPACE+ PosInt
-                  | "LIMIT" SPACE+ PosInt.
-SearchValue      := Word.
-SearchKey        := MetadataKey.
-SearchOperator   := '!'
-                  | ('!')? ('~' | ':' | '<' | '>').
-ExistOperator    := '?'
-                  | '!' '?'.
-PosInt           := '0'
-                  | ('1' .. '9') DIGIT*.
-ActionExpression := '|' (Word (SPACE+ Word)*)?
-Word             := NO-SPACE NO-SPACE*
+QueryExpression   := ZettelList? QueryDirective* SearchExpression ActionExpression?
+ZettelList        := (ZID (SPACE+ ZID)*).
+ZID               := '0'+ ('1' .. '9'') DIGIT*
+                   | ('1' .. '9') DIGIT*.
+QueryDirective    := ContextDirective
+                   | IdentDirective
+                   | ItemsDirective
+                   | UnlinkedDirective.
+ContextDirective  := "CONTEXT" (SPACE+ ContextDetail)*.
+ContextDetail     := "BACKWARD"
+                   | "FORWARD"
+                   | "COST" SPACE+ PosInt
+                   | "MAX" SPACE+ PosInt.
+IdentDirective    := IDENT.
+ItemsDirective    := ITEMS.
+UnlinkedDirective := UNLINKED (SPACE+ PHRASE SPACE+ Word)*.
+SearchExpression  := SearchTerm (SPACE+ SearchTerm)*.
+SearchTerm        := SearchOperator? SearchValue
+                   | SearchKey SearchOperator SearchValue?
+                   | SearchKey ExistOperator
+                   | "OR"
+                   | "RANDOM"
+                   | "PICK" SPACE+ PosInt
+                   | "ORDER" SPACE+ ("REVERSE" SPACE+)? SearchKey
+                   | "OFFSET" SPACE+ PosInt
+                   | "LIMIT" SPACE+ PosInt.
+SearchValue       := Word.
+SearchKey         := MetadataKey.
+SearchOperator    := '!'
+                   | ('!')? ('~' | ':' | '[' | '}').
+ExistOperator     := '?'
+                   | '!' '?'.
+PosInt            := '0'
+                   | ('1' .. '9') DIGIT*.
+ActionExpression  := '|' (Word (SPACE+ Word)*)?
+Word              := NO-SPACE NO-SPACE*
 ```

Index: docs/manual/00001007790000.zettel
==================================================================
--- docs/manual/00001007790000.zettel
+++ docs/manual/00001007790000.zettel
@@ -2,15 +2,17 @@
 title: Useful query expressions
 role: manual
 tags: #example #manual #search #zettelstore
 syntax: zmk
 created: 20220810144539
-modified: 20230327122547
+modified: 20230706155134
 
 |= Query Expression |= Meaning
 | [[query:role:configuration]] | Zettel that contains some configuration data for the Zettelstore
 | [[query:ORDER REVERSE created LIMIT 40]] | 40 recently created zettel
 | [[query:ORDER REVERSE published LIMIT 40]] | 40 recently updated zettel
-| [[query:PICK 40]] | 40 random zettel
+| [[query:PICK 40]] | 40 random zettel, ordered by zettel identifier
 | [[query:dead?]] | Zettel with invalid / dead links
 | [[query:backward!? precursor!?]] | Zettel that are not referenced by other zettel
 | [[query:tags!?]] | Zettel without tags
+| [[query:expire? ORDER expire]] | Zettel with an expire date, ordered from the nearest to the latest
+| [[query:00001007700000 CONTEXT]] | Zettel within the context of the [[given zettel|00001007700000]]

Index: docs/manual/00001007800000.zettel
==================================================================
--- docs/manual/00001007800000.zettel
+++ docs/manual/00001007800000.zettel
@@ -1,18 +1,19 @@
 id: 00001007800000
 title: Zettelmarkup: Summary of Formatting Characters
 role: manual
 tags: #manual #reference #zettelmarkup #zettelstore
 syntax: zmk
-modified: 20220810095559
+created: 20220805150154
+modified: 20231113191330
 
 The following table gives an overview about the use of all characters that begin a markup element.
 
 |= Character :|= [[Blocks|00001007030000]] <|= [[Inlines|00001007040000]] <
 | ''!''  | (free) | (free)
 | ''"''  | [[Verse block|00001007030700]] | [[Short inline quote|00001007040100]]
-| ''#''  | [[Ordered list|00001007030200]] | [[Tag|00001007040000]]
+| ''#''  | [[Ordered list|00001007030200]] | [[marked / highlighted text|00001007040100]]
 | ''$''  | (reserved) | (reserved)
 | ''%''  | [[Comment block|00001007030900]] | [[Comment|00001007040000]]
 | ''&''  | (free) | [[Entity|00001007040000]]
 | ''\'''  | (free)  | [[Computer input|00001007040200]]
 | ''(''  | (free) | (free)

Index: docs/manual/00001007903000.zettel
==================================================================
--- docs/manual/00001007903000.zettel
+++ docs/manual/00001007903000.zettel
@@ -2,11 +2,11 @@
 title: Zettelmarkup: First Steps
 role: manual
 tags: #manual #tutorial #zettelmarkup #zettelstore
 syntax: zmk
 created: 20220810182917
-modified: 20220926183359
+modified: 20231201135849
 
 [[Zettelmarkup|00001007000000]] allows you to leave your text as it is, at least in many situations.
 Some characters have a special meaning, but you have to enter them is a defined way to see a visible change.
 Zettelmarkup is designed to be used for zettel, which are relatively short.
 It allows to produce longer texts, but you should probably use a different tool, if you want to produce an scientific paper, to name an example.
@@ -29,11 +29,11 @@
 | ''He says: ""I love you!""'' | Her says: ""I love you!"" | Put two quotation mark characters before and after the text you want to quote.
 
 You probably see a principle.
 
 One nice thing about the quotation mark characters: they are rendered according to the current language.
-Examples: ""english""{lang=en}, ""french""{lang=fr}, ""german""{lang=de}, ""finnish""{lang=fi}.
+Examples: ""english""{lang=en}, ""french""{lang=fr}, ""german""{lang=de}.
 You will see later, how to change the current language.
 
 === Lists
 Quite often, text consists of lists.
 Zettelmarkup supports different types of lists.

Index: docs/manual/00001007990000.zettel
==================================================================
--- docs/manual/00001007990000.zettel
+++ docs/manual/00001007990000.zettel
@@ -2,19 +2,19 @@
 title: Zettelmarkup: Cheat Sheet
 role: manual
 tags: #manual #reference #zettelmarkup
 syntax: zmk
 created: 20221209191905
-modified: 20221209193310
+modified: 20231201140000
 
 === Overview
 This Zettelmarkup cheat sheet provides a quick overview of many Zettelmarkup elements.
 It can not cover any special case.
 If you need more information about any of these elements, please refer to the detailed description.
 
 === Basic Syntax
-|[[Text formatting|00001007040100]]|''__italic text__'' &rarr; __italic text__, ''**bold text**'' &rarr; **bold text**, ''""quoted text""'' &rarr; ""quoted text""
+|[[Text formatting|00001007040100]]|''__italic text__'' &rarr; __italic text__, ''**bold text**'' &rarr; **bold text**, ''""quoted text""'' &rarr; ""quoted text"", ''##marked text##'' &rarr; ##marked text##
 |[[Text editing|00001007040100]]|''>>inserted text>>'' &rarr; >>inserted text>>, ''~~deleted text~~'' &rarr; ~~deleted text~~
 |[[Text literal formatting|00001007040200]]|''\'\'entered text\'\''' &rarr; ''entered text'', ''``source code``'' &rarr; ``source code``, ''==text output=='' &rarr; ==text output==
 |[[Superscript, subscript|00001007040100]]|''m^^2^^'' &rarr; m^^2^^, ''H,,2,,O'' &rarr; H,,2,,O
 |[[Links to other zettel|00001007040310]]|''[[Link text|00001007990000]]'' &rarr; [[Link text|00001007990000]]
 |[[Links to external resources|00001007040310]]|''[[Zettelstore|https://zettelstore.de]]'' &rarr; [[Zettelstore|https://zettelstore.de]]

Index: docs/manual/00001008000000.zettel
==================================================================
--- docs/manual/00001008000000.zettel
+++ docs/manual/00001008000000.zettel
@@ -2,11 +2,11 @@
 title: Other Markup Languages
 role: manual
 tags: #manual #zettelstore
 syntax: zmk
 created: 20210126175300
-modified: 20221112111148
+modified: 20230529223634
 
 [[Zettelmarkup|00001007000000]] is not the only markup language you can use to define your content.
 Zettelstore is quite agnostic with respect to markup languages.
 Of course, Zettelmarkup plays an important role.
 However, with the exception of zettel titles, you can use any (markup) language that is supported:
@@ -39,22 +39,23 @@
   See [[security aspects of Markdown|00001008010000#security-aspects]] for some details.
 ; [!markdown|''markdown''], [!md|''md'']
 : For those who desperately need [[Markdown|https://daringfireball.net/projects/markdown/]].
   Since the world of Markdown is so diverse, a [[CommonMark|00001008010500]] parser is used.
   See [[Use Markdown within Zettelstore|00001008010000]].
-; [!mustache|''mustache'']
-: A [[Mustache template|https://mustache.github.io/]], used when rendering a zettel as HTML for the [[web user interface|00001014000000]].
 ; [!none|''none'']
 : Only the metadata of a zettel is ""parsed"".
   Useful for displaying the full metadata.
   The [[runtime configuration zettel|00000000000100]] uses this syntax.
   The zettel content is ignored.
 ; [!svg|''svg'']
 : [[Scalable Vector Graphics|https://www.w3.org/TR/SVG2/]].
+; [!sxn|''sxn'']
+: S-Expressions, as implemented by [[sx|https://zettelstore.de/sx]].
+  Often used to specify templates when rendering a zettel as HTML for the [[web user interface|00001014000000]] (with the help of sxhtml]).
 ; [!text|''text''], [!plain|''plain''], [!txt|''txt'']
 : Plain text that must not be interpreted further.
 ; [!zmk|''zmk'']
 : [[Zettelmarkup|00001007000000]].
 
 The actual values are also listed in a zettel named [[Zettelstore Supported Parser|00000000000092]].
 
 If you specify something else, your content will be interpreted as plain text.

Index: docs/manual/00001008050000.zettel
==================================================================
--- docs/manual/00001008050000.zettel
+++ docs/manual/00001008050000.zettel
@@ -1,11 +1,12 @@
 id: 00001008050000
-title: The ""draw"" language
+title: The "draw" language
 role: manual
 tags: #graphic #manual #zettelstore
 syntax: zmk
-modified: 20220311120439
+created: 20220131142036
+modified: 20230403123738
 
 Sometimes, ""a picture is worth a thousand words"".
 To create some graphical representations, Zettelmarkup provides a simple mechanism.
 Characters like ""''|''"" or ""''-''"" already provide some visual feedback.
 For example, to create a picture containing two boxes that are connected via an arrow, the following representation is possible:

Index: docs/manual/00001012000000.zettel
==================================================================
--- docs/manual/00001012000000.zettel
+++ docs/manual/00001012000000.zettel
@@ -2,18 +2,18 @@
 title: API
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20221219150243
+modified: 20231128183617
 
 The API (short for ""**A**pplication **P**rogramming **I**nterface"") is the primary way to communicate with a running Zettelstore.
 Most integration with other systems and services is done through the API.
 The [[web user interface|00001014000000]] is just an alternative, secondary way of interacting with a Zettelstore.
 
 === Background
-The API is HTTP-based and uses plain text and JSON as its main encoding format for exchanging messages between a Zettelstore and its client software.
+The API is HTTP-based and uses plain text and [[symbolic expressions|00001012930000]] as its main encoding formats for exchanging messages between a Zettelstore and its client software.
 
 There is an [[overview zettel|00001012920000]] that shows the structure of the endpoints used by the API and gives an indication about its use.
 
 === Authentication
 If [[authentication is enabled|00001010040100]], most API calls must include an [[access token|00001010040700]] that proves the identity of the caller.
@@ -22,24 +22,23 @@
 * [[Provide an access token|00001012050600]] when doing an API call
 
 === Zettel lists
 * [[List all zettel|00001012051200]]
 * [[Query the list of all zettel|00001012051400]]
+* [[Determine a tag zettel|00001012051600]]
+* [[Determine a role zettel|00001012051800]]
 
 === Working with zettel
 * [[Create a new zettel|00001012053200]]
 * [[Retrieve metadata and content of an existing zettel|00001012053300]]
 * [[Retrieve metadata of an existing zettel|00001012053400]]
 * [[Retrieve evaluated metadata and content of an existing zettel in various encodings|00001012053500]]
 * [[Retrieve parsed metadata and content of an existing zettel in various encodings|00001012053600]]
-* [[Retrieve context of an existing zettel|00001012053800]]
-* [[Retrieve unlinked references to an existing zettel|00001012053900]]
-* [[Retrieve zettel order within an existing zettel|00001012054000]]
 * [[Update metadata and content of a zettel|00001012054200]]
 * [[Rename a zettel|00001012054400]]
 * [[Delete a zettel|00001012054600]]
 
 === Various helper methods
 * [[Retrieve administrative data|00001012070500]]
 * [[Execute some commands|00001012080100]]
 ** [[Check for authentication|00001012080200]]
 ** [[Refresh internal data|00001012080500]]

Index: docs/manual/00001012050200.zettel
==================================================================
--- docs/manual/00001012050200.zettel
+++ docs/manual/00001012050200.zettel
@@ -1,51 +1,52 @@
 id: 00001012050200
 title: API: Authenticate a client
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
-modified: 20220107215844
+created: 20210126175322
+modified: 20230412150544
 
 Authentication for future API calls is done by sending a [[user identification|00001010040200]] and a password to the Zettelstore to obtain an [[access token|00001010040700]].
 This token has to be used for other API calls.
 It is valid for a relatively short amount of time, as configured with the key ''token-lifetime-api'' of the [[startup configuration|00001004010000#token-lifetime-api]] (typically 10 minutes).
 
 The simplest way is to send user identification (''IDENT'') and password (''PASSWORD'') via [[HTTP Basic Authentication|https://tools.ietf.org/html/rfc7617]] and send them to the [[endpoint|00001012920000]] ''/a'' with a POST request:
 ```sh
 # curl -X POST -u IDENT:PASSWORD http://127.0.0.1:23123/a
-{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":600}
+("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA2MiwiaWF0IjoxNjgxMzA0MDAyLCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.kdF8PdiL50gIPkRD3ovgR6nUXR0-80EKAXcY2zVYgYvryF09iXnNR3zrvYnGzdrArMcnvAYqVvuXtqhQj2jG9g" 600)
 ```
 
 Some tools, like [[curl|https://curl.haxx.se/]], also allow to specify user identification and password as part of the URL:
 ```sh
 # curl -X POST http://IDENT:PASSWORD@127.0.0.1:23123/a
-{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":600}
+("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA4NiwiaWF0IjoxNjgxMzA0MDI2LCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.kZd3prYc79dt9efDsrYVHtKrjWyOWvfByjeeUB3hf_vs43V3SNJqmb8k-zTHVNWOK0-5orVPrg2tIAqbXqmkhg" 600)
 ```
 
 If you do not want to use Basic Authentication, you can also send user identification and password as HTML form data:
 ```sh
 # curl -X POST -d 'username=IDENT&password=PASSWORD' http://127.0.0.1:23123/a
-{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":600}
+("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA4OCwiaWF0IjoxNjgxMzA0MDI4LCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.qIEyOMFXykCApWtBaqbSESwTL96stWl2LRICiRNAXUjcY-mwx_SSl9L5Fj2FvmrI1K1RBvWehjoq8KZUNjhJ9Q" 600)
 ```
 
-In all cases, you will receive an JSON object will all [[relevant data|00001012921000]] to be used for further API calls.
+In all cases, you will receive a list with three elements that will contain all [[relevant data|00001012921000]] to be used for further API calls.
 
 **Important:** obtaining a token is a time-intensive process.
 Zettelstore will delay every request to obtain a token for a certain amount of time.
 Please take into account that this request will take approximately 500 milliseconds, under certain circumstances more.
 
 However, if [[authentication is not enabled|00001010040100]] and you send an authentication request, no user identification/password checking is done and you receive an artificial token immediate, without any delay:
 
 ```sh
 # curl -X POST -u IDENT:PASSWORD http://127.0.0.1:23123/a
-{"token":"freeaccess","token_type":"Bearer","expires_in":316224000}
+("Bearer" "freeaccess" 316224000)
 ```
 
 In this case, it is even possible to omit the user identification/password.
 
 === HTTP Status codes
-In all cases of successful authentication, a JSON object is returned, which contains the token under the key ''"token"''.
+In all cases of successful authentication, a list is returned, which contains the token as the second element.
 A successful authentication is signaled with the HTTP status code 200, as usual.
 
 Other status codes possibly send by the Zettelstore:
 ; ''400''
 : Unable to process the request.

Index: docs/manual/00001012050400.zettel
==================================================================
--- docs/manual/00001012050400.zettel
+++ docs/manual/00001012050400.zettel
@@ -1,37 +1,38 @@
 id: 00001012050400
 title: API: Renew an access token
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
-modified: 20220107215751
+created: 20210126175322
+modified: 20230412160219
 
 An access token is only valid for a certain duration.
 Since the [[authentication process|00001012050200]] will need some processing time, there is a way to renew the token without providing full authentication data.
 
 Send a HTTP PUT request to the [[endpoint|00001012920000]] ''/a'' and include the current access token in the ''Authorization'' header:
 
 ```sh
 # curl -X PUT -H 'Authorization: Bearer TOKEN' http://127.0.0.1:23123/a
-{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":456}
+("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA4NiwiaWF0IjoxNjgxMzA0MDI2LCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.kZd3prYc79dt9efDsrYVHtKrjWyOWvfByjeeUB3hf_vs43V3SNJqmb8k-zTHVNWOK0-5orVPrg2tIAqbXqmkhg" 456)
 ```
 You may receive a new access token, or the current one if it was obtained not a long time ago.
 However, the lifetime of the returned [[access token|00001012921000]] is accurate.
 
 If [[authentication is not enabled|00001010040100]] and you send a renew request, no checking is done and you receive an artificial token immediate, without any delay:
 
 ```sh
 # curl -X PUT -H 'Authorization: Bearer freeaccess' http://127.0.0.1:23123/a
-{"token":"freeaccess","token_type":"Bearer","expires_in":316224000}
+("Bearer" "freeaccess" 316224000)
 ```
 
 In this case, it is even possible to omit the access token.
 
 === HTTP Status codes
 ; ''200''
-: Renew process was successful, the body contains an [[appropriate JSON object|00001012921000]].
+: Renew process was successful, the body contains a [[list|00001012921000]] with the relevant data.
 ; ''400''
 : The renew process was not successful.
   There are several reasons for this.
   Maybe access bearer token was not valid.
 
   Probably you should [[authenticate|00001012050200]] again with user identification and password.

Index: docs/manual/00001012051200.zettel
==================================================================
--- docs/manual/00001012051200.zettel
+++ docs/manual/00001012051200.zettel
@@ -2,11 +2,11 @@
 title: API: List all zettel
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20221219154400
+modified: 20230807170810
 
 To list all zettel just send a HTTP GET request to the [[endpoint|00001012920000]] ''/z''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header].
 Always use the endpoint ''/z'' to work with a list of zettel.
 
 Without further specifications, a plain text document is returned, with one line per zettel.
@@ -21,102 +21,51 @@
 00001012050400 API: Renew an access token
 00001012050200 API: Authenticate a client
 ...
 ```
 
-Alternatively, you may retrieve the list of all zettel as a JSON object by specifying the encoding with the query parameter ''enc=json'':
+The list is **not** sorted, even in the these examples where it appears to be sorted.
+If you want to have it ordered, you must specify it with the help of a [[query expression|00001007700000]] / [[search term|00001007702000]].
+See [[Query the list of all zettel|00001012051400]] how to do it.
+
+=== Data output
+
+Alternatively, you may retrieve the zettel list as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data'':
 
 ```sh
-# curl 'http://127.0.0.1:23123/z?enc=json'
-{"query":"","human":"","list":[{"id":"00001012051200","meta":{"back":"00001012000000","backward":"00001012000000 00001012920000","box-number":"1","created":"20210126175322","forward":"00001006020000 00001006050000 00001007700000 00001010040100 00001012050200 00001012051400 00001012920000 00001012921000 00001014000000","modified":"20221219150626","published":"20221219150626","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: List all zettel"},"rights":62},{"id":"00001012050600","meta":{"back":"00001012000000 00001012080500","backward":"00001012000000 00001012080500","box-number":"1","created":"00010101000000","forward":"00001012050200 00001012921000","modified":"20220218130020","published":"20220218130020","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: Provide an access token"},"rights":62},{"id":"00001012050400","meta":{"back":"00001010040700 00001012000000","backward":"00001010040700 00001012000000 00001012920000 00001012921000","box-number":"1","created":"00010101000000","forward":"00001010040100 00001012050200 00001012920000 00001012921000","modified":"20220107215751","published":"20220107215751","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: Renew an access token"},"rights":62},{"id":"00001012050200","meta":{"back":"00001012000000 00001012050400 00001012050600 00001012051200 00001012051400 00001012053300 00001012053400 00001012053500 00001012053600 00001012080200","backward":"00001010040700 00001012000000 00001012050400 00001012050600 00001012051200 00001012051400 00001012053300 00001012053400 00001012053500 00001012053600 00001012080200 00001012920000 00001012921000","box-number":"1","created":"00010101000000","forward":"00001004010000 00001010040100 00001010040200 00001010040700 00001012920000 00001012921000","modified":"20220107215844","published":"20220107215844","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: Authenticate a client"},"rights":62}, ...]}
-```
-
-If you reformat the JSON output, you will see its structure better:
-```
-{
-  "query": "",
-  "human": "",
-  "list": [
-    {
-      "id": "00001012051200",
-      "meta": {
-        "back": "00001012000000",
-        "backward": "00001012000000 00001012920000",
-        "box-number": "1",
-        "created": "20210126175322",
-        "forward": "00001006020000 00001006050000 00001007700000 00001010040100 00001012050200 00001012051400 00001012920000 00001012921000 00001014000000",
-        "modified": "20221219151200",
-        "published": "20221219151200",
-        "role": "manual",
-        "syntax": "zmk",
-        "tags": "#api #manual #zettelstore",
-        "title": "API: List all zettel"
-      },
-      "rights": 62
-    },
-    {
-      "id": "00001012050600",
-      "meta": {
-        "back": "00001012000000 00001012080500",
-        "backward": "00001012000000 00001012080500",
-        "box-number": "1",
-        "created": "00010101000000",
-        "forward": "00001012050200 00001012921000",
-        "modified": "20220218130020",
-        "published": "20220218130020",
-        "role": "manual",
-        "syntax": "zmk",
-        "tags": "#api #manual #zettelstore",
-        "title": "API: Provide an access token"
-      },
-      "rights": 62
-    },
-    {
-      "id": "00001012050400",
-      "meta": {
-        "back": "00001010040700 00001012000000",
-        "backward": "00001010040700 00001012000000 00001012920000 00001012921000",
-        "box-number": "1",
-        "created": "00010101000000",
-        "forward": "00001010040100 00001012050200 00001012920000 00001012921000",
-        "modified": "20220107215751",
-        "published": "20220107215751",
-        "role": "manual",
-        "syntax": "zmk",
-        "tags": "#api #manual #zettelstore",
-        "title": "API: Renew an access token"
-      },
-      "rights": 62
-    },
-    {
-      "id": "00001012050200",
-      "meta": {
-        "back": "00001012000000 00001012050400 00001012050600 00001012051200 00001012051400 00001012053300 00001012053400 00001012053500 00001012053600 00001012
-080200",
-        "backward": "00001010040700 00001012000000 00001012050400 00001012050600 00001012051200 00001012051400 00001012053300 00001012053400 00001012053500 0000
-1012053600 00001012080200 00001012920000 00001012921000",
-        "box-number": "1",
-        "created": "00010101000000",
-        "forward": "00001004010000 00001010040100 00001010040200 00001010040700 00001012920000 00001012921000",
-        "modified": "20220107215844",
-        "published": "20220107215844",
-        "role": "manual",
-        "syntax": "zmk",
-        "tags": "#api #manual #zettelstore",
-        "title": "API: Authenticate a client"
-      },
-      "rights": 62
-    }
-  ]
-}
-```
-
-The JSON object contains a key ''"list"'' where its value is a list of zettel JSON objects.
-These zettel JSON objects themselves contains the keys ''"id"'' (value is a string containing the [[zettel identifier|00001006050000]]), ''"meta"'' (value as a JSON object), and ''"rights"'' (encodes the [[access rights|00001012921200]] for the given zettel).
-The value of key ''"meta"'' effectively contains all metadata of the identified zettel, where metadata keys are encoded as JSON object keys and metadata values encoded as JSON strings.
-
-The JSON objects keys ''"query"'' and ''"human"'' will be explained later in this manual.
+# curl 'http://127.0.0.1:23123/z?enc=data'
+(meta-list (query "") (human "") (list (zettel (id "00001012921200") (meta (title "API: Encoding of Zettel Access Rights") (role "manual") (tags "#api #manual #reference #zettelstore") (syntax "zmk") (back "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000") (backward "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000") (box-number "1") (created "00010101000000") (forward "00001003000000 00001006020400 00001010000000 00001010040100 00001010040200 00001010070200 00001010070300") (modified "20220201171959") (published "20220201171959")) (rights 62)) (zettel (id "00001007030100") ...
+```
+
+Pretty-printed, this results in:
+```
+(meta-list (query "")
+           (human "")
+           (list (zettel (id "00001012921200")
+                         (meta (title "API: Encoding of Zettel Access Rights")
+                               (role "manual")
+                               (tags "#api #manual #reference #zettelstore")
+                               (syntax "zmk")
+                               (back "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000")
+                               (backward "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000")
+                               (box-number "1")
+                               (created "00010101000000")
+                               (forward "00001003000000 00001006020400 00001010000000 00001010040100 00001010040200 00001010070200 00001010070300")
+                               (modified "20220201171959")
+                               (published "20220201171959"))
+                         (rights 62))
+                 (zettel (id "00001007030100")
+```
+
+* The result is a list, starting with the symbol ''meta-list''.
+* Then, some key/value pairs are following, also nested.
+* Keys ''query'' and ''human'' will be explained [[later in this manual|00001012051400]].
+* ''list'' starts a list of zettel.
+* ''zettel'' itself start, well, a zettel.
+* ''id'' denotes the zettel identifier, encoded as a string.
+* Nested in ''meta'' are the metadata, each as a key/value pair.
+* ''rights'' specifies the [[access rights|00001012921200]] the user has for this zettel.
 
 === Note
 This request (and similar others) will always return a list of metadata, provided the request was syntactically correct.
 There will never be a HTTP status code 403 (Forbidden), even if [[authentication was enabled|00001010040100]] and you did not provide a valid access token.
 In this case, the resulting list might be quite short (some zettel will have [[public visibility|00001010070200]]) or the list might be empty.
@@ -123,10 +72,10 @@
 
 With this call, you cannot differentiate between an empty result list (e.g because your search did not found a zettel with the specified term) and an empty list because of missing authorization (e.g. an invalid access token).
 
 === HTTP Status codes
 ; ''200''
-: Retrieval was successful, the body contains an [[appropriate JSON object|00001012921000]].
+: Retrieval was successful, the body contains an appropriate data value.
 ; ''400''
 : Request was not valid. 
   There are several reasons for this.
   Maybe the access bearer token was not valid.

Index: docs/manual/00001012051400.zettel
==================================================================
--- docs/manual/00001012051400.zettel
+++ docs/manual/00001012051400.zettel
@@ -2,11 +2,12 @@
 title: API: Query the list of all zettel
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20220912111111
-modified: 20230320151117
+modified: 20231023162927
+precursor: 00001012051200
 
 The [[endpoint|00001012920000]] ''/z'' also allows you to filter the list of all zettel[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] and optionally to provide some actions.
 
 A [[query|00001007700000]] is an optional [[search expression|00001007700000#search-expression]], together with an optional [[list of actions|00001007700000#action-list]] (described below).
 An empty search expression will select all zettel.
@@ -20,33 +21,38 @@
 
 This parameter loosely resembles the search form of the [[web user interface|00001014000000]] or those of [[Zettelmarkup's Query Transclusion|00001007031140]].
 
 For example, if you want to retrieve all zettel that contain the string ""API"" in its title, your request will be:
 ```sh
-# curl 'http://127.0.0.1:23123/z?q=title%3AAPI'
-00001012921000 API: JSON structure of an access token
+# curl 'http://127.0.0.1:23123/z?q=title%3AAPI+ORDER+REVERSE+id+OFFSET+1'
+00001012921000 API: Structure of an access token
 00001012920500 Formats available by the API
 00001012920000 Endpoints used by the API
 ...
 ```
 
-If you want to retrieve a JSON document:
+If you want to retrieve a data document, as a [[symbolic expression|00001012930500]]:
 
 ```sh
-# curl 'http://127.0.0.1:23123/z?q=title%3AAPI&enc=json'
-{"query":"title:API","human":"title HAS API","list":[{"id":"00001012921200","meta":{"back":"00001012051200 00001012051400 00001012053300 00001012053400 00001012053800 00001012053900 00001012054000","backward":"00001012051200 00001012051400 00001012053300 00001012053400 00001012053800 00001012053900 00001012054000","box-number":"1","created":"00010101000000","forward":"00001003000000 00001006020400 00001010000000 00001010040100 00001010040200 00001010070200 00001010070300","modified":"20220201171959","published":"20220201171959","role":"manual","syntax":"zmk","tags":"#api #manual #reference #zettelstore","title":"API: Encoding of Zettel Access Rights"},"rights":62},{"id":"00001012921000","meta":{"back":"00001012050600 00001012051200","backward":"00001012050200 00001012050400 00001012050600 00001012051200","box-number":"1","created":"00010101000000","forward":"00001012050200 00001012050400","published":"00010101000000","role":"manual","syntax":"zmk","tags":"#api #manual #reference #zettelstore","title":"API: JSON structure of an access token"},"rights":62}, ...]
+# curl 'http://127.0.0.1:23123/z?q=title%3AAPI+ORDER+REVERSE+id+OFFSET+1&enc=data'
+(meta-list (query "title:API ORDER REVERSE id OFFSET 1") (human "title HAS API ORDER REVERSE id OFFSET 1") (list (zettel (id 1012921000) (meta (title "API: Structure of an access token") (role "manual") (tags "#api #manual #reference #zettelstore") (syntax "zmk") (back "00001012050600 00001012051200") (backward "00001012050200 00001012050400 00001012050600 00001012051200") (box-number "1") (created "20210126175322") (forward "00001012050200 00001012050400 00001012930000") (modified "20230412155303") (published "20230412155303")) (rights 62)) (zettel (id 1012920500) (meta (title "Encodings available via the API") (role "manual") (tags "#api #manual #reference #zettelstore") (syntax "zmk") (back "00001006000000 00001008010000 00001008010500 00001012053500 00001012053600") (backward "00001006000000 00001008010000 00001008010500 00001012053500 00001012053600") (box-number "1") (created "20210126175322") (forward "00001012000000 00001012920510 00001012920513 00001012920516 00001012920519 00001012920522 00001012920525") (modified "20230403123653") (published "20230403123653")) (rights 62)) (zettel (id 1012920000) (meta (title "Endpoints used by the API") ...
 ```
 
-The JSON object contains a key ''"list"'' where its value is a list of zettel JSON objects.
-These zettel JSON objects themselves contains the keys ''"id"'' (value is a string containing the [[zettel identifier|00001006050000]]), ''"meta"'' (value as a JSON object), and ''"rights"'' (encodes the [[access rights|00001012921200]] for the given zettel).
-The value of key ''"meta"'' effectively contains all metadata of the identified zettel, where metadata keys are encoded as JSON object keys and metadata values encoded as JSON strings.
-
-Additionally, the JSON object contains the keys ''"query"'' and ''"human"'' with a string value.
+The data object contains a key ''"meta-list"'' to signal that it contains a list of metadata values (and some more).
+It contains the keys ''"query"'' and ''"human"'' with a string value.
 Both will contain a textual description of the underlying query if you select only some zettel with a [[query expression|00001007700000]].
 Without a selection, the values are the empty string.
 ''"query"'' returns the normalized query expression itself, while ''"human"'' is the normalized query expression to be read by humans.
 
+The symbol ''list'' starts the list of zettel data.
+Data of a zettel is indicated by the symbol ''zettel'', followed by ''(id ID)'' that describes the zettel identifier as a numeric value.
+Leading zeroes are removed.
+Metadata starts with the symbol ''meta'', and each metadatum itself is a list of metadata key / metadata value.
+Metadata keys are encoded as a symbol, metadata values as a string.
+''"rights"'' encodes the [[access rights|00001012921200]] for the given zettel.
+
+=== Aggregates
 
 An implicit precondition is that the zettel must contain the given metadata key.
 For a metadata key like [[''title''|00001006020000#title]], which have a default value, this precondition should always be true.
 But the situation is different for a key like [[''url''|00001006020000#url]].
 Both ``curl 'http://localhost:23123/z?q=url%3A'`` and ``curl 'http://localhost:23123/z?q=url%3A!'`` may result in an empty list.
@@ -64,42 +70,51 @@
 The result is a text file.
 The first word, separated by a horizontal tab (U+0009) contains the role name.
 The rest of the line consists of zettel identifier, where the corresponding zettel have this role.
 Zettel identifier are separated by a space character (U+0020).
 
-Of course, this list can be returned as a JSON object:
+Please note that the list is **not** sorted by the role name, so the same request might result in a different order.
+If you want a sorted list, you could sort it on the command line (``curl 'http://127.0.0.1:23123/z?q=|role' | sort``) or within the software that made the call to the Zettelstore.
+
+Of course, this list can also be returned as a data object:
 
 ```sh
-# curl 'http://127.0.0.1:23123/z?q=|role?enc=json'
-{"map":{"configuration":["00000000090002","00000000090000", ... ,"00000000000001"],"manual":["00001014000000", ... ,"00001000000000"],"zettel":["00010000000000", ... ,"00001012070500","00000000090001"]}}
+# curl 'http://127.0.0.1:23123/z?q=|role&enc=data'
+(aggregate "role" (query "| role") (human "| role") (list ("zettel" 10000000000 90001) ("configuration" 6 100 1000000100 20001 90 25001 92 4 40001 1 90000 5 90002) ("manual" 1008050000 1007031110 1008000000 1012920513 1005000000 1012931800 1010040700 1012931000 1012053600 1006050000 1012050200 1012000000 1012070500 1012920522 1006032500 1006020100 1007906000 1007030300 1012051400 1007040350 1007040324 1007706000 1012931900 1006030500 1004050200 1012054400 1007700000 1004050000 1006020000 1007030400 1012080100 1012920510 1007790000 1010070400 1005090000 1004011400 1006033000 1012930500 1001000000 1007010000 1006020400 1007040300 1010070300 1008010000 1003305000 1006030000 1006034000 1012054200 1012080200 1004010000 1003300000 1006032000 1003310000 1004059700 1007031000 1003600000 1004000000 1007030700 1007000000 1006055000 1007050200 1006036000 1012050600 1006000000 1012053900 1012920500 1004050400 1007031100 1007040340 1007020000 1017000000 1012053200 1007030600 1007040320 1003315000 1012054000 1014000000 1007030800 1010000000 1007903000 1010070200 1004051200 1007040330 1004051100 1004051000 1007050100 1012080500 1012053400 1006035500 1012054600 1004100000 1010040200 1012920000 1012920525 1004051400 1006031500 1012921200 1008010500 1012921000 1018000000 1012051200 1010040100 1012931200 1012920516 1007040310 1007780000 1007030200 1004101000 1012920800 1007030100 1007040200 1012053500 1007040000 1007040322 1007031300 1007031140 1012931600 1012931400 1004059900 1003000000 1006036500 1004020200 1010040400 1006033500 1000000000 1012053300 1007990000 1010090100 1007900000 1007030500 1004011600 1012930000 1007030900 1004020000 1007030000 1010070600 1007040100 1007800000 1012050400 1006010000 1007705000 1007702000 1007050000 1002000000 1007031200 1006035000 1006031000 1006034500 1004011200 1007031400 1012920519)))
 ```
 
-The JSON object only contains the key ''"map"'' with the value of another object.
-This second object contains all role names as keys and the list of identifier of those zettel with this specific role as a value.
+The data object starts with the symbol ''aggregate'' to signal a different format compared to ''meta-list'' above.
+Then a string follows, which specifies the key on which the aggregate was performed.
+''query'' and ''human'' have the same meaning as above.
+The ''symbol'' list starts the result list of aggregates.
+Each aggregate starts with a string of the aggregate value, in this case the role value, followed by a list of zettel identifier, denoting zettel which have the given role value.
 
 Similar, to list all tags used in the Zettelstore, send a HTTP GET request to the endpoint ''/z?q=|tags''.
-If successful, the output is a JSON object:
+If successful, the output is a data object:
 
 ```sh
-# curl 'http://127.0.0.1:23123/z?q=|tags&enc=json'
-{"map":{"#api":[:["00001012921000","00001012920800","00001012920522",...],"#authorization":["00001010040700","00001010040400",...],...,"#zettelstore":["00010000000000","00001014000000",...,"00001001000000"]}}
+# curl 'http://127.0.0.1:23123/z?q=|tags&enc=data'
+(aggregate "tags" (query "| tags") (human "| tags") (list ("#zettel" 1006034500 1006034000 1006031000 1006020400 1006033500 1006036500 1006032500 1006020100 1006031500 1006030500 1006035500 1006033000 1006020000 1006036000 1006030000 1006032000 1006035000) ("#reference" 1006034500 1006034000 1007800000 1012920500 1006031000 1012931000 1006020400 1012930000 1006033500 1012920513 1007050100 1012920800 1007780000 1012921000 1012920510 1007990000 1006036500 1006032500 1006020100 1012931400 1012931800 1012920516 1012931600 1012920525 1012931200 1006031500 1012931900 1012920000 1005090000 1012920522 1006030500 1007050200 1012921200 1006035500 1012920519 1006033000 1006020000 1006036000 1006030000 1006032000 1012930500 1006035000) ("#graphic" 1008050000) ("#search" 1007700000 1007705000 1007790000 1007780000 1007702000 1007706000 1007031140) ("#installation" 1003315000 1003310000 1003000000 1003305000 1003300000 1003600000) ("#zettelmarkup" 1007900000 1007030700 1007031300 1007030600 1007800000 1007000000 1007031400 1007040100 1007030300 1007031200 1007040350 1007030400 1007030900 1007050100 1007040000 1007030500 1007903000 1007040200 1007040330 1007990000 1007040320 1007050000 1007040310 1007031100 1007040340 1007020000 1007031110 1007031140 1007040324 1007030800 1007031000 1007030000 1007010000 1007906000 1007050200 1007030100 1007030200 1007040300 1007040322) ("#design" 1005000000 1006000000 1002000000 1006050000 1006055000) ("#markdown" 1008010000 1008010500) ("#goal" 1002000000) ("#syntax" 1006010000) ...
 ```
 
-The JSON object only contains the key ''"map"'' with the value of another object.
-This second object contains all tags as keys and the list of identifier of those zettel with this tag as a value.
-
 If you want only those tags that occur at least 100 times, use the endpoint ''/z?q=|MIN100+tags''.
 You see from this that actions are separated by space characters.
+
+=== Actions
 
 There are two types of actions: parameters and aggregates.
 The following actions are supported:
 ; ''MINn'' (parameter)
 : Emit only those values with at least __n__ aggregated values.
   __n__ must be a positive integer, ''MIN'' must be given in upper-case letters.
 ; ''MAXn'' (parameter)
 : Emit only those values with at most __n__ aggregated values.
   __n__ must be a positive integer, ''MAX'' must be given in upper-case letters.
+; ''REINDEX'' (aggregate)
+: Updates the internal search index for the selected zettel, roughly similar to the [[refresh|00001012080500]] API call.
+  It is not really an aggregate, since it is used only for its side effect.
+  It is allowed to specify another aggregate.
 ; Any [[metadata key|00001006020000]] of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]] (aggregates)
 : Emit an aggregate of the given metadata key.
   The key can be given in any letter case.
 
 Only the first aggregate action will be executed.

ADDED   docs/manual/00001012051600.zettel
Index: docs/manual/00001012051600.zettel
==================================================================
--- docs/manual/00001012051600.zettel
+++ docs/manual/00001012051600.zettel
@@ -0,0 +1,82 @@
+id: 00001012051600
+title: API: Determine a tag zettel
+role: manual
+tags: #api #manual #zettelstore
+syntax: zmk
+created: 20230928183339
+modified: 20230929114937
+
+The [[endpoint|00001012920000]] ''/z'' also allows you to determine a ""tag zettel"", i.e. a zettel that documents a given tag.
+
+The query parameter ""''tag''"" allows you to specify a value that is interpreted as the name of a tag.
+Zettelstore tries to determine the corresponding tag zettel.
+
+A tag zettel is a zettel with the [[''role''|00001006020100]] value ""tag"" and a title that names the tag.
+If there is more than one zettel that qualifies, the zettel with the highest zettel identifier is used.
+
+For example, if you want to determine the tag zettel for the tag ""#api"", your request will be:
+```sh
+# curl -i 'http://127.0.0.1:23123/z?tag=%23api'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/00001019990010
+Content-Length: 14
+
+00001019990010
+```
+
+Alternatively, you can omit the ''#'' character at the beginning of the tag:
+```sh
+# curl -i 'http://127.0.0.1:23123/z?tag=api'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/00001019990010
+Content-Length: 14
+
+00001019990010
+```
+
+If there is a corresponding tag zettel, the response will use the HTTP status code 302 (""Found""), the HTTP response header ''Location'' will contain the URL of the tag zettel.
+Its zettel identifier will be returned in the HTTP response body.
+
+If you specified some more query parameter, these will be part of the URL in the response header ''Location'':
+
+```sh
+# curl -i 'http://127.0.0.1:23123/z?tag=%23api&part=zettel'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/00001019990010?part=zettel
+Content-Length: 14
+
+00001019990010
+```
+
+Otherwise, if no tag zettel was found, the response will use the HTTP status code 404 (""Not found"").
+
+```sh
+# curl -i 'http://127.0.0.1:23123/z?tag=notag'
+HTTP/1.1 404 Not Found
+Content-Type: text/plain; charset=utf-8
+Content-Length: 29
+
+Tag zettel not found: #notag
+```
+
+To fulfill this service, Zettelstore will evaluate internally the query ''role:tag title=TAG'', there ''TAG'' is the actual tag.
+
+Of course, if you are interested in the URL of the tag zettel, you can make use of the HTTP ''HEAD'' method:
+
+```sh
+# curl -I 'http://127.0.0.1:23123/z?tag=%23api'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/00001019990010
+Content-Length: 14
+```
+
+=== HTTP Status codes
+; ''302''
+: Tag zettel was found.
+  The HTTP header ''Location'' contains its URL, the body of the response contains its zettel identifier.
+; ''404''
+: No zettel for the given tag was found.

ADDED   docs/manual/00001012051800.zettel
Index: docs/manual/00001012051800.zettel
==================================================================
--- docs/manual/00001012051800.zettel
+++ docs/manual/00001012051800.zettel
@@ -0,0 +1,71 @@
+id: 00001012051800
+title: API: Determine a role zettel
+role: manual
+tags: #api #manual #zettelstore
+syntax: zmk
+created: 20231128183917
+modified: 20231128184701
+
+The [[endpoint|00001012920000]] ''/z'' also allows you to determine a ""role zettel"", i.e. a zettel that documents a given role.
+
+The query parameter ""''role''"" allows you to specify a value that is interpreted as the name of a role.
+Zettelstore tries to determine the corresponding role zettel.
+
+A role zettel is a zettel with the [[''role''|00001006020100]] value ""role"" and a title that names the role.
+If there is more than one zettel that qualifies, the zettel with the highest zettel identifier is used.
+
+For example, if you want to determine the role zettel for the role ""manual"", your request will be:
+```sh
+# curl -i 'http://127.0.0.1:23123/z?role=manual'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/20231128184200
+Content-Length: 14
+
+20231128184200
+```
+
+If there is a corresponding role zettel, the response will use the HTTP status code 302 (""Found""), the HTTP response header ''Location'' will contain the URL of the role zettel.
+Its zettel identifier will be returned in the HTTP response body.
+
+If you specified some more query parameter, these will be part of the URL in the response header ''Location'':
+
+```sh
+# curl -i 'http://127.0.0.1:23123/z?role=manual&part=zettel'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/20231128184200?part=zettel
+Content-Length: 14
+
+20231128184200
+```
+
+Otherwise, if no role zettel was found, the response will use the HTTP status code 404 (""Not found"").
+
+```sh
+# curl -i 'http://127.0.0.1:23123/z?role=norole'
+HTTP/1.1 404 Not Found
+Content-Type: text/plain; charset=utf-8
+Content-Length: 30
+
+Role zettel not found: norole
+```
+
+To fulfill this service, Zettelstore will evaluate internally the query ''role:role title=ROLE'', there ''ROLE'' is the actual role.
+
+Of course, if you are only interested in the URL of the role zettel, you can make use of the HTTP ''HEAD'' method:
+
+```sh
+# curl -I 'http://127.0.0.1:23123/z?role=manual'
+HTTP/1.1 302 Found
+Content-Type: text/plain; charset=utf-8
+Location: /z/20231128184200
+Content-Length: 14
+```
+
+=== HTTP Status codes
+; ''302''
+: Role zettel was found.
+  The HTTP header ''Location'' contains its URL, the body of the response contains its zettel identifier.
+; ''404''
+: No zettel for the given role was found.

Index: docs/manual/00001012053200.zettel
==================================================================
--- docs/manual/00001012053200.zettel
+++ docs/manual/00001012053200.zettel
@@ -2,11 +2,11 @@
 title: API: Create a new zettel
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210713150005
-modified: 20221219162225
+modified: 20230807170416
 
 A zettel is created by adding it to the [[list of zettel|00001012000000]].
 Therefore, the [[endpoint|00001012920000]] to create a new zettel is also ''/z'', but you must send the data of the new zettel via a HTTP POST request.
 
 
@@ -20,51 +20,21 @@
 
 The zettel identifier of the created zettel is returned.
 In addition, the HTTP response header contains a key ''Location'' with a relative URL for the new zettel.
 A client must prepend the HTTP protocol scheme, the host name, and (optional, but often needed) the post number to make it an absolute URL.
 
-
-Alternatively, the body of the POST request may contain a JSON object that specifies metadata and content of the zettel to be created.
-To do this, you must add the query parameter ''enc=json''.
-The following keys of the JSON object are used:
-; ''"meta"''
-: References an embedded JSON object with only string values.
-  The name/value pairs of this objects are interpreted as the metadata of the new zettel.
-  Please consider the [[list of supported metadata keys|00001006020000]] (and their value types).
-; ''"encoding"''
-: States how the content is encoded.
-  Currently, only two values are allowed: the empty string (''""'') that specifies an empty encoding, and the string ''"base64"'' that specifies the [[standard Base64 encoding|https://www.rfc-editor.org/rfc/rfc4648.txt]].
-  Other values will result in a HTTP response status code ''400''.
-; ''"content"''
-: Is a string value that contains the content of the zettel to be created.
-  Typically, text content is not encoded, and binary content is encoded via Base64.
-
-Other keys will be ignored.
-Even these three keys are just optional.
-The body of the HTTP POST request must not be empty and it must contain a JSON object.
-
-Therefore, a body containing just ''{}'' is perfectly valid.
-The new zettel will have no content, and only an identifier as [[metadata|00001006020000]]:
-
-```
-# curl -X POST --data '{}' 'http://127.0.0.1:23123/z?enc=json'
-{"id":"20210713161000"}
-```
-If creating the zettel was successful, the HTTP response will contain a JSON object with one key:
-; ''"id"''
-: Contains the [[zettel identifier|00001006050000]] of the created zettel for further usage.
-
-As an example, a zettel with title ""Note"" and content ""Important content."" can be created by issuing:
-```
-# curl -X POST --data '{"meta":{"title":"Note"},"content":"Important content."}' 'http://127.0.0.1:23123/z?enc=json'
-{"id":"20210713163100"}
-```
+=== Data input
+Alternatively, you may encode the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data''.
+The encoding is the same as the data output encoding when you [[retrieve a zettel|00001012053300#data-output]].
+
+The encoding for [[access rights|00001012921200]] must be given, but is ignored.
+You may encode computed or property [[metadata keys|00001006020000]], but these are also ignored.
 
 === HTTP Status codes
 ; ''201''
-: Zettel creation was successful, the body contains its [[zettel identifier|00001006050000]] (JSON object or plain text).
+: Zettel creation was successful, the body contains its [[zettel identifier|00001006050000]] (data value or plain text).
 ; ''400''
 : Request was not valid. 
   There are several reasons for this.
-  Most likely, the JSON was not formed according to above rules.
+  Most likely, the symbolic expression was not formed according to above rules.
 ; ''403''
 : You are not allowed to create a new zettel.

Index: docs/manual/00001012053300.zettel
==================================================================
--- docs/manual/00001012053300.zettel
+++ docs/manual/00001012053300.zettel
@@ -2,11 +2,11 @@
 title: API: Retrieve metadata and content of an existing zettel
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20211004093206
-modified: 20221219160613
+modified: 20230807170259
 
 The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].
 
 For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/z/00001012053300''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header].
 
@@ -36,61 +36,49 @@
 
 For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint
 ...
 ````
 
-=== JSON output
-
-Alternatively, you may retrieve the zettel as a JSON object by providinv the query parameter ''enc=json'':
-```sh
-# curl 'http://127.0.0.1:23123/z/00001012053300?enc=json&part=zettel'
-{"id":"00001012053300","meta":{"back":"00001012000000 00001012054400","backward":"00001012000000 00001012054400 00001012920000","box-number":"1","created":"20211004093206","forward":"00001006020000 00001006050000 00001010040100 00001012050200 00001012053400 00001012920000 00001012920800 00001012921200","modified":"20221219160211","published":"20221219160211","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: Retrieve metadata and content of an existing zettel"},"encoding":"","content":"The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].\n\nFor example, ...
-```
-
-Pretty-printed, this results in:
-```
-{
-  "id": "00001012053300",
-  "meta": {
-    "back": "00001012000000 00001012054400",
-    "backward": "00001012000000 00001012054400 00001012920000",
-    "box-number": "1",
-    "created": "20211004093206",
-    "forward": "00001006020000 00001006050000 00001010040100 00001012050200 00001012053400 00001012920000 00001012920800 00001012921200",
-    "modified": "20221219160211",
-    "published": "20221219160211",
-    "role": "manual",
-    "syntax": "zmk",
-    "tags": "#api #manual #zettelstore",
-    "title": "API: Retrieve metadata and content of an existing zettel"
-  },
-  "encoding": "",
-  "content": "The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' (...)
-  "rights": 62
-}
-```
-
-The following keys of the JSON object are used:
-; ''"id"''
-: The zettel identifier of the zettel you requested.
-; ''"meta"''
-: References an embedded JSON object with only string values.
-  The name/value pairs of this objects are interpreted as the metadata of the new zettel.
-  Please consider the [[list of supported metadata keys|00001006020000]] (and their value types).
-; ''"encoding"''
-: States how the content is encoded.
-  Currently, only two values are allowed: the empty string (''""'') that specifies an empty encoding, and the string ''"base64"'' that specifies the [[standard Base64 encoding|https://www.rfc-editor.org/rfc/rfc4648.txt]].
-  Other values will result in a HTTP response status code ''400''.
-; ''"content"''
-: Is a string value that contains the content of the zettel to be created.
-  Typically, text content is not encoded, and binary content is encoded via Base64.
-; ''"rights"''
-: An integer number that describes the [[access rights|00001012921200]] for the zettel.
+=== Data output
+
+Alternatively, you may retrieve the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data'':
+
+```sh
+# curl 'http://127.0.0.1:23123/z/00001012053300?enc=data&part=zettel'
+(zettel (meta (back "00001006000000 00001012000000 00001012053200 00001012054400") (backward "00001006000000 00001012000000 00001012053200 00001012054400 00001012920000") (box-number "1") (created "20211004093206") (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012053400 00001012920000 00001012920800 00001012921200 00001012930500") (modified "20230703174152") (published "20230703174152") (role "manual") (syntax "zmk") (tags "#api #manual #zettelstore") (title "API: Retrieve metadata and content of an existing zettel")) (rights 62) (encoding "") (content "The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].\n\nFor example, ...
+```
+
+If you print the result a little bit nicer, you will see its structure:
+```
+(zettel (meta (back "00001006000000 00001012000000 00001012053200 00001012054400")
+              (backward "00001006000000 00001012000000 00001012053200 00001012054400 00001012920000")
+              (box-number "1")
+              (created "20211004093206")
+              (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012053400 00001012920000 00001012920800 00001012921200 00001012930500")
+              (modified "20230703174152")
+              (published "20230703174152")
+              (role "manual")
+              (syntax "zmk")
+              (tags "#api #manual #zettelstore")
+              (title "API: Retrieve metadata and content of an existing zettel"))
+        (rights 62)
+        (encoding "")
+        (content "The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].\n\nFor example, ...
+```
+
+* The result is a list, starting with the symbol ''zettel''.
+* Then, some key/value pairs are following, also nested.
+* Nested in ''meta'' are the metadata, each as a key/value pair.
+* ''rights'' specifies the [[access rights|00001012921200]] the user has for this zettel.
+* ''"encoding"'' states how the content is encoded.
+  Currently, only two values are allowed: the empty string (''""'') that specifies an empty encoding, and the string ''"base64"'' that specifies the [[standard Base64 encoding|https://www.rfc-editor.org/rfc/rfc4648.txt]].
+* The zettel contents is stored as a value of the key ''content''.
+  Typically, text content is not encoded, and binary content is encoded via Base64.
 
 === HTTP Status codes
 ; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object / plain zettel data.
+: Retrieval was successful, the body contains an appropriate data value.
 ; ''204''
 : Request was valid, but there is no data to be returned.
   Most likely, you specified the query parameter ''part=content'', but the zettel does not contain any content.
 ; ''400''
 : Request was not valid. 

Index: docs/manual/00001012053400.zettel
==================================================================
--- docs/manual/00001012053400.zettel
+++ docs/manual/00001012053400.zettel
@@ -2,11 +2,11 @@
 title: API: Retrieve metadata of an existing zettel
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210726174524
-modified: 20221219161030
+modified: 20230807170155
 
 The [[endpoint|00001012920000]] to work with metadata of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]][^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header].
 
 To retrieve the plain metadata of a zettel, use the query parameter ''part=meta''
 
@@ -16,52 +16,47 @@
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 ````
 
-To return a JSON object, use also the query parameter ''enc=json''.
+=== Data output
+
+Alternatively, you may retrieve the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data'':
 
 ```sh
-# curl 'http://127.0.0.1:23123/z/00001012053400?part=meta&enc=json'
-{"meta":{"back":"00001012000000 00001012053300","backward":"00001012000000 00001012053300 00001012920000","box-number":"1","created":"20210726174524","forward":"00001006020000 00001006050000 00001010040100 00001012050200 00001012920000 00001012921200","modified":"20220917175233","published":"20220917175233","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: Retrieve metadata of an existing zettel"},"rights":62}
+# curl 'http://127.0.0.1:23123/z/00001012053400?part=meta&enc=data'
+(list (meta (title "API: Retrieve metadata of an existing zettel") (role "manual") (tags "#api #manual #zettelstore") (syntax "zmk") (back "00001012000000 00001012053300") (backward "00001012000000 00001012053300") (box-number "1") (created "20210726174524") (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012920000 00001012921200") (modified "20230703174515") (published "20230703174515")) (rights 62))
 ```
 
 Pretty-printed, this results in:
 ```
-{
-  "meta": {
-    "back": "00001012000000 00001012053300",
-    "backward": "00001012000000 00001012053300 00001012920000",
-    "box-number": "1",
-    "created": "20210726174524",
-    "forward": "00001006020000 00001006050000 00001010040100 00001012050200 00001012920000 00001012921200",
-    "modified": "20220917175233",
-    "published": "20220917175233",
-    "role": "manual",
-    "syntax": "zmk",
-    "tags": "#api #manual #zettelstore",
-    "title": "API: Retrieve metadata of an existing zettel"
-  },
-  "rights": 62
-}
+(list (meta (title "API: Retrieve metadata of an existing zettel")
+            (role "manual")
+            (tags "#api #manual #zettelstore")
+            (syntax "zmk")
+            (back "00001012000000 00001012053300")
+            (backward "00001012000000 00001012053300")
+            (box-number "1")
+            (created "20210726174524")
+            (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012920000 00001012921200")
+            (modified "20230703174515")
+            (published "20230703174515"))
+      (rights 62))
 ```
-The following keys of the JSON object are used:
-; ''"meta"''
-: References an embedded JSON object with only string values.
-  The name/value pairs of this objects are interpreted as the metadata of the new zettel.
-  Please consider the [[list of supported metadata keys|00001006020000]] (and their value types).
-; ''"rights"''
-: An integer number that describes the [[access rights|00001012921200]] for the zettel.
-
+
+* The result is a list, starting with the symbol ''list''.
+* Then, some key/value pairs are following, also nested.
+* Nested in ''meta'' are the metadata, each as a key/value pair.
+* ''rights'' specifies the [[access rights|00001012921200]] the user has for this zettel.
 
 === HTTP Status codes
 ; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
+: Retrieval was successful, the body contains an appropriate data value.
 ; ''400''
 : Request was not valid. 
   There are several reasons for this.
   Maybe the zettel identifier did not consist of exactly 14 digits.
 ; ''403''
 : You are not allowed to retrieve data of the given zettel.
 ; ''404''
 : Zettel not found.
   You probably used a zettel identifier that is not used in the Zettelstore.

Index: docs/manual/00001012053500.zettel
==================================================================
--- docs/manual/00001012053500.zettel
+++ docs/manual/00001012053500.zettel
@@ -2,18 +2,18 @@
 title: API: Retrieve evaluated metadata and content of an existing zettel in various encodings
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210726174524
-modified: 20230109105303
+modified: 20230807170112
 
 The [[endpoint|00001012920000]] to work with evaluated metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].
 
-For example, to retrieve some evaluated data about this zettel you are currently viewing in [[Sexpr encoding|00001012920516]], just send a HTTP GET request to the endpoint ''/z/00001012053500''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] with the query parameter ''enc=sexpr''.
-If successful, the output is a JSON object:
+For example, to retrieve some evaluated data about this zettel you are currently viewing in [[Sz encoding|00001012920516]], just send a HTTP GET request to the endpoint ''/z/00001012053500''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] with the query parameter ''enc=sz''.
+If successful, the output is a symbolic expression value:
 ```sh
-# curl 'http://127.0.0.1:23123/z/00001012053500?enc=sexpr'
+# curl 'http://127.0.0.1:23123/z/00001012053500?enc=sz'
 ((PARA (TEXT "The") (SPACE) (LINK-ZETTEL () "00001012920000" (TEXT "endpoint")) (SPACE) (TEXT "to") (SPACE) (TEXT "work") (SPACE) (TEXT "with") (SPACE) (TEXT "evaluated") (SPACE) (TEXT "metadata") (SPACE) (TEXT "and") (SPACE) (TEXT "content") (SPACE) (TEXT "of") (SPACE) (TEXT "a") (SPACE) (TEXT "specific") (SPACE) (TEXT "zettel") (SPACE) (TEXT "is") (SPACE) (LITERAL-INPUT () "/z/{ID}") (TEXT ",") (SPACE) (TEXT "where") (SPACE) (LITERAL-INPUT () "{ID}") ...
 ```
 
 To select another encoding, you must provide the query parameter ''enc=ENCODING''.
 Others are ""[[html|00001012920510]]"", ""[[text|00001012920519]]"", and some [[more|00001012920500]].
@@ -46,15 +46,15 @@
 ...
 ```
 
 === HTTP Status codes
 ; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
+: Retrieval was successful, the body contains an appropriate data value.
 ; ''400''
 : Request was not valid. 
   There are several reasons for this.
   Maybe the zettel identifier did not consist of exactly 14 digits or ''enc'' / ''part'' contained illegal values.
 ; ''403''
 : You are not allowed to retrieve data of the given zettel.
 ; ''404''
 : Zettel not found.
   You probably used a zettel identifier that is not used in the Zettelstore.

Index: docs/manual/00001012053600.zettel
==================================================================
--- docs/manual/00001012053600.zettel
+++ docs/manual/00001012053600.zettel
@@ -2,34 +2,34 @@
 title: API: Retrieve parsed metadata and content of an existing zettel in various encodings
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20230109105034
+modified: 20230807170019
 
 The [[endpoint|00001012920000]] to work with parsed metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].
 
 A __parsed__ zettel is basically an [[unevaluated|00001012053500]] zettel: the zettel is read and analyzed, but its content is not __evaluated__.
 By using this endpoint, you are able to retrieve the structure of a zettel before it is evaluated.
 
 For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/z/00001012053600''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] with the query parameter ''parseonly'' (and other appropriate query parameter).
 For example:
 ```sh
-# curl 'http://127.0.0.1:23123/z/00001012053600?enc=sexpr&parseonly'
+# curl 'http://127.0.0.1:23123/z/00001012053600?enc=sz&parseonly'
 ((PARA (TEXT "The") (SPACE) (LINK-ZETTEL () "00001012920000" (TEXT "endpoint")) (SPACE) (TEXT "to") (SPACE) (TEXT "work") (SPACE) (TEXT "with") (SPACE) ...
 ```
 
 Similar to [[retrieving an encoded zettel|00001012053500]], you can specify an [[encoding|00001012920500]] and state which [[part|00001012920800]] of a zettel you are interested in.
 The same default values applies to this endpoint.
 
 === HTTP Status codes
 ; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
+: Retrieval was successful, the body contains an appropriate data value.
 ; ''400''
 : Request was not valid. 
   There are several reasons for this.
   Maybe the zettel identifier did not consist of exactly 14 digits or ''enc'' / ''part'' contained illegal values.
 ; ''403''
 : You are not allowed to retrieve data of the given zettel.
 ; ''404''
 : Zettel not found.
   You probably used a zettel identifier that is not used in the Zettelstore.

DELETED docs/manual/00001012053800.zettel
Index: docs/manual/00001012053800.zettel
==================================================================
--- docs/manual/00001012053800.zettel
+++ docs/manual/00001012053800.zettel
@@ -1,81 +0,0 @@
-id: 00001012053800
-title: API: Retrieve context of an existing zettel
-role: manual
-tags: #api #manual #zettelstore
-syntax: zmk
-created: 20210222151131
-modified: 20221208165112
-
-The context of an origin zettel consists of those zettel that are somehow connected to the origin zettel.
-Direct connections of an origin zettel to other zettel are visible via [[metadata values|00001006020000]], such as ''backward'', ''forward'' or other values with type [[identifier|00001006032000]] or [[set of identifier|00001006032500]].
-
-The context is defined by a __direction__, a __cost__, and a __limit__:
-* Direction: connections are directed.
-  For example, the metadata value of ''backward'' lists all zettel that link to the current zettel, while ''forward'' list all zettel to which the current zettel links to.
-  When you are only interested in one direction, set the parameter ''dir'' either to the value ""backward"" or ""forward"".
-  All other values, including a missing value, is interpreted as ""both"".
-* Cost: a normal direct connection has cost 5, an indirect connection is the length of the shortest path between two zettel.
-  The cost of a folgezettel or a precursor zettel is just 1, the cost of successor zettel and predecessor zettel are 2.
-  You should limit the cost by using the parameter ''cost''.
-  Its default value is ""17"".
-  A value of ""0"" does disable any cost check.
-* Limit: to set an upper bound for the returned context, you should use the parameter ''limit''.
-  Its default value is ""200"".
-  A value of ""0"" disables does not limit the number of elements returned.
-
-The search for the context of a zettel stops at the [[home zettel|00001004020000#home-zettel]].
-This zettel is connected to all other zettel.
-If it is included, the context would become too big and therefore unusable.
-
-To retrieve the context of an existing zettel, use the [[endpoint|00001012920000]] ''/x/{ID}''[^Mnemonic: conte**X**t].
-
-````
-# curl 'http://127.0.0.1:23123/x/00001012053800?limit=3&dir=forward&cost=5'
-{"id": "00001012053800","meta": {...},"rights":62,"list":[{"id": "00001012921000","meta": {...},"rights":62},{"id": "00001012920800","meta": {...},"rights":62},{"id": "00010000000000","meta": {...},"rights":62}]}
-````
-Formatted, this translates into:[^Metadata (key ''meta'') are hidden to make the overall structure easier to read.]
-````json
-{
-  "id": "00001012053800",
-  "meta": {...},
-  "rights": 62,
-  "list": [
-    {
-      "id": "00001012921000",
-      "meta": {...},
-      "rights":62
-    },
-    {
-      "id": "00001012920800",
-      "meta": {...},
-      "rights":62
-    },
-    {
-      "id": "00010000000000",
-      "meta": {...},
-      "rights":62
-    }
-  ]
-}
-````
-=== Keys
-The following top-level JSON keys are returned:
-; ''id''
-: The [[zettel identifier|00001006050000]] for which the context was requested.
-; ''meta'':
-: The metadata of the zettel, encoded as a JSON object.
-; ''rights''
-: An integer number that describes the [[access rights|00001012921200]] for the given zettel.
-; ''list''
-: A list of JSON objects with keys ''id'', ''meta'', and ''rights'' that contains the zettel of the context.
-
-=== HTTP Status codes
-; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
-; ''400''
-: Request was not valid.
-; ''403''
-: You are not allowed to retrieve data of the given zettel.
-; ''404''
-: Zettel not found.
-  You probably used a zettel identifier that is not used in the Zettelstore.

DELETED docs/manual/00001012053900.zettel
Index: docs/manual/00001012053900.zettel
==================================================================
--- docs/manual/00001012053900.zettel
+++ docs/manual/00001012053900.zettel
@@ -1,80 +0,0 @@
-id: 00001012053900
-title: API: Retrieve unlinked references to an existing zettel
-role: manual
-tags: #api #manual #zettelstore
-syntax: zmk
-created: 20211119133357
-modified: 20220913152019
-
-The value of a personal Zettelstore is determined in part by explicit connections between related zettel.
-If the number of zettel grow, some of these connections are missing.
-There are various reasons for this.
-Maybe, you forgot that a zettel exists.
-Or you add a zettel later, but forgot that previous zettel already mention its title.
-
-__Unlinked references__ are phrases in a zettel that mention the title of another, currently unlinked zettel.
-
-To retrieve unlinked references to an existing zettel, use the [[endpoint|00001012920000]] ''/u/{ID}''.
-
-````
-# curl 'http://127.0.0.1:23123/u/00001007000000'
-{"id": "00001007000000","meta": {...},"rights":62,"list": [{"id": "00001012070500","meta": {...},"rights":62},...{"id": "00001006020000","meta": {...},"rights":62}]}
-````
-Formatted, this translates into:[^Metadata (key ''meta'') are hidden to make the overall structure easier to read.]
-````json
-{
-  "id": "00001007000000",
-  "meta": {...},
-  "rights": 62,
-  "list": [
-    {
-      "id": "00001012070500",
-      "meta": {...},
-      "rights": 62
-    },
-    ...
-    {
-      "id": "00001006020000",
-      "meta": {...},
-      "rights": 62
-    }
-  ]
-}
-````
-
-This call searches within all zettel whether the title of the specified zettel occurs there.
-The other zettel must not link to the specified zettel.
-The title must not occur within a link (e.g. to another zettel), in a [[heading|00001007030300]], in a [[citation|00001007040340]], and must have a uniform formatting.
-The match must be exact, but is case-insensitive.
-
-If the title of the specified zettel contains some extra character that probably reduce the number of found unlinked references,
-you can specify the title phase to be searched for as a query parameter ''phrase'':
-
-````
-# curl 'http://127.0.0.1:23123/u/00001007000000?phrase=markdown'
-{"id": "00001007000000","meta": {...},"list": [{"id": "00001008010000","meta": {...},"rights":62},{"id": "00001004020000","meta": {...},"rights":62}]}
-````
-
-%%TODO: In addition, you are allowed to limit the search by a [[query expression|00001012051840]], which may search for zettel content.
-
-=== Keys
-The following top-level JSON keys are returned:
-; ''id''
-: The [[zettel identifier|00001006050000]] for which the unlinked references were requested.
-; ''meta'':
-: The metadata of the zettel, encoded as a JSON object.
-; ''rights''
-: An integer number that describes the [[access rights|00001012921200]] for the given zettel.
-; ''list''
-: A list of JSON objects with keys ''id'', ''meta'', and ''rights'' that describe zettel with unlinked references.
-
-=== HTTP Status codes
-; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
-; ''400''
-: Request was not valid.
-; ''403''
-: You are not allowed to retrieve data of the given zettel.
-; ''404''
-: Zettel not found.
-  You probably used a zettel identifier that is not used in the Zettelstore.

DELETED docs/manual/00001012054000.zettel
Index: docs/manual/00001012054000.zettel
==================================================================
--- docs/manual/00001012054000.zettel
+++ docs/manual/00001012054000.zettel
@@ -1,84 +0,0 @@
-id: 00001012054000
-title: API: Retrieve zettel order within an existing zettel
-role: manual
-tags: #api #manual #zettelstore
-syntax: zmk
-modified: 20220202112451
-
-Some zettel act as a ""table of contents"" for other zettel.
-The [[initial zettel|00001000000000]] of this manual is one example, the [[general API description|00001012000000]] is another.
-Every zettel with a certain internal structure can act as the ""table of contents"" for others.
-
-What is a ""table of contents""?
-Basically, it is just a list of references to other zettel.
-
-To retrieve the ""table of contents"", the software looks at first level [[list items|00001007030200]].
-If an item contains a valid reference to a zettel, this reference will be interpreted as an item in the table of contents.
-
-This applies only to first level list items (ordered or unordered list), but not to deeper levels.
-Only the first reference to a valid zettel is collected for the table of contents.
-Following references to zettel within such an list item are ignored.
-
-To retrieve the zettel order of an existing zettel, use the [[endpoint|00001012920000]] ''/o/{ID}''.
-
-````
-# curl http://127.0.0.1:23123/o/00001000000000
-{"id":"00001000000000","meta":{...},"rights":62,"list":[{"id":"00001001000000","meta":{...},"rights":62},{"id":"00001002000000","meta":{...},"rights":62},{"id":"00001003000000","meta":{...},"rights":62},{"id":"00001004000000","meta":{...},"rights":62},...,{"id":"00001014000000","meta":{...},"rights":62}]}
-````
-Formatted, this translates into:[^Metadata (key ''meta'') are hidden to make the overall structure easier to read.]
-````json
-{
-  "id": "00001000000000",
-  "meta": {...},
-  "rights": 62,
-  "list": [
-    {
-      "id": "00001001000000",
-      "meta": {...},
-      "rights": 62
-    },
-    {
-      "id": "00001002000000",
-      "meta": {...},
-      "rights": 62
-    },
-    {
-      "id": "00001003000000",
-      "meta": {...},
-      "rights": 62
-    },
-    {
-      "id": "00001004000000",
-      "meta": {...},
-      "rights": 62
-    },
-    ...
-    {
-      "id": "00001014000000",
-      "meta": {...},
-      "rights": 62
-    }
-  ]
-}
-````
-
-The following top-level JSON keys are returned:
-; ''id''
-: The [[zettel identifier|00001006050000]] for which the references were requested.
-; ''meta'':
-: The metadata of the zettel, encoded as a JSON object.
-; ''rights''
-: An integer number that describes the [[access rights|00001012921200]] for the given zettel.
-; ''list''
-: A list of JSON objects with keys ''id'', ''meta'', and ''rights'' that describe other zettel in the defined order.
-
-=== HTTP Status codes
-; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
-; ''400''
-: Request was not valid.
-; ''403''
-: You are not allowed to retrieve data of the given zettel.
-; ''404''
-: Zettel not found.
-  You probably used a zettel identifier that is not used in the Zettelstore.

Index: docs/manual/00001012054200.zettel
==================================================================
--- docs/manual/00001012054200.zettel
+++ docs/manual/00001012054200.zettel
@@ -2,11 +2,11 @@
 title: API: Update a zettel
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
 created: 20210713150005
-modified: 20221219155029
+modified: 20231116110417
 
 Updating metadata and content of a zettel is technically quite similar to [[creating a new zettel|00001012053200]].
 In both cases you must provide the data for the new or updated zettel in the body of the HTTP request.
 
 One difference is the endpoint.
@@ -15,22 +15,19 @@
 
 The zettel must be encoded in a [[plain|00001006000000]] format: first comes the [[metadata|00001006010000]] and the following content is separated by an empty line.
 This is the same format as used by storing zettel within a [[directory box|00001006010000]].
 
 ```
-# curl -X POST --data 'title: Updated Note\n\nUpdated content.' http://127.0.0.1:23123/z/00001012054200
+# curl -X PUT --data $'title: Updated Note\n\nUpdated content.' http://127.0.0.1:23123/z/00001012054200
 ```
 
-Alternatively, you can use the JSON encoding by using the query parameter ''enc=json''.
-
-```
-# curl -X PUT --data '{}' 'http://127.0.0.1:23123/z/00001012054200?enc=json'
-```
-This will put some empty content and metadata to the zettel you are currently reading.
-As usual, some metadata will be calculated if it is empty.
-
-The body of the HTTP response is empty, if the request was successful.
+=== Data input
+Alternatively, you may encode the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data''.
+The encoding is the same as the data output encoding when you [[retrieve a zettel|00001012053300#data-output]].
+
+The encoding for [[access rights|00001012921200]] must be given, but is ignored.
+You may encode computed or property [[metadata keys|00001006020000]], but these are also ignored.
 
 === HTTP Status codes
 ; ''204''
 : Update was successful, there is no body in the response.
 ; ''400''

Index: docs/manual/00001012070500.zettel
==================================================================
--- docs/manual/00001012070500.zettel
+++ docs/manual/00001012070500.zettel
@@ -1,27 +1,29 @@
 id: 00001012070500
-title: Retrieve administrative data
+title: API: Retrieve administrative data
 role: manual
 tags: #api #manual #zettelstore
 syntax: zmk
-modified: 20220805174216
+created: 20220304164242
+modified: 20230928190516
 
 The [[endpoint|00001012920000]] ''/x'' allows you to retrieve some (administrative) data.
 
 Currently, you can only request Zettelstore version data.
 
 ````
 # curl 'http://127.0.0.1:23123/x'
-{"major":0,"minor":4,"patch":0,"info":"dev","hash":"cb121cc980-dirty"}
+(0 13 0 "dev" "f781dc384b-dirty")
 ````
 
-Zettelstore conforms somehow to the Standard [[Semantic Versioning|https://semver.org/]].
+* Zettelstore conforms somehow to the Standard [[Semantic Versioning|https://semver.org/]].
 
-The names ""major"", ""minor"", and ""patch"" are described in this standard.
+  The first three digits contain the major, minor, and patch version as described in this standard.
+* The first string contains additional information, e.g. ""dev"" for a development version, or ""preview"" for a preview version.
+* The second string contains data to identify the version from a developers perspective.
 
-The name ""info"" contains sometimes some additional information, e.g. ""dev"" for a development version, or ""preview"" for a preview version.
-
-The name ""hash"" contains some data to identify the version from a developers perspective.
+If any of the three digits has the value -1, its semantic value is unknown.
+Similar, the two string might be empty.
 
 === HTTP Status codes
 ; ''200''
-: Retrieval was successful, the body contains an appropriate JSON object.
+: Retrieval was successful, the body contains an appropriate object.

Index: docs/manual/00001012920000.zettel
==================================================================
--- docs/manual/00001012920000.zettel
+++ docs/manual/00001012920000.zettel
@@ -2,11 +2,11 @@
 title: Endpoints used by the API
 role: manual
 tags: #api #manual #reference #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20221219162335
+modified: 20230731162343
 
 All API endpoints conform to the pattern ''[PREFIX]LETTER[/ZETTEL-ID]'', where:
 ; ''PREFIX''
 : is the URL prefix (default: ""/""), configured via the ''url-prefix'' [[startup configuration|00001004010000]],
 ; ''LETTER''
@@ -17,18 +17,16 @@
 The following letters are currently in use:
 
 |= Letter:| Without zettel identifier | With [[zettel identifier|00001006050000]] | Mnemonic
 | ''a'' | POST: [[client authentication|00001012050200]] | | **A**uthenticate
 |       | PUT: [[renew access token|00001012050400]] |
-| ''o'' |  | GET: [[list zettel order|00001012054000]] | **O**rder
-| ''u'' |  | GET [[unlinked references|00001012053900]] | **U**nlinked
-| ''x'' | GET: [[retrieve administrative data|00001012070500]] | GET: [[list zettel context|00001012053800]] | Conte**x**t
+| ''x'' | GET: [[retrieve administrative data|00001012070500]] | | E**x**ecute
 |       | POST: [[execute command|00001012080100]]
-| ''z'' | GET: [[list zettel|00001012051200]] | GET: [[retrieve zettel|00001012053300]] | **Z**ettel
-|       | POST: [[create new zettel|00001012053200]] | PUT: [[update a zettel|00001012054200]]
+| ''z'' | GET: [[list zettel|00001012051200]]/[[query zettel|00001012051400]] | GET: [[retrieve zettel|00001012053300]] | **Z**ettel
+|       | POST: [[create new zettel|00001012053200]] | PUT: [[update zettel|00001012054200]]
 |       |  | DELETE: [[delete zettel|00001012054600]]
 |       |  | MOVE: [[rename zettel|00001012054400]]
 
 The full URL will contain either the ""http"" oder ""https"" scheme, a host name, and an optional port number.
 
 The API examples will assume the ""http"" schema, the local host ""127.0.0.1"", the default port ""23123"", and the default empty ''PREFIX'' ""/"".
 Therefore, all URLs in the API documentation will begin with ""http://127.0.0.1:23123/"".

Index: docs/manual/00001012920500.zettel
==================================================================
--- docs/manual/00001012920500.zettel
+++ docs/manual/00001012920500.zettel
@@ -1,16 +1,17 @@
 id: 00001012920500
-title: Encodings available via the [[API|00001012000000]]
+title: Encodings available via the API
 role: manual
 tags: #api #manual #reference #zettelstore
 syntax: zmk
 created: 20210126175322
-modified: 20230316180859
+modified: 20230403123653
 
 A zettel representation can be encoded in various formats for further processing.
+These will be retrieved via the [[API|00001012000000]].
 
 * [[html|00001012920510]]
 * [[md|00001012920513]]
-* [[sexpr|00001012920516]]
 * [[shtml|00001012920525]]
+* [[sz|00001012920516]]
 * [[text|00001012920519]]
 * [[zmk|00001012920522]]

Index: docs/manual/00001012920516.zettel
==================================================================
--- docs/manual/00001012920516.zettel
+++ docs/manual/00001012920516.zettel
@@ -1,45 +1,20 @@
 id: 00001012920516
-title: Sexpr Encoding
+title: Sz Encoding
 role: manual
 tags: #api #manual #reference #zettelstore
 syntax: zmk
 created: 20220422181104
-modified: 20230316182622
+modified: 20230403161458
 
-A zettel representation that is a [[s-expression|https://en.wikipedia.org/wiki/S-expression]] (also known as symbolic expression).
+A zettel representation that is a [[s-expression|00001012930000]] (also known as symbolic expression).
 
 It is (relatively) easy to parse and contain all relevant information of a zettel, metadata and content.
-For example, take a look at the Sexpr encoding of this page, which is available via the ""Info"" sub-page of this zettel: 
+For example, take a look at the Sz encoding of this page, which is available via the ""Info"" sub-page of this zettel: 
+
+* [[//z/00001012920516?enc=sz&part=zettel]],
+* [[//z/00001012920516?enc=sz&part=meta]],
+* [[//z/00001012920516?enc=sz&part=content]].
 
-* [[//z/00001012920516?enc=sexpr&part=zettel]],
-* [[//z/00001012920516?enc=sexpr&part=meta]],
-* [[//z/00001012920516?enc=sexpr&part=content]].
+Some zettel describe the [[Sz encoding|00001012931000]] in a more detailed way.
 
 If transferred via HTTP, the content type will be ''text/plain''.
-
-=== Syntax of s-expressions
-There are only two types of elements: atoms and lists.
-
-A list always starts with the left parenthesis (""''(''"", U+0028) and ends with a right parenthesis (""'')''"", U+0029).
-A list may contain a possibly empty sequence of elements, i.e. lists and / or atoms.
-Before the last element of a list of at least to elements, a full stop character (""''.''"", U+002E) signal a pair as the last two elements.
-This allows a more space economic storage of data.
-
-There are three syntactic forms for an atom: numbers, symbols and strings.
-
-A number is a non-empty sequence of digits (""0"" ... ""9"").
-The smallest number is ``0``, there are no negative numbers.
-
-A symbol is a non-empty sequence of printable characters, except left or right parenthesis.
-Unicode characters of the following categories contains printable characters in the above sense: letter (L), number (N), punctuation (P), symbol (S).
-Symbols are case-insensitive, i.e. ""''ZETTEL''"" and ""''zettel''"" denote the same symbol.
-
-A string starts with a quotation mark (""''"''"", U+0022), contains a possibly empty sequence of Unicode characters, and ends with a quotation mark.
-To allow a string to contain a quotations mark, it must be prefixed by one backslash (""''\\''"", U+005C).
-To allow a string to contain a backslash, it also must be prefixed by one backslash.
-Unicode characters with a code less than U+FF are encoded by by the sequence ""''\\xNM''"", where ''NM'' is the hex encoding of the character.
-Unicode characters with a code less than U+FFFF are encoded by by the sequence ""''\\uNMOP''"", where ''NMOP'' is the hex encoding of the character.
-Unicode characters with a code less than U+FFFFFF are encoded by by the sequence ""''\\UNMOPQR''"", where ''NMOPQR'' is the hex encoding of the character.
-In addition, the sequence ""''\\t''"" encodes a horizontal tab (U+0009), the sequence ""''\\n''"" encodes a line feed (U+000A).
-
-Atoms are separated by Unicode characters of category separator (Z).

Index: docs/manual/00001012920525.zettel
==================================================================
--- docs/manual/00001012920525.zettel
+++ docs/manual/00001012920525.zettel
@@ -2,13 +2,13 @@
 title: SHTML Encoding
 role: manual
 tags: #api #manual #reference #zettelstore
 syntax: zmk
 created: 20230316181044
-modified: 20230316182614
+modified: 20230403150657
 
-A zettel representation that is a [[s-expression|https://en.wikipedia.org/wiki/S-expression]], syntactically similar to the [[Sexpr encoding|00001012920516]], but denotes [[HTML|00001012920510]] semantics.
+A zettel representation that is a [[s-expression|00001012930000]], syntactically similar to the [[Sz encoding|00001012920516]], but denotes [[HTML|00001012920510]] semantics.
 It is derived from a XML encoding in s-expressions, called [[SXML|https://en.wikipedia.org/wiki/SXML]].
 
 It is (relatively) easy to parse and contains everything to transform it into real HTML.
 In contrast to HTML, SHTML is easier to parse and to manipulate.
 For example, take a look at the SHTML encoding of this page, which is available via the ""Info"" sub-page of this zettel: 
@@ -17,14 +17,14 @@
 * [[//z/00001012920525?enc=shtml&part=meta]],
 * [[//z/00001012920525?enc=shtml&part=content]].
 
 If transferred via HTTP, the content type will be ''text/plain''.
 
-Internally, if a zettel should be transformed into HTML, the zettel is translated into the [[Sexpr encoding|00001012920516]], which is transformed into this SHTML encoding to produce the [[HTML encoding|00001012920510]].
+Internally, if a zettel should be transformed into HTML, the zettel is translated into the [[Sz encoding|00001012920516]], which is transformed into this SHTML encoding to produce the [[HTML encoding|00001012920510]].
 
 === Syntax of SHTML
-There are only two types of elements: atoms and lists, similar to the Sexpr encoding.
+There are only two types of elements: atoms and lists, similar to the Sz encoding.
 
 A list always starts with the left parenthesis (""''(''"", U+0028) and ends with a right parenthesis (""'')''"", U+0029).
 A list may contain a possibly empty sequence of elements, i.e. lists and / or atoms.
 Before the last element of a list of at least to elements, a full stop character (""''.''"", U+002E) signal a pair as the last two elements.
 This allows a more space economic storage of data.

Index: docs/manual/00001012921000.zettel
==================================================================
--- docs/manual/00001012921000.zettel
+++ docs/manual/00001012921000.zettel
@@ -1,14 +1,23 @@
 id: 00001012921000
-title: API: JSON structure of an access token
+title: API: Structure of an access token
+role: manual
 tags: #api #manual #reference #zettelstore
 syntax: zmk
-role: manual
+created: 20210126175322
+modified: 20230807165915
 
 If the [[authentication process|00001012050200]] was successful, an access token with some additional data is returned.
 The same is true, if the access token was [[renewed|00001012050400]].
-The response is structured as an JSON object, with the following named values:
+The response is structured as a [[symbolic expression|00001012930000]] list, with the following elements:
 
-|=Name|Description
-|''access_token''|The access token itself, as string value, which is a [[JSON Web Token|https://tools.ietf.org/html/rfc7519]] (JWT, RFC 7915)
-|''token_type''|The type of the token, always set to ''"Bearer"'', as described in [[RFC 6750|https://tools.ietf.org/html/rfc6750]]
-|''expires_in''|An integer that gives a hint about the lifetime / endurance of the token, measured in seconds
+# The type of the token, always set to ''"Bearer"'', as described in [[RFC 6750|https://tools.ietf.org/html/rfc6750]]
+# The token itself, which is technically the string representation of a [[symbolic expression|00001012930500]] containing relevant data, plus a check sum.
+#* The symbolic expression has the form ''(KIND USERNAME NOW EXPIRE Z-ID)''
+#* ''KIND'' is ''0'' for an API access, ''1'' if it created for the Web user interface.
+#* ''USERNAME'' is the user name of the user.
+#* ''NOW'' is a timestamp of the current time.
+#* ''EXPIRE'' is the timestamp when the access token expires.
+#* ''Z-ID'' is the zettel identifier of the user zettel.
+  The symbolic expression is encoded via ""base64"".
+  Based on this encoding, a checksum is calculated, also encoded via ""base64"".
+  Both encoded values are concatenated, with a period (''"."'') as a delimiter.

Index: docs/manual/00001012921200.zettel
==================================================================
--- docs/manual/00001012921200.zettel
+++ docs/manual/00001012921200.zettel
@@ -1,14 +1,15 @@
 id: 00001012921200
 title: API: Encoding of Zettel Access Rights
 role: manual
 tags: #api #manual #reference #zettelstore
 syntax: zmk
-modified: 20220201171959
+created: 20220201173115
+modified: 20230807164817
 
-Various API calls return a JSON key ''"rights"'' that encodes the access rights the user currently has.
-It is an integer number between 0 and 62.[^Not all values in this range are used.]
+Various API calls return a symbolic expression list ''(rights N)'', with ''N'' as a number, that encodes the access rights the user currently has.
+''N'' is an integer number between 0 and 62.[^Not all values in this range are used.]
 
 The value ""0"" signals that something went wrong internally while determining the access rights.
 
 A value of ""1"" says, that the current user has no access right for the given zettel.
 In most cases, this value will not occur, because only zettel are presented, which are at least readable by the current user.

ADDED   docs/manual/00001012930000.zettel
Index: docs/manual/00001012930000.zettel
==================================================================
--- docs/manual/00001012930000.zettel
+++ docs/manual/00001012930000.zettel
@@ -0,0 +1,26 @@
+id: 00001012930000
+title: Symbolic Expression
+role: manual
+tags: #manual #reference #zettelstore
+syntax: zmk
+created: 20230403145644
+modified: 20230403154010
+
+A symbolic expression (also called __s-expression__) is a notation of a list-based tree.
+Inner nodes are lists of arbitrary length, outer nodes are primitive values (also called __atoms__) or the empty list.
+
+A symbolic expression is either
+* a primitive value (__atom__), or
+* a list of the form __(E,,1,, E,,2,, &hellip; E,,n,,)__, where __E,,i,,__ is itself a symbolic expression, separated by space characters.
+
+An atom is a number, a string, or a symbol.
+
+Symbolic expressions are used in programming languages like LISP or Scheme, where they denote both data structures and the program itself.
+This allows a LISP or Scheme program to process LISP or Scheme programs.
+That property is also used within Zettelstore.
+
+Symbolic expressions are relatively easy to read, to parse, and to process.
+
+=== See also
+* [[Syntax|00001012930500]] of symbolic expressions in the Zettelstore
+* [[S-expression @ Wikipedia|https://en.wikipedia.org/wiki/S-expression]]

ADDED   docs/manual/00001012930500.zettel
Index: docs/manual/00001012930500.zettel
==================================================================
--- docs/manual/00001012930500.zettel
+++ docs/manual/00001012930500.zettel
@@ -0,0 +1,77 @@
+id: 00001012930500
+title: Syntax of Symbolic Expressions
+role: manual
+tags: #manual #reference #zettelstore
+syntax: zmk
+created: 20230403151127
+modified: 20230703174218
+
+=== Syntax of lists
+A list always starts with the left parenthesis (""''(''"", U+0028) and ends with a right parenthesis (""'')''"", U+0029).
+A list may contain a possibly empty sequence of elements, i.e. lists and / or atoms.
+
+Internally, lists are composed of __cells__.
+A cell allows to store two values.
+The first value references the first element of a list.
+The second value references the rest of the list, or is the special value __nil__ if there is no rest of the list.
+
+However, it is possible to store an atom as the second value of the last cell.
+In this case, before the last element of a list of at least two elements, a full stop character (""''.''"", U+002E) signals such a cell as the last two elements.
+This allows a more space economic storage of data.
+
+A __proper__ list, which contains __nil__ as the second value of the last element might be pictured as follows:
+
+~~~draw
++---+---+   +---+---+         +---+---+
+| V | N +-->| V | N +-->   -->| V |   |
++-+-+---+   +-+-+---+         +-+-+---+
+  |           |                 |
+  v           v                 v
++-------+   +-------+         +-------+
+| Elem1 |   | Elem2 |         | ElemN |
++-------+   +-------+         +-------+
+~~~
+
+''V'' is a placeholder for a value, ''N'' is the reference to the next cell (also known as the rest / tail of the list).
+Above list will be represented as an symbolic expression as ''(Elem1 Elem2 ... ElemN)''
+
+An improper list will have a non-__nil__ reference to an atom as the very last element
+
+~~~draw
++---+---+   +---+---+         +---+---+
+| V | N +-->| V | N +-->   -->| V | V |
++-+-+---+   +-+-+---+         +-+-+-+-+
+  |           |                 |   |
+  v           v                 v   v
++-------+   +-------+    +-------+ +------+
+| Elem1 |   | Elem2 |    | ElemN | | Atom |
++-------+   +-------+    +-------+ +------+
+~~~
+
+Above improper list will be represented as an symbolic expression as ''(Elem1 Elem2 ... ElemN . Atom)''
+
+
+=== Syntax of numbers (atom)
+A number is a non-empty sequence of digits (""0"" ... ""9"").
+The smallest number is ``0``, there are no negative numbers.
+
+=== Syntax of symbols (atom)
+A symbol is a non-empty sequence of printable characters, except left or right parenthesis.
+Unicode characters of the following categories contains printable characters in the above sense: letter (L), number (N), punctuation (P), symbol (S).
+Symbols are case-sensitive, i.e. ""''ZETTEL''"" and ""''zettel''"" denote different symbols.
+
+=== Syntax of string (atom)
+
+A string starts with a quotation mark (""''"''"", U+0022), contains a possibly empty sequence of Unicode characters, and ends with a quotation mark.
+To allow a string to contain a quotations mark, it must be prefixed by one backslash (""''\\''"", U+005C).
+To allow a string to contain a backslash, it also must be prefixed by one backslash.
+Unicode characters with a code less than U+FF are encoded by by the sequence ""''\\xNM''"", where ''NM'' is the hex encoding of the character.
+Unicode characters with a code less than U+FFFF are encoded by by the sequence ""''\\uNMOP''"", where ''NMOP'' is the hex encoding of the character.
+Unicode characters with a code less than U+FFFFFF are encoded by by the sequence ""''\\UNMOPQR''"", where ''NMOPQR'' is the hex encoding of the character.
+In addition, the sequence ""''\\t''"" encodes a horizontal tab (U+0009), the sequence ""''\\n''"" encodes a line feed (U+000A).
+
+=== See also
+* Currently, Zettelstore uses [[sx|https://zettelstore.de/sx]] (""Symbolic eXPression Framework"") to implement symbolic expression.
+  The project page might contain additional information about the full syntax.
+
+  Zettelstore only uses lists, numbers, string, and symbols to represent zettel.

ADDED   docs/manual/00001012931000.zettel
Index: docs/manual/00001012931000.zettel
==================================================================
--- docs/manual/00001012931000.zettel
+++ docs/manual/00001012931000.zettel
@@ -0,0 +1,81 @@
+id: 00001012931000
+title: Encoding of Sz
+role: manual
+tags: #api #manual #reference #zettelstore
+syntax: zmk
+created: 20230403153903
+modified: 20230405133249
+
+Zettel in a [[Sz encoding|00001012920516]] are represented as a [[symbolic expression|00001012930000]].
+To process these symbolic expressions, you need to know, how a specific part of a zettel is represented by a symbolic expression.
+
+Basically, each part of a zettel is represented as a list, often a nested list.
+The first element of that list is always an unique symbol, which denotes that part.
+The meaning / semantic of all other elements depend on that symbol.
+
+=== Zettel
+A full zettel is represented by a list of two elements.
+The first elements represents the metadata, the second element represents the zettel content.
+
+:::syntax
+__Zettel__ **=** ''('' [[__Metadata__|#metadata]] [[__Content__|#content]] '')''.
+:::
+
+=== Metadata
+
+Metadata is represented by a list, where the first element is the symbol ''META''.
+Following elements represent each metadatum[^""Metadatum"" is used as the singular form of metadata.] of a zettel in standard order.
+
+Standard order is: [[Title|00001006020000#title]], [[Role|00001006020000#role]], [[Tags|00001006020000#tags]], [[Syntax|00001006020000#syntax]], all other [[keys|00001006020000]] in alphabetic order.
+
+:::syntax
+__Metadata__ **=** ''(META'' [[__Metadatum__|00001012931200]] __Metadatum__ &hellip; __Metadatum__ '')''.
+:::
+=== Content
+
+Zettel content is represented by a block.
+:::syntax
+__Content__ **=** [[__Block__|#block]].
+:::
+
+==== Block
+A block is represented by a list with the symbol ''BLOCK'' as the first element.
+All following elements represent a nested [[block-structured element|00001007030000]].
+
+:::syntax
+[!block|__Block__] **=** ''(BLOCK'' [[__BlockElement__|00001012931400]] __BlockElement__ &hellip; __BlockElement__ '')''.
+:::
+
+==== Inline
+Both block-structured elements and some metadata values may contain [[inline-structured elements|00001007040000]].
+Similar, inline-structured elements are represented as follows:
+
+:::syntax
+__Inline__ **=** ''(INLINE'' [[__InlineElement__|00001012931600]] __InlineElement__ &hellip; __InlineElement__ '')''.
+:::
+
+==== Attribute
+[[Attributes|00001007050000]] may be specified for both block- and inline- structured elements.
+Attributes are represented by the following schema.
+Please note, the the symbol ''quote'' is lower-case by intention.
+
+:::syntax
+__Attribute__ **=** ''('' **[** ''quote'' ''('' [[__AttributeKeyValue__|00001012931800]] __AttributeKeyValue__ &hellip; __AttributeKeyValue__ '')'' **]** ')'.
+:::
+
+Either, there are no attributes.
+These are specified by the empty list ''()''.
+Or there are attributes.
+In this case, the first element of the list must be the symbol ''quote'': ''(quote'' ''('' A,,1,, A,,2,, &hellip; A,,n,, '')'''')''.
+
+=== Other
+A list with ''UNKNOWN'' as its first element signals an internal error during transforming a zettel into the Sz encoding.
+It may be ignored, or it may produce an error.
+
+:::syntax
+__Unknown__ **=** ''(UNKNOWN'' Object &hellip; '')''.
+:::
+
+The list may only contain the symbol ''UNKNOWN'', or additionally an unlimited amount of other objects.
+
+Similar, any symbol with the pattern ''**xyz:NOT-FOUND**'', where ''xyz'' is any string, signals an internal error.

ADDED   docs/manual/00001012931200.zettel
Index: docs/manual/00001012931200.zettel
==================================================================
--- docs/manual/00001012931200.zettel
+++ docs/manual/00001012931200.zettel
@@ -0,0 +1,41 @@
+id: 00001012931200
+title: Encoding of Sz Metadata
+role: manual
+tags: #api #manual #reference #zettelstore
+syntax: zmk
+created: 20230403161618
+modified: 20230405121932
+
+A single metadata (""metadatum"") is represented by a triple: a symbol representing the type, a symbol representing the key, and either a string or a list that represent the value.
+
+The key symbol must be ""quoted"", i.e. for the key ""title"": ''(quote title)''.
+This property may be relaxed in future versions of the Zettelstore.
+
+The symbol depends on the [[metadata key type|00001006030000]].
+The value also depends somehow on the key type: a set of values is represented as a list, all other values are represented by a string, even if it is a number.
+
+The following table maps key types to symbols and to the type of the value representation.
+
+|=Key Type<| Symbol<| Value<
+| [[Credential|00001006031000]] | ''CREDENTIAL'' | string
+| [[EString|00001006031500]] | ''EMPTY-STRING'' | string
+| [[Identifier|00001006032000]] | ''ZID'' | string
+| [[IdentifierSet|00001006032500]] | ''ZID-SET'' | list
+| [[Number|00001006033000]] | ''NUMBER'' | string
+| [[String|00001006033500]] | ''STRING'' | string
+| [[TagSet|00001006034000]] | ''TAG-SET'' | list
+| [[Timestamp|00001006034500]] | ''TIMESTAMP'' | string
+| [[URL|00001006035000]] | ''URL'' | string
+| [[Word|00001006035500]] | ''WORD'' | string
+| [[WordSet|00001006036000]] | ''WORD-SET'' | list
+| [[Zettelmarkup|00001006036500]] | ''ZETTELMARKUP'' | string
+
+If the value is represented as a list, its first element is the symbol ''list'', and all other elements are strings with the appropriate values.
+
+:::syntax
+__ListValue__ **=** ''(list'' String,,1,, String,,2,, &hellip; String,,n,, '')''.
+:::
+
+Examples:
+* The title of this zettel is represented as: ''(EMPTY-STRING (quote title) "Encoding of Sz Metadata")''
+* The tags of this zettel are represented as: ''(TAG-SET (quote tags) (list "#api" "#manual" "#reference" "#zettelstore"))''

ADDED   docs/manual/00001012931400.zettel
Index: docs/manual/00001012931400.zettel
==================================================================
--- docs/manual/00001012931400.zettel
+++ docs/manual/00001012931400.zettel
@@ -0,0 +1,186 @@
+id: 00001012931400
+title: Encoding of Sz Block Elements
+role: manual
+tags: #api #manual #reference #zettelstore
+syntax: zmk
+created: 20230403161803
+modified: 20230405132916
+
+=== ''PARA''
+:::syntax
+__Paragraph__ **=** ''(PARA'' [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+A paragraph is just a list of inline elements.
+
+=== ''HEADING''
+:::syntax
+__Heading__ **=** ''(HEADING'' Number [[__Attributes__|00001012931000#attribute]] String,,1,, String,,2,, [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+A heading consists of a number, which specifies its level (1 -- 5), its optional attributes.
+The first string is a ""slug"" of the heading text, i.e. transformed it to lower case, replaced space character with minus sign, and some more.
+The second string is the slug, but made unique for the whole zettel.
+Then the heading text follows as a sequence of inline elements.
+
+=== ''THEMATIC''
+:::syntax
+__Thematic__ **=** ''(THEMATIC'' [[__Attributes__|00001012931000#attribute]] '')''.
+:::
+
+=== ''ORDERED'', ''UNORDERED'', ''QUOTATION''
+These three symbols are specifying different kinds of lists / enumerations: an ordered list, an unordered list, and a quotation list.
+Their structure is the same.
+
+:::syntax
+__OrderedList__ **=** ''(ORDERED'' __ListElement__ &hellip; '')''.
+
+__UnorderedList__ **=** ''(UNORDERED'' __ListElement__ &hellip; '')''.
+
+__QuotationList__ **=** ''(QUOTATION'' __ListElement__ &hellip; '')''.
+:::
+
+:::syntax
+__ListElement__ **=** [[__Block__|00001012931000#block]] **|** [[__Inline__|00001012931000#inline]].
+:::
+A list element is either a block or an inline.
+If it is a block, it may contain a nested list.
+=== ''DESCRIPTION''
+:::syntax
+__Description__ **=** ''(DESCRIPTION'' __DescriptionTerm__ __DescriptionValues__ __DescriptionTerm__ __DescriptionValues__ &hellip; '')''.
+:::
+A description is a sequence of one ore more terms and values.
+
+:::syntax
+__DescriptionTerm__ **=** [[__Inline__|00001012931000#inline]].
+:::
+A description term is just an inline-structured value.
+
+:::syntax
+__DescriptionValues__ **=** ''(BLOCK'' [[__Block__|00001012931000#block]] &hellip; '')''.
+:::
+Description values are sequences of blocks.
+
+=== ''TABLE''
+:::syntax
+__Table__ **=** ''(TABLE'' __TableHeader__ __TableRow__ &hellip; '')''.
+:::
+A table is a table header and a sequence of table rows.
+
+:::syntax
+__TableHeader__ **=** ''()'' **|** ''(list'' __TableCell__ &hellip; '')''.
+:::
+A table header is either the empty list or a list of table cells stating with the ''list'' symbol.
+
+:::syntax
+__TableRow__ **=** ''(list'' __TableCell__ &hellip; '')''.
+:::
+A table row is a list with the initial symbol ''list'', followed by table cells.
+
+=== ''CELL'', ''CELL-*''
+There are four kinds of table cells, one for each possible cell alignment.
+The structure is the same for all kind.
+
+:::syntax
+__TableCell__ **=** __DefaultCell__ **|** __CenterCell__ **|** __LeftCell__ **|** __RightCell__.
+:::
+
+:::syntax
+__DefaultCell__ **=** ''(CELL'' [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The cell content, specified by the sequence of inline elements, used the default alignment.
+
+:::syntax
+__CenterCell__ **=** ''(CELL-CENTER'' [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The cell content, specified by the sequence of inline elements, is centered aligned.
+
+:::syntax
+__LeftCell__ **=** ''(CELL-LEFT'' [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The cell content, specified by the sequence of inline elements, is left aligned.
+
+:::syntax
+__RightCell__ **=** ''(CELL-RIGHT'' [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The cell content, specified by the sequence of inline elements, is right aligned.
+
+=== ''REGION-*''
+The following lists specifies different kinds of regions.
+A region treat a sequence of block elements to be belonging together in certain ways.
+The have a similar structure.
+
+:::syntax
+__BlockRegion__ **=** ''(REGION-BLOCK'' [[__Attributes__|00001012931000#attribute]] [[__Block__|00001012931000#block]] [[__Inline__|00001012931000#inline]] '')''.
+:::
+A block region just treats the block to belong in an unspecified way.
+Typically, the reason is given in the attributes.
+The inline describes the block.
+
+:::syntax
+__QuoteRegion__ **=** ''(REGION-QUOTE'' [[__Attributes__|00001012931000#attribute]] [[__Block__|00001012931000#block]] [[__Inline__|00001012931000#inline]] '')''.
+:::
+A block region just treats the block to contain a longer quotation.
+Attributes may further specify the quotation.
+The inline typically describes author / source of the quotation.
+
+:::syntax
+__VerseRegion__ **=** ''(REGION-VERSE'' [[__Attributes__|00001012931000#attribute]] [[__Block__|00001012931000#block]] [[__Inline__|00001012931000#inline]] '')''.
+:::
+A block region just treats the block to contain a verse.
+Soft line break are transformed into hard line breaks to save the structure of the verse / poem.
+Attributes may further specify something.
+The inline typically describes author / source of the verse.
+
+=== ''VERBATIM-*''
+The following lists specifies some literal text of more than one line.
+The structure is always the same, the initial symbol denotes the actual usage.
+The content is encoded as a string, most likely to contain control characters that signals the end of a line.
+
+:::syntax
+__CommentVerbatim__ **=** ''(VERBATIM-COMMENT'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as an internal comment not to be interpreted further.
+
+:::syntax
+__EvalVerbatim__ **=** ''(VERBATIM-EVAL'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be evaluated by an (external) software to produce some derived content.
+
+:::syntax
+__HTMLVerbatim__ **=** ''(VERBATIM-HTML'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains HTML code.
+
+:::syntax
+__MathVerbatim__ **=** ''(VERBATIM-MATH'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as special code to be interpreted as mathematical formulas.
+
+:::syntax
+__CodeVerbatim__ **=** ''(VERBATIM-CODE'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as (executable) code.
+
+:::syntax
+__ZettelVerbatim__ **=** ''(VERBATIM-ZETTEL'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as (nested) zettel content.
+
+=== ''BLOB''
+:::syntax
+__BLOB__ **=** ''(BLOB'' [[__Inline__|00001012931000#inline]] String,,1,, String,,2,, '')''.
+:::
+A BLOB contains an image in block mode.
+The inline states some description.
+The first string contains the syntax of the image.
+The second string contains the actual image.
+If the syntax is ""SVG"", then the second string contains the SVG code.
+Otherwise the (binary) image data is encoded with base64.
+
+=== ''TRANSCLUDE''
+:::syntax
+__Transclude__ **=** ''(TRANSCLUDE'' [[__Attributes__|00001012931000#attribute]] [[__Reference__|00001012931900]] '')''.
+:::
+A transclude list only occurs for a parsed zettel, but not for a evaluated zettel.
+Evaluating a zettel also means that all transclusions are resolved.
+
+__Reference__ denotes the zettel to be transcluded.

ADDED   docs/manual/00001012931600.zettel
Index: docs/manual/00001012931600.zettel
==================================================================
--- docs/manual/00001012931600.zettel
+++ docs/manual/00001012931600.zettel
@@ -0,0 +1,217 @@
+id: 00001012931600
+title: Encoding of Sz Inline Elements
+role: manual
+tags: #api #manual #reference #zettelstore
+syntax: zmk
+created: 20230403161845
+modified: 20231113191203
+
+=== ''TEXT''
+:::syntax
+__Text__ **=** ''(TEXT'' String '')''.
+:::
+Specifies the string as some text content, typically a word.
+
+=== ''SPACE''
+:::syntax
+__Space__ **=** ''(SPACE'' **[** String **]** '')''.
+:::
+Specifies some space, typically white space.
+If the string is not given it is assumed to be ''" "'' (one space character).
+Otherwise it contains the space characters.
+
+=== ''SOFT''
+:::syntax
+__Soft__ **=** ''(SOFT)''.
+:::
+Denotes a soft line break.
+It is typically translated into a space character, but signals the point in the textual content, where a line break occurred.
+
+=== ''HARD''
+:::syntax
+__Hard__ **=** ''(HARD)''.
+:::
+Specifies a hard line break, i.e. the user wants to have a line break here.
+
+=== ''LINK-*''
+The following lists specify various links, based on the full reference.
+They all have the same structure, with a trailing sequence of __InlineElements__ that contain the linked text.
+
+:::syntax
+__InvalidLink__ **=** ''(LINK-INVALID'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains the invalid link specification.
+
+:::syntax
+__ZettelLink__ **=** ''(LINK-ZETTEL'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains the zettel identifier, a zettel reference.
+
+:::syntax
+__SelfLink__ **=** ''(LINK-SELF'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains the number sign character and the name of a zettel mark.
+It reference the same zettel where it occurs.
+
+:::syntax
+__FoundLink__ **=** ''(LINK-FOUND'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains a zettel identifier, a zettel reference, of a zettel known to be included in the Zettelstore.
+
+:::syntax
+__BrokenLink__ **=** ''(LINK-BROKEN'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains a zettel identifier, a zettel reference, of a zettel known to be __not__ included in the Zettelstore.
+
+:::syntax
+__HostedLink__ **=** ''(LINK-HOSTED'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains a link starting with one slash character, denoting an absolute local reference.
+
+:::syntax
+__BasedLink__ **=** ''(LINK-BASED'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains a link starting with two slash characters, denoting a local reference interpreted relative to the Zettelstore base URL.
+
+:::syntax
+__QueryLink__ **=** ''(LINK-BASED'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains a [[query expression|00001007700000]].
+
+:::syntax
+__ExternalLink__ **=** ''(LINK-EXTERNAL'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains a full URL, referencing a resource outside of the Zettelstore server.
+
+=== ''EMBED''
+:::syntax
+__Embed__ **=** ''(EMBED'' [[__Attributes__|00001012931000#attribute]] [[__Reference__|00001012931900]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+Specifies an embedded element, in most cases some image content or an inline transclusion.
+A transclusion will only be used, if the zettel content was not evaluated.
+
+__Reference__ denoted the referenced zettel.
+
+If the string value is empty, it is an inline transclusion.
+Otherwise it contains the syntax of an image.
+
+The __InlineElement__ at the end of the list is interpreted as describing text.
+
+=== ''EMBED-BLOB''
+:::syntax
+__EmbedBLOB__ **=** ''(EMBED-BLOB'' [[__Attributes__|00001012931000#attribute]] String,,1,, String,,2,, '')''.
+:::
+If used if some processed image has to be embedded inside some inline material.
+The first string specifies the syntax of the image content.
+The second string contains the image content.
+If the syntax is ""SVG"", the image content is not further encoded.
+Otherwise a base64 encoding is used.
+
+=== ''CITE''
+:::syntax
+__CiteBLOB__ **=** ''(CITE'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The string contains the citation key.
+
+=== ''MARK''
+:::syntax
+__Mark__ **=** ''(MARK'' String,,1,, String,,2,, String,,3,, [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The first string is the mark string used in the content.
+The second string is the mark string transformed to a slug, i.e. transformed to lower case, remove non-ASCII characters.
+The third string is the slug string, but made unique for the whole zettel.
+Then follows the marked text as a sequence of __InlineElement__s.
+
+=== ''ENDNOTE''
+:::syntax
+__Endnote__ **=** ''(ENDNOTE'' [[__Attributes__|00001012931000#attribute]] ''(quote'' [[__InlineElement__|00001012931600]] &hellip; '')'''')''.
+:::
+Specifies endnote / footnote text.
+
+=== ''FORMAT-*''
+The following lists specifies some inline text formatting.
+The structure is always the same, the initial symbol denotes the actual formatting.
+
+:::syntax
+__DeleteFormat__ **=** ''(FORMAT-DELETE'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as deleted.
+
+:::syntax
+__EmphasizeFormat__ **=** ''(FORMAT-EMPH'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as emphasized.
+
+:::syntax
+__InsertFormat__ **=** ''(FORMAT-INSERT'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as inserted.
+
+:::syntax
+__MarkFormat__ **=** ''(FORMAT-MARK'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as highlighted for the reader (but was not important fto the original author).
+
+:::syntax
+__QuoteFormat__ **=** ''(FORMAT-QUOTE'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as quoted text.
+
+:::syntax
+__SpanFormat__ **=** ''(FORMAT-SPAN'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as belonging together in a certain, yet unspecified way.
+
+:::syntax
+__SubScriptFormat__ **=** ''(FORMAT-SUB'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as sub-scripted text.
+
+:::syntax
+__SuperScriptFormat__ **=** ''(FORMAT-SUPER'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as super-scripted text.
+
+:::syntax
+__StrongFormat__ **=** ''(FORMAT-STRONG'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] &hellip; '')''.
+:::
+The inline text should be treated as strongly emphasized.
+
+=== ''LITERAL-*''
+The following lists specifies some literal text.
+The structure is always the same, the initial symbol denotes the actual usage.
+
+:::syntax
+__CodeLiteral__ **=** ''(LITERAL-CODE'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as executable code.
+
+:::syntax
+__CommentLiteral__ **=** ''(LITERAL-COMMENT'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as an internal comment not to be interpreted further.
+
+:::syntax
+__HTMLLiteral__ **=** ''(LITERAL-HTML'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as HTML code.
+
+:::syntax
+__InputLiteral__ **=** ''(LITERAL-INPUT'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as input entered by an user.
+
+:::syntax
+__MathLiteral__ **=** ''(LITERAL-MATH'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as special code to be interpreted as mathematical formulas.
+
+:::syntax
+__OutputLiteral__ **=** ''(LITERAL-OUTPUT'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as computer output to be read by an user.
+
+:::syntax
+__ZettelLiteral__ **=** ''(LITERAL-ZETTEL'' [[__Attributes__|00001012931000#attribute]] String '')''.
+:::
+The string contains text that should be treated as (nested) zettel content.

ADDED   docs/manual/00001012931800.zettel
Index: docs/manual/00001012931800.zettel
==================================================================
--- docs/manual/00001012931800.zettel
+++ docs/manual/00001012931800.zettel
@@ -0,0 +1,28 @@
+id: 00001012931800
+title: Encoding of Sz Attribute Values
+role: manual
+tags: #api #manual #reference #zettelstore
+syntax: zmk
+created: 20230403161923
+modified: 20230403163701
+
+An attribute is represented by a single cell.
+The first element of the cell references the attribute key, the second value the corresponding value.
+
+:::syntax
+__AttributeKeyValue__ **=** ''('' __AttributeKey__ ''.'' __AttributeValue__ '')''.
+:::
+
+__AttributeKey__ and __AttributeValue__ are [[string values|00001012930500]].
+
+An empty key denotes the generic attribute.
+
+A key with the value ''"-"'' specifies the default attribute.
+In this case, the attribute value is not interpreted.
+
+Some examples:
+* ''()'' represents the absence of attributes,
+* ''(quote (("-" . "")))'' represent the default attribute,
+* ''(quote (("-" . "") ("" . "syntax")))'' adds the generic attrribute with the value ""syntax"",
+* ''(quote ())'' will also represent the absence of attribute (in a more complicated way),
+* ''(quote (("lang" . "en")))'' denote the attribute key ""lang"" with a value ""en"".

ADDED   docs/manual/00001012931900.zettel
Index: docs/manual/00001012931900.zettel
==================================================================
--- docs/manual/00001012931900.zettel
+++ docs/manual/00001012931900.zettel
@@ -0,0 +1,38 @@
+id: 00001012931900
+title: Encoding of Sz Reference Values
+role: manual
+tags: #api #manual #reference #zettelstore
+syntax: zmk
+created: 20230405123046
+modified: 20230405124516
+
+A reference is encoded as the actual reference value, and a symbol describing the state of that actual reference value.
+
+:::syntax
+__Reference__ **=** ''(quote'' __ReferenceState__ String '')''.
+:::
+The ''quote'' is needed for internal reasons, the string contains the actual reference value.
+
+:::syntax
+__ReferenceState__ **=** ''INVALID'' **|** ''ZETTEL'' **|** ''SELF'' **|** ''FOUND'' **|** ''BROKEN'' **|** ''HOSTED'' **|** ''BASED'' **|** ''QUERY'' **|** ''EXTERNAL''.
+:::
+
+The meaning of the state symbols corresponds to that of the symbols used for the description of [[link references|00001012931600#link]].
+
+; ''INVALID''
+: The reference value is invalid.
+; ''ZETTEL''
+: The reference value is a reference to a zettel.
+  This value is only possible before evaluating the zettel.
+; ''SELF''
+: The reference value is a reference to the same zettel, to a specific mark.
+; ''FOUND''
+: The reference value is a valid reference to an existing zettel.
+  This value is only possible after evaluating the zettel.
+; ''BROKEN''
+: The reference value is a valid reference to an missing zettel.
+  This value is only possible after evaluating the zettel.
+; ''HOSTED''
+; ''BASED''
+; ''QUERY''
+; ''EXTERNAL''

Index: docs/manual/00001017000000.zettel
==================================================================
--- docs/manual/00001017000000.zettel
+++ docs/manual/00001017000000.zettel
@@ -2,11 +2,11 @@
 title: Tips and Tricks
 role: manual
 tags: #manual #zettelstore
 syntax: zmk
 created: 20220803170112
-modified: 20221205154406
+modified: 20231012154803
 
 === Welcome Zettel
 * **Problem:** You want to put your Zettelstore into the public and need a starting zettel for your users.
   In addition, you still want a ""home zettel"", with all your references to internal, non-public zettel.
   Zettelstore only allows to specify one [[''home-zettel''|00001004020000#home-zettel]].
@@ -27,28 +27,27 @@
 === Role-specific Layout of Zettel in Web User Interface (WebUI)
 [!role-css]
 * **Problem:** You want to add some CSS when displaying zettel of a specific [[role|00001006020000#role]].
   For example, you might want to add a yellow background color for all [[configuration|00001006020100#configuration]] zettel.
   Or you want a multi-column layout.
-* **Solution:** If you enable [[''expert-mode''|00001004020000#expert-mode]], you will have access to a zettel called ""[[Zettelstore Role to CSS Map|00000000029000]]"" (its identifier is ''00000000029000'').
-  This zettel maps a role name to a zettel that must contain the role-specific CSS code.
+* **Solution:** If you enable [[''expert-mode''|00001004020000#expert-mode]], you will have access to a zettel called ""[[Zettelstore Sxn Start Code|00000000019000]]"" (its identifier is ''00000000019000'').
+  This zettel is the starting point for Sxn code, where you can place a definition for a variable named ""CSS-ROLE-map"".
 
-  First, create a zettel containing the needed CSS: give it any title, its role is preferably ""configuration"" (but this is not a must).
-  Set its [[''syntax''|00001006020000#syntax]] must be set to ""[[css|00001008000000#css]]"".
+  But first, create a zettel containing the needed CSS: give it any title, its role is preferably ""configuration"" (but this is not a must).
+  Its [[''syntax''|00001006020000#syntax]] must be set to ""[[css|00001008000000#css]]"".
   The content must contain the role-specific CSS code, for example ``body {background-color: #FFFFD0}``for a background in a light yellow color.
 
   Let's assume, the newly created CSS zettel got the identifier ''20220825200100''.
 
-  Now, you have to connect this zettel to the zettel called ""Zettelstore Role CSS Map"".
-  Since you have enabled ''expert-mode'', you are allowed to modify it.
-  Add the following metadata ''css-configuration-zid: 20220825200100'' to assign the role-specific CSS code for the role ""configuration"" to the CSS zettel containing that CSS.
+  Now, you have to map this freshly created zettel to a role, for example ""zettel"".
+  Since you have enabled ''expert-mode'', you are allowed to modify the zettel ""[[Zettelstore Sxn Start Code|00000000019000]]"".
+  Add the following code to the Sxn Start Code zettel: ``(set! CSS-ROLE-map '(("zettel" . "20220825200100")))``.
 
-  In general, its role-assigning metadata must be like this pattern: ''css-ROLE-zid: ID'', where ''ROLE'' is the placeholder for the role, and ''ID'' for the zettel identifier containing CSS code.
-  It is allowed to assign more than one role to a specific CSS zettel.
+  In general, the mapping must follow the pattern: ``(ROLE . ID)``, where ''ROLE'' is the placeholder for the role, and ''ID'' for the zettel identifier containing CSS code.
+  For example, if you also want the role ""configuration"" to be rendered using that CSS, the code should be something like ``(set! CSS-ROLE-map '(("zettel" . "20220825200100") ("configuration" . "20220825200100")))``.
 * **Discussion:** you have to ensure that the CSS zettel is allowed to be read by the intended audience of the zettel with that given role.
   For example, if you made zettel with a specific role public visible, the CSS zettel must also have a [[''visibility: public''|00001010070200]] metadata.
-* **Extension:** if you have already established a role-specific layout for zettel, but you additionally want just one another zettel with another role to be rendered with the same CSS, you have to add metadata to the one zettel: ''css-role: ROLE'', where ''ROLE'' is the placeholder for the role that already is assigned to a specific CSS-based layout.
 
 === Zettel synchronization with iCloud (Apple)
 * **Problem:** You use Zettelstore on various macOS computers and you want to use the sameset of zettel across all computers.
 * **Solution:** Place your zettel in an iCloud folder.
 

ADDED   docs/manual/00001019990010.zettel
Index: docs/manual/00001019990010.zettel
==================================================================
--- docs/manual/00001019990010.zettel
+++ docs/manual/00001019990010.zettel
@@ -0,0 +1,8 @@
+id: 00001019990010
+title: #api
+role: tag
+syntax: zmk
+created: 20230928185004
+modified: 20230928185204
+
+Zettel with the tag ''#api'' contain a description of the [[API|00001012000000]].

ADDED   docs/manual/20231128184200.zettel
Index: docs/manual/20231128184200.zettel
==================================================================
--- docs/manual/20231128184200.zettel
+++ docs/manual/20231128184200.zettel
@@ -0,0 +1,7 @@
+id: 20231128184200
+title: manual
+role: role
+syntax: zmk
+created: 20231128184200
+
+Zettel with the role ""manual"" contain the manual of the zettelstore.

Index: docs/readmezip.txt
==================================================================
--- docs/readmezip.txt
+++ docs/readmezip.txt
@@ -15,7 +15,6 @@
 possible to make it directly available for your local Zettelstore.
 
 The software, including the manual, is licensed under the European Union Public
 License 1.2 (or later). See the separate file LICENSE.txt.
 
-To get in contact with the developer, send an email to ds@zettelstore.de or
-follow Zettelstore on Twitter: https://twitter.com/zettelstore.
+To get in contact with the developer, send an email to ds@zettelstore.de.

DELETED domain/content.go
Index: domain/content.go
==================================================================
--- domain/content.go
+++ domain/content.go
@@ -1,129 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package domain
-
-import (
-	"bytes"
-	"encoding/base64"
-	"errors"
-	"io"
-	"unicode"
-	"unicode/utf8"
-
-	"zettelstore.de/z/input"
-)
-
-// Content is just the content of a zettel.
-type Content struct {
-	data     []byte
-	isBinary bool
-}
-
-// NewContent creates a new content from a string.
-func NewContent(data []byte) Content {
-	return Content{data: data, isBinary: IsBinary(data)}
-}
-
-// Length returns the number of bytes stored.
-func (zc *Content) Length() int { return len(zc.data) }
-
-// Equal compares two content values.
-func (zc *Content) Equal(o *Content) bool {
-	if zc == nil {
-		return o == nil
-	}
-	if zc.isBinary != o.isBinary {
-		return false
-	}
-	return bytes.Equal(zc.data, o.data)
-}
-
-// Set content to new string value.
-func (zc *Content) Set(data []byte) {
-	zc.data = data
-	zc.isBinary = IsBinary(data)
-}
-
-// Write it to a Writer
-func (zc *Content) Write(w io.Writer) (int, error) {
-	return w.Write(zc.data)
-}
-
-// AsString returns the content itself is a string.
-func (zc *Content) AsString() string { return string(zc.data) }
-
-// AsBytes returns the content itself is a byte slice.
-func (zc *Content) AsBytes() []byte { return zc.data }
-
-// IsBinary returns true if the content contains non-unicode values or is,
-// interpreted a text, with a high probability binary content.
-func (zc *Content) IsBinary() bool { return zc.isBinary }
-
-// TrimSpace remove some space character in content, if it is not binary content.
-func (zc *Content) TrimSpace() {
-	if zc.isBinary {
-		return
-	}
-	inp := input.NewInput(zc.data)
-	pos := inp.Pos
-	for inp.Ch != input.EOS {
-		if input.IsEOLEOS(inp.Ch) {
-			inp.Next()
-			pos = inp.Pos
-			continue
-		}
-		if !input.IsSpace(inp.Ch) {
-			break
-		}
-		inp.Next()
-	}
-	zc.data = bytes.TrimRightFunc(inp.Src[pos:], unicode.IsSpace)
-}
-
-// Encode content for future transmission.
-func (zc *Content) Encode() (data, encoding string) {
-	if !zc.isBinary {
-		return zc.AsString(), ""
-	}
-	return base64.StdEncoding.EncodeToString(zc.data), "base64"
-}
-
-// SetDecoded content to the decoded value of the given string.
-func (zc *Content) SetDecoded(data, encoding string) error {
-	switch encoding {
-	case "":
-		zc.data = []byte(data)
-	case "base64":
-		decoded, err := base64.StdEncoding.DecodeString(data)
-		if err != nil {
-			return err
-		}
-		zc.data = decoded
-	default:
-		return errors.New("unknown encoding " + encoding)
-	}
-	zc.isBinary = IsBinary(zc.data)
-	return nil
-}
-
-// IsBinary returns true if the given data appears to be non-text data.
-func IsBinary(data []byte) bool {
-	if !utf8.Valid(data) {
-		return true
-	}
-	l := len(data)
-	for i := 0; i < l; i++ {
-		if data[i] == 0 {
-			return true
-		}
-	}
-	return false
-}

DELETED domain/content_test.go
Index: domain/content_test.go
==================================================================
--- domain/content_test.go
+++ domain/content_test.go
@@ -1,66 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package domain_test
-
-import (
-	"testing"
-
-	"zettelstore.de/z/domain"
-)
-
-func TestContentIsBinary(t *testing.T) {
-	t.Parallel()
-	td := []struct {
-		s   string
-		exp bool
-	}{
-		{"abc", false},
-		{"äöü", false},
-		{"", false},
-		{string([]byte{0}), true},
-	}
-	for i, tc := range td {
-		content := domain.NewContent([]byte(tc.s))
-		got := content.IsBinary()
-		if got != tc.exp {
-			t.Errorf("TC=%d: expected %v, got %v", i, tc.exp, got)
-		}
-	}
-}
-
-func TestTrimSpace(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		in, exp string
-	}{
-		{"", ""},
-		{" ", ""},
-		{"abc", "abc"},
-		{" abc", " abc"},
-		{"abc ", "abc"},
-		{"abc \n", "abc"},
-		{"abc\n ", "abc"},
-		{"\nabc", "abc"},
-		{" \nabc", "abc"},
-		{" \n abc", " abc"},
-		{" \n\n abc", " abc"},
-		{" \n \n abc", " abc"},
-		{" \n \n abc \n \n ", " abc"},
-	}
-	for _, tc := range testcases {
-		c := domain.NewContent([]byte(tc.in))
-		c.TrimSpace()
-		got := c.AsString()
-		if got != tc.exp {
-			t.Errorf("TrimSpace(%q) should be %q, but got %q", tc.in, tc.exp, got)
-		}
-	}
-}

DELETED domain/id/id.go
Index: domain/id/id.go
==================================================================
--- domain/id/id.go
+++ domain/id/id.go
@@ -1,163 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-// Package id provides domain specific types, constants, and functions about
-// zettel identifier.
-package id
-
-import (
-	"strconv"
-	"time"
-
-	"zettelstore.de/c/api"
-)
-
-// Zid is the internal identifier of a zettel. Typically, it is a
-// time stamp of the form "YYYYMMDDHHmmSS" converted to an unsigned integer.
-// A zettelstore implementation should try to set the last two digits to zero,
-// e.g. the seconds should be zero,
-type Zid uint64
-
-// Some important ZettelIDs.
-const (
-	Invalid = Zid(0) // Invalid is a Zid that will never be valid
-)
-
-// ZettelIDs that are used as Zid more than once.
-//
-// Note: if you change some values, ensure that you also change them in the
-// Constant box. They are mentioned there literally, because these
-// constants are not available there.
-var (
-	ConfigurationZid   = MustParse(api.ZidConfiguration)
-	BaseTemplateZid    = MustParse(api.ZidBaseTemplate)
-	LoginTemplateZid   = MustParse(api.ZidLoginTemplate)
-	ListTemplateZid    = MustParse(api.ZidListTemplate)
-	ZettelTemplateZid  = MustParse(api.ZidZettelTemplate)
-	InfoTemplateZid    = MustParse(api.ZidInfoTemplate)
-	FormTemplateZid    = MustParse(api.ZidFormTemplate)
-	RenameTemplateZid  = MustParse(api.ZidRenameTemplate)
-	DeleteTemplateZid  = MustParse(api.ZidDeleteTemplate)
-	ContextTemplateZid = MustParse(api.ZidContextTemplate)
-	ErrorTemplateZid   = MustParse(api.ZidErrorTemplate)
-	RoleCSSMapZid      = MustParse(api.ZidRoleCSSMap)
-	EmojiZid           = MustParse(api.ZidEmoji)
-	TOCNewTemplateZid  = MustParse(api.ZidTOCNewTemplate)
-	DefaultHomeZid     = MustParse(api.ZidDefaultHome)
-)
-
-const maxZid = 99999999999999
-
-// ParseUint interprets a string as a possible zettel identifier
-// and returns its integer value.
-func ParseUint(s string) (uint64, error) {
-	res, err := strconv.ParseUint(s, 10, 47)
-	if err != nil {
-		return 0, err
-	}
-	if res == 0 || res > maxZid {
-		return res, strconv.ErrRange
-	}
-	return res, nil
-}
-
-// Parse interprets a string as a zettel identification and
-// returns its value.
-func Parse(s string) (Zid, error) {
-	if len(s) != 14 {
-		return Invalid, strconv.ErrSyntax
-	}
-	res, err := ParseUint(s)
-	if err != nil {
-		return Invalid, err
-	}
-	return Zid(res), nil
-}
-
-// MustParse tries to interpret a string as a zettel identifier and returns
-// its value or panics otherwise.
-func MustParse(s api.ZettelID) Zid {
-	zid, err := Parse(string(s))
-	if err == nil {
-		return zid
-	}
-	panic(err)
-}
-
-// String converts the zettel identification to a string of 14 digits.
-// Only defined for valid ids.
-func (zid Zid) String() string {
-	var result [14]byte
-	zid.toByteArray(&result)
-	return string(result[:])
-}
-
-// Bytes converts the zettel identification to a byte slice of 14 digits.
-// Only defined for valid ids.
-func (zid Zid) Bytes() []byte {
-	var result [14]byte
-	zid.toByteArray(&result)
-	return result[:]
-}
-
-// toByteArray converts the Zid into a fixed byte array, usable for printing.
-//
-// Based on idea by Daniel Lemire: "Converting integers to fix-digit representations quickly"
-// https://lemire.me/blog/2021/11/18/converting-integers-to-fix-digit-representations-quickly/
-func (zid Zid) toByteArray(result *[14]byte) {
-	date := uint64(zid) / 1000000
-	fullyear := date / 10000
-	century := fullyear / 100
-	year := fullyear % 100
-	monthday := date % 10000
-	month := monthday / 100
-	day := monthday % 100
-	time := uint64(zid) % 1000000
-	hmtime := time / 100
-	second := time % 100
-	hour := hmtime / 100
-	minute := hmtime % 100
-	result[0] = byte(century/10) + '0'
-	result[1] = byte(century%10) + '0'
-	result[2] = byte(year/10) + '0'
-	result[3] = byte(year%10) + '0'
-	result[4] = byte(month/10) + '0'
-	result[5] = byte(month%10) + '0'
-	result[6] = byte(day/10) + '0'
-	result[7] = byte(day%10) + '0'
-	result[8] = byte(hour/10) + '0'
-	result[9] = byte(hour%10) + '0'
-	result[10] = byte(minute/10) + '0'
-	result[11] = byte(minute%10) + '0'
-	result[12] = byte(second/10) + '0'
-	result[13] = byte(second%10) + '0'
-}
-
-// IsValid determines if zettel id is a valid one, e.g. consists of max. 14 digits.
-func (zid Zid) IsValid() bool { return 0 < zid && zid <= maxZid }
-
-// ZidLayout to transform a date into a Zid and into other internal dates.
-const ZidLayout = "20060102150405"
-
-// New returns a new zettel id based on the current time.
-func New(withSeconds bool) Zid {
-	now := time.Now().Local()
-	var s string
-	if withSeconds {
-		s = now.Format(ZidLayout)
-	} else {
-		s = now.Format("20060102150400")
-	}
-	res, err := Parse(s)
-	if err != nil {
-		panic(err)
-	}
-	return res
-}

DELETED domain/id/id_test.go
Index: domain/id/id_test.go
==================================================================
--- domain/id/id_test.go
+++ domain/id/id_test.go
@@ -1,87 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-// Package id_test provides unit tests for testing zettel id specific functions.
-package id_test
-
-import (
-	"testing"
-
-	"zettelstore.de/z/domain/id"
-)
-
-func TestIsValid(t *testing.T) {
-	t.Parallel()
-	validIDs := []string{
-		"00000000000001",
-		"00000000000020",
-		"00000000000300",
-		"00000000004000",
-		"00000000050000",
-		"00000000600000",
-		"00000007000000",
-		"00000080000000",
-		"00000900000000",
-		"00001000000000",
-		"00020000000000",
-		"00300000000000",
-		"04000000000000",
-		"50000000000000",
-		"99999999999999",
-		"00001007030200",
-		"20200310195100",
-	}
-
-	for i, sid := range validIDs {
-		zid, err := id.Parse(sid)
-		if err != nil {
-			t.Errorf("i=%d: sid=%q is not valid, but should be. err=%v", i, sid, err)
-		}
-		s := zid.String()
-		if s != sid {
-			t.Errorf(
-				"i=%d: zid=%v does not format to %q, but to %q", i, zid, sid, s)
-		}
-	}
-
-	invalidIDs := []string{
-		"", "0", "a",
-		"00000000000000",
-		"0000000000000a",
-		"000000000000000",
-		"20200310T195100",
-	}
-
-	for i, sid := range invalidIDs {
-		if zid, err := id.Parse(sid); err == nil {
-			t.Errorf("i=%d: sid=%q is valid (zid=%s), but should not be", i, sid, zid)
-		}
-	}
-}
-
-var sResult string // to disable compiler optimization in loop below
-
-func BenchmarkString(b *testing.B) {
-	var s string
-	for n := 0; n < b.N; n++ {
-		s = id.Zid(12345678901200).String()
-	}
-	sResult = s
-}
-
-var bResult []byte // to disable compiler optimization in loop below
-
-func BenchmarkBytes(b *testing.B) {
-	var bs []byte
-	for n := 0; n < b.N; n++ {
-		bs = id.Zid(12345678901200).Bytes()
-	}
-	bResult = bs
-}

DELETED domain/id/set.go
Index: domain/id/set.go
==================================================================
--- domain/id/set.go
+++ domain/id/set.go
@@ -1,119 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package id
-
-// Set is a set of zettel identifier
-type Set map[Zid]struct{}
-
-// NewSet returns a new set of identifier with the given initial values.
-func NewSet(zids ...Zid) Set {
-	l := len(zids)
-	if l < 8 {
-		l = 8
-	}
-	result := make(Set, l)
-	result.AddSlice(zids)
-	return result
-}
-
-// NewSetCap returns a new set of identifier with the given capacity and initial values.
-func NewSetCap(c int, zids ...Zid) Set {
-	l := len(zids)
-	if c < l {
-		c = l
-	}
-	if c < 8 {
-		c = 8
-	}
-	result := make(Set, c)
-	result.AddSlice(zids)
-	return result
-}
-
-// Zid adds a Zid to the set.
-func (s Set) Zid(zid Zid) Set {
-	if s == nil {
-		return NewSet(zid)
-	}
-	s[zid] = struct{}{}
-	return s
-}
-
-// Contains return true if the set is nil or if the set contains the given Zettel identifier.
-func (s Set) Contains(zid Zid) bool {
-	if s != nil {
-		_, found := s[zid]
-		return found
-	}
-	return true
-}
-
-// Add all member from the other set.
-func (s Set) Add(other Set) Set {
-	if s == nil {
-		return other
-	}
-	for zid := range other {
-		s[zid] = struct{}{}
-	}
-	return s
-}
-
-// AddSlice adds all identifier of the given slice to the set.
-func (s Set) AddSlice(sl Slice) {
-	for _, zid := range sl {
-		s[zid] = struct{}{}
-	}
-}
-
-// Sorted returns the set as a sorted slice of zettel identifier.
-func (s Set) Sorted() Slice {
-	if l := len(s); l > 0 {
-		result := make(Slice, 0, l)
-		for zid := range s {
-			result = append(result, zid)
-		}
-		result.Sort()
-		return result
-	}
-	return nil
-}
-
-// IntersectOrSet removes all zettel identifier that are not in the other set.
-// Both sets can be modified by this method. One of them is the set returned.
-// It contains the intersection of both, if s is not nil.
-//
-// If s == nil, then the other set is always returned.
-func (s Set) IntersectOrSet(other Set) Set {
-	if s == nil {
-		return other
-	}
-	if len(s) > len(other) {
-		s, other = other, s
-	}
-	for zid := range s {
-		_, otherOk := other[zid]
-		if !otherOk {
-			delete(s, zid)
-		}
-	}
-	return s
-}
-
-// Remove all zettel identifier from 's' that are in the set 'other'.
-func (s Set) Remove(other Set) {
-	if s == nil || other == nil {
-		return
-	}
-	for zid := range other {
-		delete(s, zid)
-	}
-}

DELETED domain/id/set_test.go
Index: domain/id/set_test.go
==================================================================
--- domain/id/set_test.go
+++ domain/id/set_test.go
@@ -1,149 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package id_test
-
-import (
-	"testing"
-
-	"zettelstore.de/z/domain/id"
-)
-
-func TestSetContains(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		s   id.Set
-		zid id.Zid
-		exp bool
-	}{
-		{nil, id.Invalid, true},
-		{nil, 14, true},
-		{id.NewSet(), id.Invalid, false},
-		{id.NewSet(), 1, false},
-		{id.NewSet(), id.Invalid, false},
-		{id.NewSet(1), 1, true},
-	}
-	for i, tc := range testcases {
-		got := tc.s.Contains(tc.zid)
-		if got != tc.exp {
-			t.Errorf("%d: %v.Contains(%v) == %v, but got %v", i, tc.s, tc.zid, tc.exp, got)
-		}
-	}
-}
-
-func TestSetAdd(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		s1, s2 id.Set
-		exp    id.Slice
-	}{
-		{nil, nil, nil},
-		{id.NewSet(), nil, nil},
-		{id.NewSet(), id.NewSet(), nil},
-		{nil, id.NewSet(1), id.Slice{1}},
-		{id.NewSet(1), nil, id.Slice{1}},
-		{id.NewSet(1), id.NewSet(), id.Slice{1}},
-		{id.NewSet(1), id.NewSet(2), id.Slice{1, 2}},
-		{id.NewSet(1), id.NewSet(1), id.Slice{1}},
-	}
-	for i, tc := range testcases {
-		sl1 := tc.s1.Sorted()
-		sl2 := tc.s2.Sorted()
-		got := tc.s1.Add(tc.s2).Sorted()
-		if !got.Equal(tc.exp) {
-			t.Errorf("%d: %v.Add(%v) should be %v, but got %v", i, sl1, sl2, tc.exp, got)
-		}
-	}
-}
-
-func TestSetSorted(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		set id.Set
-		exp id.Slice
-	}{
-		{nil, nil},
-		{id.NewSet(), nil},
-		{id.NewSet(9, 4, 6, 1, 7), id.Slice{1, 4, 6, 7, 9}},
-	}
-	for i, tc := range testcases {
-		got := tc.set.Sorted()
-		if !got.Equal(tc.exp) {
-			t.Errorf("%d: %v.Sorted() should be %v, but got %v", i, tc.set, tc.exp, got)
-		}
-	}
-}
-
-func TestSetIntersectOrSet(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		s1, s2 id.Set
-		exp    id.Slice
-	}{
-		{nil, nil, nil},
-		{id.NewSet(), nil, nil},
-		{nil, id.NewSet(), nil},
-		{id.NewSet(), id.NewSet(), nil},
-		{id.NewSet(1), nil, nil},
-		{nil, id.NewSet(1), id.Slice{1}},
-		{id.NewSet(1), id.NewSet(), nil},
-		{id.NewSet(), id.NewSet(1), nil},
-		{id.NewSet(1), id.NewSet(2), nil},
-		{id.NewSet(2), id.NewSet(1), nil},
-		{id.NewSet(1), id.NewSet(1), id.Slice{1}},
-	}
-	for i, tc := range testcases {
-		sl1 := tc.s1.Sorted()
-		sl2 := tc.s2.Sorted()
-		got := tc.s1.IntersectOrSet(tc.s2).Sorted()
-		if !got.Equal(tc.exp) {
-			t.Errorf("%d: %v.IntersectOrSet(%v) should be %v, but got %v", i, sl1, sl2, tc.exp, got)
-		}
-	}
-}
-
-func TestSetRemove(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		s1, s2 id.Set
-		exp    id.Slice
-	}{
-		{nil, nil, nil},
-		{id.NewSet(), nil, nil},
-		{id.NewSet(), id.NewSet(), nil},
-		{id.NewSet(1), nil, id.Slice{1}},
-		{id.NewSet(1), id.NewSet(), id.Slice{1}},
-		{id.NewSet(1), id.NewSet(2), id.Slice{1}},
-		{id.NewSet(1), id.NewSet(1), id.Slice{}},
-	}
-	for i, tc := range testcases {
-		sl1 := tc.s1.Sorted()
-		sl2 := tc.s2.Sorted()
-		newS1 := id.NewSet(sl1...)
-		newS1.Remove(tc.s2)
-		got := newS1.Sorted()
-		if !got.Equal(tc.exp) {
-			t.Errorf("%d: %v.Remove(%v) should be %v, but got %v", i, sl1, sl2, tc.exp, got)
-		}
-	}
-}
-
-//	func BenchmarkSet(b *testing.B) {
-//		s := id.Set{}
-//		for i := 0; i < b.N; i++ {
-//			s[id.Zid(i)] = true
-//		}
-//	}
-func BenchmarkSet(b *testing.B) {
-	s := id.Set{}
-	for i := 0; i < b.N; i++ {
-		s[id.Zid(i)] = struct{}{}
-	}
-}

DELETED domain/id/slice.go
Index: domain/id/slice.go
==================================================================
--- domain/id/slice.go
+++ domain/id/slice.go
@@ -1,67 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package id
-
-import (
-	"sort"
-	"strings"
-)
-
-// Slice is a sequence of zettel identifier. A special case is a sorted slice.
-type Slice []Zid
-
-func (zs Slice) Len() int           { return len(zs) }
-func (zs Slice) Less(i, j int) bool { return zs[i] < zs[j] }
-func (zs Slice) Swap(i, j int)      { zs[i], zs[j] = zs[j], zs[i] }
-
-// Sort a slice of Zids.
-func (zs Slice) Sort() { sort.Sort(zs) }
-
-// Copy a zettel identifier slice
-func (zs Slice) Copy() Slice {
-	if zs == nil {
-		return nil
-	}
-	result := make(Slice, len(zs))
-	copy(result, zs)
-	return result
-}
-
-// Equal reports whether zs and other are the same length and contain the samle zettel
-// identifier. A nil argument is equivalent to an empty slice.
-func (zs Slice) Equal(other Slice) bool {
-	if len(zs) != len(other) {
-		return false
-	}
-	if len(zs) == 0 {
-		return true
-	}
-	for i, e := range zs {
-		if e != other[i] {
-			return false
-		}
-	}
-	return true
-}
-
-func (zs Slice) String() string {
-	if len(zs) == 0 {
-		return ""
-	}
-	var sb strings.Builder
-	for i, zid := range zs {
-		if i > 0 {
-			sb.WriteByte(' ')
-		}
-		sb.WriteString(zid.String())
-	}
-	return sb.String()
-}

DELETED domain/id/slice_test.go
Index: domain/id/slice_test.go
==================================================================
--- domain/id/slice_test.go
+++ domain/id/slice_test.go
@@ -1,86 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package id_test
-
-import (
-	"testing"
-
-	"zettelstore.de/z/domain/id"
-)
-
-func TestSliceSort(t *testing.T) {
-	t.Parallel()
-	zs := id.Slice{9, 4, 6, 1, 7}
-	zs.Sort()
-	exp := id.Slice{1, 4, 6, 7, 9}
-	if !zs.Equal(exp) {
-		t.Errorf("Slice.Sort did not work. Expected %v, got %v", exp, zs)
-	}
-}
-
-func TestCopy(t *testing.T) {
-	t.Parallel()
-	var orig id.Slice
-	got := orig.Copy()
-	if got != nil {
-		t.Errorf("Nil copy resulted in %v", got)
-	}
-	orig = id.Slice{9, 4, 6, 1, 7}
-	got = orig.Copy()
-	if !orig.Equal(got) {
-		t.Errorf("Slice.Copy did not work. Expected %v, got %v", orig, got)
-	}
-}
-
-func TestSliceEqual(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		s1, s2 id.Slice
-		exp    bool
-	}{
-		{nil, nil, true},
-		{nil, id.Slice{}, true},
-		{nil, id.Slice{1}, false},
-		{id.Slice{1}, id.Slice{1}, true},
-		{id.Slice{1}, id.Slice{2}, false},
-		{id.Slice{1, 2}, id.Slice{2, 1}, false},
-		{id.Slice{1, 2}, id.Slice{1, 2}, true},
-	}
-	for i, tc := range testcases {
-		got := tc.s1.Equal(tc.s2)
-		if got != tc.exp {
-			t.Errorf("%d/%v.Equal(%v)==%v, but got %v", i, tc.s1, tc.s2, tc.exp, got)
-		}
-		got = tc.s2.Equal(tc.s1)
-		if got != tc.exp {
-			t.Errorf("%d/%v.Equal(%v)==%v, but got %v", i, tc.s2, tc.s1, tc.exp, got)
-		}
-	}
-}
-
-func TestSliceString(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		in  id.Slice
-		exp string
-	}{
-		{nil, ""},
-		{id.Slice{}, ""},
-		{id.Slice{1}, "00000000000001"},
-		{id.Slice{1, 2}, "00000000000001 00000000000002"},
-	}
-	for i, tc := range testcases {
-		got := tc.in.String()
-		if got != tc.exp {
-			t.Errorf("%d/%v: expected %q, but got %q", i, tc.in, tc.exp, got)
-		}
-	}
-}

DELETED domain/meta/collection.go
Index: domain/meta/collection.go
==================================================================
--- domain/meta/collection.go
+++ domain/meta/collection.go
@@ -1,110 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2022-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta
-
-import "sort"
-
-// Arrangement stores metadata within its categories.
-// Typecally a category might be a tag name, a role name, a syntax value.
-type Arrangement map[string][]*Meta
-
-// CreateArrangement by inspecting a given key and use the found
-// value as a category.
-func CreateArrangement(metaList []*Meta, key string) Arrangement {
-	if len(metaList) == 0 {
-		return nil
-	}
-	descr := Type(key)
-	if descr == nil {
-		return nil
-	}
-	if descr.IsSet {
-		return createSetArrangement(metaList, key)
-	}
-	return createSimplearrangement(metaList, key)
-}
-
-func createSetArrangement(metaList []*Meta, key string) Arrangement {
-	a := make(Arrangement)
-	for _, m := range metaList {
-		if vals, ok := m.GetList(key); ok {
-			for _, val := range vals {
-				a[val] = append(a[val], m)
-			}
-		}
-	}
-	return a
-}
-
-func createSimplearrangement(metaList []*Meta, key string) Arrangement {
-	a := make(Arrangement)
-	for _, m := range metaList {
-		if val, ok := m.Get(key); ok && val != "" {
-			a[val] = append(a[val], m)
-		}
-	}
-	return a
-}
-
-// Counted returns the list of categories, together with the number of
-// metadata for each category.
-func (a Arrangement) Counted() CountedCategories {
-	if len(a) == 0 {
-		return nil
-	}
-	result := make(CountedCategories, 0, len(a))
-	for cat, metas := range a {
-		result = append(result, CountedCategory{Name: cat, Count: len(metas)})
-	}
-	return result
-}
-
-// CountedCategory contains of a name and the number how much this name occured
-// somewhere.
-type CountedCategory struct {
-	Name  string
-	Count int
-}
-
-// CountedCategories is the list of CountedCategories.
-// Every name must occur only once.
-type CountedCategories []CountedCategory
-
-// SortByName sorts the list by the name attribute.
-// Since each name must occur only once, two CountedCategories cannot have
-// the same name.
-func (ccs CountedCategories) SortByName() {
-	sort.Slice(ccs, func(i, j int) bool { return ccs[i].Name < ccs[j].Name })
-}
-
-// SortByCount sorts the list by the count attribute, descending.
-// If two counts are equal, elements are sorted by name.
-func (ccs CountedCategories) SortByCount() {
-	sort.Slice(ccs, func(i, j int) bool {
-		iCount, jCount := ccs[i].Count, ccs[j].Count
-		if iCount > jCount {
-			return true
-		}
-		if iCount == jCount {
-			return ccs[i].Name < ccs[j].Name
-		}
-		return false
-	})
-}
-
-// Categories returns just the category names.
-func (ccs CountedCategories) Categories() []string {
-	result := make([]string, len(ccs))
-	for i, cc := range ccs {
-		result[i] = cc.Name
-	}
-	return result
-}

DELETED domain/meta/meta.go
Index: domain/meta/meta.go
==================================================================
--- domain/meta/meta.go
+++ domain/meta/meta.go
@@ -1,423 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-// Package meta provides the domain specific type 'meta'.
-package meta
-
-import (
-	"regexp"
-	"sort"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/maps"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/input"
-	"zettelstore.de/z/strfun"
-)
-
-type keyUsage int
-
-const (
-	_             keyUsage = iota
-	usageUser              // Key will be manipulated by the user
-	usageComputed          // Key is computed by zettelstore
-	usageProperty          // Key is computed and not stored by zettelstore
-)
-
-// DescriptionKey formally describes each supported metadata key.
-type DescriptionKey struct {
-	Name    string
-	Type    *DescriptionType
-	usage   keyUsage
-	Inverse string
-}
-
-// IsComputed returns true, if metadata is computed and not set by the user.
-func (kd *DescriptionKey) IsComputed() bool { return kd.usage >= usageComputed }
-
-// IsProperty returns true, if metadata is a computed property.
-func (kd *DescriptionKey) IsProperty() bool { return kd.usage >= usageProperty }
-
-// IsStoredComputed retruns true, if metadata is computed, but also stored.
-func (kd *DescriptionKey) IsStoredComputed() bool { return kd.usage == usageComputed }
-
-var registeredKeys = make(map[string]*DescriptionKey)
-
-func registerKey(name string, t *DescriptionType, usage keyUsage, inverse string) {
-	if _, ok := registeredKeys[name]; ok {
-		panic("Key '" + name + "' already defined")
-	}
-	if inverse != "" {
-		if t != TypeID && t != TypeIDSet {
-			panic("Inversable key '" + name + "' is not identifier type, but " + t.String())
-		}
-		inv, ok := registeredKeys[inverse]
-		if !ok {
-			panic("Inverse Key '" + inverse + "' not found")
-		}
-		if !inv.IsComputed() {
-			panic("Inverse Key '" + inverse + "' is not computed.")
-		}
-		if inv.Type != TypeIDSet {
-			panic("Inverse Key '" + inverse + "' is not an identifier set, but " + inv.Type.String())
-		}
-	}
-	registeredKeys[name] = &DescriptionKey{name, t, usage, inverse}
-}
-
-// IsComputed returns true, if key denotes a computed metadata key.
-func IsComputed(name string) bool {
-	if kd, ok := registeredKeys[name]; ok {
-		return kd.IsComputed()
-	}
-	return false
-}
-
-// IsProperty returns true, if key denotes a property metadata value.
-func IsProperty(name string) bool {
-	if kd, ok := registeredKeys[name]; ok {
-		return kd.IsProperty()
-	}
-	return false
-}
-
-// IsStoredComputed returns true, if key denotes a computed metadata key that is stored.
-func IsStoredComputed(name string) bool {
-	if kd, ok := registeredKeys[name]; ok {
-		return kd.IsStoredComputed()
-	}
-	return false
-}
-
-// Inverse returns the name of the inverse key.
-func Inverse(name string) string {
-	if kd, ok := registeredKeys[name]; ok {
-		return kd.Inverse
-	}
-	return ""
-}
-
-// GetDescription returns the key description object of the given key name.
-func GetDescription(name string) DescriptionKey {
-	if d, ok := registeredKeys[name]; ok {
-		return *d
-	}
-	return DescriptionKey{Type: Type(name)}
-}
-
-// GetSortedKeyDescriptions delivers all metadata key descriptions as a slice, sorted by name.
-func GetSortedKeyDescriptions() []*DescriptionKey {
-	keys := maps.Keys(registeredKeys)
-	result := make([]*DescriptionKey, 0, len(keys))
-	for _, n := range keys {
-		result = append(result, registeredKeys[n])
-	}
-	return result
-}
-
-// Supported keys.
-func init() {
-	registerKey(api.KeyID, TypeID, usageComputed, "")
-	registerKey(api.KeyTitle, TypeEmpty, usageUser, "")
-	registerKey(api.KeyRole, TypeWord, usageUser, "")
-	registerKey(api.KeyTags, TypeTagSet, usageUser, "")
-	registerKey(api.KeySyntax, TypeWord, usageUser, "")
-
-	// Properties that are inverse keys
-	registerKey(api.KeyFolge, TypeIDSet, usageProperty, "")
-	registerKey(api.KeySuccessors, TypeIDSet, usageProperty, "")
-
-	registerKey(api.KeyAuthor, TypeString, usageUser, "")
-	registerKey(api.KeyBack, TypeIDSet, usageProperty, "")
-	registerKey(api.KeyBackward, TypeIDSet, usageProperty, "")
-	registerKey(api.KeyBoxNumber, TypeNumber, usageProperty, "")
-	registerKey(api.KeyCopyright, TypeString, usageUser, "")
-	registerKey(api.KeyCreated, TypeTimestamp, usageComputed, "")
-	registerKey(api.KeyCredential, TypeCredential, usageUser, "")
-	registerKey(api.KeyDead, TypeIDSet, usageProperty, "")
-	registerKey(api.KeyForward, TypeIDSet, usageProperty, "")
-	registerKey(api.KeyLang, TypeWord, usageUser, "")
-	registerKey(api.KeyLicense, TypeEmpty, usageUser, "")
-	registerKey(api.KeyModified, TypeTimestamp, usageComputed, "")
-	registerKey(api.KeyPrecursor, TypeIDSet, usageUser, api.KeyFolge)
-	registerKey(api.KeyPredecessor, TypeID, usageUser, api.KeySuccessors)
-	registerKey(api.KeyPublished, TypeTimestamp, usageProperty, "")
-	registerKey(api.KeyQuery, TypeEmpty, usageUser, "")
-	registerKey(api.KeyReadOnly, TypeWord, usageUser, "")
-	registerKey(api.KeySummary, TypeZettelmarkup, usageUser, "")
-	registerKey(api.KeyURL, TypeURL, usageUser, "")
-	registerKey(api.KeyUselessFiles, TypeString, usageProperty, "")
-	registerKey(api.KeyUserID, TypeWord, usageUser, "")
-	registerKey(api.KeyUserRole, TypeWord, usageUser, "")
-	registerKey(api.KeyVisibility, TypeWord, usageUser, "")
-}
-
-// NewPrefix is the prefix for metadata key in template zettel for creating new zettel.
-const NewPrefix = "new-"
-
-// Meta contains all meta-data of a zettel.
-type Meta struct {
-	Zid     id.Zid
-	pairs   map[string]string
-	YamlSep bool
-}
-
-// New creates a new chunk for storing metadata.
-func New(zid id.Zid) *Meta {
-	return &Meta{Zid: zid, pairs: make(map[string]string, 5)}
-}
-
-// NewWithData creates metadata object with given data.
-func NewWithData(zid id.Zid, data map[string]string) *Meta {
-	pairs := make(map[string]string, len(data))
-	for k, v := range data {
-		pairs[k] = v
-	}
-	return &Meta{Zid: zid, pairs: pairs}
-}
-
-// Length returns the number of bytes stored for the metadata.
-func (m *Meta) Length() int {
-	if m == nil {
-		return 0
-	}
-	result := 6 // storage needed for Zid
-	for k, v := range m.pairs {
-		result += len(k) + len(v) + 1 // 1 because separator
-	}
-	return result
-}
-
-// Clone returns a new copy of the metadata.
-func (m *Meta) Clone() *Meta {
-	return &Meta{
-		Zid:     m.Zid,
-		pairs:   m.Map(),
-		YamlSep: m.YamlSep,
-	}
-}
-
-// Map returns a copy of the meta data as a string map.
-func (m *Meta) Map() map[string]string {
-	pairs := make(map[string]string, len(m.pairs))
-	for k, v := range m.pairs {
-		pairs[k] = v
-	}
-	return pairs
-}
-
-var reKey = regexp.MustCompile("^[0-9a-z][-0-9a-z]{0,254}$")
-
-// KeyIsValid returns true, the the key is a valid string.
-func KeyIsValid(key string) bool {
-	return reKey.MatchString(key)
-}
-
-// Pair is one key-value-pair of a Zettel meta.
-type Pair struct {
-	Key   string
-	Value string
-}
-
-var firstKeys = []string{api.KeyTitle, api.KeyRole, api.KeyTags, api.KeySyntax}
-var firstKeySet strfun.Set
-
-func init() {
-	firstKeySet = strfun.NewSet(firstKeys...)
-}
-
-// Set stores the given string value under the given key.
-func (m *Meta) Set(key, value string) {
-	if key != api.KeyID {
-		m.pairs[key] = trimValue(value)
-	}
-}
-
-// SetNonEmpty stores the given value under the given key, if the value is non-empty.
-// An empty value will delete the previous association.
-func (m *Meta) SetNonEmpty(key, value string) {
-	if value == "" {
-		delete(m.pairs, key)
-	} else if key != api.KeyID {
-		m.pairs[key] = trimValue(value)
-	}
-}
-
-func trimValue(value string) string {
-	return strings.TrimFunc(value, input.IsSpace)
-}
-
-// Get retrieves the string value of a given key. The bool value signals,
-// whether there was a value stored or not.
-func (m *Meta) Get(key string) (string, bool) {
-	if m == nil {
-		return "", false
-	}
-	if key == api.KeyID {
-		return m.Zid.String(), true
-	}
-	value, ok := m.pairs[key]
-	return value, ok
-}
-
-// GetDefault retrieves the string value of the given key. If no value was
-// stored, the given default value is returned.
-func (m *Meta) GetDefault(key, def string) string {
-	if value, found := m.Get(key); found {
-		return value
-	}
-	return def
-}
-
-// GetTitle returns the title of the metadata. It is the only key that has a
-// defined default value: the string representation of the zettel identifier.
-func (m *Meta) GetTitle() string {
-	if title, found := m.Get(api.KeyTitle); found {
-		return title
-	}
-	return m.Zid.String()
-}
-
-// Pairs returns not computed key/values pairs stored, in a specific order.
-// First come the pairs with predefined keys: MetaTitleKey, MetaTagsKey, MetaSyntaxKey,
-// MetaContextKey. Then all other pairs are append to the list, ordered by key.
-func (m *Meta) Pairs() []Pair {
-	return m.doPairs(m.getFirstKeys(), notComputedKey)
-}
-
-// ComputedPairs returns all key/values pairs stored, in a specific order. First come
-// the pairs with predefined keys: MetaTitleKey, MetaTagsKey, MetaSyntaxKey,
-// MetaContextKey. Then all other pairs are append to the list, ordered by key.
-func (m *Meta) ComputedPairs() []Pair {
-	return m.doPairs(m.getFirstKeys(), anyKey)
-}
-
-// PairsRest returns not computed key/values pairs stored, except the values with
-// predefined keys. The pairs are ordered by key.
-func (m *Meta) PairsRest() []Pair {
-	result := make([]Pair, 0, len(m.pairs))
-	return m.doPairs(result, notComputedKey)
-}
-
-// ComputedPairsRest returns all key/values pairs stored, except the values with
-// predefined keys. The pairs are ordered by key.
-func (m *Meta) ComputedPairsRest() []Pair {
-	result := make([]Pair, 0, len(m.pairs))
-	return m.doPairs(result, anyKey)
-}
-
-func notComputedKey(key string) bool { return !IsComputed(key) }
-func anyKey(string) bool             { return true }
-
-func (m *Meta) doPairs(firstKeys []Pair, addKeyPred func(string) bool) []Pair {
-	keys := m.getKeysRest(addKeyPred)
-	for _, k := range keys {
-		firstKeys = append(firstKeys, Pair{k, m.pairs[k]})
-	}
-	return firstKeys
-}
-
-func (m *Meta) getFirstKeys() []Pair {
-	result := make([]Pair, 0, len(m.pairs))
-	for _, key := range firstKeys {
-		if value, ok := m.pairs[key]; ok {
-			result = append(result, Pair{key, value})
-		}
-	}
-	return result
-}
-
-func (m *Meta) getKeysRest(addKeyPred func(string) bool) []string {
-	keys := make([]string, 0, len(m.pairs))
-	for k := range m.pairs {
-		if !firstKeySet.Has(k) && addKeyPred(k) {
-			keys = append(keys, k)
-		}
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-// Delete removes a key from the data.
-func (m *Meta) Delete(key string) {
-	if key != api.KeyID {
-		delete(m.pairs, key)
-	}
-}
-
-// Equal compares to metas for equality.
-func (m *Meta) Equal(o *Meta, allowComputed bool) bool {
-	if m == nil && o == nil {
-		return true
-	}
-	if m == nil || o == nil || m.Zid != o.Zid {
-		return false
-	}
-	tested := make(strfun.Set, len(m.pairs))
-	for k, v := range m.pairs {
-		tested.Set(k)
-		if !equalValue(k, v, o, allowComputed) {
-			return false
-		}
-	}
-	for k, v := range o.pairs {
-		if !tested.Has(k) && !equalValue(k, v, m, allowComputed) {
-			return false
-		}
-	}
-	return true
-}
-
-func equalValue(key, val string, other *Meta, allowComputed bool) bool {
-	if allowComputed || !IsComputed(key) {
-		if valO, found := other.pairs[key]; !found || val != valO {
-			return false
-		}
-	}
-	return true
-}
-
-// Sanitize all metadata keys and values, so that they can be written safely into a file.
-func (m *Meta) Sanitize() {
-	if m == nil {
-		return
-	}
-	for k, v := range m.pairs {
-		m.pairs[RemoveNonGraphic(k)] = RemoveNonGraphic(v)
-	}
-}
-
-// RemoveNonGraphic changes the given string not to include non-graphical characters.
-// It is needed to sanitize meta data.
-func RemoveNonGraphic(s string) string {
-	if s == "" {
-		return ""
-	}
-	pos := 0
-	var sb strings.Builder
-	for pos < len(s) {
-		nextPos := strings.IndexFunc(s[pos:], func(r rune) bool { return !unicode.IsGraphic(r) })
-		if nextPos < 0 {
-			break
-		}
-		sb.WriteString(s[pos:nextPos])
-		sb.WriteByte(' ')
-		_, size := utf8.DecodeRuneInString(s[nextPos:])
-		pos = nextPos + size
-	}
-	if pos == 0 {
-		return strings.TrimSpace(s)
-	}
-	sb.WriteString(s[pos:])
-	return strings.TrimSpace(sb.String())
-}

DELETED domain/meta/meta_test.go
Index: domain/meta/meta_test.go
==================================================================
--- domain/meta/meta_test.go
+++ domain/meta/meta_test.go
@@ -1,262 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-// Package meta_test provides tests for the domain specific type 'meta'.
-package meta
-
-import (
-	"strings"
-	"testing"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-)
-
-const testID = id.Zid(98765432101234)
-
-func TestKeyIsValid(t *testing.T) {
-	t.Parallel()
-	validKeys := []string{"0", "a", "0-", "title", "title-----", strings.Repeat("r", 255)}
-	for _, key := range validKeys {
-		if !KeyIsValid(key) {
-			t.Errorf("Key %q wrongly identified as invalid key", key)
-		}
-	}
-	invalidKeys := []string{"", "-", "-a", "Title", "a_b", strings.Repeat("e", 256)}
-	for _, key := range invalidKeys {
-		if KeyIsValid(key) {
-			t.Errorf("Key %q wrongly identified as valid key", key)
-		}
-	}
-}
-
-func TestTitleHeader(t *testing.T) {
-	t.Parallel()
-	m := New(testID)
-	if got, ok := m.Get(api.KeyTitle); ok && got != "" {
-		t.Errorf("Title is not empty, but %q", got)
-	}
-	addToMeta(m, api.KeyTitle, " ")
-	if got, ok := m.Get(api.KeyTitle); ok && got != "" {
-		t.Errorf("Title is not empty, but %q", got)
-	}
-	const st = "A simple text"
-	addToMeta(m, api.KeyTitle, " "+st+"  ")
-	if got, ok := m.Get(api.KeyTitle); !ok || got != st {
-		t.Errorf("Title is not %q, but %q", st, got)
-	}
-	addToMeta(m, api.KeyTitle, "  "+st+"\t")
-	const exp = st + " " + st
-	if got, ok := m.Get(api.KeyTitle); !ok || got != exp {
-		t.Errorf("Title is not %q, but %q", exp, got)
-	}
-
-	m = New(testID)
-	const at = "A Title"
-	addToMeta(m, api.KeyTitle, at)
-	addToMeta(m, api.KeyTitle, " ")
-	if got, ok := m.Get(api.KeyTitle); !ok || got != at {
-		t.Errorf("Title is not %q, but %q", at, got)
-	}
-}
-
-func checkSet(t *testing.T, exp []string, m *Meta, key string) {
-	t.Helper()
-	got, _ := m.GetList(key)
-	for i, tag := range exp {
-		if i < len(got) {
-			if tag != got[i] {
-				t.Errorf("Pos=%d, expected %q, got %q", i, exp[i], got[i])
-			}
-		} else {
-			t.Errorf("Expected %q, but is missing", exp[i])
-		}
-	}
-	if len(exp) < len(got) {
-		t.Errorf("Extra tags: %q", got[len(exp):])
-	}
-}
-
-func TestTagsHeader(t *testing.T) {
-	t.Parallel()
-	m := New(testID)
-	checkSet(t, []string{}, m, api.KeyTags)
-
-	addToMeta(m, api.KeyTags, "")
-	checkSet(t, []string{}, m, api.KeyTags)
-
-	addToMeta(m, api.KeyTags, "  #t1 #t2  #t3 #t4  ")
-	checkSet(t, []string{"#t1", "#t2", "#t3", "#t4"}, m, api.KeyTags)
-
-	addToMeta(m, api.KeyTags, "#t5")
-	checkSet(t, []string{"#t1", "#t2", "#t3", "#t4", "#t5"}, m, api.KeyTags)
-
-	addToMeta(m, api.KeyTags, "t6")
-	checkSet(t, []string{"#t1", "#t2", "#t3", "#t4", "#t5"}, m, api.KeyTags)
-}
-
-func TestSyntax(t *testing.T) {
-	t.Parallel()
-	m := New(testID)
-	if got, ok := m.Get(api.KeySyntax); ok || got != "" {
-		t.Errorf("Syntax is not %q, but %q", "", got)
-	}
-	addToMeta(m, api.KeySyntax, " ")
-	if got, _ := m.Get(api.KeySyntax); got != "" {
-		t.Errorf("Syntax is not %q, but %q", "", got)
-	}
-	addToMeta(m, api.KeySyntax, "MarkDown")
-	const exp = "markdown"
-	if got, ok := m.Get(api.KeySyntax); !ok || got != exp {
-		t.Errorf("Syntax is not %q, but %q", exp, got)
-	}
-	addToMeta(m, api.KeySyntax, " ")
-	if got, _ := m.Get(api.KeySyntax); got != "" {
-		t.Errorf("Syntax is not %q, but %q", "", got)
-	}
-}
-
-func checkHeader(t *testing.T, exp map[string]string, gotP []Pair) {
-	t.Helper()
-	got := make(map[string]string, len(gotP))
-	for _, p := range gotP {
-		got[p.Key] = p.Value
-		if _, ok := exp[p.Key]; !ok {
-			t.Errorf("Key %q is not expected, but has value %q", p.Key, p.Value)
-		}
-	}
-	for k, v := range exp {
-		if gv, ok := got[k]; !ok || v != gv {
-			if ok {
-				t.Errorf("Key %q is not %q, but %q", k, v, got[k])
-			} else {
-				t.Errorf("Key %q missing, should have value %q", k, v)
-			}
-		}
-	}
-}
-
-func TestDefaultHeader(t *testing.T) {
-	t.Parallel()
-	m := New(testID)
-	addToMeta(m, "h1", "d1")
-	addToMeta(m, "H2", "D2")
-	addToMeta(m, "H1", "D1.1")
-	exp := map[string]string{"h1": "d1 D1.1", "h2": "D2"}
-	checkHeader(t, exp, m.Pairs())
-	addToMeta(m, "", "d0")
-	checkHeader(t, exp, m.Pairs())
-	addToMeta(m, "h3", "")
-	exp["h3"] = ""
-	checkHeader(t, exp, m.Pairs())
-	addToMeta(m, "h3", "  ")
-	checkHeader(t, exp, m.Pairs())
-	addToMeta(m, "h4", " ")
-	exp["h4"] = ""
-	checkHeader(t, exp, m.Pairs())
-}
-
-func TestDelete(t *testing.T) {
-	t.Parallel()
-	m := New(testID)
-	m.Set("key", "val")
-	if got, ok := m.Get("key"); !ok || got != "val" {
-		t.Errorf("Value != %q, got: %v/%q", "val", ok, got)
-	}
-	m.Set("key", "")
-	if got, ok := m.Get("key"); !ok || got != "" {
-		t.Errorf("Value != %q, got: %v/%q", "", ok, got)
-	}
-	m.Delete("key")
-	if got, ok := m.Get("key"); ok || got != "" {
-		t.Errorf("Value != %q, got: %v/%q", "", ok, got)
-	}
-}
-
-func TestEqual(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		pairs1, pairs2 []string
-		allowComputed  bool
-		exp            bool
-	}{
-		{nil, nil, true, true},
-		{nil, nil, false, true},
-		{[]string{"a", "a"}, nil, false, false},
-		{[]string{"a", "a"}, nil, true, false},
-		{[]string{api.KeyFolge, "0"}, nil, true, false},
-		{[]string{api.KeyFolge, "0"}, nil, false, true},
-		{[]string{api.KeyFolge, "0"}, []string{api.KeyFolge, "0"}, true, true},
-		{[]string{api.KeyFolge, "0"}, []string{api.KeyFolge, "0"}, false, true},
-	}
-	for i, tc := range testcases {
-		m1 := pairs2meta(tc.pairs1)
-		m2 := pairs2meta(tc.pairs2)
-		got := m1.Equal(m2, tc.allowComputed)
-		if tc.exp != got {
-			t.Errorf("%d: %v =?= %v: expected=%v, but got=%v", i, tc.pairs1, tc.pairs2, tc.exp, got)
-		}
-		got = m2.Equal(m1, tc.allowComputed)
-		if tc.exp != got {
-			t.Errorf("%d: %v =!= %v: expected=%v, but got=%v", i, tc.pairs1, tc.pairs2, tc.exp, got)
-		}
-	}
-
-	// Pathologic cases
-	var m1, m2 *Meta
-	if !m1.Equal(m2, true) {
-		t.Error("Nil metas should be treated equal")
-	}
-	m1 = New(testID)
-	if m1.Equal(m2, true) {
-		t.Error("Empty meta should not be equal to nil")
-	}
-	if m2.Equal(m1, true) {
-		t.Error("Nil meta should should not be equal to empty")
-	}
-	m2 = New(testID + 1)
-	if m1.Equal(m2, true) {
-		t.Error("Different ID should differentiate")
-	}
-	if m2.Equal(m1, true) {
-		t.Error("Different ID should differentiate")
-	}
-}
-
-func pairs2meta(pairs []string) *Meta {
-	m := New(testID)
-	for i := 0; i < len(pairs); i = i + 2 {
-		m.Set(pairs[i], pairs[i+1])
-	}
-	return m
-}
-
-func TestRemoveNonGraphic(t *testing.T) {
-	testCases := []struct {
-		inp string
-		exp string
-	}{
-		{"", ""},
-		{" ", ""},
-		{"a", "a"},
-		{"a ", "a"},
-		{"a b", "a b"},
-		{"\n", ""},
-		{"a\n", "a"},
-		{"a\nb", "a b"},
-		{"a\tb", "a b"},
-	}
-	for i, tc := range testCases {
-		got := RemoveNonGraphic(tc.inp)
-		if tc.exp != got {
-			t.Errorf("%q/%d: expected %q, but got %q", tc.inp, i, tc.exp, got)
-		}
-	}
-}

DELETED domain/meta/parse.go
Index: domain/meta/parse.go
==================================================================
--- domain/meta/parse.go
+++ domain/meta/parse.go
@@ -1,177 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta
-
-import (
-	"strings"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/maps"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/input"
-	"zettelstore.de/z/strfun"
-)
-
-// NewFromInput parses the meta data of a zettel.
-func NewFromInput(zid id.Zid, inp *input.Input) *Meta {
-	if inp.Ch == '-' && inp.PeekN(0) == '-' && inp.PeekN(1) == '-' {
-		skipToEOL(inp)
-		inp.EatEOL()
-	}
-	meta := New(zid)
-	for {
-		skipSpace(inp)
-		switch inp.Ch {
-		case '\r':
-			if inp.Peek() == '\n' {
-				inp.Next()
-			}
-			fallthrough
-		case '\n':
-			inp.Next()
-			return meta
-		case input.EOS:
-			return meta
-		case '%':
-			skipToEOL(inp)
-			inp.EatEOL()
-			continue
-		}
-		parseHeader(meta, inp)
-		if inp.Ch == '-' && inp.PeekN(0) == '-' && inp.PeekN(1) == '-' {
-			skipToEOL(inp)
-			inp.EatEOL()
-			meta.YamlSep = true
-			return meta
-		}
-	}
-}
-
-func parseHeader(m *Meta, inp *input.Input) {
-	pos := inp.Pos
-	for isHeader(inp.Ch) {
-		inp.Next()
-	}
-	key := inp.Src[pos:inp.Pos]
-	skipSpace(inp)
-	if inp.Ch == ':' {
-		inp.Next()
-	}
-	var val []byte
-	for {
-		skipSpace(inp)
-		pos = inp.Pos
-		skipToEOL(inp)
-		val = append(val, inp.Src[pos:inp.Pos]...)
-		inp.EatEOL()
-		if !input.IsSpace(inp.Ch) {
-			break
-		}
-		val = append(val, ' ')
-	}
-	addToMeta(m, string(key), string(val))
-}
-
-func skipSpace(inp *input.Input) {
-	for input.IsSpace(inp.Ch) {
-		inp.Next()
-	}
-}
-
-func skipToEOL(inp *input.Input) {
-	for {
-		switch inp.Ch {
-		case '\n', '\r', input.EOS:
-			return
-		}
-		inp.Next()
-	}
-}
-
-// Return true iff rune is valid for header key.
-func isHeader(ch rune) bool {
-	return ('a' <= ch && ch <= 'z') ||
-		('0' <= ch && ch <= '9') ||
-		ch == '-' ||
-		('A' <= ch && ch <= 'Z')
-}
-
-type predValidElem func(string) bool
-
-func addToSet(set strfun.Set, elems []string, useElem predValidElem) {
-	for _, s := range elems {
-		if len(s) > 0 && useElem(s) {
-			set.Set(s)
-		}
-	}
-}
-
-func addSet(m *Meta, key, val string, useElem predValidElem) {
-	newElems := strings.Fields(val)
-	oldElems, ok := m.GetList(key)
-	if !ok {
-		oldElems = nil
-	}
-
-	set := make(strfun.Set, len(newElems)+len(oldElems))
-	addToSet(set, newElems, useElem)
-	if len(set) == 0 {
-		// Nothing to add. Maybe because of rejected elements.
-		return
-	}
-	addToSet(set, oldElems, useElem)
-	m.SetList(key, maps.Keys(set))
-}
-
-func addData(m *Meta, k, v string) {
-	if o, ok := m.Get(k); !ok || o == "" {
-		m.Set(k, v)
-	} else if v != "" {
-		m.Set(k, o+" "+v)
-	}
-}
-
-func addToMeta(m *Meta, key, val string) {
-	v := trimValue(val)
-	key = strings.ToLower(key)
-	if !KeyIsValid(key) {
-		return
-	}
-	switch key {
-	case "", api.KeyID:
-		// Empty key and 'id' key will be ignored
-		return
-	}
-
-	switch Type(key) {
-	case TypeTagSet:
-		addSet(m, key, strings.ToLower(v), func(s string) bool { return s[0] == '#' && len(s) > 1 })
-	case TypeWord:
-		m.Set(key, strings.ToLower(v))
-	case TypeWordSet:
-		addSet(m, key, strings.ToLower(v), func(s string) bool { return true })
-	case TypeID:
-		if _, err := id.Parse(v); err == nil {
-			m.Set(key, v)
-		}
-	case TypeIDSet:
-		addSet(m, key, v, func(s string) bool {
-			_, err := id.Parse(s)
-			return err == nil
-		})
-	case TypeTimestamp:
-		if _, ok := TimeValue(v); ok {
-			m.Set(key, v)
-		}
-	default:
-		addData(m, key, v)
-	}
-}

DELETED domain/meta/parse_test.go
Index: domain/meta/parse_test.go
==================================================================
--- domain/meta/parse_test.go
+++ domain/meta/parse_test.go
@@ -1,167 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta_test
-
-import (
-	"strings"
-	"testing"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/input"
-)
-
-func parseMetaStr(src string) *meta.Meta {
-	return meta.NewFromInput(testID, input.NewInput([]byte(src)))
-}
-
-func TestEmpty(t *testing.T) {
-	t.Parallel()
-	m := parseMetaStr("")
-	if got, ok := m.Get(api.KeySyntax); ok || got != "" {
-		t.Errorf("Syntax is not %q, but %q", "", got)
-	}
-	if got, ok := m.GetList(api.KeyTags); ok || len(got) > 0 {
-		t.Errorf("Tags are not nil, but %v", got)
-	}
-}
-
-func TestTitle(t *testing.T) {
-	t.Parallel()
-	td := []struct{ s, e string }{
-		{api.KeyTitle + ": a title", "a title"},
-		{api.KeyTitle + ": a\n\t title", "a title"},
-		{api.KeyTitle + ": a\n\t title\r\n  x", "a title x"},
-		{api.KeyTitle + " AbC", "AbC"},
-		{api.KeyTitle + " AbC\n ded", "AbC ded"},
-		{api.KeyTitle + ": o\ntitle: p", "o p"},
-		{api.KeyTitle + ": O\n\ntitle: P", "O"},
-		{api.KeyTitle + ": b\r\ntitle: c", "b c"},
-		{api.KeyTitle + ": B\r\n\r\ntitle: C", "B"},
-		{api.KeyTitle + ": r\rtitle: q", "r q"},
-		{api.KeyTitle + ": R\r\rtitle: Q", "R"},
-	}
-	for i, tc := range td {
-		m := parseMetaStr(tc.s)
-		if got, ok := m.Get(api.KeyTitle); !ok || got != tc.e {
-			t.Log(m)
-			t.Errorf("TC=%d: expected %q, got %q", i, tc.e, got)
-		}
-	}
-}
-
-func TestTags(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		src string
-		exp string
-	}{
-		{"", ""},
-		{api.KeyTags + ":", ""},
-		{api.KeyTags + ": c", ""},
-		{api.KeyTags + ": #", ""},
-		{api.KeyTags + ": #c", "c"},
-		{api.KeyTags + ": #c #", "c"},
-		{api.KeyTags + ": #c #b", "b c"},
-		{api.KeyTags + ": #c # #", "c"},
-		{api.KeyTags + ": #c # #b", "b c"},
-	}
-	for i, tc := range testcases {
-		m := parseMetaStr(tc.src)
-		tags, found := m.GetTags(api.KeyTags)
-		if !found {
-			if tc.exp != "" {
-				t.Errorf("%d / %q: no %s found", i, tc.src, api.KeyTags)
-			}
-			continue
-		}
-		if tc.exp == "" && len(tags) > 0 {
-			t.Errorf("%d / %q: expected no %s, but got %v", i, tc.src, api.KeyTags, tags)
-			continue
-		}
-		got := strings.Join(tags, " ")
-		if tc.exp != got {
-			t.Errorf("%d / %q: expected %q, got: %q", i, tc.src, tc.exp, got)
-		}
-	}
-}
-
-func TestNewFromInput(t *testing.T) {
-	t.Parallel()
-	testcases := []struct {
-		input string
-		exp   []meta.Pair
-	}{
-		{"", []meta.Pair{}},
-		{" a:b", []meta.Pair{{"a", "b"}}},
-		{"%a:b", []meta.Pair{}},
-		{"a:b\r\n\r\nc:d", []meta.Pair{{"a", "b"}}},
-		{"a:b\r\n%c:d", []meta.Pair{{"a", "b"}}},
-		{"% a:b\r\n c:d", []meta.Pair{{"c", "d"}}},
-		{"---\r\na:b\r\n", []meta.Pair{{"a", "b"}}},
-		{"---\r\na:b\r\n--\r\nc:d", []meta.Pair{{"a", "b"}, {"c", "d"}}},
-		{"---\r\na:b\r\n---\r\nc:d", []meta.Pair{{"a", "b"}}},
-		{"---\r\na:b\r\n----\r\nc:d", []meta.Pair{{"a", "b"}}},
-		{"new-title:\nnew-url:", []meta.Pair{{"new-title", ""}, {"new-url", ""}}},
-	}
-	for i, tc := range testcases {
-		meta := parseMetaStr(tc.input)
-		if got := meta.Pairs(); !equalPairs(tc.exp, got) {
-			t.Errorf("TC=%d: expected=%v, got=%v", i, tc.exp, got)
-		}
-	}
-
-	// Test, whether input position is correct.
-	inp := input.NewInput([]byte("---\na:b\n---\nX"))
-	m := meta.NewFromInput(testID, inp)
-	exp := []meta.Pair{{"a", "b"}}
-	if got := m.Pairs(); !equalPairs(exp, got) {
-		t.Errorf("Expected=%v, got=%v", exp, got)
-	}
-	expCh := 'X'
-	if gotCh := inp.Ch; gotCh != expCh {
-		t.Errorf("Expected=%v, got=%v", expCh, gotCh)
-	}
-}
-
-func equalPairs(one, two []meta.Pair) bool {
-	if len(one) != len(two) {
-		return false
-	}
-	for i := 0; i < len(one); i++ {
-		if one[i].Key != two[i].Key || one[i].Value != two[i].Value {
-			return false
-		}
-	}
-	return true
-}
-
-func TestPrecursorIDSet(t *testing.T) {
-	t.Parallel()
-	var testdata = []struct {
-		inp string
-		exp string
-	}{
-		{"", ""},
-		{"123", ""},
-		{"12345678901234", "12345678901234"},
-		{"123 12345678901234", "12345678901234"},
-		{"12345678901234 123", "12345678901234"},
-		{"01234567890123 123 12345678901234", "01234567890123 12345678901234"},
-		{"12345678901234 01234567890123", "01234567890123 12345678901234"},
-	}
-	for i, tc := range testdata {
-		m := parseMetaStr(api.KeyPrecursor + ": " + tc.inp)
-		if got, ok := m.Get(api.KeyPrecursor); (!ok && tc.exp != "") || tc.exp != got {
-			t.Errorf("TC=%d: expected %q, but got %q when parsing %q", i, tc.exp, got, tc.inp)
-		}
-	}
-}

DELETED domain/meta/type.go
Index: domain/meta/type.go
==================================================================
--- domain/meta/type.go
+++ domain/meta/type.go
@@ -1,207 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta
-
-import (
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-)
-
-// DescriptionType is a description of a specific key type.
-type DescriptionType struct {
-	Name  string
-	IsSet bool
-}
-
-// String returns the string representation of the given type
-func (t DescriptionType) String() string { return t.Name }
-
-var registeredTypes = make(map[string]*DescriptionType)
-
-func registerType(name string, isSet bool) *DescriptionType {
-	if _, ok := registeredTypes[name]; ok {
-		panic("Type '" + name + "' already registered")
-	}
-	t := &DescriptionType{name, isSet}
-	registeredTypes[name] = t
-	return t
-}
-
-// Supported key types.
-var (
-	TypeCredential   = registerType(api.MetaCredential, false)
-	TypeEmpty        = registerType(api.MetaEmpty, false)
-	TypeID           = registerType(api.MetaID, false)
-	TypeIDSet        = registerType(api.MetaIDSet, true)
-	TypeNumber       = registerType(api.MetaNumber, false)
-	TypeString       = registerType(api.MetaString, false)
-	TypeTagSet       = registerType(api.MetaTagSet, true)
-	TypeTimestamp    = registerType(api.MetaTimestamp, false)
-	TypeURL          = registerType(api.MetaURL, false)
-	TypeWord         = registerType(api.MetaWord, false)
-	TypeWordSet      = registerType(api.MetaWordSet, true)
-	TypeZettelmarkup = registerType(api.MetaZettelmarkup, false)
-)
-
-// Type returns a type hint for the given key. If no type hint is specified,
-// TypeUnknown is returned.
-func (*Meta) Type(key string) *DescriptionType {
-	return Type(key)
-}
-
-var (
-	cachedTypedKeys = make(map[string]*DescriptionType)
-	mxTypedKey      sync.RWMutex
-	suffixTypes     = map[string]*DescriptionType{
-		"-number": TypeNumber,
-		"-role":   TypeWord,
-		"-set":    TypeWordSet,
-		"-title":  TypeZettelmarkup,
-		"-url":    TypeURL,
-		"-zettel": TypeID,
-		"-zid":    TypeID,
-		"-zids":   TypeIDSet,
-	}
-)
-
-// Type returns a type hint for the given key. If no type hint is specified,
-// TypeEmpty is returned.
-func Type(key string) *DescriptionType {
-	if k, ok := registeredKeys[key]; ok {
-		return k.Type
-	}
-	mxTypedKey.RLock()
-	k, ok := cachedTypedKeys[key]
-	mxTypedKey.RUnlock()
-	if ok {
-		return k
-	}
-	for suffix, t := range suffixTypes {
-		if strings.HasSuffix(key, suffix) {
-			mxTypedKey.Lock()
-			defer mxTypedKey.Unlock()
-			cachedTypedKeys[key] = t
-			return t
-		}
-	}
-	return TypeEmpty
-}
-
-// SetList stores the given string list value under the given key.
-func (m *Meta) SetList(key string, values []string) {
-	if key != api.KeyID {
-		for i, val := range values {
-			values[i] = trimValue(val)
-		}
-		m.pairs[key] = strings.Join(values, " ")
-	}
-}
-
-// SetNow stores the current timestamp under the given key.
-func (m *Meta) SetNow(key string) {
-	m.Set(key, time.Now().Local().Format(id.ZidLayout))
-}
-
-// BoolValue returns the value interpreted as a bool.
-func BoolValue(value string) bool {
-	if len(value) > 0 {
-		switch value[0] {
-		case '0', 'f', 'F', 'n', 'N':
-			return false
-		}
-	}
-	return true
-}
-
-// GetBool returns the boolean value of the given key.
-func (m *Meta) GetBool(key string) bool {
-	if value, ok := m.Get(key); ok {
-		return BoolValue(value)
-	}
-	return false
-}
-
-// TimeValue returns the time value of the given value.
-func TimeValue(value string) (time.Time, bool) {
-	if t, err := time.Parse(id.ZidLayout, value); err == nil {
-		return t, true
-	}
-	return time.Time{}, false
-}
-
-// GetTime returns the time value of the given key.
-func (m *Meta) GetTime(key string) (time.Time, bool) {
-	if value, ok := m.Get(key); ok {
-		return TimeValue(value)
-	}
-	return time.Time{}, false
-}
-
-// ListFromValue transforms a string value into a list value.
-func ListFromValue(value string) []string {
-	return strings.Fields(value)
-}
-
-// GetList retrieves the string list value of a given key. The bool value
-// signals, whether there was a value stored or not.
-func (m *Meta) GetList(key string) ([]string, bool) {
-	value, ok := m.Get(key)
-	if !ok {
-		return nil, false
-	}
-	return ListFromValue(value), true
-}
-
-// GetTags returns the list of tags as a string list. Each tag does not begin
-// with the '#' character, in contrast to `GetList`.
-func (m *Meta) GetTags(key string) ([]string, bool) {
-	tagsValue, ok := m.Get(key)
-	if !ok {
-		return nil, false
-	}
-	tags := ListFromValue(strings.ToLower(tagsValue))
-	for i, tag := range tags {
-		tags[i] = CleanTag(tag)
-	}
-	return tags, len(tags) > 0
-}
-
-// CleanTag removes the number character ('#') from a tag value and lowercases it.
-func CleanTag(tag string) string {
-	if len(tag) > 1 && tag[0] == '#' {
-		return tag[1:]
-	}
-	return tag
-}
-
-// GetListOrNil retrieves the string list value of a given key. If there was
-// nothing stores, a nil list is returned.
-func (m *Meta) GetListOrNil(key string) []string {
-	if value, ok := m.GetList(key); ok {
-		return value
-	}
-	return nil
-}
-
-// GetNumber retrieves the numeric value of a given key.
-func (m *Meta) GetNumber(key string, def int64) int64 {
-	if value, ok := m.Get(key); ok {
-		if num, err := strconv.ParseInt(value, 10, 64); err == nil {
-			return num
-		}
-	}
-	return def
-}

DELETED domain/meta/type_test.go
Index: domain/meta/type_test.go
==================================================================
--- domain/meta/type_test.go
+++ domain/meta/type_test.go
@@ -1,64 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta_test
-
-import (
-	"strconv"
-	"testing"
-	"time"
-
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-)
-
-func TestNow(t *testing.T) {
-	t.Parallel()
-	m := meta.New(id.Invalid)
-	m.SetNow("key")
-	val, ok := m.Get("key")
-	if !ok {
-		t.Error("Unable to get value of key")
-	}
-	if len(val) != 14 {
-		t.Errorf("Value is not 14 digits long: %q", val)
-	}
-	if _, err := strconv.ParseInt(val, 10, 64); err != nil {
-		t.Errorf("Unable to parse %q as an int64: %v", val, err)
-	}
-	if _, ok = m.GetTime("key"); !ok {
-		t.Errorf("Unable to get time from value %q", val)
-	}
-}
-
-func TestGetTime(t *testing.T) {
-	t.Parallel()
-	testCases := []struct {
-		value string
-		valid bool
-		exp   time.Time
-	}{
-		{"", false, time.Time{}},
-		{"1", false, time.Time{}},
-		{"00000000000000", false, time.Time{}},
-		{"98765432109876", false, time.Time{}},
-		{"20201221111905", true, time.Date(2020, time.December, 21, 11, 19, 5, 0, time.UTC)},
-	}
-	for i, tc := range testCases {
-		got, ok := meta.TimeValue(tc.value)
-		if ok != tc.valid {
-			t.Errorf("%d: parsing of %q should be %v, but got %v", i, tc.value, tc.valid, ok)
-			continue
-		}
-		if got != tc.exp {
-			t.Errorf("%d: parsing of %q should return %v, but got %v", i, tc.value, tc.exp, got)
-		}
-	}
-}

DELETED domain/meta/values.go
Index: domain/meta/values.go
==================================================================
--- domain/meta/values.go
+++ domain/meta/values.go
@@ -1,110 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta
-
-import (
-	"fmt"
-
-	"zettelstore.de/c/api"
-)
-
-// Supported syntax values.
-const (
-	SyntaxCSS      = api.ValueSyntaxCSS
-	SyntaxDraw     = api.ValueSyntaxDraw
-	SyntaxGif      = api.ValueSyntaxGif
-	SyntaxHTML     = api.ValueSyntaxHTML
-	SyntaxJPEG     = "jpeg"
-	SyntaxJPG      = "jpg"
-	SyntaxMarkdown = api.ValueSyntaxMarkdown
-	SyntaxMD       = api.ValueSyntaxMD
-	SyntaxMustache = api.ValueSyntaxMustache
-	SyntaxNone     = api.ValueSyntaxNone
-	SyntaxPlain    = "plain"
-	SyntaxPNG      = "png"
-	SyntaxSVG      = api.ValueSyntaxSVG
-	SyntaxText     = api.ValueSyntaxText
-	SyntaxTxt      = "txt"
-	SyntaxWebp     = "webp"
-	SyntaxZmk      = api.ValueSyntaxZmk
-)
-
-// Visibility enumerates the variations of the 'visibility' meta key.
-type Visibility int
-
-// Supported values for visibility.
-const (
-	_ Visibility = iota
-	VisibilityUnknown
-	VisibilityPublic
-	VisibilityCreator
-	VisibilityLogin
-	VisibilityOwner
-	VisibilityExpert
-)
-
-var visMap = map[string]Visibility{
-	api.ValueVisibilityPublic:  VisibilityPublic,
-	api.ValueVisibilityCreator: VisibilityCreator,
-	api.ValueVisibilityLogin:   VisibilityLogin,
-	api.ValueVisibilityOwner:   VisibilityOwner,
-	api.ValueVisibilityExpert:  VisibilityExpert,
-}
-var revVisMap = map[Visibility]string{}
-
-func init() {
-	for k, v := range visMap {
-		revVisMap[v] = k
-	}
-}
-
-// GetVisibility returns the visibility value of the given string
-func GetVisibility(val string) Visibility {
-	if vis, ok := visMap[val]; ok {
-		return vis
-	}
-	return VisibilityUnknown
-}
-
-func (v Visibility) String() string {
-	if s, ok := revVisMap[v]; ok {
-		return s
-	}
-	return fmt.Sprintf("Unknown (%d)", v)
-}
-
-// UserRole enumerates the supported values of meta key 'user-role'.
-type UserRole int
-
-// Supported values for user roles.
-const (
-	_ UserRole = iota
-	UserRoleUnknown
-	UserRoleCreator
-	UserRoleReader
-	UserRoleWriter
-	UserRoleOwner
-)
-
-var urMap = map[string]UserRole{
-	api.ValueUserRoleCreator: UserRoleCreator,
-	api.ValueUserRoleReader:  UserRoleReader,
-	api.ValueUserRoleWriter:  UserRoleWriter,
-	api.ValueUserRoleOwner:   UserRoleOwner,
-}
-
-// GetUserRole role returns the user role of the given string.
-func GetUserRole(val string) UserRole {
-	if ur, ok := urMap[val]; ok {
-		return ur
-	}
-	return UserRoleUnknown
-}

DELETED domain/meta/write.go
Index: domain/meta/write.go
==================================================================
--- domain/meta/write.go
+++ domain/meta/write.go
@@ -1,57 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta
-
-import "io"
-
-// Write writes metadata to a writer, excluding computed and propery values.
-func (m *Meta) Write(w io.Writer) (int, error) {
-	return m.doWrite(w, IsComputed)
-}
-
-// WriteComputed writes metadata to a writer, including computed values,
-// but excluding property values.
-func (m *Meta) WriteComputed(w io.Writer) (int, error) {
-	return m.doWrite(w, IsProperty)
-}
-
-func (m *Meta) doWrite(w io.Writer, ignoreKeyPred func(string) bool) (length int, err error) {
-	for _, p := range m.ComputedPairs() {
-		key := p.Key
-		if ignoreKeyPred(key) {
-			continue
-		}
-		if err != nil {
-			break
-		}
-		var l int
-		l, err = io.WriteString(w, key)
-		length += l
-		if err == nil {
-			l, err = w.Write(colonSpace)
-			length += l
-		}
-		if err == nil {
-			l, err = io.WriteString(w, p.Value)
-			length += l
-		}
-		if err == nil {
-			l, err = w.Write(newline)
-			length += l
-		}
-	}
-	return length, err
-}
-
-var (
-	colonSpace = []byte{':', ' '}
-	newline    = []byte{'\n'}
-)

DELETED domain/meta/write_test.go
Index: domain/meta/write_test.go
==================================================================
--- domain/meta/write_test.go
+++ domain/meta/write_test.go
@@ -1,57 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package meta_test
-
-import (
-	"strings"
-	"testing"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-)
-
-const testID = id.Zid(98765432101234)
-
-func newMeta(title string, tags []string, syntax string) *meta.Meta {
-	m := meta.New(testID)
-	if title != "" {
-		m.Set(api.KeyTitle, title)
-	}
-	if tags != nil {
-		m.Set(api.KeyTags, strings.Join(tags, " "))
-	}
-	if syntax != "" {
-		m.Set(api.KeySyntax, syntax)
-	}
-	return m
-}
-func assertWriteMeta(t *testing.T, m *meta.Meta, expected string) {
-	t.Helper()
-	var sb strings.Builder
-	m.Write(&sb)
-	if got := sb.String(); got != expected {
-		t.Errorf("\nExp: %q\ngot: %q", expected, got)
-	}
-}
-
-func TestWriteMeta(t *testing.T) {
-	t.Parallel()
-	assertWriteMeta(t, newMeta("", nil, ""), "")
-
-	m := newMeta("TITLE", []string{"#t1", "#t2"}, "syntax")
-	assertWriteMeta(t, m, "title: TITLE\ntags: #t1 #t2\nsyntax: syntax\n")
-
-	m = newMeta("TITLE", nil, "")
-	m.Set("user", "zettel")
-	m.Set("auth", "basic")
-	assertWriteMeta(t, m, "title: TITLE\nauth: basic\nuser: zettel\n")
-}

DELETED domain/zettel.go
Index: domain/zettel.go
==================================================================
--- domain/zettel.go
+++ domain/zettel.go
@@ -1,29 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-// Package domain provides domain specific types, constants, and functions.
-package domain
-
-import "zettelstore.de/z/domain/meta"
-
-// Zettel is the main data object of a zettelstore.
-type Zettel struct {
-	Meta    *meta.Meta // Some additional meta-data.
-	Content Content    // The content of the zettel itself.
-}
-
-// Length returns the number of bytes to store the zettel (in a domain view,
-// not in a technical view).
-func (z Zettel) Length() int { return z.Meta.Length() + z.Content.Length() }
-
-// Equal compares two zettel for equality.
-func (z Zettel) Equal(o Zettel, allowComputed bool) bool {
-	return z.Meta.Equal(o.Meta, allowComputed) && z.Content.Equal(&o.Content)
-}

Index: encoder/encoder.go
==================================================================
--- encoder/encoder.go
+++ encoder/encoder.go
@@ -15,13 +15,13 @@
 import (
 	"errors"
 	"fmt"
 	"io"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Encoder is an interface that allows to encode different parts of a zettel.
 type Encoder interface {
 	WriteZettel(io.Writer, *ast.ZettelNode, EvalMetaFunc) (int, error)
@@ -43,19 +43,24 @@
 	ErrNoWriteBlocks  = errors.New("method WriteBlocks is not implemented")
 	ErrNoWriteInlines = errors.New("method WriteInlines is not implemented")
 )
 
 // Create builds a new encoder with the given options.
-func Create(enc api.EncodingEnum) Encoder {
+func Create(enc api.EncodingEnum, params *CreateParameter) Encoder {
 	if create, ok := registry[enc]; ok {
-		return create()
+		return create(params)
 	}
 	return nil
 }
 
 // CreateFunc produces a new encoder.
-type CreateFunc func() Encoder
+type CreateFunc func(*CreateParameter) Encoder
+
+// CreateParameter contains values that are needed to create an encoder.
+type CreateParameter struct {
+	Lang string // default language
+}
 
 var registry = map[api.EncodingEnum]CreateFunc{}
 
 // Register the encoder for later retrieval.
 func Register(enc api.EncodingEnum, create CreateFunc) {

Index: encoder/encoder_blob_test.go
==================================================================
--- encoder/encoder_blob_test.go
+++ encoder/encoder_blob_test.go
@@ -11,16 +11,16 @@
 package encoder_test
 
 import (
 	"testing"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 
 	_ "zettelstore.de/z/parser/blob" // Allow to use BLOB parser.
 )
 
 type blobTestCase struct {
@@ -39,11 +39,11 @@
 			0x06, 0x00, 0x03, 0x36, 0x37, 0x7c, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
 			0x42, 0x60, 0x82,
 		},
 		expect: expectMap{
 			encoderHTML:  `<p><img alt="PNG" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=="></p>`,
-			encoderSexpr: `(BLOCK (BLOB (INLINE (TEXT "PNG")) "png" "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=="))`,
+			encoderSz:    `(BLOCK (BLOB (INLINE (TEXT "PNG")) "png" "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=="))`,
 			encoderSHTML: `((p (img (@ (alt . "PNG") (src . "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg==")))))`,
 			encoderText:  "",
 			encoderZmk:   `%% Unable to display BLOB with description 'PNG' and syntax 'png'.`,
 		},
 	},

Index: encoder/encoder_block_test.go
==================================================================
--- encoder/encoder_block_test.go
+++ encoder/encoder_block_test.go
@@ -15,11 +15,11 @@
 		descr: "Empty Zettelmarkup should produce near nothing",
 		zmk:   "",
 		expect: expectMap{
 			encoderHTML:  "",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK)`,
+			encoderSz:    `(BLOCK)`,
 			encoderSHTML: `()`,
 			encoderText:  "",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -27,11 +27,11 @@
 		descr: "Simple text: Hello, world",
 		zmk:   "Hello, world",
 		expect: expectMap{
 			encoderHTML:  "<p>Hello, world</p>",
 			encoderMD:    "Hello, world",
-			encoderSexpr: `(BLOCK (PARA (TEXT "Hello,") (SPACE) (TEXT "world")))`,
+			encoderSz:    `(BLOCK (PARA (TEXT "Hello,") (SPACE) (TEXT "world")))`,
 			encoderSHTML: `((p "Hello," " " "world"))`,
 			encoderText:  "Hello, world",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -39,11 +39,11 @@
 		descr: "Simple block comment",
 		zmk:   "%%%\nNo\nrender\n%%%",
 		expect: expectMap{
 			encoderHTML:  ``,
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (VERBATIM-COMMENT () "No\nrender"))`,
+			encoderSz:    `(BLOCK (VERBATIM-COMMENT () "No\nrender"))`,
 			encoderSHTML: `(())`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -51,11 +51,11 @@
 		descr: "Rendered block comment",
 		zmk:   "%%%{-}\nRender\n%%%",
 		expect: expectMap{
 			encoderHTML:  "<!--\nRender\n-->\n",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (VERBATIM-COMMENT (quote (("-" . ""))) "Render"))`,
+			encoderSz:    `(BLOCK (VERBATIM-COMMENT (quote (("-" . ""))) "Render"))`,
 			encoderSHTML: "((@@@ \"Render\"))",
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -63,11 +63,11 @@
 		descr: "Simple Heading",
 		zmk:   `=== Top`,
 		expect: expectMap{
 			encoderHTML:  "<h2 id=\"top\">Top</h2>",
 			encoderMD:    "# Top",
-			encoderSexpr: `(BLOCK (HEADING 1 () "top" "top" (INLINE (TEXT "Top"))))`,
+			encoderSz:    `(BLOCK (HEADING 1 () "top" "top" (INLINE (TEXT "Top"))))`,
 			encoderSHTML: `((h2 (@ (id . "top")) "Top"))`,
 			encoderText:  `Top`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -75,11 +75,11 @@
 		descr: "Simple List",
 		zmk:   "* A\n* B\n* C",
 		expect: expectMap{
 			encoderHTML:  "<ul><li>A</li><li>B</li><li>C</li></ul>",
 			encoderMD:    "* A\n* B\n* C",
-			encoderSexpr: `(BLOCK (UNORDERED (INLINE (TEXT "A")) (INLINE (TEXT "B")) (INLINE (TEXT "C"))))`,
+			encoderSz:    `(BLOCK (UNORDERED (INLINE (TEXT "A")) (INLINE (TEXT "B")) (INLINE (TEXT "C"))))`,
 			encoderSHTML: `((ul (li "A") (li "B") (li "C")))`,
 			encoderText:  "A\nB\nC",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -87,11 +87,11 @@
 		descr: "Nested List",
 		zmk:   "* T1\n** T2\n* T3\n** T4\n** T5\n* T6",
 		expect: expectMap{
 			encoderHTML:  `<ul><li><p>T1</p><ul><li>T2</li></ul></li><li><p>T3</p><ul><li>T4</li><li>T5</li></ul></li><li><p>T6</p></li></ul>`,
 			encoderMD:    "* T1\n    * T2\n* T3\n    * T4\n    * T5\n* T6",
-			encoderSexpr: `(BLOCK (UNORDERED (BLOCK (PARA (TEXT "T1")) (UNORDERED (INLINE (TEXT "T2")))) (BLOCK (PARA (TEXT "T3")) (UNORDERED (INLINE (TEXT "T4")) (INLINE (TEXT "T5")))) (BLOCK (PARA (TEXT "T6")))))`,
+			encoderSz:    `(BLOCK (UNORDERED (BLOCK (PARA (TEXT "T1")) (UNORDERED (INLINE (TEXT "T2")))) (BLOCK (PARA (TEXT "T3")) (UNORDERED (INLINE (TEXT "T4")) (INLINE (TEXT "T5")))) (BLOCK (PARA (TEXT "T6")))))`,
 			encoderSHTML: `((ul (li (p "T1") (ul (li "T2"))) (li (p "T3") (ul (li "T4") (li "T5"))) (li (p "T6"))))`,
 			encoderText:  "T1\nT2\nT3\nT4\nT5\nT6",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -99,11 +99,11 @@
 		descr: "Sequence of two lists",
 		zmk:   "* Item1.1\n* Item1.2\n* Item1.3\n\n* Item2.1\n* Item2.2",
 		expect: expectMap{
 			encoderHTML:  "<ul><li>Item1.1</li><li>Item1.2</li><li>Item1.3</li><li>Item2.1</li><li>Item2.2</li></ul>",
 			encoderMD:    "* Item1.1\n* Item1.2\n* Item1.3\n* Item2.1\n* Item2.2",
-			encoderSexpr: `(BLOCK (UNORDERED (INLINE (TEXT "Item1.1")) (INLINE (TEXT "Item1.2")) (INLINE (TEXT "Item1.3")) (INLINE (TEXT "Item2.1")) (INLINE (TEXT "Item2.2"))))`,
+			encoderSz:    `(BLOCK (UNORDERED (INLINE (TEXT "Item1.1")) (INLINE (TEXT "Item1.2")) (INLINE (TEXT "Item1.3")) (INLINE (TEXT "Item2.1")) (INLINE (TEXT "Item2.2"))))`,
 			encoderSHTML: `((ul (li "Item1.1") (li "Item1.2") (li "Item1.3") (li "Item2.1") (li "Item2.2")))`,
 			encoderText:  "Item1.1\nItem1.2\nItem1.3\nItem2.1\nItem2.2",
 			encoderZmk:   "* Item1.1\n* Item1.2\n* Item1.3\n* Item2.1\n* Item2.2",
 		},
 	},
@@ -111,11 +111,11 @@
 		descr: "Simple horizontal rule",
 		zmk:   `---`,
 		expect: expectMap{
 			encoderHTML:  "<hr>",
 			encoderMD:    "---",
-			encoderSexpr: `(BLOCK (THEMATIC ()))`,
+			encoderSz:    `(BLOCK (THEMATIC ()))`,
 			encoderSHTML: `((hr))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -123,11 +123,11 @@
 		descr: "Thematic break with attribute",
 		zmk:   `---{lang="zmk"}`,
 		expect: expectMap{
 			encoderHTML:  `<hr lang="zmk">`,
 			encoderMD:    "---",
-			encoderSexpr: `(BLOCK (THEMATIC (quote (("lang" . "zmk")))))`,
+			encoderSz:    `(BLOCK (THEMATIC (quote (("lang" . "zmk")))))`,
 			encoderSHTML: `((hr (@ (lang . "zmk"))))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -135,11 +135,11 @@
 		descr: "No list after paragraph",
 		zmk:   "Text\n*abc",
 		expect: expectMap{
 			encoderHTML:  "<p>Text *abc</p>",
 			encoderMD:    "Text\n*abc",
-			encoderSexpr: `(BLOCK (PARA (TEXT "Text") (SOFT) (TEXT "*abc")))`,
+			encoderSz:    `(BLOCK (PARA (TEXT "Text") (SOFT) (TEXT "*abc")))`,
 			encoderSHTML: `((p "Text" " " "*abc"))`,
 			encoderText:  `Text *abc`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -147,11 +147,11 @@
 		descr: "A list after paragraph",
 		zmk:   "Text\n# abc",
 		expect: expectMap{
 			encoderHTML:  "<p>Text</p><ol><li>abc</li></ol>",
 			encoderMD:    "Text\n\n1. abc",
-			encoderSexpr: `(BLOCK (PARA (TEXT "Text")) (ORDERED (INLINE (TEXT "abc"))))`,
+			encoderSz:    `(BLOCK (PARA (TEXT "Text")) (ORDERED (INLINE (TEXT "abc"))))`,
 			encoderSHTML: `((p "Text") (ol (li "abc")))`,
 			encoderText:  "Text\nabc",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -159,11 +159,11 @@
 		descr: "Simple List Quote",
 		zmk:   "> ToBeOrNotToBe",
 		expect: expectMap{
 			encoderHTML:  "<blockquote><p>ToBeOrNotToBe</p></blockquote>",
 			encoderMD:    "> ToBeOrNotToBe",
-			encoderSexpr: `(BLOCK (QUOTATION (INLINE (TEXT "ToBeOrNotToBe"))))`,
+			encoderSz:    `(BLOCK (QUOTATION (INLINE (TEXT "ToBeOrNotToBe"))))`,
 			encoderSHTML: `((blockquote (p "ToBeOrNotToBe")))`,
 			encoderText:  "ToBeOrNotToBe",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -171,11 +171,11 @@
 		descr: "Simple Quote Block",
 		zmk:   "<<<\nToBeOrNotToBe\n<<< Romeo",
 		expect: expectMap{
 			encoderHTML:  "<blockquote><p>ToBeOrNotToBe</p><cite>Romeo</cite></blockquote>",
 			encoderMD:    "> ToBeOrNotToBe",
-			encoderSexpr: `(BLOCK (REGION-QUOTE () (BLOCK (PARA (TEXT "ToBeOrNotToBe"))) (INLINE (TEXT "Romeo"))))`,
+			encoderSz:    `(BLOCK (REGION-QUOTE () (BLOCK (PARA (TEXT "ToBeOrNotToBe"))) (INLINE (TEXT "Romeo"))))`,
 			encoderSHTML: `((blockquote (p "ToBeOrNotToBe") (cite "Romeo")))`,
 			encoderText:  "ToBeOrNotToBe\nRomeo",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -183,11 +183,11 @@
 		descr: "Quote Block with multiple paragraphs",
 		zmk:   "<<<\nToBeOr\n\nNotToBe\n<<< Romeo",
 		expect: expectMap{
 			encoderHTML:  "<blockquote><p>ToBeOr</p><p>NotToBe</p><cite>Romeo</cite></blockquote>",
 			encoderMD:    "> ToBeOr\n\n> NotToBe",
-			encoderSexpr: `(BLOCK (REGION-QUOTE () (BLOCK (PARA (TEXT "ToBeOr")) (PARA (TEXT "NotToBe"))) (INLINE (TEXT "Romeo"))))`,
+			encoderSz:    `(BLOCK (REGION-QUOTE () (BLOCK (PARA (TEXT "ToBeOr")) (PARA (TEXT "NotToBe"))) (INLINE (TEXT "Romeo"))))`,
 			encoderSHTML: `((blockquote (p "ToBeOr") (p "NotToBe") (cite "Romeo")))`,
 			encoderText:  "ToBeOr\nNotToBe\nRomeo",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -203,11 +203,11 @@
     Spacy  Para
 """ Author`,
 		expect: expectMap{
 			encoderHTML:  "<div><p>A\u00a0line<br>\u00a0\u00a0another\u00a0line<br>Back</p><p>Paragraph</p><p>\u00a0\u00a0\u00a0\u00a0Spacy\u00a0\u00a0Para</p><cite>Author</cite></div>",
 			encoderMD:    "",
-			encoderSexpr: "(BLOCK (REGION-VERSE () (BLOCK (PARA (TEXT \"A\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (SPACE \"\u00a0\u00a0\") (TEXT \"another\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (TEXT \"Back\")) (PARA (TEXT \"Paragraph\")) (PARA (SPACE \"\u00a0\u00a0\u00a0\u00a0\") (TEXT \"Spacy\") (SPACE \"\u00a0\u00a0\") (TEXT \"Para\"))) (INLINE (TEXT \"Author\"))))",
+			encoderSz:    "(BLOCK (REGION-VERSE () (BLOCK (PARA (TEXT \"A\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (SPACE \"\u00a0\u00a0\") (TEXT \"another\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (TEXT \"Back\")) (PARA (TEXT \"Paragraph\")) (PARA (SPACE \"\u00a0\u00a0\u00a0\u00a0\") (TEXT \"Spacy\") (SPACE \"\u00a0\u00a0\") (TEXT \"Para\"))) (INLINE (TEXT \"Author\"))))",
 			encoderSHTML: "((div (p \"A\" \"\u00a0\" \"line\" (br) \"\u00a0\u00a0\" \"another\" \"\u00a0\" \"line\" (br) \"Back\") (p \"Paragraph\") (p \"\u00a0\u00a0\u00a0\u00a0\" \"Spacy\" \"\u00a0\u00a0\" \"Para\") (cite \"Author\")))",
 			encoderText:  "A line\n another line\nBack\nParagraph\n Spacy Para\nAuthor",
 			encoderZmk:   "\"\"\"\nA\u00a0line\\\n\u00a0\u00a0another\u00a0line\\\nBack\nParagraph\n\u00a0\u00a0\u00a0\u00a0Spacy\u00a0\u00a0Para\n\"\"\" Author",
 		},
 	},
@@ -219,11 +219,11 @@
 and much more
 :::`,
 		expect: expectMap{
 			encoderHTML:  "<div><p>A simple  span and much more</p></div>",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (REGION-BLOCK () (BLOCK (PARA (TEXT "A") (SPACE) (TEXT "simple") (SOFT) (SPACE) (TEXT "span") (SOFT) (TEXT "and") (SPACE) (TEXT "much") (SPACE) (TEXT "more"))) (INLINE)))`,
+			encoderSz:    `(BLOCK (REGION-BLOCK () (BLOCK (PARA (TEXT "A") (SPACE) (TEXT "simple") (SOFT) (SPACE) (TEXT "span") (SOFT) (TEXT "and") (SPACE) (TEXT "much") (SPACE) (TEXT "more"))) (INLINE)))`,
 			encoderSHTML: `((div (p "A" " " "simple" " " " " "span" " " "and" " " "much" " " "more")))`,
 			encoderText:  `A simple  span and much more`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -231,11 +231,11 @@
 		descr: "Simple Verbatim Code",
 		zmk:   "```\nHello\nWorld\n```",
 		expect: expectMap{
 			encoderHTML:  "<pre><code>Hello\nWorld</code></pre>",
 			encoderMD:    "    Hello\n    World",
-			encoderSexpr: `(BLOCK (VERBATIM-CODE () "Hello\nWorld"))`,
+			encoderSz:    `(BLOCK (VERBATIM-CODE () "Hello\nWorld"))`,
 			encoderSHTML: `((pre (code "Hello\nWorld")))`,
 			encoderText:  "Hello\nWorld",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -243,11 +243,11 @@
 		descr: "Simple Verbatim Code with visible spaces",
 		zmk:   "```{-}\nHello World\n```",
 		expect: expectMap{
 			encoderHTML:  "<pre><code>Hello\u2423World</code></pre>",
 			encoderMD:    "    Hello World",
-			encoderSexpr: `(BLOCK (VERBATIM-CODE (quote (("-" . ""))) "Hello World"))`,
+			encoderSz:    `(BLOCK (VERBATIM-CODE (quote (("-" . ""))) "Hello World"))`,
 			encoderSHTML: "((pre (code \"Hello\u2423World\")))",
 			encoderText:  "Hello World",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -255,11 +255,11 @@
 		descr: "Simple Verbatim Eval",
 		zmk:   "~~~\nHello\nWorld\n~~~",
 		expect: expectMap{
 			encoderHTML:  "<pre><code class=\"zs-eval\">Hello\nWorld</code></pre>",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (VERBATIM-EVAL () "Hello\nWorld"))`,
+			encoderSz:    `(BLOCK (VERBATIM-EVAL () "Hello\nWorld"))`,
 			encoderSHTML: "((pre (code (@ (class . \"zs-eval\")) \"Hello\\nWorld\")))",
 			encoderText:  "Hello\nWorld",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -267,11 +267,11 @@
 		descr: "Simple Verbatim Math",
 		zmk:   "$$$\nHello\n\\LaTeX\n$$$",
 		expect: expectMap{
 			encoderHTML:  "<pre><code class=\"zs-math\">Hello\n\\LaTeX</code></pre>",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (VERBATIM-MATH () "Hello\n\\LaTeX"))`,
+			encoderSz:    `(BLOCK (VERBATIM-MATH () "Hello\n\\LaTeX"))`,
 			encoderSHTML: "((pre (code (@ (class . \"zs-math\")) \"Hello\\n\\\\LaTeX\")))",
 			encoderText:  "Hello\n\\LaTeX",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -279,11 +279,11 @@
 		descr: "Simple Description List",
 		zmk:   "; Zettel\n: Paper\n: Note\n; Zettelkasten\n: Slip box",
 		expect: expectMap{
 			encoderHTML:  "<dl><dt>Zettel</dt><dd><p>Paper</p></dd><dd><p>Note</p></dd><dt>Zettelkasten</dt><dd><p>Slip box</p></dd></dl>",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (DESCRIPTION (INLINE (TEXT "Zettel")) (BLOCK (BLOCK (PARA (TEXT "Paper"))) (BLOCK (PARA (TEXT "Note")))) (INLINE (TEXT "Zettelkasten")) (BLOCK (BLOCK (PARA (TEXT "Slip") (SPACE) (TEXT "box"))))))`,
+			encoderSz:    `(BLOCK (DESCRIPTION (INLINE (TEXT "Zettel")) (BLOCK (BLOCK (PARA (TEXT "Paper"))) (BLOCK (PARA (TEXT "Note")))) (INLINE (TEXT "Zettelkasten")) (BLOCK (BLOCK (PARA (TEXT "Slip") (SPACE) (TEXT "box"))))))`,
 			encoderSHTML: `((dl (dt "Zettel") (dd (p "Paper")) (dd (p "Note")) (dt "Zettelkasten") (dd (p "Slip" " " "box"))))`,
 			encoderText:  "Zettel\nPaper\nNote\nZettelkasten\nSlip box",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -291,23 +291,35 @@
 		descr: "Description List with paragraphs as item",
 		zmk:   "; Zettel\n: Paper\n\n  Note\n; Zettelkasten\n: Slip box",
 		expect: expectMap{
 			encoderHTML:  "<dl><dt>Zettel</dt><dd><p>Paper</p><p>Note</p></dd><dt>Zettelkasten</dt><dd><p>Slip box</p></dd></dl>",
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (DESCRIPTION (INLINE (TEXT "Zettel")) (BLOCK (BLOCK (PARA (TEXT "Paper")) (PARA (TEXT "Note")))) (INLINE (TEXT "Zettelkasten")) (BLOCK (BLOCK (PARA (TEXT "Slip") (SPACE) (TEXT "box"))))))`,
+			encoderSz:    `(BLOCK (DESCRIPTION (INLINE (TEXT "Zettel")) (BLOCK (BLOCK (PARA (TEXT "Paper")) (PARA (TEXT "Note")))) (INLINE (TEXT "Zettelkasten")) (BLOCK (BLOCK (PARA (TEXT "Slip") (SPACE) (TEXT "box"))))))`,
 			encoderSHTML: `((dl (dt "Zettel") (dd (p "Paper") (p "Note")) (dt "Zettelkasten") (dd (p "Slip" " " "box"))))`,
 			encoderText:  "Zettel\nPaper\nNote\nZettelkasten\nSlip box",
 			encoderZmk:   useZmk,
 		},
 	},
+	{
+		descr: "Description List with keys, but no descriptions",
+		zmk:   "; K1\n: D11\n: D12\n; K2\n; K3\n: D31",
+		expect: expectMap{
+			encoderHTML:  "<dl><dt>K1</dt><dd><p>D11</p></dd><dd><p>D12</p></dd><dt>K2</dt><dt>K3</dt><dd><p>D31</p></dd></dl>",
+			encoderMD:    "",
+			encoderSz:    `(BLOCK (DESCRIPTION (INLINE (TEXT "K1")) (BLOCK (BLOCK (PARA (TEXT "D11"))) (BLOCK (PARA (TEXT "D12")))) (INLINE (TEXT "K2")) (BLOCK) (INLINE (TEXT "K3")) (BLOCK (BLOCK (PARA (TEXT "D31"))))))`,
+			encoderSHTML: `((dl (dt "K1") (dd (p "D11")) (dd (p "D12")) (dt "K2") (dt "K3") (dd (p "D31"))))`,
+			encoderText:  "K1\nD11\nD12\nK2\nK3\nD31",
+			encoderZmk:   useZmk,
+		},
+	},
 	{
 		descr: "Simple Table",
 		zmk:   "|c1|c2|c3\n|d1||d3",
 		expect: expectMap{
 			encoderHTML:  `<table><tbody><tr><td>c1</td><td>c2</td><td>c3</td></tr><tr><td>d1</td><td></td><td>d3</td></tr></tbody></table>`,
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (TABLE () (LIST (CELL (TEXT "c1")) (CELL (TEXT "c2")) (CELL (TEXT "c3"))) (LIST (CELL (TEXT "d1")) (CELL) (CELL (TEXT "d3")))))`,
+			encoderSz:    `(BLOCK (TABLE () (list (CELL (TEXT "c1")) (CELL (TEXT "c2")) (CELL (TEXT "c3"))) (list (CELL (TEXT "d1")) (CELL) (CELL (TEXT "d3")))))`,
 			encoderSHTML: `((table (tbody (tr (td "c1") (td "c2") (td "c3")) (tr (td "d1") (td) (td "d3")))))`,
 			encoderText:  "c1 c2 c3\nd1  d3",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -318,11 +330,11 @@
 |<c1|c2|:c3|
 |f1|f2|=f3`,
 		expect: expectMap{
 			encoderHTML:  `<table><thead><tr><td class="right">h1</td><td>h2</td><td class="center">h3</td></tr></thead><tbody><tr><td class="left">c1</td><td>c2</td><td class="center">c3</td></tr><tr><td class="right">f1</td><td>f2</td><td class="center">=f3</td></tr></tbody></table>`,
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (TABLE (LIST (CELL-RIGHT (TEXT "h1")) (CELL (TEXT "h2")) (CELL-CENTER (TEXT "h3"))) (LIST (CELL-LEFT (TEXT "c1")) (CELL (TEXT "c2")) (CELL-CENTER (TEXT "c3"))) (LIST (CELL-RIGHT (TEXT "f1")) (CELL (TEXT "f2")) (CELL-CENTER (TEXT "=f3")))))`,
+			encoderSz:    `(BLOCK (TABLE (list (CELL-RIGHT (TEXT "h1")) (CELL (TEXT "h2")) (CELL-CENTER (TEXT "h3"))) (list (CELL-LEFT (TEXT "c1")) (CELL (TEXT "c2")) (CELL-CENTER (TEXT "c3"))) (list (CELL-RIGHT (TEXT "f1")) (CELL (TEXT "f2")) (CELL-CENTER (TEXT "=f3")))))`,
 			encoderSHTML: `((table (thead (tr (td (@ (class . "right")) "h1") (td "h2") (td (@ (class . "center")) "h3"))) (tbody (tr (td (@ (class . "left")) "c1") (td "c2") (td (@ (class . "center")) "c3")) (tr (td (@ (class . "right")) "f1") (td "f2") (td (@ (class . "center")) "=f3")))))`,
 			encoderText:  "h1 h2 h3\nc1 c2 c3\nf1 f2 =f3",
 			encoderZmk: `|=h1>|=h2|=h3:
 |<c1|c2|c3
 |f1|f2|=f3`,
@@ -332,11 +344,11 @@
 		descr: "Simple Endnote",
 		zmk:   `Text[^Endnote]`,
 		expect: expectMap{
 			encoderHTML:  "<p>Text<sup id=\"fnref:1\"><a class=\"zs-noteref\" href=\"#fn:1\" role=\"doc-noteref\">1</a></sup></p><ol class=\"zs-endnotes\"><li class=\"zs-endnote\" id=\"fn:1\" role=\"doc-endnote\" value=\"1\">Endnote <a class=\"zs-endnote-backref\" href=\"#fnref:1\" role=\"doc-backlink\">\u21a9\ufe0e</a></li></ol>",
 			encoderMD:    "Text",
-			encoderSexpr: `(BLOCK (PARA (TEXT "Text") (ENDNOTE () (quote (INLINE (TEXT "Endnote"))))))`,
+			encoderSz:    `(BLOCK (PARA (TEXT "Text") (ENDNOTE () (quote (INLINE (TEXT "Endnote"))))))`,
 			encoderSHTML: "((p \"Text\" (sup (@ (id . \"fnref:1\")) (a (@ (class . \"zs-noteref\") (href . \"#fn:1\") (role . \"doc-noteref\")) \"1\"))))",
 			encoderText:  "Text Endnote",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -344,11 +356,11 @@
 		descr: "Nested Endnotes",
 		zmk:   `Text[^Endnote[^Nested]]`,
 		expect: expectMap{
 			encoderHTML:  "<p>Text<sup id=\"fnref:1\"><a class=\"zs-noteref\" href=\"#fn:1\" role=\"doc-noteref\">1</a></sup></p><ol class=\"zs-endnotes\"><li class=\"zs-endnote\" id=\"fn:1\" role=\"doc-endnote\" value=\"1\">Endnote<sup id=\"fnref:2\"><a class=\"zs-noteref\" href=\"#fn:2\" role=\"doc-noteref\">2</a></sup> <a class=\"zs-endnote-backref\" href=\"#fnref:1\" role=\"doc-backlink\">\u21a9\ufe0e</a></li><li class=\"zs-endnote\" id=\"fn:2\" role=\"doc-endnote\" value=\"2\">Nested <a class=\"zs-endnote-backref\" href=\"#fnref:2\" role=\"doc-backlink\">\u21a9\ufe0e</a></li></ol>",
 			encoderMD:    "Text",
-			encoderSexpr: `(BLOCK (PARA (TEXT "Text") (ENDNOTE () (quote (INLINE (TEXT "Endnote") (ENDNOTE () (quote (INLINE (TEXT "Nested")))))))))`,
+			encoderSz:    `(BLOCK (PARA (TEXT "Text") (ENDNOTE () (quote (INLINE (TEXT "Endnote") (ENDNOTE () (quote (INLINE (TEXT "Nested")))))))))`,
 			encoderSHTML: "((p \"Text\" (sup (@ (id . \"fnref:1\")) (a (@ (class . \"zs-noteref\") (href . \"#fn:1\") (role . \"doc-noteref\")) \"1\"))))",
 			encoderText:  "Text Endnote Nested",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -356,11 +368,11 @@
 		descr: "Transclusion",
 		zmk:   `{{{http://example.com/image}}}{width="100px"}`,
 		expect: expectMap{
 			encoderHTML:  `<p><img class="external" src="http://example.com/image" width="100px"></p>`,
 			encoderMD:    "",
-			encoderSexpr: `(BLOCK (TRANSCLUDE (quote (("width" . "100px"))) (quote (EXTERNAL "http://example.com/image"))))`,
+			encoderSz:    `(BLOCK (TRANSCLUDE (quote (("width" . "100px"))) (quote (EXTERNAL "http://example.com/image"))))`,
 			encoderSHTML: `((p (img (@ (class . "external") (src . "http://example.com/image") (width . "100px")))))`,
 			encoderText:  "",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -367,11 +379,11 @@
 	{
 		descr: "A paragraph with a inline comment only should be empty in HTML",
 		zmk:   `%% Comment`,
 		expect: expectMap{
 			// encoderHTML:  ``,
-			encoderSexpr: `(BLOCK (PARA (LITERAL-COMMENT () "Comment")))`,
+			encoderSz: `(BLOCK (PARA (LITERAL-COMMENT () "Comment")))`,
 			// encoderSHTML: ``,
 			encoderText: "",
 			encoderZmk:  useZmk,
 		},
 	},
@@ -378,11 +390,11 @@
 	{
 		descr: "",
 		zmk:   ``,
 		expect: expectMap{
 			encoderHTML:  ``,
-			encoderSexpr: `(BLOCK)`,
+			encoderSz:    `(BLOCK)`,
 			encoderSHTML: `()`,
 			encoderText:  "",
 			encoderZmk:   useZmk,
 		},
 	},

Index: encoder/encoder_inline_test.go
==================================================================
--- encoder/encoder_inline_test.go
+++ encoder/encoder_inline_test.go
@@ -15,11 +15,11 @@
 		descr: "Empty Zettelmarkup should produce near nothing (inline)",
 		zmk:   "",
 		expect: expectMap{
 			encoderHTML:  "",
 			encoderMD:    "",
-			encoderSexpr: `(INLINE)`,
+			encoderSz:    `(INLINE)`,
 			encoderSHTML: `()`,
 			encoderText:  "",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -27,11 +27,11 @@
 		descr: "Simple text: Hello, world (inline)",
 		zmk:   `Hello, world`,
 		expect: expectMap{
 			encoderHTML:  "Hello, world",
 			encoderMD:    "Hello, world",
-			encoderSexpr: `(INLINE (TEXT "Hello,") (SPACE) (TEXT "world"))`,
+			encoderSz:    `(INLINE (TEXT "Hello,") (SPACE) (TEXT "world"))`,
 			encoderSHTML: `("Hello," " " "world")`,
 			encoderText:  "Hello, world",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -39,11 +39,11 @@
 		descr: "Soft Break",
 		zmk:   "soft\nbreak",
 		expect: expectMap{
 			encoderHTML:  "soft break",
 			encoderMD:    "soft\nbreak",
-			encoderSexpr: `(INLINE (TEXT "soft") (SOFT) (TEXT "break"))`,
+			encoderSz:    `(INLINE (TEXT "soft") (SOFT) (TEXT "break"))`,
 			encoderSHTML: `("soft" " " "break")`,
 			encoderText:  "soft break",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -51,11 +51,11 @@
 		descr: "Hard Break",
 		zmk:   "hard\\\nbreak",
 		expect: expectMap{
 			encoderHTML:  "hard<br>break",
 			encoderMD:    "hard\\\nbreak",
-			encoderSexpr: `(INLINE (TEXT "hard") (HARD) (TEXT "break"))`,
+			encoderSz:    `(INLINE (TEXT "hard") (HARD) (TEXT "break"))`,
 			encoderSHTML: `("hard" (br) "break")`,
 			encoderText:  "hard\nbreak",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -63,11 +63,11 @@
 		descr: "Emphasized formatting",
 		zmk:   "__emph__",
 		expect: expectMap{
 			encoderHTML:  "<em>emph</em>",
 			encoderMD:    "*emph*",
-			encoderSexpr: `(INLINE (FORMAT-EMPH () (TEXT "emph")))`,
+			encoderSz:    `(INLINE (FORMAT-EMPH () (TEXT "emph")))`,
 			encoderSHTML: `((em "emph"))`,
 			encoderText:  "emph",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -75,11 +75,11 @@
 		descr: "Strong formatting",
 		zmk:   "**strong**",
 		expect: expectMap{
 			encoderHTML:  "<strong>strong</strong>",
 			encoderMD:    "__strong__",
-			encoderSexpr: `(INLINE (FORMAT-STRONG () (TEXT "strong")))`,
+			encoderSz:    `(INLINE (FORMAT-STRONG () (TEXT "strong")))`,
 			encoderSHTML: `((strong "strong"))`,
 			encoderText:  "strong",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -87,11 +87,11 @@
 		descr: "Insert formatting",
 		zmk:   ">>insert>>",
 		expect: expectMap{
 			encoderHTML:  "<ins>insert</ins>",
 			encoderMD:    "insert",
-			encoderSexpr: `(INLINE (FORMAT-INSERT () (TEXT "insert")))`,
+			encoderSz:    `(INLINE (FORMAT-INSERT () (TEXT "insert")))`,
 			encoderSHTML: `((ins "insert"))`,
 			encoderText:  "insert",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -99,11 +99,11 @@
 		descr: "Delete formatting",
 		zmk:   "~~delete~~",
 		expect: expectMap{
 			encoderHTML:  "<del>delete</del>",
 			encoderMD:    "delete",
-			encoderSexpr: `(INLINE (FORMAT-DELETE () (TEXT "delete")))`,
+			encoderSz:    `(INLINE (FORMAT-DELETE () (TEXT "delete")))`,
 			encoderSHTML: `((del "delete"))`,
 			encoderText:  "delete",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -111,11 +111,11 @@
 		descr: "Update formatting",
 		zmk:   "~~old~~>>new>>",
 		expect: expectMap{
 			encoderHTML:  "<del>old</del><ins>new</ins>",
 			encoderMD:    "oldnew",
-			encoderSexpr: `(INLINE (FORMAT-DELETE () (TEXT "old")) (FORMAT-INSERT () (TEXT "new")))`,
+			encoderSz:    `(INLINE (FORMAT-DELETE () (TEXT "old")) (FORMAT-INSERT () (TEXT "new")))`,
 			encoderSHTML: `((del "old") (ins "new"))`,
 			encoderText:  "oldnew",
 			encoderZmk:   useZmk,
 		},
 	},
@@ -123,11 +123,11 @@
 		descr: "Superscript formatting",
 		zmk:   "^^superscript^^",
 		expect: expectMap{
 			encoderHTML:  `<sup>superscript</sup>`,
 			encoderMD:    "superscript",
-			encoderSexpr: `(INLINE (FORMAT-SUPER () (TEXT "superscript")))`,
+			encoderSz:    `(INLINE (FORMAT-SUPER () (TEXT "superscript")))`,
 			encoderSHTML: `((sup "superscript"))`,
 			encoderText:  `superscript`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -135,47 +135,107 @@
 		descr: "Subscript formatting",
 		zmk:   ",,subscript,,",
 		expect: expectMap{
 			encoderHTML:  `<sub>subscript</sub>`,
 			encoderMD:    "subscript",
-			encoderSexpr: `(INLINE (FORMAT-SUB () (TEXT "subscript")))`,
+			encoderSz:    `(INLINE (FORMAT-SUB () (TEXT "subscript")))`,
 			encoderSHTML: `((sub "subscript"))`,
 			encoderText:  `subscript`,
 			encoderZmk:   useZmk,
 		},
 	},
 	{
 		descr: "Quotes formatting",
 		zmk:   `""quotes""`,
 		expect: expectMap{
-			encoderHTML:  "<q>quotes</q>",
+			encoderHTML:  "&ldquo;quotes&rdquo;",
 			encoderMD:    "<q>quotes</q>",
-			encoderSexpr: `(INLINE (FORMAT-QUOTE () (TEXT "quotes")))`,
-			encoderSHTML: `((q "quotes"))`,
+			encoderSz:    `(INLINE (FORMAT-QUOTE () (TEXT "quotes")))`,
+			encoderSHTML: `((@L (@H "&ldquo;") "quotes" (@H "&rdquo;")))`,
 			encoderText:  `quotes`,
 			encoderZmk:   useZmk,
 		},
 	},
 	{
 		descr: "Quotes formatting (german)",
 		zmk:   `""quotes""{lang=de}`,
 		expect: expectMap{
-			encoderHTML:  `<span lang="de"><q>quotes</q></span>`,
+			encoderHTML:  `<span lang="de">&bdquo;quotes&ldquo;</span>`,
 			encoderMD:    "<q>quotes</q>",
-			encoderSexpr: `(INLINE (FORMAT-QUOTE (quote (("lang" . "de"))) (TEXT "quotes")))`,
-			encoderSHTML: `((span (@ (lang . "de")) (q "quotes")))`,
+			encoderSz:    `(INLINE (FORMAT-QUOTE (quote (("lang" . "de"))) (TEXT "quotes")))`,
+			encoderSHTML: `((span (@ (lang . "de")) (@H "&bdquo;") "quotes" (@H "&ldquo;")))`,
 			encoderText:  `quotes`,
 			encoderZmk:   `""quotes""{lang="de"}`,
 		},
 	},
+	{
+		descr: "Empty quotes (default)",
+		zmk:   `""""`,
+		expect: expectMap{
+			encoderHTML:  `&ldquo;&rdquo;`,
+			encoderMD:    "<q></q>",
+			encoderSz:    `(INLINE (FORMAT-QUOTE ()))`,
+			encoderSHTML: `((@L (@H "&ldquo;" "&rdquo;")))`,
+			encoderText:  ``,
+			encoderZmk:   useZmk,
+		},
+	},
+	{
+		descr: "Empty quotes (unknown)",
+		zmk:   `""""{lang=unknown}`,
+		expect: expectMap{
+			encoderHTML:  `<span lang="unknown">&quot;&quot;</span>`,
+			encoderMD:    "<q></q>",
+			encoderSz:    `(INLINE (FORMAT-QUOTE (quote (("lang" . "unknown")))))`,
+			encoderSHTML: `((span (@ (lang . "unknown")) (@H "&quot;" "&quot;")))`,
+			encoderText:  ``,
+			encoderZmk:   `""""{lang="unknown"}`,
+		},
+	},
+	{
+		descr: "Nested quotes (default)",
+		zmk:   `""say: ::""yes, ::""or?""::""::""`,
+		expect: expectMap{
+			encoderHTML:  `&ldquo;say: <span>&lsquo;yes, <span>&ldquo;or?&rdquo;</span>&rsquo;</span>&rdquo;`,
+			encoderMD:    "<q>say: <q>yes, <q>or?</q></q></q>",
+			encoderSz:    `(INLINE (FORMAT-QUOTE () (TEXT "say:") (SPACE) (FORMAT-SPAN () (FORMAT-QUOTE () (TEXT "yes,") (SPACE) (FORMAT-SPAN () (FORMAT-QUOTE () (TEXT "or?")))))))`,
+			encoderSHTML: `((@L (@H "&ldquo;") "say:" " " (span (@L (@H "&lsquo;") "yes," " " (span (@L (@H "&ldquo;") "or?" (@H "&rdquo;"))) (@H "&rsquo;"))) (@H "&rdquo;")))`,
+			encoderText:  `say: yes, or?`,
+			encoderZmk:   useZmk,
+		},
+	},
+	{
+		descr: "Two quotes",
+		zmk:   `""yes"" or ""no""`,
+		expect: expectMap{
+			encoderHTML:  `&ldquo;yes&rdquo; or &ldquo;no&rdquo;`,
+			encoderMD:    "<q>yes</q> or <q>no</q>",
+			encoderSz:    `(INLINE (FORMAT-QUOTE () (TEXT "yes")) (SPACE) (TEXT "or") (SPACE) (FORMAT-QUOTE () (TEXT "no")))`,
+			encoderSHTML: `((@L (@H "&ldquo;") "yes" (@H "&rdquo;")) " " "or" " " (@L (@H "&ldquo;") "no" (@H "&rdquo;")))`,
+			encoderText:  `yes or no`,
+			encoderZmk:   useZmk,
+		},
+	},
+	{
+		descr: "Mark formatting",
+		zmk:   `##marked##`,
+		expect: expectMap{
+			encoderHTML:  `<mark>marked</mark>`,
+			encoderMD:    "<mark>marked</mark>",
+			encoderSz:    `(INLINE (FORMAT-MARK () (TEXT "marked")))`,
+			encoderSHTML: `((mark "marked"))`,
+			encoderText:  `marked`,
+			encoderZmk:   useZmk,
+		},
+	},
 	{
 		descr: "Span formatting",
 		zmk:   `::span::`,
 		expect: expectMap{
 			encoderHTML:  `<span>span</span>`,
 			encoderMD:    "span",
-			encoderSexpr: `(INLINE (FORMAT-SPAN () (TEXT "span")))`,
+			encoderSz:    `(INLINE (FORMAT-SPAN () (TEXT "span")))`,
 			encoderSHTML: `((span "span"))`,
 			encoderText:  `span`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -183,11 +243,11 @@
 		descr: "Code formatting",
 		zmk:   "``code``",
 		expect: expectMap{
 			encoderHTML:  `<code>code</code>`,
 			encoderMD:    "`code`",
-			encoderSexpr: `(INLINE (LITERAL-CODE () "code"))`,
+			encoderSz:    `(INLINE (LITERAL-CODE () "code"))`,
 			encoderSHTML: `((code "code"))`,
 			encoderText:  `code`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -195,11 +255,11 @@
 		descr: "Code formatting with visible space",
 		zmk:   "``x y``{-}",
 		expect: expectMap{
 			encoderHTML:  "<code>x\u2423y</code>",
 			encoderMD:    "`x y`",
-			encoderSexpr: `(INLINE (LITERAL-CODE (quote (("-" . ""))) "x y"))`,
+			encoderSz:    `(INLINE (LITERAL-CODE (quote (("-" . ""))) "x y"))`,
 			encoderSHTML: "((code \"x\u2423y\"))",
 			encoderText:  `x y`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -207,11 +267,11 @@
 		descr: "HTML in Code formatting",
 		zmk:   "``<script `` abc",
 		expect: expectMap{
 			encoderHTML:  "<code>&lt;script </code> abc",
 			encoderMD:    "`<script ` abc",
-			encoderSexpr: `(INLINE (LITERAL-CODE () "<script ") (SPACE) (TEXT "abc"))`,
+			encoderSz:    `(INLINE (LITERAL-CODE () "<script ") (SPACE) (TEXT "abc"))`,
 			encoderSHTML: `((code "<script ") " " "abc")`,
 			encoderText:  `<script  abc`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -219,11 +279,11 @@
 		descr: "Input formatting",
 		zmk:   `''input''`,
 		expect: expectMap{
 			encoderHTML:  `<kbd>input</kbd>`,
 			encoderMD:    "input",
-			encoderSexpr: `(INLINE (LITERAL-INPUT () "input"))`,
+			encoderSz:    `(INLINE (LITERAL-INPUT () "input"))`,
 			encoderSHTML: `((kbd "input"))`,
 			encoderText:  `input`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -231,11 +291,11 @@
 		descr: "Output formatting",
 		zmk:   `==output==`,
 		expect: expectMap{
 			encoderHTML:  `<samp>output</samp>`,
 			encoderMD:    "output",
-			encoderSexpr: `(INLINE (LITERAL-OUTPUT () "output"))`,
+			encoderSz:    `(INLINE (LITERAL-OUTPUT () "output"))`,
 			encoderSHTML: `((samp "output"))`,
 			encoderText:  `output`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -243,24 +303,24 @@
 		descr: "Math formatting",
 		zmk:   `$$\TeX$$`,
 		expect: expectMap{
 			encoderHTML:  `<code class="zs-math">\TeX</code>`,
 			encoderMD:    "\\TeX",
-			encoderSexpr: `(INLINE (LITERAL-MATH () "\\TeX"))`,
+			encoderSz:    `(INLINE (LITERAL-MATH () "\\TeX"))`,
 			encoderSHTML: `((code (@ (class . "zs-math")) "\\TeX"))`,
 			encoderText:  `\TeX`,
 			encoderZmk:   useZmk,
 		},
 	},
 	{
 		descr: "Nested Span Quote formatting",
 		zmk:   `::""abc""::{lang=fr}`,
 		expect: expectMap{
-			encoderHTML:  `<span lang="fr"><q>abc</q></span>`,
+			encoderHTML:  `<span lang="fr">&laquo;&nbsp;abc&nbsp;&raquo;</span>`,
 			encoderMD:    "<q>abc</q>",
-			encoderSexpr: `(INLINE (FORMAT-SPAN (quote (("lang" . "fr"))) (FORMAT-QUOTE () (TEXT "abc"))))`,
-			encoderSHTML: `((span (@ (lang . "fr")) (q "abc")))`,
+			encoderSz:    `(INLINE (FORMAT-SPAN (quote (("lang" . "fr"))) (FORMAT-QUOTE () (TEXT "abc"))))`,
+			encoderSHTML: `((span (@ (lang . "fr")) (@L (@H "&laquo;" "&nbsp;") "abc" (@H "&nbsp;" "&raquo;"))))`,
 			encoderText:  `abc`,
 			encoderZmk:   `::""abc""::{lang="fr"}`,
 		},
 	},
 	{
@@ -267,11 +327,11 @@
 		descr: "Simple Citation",
 		zmk:   `[@Stern18]`,
 		expect: expectMap{
 			encoderHTML:  `<span>Stern18</span>`, // TODO
 			encoderMD:    "",
-			encoderSexpr: `(INLINE (CITE () "Stern18"))`,
+			encoderSz:    `(INLINE (CITE () "Stern18"))`,
 			encoderSHTML: `((span "Stern18"))`, // TODO
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -279,11 +339,11 @@
 		descr: "Citation",
 		zmk:   `[@Stern18 p.23]`,
 		expect: expectMap{
 			encoderHTML:  `<span>Stern18, p.23</span>`, // TODO
 			encoderMD:    "p.23",
-			encoderSexpr: `(INLINE (CITE () "Stern18" (TEXT "p.23")))`,
+			encoderSz:    `(INLINE (CITE () "Stern18" (TEXT "p.23")))`,
 			encoderSHTML: `((span "Stern18" ", " "p.23"))`, // TODO
 			encoderText:  `p.23`,
 			encoderZmk:   useZmk,
 		},
 	}, {
@@ -290,11 +350,11 @@
 		descr: "No comment",
 		zmk:   `% comment`,
 		expect: expectMap{
 			encoderHTML:  `% comment`,
 			encoderMD:    "% comment",
-			encoderSexpr: `(INLINE (TEXT "%") (SPACE) (TEXT "comment"))`,
+			encoderSz:    `(INLINE (TEXT "%") (SPACE) (TEXT "comment"))`,
 			encoderSHTML: `("%" " " "comment")`,
 			encoderText:  `% comment`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -302,11 +362,11 @@
 		descr: "Line comment (nogen HTML)",
 		zmk:   `%% line comment`,
 		expect: expectMap{
 			encoderHTML:  ``,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE (LITERAL-COMMENT () "line comment"))`,
+			encoderSz:    `(INLINE (LITERAL-COMMENT () "line comment"))`,
 			encoderSHTML: `(())`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -314,11 +374,11 @@
 		descr: "Line comment",
 		zmk:   `%%{-} line comment`,
 		expect: expectMap{
 			encoderHTML:  `<!-- line comment -->`,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE (LITERAL-COMMENT (quote (("-" . ""))) "line comment"))`,
+			encoderSz:    `(INLINE (LITERAL-COMMENT (quote (("-" . ""))) "line comment"))`,
 			encoderSHTML: `((@@ "line comment"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -326,11 +386,11 @@
 		descr: "Comment after text",
 		zmk:   `Text %%{-} comment`,
 		expect: expectMap{
 			encoderHTML:  `Text<!-- comment -->`,
 			encoderMD:    "Text",
-			encoderSexpr: `(INLINE (TEXT "Text") (LITERAL-COMMENT (quote (("-" . ""))) "comment"))`,
+			encoderSz:    `(INLINE (TEXT "Text") (LITERAL-COMMENT (quote (("-" . ""))) "comment"))`,
 			encoderSHTML: `("Text" (@@ "comment"))`,
 			encoderText:  `Text`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -338,11 +398,11 @@
 		descr: "Comment after text and with -->",
 		zmk:   `Text %%{-} comment --> end`,
 		expect: expectMap{
 			encoderHTML:  `Text<!-- comment -&#45;> end -->`,
 			encoderMD:    "Text",
-			encoderSexpr: `(INLINE (TEXT "Text") (LITERAL-COMMENT (quote (("-" . ""))) "comment --> end"))`,
+			encoderSz:    `(INLINE (TEXT "Text") (LITERAL-COMMENT (quote (("-" . ""))) "comment --> end"))`,
 			encoderSHTML: `("Text" (@@ "comment --> end"))`,
 			encoderText:  `Text`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -350,11 +410,11 @@
 		descr: "Simple inline endnote",
 		zmk:   `[^endnote]`,
 		expect: expectMap{
 			encoderHTML:  `<sup id="fnref:1"><a class="zs-noteref" href="#fn:1" role="doc-noteref">1</a></sup>`,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE (ENDNOTE () (quote (INLINE (TEXT "endnote")))))`,
+			encoderSz:    `(INLINE (ENDNOTE () (quote (INLINE (TEXT "endnote")))))`,
 			encoderSHTML: `((sup (@ (id . "fnref:1")) (a (@ (class . "zs-noteref") (href . "#fn:1") (role . "doc-noteref")) "1")))`,
 			encoderText:  `endnote`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -362,11 +422,11 @@
 		descr: "Simple mark",
 		zmk:   `[!mark]`,
 		expect: expectMap{
 			encoderHTML:  `<a id="mark"></a>`,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE (MARK "mark" "mark" "mark"))`,
+			encoderSz:    `(INLINE (MARK "mark" "mark" "mark"))`,
 			encoderSHTML: `((a (@ (id . "mark"))))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -374,11 +434,11 @@
 		descr: "Mark with text",
 		zmk:   `[!mark|with text]`,
 		expect: expectMap{
 			encoderHTML:  `<a id="mark">with text</a>`,
 			encoderMD:    "with text",
-			encoderSexpr: `(INLINE (MARK "mark" "mark" "mark" (TEXT "with") (SPACE) (TEXT "text")))`,
+			encoderSz:    `(INLINE (MARK "mark" "mark" "mark" (TEXT "with") (SPACE) (TEXT "text")))`,
 			encoderSHTML: `((a (@ (id . "mark")) "with" " " "text"))`,
 			encoderText:  `with text`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -386,11 +446,11 @@
 		descr: "Invalid Link",
 		zmk:   `[[link|00000000000000]]`,
 		expect: expectMap{
 			encoderHTML:  `<span>link</span>`,
 			encoderMD:    "[link](00000000000000)",
-			encoderSexpr: `(INLINE (LINK-INVALID () "00000000000000" (TEXT "link")))`,
+			encoderSz:    `(INLINE (LINK-INVALID () "00000000000000" (TEXT "link")))`,
 			encoderSHTML: `((span "link"))`,
 			encoderText:  `link`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -398,11 +458,11 @@
 		descr: "Invalid Simple Link",
 		zmk:   `[[00000000000000]]`,
 		expect: expectMap{
 			encoderHTML:  `<span>00000000000000</span>`,
 			encoderMD:    "[00000000000000](00000000000000)",
-			encoderSexpr: `(INLINE (LINK-INVALID () "00000000000000"))`,
+			encoderSz:    `(INLINE (LINK-INVALID () "00000000000000"))`,
 			encoderSHTML: `((span "00000000000000"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -410,11 +470,11 @@
 		descr: "Dummy Link",
 		zmk:   `[[abc]]`,
 		expect: expectMap{
 			encoderHTML:  `<a class="external" href="abc">abc</a>`,
 			encoderMD:    "[abc](abc)",
-			encoderSexpr: `(INLINE (LINK-EXTERNAL () "abc"))`,
+			encoderSz:    `(INLINE (LINK-EXTERNAL () "abc"))`,
 			encoderSHTML: `((a (@ (class . "external") (href . "abc")) "abc"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -422,11 +482,11 @@
 		descr: "Simple URL",
 		zmk:   `[[https://zettelstore.de]]`,
 		expect: expectMap{
 			encoderHTML:  `<a class="external" href="https://zettelstore.de">https://zettelstore.de</a>`,
 			encoderMD:    "<https://zettelstore.de>",
-			encoderSexpr: `(INLINE (LINK-EXTERNAL () "https://zettelstore.de"))`,
+			encoderSz:    `(INLINE (LINK-EXTERNAL () "https://zettelstore.de"))`,
 			encoderSHTML: `((a (@ (class . "external") (href . "https://zettelstore.de")) "https://zettelstore.de"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -434,11 +494,11 @@
 		descr: "URL with Text",
 		zmk:   `[[Home|https://zettelstore.de]]`,
 		expect: expectMap{
 			encoderHTML:  `<a class="external" href="https://zettelstore.de">Home</a>`,
 			encoderMD:    "[Home](https://zettelstore.de)",
-			encoderSexpr: `(INLINE (LINK-EXTERNAL () "https://zettelstore.de" (TEXT "Home")))`,
+			encoderSz:    `(INLINE (LINK-EXTERNAL () "https://zettelstore.de" (TEXT "Home")))`,
 			encoderSHTML: `((a (@ (class . "external") (href . "https://zettelstore.de")) "Home"))`,
 			encoderText:  `Home`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -446,11 +506,11 @@
 		descr: "Simple Zettel ID",
 		zmk:   `[[00000000000100]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="00000000000100">00000000000100</a>`,
 			encoderMD:    "[00000000000100](00000000000100)",
-			encoderSexpr: `(INLINE (LINK-ZETTEL () "00000000000100"))`,
+			encoderSz:    `(INLINE (LINK-ZETTEL () "00000000000100"))`,
 			encoderSHTML: `((a (@ (href . "00000000000100")) "00000000000100"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -458,11 +518,11 @@
 		descr: "Zettel ID with Text",
 		zmk:   `[[Config|00000000000100]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="00000000000100">Config</a>`,
 			encoderMD:    "[Config](00000000000100)",
-			encoderSexpr: `(INLINE (LINK-ZETTEL () "00000000000100" (TEXT "Config")))`,
+			encoderSz:    `(INLINE (LINK-ZETTEL () "00000000000100" (TEXT "Config")))`,
 			encoderSHTML: `((a (@ (href . "00000000000100")) "Config"))`,
 			encoderText:  `Config`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -470,11 +530,11 @@
 		descr: "Simple Zettel ID with fragment",
 		zmk:   `[[00000000000100#frag]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="00000000000100#frag">00000000000100#frag</a>`,
 			encoderMD:    "[00000000000100#frag](00000000000100#frag)",
-			encoderSexpr: `(INLINE (LINK-ZETTEL () "00000000000100#frag"))`,
+			encoderSz:    `(INLINE (LINK-ZETTEL () "00000000000100#frag"))`,
 			encoderSHTML: `((a (@ (href . "00000000000100#frag")) "00000000000100#frag"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -482,11 +542,11 @@
 		descr: "Zettel ID with Text and fragment",
 		zmk:   `[[Config|00000000000100#frag]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="00000000000100#frag">Config</a>`,
 			encoderMD:    "[Config](00000000000100#frag)",
-			encoderSexpr: `(INLINE (LINK-ZETTEL () "00000000000100#frag" (TEXT "Config")))`,
+			encoderSz:    `(INLINE (LINK-ZETTEL () "00000000000100#frag" (TEXT "Config")))`,
 			encoderSHTML: `((a (@ (href . "00000000000100#frag")) "Config"))`,
 			encoderText:  `Config`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -494,11 +554,11 @@
 		descr: "Fragment link to self",
 		zmk:   `[[#frag]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="#frag">#frag</a>`,
 			encoderMD:    "[#frag](#frag)",
-			encoderSexpr: `(INLINE (LINK-SELF () "#frag"))`,
+			encoderSz:    `(INLINE (LINK-SELF () "#frag"))`,
 			encoderSHTML: `((a (@ (href . "#frag")) "#frag"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -506,11 +566,11 @@
 		descr: "Hosted link",
 		zmk:   `[[H|/hosted]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="/hosted">H</a>`,
 			encoderMD:    "[H](/hosted)",
-			encoderSexpr: `(INLINE (LINK-HOSTED () "/hosted" (TEXT "H")))`,
+			encoderSz:    `(INLINE (LINK-HOSTED () "/hosted" (TEXT "H")))`,
 			encoderSHTML: `((a (@ (href . "/hosted")) "H"))`,
 			encoderText:  `H`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -518,11 +578,11 @@
 		descr: "Based link",
 		zmk:   `[[B|//based]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="/based">B</a>`,
 			encoderMD:    "[B](/based)",
-			encoderSexpr: `(INLINE (LINK-BASED () "/based" (TEXT "B")))`,
+			encoderSz:    `(INLINE (LINK-BASED () "/based" (TEXT "B")))`,
 			encoderText:  `B`,
 			encoderSHTML: `((a (@ (href . "/based")) "B"))`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -530,11 +590,11 @@
 		descr: "Relative link",
 		zmk:   `[[R|../relative]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="../relative">R</a>`,
 			encoderMD:    "[R](../relative)",
-			encoderSexpr: `(INLINE (LINK-HOSTED () "../relative" (TEXT "R")))`,
+			encoderSz:    `(INLINE (LINK-HOSTED () "../relative" (TEXT "R")))`,
 			encoderSHTML: `((a (@ (href . "../relative")) "R"))`,
 			encoderText:  `R`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -542,11 +602,11 @@
 		descr: "Query link w/o text",
 		zmk:   `[[query:title:syntax]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="?q=title%3Asyntax">title:syntax</a>`,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE (LINK-QUERY () "title:syntax"))`,
+			encoderSz:    `(INLINE (LINK-QUERY () "title:syntax"))`,
 			encoderSHTML: `((a (@ (href . "?q=title%3Asyntax")) "title:syntax"))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -554,11 +614,11 @@
 		descr: "Query link with text",
 		zmk:   `[[Q|query:title:syntax]]`,
 		expect: expectMap{
 			encoderHTML:  `<a href="?q=title%3Asyntax">Q</a>`,
 			encoderMD:    "Q",
-			encoderSexpr: `(INLINE (LINK-QUERY () "title:syntax" (TEXT "Q")))`,
+			encoderSz:    `(INLINE (LINK-QUERY () "title:syntax" (TEXT "Q")))`,
 			encoderSHTML: `((a (@ (href . "?q=title%3Asyntax")) "Q"))`,
 			encoderText:  `Q`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -566,11 +626,11 @@
 		descr: "Dummy Embed",
 		zmk:   `{{abc}}`,
 		expect: expectMap{
 			encoderHTML:  `<img src="abc">`,
 			encoderMD:    "![abc](abc)",
-			encoderSexpr: `(INLINE (EMBED () (quote (EXTERNAL "abc")) ""))`,
+			encoderSz:    `(INLINE (EMBED () (quote (EXTERNAL "abc")) ""))`,
 			encoderSHTML: `((img (@ (src . "abc"))))`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -578,11 +638,11 @@
 		descr: "Inline HTML Zettel",
 		zmk:   `@@<hr>@@{="html"}`,
 		expect: expectMap{
 			encoderHTML:  ``,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE)`,
+			encoderSz:    `(INLINE)`,
 			encoderSHTML: `()`,
 			encoderText:  ``,
 			encoderZmk:   ``,
 		},
 	},
@@ -590,11 +650,11 @@
 		descr: "Inline Text Zettel",
 		zmk:   `@@<hr>@@{="text"}`,
 		expect: expectMap{
 			encoderHTML:  ``,
 			encoderMD:    "<hr>",
-			encoderSexpr: `(INLINE (LITERAL-ZETTEL (quote (("" . "text"))) "<hr>"))`,
+			encoderSz:    `(INLINE (LITERAL-ZETTEL (quote (("" . "text"))) "<hr>"))`,
 			encoderSHTML: `(())`,
 			encoderText:  `<hr>`,
 			encoderZmk:   useZmk,
 		},
 	},
@@ -602,12 +662,12 @@
 		descr: "",
 		zmk:   ``,
 		expect: expectMap{
 			encoderHTML:  ``,
 			encoderMD:    "",
-			encoderSexpr: `(INLINE)`,
+			encoderSz:    `(INLINE)`,
 			encoderSHTML: `()`,
 			encoderText:  ``,
 			encoderZmk:   useZmk,
 		},
 	},
 }

Index: encoder/encoder_test.go
==================================================================
--- encoder/encoder_test.go
+++ encoder/encoder_test.go
@@ -13,23 +13,23 @@
 import (
 	"fmt"
 	"strings"
 	"testing"
 
-	"codeberg.org/t73fde/sxpf/reader"
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil/sxreader"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 
 	_ "zettelstore.de/z/encoder/htmlenc"  // Allow to use HTML encoder.
 	_ "zettelstore.de/z/encoder/mdenc"    // Allow to use markdown encoder.
-	_ "zettelstore.de/z/encoder/sexprenc" // Allow to use sexpr encoder.
 	_ "zettelstore.de/z/encoder/shtmlenc" // Allow to use SHTML encoder.
+	_ "zettelstore.de/z/encoder/szenc"    // Allow to use sz encoder.
 	_ "zettelstore.de/z/encoder/textenc"  // Allow to use text encoder.
 	_ "zettelstore.de/z/encoder/zmkenc"   // Allow to use zmk encoder.
 	"zettelstore.de/z/parser/cleaner"
 	_ "zettelstore.de/z/parser/zettelmark" // Allow to use zettelmark parser.
 )
@@ -45,11 +45,11 @@
 
 const useZmk = "\000"
 const (
 	encoderHTML  = api.EncoderHTML
 	encoderMD    = api.EncoderMD
-	encoderSexpr = api.EncoderSexpr
+	encoderSz    = api.EncoderSz
 	encoderSHTML = api.EncoderSHTML
 	encoderText  = api.EncoderText
 	encoderZmk   = api.EncoderZmk
 )
 
@@ -70,17 +70,17 @@
 			pe = &peInlines{is: is}
 		} else {
 			pe = &peBlocks{bs: parser.ParseBlocks(inp, nil, meta.SyntaxZmk, config.NoHTML)}
 		}
 		checkEncodings(t, testNum, pe, tc.descr, tc.expect, tc.zmk)
-		checkSexpr(t, testNum, pe, tc.descr)
+		checkSz(t, testNum, pe, tc.descr)
 	}
 }
 
 func checkEncodings(t *testing.T, testNum int, pe parserEncoder, descr string, expected expectMap, zmkDefault string) {
 	for enc, exp := range expected {
-		encdr := encoder.Create(enc)
+		encdr := encoder.Create(enc, &encoder.CreateParameter{Lang: api.ValueLangEN})
 		got, err := pe.encode(encdr)
 		if err != nil {
 			prefix := fmt.Sprintf("Test #%d", testNum)
 			if d := descr; d != "" {
 				prefix += "\nReason:   " + d
@@ -101,19 +101,19 @@
 			t.Errorf("%s\nEncoder:  %s\nExpected: %q\nGot:      %q", prefix, enc, exp, got)
 		}
 	}
 }
 
-func checkSexpr(t *testing.T, testNum int, pe parserEncoder, descr string) {
+func checkSz(t *testing.T, testNum int, pe parserEncoder, descr string) {
 	t.Helper()
-	encdr := encoder.Create(encoderSexpr)
+	encdr := encoder.Create(encoderSz, nil)
 	exp, err := pe.encode(encdr)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	val, err := reader.MakeReader(strings.NewReader(exp)).Read()
+	val, err := sxreader.MakeReader(strings.NewReader(exp)).Read()
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	got := val.Repr()

Index: encoder/htmlenc/htmlenc.go
==================================================================
--- encoder/htmlenc/htmlenc.go
+++ encoder/htmlenc/htmlenc.go
@@ -13,152 +13,153 @@
 
 import (
 	"io"
 	"strings"
 
-	"codeberg.org/t73fde/sxhtml"
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/shtml"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/shtml"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/sx.fossil/sxhtml"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
-	"zettelstore.de/z/encoder/sexprenc"
-	"zettelstore.de/z/encoder/shtmlenc"
+	"zettelstore.de/z/encoder/szenc"
 	"zettelstore.de/z/encoder/textenc"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
-	encoder.Register(api.EncoderHTML, func() encoder.Encoder { return Create() })
+	encoder.Register(api.EncoderHTML, func(params *encoder.CreateParameter) encoder.Encoder { return Create(params) })
 }
 
 // Create an encoder.
-func Create() *Encoder { return &mySHE }
+func Create(params *encoder.CreateParameter) *Encoder {
+	// We need a new transformer every time, because tx.inVerse must be unique.
+	// If we can refactor it out, the transformer can be created only once.
+	return &Encoder{
+		tx:      szenc.NewTransformer(),
+		th:      shtml.NewEvaluator(1, nil),
+		lang:    params.Lang,
+		textEnc: textenc.Create(),
+	}
+}
 
 type Encoder struct {
+	tx      *szenc.Transformer
+	th      *shtml.Evaluator
+	lang    string
 	textEnc *textenc.Encoder
 }
 
-var mySHE = Encoder{
-	textEnc: textenc.Create(),
-}
-
 // WriteZettel encodes a full zettel as HTML5.
 func (he *Encoder) WriteZettel(w io.Writer, zn *ast.ZettelNode, evalMeta encoder.EvalMetaFunc) (int, error) {
-	tx := sexprenc.NewTransformer()
-	xm := tx.GetMeta(zn.InhMeta, evalMeta)
-
-	th := shtml.NewTransformer(1, nil)
-	hm, err := th.Transform(xm)
+	env := shtml.MakeEnvironment(he.lang)
+	hm, err := he.th.Evaluate(he.tx.GetMeta(zn.InhMeta, evalMeta), &env)
 	if err != nil {
 		return 0, err
 	}
 
 	var isTitle ast.InlineSlice
-	var htitle *sxpf.List
+	var htitle *sx.Pair
 	plainTitle, hasTitle := zn.InhMeta.Get(api.KeyTitle)
 	if hasTitle {
 		isTitle = parser.ParseSpacedText(plainTitle)
-		xtitle := tx.GetSexpr(&isTitle)
-		htitle, err = th.Transform(xtitle)
+		xtitle := he.tx.GetSz(&isTitle)
+		htitle, err = he.th.Evaluate(xtitle, &env)
 		if err != nil {
 			return 0, err
 		}
 	}
 
-	xast := tx.GetSexpr(&zn.Ast)
-	hast, err := th.Transform(xast)
+	xast := he.tx.GetSz(&zn.Ast)
+	hast, err := he.th.Evaluate(xast, &env)
 	if err != nil {
 		return 0, err
 	}
-	hen := th.Endnotes()
+	hen := he.th.Endnotes(&env)
 
-	sf := th.SymbolFactory()
+	sf := he.th.SymbolFactory()
 	symAttr := sf.MustMake(sxhtml.NameSymAttr)
 
-	head := sxpf.Nil().Cons(sf.MustMake("head"))
+	head := sx.MakeList(sf.MustMake("head"))
 	curr := head
-	curr = curr.AppendBang(sxpf.Nil().Cons(sxpf.Nil().Cons(sxpf.Cons(sf.MustMake("charset"), sxpf.MakeString("utf-8"))).Cons(symAttr)).Cons(sf.MustMake("meta")))
+	curr = curr.AppendBang(sx.Nil().Cons(sx.Nil().Cons(sx.Cons(sf.MustMake("charset"), sx.String("utf-8"))).Cons(symAttr)).Cons(sf.MustMake("meta")))
 	for elem := hm; elem != nil; elem = elem.Tail() {
 		curr = curr.AppendBang(elem.Car())
 	}
+	var sb strings.Builder
 	if hasTitle {
-		var sb strings.Builder
 		he.textEnc.WriteInlines(&sb, &isTitle)
-		_ = curr.AppendBang(sxpf.Nil().Cons(sxpf.MakeString(sb.String())).Cons(sf.MustMake("title")))
+	} else {
+		sb.Write(zn.Meta.Zid.Bytes())
 	}
+	_ = curr.AppendBang(sx.Nil().Cons(sx.String(sb.String())).Cons(sf.MustMake("title")))
 
-	body := sxpf.Nil().Cons(sf.MustMake("body"))
+	body := sx.MakeList(sf.MustMake("body"))
 	curr = body
 	if hasTitle {
 		curr = curr.AppendBang(htitle.Cons(sf.MustMake("h1")))
 	}
 	for elem := hast; elem != nil; elem = elem.Tail() {
 		curr = curr.AppendBang(elem.Car())
 	}
 	if hen != nil {
-		curr = curr.AppendBang(sxpf.Nil().Cons(sf.MustMake("hr")))
+		curr = curr.AppendBang(sx.Nil().Cons(sf.MustMake("hr")))
 		_ = curr.AppendBang(hen)
 	}
 
-	doc := sxpf.MakeList(
+	doc := sx.MakeList(
 		sf.MustMake(sxhtml.NameSymDoctype),
-		sxpf.MakeList(sf.MustMake("html"), head, body),
+		sx.MakeList(sf.MustMake("html"), head, body),
 	)
 
 	gen := sxhtml.NewGenerator(sf, sxhtml.WithNewline)
 	return gen.WriteHTML(w, doc)
 }
 
 // WriteMeta encodes meta data as HTML5.
 func (he *Encoder) WriteMeta(w io.Writer, m *meta.Meta, evalMeta encoder.EvalMetaFunc) (int, error) {
-	tx := sexprenc.NewTransformer()
-	xm := tx.GetMeta(m, evalMeta)
-
-	th := shtml.NewTransformer(1, nil)
-	hm, err := th.Transform(xm)
+	env := shtml.MakeEnvironment(he.lang)
+	hm, err := he.th.Evaluate(he.tx.GetMeta(m, evalMeta), &env)
 	if err != nil {
 		return 0, err
 	}
-	gen := sxhtml.NewGenerator(th.SymbolFactory(), sxhtml.WithNewline)
+	gen := sxhtml.NewGenerator(he.th.SymbolFactory(), sxhtml.WithNewline)
 	return gen.WriteListHTML(w, hm)
 }
 
 func (he *Encoder) WriteContent(w io.Writer, zn *ast.ZettelNode) (int, error) {
 	return he.WriteBlocks(w, &zn.Ast)
 }
 
 // WriteBlocks encodes a block slice.
-func (*Encoder) WriteBlocks(w io.Writer, bs *ast.BlockSlice) (int, error) {
-	tx := sexprenc.NewTransformer()
-	xval := tx.GetSexpr(bs)
-	th := shtml.NewTransformer(1, nil)
-	hobj, err := th.Transform(xval)
-
+func (he *Encoder) WriteBlocks(w io.Writer, bs *ast.BlockSlice) (int, error) {
+	env := shtml.MakeEnvironment(he.lang)
+	hobj, err := he.th.Evaluate(he.tx.GetSz(bs), &env)
 	if err == nil {
-		gen := sxhtml.NewGenerator(th.SymbolFactory())
+		gen := sxhtml.NewGenerator(he.th.SymbolFactory())
 		length, err2 := gen.WriteListHTML(w, hobj)
 		if err2 != nil {
 			return length, err2
 		}
 
-		l, err2 := gen.WriteHTML(w, th.Endnotes())
+		l, err2 := gen.WriteHTML(w, he.th.Endnotes(&env))
 		length += l
 		return length, err2
 	}
 	return 0, err
 }
 
 // WriteInlines writes an inline slice to the writer
-func (*Encoder) WriteInlines(w io.Writer, is *ast.InlineSlice) (int, error) {
-	hobj, err := shtmlenc.TransformSlice(is)
+func (he *Encoder) WriteInlines(w io.Writer, is *ast.InlineSlice) (int, error) {
+	env := shtml.MakeEnvironment(he.lang)
+	hobj, err := he.th.Evaluate(he.tx.GetSz(is), &env)
 	if err == nil {
-		gen := sxhtml.NewGenerator(sxpf.FindSymbolFactory(hobj))
+		gen := sxhtml.NewGenerator(sx.FindSymbolFactory(hobj))
 		length, err2 := gen.WriteListHTML(w, hobj)
 		if err2 != nil {
 			return length, err2
 		}
 		return length, nil
 	}
 	return 0, err
 }

Index: encoder/mdenc/mdenc.go
==================================================================
--- encoder/mdenc/mdenc.go
+++ encoder/mdenc/mdenc.go
@@ -12,18 +12,18 @@
 package mdenc
 
 import (
 	"io"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
-	encoder.Register(api.EncoderMD, func() encoder.Encoder { return Create() })
+	encoder.Register(api.EncoderMD, func(*encoder.CreateParameter) encoder.Encoder { return Create() })
 }
 
 // Create an encoder.
 func Create() *Encoder { return &myME }
 
@@ -329,10 +329,14 @@
 		v.b.WriteString("__")
 	case ast.FormatQuote:
 		v.b.WriteString("<q>")
 		ast.Walk(v, &fn.Inlines)
 		v.b.WriteString("</q>")
+	case ast.FormatMark:
+		v.b.WriteString("<mark>")
+		ast.Walk(v, &fn.Inlines)
+		v.b.WriteString("</mark>")
 	default:
 		ast.Walk(v, &fn.Inlines)
 	}
 }
 

DELETED encoder/sexprenc/sexprenc.go
Index: encoder/sexprenc/sexprenc.go
==================================================================
--- encoder/sexprenc/sexprenc.go
+++ encoder/sexprenc/sexprenc.go
@@ -1,63 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2022-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-// Package sexprenc encodes the abstract syntax tree into a s-expr.
-package sexprenc
-
-import (
-	"io"
-
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/encoder"
-)
-
-func init() {
-	encoder.Register(api.EncoderSexpr, func() encoder.Encoder { return Create() })
-}
-
-// Create a S-expr encoder
-func Create() *Encoder { return &mySE }
-
-type Encoder struct{}
-
-var mySE Encoder
-
-// WriteZettel writes the encoded zettel to the writer.
-func (*Encoder) WriteZettel(w io.Writer, zn *ast.ZettelNode, evalMeta encoder.EvalMetaFunc) (int, error) {
-	t := NewTransformer()
-	content := t.GetSexpr(&zn.Ast)
-	meta := t.GetMeta(zn.InhMeta, evalMeta)
-	return io.WriteString(w, sxpf.Nil().Cons(content).Cons(meta).Repr())
-}
-
-// WriteMeta encodes meta data as s-expression.
-func (*Encoder) WriteMeta(w io.Writer, m *meta.Meta, evalMeta encoder.EvalMetaFunc) (int, error) {
-	t := NewTransformer()
-	return io.WriteString(w, t.GetMeta(m, evalMeta).Repr())
-}
-
-func (se *Encoder) WriteContent(w io.Writer, zn *ast.ZettelNode) (int, error) {
-	return se.WriteBlocks(w, &zn.Ast)
-}
-
-// WriteBlocks writes a block slice to the writer
-func (*Encoder) WriteBlocks(w io.Writer, bs *ast.BlockSlice) (int, error) {
-	t := NewTransformer()
-	return io.WriteString(w, t.GetSexpr(bs).Repr())
-}
-
-// WriteInlines writes an inline slice to the writer
-func (*Encoder) WriteInlines(w io.Writer, is *ast.InlineSlice) (int, error) {
-	t := NewTransformer()
-	return io.WriteString(w, t.GetSexpr(is).Repr())
-}

DELETED encoder/sexprenc/transform.go
Index: encoder/sexprenc/transform.go
==================================================================
--- encoder/sexprenc/transform.go
+++ encoder/sexprenc/transform.go
@@ -1,430 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2022-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package sexprenc
-
-import (
-	"encoding/base64"
-	"fmt"
-	"log"
-	"strings"
-
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/attrs"
-	"zettelstore.de/c/sexpr"
-	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/encoder"
-)
-
-// NewTransformer returns a new transformer to create s-expressions from AST nodes.
-func NewTransformer() *Transformer {
-	sf := sxpf.MakeMappedFactory()
-	t := Transformer{sf: sf}
-	t.zetSyms.InitializeZettelSymbols(sf)
-
-	t.mapVerbatimKindS = map[ast.VerbatimKind]*sxpf.Symbol{
-		ast.VerbatimZettel:  t.zetSyms.SymVerbatimZettel,
-		ast.VerbatimProg:    t.zetSyms.SymVerbatimProg,
-		ast.VerbatimEval:    t.zetSyms.SymVerbatimEval,
-		ast.VerbatimMath:    t.zetSyms.SymVerbatimMath,
-		ast.VerbatimComment: t.zetSyms.SymVerbatimComment,
-		ast.VerbatimHTML:    t.zetSyms.SymVerbatimHTML,
-	}
-
-	t.mapRegionKindS = map[ast.RegionKind]*sxpf.Symbol{
-		ast.RegionSpan:  t.zetSyms.SymRegionBlock,
-		ast.RegionQuote: t.zetSyms.SymRegionQuote,
-		ast.RegionVerse: t.zetSyms.SymRegionVerse,
-	}
-	t.mapNestedListKindS = map[ast.NestedListKind]*sxpf.Symbol{
-		ast.NestedListOrdered:   t.zetSyms.SymListOrdered,
-		ast.NestedListUnordered: t.zetSyms.SymListUnordered,
-		ast.NestedListQuote:     t.zetSyms.SymListQuote,
-	}
-	t.alignmentSymbolS = map[ast.Alignment]*sxpf.Symbol{
-		ast.AlignDefault: t.zetSyms.SymCell,
-		ast.AlignLeft:    t.zetSyms.SymCellLeft,
-		ast.AlignCenter:  t.zetSyms.SymCellCenter,
-		ast.AlignRight:   t.zetSyms.SymCellRight,
-	}
-	t.mapRefStateLink = map[ast.RefState]*sxpf.Symbol{
-		ast.RefStateInvalid:  t.zetSyms.SymLinkInvalid,
-		ast.RefStateZettel:   t.zetSyms.SymLinkZettel,
-		ast.RefStateSelf:     t.zetSyms.SymLinkSelf,
-		ast.RefStateFound:    t.zetSyms.SymLinkFound,
-		ast.RefStateBroken:   t.zetSyms.SymLinkBroken,
-		ast.RefStateHosted:   t.zetSyms.SymLinkHosted,
-		ast.RefStateBased:    t.zetSyms.SymLinkBased,
-		ast.RefStateQuery:    t.zetSyms.SymLinkQuery,
-		ast.RefStateExternal: t.zetSyms.SymLinkExternal,
-	}
-	t.mapFormatKindS = map[ast.FormatKind]*sxpf.Symbol{
-		ast.FormatEmph:   t.zetSyms.SymFormatEmph,
-		ast.FormatStrong: t.zetSyms.SymFormatStrong,
-		ast.FormatDelete: t.zetSyms.SymFormatDelete,
-		ast.FormatInsert: t.zetSyms.SymFormatInsert,
-		ast.FormatSuper:  t.zetSyms.SymFormatSuper,
-		ast.FormatSub:    t.zetSyms.SymFormatSub,
-		ast.FormatQuote:  t.zetSyms.SymFormatQuote,
-		ast.FormatSpan:   t.zetSyms.SymFormatSpan,
-	}
-	t.mapLiteralKindS = map[ast.LiteralKind]*sxpf.Symbol{
-		ast.LiteralZettel:  t.zetSyms.SymLiteralZettel,
-		ast.LiteralProg:    t.zetSyms.SymLiteralProg,
-		ast.LiteralInput:   t.zetSyms.SymLiteralInput,
-		ast.LiteralOutput:  t.zetSyms.SymLiteralOutput,
-		ast.LiteralComment: t.zetSyms.SymLiteralComment,
-		ast.LiteralHTML:    t.zetSyms.SymLiteralHTML,
-		ast.LiteralMath:    t.zetSyms.SymLiteralMath,
-	}
-	t.mapRefStateS = map[ast.RefState]*sxpf.Symbol{
-		ast.RefStateInvalid:  t.zetSyms.SymRefStateInvalid,
-		ast.RefStateZettel:   t.zetSyms.SymRefStateZettel,
-		ast.RefStateSelf:     t.zetSyms.SymRefStateSelf,
-		ast.RefStateFound:    t.zetSyms.SymRefStateFound,
-		ast.RefStateBroken:   t.zetSyms.SymRefStateBroken,
-		ast.RefStateHosted:   t.zetSyms.SymRefStateHosted,
-		ast.RefStateBased:    t.zetSyms.SymRefStateBased,
-		ast.RefStateQuery:    t.zetSyms.SymRefStateQuery,
-		ast.RefStateExternal: t.zetSyms.SymRefStateExternal,
-	}
-	t.mapMetaTypeS = map[*meta.DescriptionType]*sxpf.Symbol{
-		meta.TypeCredential:   t.zetSyms.SymTypeCredential,
-		meta.TypeEmpty:        t.zetSyms.SymTypeEmpty,
-		meta.TypeID:           t.zetSyms.SymTypeID,
-		meta.TypeIDSet:        t.zetSyms.SymTypeIDSet,
-		meta.TypeNumber:       t.zetSyms.SymTypeNumber,
-		meta.TypeString:       t.zetSyms.SymTypeString,
-		meta.TypeTagSet:       t.zetSyms.SymTypeTagSet,
-		meta.TypeTimestamp:    t.zetSyms.SymTypeTimestamp,
-		meta.TypeURL:          t.zetSyms.SymTypeURL,
-		meta.TypeWord:         t.zetSyms.SymTypeWord,
-		meta.TypeWordSet:      t.zetSyms.SymTypeWordSet,
-		meta.TypeZettelmarkup: t.zetSyms.SymTypeZettelmarkup,
-	}
-	return &t
-}
-
-type Transformer struct {
-	sf                 sxpf.SymbolFactory
-	zetSyms            sexpr.ZettelSymbols
-	mapVerbatimKindS   map[ast.VerbatimKind]*sxpf.Symbol
-	mapRegionKindS     map[ast.RegionKind]*sxpf.Symbol
-	mapNestedListKindS map[ast.NestedListKind]*sxpf.Symbol
-	alignmentSymbolS   map[ast.Alignment]*sxpf.Symbol
-	mapRefStateLink    map[ast.RefState]*sxpf.Symbol
-	mapFormatKindS     map[ast.FormatKind]*sxpf.Symbol
-	mapLiteralKindS    map[ast.LiteralKind]*sxpf.Symbol
-	mapRefStateS       map[ast.RefState]*sxpf.Symbol
-	mapMetaTypeS       map[*meta.DescriptionType]*sxpf.Symbol
-	inVerse            bool
-}
-
-func (t *Transformer) GetSexpr(node ast.Node) *sxpf.List {
-	switch n := node.(type) {
-	case *ast.BlockSlice:
-		return t.getBlockSlice(n)
-	case *ast.InlineSlice:
-		return t.getInlineSlice(*n)
-	case *ast.ParaNode:
-		return t.getInlineSlice(n.Inlines).Tail().Cons(t.zetSyms.SymPara)
-	case *ast.VerbatimNode:
-		return sxpf.MakeList(
-			mapGetS(t, t.mapVerbatimKindS, n.Kind),
-			t.getAttributes(n.Attrs),
-			sxpf.MakeString(string(n.Content)),
-		)
-	case *ast.RegionNode:
-		return t.getRegion(n)
-	case *ast.HeadingNode:
-		return sxpf.MakeList(
-			t.zetSyms.SymHeading,
-			sxpf.MakeInteger64(int64(n.Level)),
-			t.getAttributes(n.Attrs),
-			sxpf.MakeString(n.Slug),
-			sxpf.MakeString(n.Fragment),
-			t.getInlineSlice(n.Inlines),
-		)
-	case *ast.HRuleNode:
-		return sxpf.MakeList(t.zetSyms.SymThematic, t.getAttributes(n.Attrs))
-	case *ast.NestedListNode:
-		return t.getNestedList(n)
-	case *ast.DescriptionListNode:
-		return t.getDescriptionList(n)
-	case *ast.TableNode:
-		return t.getTable(n)
-	case *ast.TranscludeNode:
-		return sxpf.MakeList(t.zetSyms.SymTransclude, t.getAttributes(n.Attrs), t.getReference(n.Ref))
-	case *ast.BLOBNode:
-		return t.getBLOB(n)
-	case *ast.TextNode:
-		return sxpf.MakeList(t.zetSyms.SymText, sxpf.MakeString(n.Text))
-	case *ast.SpaceNode:
-		if t.inVerse {
-			return sxpf.MakeList(t.zetSyms.SymSpace, sxpf.MakeString(n.Lexeme))
-		}
-		return sxpf.MakeList(t.zetSyms.SymSpace)
-	case *ast.BreakNode:
-		if n.Hard {
-			return sxpf.MakeList(t.zetSyms.SymHard)
-		}
-		return sxpf.MakeList(t.zetSyms.SymSoft)
-	case *ast.LinkNode:
-		return t.getLink(n)
-	case *ast.EmbedRefNode:
-		return t.getInlineSlice(n.Inlines).Tail().
-			Cons(sxpf.MakeString(n.Syntax)).
-			Cons(t.getReference(n.Ref)).
-			Cons(t.getAttributes(n.Attrs)).
-			Cons(t.zetSyms.SymEmbed)
-	case *ast.EmbedBLOBNode:
-		return t.getEmbedBLOB(n)
-	case *ast.CiteNode:
-		return t.getInlineSlice(n.Inlines).Tail().
-			Cons(sxpf.MakeString(n.Key)).
-			Cons(t.getAttributes(n.Attrs)).
-			Cons(t.zetSyms.SymCite)
-	case *ast.FootnoteNode:
-		text := sxpf.Nil().Cons(sxpf.Nil().Cons(t.getInlineSlice(n.Inlines)).Cons(t.zetSyms.SymQuote))
-		return text.Cons(t.getAttributes(n.Attrs)).Cons(t.zetSyms.SymEndnote)
-	case *ast.MarkNode:
-		return t.getInlineSlice(n.Inlines).Tail().
-			Cons(sxpf.MakeString(n.Fragment)).
-			Cons(sxpf.MakeString(n.Slug)).
-			Cons(sxpf.MakeString(n.Mark)).
-			Cons(t.zetSyms.SymMark)
-	case *ast.FormatNode:
-		return t.getInlineSlice(n.Inlines).Tail().
-			Cons(t.getAttributes(n.Attrs)).
-			Cons(mapGetS(t, t.mapFormatKindS, n.Kind))
-	case *ast.LiteralNode:
-		return sxpf.MakeList(
-			mapGetS(t, t.mapLiteralKindS, n.Kind),
-			t.getAttributes(n.Attrs),
-			sxpf.MakeString(string(n.Content)),
-		)
-	}
-	log.Printf("SEXPR %T %v\n", node, node)
-	return sxpf.MakeList(t.zetSyms.SymUnknown, sxpf.MakeString(fmt.Sprintf("%T %v", node, node)))
-}
-
-func (t *Transformer) getRegion(rn *ast.RegionNode) *sxpf.List {
-	saveInVerse := t.inVerse
-	if rn.Kind == ast.RegionVerse {
-		t.inVerse = true
-	}
-	symBlocks := t.GetSexpr(&rn.Blocks)
-	t.inVerse = saveInVerse
-	return sxpf.MakeList(
-		mapGetS(t, t.mapRegionKindS, rn.Kind),
-		t.getAttributes(rn.Attrs),
-		symBlocks,
-		t.GetSexpr(&rn.Inlines),
-	)
-}
-
-func (t *Transformer) getNestedList(ln *ast.NestedListNode) *sxpf.List {
-	nlistObjs := make([]sxpf.Object, len(ln.Items)+1)
-	nlistObjs[0] = mapGetS(t, t.mapNestedListKindS, ln.Kind)
-	isCompact := isCompactList(ln.Items)
-	for i, item := range ln.Items {
-		if isCompact && len(item) > 0 {
-			paragraph := t.GetSexpr(item[0])
-			nlistObjs[i+1] = paragraph.Tail().Cons(t.zetSyms.SymInline)
-			continue
-		}
-		itemObjs := make([]sxpf.Object, len(item))
-		for j, in := range item {
-			itemObjs[j] = t.GetSexpr(in)
-		}
-		if isCompact {
-			nlistObjs[i+1] = sxpf.MakeList(itemObjs...).Cons(t.zetSyms.SymInline)
-		} else {
-			nlistObjs[i+1] = sxpf.MakeList(itemObjs...).Cons(t.zetSyms.SymBlock)
-		}
-	}
-	return sxpf.MakeList(nlistObjs...)
-}
-func isCompactList(itemSlice []ast.ItemSlice) bool {
-	for _, items := range itemSlice {
-		if len(items) > 1 {
-			return false
-		}
-		if len(items) == 1 {
-			if _, ok := items[0].(*ast.ParaNode); !ok {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-func (t *Transformer) getDescriptionList(dn *ast.DescriptionListNode) *sxpf.List {
-	dlObjs := make([]sxpf.Object, 2*len(dn.Descriptions)+1)
-	dlObjs[0] = t.zetSyms.SymDescription
-	for i, def := range dn.Descriptions {
-		dlObjs[2*i+1] = t.getInlineSlice(def.Term)
-		descObjs := make([]sxpf.Object, len(def.Descriptions))
-		for j, b := range def.Descriptions {
-			dVal := make([]sxpf.Object, len(b))
-			for k, dn := range b {
-				dVal[k] = t.GetSexpr(dn)
-			}
-			descObjs[j] = sxpf.MakeList(dVal...).Cons(t.zetSyms.SymBlock)
-		}
-		dlObjs[2*i+2] = sxpf.MakeList(descObjs...).Cons(t.zetSyms.SymBlock)
-	}
-	return sxpf.MakeList(dlObjs...)
-}
-
-func (t *Transformer) getTable(tn *ast.TableNode) *sxpf.List {
-	tObjs := make([]sxpf.Object, len(tn.Rows)+2)
-	tObjs[0] = t.zetSyms.SymTable
-	tObjs[1] = t.getHeader(tn.Header)
-	for i, row := range tn.Rows {
-		tObjs[i+2] = t.getRow(row)
-	}
-	return sxpf.MakeList(tObjs...)
-}
-func (t *Transformer) getHeader(header ast.TableRow) *sxpf.List {
-	if len(header) == 0 {
-		return sxpf.Nil()
-	}
-	return t.getRow(header)
-}
-func (t *Transformer) getRow(row ast.TableRow) *sxpf.List {
-	rObjs := make([]sxpf.Object, len(row))
-	for i, cell := range row {
-		rObjs[i] = t.getCell(cell)
-	}
-	return sxpf.MakeList(rObjs...).Cons(t.zetSyms.SymList)
-}
-
-func (t *Transformer) getCell(cell *ast.TableCell) *sxpf.List {
-	return t.getInlineSlice(cell.Inlines).Tail().Cons(mapGetS(t, t.alignmentSymbolS, cell.Align))
-}
-
-func (t *Transformer) getBLOB(bn *ast.BLOBNode) *sxpf.List {
-	var lastObj sxpf.Object
-	if bn.Syntax == meta.SyntaxSVG {
-		lastObj = sxpf.MakeString(string(bn.Blob))
-	} else {
-		lastObj = getBase64String(bn.Blob)
-	}
-	return sxpf.MakeList(
-		t.zetSyms.SymBLOB,
-		t.getInlineSlice(bn.Description),
-		sxpf.MakeString(bn.Syntax),
-		lastObj,
-	)
-}
-
-func (t *Transformer) getLink(ln *ast.LinkNode) *sxpf.List {
-	return t.getInlineSlice(ln.Inlines).Tail().
-		Cons(sxpf.MakeString(ln.Ref.Value)).
-		Cons(t.getAttributes(ln.Attrs)).
-		Cons(mapGetS(t, t.mapRefStateLink, ln.Ref.State))
-}
-
-func (t *Transformer) getEmbedBLOB(en *ast.EmbedBLOBNode) *sxpf.List {
-	tail := t.getInlineSlice(en.Inlines).Tail()
-	if en.Syntax == meta.SyntaxSVG {
-		tail = tail.Cons(sxpf.MakeString(string(en.Blob)))
-	} else {
-		tail = tail.Cons(getBase64String(en.Blob))
-	}
-	return tail.Cons(sxpf.MakeString(en.Syntax)).Cons(t.getAttributes(en.Attrs)).Cons(t.zetSyms.SymEmbedBLOB)
-}
-
-func (t *Transformer) getBlockSlice(bs *ast.BlockSlice) *sxpf.List {
-	objs := make([]sxpf.Object, len(*bs))
-	for i, n := range *bs {
-		objs[i] = t.GetSexpr(n)
-	}
-	return sxpf.MakeList(objs...).Cons(t.zetSyms.SymBlock)
-}
-func (t *Transformer) getInlineSlice(is ast.InlineSlice) *sxpf.List {
-	objs := make([]sxpf.Object, len(is))
-	for i, n := range is {
-		objs[i] = t.GetSexpr(n)
-	}
-	return sxpf.MakeList(objs...).Cons(t.zetSyms.SymInline)
-}
-
-func (t *Transformer) getAttributes(a attrs.Attributes) sxpf.Object {
-	if a.IsEmpty() {
-		return sxpf.Nil()
-	}
-	keys := a.Keys()
-	objs := make([]sxpf.Object, 0, len(keys))
-	for _, k := range keys {
-		objs = append(objs, sxpf.Cons(sxpf.MakeString(k), sxpf.MakeString(a[k])))
-	}
-	return sxpf.Nil().Cons(sxpf.MakeList(objs...)).Cons(t.zetSyms.SymQuote)
-}
-
-func (t *Transformer) getReference(ref *ast.Reference) *sxpf.List {
-	return sxpf.MakeList(
-		t.zetSyms.SymQuote,
-		sxpf.MakeList(
-			mapGetS(t, t.mapRefStateS, ref.State),
-			sxpf.MakeString(ref.Value),
-		),
-	)
-}
-
-func (t *Transformer) GetMeta(m *meta.Meta, evalMeta encoder.EvalMetaFunc) *sxpf.List {
-	pairs := m.ComputedPairs()
-	objs := make([]sxpf.Object, 0, len(pairs))
-	for _, p := range pairs {
-		key := p.Key
-		ty := m.Type(key)
-		symType := mapGetS(t, t.mapMetaTypeS, ty)
-		strKey := sxpf.MakeString(key)
-		var obj sxpf.Object
-		if ty.IsSet {
-			setList := meta.ListFromValue(p.Value)
-			setObjs := make([]sxpf.Object, len(setList))
-			for i, val := range setList {
-				setObjs[i] = sxpf.MakeString(val)
-			}
-			obj = sxpf.MakeList(setObjs...).Cons(t.zetSyms.SymList)
-		} else if ty == meta.TypeZettelmarkup {
-			is := evalMeta(p.Value)
-			obj = t.GetSexpr(&is)
-		} else {
-			obj = sxpf.MakeString(p.Value)
-		}
-		objs = append(objs, sxpf.Nil().Cons(obj).Cons(strKey).Cons(symType))
-	}
-	return sxpf.MakeList(objs...).Cons(t.zetSyms.SymMeta)
-}
-
-func mapGetS[T comparable](t *Transformer, m map[T]*sxpf.Symbol, k T) *sxpf.Symbol {
-	if result, found := m[k]; found {
-		return result
-	}
-	log.Println("MISS", k, m)
-	return t.sf.MustMake(fmt.Sprintf("**%v:NOT-FOUND**", k))
-}
-
-func getBase64String(data []byte) sxpf.String {
-	var sb strings.Builder
-	encoder := base64.NewEncoder(base64.StdEncoding, &sb)
-	_, err := encoder.Write(data)
-	if err == nil {
-		err = encoder.Close()
-	}
-	if err == nil {
-		return sxpf.MakeString(sb.String())
-	}
-	return sxpf.MakeString("")
-}

Index: encoder/shtmlenc/shtmlenc.go
==================================================================
--- encoder/shtmlenc/shtmlenc.go
+++ encoder/shtmlenc/shtmlenc.go
@@ -12,81 +12,83 @@
 package shtmlenc
 
 import (
 	"io"
 
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/shtml"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/shtml"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
-	"zettelstore.de/z/encoder/sexprenc"
+	"zettelstore.de/z/encoder/szenc"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
-	encoder.Register(api.EncoderSHTML, func() encoder.Encoder { return Create() })
+	encoder.Register(api.EncoderSHTML, func(params *encoder.CreateParameter) encoder.Encoder { return Create(params) })
 }
 
 // Create a SHTML encoder
-func Create() *Encoder { return &mySE }
-
-type Encoder struct{}
+func Create(params *encoder.CreateParameter) *Encoder {
+	// We need a new transformer every time, because tx.inVerse must be unique.
+	// If we can refactor it out, the transformer can be created only once.
+	return &Encoder{
+		tx:   szenc.NewTransformer(),
+		th:   shtml.NewEvaluator(1, nil),
+		lang: params.Lang,
+	}
+}
 
-var mySE Encoder
+type Encoder struct {
+	tx   *szenc.Transformer
+	th   *shtml.Evaluator
+	lang string
+}
 
 // WriteZettel writes the encoded zettel to the writer.
-func (*Encoder) WriteZettel(w io.Writer, zn *ast.ZettelNode, evalMeta encoder.EvalMetaFunc) (int, error) {
-	tx := sexprenc.NewTransformer()
-	th := shtml.NewTransformer(1, nil)
-	metaSHTML, err := th.Transform(tx.GetMeta(zn.InhMeta, evalMeta))
+func (enc *Encoder) WriteZettel(w io.Writer, zn *ast.ZettelNode, evalMeta encoder.EvalMetaFunc) (int, error) {
+	env := shtml.MakeEnvironment(enc.lang)
+	metaSHTML, err := enc.th.Evaluate(enc.tx.GetMeta(zn.InhMeta, evalMeta), &env)
+	if err != nil {
+		return 0, err
+	}
+	contentSHTML, err := enc.th.Evaluate(enc.tx.GetSz(&zn.Ast), &env)
 	if err != nil {
 		return 0, err
 	}
-	contentSHTML, err := th.Transform(tx.GetSexpr(&zn.Ast))
-	if err != nil {
-		return 0, err
-	}
-	result := sxpf.Cons(metaSHTML, contentSHTML)
+	result := sx.Cons(metaSHTML, contentSHTML)
 	return result.Print(w)
 }
 
 // WriteMeta encodes meta data as s-expression.
-func (*Encoder) WriteMeta(w io.Writer, m *meta.Meta, evalMeta encoder.EvalMetaFunc) (int, error) {
-	tx := sexprenc.NewTransformer()
-	th := shtml.NewTransformer(1, nil)
-	metaSHTML, err := th.Transform(tx.GetMeta(m, evalMeta))
+func (enc *Encoder) WriteMeta(w io.Writer, m *meta.Meta, evalMeta encoder.EvalMetaFunc) (int, error) {
+	env := shtml.MakeEnvironment(enc.lang)
+	metaSHTML, err := enc.th.Evaluate(enc.tx.GetMeta(m, evalMeta), &env)
 	if err != nil {
 		return 0, err
 	}
-	return metaSHTML.Print(w)
+	return sx.Print(w, metaSHTML)
 }
 
-func (se *Encoder) WriteContent(w io.Writer, zn *ast.ZettelNode) (int, error) {
-	return se.WriteBlocks(w, &zn.Ast)
+func (enc *Encoder) WriteContent(w io.Writer, zn *ast.ZettelNode) (int, error) {
+	return enc.WriteBlocks(w, &zn.Ast)
 }
 
 // WriteBlocks writes a block slice to the writer
-func (*Encoder) WriteBlocks(w io.Writer, bs *ast.BlockSlice) (int, error) {
-	hval, err := TransformSlice(bs)
+func (enc *Encoder) WriteBlocks(w io.Writer, bs *ast.BlockSlice) (int, error) {
+	env := shtml.MakeEnvironment(enc.lang)
+	hval, err := enc.th.Evaluate(enc.tx.GetSz(bs), &env)
 	if err != nil {
 		return 0, err
 	}
-	return hval.Print(w)
+	return sx.Print(w, hval)
 }
 
 // WriteInlines writes an inline slice to the writer
-func (*Encoder) WriteInlines(w io.Writer, is *ast.InlineSlice) (int, error) {
-	hval, err := TransformSlice(is)
+func (enc *Encoder) WriteInlines(w io.Writer, is *ast.InlineSlice) (int, error) {
+	env := shtml.MakeEnvironment(enc.lang)
+	hval, err := enc.th.Evaluate(enc.tx.GetSz(is), &env)
 	if err != nil {
 		return 0, err
 	}
-	return hval.Print(w)
-}
-
-// TransformSlice transforms a AST slice into SHTML.
-func TransformSlice(node ast.Node) (*sxpf.List, error) {
-	tx := sexprenc.NewTransformer()
-	xval := tx.GetSexpr(node)
-	th := shtml.NewTransformer(1, nil)
-	return th.Transform(xval)
+	return sx.Print(w, hval)
 }

ADDED   encoder/szenc/szenc.go
Index: encoder/szenc/szenc.go
==================================================================
--- encoder/szenc/szenc.go
+++ encoder/szenc/szenc.go
@@ -0,0 +1,63 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2022-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+// Package szenc encodes the abstract syntax tree into a s-expr for zettel.
+package szenc
+
+import (
+	"io"
+
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/z/ast"
+	"zettelstore.de/z/encoder"
+	"zettelstore.de/z/zettel/meta"
+)
+
+func init() {
+	encoder.Register(api.EncoderSz, func(*encoder.CreateParameter) encoder.Encoder { return Create() })
+}
+
+// Create a S-expr encoder
+func Create() *Encoder {
+	// We need a new transformer every time, because trans.inVerse must be unique.
+	// If we can refactor it out, the transformer can be created only once.
+	return &Encoder{trans: NewTransformer()}
+}
+
+type Encoder struct {
+	trans *Transformer
+}
+
+// WriteZettel writes the encoded zettel to the writer.
+func (enc *Encoder) WriteZettel(w io.Writer, zn *ast.ZettelNode, evalMeta encoder.EvalMetaFunc) (int, error) {
+	content := enc.trans.GetSz(&zn.Ast)
+	meta := enc.trans.GetMeta(zn.InhMeta, evalMeta)
+	return sx.MakeList(meta, content).Print(w)
+}
+
+// WriteMeta encodes meta data as s-expression.
+func (enc *Encoder) WriteMeta(w io.Writer, m *meta.Meta, evalMeta encoder.EvalMetaFunc) (int, error) {
+	return enc.trans.GetMeta(m, evalMeta).Print(w)
+}
+
+func (enc *Encoder) WriteContent(w io.Writer, zn *ast.ZettelNode) (int, error) {
+	return enc.WriteBlocks(w, &zn.Ast)
+}
+
+// WriteBlocks writes a block slice to the writer
+func (enc *Encoder) WriteBlocks(w io.Writer, bs *ast.BlockSlice) (int, error) {
+	return enc.trans.GetSz(bs).Print(w)
+}
+
+// WriteInlines writes an inline slice to the writer
+func (enc *Encoder) WriteInlines(w io.Writer, is *ast.InlineSlice) (int, error) {
+	return enc.trans.GetSz(is).Print(w)
+}

ADDED   encoder/szenc/transform.go
Index: encoder/szenc/transform.go
==================================================================
--- encoder/szenc/transform.go
+++ encoder/szenc/transform.go
@@ -0,0 +1,428 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2022-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package szenc
+
+import (
+	"encoding/base64"
+	"fmt"
+	"strings"
+
+	"zettelstore.de/client.fossil/attrs"
+	"zettelstore.de/client.fossil/sz"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/z/ast"
+	"zettelstore.de/z/encoder"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// NewTransformer returns a new transformer to create s-expressions from AST nodes.
+func NewTransformer() *Transformer {
+	sf := sx.MakeMappedFactory(1024)
+	t := Transformer{sf: sf}
+	t.zetSyms.InitializeZettelSymbols(sf)
+
+	t.mapVerbatimKindS = map[ast.VerbatimKind]*sx.Symbol{
+		ast.VerbatimZettel:  t.zetSyms.SymVerbatimZettel,
+		ast.VerbatimProg:    t.zetSyms.SymVerbatimProg,
+		ast.VerbatimEval:    t.zetSyms.SymVerbatimEval,
+		ast.VerbatimMath:    t.zetSyms.SymVerbatimMath,
+		ast.VerbatimComment: t.zetSyms.SymVerbatimComment,
+		ast.VerbatimHTML:    t.zetSyms.SymVerbatimHTML,
+	}
+
+	t.mapRegionKindS = map[ast.RegionKind]*sx.Symbol{
+		ast.RegionSpan:  t.zetSyms.SymRegionBlock,
+		ast.RegionQuote: t.zetSyms.SymRegionQuote,
+		ast.RegionVerse: t.zetSyms.SymRegionVerse,
+	}
+	t.mapNestedListKindS = map[ast.NestedListKind]*sx.Symbol{
+		ast.NestedListOrdered:   t.zetSyms.SymListOrdered,
+		ast.NestedListUnordered: t.zetSyms.SymListUnordered,
+		ast.NestedListQuote:     t.zetSyms.SymListQuote,
+	}
+	t.alignmentSymbolS = map[ast.Alignment]*sx.Symbol{
+		ast.AlignDefault: t.zetSyms.SymCell,
+		ast.AlignLeft:    t.zetSyms.SymCellLeft,
+		ast.AlignCenter:  t.zetSyms.SymCellCenter,
+		ast.AlignRight:   t.zetSyms.SymCellRight,
+	}
+	t.mapRefStateLink = map[ast.RefState]*sx.Symbol{
+		ast.RefStateInvalid:  t.zetSyms.SymLinkInvalid,
+		ast.RefStateZettel:   t.zetSyms.SymLinkZettel,
+		ast.RefStateSelf:     t.zetSyms.SymLinkSelf,
+		ast.RefStateFound:    t.zetSyms.SymLinkFound,
+		ast.RefStateBroken:   t.zetSyms.SymLinkBroken,
+		ast.RefStateHosted:   t.zetSyms.SymLinkHosted,
+		ast.RefStateBased:    t.zetSyms.SymLinkBased,
+		ast.RefStateQuery:    t.zetSyms.SymLinkQuery,
+		ast.RefStateExternal: t.zetSyms.SymLinkExternal,
+	}
+	t.mapFormatKindS = map[ast.FormatKind]*sx.Symbol{
+		ast.FormatEmph:   t.zetSyms.SymFormatEmph,
+		ast.FormatStrong: t.zetSyms.SymFormatStrong,
+		ast.FormatDelete: t.zetSyms.SymFormatDelete,
+		ast.FormatInsert: t.zetSyms.SymFormatInsert,
+		ast.FormatSuper:  t.zetSyms.SymFormatSuper,
+		ast.FormatSub:    t.zetSyms.SymFormatSub,
+		ast.FormatQuote:  t.zetSyms.SymFormatQuote,
+		ast.FormatMark:   t.zetSyms.SymFormatMark,
+		ast.FormatSpan:   t.zetSyms.SymFormatSpan,
+	}
+	t.mapLiteralKindS = map[ast.LiteralKind]*sx.Symbol{
+		ast.LiteralZettel:  t.zetSyms.SymLiteralZettel,
+		ast.LiteralProg:    t.zetSyms.SymLiteralProg,
+		ast.LiteralInput:   t.zetSyms.SymLiteralInput,
+		ast.LiteralOutput:  t.zetSyms.SymLiteralOutput,
+		ast.LiteralComment: t.zetSyms.SymLiteralComment,
+		ast.LiteralHTML:    t.zetSyms.SymLiteralHTML,
+		ast.LiteralMath:    t.zetSyms.SymLiteralMath,
+	}
+	t.mapRefStateS = map[ast.RefState]*sx.Symbol{
+		ast.RefStateInvalid:  t.zetSyms.SymRefStateInvalid,
+		ast.RefStateZettel:   t.zetSyms.SymRefStateZettel,
+		ast.RefStateSelf:     t.zetSyms.SymRefStateSelf,
+		ast.RefStateFound:    t.zetSyms.SymRefStateFound,
+		ast.RefStateBroken:   t.zetSyms.SymRefStateBroken,
+		ast.RefStateHosted:   t.zetSyms.SymRefStateHosted,
+		ast.RefStateBased:    t.zetSyms.SymRefStateBased,
+		ast.RefStateQuery:    t.zetSyms.SymRefStateQuery,
+		ast.RefStateExternal: t.zetSyms.SymRefStateExternal,
+	}
+	t.mapMetaTypeS = map[*meta.DescriptionType]*sx.Symbol{
+		meta.TypeCredential:   t.zetSyms.SymTypeCredential,
+		meta.TypeEmpty:        t.zetSyms.SymTypeEmpty,
+		meta.TypeID:           t.zetSyms.SymTypeID,
+		meta.TypeIDSet:        t.zetSyms.SymTypeIDSet,
+		meta.TypeNumber:       t.zetSyms.SymTypeNumber,
+		meta.TypeString:       t.zetSyms.SymTypeString,
+		meta.TypeTagSet:       t.zetSyms.SymTypeTagSet,
+		meta.TypeTimestamp:    t.zetSyms.SymTypeTimestamp,
+		meta.TypeURL:          t.zetSyms.SymTypeURL,
+		meta.TypeWord:         t.zetSyms.SymTypeWord,
+		meta.TypeWordSet:      t.zetSyms.SymTypeWordSet,
+		meta.TypeZettelmarkup: t.zetSyms.SymTypeZettelmarkup,
+	}
+	return &t
+}
+
+type Transformer struct {
+	sf                 sx.SymbolFactory
+	zetSyms            sz.ZettelSymbols
+	mapVerbatimKindS   map[ast.VerbatimKind]*sx.Symbol
+	mapRegionKindS     map[ast.RegionKind]*sx.Symbol
+	mapNestedListKindS map[ast.NestedListKind]*sx.Symbol
+	alignmentSymbolS   map[ast.Alignment]*sx.Symbol
+	mapRefStateLink    map[ast.RefState]*sx.Symbol
+	mapFormatKindS     map[ast.FormatKind]*sx.Symbol
+	mapLiteralKindS    map[ast.LiteralKind]*sx.Symbol
+	mapRefStateS       map[ast.RefState]*sx.Symbol
+	mapMetaTypeS       map[*meta.DescriptionType]*sx.Symbol
+	inVerse            bool
+}
+
+func (t *Transformer) GetSz(node ast.Node) *sx.Pair {
+	switch n := node.(type) {
+	case *ast.BlockSlice:
+		return t.getBlockSlice(n)
+	case *ast.InlineSlice:
+		return t.getInlineSlice(*n)
+	case *ast.ParaNode:
+		return t.getInlineSlice(n.Inlines).Tail().Cons(t.zetSyms.SymPara)
+	case *ast.VerbatimNode:
+		return sx.MakeList(
+			mapGetS(t, t.mapVerbatimKindS, n.Kind),
+			t.getAttributes(n.Attrs),
+			sx.String(string(n.Content)),
+		)
+	case *ast.RegionNode:
+		return t.getRegion(n)
+	case *ast.HeadingNode:
+		return sx.MakeList(
+			t.zetSyms.SymHeading,
+			sx.Int64(int64(n.Level)),
+			t.getAttributes(n.Attrs),
+			sx.String(n.Slug),
+			sx.String(n.Fragment),
+			t.getInlineSlice(n.Inlines),
+		)
+	case *ast.HRuleNode:
+		return sx.MakeList(t.zetSyms.SymThematic, t.getAttributes(n.Attrs))
+	case *ast.NestedListNode:
+		return t.getNestedList(n)
+	case *ast.DescriptionListNode:
+		return t.getDescriptionList(n)
+	case *ast.TableNode:
+		return t.getTable(n)
+	case *ast.TranscludeNode:
+		return sx.MakeList(t.zetSyms.SymTransclude, t.getAttributes(n.Attrs), t.getReference(n.Ref))
+	case *ast.BLOBNode:
+		return t.getBLOB(n)
+	case *ast.TextNode:
+		return sx.MakeList(t.zetSyms.SymText, sx.String(n.Text))
+	case *ast.SpaceNode:
+		if t.inVerse {
+			return sx.MakeList(t.zetSyms.SymSpace, sx.String(n.Lexeme))
+		}
+		return sx.MakeList(t.zetSyms.SymSpace)
+	case *ast.BreakNode:
+		if n.Hard {
+			return sx.MakeList(t.zetSyms.SymHard)
+		}
+		return sx.MakeList(t.zetSyms.SymSoft)
+	case *ast.LinkNode:
+		return t.getLink(n)
+	case *ast.EmbedRefNode:
+		return t.getInlineSlice(n.Inlines).Tail().
+			Cons(sx.String(n.Syntax)).
+			Cons(t.getReference(n.Ref)).
+			Cons(t.getAttributes(n.Attrs)).
+			Cons(t.zetSyms.SymEmbed)
+	case *ast.EmbedBLOBNode:
+		return t.getEmbedBLOB(n)
+	case *ast.CiteNode:
+		return t.getInlineSlice(n.Inlines).Tail().
+			Cons(sx.String(n.Key)).
+			Cons(t.getAttributes(n.Attrs)).
+			Cons(t.zetSyms.SymCite)
+	case *ast.FootnoteNode:
+		text := sx.Nil().Cons(sx.Nil().Cons(t.getInlineSlice(n.Inlines)).Cons(t.zetSyms.SymQuote))
+		return text.Cons(t.getAttributes(n.Attrs)).Cons(t.zetSyms.SymEndnote)
+	case *ast.MarkNode:
+		return t.getInlineSlice(n.Inlines).Tail().
+			Cons(sx.String(n.Fragment)).
+			Cons(sx.String(n.Slug)).
+			Cons(sx.String(n.Mark)).
+			Cons(t.zetSyms.SymMark)
+	case *ast.FormatNode:
+		return t.getInlineSlice(n.Inlines).Tail().
+			Cons(t.getAttributes(n.Attrs)).
+			Cons(mapGetS(t, t.mapFormatKindS, n.Kind))
+	case *ast.LiteralNode:
+		return sx.MakeList(
+			mapGetS(t, t.mapLiteralKindS, n.Kind),
+			t.getAttributes(n.Attrs),
+			sx.String(string(n.Content)),
+		)
+	}
+	return sx.MakeList(t.zetSyms.SymUnknown, sx.String(fmt.Sprintf("%T %v", node, node)))
+}
+
+func (t *Transformer) getRegion(rn *ast.RegionNode) *sx.Pair {
+	saveInVerse := t.inVerse
+	if rn.Kind == ast.RegionVerse {
+		t.inVerse = true
+	}
+	symBlocks := t.GetSz(&rn.Blocks)
+	t.inVerse = saveInVerse
+	return sx.MakeList(
+		mapGetS(t, t.mapRegionKindS, rn.Kind),
+		t.getAttributes(rn.Attrs),
+		symBlocks,
+		t.GetSz(&rn.Inlines),
+	)
+}
+
+func (t *Transformer) getNestedList(ln *ast.NestedListNode) *sx.Pair {
+	nlistObjs := make([]sx.Object, len(ln.Items)+1)
+	nlistObjs[0] = mapGetS(t, t.mapNestedListKindS, ln.Kind)
+	isCompact := isCompactList(ln.Items)
+	for i, item := range ln.Items {
+		if isCompact && len(item) > 0 {
+			paragraph := t.GetSz(item[0])
+			nlistObjs[i+1] = paragraph.Tail().Cons(t.zetSyms.SymInline)
+			continue
+		}
+		itemObjs := make([]sx.Object, len(item))
+		for j, in := range item {
+			itemObjs[j] = t.GetSz(in)
+		}
+		if isCompact {
+			nlistObjs[i+1] = sx.MakeList(itemObjs...).Cons(t.zetSyms.SymInline)
+		} else {
+			nlistObjs[i+1] = sx.MakeList(itemObjs...).Cons(t.zetSyms.SymBlock)
+		}
+	}
+	return sx.MakeList(nlistObjs...)
+}
+func isCompactList(itemSlice []ast.ItemSlice) bool {
+	for _, items := range itemSlice {
+		if len(items) > 1 {
+			return false
+		}
+		if len(items) == 1 {
+			if _, ok := items[0].(*ast.ParaNode); !ok {
+				return false
+			}
+		}
+	}
+	return true
+}
+
+func (t *Transformer) getDescriptionList(dn *ast.DescriptionListNode) *sx.Pair {
+	dlObjs := make([]sx.Object, 2*len(dn.Descriptions)+1)
+	dlObjs[0] = t.zetSyms.SymDescription
+	for i, def := range dn.Descriptions {
+		dlObjs[2*i+1] = t.getInlineSlice(def.Term)
+		descObjs := make([]sx.Object, len(def.Descriptions))
+		for j, b := range def.Descriptions {
+			dVal := make([]sx.Object, len(b))
+			for k, dn := range b {
+				dVal[k] = t.GetSz(dn)
+			}
+			descObjs[j] = sx.MakeList(dVal...).Cons(t.zetSyms.SymBlock)
+		}
+		dlObjs[2*i+2] = sx.MakeList(descObjs...).Cons(t.zetSyms.SymBlock)
+	}
+	return sx.MakeList(dlObjs...)
+}
+
+func (t *Transformer) getTable(tn *ast.TableNode) *sx.Pair {
+	tObjs := make([]sx.Object, len(tn.Rows)+2)
+	tObjs[0] = t.zetSyms.SymTable
+	tObjs[1] = t.getHeader(tn.Header)
+	for i, row := range tn.Rows {
+		tObjs[i+2] = t.getRow(row)
+	}
+	return sx.MakeList(tObjs...)
+}
+func (t *Transformer) getHeader(header ast.TableRow) *sx.Pair {
+	if len(header) == 0 {
+		return nil
+	}
+	return t.getRow(header)
+}
+func (t *Transformer) getRow(row ast.TableRow) *sx.Pair {
+	rObjs := make([]sx.Object, len(row))
+	for i, cell := range row {
+		rObjs[i] = t.getCell(cell)
+	}
+	return sx.MakeList(rObjs...).Cons(t.zetSyms.SymList)
+}
+
+func (t *Transformer) getCell(cell *ast.TableCell) *sx.Pair {
+	return t.getInlineSlice(cell.Inlines).Tail().Cons(mapGetS(t, t.alignmentSymbolS, cell.Align))
+}
+
+func (t *Transformer) getBLOB(bn *ast.BLOBNode) *sx.Pair {
+	var lastObj sx.Object
+	if bn.Syntax == meta.SyntaxSVG {
+		lastObj = sx.String(string(bn.Blob))
+	} else {
+		lastObj = getBase64String(bn.Blob)
+	}
+	return sx.MakeList(
+		t.zetSyms.SymBLOB,
+		t.getInlineSlice(bn.Description),
+		sx.String(bn.Syntax),
+		lastObj,
+	)
+}
+
+func (t *Transformer) getLink(ln *ast.LinkNode) *sx.Pair {
+	return t.getInlineSlice(ln.Inlines).Tail().
+		Cons(sx.String(ln.Ref.Value)).
+		Cons(t.getAttributes(ln.Attrs)).
+		Cons(mapGetS(t, t.mapRefStateLink, ln.Ref.State))
+}
+
+func (t *Transformer) getEmbedBLOB(en *ast.EmbedBLOBNode) *sx.Pair {
+	tail := t.getInlineSlice(en.Inlines).Tail()
+	if en.Syntax == meta.SyntaxSVG {
+		tail = tail.Cons(sx.String(string(en.Blob)))
+	} else {
+		tail = tail.Cons(getBase64String(en.Blob))
+	}
+	return tail.Cons(sx.String(en.Syntax)).Cons(t.getAttributes(en.Attrs)).Cons(t.zetSyms.SymEmbedBLOB)
+}
+
+func (t *Transformer) getBlockSlice(bs *ast.BlockSlice) *sx.Pair {
+	objs := make([]sx.Object, len(*bs))
+	for i, n := range *bs {
+		objs[i] = t.GetSz(n)
+	}
+	return sx.MakeList(objs...).Cons(t.zetSyms.SymBlock)
+}
+func (t *Transformer) getInlineSlice(is ast.InlineSlice) *sx.Pair {
+	objs := make([]sx.Object, len(is))
+	for i, n := range is {
+		objs[i] = t.GetSz(n)
+	}
+	return sx.MakeList(objs...).Cons(t.zetSyms.SymInline)
+}
+
+func (t *Transformer) getAttributes(a attrs.Attributes) sx.Object {
+	if a.IsEmpty() {
+		return sx.Nil()
+	}
+	keys := a.Keys()
+	objs := make([]sx.Object, 0, len(keys))
+	for _, k := range keys {
+		objs = append(objs, sx.Cons(sx.String(k), sx.String(a[k])))
+	}
+	return sx.Nil().Cons(sx.MakeList(objs...)).Cons(t.zetSyms.SymQuote)
+}
+
+func (t *Transformer) getReference(ref *ast.Reference) *sx.Pair {
+	return sx.MakeList(
+		t.zetSyms.SymQuote,
+		sx.MakeList(
+			mapGetS(t, t.mapRefStateS, ref.State),
+			sx.String(ref.Value),
+		),
+	)
+}
+
+func (t *Transformer) GetMeta(m *meta.Meta, evalMeta encoder.EvalMetaFunc) *sx.Pair {
+	pairs := m.ComputedPairs()
+	objs := make([]sx.Object, 0, len(pairs))
+	for _, p := range pairs {
+		key := p.Key
+		ty := m.Type(key)
+		symType := mapGetS(t, t.mapMetaTypeS, ty)
+		var obj sx.Object
+		if ty.IsSet {
+			setList := meta.ListFromValue(p.Value)
+			setObjs := make([]sx.Object, len(setList))
+			for i, val := range setList {
+				setObjs[i] = sx.String(val)
+			}
+			obj = sx.MakeList(setObjs...).Cons(t.zetSyms.SymList)
+		} else if ty == meta.TypeZettelmarkup {
+			is := evalMeta(p.Value)
+			obj = t.GetSz(&is)
+		} else {
+			obj = sx.String(p.Value)
+		}
+		symKey := sx.MakeList(t.zetSyms.SymQuote, t.sf.MustMake(key))
+		objs = append(objs, sx.Nil().Cons(obj).Cons(symKey).Cons(symType))
+	}
+	return sx.MakeList(objs...).Cons(t.zetSyms.SymMeta)
+}
+
+func mapGetS[T comparable](t *Transformer, m map[T]*sx.Symbol, k T) *sx.Symbol {
+	if result, found := m[k]; found {
+		return result
+	}
+	return t.sf.MustMake(fmt.Sprintf("**%v:NOT-FOUND**", k))
+}
+
+func getBase64String(data []byte) sx.String {
+	var sb strings.Builder
+	encoder := base64.NewEncoder(base64.StdEncoding, &sb)
+	_, err := encoder.Write(data)
+	if err == nil {
+		err = encoder.Close()
+	}
+	if err == nil {
+		return sx.String(sb.String())
+	}
+	return sx.String("")
+}

Index: encoder/textenc/textenc.go
==================================================================
--- encoder/textenc/textenc.go
+++ encoder/textenc/textenc.go
@@ -12,18 +12,18 @@
 package textenc
 
 import (
 	"io"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
-	encoder.Register(api.EncoderText, func() encoder.Encoder { return Create() })
+	encoder.Register(api.EncoderText, func(*encoder.CreateParameter) encoder.Encoder { return Create() })
 }
 
 // Create an encoder.
 func Create() *Encoder { return &myTE }
 

Index: encoder/zmkenc/zmkenc.go
==================================================================
--- encoder/zmkenc/zmkenc.go
+++ encoder/zmkenc/zmkenc.go
@@ -14,21 +14,21 @@
 import (
 	"fmt"
 	"io"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/encoder/textenc"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
-	encoder.Register(api.EncoderZmk, func() encoder.Encoder { return Create() })
+	encoder.Register(api.EncoderZmk, func(*encoder.CreateParameter) encoder.Encoder { return Create() })
 }
 
 // Create an encoder.
 func Create() *Encoder { return &myZE }
 
@@ -354,11 +354,11 @@
 	v.textEnc.WriteInlines(&sb, &bn.Description)
 	v.b.WriteStrings("%% Unable to display BLOB with description '", sb.String(), "' and syntax '", bn.Syntax, "'.")
 }
 
 var escapeSeqs = strfun.NewSet(
-	"\\", "__", "**", "~~", "^^", ",,", ">>", `""`, "::", "''", "``", "++", "==",
+	"\\", "__", "**", "~~", "^^", ",,", ">>", `""`, "::", "''", "``", "++", "==", "##",
 )
 
 func (v *visitor) visitText(tn *ast.TextNode) {
 	last := 0
 	for i := 0; i < len(tn.Text); i++ {
@@ -450,10 +450,11 @@
 	ast.FormatInsert: []byte(">>"),
 	ast.FormatDelete: []byte("~~"),
 	ast.FormatSuper:  []byte("^^"),
 	ast.FormatSub:    []byte(",,"),
 	ast.FormatQuote:  []byte(`""`),
+	ast.FormatMark:   []byte("##"),
 	ast.FormatSpan:   []byte("::"),
 }
 
 func (v *visitor) visitFormat(fn *ast.FormatNode) {
 	kind, ok := mapFormatKind[fn.Kind]

Index: encoding/atom/atom.go
==================================================================
--- encoding/atom/atom.go
+++ encoding/atom/atom.go
@@ -13,19 +13,19 @@
 
 import (
 	"bytes"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoding"
 	"zettelstore.de/z/encoding/xml"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/query"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 const ContentType = "application/atom+xml"
 
 type Configuration struct {
@@ -74,11 +74,11 @@
 }
 
 func (c *Configuration) marshalMeta(buf *bytes.Buffer, m *meta.Meta) {
 	entryUpdated := ""
 	if val, found := m.Get(api.KeyPublished); found {
-		if published, err := time.ParseInLocation(id.ZidLayout, val, time.Local); err == nil {
+		if published, err := time.ParseInLocation(id.TimestampLayout, val, time.Local); err == nil {
 			entryUpdated = published.UTC().Format(time.RFC3339)
 		}
 	}
 
 	link := c.NewURLBuilderAbs().SetZid(api.ZettelID(m.Zid.String())).String()

Index: encoding/encoding.go
==================================================================
--- encoding/encoding.go
+++ encoding/encoding.go
@@ -12,22 +12,22 @@
 package encoding
 
 import (
 	"time"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // LastUpdated returns the formated time of the zettel which was updated at the latest time.
 func LastUpdated(ml []*meta.Meta, timeFormat string) string {
 	maxPublished := time.Date(1, time.January, 1, 0, 0, 0, 0, time.Local)
 	for _, m := range ml {
 		if val, found := m.Get(api.KeyPublished); found {
-			if published, err := time.ParseInLocation(id.ZidLayout, val, time.Local); err == nil {
+			if published, err := time.ParseInLocation(id.TimestampLayout, val, time.Local); err == nil {
 				if maxPublished.Before(published) {
 					maxPublished = published
 				}
 			}
 		}

Index: encoding/rss/rss.go
==================================================================
--- encoding/rss/rss.go
+++ encoding/rss/rss.go
@@ -14,19 +14,19 @@
 import (
 	"bytes"
 	"context"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoding"
 	"zettelstore.de/z/encoding/xml"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/query"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 const ContentType = "application/rss+xml"
 
 type Configuration struct {
@@ -84,11 +84,11 @@
 }
 
 func (c *Configuration) marshalMeta(buf *bytes.Buffer, m *meta.Meta) {
 	itemPublished := ""
 	if val, found := m.Get(api.KeyPublished); found {
-		if published, err := time.ParseInLocation(id.ZidLayout, val, time.Local); err == nil {
+		if published, err := time.ParseInLocation(id.TimestampLayout, val, time.Local); err == nil {
 			itemPublished = published.UTC().Format(time.RFC1123Z)
 		}
 	}
 
 	link := c.NewURLBuilderAbs().SetZid(api.ZettelID(m.Zid.String())).String()

Index: evaluator/evaluator.go
==================================================================
--- evaluator/evaluator.go
+++ evaluator/evaluator.go
@@ -17,30 +17,29 @@
 	"fmt"
 	"path"
 	"strconv"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/parser/cleaner"
 	"zettelstore.de/z/parser/draw"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Port contains all methods to retrieve zettel (or part of it) to evaluate a zettel.
 type Port interface {
-	GetMeta(context.Context, id.Zid) (*meta.Meta, error)
-	GetZettel(context.Context, id.Zid) (domain.Zettel, error)
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
+	GetZettel(context.Context, id.Zid) (zettel.Zettel, error)
+	QueryMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
 }
 
 // EvaluateZettel evaluates the given zettel in the given context, with the
 // given ports, and the given environment.
 func EvaluateZettel(ctx context.Context, port Port, rtConfig config.Config, zn *ast.ZettelNode) {
@@ -165,13 +164,13 @@
 }
 
 func (e *evaluator) evalVerbatimZettel(vn *ast.VerbatimNode) ast.BlockNode {
 	m := meta.New(id.Invalid)
 	m.Set(api.KeySyntax, getSyntax(vn.Attrs, meta.SyntaxText))
-	zettel := domain.Zettel{
+	zettel := zettel.Zettel{
 		Meta:    m,
-		Content: domain.NewContent(vn.Content),
+		Content: zettel.NewContent(vn.Content),
 	}
 	e.transcludeCount++
 	zn := e.evaluateEmbeddedZettel(zettel)
 	return &zn.Ast
 }
@@ -253,11 +252,11 @@
 	return &zn.Ast
 }
 
 func (e *evaluator) evalQueryTransclusion(expr string) ast.BlockNode {
 	q := query.Parse(expr)
-	ml, err := e.port.SelectMeta(e.ctx, q)
+	ml, err := e.port.QueryMeta(e.ctx, q)
 	if err != nil {
 		if errors.Is(err, &box.ErrNotAllowed{}) {
 			return nil
 		}
 		return makeBlockNode(createInlineErrorText(nil, "Unable", "to", "search", "zettel"))
@@ -343,11 +342,11 @@
 	if ref == nil || ref.State != ast.RefStateZettel {
 		return ln
 	}
 
 	zid := mustParseZid(ref)
-	_, err := e.port.GetMeta(box.NoEnrichContext(e.ctx), zid)
+	_, err := e.port.GetZettel(box.NoEnrichContext(e.ctx), zid)
 	if errors.Is(err, &box.ErrNotAllowed{}) {
 		return &ast.FormatNode{
 			Kind:    ast.FormatSpan,
 			Attrs:   ln.Attrs,
 			Inlines: getLinkInline(ln),
@@ -534,11 +533,11 @@
 	is := parser.ParseInlines(input.NewInput(content), syntax)
 	ast.Walk(e, &is)
 	return is
 }
 
-func (e *evaluator) evaluateEmbeddedZettel(zettel domain.Zettel) *ast.ZettelNode {
+func (e *evaluator) evaluateEmbeddedZettel(zettel zettel.Zettel) *ast.ZettelNode {
 	zn := parser.ParseZettel(e.ctx, zettel, zettel.Meta.GetDefault(api.KeySyntax, ""), e.rtConfig)
 	ast.Walk(e, &zn.Ast)
 	return zn
 }
 

Index: evaluator/list.go
==================================================================
--- evaluator/list.go
+++ evaluator/list.go
@@ -16,19 +16,19 @@
 	"math"
 	"sort"
 	"strconv"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoding/atom"
 	"zettelstore.de/z/encoding/rss"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // QueryAction transforms a list of metadata according to query actions into a AST nested list.
 func QueryAction(ctx context.Context, q *query.Query, ml []*meta.Meta, rtConfig config.Config) ast.BlockNode {
 	ap := actionPara{
@@ -64,10 +64,13 @@
 			}
 		}
 		if act == "TITLE" && i+1 < len(actions) {
 			ap.title = strings.Join(actions[i+1:], " ")
 			break
+		}
+		if act == "REINDEX" {
+			continue
 		}
 		acts = append(acts, act)
 	}
 	var firstUnknownKey string
 	for _, act := range acts {

Index: evaluator/metadata.go
==================================================================
--- evaluator/metadata.go
+++ evaluator/metadata.go
@@ -10,11 +10,11 @@
 
 package evaluator
 
 import (
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func evaluateMetadata(m *meta.Meta) ast.BlockSlice {
 	descrlist := &ast.DescriptionListNode{}
 	for _, p := range m.Pairs() {
@@ -40,15 +40,11 @@
 			return nil
 		}
 	} else {
 		sliceData = []string{value}
 	}
-	var makeLink bool
-	switch dt {
-	case meta.TypeID, meta.TypeIDSet:
-		makeLink = true
-	}
+	makeLink := dt == meta.TypeID || dt == meta.TypeIDSet
 
 	result := make(ast.InlineSlice, 0, 2*len(sliceData)-1)
 	for i, val := range sliceData {
 		if i > 0 {
 			result = append(result, &ast.SpaceNode{Lexeme: " "})

Index: go.mod
==================================================================
--- go.mod
+++ go.mod
@@ -1,17 +1,15 @@
 module zettelstore.de/z
 
-go 1.19
+go 1.21
 
 require (
-	codeberg.org/t73fde/sxhtml v0.0.0-20230317170051-24321195e197
-	codeberg.org/t73fde/sxpf v0.0.0-20230319111333-7de220f3b475
-	github.com/fsnotify/fsnotify v1.6.0
-	github.com/pascaldekloe/jwt v1.12.0
-	github.com/yuin/goldmark v1.5.4
-	golang.org/x/crypto v0.7.0
-	golang.org/x/term v0.6.0
-	golang.org/x/text v0.8.0
-	zettelstore.de/c v0.11.0
+	github.com/fsnotify/fsnotify v1.7.0
+	github.com/yuin/goldmark v1.6.0
+	golang.org/x/crypto v0.16.0
+	golang.org/x/term v0.15.0
+	golang.org/x/text v0.14.0
+	zettelstore.de/client.fossil v0.0.0-20231130151508-751754d40c73
+	zettelstore.de/sx.fossil v0.0.0-20231130150648-05ef116ba207
 )
 
-require golang.org/x/sys v0.6.0 // indirect
+require golang.org/x/sys v0.15.0 // indirect

Index: go.sum
==================================================================
--- go.sum
+++ go.sum
@@ -1,21 +1,16 @@
-codeberg.org/t73fde/sxhtml v0.0.0-20230317170051-24321195e197 h1:6kX7TY25agLFlHNvByO1Jc3GrBA7mu7aOa8tCOniUew=
-codeberg.org/t73fde/sxhtml v0.0.0-20230317170051-24321195e197/go.mod h1:Dp3EwBSsE3TvdPw9QZ4Wm25ZragluVT2OayRFRiq6jk=
-codeberg.org/t73fde/sxpf v0.0.0-20230319111333-7de220f3b475 h1:0OTzV3FYY/Y7YsaVaSzF4Wd17pXzdH6DaSvMeqteJc4=
-codeberg.org/t73fde/sxpf v0.0.0-20230319111333-7de220f3b475/go.mod h1:iSbMygOmtRQYp8pryNKYzRuMibYDSR80smU2b6qm1bc=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/pascaldekloe/jwt v1.12.0 h1:imQSkPOtAIBAXoKKjL9ZVJuF/rVqJ+ntiLGpLyeqMUQ=
-github.com/pascaldekloe/jwt v1.12.0/go.mod h1:LiIl7EwaglmH1hWThd/AmydNCnHf/mmfluBlNqHbk8U=
-github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
-github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-zettelstore.de/c v0.11.0 h1:eD1og+5R2DC3po8JEYUKldONxo69uIKm0jmbNH+NfZI=
-zettelstore.de/c v0.11.0/go.mod h1:aYfHJ/ipU9BvYVBGVwOyfFjuGpf29Pf5Xn+pjcutR6E=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68=
+github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+zettelstore.de/client.fossil v0.0.0-20231130151508-751754d40c73 h1:LPF8QWip3GRLBzgPdnsJnrvk1sGiMOSpqOwURiax9gg=
+zettelstore.de/client.fossil v0.0.0-20231130151508-751754d40c73/go.mod h1:fN+1WxRorSbHduS0T0B4GI8o82EgFuUWBv6fwsAZF6o=
+zettelstore.de/sx.fossil v0.0.0-20231130150648-05ef116ba207 h1:8ch54z0w53bps6a00NDofEqo3AJ1l7ITXyC3XyLmlY4=
+zettelstore.de/sx.fossil v0.0.0-20231130150648-05ef116ba207/go.mod h1:Uw3OLM1ufOM4Xe0G51mvkTDUv2okd+HyDBMx+0ZG7ME=

Index: kernel/impl/auth.go
==================================================================
--- kernel/impl/auth.go
+++ kernel/impl/auth.go
@@ -13,13 +13,13 @@
 import (
 	"errors"
 	"sync"
 
 	"zettelstore.de/z/auth"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel/id"
 )
 
 type authService struct {
 	srvConfig
 	mxService     sync.RWMutex

Index: kernel/impl/cfg.go
==================================================================
--- kernel/impl/cfg.go
+++ kernel/impl/cfg.go
@@ -16,24 +16,25 @@
 	"fmt"
 	"strconv"
 	"strings"
 	"sync"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type configService struct {
 	srvConfig
 	mxService sync.RWMutex
 	orig      *meta.Meta
+	manager   box.Manager
 }
 
 // Predefined Metadata keys for runtime configuration
 // See: https://zettelstore.de/manual/h/00001004020000
 const (
@@ -90,26 +91,34 @@
 		keyZettelFileSyntax: {
 			"Zettel file syntax",
 			func(val string) (any, error) { return strings.Fields(val), nil },
 			true,
 		},
-		kernel.ConfigSimpleMode: {"Simple mode", cs.noFrozen(parseBool), true},
+		kernel.ConfigSimpleMode:        {"Simple mode", cs.noFrozen(parseBool), true},
+		config.KeyShowBackLinks:        {"Show back links", parseString, true},
+		config.KeyShowFolgeLinks:       {"Show folge links", parseString, true},
+		config.KeyShowSubordinateLinks: {"Show subordinate links", parseString, true},
+		config.KeyShowSuccessorLinks:   {"Show successor links", parseString, true},
 	}
 	cs.next = interfaceMap{
-		keyDefaultCopyright:       "",
-		keyDefaultLicense:         "",
-		keyDefaultVisibility:      meta.VisibilityLogin,
-		keyExpertMode:             false,
-		config.KeyFooterZettel:    id.Invalid,
-		config.KeyHomeZettel:      id.DefaultHomeZid,
-		kernel.ConfigInsecureHTML: config.NoHTML,
-		api.KeyLang:               api.ValueLangEN,
-		keyMaxTransclusions:       int64(1024),
-		keySiteName:               "Zettelstore",
-		keyYAMLHeader:             false,
-		keyZettelFileSyntax:       nil,
-		kernel.ConfigSimpleMode:   false,
+		keyDefaultCopyright:            "",
+		keyDefaultLicense:              "",
+		keyDefaultVisibility:           meta.VisibilityLogin,
+		keyExpertMode:                  false,
+		config.KeyFooterZettel:         id.Invalid,
+		config.KeyHomeZettel:           id.DefaultHomeZid,
+		kernel.ConfigInsecureHTML:      config.NoHTML,
+		api.KeyLang:                    api.ValueLangEN,
+		keyMaxTransclusions:            int64(1024),
+		keySiteName:                    "Zettelstore",
+		keyYAMLHeader:                  false,
+		keyZettelFileSyntax:            nil,
+		kernel.ConfigSimpleMode:        false,
+		config.KeyShowBackLinks:        "",
+		config.KeyShowFolgeLinks:       "",
+		config.KeyShowSubordinateLinks: "",
+		config.KeyShowSuccessorLinks:   "",
 	}
 }
 func (cs *configService) GetLogger() *logger.Logger { return cs.logger }
 
 func (cs *configService) Start(*myKernel) error {
@@ -132,28 +141,33 @@
 
 func (cs *configService) Stop(*myKernel) {
 	cs.logger.Info().Msg("Stop Service")
 	cs.mxService.Lock()
 	cs.orig = nil
+	cs.manager = nil
 	cs.mxService.Unlock()
 }
 
 func (*configService) GetStatistics() []kernel.KeyValue {
 	return nil
 }
 
 func (cs *configService) setBox(mgr box.Manager) {
+	cs.mxService.Lock()
+	cs.manager = mgr
+	cs.mxService.Unlock()
 	mgr.RegisterObserver(cs.observe)
 	cs.observe(box.UpdateInfo{Box: mgr, Reason: box.OnZettel, Zid: id.ConfigurationZid})
 }
 
 func (cs *configService) doUpdate(p box.BaseBox) error {
-	m, err := p.GetMeta(context.Background(), cs.orig.Zid)
+	z, err := p.GetZettel(context.Background(), id.ConfigurationZid)
 	cs.logger.Trace().Err(err).Msg("got config meta")
 	if err != nil {
 		return err
 	}
+	m := z.Meta
 	cs.mxService.Lock()
 	for _, pair := range cs.orig.Pairs() {
 		key := pair.Key
 		if val, ok := m.Get(key); ok {
 			cs.SetConfig(key, val)
@@ -167,11 +181,20 @@
 }
 
 func (cs *configService) observe(ci box.UpdateInfo) {
 	if ci.Reason != box.OnZettel || ci.Zid == id.ConfigurationZid {
 		cs.logger.Debug().Uint("reason", uint64(ci.Reason)).Zid(ci.Zid).Msg("observe")
-		go func() { cs.doUpdate(ci.Box) }()
+		go func() {
+			cs.mxService.RLock()
+			mgr := cs.manager
+			cs.mxService.RUnlock()
+			if mgr != nil {
+				cs.doUpdate(mgr)
+			} else {
+				cs.doUpdate(ci.Box)
+			}
+		}()
 	}
 }
 
 // --- config.Config
 

Index: kernel/impl/cmd.go
==================================================================
--- kernel/impl/cmd.go
+++ kernel/impl/cmd.go
@@ -17,11 +17,11 @@
 	"runtime/metrics"
 	"sort"
 	"strconv"
 	"strings"
 
-	"zettelstore.de/c/maps"
+	"zettelstore.de/client.fossil/maps"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/strfun"
 )
 

Index: kernel/impl/config.go
==================================================================
--- kernel/impl/config.go
+++ kernel/impl/config.go
@@ -16,14 +16,14 @@
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
 
-	"zettelstore.de/c/maps"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/client.fossil/maps"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel/id"
 )
 
 type parseFunc func(string) (any, error)
 type configDescription struct {
 	text    string

Index: kernel/impl/core.go
==================================================================
--- kernel/impl/core.go
+++ kernel/impl/core.go
@@ -16,15 +16,15 @@
 	"os"
 	"runtime"
 	"sync"
 	"time"
 
-	"zettelstore.de/c/maps"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/client.fossil/maps"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
 )
 
 type coreService struct {
 	srvConfig
 	started bool
@@ -79,11 +79,11 @@
 		kernel.CoreGoArch:    runtime.GOARCH,
 		kernel.CoreGoOS:      runtime.GOOS,
 		kernel.CoreGoVersion: runtime.Version(),
 		kernel.CoreHostname:  "*unknown host*",
 		kernel.CorePort:      0,
-		kernel.CoreStarted:   time.Now().Local().Format(id.ZidLayout),
+		kernel.CoreStarted:   time.Now().Local().Format(id.TimestampLayout),
 		kernel.CoreVerbose:   false,
 	}
 	if hn, err := os.Hostname(); err == nil {
 		cs.next[kernel.CoreHostname] = hn
 	}

Index: kernel/impl/impl.go
==================================================================
--- kernel/impl/impl.go
+++ kernel/impl/impl.go
@@ -25,13 +25,13 @@
 	"strings"
 	"sync"
 	"syscall"
 	"time"
 
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel/id"
 )
 
 // myKernel is the main internal kernel.
 type myKernel struct {
 	logWriter *kernelLogWriter
@@ -124,14 +124,14 @@
 }
 
 func (kern *myKernel) Setup(progname, version string, versionTime time.Time) {
 	kern.SetConfig(kernel.CoreService, kernel.CoreProgname, progname)
 	kern.SetConfig(kernel.CoreService, kernel.CoreVersion, version)
-	kern.SetConfig(kernel.CoreService, kernel.CoreVTime, versionTime.Local().Format(id.ZidLayout))
+	kern.SetConfig(kernel.CoreService, kernel.CoreVTime, versionTime.Local().Format(id.TimestampLayout))
 }
 
-func (kern *myKernel) Start(headline, lineServer bool) {
+func (kern *myKernel) Start(headline, lineServer bool, configFilename string) {
 	for _, srvD := range kern.srvs {
 		srvD.srv.Freeze()
 	}
 	if kern.cfg.GetCurConfig(kernel.ConfigSimpleMode).(bool) {
 		kern.SetLogLevel(defaultSimpleLogLevel.String())
@@ -158,10 +158,15 @@
 			kern.core.GetCurConfig(kernel.CoreGoVersion),
 			kern.core.GetCurConfig(kernel.CoreGoOS),
 			kern.core.GetCurConfig(kernel.CoreGoArch),
 		))
 		logger.Mandatory().Msg("Licensed under the latest version of the EUPL (European Union Public License)")
+		if configFilename != "" {
+			logger.Mandatory().Str("filename", configFilename).Msg("Configuration file found")
+		} else {
+			logger.Mandatory().Msg("No configuration file found / used")
+		}
 		if kern.core.GetCurConfig(kernel.CoreDebug).(bool) {
 			logger.Warn().Msg("----------------------------------------")
 			logger.Warn().Msg("DEBUG MODE, DO NO USE THIS IN PRODUCTION")
 			logger.Warn().Msg("----------------------------------------")
 		}

Index: kernel/impl/server.go
==================================================================
--- kernel/impl/server.go
+++ kernel/impl/server.go
@@ -27,21 +27,21 @@
 }
 
 func lineServer(ln net.Listener, kern *myKernel) {
 	// Something may panic. Ensure a running line service.
 	defer func() {
-		if r := recover(); r != nil {
-			kern.doLogRecover("Line", r)
+		if ri := recover(); ri != nil {
+			kern.doLogRecover("Line", ri)
 			go lineServer(ln, kern)
 		}
 	}()
 
 	for {
 		conn, err := ln.Accept()
 		if err != nil {
 			// handle error
-			kern.logger.IfErr(err).Msg("Unable to accept connection")
+			kern.logger.Error().Err(err).Msg("Unable to accept connection")
 			break
 		}
 		go handleLineConnection(conn, kern)
 	}
 	ln.Close()
@@ -48,12 +48,12 @@
 }
 
 func handleLineConnection(conn net.Conn, kern *myKernel) {
 	// Something may panic. Ensure a running connection.
 	defer func() {
-		if r := recover(); r != nil {
-			kern.doLogRecover("LineConn", r)
+		if ri := recover(); ri != nil {
+			kern.doLogRecover("LineConn", ri)
 			go handleLineConnection(conn, kern)
 		}
 	}()
 
 	kern.logger.Mandatory().Str("from", conn.RemoteAddr().String()).Msg("Start session on administration console")

Index: kernel/kernel.go
==================================================================
--- kernel/kernel.go
+++ kernel/kernel.go
@@ -17,23 +17,23 @@
 	"time"
 
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
 )
 
 // Kernel is the main internal service.
 type Kernel interface {
 	// Setup sets the most basic data of a software: its name, its version,
 	// and when the version was created.
 	Setup(progname, version string, versionTime time.Time)
 
 	// Start the service.
-	Start(headline bool, lineServer bool)
+	Start(headline bool, lineServer bool, configFile string)
 
 	// WaitForShutdown blocks the call until Shutdown is called.
 	WaitForShutdown()
 
 	// Shutdown the service. Waits for all concurrent activities to stop.

Index: logger/logger.go
==================================================================
--- logger/logger.go
+++ logger/logger.go
@@ -16,11 +16,11 @@
 	"strconv"
 	"strings"
 	"sync/atomic"
 	"time"
 
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Level defines the possible log levels
 type Level uint8
 
@@ -181,18 +181,10 @@
 func (l *Logger) Warn() *Message { return newMessage(l, WarnLevel) }
 
 // Error creates a message suitable for errors.
 func (l *Logger) Error() *Message { return newMessage(l, ErrorLevel) }
 
-// IfErr creates an error message and sets the go error, if there is an error.
-func (l *Logger) IfErr(err error) *Message {
-	if err != nil {
-		return newMessage(l, ErrorLevel).Err(err)
-	}
-	return nil
-}
-
 // Fatal creates a message suitable for fatal errors.
 func (l *Logger) Fatal() *Message { return newMessage(l, FatalLevel) }
 
 // Panic creates a message suitable for panicing.
 func (l *Logger) Panic() *Message { return newMessage(l, PanicLevel) }

Index: logger/message.go
==================================================================
--- logger/message.go
+++ logger/message.go
@@ -14,12 +14,12 @@
 	"context"
 	"net/http"
 	"strconv"
 	"sync"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/zettel/id"
 )
 
 // Message presents a message to log.
 type Message struct {
 	logger *Logger

Index: parser/blob/blob.go
==================================================================
--- parser/blob/blob.go
+++ parser/blob/blob.go
@@ -11,13 +11,13 @@
 // Package blob provides a parser of binary data.
 package blob
 
 import (
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	parser.Register(&parser.Info{
 		Name:          meta.SyntaxGif,

Index: parser/draw/draw.go
==================================================================
--- parser/draw/draw.go
+++ parser/draw/draw.go
@@ -15,15 +15,15 @@
 package draw
 
 import (
 	"strconv"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	parser.Register(&parser.Info{
 		Name:          meta.SyntaxDraw,

Index: parser/draw/draw_test.go
==================================================================
--- parser/draw/draw_test.go
+++ parser/draw/draw_test.go
@@ -12,17 +12,17 @@
 
 import (
 	"testing"
 
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func FuzzParseBlocks(f *testing.F) {
 	f.Fuzz(func(t *testing.T, src []byte) {
 		t.Parallel()
 		inp := input.NewInput(src)
 		parser.ParseBlocks(inp, nil, meta.SyntaxDraw, config.NoHTML)
 	})
 }

Index: parser/markdown/markdown.go
==================================================================
--- parser/markdown/markdown.go
+++ parser/markdown/markdown.go
@@ -19,16 +19,16 @@
 
 	gm "github.com/yuin/goldmark"
 	gmAst "github.com/yuin/goldmark/ast"
 	gmText "github.com/yuin/goldmark/text"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder/textenc"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	parser.Register(&parser.Info{
 		Name:          meta.SyntaxMarkdown,

Index: parser/none/none.go
==================================================================
--- parser/none/none.go
+++ parser/none/none.go
@@ -11,13 +11,13 @@
 // Package none provides a none-parser, e.g. for zettel with just metadata.
 package none
 
 import (
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	parser.Register(&parser.Info{
 		Name:          meta.SyntaxNone,

Index: parser/parser.go
==================================================================
--- parser/parser.go
+++ parser/parser.go
@@ -14,17 +14,17 @@
 import (
 	"context"
 	"fmt"
 	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser/cleaner"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Info describes a single parser.
 //
 // Before ParseBlocks() or ParseInlines() is called, ensure the input stream to
@@ -133,10 +133,11 @@
 
 // NormalizedSpacedText returns the given string, but normalize multiple spaces to one space.
 func NormalizedSpacedText(s string) string { return strings.Join(meta.ListFromValue(s), " ") }
 
 // ParseDescription returns a suitable description stored in the metadata as an inline slice.
+// This is done for an image in most cases.
 func ParseDescription(m *meta.Meta) ast.InlineSlice {
 	if m == nil {
 		return nil
 	}
 	if descr, found := m.Get(api.KeySummary); found {
@@ -145,15 +146,15 @@
 		return in
 	}
 	if title, found := m.Get(api.KeyTitle); found {
 		return ParseSpacedText(title)
 	}
-	return nil
+	return ast.CreateInlineSliceFromWords("Zettel", "without", "title:", m.Zid.String())
 }
 
 // ParseZettel parses the zettel based on the syntax.
-func ParseZettel(ctx context.Context, zettel domain.Zettel, syntax string, rtConfig config.Config) *ast.ZettelNode {
+func ParseZettel(ctx context.Context, zettel zettel.Zettel, syntax string, rtConfig config.Config) *ast.ZettelNode {
 	m := zettel.Meta
 	inhMeta := m
 	if rtConfig != nil {
 		inhMeta = rtConfig.AddDefaultValues(ctx, inhMeta)
 	}

Index: parser/parser_test.go
==================================================================
--- parser/parser_test.go
+++ parser/parser_test.go
@@ -11,13 +11,13 @@
 package parser_test
 
 import (
 	"testing"
 
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/meta"
 
 	_ "zettelstore.de/z/parser/blob"       // Allow to use BLOB parser.
 	_ "zettelstore.de/z/parser/draw"       // Allow to use draw parser.
 	_ "zettelstore.de/z/parser/markdown"   // Allow to use markdown parser.
 	_ "zettelstore.de/z/parser/none"       // Allow to use none parser.
@@ -39,15 +39,15 @@
 		{meta.SyntaxGif, false, false, true},
 		{meta.SyntaxJPEG, false, false, true},
 		{meta.SyntaxJPG, false, false, true},
 		{meta.SyntaxMarkdown, true, true, false},
 		{meta.SyntaxMD, true, true, false},
-		{meta.SyntaxMustache, false, true, false},
 		{meta.SyntaxNone, false, false, false},
 		{meta.SyntaxPlain, false, true, false},
 		{meta.SyntaxPNG, false, false, true},
 		{meta.SyntaxSVG, false, true, true},
+		{meta.SyntaxSxn, false, true, false},
 		{meta.SyntaxText, false, true, false},
 		{meta.SyntaxTxt, false, true, false},
 		{meta.SyntaxWebp, false, false, true},
 		{meta.SyntaxZmk, true, true, false},
 	}

Index: parser/plain/plain.go
==================================================================
--- parser/plain/plain.go
+++ parser/plain/plain.go
@@ -10,17 +10,20 @@
 
 // Package plain provides a parser for plain text data.
 package plain
 
 import (
+	"bytes"
 	"strings"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
+	"zettelstore.de/sx.fossil/sxbuiltins"
+	"zettelstore.de/sx.fossil/sxreader"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	parser.Register(&parser.Info{
 		Name:          meta.SyntaxTxt,
@@ -57,17 +60,17 @@
 		IsImageFormat: true,
 		ParseBlocks:   parseSVGBlocks,
 		ParseInlines:  parseSVGInlines,
 	})
 	parser.Register(&parser.Info{
-		Name:          meta.SyntaxMustache,
+		Name:          meta.SyntaxSxn,
 		AltNames:      []string{},
 		IsASTParser:   false,
 		IsTextFormat:  true,
 		IsImageFormat: false,
-		ParseBlocks:   parseBlocks,
-		ParseInlines:  parseInlines,
+		ParseBlocks:   parseSxnBlocks,
+		ParseInlines:  parseSxnInlines,
 	})
 }
 
 func parseBlocks(inp *input.Input, _ *meta.Meta, syntax string) ast.BlockSlice {
 	return doParseBlocks(inp, syntax, ast.VerbatimProg)
@@ -128,5 +131,42 @@
 		return ""
 	}
 	// TODO: check proper end </svg>
 	return svgSrc
 }
+
+func parseSxnBlocks(inp *input.Input, _ *meta.Meta, syntax string) ast.BlockSlice {
+	rd := sxreader.MakeReader(bytes.NewReader(inp.Src))
+	objs, err := rd.ReadAll()
+	if err != nil {
+		return ast.BlockSlice{
+			&ast.VerbatimNode{
+				Kind:    ast.VerbatimProg,
+				Attrs:   attrs.Attributes{"": syntax},
+				Content: inp.ScanLineContent(),
+			},
+			ast.CreateParaNode(&ast.TextNode{
+				Text: err.Error(),
+			}),
+		}
+	}
+	result := make(ast.BlockSlice, len(objs))
+	for i, obj := range objs {
+		var buf bytes.Buffer
+		sxbuiltins.Print(&buf, obj)
+		result[i] = &ast.VerbatimNode{
+			Kind:    ast.VerbatimProg,
+			Attrs:   attrs.Attributes{"": syntax},
+			Content: buf.Bytes(),
+		}
+	}
+	return result
+}
+
+func parseSxnInlines(inp *input.Input, syntax string) ast.InlineSlice {
+	inp.SkipToEOL()
+	return ast.InlineSlice{&ast.LiteralNode{
+		Kind:    ast.LiteralProg,
+		Attrs:   attrs.Attributes{"": syntax},
+		Content: append([]byte(nil), inp.Src[0:inp.Pos]...),
+	}}
+}

Index: parser/zettelmark/inline.go
==================================================================
--- parser/zettelmark/inline.go
+++ parser/zettelmark/inline.go
@@ -13,14 +13,14 @@
 import (
 	"bytes"
 	"fmt"
 	"strings"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // parseInlineSlice parses a sequence of Inlines until EOS.
 func (cp *zmkP) parseInlineSlice() (ins ast.InlineSlice) {
 	inp := cp.inp
@@ -67,11 +67,11 @@
 			if inp.Ch == '{' {
 				in, success = cp.parseEmbed()
 			}
 		case '%':
 			in, success = cp.parseComment()
-		case '_', '*', '>', '~', '^', ',', '"', ':':
+		case '_', '*', '>', '~', '^', ',', '"', '#', ':':
 			in, success = cp.parseFormat()
 		case '@', '\'', '`', '=', runeModGrave:
 			in, success = cp.parseLiteral()
 		case '$':
 			in, success = cp.parseLiteralMath()
@@ -100,11 +100,11 @@
 	for {
 		inp.Next()
 		switch inp.Ch {
 		// The following case must contain all runes that occur in parseInline!
 		// Plus the closing brackets ] and } and ) and the middle |
-		case input.EOS, '\n', '\r', ' ', '\t', '[', ']', '{', '}', '(', ')', '|', '%', '_', '*', '>', '~', '^', ',', '"', ':', '\'', '@', '`', runeModGrave, '$', '=', '\\', '-', '&':
+		case input.EOS, '\n', '\r', ' ', '\t', '[', ']', '{', '}', '(', ')', '|', '%', '_', '*', '>', '~', '^', ',', '"', '#', ':', '\'', '@', '`', runeModGrave, '$', '=', '\\', '-', '&':
 			return &ast.TextNode{Text: string(inp.Src[pos:inp.Pos])}
 		}
 	}
 }
 
@@ -416,10 +416,11 @@
 	'>': ast.FormatInsert,
 	'~': ast.FormatDelete,
 	'^': ast.FormatSuper,
 	',': ast.FormatSub,
 	'"': ast.FormatQuote,
+	'#': ast.FormatMark,
 	':': ast.FormatSpan,
 }
 
 func (cp *zmkP) parseFormat() (res ast.InlineNode, success bool) {
 	inp := cp.inp

Index: parser/zettelmark/zettelmark.go
==================================================================
--- parser/zettelmark/zettelmark.go
+++ parser/zettelmark/zettelmark.go
@@ -13,15 +13,15 @@
 
 import (
 	"strings"
 	"unicode"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func init() {
 	parser.Register(&parser.Info{
 		Name:          meta.SyntaxZmk,

Index: parser/zettelmark/zettelmark_fuzz_test.go
==================================================================
--- parser/zettelmark/zettelmark_fuzz_test.go
+++ parser/zettelmark/zettelmark_fuzz_test.go
@@ -12,17 +12,17 @@
 
 import (
 	"testing"
 
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func FuzzParseBlocks(f *testing.F) {
 	f.Fuzz(func(t *testing.T, src []byte) {
 		t.Parallel()
 		inp := input.NewInput(src)
 		parser.ParseBlocks(inp, nil, meta.SyntaxZmk, config.NoHTML)
 	})
 }

Index: parser/zettelmark/zettelmark_test.go
==================================================================
--- parser/zettelmark/zettelmark_test.go
+++ parser/zettelmark/zettelmark_test.go
@@ -14,16 +14,16 @@
 import (
 	"fmt"
 	"strings"
 	"testing"
 
-	"zettelstore.de/c/attrs"
+	"zettelstore.de/client.fossil/attrs"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type TestCase struct{ source, want string }
 type TestCases []TestCase
 
@@ -291,19 +291,19 @@
 }
 
 func TestFormat(t *testing.T) {
 	t.Parallel()
 	// Not for Insert / '>', because collision with quoted list
-	for _, ch := range []string{"_", "*", "~", "^", ",", "\"", ":"} {
+	for _, ch := range []string{"_", "*", "~", "^", ",", "\"", "#", ":"} {
 		checkTcs(t, replace(ch, TestCases{
 			{"$", "(PARA $)"},
 			{"$$", "(PARA $$)"},
 			{"$$$", "(PARA $$$)"},
 			{"$$$$", "(PARA {$})"},
 		}))
 	}
-	for _, ch := range []string{"_", "*", ">", "~", "^", ",", "\"", ":"} {
+	for _, ch := range []string{"_", "*", ">", "~", "^", ",", "\"", "#", ":"} {
 		checkTcs(t, replace(ch, TestCases{
 			{"$$a$$", "(PARA {$ a})"},
 			{"$$a$$$", "(PARA {$ a} $)"},
 			{"$$$a$$", "(PARA {$ $a})"},
 			{"$$$a$$$", "(PARA {$ $a} $)"},
@@ -988,10 +988,11 @@
 	ast.FormatInsert: '>',
 	ast.FormatDelete: '~',
 	ast.FormatSuper:  '^',
 	ast.FormatSub:    ',',
 	ast.FormatQuote:  '"',
+	ast.FormatMark:   '#',
 	ast.FormatSpan:   ':',
 }
 
 var mapLiteralKind = map[ast.LiteralKind]rune{
 	ast.LiteralZettel:  '@',

ADDED   query/compiled.go
Index: query/compiled.go
==================================================================
--- query/compiled.go
+++ query/compiled.go
@@ -0,0 +1,189 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package query
+
+import (
+	"math/rand"
+	"sort"
+
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// Compiled is a compiled query, to be used in a Box
+type Compiled struct {
+	hasQuery bool
+	seed     int
+	pick     int
+	order    []sortOrder
+	offset   int // <= 0: no offset
+	limit    int // <= 0: no limit
+
+	startMeta []*meta.Meta
+	PreMatch  MetaMatchFunc // Precondition for Match and Retrieve
+	Terms     []CompiledTerm
+}
+
+// MetaMatchFunc is a function determine whethe some metadata should be selected or not.
+type MetaMatchFunc func(*meta.Meta) bool
+
+func matchAlways(*meta.Meta) bool { return true }
+func matchNever(*meta.Meta) bool  { return false }
+
+// CompiledTerm is the preprocessed sequence of conjugated search terms.
+type CompiledTerm struct {
+	Match    MetaMatchFunc     // Match on metadata
+	Retrieve RetrievePredicate // Retrieve from full-text search
+}
+
+// RetrievePredicate returns true, if the given Zid is contained in the (full-text) search.
+type RetrievePredicate func(id.Zid) bool
+
+// AlwaysIncluded is a RetrievePredicate that always returns true.
+func AlwaysIncluded(id.Zid) bool { return true }
+func neverIncluded(id.Zid) bool  { return false }
+
+func (c *Compiled) isDeterministic() bool { return c.seed > 0 }
+
+// Result returns a result of the compiled search, that is achievable without iterating through a box.
+func (c *Compiled) Result() []*meta.Meta {
+	if len(c.startMeta) == 0 {
+		// nil -> no directive
+		// empty slice -> nothing found
+		return c.startMeta
+	}
+	result := make([]*meta.Meta, 0, len(c.startMeta))
+	for _, m := range c.startMeta {
+		for _, term := range c.Terms {
+			if term.Match(m) && term.Retrieve(m.Zid) {
+				result = append(result, m)
+				break
+			}
+		}
+	}
+	result = c.pickElements(result)
+	result = c.sortElements(result)
+	result = c.offsetElements(result)
+	return limitElements(result, c.limit)
+}
+
+// AfterSearch applies all terms to the metadata list that was searched.
+//
+// This includes sorting, offset, limit, and picking.
+func (c *Compiled) AfterSearch(metaList []*meta.Meta) []*meta.Meta {
+	if len(metaList) == 0 {
+		return metaList
+	}
+
+	if !c.hasQuery {
+		return sortMetaByZid(metaList)
+	}
+
+	if c.isDeterministic() {
+		// We need to sort to make it deterministic
+		if len(c.order) == 0 || c.order[0].isRandom() {
+			metaList = sortMetaByZid(metaList)
+		} else {
+			sort.Slice(metaList, createSortFunc(c.order, metaList))
+		}
+	}
+	metaList = c.pickElements(metaList)
+	if c.isDeterministic() {
+		if len(c.order) > 0 && c.order[0].isRandom() {
+			metaList = c.sortRandomly(metaList)
+		}
+	} else {
+		metaList = c.sortElements(metaList)
+	}
+	metaList = c.offsetElements(metaList)
+	return limitElements(metaList, c.limit)
+}
+
+func (c *Compiled) sortElements(metaList []*meta.Meta) []*meta.Meta {
+	if len(c.order) > 0 {
+		if c.order[0].isRandom() {
+			metaList = c.sortRandomly(metaList)
+		} else {
+			sort.Slice(metaList, createSortFunc(c.order, metaList))
+		}
+	}
+	return metaList
+}
+
+func (c *Compiled) offsetElements(metaList []*meta.Meta) []*meta.Meta {
+	if c.offset == 0 {
+		return metaList
+	}
+	if c.offset > len(metaList) {
+		return nil
+	}
+	return metaList[c.offset:]
+}
+
+func (c *Compiled) pickElements(metaList []*meta.Meta) []*meta.Meta {
+	count := c.pick
+	if count <= 0 || count >= len(metaList) {
+		return metaList
+	}
+	if limit := c.limit; limit > 0 && limit < count {
+		count = limit
+		c.limit = 0
+	}
+
+	order := make([]int, len(metaList))
+	for i := 0; i < len(metaList); i++ {
+		order[i] = i
+	}
+	rnd := c.newRandom()
+	picked := make([]int, count)
+	for i := 0; i < count; i++ {
+		last := len(order) - i
+		n := rnd.Intn(last)
+		picked[i] = order[n]
+		order[n] = order[last-1]
+	}
+	order = nil
+	sort.Ints(picked)
+	result := make([]*meta.Meta, count)
+	for i, p := range picked {
+		result[i] = metaList[p]
+	}
+	return result
+}
+
+func (c *Compiled) sortRandomly(metaList []*meta.Meta) []*meta.Meta {
+	rnd := c.newRandom()
+	rnd.Shuffle(
+		len(metaList),
+		func(i, j int) { metaList[i], metaList[j] = metaList[j], metaList[i] },
+	)
+	return metaList
+}
+
+func (c *Compiled) newRandom() *rand.Rand {
+	seed := c.seed
+	if seed <= 0 {
+		seed = rand.Intn(10000) + 10001
+	}
+	return rand.New(rand.NewSource(int64(seed)))
+}
+
+func limitElements(metaList []*meta.Meta, limit int) []*meta.Meta {
+	if limit > 0 && limit < len(metaList) {
+		return metaList[:limit]
+	}
+	return metaList
+}
+
+func sortMetaByZid(metaList []*meta.Meta) []*meta.Meta {
+	sort.Slice(metaList, func(i, j int) bool { return metaList[i].Zid > metaList[j].Zid })
+	return metaList
+}

ADDED   query/context.go
Index: query/context.go
==================================================================
--- query/context.go
+++ query/context.go
@@ -0,0 +1,270 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package query
+
+import (
+	"container/heap"
+	"context"
+
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// ContextSpec contains all specification values for calculating a context.
+type ContextSpec struct {
+	Direction ContextDirection
+	MaxCost   int
+	MaxCount  int
+}
+
+// ContextDirection specifies the direction a context should be calculated.
+type ContextDirection uint8
+
+const (
+	ContextDirBoth ContextDirection = iota
+	ContextDirForward
+	ContextDirBackward
+)
+
+// ContextPort is the collection of box methods needed by this directive.
+type ContextPort interface {
+	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
+	SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *Query) ([]*meta.Meta, error)
+}
+
+func (spec *ContextSpec) Print(pe *PrintEnv) {
+	pe.printSpace()
+	pe.writeString(api.ContextDirective)
+	switch spec.Direction {
+	case ContextDirBackward:
+		pe.printSpace()
+		pe.writeString(api.BackwardDirective)
+	case ContextDirForward:
+		pe.printSpace()
+		pe.writeString(api.ForwardDirective)
+	}
+	pe.printPosInt(api.CostDirective, spec.MaxCost)
+	pe.printPosInt(api.MaxDirective, spec.MaxCount)
+}
+
+func (spec *ContextSpec) Execute(ctx context.Context, startSeq []*meta.Meta, port ContextPort) []*meta.Meta {
+	maxCost := spec.MaxCost
+	if maxCost <= 0 {
+		maxCost = 17
+	}
+	maxCount := spec.MaxCount
+	if maxCount <= 0 {
+		maxCount = 200
+	}
+	tasks := newQueue(startSeq, maxCost, maxCount, port)
+	isBackward := spec.Direction == ContextDirBoth || spec.Direction == ContextDirBackward
+	isForward := spec.Direction == ContextDirBoth || spec.Direction == ContextDirForward
+	result := []*meta.Meta{}
+	for {
+		m, cost := tasks.next()
+		if m == nil {
+			break
+		}
+		result = append(result, m)
+
+		for _, p := range m.ComputedPairsRest() {
+			tasks.addPair(ctx, p.Key, p.Value, cost, isBackward, isForward)
+		}
+		if tags, found := m.GetList(api.KeyTags); found {
+			for _, tag := range tags {
+				tasks.addSameTag(ctx, tag, cost)
+			}
+		}
+	}
+	return result
+}
+
+type ztlCtxItem struct {
+	cost int
+	meta *meta.Meta
+}
+type ztlCtxQueue []ztlCtxItem
+
+func (q ztlCtxQueue) Len() int           { return len(q) }
+func (q ztlCtxQueue) Less(i, j int) bool { return q[i].cost < q[j].cost }
+func (q ztlCtxQueue) Swap(i, j int)      { q[i], q[j] = q[j], q[i] }
+func (q *ztlCtxQueue) Push(x any)        { *q = append(*q, x.(ztlCtxItem)) }
+func (q *ztlCtxQueue) Pop() any {
+	old := *q
+	n := len(old)
+	item := old[n-1]
+	old[n-1].meta = nil // avoid memory leak
+	*q = old[0 : n-1]
+	return item
+}
+
+type contextTask struct {
+	port    ContextPort
+	seen    id.Set
+	queue   ztlCtxQueue
+	maxCost int
+	limit   int
+	tagCost map[string][]*meta.Meta
+}
+
+func newQueue(startSeq []*meta.Meta, maxCost, limit int, port ContextPort) *contextTask {
+	result := &contextTask{
+		port:    port,
+		seen:    id.NewSet(),
+		maxCost: maxCost,
+		limit:   limit,
+		tagCost: make(map[string][]*meta.Meta, 1024),
+	}
+
+	queue := make(ztlCtxQueue, 0, len(startSeq))
+	for _, m := range startSeq {
+		queue = append(queue, ztlCtxItem{cost: 1, meta: m})
+	}
+	heap.Init(&queue)
+	result.queue = queue
+	return result
+}
+
+func (ct *contextTask) addPair(ctx context.Context, key, value string, curCost int, isBackward, isForward bool) {
+	if key == api.KeyBack {
+		return
+	}
+	newCost := curCost + contextCost(key)
+	if key == api.KeyBackward {
+		if isBackward {
+			ct.addIDSet(ctx, newCost, value)
+		}
+		return
+	}
+	if key == api.KeyForward {
+		if isForward {
+			ct.addIDSet(ctx, newCost, value)
+		}
+		return
+	}
+	hasInverse := meta.Inverse(key) != ""
+	if (!hasInverse || !isBackward) && (hasInverse || !isForward) {
+		return
+	}
+	if t := meta.Type(key); t == meta.TypeID {
+		ct.addID(ctx, newCost, value)
+	} else if t == meta.TypeIDSet {
+		ct.addIDSet(ctx, newCost, value)
+	}
+}
+
+func contextCost(key string) int {
+	switch key {
+	case api.KeyFolge, api.KeyPrecursor:
+		return 1
+	case api.KeySuccessors, api.KeyPredecessor,
+		api.KeySubordinates, api.KeySuperior:
+		return 2
+	}
+	return 3
+}
+
+func (ct *contextTask) addID(ctx context.Context, newCost int, value string) {
+	if ct.costMaxed(newCost) {
+		return
+	}
+	if zid, errParse := id.Parse(value); errParse == nil {
+		if m, errGetMeta := ct.port.GetMeta(ctx, zid); errGetMeta == nil {
+			ct.addMeta(m, newCost)
+		}
+	}
+}
+func (ct *contextTask) addMeta(m *meta.Meta, newCost int) {
+	if _, found := ct.seen[m.Zid]; !found {
+		heap.Push(&ct.queue, ztlCtxItem{cost: newCost, meta: m})
+	}
+}
+
+func (ct *contextTask) costMaxed(newCost int) bool {
+	// If len(zc.seen) <= 1, the initial zettel is processed. In this case allow all
+	// other zettel that are directly reachable, without taking the cost into account.
+	// Of course, the limit ist still relevant.
+	return (len(ct.seen) > 1 && ct.maxCost > 0 && newCost > ct.maxCost) || ct.hasLimit()
+}
+
+func (ct *contextTask) addIDSet(ctx context.Context, newCost int, value string) {
+	elems := meta.ListFromValue(value)
+	refCost := referenceCost(newCost, len(elems))
+	for _, val := range elems {
+		ct.addID(ctx, refCost, val)
+	}
+}
+
+func referenceCost(baseCost int, numReferences int) int {
+	switch {
+	case numReferences < 5:
+		return baseCost + 1
+	case numReferences < 9:
+		return baseCost * 2
+	case numReferences < 17:
+		return baseCost * 3
+	case numReferences < 33:
+		return baseCost * 4
+	case numReferences < 65:
+		return baseCost * 5
+	}
+	return baseCost * numReferences / 8
+}
+
+func (ct *contextTask) addSameTag(ctx context.Context, tag string, baseCost int) {
+	tagMetas, found := ct.tagCost[tag]
+	if !found {
+		q := Parse(api.KeyTags + api.SearchOperatorHas + tag + " ORDER REVERSE " + api.KeyID)
+		ml, err := ct.port.SelectMeta(ctx, nil, q)
+		if err != nil {
+			return
+		}
+		tagMetas = ml
+		ct.tagCost[tag] = ml
+	}
+	cost := tagCost(baseCost, len(tagMetas))
+	if ct.costMaxed(cost) {
+		return
+	}
+	for _, m := range tagMetas {
+		ct.addMeta(m, cost)
+	}
+}
+
+func tagCost(baseCost, numTags int) int {
+	if numTags < 8 {
+		return baseCost + numTags/2
+	}
+	return (baseCost + 2) * (numTags / 4)
+}
+
+func (ct *contextTask) next() (*meta.Meta, int) {
+	if ct.hasLimit() {
+		return nil, -1
+	}
+	for len(ct.queue) > 0 {
+		item := heap.Pop(&ct.queue).(ztlCtxItem)
+		m := item.meta
+		zid := m.Zid
+		if _, found := ct.seen[zid]; found {
+			continue
+		}
+		ct.seen.Add(zid)
+		return m, item.cost
+	}
+	return nil, -1
+}
+
+func (ct *contextTask) hasLimit() bool {
+	limit := ct.limit
+	return limit > 0 && len(ct.seen) >= limit
+}

Index: query/parser.go
==================================================================
--- query/parser.go
+++ query/parser.go
@@ -11,12 +11,14 @@
 package query
 
 import (
 	"strconv"
 
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/input"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Parse the query specification and return a Query object.
 func Parse(spec string) (q *Query) { return q.Parse(spec) }
 
@@ -38,11 +40,11 @@
 	inp *input.Input
 }
 
 func (ps *parserState) mustStop() bool { return ps.inp.Ch == input.EOS }
 func (ps *parserState) acceptSingleKw(s string) bool {
-	if ps.inp.Accept(s) && (ps.isSpace() || ps.mustStop()) {
+	if ps.inp.Accept(s) && (ps.isSpace() || ps.isActionSep() || ps.mustStop()) {
 		return true
 	}
 	return false
 }
 func (ps *parserState) acceptKwArgs(s string) bool {
@@ -52,87 +54,232 @@
 	}
 	return false
 }
 
 const (
-	actionSeparatorChar      = '|'
-	existOperatorChar        = '?'
-	searchOperatorNotChar    = '!'
-	searchOperatorHasChar    = ':'
-	searchOperatorPrefixChar = '>'
-	searchOperatorSuffixChar = '<'
-	searchOperatorMatchChar  = '~'
-
-	kwLimit   = "LIMIT"
-	kwOffset  = "OFFSET"
-	kwOr      = "OR"
-	kwOrder   = "ORDER"
-	kwPick    = "PICK"
-	kwRandom  = "RANDOM"
-	kwReverse = "REVERSE"
+	actionSeparatorChar       = '|'
+	existOperatorChar         = '?'
+	searchOperatorNotChar     = '!'
+	searchOperatorEqualChar   = '='
+	searchOperatorHasChar     = ':'
+	searchOperatorPrefixChar  = '['
+	searchOperatorSuffixChar  = ']'
+	searchOperatorMatchChar   = '~'
+	searchOperatorLessChar    = '<'
+	searchOperatorGreaterChar = '>'
 )
 
 func (ps *parserState) parse(q *Query) *Query {
+	ps.skipSpace()
+	if ps.mustStop() {
+		return q
+	}
 	inp := ps.inp
+	firstPos := inp.Pos
+	zidSet := id.NewSet()
+	for {
+		pos := inp.Pos
+		zid, found := ps.scanZid()
+		if !found {
+			inp.SetPos(pos)
+			break
+		}
+		if !zidSet.ContainsOrNil(zid) {
+			zidSet.Add(zid)
+			q = createIfNeeded(q)
+			q.zids = append(q.zids, zid)
+		}
+		ps.skipSpace()
+		if ps.mustStop() {
+			q.zids = nil
+			break
+		}
+	}
+
+	hasContext := false
+	for {
+		ps.skipSpace()
+		if ps.mustStop() {
+			break
+		}
+		pos := inp.Pos
+		if ps.acceptSingleKw(api.ContextDirective) {
+			if hasContext {
+				inp.SetPos(pos)
+				break
+			}
+			q = ps.parseContext(q)
+			hasContext = true
+			continue
+		}
+		inp.SetPos(pos)
+		if q == nil || len(q.zids) == 0 {
+			break
+		}
+		if ps.acceptSingleKw(api.IdentDirective) {
+			q.directives = append(q.directives, &IdentSpec{})
+			continue
+		}
+		inp.SetPos(pos)
+		if ps.acceptSingleKw(api.ItemsDirective) {
+			q.directives = append(q.directives, &ItemsSpec{})
+			continue
+		}
+		inp.SetPos(pos)
+		if ps.acceptSingleKw(api.UnlinkedDirective) {
+			q = ps.parseUnlinked(q)
+			continue
+		}
+		inp.SetPos(pos)
+		break
+	}
+	if q != nil && len(q.directives) == 0 {
+		inp.SetPos(firstPos) // No directive -> restart at beginning
+		q.zids = nil
+	}
+
 	for {
 		ps.skipSpace()
 		if ps.mustStop() {
 			break
 		}
 		pos := inp.Pos
-		if ps.acceptSingleKw(kwOr) {
+		if ps.acceptSingleKw(api.OrDirective) {
 			q = createIfNeeded(q)
 			if !q.terms[len(q.terms)-1].isEmpty() {
 				q.terms = append(q.terms, conjTerms{})
 			}
 			continue
 		}
 		inp.SetPos(pos)
-		if ps.acceptSingleKw(kwRandom) {
+		if ps.acceptSingleKw(api.RandomDirective) {
 			q = createIfNeeded(q)
-			if len(q.order) == 0 && q.pick <= 0 {
+			if len(q.order) == 0 {
 				q.order = []sortOrder{{"", false}}
 			}
 			continue
 		}
 		inp.SetPos(pos)
-		if ps.acceptKwArgs(kwPick) {
+		if ps.acceptKwArgs(api.PickDirective) {
 			if s, ok := ps.parsePick(q); ok {
 				q = s
 				continue
 			}
 		}
 		inp.SetPos(pos)
-		if ps.acceptKwArgs(kwOrder) {
+		if ps.acceptKwArgs(api.OrderDirective) {
 			if s, ok := ps.parseOrder(q); ok {
 				q = s
 				continue
 			}
 		}
 		inp.SetPos(pos)
-		if ps.acceptKwArgs(kwOffset) {
+		if ps.acceptKwArgs(api.OffsetDirective) {
 			if s, ok := ps.parseOffset(q); ok {
 				q = s
 				continue
 			}
 		}
 		inp.SetPos(pos)
-		if ps.acceptKwArgs(kwLimit) {
+		if ps.acceptKwArgs(api.LimitDirective) {
 			if s, ok := ps.parseLimit(q); ok {
 				q = s
 				continue
 			}
 		}
 		inp.SetPos(pos)
-		if isActionSep(inp.Ch) {
+		if ps.isActionSep() {
 			q = ps.parseActions(q)
 			break
 		}
 		q = ps.parseText(q)
 	}
 	return q
 }
+
+func (ps *parserState) parseContext(q *Query) *Query {
+	inp := ps.inp
+	spec := &ContextSpec{}
+	for {
+		ps.skipSpace()
+		if ps.mustStop() {
+			break
+		}
+		pos := inp.Pos
+		if ps.acceptSingleKw(api.BackwardDirective) {
+			spec.Direction = ContextDirBackward
+			continue
+		}
+		inp.SetPos(pos)
+		if ps.acceptSingleKw(api.ForwardDirective) {
+			spec.Direction = ContextDirForward
+			continue
+		}
+		inp.SetPos(pos)
+		if ps.acceptKwArgs(api.CostDirective) {
+			if ps.parseCost(spec) {
+				continue
+			}
+		}
+		inp.SetPos(pos)
+		if ps.acceptKwArgs(api.MaxDirective) {
+			if ps.parseCount(spec) {
+				continue
+			}
+		}
+
+		inp.SetPos(pos)
+		break
+	}
+	q = createIfNeeded(q)
+	q.directives = append(q.directives, spec)
+	return q
+}
+func (ps *parserState) parseCost(spec *ContextSpec) bool {
+	num, ok := ps.scanPosInt()
+	if !ok {
+		return false
+	}
+	if spec.MaxCost == 0 || spec.MaxCost >= num {
+		spec.MaxCost = num
+	}
+	return true
+}
+func (ps *parserState) parseCount(spec *ContextSpec) bool {
+	num, ok := ps.scanPosInt()
+	if !ok {
+		return false
+	}
+	if spec.MaxCount == 0 || spec.MaxCount >= num {
+		spec.MaxCount = num
+	}
+	return true
+}
+
+func (ps *parserState) parseUnlinked(q *Query) *Query {
+	inp := ps.inp
+
+	spec := &UnlinkedSpec{}
+	for {
+		ps.skipSpace()
+		if ps.mustStop() {
+			break
+		}
+		pos := inp.Pos
+		if ps.acceptKwArgs(api.PhraseDirective) {
+			if word := ps.scanWord(); len(word) > 0 {
+				spec.words = append(spec.words, string(word))
+				continue
+			}
+		}
+
+		inp.SetPos(pos)
+		break
+	}
+	q.directives = append(q.directives, spec)
+	return q
+}
 
 func (ps *parserState) parsePick(q *Query) (*Query, bool) {
 	num, ok := ps.scanPosInt()
 	if !ok {
 		return q, false
@@ -139,19 +286,16 @@
 	}
 	q = createIfNeeded(q)
 	if q.pick == 0 || q.pick >= num {
 		q.pick = num
 	}
-	if len(q.order) == 1 && q.order[0].isRandom() {
-		q.order = nil
-	}
 	return q, true
 }
 
 func (ps *parserState) parseOrder(q *Query) (*Query, bool) {
 	reverse := false
-	if ps.acceptKwArgs(kwReverse) {
+	if ps.acceptKwArgs(api.ReverseDirective) {
 		reverse = true
 	}
 	word := ps.scanWord()
 	if len(word) == 0 {
 		return q, false
@@ -221,11 +365,11 @@
 	if len(key) > 0 {
 		// Assert: hasOp == false
 		op, hasOp = ps.scanSearchOp()
 		// Assert hasOp == true
 		if op == cmpExist || op == cmpNotExist {
-			if ps.isSpace() || isActionSep(inp.Ch) || ps.mustStop() {
+			if ps.isSpace() || ps.isActionSep() || ps.mustStop() {
 				return q.addKey(string(key), op)
 			}
 			ps.inp.SetPos(pos)
 			hasOp = false
 			text = ps.scanWord()
@@ -260,15 +404,17 @@
 func (ps *parserState) scanSearchTextOrKey(hasOp bool) ([]byte, []byte) {
 	inp := ps.inp
 	pos := inp.Pos
 	allowKey := !hasOp
 
-	for !ps.isSpace() && !isActionSep(inp.Ch) && !ps.mustStop() {
+	for !ps.isSpace() && !ps.isActionSep() && !ps.mustStop() {
 		if allowKey {
 			switch inp.Ch {
-			case searchOperatorNotChar, existOperatorChar, searchOperatorHasChar,
-				searchOperatorPrefixChar, searchOperatorSuffixChar, searchOperatorMatchChar:
+			case searchOperatorNotChar, existOperatorChar,
+				searchOperatorEqualChar, searchOperatorHasChar,
+				searchOperatorPrefixChar, searchOperatorSuffixChar, searchOperatorMatchChar,
+				searchOperatorLessChar, searchOperatorGreaterChar:
 				allowKey = false
 				if key := inp.Src[pos:inp.Pos]; meta.KeyIsValid(string(key)) {
 					return nil, key
 				}
 			}
@@ -279,26 +425,17 @@
 }
 
 func (ps *parserState) scanWord() []byte {
 	inp := ps.inp
 	pos := inp.Pos
-	for !ps.isSpace() && !isActionSep(inp.Ch) && !ps.mustStop() {
+	for !ps.isSpace() && !ps.isActionSep() && !ps.mustStop() {
 		inp.Next()
 	}
 	return inp.Src[pos:inp.Pos]
 }
 
 func (ps *parserState) scanPosInt() (int, bool) {
-	inp := ps.inp
-	ch := inp.Ch
-	if ch == '0' {
-		ch = inp.Next()
-		if isSpace(ch) || isActionSep(inp.Ch) || ps.mustStop() {
-			return 0, true
-		}
-		return 0, false
-	}
 	word := ps.scanWord()
 	if len(word) == 0 {
 		return 0, false
 	}
 	uval, err := strconv.ParseUint(string(word), 10, 63)
@@ -305,10 +442,23 @@
 	if err != nil {
 		return 0, false
 	}
 	return int(uval), true
 }
+
+func (ps *parserState) scanZid() (id.Zid, bool) {
+	word := ps.scanWord()
+	if len(word) == 0 {
+		return id.Invalid, false
+	}
+	uval, err := id.ParseUint(string(word))
+	if err != nil {
+		return id.Invalid, false
+	}
+	zid := id.Zid(uval)
+	return zid, zid.IsValid()
+}
 
 func (ps *parserState) scanSearchOp() (compareOp, bool) {
 	inp := ps.inp
 	ch := inp.Ch
 	negate := false
@@ -319,10 +469,13 @@
 	op := cmpUnknown
 	switch ch {
 	case existOperatorChar:
 		inp.Next()
 		op = cmpExist
+	case searchOperatorEqualChar:
+		inp.Next()
+		op = cmpEqual
 	case searchOperatorHasChar:
 		inp.Next()
 		op = cmpHas
 	case searchOperatorSuffixChar:
 		inp.Next()
@@ -331,10 +484,16 @@
 		inp.Next()
 		op = cmpPrefix
 	case searchOperatorMatchChar:
 		inp.Next()
 		op = cmpMatch
+	case searchOperatorLessChar:
+		inp.Next()
+		op = cmpLess
+	case searchOperatorGreaterChar:
+		inp.Next()
+		op = cmpGreater
 	default:
 		if negate {
 			return cmpNoMatch, true
 		}
 		return cmpUnknown, false
@@ -343,26 +502,25 @@
 		return op.negate(), true
 	}
 	return op, true
 }
 
-func (ps *parserState) isSpace() bool {
-	return isSpace(ps.inp.Ch)
-}
-
-func isSpace(ch rune) bool {
-	switch ch {
-	case input.EOS:
-		return false
-	case ' ', '\t', '\n', '\r':
-		return true
-	}
-	return input.IsSpace(ch)
-}
-
 func (ps *parserState) skipSpace() {
 	for ps.isSpace() {
 		ps.inp.Next()
 	}
 }
 
-func isActionSep(ch rune) bool { return ch == actionSeparatorChar }
+func (ps *parserState) isSpace() bool {
+	switch ch := ps.inp.Ch; ch {
+	case input.EOS:
+		return false
+	case ' ', '\t', '\n', '\r':
+		return true
+	default:
+		return input.IsSpace(ch)
+	}
+}
+
+func (ps *parserState) isActionSep() bool {
+	return ps.inp.Ch == actionSeparatorChar
+}

Index: query/parser_test.go
==================================================================
--- query/parser_test.go
+++ query/parser_test.go
@@ -20,44 +20,84 @@
 	t.Parallel()
 	testcases := []struct {
 		spec string
 		exp  string
 	}{
+		{"1", "1"}, // Just a number will transform to search for that number in all zettel
+
+		{"1 IDENT", "00000000000001 IDENT"},
+		{"IDENT", "IDENT"},
+		{"1 IDENT|REINDEX", "00000000000001 IDENT | REINDEX"},
+
+		{"1 ITEMS", "00000000000001 ITEMS"},
+		{"ITEMS", "ITEMS"},
+
+		{"CONTEXT", "CONTEXT"}, {"CONTEXT a", "CONTEXT a"},
+		{"0 CONTEXT", "0 CONTEXT"}, {"1 CONTEXT", "00000000000001 CONTEXT"},
+		{"00000000000001 CONTEXT", "00000000000001 CONTEXT"},
+		{"100000000000001 CONTEXT", "100000000000001 CONTEXT"},
+		{"1 CONTEXT BACKWARD", "00000000000001 CONTEXT BACKWARD"},
+		{"1 CONTEXT FORWARD", "00000000000001 CONTEXT FORWARD"},
+		{"1 CONTEXT COST ", "00000000000001 CONTEXT COST"},
+		{"1 CONTEXT COST 3", "00000000000001 CONTEXT COST 3"}, {"1 CONTEXT COST x", "00000000000001 CONTEXT COST x"},
+		{"1 CONTEXT MAX 5", "00000000000001 CONTEXT MAX 5"}, {"1 CONTEXT MAX y", "00000000000001 CONTEXT MAX y"},
+		{"1 CONTEXT MAX 5 COST 7", "00000000000001 CONTEXT COST 7 MAX 5"},
+		{"1 CONTEXT |  N", "00000000000001 CONTEXT | N"},
+		{"1 1 CONTEXT", "00000000000001 CONTEXT"},
+		{"1 2 CONTEXT", "00000000000001 00000000000002 CONTEXT"},
+		{"2 1 CONTEXT", "00000000000002 00000000000001 CONTEXT"},
+		{"1 CONTEXT|N", "00000000000001 CONTEXT | N"},
+
+		{"CONTEXT 0", "CONTEXT 0"},
+
+		{"1 UNLINKED", "00000000000001 UNLINKED"},
+		{"UNLINKED", "UNLINKED"},
+		{"1 UNLINKED PHRASE", "00000000000001 UNLINKED PHRASE"},
+		{"1 UNLINKED PHRASE Zettel", "00000000000001 UNLINKED PHRASE Zettel"},
+
 		{"?", "?"}, {"!?", "!?"}, {"?a", "?a"}, {"!?a", "!?a"},
 		{"key?", "key?"}, {"key!?", "key!?"},
 		{"b key?", "key? b"}, {"b key!?", "key!? b"},
 		{"key?a", "key?a"}, {"key!?a", "key!?a"},
-		{"", ""}, {"!", ""}, {":", ""}, {"!:", ""}, {">", ""}, {"!>", ""}, {"<", ""}, {"!<", ""}, {"~", ""}, {"!~", ""},
+		{"", ""}, {"!", ""}, {":", ""}, {"!:", ""}, {"[", ""}, {"![", ""}, {"]", ""}, {"!]", ""}, {"~", ""}, {"!~", ""}, {"<", ""}, {"!<", ""}, {">", ""}, {"!>", ""},
 		{`a`, `a`}, {`!a`, `!a`},
+		{`=a`, `=a`}, {`!=a`, `!=a`},
 		{`:a`, `:a`}, {`!:a`, `!:a`},
-		{`>a`, `>a`}, {`!>a`, `!>a`},
-		{`<a`, `<a`}, {`!<a`, `!<a`},
+		{`[a`, `[a`}, {`![a`, `![a`},
+		{`]a`, `]a`}, {`!]a`, `!]a`},
 		{`~a`, `a`}, {`!~a`, `!a`},
+		{`key=`, `key=`}, {`key!=`, `key!=`},
 		{`key:`, `key:`}, {`key!:`, `key!:`},
-		{`key>`, `key>`}, {`key!>`, `key!>`},
-		{`key<`, `key<`}, {`key!<`, `key!<`},
+		{`key[`, `key[`}, {`key![`, `key![`},
+		{`key]`, `key]`}, {`key!]`, `key!]`},
 		{`key~`, `key~`}, {`key!~`, `key!~`},
+		{`key<`, `key<`}, {`key!<`, `key!<`},
+		{`key>`, `key>`}, {`key!>`, `key!>`},
+		{`key=a`, `key=a`}, {`key!=a`, `key!=a`},
 		{`key:a`, `key:a`}, {`key!:a`, `key!:a`},
-		{`key>a`, `key>a`}, {`key!>a`, `key!>a`},
-		{`key<a`, `key<a`}, {`key!<a`, `key!<a`},
+		{`key[a`, `key[a`}, {`key![a`, `key![a`},
+		{`key]a`, `key]a`}, {`key!]a`, `key!]a`},
 		{`key~a`, `key~a`}, {`key!~a`, `key!~a`},
+		{`key<a`, `key<a`}, {`key!<a`, `key!<a`},
+		{`key>a`, `key>a`}, {`key!>a`, `key!>a`},
 		{`key1:a key2:b`, `key1:a key2:b`},
 		{`key1: key2:b`, `key1: key2:b`},
 		{"word key:a", "key:a word"},
-		{`PICK 3`, `PICK 3`}, {`PICK 9 PICK 11`, `PICK 9`}, {`PICK 5 RANDOM`, `PICK 5`}, {`RANDOM PICK 7`, `PICK 7`},
+		{`PICK 3`, `PICK 3`}, {`PICK 9 PICK 11`, `PICK 9`},
+		{"PICK a", "PICK a"},
 		{`RANDOM`, `RANDOM`}, {`RANDOM a`, `a RANDOM`}, {`a RANDOM`, `a RANDOM`},
 		{`RANDOM RANDOM a`, `a RANDOM`},
 		{`RANDOMRANDOM a`, `RANDOMRANDOM a`}, {`a RANDOMRANDOM`, `a RANDOMRANDOM`},
 		{`ORDER`, `ORDER`}, {"ORDER a b", "b ORDER a"}, {"a ORDER", "a ORDER"}, {"ORDER %", "ORDER %"},
 		{"ORDER a %", "% ORDER a"},
 		{"ORDER REVERSE", "ORDER REVERSE"}, {"ORDER REVERSE a b", "b ORDER REVERSE a"},
 		{"a RANDOM ORDER b", "a ORDER b"}, {"a ORDER b RANDOM", "a ORDER b"},
 		{"OFFSET", "OFFSET"}, {"OFFSET a", "OFFSET a"}, {"OFFSET 10 a", "a OFFSET 10"},
-		{"OFFSET 01 a", "OFFSET 01 a"}, {"OFFSET 0 a", "a"}, {"a OFFSET 0", "a"},
+		{"OFFSET 01 a", "a OFFSET 1"}, {"OFFSET 0 a", "a"}, {"a OFFSET 0", "a"},
 		{"OFFSET 4 OFFSET 8", "OFFSET 8"}, {"OFFSET 8 OFFSET 4", "OFFSET 8"},
 		{"LIMIT", "LIMIT"}, {"LIMIT a", "LIMIT a"}, {"LIMIT 10 a", "a LIMIT 10"},
-		{"LIMIT 01 a", "LIMIT 01 a"}, {"LIMIT 0 a", "a"}, {"a LIMIT 0", "a"},
+		{"LIMIT 01 a", "a LIMIT 1"}, {"LIMIT 0 a", "a"}, {"a LIMIT 0", "a"},
 		{"LIMIT 4 LIMIT 8", "LIMIT 4"}, {"LIMIT 8 LIMIT 4", "LIMIT 4"},
 		{"OR", ""}, {"OR OR", ""}, {"a OR", "a"}, {"OR b", "b"}, {"OR a OR", "a"},
 		{"a OR b", "a OR b"},
 		{"|", ""}, {" | RANDOM", "| RANDOM"}, {"| RANDOM", "| RANDOM"}, {"a|a b ", "a | a b"},
 	}

Index: query/print.go
==================================================================
--- query/print.go
+++ query/print.go
@@ -13,25 +13,32 @@
 import (
 	"io"
 	"strconv"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/maps"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/maps"
+	"zettelstore.de/z/zettel/id"
 )
 
 var op2string = map[compareOp]string{
-	cmpExist:    api.ExistOperator,
-	cmpNotExist: api.ExistNotOperator,
-	cmpHas:      api.SearchOperatorHas,
-	cmpHasNot:   api.SearchOperatorHasNot,
-	cmpPrefix:   api.SearchOperatorPrefix,
-	cmpNoPrefix: api.SearchOperatorNoPrefix,
-	cmpSuffix:   api.SearchOperatorSuffix,
-	cmpNoSuffix: api.SearchOperatorNoSuffix,
-	cmpMatch:    api.SearchOperatorMatch,
-	cmpNoMatch:  api.SearchOperatorNoMatch,
+	cmpExist:     api.ExistOperator,
+	cmpNotExist:  api.ExistNotOperator,
+	cmpEqual:     api.SearchOperatorEqual,
+	cmpNotEqual:  api.SearchOperatorNotEqual,
+	cmpHas:       api.SearchOperatorHas,
+	cmpHasNot:    api.SearchOperatorHasNot,
+	cmpPrefix:    api.SearchOperatorPrefix,
+	cmpNoPrefix:  api.SearchOperatorNoPrefix,
+	cmpSuffix:    api.SearchOperatorSuffix,
+	cmpNoSuffix:  api.SearchOperatorNoSuffix,
+	cmpMatch:     api.SearchOperatorMatch,
+	cmpNoMatch:   api.SearchOperatorNoMatch,
+	cmpLess:      api.SearchOperatorLess,
+	cmpNoLess:    api.SearchOperatorNotLess,
+	cmpGreater:   api.SearchOperatorGreater,
+	cmpNoGreater: api.SearchOperatorNotGreater,
 }
 
 func (q *Query) String() string {
 	var sb strings.Builder
 	q.Print(&sb)
@@ -41,11 +48,15 @@
 // Print the query in a parseable form.
 func (q *Query) Print(w io.Writer) {
 	if q == nil {
 		return
 	}
-	env := printEnv{w: w}
+	env := PrintEnv{w: w}
+	env.printZids(q.zids)
+	for _, d := range q.directives {
+		d.Print(&env)
+	}
 	for i, term := range q.terms {
 		if i > 0 {
 			env.writeString(" OR")
 		}
 		for _, name := range maps.Keys(term.keys) {
@@ -52,48 +63,60 @@
 			env.printSpace()
 			env.writeString(name)
 			if op := term.keys[name]; op == cmpExist || op == cmpNotExist {
 				env.writeString(op2string[op])
 			} else {
-				env.writeString(api.ExistOperator)
-				env.printSpace()
-				env.writeString(name)
-				env.writeString(api.ExistNotOperator)
+				env.writeStrings(api.ExistOperator, " ", name, api.ExistNotOperator)
 			}
 		}
 		for _, name := range maps.Keys(term.mvals) {
 			env.printExprValues(name, term.mvals[name])
 		}
 		if len(term.search) > 0 {
 			env.printExprValues("", term.search)
 		}
 	}
-	env.printPosInt(kwPick, q.pick)
+	env.printPosInt(api.PickDirective, q.pick)
 	env.printOrder(q.order)
-	env.printPosInt(kwOffset, q.offset)
-	env.printPosInt(kwLimit, q.limit)
+	env.printPosInt(api.OffsetDirective, q.offset)
+	env.printPosInt(api.LimitDirective, q.limit)
 	env.printActions(q.actions)
 }
 
-type printEnv struct {
+// PrintEnv is an environment where queries are printed.
+type PrintEnv struct {
 	w     io.Writer
 	space bool
 }
 
 var bsSpace = []byte{' '}
 
-func (pe *printEnv) printSpace() {
+func (pe *PrintEnv) printSpace() {
 	if pe.space {
 		pe.w.Write(bsSpace)
 		return
 	}
 	pe.space = true
 }
-func (pe *printEnv) write(ch byte)        { pe.w.Write([]byte{ch}) }
-func (pe *printEnv) writeString(s string) { io.WriteString(pe.w, s) }
+func (pe *PrintEnv) write(ch byte)        { pe.w.Write([]byte{ch}) }
+func (pe *PrintEnv) writeString(s string) { io.WriteString(pe.w, s) }
+func (pe *PrintEnv) writeStrings(sSeq ...string) {
+	for _, s := range sSeq {
+		io.WriteString(pe.w, s)
+	}
+}
 
-func (pe *printEnv) printExprValues(key string, values []expValue) {
+func (pe *PrintEnv) printZids(zids []id.Zid) {
+	for i, zid := range zids {
+		if i > 0 {
+			pe.printSpace()
+		}
+		pe.writeString(zid.String())
+		pe.space = true
+	}
+}
+func (pe *PrintEnv) printExprValues(key string, values []expValue) {
 	for _, val := range values {
 		pe.printSpace()
 		pe.writeString(key)
 		switch op := val.op; op {
 		case cmpMatch:
@@ -132,11 +155,15 @@
 // PrintHuman the query to a writer in a human readable form.
 func (q *Query) PrintHuman(w io.Writer) {
 	if q == nil {
 		return
 	}
-	env := printEnv{w: w}
+	env := PrintEnv{w: w}
+	env.printZids(q.zids)
+	for _, d := range q.directives {
+		d.Print(&env)
+	}
 	for i, term := range q.terms {
 		if i > 0 {
 			env.writeString(" OR ")
 			env.space = false
 		}
@@ -171,18 +198,18 @@
 			env.printHumanSelectExprValues(term.search)
 			env.space = true
 		}
 	}
 
-	env.printPosInt(kwPick, q.pick)
+	env.printPosInt(api.PickDirective, q.pick)
 	env.printOrder(q.order)
-	env.printPosInt(kwOffset, q.offset)
-	env.printPosInt(kwLimit, q.limit)
+	env.printPosInt(api.OffsetDirective, q.offset)
+	env.printPosInt(api.LimitDirective, q.limit)
 	env.printActions(q.actions)
 }
 
-func (pe *printEnv) printHumanSelectExprValues(values []expValue) {
+func (pe *PrintEnv) printHumanSelectExprValues(values []expValue) {
 	if len(values) == 0 {
 		pe.writeString(" MATCH ANY")
 		return
 	}
 
@@ -189,10 +216,14 @@
 	for j, val := range values {
 		if j > 0 {
 			pe.writeString(" AND")
 		}
 		switch val.op {
+		case cmpEqual:
+			pe.writeString(" EQUALS ")
+		case cmpNotEqual:
+			pe.writeString(" EQUALS NOT ")
 		case cmpHas:
 			pe.writeString(" HAS ")
 		case cmpHasNot:
 			pe.writeString(" HAS NOT ")
 		case cmpPrefix:
@@ -205,10 +236,18 @@
 			pe.writeString(" NOT SUFFIX ")
 		case cmpMatch:
 			pe.writeString(" MATCH ")
 		case cmpNoMatch:
 			pe.writeString(" NOT MATCH ")
+		case cmpLess:
+			pe.writeString(" LESS ")
+		case cmpNoLess:
+			pe.writeString(" NOT LESS ")
+		case cmpGreater:
+			pe.writeString(" GREATER ")
+		case cmpNoGreater:
+			pe.writeString(" NOT GREATER ")
 		default:
 			pe.writeString(" MaTcH ")
 		}
 		if val.value == "" {
 			pe.writeString("NOTHING")
@@ -216,44 +255,40 @@
 			pe.writeString(val.value)
 		}
 	}
 }
 
-func (pe *printEnv) printOrder(order []sortOrder) {
+func (pe *PrintEnv) printOrder(order []sortOrder) {
 	for _, o := range order {
 		if o.isRandom() {
 			pe.printSpace()
-			pe.writeString(kwRandom)
-			continue
-		} else if o.key == api.KeyID && o.descending {
+			pe.writeString(api.RandomDirective)
 			continue
 		}
 		pe.printSpace()
-		pe.writeString(kwOrder)
+		pe.writeString(api.OrderDirective)
 		if o.descending {
 			pe.printSpace()
-			pe.writeString(kwReverse)
+			pe.writeString(api.ReverseDirective)
 		}
 		pe.printSpace()
 		pe.writeString(o.key)
 	}
 }
 
-func (pe *printEnv) printPosInt(key string, val int) {
+func (pe *PrintEnv) printPosInt(key string, val int) {
 	if val > 0 {
 		pe.printSpace()
-		pe.writeString(key)
-		pe.writeString(" ")
-		pe.writeString(strconv.Itoa(val))
+		pe.writeStrings(key, " ", strconv.Itoa(val))
 	}
 }
 
-func (pe *printEnv) printActions(words []string) {
+func (pe *PrintEnv) printActions(words []string) {
 	if len(words) > 0 {
 		pe.printSpace()
 		pe.write(actionSeparatorChar)
 		for _, word := range words {
 			pe.printSpace()
 			pe.writeString(word)
 		}
 	}
 }

Index: query/query.go
==================================================================
--- query/query.go
+++ query/query.go
@@ -10,15 +10,16 @@
 
 // Package query provides a query for zettel.
 package query
 
 import (
+	"context"
 	"math/rand"
-	"sort"
+	"slices"
 
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Searcher is used to select zettel identifier based on search criteria.
 type Searcher interface {
 	// Select all zettel that contains the given exact word.
@@ -38,10 +39,16 @@
 	SearchContains(s string) id.Set
 }
 
 // Query specifies a mechanism for querying zettel.
 type Query struct {
+	// Präfixed zettel identifier.
+	zids []id.Zid
+
+	// Querydirectives, like CONTEXT, ...
+	directives []Directive
+
 	// Fields to be used for selecting
 	preMatch MetaMatchFunc // Match that must be true
 	terms    []conjTerms
 
 	// Allow to create predictable randomness
@@ -56,30 +63,34 @@
 
 	// Execute specification
 	actions []string
 }
 
-// Compiled is a compiled query, to be used in a Box
-type Compiled struct {
-	PreMatch MetaMatchFunc // Precondition for Match and Retrieve
-	Terms    []CompiledTerm
-}
-
-// MetaMatchFunc is a function determine whethe some metadata should be selected or not.
-type MetaMatchFunc func(*meta.Meta) bool
-
-func matchAlways(*meta.Meta) bool { return true }
-func matchNever(*meta.Meta) bool  { return false }
-
-// CompiledTerm is the preprocessed sequence of conjugated search terms.
-type CompiledTerm struct {
-	Match    MetaMatchFunc     // Match on metadata
-	Retrieve RetrievePredicate // Retrieve from full-text search
-}
-
-// RetrievePredicate returns true, if the given Zid is contained in the (full-text) search.
-type RetrievePredicate func(id.Zid) bool
+// GetZids returns a slide of all specified zettel identifier.
+func (q *Query) GetZids() []id.Zid {
+	if q == nil || len(q.zids) == 0 {
+		return nil
+	}
+	result := make([]id.Zid, len(q.zids))
+	copy(result, q.zids)
+	return result
+}
+
+// Directive are executed to process the list of metadata.
+type Directive interface {
+	Print(*PrintEnv)
+}
+
+// GetDirectives returns the slice of query directives.
+func (q *Query) GetDirectives() []Directive {
+	if q == nil || len(q.directives) == 0 {
+		return nil
+	}
+	result := make([]Directive, len(q.directives))
+	copy(result, q.directives)
+	return result
+}
 
 type keyExistMap map[string]compareOp
 type expMetaValues map[string][]expValue
 
 type conjTerms struct {
@@ -126,10 +137,19 @@
 func (q *Query) Clone() *Query {
 	if q == nil {
 		return nil
 	}
 	c := new(Query)
+	if len(q.zids) > 0 {
+		c.zids = make([]id.Zid, len(q.zids))
+		copy(c.zids, q.zids)
+	}
+	if len(q.directives) > 0 {
+		c.directives = make([]Directive, len(q.directives))
+		copy(c.directives, q.directives)
+	}
+
 	c.preMatch = q.preMatch
 	c.terms = make([]conjTerms, len(q.terms))
 	for i, term := range q.terms {
 		if len(term.keys) > 0 {
 			c.terms[i].keys = make(keyExistMap, len(term.keys))
@@ -162,41 +182,56 @@
 
 const (
 	cmpUnknown compareOp = iota
 	cmpExist
 	cmpNotExist
+	cmpEqual
+	cmpNotEqual
 	cmpHas
 	cmpHasNot
 	cmpPrefix
 	cmpNoPrefix
 	cmpSuffix
 	cmpNoSuffix
 	cmpMatch
 	cmpNoMatch
+	cmpLess
+	cmpNoLess
+	cmpGreater
+	cmpNoGreater
 )
 
 var negateMap = map[compareOp]compareOp{
-	cmpUnknown:  cmpUnknown,
-	cmpExist:    cmpNotExist,
-	cmpHas:      cmpHasNot,
-	cmpHasNot:   cmpHas,
-	cmpPrefix:   cmpNoPrefix,
-	cmpNoPrefix: cmpPrefix,
-	cmpSuffix:   cmpNoSuffix,
-	cmpNoSuffix: cmpSuffix,
-	cmpMatch:    cmpNoMatch,
-	cmpNoMatch:  cmpMatch,
+	cmpUnknown:   cmpUnknown,
+	cmpExist:     cmpNotExist,
+	cmpEqual:     cmpNotEqual,
+	cmpNotEqual:  cmpEqual,
+	cmpHas:       cmpHasNot,
+	cmpHasNot:    cmpHas,
+	cmpPrefix:    cmpNoPrefix,
+	cmpNoPrefix:  cmpPrefix,
+	cmpSuffix:    cmpNoSuffix,
+	cmpNoSuffix:  cmpSuffix,
+	cmpMatch:     cmpNoMatch,
+	cmpNoMatch:   cmpMatch,
+	cmpLess:      cmpNoLess,
+	cmpNoLess:    cmpLess,
+	cmpGreater:   cmpNoGreater,
+	cmpNoGreater: cmpGreater,
 }
 
 func (op compareOp) negate() compareOp { return negateMap[op] }
 
 var negativeMap = map[compareOp]bool{
-	cmpNotExist: true,
-	cmpHasNot:   true,
-	cmpNoPrefix: true,
-	cmpNoSuffix: true,
-	cmpNoMatch:  true,
+	cmpNotExist:  true,
+	cmpNotEqual:  true,
+	cmpHasNot:    true,
+	cmpNoPrefix:  true,
+	cmpNoSuffix:  true,
+	cmpNoMatch:   true,
+	cmpNoLess:    true,
+	cmpNoGreater: true,
 }
 
 func (op compareOp) isNegated() bool { return negativeMap[op] }
 
 type expValue struct {
@@ -209,10 +244,25 @@
 func (q *Query) addKey(key string, op compareOp) *Query {
 	q = createIfNeeded(q)
 	q.terms[len(q.terms)-1].addKey(key, op)
 	return q
 }
+
+func (q *Query) GetMetaValues(key string) (vals []string) {
+	if q == nil {
+		return nil
+	}
+	for _, term := range q.terms {
+		if mvs, hasMv := term.mvals[key]; hasMv {
+			for _, ev := range mvs {
+				vals = append(vals, ev.value)
+			}
+		}
+	}
+	slices.Sort(vals)
+	return slices.Compact(vals)
+}
 
 // SetPreMatch sets the pre-selection predicate.
 func (q *Query) SetPreMatch(preMatch MetaMatchFunc) *Query {
 	q = createIfNeeded(q)
 	if q.preMatch != nil {
@@ -235,26 +285,17 @@
 		return 0, false
 	}
 	return q.seed, q.seed > 0
 }
 
-// SetLimit sets the given limit of the query object.
-func (q *Query) SetLimit(limit int) *Query {
+// SetDeterministic signals that the result should be the same if the seed is the same.
+func (q *Query) SetDeterministic() *Query {
 	q = createIfNeeded(q)
-	if limit < 0 {
-		limit = 0
-	}
-	q.limit = limit
-	return q
-}
-
-// GetLimit returns the current offset value.
-func (q *Query) GetLimit() int {
-	if q == nil {
-		return 0
-	}
-	return q.limit
+	if q.seed <= 0 {
+		q.seed = int(rand.Intn(10000) + 1)
+	}
+	return q
 }
 
 // Actions returns the slice of action specifications
 func (q *Query) Actions() []string {
 	if q == nil {
@@ -273,10 +314,13 @@
 // EnrichNeeded returns true, if the query references a metadata key that
 // is calculated via metadata enrichments.
 func (q *Query) EnrichNeeded() bool {
 	if q == nil {
 		return false
+	}
+	if len(q.zids) > 0 {
+		return true
 	}
 	if len(q.actions) > 0 {
 		// Unknown, what an action will use. Example: RSS needs api.KeyPublished.
 		return true
 	}
@@ -300,54 +344,89 @@
 	return false
 }
 
 // RetrieveAndCompile queries the search index and returns a predicate
 // for its results and returns a matching predicate.
-func (q *Query) RetrieveAndCompile(searcher Searcher) Compiled {
+func (q *Query) RetrieveAndCompile(_ context.Context, searcher Searcher, metaSeq []*meta.Meta) Compiled {
 	if q == nil {
 		return Compiled{
 			PreMatch: matchAlways,
 			Terms: []CompiledTerm{{
 				Match:    matchAlways,
-				Retrieve: alwaysIncluded,
+				Retrieve: AlwaysIncluded,
 			}}}
 	}
 	q = q.Clone()
 
 	preMatch := q.preMatch
 	if preMatch == nil {
 		preMatch = matchAlways
 	}
-	result := Compiled{PreMatch: preMatch}
+
+	startSet := metaList2idSet(metaSeq)
+	result := Compiled{
+		hasQuery:  true,
+		seed:      q.seed,
+		pick:      q.pick,
+		order:     q.order,
+		offset:    q.offset,
+		limit:     q.limit,
+		startMeta: metaSeq,
+		PreMatch:  preMatch,
+		Terms:     []CompiledTerm{},
+	}
 
 	for _, term := range q.terms {
-		cTerm := term.retrievAndCompileTerm(searcher)
+		cTerm := term.retrieveAndCompileTerm(searcher, startSet)
 		if cTerm.Retrieve == nil {
 			if cTerm.Match == nil {
 				// no restriction on match/retrieve -> all will match
-				return Compiled{
-					PreMatch: preMatch,
-					Terms: []CompiledTerm{{
-						Match:    matchAlways,
-						Retrieve: alwaysIncluded,
-					}}}
-			}
-			cTerm.Retrieve = alwaysIncluded
+				result.Terms = []CompiledTerm{{
+					Match:    matchAlways,
+					Retrieve: AlwaysIncluded,
+				}}
+				break
+			}
+			cTerm.Retrieve = AlwaysIncluded
 		}
 		if cTerm.Match == nil {
 			cTerm.Match = matchAlways
 		}
 		result.Terms = append(result.Terms, cTerm)
 	}
 	return result
 }
 
-func (ct *conjTerms) retrievAndCompileTerm(searcher Searcher) CompiledTerm {
+func metaList2idSet(ml []*meta.Meta) id.Set {
+	if ml == nil {
+		return nil
+	}
+	result := id.NewSetCap(len(ml))
+	for _, m := range ml {
+		result = result.Add(m.Zid)
+	}
+	return result
+}
+
+func (ct *conjTerms) retrieveAndCompileTerm(searcher Searcher, startSet id.Set) CompiledTerm {
 	match := ct.compileMeta() // Match might add some searches
 	var pred RetrievePredicate
 	if searcher != nil {
 		pred = ct.retrieveIndex(searcher)
+		if startSet != nil {
+			if pred == nil {
+				pred = startSet.ContainsOrNil
+			} else {
+				predSet := id.NewSetCap(len(startSet))
+				for zid := range startSet {
+					if pred(zid) {
+						predSet = predSet.Add(zid)
+					}
+				}
+				pred = predSet.ContainsOrNil
+			}
+		}
 	}
 	return CompiledTerm{Match: match, Retrieve: pred}
 }
 
 // retrieveIndex and return a predicate to ask for results.
@@ -363,113 +442,31 @@
 	positives := retrievePositives(normCalls, plainCalls)
 	if positives == nil {
 		// No positive search for words, must contain only words for a negative search.
 		// Otherwise len(search) == 0 (see above)
 		negatives := retrieveNegatives(negCalls)
-		return func(zid id.Zid) bool { return !negatives.Contains(zid) }
+		return func(zid id.Zid) bool { return !negatives.ContainsOrNil(zid) }
 	}
 	if len(positives) == 0 {
 		// Positive search didn't found anything. We can omit the negative search.
 		return neverIncluded
 	}
 	if len(negCalls) == 0 {
 		// Positive search found something, but there is no negative search.
-		return positives.Contains
+		return positives.ContainsOrNil
 	}
 	negatives := retrieveNegatives(negCalls)
-	return func(zid id.Zid) bool {
-		return positives.Contains(zid) && !negatives.Contains(zid)
-	}
-}
-
-// AfterSearch applies all terms to the metadata list that was searched.
-//
-// This includes sorting, offset, limit, and picking.
-func (q *Query) AfterSearch(metaList []*meta.Meta) []*meta.Meta {
-	if len(metaList) == 0 {
-		return metaList
-	}
-
-	if q == nil {
-		sort.Slice(metaList, func(i, j int) bool { return metaList[i].Zid > metaList[j].Zid })
-		return metaList
-	}
-
-	metaList = q.doPick(metaList)
-
-	if len(q.order) == 0 {
-		if q.pick <= 0 {
-			sort.Slice(metaList, func(i, j int) bool { return metaList[i].Zid > metaList[j].Zid })
-		}
-	} else if q.order[0].isRandom() {
-		metaList = q.sortRandomly(metaList)
-	} else {
-		sort.Slice(metaList, createSortFunc(q.order, metaList))
-	}
-
-	if q.offset > 0 {
-		if q.offset > len(metaList) {
-			return nil
-		}
-		metaList = metaList[q.offset:]
-	}
-	return q.Limit(metaList)
-}
-
-func (q *Query) setSeed() {
-	if q != nil && q.seed <= 0 {
-		q.seed = int(rand.Intn(10000) + 1)
-	}
-}
-
-func (q *Query) doPick(metaList []*meta.Meta) []*meta.Meta {
-	pick := q.pick
-	if pick <= 0 {
-		return metaList
-	}
-	if limit := q.limit; limit > 0 && limit < pick {
-		pick = limit
-	}
-	if pick >= len(metaList) && len(q.order) == 0 {
-		return q.sortRandomly(metaList)
-	}
-	return q.doPickN(metaList, pick)
-}
-func (q *Query) doPickN(metaList []*meta.Meta, pick int) []*meta.Meta {
-	q.setSeed()
-	rnd := rand.New(rand.NewSource(int64(q.seed)))
-	result := make([]*meta.Meta, pick)
-	for i := 0; i < pick; i++ {
-		n := rnd.Intn(pick - i)
-		result[i] = metaList[n]
-		metaList[n] = metaList[len(metaList)-i-1]
-		metaList[len(metaList)-i-1] = nil
-	}
-	return result
-}
-
-func (q *Query) sortRandomly(metaList []*meta.Meta) []*meta.Meta {
-	// Optimization: RANDOM LIMIT n, where n < len(metaList) is essentially a PICK n.
-	if limit := q.limit; limit > 0 && limit < len(metaList) {
-		return q.doPickN(metaList, limit)
-	}
-
-	sort.Slice(metaList, func(i, j int) bool { return metaList[i].Zid > metaList[j].Zid })
-	q.setSeed()
-	rnd := rand.New(rand.NewSource(int64(q.seed)))
-	rnd.Shuffle(
-		len(metaList),
-		func(i, j int) { metaList[i], metaList[j] = metaList[j], metaList[i] },
-	)
-	return metaList
+	if negatives == nil {
+		return positives.ContainsOrNil
+	}
+	return func(zid id.Zid) bool {
+		return positives.ContainsOrNil(zid) && !negatives.ContainsOrNil(zid)
+	}
 }
 
 // Limit returns only s.GetLimit() elements of the given list.
 func (q *Query) Limit(metaList []*meta.Meta) []*meta.Meta {
 	if q == nil {
 		return metaList
 	}
-	if limit := q.limit; limit > 0 && limit < len(metaList) {
-		return metaList[:limit]
-	}
-	return metaList
+	return limitElements(metaList, q.limit)
 }

Index: query/retrieve.go
==================================================================
--- query/retrieve.go
+++ query/retrieve.go
@@ -14,12 +14,12 @@
 
 import (
 	"fmt"
 	"strings"
 
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
 )
 
 type searchOp struct {
 	s  string
 	op compareOp
@@ -26,14 +26,17 @@
 }
 type searchFunc func(string) id.Set
 type searchCallMap map[searchOp]searchFunc
 
 var cmpPred = map[compareOp]func(string, string) bool{
-	cmpHas:    func(s, t string) bool { return s == t },
-	cmpPrefix: strings.HasPrefix,
-	cmpSuffix: strings.HasSuffix,
-	cmpMatch:  strings.Contains,
+	cmpEqual:   stringEqual,
+	cmpPrefix:  strings.HasPrefix,
+	cmpSuffix:  strings.HasSuffix,
+	cmpMatch:   strings.Contains,
+	cmpHas:     strings.Contains, // the "has" operator have string semantics here in a index search
+	cmpLess:    strings.Contains, // in index search there is no "less", only "has"
+	cmpGreater: strings.Contains, // in index search there is no "greater", only "has"
 }
 
 func (scm searchCallMap) addSearch(s string, op compareOp, sf searchFunc) {
 	pred := cmpPred[op]
 	for k := range scm {
@@ -57,13 +60,10 @@
 		}
 	}
 	scm[searchOp{s: s, op: op}] = sf
 }
 
-func alwaysIncluded(id.Zid) bool { return true }
-func neverIncluded(id.Zid) bool  { return false }
-
 func prepareRetrieveCalls(searcher Searcher, search []expValue) (normCalls, plainCalls, negCalls searchCallMap) {
 	normCalls = make(searchCallMap, len(search))
 	negCalls = make(searchCallMap, len(search))
 	for _, val := range search {
 		for _, word := range strfun.NormalizeWords(val.value) {
@@ -131,11 +131,11 @@
 				continue
 			}
 		}
 		normResult = normResult.IntersectOrSet(sf(c.s))
 	}
-	return normResult.Add(plainResult)
+	return normResult.Copy(plainResult)
 }
 
 func isSuperset(normCalls, plainCalls searchCallMap) bool {
 	for c := range plainCalls {
 		if _, found := normCalls[c]; !found {
@@ -146,24 +146,24 @@
 }
 
 func retrieveNegatives(negCalls searchCallMap) id.Set {
 	var negatives id.Set
 	for val, sf := range negCalls {
-		negatives = negatives.Add(sf(val.s))
+		negatives = negatives.Copy(sf(val.s))
 	}
 	return negatives
 }
 
 func getSearchFunc(searcher Searcher, op compareOp) searchFunc {
 	switch op {
-	case cmpHas:
+	case cmpEqual:
 		return searcher.SearchEqual
 	case cmpPrefix:
 		return searcher.SearchPrefix
 	case cmpSuffix:
 		return searcher.SearchSuffix
-	case cmpMatch:
+	case cmpMatch, cmpHas, cmpLess, cmpGreater: // for index search we assume string semantics
 		return searcher.SearchContains
 	default:
 		panic(fmt.Sprintf("Unexpected value of comparison operation: %v", op))
 	}
 }

Index: query/select.go
==================================================================
--- query/select.go
+++ query/select.go
@@ -10,17 +10,18 @@
 
 package query
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 	"unicode/utf8"
 
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder/textenc"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type matchValueFunc func(value string) bool
 
 func matchValueNever(string) bool { return false }
@@ -30,13 +31,17 @@
 	match matchValueFunc
 }
 
 // compileMeta calculates a selection func based on the given select criteria.
 func (ct *conjTerms) compileMeta() MetaMatchFunc {
-	for key := range ct.mvals {
-		// All queried keys must exist
-		ct.addKey(key, cmpExist)
+	for key, vals := range ct.mvals {
+		// All queried keys must exist, if there is at least one non-negated compare operation
+		//
+		// This is only an optimization to make selection of metadata faster.
+		if countNegatedOps(vals) < len(vals) {
+			ct.addKey(key, cmpExist)
+		}
 	}
 	for _, op := range ct.keys {
 		if op != cmpExist && op != cmpNotExist {
 			return matchNever
 		}
@@ -45,10 +50,20 @@
 	if len(posSpecs) > 0 || len(negSpecs) > 0 || len(ct.keys) > 0 {
 		return makeSearchMetaMatchFunc(posSpecs, negSpecs, ct.keys)
 	}
 	return nil
 }
+
+func countNegatedOps(vals []expValue) int {
+	count := 0
+	for _, val := range vals {
+		if val.op.isNegated() {
+			count++
+		}
+	}
+	return count
+}
 
 func (ct *conjTerms) createSelectSpecs() (posSpecs, negSpecs []matchSpec) {
 	posSpecs = make([]matchSpec, 0, len(ct.mvals))
 	negSpecs = make([]matchSpec, 0, len(ct.mvals))
 	for key, values := range ct.mvals {
@@ -92,28 +107,32 @@
 		return nil
 	}
 	switch meta.Type(key) {
 	case meta.TypeCredential:
 		return matchValueNever
-	case meta.TypeID, meta.TypeTimestamp: // ID and timestamp use the same layout
+	case meta.TypeID:
 		return createMatchIDFunc(values, addSearch)
 	case meta.TypeIDSet:
 		return createMatchIDSetFunc(values, addSearch)
+	case meta.TypeTimestamp:
+		return createMatchTimestampFunc(values, addSearch)
+	case meta.TypeNumber:
+		return createMatchNumberFunc(values, addSearch)
 	case meta.TypeTagSet:
 		return createMatchTagSetFunc(values, addSearch)
 	case meta.TypeWord:
-		return createMatchWordOrStringFunc(values, addSearch)
+		return createMatchWordFunc(values, addSearch)
 	case meta.TypeWordSet:
 		return createMatchWordSetFunc(values, addSearch)
 	case meta.TypeZettelmarkup:
 		return createMatchZmkFunc(values, addSearch)
 	}
-	return createMatchWordOrStringFunc(values, addSearch)
+	return createMatchStringFunc(values, addSearch)
 }
 
 func createMatchIDFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
-	preds := valuesToStringPredicates(values, addSearch)
+	preds := valuesToIDPredicates(values, addSearch)
 	return func(value string) bool {
 		for _, pred := range preds {
 			if !pred(value) {
 				return false
 			}
@@ -121,11 +140,11 @@
 		return true
 	}
 }
 
 func createMatchIDSetFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
-	predList := valuesToStringSetPredicates(preprocessSet(values), addSearch)
+	predList := valuesToWordSetPredicates(preprocessSet(values), addSearch)
 	return func(value string) bool {
 		ids := meta.ListFromValue(value)
 		for _, preds := range predList {
 			for _, pred := range preds {
 				if !pred(ids) {
@@ -134,19 +153,39 @@
 			}
 		}
 		return true
 	}
 }
+func createMatchTimestampFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
+	preds := valuesToTimestampPredicates(values, addSearch)
+	return func(value string) bool {
+		value = meta.ExpandTimestamp(value)
+		for _, pred := range preds {
+			if !pred(value) {
+				return false
+			}
+		}
+		return true
+	}
+}
+
+func createMatchNumberFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
+	preds := valuesToNumberPredicates(values, addSearch)
+	return func(value string) bool {
+		for _, pred := range preds {
+			if !pred(value) {
+				return false
+			}
+		}
+		return true
+	}
+}
 
 func createMatchTagSetFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
-	predList := valuesToStringSetPredicates(processTagSet(preprocessSet(sliceToLower(values))), addSearch)
+	predList := valuesToWordSetPredicates(processTagSet(preprocessSet(sliceToLower(values))), addSearch)
 	return func(value string) bool {
-		tags := meta.ListFromValue(value)
-		// Remove leading '#' from each tag
-		for i, tag := range tags {
-			tags[i] = meta.CleanTag(tag)
-		}
+		tags := meta.TagsFromValue(value)
 		for _, preds := range predList {
 			for _, pred := range preds {
 				if !pred(tags) {
 					return false
 				}
@@ -171,11 +210,24 @@
 		result[i] = tags
 	}
 	return result
 }
 
-func createMatchWordOrStringFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
+func createMatchWordFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
+	preds := valuesToWordPredicates(sliceToLower(values), addSearch)
+	return func(value string) bool {
+		value = strings.ToLower(value)
+		for _, pred := range preds {
+			if !pred(value) {
+				return false
+			}
+		}
+		return true
+	}
+}
+
+func createMatchStringFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
 	preds := valuesToStringPredicates(sliceToLower(values), addSearch)
 	return func(value string) bool {
 		value = strings.ToLower(value)
 		for _, pred := range preds {
 			if !pred(value) {
@@ -185,11 +237,11 @@
 		return true
 	}
 }
 
 func createMatchWordSetFunc(values []expValue, addSearch addSearchFunc) matchValueFunc {
-	predsList := valuesToStringSetPredicates(preprocessSet(sliceToLower(values)), addSearch)
+	predsList := valuesToWordSetPredicates(preprocessSet(sliceToLower(values)), addSearch)
 	return func(value string) bool {
 		words := meta.ListFromValue(value)
 		for _, preds := range predsList {
 			for _, pred := range preds {
 				if !pred(words) {
@@ -217,13 +269,13 @@
 	negPreds := make([]stringPredicate, 0, len(values))
 	for _, v := range values {
 		for _, word := range strfun.NormalizeWords(v.value) {
 			if cmpOp := v.op; cmpOp.isNegated() {
 				cmpOp = cmpOp.negate()
-				negPreds = append(negPreds, createStringCompareFunc(word, cmpOp))
+				negPreds = append(negPreds, createWordCompareFunc(word, cmpOp))
 			} else {
-				normPreds = append(normPreds, createStringCompareFunc(word, cmpOp))
+				normPreds = append(normPreds, createWordCompareFunc(word, cmpOp))
 				addSearch(expValue{word, cmpOp}) // addSearch only for positive selections
 			}
 		}
 	}
 	return func(metaValue string) bool {
@@ -301,27 +353,191 @@
 	}
 	return result
 }
 
 type stringPredicate func(string) bool
+
+func valuesToIDPredicates(values []expValue, addSearch addSearchFunc) []stringPredicate {
+	result := make([]stringPredicate, len(values))
+	for i, v := range values {
+		value := v.value
+		if len(value) > 14 {
+			value = value[:14]
+		}
+		switch op := disambiguatedIDOp(v.op); op {
+		case cmpLess, cmpNoLess, cmpGreater, cmpNoGreater:
+			if isDigits(value) {
+				// Never add the strValue to search.
+				// Append enough zeroes to make it comparable as string.
+				// (an ID and a timestamp always have 14 digits)
+				strValue := value + "00000000000000"[:14-len(value)]
+				result[i] = createIDCompareFunc(strValue, op)
+				continue
+			}
+			fallthrough
+		default:
+			// Otherwise compare as a word.
+			if !op.isNegated() {
+				addSearch(v) // addSearch only for positive selections
+			}
+			result[i] = createWordCompareFunc(value, op)
+		}
+	}
+	return result
+}
+
+func isDigits(s string) bool {
+	for i := 0; i < len(s); i++ {
+		if ch := s[i]; ch < '0' || '9' < ch {
+			return false
+		}
+	}
+	return true
+}
+
+func disambiguatedIDOp(cmpOp compareOp) compareOp { return disambiguateWordOp(cmpOp) }
+
+func createIDCompareFunc(cmpVal string, cmpOp compareOp) stringPredicate {
+	return createWordCompareFunc(cmpVal, cmpOp)
+}
+
+func valuesToTimestampPredicates(values []expValue, addSearch addSearchFunc) []stringPredicate {
+	result := make([]stringPredicate, len(values))
+	for i, v := range values {
+		value := meta.ExpandTimestamp(v.value)
+		switch op := disambiguatedTimestampOp(v.op); op {
+		case cmpLess, cmpNoLess, cmpGreater, cmpNoGreater:
+			if isDigits(value) {
+				// Never add the value to search.
+				result[i] = createTimestampCompareFunc(value, op)
+				continue
+			}
+			fallthrough
+		default:
+			// Otherwise compare as a word.
+			if !op.isNegated() {
+				addSearch(v) // addSearch only for positive selections
+			}
+			result[i] = createWordCompareFunc(value, op)
+		}
+	}
+	return result
+}
+
+func disambiguatedTimestampOp(cmpOp compareOp) compareOp { return disambiguateWordOp(cmpOp) }
+
+func createTimestampCompareFunc(cmpVal string, cmpOp compareOp) stringPredicate {
+	return createWordCompareFunc(cmpVal, cmpOp)
+}
+
+func valuesToNumberPredicates(values []expValue, addSearch addSearchFunc) []stringPredicate {
+	result := make([]stringPredicate, len(values))
+	for i, v := range values {
+		switch op := disambiguatedNumberOp(v.op); op {
+		case cmpEqual, cmpNotEqual, cmpLess, cmpNoLess, cmpGreater, cmpNoGreater:
+			iValue, err := strconv.ParseInt(v.value, 10, 64)
+			if err == nil {
+				// Never add the strValue to search.
+				result[i] = createNumberCompareFunc(iValue, op)
+				continue
+			}
+			fallthrough
+		default:
+			// In all other cases, a number is treated like a word.
+			if !op.isNegated() {
+				addSearch(v) // addSearch only for positive selections
+			}
+			result[i] = createWordCompareFunc(v.value, op)
+		}
+	}
+	return result
+}
+
+func disambiguatedNumberOp(cmpOp compareOp) compareOp { return disambiguateWordOp(cmpOp) }
+
+func createNumberCompareFunc(cmpVal int64, cmpOp compareOp) stringPredicate {
+	var cmpFunc func(int64) bool
+	switch cmpOp {
+	case cmpEqual:
+		cmpFunc = func(iMetaVal int64) bool { return iMetaVal == cmpVal }
+	case cmpNotEqual:
+		cmpFunc = func(iMetaVal int64) bool { return iMetaVal != cmpVal }
+	case cmpLess:
+		cmpFunc = func(iMetaVal int64) bool { return iMetaVal < cmpVal }
+	case cmpNoLess:
+		cmpFunc = func(iMetaVal int64) bool { return iMetaVal >= cmpVal }
+	case cmpGreater:
+		cmpFunc = func(iMetaVal int64) bool { return iMetaVal > cmpVal }
+	case cmpNoGreater:
+		cmpFunc = func(iMetaVal int64) bool { return iMetaVal <= cmpVal }
+	default:
+		panic(fmt.Sprintf("Unknown compare operation %d with value %q", cmpOp, cmpVal))
+	}
+	return func(metaVal string) bool {
+		iMetaVal, err := strconv.ParseInt(metaVal, 10, 64)
+		if err != nil {
+			return false
+		}
+		return cmpFunc(iMetaVal)
+	}
+}
 
 func valuesToStringPredicates(values []expValue, addSearch addSearchFunc) []stringPredicate {
 	result := make([]stringPredicate, len(values))
 	for i, v := range values {
-		if !v.op.isNegated() {
+		op := disambiguatedStringOp(v.op)
+		if !op.isNegated() {
+			addSearch(v) // addSearch only for positive selections
+		}
+		result[i] = createStringCompareFunc(v.value, op)
+	}
+	return result
+}
+
+func disambiguatedStringOp(cmpOp compareOp) compareOp {
+	switch cmpOp {
+	case cmpHas:
+		return cmpMatch
+	case cmpHasNot:
+		return cmpNoMatch
+	default:
+		return cmpOp
+	}
+}
+
+func createStringCompareFunc(cmpVal string, cmpOp compareOp) stringPredicate {
+	return createWordCompareFunc(cmpVal, cmpOp)
+}
+
+func valuesToWordPredicates(values []expValue, addSearch addSearchFunc) []stringPredicate {
+	result := make([]stringPredicate, len(values))
+	for i, v := range values {
+		op := disambiguateWordOp(v.op)
+		if !op.isNegated() {
 			addSearch(v) // addSearch only for positive selections
 		}
-		result[i] = createStringCompareFunc(v.value, v.op)
+		result[i] = createWordCompareFunc(v.value, op)
 	}
 	return result
 }
 
-func createStringCompareFunc(cmpVal string, cmpOp compareOp) stringPredicate {
+func disambiguateWordOp(cmpOp compareOp) compareOp {
 	switch cmpOp {
 	case cmpHas:
-		return func(metaVal string) bool { return metaVal == cmpVal }
+		return cmpEqual
 	case cmpHasNot:
+		return cmpNotEqual
+	default:
+		return cmpOp
+	}
+}
+
+func createWordCompareFunc(cmpVal string, cmpOp compareOp) stringPredicate {
+	switch cmpOp {
+	case cmpEqual:
+		return func(metaVal string) bool { return metaVal == cmpVal }
+	case cmpNotEqual:
 		return func(metaVal string) bool { return metaVal != cmpVal }
 	case cmpPrefix:
 		return func(metaVal string) bool { return strings.HasPrefix(metaVal, cmpVal) }
 	case cmpNoPrefix:
 		return func(metaVal string) bool { return !strings.HasPrefix(metaVal, cmpVal) }
@@ -331,54 +547,72 @@
 		return func(metaVal string) bool { return !strings.HasSuffix(metaVal, cmpVal) }
 	case cmpMatch:
 		return func(metaVal string) bool { return strings.Contains(metaVal, cmpVal) }
 	case cmpNoMatch:
 		return func(metaVal string) bool { return !strings.Contains(metaVal, cmpVal) }
+	case cmpLess:
+		return func(metaVal string) bool { return metaVal < cmpVal }
+	case cmpNoLess:
+		return func(metaVal string) bool { return metaVal >= cmpVal }
+	case cmpGreater:
+		return func(metaVal string) bool { return metaVal > cmpVal }
+	case cmpNoGreater:
+		return func(metaVal string) bool { return metaVal <= cmpVal }
+	case cmpHas, cmpHasNot:
+		panic(fmt.Sprintf("operator %d not disambiguated with value %q", cmpOp, cmpVal))
 	default:
 		panic(fmt.Sprintf("Unknown compare operation %d with value %q", cmpOp, cmpVal))
 	}
 }
 
 type stringSetPredicate func(value []string) bool
 
-func valuesToStringSetPredicates(values [][]expValue, addSearch addSearchFunc) [][]stringSetPredicate {
+func valuesToWordSetPredicates(values [][]expValue, addSearch addSearchFunc) [][]stringSetPredicate {
 	result := make([][]stringSetPredicate, len(values))
 	for i, val := range values {
 		elemPreds := make([]stringSetPredicate, len(val))
 		for j, v := range val {
 			opVal := v.value // loop variable is used in closure --> save needed value
-			switch v.op {
-			case cmpHas:
+			switch op := disambiguateWordOp(v.op); op {
+			case cmpEqual:
 				addSearch(v) // addSearch only for positive selections
-				elemPreds[j] = makeStringSetPredicate(opVal, stringEqual, true)
-			case cmpHasNot:
-				elemPreds[j] = makeStringSetPredicate(opVal, stringEqual, false)
+				fallthrough
+			case cmpNotEqual:
+				elemPreds[j] = makeStringSetPredicate(opVal, stringEqual, op == cmpEqual)
 			case cmpPrefix:
 				addSearch(v)
-				elemPreds[j] = makeStringSetPredicate(opVal, strings.HasPrefix, true)
+				fallthrough
 			case cmpNoPrefix:
-				elemPreds[j] = makeStringSetPredicate(opVal, strings.HasPrefix, false)
+				elemPreds[j] = makeStringSetPredicate(opVal, strings.HasPrefix, op == cmpPrefix)
 			case cmpSuffix:
 				addSearch(v)
-				elemPreds[j] = makeStringSetPredicate(opVal, strings.HasSuffix, true)
+				fallthrough
 			case cmpNoSuffix:
-				elemPreds[j] = makeStringSetPredicate(opVal, strings.HasSuffix, false)
+				elemPreds[j] = makeStringSetPredicate(opVal, strings.HasSuffix, op == cmpSuffix)
 			case cmpMatch:
 				addSearch(v)
-				elemPreds[j] = makeStringSetPredicate(opVal, strings.Contains, true)
+				fallthrough
 			case cmpNoMatch:
-				elemPreds[j] = makeStringSetPredicate(opVal, strings.Contains, false)
+				elemPreds[j] = makeStringSetPredicate(opVal, strings.Contains, op == cmpMatch)
+			case cmpLess, cmpNoLess:
+				elemPreds[j] = makeStringSetPredicate(opVal, stringLess, op == cmpLess)
+			case cmpGreater, cmpNoGreater:
+				elemPreds[j] = makeStringSetPredicate(opVal, stringGreater, op == cmpGreater)
+			case cmpHas, cmpHasNot:
+				panic(fmt.Sprintf("operator %d not disambiguated with value %q", op, opVal))
 			default:
-				panic(fmt.Sprintf("Unknown compare operation %d with value %q", v.op, opVal))
+				panic(fmt.Sprintf("Unknown compare operation %d with value %q", op, opVal))
 			}
 		}
 		result[i] = elemPreds
 	}
 	return result
 }
 
-func stringEqual(val1, val2 string) bool { return val1 == val2 }
+func stringEqual(val1, val2 string) bool   { return val1 == val2 }
+func stringLess(val1, val2 string) bool    { return val1 < val2 }
+func stringGreater(val1, val2 string) bool { return val1 > val2 }
 
 type compareStringFunc func(val1, val2 string) bool
 
 func makeStringSetPredicate(neededValue string, compare compareStringFunc, foundResult bool) stringSetPredicate {
 	return func(metaVals []string) bool {

Index: query/select_test.go
==================================================================
--- query/select_test.go
+++ query/select_test.go
@@ -9,21 +9,22 @@
 //-----------------------------------------------------------------------------
 
 package query_test
 
 import (
+	"context"
 	"testing"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func TestMatchZidNegate(t *testing.T) {
 	q := query.Parse(api.KeyID + api.SearchOperatorHasNot + string(api.ZidVersion) + " " + api.KeyID + api.SearchOperatorHasNot + string(api.ZidLicense))
-	compiled := q.RetrieveAndCompile(nil)
+	compiled := q.RetrieveAndCompile(context.Background(), nil, nil)
 
 	testCases := []struct {
 		zid api.ZettelID
 		exp bool
 	}{

Index: query/sorter.go
==================================================================
--- query/sorter.go
+++ query/sorter.go
@@ -11,12 +11,12 @@
 package query
 
 import (
 	"strconv"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type sortFunc func(i, j int) bool
 
 func createSortFunc(order []sortOrder, ml []*meta.Meta) sortFunc {
@@ -55,15 +55,33 @@
 		if descending {
 			return func(i, j int) bool { return ml[i].Zid > ml[j].Zid }
 		}
 		return func(i, j int) bool { return ml[i].Zid < ml[j].Zid }
 	}
+	if keyType == meta.TypeTimestamp {
+		return createSortTimestampFunc(ml, key, descending)
+	}
 	if keyType == meta.TypeNumber {
 		return createSortNumberFunc(ml, key, descending)
 	}
 	return createSortStringFunc(ml, key, descending)
 }
+
+func createSortTimestampFunc(ml []*meta.Meta, key string, descending bool) sortFunc {
+	if descending {
+		return func(i, j int) bool {
+			iVal, iOk := ml[i].Get(key)
+			jVal, jOk := ml[j].Get(key)
+			return (iOk && (!jOk || meta.ExpandTimestamp(iVal) > meta.ExpandTimestamp(jVal))) || !jOk
+		}
+	}
+	return func(i, j int) bool {
+		iVal, iOk := ml[i].Get(key)
+		jVal, jOk := ml[j].Get(key)
+		return (iOk && (!jOk || meta.ExpandTimestamp(iVal) < meta.ExpandTimestamp(jVal))) || !jOk
+	}
+}
 
 func createSortNumberFunc(ml []*meta.Meta, key string, descending bool) sortFunc {
 	if descending {
 		return func(i, j int) bool {
 			iVal, iOk := getNum(ml[i], key)
@@ -75,10 +93,19 @@
 		iVal, iOk := getNum(ml[i], key)
 		jVal, jOk := getNum(ml[j], key)
 		return (iOk && (!jOk || iVal < jVal)) || !jOk
 	}
 }
+
+func getNum(m *meta.Meta, key string) (int64, bool) {
+	if s, ok := m.Get(key); ok {
+		if i, err := strconv.ParseInt(s, 10, 64); err == nil {
+			return i, true
+		}
+	}
+	return 0, false
+}
 
 func createSortStringFunc(ml []*meta.Meta, key string, descending bool) sortFunc {
 	if descending {
 		return func(i, j int) bool {
 			iVal, iOk := ml[i].Get(key)
@@ -90,14 +117,5 @@
 		iVal, iOk := ml[i].Get(key)
 		jVal, jOk := ml[j].Get(key)
 		return (iOk && (!jOk || iVal < jVal)) || !jOk
 	}
 }
-
-func getNum(m *meta.Meta, key string) (int64, bool) {
-	if s, ok := m.Get(key); ok {
-		if i, err := strconv.ParseInt(s, 10, 64); err == nil {
-			return i, true
-		}
-	}
-	return 0, false
-}

ADDED   query/specs.go
Index: query/specs.go
==================================================================
--- query/specs.go
+++ query/specs.go
@@ -0,0 +1,29 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package query
+
+import "zettelstore.de/client.fossil/api"
+
+// IdentSpec contains all specification values to calculate the ident directive.
+type IdentSpec struct{}
+
+func (spec *IdentSpec) Print(pe *PrintEnv) {
+	pe.printSpace()
+	pe.writeString(api.IdentDirective)
+}
+
+// ItemsSpec contains all specification values to calculate items.
+type ItemsSpec struct{}
+
+func (spec *ItemsSpec) Print(pe *PrintEnv) {
+	pe.printSpace()
+	pe.writeString(api.ItemsDirective)
+}

ADDED   query/unlinked.go
Index: query/unlinked.go
==================================================================
--- query/unlinked.go
+++ query/unlinked.go
@@ -0,0 +1,47 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package query
+
+import (
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// UnlinkedSpec contains all specification values to calculate unlinked references.
+type UnlinkedSpec struct {
+	words []string
+}
+
+func (spec *UnlinkedSpec) Print(pe *PrintEnv) {
+	pe.printSpace()
+	pe.writeString(api.UnlinkedDirective)
+	for _, word := range spec.words {
+		pe.writeStrings(" ", api.PhraseDirective, " ", word)
+	}
+}
+
+func (spec *UnlinkedSpec) GetWords(metaSeq []*meta.Meta) []string {
+	if words := spec.words; len(words) > 0 {
+		result := make([]string, len(words))
+		copy(result, words)
+		return result
+	}
+	result := make([]string, 0, len(metaSeq)*4) // Assumption: four words per title
+	for _, m := range metaSeq {
+		title, hasTitle := m.Get(api.KeyTitle)
+		if !hasTitle {
+			continue
+		}
+		result = append(result, strfun.MakeWords(title)...)
+	}
+	return result
+}

Index: strfun/strfun.go
==================================================================
--- strfun/strfun.go
+++ strfun/strfun.go
@@ -11,10 +11,11 @@
 // Package strfun provides some string functions.
 package strfun
 
 import (
 	"strings"
+	"unicode"
 	"unicode/utf8"
 )
 
 // Length returns the number of runes in the given string.
 func Length(s string) int {
@@ -49,5 +50,13 @@
 func SplitLines(s string) []string {
 	return strings.FieldsFunc(s, func(r rune) bool {
 		return r == '\n' || r == '\r'
 	})
 }
+
+// MakeWords produces a list of words, i.e. string that were separated by
+// control character, space characters, or separator characters.
+func MakeWords(text string) []string {
+	return strings.FieldsFunc(text, func(r rune) bool {
+		return unicode.In(r, unicode.C, unicode.P, unicode.Z)
+	})
+}

DELETED template/LICENSE
Index: template/LICENSE
==================================================================
--- template/LICENSE
+++ template/LICENSE
@@ -1,19 +0,0 @@
-Copyright (c) 2009 Michael Hoisie
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

DELETED template/mustache.go
Index: template/mustache.go
==================================================================
--- template/mustache.go
+++ template/mustache.go
@@ -1,712 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//
-// This file was derived from previous work:
-// - https://github.com/hoisie/mustache (License: MIT)
-//   Copyright (c) 2009 Michael Hoisie
-// - https://github.com/cbroglie/mustache (a fork from above code)
-//   Starting with commit [f9b4cbf]
-//   Does not have an explicit copyright and obviously continues with
-//   above MIT license.
-// The license text is included in the same directory where this file is
-// located. See file LICENSE.
-//-----------------------------------------------------------------------------
-
-// Package template implements the Mustache templating language.
-package template
-
-import (
-	"fmt"
-	"io"
-	"reflect"
-	"regexp"
-	"strings"
-
-	"codeberg.org/t73fde/sxhtml"
-	"codeberg.org/t73fde/sxpf"
-)
-
-// Node represents a node in the parse tree.
-// It is either a Tag or a textNode.
-type node interface {
-	node()
-}
-
-// Tag represents the different mustache tag types.
-//
-// Not all methods apply to all kinds of tags. Restrictions, if any, are noted
-// in the documentation for each method. Use the Type method to find out the
-// type of tag before calling type-specific methods. Calling a method
-// inappropriate to the type of tag causes a run time panic.
-type Tag interface {
-	node
-
-	// Type returns the type of the tag.
-	Type() TagType
-	// Name returns the name of the tag.
-	Name() string
-	// Tags returns any child tags. It panics for tag types which cannot contain
-	// child tags (i.e. variable tags).
-	Tags() []Tag
-}
-
-// A TagType represents the specific type of mustache tag that a Tag
-// represents. The zero TagType is not a valid type.
-type TagType uint
-
-// Defines representing the possible Tag types
-const (
-	Invalid TagType = iota
-	Variable
-	Section
-	InvertedSection
-	Partial
-)
-
-type varNode struct {
-	name string
-	raw  bool
-}
-
-func (*varNode) node()          {}
-func (*varNode) Type() TagType  { return Variable }
-func (e *varNode) Name() string { return e.name }
-func (*varNode) Tags() []Tag    { panic("mustache: Tags on Variable type") }
-
-type sectionNode struct {
-	name      string
-	inverted  bool
-	startline int
-	nodes     []node
-}
-
-func (*sectionNode) node() {}
-func (e *sectionNode) Type() TagType {
-	if e.inverted {
-		return InvertedSection
-	}
-	return Section
-}
-func (e *sectionNode) Name() string { return e.name }
-func (e *sectionNode) Tags() []Tag  { return extractTags(e.nodes) }
-
-type partialNode struct {
-	name   string
-	indent string
-	prov   PartialProvider
-}
-
-func (*partialNode) node()          {}
-func (*partialNode) Type() TagType  { return Partial }
-func (e *partialNode) Name() string { return e.name }
-func (*partialNode) Tags() []Tag    { return nil }
-
-type textNode struct {
-	text []byte
-}
-
-func (*textNode) node() {}
-
-// Template represents a compiled mustache template
-type Template struct {
-	data    string
-	otag    string
-	ctag    string
-	p       int
-	curline int
-	nodes   []node
-	partial PartialProvider
-	errmiss bool // Error when variable is not found?
-}
-
-type parseError struct {
-	line    int
-	message string
-}
-
-func (p parseError) Error() string { return fmt.Sprintf("line %d: %s", p.line, p.message) }
-
-// Tags returns the mustache tags for the given template
-func (tmpl *Template) Tags() []Tag {
-	return extractTags(tmpl.nodes)
-}
-
-func extractTags(nodes []node) []Tag {
-	tags := make([]Tag, 0, len(nodes))
-	for _, elem := range nodes {
-		switch elem := elem.(type) {
-		case *varNode:
-			tags = append(tags, elem)
-		case *sectionNode:
-			tags = append(tags, elem)
-		case *partialNode:
-			tags = append(tags, elem)
-		}
-	}
-	return tags
-}
-
-func (tmpl *Template) readString(s string) (string, error) {
-	newlines := 0
-	for i := tmpl.p; ; i++ {
-		//are we at the end of the string?
-		if i+len(s) > len(tmpl.data) {
-			return tmpl.data[tmpl.p:], io.EOF
-		}
-
-		if tmpl.data[i] == '\n' {
-			newlines++
-		}
-
-		if tmpl.data[i] != s[0] {
-			continue
-		}
-
-		match := true
-		for j := 1; j < len(s); j++ {
-			if s[j] != tmpl.data[i+j] {
-				match = false
-				break
-			}
-		}
-		if match {
-			e := i + len(s)
-			text := tmpl.data[tmpl.p:e]
-			tmpl.p = e
-
-			tmpl.curline += newlines
-			return text, nil
-		}
-	}
-}
-
-type textReadingResult struct {
-	text          string
-	padding       string
-	mayStandalone bool
-}
-
-func (tmpl *Template) readText() (*textReadingResult, error) {
-	pPrev := tmpl.p
-	text, err := tmpl.readString(tmpl.otag)
-	if err == io.EOF {
-		return &textReadingResult{
-			text:          text,
-			padding:       "",
-			mayStandalone: false,
-		}, err
-	}
-	i := tmpl.p - len(tmpl.otag)
-	for ; i > pPrev; i-- {
-		if tmpl.data[i-1] != ' ' && tmpl.data[i-1] != '\t' {
-			break
-		}
-	}
-
-	if i == 0 || tmpl.data[i-1] == '\n' {
-		return &textReadingResult{
-			text:          tmpl.data[pPrev:i],
-			padding:       tmpl.data[i : tmpl.p-len(tmpl.otag)],
-			mayStandalone: true,
-		}, nil
-	}
-
-	return &textReadingResult{
-		text:          tmpl.data[pPrev : tmpl.p-len(tmpl.otag)],
-		padding:       "",
-		mayStandalone: false,
-	}, nil
-}
-
-type tagReadingResult struct {
-	tag        string
-	standalone bool
-}
-
-var skipWhitespaceTagTypes = map[byte]struct{}{
-	'#': {}, '^': {}, '/': {}, '<': {}, '>': {}, '=': {}, '!': {},
-}
-
-func (tmpl *Template) readTag(mayStandalone bool) (*tagReadingResult, error) {
-	var text string
-	var err error
-	if tmpl.p < len(tmpl.data) && tmpl.data[tmpl.p] == '{' {
-		text, err = tmpl.readString("}" + tmpl.ctag)
-	} else {
-		text, err = tmpl.readString(tmpl.ctag)
-	}
-
-	if err == io.EOF {
-		//put the remaining text in a block
-		return nil, parseError{tmpl.curline, "unmatched open tag"}
-	}
-
-	text = text[:len(text)-len(tmpl.ctag)]
-
-	//trim the close tag off the text
-	tag := strings.TrimSpace(text)
-	if tag == "" {
-		return nil, parseError{tmpl.curline, "empty tag"}
-	}
-
-	eow := tmpl.p
-	for i := tmpl.p; i < len(tmpl.data); i++ {
-		if !(tmpl.data[i] == ' ' || tmpl.data[i] == '\t') {
-			eow = i
-			break
-		}
-	}
-
-	standalone := tmpl.skipWhitespaceTag(tag, eow, mayStandalone)
-
-	return &tagReadingResult{
-		tag:        tag,
-		standalone: standalone,
-	}, nil
-}
-
-func (tmpl *Template) skipWhitespaceTag(tag string, eow int, mayStandalone bool) bool {
-	if !mayStandalone {
-		return true
-	}
-	// Skip all whitespaces apeared after these types of tags until end of line if
-	// the line only contains a tag and whitespaces.
-	if _, ok := skipWhitespaceTagTypes[tag[0]]; !ok {
-		return false
-	}
-	if eow == len(tmpl.data) {
-		tmpl.p = eow
-		return true
-	}
-	if eow < len(tmpl.data) && tmpl.data[eow] == '\n' {
-		tmpl.p = eow + 1
-		tmpl.curline++
-		return true
-	}
-	if eow+1 < len(tmpl.data) && tmpl.data[eow] == '\r' && tmpl.data[eow+1] == '\n' {
-		tmpl.p = eow + 2
-		tmpl.curline++
-		return true
-	}
-	return false
-}
-
-func (tmpl *Template) parsePartial(name, indent string) *partialNode {
-	return &partialNode{
-		name:   name,
-		indent: indent,
-		prov:   tmpl.partial,
-	}
-}
-
-func (tmpl *Template) parseSection(section *sectionNode) error {
-	for {
-		textResult, err := tmpl.readText()
-		text := textResult.text
-		padding := textResult.padding
-		mayStandalone := textResult.mayStandalone
-
-		if err == io.EOF {
-			//put the remaining text in a block
-			return parseError{section.startline, "Section " + section.name + " has no closing tag"}
-		}
-
-		// put text into an item
-		section.nodes = append(section.nodes, &textNode{[]byte(text)})
-
-		tagResult, err := tmpl.readTag(mayStandalone)
-		if err != nil {
-			return err
-		}
-
-		if !tagResult.standalone {
-			section.nodes = append(section.nodes, &textNode{[]byte(padding)})
-		}
-
-		tag := tagResult.tag
-		switch tag[0] {
-		case '!':
-			//ignore comment
-		case '#', '^':
-			name := strings.TrimSpace(tag[1:])
-			sn := &sectionNode{name, tag[0] == '^', tmpl.curline, []node{}}
-			err = tmpl.parseSection(sn)
-			if err != nil {
-				return err
-			}
-			section.nodes = append(section.nodes, sn)
-		case '/':
-			name := strings.TrimSpace(tag[1:])
-			if name != section.name {
-				return parseError{tmpl.curline, "interleaved closing tag: " + name}
-			}
-			return nil
-		case '>':
-			name := strings.TrimSpace(tag[1:])
-			partial := tmpl.parsePartial(name, textResult.padding)
-			section.nodes = append(section.nodes, partial)
-		case '=':
-			if tag[len(tag)-1] != '=' {
-				return parseError{tmpl.curline, "Invalid meta tag"}
-			}
-			tag = strings.TrimSpace(tag[1 : len(tag)-1])
-			newtags := strings.SplitN(tag, " ", 2)
-			if len(newtags) == 2 {
-				tmpl.otag = newtags[0]
-				tmpl.ctag = newtags[1]
-			}
-		case '{':
-			if tag[len(tag)-1] == '}' {
-				//use a raw tag
-				name := strings.TrimSpace(tag[1 : len(tag)-1])
-				section.nodes = append(section.nodes, &varNode{name, true})
-			}
-		case '&':
-			name := strings.TrimSpace(tag[1:])
-			section.nodes = append(section.nodes, &varNode{name, true})
-		default:
-			section.nodes = append(section.nodes, &varNode{tag, false})
-		}
-	}
-}
-
-func (tmpl *Template) parse() error {
-	for {
-		textResult, err := tmpl.readText()
-		text := textResult.text
-		padding := textResult.padding
-		mayStandalone := textResult.mayStandalone
-
-		if err == io.EOF {
-			//put the remaining text in a block
-			tmpl.nodes = append(tmpl.nodes, &textNode{[]byte(text)})
-			return nil
-		}
-
-		// put text into an item
-		tmpl.nodes = append(tmpl.nodes, &textNode{[]byte(text)})
-
-		tagResult, err := tmpl.readTag(mayStandalone)
-		if err != nil {
-			return err
-		}
-
-		if !tagResult.standalone {
-			tmpl.nodes = append(tmpl.nodes, &textNode{[]byte(padding)})
-		}
-
-		tag := tagResult.tag
-		switch tag[0] {
-		case '!':
-			//ignore comment
-		case '#', '^':
-			name := strings.TrimSpace(tag[1:])
-			sn := &sectionNode{name, tag[0] == '^', tmpl.curline, []node{}}
-			err = tmpl.parseSection(sn)
-			if err != nil {
-				return err
-			}
-			tmpl.nodes = append(tmpl.nodes, sn)
-		case '/':
-			return parseError{tmpl.curline, "unmatched close tag"}
-		case '>':
-			name := strings.TrimSpace(tag[1:])
-			partial := tmpl.parsePartial(name, textResult.padding)
-			tmpl.nodes = append(tmpl.nodes, partial)
-		case '=':
-			if tag[len(tag)-1] != '=' {
-				return parseError{tmpl.curline, "Invalid meta tag"}
-			}
-			tag = strings.TrimSpace(tag[1 : len(tag)-1])
-			newtags := strings.SplitN(tag, " ", 2)
-			if len(newtags) == 2 {
-				tmpl.otag = newtags[0]
-				tmpl.ctag = newtags[1]
-			}
-		case '{':
-			//use a raw tag
-			if tag[len(tag)-1] == '}' {
-				name := strings.TrimSpace(tag[1 : len(tag)-1])
-				tmpl.nodes = append(tmpl.nodes, &varNode{name, true})
-			}
-		case '&':
-			name := strings.TrimSpace(tag[1:])
-			tmpl.nodes = append(tmpl.nodes, &varNode{name, true})
-		default:
-			tmpl.nodes = append(tmpl.nodes, &varNode{tag, false})
-		}
-	}
-}
-
-// Evaluate interfaces and pointers looking for a value that can look up the
-// name, via a struct field, method, or map key, and return the result of the
-// lookup.
-func lookup(stack []reflect.Value, name string, errMissing bool) (reflect.Value, error) {
-	// dot notation
-	if pos := strings.IndexByte(name, '.'); pos > 0 && pos < len(name)-1 {
-		v, err := lookup(stack, name[:pos], errMissing)
-		if err != nil {
-			return v, err
-		}
-		return lookup([]reflect.Value{v}, name[pos+1:], errMissing)
-	}
-
-	for i := len(stack) - 1; i >= 0; i-- {
-		if val, ok := lookupValue(stack[i], name); ok {
-			return val, nil
-		}
-	}
-	if errMissing {
-		return reflect.Value{}, fmt.Errorf("missing variable %q", name)
-	}
-	return reflect.Value{}, nil
-}
-
-func lookupValue(v reflect.Value, name string) (reflect.Value, bool) {
-	for v.IsValid() {
-		typ := v.Type()
-		if n := v.Type().NumMethod(); n > 0 {
-			for i := 0; i < n; i++ {
-				m := typ.Method(i)
-				mtyp := m.Type
-				if m.Name == name && mtyp.NumIn() == 1 {
-					return v.Method(i).Call(nil)[0], true
-				}
-			}
-		}
-		if name == "." {
-			return v, true
-		}
-		switch av := v; av.Kind() {
-		case reflect.Ptr:
-			v = av.Elem()
-		case reflect.Interface:
-			v = av.Elem()
-		case reflect.Struct:
-			return sanitizeValue(av.FieldByName(name))
-		case reflect.Map:
-			return sanitizeValue(av.MapIndex(reflect.ValueOf(name)))
-		default:
-			return reflect.Value{}, false
-		}
-	}
-	return reflect.Value{}, false
-}
-
-func sanitizeValue(v reflect.Value) (reflect.Value, bool) {
-	if v.IsValid() {
-		return v, true
-	}
-	return reflect.Value{}, false
-}
-
-func isEmpty(v reflect.Value) bool {
-	if !v.IsValid() || v.Interface() == nil {
-		return true
-	}
-
-	valueInd := indirect(v)
-	if !valueInd.IsValid() {
-		return true
-	}
-	switch val := valueInd; val.Kind() {
-	case reflect.Array, reflect.Slice:
-		return val.Len() == 0
-	case reflect.String:
-		return strings.TrimSpace(val.String()) == ""
-	default:
-		return valueInd.IsZero()
-	}
-}
-
-func indirect(v reflect.Value) reflect.Value {
-loop:
-	for v.IsValid() {
-		switch av := v; av.Kind() {
-		case reflect.Ptr:
-			v = av.Elem()
-		case reflect.Interface:
-			v = av.Elem()
-		default:
-			break loop
-		}
-	}
-	return v
-}
-
-func (tmpl *Template) renderSection(w io.Writer, section *sectionNode, stack []reflect.Value) error {
-	value, err := lookup(stack, section.name, false)
-	if err != nil {
-		return err
-	}
-
-	// if the value is empty, check if it's an inverted section
-	if isEmpty(value) != section.inverted {
-		return nil
-	}
-
-	if !section.inverted {
-		switch val := indirect(value); val.Kind() {
-		case reflect.Slice, reflect.Array:
-			valLen := val.Len()
-			enumeration := make([]reflect.Value, valLen)
-			for i := 0; i < valLen; i++ {
-				enumeration[i] = val.Index(i)
-			}
-			topStack := len(stack)
-			stack = append(stack, enumeration[0])
-			for _, elem := range enumeration {
-				stack[topStack] = elem
-				if err = tmpl.renderNodes(w, section.nodes, stack); err != nil {
-					return err
-				}
-			}
-			return nil
-		case reflect.Map, reflect.Struct:
-			return tmpl.renderNodes(w, section.nodes, append(stack, value))
-		}
-		return tmpl.renderNodes(w, section.nodes, stack)
-	}
-
-	return tmpl.renderNodes(w, section.nodes, stack)
-}
-
-func (tmpl *Template) renderNodes(w io.Writer, nodes []node, stack []reflect.Value) error {
-	for _, n := range nodes {
-		if err := tmpl.renderNode(w, n, stack); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (tmpl *Template) renderNode(w io.Writer, node node, stack []reflect.Value) error {
-	switch n := node.(type) {
-	case *textNode:
-		_, err := w.Write(n.text)
-		return err
-	case *varNode:
-		val, err := lookup(stack, n.name, tmpl.errmiss)
-		if err != nil {
-			return err
-		}
-		if val.IsValid() {
-			if n.raw {
-				fmt.Fprint(w, val.Interface())
-			} else {
-				sxhtml.NewGenerator(nil).WriteHTML(w, sxpf.MakeString(fmt.Sprint(val.Interface())))
-			}
-		}
-	case *sectionNode:
-		if err := tmpl.renderSection(w, n, stack); err != nil {
-			return err
-		}
-	case *partialNode:
-		partial, err := getPartials(n.prov, n.name, n.indent)
-		if err != nil {
-			return err
-		}
-		if err = partial.renderTemplate(w, stack); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (tmpl *Template) renderTemplate(w io.Writer, stack []reflect.Value) error {
-	for _, n := range tmpl.nodes {
-		if err := tmpl.renderNode(w, n, stack); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Render uses the given data source - generally a map or struct - to render
-// the compiled template to an io.Writer.
-func (tmpl *Template) Render(w io.Writer, data interface{}) error {
-	return tmpl.renderTemplate(w, []reflect.Value{reflect.ValueOf(data)})
-}
-
-// ParseString compiles a mustache template string, retrieving any
-// required partials from the given provider. The resulting output can be used
-// to efficiently render the template multiple times with different data
-// sources.
-func ParseString(data string, partials PartialProvider) (*Template, error) {
-	if partials == nil {
-		partials = &EmptyProvider
-	}
-	tmpl := Template{data, "{{", "}}", 0, 1, []node{}, partials, false}
-	err := tmpl.parse()
-	if err != nil {
-		return nil, err
-	}
-	return &tmpl, err
-}
-
-// SetErrorOnMissing will produce an error is a variable is not found.
-func (tmpl *Template) SetErrorOnMissing() { tmpl.errmiss = true }
-
-// PartialProvider comprises the behaviors required of a struct to be able to
-// provide partials to the mustache rendering engine.
-type PartialProvider interface {
-	// Get accepts the name of a partial and returns the parsed partial, if it
-	// could be found; a valid but empty template, if it could not be found; or
-	// nil and error if an error occurred (other than an inability to find the
-	// partial).
-	Get(name string) (string, error)
-}
-
-// ErrPartialNotFound is returned if a partial was not found.
-type ErrPartialNotFound struct {
-	Name string
-}
-
-func (err *ErrPartialNotFound) Error() string {
-	return "Partial '" + err.Name + "' not found"
-}
-
-// StaticProvider implements the PartialProvider interface by providing
-// partials drawn from a map, which maps partial name to template contents.
-type StaticProvider struct {
-	Partials map[string]string
-}
-
-// Get accepts the name of a partial and returns the parsed partial.
-func (sp *StaticProvider) Get(name string) (string, error) {
-	if sp.Partials != nil {
-		if data, ok := sp.Partials[name]; ok {
-			return data, nil
-		}
-	}
-
-	return "", &ErrPartialNotFound{name}
-}
-
-// emptyProvider will always returns an empty string.
-type emptyProvider struct{}
-
-// Get accepts the name of a partial and returns the parsed partial.
-func (*emptyProvider) Get(string) (string, error) { return "", nil }
-
-// EmptyProvider is a partial provider that will always return an empty string.
-var EmptyProvider emptyProvider
-
-var nonEmptyLine = regexp.MustCompile(`(?m:^(.+)$)`)
-
-func getPartials(partials PartialProvider, name, indent string) (*Template, error) {
-	data, err := partials.Get(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// indent non empty lines
-	data = nonEmptyLine.ReplaceAllString(data, indent+"$1")
-	return ParseString(data, partials)
-}

DELETED template/mustache_test.go
Index: template/mustache_test.go
==================================================================
--- template/mustache_test.go
+++ template/mustache_test.go
@@ -1,479 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//
-// This file was derived from previous work:
-// - https://github.com/hoisie/mustache (License: MIT)
-//   Copyright (c) 2009 Michael Hoisie
-// - https://github.com/cbroglie/mustache (a fork from above code)
-//   Starting with commit [f9b4cbf]
-//   Does not have an explicit copyright and obviously continues with
-//   above MIT license.
-// The license text is included in the same directory where this file is
-// located. See file LICENSE.
-//-----------------------------------------------------------------------------
-
-package template_test
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-
-	"zettelstore.de/z/template"
-)
-
-type Test struct {
-	tmpl     string
-	context  interface{}
-	expected string
-	err      error
-}
-
-type Data struct {
-	A bool
-	B string
-}
-
-type User struct {
-	Name string
-	ID   int64
-}
-
-type Settings struct {
-	Allow bool
-}
-
-func (u User) Func1() string {
-	return u.Name
-}
-
-func (u *User) Func2() string {
-	return u.Name
-}
-
-func (u *User) Func3() (map[string]string, error) {
-	return map[string]string{"name": u.Name}, nil
-}
-
-func (u *User) Func4() (map[string]string, error) {
-	return nil, nil
-}
-
-func (u *User) Func5() (*Settings, error) {
-	return &Settings{true}, nil
-}
-
-func (u *User) Func6() ([]interface{}, error) {
-	var v []interface{}
-	v = append(v, &Settings{true})
-	return v, nil
-}
-
-func (u User) Truefunc1() bool {
-	return true
-}
-
-func (u *User) Truefunc2() bool {
-	return true
-}
-
-func makeVector(n int) []interface{} {
-	var v []interface{}
-	for i := 0; i < n; i++ {
-		v = append(v, &User{"Mike", 1})
-	}
-	return v
-}
-
-type Category struct {
-	Tag         string
-	Description string
-}
-
-func (c Category) DisplayName() string {
-	return c.Tag + " - " + c.Description
-}
-
-var tests = []Test{
-	{`hello world`, nil, "hello world", nil},
-	{`hello {{name}}`, map[string]string{"name": "world"}, "hello world", nil},
-	{`{{var}}`, map[string]string{"var": "5 > 2"}, "5 &gt; 2", nil},
-	{`{{{var}}}`, map[string]string{"var": "5 > 2"}, "5 > 2", nil},
-	// {`{{var}}`, map[string]string{"var": "& \" < >"}, "&amp; &#34; &lt; &gt;", nil},
-	{`{{{var}}}`, map[string]string{"var": "& \" < >"}, "& \" < >", nil},
-	{`{{a}}{{b}}{{c}}{{d}}`, map[string]string{"a": "a", "b": "b", "c": "c", "d": "d"}, "abcd", nil},
-	{`0{{a}}1{{b}}23{{c}}456{{d}}89`, map[string]string{"a": "a", "b": "b", "c": "c", "d": "d"}, "0a1b23c456d89", nil},
-	{`hello {{! comment }}world`, map[string]string{}, "hello world", nil},
-	{`{{ a }}{{=<% %>=}}<%b %><%={{ }}=%>{{ c }}`, map[string]string{"a": "a", "b": "b", "c": "c"}, "abc", nil},
-	{`{{ a }}{{= <% %> =}}<%b %><%= {{ }}=%>{{c}}`, map[string]string{"a": "a", "b": "b", "c": "c"}, "abc", nil},
-
-	//section tests
-	{`{{#A}}{{B}}{{/A}}`, Data{true, "hello"}, "hello", nil},
-	{`{{#A}}{{{B}}}{{/A}}`, Data{true, "5 > 2"}, "5 > 2", nil},
-	{`{{#A}}{{B}}{{/A}}`, Data{true, "5 > 2"}, "5 &gt; 2", nil},
-	{`{{#A}}{{B}}{{/A}}`, Data{false, "hello"}, "", nil},
-	{`{{a}}{{#b}}{{b}}{{/b}}{{c}}`, map[string]string{"a": "a", "b": "b", "c": "c"}, "abc", nil},
-	{`{{#A}}{{B}}{{/A}}`, struct {
-		A []struct {
-			B string
-		}
-	}{[]struct {
-		B string
-	}{{"a"}, {"b"}, {"c"}}},
-		"abc",
-		nil,
-	},
-	{`{{#A}}{{b}}{{/A}}`, struct{ A []map[string]string }{[]map[string]string{{"b": "a"}, {"b": "b"}, {"b": "c"}}}, "abc", nil},
-
-	{`{{#users}}{{Name}}{{/users}}`, map[string]interface{}{"users": []User{{"Mike", 1}}}, "Mike", nil},
-
-	{`{{#users}}gone{{Name}}{{/users}}`, map[string]interface{}{"users": nil}, "", nil},
-	{`{{#users}}gone{{Name}}{{/users}}`, map[string]interface{}{"users": (*User)(nil)}, "", nil},
-	{`{{#users}}gone{{Name}}{{/users}}`, map[string]interface{}{"users": []User{}}, "", nil},
-
-	{`{{#users}}{{Name}}{{/users}}`, map[string]interface{}{"users": []*User{{"Mike", 1}}}, "Mike", nil},
-	{`{{#users}}{{Name}}{{/users}}`, map[string]interface{}{"users": []interface{}{&User{"Mike", 12}}}, "Mike", nil},
-	{`{{#users}}{{Name}}{{/users}}`, map[string]interface{}{"users": makeVector(1)}, "Mike", nil},
-	{`{{Name}}`, User{"Mike", 1}, "Mike", nil},
-	{`{{Name}}`, &User{"Mike", 1}, "Mike", nil},
-	{"{{#users}}\n{{Name}}\n{{/users}}", map[string]interface{}{"users": makeVector(2)}, "Mike\nMike\n", nil},
-	{"{{#users}}\r\n{{Name}}\r\n{{/users}}", map[string]interface{}{"users": makeVector(2)}, "Mike\r\nMike\r\n", nil},
-
-	//falsy: golang zero values
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": nil}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": false}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": 0}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": 0.0}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": ""}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": Data{}}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": []interface{}{}}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": [0]interface{}{}}, "", nil},
-	//falsy: special cases we disagree with golang
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": "\t"}, "", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": []interface{}{0}}, "Hi 0", nil},
-	{"{{#a}}Hi {{.}}{{/a}}", map[string]interface{}{"a": [1]interface{}{0}}, "Hi 0", nil},
-
-	//section does not exist
-	{`{{#has}}{{/has}}`, &User{"Mike", 1}, "", nil},
-
-	// implicit iterator tests
-	{`"{{#list}}({{.}}){{/list}}"`, map[string]interface{}{"list": []string{"a", "b", "c", "d", "e"}}, "\"(a)(b)(c)(d)(e)\"", nil},
-	{`"{{#list}}({{.}}){{/list}}"`, map[string]interface{}{"list": []int{1, 2, 3, 4, 5}}, "\"(1)(2)(3)(4)(5)\"", nil},
-	{`"{{#list}}({{.}}){{/list}}"`, map[string]interface{}{"list": []float64{1.10, 2.20, 3.30, 4.40, 5.50}}, "\"(1.1)(2.2)(3.3)(4.4)(5.5)\"", nil},
-
-	//inverted section tests
-	{`{{a}}{{^b}}b{{/b}}{{c}}`, map[string]interface{}{"a": "a", "b": false, "c": "c"}, "abc", nil},
-	{`{{^a}}b{{/a}}`, map[string]interface{}{"a": false}, "b", nil},
-	{`{{^a}}b{{/a}}`, map[string]interface{}{"a": true}, "", nil},
-	{`{{^a}}b{{/a}}`, map[string]interface{}{"a": "nonempty string"}, "", nil},
-	{`{{^a}}b{{/a}}`, map[string]interface{}{"a": []string{}}, "b", nil},
-	{`{{a}}{{^b}}b{{/b}}{{c}}`, map[string]string{"a": "a", "c": "c"}, "abc", nil},
-
-	//function tests
-	{`{{#users}}{{Func1}}{{/users}}`, map[string]interface{}{"users": []User{{"Mike", 1}}}, "Mike", nil},
-	{`{{#users}}{{Func1}}{{/users}}`, map[string]interface{}{"users": []*User{{"Mike", 1}}}, "Mike", nil},
-	{`{{#users}}{{Func2}}{{/users}}`, map[string]interface{}{"users": []*User{{"Mike", 1}}}, "Mike", nil},
-
-	{`{{#users}}{{#Func3}}{{name}}{{/Func3}}{{/users}}`, map[string]interface{}{"users": []*User{{"Mike", 1}}}, "Mike", nil},
-	{`{{#users}}{{#Func4}}{{name}}{{/Func4}}{{/users}}`, map[string]interface{}{"users": []*User{{"Mike", 1}}}, "", nil},
-	{`{{#Truefunc1}}abcd{{/Truefunc1}}`, User{"Mike", 1}, "abcd", nil},
-	{`{{#Truefunc1}}abcd{{/Truefunc1}}`, &User{"Mike", 1}, "abcd", nil},
-	{`{{#Truefunc2}}abcd{{/Truefunc2}}`, &User{"Mike", 1}, "abcd", nil},
-	{`{{#Func5}}{{#Allow}}abcd{{/Allow}}{{/Func5}}`, &User{"Mike", 1}, "abcd", nil},
-	{`{{#user}}{{#Func5}}{{#Allow}}abcd{{/Allow}}{{/Func5}}{{/user}}`, map[string]interface{}{"user": &User{"Mike", 1}}, "abcd", nil},
-	{`{{#user}}{{#Func6}}{{#Allow}}abcd{{/Allow}}{{/Func6}}{{/user}}`, map[string]interface{}{"user": &User{"Mike", 1}}, "abcd", nil},
-
-	//context chaining
-	{`hello {{#section}}{{name}}{{/section}}`, map[string]interface{}{"section": map[string]string{"name": "world"}}, "hello world", nil},
-	{`hello {{#section}}{{name}}{{/section}}`, map[string]interface{}{"name": "bob", "section": map[string]string{"name": "world"}}, "hello world", nil},
-	{`hello {{#bool}}{{#section}}{{name}}{{/section}}{{/bool}}`, map[string]interface{}{"bool": true, "section": map[string]string{"name": "world"}}, "hello world", nil},
-	{`{{#users}}{{canvas}}{{/users}}`, map[string]interface{}{"canvas": "hello", "users": []User{{"Mike", 1}}}, "hello", nil},
-	{`{{#categories}}{{DisplayName}}{{/categories}}`, map[string][]*Category{
-		"categories": {&Category{"a", "b"}},
-	}, "a - b", nil},
-
-	//dotted names(dot notation)
-	{`"{{person.name}}" == "{{#person}}{{name}}{{/person}}"`, map[string]interface{}{"person": map[string]string{"name": "Joe"}}, `"Joe" == "Joe"`, nil},
-	{`"{{{person.name}}}" == "{{#person}}{{{name}}}{{/person}}"`, map[string]interface{}{"person": map[string]string{"name": "Joe"}}, `"Joe" == "Joe"`, nil},
-	{`"{{a.b.c.d.e.name}}" == "Phil"`, map[string]interface{}{"a": map[string]interface{}{"b": map[string]interface{}{"c": map[string]interface{}{"d": map[string]interface{}{"e": map[string]string{"name": "Phil"}}}}}}, `"Phil" == "Phil"`, nil},
-	{`"{{#a}}{{b.c.d.e.name}}{{/a}}" == "Phil"`, map[string]interface{}{"a": map[string]interface{}{"b": map[string]interface{}{"c": map[string]interface{}{"d": map[string]interface{}{"e": map[string]string{"name": "Phil"}}}}}, "b": map[string]interface{}{"c": map[string]interface{}{"d": map[string]interface{}{"e": map[string]string{"name": "Wrong"}}}}}, `"Phil" == "Phil"`, nil},
-}
-
-func parseString(data string) (*template.Template, error) {
-	return template.ParseString(data, nil)
-}
-
-func render(tmpl *template.Template, data interface{}) (string, error) {
-	var sf strings.Builder
-	err := tmpl.Render(&sf, data)
-	return sf.String(), err
-}
-
-func renderString(data string, errMissing bool, value interface{}) (string, error) {
-	tmpl, err := parseString(data)
-	if err != nil {
-		return "", err
-	}
-	if errMissing {
-		tmpl.SetErrorOnMissing()
-	}
-	return render(tmpl, value)
-}
-
-func TestBasic(t *testing.T) {
-	t.Parallel()
-	for _, test := range tests {
-		output, err := renderString(test.tmpl, false, test.context)
-		if err != nil {
-			t.Errorf("%q expected %q but got error: %v", test.tmpl, test.expected, err)
-		} else if output != test.expected {
-			t.Errorf("%q expected %q got %q", test.tmpl, test.expected, output)
-		}
-	}
-
-	// Now set "error on missing variable" and test again
-	for _, test := range tests {
-		output, err := renderString(test.tmpl, true, test.context)
-		if err != nil {
-			t.Errorf("%q expected %q but got error: %v", test.tmpl, test.expected, err)
-		} else if output != test.expected {
-			t.Errorf("%q expected %q got %q", test.tmpl, test.expected, output)
-		}
-	}
-}
-
-var missing = []Test{
-	//does not exist
-	{`{{dne}}`, map[string]string{"name": "world"}, "", nil},
-	{`{{dne}}`, User{"Mike", 1}, "", nil},
-	{`{{dne}}`, &User{"Mike", 1}, "", nil},
-	//dotted names(dot notation)
-	{`"{{a.b.c}}" == ""`, map[string]interface{}{}, `"" == ""`, nil},
-	{`"{{a.b.c.name}}" == ""`, map[string]interface{}{"a": map[string]interface{}{"b": map[string]string{}}, "c": map[string]string{"name": "Jim"}}, `"" == ""`, nil},
-	{`{{#a}}{{b.c}}{{/a}}`, map[string]interface{}{"a": map[string]interface{}{"b": map[string]string{}}, "b": map[string]string{"c": "ERROR"}}, "", nil},
-}
-
-func TestMissing(t *testing.T) {
-	t.Parallel()
-	for _, test := range missing {
-		output, err := renderString(test.tmpl, false, test.context)
-		if err != nil {
-			t.Error(err)
-		} else if output != test.expected {
-			t.Errorf("%q expected %q got %q", test.tmpl, test.expected, output)
-		}
-	}
-
-	// Now set "error on missing varaible" and confirm we get errors.
-	for _, test := range missing {
-		output, err := renderString(test.tmpl, true, test.context)
-		if err == nil {
-			t.Errorf("%q expected missing variable error but got %q", test.tmpl, output)
-		} else if !strings.Contains(err.Error(), "missing variable") {
-			t.Errorf("%q expected missing variable error but got %q", test.tmpl, err.Error())
-		}
-	}
-}
-
-var malformed = []Test{
-	{`{{#a}}{{}}{{/a}}`, Data{true, "hello"}, "", fmt.Errorf("line 1: empty tag")},
-	{`{{}}`, nil, "", fmt.Errorf("line 1: empty tag")},
-	{`{{}`, nil, "", fmt.Errorf("line 1: unmatched open tag")},
-	{`{{`, nil, "", fmt.Errorf("line 1: unmatched open tag")},
-	//invalid syntax - https://github.com/hoisie/mustache/issues/10
-	{`{{#a}}{{#b}}{{/a}}{{/b}}}`, map[string]interface{}{}, "", fmt.Errorf("line 1: interleaved closing tag: a")},
-}
-
-func TestMalformed(t *testing.T) {
-	t.Parallel()
-	for _, test := range malformed {
-		output, err := renderString(test.tmpl, false, test.context)
-		if err != nil {
-			if test.err == nil {
-				t.Error(err)
-			} else if test.err.Error() != err.Error() {
-				t.Errorf("%q expected error %q but got error %q", test.tmpl, test.err.Error(), err.Error())
-			}
-		} else {
-			if test.err == nil {
-				t.Errorf("%q expected %q got %q", test.tmpl, test.expected, output)
-			} else {
-				t.Errorf("%q expected error %q but got %q", test.tmpl, test.err.Error(), output)
-			}
-		}
-	}
-}
-
-type Person struct {
-	FirstName string
-	LastName  string
-}
-
-func (p *Person) Name1() string {
-	return p.FirstName + " " + p.LastName
-}
-
-func (p Person) Name2() string {
-	return p.FirstName + " " + p.LastName
-}
-
-func TestPointerReceiver(t *testing.T) {
-	t.Parallel()
-	p := Person{"John", "Smith"}
-	tests := []struct {
-		tmpl     string
-		context  interface{}
-		expected string
-	}{
-		{
-			tmpl:     "{{Name1}}",
-			context:  &p,
-			expected: "John Smith",
-		},
-		{
-			tmpl:     "{{Name2}}",
-			context:  &p,
-			expected: "John Smith",
-		},
-		{
-			tmpl:     "{{Name1}}",
-			context:  p,
-			expected: "",
-		},
-		{
-			tmpl:     "{{Name2}}",
-			context:  p,
-			expected: "John Smith",
-		},
-	}
-	for _, test := range tests {
-		output, err := renderString(test.tmpl, false, test.context)
-		if err != nil {
-			t.Error(err)
-		} else if output != test.expected {
-			t.Errorf("expected %q got %q", test.expected, output)
-		}
-	}
-}
-
-type tag struct {
-	Type template.TagType
-	Name string
-	Tags []tag
-}
-
-type tagsTest struct {
-	tmpl string
-	tags []tag
-}
-
-var tagTests = []tagsTest{
-	{
-		tmpl: `hello world`,
-		tags: nil,
-	},
-	{
-		tmpl: `hello {{name}}`,
-		tags: []tag{
-			{
-				Type: template.Variable,
-				Name: "name",
-			},
-		},
-	},
-	{
-		tmpl: `{{#name}}hello {{name}}{{/name}}{{^name}}hello {{name2}}{{/name}}`,
-		tags: []tag{
-			{
-				Type: template.Section,
-				Name: "name",
-				Tags: []tag{
-					{
-						Type: template.Variable,
-						Name: "name",
-					},
-				},
-			},
-			{
-				Type: template.InvertedSection,
-				Name: "name",
-				Tags: []tag{
-					{
-						Type: template.Variable,
-						Name: "name2",
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestTags(t *testing.T) {
-	t.Parallel()
-	for _, test := range tagTests {
-		testTags(t, &test)
-	}
-}
-
-func testTags(t *testing.T, test *tagsTest) {
-	tmpl, err := parseString(test.tmpl)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	compareTags(t, tmpl.Tags(), test.tags)
-}
-
-func compareTags(t *testing.T, actual []template.Tag, expected []tag) {
-	if len(actual) != len(expected) {
-		t.Errorf("expected %d tags, got %d", len(expected), len(actual))
-		return
-	}
-	for i, tag := range actual {
-		if tag.Type() != expected[i].Type {
-			t.Errorf("expected %s, got %s", tagString(expected[i].Type), tagString(tag.Type()))
-			return
-		}
-		if tag.Name() != expected[i].Name {
-			t.Errorf("expected %s, got %s", expected[i].Name, tag.Name())
-			return
-		}
-
-		switch tag.Type() {
-		case template.Variable:
-			if len(expected[i].Tags) != 0 {
-				t.Errorf("expected %d tags, got 0", len(expected[i].Tags))
-				return
-			}
-		case template.Section, template.InvertedSection:
-			compareTags(t, tag.Tags(), expected[i].Tags)
-		case template.Partial:
-			compareTags(t, tag.Tags(), expected[i].Tags)
-		default:
-			t.Errorf("invalid tag type: %s", tagString(tag.Type()))
-			return
-		}
-	}
-}
-
-func tagString(t template.TagType) string {
-	if int(t) < len(tagNames) {
-		return tagNames[t]
-	}
-	return "type" + strconv.Itoa(int(t))
-}
-
-var tagNames = []string{
-	template.Invalid:         "Invalid",
-	template.Variable:        "Variable",
-	template.Section:         "Section",
-	template.InvertedSection: "InvertedSection",
-	template.Partial:         "Partial",
-}

DELETED template/spec_test.go
Index: template/spec_test.go
==================================================================
--- template/spec_test.go
+++ template/spec_test.go
@@ -1,257 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//
-// This file was derived from previous work:
-// - https://github.com/hoisie/mustache (License: MIT)
-//   Copyright (c) 2009 Michael Hoisie
-// - https://github.com/cbroglie/mustache (a fork from above code)
-//   Starting with commit [f9b4cbf]
-//   Does not have an explicit copyright and obviously continues with
-//   above MIT license.
-// The license text is included in the same directory where this file is
-// located. See file LICENSE.
-//-----------------------------------------------------------------------------
-
-package template_test
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-	"path/filepath"
-	"sort"
-	"testing"
-
-	"zettelstore.de/z/template"
-)
-
-var enabledTests = map[string]map[string]bool{
-	"comments.json": {
-		"Inline":                           true,
-		"Multiline":                        true,
-		"Standalone":                       true,
-		"Indented Standalone":              true,
-		"Standalone Line Endings":          true,
-		"Standalone Without Previous Line": true,
-		"Standalone Without Newline":       true,
-		"Multiline Standalone":             true,
-		"Indented Multiline Standalone":    true,
-		"Indented Inline":                  true,
-		"Surrounding Whitespace":           true,
-	},
-	"delimiters.json": {
-		"Pair Behavior":                    true,
-		"Special Characters":               true,
-		"Sections":                         true,
-		"Inverted Sections":                true,
-		"Partial Inheritence":              true,
-		"Post-Partial Behavior":            true,
-		"Outlying Whitespace (Inline)":     true,
-		"Standalone Tag":                   true,
-		"Indented Standalone Tag":          true,
-		"Pair with Padding":                true,
-		"Surrounding Whitespace":           true,
-		"Standalone Line Endings":          true,
-		"Standalone Without Previous Line": true,
-		"Standalone Without Newline":       true,
-	},
-	"interpolation.json": {
-		"No Interpolation":                             true,
-		"Basic Interpolation":                          true,
-		"HTML Escaping":                                true,
-		"Triple Mustache":                              true,
-		"Ampersand":                                    true,
-		"Basic Integer Interpolation":                  true,
-		"Triple Mustache Integer Interpolation":        true,
-		"Ampersand Integer Interpolation":              true,
-		"Basic Decimal Interpolation":                  true,
-		"Triple Mustache Decimal Interpolation":        true,
-		"Ampersand Decimal Interpolation":              true,
-		"Basic Context Miss Interpolation":             true,
-		"Triple Mustache Context Miss Interpolation":   true,
-		"Ampersand Context Miss Interpolation":         true,
-		"Dotted Names - Basic Interpolation":           true,
-		"Dotted Names - Triple Mustache Interpolation": true,
-		"Dotted Names - Ampersand Interpolation":       true,
-		"Dotted Names - Arbitrary Depth":               true,
-		"Dotted Names - Broken Chains":                 true,
-		"Dotted Names - Broken Chain Resolution":       true,
-		"Dotted Names - Initial Resolution":            true,
-		"Interpolation - Surrounding Whitespace":       true,
-		"Triple Mustache - Surrounding Whitespace":     true,
-		"Ampersand - Surrounding Whitespace":           true,
-		"Interpolation - Standalone":                   true,
-		"Triple Mustache - Standalone":                 true,
-		"Ampersand - Standalone":                       true,
-		"Interpolation With Padding":                   true,
-		"Triple Mustache With Padding":                 true,
-		"Ampersand With Padding":                       true,
-	},
-	"inverted.json": {
-		"Falsey":                           true,
-		"Truthy":                           true,
-		"Context":                          true,
-		"List":                             true,
-		"Empty List":                       true,
-		"Doubled":                          true,
-		"Nested (Falsey)":                  true,
-		"Nested (Truthy)":                  true,
-		"Context Misses":                   true,
-		"Dotted Names - Truthy":            true,
-		"Dotted Names - Falsey":            true,
-		"Internal Whitespace":              true,
-		"Indented Inline Sections":         true,
-		"Standalone Lines":                 true,
-		"Standalone Indented Lines":        true,
-		"Padding":                          true,
-		"Dotted Names - Broken Chains":     true,
-		"Surrounding Whitespace":           true,
-		"Standalone Line Endings":          true,
-		"Standalone Without Previous Line": true,
-		"Standalone Without Newline":       true,
-	},
-	"partials.json": {
-		"Basic Behavior":                   true,
-		"Failed Lookup":                    true,
-		"Context":                          true,
-		"Recursion":                        true,
-		"Surrounding Whitespace":           true,
-		"Inline Indentation":               true,
-		"Standalone Line Endings":          true,
-		"Standalone Without Previous Line": true,
-		"Standalone Without Newline":       true,
-		"Standalone Indentation":           true,
-		"Padding Whitespace":               true,
-	},
-	"sections.json": {
-		"Truthy":                           true,
-		"Falsey":                           true,
-		"Context":                          true,
-		"Deeply Nested Contexts":           true,
-		"List":                             true,
-		"Empty List":                       true,
-		"Doubled":                          true,
-		"Nested (Truthy)":                  true,
-		"Nested (Falsey)":                  true,
-		"Context Misses":                   true,
-		"Implicit Iterator - String":       true,
-		"Implicit Iterator - Integer":      true,
-		"Implicit Iterator - Decimal":      true,
-		"Implicit Iterator - Array":        true,
-		"Dotted Names - Truthy":            true,
-		"Dotted Names - Falsey":            true,
-		"Dotted Names - Broken Chains":     true,
-		"Surrounding Whitespace":           true,
-		"Internal Whitespace":              true,
-		"Indented Inline Sections":         true,
-		"Standalone Lines":                 true,
-		"Indented Standalone Lines":        true,
-		"Standalone Line Endings":          true,
-		"Standalone Without Previous Line": true,
-		"Standalone Without Newline":       true,
-		"Padding":                          true,
-	},
-	"~lambdas.json": nil, // not implemented
-}
-
-type specTest struct {
-	Name        string            `json:"name"`
-	Data        interface{}       `json:"data"`
-	Expected    string            `json:"expected"`
-	Template    string            `json:"template"`
-	Description string            `json:"desc"`
-	Partials    map[string]string `json:"partials"`
-}
-
-type specTestSuite struct {
-	Tests []specTest `json:"tests"`
-}
-
-func getRoot() string {
-	curDir, err := os.Getwd()
-	if err != nil {
-		curDir = os.Getenv("PWD")
-	}
-	return filepath.Join(curDir, "..", "testdata", "mustache")
-}
-
-func TestSpec(t *testing.T) {
-	t.Parallel()
-	root := getRoot()
-	if _, err := os.Stat(root); err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			t.Fatalf("Could not find the mustache testdata folder at %s'", root)
-		}
-		t.Fatal(err)
-	}
-
-	paths, err := filepath.Glob(filepath.Join(root, "*.json"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	sort.Strings(paths)
-
-	for _, path := range paths {
-		_, file := filepath.Split(path)
-		enabled, ok := enabledTests[file]
-		if !ok {
-			t.Errorf("Unexpected file %s, consider adding to enabledFiles", file)
-			continue
-		}
-		if enabled == nil {
-			continue
-		}
-		b, err2 := os.ReadFile(path)
-		if err2 != nil {
-			t.Fatal(err2)
-		}
-		var suite specTestSuite
-		err2 = json.Unmarshal(b, &suite)
-		if err2 != nil {
-			t.Fatal(err2)
-		}
-		for _, test := range suite.Tests {
-			runTest(t, file, &test)
-		}
-	}
-}
-
-func selectProvider(partials map[string]string) template.PartialProvider {
-	if len(partials) == 0 {
-		return &template.EmptyProvider
-	}
-	return &template.StaticProvider{partials}
-}
-
-func runTest(t *testing.T, file string, test *specTest) {
-	enabled, ok := enabledTests[file][test.Name]
-	if !ok {
-		t.Errorf("[%s %s]: Unexpected test, add to enabledTests", file, test.Name)
-	}
-	if !enabled {
-		t.Logf("[%s %s]: Skipped", file, test.Name)
-		return
-	}
-
-	tmpl, err := template.ParseString(test.Template, selectProvider(test.Partials))
-	if err != nil {
-		t.Errorf("[%s %s]: %s", file, test.Name, err.Error())
-		return
-	}
-	out, err := render(tmpl, test.Data)
-	if err != nil {
-		t.Errorf("[%s %s]: %s", file, test.Name, err.Error())
-		return
-	}
-	if out != test.Expected {
-		t.Errorf("[%s %s]: Expected %q, got %q", file, test.Name, test.Expected, out)
-		return
-	}
-	t.Logf("[%s %s]: Passed", file, test.Name)
-}

DELETED testdata/mustache/comments.json
Index: testdata/mustache/comments.json
==================================================================
--- testdata/mustache/comments.json
+++ testdata/mustache/comments.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Comment tags represent content that should never appear in the resulting\noutput.\n\nThe tag's content may contain any substring (including newlines) EXCEPT the\nclosing delimiter.\n\nComment tags SHOULD be treated as standalone when appropriate.\n","tests":[{"name":"Inline","data":{},"expected":"1234567890","template":"12345{{! Comment Block! }}67890","desc":"Comment blocks should be removed from the template."},{"name":"Multiline","data":{},"expected":"1234567890\n","template":"12345{{!\n  This is a\n  multi-line comment...\n}}67890\n","desc":"Multiline comments should be permitted."},{"name":"Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n{{! Comment Block! }}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Indented Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n  {{! Indented Comment Block! }}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Standalone Line Endings","data":{},"expected":"|\r\n|","template":"|\r\n{{! Standalone Comment }}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags."},{"name":"Standalone Without Previous Line","data":{},"expected":"!","template":"  {{! I'm Still Standalone }}\n!","desc":"Standalone tags should not require a newline to precede them."},{"name":"Standalone Without Newline","data":{},"expected":"!\n","template":"!\n  {{! I'm Still Standalone }}","desc":"Standalone tags should not require a newline to follow them."},{"name":"Multiline Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n{{!\nSomething's going on here...\n}}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Indented Multiline Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n  {{!\n    Something's going on here...\n  }}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Indented Inline","data":{},"expected":"  12 \n","template":"  12 {{! 34 }}\n","desc":"Inline comments should not strip whitespace"},{"name":"Surrounding Whitespace","data":{},"expected":"12345  67890","template":"12345 {{! Comment Block! }} 67890","desc":"Comment removal should preserve surrounding whitespace."}]}

DELETED testdata/mustache/delimiters.json
Index: testdata/mustache/delimiters.json
==================================================================
--- testdata/mustache/delimiters.json
+++ testdata/mustache/delimiters.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Set Delimiter tags are used to change the tag delimiters for all content\nfollowing the tag in the current compilation unit.\n\nThe tag's content MUST be any two non-whitespace sequences (separated by\nwhitespace) EXCEPT an equals sign ('=') followed by the current closing\ndelimiter.\n\nSet Delimiter tags SHOULD be treated as standalone when appropriate.\n","tests":[{"name":"Pair Behavior","data":{"text":"Hey!"},"expected":"(Hey!)","template":"{{=<% %>=}}(<%text%>)","desc":"The equals sign (used on both sides) should permit delimiter changes."},{"name":"Special Characters","data":{"text":"It worked!"},"expected":"(It worked!)","template":"({{=[ ]=}}[text])","desc":"Characters with special meaning regexen should be valid delimiters."},{"name":"Sections","data":{"section":true,"data":"I got interpolated."},"expected":"[\n  I got interpolated.\n  |data|\n\n  {{data}}\n  I got interpolated.\n]\n","template":"[\n{{#section}}\n  {{data}}\n  |data|\n{{/section}}\n\n{{= | | =}}\n|#section|\n  {{data}}\n  |data|\n|/section|\n]\n","desc":"Delimiters set outside sections should persist."},{"name":"Inverted Sections","data":{"section":false,"data":"I got interpolated."},"expected":"[\n  I got interpolated.\n  |data|\n\n  {{data}}\n  I got interpolated.\n]\n","template":"[\n{{^section}}\n  {{data}}\n  |data|\n{{/section}}\n\n{{= | | =}}\n|^section|\n  {{data}}\n  |data|\n|/section|\n]\n","desc":"Delimiters set outside inverted sections should persist."},{"name":"Partial Inheritence","data":{"value":"yes"},"expected":"[ .yes. ]\n[ .yes. ]\n","template":"[ {{>include}} ]\n{{= | | =}}\n[ |>include| ]\n","desc":"Delimiters set in a parent template should not affect a partial.","partials":{"include":".{{value}}."}},{"name":"Post-Partial Behavior","data":{"value":"yes"},"expected":"[ .yes.  .yes. ]\n[ .yes.  .|value|. ]\n","template":"[ {{>include}} ]\n[ .{{value}}.  .|value|. ]\n","desc":"Delimiters set in a partial should not affect the parent template.","partials":{"include":".{{value}}. {{= | | =}} .|value|."}},{"name":"Surrounding Whitespace","data":{},"expected":"|  |","template":"| {{=@ @=}} |","desc":"Surrounding whitespace should be left untouched."},{"name":"Outlying Whitespace (Inline)","data":{},"expected":" | \n","template":" | {{=@ @=}}\n","desc":"Whitespace should be left untouched."},{"name":"Standalone Tag","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n{{=@ @=}}\nEnd.\n","desc":"Standalone lines should be removed from the template."},{"name":"Indented Standalone Tag","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n  {{=@ @=}}\nEnd.\n","desc":"Indented standalone lines should be removed from the template."},{"name":"Standalone Line Endings","data":{},"expected":"|\r\n|","template":"|\r\n{{= @ @ =}}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags."},{"name":"Standalone Without Previous Line","data":{},"expected":"=","template":"  {{=@ @=}}\n=","desc":"Standalone tags should not require a newline to precede them."},{"name":"Standalone Without Newline","data":{},"expected":"=\n","template":"=\n  {{=@ @=}}","desc":"Standalone tags should not require a newline to follow them."},{"name":"Pair with Padding","data":{},"expected":"||","template":"|{{= @   @ =}}|","desc":"Superfluous in-tag whitespace should be ignored."}]}

DELETED testdata/mustache/interpolation.json
Index: testdata/mustache/interpolation.json
==================================================================
--- testdata/mustache/interpolation.json
+++ testdata/mustache/interpolation.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Interpolation tags are used to integrate dynamic content into the template.\n\nThe tag's content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter.\n\nThis tag's content names the data to replace the tag.  A single period (`.`)\nindicates that the item currently sitting atop the context stack should be\nused; otherwise, name resolution is as follows:\n  1) Split the name on periods; the first part is the name to resolve, any\n  remaining parts should be retained.\n  2) Walk the context stack from top to bottom, finding the first context\n  that is a) a hash containing the name as a key OR b) an object responding\n  to a method with the given name.\n  3) If the context is a hash, the data is the value associated with the\n  name.\n  4) If the context is an object, the data is the value returned by the\n  method with the given name.\n  5) If any name parts were retained in step 1, each should be resolved\n  against a context stack containing only the result from the former\n  resolution.  If any part fails resolution, the result should be considered\n  falsey, and should interpolate as the empty string.\nData should be coerced into a string (and escaped, if appropriate) before\ninterpolation.\n\nThe Interpolation tags MUST NOT be treated as standalone.\n","tests":[{"name":"No Interpolation","data":{},"expected":"Hello from {Mustache}!\n","template":"Hello from {Mustache}!\n","desc":"Mustache-free templates should render as-is."},{"name":"Basic Interpolation","data":{"subject":"world"},"expected":"Hello, world!\n","template":"Hello, {{subject}}!\n","desc":"Unadorned tags should interpolate content into the template."},{"name":"HTML Escaping","data":{"forbidden":"& \" < >"},"expected":"These characters should be HTML escaped: &amp; &quot; &lt; &gt;\n","template":"These characters should be HTML escaped: {{forbidden}}\n","desc":"Basic interpolation should be HTML escaped."},{"name":"Triple Mustache","data":{"forbidden":"& \" < >"},"expected":"These characters should not be HTML escaped: & \" < >\n","template":"These characters should not be HTML escaped: {{{forbidden}}}\n","desc":"Triple mustaches should interpolate without HTML escaping."},{"name":"Ampersand","data":{"forbidden":"& \" < >"},"expected":"These characters should not be HTML escaped: & \" < >\n","template":"These characters should not be HTML escaped: {{&forbidden}}\n","desc":"Ampersand should interpolate without HTML escaping."},{"name":"Basic Integer Interpolation","data":{"mph":85},"expected":"\"85 miles an hour!\"","template":"\"{{mph}} miles an hour!\"","desc":"Integers should interpolate seamlessly."},{"name":"Triple Mustache Integer Interpolation","data":{"mph":85},"expected":"\"85 miles an hour!\"","template":"\"{{{mph}}} miles an hour!\"","desc":"Integers should interpolate seamlessly."},{"name":"Ampersand Integer Interpolation","data":{"mph":85},"expected":"\"85 miles an hour!\"","template":"\"{{&mph}} miles an hour!\"","desc":"Integers should interpolate seamlessly."},{"name":"Basic Decimal Interpolation","data":{"power":1.21},"expected":"\"1.21 jiggawatts!\"","template":"\"{{power}} jiggawatts!\"","desc":"Decimals should interpolate seamlessly with proper significance."},{"name":"Triple Mustache Decimal Interpolation","data":{"power":1.21},"expected":"\"1.21 jiggawatts!\"","template":"\"{{{power}}} jiggawatts!\"","desc":"Decimals should interpolate seamlessly with proper significance."},{"name":"Ampersand Decimal Interpolation","data":{"power":1.21},"expected":"\"1.21 jiggawatts!\"","template":"\"{{&power}} jiggawatts!\"","desc":"Decimals should interpolate seamlessly with proper significance."},{"name":"Basic Context Miss Interpolation","data":{},"expected":"I () be seen!","template":"I ({{cannot}}) be seen!","desc":"Failed context lookups should default to empty strings."},{"name":"Triple Mustache Context Miss Interpolation","data":{},"expected":"I () be seen!","template":"I ({{{cannot}}}) be seen!","desc":"Failed context lookups should default to empty strings."},{"name":"Ampersand Context Miss Interpolation","data":{},"expected":"I () be seen!","template":"I ({{&cannot}}) be seen!","desc":"Failed context lookups should default to empty strings."},{"name":"Dotted Names - Basic Interpolation","data":{"person":{"name":"Joe"}},"expected":"\"Joe\" == \"Joe\"","template":"\"{{person.name}}\" == \"{{#person}}{{name}}{{/person}}\"","desc":"Dotted names should be considered a form of shorthand for sections."},{"name":"Dotted Names - Triple Mustache Interpolation","data":{"person":{"name":"Joe"}},"expected":"\"Joe\" == \"Joe\"","template":"\"{{{person.name}}}\" == \"{{#person}}{{{name}}}{{/person}}\"","desc":"Dotted names should be considered a form of shorthand for sections."},{"name":"Dotted Names - Ampersand Interpolation","data":{"person":{"name":"Joe"}},"expected":"\"Joe\" == \"Joe\"","template":"\"{{&person.name}}\" == \"{{#person}}{{&name}}{{/person}}\"","desc":"Dotted names should be considered a form of shorthand for sections."},{"name":"Dotted Names - Arbitrary Depth","data":{"a":{"b":{"c":{"d":{"e":{"name":"Phil"}}}}}},"expected":"\"Phil\" == \"Phil\"","template":"\"{{a.b.c.d.e.name}}\" == \"Phil\"","desc":"Dotted names should be functional to any level of nesting."},{"name":"Dotted Names - Broken Chains","data":{"a":{}},"expected":"\"\" == \"\"","template":"\"{{a.b.c}}\" == \"\"","desc":"Any falsey value prior to the last part of the name should yield ''."},{"name":"Dotted Names - Broken Chain Resolution","data":{"a":{"b":{}},"c":{"name":"Jim"}},"expected":"\"\" == \"\"","template":"\"{{a.b.c.name}}\" == \"\"","desc":"Each part of a dotted name should resolve only against its parent."},{"name":"Dotted Names - Initial Resolution","data":{"a":{"b":{"c":{"d":{"e":{"name":"Phil"}}}}},"b":{"c":{"d":{"e":{"name":"Wrong"}}}}},"expected":"\"Phil\" == \"Phil\"","template":"\"{{#a}}{{b.c.d.e.name}}{{/a}}\" == \"Phil\"","desc":"The first part of a dotted name should resolve as any other name."},{"name":"Interpolation - Surrounding Whitespace","data":{"string":"---"},"expected":"| --- |","template":"| {{string}} |","desc":"Interpolation should not alter surrounding whitespace."},{"name":"Triple Mustache - Surrounding Whitespace","data":{"string":"---"},"expected":"| --- |","template":"| {{{string}}} |","desc":"Interpolation should not alter surrounding whitespace."},{"name":"Ampersand - Surrounding Whitespace","data":{"string":"---"},"expected":"| --- |","template":"| {{&string}} |","desc":"Interpolation should not alter surrounding whitespace."},{"name":"Interpolation - Standalone","data":{"string":"---"},"expected":"  ---\n","template":"  {{string}}\n","desc":"Standalone interpolation should not alter surrounding whitespace."},{"name":"Triple Mustache - Standalone","data":{"string":"---"},"expected":"  ---\n","template":"  {{{string}}}\n","desc":"Standalone interpolation should not alter surrounding whitespace."},{"name":"Ampersand - Standalone","data":{"string":"---"},"expected":"  ---\n","template":"  {{&string}}\n","desc":"Standalone interpolation should not alter surrounding whitespace."},{"name":"Interpolation With Padding","data":{"string":"---"},"expected":"|---|","template":"|{{ string }}|","desc":"Superfluous in-tag whitespace should be ignored."},{"name":"Triple Mustache With Padding","data":{"string":"---"},"expected":"|---|","template":"|{{{ string }}}|","desc":"Superfluous in-tag whitespace should be ignored."},{"name":"Ampersand With Padding","data":{"string":"---"},"expected":"|---|","template":"|{{& string }}|","desc":"Superfluous in-tag whitespace should be ignored."}]}

DELETED testdata/mustache/inverted.json
Index: testdata/mustache/inverted.json
==================================================================
--- testdata/mustache/inverted.json
+++ testdata/mustache/inverted.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Inverted Section tags and End Section tags are used in combination to wrap a\nsection of the template.\n\nThese tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Inverted Section tag MUST be\nfollowed by an End Section tag with the same content within the same\nsection.\n\nThis tag's content names the data to replace the tag.  Name resolution is as\nfollows:\n  1) Split the name on periods; the first part is the name to resolve, any\n  remaining parts should be retained.\n  2) Walk the context stack from top to bottom, finding the first context\n  that is a) a hash containing the name as a key OR b) an object responding\n  to a method with the given name.\n  3) If the context is a hash, the data is the value associated with the\n  name.\n  4) If the context is an object and the method with the given name has an\n  arity of 1, the method SHOULD be called with a String containing the\n  unprocessed contents of the sections; the data is the value returned.\n  5) Otherwise, the data is the value returned by calling the method with\n  the given name.\n  6) If any name parts were retained in step 1, each should be resolved\n  against a context stack containing only the result from the former\n  resolution.  If any part fails resolution, the result should be considered\n  falsey, and should interpolate as the empty string.\nIf the data is not of a list type, it is coerced into a list as follows: if\nthe data is truthy (e.g. `!!data == true`), use a single-element list\ncontaining the data, otherwise use an empty list.\n\nThis section MUST NOT be rendered unless the data list is empty.\n\nInverted Section and End Section tags SHOULD be treated as standalone when\nappropriate.\n","tests":[{"name":"Falsey","data":{"boolean":false},"expected":"\"This should be rendered.\"","template":"\"{{^boolean}}This should be rendered.{{/boolean}}\"","desc":"Falsey sections should have their contents rendered."},{"name":"Truthy","data":{"boolean":true},"expected":"\"\"","template":"\"{{^boolean}}This should not be rendered.{{/boolean}}\"","desc":"Truthy sections should have their contents omitted."},{"name":"Context","data":{"context":{"name":"Joe"}},"expected":"\"\"","template":"\"{{^context}}Hi {{name}}.{{/context}}\"","desc":"Objects and hashes should behave like truthy values."},{"name":"List","data":{"list":[{"n":1},{"n":2},{"n":3}]},"expected":"\"\"","template":"\"{{^list}}{{n}}{{/list}}\"","desc":"Lists should behave like truthy values."},{"name":"Empty List","data":{"list":[]},"expected":"\"Yay lists!\"","template":"\"{{^list}}Yay lists!{{/list}}\"","desc":"Empty lists should behave like falsey values."},{"name":"Doubled","data":{"two":"second","bool":false},"expected":"* first\n* second\n* third\n","template":"{{^bool}}\n* first\n{{/bool}}\n* {{two}}\n{{^bool}}\n* third\n{{/bool}}\n","desc":"Multiple inverted sections per template should be permitted."},{"name":"Nested (Falsey)","data":{"bool":false},"expected":"| A B C D E |","template":"| A {{^bool}}B {{^bool}}C{{/bool}} D{{/bool}} E |","desc":"Nested falsey sections should have their contents rendered."},{"name":"Nested (Truthy)","data":{"bool":true},"expected":"| A  E |","template":"| A {{^bool}}B {{^bool}}C{{/bool}} D{{/bool}} E |","desc":"Nested truthy sections should be omitted."},{"name":"Context Misses","data":{},"expected":"[Cannot find key 'missing'!]","template":"[{{^missing}}Cannot find key 'missing'!{{/missing}}]","desc":"Failed context lookups should be considered falsey."},{"name":"Dotted Names - Truthy","data":{"a":{"b":{"c":true}}},"expected":"\"\" == \"\"","template":"\"{{^a.b.c}}Not Here{{/a.b.c}}\" == \"\"","desc":"Dotted names should be valid for Inverted Section tags."},{"name":"Dotted Names - Falsey","data":{"a":{"b":{"c":false}}},"expected":"\"Not Here\" == \"Not Here\"","template":"\"{{^a.b.c}}Not Here{{/a.b.c}}\" == \"Not Here\"","desc":"Dotted names should be valid for Inverted Section tags."},{"name":"Dotted Names - Broken Chains","data":{"a":{}},"expected":"\"Not Here\" == \"Not Here\"","template":"\"{{^a.b.c}}Not Here{{/a.b.c}}\" == \"Not Here\"","desc":"Dotted names that cannot be resolved should be considered falsey."},{"name":"Surrounding Whitespace","data":{"boolean":false},"expected":" | \t|\t | \n","template":" | {{^boolean}}\t|\t{{/boolean}} | \n","desc":"Inverted sections should not alter surrounding whitespace."},{"name":"Internal Whitespace","data":{"boolean":false},"expected":" |  \n  | \n","template":" | {{^boolean}} {{! Important Whitespace }}\n {{/boolean}} | \n","desc":"Inverted should not alter internal whitespace."},{"name":"Indented Inline Sections","data":{"boolean":false},"expected":" NO\n WAY\n","template":" {{^boolean}}NO{{/boolean}}\n {{^boolean}}WAY{{/boolean}}\n","desc":"Single-line sections should not alter surrounding whitespace."},{"name":"Standalone Lines","data":{"boolean":false},"expected":"| This Is\n|\n| A Line\n","template":"| This Is\n{{^boolean}}\n|\n{{/boolean}}\n| A Line\n","desc":"Standalone lines should be removed from the template."},{"name":"Standalone Indented Lines","data":{"boolean":false},"expected":"| This Is\n|\n| A Line\n","template":"| This Is\n  {{^boolean}}\n|\n  {{/boolean}}\n| A Line\n","desc":"Standalone indented lines should be removed from the template."},{"name":"Standalone Line Endings","data":{"boolean":false},"expected":"|\r\n|","template":"|\r\n{{^boolean}}\r\n{{/boolean}}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags."},{"name":"Standalone Without Previous Line","data":{"boolean":false},"expected":"^\n/","template":"  {{^boolean}}\n^{{/boolean}}\n/","desc":"Standalone tags should not require a newline to precede them."},{"name":"Standalone Without Newline","data":{"boolean":false},"expected":"^\n/\n","template":"^{{^boolean}}\n/\n  {{/boolean}}","desc":"Standalone tags should not require a newline to follow them."},{"name":"Padding","data":{"boolean":false},"expected":"|=|","template":"|{{^ boolean }}={{/ boolean }}|","desc":"Superfluous in-tag whitespace should be ignored."}]}

DELETED testdata/mustache/partials.json
Index: testdata/mustache/partials.json
==================================================================
--- testdata/mustache/partials.json
+++ testdata/mustache/partials.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Partial tags are used to expand an external template into the current\ntemplate.\n\nThe tag's content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter.\n\nThis tag's content names the partial to inject.  Set Delimiter tags MUST NOT\naffect the parsing of a partial.  The partial MUST be rendered against the\ncontext stack local to the tag.  If the named partial cannot be found, the\nempty string SHOULD be used instead, as in interpolations.\n\nPartial tags SHOULD be treated as standalone when appropriate.  If this tag\nis used standalone, any whitespace preceding the tag should treated as\nindentation, and prepended to each line of the partial before rendering.\n","tests":[{"name":"Basic Behavior","data":{},"expected":"\"from partial\"","template":"\"{{>text}}\"","desc":"The greater-than operator should expand to the named partial.","partials":{"text":"from partial"}},{"name":"Failed Lookup","data":{},"expected":"\"\"","template":"\"{{>text}}\"","desc":"The empty string should be used when the named partial is not found.","partials":{}},{"name":"Context","data":{"text":"content"},"expected":"\"*content*\"","template":"\"{{>partial}}\"","desc":"The greater-than operator should operate within the current context.","partials":{"partial":"*{{text}}*"}},{"name":"Recursion","data":{"content":"X","nodes":[{"content":"Y","nodes":[]}]},"expected":"X<Y<>>","template":"{{>node}}","desc":"The greater-than operator should properly recurse.","partials":{"node":"{{content}}<{{#nodes}}{{>node}}{{/nodes}}>"}},{"name":"Surrounding Whitespace","data":{},"expected":"| \t|\t |","template":"| {{>partial}} |","desc":"The greater-than operator should not alter surrounding whitespace.","partials":{"partial":"\t|\t"}},{"name":"Inline Indentation","data":{"data":"|"},"expected":"  |  >\n>\n","template":"  {{data}}  {{> partial}}\n","desc":"Whitespace should be left untouched.","partials":{"partial":">\n>"}},{"name":"Standalone Line Endings","data":{},"expected":"|\r\n>|","template":"|\r\n{{>partial}}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags.","partials":{"partial":">"}},{"name":"Standalone Without Previous Line","data":{},"expected":"  >\n  >>","template":"  {{>partial}}\n>","desc":"Standalone tags should not require a newline to precede them.","partials":{"partial":">\n>"}},{"name":"Standalone Without Newline","data":{},"expected":">\n  >\n  >","template":">\n  {{>partial}}","desc":"Standalone tags should not require a newline to follow them.","partials":{"partial":">\n>"}},{"name":"Standalone Indentation","data":{"content":"<\n->"},"expected":"\\\n |\n <\n->\n |\n/\n","template":"\\\n {{>partial}}\n/\n","desc":"Each line of the partial should be indented before rendering.","partials":{"partial":"|\n{{{content}}}\n|\n"}},{"name":"Padding Whitespace","data":{"boolean":true},"expected":"|[]|","template":"|{{> partial }}|","desc":"Superfluous in-tag whitespace should be ignored.","partials":{"partial":"[]"}}]}

DELETED testdata/mustache/sections.json
Index: testdata/mustache/sections.json
==================================================================
--- testdata/mustache/sections.json
+++ testdata/mustache/sections.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Section tags and End Section tags are used in combination to wrap a section\nof the template for iteration\n\nThese tags' content MUST be a non-whitespace character sequence NOT\ncontaining the current closing delimiter; each Section tag MUST be followed\nby an End Section tag with the same content within the same section.\n\nThis tag's content names the data to replace the tag.  Name resolution is as\nfollows:\n  1) Split the name on periods; the first part is the name to resolve, any\n  remaining parts should be retained.\n  2) Walk the context stack from top to bottom, finding the first context\n  that is a) a hash containing the name as a key OR b) an object responding\n  to a method with the given name.\n  3) If the context is a hash, the data is the value associated with the\n  name.\n  4) If the context is an object and the method with the given name has an\n  arity of 1, the method SHOULD be called with a String containing the\n  unprocessed contents of the sections; the data is the value returned.\n  5) Otherwise, the data is the value returned by calling the method with\n  the given name.\n  6) If any name parts were retained in step 1, each should be resolved\n  against a context stack containing only the result from the former\n  resolution.  If any part fails resolution, the result should be considered\n  falsey, and should interpolate as the empty string.\nIf the data is not of a list type, it is coerced into a list as follows: if\nthe data is truthy (e.g. `!!data == true`), use a single-element list\ncontaining the data, otherwise use an empty list.\n\nFor each element in the data list, the element MUST be pushed onto the\ncontext stack, the section MUST be rendered, and the element MUST be popped\noff the context stack.\n\nSection and End Section tags SHOULD be treated as standalone when\nappropriate.\n","tests":[{"name":"Truthy","data":{"boolean":true},"expected":"\"This should be rendered.\"","template":"\"{{#boolean}}This should be rendered.{{/boolean}}\"","desc":"Truthy sections should have their contents rendered."},{"name":"Falsey","data":{"boolean":false},"expected":"\"\"","template":"\"{{#boolean}}This should not be rendered.{{/boolean}}\"","desc":"Falsey sections should have their contents omitted."},{"name":"Context","data":{"context":{"name":"Joe"}},"expected":"\"Hi Joe.\"","template":"\"{{#context}}Hi {{name}}.{{/context}}\"","desc":"Objects and hashes should be pushed onto the context stack."},{"name":"Deeply Nested Contexts","data":{"a":{"one":1},"b":{"two":2},"c":{"three":3},"d":{"four":4},"e":{"five":5}},"expected":"1\n121\n12321\n1234321\n123454321\n1234321\n12321\n121\n1\n","template":"{{#a}}\n{{one}}\n{{#b}}\n{{one}}{{two}}{{one}}\n{{#c}}\n{{one}}{{two}}{{three}}{{two}}{{one}}\n{{#d}}\n{{one}}{{two}}{{three}}{{four}}{{three}}{{two}}{{one}}\n{{#e}}\n{{one}}{{two}}{{three}}{{four}}{{five}}{{four}}{{three}}{{two}}{{one}}\n{{/e}}\n{{one}}{{two}}{{three}}{{four}}{{three}}{{two}}{{one}}\n{{/d}}\n{{one}}{{two}}{{three}}{{two}}{{one}}\n{{/c}}\n{{one}}{{two}}{{one}}\n{{/b}}\n{{one}}\n{{/a}}\n","desc":"All elements on the context stack should be accessible."},{"name":"List","data":{"list":[{"item":1},{"item":2},{"item":3}]},"expected":"\"123\"","template":"\"{{#list}}{{item}}{{/list}}\"","desc":"Lists should be iterated; list items should visit the context stack."},{"name":"Empty List","data":{"list":[]},"expected":"\"\"","template":"\"{{#list}}Yay lists!{{/list}}\"","desc":"Empty lists should behave like falsey values."},{"name":"Doubled","data":{"two":"second","bool":true},"expected":"* first\n* second\n* third\n","template":"{{#bool}}\n* first\n{{/bool}}\n* {{two}}\n{{#bool}}\n* third\n{{/bool}}\n","desc":"Multiple sections per template should be permitted."},{"name":"Nested (Truthy)","data":{"bool":true},"expected":"| A B C D E |","template":"| A {{#bool}}B {{#bool}}C{{/bool}} D{{/bool}} E |","desc":"Nested truthy sections should have their contents rendered."},{"name":"Nested (Falsey)","data":{"bool":false},"expected":"| A  E |","template":"| A {{#bool}}B {{#bool}}C{{/bool}} D{{/bool}} E |","desc":"Nested falsey sections should be omitted."},{"name":"Context Misses","data":{},"expected":"[]","template":"[{{#missing}}Found key 'missing'!{{/missing}}]","desc":"Failed context lookups should be considered falsey."},{"name":"Implicit Iterator - String","data":{"list":["a","b","c","d","e"]},"expected":"\"(a)(b)(c)(d)(e)\"","template":"\"{{#list}}({{.}}){{/list}}\"","desc":"Implicit iterators should directly interpolate strings."},{"name":"Implicit Iterator - Integer","data":{"list":[1,2,3,4,5]},"expected":"\"(1)(2)(3)(4)(5)\"","template":"\"{{#list}}({{.}}){{/list}}\"","desc":"Implicit iterators should cast integers to strings and interpolate."},{"name":"Implicit Iterator - Decimal","data":{"list":[1.1,2.2,3.3,4.4,5.5]},"expected":"\"(1.1)(2.2)(3.3)(4.4)(5.5)\"","template":"\"{{#list}}({{.}}){{/list}}\"","desc":"Implicit iterators should cast decimals to strings and interpolate."},{"name":"Implicit Iterator - Array","desc":"Implicit iterators should allow iterating over nested arrays.","data":{"list":[[1,2,3],["a","b","c"]]},"template":"\"{{#list}}({{#.}}{{.}}{{/.}}){{/list}}\"","expected":"\"(123)(abc)\""},{"name":"Dotted Names - Truthy","data":{"a":{"b":{"c":true}}},"expected":"\"Here\" == \"Here\"","template":"\"{{#a.b.c}}Here{{/a.b.c}}\" == \"Here\"","desc":"Dotted names should be valid for Section tags."},{"name":"Dotted Names - Falsey","data":{"a":{"b":{"c":false}}},"expected":"\"\" == \"\"","template":"\"{{#a.b.c}}Here{{/a.b.c}}\" == \"\"","desc":"Dotted names should be valid for Section tags."},{"name":"Dotted Names - Broken Chains","data":{"a":{}},"expected":"\"\" == \"\"","template":"\"{{#a.b.c}}Here{{/a.b.c}}\" == \"\"","desc":"Dotted names that cannot be resolved should be considered falsey."},{"name":"Surrounding Whitespace","data":{"boolean":true},"expected":" | \t|\t | \n","template":" | {{#boolean}}\t|\t{{/boolean}} | \n","desc":"Sections should not alter surrounding whitespace."},{"name":"Internal Whitespace","data":{"boolean":true},"expected":" |  \n  | \n","template":" | {{#boolean}} {{! Important Whitespace }}\n {{/boolean}} | \n","desc":"Sections should not alter internal whitespace."},{"name":"Indented Inline Sections","data":{"boolean":true},"expected":" YES\n GOOD\n","template":" {{#boolean}}YES{{/boolean}}\n {{#boolean}}GOOD{{/boolean}}\n","desc":"Single-line sections should not alter surrounding whitespace."},{"name":"Standalone Lines","data":{"boolean":true},"expected":"| This Is\n|\n| A Line\n","template":"| This Is\n{{#boolean}}\n|\n{{/boolean}}\n| A Line\n","desc":"Standalone lines should be removed from the template."},{"name":"Indented Standalone Lines","data":{"boolean":true},"expected":"| This Is\n|\n| A Line\n","template":"| This Is\n  {{#boolean}}\n|\n  {{/boolean}}\n| A Line\n","desc":"Indented standalone lines should be removed from the template."},{"name":"Standalone Line Endings","data":{"boolean":true},"expected":"|\r\n|","template":"|\r\n{{#boolean}}\r\n{{/boolean}}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags."},{"name":"Standalone Without Previous Line","data":{"boolean":true},"expected":"#\n/","template":"  {{#boolean}}\n#{{/boolean}}\n/","desc":"Standalone tags should not require a newline to precede them."},{"name":"Standalone Without Newline","data":{"boolean":true},"expected":"#\n/\n","template":"#{{#boolean}}\n/\n  {{/boolean}}","desc":"Standalone tags should not require a newline to follow them."},{"name":"Padding","data":{"boolean":true},"expected":"|=|","template":"|{{# boolean }}={{/ boolean }}|","desc":"Superfluous in-tag whitespace should be ignored."}]}

DELETED testdata/mustache/~lambdas.json
Index: testdata/mustache/~lambdas.json
==================================================================
--- testdata/mustache/~lambdas.json
+++ testdata/mustache/~lambdas.json
@@ -1,1 +0,0 @@
-{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Lambdas are a special-cased data type for use in interpolations and\nsections.\n\nWhen used as the data value for an Interpolation tag, the lambda MUST be\ntreatable as an arity 0 function, and invoked as such.  The returned value\nMUST be rendered against the default delimiters, then interpolated in place\nof the lambda.\n\nWhen used as the data value for a Section tag, the lambda MUST be treatable\nas an arity 1 function, and invoked as such (passing a String containing the\nunprocessed section contents).  The returned value MUST be rendered against\nthe current delimiters, then interpolated in place of the section.\n","tests":[{"name":"Interpolation","data":{"lambda":{"php":"return \"world\";","clojure":"(fn [] \"world\")","__tag__":"code","perl":"sub { \"world\" }","python":"lambda: \"world\"","ruby":"proc { \"world\" }","js":"function() { return \"world\" }"}},"expected":"Hello, world!","template":"Hello, {{lambda}}!","desc":"A lambda's return value should be interpolated."},{"name":"Interpolation - Expansion","data":{"planet":"world","lambda":{"php":"return \"{{planet}}\";","clojure":"(fn [] \"{{planet}}\")","__tag__":"code","perl":"sub { \"{{planet}}\" }","python":"lambda: \"{{planet}}\"","ruby":"proc { \"{{planet}}\" }","js":"function() { return \"{{planet}}\" }"}},"expected":"Hello, world!","template":"Hello, {{lambda}}!","desc":"A lambda's return value should be parsed."},{"name":"Interpolation - Alternate Delimiters","data":{"planet":"world","lambda":{"php":"return \"|planet| => {{planet}}\";","clojure":"(fn [] \"|planet| => {{planet}}\")","__tag__":"code","perl":"sub { \"|planet| => {{planet}}\" }","python":"lambda: \"|planet| => {{planet}}\"","ruby":"proc { \"|planet| => {{planet}}\" }","js":"function() { return \"|planet| => {{planet}}\" }"}},"expected":"Hello, (|planet| => world)!","template":"{{= | | =}}\nHello, (|&lambda|)!","desc":"A lambda's return value should parse with the default delimiters."},{"name":"Interpolation - Multiple Calls","data":{"lambda":{"php":"global $calls; return ++$calls;","clojure":"(def g (atom 0)) (fn [] (swap! g inc))","__tag__":"code","perl":"sub { no strict; $calls += 1 }","python":"lambda: globals().update(calls=globals().get(\"calls\",0)+1) or calls","ruby":"proc { $calls ||= 0; $calls += 1 }","js":"function() { return (g=(function(){return this})()).calls=(g.calls||0)+1 }"}},"expected":"1 == 2 == 3","template":"{{lambda}} == {{{lambda}}} == {{lambda}}","desc":"Interpolated lambdas should not be cached."},{"name":"Escaping","data":{"lambda":{"php":"return \">\";","clojure":"(fn [] \">\")","__tag__":"code","perl":"sub { \">\" }","python":"lambda: \">\"","ruby":"proc { \">\" }","js":"function() { return \">\" }"}},"expected":"<&gt;>","template":"<{{lambda}}{{{lambda}}}","desc":"Lambda results should be appropriately escaped."},{"name":"Section","data":{"x":"Error!","lambda":{"php":"return ($text == \"{{x}}\") ? \"yes\" : \"no\";","clojure":"(fn [text] (if (= text \"{{x}}\") \"yes\" \"no\"))","__tag__":"code","perl":"sub { $_[0] eq \"{{x}}\" ? \"yes\" : \"no\" }","python":"lambda text: text == \"{{x}}\" and \"yes\" or \"no\"","ruby":"proc { |text| text == \"{{x}}\" ? \"yes\" : \"no\" }","js":"function(txt) { return (txt == \"{{x}}\" ? \"yes\" : \"no\") }"}},"expected":"<yes>","template":"<{{#lambda}}{{x}}{{/lambda}}>","desc":"Lambdas used for sections should receive the raw section string."},{"name":"Section - Expansion","data":{"planet":"Earth","lambda":{"php":"return $text . \"{{planet}}\" . $text;","clojure":"(fn [text] (str text \"{{planet}}\" text))","__tag__":"code","perl":"sub { $_[0] . \"{{planet}}\" . $_[0] }","python":"lambda text: \"%s{{planet}}%s\" % (text, text)","ruby":"proc { |text| \"#{text}{{planet}}#{text}\" }","js":"function(txt) { return txt + \"{{planet}}\" + txt }"}},"expected":"<-Earth->","template":"<{{#lambda}}-{{/lambda}}>","desc":"Lambdas used for sections should have their results parsed."},{"name":"Section - Alternate Delimiters","data":{"planet":"Earth","lambda":{"php":"return $text . \"{{planet}} => |planet|\" . $text;","clojure":"(fn [text] (str text \"{{planet}} => |planet|\" text))","__tag__":"code","perl":"sub { $_[0] . \"{{planet}} => |planet|\" . $_[0] }","python":"lambda text: \"%s{{planet}} => |planet|%s\" % (text, text)","ruby":"proc { |text| \"#{text}{{planet}} => |planet|#{text}\" }","js":"function(txt) { return txt + \"{{planet}} => |planet|\" + txt }"}},"expected":"<-{{planet}} => Earth->","template":"{{= | | =}}<|#lambda|-|/lambda|>","desc":"Lambdas used for sections should parse with the current delimiters."},{"name":"Section - Multiple Calls","data":{"lambda":{"php":"return \"__\" . $text . \"__\";","clojure":"(fn [text] (str \"__\" text \"__\"))","__tag__":"code","perl":"sub { \"__\" . $_[0] . \"__\" }","python":"lambda text: \"__%s__\" % (text)","ruby":"proc { |text| \"__#{text}__\" }","js":"function(txt) { return \"__\" + txt + \"__\" }"}},"expected":"__FILE__ != __LINE__","template":"{{#lambda}}FILE{{/lambda}} != {{#lambda}}LINE{{/lambda}}","desc":"Lambdas used for sections should not be cached."},{"name":"Inverted Section","data":{"static":"static","lambda":{"php":"return false;","clojure":"(fn [text] false)","__tag__":"code","perl":"sub { 0 }","python":"lambda text: 0","ruby":"proc { |text| false }","js":"function(txt) { return false }"}},"expected":"<>","template":"<{{^lambda}}{{static}}{{/lambda}}>","desc":"Lambdas used for inverted sections should be considered truthy."}]}

ADDED   testdata/testbox/20230929102100.zettel
Index: testdata/testbox/20230929102100.zettel
==================================================================
--- testdata/testbox/20230929102100.zettel
+++ testdata/testbox/20230929102100.zettel
@@ -0,0 +1,7 @@
+id: 20230929102100
+title: #test
+role: tag
+syntax: zmk
+created: 20230929102125
+
+Zettel with this tag are testing the Zettelstore.

Index: tests/client/client_test.go
==================================================================
--- tests/client/client_test.go
+++ tests/client/client_test.go
@@ -18,12 +18,12 @@
 	"net/http"
 	"net/url"
 	"strconv"
 	"testing"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/client"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/client"
 	"zettelstore.de/z/kernel"
 )
 
 func nextZid(zid api.ZettelID) api.ZettelID {
 	numVal, err := strconv.ParseUint(string(zid), 10, 64)
@@ -47,16 +47,16 @@
 	}
 }
 
 func TestListZettel(t *testing.T) {
 	const (
-		ownerZettel      = 47
-		configRoleZettel = 29
-		writerZettel     = ownerZettel - 23
-		readerZettel     = ownerZettel - 23
-		creatorZettel    = 7
-		publicZettel     = 4
+		ownerZettel      = 55
+		configRoleZettel = 33
+		writerZettel     = ownerZettel - 24
+		readerZettel     = ownerZettel - 24
+		creatorZettel    = 10
+		publicZettel     = 5
 	)
 
 	testdata := []struct {
 		user string
 		exp  int
@@ -71,11 +71,11 @@
 	t.Parallel()
 	c := getClient()
 	for i, tc := range testdata {
 		t.Run(fmt.Sprintf("User %d/%q", i, tc.user), func(tt *testing.T) {
 			c.SetAuth(tc.user, tc.user)
-			q, h, l, err := c.ListZettelJSON(context.Background(), "")
+			q, h, l, err := c.QueryZettelData(context.Background(), "")
 			if err != nil {
 				tt.Error(err)
 				return
 			}
 			if q != "" {
@@ -88,54 +88,55 @@
 			if got != tc.exp {
 				tt.Errorf("List of length %d expected, but got %d\n%v", tc.exp, got, l)
 			}
 		})
 	}
-	q, h, l, err := c.ListZettelJSON(context.Background(), api.KeyRole+api.SearchOperatorHas+api.ValueRoleConfiguration)
+	search := api.KeyRole + api.SearchOperatorHas + api.ValueRoleConfiguration + " ORDER id"
+	q, h, l, err := c.QueryZettelData(context.Background(), search)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	expQ := "role:configuration"
+	expQ := "role:configuration ORDER id"
 	if q != expQ {
 		t.Errorf("Query should be %q, but is %q", expQ, q)
 	}
-	expH := "role HAS configuration"
+	expH := "role HAS configuration ORDER id"
 	if h != expH {
 		t.Errorf("Human should be %q, but is %q", expH, h)
 	}
 	got := len(l)
 	if got != configRoleZettel {
 		t.Errorf("List of length %d expected, but got %d\n%v", configRoleZettel, got, l)
 	}
 
-	pl, err := c.ListZettel(context.Background(), api.KeyRole+api.SearchOperatorHas+api.ValueRoleConfiguration)
+	pl, err := c.QueryZettel(context.Background(), search)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	compareZettelList(t, pl, l)
 }
 
-func compareZettelList(t *testing.T, pl [][]byte, l []api.ZidMetaJSON) {
+func compareZettelList(t *testing.T, pl [][]byte, l []api.ZidMetaRights) {
 	t.Helper()
 	if len(pl) != len(l) {
-		t.Errorf("Different list lenght: Plain=%d, JSON=%d", len(pl), len(l))
+		t.Errorf("Different list lenght: Plain=%d, Data=%d", len(pl), len(l))
 	} else {
 		for i, line := range pl {
 			if got := api.ZettelID(line[:14]); got != l[i].ID {
-				t.Errorf("%d: JSON=%q, got=%q", i, l[i].ID, got)
+				t.Errorf("%d: Data=%q, got=%q", i, l[i].ID, got)
 			}
 		}
 	}
 }
 
-func TestGetZettelJSON(t *testing.T) {
+func TestGetZettelData(t *testing.T) {
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("owner", "owner")
-	z, err := c.GetZettelJSON(context.Background(), api.ZidDefaultHome)
+	z, err := c.GetZettelData(context.Background(), api.ZidDefaultHome)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	if m := z.Meta; len(m) == 0 {
@@ -143,21 +144,24 @@
 	}
 	if z.Content == "" || z.Encoding != "" {
 		t.Errorf("Expect non-empty content, but empty encoding (got %q)", z.Encoding)
 	}
 
-	m, err := c.GetMeta(context.Background(), api.ZidDefaultHome)
+	mr, err := c.GetMetaData(context.Background(), api.ZidDefaultHome)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	if len(m) != len(z.Meta) {
-		t.Errorf("Pure meta differs from zettel meta: %s vs %s", m, z.Meta)
+	if mr.Rights == api.ZettelCanNone {
+		t.Error("rights must be greater zero")
+	}
+	if len(mr.Meta) != len(z.Meta) {
+		t.Errorf("Pure meta differs from zettel meta: %s vs %s", mr.Meta, z.Meta)
 		return
 	}
 	for k, v := range z.Meta {
-		got, ok := m[k]
+		got, ok := mr.Meta[k]
 		if !ok {
 			t.Errorf("Pure meta has no key %q", k)
 			continue
 		}
 		if got != v {
@@ -170,11 +174,11 @@
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("owner", "owner")
 	encodings := []api.EncodingEnum{
 		api.EncoderHTML,
-		api.EncoderSexpr,
+		api.EncoderSz,
 		api.EncoderText,
 	}
 	for _, enc := range encodings {
 		content, err := c.GetParsedZettel(context.Background(), api.ZidDefaultHome, enc)
 		if err != nil {
@@ -193,20 +197,11 @@
 			t.Errorf("Empty content for evaluated encoding %v", enc)
 		}
 	}
 }
 
-func checkZid(t *testing.T, expected, got api.ZettelID) bool {
-	t.Helper()
-	if expected != got {
-		t.Errorf("Expected a Zid %q, but got %q", expected, got)
-		return false
-	}
-	return true
-}
-
-func checkListZid(t *testing.T, l []api.ZidMetaJSON, pos int, expected api.ZettelID) {
+func checkListZid(t *testing.T, l []api.ZidMetaRights, pos int, expected api.ZettelID) {
 	t.Helper()
 	if got := api.ZettelID(l[pos].ID); got != expected {
 		t.Errorf("Expected result[%d]=%v, but got %v", pos, expected, got)
 	}
 }
@@ -213,89 +208,83 @@
 
 func TestGetZettelOrder(t *testing.T) {
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("owner", "owner")
-	rl, err := c.GetZettelOrder(context.Background(), api.ZidTOCNewTemplate)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if !checkZid(t, api.ZidTOCNewTemplate, rl.ID) {
-		return
-	}
-	l := rl.List
-	if got := len(l); got != 2 {
-		t.Errorf("Expected list of length 2, got %d", got)
-		return
-	}
-	checkListZid(t, l, 0, api.ZidTemplateNewZettel)
-	checkListZid(t, l, 1, api.ZidTemplateNewUser)
-}
-
-func TestGetZettelContext(t *testing.T) {
-	const (
-		allUserZid = api.ZettelID("20211019200500")
-		ownerZid   = api.ZettelID("20210629163300")
-		writerZid  = api.ZettelID("20210629165000")
-		readerZid  = api.ZettelID("20210629165024")
-		creatorZid = api.ZettelID("20210629165050")
-		limitAll   = 3
-	)
-	t.Parallel()
-	c := getClient()
-	c.SetAuth("owner", "owner")
-	rl, err := c.GetZettelContext(context.Background(), ownerZid, client.DirBoth, 0, limitAll)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if !checkZid(t, ownerZid, rl.ID) {
-		return
-	}
-	l := rl.List
-	if got := len(l); got != limitAll {
-		t.Errorf("Expected list of length %d, got %d", limitAll, got)
-		t.Error(rl)
-		return
-	}
-	checkListZid(t, l, 0, allUserZid)
-	// checkListZid(t, l, 1, writerZid)
-	// checkListZid(t, l, 2, readerZid)
-	checkListZid(t, l, 1, creatorZid)
-
-	rl, err = c.GetZettelContext(context.Background(), ownerZid, client.DirBackward, 0, 0)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if !checkZid(t, ownerZid, rl.ID) {
-		return
-	}
-	l = rl.List
-	if got, exp := len(l), 4; got != exp {
-		t.Errorf("Expected list of length %d, got %d", exp, got)
-		return
-	}
-	checkListZid(t, l, 0, allUserZid)
-}
+	_, _, metaSeq, err := c.QueryZettelData(context.Background(), string(api.ZidTOCNewTemplate)+" "+api.ItemsDirective)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	if got := len(metaSeq); got != 4 {
+		t.Errorf("Expected list of length 4, got %d", got)
+		return
+	}
+	checkListZid(t, metaSeq, 0, api.ZidTemplateNewZettel)
+	checkListZid(t, metaSeq, 1, api.ZidTemplateNewRole)
+	checkListZid(t, metaSeq, 2, api.ZidTemplateNewTag)
+	checkListZid(t, metaSeq, 3, api.ZidTemplateNewUser)
+}
+
+// func TestGetZettelContext(t *testing.T) {
+// 	const (
+// 		allUserZid = api.ZettelID("20211019200500")
+// 		ownerZid   = api.ZettelID("20210629163300")
+// 		writerZid  = api.ZettelID("20210629165000")
+// 		readerZid  = api.ZettelID("20210629165024")
+// 		creatorZid = api.ZettelID("20210629165050")
+// 		limitAll   = 3
+// 	)
+// 	t.Parallel()
+// 	c := getClient()
+// 	c.SetAuth("owner", "owner")
+// 	rl, err := c.GetZettelContext(context.Background(), ownerZid, client.DirBoth, 0, limitAll)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	if !checkZid(t, ownerZid, rl.ID) {
+// 		return
+// 	}
+// 	l := rl.List
+// 	if got := len(l); got != limitAll {
+// 		t.Errorf("Expected list of length %d, got %d", limitAll, got)
+// 		t.Error(rl)
+// 		return
+// 	}
+// 	checkListZid(t, l, 0, allUserZid)
+// 	// checkListZid(t, l, 1, writerZid)
+// 	// checkListZid(t, l, 2, readerZid)
+// 	checkListZid(t, l, 1, creatorZid)
+
+// 	rl, err = c.GetZettelContext(context.Background(), ownerZid, client.DirBackward, 0, 0)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	if !checkZid(t, ownerZid, rl.ID) {
+// 		return
+// 	}
+// 	l = rl.List
+// 	if got, exp := len(l), 4; got != exp {
+// 		t.Errorf("Expected list of length %d, got %d", exp, got)
+// 		return
+// 	}
+// 	checkListZid(t, l, 0, allUserZid)
+// }
 
 func TestGetUnlinkedReferences(t *testing.T) {
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("owner", "owner")
-	zl, err := c.GetUnlinkedReferences(context.Background(), api.ZidDefaultHome, nil)
+	_, _, metaSeq, err := c.QueryZettelData(context.Background(), string(api.ZidDefaultHome)+" "+api.UnlinkedDirective)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	if !checkZid(t, api.ZidDefaultHome, zl.ID) {
-		return
-	}
-	l := zl.List
-	if got := len(l); got != 1 {
-		t.Errorf("Expected list of length 1, got %d", got)
+	if got := len(metaSeq); got != 1 {
+		t.Errorf("Expected list of length 1, got %d:\n%v", got, metaSeq)
 		return
 	}
 }
 
 func failNoErrorOrNoCode(t *testing.T, err error, goodCode int) bool {
@@ -336,11 +325,11 @@
 
 func TestListTags(t *testing.T) {
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("owner", "owner")
-	tm, err := c.QueryMapMeta(context.Background(), api.ActionSeparator+api.KeyTags)
+	agg, err := c.QueryAggregate(context.Background(), api.ActionSeparator+api.KeyTags)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	tags := []struct {
@@ -349,51 +338,93 @@
 	}{
 		{"#invisible", 1},
 		{"#user", 4},
 		{"#test", 4},
 	}
-	if len(tm) != len(tags) {
-		t.Errorf("Expected %d different tags, but got only %d (%v)", len(tags), len(tm), tm)
+	if len(agg) != len(tags) {
+		t.Errorf("Expected %d different tags, but got %d (%v)", len(tags), len(agg), agg)
 	}
 	for _, tag := range tags {
-		if zl, ok := tm[tag.key]; !ok {
-			t.Errorf("No tag %v: %v", tag.key, tm)
+		if zl, ok := agg[tag.key]; !ok {
+			t.Errorf("No tag %v: %v", tag.key, agg)
 		} else if len(zl) != tag.size {
 			t.Errorf("Expected %d zettel with tag %v, but got %v", tag.size, tag.key, zl)
 		}
 	}
-	for i, id := range tm["#user"] {
-		if id != tm["#test"][i] {
-			t.Errorf("Tags #user and #test have different content: %v vs %v", tm["#user"], tm["#test"])
+	for i, id := range agg["#user"] {
+		if id != agg["#test"][i] {
+			t.Errorf("Tags #user and #test have different content: %v vs %v", agg["#user"], agg["#test"])
 		}
 	}
 }
+
+func TestTagZettel(t *testing.T) {
+	t.Parallel()
+	c := getClient()
+	c.AllowRedirect(true)
+	c.SetAuth("owner", "owner")
+	ctx := context.Background()
+	zid, err := c.TagZettel(ctx, "nosuchtag")
+	if err != nil {
+		t.Error(err)
+	} else if zid != "" {
+		t.Errorf("no zid expected, but got %q", zid)
+	}
+	zid, err = c.TagZettel(ctx, "#test")
+	exp := api.ZettelID("20230929102100")
+	if err != nil {
+		t.Error(err)
+	} else if zid != exp {
+		t.Errorf("tag zettel for #test should be %q, but got %q", exp, zid)
+	}
+}
 
 func TestListRoles(t *testing.T) {
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("owner", "owner")
-	rl, err := c.QueryMapMeta(context.Background(), api.ActionSeparator+api.KeyRole)
+	agg, err := c.QueryAggregate(context.Background(), api.ActionSeparator+api.KeyRole)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	exp := []string{"configuration", "user", "zettel"}
-	if len(rl) != len(exp) {
-		t.Errorf("Expected %d different tags, but got only %d (%v)", len(exp), len(rl), rl)
+	exp := []string{"configuration", "role", "user", "tag", "zettel"}
+	if len(agg) != len(exp) {
+		t.Errorf("Expected %d different roles, but got %d (%v)", len(exp), len(agg), agg)
 	}
 	for _, id := range exp {
-		if _, found := rl[id]; !found {
+		if _, found := agg[id]; !found {
 			t.Errorf("Role map expected key %q", id)
 		}
 	}
 }
+
+func TestRoleZettel(t *testing.T) {
+	t.Parallel()
+	c := getClient()
+	c.AllowRedirect(true)
+	c.SetAuth("owner", "owner")
+	ctx := context.Background()
+	zid, err := c.RoleZettel(ctx, "nosuchrole")
+	if err != nil {
+		t.Error("AAA", err)
+	} else if zid != "" {
+		t.Errorf("no zid expected, but got %q", zid)
+	}
+	zid, err = c.RoleZettel(ctx, "zettel")
+	exp := api.ZettelID("00000000060010")
+	if err != nil {
+		t.Error(err)
+	} else if zid != exp {
+		t.Errorf("role zettel for zettel should be %q, but got %q", exp, zid)
+	}
+}
 
 func TestVersion(t *testing.T) {
 	t.Parallel()
 	c := getClient()
-	ver, err := c.GetVersionJSON(context.Background())
+	ver, err := c.GetVersionInfo(context.Background())
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	if ver.Major != -1 || ver.Minor != -1 || ver.Patch != -1 || ver.Info != kernel.CoreDefaultVersion || ver.Hash != "" {

Index: tests/client/crud_test.go
==================================================================
--- tests/client/crud_test.go
+++ tests/client/crud_test.go
@@ -13,12 +13,12 @@
 import (
 	"context"
 	"strings"
 	"testing"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/client"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/client"
 )
 
 // ---------------------------------------------------------------------------
 // Tests that change the Zettelstore must nor run parallel to other tests.
 
@@ -57,15 +57,15 @@
 	}
 
 	doDelete(t, c, newZid)
 }
 
-func TestCreateGetRenameDeleteZettelJSON(t *testing.T) {
+func TestCreateGetRenameDeleteZettelData(t *testing.T) {
 	// Is not to be allowed to run in parallel with other tests.
 	c := getClient()
 	c.SetAuth("creator", "creator")
-	zid, err := c.CreateZettelJSON(context.Background(), &api.ZettelDataJSON{
+	zid, err := c.CreateZettelData(context.Background(), api.ZettelData{
 		Meta:     nil,
 		Encoding: "",
 		Content:  "Example",
 	})
 	if err != nil {
@@ -86,26 +86,26 @@
 
 	c.SetAuth("owner", "owner")
 	doDelete(t, c, newZid)
 }
 
-func TestCreateGetDeleteZettelJSON(t *testing.T) {
+func TestCreateGetDeleteZettelData(t *testing.T) {
 	// Is not to be allowed to run in parallel with other tests.
 	c := getClient()
 	c.SetAuth("owner", "owner")
 	wrongModified := "19691231115959"
-	zid, err := c.CreateZettelJSON(context.Background(), &api.ZettelDataJSON{
+	zid, err := c.CreateZettelData(context.Background(), api.ZettelData{
 		Meta: api.ZettelMeta{
 			api.KeyTitle:    "A\nTitle", // \n must be converted into a space
 			api.KeyModified: wrongModified,
 		},
 	})
 	if err != nil {
 		t.Error("Cannot create zettel:", err)
 		return
 	}
-	z, err := c.GetZettelJSON(context.Background(), zid)
+	z, err := c.GetZettelData(context.Background(), zid)
 	if err != nil {
 		t.Error("Cannot get zettel:", zid, err)
 	} else {
 		exp := "A Title"
 		if got := z.Meta[api.KeyTitle]; got != exp {
@@ -150,14 +150,14 @@
 	}
 	// Must delete to clean up for next tests
 	doDelete(t, c, api.ZidDefaultHome)
 }
 
-func TestUpdateZettelJSON(t *testing.T) {
+func TestUpdateZettelData(t *testing.T) {
 	c := getClient()
 	c.SetAuth("writer", "writer")
-	z, err := c.GetZettelJSON(context.Background(), api.ZidDefaultHome)
+	z, err := c.GetZettelData(context.Background(), api.ZidDefaultHome)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	if got := z.Meta[api.KeyTitle]; got != "Home" {
@@ -166,16 +166,16 @@
 	}
 	newTitle := "New Home"
 	z.Meta[api.KeyTitle] = newTitle
 	wrongModified := "19691231235959"
 	z.Meta[api.KeyModified] = wrongModified
-	err = c.UpdateZettelJSON(context.Background(), api.ZidDefaultHome, z)
+	err = c.UpdateZettelData(context.Background(), api.ZidDefaultHome, z)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	zt, err := c.GetZettelJSON(context.Background(), api.ZidDefaultHome)
+	zt, err := c.GetZettelData(context.Background(), api.ZidDefaultHome)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	if got := zt.Meta[api.KeyTitle]; got != newTitle {

Index: tests/client/embed_test.go
==================================================================
--- tests/client/embed_test.go
+++ tests/client/embed_test.go
@@ -13,11 +13,11 @@
 import (
 	"context"
 	"strings"
 	"testing"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 )
 
 const (
 	abcZid   = api.ZettelID("20211020121000")
 	abc10Zid = api.ZettelID("20211020121100")
@@ -75,11 +75,11 @@
 func TestZettelTransclusionNoPrivilegeEscalation(t *testing.T) {
 	t.Parallel()
 	c := getClient()
 	c.SetAuth("reader", "reader")
 
-	zettelData, err := c.GetZettelJSON(context.Background(), api.ZidEmoji)
+	zettelData, err := c.GetZettelData(context.Background(), api.ZidEmoji)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 	expectedEnc := "base64"

Index: tests/markdown_test.go
==================================================================
--- tests/markdown_test.go
+++ tests/markdown_test.go
@@ -16,25 +16,25 @@
 	"fmt"
 	"os"
 	"strings"
 	"testing"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
 	_ "zettelstore.de/z/encoder/htmlenc"
 	_ "zettelstore.de/z/encoder/mdenc"
-	_ "zettelstore.de/z/encoder/sexprenc"
 	_ "zettelstore.de/z/encoder/shtmlenc"
+	_ "zettelstore.de/z/encoder/szenc"
 	_ "zettelstore.de/z/encoder/textenc"
 	_ "zettelstore.de/z/encoder/zmkenc"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
 	_ "zettelstore.de/z/parser/markdown"
 	_ "zettelstore.de/z/parser/zettelmark"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type markdownTestCase struct {
 	Markdown  string `json:"markdown"`
 	HTML      string `json:"html"`
@@ -46,11 +46,11 @@
 
 func TestEncoderAvailability(t *testing.T) {
 	t.Parallel()
 	encoderMissing := false
 	for _, enc := range encodings {
-		enc := encoder.Create(enc)
+		enc := encoder.Create(enc, &encoder.CreateParameter{Lang: api.ValueLangEN})
 		if enc == nil {
 			t.Errorf("No encoder for %q found", enc)
 			encoderMissing = true
 		}
 	}
@@ -84,18 +84,18 @@
 func testAllEncodings(t *testing.T, tc markdownTestCase, ast *ast.BlockSlice) {
 	var sb strings.Builder
 	testID := tc.Example*100 + 1
 	for _, enc := range encodings {
 		t.Run(fmt.Sprintf("Encode %v %v", enc, testID), func(st *testing.T) {
-			encoder.Create(enc).WriteBlocks(&sb, ast)
+			encoder.Create(enc, &encoder.CreateParameter{Lang: api.ValueLangEN}).WriteBlocks(&sb, ast)
 			sb.Reset()
 		})
 	}
 }
 
 func testZmkEncoding(t *testing.T, tc markdownTestCase, ast *ast.BlockSlice) {
-	zmkEncoder := encoder.Create(api.EncoderZmk)
+	zmkEncoder := encoder.Create(api.EncoderZmk, nil)
 	var buf bytes.Buffer
 	testID := tc.Example*100 + 1
 	t.Run(fmt.Sprintf("Encode zmk %14d", testID), func(st *testing.T) {
 		buf.Reset()
 		zmkEncoder.WriteBlocks(&buf, ast)
@@ -128,11 +128,11 @@
 		md  string
 		exp string
 	}{
 		{`abc<br>def`, `abc@@<br>@@{="html"}def`},
 	}
-	zmkEncoder := encoder.Create(api.EncoderZmk)
+	zmkEncoder := encoder.Create(api.EncoderZmk, nil)
 	var sb strings.Builder
 	for i, tc := range testcases {
 		ast := createMDBlockSlice(tc.md, config.MarkdownHTML)
 		sb.Reset()
 		zmkEncoder.WriteBlocks(&sb, &ast)

Index: tests/naughtystrings_test.go
==================================================================
--- tests/naughtystrings_test.go
+++ tests/naughtystrings_test.go
@@ -15,15 +15,16 @@
 	"io"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"zettelstore.de/client.fossil/api"
 	_ "zettelstore.de/z/cmd"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Test all parser / encoder with a list of "naughty strings", i.e. unusual strings
 // that often crash software.
 
@@ -53,11 +54,11 @@
 	return result
 }
 
 func getAllEncoder() (result []encoder.Encoder) {
 	for _, enc := range encoder.GetEncodings() {
-		e := encoder.Create(enc)
+		e := encoder.Create(enc, &encoder.CreateParameter{Lang: api.ValueLangEN})
 		result = append(result, e)
 	}
 	return result
 }
 

Index: tests/regression_test.go
==================================================================
--- tests/regression_test.go
+++ tests/regression_test.go
@@ -19,26 +19,27 @@
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/box/manager"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel/meta"
 
 	_ "zettelstore.de/z/box/dirbox"
 )
 
 var encodings = []api.EncodingEnum{
 	api.EncoderHTML,
-	api.EncoderSexpr,
+	api.EncoderSz,
 	api.EncoderText,
 }
 
 func getFileBoxes(wd, kind string) (root string, boxes []box.ManagedBox) {
 	root = filepath.Clean(filepath.Join(wd, "..", "testdata", kind))
@@ -118,11 +119,11 @@
 }
 
 func checkMetaFile(t *testing.T, resultName string, zn *ast.ZettelNode, enc api.EncodingEnum) {
 	t.Helper()
 
-	if enc := encoder.Create(enc); enc != nil {
+	if enc := encoder.Create(enc, &encoder.CreateParameter{Lang: api.ValueLangEN}); enc != nil {
 		var sf strings.Builder
 		enc.WriteMeta(&sf, zn.Meta, parser.ParseMetadata)
 		checkFileContent(t, resultName, sf.String())
 		return
 	}
@@ -133,18 +134,19 @@
 	ss := p.(box.StartStopper)
 	if err := ss.Start(context.Background()); err != nil {
 		panic(err)
 	}
 	metaList := []*meta.Meta{}
-	err := p.ApplyMeta(context.Background(), func(m *meta.Meta) { metaList = append(metaList, m) }, nil)
-	if err != nil {
+	if err := p.ApplyMeta(context.Background(),
+		func(m *meta.Meta) { metaList = append(metaList, m) },
+		query.AlwaysIncluded); err != nil {
 		panic(err)
 	}
 	for _, meta := range metaList {
-		zettel, err2 := p.GetZettel(context.Background(), meta.Zid)
-		if err2 != nil {
-			panic(err2)
+		zettel, err := p.GetZettel(context.Background(), meta.Zid)
+		if err != nil {
+			panic(err)
 		}
 		z := parser.ParseZettel(context.Background(), zettel, "", testConfig)
 		for _, enc := range encodings {
 			t.Run(fmt.Sprintf("%s::%d(%s)", p.Location(), meta.Zid, enc), func(st *testing.T) {
 				resultName := filepath.Join(wd, "result", "meta", boxName, z.Zid.String()+"."+enc.String())

Index: tools/build.go
==================================================================
--- tools/build.go
+++ tools/build.go
@@ -11,10 +11,11 @@
 // Package main provides a command to build and run the software.
 package main
 
 import (
 	"archive/zip"
+	"bytes"
 	"errors"
 	"flag"
 	"fmt"
 	"io"
 	"io/fs"
@@ -23,14 +24,19 @@
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/input"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
-var directProxy = []string{"GOPROXY=direct"}
+var envDirectProxy = []string{"GOPROXY=direct"}
+var envGoVCS = []string{"GOVCS=zettelstore.de:fossil"}
 
 func executeCommand(env []string, name string, arg ...string) (string, error) {
 	logCommand("EXEC", env, name, arg)
 	var out strings.Builder
 	cmd := prepareCommand(env, name, arg, &out)
@@ -137,13 +143,16 @@
 	}
 	return checkFossilExtra()
 }
 
 func checkGoTest(pkg string, testParams ...string) error {
+	var env []string
+	env = append(env, envDirectProxy...)
+	env = append(env, envGoVCS...)
 	args := []string{"test", pkg}
 	args = append(args, testParams...)
-	out, err := executeCommand(directProxy, "go", args...)
+	out, err := executeCommand(env, "go", args...)
 	if err != nil {
 		for _, line := range strfun.SplitLines(out) {
 			if strings.HasPrefix(line, "ok") || strings.HasPrefix(line, "?") {
 				continue
 			}
@@ -152,11 +161,11 @@
 	}
 	return err
 }
 
 func checkGoVet() error {
-	out, err := executeCommand(nil, "go", "vet", "./...")
+	out, err := executeCommand(envGoVCS, "go", "vet", "./...")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Some checks failed")
 		if len(out) > 0 {
 			fmt.Fprintln(os.Stderr, out)
 		}
@@ -167,11 +176,11 @@
 func checkShadow(forRelease bool) error {
 	path, err := findExecStrict("shadow", forRelease)
 	if path == "" {
 		return err
 	}
-	out, err := executeCommand(nil, path, "-strict", "./...")
+	out, err := executeCommand(envGoVCS, path, "-strict", "./...")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Some shadowed variables found")
 		if len(out) > 0 {
 			fmt.Fprintln(os.Stderr, out)
 		}
@@ -178,11 +187,11 @@
 	}
 	return err
 }
 
 func checkStaticcheck() error {
-	out, err := executeCommand(nil, "staticcheck", "./...")
+	out, err := executeCommand(envGoVCS, "staticcheck", "./...")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Some staticcheck problems found")
 		if len(out) > 0 {
 			fmt.Fprintln(os.Stderr, out)
 		}
@@ -193,11 +202,11 @@
 func checkUnparam(forRelease bool) error {
 	path, err := findExecStrict("unparam", forRelease)
 	if path == "" {
 		return err
 	}
-	out, err := executeCommand(nil, path, "./...")
+	out, err := executeCommand(envGoVCS, path, "./...")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Some unparam problems found")
 		if len(out) > 0 {
 			fmt.Fprintln(os.Stderr, out)
 		}
@@ -212,11 +221,11 @@
 	}
 	return err
 }
 
 func checkGoVulncheck() error {
-	out, err := executeCommand(nil, "govulncheck", "./...")
+	out, err := executeCommand(envGoVCS, "govulncheck", "./...")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Some checks failed")
 		if len(out) > 0 {
 			fmt.Fprintln(os.Stderr, out)
 		}
@@ -281,11 +290,11 @@
 	info.adminAddress = ":2323"
 	name, arg := "go", []string{
 		"run", "cmd/zettelstore/main.go", "run",
 		"-c", "./testdata/testbox/19700101000000.zettel", "-a", info.adminAddress[1:]}
 	logCommand("FORK", nil, name, arg)
-	cmd := prepareCommand(nil, name, arg, &info.out)
+	cmd := prepareCommand(envGoVCS, name, arg, &info.out)
 	if !verbose {
 		cmd.Stderr = nil
 	}
 	err := cmd.Start()
 	time.Sleep(2 * time.Second)
@@ -294,10 +303,11 @@
 		if addressInUse(info.adminAddress) {
 			info.cmd = cmd
 			return err
 		}
 	}
+	time.Sleep(4 * time.Second) // Wait for all zettel to be indexed.
 	return errors.New("zettelstore did not start")
 }
 
 func stopZettelstore(i *zsInfo) error {
 	conn, err := net.Dial("tcp", i.adminAddress)
@@ -319,15 +329,16 @@
 	conn.Close()
 	return true
 }
 
 func cmdBuild() error {
-	return doBuild(directProxy, getVersion(), "bin/zettelstore")
+	return doBuild(envDirectProxy, getVersion(), "bin/zettelstore")
 }
 
 func doBuild(env []string, version, target string) error {
 	env = append(env, "CGO_ENABLED=0")
+	env = append(env, envGoVCS...)
 	out, err := executeCommand(
 		env,
 		"go", "build",
 		"-tags", "osusergo,netgo",
 		"-trimpath",
@@ -369,10 +380,12 @@
 			return err
 		}
 	}
 	return nil
 }
+
+const versionZid = "00001000000001"
 
 func createManualZipEntry(path string, entry fs.DirEntry, zipWriter *zip.Writer) error {
 	info, err := entry.Info()
 	if err != nil {
 		return err
@@ -379,22 +392,48 @@
 	}
 	fh, err := zip.FileInfoHeader(info)
 	if err != nil {
 		return err
 	}
-	fh.Name = entry.Name()
+	name := entry.Name()
+	fh.Name = name
 	fh.Method = zip.Deflate
 	w, err := zipWriter.CreateHeader(fh)
 	if err != nil {
 		return err
 	}
-	manualFile, err := os.Open(filepath.Join(path, entry.Name()))
+	manualFile, err := os.Open(filepath.Join(path, name))
 	if err != nil {
 		return err
 	}
 	defer manualFile.Close()
-	_, err = io.Copy(w, manualFile)
+
+	if name != versionZid+".zettel" {
+		_, err = io.Copy(w, manualFile)
+		return err
+	}
+
+	data, err := io.ReadAll(manualFile)
+	if err != nil {
+		return err
+	}
+	inp := input.NewInput(data)
+	m := meta.NewFromInput(id.MustParse(versionZid), inp)
+	m.SetNow(api.KeyModified)
+
+	var buf bytes.Buffer
+	if _, err = fmt.Fprintf(&buf, "id: %s\n", versionZid); err != nil {
+		return err
+	}
+	if _, err = m.WriteComputed(&buf); err != nil {
+		return err
+	}
+	version := getVersion()
+	if _, err = fmt.Fprintf(&buf, "\n%s", version); err != nil {
+		return err
+	}
+	_, err = io.Copy(w, &buf)
 	return err
 }
 
 func getReleaseVersionData() string {
 	if fossil := getFossilDirty(); fossil != "" {
@@ -425,11 +464,12 @@
 		{"amd64", "windows", nil, "zettelstore.exe"},
 	}
 	for _, rel := range releases {
 		env := append([]string{}, rel.env...)
 		env = append(env, "GOARCH="+rel.arch, "GOOS="+rel.os)
-		env = append(env, directProxy...)
+		env = append(env, envDirectProxy...)
+		env = append(env, envGoVCS...)
 		zsName := filepath.Join("releases", rel.name)
 		if err := doBuild(env, base, zsName); err != nil {
 			return err
 		}
 		zipName := fmt.Sprintf("zettelstore-%v-%v-%v.zip", base, rel.os, rel.arch)
@@ -484,10 +524,36 @@
 		return err
 	}
 	_, err = io.Copy(w, zsFile)
 	return err
 }
+
+func cmdTools() error {
+	tools := []struct{ name, pack string }{
+		{"shadow", "golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest"},
+		{"unparam", "mvdan.cc/unparam@latest"},
+		{"staticcheck", "honnef.co/go/tools/cmd/staticcheck@latest"},
+		{"govulncheck", "golang.org/x/vuln/cmd/govulncheck@latest"},
+	}
+	for _, tool := range tools {
+		err := doGoInstall(tool.pack)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+func doGoInstall(pack string) error {
+	out, err := executeCommand(nil, "go", "install", pack)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "Unable to install package", pack)
+		if len(out) > 0 {
+			fmt.Fprintln(os.Stderr, out)
+		}
+	}
+	return err
+}
 
 func cmdClean() error {
 	for _, dir := range []string{"bin", "releases"} {
 		err := os.RemoveAll(dir)
 		if err != nil {
@@ -527,18 +593,17 @@
   manual    Create a ZIP file with all manual zettel
   relcheck  Check current working state for release.
   release   Create the software for various platforms and put them in
             appropriate named ZIP files.
   testapi   Start a Zettelstore and execute API tests.
+  tools     Install/update tools needed for building Zettelstore.
   version   Print the current version of the software.
 
 All commands can be abbreviated as long as they remain unique.`)
 }
 
-var (
-	verbose bool
-)
+var verbose bool
 
 func main() {
 	flag.BoolVar(&verbose, "v", false, "Verbose output")
 	flag.Parse()
 	var err error
@@ -559,12 +624,14 @@
 			fmt.Print(getVersion())
 		case "ch", "che", "chec", "check":
 			err = cmdCheck(false)
 		case "relc", "relch", "relche", "relchec", "relcheck":
 			err = cmdCheck(true)
-		case "t", "te", "tes", "test", "testa", "testap", "testapi":
+		case "te", "tes", "test", "testa", "testap", "testapi":
 			cmdTestAPI()
+		case "to", "too", "tool", "tools":
+			err = cmdTools()
 		case "h", "he", "hel", "help":
 			cmdHelp()
 		default:
 			fmt.Fprintf(os.Stderr, "Unknown command %q\n", args[0])
 			cmdHelp()

Index: usecase/authenticate.go
==================================================================
--- usecase/authenticate.go
+++ usecase/authenticate.go
@@ -14,40 +14,31 @@
 	"context"
 	"math/rand"
 	"net/http"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/auth/cred"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/logger"
-	"zettelstore.de/z/query"
-)
-
-// AuthenticatePort is the interface used by this use case.
-type AuthenticatePort interface {
-	GetMeta(context.Context, id.Zid) (*meta.Meta, error)
-	SelectMeta(context.Context, *query.Query) ([]*meta.Meta, error)
-}
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
 
 // Authenticate is the data for this use case.
 type Authenticate struct {
 	log       *logger.Logger
 	token     auth.TokenManager
-	port      AuthenticatePort
-	ucGetUser GetUser
+	ucGetUser *GetUser
 }
 
 // NewAuthenticate creates a new use case.
-func NewAuthenticate(log *logger.Logger, token auth.TokenManager, authz auth.AuthzManager, port AuthenticatePort) Authenticate {
+func NewAuthenticate(log *logger.Logger, token auth.TokenManager, ucGetUser *GetUser) Authenticate {
 	return Authenticate{
 		log:       log,
 		token:     token,
-		port:      port,
-		ucGetUser: NewGetUser(authz, port),
+		ucGetUser: ucGetUser,
 	}
 }
 
 // Run executes the use case.
 //

DELETED usecase/context.go
Index: usecase/context.go
==================================================================
--- usecase/context.go
+++ usecase/context.go
@@ -1,295 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package usecase
-
-import (
-	"context"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/query"
-)
-
-// ZettelContextPort is the interface used by this use case.
-type ZettelContextPort interface {
-	// GetMeta retrieves just the meta data of a specific zettel.
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-
-	// SelectMeta returns all zettel metadata that match the selection criteria.
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
-}
-
-// ZettelContextConfig is the interface to allow the usecase to read some config data.
-type ZettelContextConfig interface {
-	// Get returns a config value that might be user-specific.
-	Get(ctx context.Context, m *meta.Meta, key string) string
-}
-
-// ZettelContext is the data for this use case.
-type ZettelContext struct {
-	port   ZettelContextPort
-	config ZettelContextConfig
-}
-
-// NewZettelContext creates a new use case.
-func NewZettelContext(port ZettelContextPort, config ZettelContextConfig) ZettelContext {
-	return ZettelContext{port: port, config: config}
-}
-
-// ZettelContextDirection determines the way, the context is calculated.
-type ZettelContextDirection int
-
-// Constant values for ZettelContextDirection
-const (
-	_                     ZettelContextDirection = iota
-	ZettelContextForward                         // Traverse all forwarding links
-	ZettelContextBackward                        // Traverse all backwaring links
-	ZettelContextBoth                            // Traverse both directions
-)
-
-// Run executes the use case.
-func (uc ZettelContext) Run(ctx context.Context, zid id.Zid, dir ZettelContextDirection, maxCost, limit int) (result []*meta.Meta, err error) {
-	start, err := uc.port.GetMeta(ctx, zid)
-	if err != nil {
-		return nil, err
-	}
-	tasks := newQueue(start, maxCost, limit)
-	isBackward := dir == ZettelContextBoth || dir == ZettelContextBackward
-	isForward := dir == ZettelContextBoth || dir == ZettelContextForward
-	for {
-		m, cost := tasks.next()
-		if m == nil {
-			break
-		}
-		result = append(result, m)
-
-		for _, p := range m.ComputedPairsRest() {
-			tasks.addPair(ctx, uc.port, p.Key, p.Value, cost, isBackward, isForward)
-		}
-		if tags, found := m.GetList(api.KeyTags); found {
-			for _, tag := range tags {
-				tasks.addSameTag(ctx, uc.port, tag, cost)
-			}
-		}
-	}
-	return result, nil
-}
-
-type ztlCtxTask struct {
-	next *ztlCtxTask
-	prev *ztlCtxTask
-	meta *meta.Meta
-	cost int
-}
-
-type contextQueue struct {
-	seen    id.Set
-	first   *ztlCtxTask
-	last    *ztlCtxTask
-	maxCost int
-	limit   int
-	tagCost map[string][]*meta.Meta
-}
-
-func newQueue(m *meta.Meta, maxCost, limit int) *contextQueue {
-	task := &ztlCtxTask{
-		next: nil,
-		prev: nil,
-		meta: m,
-		cost: 0,
-	}
-	result := &contextQueue{
-		seen:    id.NewSet(),
-		first:   task,
-		last:    task,
-		maxCost: maxCost,
-		limit:   limit,
-		tagCost: make(map[string][]*meta.Meta, 1024),
-	}
-	return result
-}
-
-func (zc *contextQueue) addPair(
-	ctx context.Context, port ZettelContextPort,
-	key, value string,
-	curCost int, isBackward, isForward bool,
-) {
-	if key == api.KeyBack {
-		return
-	}
-	newCost := curCost + contextCost(key)
-	if key == api.KeyBackward {
-		if isBackward {
-			zc.addIDSet(ctx, port, newCost, value)
-		}
-		return
-	}
-	if key == api.KeyForward {
-		if isForward {
-			zc.addIDSet(ctx, port, newCost, value)
-		}
-		return
-	}
-	hasInverse := meta.Inverse(key) != ""
-	if (!hasInverse || !isBackward) && (hasInverse || !isForward) {
-		return
-	}
-	if t := meta.Type(key); t == meta.TypeID {
-		zc.addID(ctx, port, newCost, value)
-	} else if t == meta.TypeIDSet {
-		zc.addIDSet(ctx, port, newCost, value)
-	}
-}
-
-func contextCost(key string) int {
-	switch key {
-	case api.KeyFolge, api.KeyPrecursor:
-		return 1
-	case api.KeySuccessors, api.KeyPredecessor:
-		return 2
-	}
-	return 3
-}
-
-func (zc *contextQueue) addID(ctx context.Context, port ZettelContextPort, newCost int, value string) {
-	if zc.costMaxed(newCost) {
-		return
-	}
-
-	zid, err := id.Parse(value)
-	if err != nil {
-		return
-	}
-	m, err := port.GetMeta(ctx, zid)
-	if err != nil {
-		return
-	}
-	zc.addMeta(m, newCost)
-}
-func (zc *contextQueue) addMeta(m *meta.Meta, newCost int) {
-	task := &ztlCtxTask{next: nil, prev: nil, meta: m, cost: newCost}
-	if zc.first == nil {
-		zc.first = task
-		zc.last = task
-		return
-	}
-
-	// Search backward for a task t with at most the same cost
-	for t := zc.last; t != nil; t = t.prev {
-		if t.cost <= task.cost {
-			// Found!
-			if t.next != nil {
-				t.next.prev = task
-			}
-			task.next = t.next
-			t.next = task
-			task.prev = t
-			if task.next == nil {
-				zc.last = task
-			}
-			return
-		}
-	}
-
-	// We have not found a task, therefore the new task is the first one
-	task.next = zc.first
-	zc.first.prev = task
-	zc.first = task
-}
-
-func (zc *contextQueue) costMaxed(newCost int) bool {
-	return (zc.maxCost > 0 && newCost > zc.maxCost) || zc.hasLimit()
-}
-
-func (zc *contextQueue) addIDSet(ctx context.Context, port ZettelContextPort, newCost int, value string) {
-	elems := meta.ListFromValue(value)
-	refCost := referenceCost(newCost, len(elems))
-	for _, val := range elems {
-		zc.addID(ctx, port, refCost, val)
-	}
-}
-
-func referenceCost(baseCost int, numReferences int) int {
-	baseCost++
-	if numReferences < 5 {
-		return baseCost
-	}
-	if numReferences < 9 {
-		return baseCost * 2
-	}
-	if numReferences < 17 {
-		return baseCost * 3
-	}
-	if numReferences < 33 {
-		return baseCost * 4
-	}
-	if numReferences < 65 {
-		return baseCost * 5
-	}
-	return baseCost * numReferences / 8
-}
-
-func (zc *contextQueue) addSameTag(ctx context.Context, port ZettelContextPort, tag string, baseCost int) {
-	tagMetas, found := zc.tagCost[tag]
-	if !found {
-		q := query.Parse(api.KeyTags + api.SearchOperatorHas + tag)
-		ml, err := port.SelectMeta(ctx, q)
-		if err != nil {
-			return
-		}
-		tagMetas = ml
-		zc.tagCost[tag] = ml
-	}
-	cost := tagCost(baseCost, len(tagMetas))
-	if zc.costMaxed(cost) {
-		return
-	}
-	for _, m := range tagMetas {
-		zc.addMeta(m, cost)
-	}
-}
-
-func tagCost(baseCost, numTags int) int {
-	if numTags < 5 {
-		return baseCost + numTags
-	}
-	return (baseCost + 2) * (numTags + 1) / 4
-}
-
-func (zc *contextQueue) next() (*meta.Meta, int) {
-	if zc.hasLimit() {
-		return nil, -1
-	}
-	for zc.first != nil {
-		task := zc.first
-		zc.first = task.next
-		if zc.first == nil {
-			zc.last = nil
-		} else {
-			zc.first.prev = nil
-		}
-		m := task.meta
-		zid := m.Zid
-		_, found := zc.seen[zid]
-		if found {
-			continue
-		}
-		zc.seen.Zid(zid)
-		return m, task.cost
-	}
-	return nil, -1
-}
-
-func (zc *contextQueue) hasLimit() bool {
-	limit := zc.limit
-	return limit > 0 && len(zc.seen) > limit
-}

Index: usecase/create_zettel.go
==================================================================
--- usecase/create_zettel.go
+++ usecase/create_zettel.go
@@ -12,22 +12,22 @@
 
 import (
 	"context"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // CreateZettelPort is the interface used by this use case.
 type CreateZettelPort interface {
 	// CreateZettel creates a new zettel.
-	CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error)
+	CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error)
 }
 
 // CreateZettel is the data for this use case.
 type CreateZettel struct {
 	log      *logger.Logger
@@ -43,64 +43,82 @@
 		port:     port,
 	}
 }
 
 // PrepareCopy the zettel for further modification.
-func (*CreateZettel) PrepareCopy(origZettel domain.Zettel) domain.Zettel {
-	m := origZettel.Meta.Clone()
-	if title, found := m.Get(api.KeyTitle); found {
+func (*CreateZettel) PrepareCopy(origZettel zettel.Zettel) zettel.Zettel {
+	origMeta := origZettel.Meta
+	m := origMeta.Clone()
+	if title, found := origMeta.Get(api.KeyTitle); found {
 		m.Set(api.KeyTitle, prependTitle(title, "Copy", "Copy of "))
 	}
 	setReadonly(m)
 	content := origZettel.Content
 	content.TrimSpace()
-	return domain.Zettel{Meta: m, Content: content}
+	return zettel.Zettel{Meta: m, Content: content}
 }
 
 // PrepareVersion the zettel for further modification.
-func (*CreateZettel) PrepareVersion(origZettel domain.Zettel) domain.Zettel {
+func (*CreateZettel) PrepareVersion(origZettel zettel.Zettel) zettel.Zettel {
 	origMeta := origZettel.Meta
 	m := origMeta.Clone()
 	m.Set(api.KeyPredecessor, origMeta.Zid.String())
 	setReadonly(m)
 	content := origZettel.Content
 	content.TrimSpace()
-	return domain.Zettel{Meta: m, Content: content}
+	return zettel.Zettel{Meta: m, Content: content}
 }
 
 // PrepareFolge the zettel for further modification.
-func (*CreateZettel) PrepareFolge(origZettel domain.Zettel) domain.Zettel {
+func (*CreateZettel) PrepareFolge(origZettel zettel.Zettel) zettel.Zettel {
 	origMeta := origZettel.Meta
 	m := meta.New(id.Invalid)
 	if title, found := origMeta.Get(api.KeyTitle); found {
 		m.Set(api.KeyTitle, prependTitle(title, "Folge", "Folge of "))
 	}
-	m.SetNonEmpty(api.KeyRole, origMeta.GetDefault(api.KeyRole, ""))
-	m.SetNonEmpty(api.KeyTags, origMeta.GetDefault(api.KeyTags, ""))
-	m.SetNonEmpty(api.KeySyntax, origMeta.GetDefault(api.KeySyntax, ""))
+	updateMetaRoleTagsSyntax(m, origMeta)
 	m.Set(api.KeyPrecursor, origMeta.Zid.String())
-	return domain.Zettel{Meta: m, Content: domain.NewContent(nil)}
+	return zettel.Zettel{Meta: m, Content: zettel.NewContent(nil)}
+}
+
+// PrepareChild the zettel for further modification.
+func (*CreateZettel) PrepareChild(origZettel zettel.Zettel) zettel.Zettel {
+	origMeta := origZettel.Meta
+	m := meta.New(id.Invalid)
+	if title, found := origMeta.Get(api.KeyTitle); found {
+		m.Set(api.KeyTitle, prependTitle(title, "Child", "Child of "))
+	}
+	updateMetaRoleTagsSyntax(m, origMeta)
+	m.Set(api.KeySuperior, origMeta.Zid.String())
+	return zettel.Zettel{Meta: m, Content: zettel.NewContent(nil)}
 }
 
 // PrepareNew the zettel for further modification.
-func (*CreateZettel) PrepareNew(origZettel domain.Zettel) domain.Zettel {
+func (*CreateZettel) PrepareNew(origZettel zettel.Zettel, newTitle string) zettel.Zettel {
 	m := meta.New(id.Invalid)
 	om := origZettel.Meta
 	m.SetNonEmpty(api.KeyTitle, om.GetDefault(api.KeyTitle, ""))
-	m.SetNonEmpty(api.KeyRole, om.GetDefault(api.KeyRole, ""))
-	m.SetNonEmpty(api.KeyTags, om.GetDefault(api.KeyTags, ""))
-	m.SetNonEmpty(api.KeySyntax, om.GetDefault(api.KeySyntax, ""))
+	updateMetaRoleTagsSyntax(m, om)
 
 	const prefixLen = len(meta.NewPrefix)
 	for _, pair := range om.PairsRest() {
 		if key := pair.Key; len(key) > prefixLen && key[0:prefixLen] == meta.NewPrefix {
 			m.Set(key[prefixLen:], pair.Value)
 		}
 	}
+	if newTitle != "" {
+		m.Set(api.KeyTitle, newTitle)
+	}
 	content := origZettel.Content
 	content.TrimSpace()
-	return domain.Zettel{Meta: m, Content: content}
+	return zettel.Zettel{Meta: m, Content: content}
+}
+
+func updateMetaRoleTagsSyntax(m, orig *meta.Meta) {
+	m.SetNonEmpty(api.KeyRole, orig.GetDefault(api.KeyRole, ""))
+	m.SetNonEmpty(api.KeyTags, orig.GetDefault(api.KeyTags, ""))
+	m.SetNonEmpty(api.KeySyntax, orig.GetDefault(api.KeySyntax, ""))
 }
 
 func prependTitle(title, s0, s1 string) string {
 	if len(title) > 0 {
 		return s1 + title
@@ -118,20 +136,20 @@
 		m.Set(api.KeyReadOnly, api.ValueFalse)
 	}
 }
 
 // Run executes the use case.
-func (uc *CreateZettel) Run(ctx context.Context, zettel domain.Zettel) (id.Zid, error) {
+func (uc *CreateZettel) Run(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) {
 	m := zettel.Meta
 	if m.Zid.IsValid() {
 		return m.Zid, nil // TODO: new error: already exists
 	}
 
-	m.Set(api.KeyCreated, time.Now().Local().Format(id.ZidLayout))
+	m.Set(api.KeyCreated, time.Now().Local().Format(id.TimestampLayout))
 	m.Delete(api.KeyModified)
 	m.YamlSep = uc.rtConfig.GetYAMLHeader()
 
 	zettel.Content.TrimSpace()
 	zid, err := uc.port.CreateZettel(ctx, zettel)
 	uc.log.Info().User(ctx).Zid(zid).Err(err).Msg("Create zettel")
 	return zid, err
 }

Index: usecase/delete_zettel.go
==================================================================
--- usecase/delete_zettel.go
+++ usecase/delete_zettel.go
@@ -11,12 +11,12 @@
 package usecase
 
 import (
 	"context"
 
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel/id"
 )
 
 // DeleteZettelPort is the interface used by this use case.
 type DeleteZettelPort interface {
 	// DeleteZettel removes the zettel from the box.

Index: usecase/evaluate.go
==================================================================
--- usecase/evaluate.go
+++ usecase/evaluate.go
@@ -13,49 +13,48 @@
 import (
 	"context"
 
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/evaluator"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Evaluate is the data for this use case.
 type Evaluate struct {
-	rtConfig  config.Config
-	getZettel GetZettel
-	getMeta   GetMeta
-	listMeta  ListMeta
+	rtConfig    config.Config
+	ucGetZettel *GetZettel
+	ucQuery     *Query
 }
 
 // NewEvaluate creates a new use case.
-func NewEvaluate(rtConfig config.Config, getZettel GetZettel, getMeta GetMeta, listMeta ListMeta) Evaluate {
+func NewEvaluate(rtConfig config.Config, ucGetZettel *GetZettel, ucQuery *Query) Evaluate {
 	return Evaluate{
-		rtConfig:  rtConfig,
-		getZettel: getZettel,
-		getMeta:   getMeta,
-		listMeta:  listMeta,
+		rtConfig:    rtConfig,
+		ucGetZettel: ucGetZettel,
+		ucQuery:     ucQuery,
 	}
 }
 
 // Run executes the use case.
 func (uc *Evaluate) Run(ctx context.Context, zid id.Zid, syntax string) (*ast.ZettelNode, error) {
-	zettel, err := uc.getZettel.Run(ctx, zid)
+	zettel, err := uc.ucGetZettel.Run(ctx, zid)
 	if err != nil {
 		return nil, err
 	}
-	zn, err := parser.ParseZettel(ctx, zettel, syntax, uc.rtConfig), nil
-	if err != nil {
-		return nil, err
-	}
+	return uc.RunZettel(ctx, zettel, syntax), nil
+}
 
+// RunZettel executes the use case for a given zettel.
+func (uc *Evaluate) RunZettel(ctx context.Context, zettel zettel.Zettel, syntax string) *ast.ZettelNode {
+	zn := parser.ParseZettel(ctx, zettel, syntax, uc.rtConfig)
 	evaluator.EvaluateZettel(ctx, uc, uc.rtConfig, zn)
-	return zn, nil
+	return zn
 }
 
 // RunBlockNode executes the use case for a metadata list.
 func (uc *Evaluate) RunBlockNode(ctx context.Context, bn ast.BlockNode) ast.BlockSlice {
 	if bn == nil {
@@ -71,19 +70,14 @@
 	is := parser.ParseMetadata(value)
 	evaluator.EvaluateInline(ctx, uc, uc.rtConfig, &is)
 	return is
 }
 
-// GetMeta retrieves the metadata of a given zettel identifier.
-func (uc *Evaluate) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
-	return uc.getMeta.Run(ctx, zid)
+// GetZettel retrieves the full zettel of a given zettel identifier.
+func (uc *Evaluate) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) {
+	return uc.ucGetZettel.Run(ctx, zid)
 }
 
-// GetZettel retrieves the full zettel of a given zettel identifier.
-func (uc *Evaluate) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) {
-	return uc.getZettel.Run(ctx, zid)
-}
-
-// SelectMeta returns a list of metadata that comply to the given selection criteria.
-func (uc *Evaluate) SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) {
-	return uc.listMeta.Run(ctx, q)
+// QueryMeta returns a list of metadata that comply to the given selection criteria.
+func (uc *Evaluate) QueryMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) {
+	return uc.ucQuery.Run(ctx, q)
 }

DELETED usecase/get_all_meta.go
Index: usecase/get_all_meta.go
==================================================================
--- usecase/get_all_meta.go
+++ usecase/get_all_meta.go
@@ -1,39 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package usecase
-
-import (
-	"context"
-
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-)
-
-// GetAllMetaPort is the interface used by this use case.
-type GetAllMetaPort interface {
-	// GetAllMeta retrieves just the meta data of a specific zettel.
-	GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error)
-}
-
-// GetAllMeta is the data for this use case.
-type GetAllMeta struct {
-	port GetAllMetaPort
-}
-
-// NewGetAllMeta creates a new use case.
-func NewGetAllMeta(port GetAllMetaPort) GetAllMeta {
-	return GetAllMeta{port: port}
-}
-
-// Run executes the use case.
-func (uc GetAllMeta) Run(ctx context.Context, zid id.Zid) ([]*meta.Meta, error) {
-	return uc.port.GetAllMeta(ctx, zid)
-}

ADDED   usecase/get_all_zettel.go
Index: usecase/get_all_zettel.go
==================================================================
--- usecase/get_all_zettel.go
+++ usecase/get_all_zettel.go
@@ -0,0 +1,38 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2021-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package usecase
+
+import (
+	"context"
+
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+)
+
+// GetAllZettelPort is the interface used by this use case.
+type GetAllZettelPort interface {
+	GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error)
+}
+
+// GetAllZettel is the data for this use case.
+type GetAllZettel struct {
+	port GetAllZettelPort
+}
+
+// NewGetAllZettel creates a new use case.
+func NewGetAllZettel(port GetAllZettelPort) GetAllZettel {
+	return GetAllZettel{port: port}
+}
+
+// Run executes the use case.
+func (uc GetAllZettel) Run(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error) {
+	return uc.port.GetAllZettel(ctx, zid)
+}

DELETED usecase/get_meta.go
Index: usecase/get_meta.go
==================================================================
--- usecase/get_meta.go
+++ usecase/get_meta.go
@@ -1,39 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package usecase
-
-import (
-	"context"
-
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-)
-
-// GetMetaPort is the interface used by this use case.
-type GetMetaPort interface {
-	// GetMeta retrieves just the meta data of a specific zettel.
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-}
-
-// GetMeta is the data for this use case.
-type GetMeta struct {
-	port GetMetaPort
-}
-
-// NewGetMeta creates a new use case.
-func NewGetMeta(port GetMetaPort) GetMeta {
-	return GetMeta{port: port}
-}
-
-// Run executes the use case.
-func (uc GetMeta) Run(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
-	return uc.port.GetMeta(ctx, zid)
-}

ADDED   usecase/get_special_zettel.go
Index: usecase/get_special_zettel.go
==================================================================
--- usecase/get_special_zettel.go
+++ usecase/get_special_zettel.go
@@ -0,0 +1,110 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package usecase
+
+import (
+	"context"
+
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// TagZettel is the usecase of retrieving a "tag zettel", i.e. a zettel that
+// describes a given tag. A tag zettel must have the tag's name in its title
+// and must have a role=tag.
+
+// TagZettelPort is the interface used by this use case.
+type TagZettelPort interface {
+	// GetZettel retrieves a specific zettel.
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
+}
+
+// TagZettel is the data for this use case.
+type TagZettel struct {
+	port  GetZettelPort
+	query *Query
+}
+
+// NewTagZettel creates a new use case.
+func NewTagZettel(port GetZettelPort, query *Query) TagZettel {
+	return TagZettel{port: port, query: query}
+}
+
+// Run executes the use case.
+func (uc TagZettel) Run(ctx context.Context, tag string) (zettel.Zettel, error) {
+	tag = meta.NormalizeTag(tag)
+	q := query.Parse(
+		api.KeyTitle + api.SearchOperatorEqual + tag + " " +
+			api.KeyRole + api.SearchOperatorHas + api.ValueRoleTag)
+	ml, err := uc.query.Run(ctx, q)
+	if err != nil {
+		return zettel.Zettel{}, err
+	}
+	for _, m := range ml {
+		z, errZ := uc.port.GetZettel(ctx, m.Zid)
+		if errZ == nil {
+			return z, nil
+		}
+	}
+	return zettel.Zettel{}, ErrTagZettelNotFound{Tag: tag}
+}
+
+// ErrTagZettelNotFound is returned if a tag zettel was not found.
+type ErrTagZettelNotFound struct{ Tag string }
+
+func (etznf ErrTagZettelNotFound) Error() string { return "tag zettel not found: " + etznf.Tag }
+
+// RoleZettel is the usecase of retrieving a "role zettel", i.e. a zettel that
+// describes a given role. A role zettel must have the role's name in its title
+// and must have a role=role.
+
+// RoleZettelPort is the interface used by this use case.
+type RoleZettelPort interface {
+	// GetZettel retrieves a specific zettel.
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
+}
+
+// RoleZettel is the data for this use case.
+type RoleZettel struct {
+	port  GetZettelPort
+	query *Query
+}
+
+// NewRoleZettel creates a new use case.
+func NewRoleZettel(port GetZettelPort, query *Query) RoleZettel {
+	return RoleZettel{port: port, query: query}
+}
+
+// Run executes the use case.
+func (uc RoleZettel) Run(ctx context.Context, role string) (zettel.Zettel, error) {
+	q := query.Parse(
+		api.KeyTitle + api.SearchOperatorEqual + role + " " +
+			api.KeyRole + api.SearchOperatorHas + api.ValueRoleRole)
+	ml, err := uc.query.Run(ctx, q)
+	if err != nil {
+		return zettel.Zettel{}, err
+	}
+	for _, m := range ml {
+		z, errZ := uc.port.GetZettel(ctx, m.Zid)
+		if errZ == nil {
+			return z, nil
+		}
+	}
+	return zettel.Zettel{}, ErrRoleZettelNotFound{Role: role}
+}
+
+// ErrRoleZettelNotFound is returned if a role zettel was not found.
+type ErrRoleZettelNotFound struct{ Role string }
+
+func (etznf ErrRoleZettelNotFound) Error() string { return "role zettel not found: " + etznf.Role }

Index: usecase/get_user.go
==================================================================
--- usecase/get_user.go
+++ usecase/get_user.go
@@ -11,25 +11,26 @@
 package usecase
 
 import (
 	"context"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Use case: return user identified by meta key ident.
 // ---------------------------------------------------
 
 // GetUserPort is the interface used by this use case.
 type GetUserPort interface {
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
+	SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error)
 }
 
 // GetUser is the data for this use case.
 type GetUser struct {
 	authz auth.AuthzManager
@@ -46,17 +47,17 @@
 	ctx = box.NoEnrichContext(ctx)
 
 	// It is important to try first with the owner. First, because another user
 	// could give herself the same ''ident''. Second, in most cases the owner
 	// will authenticate.
-	identMeta, err := uc.port.GetMeta(ctx, uc.authz.Owner())
-	if err == nil && identMeta.GetDefault(api.KeyUserID, "") == ident {
-		return identMeta, nil
+	identZettel, err := uc.port.GetZettel(ctx, uc.authz.Owner())
+	if err == nil && identZettel.Meta.GetDefault(api.KeyUserID, "") == ident {
+		return identZettel.Meta, nil
 	}
 	// Owner was not found or has another ident. Try via list search.
 	q := query.Parse(api.KeyUserID + api.SearchOperatorHas + ident + " " + api.SearchOperatorHas + ident)
-	metaList, err := uc.port.SelectMeta(ctx, q)
+	metaList, err := uc.port.SelectMeta(ctx, nil, q)
 	if err != nil {
 		return nil, err
 	}
 	if len(metaList) < 1 {
 		return nil, nil
@@ -67,11 +68,11 @@
 // Use case: return an user identified by zettel id and assert given ident value.
 // ------------------------------------------------------------------------------
 
 // GetUserByZidPort is the interface used by this use case.
 type GetUserByZidPort interface {
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
 }
 
 // GetUserByZid is the data for this use case.
 type GetUserByZid struct {
 	port GetUserByZidPort
@@ -82,15 +83,16 @@
 	return GetUserByZid{port: port}
 }
 
 // GetUser executes the use case.
 func (uc GetUserByZid) GetUser(ctx context.Context, zid id.Zid, ident string) (*meta.Meta, error) {
-	userMeta, err := uc.port.GetMeta(box.NoEnrichContext(ctx), zid)
+	userZettel, err := uc.port.GetZettel(box.NoEnrichContext(ctx), zid)
 	if err != nil {
 		return nil, err
 	}
 
+	userMeta := userZettel.Meta
 	if val, ok := userMeta.Get(api.KeyUserID); !ok || val != ident {
 		return nil, nil
 	}
 	return userMeta, nil
 }

Index: usecase/get_zettel.go
==================================================================
--- usecase/get_zettel.go
+++ usecase/get_zettel.go
@@ -11,18 +11,18 @@
 package usecase
 
 import (
 	"context"
 
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
 )
 
 // GetZettelPort is the interface used by this use case.
 type GetZettelPort interface {
 	// GetZettel retrieves a specific zettel.
-	GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error)
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
 }
 
 // GetZettel is the data for this use case.
 type GetZettel struct {
 	port GetZettelPort
@@ -32,8 +32,8 @@
 func NewGetZettel(port GetZettelPort) GetZettel {
 	return GetZettel{port: port}
 }
 
 // Run executes the use case.
-func (uc GetZettel) Run(ctx context.Context, zid id.Zid) (domain.Zettel, error) {
+func (uc GetZettel) Run(ctx context.Context, zid id.Zid) (zettel.Zettel, error) {
 	return uc.port.GetZettel(ctx, zid)
 }

Index: usecase/lists.go
==================================================================
--- usecase/lists.go
+++ usecase/lists.go
@@ -11,44 +11,22 @@
 package usecase
 
 import (
 	"context"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/parser"
-	"zettelstore.de/z/query"
-)
-
-// ListMetaPort is the interface used by this use case.
-type ListMetaPort interface {
-	// SelectMeta returns all zettel metadata that match the selection criteria.
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
-}
-
-// ListMeta is the data for this use case.
-type ListMeta struct {
-	port ListMetaPort
-}
-
-// NewListMeta creates a new use case.
-func NewListMeta(port ListMetaPort) ListMeta {
-	return ListMeta{port: port}
-}
-
-// Run executes the use case.
-func (uc ListMeta) Run(ctx context.Context, q *query.Query) ([]*meta.Meta, error) {
-	return uc.port.SelectMeta(ctx, q)
-}
-
-// -------- List roles -------------------------------------------------------
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/box"
+	"zettelstore.de/z/parser"
+	"zettelstore.de/z/query"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// -------- List syntax ------------------------------------------------------
 
 // ListSyntaxPort is the interface used by this use case.
 type ListSyntaxPort interface {
-	// SelectMeta returns all zettel metadata that match the selection criteria.
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
+	SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error)
 }
 
 // ListSyntax is the data for this use case.
 type ListSyntax struct {
 	port ListSyntaxPort
@@ -60,11 +38,11 @@
 }
 
 // Run executes the use case.
 func (uc ListSyntax) Run(ctx context.Context) (meta.Arrangement, error) {
 	q := query.Parse(api.KeySyntax + api.ExistOperator) // We look for all metadata with a syntax key
-	metas, err := uc.port.SelectMeta(box.NoEnrichContext(ctx), q)
+	metas, err := uc.port.SelectMeta(box.NoEnrichContext(ctx), nil, q)
 	if err != nil {
 		return nil, err
 	}
 	result := meta.CreateArrangement(metas, api.KeySyntax)
 	for _, syn := range parser.GetSyntaxes() {
@@ -77,12 +55,11 @@
 
 // -------- List roles -------------------------------------------------------
 
 // ListRolesPort is the interface used by this use case.
 type ListRolesPort interface {
-	// SelectMeta returns all zettel metadata that match the selection criteria.
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
+	SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error)
 }
 
 // ListRoles is the data for this use case.
 type ListRoles struct {
 	port ListRolesPort
@@ -94,11 +71,11 @@
 }
 
 // Run executes the use case.
 func (uc ListRoles) Run(ctx context.Context) (meta.Arrangement, error) {
 	q := query.Parse(api.KeyRole + api.ExistOperator) // We look for all metadata with an existing role key
-	metas, err := uc.port.SelectMeta(box.NoEnrichContext(ctx), q)
+	metas, err := uc.port.SelectMeta(box.NoEnrichContext(ctx), nil, q)
 	if err != nil {
 		return nil, err
 	}
 	return meta.CreateArrangement(metas, api.KeyRole), nil
 }

DELETED usecase/order.go
Index: usecase/order.go
==================================================================
--- usecase/order.go
+++ usecase/order.go
@@ -1,54 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package usecase
-
-import (
-	"context"
-
-	"zettelstore.de/z/collect"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-)
-
-// ZettelOrderPort is the interface used by this use case.
-type ZettelOrderPort interface {
-	// GetMeta retrieves just the meta data of a specific zettel.
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-}
-
-// ZettelOrder is the data for this use case.
-type ZettelOrder struct {
-	port     ZettelOrderPort
-	evaluate Evaluate
-}
-
-// NewZettelOrder creates a new use case.
-func NewZettelOrder(port ZettelOrderPort, evaluate Evaluate) ZettelOrder {
-	return ZettelOrder{port: port, evaluate: evaluate}
-}
-
-// Run executes the use case.
-func (uc ZettelOrder) Run(ctx context.Context, zid id.Zid, syntax string) (
-	start *meta.Meta, result []*meta.Meta, err error,
-) {
-	zn, err := uc.evaluate.Run(ctx, zid, syntax)
-	if err != nil {
-		return nil, nil, err
-	}
-	for _, ref := range collect.Order(zn) {
-		if collectedZid, err2 := id.Parse(ref.URL.Path); err2 == nil {
-			if m, err3 := uc.port.GetMeta(ctx, collectedZid); err3 == nil {
-				result = append(result, m)
-			}
-		}
-	}
-	return zn.Meta, result, nil
-}

Index: usecase/parse_zettel.go
==================================================================
--- usecase/parse_zettel.go
+++ usecase/parse_zettel.go
@@ -13,12 +13,12 @@
 import (
 	"context"
 
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/zettel/id"
 )
 
 // ParseZettel is the data for this use case.
 type ParseZettel struct {
 	rtConfig  config.Config

ADDED   usecase/query.go
Index: usecase/query.go
==================================================================
--- usecase/query.go
+++ usecase/query.go
@@ -0,0 +1,276 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2020-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package usecase
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/ast"
+	"zettelstore.de/z/box"
+	"zettelstore.de/z/collect"
+	"zettelstore.de/z/parser"
+	"zettelstore.de/z/query"
+	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// QueryPort is the interface used by this use case.
+type QueryPort interface {
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
+	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
+	SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error)
+}
+
+// Query is the data for this use case.
+type Query struct {
+	port       QueryPort
+	ucEvaluate Evaluate
+}
+
+// NewQuery creates a new use case.
+func NewQuery(port QueryPort) Query {
+	return Query{port: port}
+}
+
+// SetEvaluate sets the usecase Evaluate, because of circular dependencies.
+func (uc *Query) SetEvaluate(ucEvaluate *Evaluate) { uc.ucEvaluate = *ucEvaluate }
+
+// Run executes the use case.
+func (uc *Query) Run(ctx context.Context, q *query.Query) ([]*meta.Meta, error) {
+	zids := q.GetZids()
+	if zids == nil {
+		return uc.port.SelectMeta(ctx, nil, q)
+	}
+	if len(zids) == 0 {
+		return nil, nil
+	}
+	metaSeq, err := uc.getMetaZid(ctx, zids)
+	if err != nil {
+		return metaSeq, err
+	}
+	if metaSeq = uc.processDirectives(ctx, metaSeq, q.GetDirectives()); len(metaSeq) > 0 {
+		return uc.port.SelectMeta(ctx, metaSeq, q)
+	}
+	return nil, nil
+}
+
+func (uc *Query) getMetaZid(ctx context.Context, zids []id.Zid) ([]*meta.Meta, error) {
+	metaSeq := make([]*meta.Meta, 0, len(zids))
+	for _, zid := range zids {
+		m, err := uc.port.GetMeta(ctx, zid)
+		if err == nil {
+			metaSeq = append(metaSeq, m)
+			continue
+		}
+		if errors.Is(err, &box.ErrNotAllowed{}) {
+			continue
+		}
+		return metaSeq, err
+	}
+	return metaSeq, nil
+}
+
+func (uc *Query) processDirectives(ctx context.Context, metaSeq []*meta.Meta, directives []query.Directive) []*meta.Meta {
+	if len(directives) == 0 {
+		return metaSeq
+	}
+	for _, dir := range directives {
+		if len(metaSeq) == 0 {
+			return nil
+		}
+		switch ds := dir.(type) {
+		case *query.ContextSpec:
+			metaSeq = uc.processContextDirective(ctx, ds, metaSeq)
+		case *query.IdentSpec:
+			// Nothing to do.
+		case *query.ItemsSpec:
+			metaSeq = uc.processItemsDirective(ctx, ds, metaSeq)
+		case *query.UnlinkedSpec:
+			metaSeq = uc.processUnlinkedDirective(ctx, ds, metaSeq)
+		default:
+			panic(fmt.Sprintf("Unknown directive %T", ds))
+		}
+	}
+	if len(metaSeq) == 0 {
+		return nil
+	}
+	return metaSeq
+}
+func (uc *Query) processContextDirective(ctx context.Context, spec *query.ContextSpec, metaSeq []*meta.Meta) []*meta.Meta {
+	return spec.Execute(ctx, metaSeq, uc.port)
+}
+
+func (uc *Query) processItemsDirective(ctx context.Context, _ *query.ItemsSpec, metaSeq []*meta.Meta) []*meta.Meta {
+	result := make([]*meta.Meta, 0, len(metaSeq))
+	for _, m := range metaSeq {
+		zn, err := uc.ucEvaluate.Run(ctx, m.Zid, m.GetDefault(api.KeySyntax, ""))
+		if err != nil {
+			continue
+		}
+		for _, ref := range collect.Order(zn) {
+			if collectedZid, err2 := id.Parse(ref.URL.Path); err2 == nil {
+				if z, err3 := uc.port.GetZettel(ctx, collectedZid); err3 == nil {
+					result = append(result, z.Meta)
+				}
+			}
+		}
+	}
+	return result
+}
+
+func (uc *Query) processUnlinkedDirective(ctx context.Context, spec *query.UnlinkedSpec, metaSeq []*meta.Meta) []*meta.Meta {
+	words := spec.GetWords(metaSeq)
+	if len(words) == 0 {
+		return metaSeq
+	}
+	var sb strings.Builder
+	for _, word := range words {
+		sb.WriteString(" :")
+		sb.WriteString(word)
+	}
+	q := (*query.Query)(nil).Parse(sb.String())
+	candidates, err := uc.port.SelectMeta(ctx, nil, q)
+	if err != nil {
+		return nil
+	}
+	metaZids := id.NewSetCap(len(metaSeq))
+	refZids := id.NewSetCap(len(metaSeq) * 4) // Assumption: there are four zids per zettel
+	for _, m := range metaSeq {
+		metaZids.Add(m.Zid)
+		refZids.Add(m.Zid)
+		for _, pair := range m.ComputedPairsRest() {
+			switch meta.Type(pair.Key) {
+			case meta.TypeID:
+				if zid, errParse := id.Parse(pair.Value); errParse == nil {
+					refZids.Add(zid)
+				}
+			case meta.TypeIDSet:
+				for _, value := range meta.ListFromValue(pair.Value) {
+					if zid, errParse := id.Parse(value); errParse == nil {
+						refZids.Add(zid)
+					}
+				}
+			}
+		}
+	}
+	candidates = filterByZid(candidates, refZids)
+	return uc.filterCandidates(ctx, candidates, words)
+}
+
+func filterByZid(candidates []*meta.Meta, ignoreSeq id.Set) []*meta.Meta {
+	result := make([]*meta.Meta, 0, len(candidates))
+	for _, m := range candidates {
+		if !ignoreSeq.ContainsOrNil(m.Zid) {
+			result = append(result, m)
+		}
+	}
+	return result
+}
+
+func (uc *Query) filterCandidates(ctx context.Context, candidates []*meta.Meta, words []string) []*meta.Meta {
+	result := make([]*meta.Meta, 0, len(candidates))
+candLoop:
+	for _, cand := range candidates {
+		zettel, err := uc.port.GetZettel(ctx, cand.Zid)
+		if err != nil {
+			continue
+		}
+		v := unlinkedVisitor{
+			words: words,
+			found: false,
+		}
+		v.text = v.joinWords(words)
+
+		for _, pair := range zettel.Meta.Pairs() {
+			if meta.Type(pair.Key) != meta.TypeZettelmarkup {
+				continue
+			}
+			is := uc.ucEvaluate.RunMetadata(ctx, pair.Value)
+			ast.Walk(&v, &is)
+			if v.found {
+				result = append(result, cand)
+				continue candLoop
+			}
+		}
+
+		syntax := zettel.Meta.GetDefault(api.KeySyntax, "")
+		if !parser.IsASTParser(syntax) {
+			continue
+		}
+		zn := uc.ucEvaluate.RunZettel(ctx, zettel, syntax)
+		ast.Walk(&v, &zn.Ast)
+		if v.found {
+			result = append(result, cand)
+		}
+	}
+	return result
+}
+
+func (*unlinkedVisitor) joinWords(words []string) string {
+	return " " + strings.ToLower(strings.Join(words, " ")) + " "
+}
+
+type unlinkedVisitor struct {
+	words []string
+	text  string
+	found bool
+}
+
+func (v *unlinkedVisitor) Visit(node ast.Node) ast.Visitor {
+	switch n := node.(type) {
+	case *ast.InlineSlice:
+		v.checkWords(n)
+		return nil
+	case *ast.HeadingNode:
+		return nil
+	case *ast.LinkNode, *ast.EmbedRefNode, *ast.EmbedBLOBNode, *ast.CiteNode:
+		return nil
+	}
+	return v
+}
+
+func (v *unlinkedVisitor) checkWords(is *ast.InlineSlice) {
+	if len(*is) < 2*len(v.words)-1 {
+		return
+	}
+	for _, text := range v.splitInlineTextList(is) {
+		if strings.Contains(text, v.text) {
+			v.found = true
+		}
+	}
+}
+
+func (v *unlinkedVisitor) splitInlineTextList(is *ast.InlineSlice) []string {
+	var result []string
+	var curList []string
+	for _, in := range *is {
+		switch n := in.(type) {
+		case *ast.TextNode:
+			curList = append(curList, strfun.MakeWords(n.Text)...)
+		case *ast.SpaceNode:
+		default:
+			if curList != nil {
+				result = append(result, v.joinWords(curList))
+				curList = nil
+			}
+		}
+	}
+	if curList != nil {
+		result = append(result, v.joinWords(curList))
+	}
+	return result
+}

ADDED   usecase/reindex.go
Index: usecase/reindex.go
==================================================================
--- usecase/reindex.go
+++ usecase/reindex.go
@@ -0,0 +1,41 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package usecase
+
+import (
+	"context"
+
+	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel/id"
+)
+
+// ReIndexPort is the interface used by this use case.
+type ReIndexPort interface {
+	ReIndex(context.Context, id.Zid) error
+}
+
+// ReIndex is the data for this use case.
+type ReIndex struct {
+	log  *logger.Logger
+	port ReIndexPort
+}
+
+// NewReIndex creates a new use case.
+func NewReIndex(log *logger.Logger, port ReIndexPort) ReIndex {
+	return ReIndex{log: log, port: port}
+}
+
+// Run executes the use case.
+func (uc *ReIndex) Run(ctx context.Context, zid id.Zid) error {
+	err := uc.port.ReIndex(ctx, zid)
+	uc.log.Sense().User(ctx).Err(err).Zid(zid).Msg("ReIndex zettel")
+	return err
+}

Index: usecase/rename_zettel.go
==================================================================
--- usecase/rename_zettel.go
+++ usecase/rename_zettel.go
@@ -12,21 +12,18 @@
 
 import (
 	"context"
 
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
 )
 
 // RenameZettelPort is the interface used by this use case.
 type RenameZettelPort interface {
-	// GetMeta retrieves just the meta data of a specific zettel.
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-
-	// Rename changes the current id to a new id.
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
 	RenameZettel(ctx context.Context, curZid, newZid id.Zid) error
 }
 
 // RenameZettel is the data for this use case.
 type RenameZettel struct {
@@ -35,11 +32,11 @@
 }
 
 // ErrZidInUse is returned if the zettel id is not appropriate for the box operation.
 type ErrZidInUse struct{ Zid id.Zid }
 
-func (err *ErrZidInUse) Error() string {
+func (err ErrZidInUse) Error() string {
 	return "Zettel id already in use: " + err.Zid.String()
 }
 
 // NewRenameZettel creates a new use case.
 func NewRenameZettel(log *logger.Logger, port RenameZettelPort) RenameZettel {
@@ -47,19 +44,19 @@
 }
 
 // Run executes the use case.
 func (uc *RenameZettel) Run(ctx context.Context, curZid, newZid id.Zid) error {
 	noEnrichCtx := box.NoEnrichContext(ctx)
-	if _, err := uc.port.GetMeta(noEnrichCtx, curZid); err != nil {
+	if _, err := uc.port.GetZettel(noEnrichCtx, curZid); err != nil {
 		return err
 	}
 	if newZid == curZid {
 		// Nothing to do
 		return nil
 	}
-	if _, err := uc.port.GetMeta(noEnrichCtx, newZid); err == nil {
-		return &ErrZidInUse{Zid: newZid}
+	if _, err := uc.port.GetZettel(noEnrichCtx, newZid); err == nil {
+		return ErrZidInUse{Zid: newZid}
 	}
 	err := uc.port.RenameZettel(ctx, curZid, newZid)
 	uc.log.Info().User(ctx).Zid(curZid).Err(err).Zid(newZid).Msg("Rename zettel")
 	return err
 }

DELETED usecase/unlinked_refs.go
Index: usecase/unlinked_refs.go
==================================================================
--- usecase/unlinked_refs.go
+++ usecase/unlinked_refs.go
@@ -1,181 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package usecase
-
-import (
-	"context"
-	"strings"
-	"unicode"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/ast"
-	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/encoder/textenc"
-	"zettelstore.de/z/evaluator"
-	"zettelstore.de/z/parser"
-	"zettelstore.de/z/query"
-)
-
-// UnlinkedReferencesPort is the interface used by this use case.
-type UnlinkedReferencesPort interface {
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-	GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error)
-	SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error)
-}
-
-// UnlinkedReferences is the data for this use case.
-type UnlinkedReferences struct {
-	port     UnlinkedReferencesPort
-	rtConfig config.Config
-	encText  *textenc.Encoder
-}
-
-// NewUnlinkedReferences creates a new use case.
-func NewUnlinkedReferences(port UnlinkedReferencesPort, rtConfig config.Config) UnlinkedReferences {
-	return UnlinkedReferences{
-		port:     port,
-		rtConfig: rtConfig,
-		encText:  textenc.Create(),
-	}
-}
-
-// Run executes the usecase with already evaluated title value.
-func (uc *UnlinkedReferences) Run(ctx context.Context, phrase string, q *query.Query) ([]*meta.Meta, error) {
-	words := makeWords(phrase)
-	if len(words) == 0 {
-		return nil, nil
-	}
-	var sb strings.Builder
-	for _, word := range words {
-		sb.WriteString(" :")
-		sb.WriteString(word)
-	}
-	q = q.Parse(sb.String())
-
-	// Limit applies to the filtering process, not to SelectMeta
-	limit := q.GetLimit()
-	q = q.SetLimit(0)
-
-	candidates, err := uc.port.SelectMeta(ctx, q)
-	if err != nil {
-		return nil, err
-	}
-	q = q.SetLimit(limit) // Restore limit
-	return q.Limit(uc.filterCandidates(ctx, candidates, words)), nil
-}
-
-func makeWords(text string) []string {
-	return strings.FieldsFunc(text, func(r rune) bool {
-		return unicode.In(r, unicode.C, unicode.P, unicode.Z)
-	})
-}
-
-func (uc *UnlinkedReferences) filterCandidates(ctx context.Context, candidates []*meta.Meta, words []string) []*meta.Meta {
-	result := make([]*meta.Meta, 0, len(candidates))
-candLoop:
-	for _, cand := range candidates {
-		zettel, err := uc.port.GetZettel(ctx, cand.Zid)
-		if err != nil {
-			continue
-		}
-		v := unlinkedVisitor{
-			words: words,
-			found: false,
-		}
-		v.text = v.joinWords(words)
-
-		for _, pair := range zettel.Meta.Pairs() {
-			if meta.Type(pair.Key) != meta.TypeZettelmarkup {
-				continue
-			}
-			is := parser.ParseMetadata(pair.Value)
-			evaluator.EvaluateInline(ctx, uc.port, uc.rtConfig, &is)
-			ast.Walk(&v, &is)
-			if v.found {
-				result = append(result, cand)
-				continue candLoop
-			}
-		}
-
-		syntax := zettel.Meta.GetDefault(api.KeySyntax, "")
-		if !parser.IsASTParser(syntax) {
-			continue
-		}
-		zn, err := parser.ParseZettel(ctx, zettel, syntax, uc.rtConfig), nil
-		if err != nil {
-			continue
-		}
-		evaluator.EvaluateZettel(ctx, uc.port, uc.rtConfig, zn)
-		ast.Walk(&v, &zn.Ast)
-		if v.found {
-			result = append(result, cand)
-		}
-	}
-	return result
-}
-
-func (*unlinkedVisitor) joinWords(words []string) string {
-	return " " + strings.ToLower(strings.Join(words, " ")) + " "
-}
-
-type unlinkedVisitor struct {
-	words []string
-	text  string
-	found bool
-}
-
-func (v *unlinkedVisitor) Visit(node ast.Node) ast.Visitor {
-	switch n := node.(type) {
-	case *ast.InlineSlice:
-		v.checkWords(n)
-		return nil
-	case *ast.HeadingNode:
-		return nil
-	case *ast.LinkNode, *ast.EmbedRefNode, *ast.EmbedBLOBNode, *ast.CiteNode:
-		return nil
-	}
-	return v
-}
-
-func (v *unlinkedVisitor) checkWords(is *ast.InlineSlice) {
-	if len(*is) < 2*len(v.words)-1 {
-		return
-	}
-	for _, text := range v.splitInlineTextList(is) {
-		if strings.Contains(text, v.text) {
-			v.found = true
-		}
-	}
-}
-
-func (v *unlinkedVisitor) splitInlineTextList(is *ast.InlineSlice) []string {
-	var result []string
-	var curList []string
-	for _, in := range *is {
-		switch n := in.(type) {
-		case *ast.TextNode:
-			curList = append(curList, makeWords(n.Text)...)
-		case *ast.SpaceNode:
-		default:
-			if curList != nil {
-				result = append(result, v.joinWords(curList))
-				curList = nil
-			}
-		}
-	}
-	if curList != nil {
-		result = append(result, v.joinWords(curList))
-	}
-	return result
-}

Index: usecase/update_zettel.go
==================================================================
--- usecase/update_zettel.go
+++ usecase/update_zettel.go
@@ -11,25 +11,25 @@
 package usecase
 
 import (
 	"context"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/logger"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // UpdateZettelPort is the interface used by this use case.
 type UpdateZettelPort interface {
 	// GetZettel retrieves a specific zettel.
-	GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error)
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
 
 	// UpdateZettel updates an existing zettel.
-	UpdateZettel(ctx context.Context, zettel domain.Zettel) error
+	UpdateZettel(ctx context.Context, zettel zettel.Zettel) error
 }
 
 // UpdateZettel is the data for this use case.
 type UpdateZettel struct {
 	log  *logger.Logger
@@ -40,11 +40,11 @@
 func NewUpdateZettel(log *logger.Logger, port UpdateZettelPort) UpdateZettel {
 	return UpdateZettel{log: log, port: port}
 }
 
 // Run executes the use case.
-func (uc *UpdateZettel) Run(ctx context.Context, zettel domain.Zettel, hasContent bool) error {
+func (uc *UpdateZettel) Run(ctx context.Context, zettel zettel.Zettel, hasContent bool) error {
 	m := zettel.Meta
 	oldZettel, err := uc.port.GetZettel(box.NoEnrichContext(ctx), m.Zid)
 	if err != nil {
 		return err
 	}

Index: web/adapter/api/api.go
==================================================================
--- web/adapter/api/api.go
+++ web/adapter/api/api.go
@@ -15,18 +15,18 @@
 	"bytes"
 	"context"
 	"net/http"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // API holds all data and methods for delivering API call results.
 type API struct {
 	log      *logger.Logger
@@ -64,17 +64,17 @@
 func (a *API) getAuthData(ctx context.Context) *server.AuthData {
 	return server.GetAuthData(ctx)
 }
 func (a *API) withAuth() bool { return a.authz.WithAuth() }
 func (a *API) getToken(ident *meta.Meta) ([]byte, error) {
-	return a.token.GetToken(ident, a.tokenLifetime, auth.KindJSON)
+	return a.token.GetToken(ident, a.tokenLifetime, auth.KindAPI)
 }
 
 func (a *API) reportUsecaseError(w http.ResponseWriter, err error) {
 	code, text := adapter.CodeMessageFromError(err)
 	if code == http.StatusInternalServerError {
-		a.log.IfErr(err).Msg(text)
+		a.log.Error().Err(err).Msg(text)
 		http.Error(w, http.StatusText(code), code)
 		return
 	}
 	// TODO: must call PrepareHeader somehow
 	http.Error(w, text, code)

Index: web/adapter/api/command.go
==================================================================
--- web/adapter/api/command.go
+++ web/adapter/api/command.go
@@ -12,11 +12,11 @@
 
 import (
 	"context"
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/usecase"
 )
 
 // MakePostCommandHandler creates a new HTTP handler to execute certain commands.
 func (a *API) MakePostCommandHandler(

Index: web/adapter/api/create_zettel.go
==================================================================
--- web/adapter/api/create_zettel.go
+++ web/adapter/api/create_zettel.go
@@ -9,34 +9,34 @@
 //-----------------------------------------------------------------------------
 
 package api
 
 import (
-	"bytes"
 	"net/http"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/content"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakePostCreateZettelHandler creates a new HTTP handler to store content of
 // an existing zettel.
 func (a *API) MakePostCreateZettelHandler(createZettel *usecase.CreateZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		q := r.URL.Query()
 		enc, encStr := getEncoding(r, q)
-		var zettel domain.Zettel
+		var zettel zettel.Zettel
 		var err error
 		switch enc {
 		case api.EncoderPlain:
 			zettel, err = buildZettelFromPlainData(r, id.Invalid)
-		case api.EncoderJson:
-			zettel, err = buildZettelFromJSONData(r, id.Invalid)
+		case api.EncoderData:
+			zettel, err = buildZettelFromData(r, id.Invalid)
 		default:
 			http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
 			return
 		}
 		if err != nil {
@@ -56,27 +56,20 @@
 		location := a.NewURLBuilder('z').SetZid(api.ZettelID(newZid.String()))
 		switch enc {
 		case api.EncoderPlain:
 			result = newZid.Bytes()
 			contentType = content.PlainText
-		case api.EncoderJson:
-			var buf bytes.Buffer
-			err = encodeJSONData(&buf, api.ZidJSON{ID: api.ZettelID(newZid.String())})
-			if err != nil {
-				a.log.Fatal().Err(err).Zid(newZid).Msg("Unable to store new Zid in buffer")
-				http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-				return
-			}
-			result = buf.Bytes()
-			contentType = content.JSON
-			location.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson)
+		case api.EncoderData:
+			result = []byte(sx.Int64(newZid).Repr())
+			contentType = content.SXPF
 		default:
 			panic(encStr)
 		}
 
 		h := adapter.PrepareHeader(w, contentType)
 		h.Set(api.HeaderLocation, location.String())
 		w.WriteHeader(http.StatusCreated)
-		_, err = w.Write(result)
-		a.log.IfErr(err).Zid(newZid).Msg("Create Zettel")
+		if _, err = w.Write(result); err != nil {
+			a.log.Error().Err(err).Zid(newZid).Msg("Create Zettel")
+		}
 	}
 }

Index: web/adapter/api/delete_zettel.go
==================================================================
--- web/adapter/api/delete_zettel.go
+++ web/adapter/api/delete_zettel.go
@@ -11,12 +11,12 @@
 package api
 
 import (
 	"net/http"
 
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/usecase"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeDeleteZettelHandler creates a new HTTP handler to delete a zettel.
 func (a *API) MakeDeleteZettelHandler(deleteZettel *usecase.DeleteZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {

Index: web/adapter/api/get_data.go
==================================================================
--- web/adapter/api/get_data.go
+++ web/adapter/api/get_data.go
@@ -9,36 +9,28 @@
 //-----------------------------------------------------------------------------
 
 package api
 
 import (
-	"bytes"
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/usecase"
-	"zettelstore.de/z/web/content"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeGetDataHandler creates a new HTTP handler to return zettelstore data.
 func (a *API) MakeGetDataHandler(ucVersion usecase.Version) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		version := ucVersion.Run()
-		result := api.VersionJSON{
-			Major: version.Major,
-			Minor: version.Minor,
-			Patch: version.Patch,
-			Info:  version.Info,
-			Hash:  version.Hash,
-		}
-		var buf bytes.Buffer
-		err := encodeJSONData(&buf, result)
+		err := a.writeObject(w, id.Invalid, sx.MakeList(
+			sx.Int64(version.Major),
+			sx.Int64(version.Minor),
+			sx.Int64(version.Patch),
+			sx.String(version.Info),
+			sx.String(version.Hash),
+		))
 		if err != nil {
-			a.log.Fatal().Err(err).Msg("Unable to version info in buffer")
-			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-			return
+			a.log.Error().Err(err).Msg("Write Version Info")
 		}
-
-		err = writeBuffer(w, &buf, content.JSON)
-		a.log.IfErr(err).Msg("Write Version Info")
 	}
 }

DELETED web/adapter/api/get_order.go
Index: web/adapter/api/get_order.go
==================================================================
--- web/adapter/api/get_order.go
+++ web/adapter/api/get_order.go
@@ -1,40 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package api
-
-import (
-	"net/http"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/usecase"
-)
-
-// MakeGetOrderHandler creates a new API handler to return zettel references
-// of a given zettel.
-func (a *API) MakeGetOrderHandler(zettelOrder usecase.ZettelOrder) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		zid, err := id.Parse(r.URL.Path[1:])
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-		ctx := r.Context()
-		q := r.URL.Query()
-		start, metas, err := zettelOrder.Run(ctx, zid, q.Get(api.KeySyntax))
-		if err != nil {
-			a.reportUsecaseError(w, err)
-			return
-		}
-		err = a.writeMetaList(ctx, w, start, metas)
-		a.log.IfErr(err).Zid(zid).Msg("Write Zettel Order")
-	}
-}

DELETED web/adapter/api/get_unlinked_refs.go
Index: web/adapter/api/get_unlinked_refs.go
==================================================================
--- web/adapter/api/get_unlinked_refs.go
+++ web/adapter/api/get_unlinked_refs.go
@@ -1,79 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2021-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package api
-
-import (
-	"bytes"
-	"net/http"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/parser"
-	"zettelstore.de/z/usecase"
-	"zettelstore.de/z/web/adapter"
-	"zettelstore.de/z/web/content"
-)
-
-// MakeListUnlinkedMetaHandler creates a new HTTP handler for the use case "list unlinked references".
-func (a *API) MakeListUnlinkedMetaHandler(getMeta usecase.GetMeta, unlinkedRefs usecase.UnlinkedReferences) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		zid, err := id.Parse(r.URL.Path[1:])
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-		ctx := r.Context()
-		zm, err := getMeta.Run(ctx, zid)
-		if err != nil {
-			a.reportUsecaseError(w, err)
-			return
-		}
-
-		que := r.URL.Query()
-		phrase := que.Get(api.QueryKeyPhrase)
-		if phrase == "" {
-			if title, found := zm.Get(api.KeyTitle); found {
-				phrase = parser.NormalizedSpacedText(title)
-			}
-		}
-
-		metaList, err := unlinkedRefs.Run(ctx, phrase, adapter.AddUnlinkedRefsToQuery(adapter.GetQuery(que), zm))
-		if err != nil {
-			a.reportUsecaseError(w, err)
-			return
-		}
-
-		result := api.ZidMetaRelatedList{
-			ID:     api.ZettelID(zid.String()),
-			Meta:   zm.Map(),
-			Rights: a.getRights(ctx, zm),
-			List:   make([]api.ZidMetaJSON, 0, len(metaList)),
-		}
-		for _, m := range metaList {
-			result.List = append(result.List, api.ZidMetaJSON{
-				ID:     api.ZettelID(m.Zid.String()),
-				Meta:   m.Map(),
-				Rights: a.getRights(ctx, m),
-			})
-		}
-
-		var buf bytes.Buffer
-		err = encodeJSONData(&buf, result)
-		if err != nil {
-			a.log.Fatal().Err(err).Zid(zid).Msg("Unable to store unlinked references in buffer")
-			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-			return
-		}
-
-		err = writeBuffer(w, &buf, content.JSON)
-		a.log.IfErr(err).Zid(zid).Msg("Write Unlinked References")
-	}
-}

Index: web/adapter/api/get_zettel.go
==================================================================
--- web/adapter/api/get_zettel.go
+++ web/adapter/api/get_zettel.go
@@ -14,23 +14,25 @@
 	"bytes"
 	"context"
 	"fmt"
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/sexp"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/content"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeGetZettelHandler creates a new HTTP handler to return a zettel in various encodings.
-func (a *API) MakeGetZettelHandler(getMeta usecase.GetMeta, getZettel usecase.GetZettel, parseZettel usecase.ParseZettel, evaluate usecase.Evaluate) http.HandlerFunc {
+func (a *API) MakeGetZettelHandler(getZettel usecase.GetZettel, parseZettel usecase.ParseZettel, evaluate usecase.Evaluate) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		zid, err := id.Parse(r.URL.Path[1:])
 		if err != nil {
 			http.NotFound(w, r)
 			return
@@ -39,14 +41,14 @@
 		q := r.URL.Query()
 		part := getPart(q, partContent)
 		ctx := r.Context()
 		switch enc, encStr := getEncoding(r, q); enc {
 		case api.EncoderPlain:
-			a.writePlainData(w, ctx, zid, part, getMeta, getZettel)
+			a.writePlainData(w, ctx, zid, part, getZettel)
 
-		case api.EncoderJson:
-			a.writeJSONData(w, ctx, zid, part, getMeta, getZettel)
+		case api.EncoderData:
+			a.writeSzData(w, ctx, zid, part, getZettel)
 
 		default:
 			var zn *ast.ZettelNode
 			var em func(value string) ast.InlineSlice
 			if q.Has(api.QueryKeyParseOnly) {
@@ -60,121 +62,94 @@
 			}
 			if err != nil {
 				a.reportUsecaseError(w, err)
 				return
 			}
-			a.writeEncodedZettelPart(w, zn, em, enc, encStr, part)
+			a.writeEncodedZettelPart(ctx, w, zn, em, enc, encStr, part)
 		}
 	}
 }
 
-func (a *API) writePlainData(w http.ResponseWriter, ctx context.Context, zid id.Zid, part partType, getMeta usecase.GetMeta, getZettel usecase.GetZettel) {
+func (a *API) writePlainData(w http.ResponseWriter, ctx context.Context, zid id.Zid, part partType, getZettel usecase.GetZettel) {
 	var buf bytes.Buffer
 	var contentType string
 	var err error
+
+	z, err := getZettel.Run(box.NoEnrichContext(ctx), zid)
+	if err != nil {
+		a.reportUsecaseError(w, err)
+		return
+	}
 
 	switch part {
 	case partZettel:
-		z, err2 := getZettel.Run(box.NoEnrichContext(ctx), zid)
-		if err2 != nil {
-			a.reportUsecaseError(w, err2)
-			return
-		}
-		_, err2 = z.Meta.Write(&buf)
-		if err2 == nil {
-			err2 = buf.WriteByte('\n')
-		}
-		if err2 == nil {
+		_, err = z.Meta.Write(&buf)
+		if err == nil {
+			err = buf.WriteByte('\n')
+		}
+		if err == nil {
 			_, err = z.Content.Write(&buf)
 		}
 
 	case partMeta:
-		m, err2 := getMeta.Run(box.NoEnrichContext(ctx), zid)
-		if err2 != nil {
-			a.reportUsecaseError(w, err2)
-			return
-		}
 		contentType = content.PlainText
-		_, err = m.Write(&buf)
+		_, err = z.Meta.Write(&buf)
 
 	case partContent:
-		z, err2 := getZettel.Run(box.NoEnrichContext(ctx), zid)
-		if err2 != nil {
-			a.reportUsecaseError(w, err2)
-			return
-		}
 		contentType = content.MIMEFromSyntax(z.Meta.GetDefault(api.KeySyntax, ""))
 		_, err = z.Content.Write(&buf)
 	}
 
 	if err != nil {
 		a.log.Fatal().Err(err).Zid(zid).Msg("Unable to store plain zettel/part in buffer")
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
-	err = writeBuffer(w, &buf, contentType)
-	a.log.IfErr(err).Zid(zid).Msg("Write Plain data")
+	if err = writeBuffer(w, &buf, contentType); err != nil {
+		a.log.Error().Err(err).Zid(zid).Msg("Write Plain data")
+	}
 }
 
-func (a *API) writeJSONData(w http.ResponseWriter, ctx context.Context, zid id.Zid, part partType, getMeta usecase.GetMeta, getZettel usecase.GetZettel) {
-	var buf bytes.Buffer
-	var err error
-
+func (a *API) writeSzData(w http.ResponseWriter, ctx context.Context, zid id.Zid, part partType, getZettel usecase.GetZettel) {
+	z, err := getZettel.Run(ctx, zid)
+	if err != nil {
+		a.reportUsecaseError(w, err)
+		return
+	}
+	var obj sx.Object
 	switch part {
 	case partZettel:
-		z, err2 := getZettel.Run(ctx, zid)
-		if err2 != nil {
-			a.reportUsecaseError(w, err2)
-			return
-		}
-		zContent, encoding := z.Content.Encode()
-		err = encodeJSONData(&buf, api.ZettelJSON{
-			ID:       api.ZettelID(zid.String()),
+		zContent, zEncoding := z.Content.Encode()
+		obj = sexp.EncodeZettel(api.ZettelData{
 			Meta:     z.Meta.Map(),
-			Encoding: encoding,
-			Content:  zContent,
 			Rights:   a.getRights(ctx, z.Meta),
+			Encoding: zEncoding,
+			Content:  zContent,
 		})
 
 	case partMeta:
-		m, err2 := getMeta.Run(ctx, zid)
-		if err2 != nil {
-			a.reportUsecaseError(w, err2)
-			return
-		}
-		err = encodeJSONData(&buf, api.MetaJSON{
-			Meta:   m.Map(),
-			Rights: a.getRights(ctx, m),
-		})
-
-	case partContent:
-		z, err2 := getZettel.Run(ctx, zid)
-		if err2 != nil {
-			a.reportUsecaseError(w, err2)
-			return
-		}
-		zContent, encoding := z.Content.Encode()
-		err = encodeJSONData(&buf, api.ZettelContentJSON{
-			Encoding: encoding,
-			Content:  zContent,
-		})
-	}
-	if err != nil {
-		a.log.Fatal().Err(err).Zid(zid).Msg("Unable to store zettel in buffer")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-	err = writeBuffer(w, &buf, content.JSON)
-	a.log.IfErr(err).Zid(zid).Msg("Write JSON data")
+		obj = sexp.EncodeMetaRights(api.MetaRights{
+			Meta:   z.Meta.Map(),
+			Rights: a.getRights(ctx, z.Meta),
+		})
+	}
+	if err = a.writeObject(w, zid, obj); err != nil {
+		a.log.Error().Err(err).Zid(zid).Msg("write sx data")
+	}
 }
 
 func (a *API) writeEncodedZettelPart(
+	ctx context.Context,
 	w http.ResponseWriter, zn *ast.ZettelNode,
 	evalMeta encoder.EvalMetaFunc,
 	enc api.EncodingEnum, encStr string, part partType,
 ) {
-	encdr := encoder.Create(enc)
+	encdr := encoder.Create(
+		enc,
+		&encoder.CreateParameter{
+			Lang: a.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang),
+		})
 	if encdr == nil {
 		adapter.BadRequest(w, fmt.Sprintf("Zettel %q not available in encoding %q", zn.Meta.Zid, encStr))
 		return
 	}
 	var err error
@@ -195,8 +170,9 @@
 	if buf.Len() == 0 {
 		w.WriteHeader(http.StatusNoContent)
 		return
 	}
 
-	err = writeBuffer(w, &buf, content.MIMEFromEncoding(enc))
-	a.log.IfErr(err).Zid(zn.Zid).Msg("Write Encoded Zettel")
+	if err = writeBuffer(w, &buf, content.MIMEFromEncoding(enc)); err != nil {
+		a.log.Error().Err(err).Zid(zn.Zid).Msg("Write Encoded Zettel")
+	}
 }

DELETED web/adapter/api/get_zettel_context.go
Index: web/adapter/api/get_zettel_context.go
==================================================================
--- web/adapter/api/get_zettel_context.go
+++ web/adapter/api/get_zettel_context.go
@@ -1,50 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package api
-
-import (
-	"net/http"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/usecase"
-	"zettelstore.de/z/web/adapter"
-)
-
-// MakeZettelContextHandler creates a new HTTP handler for the use case "zettel context".
-func (a *API) MakeZettelContextHandler(getContext usecase.ZettelContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		zid, err := id.Parse(r.URL.Path[1:])
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-		q := r.URL.Query()
-		dir := adapter.GetZCDirection(q.Get(api.QueryKeyDir))
-		cost, ok := adapter.GetInteger(q, api.QueryKeyCost)
-		if !ok || cost < 0 {
-			cost = 17
-		}
-		limit, ok := adapter.GetInteger(q, api.QueryKeyLimit)
-		if !ok || limit < 0 {
-			limit = 200
-		}
-		ctx := r.Context()
-		metaList, err := getContext.Run(ctx, zid, dir, cost, limit)
-		if err != nil {
-			a.reportUsecaseError(w, err)
-			return
-		}
-
-		err = a.writeMetaList(ctx, w, metaList[0], metaList[1:])
-		a.log.IfErr(err).Zid(zid).Msg("Write Context")
-	}
-}

DELETED web/adapter/api/json.go
Index: web/adapter/api/json.go
==================================================================
--- web/adapter/api/json.go
+++ web/adapter/api/json.go
@@ -1,73 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2020-present Detlef Stern
-//
-// This file is part of Zettelstore.
-//
-// Zettelstore is licensed under the latest version of the EUPL (European Union
-// Public License). Please see file LICENSE.txt for your rights and obligations
-// under this license.
-//-----------------------------------------------------------------------------
-
-package api
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/web/content"
-)
-
-func encodeJSONData(w io.Writer, data interface{}) error {
-	enc := json.NewEncoder(w)
-	enc.SetEscapeHTML(false)
-	return enc.Encode(data)
-}
-
-func (a *API) writeMetaList(ctx context.Context, w http.ResponseWriter, m *meta.Meta, metaList []*meta.Meta) error {
-	outList := make([]api.ZidMetaJSON, len(metaList))
-	for i, m := range metaList {
-		outList[i].ID = api.ZettelID(m.Zid.String())
-		outList[i].Meta = m.Map()
-		outList[i].Rights = a.getRights(ctx, m)
-	}
-
-	var buf bytes.Buffer
-	err := encodeJSONData(&buf, api.ZidMetaRelatedList{
-		ID:     api.ZettelID(m.Zid.String()),
-		Meta:   m.Map(),
-		Rights: a.getRights(ctx, m),
-		List:   outList,
-	})
-	if err != nil {
-		a.log.Fatal().Err(err).Zid(m.Zid).Msg("Unable to store meta list in buffer")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return nil
-	}
-
-	return writeBuffer(w, &buf, content.JSON)
-}
-
-func buildZettelFromJSONData(r *http.Request, zid id.Zid) (domain.Zettel, error) {
-	var zettel domain.Zettel
-	dec := json.NewDecoder(r.Body)
-	var zettelData api.ZettelDataJSON
-	if err := dec.Decode(&zettelData); err != nil {
-		return zettel, err
-	}
-	m := meta.New(zid)
-	for k, v := range zettelData.Meta {
-		m.Set(meta.RemoveNonGraphic(k), meta.RemoveNonGraphic(v))
-	}
-	zettel.Meta = m
-	if err := zettel.Content.SetDecoded(zettelData.Content, zettelData.Encoding); err != nil {
-		return zettel, err
-	}
-	return zettel, nil
-}

Index: web/adapter/api/login.go
==================================================================
--- web/adapter/api/login.go
+++ web/adapter/api/login.go
@@ -9,34 +9,33 @@
 //-----------------------------------------------------------------------------
 
 package api
 
 import (
-	"bytes"
-	"encoding/json"
 	"net/http"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
-	"zettelstore.de/z/web/content"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakePostLoginHandler creates a new HTTP handler to authenticate the given user via API.
 func (a *API) MakePostLoginHandler(ucAuth *usecase.Authenticate) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if !a.withAuth() {
-			err := a.writeJSONToken(w, "freeaccess", 24*366*10*time.Hour)
-			a.log.IfErr(err).Msg("Login/free")
+			if err := a.writeToken(w, "freeaccess", 24*366*10*time.Hour); err != nil {
+				a.log.Error().Err(err).Msg("Login/free")
+			}
 			return
 		}
 		var token []byte
 		if ident, cred := retrieveIdentCred(r); ident != "" {
 			var err error
-			token, err = ucAuth.Run(r.Context(), r, ident, cred, a.tokenLifetime, auth.KindJSON)
+			token, err = ucAuth.Run(r.Context(), r, ident, cred, a.tokenLifetime, auth.KindAPI)
 			if err != nil {
 				a.reportUsecaseError(w, err)
 				return
 			}
 		}
@@ -44,12 +43,13 @@
 			w.Header().Set("WWW-Authenticate", `Bearer realm="Default"`)
 			http.Error(w, "Authentication failed", http.StatusUnauthorized)
 			return
 		}
 
-		err := a.writeJSONToken(w, string(token), a.tokenLifetime)
-		a.log.IfErr(err).Msg("Login")
+		if err := a.writeToken(w, string(token), a.tokenLifetime); err != nil {
+			a.log.Error().Err(err).Msg("Login")
+		}
 	}
 }
 
 func retrieveIdentCred(r *http.Request) (string, string) {
 	if ident, cred, ok := adapter.GetCredentialsViaForm(r); ok {
@@ -59,34 +59,18 @@
 		return ident, cred
 	}
 	return "", ""
 }
 
-func (a *API) writeJSONToken(w http.ResponseWriter, token string, lifetime time.Duration) error {
-	var buf bytes.Buffer
-	je := json.NewEncoder(&buf)
-	err := je.Encode(api.AuthJSON{
-		Token:   token,
-		Type:    "Bearer",
-		Expires: int(lifetime / time.Second),
-	})
-	if err != nil {
-		a.log.Fatal().Err(err).Msg("Unable to store token in buffer")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return nil
-	}
-
-	return writeBuffer(w, &buf, content.JSON)
-}
-
 // MakeRenewAuthHandler creates a new HTTP handler to renew the authenticate of a user.
 func (a *API) MakeRenewAuthHandler() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 		if !a.withAuth() {
-			err := a.writeJSONToken(w, "freeaccess", 24*366*10*time.Hour)
-			a.log.IfErr(err).Msg("Refresh/free")
+			if err := a.writeToken(w, "freeaccess", 24*366*10*time.Hour); err != nil {
+				a.log.Error().Err(err).Msg("Refresh/free")
+			}
 			return
 		}
 		authData := a.getAuthData(ctx)
 		if authData == nil || len(authData.Token) == 0 || authData.User == nil {
 			adapter.BadRequest(w, "Not authenticated")
@@ -94,20 +78,30 @@
 		}
 		totalLifetime := authData.Expires.Sub(authData.Issued)
 		currentLifetime := authData.Now.Sub(authData.Issued)
 		// If we are in the first quarter of the tokens lifetime, return the token
 		if currentLifetime*4 < totalLifetime {
-			err := a.writeJSONToken(w, string(authData.Token), totalLifetime-currentLifetime)
-			a.log.IfErr(err).Msg("Write old token")
+			if err := a.writeToken(w, string(authData.Token), totalLifetime-currentLifetime); err != nil {
+				a.log.Error().Err(err).Msg("Write old token")
+			}
 			return
 		}
 
 		// Token is a little bit aged. Create a new one
 		token, err := a.getToken(authData.User)
 		if err != nil {
 			a.reportUsecaseError(w, err)
 			return
 		}
-		err = a.writeJSONToken(w, string(token), a.tokenLifetime)
-		a.log.IfErr(err).Msg("Write renewed token")
+		if err = a.writeToken(w, string(token), a.tokenLifetime); err != nil {
+			a.log.Error().Err(err).Msg("Write renewed token")
+		}
 	}
 }
+
+func (a *API) writeToken(w http.ResponseWriter, token string, lifetime time.Duration) error {
+	return a.writeObject(w, id.Invalid, sx.MakeList(
+		sx.String("Bearer"),
+		sx.String(token),
+		sx.Int64(int64(lifetime/time.Second)),
+	))
+}

Index: web/adapter/api/query.go
==================================================================
--- web/adapter/api/query.go
+++ web/adapter/api/query.go
@@ -13,65 +13,78 @@
 import (
 	"bytes"
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/sexp"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/query"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/content"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // MakeQueryHandler creates a new HTTP handler to perform a query.
-func (a *API) MakeQueryHandler(listMeta usecase.ListMeta) http.HandlerFunc {
+func (a *API) MakeQueryHandler(queryMeta *usecase.Query, tagZettel *usecase.TagZettel, roleZettel *usecase.RoleZettel, reIndex *usecase.ReIndex) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		q := r.URL.Query()
-		sq := adapter.GetQuery(q)
+		urlQuery := r.URL.Query()
+		if a.handleTagZettel(w, r, tagZettel, urlQuery) {
+			return
+		}
+		if a.handleRoleZettel(w, r, roleZettel, urlQuery) {
+			return
+		}
+
+		sq := adapter.GetQuery(urlQuery)
 
-		metaList, err := listMeta.Run(ctx, sq)
+		metaSeq, err := queryMeta.Run(ctx, sq)
 		if err != nil {
 			a.reportUsecaseError(w, err)
 			return
 		}
 
 		var encoder zettelEncoder
 		var contentType string
-		switch enc, _ := getEncoding(r, q); enc {
+		switch enc, _ := getEncoding(r, urlQuery); enc {
 		case api.EncoderPlain:
 			encoder = &plainZettelEncoder{}
 			contentType = content.PlainText
 
-		case api.EncoderJson:
-			encoder = &jsonZettelEncoder{
+		case api.EncoderData:
+			encoder = &dataZettelEncoder{
+				sf:        sx.MakeMappedFactory(256),
 				sq:        sq,
 				getRights: func(m *meta.Meta) api.ZettelRights { return a.getRights(ctx, m) },
 			}
-			contentType = content.JSON
+			contentType = content.SXPF
 
 		default:
 			http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
 			return
 		}
 
 		var buf bytes.Buffer
-		err = queryAction(&buf, encoder, metaList, sq)
+		err = queryAction(&buf, encoder, metaSeq, sq, func(zid id.Zid) error { return reIndex.Run(ctx, zid) })
 		if err != nil {
 			a.log.Error().Err(err).Str("query", sq.String()).Msg("execute query action")
 			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		}
 
-		err = writeBuffer(w, &buf, contentType)
-		a.log.IfErr(err).Msg("write result buffer")
+		if err = writeBuffer(w, &buf, contentType); err != nil {
+			a.log.Error().Err(err).Msg("write result buffer")
+		}
 	}
 }
-func queryAction(w io.Writer, enc zettelEncoder, ml []*meta.Meta, sq *query.Query) error {
+func queryAction(w io.Writer, enc zettelEncoder, ml []*meta.Meta, sq *query.Query, reindex func(id.Zid) error) error {
 	min, max := -1, -1
 	if actions := sq.Actions(); len(actions) > 0 {
 		acts := make([]string, 0, len(actions))
 		for _, act := range actions {
 			if strings.HasPrefix(act, "MIN") {
@@ -87,35 +100,54 @@
 				}
 			}
 			acts = append(acts, act)
 		}
 		for _, act := range acts {
-			key := strings.ToLower(act)
-			switch meta.Type(key) {
+			switch act {
+			case "KEYS":
+				return encodeKeysArrangement(w, enc, ml, act)
+			case "REINDEX":
+				for _, m := range ml {
+					if err := reindex(m.Zid); err != nil {
+						return err
+					}
+				}
+			}
+			switch key := strings.ToLower(act); meta.Type(key) {
 			case meta.TypeWord, meta.TypeTagSet:
-				return encodeKeyArrangement(w, enc, ml, key, min, max)
+				return encodeMetaKeyArrangement(w, enc, ml, key, min, max)
 			}
 		}
 	}
 	return enc.writeMetaList(w, ml)
 }
 
-func encodeKeyArrangement(w io.Writer, enc zettelEncoder, ml []*meta.Meta, key string, min, max int) error {
+func encodeKeysArrangement(w io.Writer, enc zettelEncoder, ml []*meta.Meta, act string) error {
+	arr := make(meta.Arrangement, 128)
+	for _, m := range ml {
+		for k := range m.Map() {
+			arr[k] = append(arr[k], m)
+		}
+	}
+	return enc.writeArrangement(w, act, arr)
+}
+
+func encodeMetaKeyArrangement(w io.Writer, enc zettelEncoder, ml []*meta.Meta, key string, min, max int) error {
 	arr0 := meta.CreateArrangement(ml, key)
 	arr := make(meta.Arrangement, len(arr0))
 	for k0, ml0 := range arr0 {
 		if len(ml0) < min || (max > 0 && len(ml0) > max) {
 			continue
 		}
 		arr[k0] = ml0
 	}
-	return enc.writeArrangement(w, arr)
+	return enc.writeArrangement(w, key, arr)
 }
 
 type zettelEncoder interface {
 	writeMetaList(w io.Writer, ml []*meta.Meta) error
-	writeArrangement(w io.Writer, arr meta.Arrangement) error
+	writeArrangement(w io.Writer, act string, arr meta.Arrangement) error
 }
 
 type plainZettelEncoder struct{}
 
 func (*plainZettelEncoder) writeMetaList(w io.Writer, ml []*meta.Meta) error {
@@ -125,11 +157,11 @@
 			return err
 		}
 	}
 	return nil
 }
-func (*plainZettelEncoder) writeArrangement(w io.Writer, arr meta.Arrangement) error {
+func (*plainZettelEncoder) writeArrangement(w io.Writer, _ string, arr meta.Arrangement) error {
 	for key, ml := range arr {
 		_, err := io.WriteString(w, key)
 		if err != nil {
 			return err
 		}
@@ -153,38 +185,111 @@
 		}
 	}
 	return nil
 }
 
-type jsonZettelEncoder struct {
+type dataZettelEncoder struct {
+	sf        sx.SymbolFactory
 	sq        *query.Query
 	getRights func(*meta.Meta) api.ZettelRights
 }
 
-func (jze *jsonZettelEncoder) writeMetaList(w io.Writer, ml []*meta.Meta) error {
-	result := make([]api.ZidMetaJSON, 0, len(ml))
-	for _, m := range ml {
-		result = append(result, api.ZidMetaJSON{
-			ID:     api.ZettelID(m.Zid.String()),
-			Meta:   m.Map(),
-			Rights: jze.getRights(m),
-		})
-	}
-
-	err := encodeJSONData(w, api.ZettelListJSON{
-		Query: jze.sq.String(),
-		Human: jze.sq.Human(),
-		List:  result,
-	})
+func (dze *dataZettelEncoder) writeMetaList(w io.Writer, ml []*meta.Meta) error {
+	sf := dze.sf
+	result := make([]sx.Object, len(ml)+1)
+	result[0] = sf.MustMake("list")
+	symID, symZettel := sf.MustMake("id"), sf.MustMake("zettel")
+	for i, m := range ml {
+		msz := sexp.EncodeMetaRights(api.MetaRights{
+			Meta:   m.Map(),
+			Rights: dze.getRights(m),
+		})
+		msz = sx.Cons(sx.MakeList(symID, sx.Int64(m.Zid)), msz.Cdr()).Cons(symZettel)
+		result[i+1] = msz
+	}
+
+	_, err := sx.Print(w, sx.MakeList(
+		sf.MustMake("meta-list"),
+		sx.MakeList(sf.MustMake("query"), sx.String(dze.sq.String())),
+		sx.MakeList(sf.MustMake("human"), sx.String(dze.sq.Human())),
+		sx.MakeList(result...),
+	))
+	return err
+}
+func (dze *dataZettelEncoder) writeArrangement(w io.Writer, act string, arr meta.Arrangement) error {
+	sf := dze.sf
+	result := sx.Nil()
+	for aggKey, metaList := range arr {
+		sxMeta := sx.Nil()
+		for i := len(metaList) - 1; i >= 0; i-- {
+			sxMeta = sxMeta.Cons(sx.Int64(metaList[i].Zid))
+		}
+		sxMeta = sxMeta.Cons(sx.String(aggKey))
+		result = result.Cons(sxMeta)
+	}
+	_, err := sx.Print(w, sx.MakeList(
+		sf.MustMake("aggregate"),
+		sx.String(act),
+		sx.MakeList(sf.MustMake("query"), sx.String(dze.sq.String())),
+		sx.MakeList(sf.MustMake("human"), sx.String(dze.sq.Human())),
+		result.Cons(sf.MustMake("list")),
+	))
 	return err
 }
-func (*jsonZettelEncoder) writeArrangement(w io.Writer, arr meta.Arrangement) error {
-	mm := make(api.MapMeta, len(arr))
-	for key, metaList := range arr {
-		zidList := make([]api.ZettelID, 0, len(metaList))
-		for _, m := range metaList {
-			zidList = append(zidList, api.ZettelID(m.Zid.String()))
-		}
-		mm[key] = zidList
-	}
-	return encodeJSONData(w, api.MapListJSON{Map: mm})
+
+func (a *API) handleTagZettel(w http.ResponseWriter, r *http.Request, tagZettel *usecase.TagZettel, vals url.Values) bool {
+	tag := vals.Get(api.QueryKeyTag)
+	if tag == "" {
+		return false
+	}
+	ctx := r.Context()
+	z, err := tagZettel.Run(ctx, tag)
+	if err != nil {
+		a.reportUsecaseError(w, err)
+		return true
+	}
+	zid := z.Meta.Zid.String()
+	w.Header().Set(api.HeaderContentType, content.PlainText)
+	newURL := a.NewURLBuilder('z').SetZid(api.ZettelID(zid))
+	for key, slVals := range vals {
+		if key == api.QueryKeyTag {
+			continue
+		}
+		for _, val := range slVals {
+			newURL.AppendKVQuery(key, val)
+		}
+	}
+	http.Redirect(w, r, newURL.String(), http.StatusFound)
+	if _, err = io.WriteString(w, zid); err != nil {
+		a.log.Error().Err(err).Msg("redirect body")
+	}
+	return true
+}
+
+func (a *API) handleRoleZettel(w http.ResponseWriter, r *http.Request, roleZettel *usecase.RoleZettel, vals url.Values) bool {
+	role := vals.Get(api.QueryKeyRole)
+	if role == "" {
+		return false
+	}
+	ctx := r.Context()
+	z, err := roleZettel.Run(ctx, role)
+	if err != nil {
+		a.reportUsecaseError(w, err)
+		return true
+	}
+	zid := z.Meta.Zid.String()
+	w.Header().Set(api.HeaderContentType, content.PlainText)
+	newURL := a.NewURLBuilder('z').SetZid(api.ZettelID(zid))
+	for key, slVals := range vals {
+		if key == api.QueryKeyRole {
+			continue
+		}
+		for _, val := range slVals {
+			newURL.AppendKVQuery(key, val)
+		}
+	}
+	http.Redirect(w, r, newURL.String(), http.StatusFound)
+	if _, err = io.WriteString(w, zid); err != nil {
+		a.log.Error().Err(err).Msg("redirect body")
+	}
+	return true
 }

Index: web/adapter/api/rename_zettel.go
==================================================================
--- web/adapter/api/rename_zettel.go
+++ web/adapter/api/rename_zettel.go
@@ -12,13 +12,13 @@
 
 import (
 	"net/http"
 	"net/url"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/usecase"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeRenameZettelHandler creates a new HTTP handler to update a zettel.
 func (a *API) MakeRenameZettelHandler(renameZettel *usecase.RenameZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {

Index: web/adapter/api/request.go
==================================================================
--- web/adapter/api/request.go
+++ web/adapter/api/request.go
@@ -13,15 +13,17 @@
 import (
 	"io"
 	"net/http"
 	"net/url"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/sexp"
+	"zettelstore.de/sx.fossil/sxreader"
 	"zettelstore.de/z/input"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // getEncoding returns the data encoding selected by the caller.
 func getEncoding(r *http.Request, q url.Values) (api.EncodingEnum, string) {
 	encoding := q.Get(api.QueryKeyEncoding)
@@ -47,12 +49,11 @@
 	}
 	return "", false
 }
 
 var mapCT2encoding = map[string]string{
-	"application/json": "json",
-	"text/html":        api.EncodingHTML,
+	"text/html": api.EncodingHTML,
 }
 
 func contentType2encoding(contentType string) (string, bool) {
 	// TODO: only check before first ';'
 	enc, ok := mapCT2encoding[contentType]
@@ -98,18 +99,48 @@
 		return ""
 	}
 	return p.String()
 }
 
-func buildZettelFromPlainData(r *http.Request, zid id.Zid) (domain.Zettel, error) {
+func buildZettelFromPlainData(r *http.Request, zid id.Zid) (zettel.Zettel, error) {
+	defer r.Body.Close()
 	b, err := io.ReadAll(r.Body)
 	if err != nil {
-		return domain.Zettel{}, err
+		return zettel.Zettel{}, err
 	}
 	inp := input.NewInput(b)
 	m := meta.NewFromInput(zid, inp)
-	return domain.Zettel{
+	return zettel.Zettel{
 		Meta:    m,
-		Content: domain.NewContent(inp.Src[inp.Pos:]),
+		Content: zettel.NewContent(inp.Src[inp.Pos:]),
 	}, nil
+}
+
+func buildZettelFromData(r *http.Request, zid id.Zid) (zettel.Zettel, error) {
+	defer r.Body.Close()
+	rdr := sxreader.MakeReader(r.Body)
+	obj, err := rdr.Read()
+	if err != nil {
+		return zettel.Zettel{}, err
+	}
+	zd, err := sexp.ParseZettel(obj)
+	if err != nil {
+		return zettel.Zettel{}, err
+	}
+
+	m := meta.New(zid)
+	for k, v := range zd.Meta {
+		if !meta.IsComputed(k) {
+			m.Set(meta.RemoveNonGraphic(k), meta.RemoveNonGraphic(v))
+		}
+	}
+
+	var content zettel.Content
+	if err = content.SetDecoded(zd.Content, zd.Encoding); err != nil {
+		return zettel.Zettel{}, err
+	}
 
+	return zettel.Zettel{
+		Meta:    m,
+		Content: content,
+	}, nil
 }

ADDED   web/adapter/api/response.go
Index: web/adapter/api/response.go
==================================================================
--- web/adapter/api/response.go
+++ web/adapter/api/response.go
@@ -0,0 +1,36 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2020-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package api
+
+import (
+	"bytes"
+	"net/http"
+
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/z/web/content"
+	"zettelstore.de/z/zettel/id"
+)
+
+func (a *API) writeObject(w http.ResponseWriter, zid id.Zid, obj sx.Object) error {
+	var buf bytes.Buffer
+	if _, err := sx.Print(&buf, obj); err != nil {
+		msg := a.log.Fatal().Err(err)
+		if msg != nil {
+			if zid.IsValid() {
+				msg = msg.Zid(zid)
+			}
+			msg.Msg("Unable to store object in buffer")
+		}
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		return nil
+	}
+	return writeBuffer(w, &buf, content.SXPF)
+}

Index: web/adapter/api/update_zettel.go
==================================================================
--- web/adapter/api/update_zettel.go
+++ web/adapter/api/update_zettel.go
@@ -11,15 +11,15 @@
 package api
 
 import (
 	"net/http"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeUpdateZettelHandler creates a new HTTP handler to update a zettel.
 func (a *API) MakeUpdateZettelHandler(updateZettel *usecase.UpdateZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -28,16 +28,16 @@
 			http.NotFound(w, r)
 			return
 		}
 
 		q := r.URL.Query()
-		var zettel domain.Zettel
+		var zettel zettel.Zettel
 		switch enc, _ := getEncoding(r, q); enc {
 		case api.EncoderPlain:
 			zettel, err = buildZettelFromPlainData(r, zid)
-		case api.EncoderJson:
-			zettel, err = buildZettelFromJSONData(r, zid)
+		case api.EncoderData:
+			zettel, err = buildZettelFromData(r, zid)
 		default:
 			http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
 			return
 		}
 

Index: web/adapter/errors.go
==================================================================
--- web/adapter/errors.go
+++ web/adapter/errors.go
@@ -25,5 +25,10 @@
 
 // NotFound signals HTTP status code 404.
 func NotFound(w http.ResponseWriter, text string) {
 	http.Error(w, text, http.StatusNotFound)
 }
+
+// ErrResourceNotFound is signalled when a web resource was not found.
+type ErrResourceNotFound struct{ Path string }
+
+func (ernf ErrResourceNotFound) Error() string { return "resource not found: " + ernf.Path }

Index: web/adapter/request.go
==================================================================
--- web/adapter/request.go
+++ web/adapter/request.go
@@ -14,15 +14,13 @@
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/query"
-	"zettelstore.de/z/usecase"
 )
 
 // GetCredentialsViaForm retrieves the authentication credentions from a form.
 func GetCredentialsViaForm(r *http.Request) (ident, cred string, ok bool) {
 	err := r.ParseForm()
@@ -37,21 +35,10 @@
 		return "", "", false
 	}
 	return ident, cred, true
 }
 
-// GetInteger returns the integer value of the named query key.
-func GetInteger(q url.Values, key string) (int, bool) {
-	s := q.Get(key)
-	if s != "" {
-		if val, err := strconv.Atoi(s); err == nil {
-			return val, true
-		}
-	}
-	return 0, false
-}
-
 // GetQuery retrieves the specified options from a query.
 func GetQuery(vals url.Values) (result *query.Query) {
 	if exprs, found := vals[api.QueryKeyQuery]; found {
 		result = query.Parse(strings.Join(exprs, " "))
 	}
@@ -63,42 +50,5 @@
 			}
 		}
 	}
 	return result
 }
-
-// GetZCDirection returns a direction value for a given string.
-func GetZCDirection(s string) usecase.ZettelContextDirection {
-	switch s {
-	case api.DirBackward:
-		return usecase.ZettelContextBackward
-	case api.DirForward:
-		return usecase.ZettelContextForward
-	}
-	return usecase.ZettelContextBoth
-}
-
-// AddUnlinkedRefsToQuery inspects metadata and enhances the given query to ignore
-// some zettel identifier.
-func AddUnlinkedRefsToQuery(q *query.Query, m *meta.Meta) *query.Query {
-	var sb strings.Builder
-	sb.WriteString(api.KeyID)
-	sb.WriteString("!:")
-	sb.WriteString(m.Zid.String())
-	for _, pair := range m.ComputedPairsRest() {
-		switch meta.Type(pair.Key) {
-		case meta.TypeID:
-			sb.WriteByte(' ')
-			sb.WriteString(api.KeyID)
-			sb.WriteString("!:")
-			sb.WriteString(pair.Value)
-		case meta.TypeIDSet:
-			for _, value := range meta.ListFromValue(pair.Value) {
-				sb.WriteByte(' ')
-				sb.WriteString(api.KeyID)
-				sb.WriteString("!:")
-				sb.WriteString(value)
-			}
-		}
-	}
-	return q.Parse(sb.String())
-}

Index: web/adapter/response.go
==================================================================
--- web/adapter/response.go
+++ web/adapter/response.go
@@ -12,12 +12,13 @@
 
 import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/usecase"
 )
 
 // WriteData emits the given data to the response writer.
@@ -45,30 +46,44 @@
 type ErrBadRequest struct {
 	Text string
 }
 
 // NewErrBadRequest creates an new bad request error.
-func NewErrBadRequest(text string) error { return &ErrBadRequest{Text: text} }
+func NewErrBadRequest(text string) error { return ErrBadRequest{Text: text} }
 
-func (err *ErrBadRequest) Error() string { return err.Text }
+func (err ErrBadRequest) Error() string { return err.Text }
 
 // CodeMessageFromError returns an appropriate HTTP status code and text from a given error.
 func CodeMessageFromError(err error) (int, string) {
-	if err == box.ErrNotFound {
-		return http.StatusNotFound, http.StatusText(http.StatusNotFound)
-	}
-	if err1, ok := err.(*box.ErrNotAllowed); ok {
-		return http.StatusForbidden, err1.Error()
-	}
-	if err1, ok := err.(*box.ErrInvalidID); ok {
-		return http.StatusBadRequest, fmt.Sprintf("Zettel-ID %q not appropriate in this context", err1.Zid)
-	}
-	if err1, ok := err.(*usecase.ErrZidInUse); ok {
-		return http.StatusBadRequest, fmt.Sprintf("Zettel-ID %q already in use", err1.Zid)
-	}
-	if err1, ok := err.(*ErrBadRequest); ok {
-		return http.StatusBadRequest, err1.Text
+	var eznf box.ErrZettelNotFound
+	if errors.As(err, &eznf) {
+		return http.StatusNotFound, "Zettel not found: " + eznf.Zid.String()
+	}
+	var ena *box.ErrNotAllowed
+	if errors.As(err, &ena) {
+		msg := ena.Error()
+		return http.StatusForbidden, strings.ToUpper(msg[:1]) + msg[1:]
+	}
+	var eiz box.ErrInvalidZid
+	if errors.As(err, &eiz) {
+		return http.StatusBadRequest, fmt.Sprintf("Zettel-ID %q not appropriate in this context", eiz.Zid)
+	}
+	var ezin usecase.ErrZidInUse
+	if errors.As(err, &ezin) {
+		return http.StatusBadRequest, fmt.Sprintf("Zettel-ID %q already in use", ezin.Zid)
+	}
+	var etznf usecase.ErrTagZettelNotFound
+	if errors.As(err, &etznf) {
+		return http.StatusNotFound, "Tag zettel not found: " + etznf.Tag
+	}
+	var erznf usecase.ErrRoleZettelNotFound
+	if errors.As(err, &erznf) {
+		return http.StatusNotFound, "Role zettel not found: " + erznf.Role
+	}
+	var ebr ErrBadRequest
+	if errors.As(err, &ebr) {
+		return http.StatusBadRequest, ebr.Text
 	}
 	if errors.Is(err, box.ErrStopped) {
 		return http.StatusInternalServerError, fmt.Sprintf("Zettelstore not operational: %v", err)
 	}
 	if errors.Is(err, box.ErrConflict) {
@@ -75,7 +90,11 @@
 		return http.StatusConflict, "Zettelstore operations conflicted"
 	}
 	if errors.Is(err, box.ErrCapacity) {
 		return http.StatusInsufficientStorage, "Zettelstore reached one of its storage limits"
 	}
+	var ernf ErrResourceNotFound
+	if errors.As(err, &ernf) {
+		return http.StatusNotFound, "Resource not found: " + ernf.Path
+	}
 	return http.StatusInternalServerError, err.Error()
 }

Index: web/adapter/webui/const.go
==================================================================
--- web/adapter/webui/const.go
+++ web/adapter/webui/const.go
@@ -10,14 +10,15 @@
 
 package webui
 
 // WebUI related constants.
 
-const queryKeyAction = "action"
+const queryKeyAction = "_action"
 
 // Values for queryKeyAction
 const (
+	valueActionChild   = "child"
 	valueActionCopy    = "copy"
 	valueActionFolge   = "folge"
 	valueActionNew     = "new"
 	valueActionVersion = "version"
 )
@@ -24,25 +25,26 @@
 
 // Enumeration for queryKeyAction
 type createAction uint8
 
 const (
-	actionCopy createAction = iota
+	actionChild createAction = iota
+	actionCopy
 	actionFolge
 	actionNew
 	actionVersion
 )
 
-func getCreateAction(s string) createAction {
-	switch s {
-	case valueActionCopy:
-		return actionCopy
-	case valueActionFolge:
-		return actionFolge
-	case valueActionNew:
-		return actionNew
-	case valueActionVersion:
-		return actionVersion
-	default:
-		return actionCopy
-	}
+var createActionMap = map[string]createAction{
+	valueActionChild:   actionChild,
+	valueActionCopy:    actionCopy,
+	valueActionFolge:   actionFolge,
+	valueActionNew:     actionNew,
+	valueActionVersion: actionVersion,
+}
+
+func getCreateAction(s string) createAction {
+	if action, found := createActionMap[s]; found {
+		return action
+	}
+	return actionCopy
 }

Index: web/adapter/webui/create_zettel.go
==================================================================
--- web/adapter/webui/create_zettel.go
+++ web/adapter/webui/create_zettel.go
@@ -12,22 +12,24 @@
 
 import (
 	"bytes"
 	"context"
 	"net/http"
+	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder/zmkenc"
 	"zettelstore.de/z/evaluator"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // MakeGetCreateZettelHandler creates a new HTTP handler to display the
 // HTML edit view for the various zettel creation methods.
 func (wui *WebUI) MakeGetCreateZettelHandler(
@@ -35,32 +37,36 @@
 	ucListRoles usecase.ListRoles, ucListSyntax usecase.ListSyntax) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 		q := r.URL.Query()
 		op := getCreateAction(q.Get(queryKeyAction))
-		zid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 		origZettel, err := getZettel.Run(box.NoEnrichContext(ctx), zid)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrZettelNotFound{Zid: zid})
 			return
 		}
 
 		roleData, syntaxData := retrieveDataLists(ctx, ucListRoles, ucListSyntax)
 		switch op {
+		case actionChild:
+			wui.renderZettelForm(ctx, w, createZettel.PrepareChild(origZettel), "Child Zettel", "", roleData, syntaxData)
 		case actionCopy:
 			wui.renderZettelForm(ctx, w, createZettel.PrepareCopy(origZettel), "Copy Zettel", "", roleData, syntaxData)
-		case actionVersion:
-			wui.renderZettelForm(ctx, w, createZettel.PrepareVersion(origZettel), "Version Zettel", "", roleData, syntaxData)
 		case actionFolge:
 			wui.renderZettelForm(ctx, w, createZettel.PrepareFolge(origZettel), "Folge Zettel", "", roleData, syntaxData)
 		case actionNew:
 			title := parser.NormalizedSpacedText(origZettel.Meta.GetTitle())
-			wui.renderZettelForm(ctx, w, createZettel.PrepareNew(origZettel), title, "", roleData, syntaxData)
+			newTitle := parser.NormalizedSpacedText(q.Get(api.KeyTitle))
+			wui.renderZettelForm(ctx, w, createZettel.PrepareNew(origZettel, newTitle), title, "", roleData, syntaxData)
+		case actionVersion:
+			wui.renderZettelForm(ctx, w, createZettel.PrepareVersion(origZettel), "Version Zettel", "", roleData, syntaxData)
 		}
 	}
 }
 
 func retrieveDataLists(ctx context.Context, ucListRoles usecase.ListRoles, ucListSyntax usecase.ListSyntax) ([]string, []string) {
@@ -79,35 +85,42 @@
 }
 
 func (wui *WebUI) renderZettelForm(
 	ctx context.Context,
 	w http.ResponseWriter,
-	zettel domain.Zettel,
+	ztl zettel.Zettel,
 	title string,
 	formActionURL string,
 	roleData []string,
 	syntaxData []string,
 ) {
 	user := server.GetUser(ctx)
-	m := zettel.Meta
-	var base baseData
-	wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, m, api.KeyLang), title, "", user, &base)
-	wui.renderTemplate(ctx, w, id.FormTemplateZid, &base, formZettelData{
-		Heading:       title,
-		FormActionURL: formActionURL,
-		MetaTitle:     m.GetDefault(api.KeyTitle, ""),
-		MetaTags:      m.GetDefault(api.KeyTags, ""),
-		MetaRole:      m.GetDefault(api.KeyRole, ""),
-		HasRoleData:   len(roleData) > 0,
-		RoleData:      roleData,
-		HasSyntaxData: len(syntaxData) > 0,
-		SyntaxData:    syntaxData,
-		MetaSyntax:    m.GetDefault(api.KeySyntax, ""),
-		MetaPairsRest: m.PairsRest(),
-		IsTextContent: !zettel.Content.IsBinary(),
-		Content:       zettel.Content.AsString(),
-	})
+	m := ztl.Meta
+
+	var sb strings.Builder
+	for _, p := range m.PairsRest() {
+		sb.WriteString(p.Key)
+		sb.WriteString(": ")
+		sb.WriteString(p.Value)
+		sb.WriteByte('\n')
+	}
+	env, rb := wui.createRenderEnv(ctx, "form", wui.rtConfig.Get(ctx, nil, api.KeyLang), title, user)
+	rb.bindString("heading", sx.String(title))
+	rb.bindString("form-action-url", sx.String(formActionURL))
+	rb.bindString("role-data", makeStringList(roleData))
+	rb.bindString("syntax-data", makeStringList(syntaxData))
+	rb.bindString("meta", sx.String(sb.String()))
+	if !ztl.Content.IsBinary() {
+		rb.bindString("content", sx.String(ztl.Content.AsString()))
+	}
+	wui.bindCommonZettelData(ctx, &rb, user, m, &ztl.Content)
+	if rb.err == nil {
+		rb.err = wui.renderSxnTemplate(ctx, w, id.FormTemplateZid, env)
+	}
+	if err := rb.err; err != nil {
+		wui.reportError(ctx, w, err)
+	}
 }
 
 // MakePostCreateZettelHandler creates a new HTTP handler to store content of
 // an existing zettel.
 func (wui *WebUI) MakePostCreateZettelHandler(createZettel *usecase.CreateZettel) http.HandlerFunc {
@@ -139,22 +152,22 @@
 }
 
 // MakeGetZettelFromListHandler creates a new HTTP handler to store content of
 // an existing zettel.
 func (wui *WebUI) MakeGetZettelFromListHandler(
-	listMeta usecase.ListMeta, evaluate *usecase.Evaluate,
+	queryMeta *usecase.Query, evaluate *usecase.Evaluate,
 	ucListRoles usecase.ListRoles, ucListSyntax usecase.ListSyntax) http.HandlerFunc {
 
 	return func(w http.ResponseWriter, r *http.Request) {
 		q := adapter.GetQuery(r.URL.Query())
 		ctx := r.Context()
-		metaList, err := listMeta.Run(box.NoEnrichQuery(ctx, q), q)
+		metaSeq, err := queryMeta.Run(box.NoEnrichQuery(ctx, q), q)
 		if err != nil {
 			wui.reportError(ctx, w, err)
 			return
 		}
-		bns := evaluate.RunBlockNode(ctx, evaluator.QueryAction(ctx, q, metaList, wui.rtConfig))
+		bns := evaluate.RunBlockNode(ctx, evaluator.QueryAction(ctx, q, metaSeq, wui.rtConfig))
 		enc := zmkenc.Create()
 		var zmkContent bytes.Buffer
 		_, err = enc.WriteBlocks(&zmkContent, &bns)
 		if err != nil {
 			wui.reportError(ctx, w, err)
@@ -165,10 +178,10 @@
 		m.Set(api.KeyTitle, q.Human())
 		m.Set(api.KeySyntax, api.ValueSyntaxZmk)
 		if qval := q.String(); qval != "" {
 			m.Set(api.KeyQuery, qval)
 		}
-		zettel := domain.Zettel{Meta: m, Content: domain.NewContent(zmkContent.Bytes())}
+		zettel := zettel.Zettel{Meta: m, Content: zettel.NewContent(zmkContent.Bytes())}
 		roleData, syntaxData := retrieveDataLists(ctx, ucListRoles, ucListSyntax)
 		wui.renderZettelForm(ctx, w, zettel, "Zettel from list", wui.createNewURL, roleData, syntaxData)
 	}
 }

Index: web/adapter/webui/delete_zettel.go
==================================================================
--- web/adapter/webui/delete_zettel.go
+++ web/adapter/webui/delete_zettel.go
@@ -11,97 +11,65 @@
 package webui
 
 import (
 	"net/http"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/maps"
-	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/strfun"
-	"zettelstore.de/z/usecase"
-	"zettelstore.de/z/web/server"
-)
-
-// MakeGetDeleteZettelHandler creates a new HTTP handler to display the
-// HTML delete view of a zettel.
-func (wui *WebUI) MakeGetDeleteZettelHandler(getMeta usecase.GetMeta, getAllMeta usecase.GetAllMeta) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
-		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
-			return
-		}
-
-		ms, err := getAllMeta.Run(ctx, zid)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		m := ms[0]
-
-		var shadowedBox string
-		var incomingLinks simpleLinks
-		if len(ms) > 1 {
-			shadowedBox = ms[1].GetDefault(api.KeyBoxNumber, "???")
-		} else {
-			getTextTitle := wui.makeGetTextTitle(ctx, getMeta)
-			incomingLinks = wui.encodeIncoming(m, getTextTitle)
-		}
-		uselessFiles := retrieveUselessFiles(m)
-
-		user := server.GetUser(ctx)
-		var base baseData
-		wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, m, api.KeyLang), "Delete Zettel "+m.Zid.String(), "", user, &base)
-		wui.renderTemplate(ctx, w, id.DeleteTemplateZid, &base, struct {
-			Zid             string
-			MetaPairs       []meta.Pair
-			HasShadows      bool
-			ShadowedBox     string
-			Incoming        simpleLinks
-			HasUselessFiles bool
-			UselessFiles    []string
-		}{
-			Zid:             zid.String(),
-			MetaPairs:       m.ComputedPairs(),
-			HasShadows:      shadowedBox != "",
-			ShadowedBox:     shadowedBox,
-			Incoming:        incomingLinks,
-			HasUselessFiles: len(uselessFiles) > 0,
-			UselessFiles:    uselessFiles,
-		})
-	}
-}
-
-func retrieveUselessFiles(m *meta.Meta) []string {
-	if val, found := m.Get(api.KeyUselessFiles); found {
-		return []string{val}
-	}
-	return nil
-}
-
-// MakePostDeleteZettelHandler creates a new HTTP handler to delete a zettel.
-func (wui *WebUI) MakePostDeleteZettelHandler(deleteZettel *usecase.DeleteZettel) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
-		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
-			return
-		}
-
-		if err = deleteZettel.Run(r.Context(), zid); err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		wui.redirectFound(w, r, wui.NewURLBuilder('/'))
-	}
-}
-
-func (wui *WebUI) encodeIncoming(m *meta.Meta, getTextTitle getTextTitleFunc) simpleLinks {
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/maps"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/z/box"
+	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/usecase"
+	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+// MakeGetDeleteZettelHandler creates a new HTTP handler to display the
+// HTML delete view of a zettel.
+func (wui *WebUI) MakeGetDeleteZettelHandler(getZettel usecase.GetZettel, getAllZettel usecase.GetAllZettel) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
+		if err != nil {
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
+			return
+		}
+
+		zs, err := getAllZettel.Run(ctx, zid)
+		if err != nil {
+			wui.reportError(ctx, w, err)
+			return
+		}
+		m := zs[0].Meta
+
+		user := server.GetUser(ctx)
+		env, rb := wui.createRenderEnv(
+			ctx, "delete",
+			wui.rtConfig.Get(ctx, nil, api.KeyLang), "Delete Zettel "+m.Zid.String(), user)
+		if len(zs) > 1 {
+			rb.bindString("shadowed-box", sx.String(zs[1].Meta.GetDefault(api.KeyBoxNumber, "???")))
+			rb.bindString("incoming", nil)
+		} else {
+			rb.bindString("shadowed-box", nil)
+			rb.bindString("incoming", wui.encodeIncoming(m, wui.makeGetTextTitle(ctx, getZettel)))
+		}
+		wui.bindCommonZettelData(ctx, &rb, user, m, nil)
+
+		if rb.err == nil {
+			err = wui.renderSxnTemplate(ctx, w, id.DeleteTemplateZid, env)
+		} else {
+			err = rb.err
+		}
+		if err != nil {
+			wui.reportError(ctx, w, err)
+		}
+	}
+}
+
+func (wui *WebUI) encodeIncoming(m *meta.Meta, getTextTitle getTextTitleFunc) *sx.Pair {
 	zidMap := make(strfun.Set)
 	addListValues(zidMap, m, api.KeyBackward)
 	for _, kd := range meta.GetSortedKeyDescriptions() {
 		inverseKey := kd.Inverse
 		if inverseKey == "" {
@@ -115,15 +83,34 @@
 			}
 		case meta.TypeIDSet:
 			addListValues(zidMap, m, inverseKey)
 		}
 	}
-	return createSimpleLinks(wui.encodeZidLinks(maps.Keys(zidMap), getTextTitle))
+	return wui.zidLinksSxn(maps.Keys(zidMap), getTextTitle)
 }
 
 func addListValues(zidMap strfun.Set, m *meta.Meta, key string) {
 	if values, ok := m.GetList(key); ok {
 		for _, val := range values {
 			zidMap.Set(val)
 		}
 	}
 }
+
+// MakePostDeleteZettelHandler creates a new HTTP handler to delete a zettel.
+func (wui *WebUI) MakePostDeleteZettelHandler(deleteZettel *usecase.DeleteZettel) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
+		if err != nil {
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
+			return
+		}
+
+		if err = deleteZettel.Run(r.Context(), zid); err != nil {
+			wui.reportError(ctx, w, err)
+			return
+		}
+		wui.redirectFound(w, r, wui.NewURLBuilder('/'))
+	}
+}

Index: web/adapter/webui/edit_zettel.go
==================================================================
--- web/adapter/webui/edit_zettel.go
+++ web/adapter/webui/edit_zettel.go
@@ -11,25 +11,26 @@
 package webui
 
 import (
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeEditGetZettelHandler creates a new HTTP handler to display the
 // HTML edit view of a zettel.
 func (wui *WebUI) MakeEditGetZettelHandler(getZettel usecase.GetZettel, ucListRoles usecase.ListRoles, ucListSyntax usecase.ListSyntax) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 
 		zettel, err := getZettel.Run(box.NoEnrichContext(ctx), zid)
 		if err != nil {
@@ -45,13 +46,14 @@
 // MakeEditSetZettelHandler creates a new HTTP handler to store content of
 // an existing zettel.
 func (wui *WebUI) MakeEditSetZettelHandler(updateZettel *usecase.UpdateZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 
 		reEdit, zettel, err := parseZettelForm(r, zid)
 		hasContent := true

Index: web/adapter/webui/favicon.go
==================================================================
--- web/adapter/webui/favicon.go
+++ web/adapter/webui/favicon.go
@@ -35,9 +35,10 @@
 			wui.log.Info().Err(err).Msg("Unable to read favicon data")
 			http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 			return
 		}
 
-		err = adapter.WriteData(w, data, "")
-		wui.log.IfErr(err).Msg("Write favicon")
+		if err = adapter.WriteData(w, data, ""); err != nil {
+			wui.log.Error().Err(err).Msg("Write favicon")
+		}
 	}
 }

Index: web/adapter/webui/forms.go
==================================================================
--- web/adapter/webui/forms.go
+++ web/adapter/webui/forms.go
@@ -17,48 +17,32 @@
 	"net/http"
 	"regexp"
 	"strings"
 	"unicode"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/input"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/web/content"
-)
-
-type formZettelData struct {
-	Heading       string
-	FormActionURL string
-	MetaTitle     string
-	MetaRole      string
-	HasRoleData   bool
-	RoleData      []string
-	HasSyntaxData bool
-	SyntaxData    []string
-	MetaTags      string
-	MetaSyntax    string
-	MetaPairsRest []meta.Pair
-	IsTextContent bool
-	Content       string
-}
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
 
 var (
 	bsCRLF = []byte{'\r', '\n'}
 	bsLF   = []byte{'\n'}
 )
 
 var errMissingContent = errors.New("missing zettel content")
 
-func parseZettelForm(r *http.Request, zid id.Zid) (bool, domain.Zettel, error) {
+func parseZettelForm(r *http.Request, zid id.Zid) (bool, zettel.Zettel, error) {
 	maxRequestSize := kernel.Main.GetConfig(kernel.WebService, kernel.WebMaxRequestSize).(int64)
 	err := r.ParseMultipartForm(maxRequestSize)
 	if err != nil {
-		return false, domain.Zettel{}, err
+		return false, zettel.Zettel{}, err
 	}
 	_, doSave := r.Form["save"]
 
 	var m *meta.Meta
 	if postMeta, ok := trimmedFormValue(r, "meta"); ok {
@@ -69,32 +53,35 @@
 	}
 	if postTitle, ok := trimmedFormValue(r, "title"); ok {
 		m.Set(api.KeyTitle, meta.RemoveNonGraphic(postTitle))
 	}
 	if postTags, ok := trimmedFormValue(r, "tags"); ok {
-		if tags := strings.Fields(meta.RemoveNonGraphic(postTags)); len(tags) > 0 {
+		if tags := meta.ListFromValue(meta.RemoveNonGraphic(postTags)); len(tags) > 0 {
+			for i, tag := range tags {
+				tags[i] = meta.NormalizeTag(tag)
+			}
 			m.SetList(api.KeyTags, tags)
 		}
 	}
 	if postRole, ok := trimmedFormValue(r, "role"); ok {
-		m.Set(api.KeyRole, meta.RemoveNonGraphic(postRole))
+		m.SetWord(api.KeyRole, meta.RemoveNonGraphic(postRole))
 	}
 	if postSyntax, ok := trimmedFormValue(r, "syntax"); ok {
-		m.Set(api.KeySyntax, meta.RemoveNonGraphic(postSyntax))
+		m.SetWord(api.KeySyntax, meta.RemoveNonGraphic(postSyntax))
 	}
 
 	if data := textContent(r); data != nil {
-		return doSave, domain.Zettel{Meta: m, Content: domain.NewContent(data)}, nil
+		return doSave, zettel.Zettel{Meta: m, Content: zettel.NewContent(data)}, nil
 	}
 	if data, m2 := uploadedContent(r, m); data != nil {
-		return doSave, domain.Zettel{Meta: m2, Content: domain.NewContent(data)}, nil
+		return doSave, zettel.Zettel{Meta: m2, Content: zettel.NewContent(data)}, nil
 	}
 
 	if allowEmptyContent(m) {
-		return doSave, domain.Zettel{Meta: m, Content: domain.NewContent(nil)}, nil
+		return doSave, zettel.Zettel{Meta: m, Content: zettel.NewContent(nil)}, nil
 	}
-	return doSave, domain.Zettel{Meta: m, Content: domain.NewContent(nil)}, errMissingContent
+	return doSave, zettel.Zettel{Meta: m, Content: zettel.NewContent(nil)}, errMissingContent
 }
 
 func trimmedFormValue(r *http.Request, key string) (string, bool) {
 	if values, ok := r.PostForm[key]; ok && len(values) > 0 {
 		value := strings.TrimSpace(values[0])

Index: web/adapter/webui/get_info.go
==================================================================
--- web/adapter/webui/get_info.go
+++ web/adapter/webui/get_info.go
@@ -14,266 +14,214 @@
 	"context"
 	"net/http"
 	"sort"
 	"strings"
 
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/collect"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/evaluator"
 	"zettelstore.de/z/parser"
+	"zettelstore.de/z/query"
+	"zettelstore.de/z/strfun"
 	"zettelstore.de/z/usecase"
-	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
-)
-
-type metaDataInfo struct {
-	Key   string
-	Value string
-}
-
-type matrixLine struct {
-	Header   string
-	Elements []simpleLink
-}
+	"zettelstore.de/z/zettel/id"
+)
 
 // MakeGetInfoHandler creates a new HTTP handler for the use case "get zettel".
 func (wui *WebUI) MakeGetInfoHandler(
-	parseZettel usecase.ParseZettel,
-	evaluate *usecase.Evaluate,
-	getMeta usecase.GetMeta,
-	getAllMeta usecase.GetAllMeta,
-	unlinkedRefs usecase.UnlinkedReferences,
+	ucParseZettel usecase.ParseZettel,
+	ucEvaluate *usecase.Evaluate,
+	ucGetZettel usecase.GetZettel,
+	ucGetAllMeta usecase.GetAllZettel,
+	ucQuery *usecase.Query,
 ) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 		q := r.URL.Query()
 
-		zid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 
-		zn, err := parseZettel.Run(ctx, zid, q.Get(api.KeySyntax))
+		zn, err := ucParseZettel.Run(ctx, zid, q.Get(api.KeySyntax))
 		if err != nil {
 			wui.reportError(ctx, w, err)
 			return
 		}
 
-		enc := wui.getSimpleHTMLEncoder()
+		enc := wui.getSimpleHTMLEncoder(wui.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang))
+		getTextTitle := wui.makeGetTextTitle(ctx, ucGetZettel)
+		evalMeta := func(val string) ast.InlineSlice {
+			return ucEvaluate.RunMetadata(ctx, val)
+		}
 		pairs := zn.Meta.ComputedPairs()
-		metaData := make([]metaDataInfo, len(pairs))
-		getTextTitle := wui.makeGetTextTitle(ctx, getMeta)
-		for i, p := range pairs {
-			var sb strings.Builder
-			if sval := wui.writeHTMLMetaValue(
-				p.Key, p.Value,
-				getTextTitle,
-				func(val string) ast.InlineSlice {
-					return evaluate.RunMetadata(ctx, val)
-				},
-				enc); !sxpf.IsNil(sval) {
-				wui.htmlGen.WriteHTML(&sb, sval)
-			}
-			metaData[i] = metaDataInfo{p.Key, sb.String()}
-		}
+		metadata := sx.Nil()
+		for i := len(pairs) - 1; i >= 0; i-- {
+			key := pairs[i].Key
+			sxval := wui.writeHTMLMetaValue(key, pairs[i].Value, getTextTitle, evalMeta, enc)
+			metadata = metadata.Cons(sx.Cons(sx.String(key), sxval))
+		}
+
 		summary := collect.References(zn)
-		locLinks, qLinks, extLinks := splitLocSeaExtLinks(append(summary.Links, summary.Embeds...))
-		queryLinks := make([]simpleLink, len(qLinks))
-		for i, sq := range qLinks {
-			queryLinks[i].Text = sq
-			queryLinks[i].URL = wui.NewURLBuilder('h').AppendQuery(sq).String()
-		}
+		locLinks, queryLinks, extLinks := wui.splitLocSeaExtLinks(append(summary.Links, summary.Embeds...))
 
 		title := parser.NormalizedSpacedText(zn.InhMeta.GetTitle())
 		phrase := q.Get(api.QueryKeyPhrase)
 		if phrase == "" {
 			phrase = title
 		}
-		phrase = strings.TrimSpace(phrase)
-		unlinkedMeta, err := unlinkedRefs.Run(
-			ctx, phrase, adapter.AddUnlinkedRefsToQuery(nil, zn.InhMeta))
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		bns := evaluate.RunBlockNode(ctx, evaluator.QueryAction(ctx, nil, unlinkedMeta, wui.rtConfig))
-		unlinkedContent, err := enc.BlocksString(&bns)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-
-		shadowLinks := getShadowLinks(ctx, zid, getAllMeta)
-		endnotes, err := enc.BlocksString(&ast.BlockSlice{})
-		if err != nil {
-			endnotes = ""
-		}
-
-		user := server.GetUser(ctx)
-		canCreate := wui.canCreate(ctx, user)
-		apiZid := api.ZettelID(zid.String())
-		var base baseData
-		wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang), title, "", user, &base)
-		wui.renderTemplate(ctx, w, id.InfoTemplateZid, &base, struct {
-			Zid            string
-			WebURL         string
-			ContextURL     string
-			CanWrite       bool
-			EditURL        string
-			CanCopy        bool
-			CopyURL        string
-			CanVersion     bool
-			VersionURL     string
-			CanFolge       bool
-			FolgeURL       string
-			CanRename      bool
-			RenameURL      string
-			CanDelete      bool
-			DeleteURL      string
-			MetaData       []metaDataInfo
-			HasLocLinks    bool
-			LocLinks       []localLink
-			QueryLinks     simpleLinks
-			HasExtLinks    bool
-			ExtLinks       []string
-			ExtNewWindow   string
-			UnLinksContent string
-			UnLinksPhrase  string
-			QueryKeyPhrase string
-			EvalMatrix     []matrixLine
-			ParseMatrix    []matrixLine
-			HasShadowLinks bool
-			ShadowLinks    []string
-			Endnotes       string
-		}{
-			Zid:            zid.String(),
-			WebURL:         wui.NewURLBuilder('h').SetZid(apiZid).String(),
-			ContextURL:     wui.NewURLBuilder('k').SetZid(apiZid).String(),
-			CanWrite:       wui.canWrite(ctx, user, zn.Meta, zn.Content),
-			EditURL:        wui.NewURLBuilder('e').SetZid(apiZid).String(),
-			CanCopy:        canCreate && !zn.Content.IsBinary(),
-			CopyURL:        wui.NewURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionCopy).String(),
-			CanVersion:     canCreate,
-			VersionURL:     wui.NewURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionVersion).String(),
-			CanFolge:       canCreate,
-			FolgeURL:       wui.NewURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionFolge).String(),
-			CanRename:      wui.canRename(ctx, user, zn.Meta),
-			RenameURL:      wui.NewURLBuilder('b').SetZid(apiZid).String(),
-			CanDelete:      wui.canDelete(ctx, user, zn.Meta),
-			DeleteURL:      wui.NewURLBuilder('d').SetZid(apiZid).String(),
-			MetaData:       metaData,
-			HasLocLinks:    len(locLinks) > 0,
-			LocLinks:       locLinks,
-			QueryLinks:     createSimpleLinks(queryLinks),
-			HasExtLinks:    len(extLinks) > 0,
-			ExtLinks:       extLinks,
-			ExtNewWindow:   htmlAttrNewWindow(len(extLinks) > 0),
-			UnLinksContent: unlinkedContent,
-			UnLinksPhrase:  phrase,
-			QueryKeyPhrase: api.QueryKeyPhrase,
-			EvalMatrix:     wui.infoAPIMatrix(zid, false),
-			ParseMatrix:    wui.infoAPIMatrixPlain(zid),
-			HasShadowLinks: len(shadowLinks) > 0,
-			ShadowLinks:    shadowLinks,
-			Endnotes:       endnotes,
-		})
-	}
-}
-
-type localLink struct {
-	Valid bool
-	Zid   string
-}
-
-func splitLocSeaExtLinks(links []*ast.Reference) (locLinks []localLink, queries, extLinks []string) {
-	if len(links) == 0 {
-		return nil, nil, nil
-	}
-	for _, ref := range links {
-		if ref.State == ast.RefStateSelf || ref.IsZettel() {
-			continue
-		}
-		if ref.State == ast.RefStateQuery {
-			queries = append(queries, ref.Value)
-			continue
-		}
-		if ref.IsExternal() {
-			extLinks = append(extLinks, ref.String())
-			continue
-		}
-		locLinks = append(locLinks, localLink{ref.IsValid(), ref.String()})
-	}
-	return locLinks, queries, extLinks
-}
-
-func (wui *WebUI) infoAPIMatrix(zid id.Zid, parseOnly bool) []matrixLine {
+		unlinkedMeta, err := ucQuery.Run(ctx, createUnlinkedQuery(zid, phrase))
+		if err != nil {
+			wui.reportError(ctx, w, err)
+			return
+		}
+
+		bns := ucEvaluate.RunBlockNode(ctx, evaluator.QueryAction(ctx, nil, unlinkedMeta, wui.rtConfig))
+		unlinkedContent, _, err := enc.BlocksSxn(&bns)
+		if err != nil {
+			wui.reportError(ctx, w, err)
+			return
+		}
+		encTexts := encodingTexts()
+		shadowLinks := getShadowLinks(ctx, zid, ucGetAllMeta)
+
+		user := server.GetUser(ctx)
+		env, rb := wui.createRenderEnv(ctx, "info", wui.rtConfig.Get(ctx, nil, api.KeyLang), title, user)
+		rb.bindString("metadata", metadata)
+		rb.bindString("local-links", locLinks)
+		rb.bindString("query-links", queryLinks)
+		rb.bindString("ext-links", extLinks)
+		rb.bindString("unlinked-content", unlinkedContent)
+		rb.bindString("phrase", sx.String(phrase))
+		rb.bindString("query-key-phrase", sx.String(api.QueryKeyPhrase))
+		rb.bindString("enc-eval", wui.infoAPIMatrix(zid, false, encTexts))
+		rb.bindString("enc-parsed", wui.infoAPIMatrixParsed(zid, encTexts))
+		rb.bindString("shadow-links", shadowLinks)
+		wui.bindCommonZettelData(ctx, &rb, user, zn.InhMeta, &zn.Content)
+		if rb.err == nil {
+			err = wui.renderSxnTemplate(ctx, w, id.InfoTemplateZid, env)
+		} else {
+			err = rb.err
+		}
+		if err != nil {
+			wui.reportError(ctx, w, err)
+		}
+	}
+}
+
+func (wui *WebUI) splitLocSeaExtLinks(links []*ast.Reference) (locLinks, queries, extLinks *sx.Pair) {
+	for i := len(links) - 1; i >= 0; i-- {
+		ref := links[i]
+		if ref.State == ast.RefStateSelf || ref.IsZettel() {
+			continue
+		}
+		if ref.State == ast.RefStateQuery {
+			queries = queries.Cons(
+				sx.Cons(
+					sx.String(ref.Value),
+					sx.String(wui.NewURLBuilder('h').AppendQuery(ref.Value).String())))
+			continue
+		}
+		if ref.IsExternal() {
+			extLinks = extLinks.Cons(sx.String(ref.String()))
+			continue
+		}
+		locLinks = locLinks.Cons(sx.Cons(sx.MakeBoolean(ref.IsValid()), sx.String(ref.String())))
+	}
+	return locLinks, queries, extLinks
+}
+
+func createUnlinkedQuery(zid id.Zid, phrase string) *query.Query {
+	var sb strings.Builder
+	sb.Write(zid.Bytes())
+	sb.WriteByte(' ')
+	sb.WriteString(api.UnlinkedDirective)
+	for _, word := range strfun.MakeWords(phrase) {
+		sb.WriteByte(' ')
+		sb.WriteString(api.PhraseDirective)
+		sb.WriteByte(' ')
+		sb.WriteString(word)
+	}
+	sb.WriteByte(' ')
+	sb.WriteString(api.OrderDirective)
+	sb.WriteByte(' ')
+	sb.WriteString(api.KeyID)
+	return query.Parse(sb.String())
+}
+
+func encodingTexts() []string {
 	encodings := encoder.GetEncodings()
 	encTexts := make([]string, 0, len(encodings))
 	for _, f := range encodings {
 		encTexts = append(encTexts, f.String())
 	}
 	sort.Strings(encTexts)
-	parts := getParts()
-	matrix := make([]matrixLine, 0, len(parts))
+	return encTexts
+}
+
+var apiParts = []string{api.PartZettel, api.PartMeta, api.PartContent}
+
+func (wui *WebUI) infoAPIMatrix(zid id.Zid, parseOnly bool, encTexts []string) *sx.Pair {
+	matrix := sx.Nil()
 	u := wui.NewURLBuilder('z').SetZid(api.ZettelID(zid.String()))
-	for _, part := range parts {
-		row := make([]simpleLink, len(encTexts))
-		for j, enc := range encTexts {
+	for ip := len(apiParts) - 1; ip >= 0; ip-- {
+		part := apiParts[ip]
+		row := sx.Nil()
+		for je := len(encTexts) - 1; je >= 0; je-- {
+			enc := encTexts[je]
 			if parseOnly {
 				u.AppendKVQuery(api.QueryKeyParseOnly, "")
 			}
 			u.AppendKVQuery(api.QueryKeyPart, part)
 			u.AppendKVQuery(api.QueryKeyEncoding, enc)
-			row[j] = simpleLink{enc, u.AttrString()}
-			u.ClearQuery()
-		}
-		matrix = append(matrix, matrixLine{part, row})
-	}
-	return matrix
-}
-
-func (wui *WebUI) infoAPIMatrixPlain(zid id.Zid) []matrixLine {
-	matrix := wui.infoAPIMatrix(zid, true)
-	apiZid := api.ZettelID(zid.String())
-
-	// Append plain and JSON format
-	u := wui.NewURLBuilder('z').SetZid(apiZid)
-	for i, part := range getParts() {
-		u.AppendKVQuery(api.QueryKeyPart, part)
-		matrix[i].Elements = append(matrix[i].Elements, simpleLink{"plain", u.AttrString()})
-		u.ClearQuery()
-	}
-
-	u.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson)
-	u.AppendKVQuery(api.QueryKeyPart, api.PartZettel)
-	matrix[0].Elements = append(matrix[0].Elements, simpleLink{"json", u.AttrString()})
-
-	u.ClearQuery()
-	u.AppendKVQuery(api.QueryKeyEncoding, api.EncodingJson)
-	u.AppendKVQuery(api.QueryKeyPart, api.PartMeta)
-	matrix[1].Elements = append(matrix[1].Elements, simpleLink{"json", u.AttrString()})
-	return matrix
-}
-
-func getParts() []string {
-	return []string{api.PartZettel, api.PartMeta, api.PartContent}
-}
-
-func getShadowLinks(ctx context.Context, zid id.Zid, getAllMeta usecase.GetAllMeta) []string {
-	ml, err := getAllMeta.Run(ctx, zid)
-	if err != nil || len(ml) < 2 {
-		return nil
-	}
-	result := make([]string, 0, len(ml)-1)
-	for _, m := range ml[1:] {
-		if boxNo, ok := m.Get(api.KeyBoxNumber); ok {
-			result = append(result, boxNo)
+			row = row.Cons(sx.Cons(sx.String(enc), sx.String(u.String())))
+			u.ClearQuery()
+		}
+		matrix = matrix.Cons(sx.Cons(sx.String(part), row))
+	}
+	return matrix
+}
+
+func (wui *WebUI) infoAPIMatrixParsed(zid id.Zid, encTexts []string) *sx.Pair {
+	matrix := wui.infoAPIMatrix(zid, true, encTexts)
+	u := wui.NewURLBuilder('z').SetZid(api.ZettelID(zid.String()))
+
+	for i, row := 0, matrix; i < len(apiParts) && row != nil; row = row.Tail() {
+		line, isLine := sx.GetPair(row.Car())
+		if !isLine || line == nil {
+			continue
+		}
+		last := line.LastPair()
+		part := apiParts[i]
+		u.AppendKVQuery(api.QueryKeyPart, part)
+		last = last.AppendBang(sx.Cons(sx.String("plain"), sx.String(u.String())))
+		u.ClearQuery()
+		if i < 2 {
+			u.AppendKVQuery(api.QueryKeyEncoding, api.EncodingData)
+			u.AppendKVQuery(api.QueryKeyPart, part)
+			last.AppendBang(sx.Cons(sx.String("data"), sx.String(u.String())))
+			u.ClearQuery()
+		}
+		i++
+	}
+	return matrix
+}
+
+func getShadowLinks(ctx context.Context, zid id.Zid, getAllZettel usecase.GetAllZettel) *sx.Pair {
+	result := sx.Nil()
+	if zl, err := getAllZettel.Run(ctx, zid); err == nil {
+		for i := len(zl) - 1; i >= 1; i-- {
+			if boxNo, ok := zl[i].Meta.Get(api.KeyBoxNumber); ok {
+				result = result.Cons(sx.String(boxNo))
+			}
 		}
 	}
 	return result
 }

Index: web/adapter/webui/get_zettel.go
==================================================================
--- web/adapter/webui/get_zettel.go
+++ web/adapter/webui/get_zettel.go
@@ -9,186 +9,137 @@
 //-----------------------------------------------------------------------------
 
 package webui
 
 import (
+	"context"
 	"net/http"
-	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/config"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // MakeGetHTMLZettelHandler creates a new HTTP handler for the use case "get zettel".
-func (wui *WebUI) MakeGetHTMLZettelHandler(evaluate *usecase.Evaluate, getMeta usecase.GetMeta) http.HandlerFunc {
+func (wui *WebUI) MakeGetHTMLZettelHandler(evaluate *usecase.Evaluate, getZettel usecase.GetZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 
 		q := r.URL.Query()
 		zn, err := evaluate.Run(ctx, zid, q.Get(api.KeySyntax))
-
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-
-		enc := wui.getSimpleHTMLEncoder()
-		htmlContent, err := enc.BlocksString(&zn.Ast)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		var roleCSSURL string
-		cssZid, err := wui.retrieveCSSZidFromRole(ctx, *zn.InhMeta)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		if cssZid != id.Invalid {
-			roleCSSURL = wui.NewURLBuilder('z').SetZid(api.ZettelID(cssZid.String())).String()
-		}
-		user := server.GetUser(ctx)
-		roleText := zn.Meta.GetDefault(api.KeyRole, "")
-		canCreate := wui.canCreate(ctx, user)
-		getTextTitle := wui.makeGetTextTitle(ctx, getMeta)
-		extURL, hasExtURL := wui.formatURLFromMeta(zn.Meta, api.KeyURL)
-		folgeLinks := createSimpleLinks(wui.encodeZettelLinks(zn.InhMeta, api.KeyFolge, getTextTitle))
-		backLinks := createSimpleLinks(wui.encodeZettelLinks(zn.InhMeta, api.KeyBack, getTextTitle))
-		successorLinks := createSimpleLinks(wui.encodeZettelLinks(zn.InhMeta, api.KeySuccessors, getTextTitle))
-		apiZid := api.ZettelID(zid.String())
-
-		var base baseData
-		title := parser.NormalizedSpacedText(zn.InhMeta.GetTitle())
-		wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang), title, roleCSSURL, user, &base)
-		base.MetaHeader = enc.MetaString(zn.InhMeta, createEvalMetadataFunc(ctx, evaluate))
-		wui.renderTemplate(ctx, w, id.ZettelTemplateZid, &base, struct {
-			Heading         string
-			RoleCSS         string
-			CanWrite        bool
-			EditURL         string
-			Zid             string
-			InfoURL         string
-			RoleText        string
-			RoleURL         string
-			Tags            simpleLinks
-			CanCopy         bool
-			CopyURL         string
-			CanVersion      bool
-			VersionURL      string
-			CanFolge        bool
-			FolgeURL        string
-			PredecessorRefs string
-			PrecursorRefs   string
-			HasExtURL       bool
-			ExtURL          string
-			Author          string
-			Content         string
-			NeedBottomNav   bool
-			FolgeLinks      simpleLinks
-			BackLinks       simpleLinks
-			SuccessorLinks  simpleLinks
-		}{
-			Heading:         title,
-			RoleCSS:         roleCSSURL,
-			CanWrite:        wui.canWrite(ctx, user, zn.Meta, zn.Content),
-			EditURL:         wui.NewURLBuilder('e').SetZid(apiZid).String(),
-			Zid:             zid.String(),
-			InfoURL:         wui.NewURLBuilder('i').SetZid(apiZid).String(),
-			RoleText:        roleText,
-			RoleURL:         wui.NewURLBuilder('h').AppendQuery(api.KeyRole + api.SearchOperatorHas + roleText).String(),
-			Tags:            createSimpleLinks(wui.buildTagInfos(zn.Meta)),
-			CanCopy:         canCreate && !zn.Content.IsBinary(),
-			CopyURL:         wui.NewURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionCopy).String(),
-			CanVersion:      canCreate,
-			VersionURL:      wui.NewURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionVersion).String(),
-			CanFolge:        canCreate,
-			FolgeURL:        wui.NewURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionFolge).String(),
-			PredecessorRefs: wui.encodeIdentifierSet(zn.InhMeta, api.KeyPredecessor, getTextTitle),
-			PrecursorRefs:   wui.encodeIdentifierSet(zn.InhMeta, api.KeyPrecursor, getTextTitle),
-			ExtURL:          extURL,
-			HasExtURL:       hasExtURL,
-			Author:          zn.Meta.GetDefault(api.KeyAuthor, ""),
-			Content:         htmlContent,
-			NeedBottomNav:   folgeLinks.Has || backLinks.Has || successorLinks.Has,
-			FolgeLinks:      folgeLinks,
-			BackLinks:       backLinks,
-			SuccessorLinks:  successorLinks,
-		})
-	}
-}
-
-func (wui *WebUI) formatURLFromMeta(m *meta.Meta, key string) (string, bool) {
-	val, found := m.Get(key)
-	if !found {
-		return "", false
-	}
-	if val == "" {
-		return "", false
-	}
-
-	var sb strings.Builder
-	_, err := wui.htmlGen.WriteHTML(&sb, wui.transformURL(val))
-	if err != nil {
-		return "", false
-	}
-	return sb.String(), true
-}
-
-func (wui *WebUI) buildTagInfos(m *meta.Meta) []simpleLink {
-	var tagInfos []simpleLink
-	if tags, ok := m.GetList(api.KeyTags); ok {
-		ub := wui.NewURLBuilder('h')
-		tagInfos = make([]simpleLink, len(tags))
-		for i, tag := range tags {
-			tagInfos[i] = simpleLink{Text: tag, URL: ub.AppendQuery(api.KeyTags + api.SearchOperatorHas + tag).String()}
-			ub.ClearQuery()
-		}
-	}
-	return tagInfos
-}
-
-func (wui *WebUI) encodeIdentifierSet(m *meta.Meta, key string, getTextTitle getTextTitleFunc) string {
-	if value, ok := m.Get(key); ok {
-		sval := wui.transformIdentifierSet(meta.ListFromValue(value), getTextTitle)
-		var sb strings.Builder
-		wui.htmlGen.WriteHTML(&sb, sval)
-		return sb.String()
-	}
-	return ""
-}
-
-func (wui *WebUI) encodeZettelLinks(m *meta.Meta, key string, getTextTitle getTextTitleFunc) []simpleLink {
-	values, ok := m.GetList(key)
-	if !ok || len(values) == 0 {
-		return nil
-	}
-	return wui.encodeZidLinks(values, getTextTitle)
-}
-
-func (wui *WebUI) encodeZidLinks(values []string, getTextTitle getTextTitleFunc) []simpleLink {
-	result := make([]simpleLink, 0, len(values))
-	for _, val := range values {
-		zid, err := id.Parse(val)
-		if err != nil {
-			continue
-		}
-		if title, found := getTextTitle(zid); found > 0 {
-			url := wui.NewURLBuilder('h').SetZid(api.ZettelID(zid.String())).String()
-			if title == "" {
-				result = append(result, simpleLink{Text: val, URL: url})
-			} else {
-				result = append(result, simpleLink{Text: title, URL: url})
-			}
-		}
-	}
-	return result
+		if err != nil {
+			wui.reportError(ctx, w, err)
+			return
+		}
+
+		enc := wui.getSimpleHTMLEncoder(wui.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang))
+		metaObj := enc.MetaSxn(zn.InhMeta, createEvalMetadataFunc(ctx, evaluate))
+		content, endnotes, err := enc.BlocksSxn(&zn.Ast)
+		if err != nil {
+			wui.reportError(ctx, w, err)
+			return
+		}
+
+		user := server.GetUser(ctx)
+		getTextTitle := wui.makeGetTextTitle(ctx, getZettel)
+
+		title := parser.NormalizedSpacedText(zn.InhMeta.GetTitle())
+		env, rb := wui.createRenderEnv(ctx, "zettel", wui.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang), title, user)
+		rb.bindSymbol(wui.symMetaHeader, metaObj)
+		rb.bindString("heading", sx.String(title))
+		if role, found := zn.InhMeta.Get(api.KeyRole); found && role != "" {
+			rb.bindString("role-url", sx.String(wui.NewURLBuilder('h').AppendQuery(api.KeyRole+api.SearchOperatorHas+role).String()))
+		}
+		if folgeRole, found := zn.InhMeta.Get(api.KeyFolgeRole); found && folgeRole != "" {
+			rb.bindString("folge-role-url", sx.String(wui.NewURLBuilder('h').AppendQuery(api.KeyRole+api.SearchOperatorHas+folgeRole).String()))
+		}
+		rb.bindString("tag-refs", wui.transformTagSet(api.KeyTags, meta.ListFromValue(zn.InhMeta.GetDefault(api.KeyTags, ""))))
+		rb.bindString("predecessor-refs", wui.identifierSetAsLinks(zn.InhMeta, api.KeyPredecessor, getTextTitle))
+		rb.bindString("precursor-refs", wui.identifierSetAsLinks(zn.InhMeta, api.KeyPrecursor, getTextTitle))
+		rb.bindString("superior-refs", wui.identifierSetAsLinks(zn.InhMeta, api.KeySuperior, getTextTitle))
+		rb.bindString("content", content)
+		rb.bindString("endnotes", endnotes)
+		wui.bindLinks(ctx, &rb, "folge", zn.InhMeta, api.KeyFolge, config.KeyShowFolgeLinks, getTextTitle)
+		wui.bindLinks(ctx, &rb, "subordinate", zn.InhMeta, api.KeySubordinates, config.KeyShowSubordinateLinks, getTextTitle)
+		wui.bindLinks(ctx, &rb, "back", zn.InhMeta, api.KeyBack, config.KeyShowBackLinks, getTextTitle)
+		wui.bindLinks(ctx, &rb, "successor", zn.InhMeta, api.KeySuccessors, config.KeyShowSuccessorLinks, getTextTitle)
+		if role, found := zn.InhMeta.Get(api.KeyRole); found && role != "" {
+			for _, part := range []string{"meta", "actions", "heading"} {
+				rb.rebindResolved("ROLE-"+role+"-"+part, "ROLE-DEFAULT-"+part)
+			}
+		}
+		wui.bindCommonZettelData(ctx, &rb, user, zn.InhMeta, &zn.Content)
+		if rb.err == nil {
+			err = wui.renderSxnTemplate(ctx, w, id.ZettelTemplateZid, env)
+		} else {
+			err = rb.err
+		}
+		if err != nil {
+			wui.reportError(ctx, w, err)
+		}
+	}
+}
+
+func (wui *WebUI) identifierSetAsLinks(m *meta.Meta, key string, getTextTitle getTextTitleFunc) *sx.Pair {
+	if values, ok := m.GetList(key); ok {
+		return wui.transformIdentifierSet(values, getTextTitle)
+	}
+	return nil
+}
+
+func (wui *WebUI) bindLinks(ctx context.Context, rb *renderBinder, varPrefix string, m *meta.Meta, key, configKey string, getTextTitle getTextTitleFunc) {
+	varLinks := varPrefix + "-links"
+	var symOpen *sx.Symbol
+	switch wui.rtConfig.Get(ctx, m, configKey) {
+	case "false":
+		rb.bindString(varLinks, sx.Nil())
+		return
+	case "close":
+	default:
+		symOpen = wui.symAttrOpen
+	}
+	lstLinks := wui.zettelLinksSxn(m, key, getTextTitle)
+	rb.bindString(varLinks, lstLinks)
+	if sx.IsNil(lstLinks) {
+		return
+	}
+	rb.bindString(varPrefix+"-open", symOpen)
+}
+
+func (wui *WebUI) zettelLinksSxn(m *meta.Meta, key string, getTextTitle getTextTitleFunc) *sx.Pair {
+	values, ok := m.GetList(key)
+	if !ok || len(values) == 0 {
+		return nil
+	}
+	return wui.zidLinksSxn(values, getTextTitle)
+}
+
+func (wui *WebUI) zidLinksSxn(values []string, getTextTitle getTextTitleFunc) (lst *sx.Pair) {
+	for i := len(values) - 1; i >= 0; i-- {
+		val := values[i]
+		zid, err := id.Parse(val)
+		if err != nil {
+			continue
+		}
+		if title, found := getTextTitle(zid); found > 0 {
+			url := sx.String(wui.NewURLBuilder('h').SetZid(api.ZettelID(zid.String())).String())
+			if title == "" {
+				lst = lst.Cons(sx.Cons(sx.String(val), url))
+			} else {
+				lst = lst.Cons(sx.Cons(sx.String(title), url))
+			}
+		}
+	}
+	return lst
 }

Index: web/adapter/webui/home.go
==================================================================
--- web/adapter/webui/home.go
+++ web/adapter/webui/home.go
@@ -13,41 +13,41 @@
 import (
 	"context"
 	"errors"
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
 )
 
 type getRootStore interface {
-	// GetMeta retrieves just the meta data of a specific zettel.
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
+	GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error)
 }
 
 // MakeGetRootHandler creates a new HTTP handler to show the root URL.
 func (wui *WebUI) MakeGetRootHandler(s getRootStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		if r.URL.Path != "/" {
-			wui.reportError(ctx, w, box.ErrNotFound)
+		if p := r.URL.Path; p != "/" {
+			wui.reportError(ctx, w, adapter.ErrResourceNotFound{Path: p})
 			return
 		}
 		homeZid, _ := id.Parse(wui.rtConfig.Get(ctx, nil, config.KeyHomeZettel))
 		apiHomeZid := api.ZettelID(homeZid.String())
 		if homeZid != id.DefaultHomeZid {
-			if _, err := s.GetMeta(ctx, homeZid); err == nil {
+			if _, err := s.GetZettel(ctx, homeZid); err == nil {
 				wui.redirectFound(w, r, wui.NewURLBuilder('h').SetZid(apiHomeZid))
 				return
 			}
 			homeZid = id.DefaultHomeZid
 		}
-		_, err := s.GetMeta(ctx, homeZid)
+		_, err := s.GetZettel(ctx, homeZid)
 		if err == nil {
 			wui.redirectFound(w, r, wui.NewURLBuilder('h').SetZid(apiHomeZid))
 			return
 		}
 		if errors.Is(err, &box.ErrNotAllowed{}) && wui.authz.WithAuth() && server.GetUser(ctx) == nil {

Index: web/adapter/webui/htmlgen.go
==================================================================
--- web/adapter/webui/htmlgen.go
+++ web/adapter/webui/htmlgen.go
@@ -12,316 +12,288 @@
 
 import (
 	"net/url"
 	"strings"
 
-	"codeberg.org/t73fde/sxhtml"
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
-	"zettelstore.de/c/attrs"
-	"zettelstore.de/c/maps"
-	"zettelstore.de/c/sexpr"
-	"zettelstore.de/c/shtml"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/client.fossil/attrs"
+	"zettelstore.de/client.fossil/maps"
+	"zettelstore.de/client.fossil/shtml"
+	"zettelstore.de/client.fossil/sz"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/ast"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/encoder"
-	"zettelstore.de/z/encoder/sexprenc"
+	"zettelstore.de/z/encoder/szenc"
 	"zettelstore.de/z/strfun"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // Builder allows to build new URLs for the web service.
 type urlBuilder interface {
 	GetURLPrefix() string
 	NewURLBuilder(key byte) *api.URLBuilder
 }
 
 type htmlGenerator struct {
-	tx    *sexprenc.Transformer
-	th    *shtml.Transformer
-	symAt *sxpf.Symbol
+	tx    *szenc.Transformer
+	th    *shtml.Evaluator
+	lang  string
+	symAt *sx.Symbol
 }
 
-func (wui *WebUI) createGenerator(builder urlBuilder) *htmlGenerator {
-	th := shtml.NewTransformer(1, wui.sf)
-	symA := th.Make("a")
+func (wui *WebUI) createGenerator(builder urlBuilder, lang string) *htmlGenerator {
+	th := shtml.NewEvaluator(1, wui.sf)
+	symA := wui.symA
 	symImg := th.Make("img")
-	symAt := th.Make(sxhtml.NameSymAttr)
+	symAttr := wui.symAttr
 
-	symHref := th.Make("href")
+	symHref := wui.symHref
 	symClass := th.Make("class")
 	symTarget := th.Make("target")
 	symRel := th.Make("rel")
 
-	findA := func(obj sxpf.Object) (attr, assoc, rest *sxpf.List) {
-		lst, ok := obj.(*sxpf.List)
-		if !ok || !symA.IsEqual(lst.Car()) {
+	findA := func(obj sx.Object) (attr, assoc, rest *sx.Pair) {
+		pair, isPair := sx.GetPair(obj)
+		if !isPair || !symA.IsEqual(pair.Car()) {
 			return nil, nil, nil
 		}
-		rest = lst.Tail()
+		rest = pair.Tail()
 		if rest == nil {
 			return nil, nil, nil
 		}
 		objA := rest.Car()
-		attr, ok = objA.(*sxpf.List)
-		if !ok || !symAt.IsEqual(attr.Car()) {
+		attr, isPair = sx.GetPair(objA)
+		if !isPair || !symAttr.IsEqual(attr.Car()) {
 			return nil, nil, nil
 		}
 		return attr, attr.Tail(), rest.Tail()
 	}
-	linkZettel := func(_ sxpf.Environment, args *sxpf.List, prevFn sxpf.Callable) sxpf.Object {
-		obj, err := prevFn.Call(nil, args)
-		if err != nil {
-			return sxpf.Nil()
-		}
+	linkZettel := func(obj sx.Object) sx.Object {
 		attr, assoc, rest := findA(obj)
 		if attr == nil {
 			return obj
 		}
 
 		hrefP := assoc.Assoc(symHref)
 		if hrefP == nil {
 			return obj
 		}
-		href, ok := hrefP.Cdr().(sxpf.String)
+		href, ok := sx.GetString(hrefP.Cdr())
 		if !ok {
 			return obj
 		}
 		zid, fragment, hasFragment := strings.Cut(href.String(), "#")
 		u := builder.NewURLBuilder('h').SetZid(api.ZettelID(zid))
 		if hasFragment {
 			u = u.SetFragment(fragment)
 		}
-		assoc = assoc.Cons(sxpf.Cons(symHref, sxpf.MakeString(u.String())))
-		return rest.Cons(assoc.Cons(symAt)).Cons(symA)
-	}
-
-	th.SetRebinder(func(te *shtml.TransformEnv) {
-		te.Rebind(sexpr.NameSymLinkZettel, linkZettel)
-		te.Rebind(sexpr.NameSymLinkFound, linkZettel)
-		te.Rebind(sexpr.NameSymLinkBased, func(_ sxpf.Environment, args *sxpf.List, prevFn sxpf.Callable) sxpf.Object {
-			obj, err := prevFn.Call(nil, args)
-			if err != nil {
-				return sxpf.Nil()
-			}
-			attr, assoc, rest := findA(obj)
-			if attr == nil {
-				return obj
-			}
-			hrefP := assoc.Assoc(symHref)
-			if hrefP == nil {
-				return obj
-			}
-			href, ok := hrefP.Cdr().(sxpf.String)
-			if !ok {
-				return obj
-			}
-			u := builder.NewURLBuilder('/').SetRawLocal(href.String())
-			assoc = assoc.Cons(sxpf.Cons(symHref, sxpf.MakeString(u.String())))
-			return rest.Cons(assoc.Cons(symAt)).Cons(symA)
-		})
-		te.Rebind(sexpr.NameSymLinkQuery, func(_ sxpf.Environment, args *sxpf.List, prevFn sxpf.Callable) sxpf.Object {
-			obj, err := prevFn.Call(nil, args)
-			if err != nil {
-				return sxpf.Nil()
-			}
-			attr, assoc, rest := findA(obj)
-			if attr == nil {
-				return obj
-			}
-			hrefP := assoc.Assoc(symHref)
-			if hrefP == nil {
-				return obj
-			}
-			href, ok := hrefP.Cdr().(sxpf.String)
-			if !ok {
-				return obj
-			}
-			ur, err := url.Parse(href.String())
-			if err != nil {
-				return obj
-			}
-			q := ur.Query().Get(api.QueryKeyQuery)
-			if q == "" {
-				return obj
-			}
-			u := builder.NewURLBuilder('h').AppendQuery(q)
-			assoc = assoc.Cons(sxpf.Cons(symHref, sxpf.MakeString(u.String())))
-			return rest.Cons(assoc.Cons(symAt)).Cons(symA)
-		})
-		te.Rebind(sexpr.NameSymLinkExternal, func(_ sxpf.Environment, args *sxpf.List, prevFn sxpf.Callable) sxpf.Object {
-			obj, err := prevFn.Call(nil, args)
-			if err != nil {
-				return sxpf.Nil()
-			}
-			attr, assoc, rest := findA(obj)
-			if attr == nil {
-				return obj
-			}
-			assoc = assoc.Cons(sxpf.Cons(symClass, sxpf.MakeString("external"))).
-				Cons(sxpf.Cons(symTarget, sxpf.MakeString("_blank"))).
-				Cons(sxpf.Cons(symRel, sxpf.MakeString("noopener noreferrer")))
-			return rest.Cons(assoc.Cons(symAt)).Cons(symA)
-		})
-		te.Rebind(sexpr.NameSymEmbed, func(_ sxpf.Environment, args *sxpf.List, prevFn sxpf.Callable) sxpf.Object {
-			obj, err := prevFn.Call(nil, args)
-			if err != nil {
-				return sxpf.Nil()
-			}
-			lst, ok := obj.(*sxpf.List)
-			if !ok || !symImg.IsEqual(lst.Car()) {
-				return obj
-			}
-			attr, ok := lst.Tail().Car().(*sxpf.List)
-			if !ok || !symAt.IsEqual(attr.Car()) {
-				return obj
-			}
-			symSrc := th.Make("src")
-			srcP := attr.Tail().Assoc(symSrc)
-			if srcP == nil {
-				return obj
-			}
-			src, ok := srcP.Cdr().(sxpf.String)
-			if !ok {
-				return obj
-			}
-			zid := api.ZettelID(src)
-			if !zid.IsValid() {
-				return obj
-			}
-			u := builder.NewURLBuilder('z').SetZid(zid)
-			imgAttr := attr.Tail().Cons(sxpf.Cons(symSrc, sxpf.MakeString(u.String()))).Cons(symAt)
-			return lst.Tail().Tail().Cons(imgAttr).Cons(symImg)
-		})
+		assoc = assoc.Cons(sx.Cons(symHref, sx.String(u.String())))
+		return rest.Cons(assoc.Cons(symAttr)).Cons(symA)
+	}
+
+	rebind(th, sz.NameSymLinkZettel, linkZettel)
+	rebind(th, sz.NameSymLinkFound, linkZettel)
+	rebind(th, sz.NameSymLinkBased, func(obj sx.Object) sx.Object {
+		attr, assoc, rest := findA(obj)
+		if attr == nil {
+			return obj
+		}
+		hrefP := assoc.Assoc(symHref)
+		if hrefP == nil {
+			return obj
+		}
+		href, ok := sx.GetString(hrefP.Cdr())
+		if !ok {
+			return obj
+		}
+		u := builder.NewURLBuilder('/').SetRawLocal(href.String())
+		assoc = assoc.Cons(sx.Cons(symHref, sx.String(u.String())))
+		return rest.Cons(assoc.Cons(symAttr)).Cons(symA)
+	})
+	rebind(th, sz.NameSymLinkQuery, func(obj sx.Object) sx.Object {
+		attr, assoc, rest := findA(obj)
+		if attr == nil {
+			return obj
+		}
+		hrefP := assoc.Assoc(symHref)
+		if hrefP == nil {
+			return obj
+		}
+		href, ok := sx.GetString(hrefP.Cdr())
+		if !ok {
+			return obj
+		}
+		ur, err := url.Parse(href.String())
+		if err != nil {
+			return obj
+		}
+		q := ur.Query().Get(api.QueryKeyQuery)
+		if q == "" {
+			return obj
+		}
+		u := builder.NewURLBuilder('h').AppendQuery(q)
+		assoc = assoc.Cons(sx.Cons(symHref, sx.String(u.String())))
+		return rest.Cons(assoc.Cons(symAttr)).Cons(symA)
+	})
+	rebind(th, sz.NameSymLinkExternal, func(obj sx.Object) sx.Object {
+		attr, assoc, rest := findA(obj)
+		if attr == nil {
+			return obj
+		}
+		assoc = assoc.Cons(sx.Cons(symClass, sx.String("external"))).
+			Cons(sx.Cons(symTarget, sx.String("_blank"))).
+			Cons(sx.Cons(symRel, sx.String("noopener noreferrer")))
+		return rest.Cons(assoc.Cons(symAttr)).Cons(symA)
+	})
+	rebind(th, sz.NameSymEmbed, func(obj sx.Object) sx.Object {
+		pair, isPair := sx.GetPair(obj)
+		if !isPair || !symImg.IsEqual(pair.Car()) {
+			return obj
+		}
+		attr, isPair := sx.GetPair(pair.Tail().Car())
+		if !isPair || !symAttr.IsEqual(attr.Car()) {
+			return obj
+		}
+		symSrc := th.Make("src")
+		srcP := attr.Tail().Assoc(symSrc)
+		if srcP == nil {
+			return obj
+		}
+		src, isString := sx.GetString(srcP.Cdr())
+		if !isString {
+			return obj
+		}
+		zid := api.ZettelID(src)
+		if !zid.IsValid() {
+			return obj
+		}
+		u := builder.NewURLBuilder('z').SetZid(zid)
+		imgAttr := attr.Tail().Cons(sx.Cons(symSrc, sx.String(u.String()))).Cons(symAttr)
+		return pair.Tail().Tail().Cons(imgAttr).Cons(symImg)
 	})
 
 	return &htmlGenerator{
-		tx:    sexprenc.NewTransformer(),
+		tx:    szenc.NewTransformer(),
 		th:    th,
-		symAt: symAt,
+		lang:  lang,
+		symAt: symAttr,
 	}
 }
 
+func rebind(ev *shtml.Evaluator, name string, fn func(sx.Object) sx.Object) {
+	prevFn := ev.ResolveBinding(name)
+	ev.Rebind(name, func(args []sx.Object, env *shtml.Environment) sx.Object {
+		obj := prevFn(args, env)
+		if env.GetError() == nil {
+			return fn(obj)
+		}
+		return sx.Nil()
+	})
+}
+
+// SetUnique sets a prefix to make several HTML ids unique.
+func (g *htmlGenerator) SetUnique(s string) *htmlGenerator { g.th.SetUnique(s); return g }
+
 var mapMetaKey = map[string]string{
 	api.KeyCopyright: "copyright",
 	api.KeyLicense:   "license",
 }
 
-func (g *htmlGenerator) MetaString(m *meta.Meta, evalMeta encoder.EvalMetaFunc) string {
+func (g *htmlGenerator) MetaSxn(m *meta.Meta, evalMeta encoder.EvalMetaFunc) *sx.Pair {
 	tm := g.tx.GetMeta(m, evalMeta)
-	hm, err := g.th.Transform(tm)
+	env := shtml.MakeEnvironment(g.lang)
+	hm, err := g.th.Evaluate(tm, &env)
 	if err != nil {
-		return ""
+		return nil
 	}
 
 	ignore := strfun.NewSet(api.KeyTitle, api.KeyLang)
-	metaMap := make(map[string]*sxpf.List, m.Length())
+	metaMap := make(map[string]*sx.Pair, m.Length())
 	if tags, ok := m.Get(api.KeyTags); ok {
 		metaMap[api.KeyTags] = g.transformMetaTags(tags)
 		ignore.Set(api.KeyTags)
 	}
 
 	for elem := hm; elem != nil; elem = elem.Tail() {
-		mlst, ok := elem.Car().(*sxpf.List)
-		if !ok {
+		mlst, isPair := sx.GetPair(elem.Car())
+		if !isPair {
 			continue
 		}
-		att, ok := mlst.Tail().Car().(*sxpf.List)
-		if !ok {
+		att, isPair := sx.GetPair(mlst.Tail().Car())
+		if !isPair {
 			continue
 		}
 		if !att.Car().IsEqual(g.symAt) {
 			continue
 		}
 		a := make(attrs.Attributes, 32)
 		for aelem := att.Tail(); aelem != nil; aelem = aelem.Tail() {
-			if p, ok2 := aelem.Car().(*sxpf.List); ok2 {
+			if p, ok := sx.GetPair(aelem.Car()); ok {
 				key := p.Car()
 				val := p.Cdr()
-				if tail, ok3 := val.(*sxpf.List); ok3 {
+				if tail, isTail := sx.GetPair(val); isTail {
 					val = tail.Car()
 				}
 				a = a.Set(key.String(), val.String())
 			}
 		}
 		name, found := a.Get("name")
 		if !found || ignore.Has(name) {
 			continue
 		}
-		var newName string
-		if altName, found2 := mapMetaKey[name]; found2 {
-			newName = altName
-		} else {
-			newName = "zs-" + name
+
+		newName, found := mapMetaKey[name]
+		if !found {
+			continue
 		}
 		a = a.Set("name", newName)
-		metaMap[newName] = g.th.TransformMeta(a)
+		metaMap[newName] = g.th.EvaluateMeta(a)
 	}
-	result := sxpf.Nil()
+	result := sx.Nil()
 	keys := maps.Keys(metaMap)
 	for i := len(keys) - 1; i >= 0; i-- {
 		result = result.Cons(metaMap[keys[i]])
 	}
+	return result
+}
 
-	var sb strings.Builder
-	gen := sxhtml.NewGenerator(sxpf.FindSymbolFactory(result))
-	_, _ = gen.WriteListHTML(&sb, result)
-	return sb.String()
-}
-func (g *htmlGenerator) transformMetaTags(tags string) *sxpf.List {
+func (g *htmlGenerator) transformMetaTags(tags string) *sx.Pair {
 	var sb strings.Builder
 	for i, val := range meta.ListFromValue(tags) {
 		if i > 0 {
 			sb.WriteString(", ")
 		}
 		sb.WriteString(strings.TrimPrefix(val, "#"))
 	}
 	metaTags := sb.String()
 	if len(metaTags) == 0 {
-		return sxpf.Nil()
-	}
-	return g.th.TransformMeta(attrs.Attributes{"name": "keywords", "content": metaTags})
-}
-
-// BlocksString encodes a block slice.
-func (g *htmlGenerator) BlocksString(bs *ast.BlockSlice) (string, error) {
-	if bs == nil || len(*bs) == 0 {
-		return "", nil
-	}
-	sx := g.tx.GetSexpr(bs)
-	sh, err := g.th.Transform(sx)
-	if err != nil {
-		return "", err
-	}
-	var sb strings.Builder
-	gen := sxhtml.NewGenerator(sxpf.FindSymbolFactory(sh), sxhtml.WithNewline)
-	_, err = gen.WriteListHTML(&sb, sh)
-	if err != nil {
-		return sb.String(), err
-	}
-
-	_, err = gen.WriteHTML(&sb, g.th.Endnotes())
-	return sb.String(), err
+		return nil
+	}
+	return g.th.EvaluateMeta(attrs.Attributes{"name": "keywords", "content": metaTags})
+}
+
+func (g *htmlGenerator) BlocksSxn(bs *ast.BlockSlice) (content, endnotes *sx.Pair, _ error) {
+	if bs == nil || len(*bs) == 0 {
+		return nil, nil, nil
+	}
+	sx := g.tx.GetSz(bs)
+	env := shtml.MakeEnvironment(g.lang)
+	sh, err := g.th.Evaluate(sx, &env)
+	if err != nil {
+		return nil, nil, err
+	}
+	return sh, g.th.Endnotes(&env), nil
 }
 
 // InlinesSxHTML returns an inline slice, encoded as a SxHTML object.
-func (g *htmlGenerator) InlinesSxHTML(is *ast.InlineSlice) *sxpf.List {
-	if is == nil || len(*is) == 0 {
-		return sxpf.Nil()
-	}
-	sx := g.tx.GetSexpr(is)
-	sh, err := g.th.Transform(sx)
-	if err != nil {
-		return sxpf.Nil()
+func (g *htmlGenerator) InlinesSxHTML(is *ast.InlineSlice) *sx.Pair {
+	if is == nil || len(*is) == 0 {
+		return nil
+	}
+	sx := g.tx.GetSz(is)
+	env := shtml.MakeEnvironment(g.lang)
+	sh, err := g.th.Evaluate(sx, &env)
+	if err != nil {
+		return nil
 	}
 	return sh
 }
-
-// InlinesString returns an inline slice, encoded as a HTML string.
-func (g *htmlGenerator) InlinesString(is *ast.InlineSlice) string {
-	if sh := g.InlinesSxHTML(is); !sxpf.IsNil(sh) {
-		var sb strings.Builder
-		gen := sxhtml.NewGenerator(sxpf.FindSymbolFactory(sh))
-		_, _ = gen.WriteListHTML(&sb, sh)
-		return sb.String()
-	}
-	return ""
-}

Index: web/adapter/webui/htmlmeta.go
==================================================================
--- web/adapter/webui/htmlmeta.go
+++ web/adapter/webui/htmlmeta.go
@@ -11,167 +11,135 @@
 package webui
 
 import (
 	"context"
 	"errors"
-	"fmt"
-	"net/url"
-	"time"
 
-	"codeberg.org/t73fde/sxhtml"
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/sx.fossil/sxhtml"
 	"zettelstore.de/z/ast"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/parser"
 	"zettelstore.de/z/usecase"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 func (wui *WebUI) writeHTMLMetaValue(
 	key, value string,
 	getTextTitle getTextTitleFunc,
 	evalMetadata evalMetadataFunc,
 	gen *htmlGenerator,
-) sxpf.Object {
-	var sval sxpf.Object = sxpf.Nil()
+) sx.Object {
 	switch kt := meta.Type(key); kt {
 	case meta.TypeCredential:
-		sval = sxpf.MakeString(value)
+		return sx.String(value)
 	case meta.TypeEmpty:
-		sval = sxpf.MakeString(value)
+		return sx.String(value)
 	case meta.TypeID:
-		sval = wui.transformIdentifier(value, getTextTitle)
+		return wui.transformIdentifier(value, getTextTitle)
 	case meta.TypeIDSet:
-		sval = wui.transformIdentifierSet(meta.ListFromValue(value), getTextTitle)
+		return wui.transformIdentifierSet(meta.ListFromValue(value), getTextTitle)
 	case meta.TypeNumber:
-		sval = wui.transformLink(key, value, value)
+		return wui.transformLink(key, value, value)
 	case meta.TypeString:
-		sval = sxpf.MakeString(value)
+		return sx.String(value)
 	case meta.TypeTagSet:
-		sval = wui.transformTagSet(key, meta.ListFromValue(value))
+		return wui.transformTagSet(key, meta.ListFromValue(value))
 	case meta.TypeTimestamp:
 		if ts, ok := meta.TimeValue(value); ok {
-			sval = wui.transformTimestamp(ts)
+			return sx.MakeList(
+				wui.sf.MustMake("time"),
+				sx.MakeList(
+					wui.symAttr,
+					sx.Cons(wui.sf.MustMake("datetime"), sx.String(ts.Format("2006-01-02T15:04:05"))),
+				),
+				sx.MakeList(wui.sf.MustMake(sxhtml.NameSymNoEscape), sx.String(ts.Format("2006-01-02&nbsp;15:04:05"))),
+			)
 		}
+		return sx.Nil()
 	case meta.TypeURL:
-		sval = wui.transformURL(value)
+		return wui.url2html(sx.String(value))
 	case meta.TypeWord:
-		sval = wui.transformWord(key, value)
+		return wui.transformLink(key, value, value)
 	case meta.TypeWordSet:
-		sval = wui.transformWordSet(key, meta.ListFromValue(value))
+		return wui.transformWordSet(key, meta.ListFromValue(value))
 	case meta.TypeZettelmarkup:
-		sval = wui.transformZmkMetadata(value, evalMetadata, gen)
+		return wui.transformZmkMetadata(value, evalMetadata, gen)
 	default:
-		sval = sxpf.Nil().Cons(sxpf.MakeString(fmt.Sprintf(" <b>(Unhandled type: %v, key: %v)</b>", kt, key))).Cons(wui.sf.MustMake("b"))
+		return sx.MakeList(wui.sf.MustMake("b"), sx.String("Unhandled type: "), sx.String(kt.Name))
 	}
-	return sval
 }
 
-func (wui *WebUI) transformIdentifier(val string, getTextTitle getTextTitleFunc) sxpf.Object {
-	text := sxpf.MakeString(val)
+func (wui *WebUI) transformIdentifier(val string, getTextTitle getTextTitleFunc) sx.Object {
+	text := sx.String(val)
 	zid, err := id.Parse(val)
 	if err != nil {
 		return text
 	}
 	title, found := getTextTitle(zid)
 	switch {
 	case found > 0:
 		ub := wui.NewURLBuilder('h').SetZid(api.ZettelID(zid.String()))
-		attrs := sxpf.Nil()
-		if title != "" {
-			attrs = attrs.Cons(sxpf.Cons(wui.sf.MustMake("title"), sxpf.MakeString(title)))
-		}
-		attrs = attrs.Cons(sxpf.Cons(wui.sf.MustMake("href"), sxpf.MakeString(ub.String()))).Cons(wui.sf.MustMake(sxhtml.NameSymAttr))
-		return sxpf.Nil().Cons(sxpf.MakeString(zid.String())).Cons(attrs).Cons(wui.sf.MustMake("a"))
-	case found == 0:
-		return sxpf.Nil().Cons(text).Cons(wui.sf.MustMake("s"))
+		attrs := sx.Nil()
+		if title != "" {
+			attrs = attrs.Cons(sx.Cons(wui.sf.MustMake("title"), sx.String(title)))
+		}
+		attrs = attrs.Cons(sx.Cons(wui.symHref, sx.String(ub.String()))).Cons(wui.symAttr)
+		return sx.Nil().Cons(sx.String(zid.String())).Cons(attrs).Cons(wui.symA)
+	case found == 0:
+		return sx.MakeList(wui.sf.MustMake("s"), text)
 	default: // case found < 0:
 		return text
 	}
 }
 
-func (wui *WebUI) transformIdentifierSet(vals []string, getTextTitle getTextTitleFunc) sxpf.Object {
+func (wui *WebUI) transformIdentifierSet(vals []string, getTextTitle getTextTitleFunc) *sx.Pair {
 	if len(vals) == 0 {
-		return sxpf.Nil()
+		return nil
 	}
-	space := sxpf.MakeString(" ")
-	text := make([]sxpf.Object, 0, 2*len(vals))
+	space := sx.String(" ")
+	text := make([]sx.Object, 0, 2*len(vals))
 	for _, val := range vals {
 		text = append(text, space, wui.transformIdentifier(val, getTextTitle))
 	}
-	return sxpf.MakeList(text[1:]...).Cons(wui.sf.MustMake("span"))
+	return sx.MakeList(text[1:]...).Cons(wui.symSpan)
 }
 
-func (wui *WebUI) transformTagSet(key string, tags []string) sxpf.Object {
+func (wui *WebUI) transformTagSet(key string, tags []string) *sx.Pair {
 	if len(tags) == 0 {
-		return sxpf.Nil()
+		return nil
 	}
-	space := sxpf.MakeString(" ")
-	text := make([]sxpf.Object, 0, 2*len(tags))
+	space := sx.String(" ")
+	text := make([]sx.Object, 0, 2*len(tags))
 	for _, tag := range tags {
 		text = append(text, space, wui.transformLink(key, tag, tag))
 	}
-	return sxpf.MakeList(text[1:]...).Cons(wui.sf.MustMake("span"))
-}
-
-func (wui *WebUI) transformTimestamp(ts time.Time) sxpf.Object {
-	return sxpf.MakeList(
-		wui.sf.MustMake("time"),
-		sxpf.MakeList(
-			wui.sf.MustMake(sxhtml.NameSymAttr),
-			sxpf.Cons(wui.sf.MustMake("datetime"), sxpf.MakeString(ts.Format("2006-01-02T15:04:05"))),
-		),
-		sxpf.MakeList(wui.sf.MustMake(sxhtml.NameSymNoEscape), sxpf.MakeString(ts.Format("2006-01-02&nbsp;15:04:05"))),
-	)
-}
-
-func (wui *WebUI) transformURL(val string) sxpf.Object {
-	text := sxpf.MakeString(val)
-	u, err := url.Parse(val)
-	if err == nil {
-		if us := u.String(); us != "" {
-			return sxpf.MakeList(
-				wui.sf.MustMake("a"),
-				sxpf.MakeList(
-					wui.sf.MustMake(sxhtml.NameSymAttr),
-					sxpf.Cons(wui.sf.MustMake("href"), sxpf.MakeString(val)),
-					sxpf.Cons(wui.sf.MustMake("target"), sxpf.MakeString("_blank")),
-					sxpf.Cons(wui.sf.MustMake("rel"), sxpf.MakeString("noopener noreferrer")),
-				),
-				text,
-			)
-		}
-	}
-	return text
-}
-
-func (wui *WebUI) transformWord(key, word string) sxpf.Object {
-	return wui.transformLink(key, word, word)
-}
-
-func (wui *WebUI) transformWordSet(key string, words []string) sxpf.Object {
-	if len(words) == 0 {
-		return sxpf.Nil()
-	}
-	space := sxpf.MakeString(" ")
-	text := make([]sxpf.Object, 0, 2*len(words))
-	for _, tag := range words {
-		text = append(text, space, wui.transformWord(key, tag))
-	}
-	return sxpf.MakeList(text[1:]...).Cons(wui.sf.MustMake("span"))
-}
-
-func (wui *WebUI) transformLink(key, value, text string) sxpf.Object {
-	return sxpf.MakeList(
-		wui.sf.MustMake("a"),
-		sxpf.MakeList(
-			wui.sf.MustMake(sxhtml.NameSymAttr),
-			sxpf.Cons(wui.sf.MustMake("href"), sxpf.MakeString(wui.NewURLBuilder('h').AppendQuery(key+api.SearchOperatorHas+value).String())),
-		),
-		sxpf.MakeString(text),
+	return sx.MakeList(text[1:]...).Cons(wui.symSpan)
+}
+
+func (wui *WebUI) transformWordSet(key string, words []string) sx.Object {
+	if len(words) == 0 {
+		return sx.Nil()
+	}
+	space := sx.String(" ")
+	text := make([]sx.Object, 0, 2*len(words))
+	for _, word := range words {
+		text = append(text, space, wui.transformLink(key, word, word))
+	}
+	return sx.MakeList(text[1:]...).Cons(wui.symSpan)
+}
+
+func (wui *WebUI) transformLink(key, value, text string) *sx.Pair {
+	return sx.MakeList(
+		wui.symA,
+		sx.MakeList(
+			wui.symAttr,
+			sx.Cons(wui.symHref, sx.String(wui.NewURLBuilder('h').AppendQuery(key+api.SearchOperatorHas+value).String())),
+		),
+		sx.String(text),
 	)
 }
 
 type evalMetadataFunc = func(string) ast.InlineSlice
 
@@ -179,22 +147,22 @@
 	return func(value string) ast.InlineSlice { return evaluate.RunMetadata(ctx, value) }
 }
 
 type getTextTitleFunc func(id.Zid) (string, int)
 
-func (wui *WebUI) makeGetTextTitle(ctx context.Context, getMeta usecase.GetMeta) getTextTitleFunc {
+func (wui *WebUI) makeGetTextTitle(ctx context.Context, getZettel usecase.GetZettel) getTextTitleFunc {
 	return func(zid id.Zid) (string, int) {
-		m, err := getMeta.Run(box.NoEnrichContext(ctx), zid)
+		z, err := getZettel.Run(box.NoEnrichContext(ctx), zid)
 		if err != nil {
 			if errors.Is(err, &box.ErrNotAllowed{}) {
 				return "", -1
 			}
 			return "", 0
 		}
-		return parser.NormalizedSpacedText(m.GetTitle()), 1
+		return parser.NormalizedSpacedText(z.Meta.GetTitle()), 1
 	}
 }
 
-func (wui *WebUI) transformZmkMetadata(value string, evalMetadata evalMetadataFunc, gen *htmlGenerator) sxpf.Object {
+func (wui *WebUI) transformZmkMetadata(value string, evalMetadata evalMetadataFunc, gen *htmlGenerator) sx.Object {
 	is := evalMetadata(value)
-	return gen.InlinesSxHTML(&is).Cons(wui.sf.MustMake("span"))
+	return gen.InlinesSxHTML(&is).Cons(wui.symSpan)
 }

Index: web/adapter/webui/lists.go
==================================================================
--- web/adapter/webui/lists.go
+++ web/adapter/webui/lists.go
@@ -13,82 +13,182 @@
 import (
 	"context"
 	"io"
 	"net/http"
 	"net/url"
+	"slices"
+	"strconv"
 	"strings"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/z/ast"
 	"zettelstore.de/z/encoding/atom"
 	"zettelstore.de/z/encoding/rss"
 	"zettelstore.de/z/encoding/xml"
 	"zettelstore.de/z/evaluator"
 	"zettelstore.de/z/query"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // MakeListHTMLMetaHandler creates a HTTP handler for rendering the list of zettel as HTML.
-func (wui *WebUI) MakeListHTMLMetaHandler(listMeta usecase.ListMeta, evaluate *usecase.Evaluate) http.HandlerFunc {
+func (wui *WebUI) MakeListHTMLMetaHandler(queryMeta *usecase.Query, tagZettel *usecase.TagZettel, roleZettel *usecase.RoleZettel, reIndex *usecase.ReIndex) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		q := adapter.GetQuery(r.URL.Query())
+		urlQuery := r.URL.Query()
+		if wui.handleTagZettel(w, r, tagZettel, urlQuery) {
+			return
+		}
+		if wui.handleRoleZettel(w, r, roleZettel, urlQuery) {
+			return
+		}
+		q := adapter.GetQuery(urlQuery)
+		q = q.SetDeterministic()
 		ctx := r.Context()
-		metaList, err := listMeta.Run(box.NoEnrichQuery(ctx, q), q)
+		metaSeq, err := queryMeta.Run(ctx, q)
 		if err != nil {
 			wui.reportError(ctx, w, err)
 			return
 		}
 		if actions := q.Actions(); len(actions) > 0 {
-			switch actions[0] {
-			case "ATOM":
-				wui.renderAtom(w, q, metaList)
-				return
-			case "RSS":
-				wui.renderRSS(ctx, w, q, metaList)
-				return
-			}
-		}
-		bns := evaluate.RunBlockNode(ctx, evaluator.QueryAction(ctx, q, metaList, wui.rtConfig))
-		enc := wui.getSimpleHTMLEncoder()
-		htmlContent, err := enc.BlocksString(&bns)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		seed, found := q.GetSeed()
-		if !found {
-			seed = 0
-		}
-		user := server.GetUser(ctx)
-		var base baseData
-		wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, nil, api.KeyLang), wui.rtConfig.GetSiteName(), "", user, &base)
-		wui.renderTemplate(ctx, w, id.ListTemplateZid, &base, struct {
-			Title         string
-			SearchURL     string
-			QueryValue    string
-			QueryKeyQuery string
-			Content       string
-			CanCreate     bool
-			CreateURL     string
-			QueryKeySeed  string
-			Seed          int
-		}{
-			Title:         wui.listTitleQuery(q),
-			SearchURL:     base.SearchURL,
-			QueryValue:    q.String(),
-			QueryKeyQuery: base.QueryKeyQuery,
-			Content:       htmlContent,
-			CanCreate:     wui.canCreate(ctx, user),
-			CreateURL:     base.CreateNewURL,
-			QueryKeySeed:  base.QueryKeySeed,
-			Seed:          seed,
-		})
-	}
+			var tempActions []string
+			for _, act := range actions {
+				if act == "REINDEX" {
+					for _, m := range metaSeq {
+						if err = reIndex.Run(ctx, m.Zid); err != nil {
+							wui.reportError(ctx, w, err)
+							return
+						}
+					}
+					continue
+				}
+				tempActions = append(tempActions, act)
+			}
+			actions = tempActions
+			if len(actions) > 0 {
+				switch actions[0] {
+				case "ATOM":
+					wui.renderAtom(w, q, metaSeq)
+					return
+				case "RSS":
+					wui.renderRSS(ctx, w, q, metaSeq)
+					return
+				}
+			}
+		}
+		var content, endnotes *sx.Pair
+		if bn := evaluator.QueryAction(ctx, q, metaSeq, wui.rtConfig); bn != nil {
+			enc := wui.getSimpleHTMLEncoder(wui.rtConfig.Get(ctx, nil, api.KeyLang))
+			content, endnotes, err = enc.BlocksSxn(&ast.BlockSlice{bn})
+			if err != nil {
+				wui.reportError(ctx, w, err)
+				return
+			}
+		}
+
+		user := server.GetUser(ctx)
+		env, rb := wui.createRenderEnv(
+			ctx, "list",
+			wui.rtConfig.Get(ctx, nil, api.KeyLang),
+			wui.rtConfig.GetSiteName(), user)
+		if q == nil {
+			rb.bindString("heading", sx.String(wui.rtConfig.GetSiteName()))
+		} else {
+			var sb strings.Builder
+			q.PrintHuman(&sb)
+			rb.bindString("heading", sx.String(sb.String()))
+		}
+		rb.bindString("query-value", sx.String(q.String()))
+		if tzl := q.GetMetaValues(api.KeyTags); len(tzl) > 0 {
+			sxTzl, sxNoTzl := wui.transformTagZettelList(ctx, tagZettel, tzl)
+			if !sx.IsNil(sxTzl) {
+				rb.bindString("tag-zettel", sxTzl)
+			}
+			if !sx.IsNil(sxNoTzl) && wui.canCreate(ctx, user) {
+				rb.bindString("create-tag-zettel", sxNoTzl)
+			}
+		}
+		if rzl := q.GetMetaValues(api.KeyRole); len(rzl) > 0 {
+			sxRzl, sxNoRzl := wui.transformRoleZettelList(ctx, roleZettel, rzl)
+			if !sx.IsNil(sxRzl) {
+				rb.bindString("role-zettel", sxRzl)
+			}
+			if !sx.IsNil(sxNoRzl) && wui.canCreate(ctx, user) {
+				rb.bindString("create-role-zettel", sxNoRzl)
+			}
+		}
+		rb.bindString("content", content)
+		rb.bindString("endnotes", endnotes)
+		apiURL := wui.NewURLBuilder('z').AppendQuery(q.String())
+		seed, found := q.GetSeed()
+		if found {
+			apiURL = apiURL.AppendKVQuery(api.QueryKeySeed, strconv.Itoa(seed))
+		} else {
+			seed = 0
+		}
+		rb.bindString("plain-url", sx.String(apiURL.String()))
+		rb.bindString("data-url", sx.String(apiURL.AppendKVQuery(api.QueryKeyEncoding, api.EncodingData).String()))
+		if wui.canCreate(ctx, user) {
+			rb.bindString("create-url", sx.String(wui.createNewURL))
+			rb.bindString("seed", sx.Int64(seed))
+		}
+		if rb.err == nil {
+			err = wui.renderSxnTemplate(ctx, w, id.ListTemplateZid, env)
+		} else {
+			err = rb.err
+		}
+		if err != nil {
+			wui.reportError(ctx, w, err)
+		}
+	}
+}
+
+func (wui *WebUI) transformTagZettelList(ctx context.Context, tagZettel *usecase.TagZettel, tags []string) (withZettel, withoutZettel *sx.Pair) {
+	slices.Reverse(tags)
+	for _, tag := range tags {
+		tag = meta.NormalizeTag(tag)
+		if _, err := tagZettel.Run(ctx, tag); err == nil {
+			u := wui.NewURLBuilder('h').AppendKVQuery(api.QueryKeyTag, tag)
+			withZettel = wui.prependZettelLink(withZettel, tag, u)
+		} else {
+			u := wui.NewURLBuilder('c').SetZid(api.ZidTemplateNewTag).AppendKVQuery(queryKeyAction, valueActionNew).AppendKVQuery(api.KeyTitle, tag)
+			withoutZettel = wui.prependZettelLink(withoutZettel, tag, u)
+		}
+	}
+	return withZettel, withoutZettel
+}
+
+func (wui *WebUI) transformRoleZettelList(ctx context.Context, roleZettel *usecase.RoleZettel, roles []string) (withZettel, withoutZettel *sx.Pair) {
+	slices.Reverse(roles)
+	for _, role := range roles {
+		if _, err := roleZettel.Run(ctx, role); err == nil {
+			u := wui.NewURLBuilder('h').AppendKVQuery(api.QueryKeyRole, role)
+			withZettel = wui.prependZettelLink(withZettel, role, u)
+		} else {
+			u := wui.NewURLBuilder('c').SetZid(api.ZidTemplateNewRole).AppendKVQuery(queryKeyAction, valueActionNew).AppendKVQuery(api.KeyTitle, role)
+			withoutZettel = wui.prependZettelLink(withoutZettel, role, u)
+		}
+	}
+	return withZettel, withoutZettel
+}
+
+func (wui *WebUI) prependZettelLink(sxZtl *sx.Pair, name string, u *api.URLBuilder) *sx.Pair {
+	link := sx.MakeList(
+		wui.symA,
+		sx.MakeList(
+			wui.symAttr,
+			sx.Cons(wui.symHref, sx.String(u.String())),
+		),
+		sx.String(name),
+	)
+	if sxZtl != nil {
+		sxZtl = sxZtl.Cons(sx.String(", "))
+	}
+	return sxZtl.Cons(link)
 }
 
 func (wui *WebUI) renderRSS(ctx context.Context, w http.ResponseWriter, q *query.Query, ml []*meta.Meta) {
 	var rssConfig rss.Configuration
 	rssConfig.Setup(ctx, wui.rtConfig)
@@ -102,11 +202,11 @@
 	var err error
 	if _, err = io.WriteString(w, xml.Header); err == nil {
 		_, err = w.Write(data)
 	}
 	if err != nil {
-		wui.log.IfErr(err).Msg("unable to write RSS data")
+		wui.log.Error().Err(err).Msg("unable to write RSS data")
 	}
 }
 
 func (wui *WebUI) renderAtom(w http.ResponseWriter, q *query.Query, ml []*meta.Meta) {
 	var atomConfig atom.Configuration
@@ -121,83 +221,38 @@
 	var err error
 	if _, err = io.WriteString(w, xml.Header); err == nil {
 		_, err = w.Write(data)
 	}
 	if err != nil {
-		wui.log.IfErr(err).Msg("unable to write Atom data")
-	}
-}
-
-// MakeZettelContextHandler creates a new HTTP handler for the use case "zettel context".
-func (wui *WebUI) MakeZettelContextHandler(getContext usecase.ZettelContext, evaluate *usecase.Evaluate) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
-		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
-			return
-		}
-		q := r.URL.Query()
-		dir := adapter.GetZCDirection(q.Get(api.QueryKeyDir))
-		cost := getIntParameter(q, api.QueryKeyCost, 17)
-		limit := getIntParameter(q, api.QueryKeyLimit, 200)
-		metaList, err := getContext.Run(ctx, zid, dir, cost, limit)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		bns := evaluate.RunBlockNode(ctx, evaluator.QueryAction(ctx, nil, metaList, wui.rtConfig))
-		enc := wui.getSimpleHTMLEncoder()
-		htmlContent, err := enc.BlocksString(&bns)
-		if err != nil {
-			wui.reportError(ctx, w, err)
-			return
-		}
-		apiZid := api.ZettelID(zid.String())
-		costs := []string{"2", "3", "5", "8", "13", "21", "34", "55", "89"}
-		costLinks := make([]simpleLink, len(costs))
-		costURL := wui.NewURLBuilder('k').SetZid(apiZid)
-		for i, cost := range costs {
-			costURL.ClearQuery()
-			switch dir {
-			case usecase.ZettelContextBackward:
-				costURL.AppendKVQuery(api.QueryKeyDir, api.DirBackward)
-			case usecase.ZettelContextForward:
-				costURL.AppendKVQuery(api.QueryKeyDir, api.DirForward)
-			}
-			costURL.AppendKVQuery(api.QueryKeyCost, cost)
-			costLinks[i].Text = cost
-			costLinks[i].URL = costURL.String()
-		}
-		var base baseData
-		user := server.GetUser(ctx)
-		wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, nil, api.KeyLang), wui.rtConfig.GetSiteName(), "", user, &base)
-		wui.renderTemplate(ctx, w, id.ContextTemplateZid, &base, struct {
-			Title   string
-			InfoURL string
-			Costs   []simpleLink
-			Content string
-		}{
-			Title:   "Zettel Context",
-			InfoURL: wui.NewURLBuilder('i').SetZid(apiZid).String(),
-			Costs:   costLinks,
-			Content: htmlContent,
-		})
-	}
-}
-
-func getIntParameter(q url.Values, key string, minValue int) int {
-	val, ok := adapter.GetInteger(q, key)
-	if !ok || val < 0 {
-		return minValue
-	}
-	return val
-}
-
-func (wui *WebUI) listTitleQuery(q *query.Query) string {
-	if q == nil {
-		return wui.rtConfig.GetSiteName()
-	}
-	var sb strings.Builder
-	q.PrintHuman(&sb)
-	return sb.String()
+		wui.log.Error().Err(err).Msg("unable to write Atom data")
+	}
+}
+
+func (wui *WebUI) handleTagZettel(w http.ResponseWriter, r *http.Request, tagZettel *usecase.TagZettel, vals url.Values) bool {
+	tag := vals.Get(api.QueryKeyTag)
+	if tag == "" {
+		return false
+	}
+	ctx := r.Context()
+	z, err := tagZettel.Run(ctx, tag)
+	if err != nil {
+		wui.reportError(ctx, w, err)
+		return true
+	}
+	wui.redirectFound(w, r, wui.NewURLBuilder('h').SetZid(api.ZettelID(z.Meta.Zid.String())))
+	return true
+}
+
+func (wui *WebUI) handleRoleZettel(w http.ResponseWriter, r *http.Request, roleZettel *usecase.RoleZettel, vals url.Values) bool {
+	role := vals.Get(api.QueryKeyRole)
+	if role == "" {
+		return false
+	}
+	ctx := r.Context()
+	z, err := roleZettel.Run(ctx, role)
+	if err != nil {
+		wui.reportError(ctx, w, err)
+		return true
+	}
+	wui.redirectFound(w, r, wui.NewURLBuilder('h').SetZid(api.ZettelID(z.Meta.Zid.String())))
+	return true
 }

Index: web/adapter/webui/login.go
==================================================================
--- web/adapter/webui/login.go
+++ web/adapter/webui/login.go
@@ -12,15 +12,16 @@
 
 import (
 	"context"
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
 	"zettelstore.de/z/auth"
-	"zettelstore.de/z/domain/id"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeGetLoginOutHandler creates a new HTTP handler to display the HTML login view,
 // or to execute a logout.
 func (wui *WebUI) MakeGetLoginOutHandler() http.HandlerFunc {
@@ -34,19 +35,18 @@
 		wui.renderLoginForm(wui.clearToken(r.Context(), w), w, false)
 	}
 }
 
 func (wui *WebUI) renderLoginForm(ctx context.Context, w http.ResponseWriter, retry bool) {
-	var base baseData
-	wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, nil, api.KeyLang), "Login", "", nil, &base)
-	wui.renderTemplate(ctx, w, id.LoginTemplateZid, &base, struct {
-		Title string
-		Retry bool
-	}{
-		Title: base.Title,
-		Retry: retry,
-	})
+	env, rb := wui.createRenderEnv(ctx, "login", wui.rtConfig.Get(ctx, nil, api.KeyLang), "Login", nil)
+	rb.bindString("retry", sx.MakeBoolean(retry))
+	if rb.err == nil {
+		rb.err = wui.renderSxnTemplate(ctx, w, id.LoginTemplateZid, env)
+	}
+	if err := rb.err; err != nil {
+		wui.reportError(ctx, w, err)
+	}
 }
 
 // MakePostLoginHandler creates a new HTTP handler to authenticate the given user.
 func (wui *WebUI) MakePostLoginHandler(ucAuth *usecase.Authenticate) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -58,11 +58,11 @@
 		ident, cred, ok := adapter.GetCredentialsViaForm(r)
 		if !ok {
 			wui.reportError(ctx, w, adapter.NewErrBadRequest("Unable to read login form"))
 			return
 		}
-		token, err := ucAuth.Run(ctx, r, ident, cred, wui.tokenLifetime, auth.KindHTML)
+		token, err := ucAuth.Run(ctx, r, ident, cred, wui.tokenLifetime, auth.KindwebUI)
 		if err != nil {
 			wui.reportError(ctx, w, err)
 			return
 		}
 		if token == nil {

Index: web/adapter/webui/rename_zettel.go
==================================================================
--- web/adapter/webui/rename_zettel.go
+++ web/adapter/webui/rename_zettel.go
@@ -13,74 +13,77 @@
 import (
 	"fmt"
 	"net/http"
 	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/id"
 )
 
 // MakeGetRenameZettelHandler creates a new HTTP handler to display the
 // HTML rename view of a zettel.
-func (wui *WebUI) MakeGetRenameZettelHandler(getMeta usecase.GetMeta) http.HandlerFunc {
+func (wui *WebUI) MakeGetRenameZettelHandler(getZettel usecase.GetZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		zid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		zid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 
-		m, err := getMeta.Run(ctx, zid)
+		z, err := getZettel.Run(ctx, zid)
 		if err != nil {
 			wui.reportError(ctx, w, err)
 			return
 		}
-
-		getTextTitle := wui.makeGetTextTitle(ctx, getMeta)
-		uselessFiles := retrieveUselessFiles(m)
+		m := z.Meta
 
 		user := server.GetUser(ctx)
-		var base baseData
-		wui.makeBaseData(ctx, wui.rtConfig.Get(ctx, m, api.KeyLang), "Rename Zettel "+zid.String(), "", user, &base)
-		wui.renderTemplate(ctx, w, id.RenameTemplateZid, &base, struct {
-			Zid             string
-			MetaPairs       []meta.Pair
-			Incoming        simpleLinks
-			HasUselessFiles bool
-			UselessFiles    []string
-		}{
-			Zid:             zid.String(),
-			MetaPairs:       m.ComputedPairs(),
-			Incoming:        wui.encodeIncoming(m, getTextTitle),
-			HasUselessFiles: len(uselessFiles) > 0,
-			UselessFiles:    uselessFiles,
-		})
+		env, rb := wui.createRenderEnv(
+			ctx, "rename",
+			wui.rtConfig.Get(ctx, nil, api.KeyLang), "Rename Zettel "+m.Zid.String(), user)
+		rb.bindString("incoming", wui.encodeIncoming(m, wui.makeGetTextTitle(ctx, getZettel)))
+		wui.bindCommonZettelData(ctx, &rb, user, m, nil)
+		if rb.err == nil {
+			err = wui.renderSxnTemplate(ctx, w, id.RenameTemplateZid, env)
+		} else {
+			err = rb.err
+		}
+		if err != nil {
+			wui.reportError(ctx, w, err)
+		}
 	}
 }
 
 // MakePostRenameZettelHandler creates a new HTTP handler to rename an existing zettel.
 func (wui *WebUI) MakePostRenameZettelHandler(renameZettel *usecase.RenameZettel) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
-		curZid, err := id.Parse(r.URL.Path[1:])
+		path := r.URL.Path[1:]
+		curZid, err := id.Parse(path)
 		if err != nil {
-			wui.reportError(ctx, w, box.ErrNotFound)
+			wui.reportError(ctx, w, box.ErrInvalidZid{Zid: path})
 			return
 		}
 
 		if err = r.ParseForm(); err != nil {
+			wui.log.Trace().Err(err).Msg("unable to read rename zettel form")
 			wui.reportError(ctx, w, adapter.NewErrBadRequest("Unable to read rename zettel form"))
 			return
 		}
-		if formCurZid, err1 := id.Parse(
-			r.PostFormValue("curzid")); err1 != nil || formCurZid != curZid {
+		formCurZidStr := r.PostFormValue("curzid")
+		if formCurZid, err1 := id.Parse(formCurZidStr); err1 != nil || formCurZid != curZid {
+			if err1 != nil {
+				wui.log.Trace().Str("formCurzid", formCurZidStr).Err(err1).Msg("unable to parse as zid")
+			} else if formCurZid != curZid {
+				wui.log.Trace().Zid(formCurZid).Zid(curZid).Msg("zid differ (form/url)")
+			}
 			wui.reportError(ctx, w, adapter.NewErrBadRequest("Invalid value for current zettel id in form"))
 			return
 		}
 		formNewZid := strings.TrimSpace(r.PostFormValue("newzid"))
 		newZid, err := id.Parse(formNewZid)

Index: web/adapter/webui/response.go
==================================================================
--- web/adapter/webui/response.go
+++ web/adapter/webui/response.go
@@ -11,13 +11,13 @@
 package webui
 
 import (
 	"net/http"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 )
 
 func (wui *WebUI) redirectFound(w http.ResponseWriter, r *http.Request, ub *api.URLBuilder) {
 	us := ub.String()
 	wui.log.Debug().Str("uri", us).Msg("redirect")
 	http.Redirect(w, r, us, http.StatusFound)
 }

ADDED   web/adapter/webui/sxn_code.go
Index: web/adapter/webui/sxn_code.go
==================================================================
--- web/adapter/webui/sxn_code.go
+++ web/adapter/webui/sxn_code.go
@@ -0,0 +1,107 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2023-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package webui
+
+import (
+	"context"
+	"fmt"
+	"io"
+
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil/sxeval"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+func (wui *WebUI) loadAllSxnCodeZettel(ctx context.Context) (id.Digraph, sxeval.Environment, error) {
+	// getMeta MUST currently use GetZettel, because GetMeta just uses the
+	// Index, which might not be current.
+	getMeta := func(ctx context.Context, zid id.Zid) (*meta.Meta, error) {
+		z, err := wui.box.GetZettel(ctx, zid)
+		if err != nil {
+			return nil, err
+		}
+		return z.Meta, nil
+	}
+	dg := buildSxnCodeDigraph(ctx, id.StartSxnZid, getMeta)
+	if dg == nil {
+		return nil, wui.engine.RootEnvironment(), nil
+	}
+	dg = dg.AddVertex(id.BaseSxnZid).AddEdge(id.StartSxnZid, id.BaseSxnZid)
+	dg = dg.AddVertex(id.PreludeSxnZid).AddEdge(id.BaseSxnZid, id.PreludeSxnZid)
+	dg = dg.TransitiveClosure(id.StartSxnZid)
+
+	if zid, isDAG := dg.IsDAG(); !isDAG {
+		return nil, nil, fmt.Errorf("zettel %v is part of a dependency cycle", zid)
+	}
+	env := sxeval.MakeChildEnvironment(wui.engine.RootEnvironment(), "zettel", 128)
+	for _, zid := range dg.SortReverse() {
+		if err := wui.loadSxnCodeZettel(ctx, zid, env); err != nil {
+			return nil, nil, err
+		}
+	}
+	return dg, env, nil
+}
+
+type getMetaFunc func(context.Context, id.Zid) (*meta.Meta, error)
+
+func buildSxnCodeDigraph(ctx context.Context, startZid id.Zid, getMeta getMetaFunc) id.Digraph {
+	m, err := getMeta(ctx, startZid)
+	if err != nil {
+		return nil
+	}
+	var marked id.Set
+	stack := []*meta.Meta{m}
+	dg := id.Digraph(nil).AddVertex(startZid)
+	for pos := len(stack) - 1; pos >= 0; pos = len(stack) - 1 {
+		curr := stack[pos]
+		stack = stack[:pos]
+		if marked.Contains(curr.Zid) {
+			continue
+		}
+		marked = marked.Add(curr.Zid)
+		if precursors, hasPrecursor := curr.GetList(api.KeyPrecursor); hasPrecursor && len(precursors) > 0 {
+			for _, pre := range precursors {
+				if preZid, errParse := id.Parse(pre); errParse == nil {
+					m, err = getMeta(ctx, preZid)
+					if err != nil {
+						continue
+					}
+					stack = append(stack, m)
+					dg.AddVertex(preZid)
+					dg.AddEdge(curr.Zid, preZid)
+				}
+			}
+		}
+	}
+	return dg
+}
+
+func (wui *WebUI) loadSxnCodeZettel(ctx context.Context, zid id.Zid, env sxeval.Environment) error {
+	rdr, err := wui.makeZettelReader(ctx, zid)
+	if err != nil {
+		return err
+	}
+	for {
+		form, err2 := rdr.Read()
+		if err2 != nil {
+			if err2 == io.EOF {
+				return nil
+			}
+			return err2
+		}
+		wui.log.Debug().Zid(zid).Str("form", form.Repr()).Msg("Loaded sxn code")
+
+		if _, err2 = wui.engine.Eval(form, env, nil); err2 != nil {
+			return err2
+		}
+	}
+}

ADDED   web/adapter/webui/template.go
Index: web/adapter/webui/template.go
==================================================================
--- web/adapter/webui/template.go
+++ web/adapter/webui/template.go
@@ -0,0 +1,456 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2020-present Detlef Stern
+//
+// This file is part of Zettelstore.
+//
+// Zettelstore is licensed under the latest version of the EUPL (European Union
+// Public License). Please see file LICENSE.txt for your rights and obligations
+// under this license.
+//-----------------------------------------------------------------------------
+
+package webui
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/sx.fossil/sxbuiltins"
+	"zettelstore.de/sx.fossil/sxeval"
+	"zettelstore.de/sx.fossil/sxhtml"
+	"zettelstore.de/sx.fossil/sxreader"
+	"zettelstore.de/z/box"
+	"zettelstore.de/z/collect"
+	"zettelstore.de/z/config"
+	"zettelstore.de/z/parser"
+	"zettelstore.de/z/web/adapter"
+	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
+)
+
+func (wui *WebUI) createRenderEngine() *sxeval.Engine {
+	root := sxeval.MakeRootEnvironment(len(specials) + len(builtins) + 3)
+	engine := sxeval.MakeEngine(wui.sf, root)
+	for _, syntax := range specials {
+		engine.BindSpecial(syntax)
+	}
+	for _, b := range builtins {
+		engine.BindBuiltin(b)
+	}
+	engine.BindBuiltin(&sxeval.Builtin{
+		Name:     "url-to-html",
+		MinArity: 1,
+		MaxArity: 1,
+		TestPure: sxeval.AssertPure,
+		Fn: func(_ *sxeval.Frame, args []sx.Object) (sx.Object, error) {
+			text, err := sxbuiltins.GetString(args, 0)
+			if err != nil {
+				return nil, err
+			}
+			return wui.url2html(text), nil
+		},
+	})
+	engine.BindBuiltin(&sxeval.Builtin{
+		Name:     "zid-content-path",
+		MinArity: 1,
+		MaxArity: 1,
+		TestPure: sxeval.AssertPure,
+		Fn: func(_ *sxeval.Frame, args []sx.Object) (sx.Object, error) {
+			s, err := sxbuiltins.GetString(args, 0)
+			if err != nil {
+				return nil, err
+			}
+			zid, err := id.Parse(s.String())
+			if err != nil {
+				return nil, fmt.Errorf("parsing zettel identfier %q: %w", s, err)
+			}
+			ub := wui.NewURLBuilder('z').SetZid(api.ZettelID(zid.String()))
+			return sx.String(ub.String()), nil
+		},
+	})
+	engine.BindBuiltin(&sxeval.Builtin{
+		Name:     "query->url",
+		MinArity: 1,
+		MaxArity: 1,
+		TestPure: sxeval.AssertPure,
+		Fn: func(_ *sxeval.Frame, args []sx.Object) (sx.Object, error) {
+			qs, err := sxbuiltins.GetString(args, 0)
+			if err != nil {
+				return nil, err
+			}
+			u := wui.NewURLBuilder('h').AppendQuery(qs.String())
+			return sx.String(u.String()), nil
+		},
+	})
+	root.Freeze()
+	return engine
+}
+
+var (
+	specials = []*sxeval.Special{
+		&sxbuiltins.QuoteS, &sxbuiltins.QuasiquoteS, // quote, quasiquote
+		&sxbuiltins.UnquoteS, &sxbuiltins.UnquoteSplicingS, // unquote, unquote-splicing
+		&sxbuiltins.DefVarS, &sxbuiltins.DefConstS, // defvar, defconst
+		&sxbuiltins.DefunS, &sxbuiltins.LambdaS, // defun, lambda
+		&sxbuiltins.SetXS,     // set!
+		&sxbuiltins.CondS,     // cond
+		&sxbuiltins.IfS,       // if
+		&sxbuiltins.BeginS,    // begin
+		&sxbuiltins.DefMacroS, // defmacro
+	}
+	builtins = []*sxeval.Builtin{
+		&sxbuiltins.Identical,            // ==
+		&sxbuiltins.NullP,                // null?
+		&sxbuiltins.PairP,                // pair?
+		&sxbuiltins.Car, &sxbuiltins.Cdr, // car, cdr
+		&sxbuiltins.Caar, &sxbuiltins.Cadr, &sxbuiltins.Cdar, &sxbuiltins.Cddr,
+		&sxbuiltins.Caaar, &sxbuiltins.Caadr, &sxbuiltins.Cadar, &sxbuiltins.Caddr,
+		&sxbuiltins.Cdaar, &sxbuiltins.Cdadr, &sxbuiltins.Cddar, &sxbuiltins.Cdddr,
+		&sxbuiltins.List,         // list
+		&sxbuiltins.Append,       // append
+		&sxbuiltins.Assoc,        // assoc
+		&sxbuiltins.Map,          // map
+		&sxbuiltins.Apply,        // apply
+		&sxbuiltins.StringAppend, // string-append
+		&sxbuiltins.BoundP,       // bound?
+		&sxbuiltins.Defined,      // defined?
+		&sxbuiltins.CurrentEnv,   // current-environment
+		&sxbuiltins.EnvLookup,    // environment-lookup
+	}
+)
+
+func (wui *WebUI) url2html(text sx.String) sx.Object {
+	if u, errURL := url.Parse(text.String()); errURL == nil {
+		if us := u.String(); us != "" {
+			return sx.MakeList(
+				wui.symA,
+				sx.MakeList(
+					wui.symAttr,
+					sx.Cons(wui.symHref, sx.String(us)),
+					sx.Cons(wui.sf.MustMake("target"), sx.String("_blank")),
+					sx.Cons(wui.sf.MustMake("rel"), sx.String("noopener noreferrer")),
+				),
+				text)
+		}
+	}
+	return text
+}
+
+func (wui *WebUI) getParentEnv(ctx context.Context) (sxeval.Environment, error) {
+	wui.mxZettelEnv.Lock()
+	defer wui.mxZettelEnv.Unlock()
+	if parentEnv := wui.zettelEnv; parentEnv != nil {
+		return parentEnv, nil
+	}
+	dag, zettelEnv, err := wui.loadAllSxnCodeZettel(ctx)
+	if err != nil {
+		wui.log.Error().Err(err).Msg("loading zettel sxn")
+		return nil, err
+	}
+	wui.dag = dag
+	wui.zettelEnv = zettelEnv
+	return zettelEnv, nil
+}
+
+// createRenderEnv creates a new environment and populates it with all relevant data for the base template.
+func (wui *WebUI) createRenderEnv(ctx context.Context, name, lang, title string, user *meta.Meta) (sxeval.Environment, renderBinder) {
+	userIsValid, userZettelURL, userIdent := wui.getUserRenderData(user)
+	parentEnv, err := wui.getParentEnv(ctx)
+	env := sxeval.MakeChildEnvironment(parentEnv, name, 128)
+	rb := makeRenderBinder(wui.sf, env, err)
+	rb.bindString("lang", sx.String(lang))
+	rb.bindString("css-base-url", sx.String(wui.cssBaseURL))
+	rb.bindString("css-user-url", sx.String(wui.cssUserURL))
+	rb.bindString("title", sx.String(title))
+	rb.bindString("home-url", sx.String(wui.homeURL))
+	rb.bindString("with-auth", sx.MakeBoolean(wui.withAuth))
+	rb.bindString("user-is-valid", sx.MakeBoolean(userIsValid))
+	rb.bindString("user-zettel-url", sx.String(userZettelURL))
+	rb.bindString("user-ident", sx.String(userIdent))
+	rb.bindString("login-url", sx.String(wui.loginURL))
+	rb.bindString("logout-url", sx.String(wui.logoutURL))
+	rb.bindString("list-zettel-url", sx.String(wui.listZettelURL))
+	rb.bindString("list-roles-url", sx.String(wui.listRolesURL))
+	rb.bindString("list-tags-url", sx.String(wui.listTagsURL))
+	if wui.canRefresh(user) {
+		rb.bindString("refresh-url", sx.String(wui.refreshURL))
+	}
+	rb.bindString("new-zettel-links", wui.fetchNewTemplatesSxn(ctx, user))
+	rb.bindString("search-url", sx.String(wui.searchURL))
+	rb.bindString("query-key-query", sx.String(api.QueryKeyQuery))
+	rb.bindString("query-key-seed", sx.String(api.QueryKeySeed))
+	rb.bindString("FOOTER", wui.calculateFooterSxn(ctx)) // TODO: use real footer
+	rb.bindString("debug-mode", sx.MakeBoolean(wui.debug))
+	rb.bindSymbol(wui.symMetaHeader, sx.Nil())
+	rb.bindSymbol(wui.symDetail, sx.Nil())
+	return env, rb
+}
+
+func (wui *WebUI) getUserRenderData(user *meta.Meta) (bool, string, string) {
+	if user == nil {
+		return false, "", ""
+	}
+	return true, wui.NewURLBuilder('h').SetZid(api.ZettelID(user.Zid.String())).String(), user.GetDefault(api.KeyUserID, "")
+}
+
+type renderBinder struct {
+	err  error
+	make func(string) (*sx.Symbol, error)
+	env  sxeval.Environment
+}
+
+func makeRenderBinder(sf sx.SymbolFactory, env sxeval.Environment, err error) renderBinder {
+	return renderBinder{make: sf.Make, env: env, err: err}
+}
+func (rb *renderBinder) bindString(key string, obj sx.Object) {
+	if rb.err == nil {
+		sym, err := rb.make(key)
+		if err == nil {
+			rb.err = rb.env.Bind(sym, obj)
+			return
+		}
+		rb.err = err
+	}
+}
+func (rb *renderBinder) bindSymbol(sym *sx.Symbol, obj sx.Object) {
+	if rb.err == nil {
+		rb.err = rb.env.Bind(sym, obj)
+	}
+}
+func (rb *renderBinder) bindKeyValue(key string, value string) {
+	rb.bindString("meta-"+key, sx.String(value))
+	if kt := meta.Type(key); kt.IsSet {
+		rb.bindString("set-meta-"+key, makeStringList(meta.ListFromValue(value)))
+	}
+}
+func (rb *renderBinder) rebindResolved(key, defKey string) {
+	if rb.err == nil {
+		sym, err := rb.make(key)
+		if err == nil {
+			if obj, found := sxeval.Resolve(rb.env, sym); found {
+				rb.bindString(defKey, obj)
+				return
+			}
+			return
+		}
+		rb.err = err
+	}
+}
+
+func (wui *WebUI) bindCommonZettelData(ctx context.Context, rb *renderBinder, user, m *meta.Meta, content *zettel.Content) {
+	strZid := m.Zid.String()
+	apiZid := api.ZettelID(strZid)
+	newURLBuilder := wui.NewURLBuilder
+
+	rb.bindString("zid", sx.String(strZid))
+	rb.bindString("web-url", sx.String(newURLBuilder('h').SetZid(apiZid).String()))
+	if content != nil && wui.canWrite(ctx, user, m, *content) {
+		rb.bindString("edit-url", sx.String(newURLBuilder('e').SetZid(apiZid).String()))
+	}
+	rb.bindString("info-url", sx.String(newURLBuilder('i').SetZid(apiZid).String()))
+	if wui.canCreate(ctx, user) {
+		if content != nil && !content.IsBinary() {
+			rb.bindString("copy-url", sx.String(newURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionCopy).String()))
+		}
+		rb.bindString("version-url", sx.String(newURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionVersion).String()))
+		rb.bindString("child-url", sx.String(newURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionChild).String()))
+		rb.bindString("folge-url", sx.String(newURLBuilder('c').SetZid(apiZid).AppendKVQuery(queryKeyAction, valueActionFolge).String()))
+	}
+	if wui.canRename(ctx, user, m) {
+		rb.bindString("rename-url", sx.String(newURLBuilder('b').SetZid(apiZid).String()))
+	}
+	if wui.canDelete(ctx, user, m) {
+		rb.bindString("delete-url", sx.String(newURLBuilder('d').SetZid(apiZid).String()))
+	}
+	if val, found := m.Get(api.KeyUselessFiles); found {
+		rb.bindString("useless", sx.Cons(sx.String(val), nil))
+	}
+	rb.bindString("context-url", sx.String(newURLBuilder('h').AppendQuery(strZid+" "+api.ContextDirective).String()))
+	if wui.canRefresh(user) {
+		rb.bindString("reindex-url", sx.String(newURLBuilder('h').AppendQuery(strZid+" "+api.IdentDirective+api.ActionSeparator+"REINDEX").String()))
+	}
+
+	// Ensure to have title, role, tags, and syntax included as "meta-*"
+	rb.bindKeyValue(api.KeyTitle, m.GetDefault(api.KeyTitle, ""))
+	rb.bindKeyValue(api.KeyRole, m.GetDefault(api.KeyRole, ""))
+	rb.bindKeyValue(api.KeyTags, m.GetDefault(api.KeyTags, ""))
+	rb.bindKeyValue(api.KeySyntax, m.GetDefault(api.KeySyntax, ""))
+	sentinel := sx.Cons(nil, nil)
+	curr := sentinel
+	for _, p := range m.ComputedPairs() {
+		key, value := p.Key, p.Value
+		curr = curr.AppendBang(sx.Cons(sx.String(key), sx.String(value)))
+
+		rb.bindKeyValue(key, value)
+	}
+	rb.bindString("metapairs", sentinel.Tail())
+}
+
+func (wui *WebUI) fetchNewTemplatesSxn(ctx context.Context, user *meta.Meta) (lst *sx.Pair) {
+	if !wui.canCreate(ctx, user) {
+		return nil
+	}
+	ctx = box.NoEnrichContext(ctx)
+	menu, err := wui.box.GetZettel(ctx, id.TOCNewTemplateZid)
+	if err != nil {
+		return nil
+	}
+	refs := collect.Order(parser.ParseZettel(ctx, menu, "", wui.rtConfig))
+	for i := len(refs) - 1; i >= 0; i-- {
+		zid, err2 := id.Parse(refs[i].URL.Path)
+		if err2 != nil {
+			continue
+		}
+		z, err2 := wui.box.GetZettel(ctx, zid)
+		if err2 != nil {
+			continue
+		}
+		if !wui.policy.CanRead(user, z.Meta) {
+			continue
+		}
+		text := sx.String(parser.NormalizedSpacedText(z.Meta.GetTitle()))
+		link := sx.String(wui.NewURLBuilder('c').SetZid(api.ZettelID(zid.String())).
+			AppendKVQuery(queryKeyAction, valueActionNew).String())
+
+		lst = lst.Cons(sx.Cons(text, link))
+	}
+	return lst
+}
+func (wui *WebUI) calculateFooterSxn(ctx context.Context) *sx.Pair {
+	if footerZid, err := id.Parse(wui.rtConfig.Get(ctx, nil, config.KeyFooterZettel)); err == nil {
+		if zn, err2 := wui.evalZettel.Run(ctx, footerZid, ""); err2 == nil {
+			htmlEnc := wui.getSimpleHTMLEncoder(wui.rtConfig.Get(ctx, zn.InhMeta, api.KeyLang)).SetUnique("footer-")
+			if content, endnotes, err3 := htmlEnc.BlocksSxn(&zn.Ast); err3 == nil {
+				if content != nil && endnotes != nil {
+					content.LastPair().SetCdr(sx.Cons(endnotes, nil))
+				}
+				return content
+			}
+		}
+	}
+	return nil
+}
+
+func (wui *WebUI) getSxnTemplate(ctx context.Context, zid id.Zid, env sxeval.Environment) (sxeval.Expr, error) {
+	if t := wui.getSxnCache(zid); t != nil {
+		return t, nil
+	}
+
+	reader, err := wui.makeZettelReader(ctx, zid)
+	if err != nil {
+		return nil, err
+	}
+
+	objs, err := reader.ReadAll()
+	if err != nil {
+		wui.log.Error().Err(err).Zid(zid).Msg("reading sxn template")
+		return nil, err
+	}
+	if len(objs) != 1 {
+		return nil, fmt.Errorf("expected 1 expression in template, but got %d", len(objs))
+	}
+	t, err := wui.engine.Parse(objs[0], env)
+	if err != nil {
+		return nil, err
+	}
+
+	wui.setSxnCache(zid, wui.engine.Rework(t, env))
+	return t, nil
+}
+func (wui *WebUI) makeZettelReader(ctx context.Context, zid id.Zid) (*sxreader.Reader, error) {
+	ztl, err := wui.box.GetZettel(ctx, zid)
+	if err != nil {
+		return nil, err
+	}
+
+	reader := sxreader.MakeReader(bytes.NewReader(ztl.Content.AsBytes()), sxreader.WithSymbolFactory(wui.sf))
+	return reader, nil
+}
+
+func (wui *WebUI) evalSxnTemplate(ctx context.Context, zid id.Zid, env sxeval.Environment) (sx.Object, error) {
+	templateExpr, err := wui.getSxnTemplate(ctx, zid, env)
+	if err != nil {
+		return nil, err
+	}
+	return wui.engine.Execute(templateExpr, env, nil)
+}
+
+func (wui *WebUI) renderSxnTemplate(ctx context.Context, w http.ResponseWriter, templateID id.Zid, env sxeval.Environment) error {
+	return wui.renderSxnTemplateStatus(ctx, w, http.StatusOK, templateID, env)
+}
+func (wui *WebUI) renderSxnTemplateStatus(ctx context.Context, w http.ResponseWriter, code int, templateID id.Zid, env sxeval.Environment) error {
+	detailObj, err := wui.evalSxnTemplate(ctx, templateID, env)
+	if err != nil {
+		return err
+	}
+	env.Bind(wui.symDetail, detailObj)
+
+	pageObj, err := wui.evalSxnTemplate(ctx, id.BaseTemplateZid, env)
+	if err != nil {
+		return err
+	}
+	wui.log.Debug().Str("page", pageObj.Repr()).Msg("render")
+
+	gen := sxhtml.NewGenerator(wui.sf, sxhtml.WithNewline)
+	var sb bytes.Buffer
+	_, err = gen.WriteHTML(&sb, pageObj)
+	if err != nil {
+		return err
+	}
+	wui.prepareAndWriteHeader(w, code)
+	if _, err = w.Write(sb.Bytes()); err != nil {
+		wui.log.Error().Err(err).Msg("Unable to write HTML via template")
+	}
+	return nil // No error reporting, since we do not know what happended during write to client.
+}
+
+func (wui *WebUI) reportError(ctx context.Context, w http.ResponseWriter, err error) {
+	code, text := adapter.CodeMessageFromError(err)
+	if code == http.StatusInternalServerError {
+		wui.log.Error().Msg(err.Error())
+	} else {
+		wui.log.Debug().Err(err).Msg("reportError")
+	}
+	user := server.GetUser(ctx)
+	env, rb := wui.createRenderEnv(ctx, "error", api.ValueLangEN, "Error", user)
+	rb.bindString("heading", sx.String(http.StatusText(code)))
+	rb.bindString("message", sx.String(text))
+	if rb.err == nil {
+		rb.err = wui.renderSxnTemplateStatus(ctx, w, code, id.ErrorTemplateZid, env)
+	}
+	errSx := rb.err
+	if errSx == nil {
+		return
+	}
+	wui.log.Error().Err(errSx).Msg("while rendering error message")
+
+	// if errBind != nil, the HTTP header was not written
+	wui.prepareAndWriteHeader(w, http.StatusInternalServerError)
+	fmt.Fprintf(
+		w,
+		`<!DOCTYPE html>
+<html>
+<head><title>Internal server error</title></head>
+<body>
+<h1>Internal server error</h1>
+<p>When generating error code %d with message:</p><pre>%v</pre><p>an error occured:</p><pre>%v</pre>
+</body>
+</html>`, code, text, errSx)
+}
+
+func makeStringList(sl []string) *sx.Pair {
+	if len(sl) == 0 {
+		return nil
+	}
+	result := sx.Nil()
+	for i := len(sl) - 1; i >= 0; i-- {
+		result = result.Cons(sx.String(sl[i]))
+	}
+	return result
+}

Index: web/adapter/webui/webui.go
==================================================================
--- web/adapter/webui/webui.go
+++ web/adapter/webui/webui.go
@@ -12,32 +12,28 @@
 package webui
 
 import (
 	"context"
 	"net/http"
-	"strings"
 	"sync"
 	"time"
 
-	"codeberg.org/t73fde/sxhtml"
-	"codeberg.org/t73fde/sxpf"
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/sx.fossil"
+	"zettelstore.de/sx.fossil/sxeval"
+	"zettelstore.de/sx.fossil/sxhtml"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/box"
-	"zettelstore.de/z/collect"
 	"zettelstore.de/z/config"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
-	"zettelstore.de/z/encoder"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
-	"zettelstore.de/z/parser"
-	"zettelstore.de/z/template"
 	"zettelstore.de/z/usecase"
 	"zettelstore.de/z/web/adapter"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // WebUI holds all data for delivering the web ui.
 type WebUI struct {
 	log      *logger.Logger
@@ -50,14 +46,11 @@
 	policy   auth.Policy
 
 	evalZettel *usecase.Evaluate
 
 	mxCache       sync.RWMutex
-	templateCache map[id.Zid]*template.Template
-
-	mxRoleCSSMap sync.RWMutex
-	roleCSSMap   map[string]id.Zid
+	templateCache map[id.Zid]sxeval.Expr
 
 	tokenLifetime time.Duration
 	cssBaseURL    string
 	cssUserURL    string
 	homeURL       string
@@ -69,28 +62,43 @@
 	loginURL      string
 	logoutURL     string
 	searchURL     string
 	createNewURL  string
 
-	sf      sxpf.SymbolFactory
-	htmlGen *sxhtml.Generator
+	sf          sx.SymbolFactory
+	engine      *sxeval.Engine
+	mxZettelEnv sync.Mutex
+	zettelEnv   sxeval.Environment
+	dag         id.Digraph
+	genHTML     *sxhtml.Generator
+
+	symMetaHeader *sx.Symbol
+	symDetail     *sx.Symbol
+	symA, symHref *sx.Symbol
+	symSpan       *sx.Symbol
+	symAttr       *sx.Symbol
+	symAttrOpen   *sx.Symbol
 }
 
+// webuiBox contains all box methods that are needed for WebUI operation.
+//
+// Note: these function must not do auth checking.
 type webuiBox interface {
-	CanCreateZettel(ctx context.Context) bool
-	GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error)
-	GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error)
-	CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool
-	AllowRenameZettel(ctx context.Context, zid id.Zid) bool
-	CanDeleteZettel(ctx context.Context, zid id.Zid) bool
+	CanCreateZettel(context.Context) bool
+	GetZettel(context.Context, id.Zid) (zettel.Zettel, error)
+	GetMeta(context.Context, id.Zid) (*meta.Meta, error)
+	CanUpdateZettel(context.Context, zettel.Zettel) bool
+	AllowRenameZettel(context.Context, id.Zid) bool
+	CanDeleteZettel(context.Context, id.Zid) bool
 }
 
 // New creates a new WebUI struct.
 func New(log *logger.Logger, ab server.AuthBuilder, authz auth.AuthzManager, rtConfig config.Config, token auth.TokenManager,
 	mgr box.Manager, pol auth.Policy, evalZettel *usecase.Evaluate) *WebUI {
 	loginoutBase := ab.NewURLBuilder('i')
-	sf := sxpf.MakeMappedFactory()
+	sf := sx.MakeMappedFactory(256)
+
 	wui := &WebUI{
 		log:      log,
 		debug:    kernel.Main.GetConfig(kernel.CoreService, kernel.CoreDebug).(bool),
 		ab:       ab,
 		rtConfig: rtConfig,
@@ -98,10 +106,12 @@
 		token:    token,
 		box:      mgr,
 		policy:   pol,
 
 		evalZettel: evalZettel,
+
+		templateCache: make(map[id.Zid]sxeval.Expr, 32),
 
 		tokenLifetime: kernel.Main.GetConfig(kernel.WebService, kernel.WebTokenLifetimeHTML).(time.Duration),
 		cssBaseURL:    ab.NewURLBuilder('z').SetZid(api.ZidBaseCSS).String(),
 		cssUserURL:    ab.NewURLBuilder('z').SetZid(api.ZidUserCSS).String(),
 		homeURL:       ab.NewURLBuilder('/').String(),
@@ -113,101 +123,68 @@
 		loginURL:      loginoutBase.String(),
 		logoutURL:     loginoutBase.AppendKVQuery("logout", "").String(),
 		searchURL:     ab.NewURLBuilder('h').String(),
 		createNewURL:  ab.NewURLBuilder('c').String(),
 
-		sf:      sf,
-		htmlGen: sxhtml.NewGenerator(sf),
+		sf:            sf,
+		zettelEnv:     nil,
+		genHTML:       sxhtml.NewGenerator(sf, sxhtml.WithNewline),
+		symDetail:     sf.MustMake("DETAIL"),
+		symMetaHeader: sf.MustMake("META-HEADER"),
+		symA:          sf.MustMake("a"),
+		symHref:       sf.MustMake("href"),
+		symSpan:       sf.MustMake("span"),
+		symAttr:       sf.MustMake(sxhtml.NameSymAttr),
+		symAttrOpen:   sf.MustMake("open"),
 	}
+	wui.engine = wui.createRenderEngine()
 	wui.observe(box.UpdateInfo{Box: mgr, Reason: box.OnReload, Zid: id.Invalid})
 	mgr.RegisterObserver(wui.observe)
 	return wui
 }
 
 func (wui *WebUI) observe(ci box.UpdateInfo) {
 	wui.mxCache.Lock()
-	if ci.Reason == box.OnReload || ci.Zid == id.BaseTemplateZid {
-		wui.templateCache = make(map[id.Zid]*template.Template, len(wui.templateCache))
+	if ci.Reason == box.OnReload {
+		clear(wui.templateCache)
 	} else {
 		delete(wui.templateCache, ci.Zid)
 	}
 	wui.mxCache.Unlock()
-	wui.mxRoleCSSMap.Lock()
-	if ci.Reason == box.OnReload || ci.Zid == id.RoleCSSMapZid {
-		wui.roleCSSMap = nil
-	}
-	wui.mxRoleCSSMap.Unlock()
-}
-
-func (wui *WebUI) cacheSetTemplate(zid id.Zid, t *template.Template) {
-	wui.mxCache.Lock()
-	wui.templateCache[zid] = t
+
+	wui.mxZettelEnv.Lock()
+	if ci.Reason == box.OnReload || wui.dag.HasVertex(ci.Zid) {
+		wui.zettelEnv = nil
+		wui.dag = nil
+	}
+	wui.mxZettelEnv.Unlock()
+}
+
+func (wui *WebUI) setSxnCache(zid id.Zid, expr sxeval.Expr) {
+	wui.mxCache.Lock()
+	wui.templateCache[zid] = expr
 	wui.mxCache.Unlock()
 }
-
-func (wui *WebUI) cacheGetTemplate(zid id.Zid) (*template.Template, bool) {
-	wui.mxCache.RLock()
-	t, ok := wui.templateCache[zid]
-	wui.mxCache.RUnlock()
-	return t, ok
-}
-
-func (wui *WebUI) retrieveCSSZidFromRole(ctx context.Context, m meta.Meta) (id.Zid, error) {
-	wui.mxRoleCSSMap.RLock()
-	if wui.roleCSSMap == nil {
-		wui.mxRoleCSSMap.RUnlock()
-		wui.mxRoleCSSMap.Lock()
-		mMap, err := wui.box.GetMeta(ctx, id.RoleCSSMapZid)
-		if err == nil {
-			wui.roleCSSMap = createRoleCSSMap(mMap)
-		}
-		wui.mxRoleCSSMap.Unlock()
-		if err != nil {
-			return id.Invalid, err
-		}
-		wui.mxRoleCSSMap.RLock()
-	}
-
-	defer wui.mxRoleCSSMap.RUnlock()
-	if role, found := m.Get("css-role"); found {
-		if result, found2 := wui.roleCSSMap[role]; found2 {
-			return result, nil
-		}
-	}
-	if role, found := m.Get(api.KeyRole); found {
-		if result, found2 := wui.roleCSSMap[role]; found2 {
-			return result, nil
-		}
-	}
-	return id.Invalid, nil
-}
-
-func createRoleCSSMap(mMap *meta.Meta) map[string]id.Zid {
-	result := make(map[string]id.Zid)
-	for _, p := range mMap.PairsRest() {
-		key := p.Key
-		if len(key) < 9 || !strings.HasPrefix(key, "css-") || !strings.HasSuffix(key, "-zid") {
-			continue
-		}
-		zid, err2 := id.Parse(p.Value)
-		if err2 != nil {
-			continue
-		}
-		result[key[4:len(key)-4]] = zid
-	}
-	return result
+func (wui *WebUI) getSxnCache(zid id.Zid) sxeval.Expr {
+	wui.mxCache.RLock()
+	expr, found := wui.templateCache[zid]
+	wui.mxCache.RUnlock()
+	if found {
+		return expr
+	}
+	return nil
 }
 
 func (wui *WebUI) canCreate(ctx context.Context, user *meta.Meta) bool {
 	m := meta.New(id.Invalid)
 	return wui.policy.CanCreate(user, m) && wui.box.CanCreateZettel(ctx)
 }
 
 func (wui *WebUI) canWrite(
-	ctx context.Context, user, meta *meta.Meta, content domain.Content) bool {
+	ctx context.Context, user, meta *meta.Meta, content zettel.Content) bool {
 	return wui.policy.CanWrite(user, meta, meta) &&
-		wui.box.CanUpdateZettel(ctx, domain.Zettel{Meta: meta, Content: content})
+		wui.box.CanUpdateZettel(ctx, zettel.Zettel{Meta: meta, Content: content})
 }
 
 func (wui *WebUI) canRename(ctx context.Context, user, m *meta.Meta) bool {
 	return wui.policy.CanRename(user, m) && wui.box.AllowRenameZettel(ctx, m.Zid)
 }
@@ -218,227 +195,12 @@
 
 func (wui *WebUI) canRefresh(user *meta.Meta) bool {
 	return wui.policy.CanRefresh(user)
 }
 
-func (wui *WebUI) getTemplate(
-	ctx context.Context, templateID id.Zid) (*template.Template, error) {
-	if t, ok := wui.cacheGetTemplate(templateID); ok {
-		return t, nil
-	}
-	realTemplateZettel, err := wui.box.GetZettel(ctx, templateID)
-	if err != nil {
-		return nil, err
-	}
-	t, err := template.ParseString(realTemplateZettel.Content.AsString(), nil)
-	if err == nil {
-		// t.SetErrorOnMissing()
-		wui.cacheSetTemplate(templateID, t)
-	}
-	return t, err
-}
-
-type simpleLink struct {
-	Text string
-	URL  string
-}
-
-type simpleLinks struct {
-	Has   bool
-	Links []simpleLink
-}
-
-func createSimpleLinks(ls []simpleLink) simpleLinks {
-	return simpleLinks{
-		Has:   len(ls) > 0,
-		Links: ls,
-	}
-}
-
-type baseData struct {
-	Lang           string
-	MetaHeader     string
-	CSSBaseURL     string
-	CSSUserURL     string
-	CSSRoleURL     string
-	Title          string
-	HomeURL        string
-	WithUser       bool
-	WithAuth       bool
-	UserIsValid    bool
-	UserZettelURL  string
-	UserIdent      string
-	LoginURL       string
-	LogoutURL      string
-	ListZettelURL  string
-	ListRolesURL   string
-	ListTagsURL    string
-	CanRefresh     bool
-	RefreshURL     string
-	NewZettelLinks simpleLinks
-	SearchURL      string
-	QueryKeyQuery  string
-	QueryKeySeed   string
-	CreateNewURL   string
-	Content        string
-	FooterHTML     string
-	DebugMode      bool
-}
-
-func (wui *WebUI) makeBaseData(ctx context.Context, lang, title, roleCSSURL string, user *meta.Meta, data *baseData) {
-	var userZettelURL string
-	var userIdent string
-
-	userIsValid := user != nil
-	if userIsValid {
-		userZettelURL = wui.NewURLBuilder('h').SetZid(api.ZettelID(user.Zid.String())).String()
-		userIdent = user.GetDefault(api.KeyUserID, "")
-	}
-
-	data.Lang = lang
-	data.CSSBaseURL = wui.cssBaseURL
-	data.CSSUserURL = wui.cssUserURL
-	data.CSSRoleURL = roleCSSURL
-	data.Title = title
-	data.HomeURL = wui.homeURL
-	data.WithAuth = wui.withAuth
-	data.WithUser = data.WithAuth
-	data.UserIsValid = userIsValid
-	data.UserZettelURL = userZettelURL
-	data.UserIdent = userIdent
-	data.LoginURL = wui.loginURL
-	data.LogoutURL = wui.logoutURL
-	data.ListZettelURL = wui.listZettelURL
-	data.ListRolesURL = wui.listRolesURL
-	data.ListTagsURL = wui.listTagsURL
-	data.CanRefresh = wui.canRefresh(user)
-	data.RefreshURL = wui.refreshURL
-	data.NewZettelLinks = createSimpleLinks(wui.fetchNewTemplates(ctx, user))
-	data.SearchURL = wui.searchURL
-	data.QueryKeyQuery = api.QueryKeyQuery
-	data.QueryKeySeed = api.QueryKeySeed
-	data.CreateNewURL = wui.createNewURL
-	data.FooterHTML = wui.calculateFooterHTML(ctx)
-	data.DebugMode = wui.debug
-}
-
-func (wui *WebUI) getSimpleHTMLEncoder() *htmlGenerator { return wui.createGenerator(wui) }
-
-// htmlAttrNewWindow returns HTML attribute string for opening a link in a new window.
-// If hasURL is false an empty string is returned.
-func htmlAttrNewWindow(hasURL bool) string {
-	if hasURL {
-		return ` target="_blank" rel="noopener noreferrer"`
-	}
-	return ""
-}
-
-func (wui *WebUI) fetchNewTemplates(ctx context.Context, user *meta.Meta) (result []simpleLink) {
-	ctx = box.NoEnrichContext(ctx)
-	if !wui.canCreate(ctx, user) {
-		return nil
-	}
-	menu, err := wui.box.GetZettel(ctx, id.TOCNewTemplateZid)
-	if err != nil {
-		return nil
-	}
-	refs := collect.Order(parser.ParseZettel(ctx, menu, "", wui.rtConfig))
-	for _, ref := range refs {
-		zid, err2 := id.Parse(ref.URL.Path)
-		if err2 != nil {
-			continue
-		}
-		m, err2 := wui.box.GetMeta(ctx, zid)
-		if err2 != nil {
-			continue
-		}
-		if !wui.policy.CanRead(user, m) {
-			continue
-		}
-		result = append(result, simpleLink{
-			Text: parser.NormalizedSpacedText(m.GetTitle()),
-			URL: wui.NewURLBuilder('c').SetZid(api.ZettelID(m.Zid.String())).
-				AppendKVQuery(queryKeyAction, valueActionNew).String(),
-		})
-	}
-	return result
-}
-
-func (wui *WebUI) calculateFooterHTML(ctx context.Context) string {
-	if footerZid, err := id.Parse(wui.rtConfig.Get(ctx, nil, config.KeyFooterZettel)); err == nil {
-		if zn, err2 := wui.evalZettel.Run(ctx, footerZid, ""); err2 == nil {
-			htmlEnc := encoder.Create(api.EncoderHTML)
-			var sb strings.Builder
-			if _, err2 = htmlEnc.WriteBlocks(&sb, &zn.Ast); err2 == nil {
-				return sb.String()
-			}
-		}
-	}
-	return ""
-}
-
-func (wui *WebUI) renderTemplate(
-	ctx context.Context,
-	w http.ResponseWriter,
-	templateID id.Zid,
-	base *baseData,
-	data interface{}) {
-	wui.renderTemplateStatus(ctx, w, http.StatusOK, templateID, base, data)
-}
-
-func (wui *WebUI) reportError(ctx context.Context, w http.ResponseWriter, err error) {
-	code, text := adapter.CodeMessageFromError(err)
-	if code == http.StatusInternalServerError {
-		wui.log.Error().Msg(err.Error())
-	}
-	user := server.GetUser(ctx)
-	var base baseData
-	wui.makeBaseData(ctx, api.ValueLangEN, "Error", "", user, &base)
-	wui.renderTemplateStatus(ctx, w, code, id.ErrorTemplateZid, &base, struct {
-		ErrorTitle string
-		ErrorText  string
-	}{
-		ErrorTitle: http.StatusText(code),
-		ErrorText:  text,
-	})
-}
-
-func (wui *WebUI) renderTemplateStatus(
-	ctx context.Context,
-	w http.ResponseWriter,
-	code int,
-	templateID id.Zid,
-	base *baseData,
-	data interface{}) {
-
-	bt, err := wui.getTemplate(ctx, id.BaseTemplateZid)
-	if err != nil {
-		wui.log.IfErr(err).Zid(id.BaseTemplateZid).Msg("Unable to get template")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-	t, err := wui.getTemplate(ctx, templateID)
-	if err != nil {
-		wui.log.IfErr(err).Zid(templateID).Msg("Unable to get template")
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-	if user := server.GetUser(ctx); user != nil {
-		if tok, err1 := wui.token.GetToken(user, wui.tokenLifetime, auth.KindHTML); err1 == nil {
-			wui.setToken(w, tok)
-		}
-	}
-	var content strings.Builder
-	err = t.Render(&content, data)
-	if err == nil {
-		wui.prepareAndWriteHeader(w, code)
-		base.Content = content.String()
-		err = bt.Render(w, base)
-	}
-	if err != nil {
-		wui.log.IfErr(err).Msg("Unable to write HTML via template")
-	}
+func (wui *WebUI) getSimpleHTMLEncoder(lang string) *htmlGenerator {
+	return wui.createGenerator(wui, lang)
 }
 
 // GetURLPrefix returns the configured URL prefix of the web server.
 func (wui *WebUI) GetURLPrefix() string { return wui.ab.GetURLPrefix() }
 

Index: web/content/content.go
==================================================================
--- web/content/content.go
+++ web/content/content.go
@@ -14,32 +14,32 @@
 
 import (
 	"mime"
 	"net/http"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/zettel"
+	"zettelstore.de/z/zettel/meta"
 )
 
 const (
 	UnknownMIME  = "application/octet-stream"
 	mimeGIF      = "image/gif"
 	mimeHTML     = "text/html; charset=utf-8"
 	mimeJPEG     = "image/jpeg"
 	mimeMarkdown = "text/markdown; charset=utf-8"
-	JSON         = "application/json"
 	PlainText    = "text/plain; charset=utf-8"
 	mimePNG      = "image/png"
+	SXPF         = PlainText
 	mimeWEBP     = "image/webp"
 )
 
 var encoding2mime = map[api.EncodingEnum]string{
 	api.EncoderHTML:  mimeHTML,
 	api.EncoderMD:    mimeMarkdown,
-	api.EncoderSexpr: PlainText,
-	api.EncoderSHTML: PlainText,
+	api.EncoderSz:    SXPF,
+	api.EncoderSHTML: SXPF,
 	api.EncoderText:  PlainText,
 	api.EncoderZmk:   PlainText,
 }
 
 // MIMEFromEncoding returns the MIME encoding for a given zettel encoding
@@ -57,17 +57,17 @@
 	meta.SyntaxHTML:     mimeHTML,
 	meta.SyntaxJPEG:     mimeJPEG,
 	meta.SyntaxJPG:      mimeJPEG,
 	meta.SyntaxMarkdown: mimeMarkdown,
 	meta.SyntaxMD:       mimeMarkdown,
-	meta.SyntaxMustache: PlainText,
 	meta.SyntaxNone:     "",
 	meta.SyntaxPlain:    PlainText,
 	meta.SyntaxPNG:      mimePNG,
 	meta.SyntaxSVG:      "image/svg+xml",
-	meta.SyntaxTxt:      PlainText,
+	meta.SyntaxSxn:      SXPF,
 	meta.SyntaxText:     PlainText,
+	meta.SyntaxTxt:      PlainText,
 	meta.SyntaxWebp:     mimeWEBP,
 	meta.SyntaxZmk:      "text/x-zmk; charset=utf-8",
 
 	// Additional syntaxes that are parsed as plain text.
 	"js":  "text/javascript; charset=utf-8",
@@ -109,11 +109,11 @@
 			return syntax
 		}
 		if ext, err := mime.ExtensionsByType(mt); err != nil && len(ext) > 0 {
 			return ext[0][1:]
 		}
-		if domain.IsBinary(data) {
+		if zettel.IsBinary(data) {
 			return "binary"
 		}
 	}
 	return "plain"
 }

Index: web/server/impl/impl.go
==================================================================
--- web/server/impl/impl.go
+++ web/server/impl/impl.go
@@ -14,15 +14,15 @@
 import (
 	"context"
 	"net/http"
 	"time"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
-	"zettelstore.de/z/domain/meta"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/web/server"
+	"zettelstore.de/z/zettel/meta"
 )
 
 type myServer struct {
 	log              *logger.Logger
 	baseURL          string

Index: web/server/impl/router.go
==================================================================
--- web/server/impl/router.go
+++ web/server/impl/router.go
@@ -14,11 +14,11 @@
 	"io"
 	"net/http"
 	"regexp"
 	"strings"
 
-	"zettelstore.de/c/api"
+	"zettelstore.de/client.fossil/api"
 	"zettelstore.de/z/auth"
 	"zettelstore.de/z/kernel"
 	"zettelstore.de/z/logger"
 	"zettelstore.de/z/web/server"
 )
@@ -106,13 +106,13 @@
 }
 
 func (rt *httpRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Something may panic. Ensure a kernel log.
 	defer func() {
-		if reco := recover(); reco != nil {
+		if ri := recover(); ri != nil {
 			rt.log.Error().Str("Method", r.Method).Str("URL", r.URL.String()).HTTPIP(r).Msg("Recover context")
-			kernel.Main.LogRecover("Web", reco)
+			kernel.Main.LogRecover("Web", ri)
 		}
 	}()
 
 	var withDebug bool
 	if msg := rt.log.Debug(); msg.Enabled() {
@@ -171,15 +171,15 @@
 func (rt *httpRouter) addUserContext(r *http.Request) *http.Request {
 	if rt.ur == nil {
 		// No auth needed
 		return r
 	}
-	k := auth.KindJSON
+	k := auth.KindAPI
 	t := getHeaderToken(r)
 	if len(t) == 0 {
 		rt.log.Debug().Msg("no jwt token found") // IP already logged: ServeHTTP
-		k = auth.KindHTML
+		k = auth.KindwebUI
 		t = getSessionToken(r)
 	}
 	if len(t) == 0 {
 		rt.log.Debug().Msg("no auth token found in request") // IP already logged: ServeHTTP
 		return r

Index: web/server/server.go
==================================================================
--- web/server/server.go
+++ web/server/server.go
@@ -14,13 +14,13 @@
 import (
 	"context"
 	"net/http"
 	"time"
 
-	"zettelstore.de/c/api"
-	"zettelstore.de/z/domain/id"
-	"zettelstore.de/z/domain/meta"
+	"zettelstore.de/client.fossil/api"
+	"zettelstore.de/z/zettel/id"
+	"zettelstore.de/z/zettel/meta"
 )
 
 // UserRetriever allows to retrieve user data based on a given zettel identifier.
 type UserRetriever interface {
 	GetUser(ctx context.Context, zid id.Zid, ident string) (*meta.Meta, error)

Index: www/build.md
==================================================================
--- www/build.md
+++ www/build.md
@@ -8,28 +8,26 @@
 * [unparam](https://mvdan.cc/unparam),
 * [govulncheck](https://golang.org/x/vuln/cmd/govulncheck),
 * [Fossil](https://fossil-scm.org/),
 * [Git](https://git-scm.org) (so that Go can download some dependencies).
 
-See folder <tt>docs/development</tt> (a zettel box) for details.
+See folder `docs/development` (a zettel box) for details.
 
 ## Clone the repository
-Most of this is covered by the excellent Fossil [documentation](https://fossil-scm.org/home/doc/trunk/www/quickstart.wiki).
+Most of this is covered by the excellent Fossil
+[documentation](https://fossil-scm.org/home/doc/trunk/www/quickstart.wiki).
 
 1. Create a directory to store your Fossil repositories.
-   Let's assume, you have created <tt>$HOME/fossils</tt>.
+   Let's assume, you have created `$HOME/fossils`.
 1. Clone the repository: `fossil clone https://zettelstore.de/ $HOME/fossils/zettelstore.fossil`.
 1. Create a working directory.
-   Let's assume, you have created <tt>$HOME/zettelstore</tt>.
+   Let's assume, you have created `$HOME/zettelstore`.
 1. Change into this directory: `cd $HOME/zettelstore`.
 1. Open development: `fossil open $HOME/fossils/zettelstore.fossil`.
 
-(If you are not able to use Fossil, you could try the GitHub mirror
-<https://github.com/zettelstore/zettelstore>.)
-
 ## The build tool
-In directory <tt>tools</tt> there is a Go file called <tt>build.go</tt>.
+In the directory `tools` there is a Go file called `build.go`.
 It automates most aspects, (hopefully) platform-independent.
 
 The script is called as:
 
 ```
@@ -40,15 +38,17 @@
 It outputs all commands called by the tool.
 
 Some important `COMMAND`s are:
 
 * `build`: builds the software with correct version information and puts it
-  into a freshly created directory <tt>bin</tt>.
+  into a freshly created directory `bin`.
 * `check`: checks the current state of the working directory to be ready for
   release (or commit).
 * `clean`: removes the build directories and cleans the Go cache.
 * `version`: prints the current version information.
+* `tools`: installs / updates the tools described above: staticcheck, shadow,
+  unparam, govulncheck.
 
 Therefore, the easiest way to build your own version of the Zettelstore
 software is to execute the command
 
 ```
@@ -58,5 +58,30 @@
 In case of errors, please send the output of the verbose execution:
 
 ```
 go run tools/build.go -v build
 ```
+
+## A note on the use of Fossil
+Zettelstore is managed by the Fossil version control system.
+Fossil is an alternative to the ubiquitous Git version control system.
+However, Go seems to prefer Git and popular platforms that just support Git.
+
+Some dependencies of Zettelstore, namely [Zettelstore
+client](https://zettelstore.de/client) and [sx](https://zettelstore.de/sx), are
+also managed by Fossil.
+Depending on your development setup, some error messages might occur.
+
+If the error message mentions an environment variable called `GOVCS` you should
+set it to the value `GOVCS=zettelstore.de:fossil` (alternatively more generous
+to `GOVCS=*:all`).
+Since the Go build system is coupled with Git and some special platforms, you
+allow ot to download a Fossil repository from the host `zettelstore.de`.
+The build tool set `GOVCS` to the right value, but you may use other `go`
+commands that try to download a Fossil repository.
+
+On some operating systems, namely Termux on Android, an error message might
+state that an user cannot be determined (`cannot determine user`).
+In this case, Fossil is allowed to download the repository, but cannot
+associate it with an user name.
+Set the environment variable `USER` to any user name, like:
+`USER=nobody go run tools/build.go build`.

Index: www/changes.wiki
==================================================================
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,11 +1,224 @@
 <title>Change Log</title>
 
+<a id="0_17"></a>
+<h2>Changes for Version 0.17.0 (pending)</h2>
+
+<a id="0_16"></a>
+<h2>Changes for Version 0.16.0 (2023-11-30)</h2>
+  *  Sx function <code>define</code> is removed, as announced for version
+     0.15.0. Use <code>defvar</code> (to define variables) or
+     <code>defun</code> (to define functions) instead. In addition
+     <code>defunconst</code> defines a constant function, which ensures a fixed
+     binding of its name to its function body (performance optimization).
+     (breaking: webui)
+  *  Allow to determine a role zettel for a given role.
+     (major: api, webui)
+  *  Present user the option to create a (missing) role zettel (in list view).
+     Results in a new predefined zettel with identifier 00000000090004, which
+     is a template for new role zettel.
+     (minor: webui)
+  *  Timestamp values can be abbrevated by omitting most of its components.
+     Previously, such values that are not in the format YYYYMMDDhhmmss were
+     ignored. Now the following formats are also allowed: YYYY, YYYYMM,
+     YYYYMMDD, YYYYMMDDhh, YYYYMMDDhhmm. Querying and sorting work accordingly.
+     Previously, only a sequences of zeroes were appended, resulting in illegal
+     timestamps, e.g. for YYYY or YYYYMM.
+     (minor)
+  *  SHTML encoder fixed w.r.t inline quoting. Previously, an &lt;q&gt; tag was
+     used, which is inappropriate. Restored smart quotes from version 0.3, but
+     with new SxHTML infrastructure. This affect the html encoder and the WebUI
+     too. Now, an empty quote should not result in a warning by HTML linters.
+     (minor: api, webui)
+  *  Add new zettelmarkup inline formatting: <code>##Text##</code> will mark /
+     highlight the given Text. It is typically used to highlight some text,
+     which is important for you, but not for the original author. When rendered
+     as HTML, the &lt;mark&gt; tag is used.
+     (minor: zettelmarkup)
+  *  Add configuration keys to show, not to show, or show the closed list of
+     referencing zettel in the web user interface. You can set these
+     configurations system-wide, per user, or per zettel. Often it is used to
+     ensure a &ldquo;clean&rdquo; home zettel. Affects the list of incoming
+     / back links, folge zettel, subordinate zettel, and successor zettel.
+     (minor: webui)
+  *  Some smaller bug fixes and improvements, to the software and to the
+     documentation.
+
+<a id="0_15"></a>
+<h2>Changes for Version 0.15.0 (2023-10-26)</h2>
+  *  Sx function <code>define</code> is now deprecated. It will be removed in
+     version 0.16. Use <code>defvar</code> or <code>defun</code> instead.
+     Otherwise the WebUI will not work in version 0.16.
+     (major: webui, deprecated)
+  *  Zettel can be re-indexed via WebUI or API query action
+     <code>REINDEX</code>. The info page of a zettel contains a link to
+     re-index the zettel. In a query transclusion, this action is ignored.
+     (major: api, webui).
+  *  Allow to determine a tag zettel for a given tag.
+     (major: api, webui)
+  *  Present user the option to create a (missing) tag zettel (in list view).
+     Results in a new predefined zettel with identifier 00000000090003, which
+     is a template for new tag zettel.
+     (minor: webui)
+  *  ZIP file with manual now contains a zettel 00001000000000 that contains
+     its build date (metadata key <code>created</code>) and version (in the
+     zettel content)
+     (minor)
+  *  If an error page cannot be created due to template errors (or similar), a
+     plain text error page is delivered instead. It shows the original error
+     and the error that occured durng rendering the original error page.
+     (minor: webui)
+  *  Some smaller bug fixes and improvements, to the software and to the
+     documentation.
+
+<a id="0_14"></a>
+<h2>Changes for Version 0.14.0 (2023-09-22)</h2>
+  *  Remove support for JSON. This was marked deprecated in version 0.12.0. Use
+     the <code>data</code> encoding instead, a form of symbolic expressions.
+     (breaking: api; minor: webui)
+  *  Remove deprecated syntax for a context list: <code>CONTEXT zid</code>. Use
+     <code>zid CONTEXT</code> instead. It was deprecated in version 0.13.0.
+     (breaking: api, webui, zettelmarkup)
+  *  Replace CSS-role-map mechanism with a more general Sx-based one: user
+     specific code may generates parts of resulting HTML document.
+     (breaking: webui)
+  *  Allow meta-tags, i.e. zettel for a specific tag. Meta-tags have the tag
+     name as a title and specify the role "tag".
+     (major: webui)
+  *  Allow to load sx code from multiple zettel; dependencies are specified
+     using <code>precursor</code> metadata.
+     (major: webui)
+  *  Allow sx code to change WebUI for zettel with specified role.
+     (major: webui)
+  *  Some minor usability improvements.
+     (minor: webui)
+  *  Some smaller bug fixes and improvements, to the software and to the
+     documentation.
+
+<a id="0_13"></a>
+<h2>Changes for Version 0.13.0 (2023-08-07)</h2>
+  *  There are for new search operators: less, not less, greater, not greater.
+     These use the same syntax as the operators prefix, not prefix, suffix, not
+     suffix. The latter are now denoted as <code>[</code>, <code>![</code>,
+     <code>]</code>, and <code>!]</code>. The first may operate numerically for
+     metadata like numbers, timestamps, and zettel identifier. They are not
+     supported for full-text search.
+     (breaking: api, webui)
+  *  The API endpoint <code>/o/{ID}</code> (order of zettel ID) is no longer
+     available. Please use the query expression <code>{ID} ITEMS</code>
+     instead.
+     (breaking: api)
+  *  The API endpoint <code>/u/{ID}</code> (unlinked references of zettel ID)
+     is no longer available. Please use the query expression <code>{ID}
+     UNLINKED</code> instead.
+     (breaking: api)
+  *  All API endpoints allow to encode zettel data with the <code>data</code>
+     encodings, incl. creating, updating, retrieving, and querying zettel.
+     (major: api)
+  *  Change syntax for context query to <code>zid ... CONTEXT</code>. This will
+     allow to add more directives that operate on zettel identifier. Old syntax
+     <code>CONTEXT zid</code> will be removed in 0.14.
+     (major, deprecated)
+  *  Add query directive <code>ITEMS</code> that will produce a list of
+     metadata of all zettel that are referenced by the originating zettel in
+     a top-level list. It replaces the API endpoint <code>/o/{ID}</code> (and
+     makes it more useful).
+     (major: api, webui)
+  *  Add query directive <code>UNLINKED</code> that will produce a list of
+     metadata of all zettel that are mentioning the originating zettel in
+     a top-level, but do not mention them. It replaces the API endpoint
+     <code>/u/{ID}</code> (and makes it more useful).
+     (major: api, webui)
+  *  Add query directive <code>IDENT</code> to distinguish a search for
+     a zettel identifier (&ldquo;{ID}&rdquo;), that will list all metadata of
+     zettel containing that zettel identifier, and a request to just list the
+     metadata of given zettel (&ldquo;{ID} IDENT&rdquo;). The latter could be
+     filtered further.
+     (minor: api, webui)
+  *  Add support for metadata key <code>folge-role</code>.
+     (minor)
+  *  Allow to create a child from a given zettel.
+     (minor: webui)
+  *  Make zettel entry/edit form a little friendlier: auto-prepend missing '#'
+     to tags; ensure that role and syntax receive just a word.
+     (minor: webui)
+  *  Use a zettel that defines builtins for evaluating WebUI templates.
+     (minor: webui)
+  *  Add links to retrieve result of a query in other formats.
+     (minor: webui)
+  *  Always log the found configuration file.
+     (minor: server)
+  *  The use of the <code>json</code> zettel encoding is deprecated (since
+     version 0.12.0). Support for this encoding will be removed in version
+     0.14.0. Please use the new <code>data</code> encoding instead.
+     (deprecated: api)
+  *  Some smaller bug fixes and improvements, to the software and to the
+     documentation.
+
 <a id="0_12"></a>
-<h2>Changes for Version 0.12.0 (pending)</h2>
+<h2>Changes for Version 0.12.0 (2023-06-05)</h2>
+  *  Syntax of templates for the web user interface are changed from Mustache
+     to Sxn (S-Expressions). Mustache is no longer supported, nowhere in the
+     software. Mustache was marked deprecated in version 0.11.0. If you
+     modified the template zettel, you must adapt to the new syntax.
+     (breaking: webui)
+  *  Query expression is allowed to search for the "context" of a zettel.
+     Previously, this was a separate call, without adding a search expression
+     / action expression.
+     (breaking)
+  *  "sexpr" encoding is renamed to "sz" encoding. This will affect mostly the
+     API. Additionally, all string "sexpr" are renamed to "sz" also. "Sz" is
+     the short form for "symbolic expression for zettel", similar to "shtml"
+     that is the short form for "symbolic expression for HTML".
+     (breaking)
+  *  Render footer zettel on all WebUI pages.
+     (fix: webui)
+  *  Query search operator "=" now compares for equality, ":" compares
+     depending on the value type.
+     (minor: api, webui)
+  *  Search term <code>PICK</code> now respects the original sort order. This
+     makes it more useful and orthogonal to <code>RANDOM</code> and
+     <code>LIMIT</code>. As a side effect, zettel lists retrieved via the API
+     are no longer sorted. In case you want a specific order, you must specify
+     it explicit.
+     (minor: api, webui)
+  *  New metadata key <code>expire</code> records a timestamp when a zettel
+     should be treated as, well, expired.
+     (minor)
+  *  New metadata keys <code>superior</code> and <code>subordinate</code>
+     (calculated from <code>superior</code>) allow to specify a hierarchy
+     between zettel.
+     (minor)
+  *  Metadata keys with suffix <code>-date</code> and <code>-time</code> are
+     treated as
+     timestamp values.
+     (minor)
+  *  <code>sexpr</code> zettel encoding is now documented in the manual.
+     (minor: manual)
+  *  Build tool allows to install / update external Go tools needed to build
+     the software.
+     (minor)
+  *  Show only useful metadata on WebUI, not the internal metadata.
+     (minor: webui)
+  *  The use of the <code>json</code> zettel encoding is deprecated. Support
+     for this encoding may be removed in future versions. Please use the new
+     <code>data</code> encoding instead.
+     (deprecated: api)
+  *  Some smaller bug fixes and improvements, to the software and to the
+     documentation.
 
 <a id="0_11"></a>
+<h2>Changes for Version 0.11.2 (2023-04-16)</h2>
+  *  Render footer zettel on all WebUI pages. Backported from 0.12.0. Many
+     thanks to HK for reporting it!
+     (fix: webui)
+
+<h2>Changes for Version 0.11.1 (2023-03-28)</h2>
+  *  Make <code>PICK</code> search term a little bit more deterministic so that
+     the &ldquo;Save As Zettel&rdquo; button produces the same list.
+     (fix: webui)
+
 <h2>Changes for Version 0.11.0 (2023-03-27)</h2>
   *  Remove ZJSON encoding. It was announced in version 0.10.0. Use Sexpr
      encoding instead.
      (breaking)
   *  Title of a zettel is no longer interpreted as Zettelmarkup text. Now it is
@@ -13,27 +226,27 @@
      bold text), no links, no footnotes, no citations (the latter made
      rendering the title often questionable, in some contexts). If you used
      special entities, please use the unicode characters directly. However, as
      a good practice, it is often the best to printable ASCII characters.
      (breaking)
-  *  Remove runtime configuration <tt>marker-external</tt>. It was added in
+  *  Remove runtime configuration <code>marker-external</code>. It was added in
      version [#0_0_6|0.0.6] and updated in [#0_0_10|0.0.10]. If you want to
      change the marker for an external URL, you could modify zettel
      00000000020001 (Zettelstore Base CSS) or zettel 00000000025001
      (Zettelstore User CSS, preferred) by changing / adding a rule to add some
-     content after an external <tt><a ...></tt> tag.
+     content after an external <code><a ...></code> tag.
      (breaking: webui)
   *  Add SHTML encoding. This allows to ensure the quality of generated HTML
      code. In addition, clients might use it, because it is easier to parse and
      manipulate than ordinary HTML. In the future, HTML template zettel will
      probably also use SHTML, deprecating the current Mustache syntax (which
      was added in [#0_0_9|0.0.9]).
      (major)
-  *  Search term <tt>PICK n</tt>, where <tt>n</tt> is an integer value greater
-     zero, will pick randomly <tt>n</tt> elements from the search result list.
-     Somehow similar (and faster) as <tt>RANDOM LIMIT n</tt>, but allows also
-     later ordering of the resulting list.
+  *  Search term <code>PICK n</code>, where <code>n</code> is an integer value
+     greater zero, will pick randomly <code>n</code> elements from the search
+     result list. Somehow similar (and faster) as <code>RANDOM LIMIT n</code>,
+     but allows also later ordering of the resulting list.
      (minor)
   *  Changed cost model for zettel context: a zettel with more
      outgoing/incoming references has higher cost than a zettel with less
      references. Also added support for traversing tags, with a similar cost
      model. As an effect, zettel hubs (in many cases your home zettel) will
@@ -49,16 +262,17 @@
   *  Show button to save a query into a zettel only when the current user has
      authorization to do it.
      (fix: webui)
 
 <h2>Changes for Version 0.10.0 (2023-01-24)</h2>
-  *  Remove support for endpoints <tt>/j, /m, /q, /p, /v</tt>. Their functions
-     are merged into endpoint <tt>/z</tt>. This was announced in version 0.9.0.
-     Please use only client library with at least version 0.10.0 too.
+  *  Remove support for endpoints <code>/j, /m, /q, /p, /v</code>. Their
+     functions are merged into endpoint <code>/z</code>. This was announced in
+     version 0.9.0. Please use only client library with at least version 0.10.0
+     too.
      (breaking: api)
-  *  Remove support for runtime configuration key <tt>footer-html</tt>. Use
-     <tt>footer-zettel</tt> instead. Deprecated in version 0.9.0.
+  *  Remove support for runtime configuration key <code>footer-html</code>. Use
+     <code>footer-zettel</code> instead. Deprecated in version 0.9.0.
      (breaking: webui)
   *  Save a query into a zettel to freeze it.
      (major: webui)
   *  Allow to show all used metadata keys, linked with their occurrences and
      their values.
@@ -69,11 +283,11 @@
   *  Some smaller bug fixes and improvements, to the software and to the
      documentation.
 
 <a id="0_9"></a>
 <h2>Changes for Version 0.9.0 (2022-12-12)</h2>
-  *  Remove support syntax <tt>pikchr</tt>. Although it was a nice idea to
+  *  Remove support syntax <code>pikchr</code>. Although it was a nice idea to
      include it into Zettelstore, the implementation is too brittle (w.r.t. the
      expected long lifetime of Zettelstore). There should be other ways to
      support SVG front-ends.
      (breaking)
   *  Allow to upload content when creating / updating a zettel.
@@ -84,61 +298,63 @@
      a zettel can be encoded in Markdown. Those aspects will be ignored.
      (minor: api)
   *  Enhance zettel context by raising the importance of folge zettel (and
      similar).
      (minor: api, webui)
-  *  Interpret zettel files with extension <tt>.webp</tt> as an binary image
-     file format.
+  *  Interpret zettel files with extension <code>.webp</code> as an binary
+     image file format.
      (minor)
   *  Allow to specify service specific log level via statup configuration and
      via command line.
      (minor)
   *  Allow to specify a zettel to serve footer content via runtime
-     comfiguration <tt>footer-zettel</tt>. Can be overwritten by user zettel.
+     comfiguration <code>footer-zettel</code>. Can be overwritten by user
+     zettel.
      (minor: webui)
   *  Footer data is automatically separated by a thematic break / horizontal
      rule. If you do not like it, you have to update the base template.
      (minor: webui)
-  *  Allow to set runtime configuration <tt>home-zettel</tt> in the user zettel
-     to make it user-specific.
+  *  Allow to set runtime configuration <code>home-zettel</code> in the user
+     zettel to make it user-specific.
      (minor: webui)
   *  Serve favicon.ico from the asset directory.
      (minor: webui)
   *  Zettelmarkup cheat sheet
      (minor: manual)
-  *  Runtime configuration key <tt>footer-html</tt> will be removed in Version
-     0.10.0. Please use <tt>footer-zettel</tt> instead.
+  *  Runtime configuration key <code>footer-html</code> will be removed in
+     Version 0.10.0. Please use <code>footer-zettel</code> instead.
      (deprecated: webui)
-  *  In the next version 0.10.0, the API endpoints for a zettel (<tt>/j</tt>,
-     <tt>/p</tt>, <tt>/v</tt>) will be merged with endpoint <tt>/z</tt>. Basically,
-     the previous endpoint will be refactored as query parameter of endpoint
-     <tt>/z</tt>. To reduce errors, there will be no version, where the previous
-     endpoint are still available and the new funnctionality is still there.
-     This is a warning to prepare for some breaking changes in v0.10.0. This
-     also affects the API client implementation.
+  *  In the next version 0.10.0, the API endpoints for a zettel
+     (<code>/j</code>, <code>/p</code>, <code>/v</code>) will be merged with
+     endpoint <code>/z</code>. Basically, the previous endpoint will be
+     refactored as query parameter of endpoint <code>/z</code>. To reduce
+     errors, there will be no version, where the previous endpoint are still
+     available and the new funnctionality is still there. This is a warning to
+     prepare for some breaking changes in v0.10.0. This also affects the API
+     client implementation.
      (warning: api)
   *  Some smaller bug fixes and improvements, to the software and to the
      documentation.
 
 <a id="0_8"></a>
 <h2>Changes for Version 0.8.0 (2022-10-20)</h2>
   *  Remove support for tags within zettel content. Removes also property
-     metadata keys <tt>all-tags</tt> and <tt>computed-tags</tt>. Deprecated in
-     version 0.7.0.
+     metadata keys <code>all-tags</code> and <code>computed-tags</code>.
+     Deprecated in version 0.7.0.
      (breaking: zettelmarkup, api, webui)
-  *  Remove API endpoint <tt>/m</tt>, which retrieve aggregated (tags, roles)
-     zettel identifier. Deprecated in version 0.7.0.
+  *  Remove API endpoint <code>/m</code>, which retrieve aggregated (tags,
+     roles) zettel identifier. Deprecated in version 0.7.0.
      (breaking: api)
   *  Remove support for URL query parameter starting with an underscore.
      Deprecated in version 0.7.0.
      (breaking: api, webui)
   *  Ignore HTML content by default, and allow HTML gradually by setting
-     startup value <tt>insecure-html</tt>.
+     startup value <code>insecure-html</code>.
      (breaking: markup)
-  *  Endpoint <tt>/q</tt> returns list of full metadata, if no query action is
-     specified. A HTTP call <tt>GET /z</tt> (retrieving metadata of all or some
-     zettel) is now an alias for <tt>GET /q</tt>.
+  *  Endpoint <code>/q</code> returns list of full metadata, if no query action
+     is specified. A HTTP call <code>GET /z</code> (retrieving metadata of all
+     or some zettel) is now an alias for <code>GET /q</code>.
      (major: api)
   *  Allow to create a zettel that acts as the new version of an existing
      zettel. Useful if you want to have access to older, outdated content.
      (minor: webui)
   *  Allow transclusion to reference local image via URL.
@@ -164,82 +380,84 @@
   *  Produce a RSS feed compatible to Miniflux.
      (minor)
   *  Make sure to always produce a pubdata in RSS feed.
      (bug)
   *  Prefix search for data that looks like a zettel identifier may end with a
-     <tt>0</tt>.
+     <code>0</code>.
      (bug)
   *  Fix glitch on manual zettel.
      (bug)
 
 <h2>Changes for Version 0.7.0 (2022-09-17)</h2>
   *  Removes support for URL query parameter to search for metadata values,
      sorting, offset, and limit a zettel list. Deprecated in version 0.6.0
      (breaking: api, webui)
   *  Allow to search for the existence / non-existence of a metadata key with
-     the "?" operator: <tt>key?</tt> and <tt>key!?</tt>. Previously, the ":"
-     operator was used for this by specifying an empty search value. Now you
-     can use the ":" operator to find empty / non-empty metadata values. If you
-     specify a search operator for metadata, the specified key is assumed to
-     exist.
+     the "?" operator: <code>key?</code> and <code>key!?</code>. Previously,
+     the ":" operator was used for this by specifying an empty search value.
+     Now you can use the ":" operator to find empty / non-empty metadata
+     values. If you specify a search operator for metadata, the specified key
+     is assumed to exist.
      (breaking: api, webui)
   *  Rename &ldquo;search expression&rdquo; into &ldquo;query
-     expressions&rdquo;. Similar, the reference prefix <tt>search:</tt> to
-     specify a query link or a query transclusion is renamed to <tt>query:</tt>
+     expressions&rdquo;. Similar, the reference prefix <code>search:</code> to
+     specify a query link or a query transclusion is renamed to
+     <code>query:</code>
      (breaking: zettelmarkup)
-  *  Rename query parameter for query expression from <tt>_s</tt> to
-     <tt>q</tt>.
+  *  Rename query parameter for query expression from <code>_s</code> to
+     <code>q</code>.
      (breaking: api, webui)
   *  Cleanup names for HTTP query parameters in WebUI. Update your bookmarks
      if you used them. (For API: see below)
      (breaking: webui)
   *  Allow search terms to be OR-ed. This allows to specify any search
      expression in disjunctive normal form. Therefore, the NEGATE term is not
      needed any more.
      (breaking: api, webui)
-  *  Replace runtime configuration <tt>default-lang</tt> with <tt>lang</tt>.
-     Additionally, <tt>lang</tt> set at the zettel of the current user, will
-     provide a default value for the current user, overwriting the global
-     default value.
+  *  Replace runtime configuration <code>default-lang</code> with
+     <code>lang</code>. Additionally, <code>lang</code> set at the zettel of
+     the current user, will provide a default value for the current user,
+     overwriting the global default value.
      (breaking)
-  *  Add new syntax <tt>pikchr</tt>, a markup language for diagrams in
+  *  Add new syntax <code>pikchr</code>, a markup language for diagrams in
      technical documentation.
      (major)
-  *  Add endpoint <tt>/q</tt> to query the zettelstore and aggregate resulting
-     values. This is done by extending the query syntax.
+  *  Add endpoint <code>/q</code> to query the zettelstore and aggregate
+     resulting values. This is done by extending the query syntax.
      (major: api)
   *  Add support for query actions. Actions may aggregate w.r.t. some metadata
      keys, or produce an RSS feed.
      (major: api, webui)
   *  Query results can be ordered for more than one metadata key. Ordering by
      zettel identifier is an implicit last order expression to produce stable
      results.
      (minor: api, webui)
   *  Add support for an asset directory, accessible via URL prefix
-     <tt>/assests/</tt>.
+     <code>/assests/</code>.
      (minor: server)
-  *  Add support for metadata key <tt>created</tt>, a timestamp when the zettel
-     was created. Since key <tt>published</tt> is now either <tt>created</tt>
-     or <tt>modified</tt>, it will now always contains a valid time stamp.
+  *  Add support for metadata key <code>created</code>, a timestamp when the
+     zettel was created. Since key <code>published</code> is now either
+     <code>created</code> or <code>modified</code>, it will now always contains
+     a valid time stamp.
      (minor)
-  *  Add support for metadata key <tt>author</tt>. It will be displayed on a
-     zettel, if set.
+  *  Add support for metadata key <code>author</code>. It will be displayed on
+     a zettel, if set.
      (minor: webui)
-  *  Remove CSS for lists. The browsers default value for <tt>padding-left</tt>
-     will be used.
+  *  Remove CSS for lists. The browsers default value for
+     <code>padding-left</code> will be used.
      (minor: webui)
   *  Removed templates for rendering roles and tags lists. This is now done by
      query actions.
      (minor: webui)
   *  Tags within zettel content are deprecated in version 0.8. This affects the
-     computed metadata keys <tt>content-tags</tt> and <tt>all-tags</tt>. They
-     will be removed. The number sign of a content tag introduces unintended
-     tags, esp. in the english language; content tags may occur within links
-     &rarr; links within links, when rendered as HTML; content tags may occur
-     in the title of a zettel; naming of content tags, zettel tags, and their
-     union is confusing for many. Migration: use zettel tags or replace content
-     tag with a search.
+     computed metadata keys <code>content-tags</code> and
+     <code>all-tags</code>. They will be removed. The number sign of a content
+     tag introduces unintended tags, esp. in the english language; content tags
+     may occur within links &rarr; links within links, when rendered as HTML;
+     content tags may occur in the title of a zettel; naming of content tags,
+     zettel tags, and their union is confusing for many. Migration: use zettel
+     tags or replace content tag with a search.
      (deprecated: zettelmarkup)
   *  Cleanup names for HTTP query parameter for API calls. Essentially,
      underscore characters in front are removed. Please use new names, old
      names will be deprecated in version 0.8.
      (deprecated: api)
@@ -307,14 +525,14 @@
      (breaking)
   *  &ldquo;Sexpr&rdquo; encoding replaces &ldquo;Native&rdquo; encoding. Sexpr
      encoding is much easier to parse, compared with native and ZJSON encoding.
      In most cases it is smaller than ZJSON.
      (breaking: api)
-  *  Endpoint <tt>/r</tt> is changed to <tt>/m?_key=role</tt> and returns now
-     a map of role names to the list of zettel having this role. Endpoint
-     <tt>/t</tt> is changed to <tt>/m?_key=tags</tt>. It already returned
-     mapping described before.
+  *  Endpoint <code>/r</code> is changed to <code>/m?_key=role</code> and
+     returns now a map of role names to the list of zettel having this role.
+     Endpoint <code>/t</code> is changed to <code>/m?_key=tags</code>. It
+     already returned mapping described before.
      (breaking: api)
   *  Remove support for a default value for metadata key title, role, and
      syntax. Title and role are now allowed to be empty, an empty syntax value
      defaults to &ldquo;plain&rdquo;.
      (breaking)
@@ -355,12 +573,12 @@
 <a id="0_4"></a>
 <h2>Changes for Version 0.4 (2022-03-08)</h2>
   *  Encoding &ldquo;djson&rdquo; renamed to &ldquo;zjson&rdquo; (<em>zettel
      json</em>).
      (breaking: api; minor: webui)
-  *  Remove inline quotation syntax <tt>&lt;&lt;...&lt;&lt;</tt>. Now,
-     <tt>&quot;&quot;...&quot;&quot;</tt> generates the equivalent code.
+  *  Remove inline quotation syntax <code>&lt;&lt;...&lt;&lt;</code>. Now,
+     <code>&quot;&quot;...&quot;&quot;</code> generates the equivalent code.
      Typographical quotes are generated by the browser, not by Zettelstore.
      (breaking: Zettelmarkup)
   *  Remove inline formatting for monospace. Its syntax is now used by the
      similar syntax element of literal computer input. Monospace was just
      a visual element with no semantic association. Now, the syntax
@@ -387,11 +605,11 @@
      identifier.
      (minor: api, webui)
   *  Change generated URLs for zettel-creation forms. If you have bookmarked
      them, e.g. to create a new zettel, you should update.
      (minor: webui)
-  *  Remove support for metadata key <tt>no-index</tt> to suppress indexing
+  *  Remove support for metadata key <code>no-index</code> to suppress indexing
      selected zettel. It was introduced in <a href="#0_0_11">v0.0.11</a>, but
      disallows some future optimizations for searching zettel.
      (minor: api, webui)
   *  Make some metadata-based searches a little bit faster by executing
      a (in-memory-based) full-text search first. Now only those zettel are
@@ -408,11 +626,11 @@
   *  Many smaller bug fixes and improvements, to the software and to the
      documentation.
 
 <a id="0_3"></a>
 <h2>Changes for Version 0.3 (2022-02-09)</h2>
-  *  Zettel files with extension <tt>.meta</tt> are now treated as content
+  *  Zettel files with extension <code>.meta</code>