From d6cfd19b15040c1704e7870d3410741686c93d7a Mon Sep 17 00:00:00 2001
From: Mark Scherer <dereuromark@users.noreply.github.com>
Date: Sat, 15 Aug 2026 03:16:19 +0200
Subject: [PATCH] fix: withdraw the quote attribution, a captioned quote is a
 figure again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

markup-carve/carve#1213 withdraws PART 9 §4a and PART 11 §10d. A caption on a
block quote is not an attribution; it is a caption like any other, so a captioned
quote is a `figure` whose target is the quote - the shape this engine produced
before markup-carve/carve-php#1239.

WHY THE CLAUSE FELL. The HTML Standard's `blockquote` section requires that
"attribution for the quotation, if any, must be placed outside the `blockquote`
element", and gives a `<figure>` wrapping the quote with a `<figcaption>` as the
way to attach it, "which is not part of the quote and therefore doesn't belong
inside the `blockquote` itself". §4a put it inside, in a `<footer>`, and asserted
that both spellings were valid. Its model argument fails too: `figure` is already
the generic captioned wrapper, since a captioned code block is a `figure` whose
target is the code block, and what a captioned thing is called and counted as
comes from the caption's own label rather than the host's node type.

Nothing had shipped - 0.1.4 predates the port - so this removes code no release
carried, and the CHANGELOG loses those entries rather than gaining a reversal.

WHAT COMES BACK:

  `> To be` + `^ Hamlet` renders

      <figure>
        <blockquote><p>To be</p></blockquote>
        <figcaption>Hamlet</figcaption>
      </figure>

  The caption numbers like any other and shares the Figure bucket with images, so
  a numbered cross-reference to the quote's id resolves again.

  `BlockQuote::$attribution` is gone from the node, the AST codec, the ProseMirror
  bridge and the renderers, and `figure.target` admits a `block_quote`.
  `resources/ast-schema.json` is re-copied from the spec submodule, which moves
  onto the withdrawal.

  `HtmlToCarve` reads `<figure><blockquote>…<figcaption>` back as the figure, and
  a `<footer>` inside a quote is ordinary quoted content again.

  The Markdown, plain-text and terminal renderers lose the attribution-specific
  handling §10d added and render a quote's caption the way they render any other
  figure caption.

WHAT STAYS. PART 11 §10e landed in the same commits and is untouched: a table
caption still survives the Markdown target, and a code fence's title and grouping
label still survive plain text and the terminal.

`tests/fixtures/ast-schema.json` is the reflection-derived field map, NOT a copy
of the published schema, so it loses exactly one entry - `block_quote.fields`
drops `attribution` - and `AstCodecSchemaTest` keeps comparing it against
`AstCodec::schema()`. That golden is the rename detector for the wire format and
is not the vendored-copy check; conflating the two would have removed a guard
while appearing to update a fixture.
---
 CHANGELOG.md                                  |  48 +---
 resources/ast-schema.json                     |  12 +-
 src/Ast/AstCodec.php                          |  21 --
 src/Converter/HtmlToCarve.php                 |  67 +----
 src/Node/Block/BlockQuote.php                 |  21 --
 src/Node/Block/Figure.php                     |   2 +-
 src/Parser/BlockParser.php                    |  40 ++-
 src/ProseMirror/ProseMirrorRenderer.php       |  15 --
 src/ProseMirror/ProseMirrorToCarve.php        |   9 -
 src/Renderer/AnsiRenderer.php                 |  24 --
 src/Renderer/CarveRenderer.php                |   8 +-
 src/Renderer/HtmlRenderer.php                 |  17 +-
 src/Renderer/MarkdownRenderer.php             |  17 --
 src/Renderer/PlainTextRenderer.php            |  14 +-
 tests/InvisibleLineEndsTheFoldTest.php        |   6 +-
 tests/TestCase/Ast/SourcePositionTest.php     | 238 ++----------------
 .../CaptionStopsAtInvisibleLineTest.php       |  12 +-
 .../Converter/HtmlImportSemanticSpanTest.php  |  10 +-
 tests/TestCase/Converter/HtmlToCarveTest.php  |  57 +----
 ...CaptionDetachesAcrossTwoBlankLinesTest.php |   9 +-
 .../Parser/BlockQuoteListMarkerFoldsTest.php  |   2 +-
 .../Parser/CaptionTrailingWhitespaceTest.php  |  14 +-
 .../WhitespaceIsSpaceAndTabOnlyTest.php       |   4 +-
 tests/TestCase/ProfileTest.php                |   9 +-
 tests/TestCase/Renderer/FigureCaptionTest.php |  12 +-
 ...resentationTargetsKeepAuthoredTextTest.php |  48 ----
 tests/fixtures/ast-schema.json                |   4 +-
 tests/spec                                    |   2 +-
 28 files changed, 80 insertions(+), 662 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ef5e6ce..c3262f97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,9 +45,8 @@ This project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   whose value attribute is absent gives the bare boolean, leftover `id`, `class`
   and `data-*` ride the same span, and the import report records no loss for any
   of the seven, in all three modes. `<mark>` keeps its `=m=` spelling, inline
-  `<code>` keeps its code span, `<code>` inside `<pre>` keeps going to a code
-  block, and a `<cite>` read as a block quote's attribution stays an
-  attribution. `abbr`, `time` and `kbd` render back as the original element;
+  `<code>` keeps its code span, and `<code>` inside `<pre>` keeps going to a
+  code block. `abbr`, `time` and `kbd` render back as the original element;
   `samp`, `var`, `cite` and `dfn` need `SemanticSpanExtension` registered to do
   so, and render as `<span samp="">` without it.
 
@@ -107,28 +106,6 @@ This project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   (§10a), one an authored `abbr` outranks, and one a later definition of the
   same term shadowed.
 
-- **A caption on a block quote is now that quote's attribution** (PART 9 §4a,
-  markup-carve/carve#1159). `> To be` followed by `^ Hamlet` no longer parses as
-  a `figure` wrapping a `block_quote`; it is a `block_quote` carrying an
-  `attribution`, and HTML renders `<footer>Hamlet</footer>` inside the
-  `<blockquote>` rather than a `<figure>` / `<figcaption>` pair. A quote is not
-  a figure, takes no number, and no longer turns up in a walk for figures. The
-  Markdown, plain-text, ANSI and Carve writers all carry the attribution, the
-  AST codec encodes and decodes it, and the ProseMirror bridge carries it in
-  both directions - without that last one, four corpus documents did not survive
-  the round trip through the editor model.
-
-- **The HTML importer reads a quote's `<footer>` back as its attribution.** This
-  renderer emits the attribution that way, so importing it as a second quoted
-  paragraph meant the engine's own HTML did not round-trip. The LAST `footer` or
-  `cite` child wins when a quote carries several, and the earlier one stays
-  ordinary quoted content rather than being dropped - which is what taking the
-  first and skipping every other used to do. An element holding BLOCK content is
-  not an attribution: the slot takes inline content, and flattening blocks into
-  it would run their paragraphs together with no separator, so it stays quoted
-  content and every word survives. All three engines agree byte for byte on both
-  rules.
-
 - **Leftover attributes ride the outermost semantic element.**
   `[Ctrl+C]{kbd .shortcut #copy}` is
   `<kbd class="shortcut" id="copy">Ctrl+C</kbd>` where it was a `<span>`
@@ -239,27 +216,6 @@ This project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   as a single byte: one tab under a two-column item is that item's content, two
   are code. Document-level indented code is unchanged.
 
