From 61adbd55c5dbd7303afc95002e42a1b19c19f5e0 Mon Sep 17 00:00:00 2001
From: Snider <snider@host.uk.com>
Date: Wed, 15 Apr 2026 00:16:01 +0100
Subject: [PATCH] fix(html): align left slot with navigation semantics

---
 docs/architecture.md |  2 +-
 docs/index.md        |  2 +-
 layout.go            |  4 ++--
 layout_test.go       |  4 ++--
 path.go              | 15 ++++++++++++++-
 path_test.go         |  2 ++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/docs/architecture.md b/docs/architecture.md
index 169dc36..f018689 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -73,7 +73,7 @@ The `Layout` type is a compositor for five named slots:
 | Slot Letter | Semantic Element | ARIA Role | Accessor |
 |-------------|-----------------|-----------|----------|
 | H | `<header>` | `banner` | `layout.H(...)` |
-| L | `<aside>` | `complementary` | `layout.L(...)` |
+| L | `<nav>` | `navigation` | `layout.L(...)` |
 | C | `<main>` | `main` | `layout.C(...)` |
 | R | `<aside>` | `complementary` | `layout.R(...)` |
 | F | `<footer>` | `contentinfo` | `layout.F(...)` |
diff --git a/docs/index.md b/docs/index.md
index 5db9bfa..9a83bdf 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -54,7 +54,7 @@ This builds a Header-Content-Footer layout with semantic HTML elements (`<header
 
 **Node tree** -- All renderable units implement `Node`, a single-method interface: `Render(ctx *Context) string`. The library composes nodes into trees using `El()` for elements, `Text()` for translated text, control-flow constructors (`If`, `Unless`, `Each`, `Switch`, `Entitled`), and accessibility helpers (`AriaLabel`, `AltText`, `TabIndex`, `AutoFocus`, `Role`).
 
-**HLCRF Layout** -- A five-slot compositor that maps to semantic HTML: `<header>` (H), `<aside>` (L/R), `<main>` (C), `<footer>` (F). The variant string controls which slots render: `"HLCRF"` for all five, `"HCF"` for three, `"C"` for content only. Layouts nest: placing a `Layout` inside another layout's slot produces hierarchical `data-block` paths like `L-0-C-0`.
+**HLCRF Layout** -- A five-slot compositor that maps to semantic HTML: `<header>` (H), `<nav>` (L), `<main>` (C), `<aside>` (R), `<footer>` (F). The variant string controls which slots render: `"HLCRF"` for all five, `"HCF"` for three, `"C"` for content only. Layouts nest: placing a `Layout` inside another layout's slot produces hierarchical `data-block` paths like `L-0-C-0`.
 
 **Responsive variants** -- `Responsive` wraps multiple `Layout` instances with named breakpoints (e.g. `"desktop"`, `"mobile"`). Each variant renders inside a `<div data-variant="name">` container for CSS or JavaScript targeting. `VariantSelector(name)` returns a ready-made attribute selector for styling these containers from CSS.
 
diff --git a/layout.go b/layout.go
index 5ebb81d..fa600ac 100644
--- a/layout.go
+++ b/layout.go
@@ -24,7 +24,7 @@ type slotMeta struct {
 // slotRegistry maps slot letters to their semantic HTML elements and ARIA roles.
 var slotRegistry = map[byte]slotMeta{
 	'H': {tag: "header", role: "banner"},
-	'L': {tag: "aside", role: "complementary"},
+	'L': {tag: "nav", role: "navigation"},
 	'C': {tag: "main", role: "main"},
 	'R': {tag: "aside", role: "complementary"},
 	'F': {tag: "footer", role: "contentinfo"},
@@ -148,7 +148,7 @@ func (l *Layout) H(nodes ...Node) *Layout {
 	return l
 }
 
-// L appends nodes to the Left aside slot.
+// L appends nodes to the Left navigation slot.
 // Usage example: NewLayout("LC").L(Text("nav"))
 func (l *Layout) L(nodes ...Node) *Layout {
 	if l == nil {
diff --git a/layout_test.go b/layout_test.go
index 704b52f..46caa40 100644
--- a/layout_test.go
+++ b/layout_test.go
@@ -11,14 +11,14 @@ func TestLayout_HLCRF_Good(t *testing.T) {
 	got := layout.Render(ctx)
 
 	// Must contain semantic elements
-	for _, want := range []string{"<header", "<aside", "<main", "<footer"} {
+	for _, want := range []string{"<header", "<nav", "<main", "<footer"} {
 		if !containsText(got, want) {
 			t.Errorf("HLCRF layout missing %q in:\n%s", want, got)
 		}
 	}
 
 	// Must contain ARIA roles
-	for _, want := range []string{`role="banner"`, `role="complementary"`, `role="main"`, `role="contentinfo"`} {
+	for _, want := range []string{`role="banner"`, `role="navigation"`, `role="main"`, `role="contentinfo"`} {
 		if !containsText(got, want) {
 			t.Errorf("HLCRF layout missing role %q in:\n%s", want, got)
 		}
diff --git a/path.go b/path.go
index dbcc46d..16f32c3 100644
--- a/path.go
+++ b/path.go
@@ -15,9 +15,22 @@ func ParseBlockID(id string) []byte {
 		return nil
 	}
 
+	// Accept both the current "{slot}-0" path format and the dot notation
+	// used in the RFC prose examples. A plain single-slot ID such as "H" is
+	// also valid.
+	normalized := strings.ReplaceAll(id, ".", "-")
+	if !strings.Contains(normalized, "-") {
+		if len(normalized) == 1 {
+			if _, ok := slotRegistry[normalized[0]]; ok {
+				return []byte{normalized[0]}
+			}
+		}
+		return nil
+	}
+
 	// Valid IDs are exact sequences of "{slot}-0" segments, e.g.
 	// "H-0" or "L-0-C-0". Any malformed segment invalidates the whole ID.
-	parts := strings.Split(id, "-")
+	parts := strings.Split(normalized, "-")
 	if len(parts)%2 != 0 {
 		return nil
 	}
diff --git a/path_test.go b/path_test.go
index 7301466..51bb77c 100644
--- a/path_test.go
+++ b/path_test.go
@@ -65,6 +65,8 @@ func TestParseBlockID_ExtractsSlots_Good(t *testing.T) {
 		want []byte
 	}{
 		{"L-0-C-0", []byte{'L', 'C'}},
+		{"L.0.C.0", []byte{'L', 'C'}},
+		{"H", []byte{'H'}},
 		{"H-0", []byte{'H'}},
 		{"C-0-C-0-C-0", []byte{'C', 'C', 'C'}},
 		{"", nil},