-- **A block quote's source span covers the attribution it owns** (#1249,
-  PART 12 §4). The span stopped at the end of the last quoted line, so the
-  attribution's inline nodes sat outside their own parent in the serialized
-  AST - a tree contradicting itself, which no rendered output could show.
-  A container "ends after its last placed child", and the attribution is one,
-  so the span now reaches the end of the `^` line. Four corpus documents
-  change; a quote with no attribution is unaffected. Consumers indexing a
-  quote by `pos` see the wider extent.
-
-- **A quote attribution stays attached to its quote on every target**
-  (markup-carve/carve#1179, PART 11 §10c). It used to follow the quote as a
-  sibling separated by a blank line, which kept the words but not what they
-  mean - read back the attribution was attached to nothing, and a round trip
-  produced a blockquote with no attribution at all. Markdown now emits a
-  `<footer>` element inside the quote (that target already writes `<u>`,
-  `<mark>` and `<ins>` where Markdown has no spelling, and through a CommonMark
-  reader `<footer>` opens an HTML block rather than being wrapped in a
-  paragraph, so the rendered HTML matches the HTML target's); the terminal
-  carries its quote bar onto the attribution line; plain text attaches by
-  adjacency, dropping the blank line. A quote with no attribution is unchanged.
-
 - **Presentation targets no longer discard authored text** (PART 11 §10e,
   markup-carve/carve#1179). `docs/graceful-degradation.md` states the floor as
   a MUST - "losing the click is fine; losing the words is not" - and three kinds
diff --git a/resources/ast-schema.json b/resources/ast-schema.json
index 210435f1..a7bbc5ab 100644
--- a/resources/ast-schema.json
+++ b/resources/ast-schema.json
@@ -611,13 +611,6 @@
             "$ref": "#/$defs/blockNode"
           }
         },
-        "attribution": {
-          "description": "The source of the quotation (PART 9 \u00a74a). Present when a `^` caption attaches to the quote; it is not a figure caption and takes no number.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/inlineNode"
-          }
-        },
         "attrs": {
           "$ref": "#/$defs/attrs"
         },
@@ -1084,11 +1077,14 @@
           "const": "figure"
         },
         "target": {
-          "description": "The captioned block: an image, table, code block or paragraph. A captioned block quote is NOT a figure - it is a quote carrying an `attribution` (PART 9 \u00a74a, carve#1159).",
+          "description": "The captioned block: an image, block quote, table, code block or paragraph. What a captioned host is called and counted as comes from the caption's label, never from the host (PART 9 \u00a74b); for a quote the HTML Standard also requires the attribution outside the `blockquote`.",
           "oneOf": [
             {
               "$ref": "#/$defs/image"
             },
+            {
+              "$ref": "#/$defs/block_quote"
+            },
             {
               "$ref": "#/$defs/table"
             },
diff --git a/src/Ast/AstCodec.php b/src/Ast/AstCodec.php
index c3842d02..8f028a7b 100644
--- a/src/Ast/AstCodec.php
+++ b/src/Ast/AstCodec.php
@@ -1861,15 +1861,6 @@ private static function spanShape(array $encoded): array
      */
     private static function captionShape(array $encoded): array
     {
-        // PART 9 §4a: a quote's `attribution` is inline content on the wire for
-        // the same reason a caption is - the reference has no `caption` node
-        // type, and this engine stores one internally. Flattened here so both
-        // fields answer to one rule rather than two (carve#1159).
-        $attribution = $encoded['attribution'] ?? null;
-        if (is_array($attribution) && ($attribution['type'] ?? null) === 'caption') {
-            $encoded['attribution'] = $attribution['children'] ?? [];
-        }
-
         $caption = $encoded['caption'] ?? null;
         if (!is_array($caption) || ($caption['type'] ?? null) !== 'caption') {
             return $encoded;
@@ -2352,18 +2343,6 @@ private static function captionFromWire(array $data): array
             $data['caption'] = ['type' => 'caption', 'children' => $caption];
         }
 
-        // PART 9 §4a: the mirror of the flattening in `captionShape`. On the
-        // wire an attribution is inline content; this engine models it with the
-        // same `caption` block it uses for a figure's caption (carve#1159).
-        $attribution = $data['attribution'] ?? null;
-        if (
-            ($data['type'] ?? null) === 'block_quote'
-            && is_array($attribution)
-            && !isset($attribution['type'])
-        ) {
-            $data['attribution'] = ['type' => 'caption', 'children' => $attribution];
-        }
-
         return $data;
     }
 
diff --git a/src/Converter/HtmlToCarve.php b/src/Converter/HtmlToCarve.php
index a8ce56c4..bd96977f 100644
--- a/src/Converter/HtmlToCarve.php
+++ b/src/Converter/HtmlToCarve.php
@@ -1598,25 +1598,13 @@ protected function processHr(DOMNode $node): string
 
     protected function processBlockquote(DOMElement $node): string
     {
-        // Check for attribution (footer or cite element)
-        $attributionNode = $this->findBlockquoteAttribution($node);
-        $attribution = $attributionNode !== null
-            ? trim($this->processChildren($attributionNode))
-            : null;
-
-        // Process content excluding attribution elements, preserving paragraph breaks
+        // Process content, preserving paragraph breaks.
         $parts = [];
         foreach ($node->childNodes as $child) {
             if ($child instanceof DOMText && trim($child->textContent) === '') {
                 continue;
             }
 
-            // Skip the ONE element read as the attribution. Any other footer
-            // or cite is ordinary quoted content and stays in the body.
-            if ($child === $attributionNode) {
-                continue;
-            }
-
             $part = rtrim($this->processNode($child), "\n");
             if ($part !== '') {
                 $parts[] = $part;
@@ -1631,64 +1619,11 @@ protected function processBlockquote(DOMElement $node): string
             $quoted[] = $line === '' ? '>' : '> ' . rtrim($line);
         }
 
-        // A `footer`/`cite` is the quote's ATTRIBUTION, and Carve spells that as
-        // a caption line BELOW the quote (PART 9 §4a, carve#1159) - not as a
-        // second quoted paragraph, which is ordinary quoted content and comes
-        // back as such. Without this the renderer's own `<blockquote><footer>`
-        // did not survive a round trip through this importer.
-        //
-        // A caption folds its continuation lines like a paragraph, so a
-        // multi-line attribution needs the marker on its first line only.
-        if ($attribution !== null) {
-            $first = true;
-            foreach (explode("\n", $attribution) as $line) {
-                $quoted[] = ($first ? '^ ' : '') . rtrim($line);
-                $first = false;
-            }
-        }
-
         $attrs = $this->formatBlockAttributes($node);
 
         return $attrs . "\n" . implode("\n", $quoted) . "\n\n";
     }
 
-    /**
-     * The `footer`/`cite` child that carries the quote's attribution, if any.
-     *
-     * The LAST one, because that is the element this renderer emits and the one
-     * an author puts after the quoted text. A quote has ONE attribution and the
-     * slot holds inline content, so an earlier footer cannot join it - it stays
-     * ordinary quoted content rather than being dropped, which is what taking
-     * the first one and skipping every other did.
-     */
-    protected function findBlockquoteAttribution(DOMElement $node): ?DOMElement
-    {
-        $found = null;
-        foreach ($node->childNodes as $child) {
-            if (!$child instanceof DOMElement) {
-                continue;
-            }
-
-            $tag = strtolower($child->tagName);
-            if (($tag !== 'footer' && $tag !== 'cite') || trim($this->processChildren($child)) === '') {
-                continue;
-            }
-            // The slot holds INLINE content, so an element carrying blocks does
-            // not fit it. Flattening one would run its paragraphs together with
-            // no separator; leaving it an ordinary block inside the quote keeps
-            // every word, which is the better answer when the shape cannot be
-            // represented.
-            foreach ($child->childNodes as $inner) {
-                if ($inner instanceof DOMElement && in_array(strtolower($inner->tagName), $this->blockElements, true)) {
-                    continue 2;
-                }
-            }
-            $found = $child;
-        }
-
-        return $found;
-    }
-
     /**
      * Process MathML element to Djot math syntax
      *
diff --git a/src/Node/Block/BlockQuote.php b/src/Node/Block/BlockQuote.php
index a5940702..fc323d7a 100644
--- a/src/Node/Block/BlockQuote.php
+++ b/src/Node/Block/BlockQuote.php
@@ -9,29 +9,8 @@
  */
 class BlockQuote extends BlockNode
 {
-    /**
-     * The source of the quotation (PART 9 SS4a).
-     *
-     * A `^` caption on a quote is its ATTRIBUTION, not a figure caption: the
-     * quote is not a figure, takes no number, and nothing walking the tree for
-     * figures finds it (carve#1159).
-     *
-     * @var \MarkupCarve\Carve\Node\Block\Caption|null
-     */
-    protected ?Caption $attribution = null;
-
     public function getType(): string
     {
         return 'block_quote';
     }
-
-    public function getAttribution(): ?Caption
-    {
-        return $this->attribution;
-    }
-
-    public function setAttribution(?Caption $attribution): void
-    {
-        $this->attribution = $attribution;
-    }
 }
diff --git a/src/Node/Block/Figure.php b/src/Node/Block/Figure.php
index 94b034b0..9bfbb34a 100644
--- a/src/Node/Block/Figure.php
+++ b/src/Node/Block/Figure.php
@@ -9,7 +9,7 @@
  *
  * Used to wrap:
  * - Images with captions → <figure><img>...<figcaption>...</figcaption></figure>
- * - Blockquotes with attribution → <figure><blockquote>...<figcaption>...</figcaption></figure>
+ * - Block quotes with captions → <figure><blockquote>...<figcaption>...</figcaption></figure>
  *
  * Tables with captions use the <caption> element inside the table instead.
  */
diff --git a/src/Parser/BlockParser.php b/src/Parser/BlockParser.php
index ab112d1c..b621171b 100644
--- a/src/Parser/BlockParser.php
+++ b/src/Parser/BlockParser.php
@@ -9209,35 +9209,29 @@ protected function tryParseCaption(Node $parent, array $lines, int $start): ?int
             return $linesConsumed;
         }
 
-        // Handle BlockQuote - the caption is its ATTRIBUTION (PART 9 SS4a)
+        // Handle BlockQuote - wrap in figure
         if ($lastChild instanceof BlockQuote) {
-            // NO FIGURE WRAPPER. A quote carrying a source is not a figure: it
-            // takes no number, and nothing walking the tree for figures finds
-            // it (carve#1159). The quote keeps its own attributes for the same
-            // reason - there is no outer node to move them to.
-            $attribution = new Caption();
-            $attribution->setPos($this->wholeLineSpan($start));
-            // PARSED WITHOUT CAPTION CONTEXT: a caption's bare `#` is the
-            // number placeholder, and an attribution has no number to place, so
-            // SS4a keeps it literal.
+            $figure = new Figure();
+
+            foreach ($lastChild->getAttributes() as $key => $value) {
+                $figure->setAttribute($key, $value);
+                $lastChild->removeAttribute($key);
+            }
+
+            $caption = new Caption();
+            $caption->setPos($this->wholeLineSpan($start));
             $this->inlineParser->parse(
-                $attribution,
+                $caption,
                 $captionText,
                 $start,
-                false,
+                true,
                 $this->contiguousMapFor($start, $lines[$start], $captionText),
             );
-            $lastChild->setAttribution($attribution);
-            // The attribution is written AFTER the quote, and it is the quote's
-            // own child, so the quote's span has to reach the end of that line.
-            // PART 12 §4: a span contains its children's spans, and "a container
-            // ends after its explicit closer when it has one, otherwise after
-            // its last placed child". Without this the attribution's inlines sat
-            // outside their own parent - a tree contradicting itself, which no
-            // renderer could show and which the containment sweep could not see
-            // either, because the attribution is not in `getChildren()`
-            // (carve-php#1249). The table arm above widens for the same reason.
-            $this->widenSpanTo($lastChild, $attribution->getPos());
+
+            $figure->appendChild($lastChild);
+            $figure->appendChild($caption);
+
+            $parent->replaceChild(count($children) - 1, $figure);
 
             return $linesConsumed;
         }
diff --git a/src/ProseMirror/ProseMirrorRenderer.php b/src/ProseMirror/ProseMirrorRenderer.php
index 554dbae5..406e1462 100644
--- a/src/ProseMirror/ProseMirrorRenderer.php
+++ b/src/ProseMirror/ProseMirrorRenderer.php
@@ -4,7 +4,6 @@
 
 namespace MarkupCarve\Carve\ProseMirror;
 
-use MarkupCarve\Carve\Node\Block\BlockQuote;
 use MarkupCarve\Carve\Node\Block\CodeBlock;
 use MarkupCarve\Carve\Node\Block\Div;
 use MarkupCarve\Carve\Node\Block\Footnote;
@@ -204,20 +203,6 @@ protected function renderBlock(Node $node): ?array
                 : $this->renderBlocks($node->getChildren());
         }
 
-        if ($node instanceof BlockQuote) {
-            // Same asymmetry as a table caption, at the other end: a quote's
-            // attribution is state rather than a child (PART 9 §4a), so walking
-            // children alone loses the source of the quotation and nothing
-            // reports it. It goes LAST, where the author wrote it.
-            $attribution = $node->getAttribution();
-            if ($attribution !== null) {
-                $content[] = [
-                    'type' => 'carveCaption',
-                    'content' => $this->renderInlines($attribution->getChildren(), []),
-                ];
-            }
-        }
-
         if ($content !== []) {
             $out['content'] = $content;
         }
diff --git a/src/ProseMirror/ProseMirrorToCarve.php b/src/ProseMirror/ProseMirrorToCarve.php
index b0bffc06..888bf184 100644
--- a/src/ProseMirror/ProseMirrorToCarve.php
+++ b/src/ProseMirror/ProseMirrorToCarve.php
@@ -355,15 +355,6 @@ protected function buildBlock(array $data): ?Node
 
                 continue;
             }
-            // The trailing `carveCaption` a quote carries is its ATTRIBUTION
-            // (PART 9 §4a), which is state on the quote rather than a child -
-            // appending it would publish a `caption` block inside the quote,
-            // which no schema names.
-            if ($built instanceof Caption && $node instanceof BlockQuote) {
-                $node->setAttribution($built);
-
-                continue;
-            }
             $node->appendChild($built);
         }
 
diff --git a/src/Renderer/AnsiRenderer.php b/src/Renderer/AnsiRenderer.php
index e598a9d9..72b5f554 100644
--- a/src/Renderer/AnsiRenderer.php
+++ b/src/Renderer/AnsiRenderer.php
@@ -880,30 +880,6 @@ protected function renderBlockQuote(BlockQuote $node): string
         $content = $this->renderChildren($node);
         $this->blockQuoteDepth--;
 
-        // Keeps the styling the caption had while a quote was a figure, so a
-        // terminal reader sees the same thing in a different place.
-        //
-        // PART 11 section 10c T2: it also carries the QUOTE BAR. The bar is
-        // already this target's marker for "inside the quote", and the
-        // attribution was the one line in the quote that did not get it - so the
-        // source read as a separate block that merely happened to follow.
-        // Nothing new is invented; the prefix the body lines already use is
-        // applied one line further. The caption's own trailing separator is
-        // trimmed BEFORE prefixing, or the bar would be drawn on blank lines and
-        // the quote would appear to continue past its end.
-        $attribution = $node->getAttribution();
-        if ($attribution !== null) {
-            $this->blockQuoteDepth++;
-            $bar = $this->getBlockQuotePrefix();
-            $this->blockQuoteDepth--;
-            $rendered = rtrim($this->renderCaption($attribution), "\n");
-            $prefixed = implode("\n", array_map(
-                fn (string $line): string => $bar . $line,
-                explode("\n", $rendered),
-            ));
-            $content = rtrim($content, "\n") . "\n" . rtrim($bar) . "\n" . $prefixed . "\n\n";
-        }
-
         return $content;
     }
 
diff --git a/src/Renderer/CarveRenderer.php b/src/Renderer/CarveRenderer.php
index a392d211..a43637ff 100644
--- a/src/Renderer/CarveRenderer.php
+++ b/src/Renderer/CarveRenderer.php
@@ -776,13 +776,7 @@ protected function renderBlockQuote(BlockQuote $node): string
 
         $quoted = implode("\n", array_map(static fn (string $line): string => $line === '' ? '>' : '> ' . $line, $lines));
 
-        // PART 9 SS4a: an attribution is written back as the `^` line it was
-        // read from. Dropping it would lose content, which PART 11 SS1 forbids.
-        $attribution = $node->getAttribution();
-
-        return $attribution === null
-            ? $quoted
-            : $quoted . "\n^ " . $this->renderInlines($attribution->getChildren());
+        return $quoted;
     }
 
     protected function renderList(ListBlock $node): string
diff --git a/src/Renderer/HtmlRenderer.php b/src/Renderer/HtmlRenderer.php
index 10e2f8f8..843d1453 100644
--- a/src/Renderer/HtmlRenderer.php
+++ b/src/Renderer/HtmlRenderer.php
@@ -1250,29 +1250,16 @@ protected function renderBlockQuote(BlockQuote $node): string
             }
         }
 
-        // PART 9 SS4a: the attribution renders INSIDE the quote, where a
-        // quotation's source belongs, rather than as a figcaption on a figure
-        // wrapping it (carve#1159). Its presence also forces the expanded form,
-        // because the compact one has nowhere to put a second element.
-        $attribution = '';
-        $attributionNode = $node->getAttribution();
-        if ($attributionNode !== null) {
-            $attribution = '<footer>' . $this->renderChildren($attributionNode) . "</footer>\n";
-        }
-
         if (
-            $attribution === ''
-            && count($visible) === 1
+            count($visible) === 1
             && $visible[0] instanceof Paragraph
             && !$this->isBlockImageParagraph($visible[0])
         ) {
             return '<blockquote' . $attrs . '>' . $inner . "</blockquote>\n";
         }
 
-        $body = $attribution === '' ? $inner : $inner . "\n" . rtrim($attribution, "\n");
-
         return '<blockquote' . $attrs . ">\n"
-            . $this->indentBlock($body, 2) . "\n</blockquote>\n";
+            . $this->indentBlock($inner, 2) . "\n</blockquote>\n";
     }
 
     /**
diff --git a/src/Renderer/MarkdownRenderer.php b/src/Renderer/MarkdownRenderer.php
index 064acc55..2619ab89 100644
--- a/src/Renderer/MarkdownRenderer.php
+++ b/src/Renderer/MarkdownRenderer.php
@@ -904,23 +904,6 @@ protected function renderBlockQuote(BlockQuote $node): string
 
         $body = trim($content, StringUtil::TRIMMABLE_WHITESPACE);
 
-        // PART 11 section 10c T1. The attribution is the quotation's SOURCE, so
-        // it stays INSIDE the quote. It used to follow as a sibling paragraph,
-        // which kept the words but not what they mean - read back it was
-        // attached to nothing, and a round trip produced a blockquote with no
-        // attribution.
-        //
-        // Markdown has no attribution syntax but does admit HTML, and this
-        // target already writes <u>, <mark>, <sub>, <ins> and <del> for
-        // constructs with no Markdown spelling. Through a CommonMark reader
-        // <footer> opens an HTML BLOCK inside the quote (it is not wrapped in a
-        // paragraph), so the rendered HTML matches the HTML target's.
-        $attribution = $node->getAttribution();
-        if ($attribution !== null) {
-            $text = trim($this->renderChildren($attribution), StringUtil::TRIMMABLE_WHITESPACE);
-            $body .= "\n\n<footer>" . $text . '</footer>';
-        }
-
         // Prefix each line with >, and a blank line with a bare marker.
         $lines = explode("\n", $body);
         $quoted = array_map(fn ($line) => $line === '' ? '>' : '> ' . $line, $lines);
diff --git a/src/Renderer/PlainTextRenderer.php b/src/Renderer/PlainTextRenderer.php
index b09ea562..a2000c2f 100644
--- a/src/Renderer/PlainTextRenderer.php
+++ b/src/Renderer/PlainTextRenderer.php
@@ -708,19 +708,7 @@ protected function renderBlockQuote(BlockQuote $node): string
     {
         $content = trim($this->renderChildren($node), StringUtil::TRIMMABLE_WHITESPACE);
 
-        $quoted = $this->blockQuotePrefix . $content . $this->blockQuoteSuffix;
-        // PART 11 section 10c T3. ADJACENCY, not a blank line. A blank line is
-        // what separates blocks on this target, so putting one here said the
-        // attribution was a block of its own rather than the quotation's source
-        // - the words survived, the attachment did not. No punctuation is
-        // invented: a dash prefix would put a character in the output the author
-        // never wrote.
-        $attribution = $node->getAttribution();
-        if ($attribution !== null) {
-            $quoted .= "\n" . trim($this->renderChildren($attribution));
-        }
-
-        return $quoted . "\n\n";
+        return $this->blockQuotePrefix . $content . $this->blockQuoteSuffix . "\n\n";
     }
 
     protected function renderList(ListBlock $node): string
diff --git a/tests/InvisibleLineEndsTheFoldTest.php b/tests/InvisibleLineEndsTheFoldTest.php
index a2c28800..379c5855 100644
--- a/tests/InvisibleLineEndsTheFoldTest.php
+++ b/tests/InvisibleLineEndsTheFoldTest.php
@@ -122,11 +122,9 @@ public function testACaptionLineFoldsIntoADefinitionTerm(): void
     public function testACaptionLineStillAttachesToABlockQuote(): void
     {
         // The arm the caption test was written for is untouched: a quote IS one
-        // of §4's five hosts, so the caption ends the fold and attaches. What
-        // it attaches AS changed - §4a makes it the quote's attribution, not a
-        // figure caption (carve#1159) - and the fold behavior is the same.
+        // of §4's five hosts, so the caption ends the fold and attaches.
         $this->assertStringContainsString(
-            '<footer>cap</footer>',
+            '<figcaption>cap</figcaption>',
             trim($this->converter->convert("> quote\n^ cap\n")),
         );
     }
diff --git a/tests/TestCase/Ast/SourcePositionTest.php b/tests/TestCase/Ast/SourcePositionTest.php
index 83886b9d..20150f5e 100644
--- a/tests/TestCase/Ast/SourcePositionTest.php
+++ b/tests/TestCase/Ast/SourcePositionTest.php
@@ -4,9 +4,6 @@
 
 namespace MarkupCarve\Carve\Test\TestCase\Ast;
 
-use MarkupCarve\Carve\Ast\AstCodec;
-use MarkupCarve\Carve\Ast\SourceSpan;
-use MarkupCarve\Carve\Node\Block\BlockQuote;
 use MarkupCarve\Carve\Node\Block\Paragraph;
 use MarkupCarve\Carve\Node\Inline\EscapedText;
 use MarkupCarve\Carve\Node\Inline\Text;
@@ -174,233 +171,32 @@ public function testNoSpanEscapesItsParent(): void
         // at that line while the nested list inside it ran on for several more.
         // A node contains what it holds, so a child span outside its parent is
         // a defect no matter which node type it is.
-        //
-        // WALKED OVER THE SERIALIZED TREE, not over `getChildren()`
-        // (carve-php#1249). A node's children are not all in its child list: a
-        // block quote's attribution, a figure's caption and quote target, a
-        // table's caption and rows, an admonition's title and an inline
-        // footnote's body each live in a slot of their own. Walking the child
-        // list alone made this sweep structurally unable to see any of them -
-        // it could not fail on a wrong span there, and it did not, while a
-        // block quote's span stopped before the attribution it owns for four
-        // corpus documents. The codec publishes every slot, and the conformance
-        // checker in the spec repo (`scripts/spec/ast-positions.mjs`) walks
-        // exactly that shape, so measuring the same tree it does is also what
-        // makes a green run here mean the same thing as a green run there.
-        //
-        // The comparison is against the nearest PLACED ancestor rather than the
-        // immediate parent, again matching the checker: PART 12 §4 lets a node
-        // whose content is not a contiguous slice omit `pos`, and stopping at
-        // one would go quiet exactly where a span is most likely to be wrong.
         $files = glob(dirname(__DIR__, 3) . '/tests/spec/tests/corpus/*.crv') ?: [];
-        $codec = new AstCodec();
         $violations = [];
         $checked = 0;
 
         foreach ($files as $file) {
             $document = (new BlockParser(trackPositions: true))->parse((string)file_get_contents($file));
-            $violations = array_merge(
-                $violations,
-                self::containmentFindings($codec->encode($document), '$', null, '$', basename($file), $checked),
-            );
-        }
-
-        // A CONTAINMENT PASS THAT EXAMINED NOTHING reports zero findings and is
-        // indistinguishable from a clean one, which is why the pair count is
-        // asserted alongside the findings (PART 12 §4, carve#913). The floor
-        // rose with the walk: the child list reached about 1000 pairs, the
-        // serialized tree reaches roughly 5000.
-        $this->assertGreaterThan(4000, $checked, 'the sweep checked almost nothing');
-        $this->assertSame([], $violations, sprintf('%d spans fall outside their parent', count($violations)));
-    }
-
-    public function testTheContainmentSweepReachesASlotOutsideTheChildList(): void
-    {
-        // The sweep above is only worth its runtime if it can see a slot the
-        // child list does not carry. Asserting that directly, on the slot that
-        // was wrong: without it, a rewrite back to `getChildren()` would leave
-        // the sweep green with nothing to say (carve-php#1249).
-        $source = "> q\n^ A\n";
-        $document = (new BlockParser(trackPositions: true))->parse($source);
-        $quote = $document->getChildren()[0];
-
-        $this->assertInstanceOf(BlockQuote::class, $quote);
-        $attribution = $quote->getAttribution();
-        $this->assertNotNull($attribution, 'the caption did not attach as an attribution');
-        $this->assertCount(1, $quote->getChildren(), 'the attribution is expected OUTSIDE the child list');
-
-        // Break a span inside the attribution on purpose and require the sweep
-        // to say so. The parser is not involved: this is the checker under
-        // test. The codec publishes the attribution as the caption's INLINE
-        // run, so the node to break is the one inside it.
-        $inline = $attribution->getChildren()[0];
-        $inline->setPos(new SourceSpan(
-            startLine: 9,
-            endLine: 9,
-            startColumn: 1,
-            endColumn: 2,
-            startOffset: 900,
-            endOffset: 901,
-        ));
-
-        $checked = 0;
-        $findings = self::containmentFindings(
-            (new AstCodec())->encode($document),
-            '$',
-            null,
-            '$',
-            'synthetic',
-            $checked,
-        );
-
-        $this->assertGreaterThan(0, $checked, 'the sweep compared nothing');
-        $this->assertNotSame([], $findings, 'a broken attribution span went unreported');
-    }
-
-    public function testAQuoteSpanReachesTheEndOfItsAttribution(): void
-    {
-        // PART 12 §4: "A container ends after its explicit closer when it has
-        // one, otherwise after its LAST PLACED CHILD", and a span contains its
-        // children's spans. The attribution is written after the quoted lines
-        // and is the quote's own child, so the quote runs to the end of that
-        // line - not to the end of the last quoted line (carve-php#1249).
-        //
-        // Offsets, not just containment: containment alone is satisfied by a
-        // span that overshoots, and §4 also excludes the trailing terminator.
-        $source = "> Stay hungry.\n^ Steve Jobs\n";
-        $document = (new BlockParser(trackPositions: true))->parse($source);
-        $quote = $document->getChildren()[0];
-
-        $this->assertInstanceOf(BlockQuote::class, $quote);
-        $pos = $quote->getPos();
-        $this->assertNotNull($pos);
-        $this->assertSame(0, $pos->startOffset);
-        $this->assertSame(27, $pos->endOffset, 'the quote must end after "Jobs", before the newline');
-        $this->assertSame(2, $pos->endLine);
-        $this->assertSame(
-            "> Stay hungry.\n^ Steve Jobs",
-            mb_substr($source, $pos->startOffset, $pos->endOffset - $pos->startOffset, 'UTF-8'),
-        );
-    }
-
-    public function testABlankLineBeforeTheAttributionIsInsideTheQuoteSpan(): void
-    {
-        // The separated spelling, which the corpus carries twice
-        // (`55-blockquote-caption-after-a-blank-line`,
-        // `282-two-blank-lines-detach-a-caption-5`). §4 excludes a blank line
-        // that FOLLOWS a construct; this one is interior - it sits between two
-        // children the quote owns - so it is covered like any other gap between
-        // siblings, exactly as the table arm already covers its own.
-        $source = "> quoted\n\n^ Source\n";
-        $document = (new BlockParser(trackPositions: true))->parse($source);
-        $quote = $document->getChildren()[0];
-
-        $this->assertInstanceOf(BlockQuote::class, $quote);
-        $pos = $quote->getPos();
-        $this->assertNotNull($pos);
-        $this->assertSame(0, $pos->startOffset);
-        $this->assertSame(18, $pos->endOffset);
-        $this->assertSame(
-            "> quoted\n\n^ Source",
-            mb_substr($source, $pos->startOffset, $pos->endOffset - $pos->startOffset, 'UTF-8'),
-        );
-    }
-
-    public function testAQuoteWithNoAttributionIsNotWidened(): void
-    {
-        // The control the two above need. A rule that widened unconditionally -
-        // or that widened to the following line whatever it held - would pass
-        // both of them and be wrong here, where the `^` line is missing and the
-        // paragraph after the quote belongs to nobody but the document.
-        $source = "> quoted\n\nafter\n";
-        $document = (new BlockParser(trackPositions: true))->parse($source);
-        $quote = $document->getChildren()[0];
-
-        $this->assertInstanceOf(BlockQuote::class, $quote);
-        $this->assertNull($quote->getAttribution());
-        $pos = $quote->getPos();
-        $this->assertNotNull($pos);
-        $this->assertSame(8, $pos->endOffset, 'the quote must stop at the end of its own line');
-    }
-
-    /**
-     * The containment rule of PART 12 §4, over the SERIALIZED tree.
-     *
-     * Every key is descended into except `pos`, which holds integers rather
-     * than nodes, so a node reached through a slot of its own is compared like
-     * any other. `$checked` counts the pairs compared and is by reference for
-     * the reason §4 states: a pass that compared nothing must not be able to
-     * come back looking clean.
-     *
-     * @param mixed $node
-     * @param string $path
-     * @param array<string, mixed>|null $parent The nearest PLACED ancestor.
-     * @param string $parentPath
-     * @param string $label
-     * @param int $checked
-     *
-     * @return array<string>
-     */
-    private static function containmentFindings(
-        mixed $node,
-        string $path,
-        ?array $parent,
-        string $parentPath,
-        string $label,
-        int &$checked,
-    ): array {
-        if (!is_array($node)) {
-            return [];
-        }
-
-        if (array_is_list($node)) {
-            $findings = [];
-            foreach ($node as $index => $child) {
-                $findings = array_merge(
-                    $findings,
-                    self::containmentFindings($child, $path . '[' . $index . ']', $parent, $parentPath, $label, $checked),
-                );
-            }
-
-            return $findings;
-        }
-
-        $findings = [];
-        $placed = isset($node['type']) && is_string($node['type']) && isset($node['pos']);
-        if ($placed && $parent !== null) {
-            $checked++;
-            if (
-                $node['pos']['startOffset'] < $parent['pos']['startOffset']
-                || $node['pos']['endOffset'] > $parent['pos']['endOffset']
-            ) {
-                $findings[] = sprintf(
-                    '%s: "%s" at %s [%d, %d] is not inside "%s" at %s [%d, %d]',
-                    $label,
-                    $node['type'],
-                    $path,
-                    $node['pos']['startOffset'],
-                    $node['pos']['endOffset'],
-                    $parent['type'],
-                    $parentPath,
-                    $parent['pos']['startOffset'],
-                    $parent['pos']['endOffset'],
-                );
-            }
-        }
-
-        $nextParent = $placed ? $node : $parent;
-        $nextPath = $placed ? $path : $parentPath;
-        foreach ($node as $key => $value) {
-            if ($key === 'pos') {
-                continue;
+            foreach (self::walk($document) as $node) {
+                $parent = $node->getPos();
+                if ($parent === null) {
+                    continue;
+                }
+                foreach ($node->getChildren() as $child) {
+                    $span = $child->getPos();
+                    if ($span === null) {
+                        continue;
+                    }
+                    $checked++;
+                    if ($span->startOffset < $parent->startOffset || $span->endOffset > $parent->endOffset) {
+                        $violations[] = sprintf('%s: %s escapes %s', basename($file), $child->getType(), $node->getType());
+                    }
+                }
             }
-            $findings = array_merge(
-                $findings,
-                self::containmentFindings($value, $path . '.' . $key, $nextParent, $nextPath, $label, $checked),
-            );
         }
 
-        return $findings;
+        $this->assertGreaterThan(1000, $checked, 'the sweep checked almost nothing');
+        $this->assertSame([], $violations, sprintf('%d spans fall outside their parent', count($violations)));
     }
 
     public function testCoverageDoesNotRegress(): void
diff --git a/tests/TestCase/CaptionStopsAtInvisibleLineTest.php b/tests/TestCase/CaptionStopsAtInvisibleLineTest.php
index e51aa180..a2a3fcde 100644
--- a/tests/TestCase/CaptionStopsAtInvisibleLineTest.php
+++ b/tests/TestCase/CaptionStopsAtInvisibleLineTest.php
@@ -18,18 +18,12 @@
  */
 class CaptionStopsAtInvisibleLineTest extends TestCase
 {
-    /**
-     * The fixtures below host the caption on a QUOTE, whose `^ ` line is an
-     * attribution and renders `<footer>` rather than `<figcaption>` (PART 9
-     * §4a, carve#1159). What folds into the slot is the same question either
-     * way, so the helper reads whichever element the host produced.
-     */
     private function caption(string $source): string
     {
         $html = (new CarveConverter())->convert($source);
-        preg_match('/<(figcaption|footer)>(.*?)<\/\1>/s', $html, $m);
+        preg_match('/<figcaption>(.*?)<\/figcaption>/s', $html, $m);
 
-        return $m[2] ?? '';
+        return $m[1] ?? '';
     }
 
     public function testALinkDefinitionDoesNotJoinTheCaption(): void
@@ -41,7 +35,7 @@ public function testAFootnoteDefinitionDoesNotJoinTheCaption(): void
     {
         $html = (new CarveConverter())->convert(">\n^ p\n[^f]: t\n");
 
-        $this->assertStringContainsString('<footer>p</footer>', $html);
+        $this->assertStringContainsString('<figcaption>p</figcaption>', $html);
     }
 
     public function testAnAbbreviationDefinitionDoesNotJoinTheCaption(): void
diff --git a/tests/TestCase/Converter/HtmlImportSemanticSpanTest.php b/tests/TestCase/Converter/HtmlImportSemanticSpanTest.php
index 3623c144..a5927da5 100644
--- a/tests/TestCase/Converter/HtmlImportSemanticSpanTest.php
+++ b/tests/TestCase/Converter/HtmlImportSemanticSpanTest.php
@@ -176,20 +176,16 @@ public function testLeavesMarkInlineCodeAndACodeBlockAlone(): void
         );
     }
 
-    /**
-     * A `<cite>` that is the quote's ATTRIBUTION keeps going to the caption
-     * line below the quote. Only an ordinary inline `<cite>` becomes a span.
-     */
-    public function testABlockQuoteAttributionCiteStaysAnAttribution(): void
+    public function testACiteInsideABlockQuoteIsOrdinaryQuotedContent(): void
     {
         $converter = new HtmlToCarve();
 
         $this->assertSame(
-            "> q\n^ Author",
+            "> q\n>\n> [Author]{cite}",
             trim($converter->convert('<blockquote><p>q</p><cite>Author</cite></blockquote>')),
         );
         $this->assertSame(
-            "> [C]{cite} said it\n^ Author",
+            "> [C]{cite} said it\n>\n> [Author]{cite}",
             trim($converter->convert(
                 '<blockquote><p><cite>C</cite> said it</p><cite>Author</cite></blockquote>',
             )),
diff --git a/tests/TestCase/Converter/HtmlToCarveTest.php b/tests/TestCase/Converter/HtmlToCarveTest.php
index d3d31d5e..1294d239 100644
--- a/tests/TestCase/Converter/HtmlToCarveTest.php
+++ b/tests/TestCase/Converter/HtmlToCarveTest.php
@@ -926,13 +926,10 @@ public function testCaptionRoundtrip(): void
         $this->assertStringContainsString('> Quote text', $djot);
         $this->assertStringContainsString('^ Source', $djot);
 
-        // The caption comes back as the quote's ATTRIBUTION, not as a figure
-        // wrapping it (PART 9 §4a, carve#1159): `<figure>` is gone from the
-        // round trip and the source sits in a `<footer>` inside the quote.
         $htmlBack = $djotConverter->convert($djot);
-        $this->assertStringNotContainsString('<figure>', $htmlBack);
+        $this->assertStringContainsString('<figure>', $htmlBack);
         $this->assertStringContainsString('<blockquote>', $htmlBack);
-        $this->assertStringContainsString('<footer>Source</footer>', $htmlBack);
+        $this->assertStringContainsString('<figcaption>Source</figcaption>', $htmlBack);
     }
 
     // ==================== Complex Examples ====================
@@ -2149,45 +2146,32 @@ public function testTableAlignmentRoundTripWithoutDjotSrcUsesCellAlignment(): vo
         $this->assertSame(trim($expected), $back);
     }
 
-    // ==================== Blockquote Attribution ====================
+    // ==================== Blockquote Footer and Cite Content ====================
 
-    /**
-     * A `footer` is the quote's ATTRIBUTION and Carve spells that as a caption
-     * line BELOW the quote (PART 9 §4a, carve#1159) - not as a second quoted
-     * paragraph, which is ordinary quoted content and comes back as such.
-     * Without this the renderer's own `<blockquote><footer>` did not survive a
-     * round trip through this importer.
-     */
-    public function testBlockquoteWithFooterAttribution(): void
+    public function testFooterInsideBlockquoteStaysQuotedContent(): void
     {
         $html = '<blockquote><p>To be or not to be</p><footer>— Shakespeare</footer></blockquote>';
         $result = trim($this->converter->convert($html));
 
         $expected = <<<'DJOT'
 > To be or not to be
-^ — Shakespeare
+>
+> — Shakespeare
 DJOT;
 
         $this->assertSame($expected, $result);
     }
 
-    public function testBlockquoteWithCiteAttribution(): void
+    public function testCiteInsideBlockquoteStaysQuotedContent(): void
     {
         $html = '<blockquote><p>Famous quote</p><cite>Author Name</cite></blockquote>';
         $result = trim($this->converter->convert($html));
 
         $this->assertStringContainsString('> Famous quote', $result);
-        $this->assertStringContainsString('^ Author Name', $result);
+        $this->assertStringContainsString('> [Author Name]{cite}', $result);
     }
 
-    /**
-     * The attribution slot holds INLINE content, so a footer carrying blocks
-     * does not fit it. Flattening one would run its paragraphs together with no
-     * separator, so it stays ordinary quoted content instead - every word
-     * survives, which is the better answer when the shape cannot be
-     * represented. carve-js and carve-rs agree byte for byte.
-     */
-    public function testAFooterCarryingBlocksStaysQuotedContent(): void
+    public function testFooterBlocksInsideBlockquoteKeepAllLinesQuoted(): void
     {
         $html = '<blockquote><p>quote</p><footer><p>By <strong>A</strong></p><p>Work</p></footer></blockquote>';
         $result = trim($this->converter->convert($html));
@@ -2203,28 +2187,7 @@ public function testAFooterCarryingBlocksStaysQuotedContent(): void
         $this->assertSame($expected, $result);
     }
 
-    /**
-     * A quote has ONE attribution, so a second footer cannot join it. The LAST
-     * is the one this renderer emits and the one an author puts after the
-     * quoted text; the earlier footer stays an ordinary block rather than being
-     * dropped, which is what taking the first and skipping every other did.
-     */
-    public function testTheLastFooterIsTheAttributionAndTheOthersStay(): void
-    {
-        $html = '<blockquote><footer>First</footer><p>To be</p><footer>Hamlet</footer></blockquote>';
-        $result = trim($this->converter->convert($html));
-
-        $expected = <<<'DJOT'
-> First
->
-> To be
-^ Hamlet
-DJOT;
-
-        $this->assertSame($expected, $result);
-    }
-
-    public function testBlockquoteWithoutAttribution(): void
+    public function testBlockquoteWithoutFooter(): void
     {
         $html = '<blockquote><p>Just a quote</p></blockquote>';
         $result = trim($this->converter->convert($html));
diff --git a/tests/TestCase/Parser/ACaptionDetachesAcrossTwoBlankLinesTest.php b/tests/TestCase/Parser/ACaptionDetachesAcrossTwoBlankLinesTest.php
index 71f27e3c..7d49c60f 100644
--- a/tests/TestCase/Parser/ACaptionDetachesAcrossTwoBlankLinesTest.php
+++ b/tests/TestCase/Parser/ACaptionDetachesAcrossTwoBlankLinesTest.php
@@ -53,17 +53,10 @@ public static function captionableHosts(): array
         ];
     }
 
-    /**
-     * `<footer>` counts too: the quote host's caption is its ATTRIBUTION and
-     * renders as a footer inside the quote (PART 9 §4a, carve#1159). What the
-     * slot ACCEPTS is the question here, and that is the same for all five
-     * hosts however the accepted content is spelled in HTML. No other
-     * construct emits a `<footer>`, so the count stays exact.
-     */
     protected function captionCount(string $source): int
     {
         return (int)preg_match_all(
-            '/<(fig)?caption[ >]|<footer[ >]/',
+            '/<(fig)?caption[ >]/',
             (new CarveConverter())->convert($source),
         );
     }
diff --git a/tests/TestCase/Parser/BlockQuoteListMarkerFoldsTest.php b/tests/TestCase/Parser/BlockQuoteListMarkerFoldsTest.php
index 3314463a..cb34ae1f 100644
--- a/tests/TestCase/Parser/BlockQuoteListMarkerFoldsTest.php
+++ b/tests/TestCase/Parser/BlockQuoteListMarkerFoldsTest.php
@@ -138,7 +138,7 @@ public function testAttributeLineStillEndsTheQuote(): void
     public function testCaptionStillAttaches(): void
     {
         $this->assertSame(
-            "<blockquote>\n  <p>quoted</p>\n  <footer>cap</footer>\n</blockquote>\n",
+            "<figure>\n  <blockquote><p>quoted</p></blockquote>\n  <figcaption>cap</figcaption>\n</figure>\n",
             $this->converter->convert("> quoted\n^ cap"),
         );
     }
diff --git a/tests/TestCase/Parser/CaptionTrailingWhitespaceTest.php b/tests/TestCase/Parser/CaptionTrailingWhitespaceTest.php
index 11a31d1d..337d387c 100644
--- a/tests/TestCase/Parser/CaptionTrailingWhitespaceTest.php
+++ b/tests/TestCase/Parser/CaptionTrailingWhitespaceTest.php
@@ -98,21 +98,17 @@ public function testAFigureCaptionDropsItsTrailingSpace(): void
     }
 
     /**
-     * The three remaining caption hosts. A code block becomes a figure with the
-     * same caption and a block quote takes an attribution instead, and all five
-     * `new Caption()` sites in the parser read ONE `$captionText` - so the rule
-     * is applied once, where that text is built, rather than five times where
-     * it is consumed.
+     * The three remaining caption hosts. A code block and a block quote each
+     * become a figure with the same caption, and all five `new Caption()` sites
+     * in the parser read ONE `$captionText` - so the rule is applied once,
+     * where that text is built, rather than five times where it is consumed.
      */
     public function testEveryCaptionHostDropsTheTrailingSpace(): void
     {
         // A code block's body is a scalar, not a text node, so the caption is
         // the whole of the first list.
         $this->assertSame(['Cap'], $this->textValues("```\ncode\n```\n^ Cap \n"));
-        // A quote's caption is its ATTRIBUTION (PART 9 §4a, carve#1159), which
-        // sorts before `children` on the wire - so the attribution text leads,
-        // the way a table caption does.
-        $this->assertSame(['Cap', 'q'], $this->textValues("> q\n\n^ Cap \n"));
+        $this->assertSame(['q', 'Cap'], $this->textValues("> q\n\n^ Cap \n"));
     }
 
     /**
diff --git a/tests/TestCase/Parser/WhitespaceIsSpaceAndTabOnlyTest.php b/tests/TestCase/Parser/WhitespaceIsSpaceAndTabOnlyTest.php
index 00e7ff57..a28c7770 100644
--- a/tests/TestCase/Parser/WhitespaceIsSpaceAndTabOnlyTest.php
+++ b/tests/TestCase/Parser/WhitespaceIsSpaceAndTabOnlyTest.php
@@ -243,8 +243,8 @@ public function testAVerticalTabCaptionDoesNotInterruptAnOpenParagraph(): void
     public function testAVerticalTabCaptionCaptionsABlockQuote(): void
     {
         $this->assertSame(
-            "<blockquote>\n  <p>q</p>\n  <footer>"
-                . self::VT . "</footer>\n</blockquote>\n",
+            "<figure>\n  <blockquote><p>q</p></blockquote>\n  <figcaption>"
+                . self::VT . "</figcaption>\n</figure>\n",
             $this->converter->convert("> q\n^ " . self::VT . "\n"),
         );
     }
diff --git a/tests/TestCase/ProfileTest.php b/tests/TestCase/ProfileTest.php
index d5a687a8..4b9085b7 100644
--- a/tests/TestCase/ProfileTest.php
+++ b/tests/TestCase/ProfileTest.php
@@ -262,7 +262,7 @@ public function testArticleProfileAllowsFiguresAndCaptions(): void
         $this->assertFalse($converter->hasProfileViolations());
     }
 
-    public function testArticleProfileAllowsBlockquoteAttributions(): void
+    public function testArticleProfileAllowsBlockquoteCaptions(): void
     {
         $converter = new CarveConverter(profile: Profile::article());
         $djot = <<<'DJOT'
@@ -272,12 +272,9 @@ public function testArticleProfileAllowsBlockquoteAttributions(): void
 
         $html = $converter->convert($djot);
 
-        // The attribution survives the profile filter, which has to walk a
-        // field it never had before (PART 9 §4a, carve#1159) - a filter that
-        // missed it would drop the name and keep the quote.
-        $this->assertStringNotContainsString('<figure>', $html);
+        $this->assertStringContainsString('<figure>', $html);
         $this->assertStringContainsString('<blockquote>', $html);
-        $this->assertStringContainsString('<footer>', $html);
+        $this->assertStringContainsString('<figcaption>', $html);
         $this->assertStringContainsString('Mahatma Gandhi', $html);
     }
 
diff --git a/tests/TestCase/Renderer/FigureCaptionTest.php b/tests/TestCase/Renderer/FigureCaptionTest.php
index 3310eb72..df6b563e 100644
--- a/tests/TestCase/Renderer/FigureCaptionTest.php
+++ b/tests/TestCase/Renderer/FigureCaptionTest.php
@@ -51,17 +51,9 @@ public function testMarkdownCodeCaptionOnItsOwnLine(): void
         $this->assertSame("```\nx\n```\ncap\n", $this->md("```\nx\n```\n^ cap"));
     }
 
-    /**
-     * PART 11 section 10c T1. This used to pin the BLANK LINE, and that spacing
-     * was the defect: a caption on a quote is its ATTRIBUTION, and emitting it
-     * as a sibling kept the words while losing what they mean - read back it was
-     * attached to nothing, and a round trip produced a blockquote with no
-     * attribution. It now stays inside the quote as a <footer>, the element this
-     * target already reaches for when Markdown has no spelling for a construct.
-     */
-    public function testMarkdownBlockquoteAttributionStaysInsideTheQuote(): void
+    public function testMarkdownBlockquoteCaptionKeepsBlankLine(): void
     {
-        $this->assertSame("> q\n>\n> <footer>cap</footer>\n", $this->md("> q\n^ cap"));
+        $this->assertSame("> q\n\ncap\n", $this->md("> q\n^ cap"));
     }
 
     public function testMarkdownFigureNotGluedToFollowingBlock(): void
diff --git a/tests/TestCase/Renderer/PresentationTargetsKeepAuthoredTextTest.php b/tests/TestCase/Renderer/PresentationTargetsKeepAuthoredTextTest.php
index 7a6d37af..cc293656 100644
--- a/tests/TestCase/Renderer/PresentationTargetsKeepAuthoredTextTest.php
+++ b/tests/TestCase/Renderer/PresentationTargetsKeepAuthoredTextTest.php
@@ -181,52 +181,4 @@ public function testAFenceWithNeitherTokenIsUnchanged(): void
             CarveConverter::ansi()->convert($source),
         );
     }
-
-    /**
-     * PART 11 section 10d (renumbered from 10c by the ruling this pin carries,
-     * which repaired a collision with the existing 10c). The attribution is the
-     * quotation's SOURCE, so every
-     * target keeps it ATTACHED. It used to follow as a sibling separated by a
-     * blank line: the words survived, the relationship did not, and a round trip
-     * produced a blockquote with no attribution at all.
-     */
-    public function testTheAttributionStaysAttachedToItsQuote(): void
-    {
-        $src = "> q\n^ Attr\n";
-
-        // Markdown: a <footer> element inside the quote. Through a CommonMark
-        // reader that opens an HTML block rather than being wrapped in a
-        // paragraph, so the rendered HTML matches the HTML target's.
-        $this->assertSame("> q\n>\n> <footer>Attr</footer>\n", CarveConverter::markdown()->convert($src));
-
-        // Plain text: adjacency. No blank line, and no invented punctuation.
-        $this->assertSame("\"q\"\nAttr\n", CarveConverter::plainText()->convert($src));
-
-        // Terminal: the quote bar carried onto the attribution line, which keeps
-        // its italic-dim caption styling.
-        $ansi = CarveConverter::ansi()->convert($src);
-        $stripped = preg_replace('/\033\[[0-9;]*m/', '', $ansi) ?? '';
-        $this->assertSame("\u{2502} q\n\u{2502}\n\u{2502} Attr\n", $stripped);
-    }
-
-    /**
-     * A quote with no attribution is untouched: the change adds a line only
-     * where the author wrote one.
-     */
-    public function testAQuoteWithoutAnAttributionIsUnchanged(): void
-    {
-        $this->assertSame("> q\n", CarveConverter::markdown()->convert("> q\n"));
-        $this->assertSame("\"q\"\n", CarveConverter::plainText()->convert("> q\n"));
-    }
-
-    /**
-     * A block after an attributed quote keeps its separation.
-     */
-    public function testABlockAfterAnAttributedQuoteStaysSeparate(): void
-    {
-        $this->assertSame(
-            "> q\n>\n> <footer>A</footer>\n\nafter\n",
-            CarveConverter::markdown()->convert("> q\n^ A\n\nafter\n"),
-        );
-    }
 }
diff --git a/tests/fixtures/ast-schema.json b/tests/fixtures/ast-schema.json
index c005b7f5..3041c757 100644
--- a/tests/fixtures/ast-schema.json
+++ b/tests/fixtures/ast-schema.json
@@ -32,9 +32,7 @@
     "required": []
   },
   "block_quote": {
-    "fields": [
-      "attribution"
-    ],
+    "fields": [],
     "required": []
   },
   "caption_number": {
diff --git a/tests/spec b/tests/spec
index 372c5cbd..0c9e8e8c 160000
--- a/tests/spec
+++ b/tests/spec
@@ -1 +1 @@
-Subproject commit 372c5cbddddd74311c832c5566857fe72d51d242
+Subproject commit 0c9e8e8c34453b2d3cc050904f01875368183708