securemark 0.231.2 → 0.232.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.232.0
+
+- Refine paragraph syntax to separate mention syntax.
+- Rename mention syntax to reply syntax.
+
 ## 0.231.2
 
 - Refactoring.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.231.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.232.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -4544,6 +4544,7 @@ require = function () {
             const codeblock_1 = _dereq_('./block/codeblock');
             const mathblock_1 = _dereq_('./block/mathblock');
             const extension_1 = _dereq_('./block/extension');
+            const reply_1 = _dereq_('./block/reply');
             const paragraph_1 = _dereq_('./block/paragraph');
             const typed_dom_1 = _dereq_('typed-dom');
             const random_1 = _dereq_('spica/random');
@@ -4560,6 +4561,7 @@ require = function () {
                 mathblock_1.mathblock,
                 extension_1.extension,
                 blockquote_1.blockquote,
+                reply_1.reply,
                 paragraph_1.paragraph
             ]))));
             function error(parser) {
@@ -4593,6 +4595,7 @@ require = function () {
             './block/mathblock': 79,
             './block/olist': 80,
             './block/paragraph': 81,
+            './block/reply': 82,
             './block/table': 85,
             './block/ulist': 86,
             './source': 128,
@@ -5307,7 +5310,7 @@ require = function () {
                     colspan,
                     ...valid ? { 'data-highlight-level': +highlight > 1 ? highlight : global_1.undefined } : {
                         'data-invalid-syntax': 'table',
-                        'data-invalid-type': 'highlight',
+                        'data-invalid-type': 'syntax',
                         'data-invalid-description': 'Too much highlight level.'
                     }
                 };
@@ -5776,31 +5779,17 @@ require = function () {
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.paragraph = void 0;
             const combinator_1 = _dereq_('../../combinator');
-            const mention_1 = _dereq_('./paragraph/mention');
-            const quote_1 = _dereq_('./paragraph/mention/quote');
             const inline_1 = _dereq_('../inline');
-            const source_1 = _dereq_('../source');
             const locale_1 = _dereq_('../locale');
             const util_1 = _dereq_('../util');
             const typed_dom_1 = _dereq_('typed-dom');
-            const array_1 = _dereq_('spica/array');
-            exports.paragraph = (0, combinator_1.block)((0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.subsequence)([
-                (0, combinator_1.some)(mention_1.mention),
-                (0, combinator_1.some)((0, combinator_1.union)([
-                    quote_1.quote,
-                    (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.some)(source_1.anyline, quote_1.syntax), (0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)(inline_1.inline)))), ns => (0, array_1.push)(ns, [(0, typed_dom_1.html)('br')]))
-                ]))
-            ]), ns => [(0, typed_dom_1.html)('p', (0, typed_dom_1.defrag)((0, array_1.pop)(ns)[0]))])));
+            exports.paragraph = (0, combinator_1.block)((0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline])))), ns => [(0, typed_dom_1.html)('p', (0, typed_dom_1.defrag)(ns))])));
         },
         {
             '../../combinator': 27,
             '../inline': 88,
             '../locale': 123,
-            '../source': 128,
             '../util': 134,
-            './paragraph/mention': 82,
-            './paragraph/mention/quote': 84,
-            'spica/array': 6,
             'typed-dom': 26
         }
     ],
@@ -5808,19 +5797,37 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.mention = void 0;
-            const combinator_1 = _dereq_('../../../combinator');
-            const cite_1 = _dereq_('./mention/cite');
-            const quote_1 = _dereq_('./mention/quote');
-            exports.mention = (0, combinator_1.validate)('>', (0, combinator_1.inits)([
-                (0, combinator_1.some)(cite_1.cite),
-                quote_1.quote
-            ]));
+            exports.reply = void 0;
+            const combinator_1 = _dereq_('../../combinator');
+            const cite_1 = _dereq_('./reply/cite');
+            const quote_1 = _dereq_('./reply/quote');
+            const inline_1 = _dereq_('../inline');
+            const source_1 = _dereq_('../source');
+            const locale_1 = _dereq_('../locale');
+            const util_1 = _dereq_('../util');
+            const typed_dom_1 = _dereq_('typed-dom');
+            const array_1 = _dereq_('spica/array');
+            exports.reply = (0, combinator_1.block)((0, combinator_1.validate)('>', (0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.inits)([
+                (0, combinator_1.some)((0, combinator_1.inits)([
+                    cite_1.cite,
+                    quote_1.quote
+                ])),
+                (0, combinator_1.subsequence)([
+                    (0, combinator_1.some)(quote_1.quote),
+                    (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.some)(source_1.anyline, quote_1.syntax), (0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)(inline_1.inline)))), ns => (0, array_1.push)(ns, [(0, typed_dom_1.html)('br')]))
+                ])
+            ])), ns => [(0, typed_dom_1.html)('p', (0, typed_dom_1.defrag)((0, array_1.pop)(ns)[0]))]))));
         },
         {
-            '../../../combinator': 27,
-            './mention/cite': 83,
-            './mention/quote': 84
+            '../../combinator': 27,
+            '../inline': 88,
+            '../locale': 123,
+            '../source': 128,
+            '../util': 134,
+            './reply/cite': 83,
+            './reply/quote': 84,
+            'spica/array': 6,
+            'typed-dom': 26
         }
     ],
     83: [
@@ -5828,9 +5835,9 @@ require = function () {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.cite = void 0;
-            const combinator_1 = _dereq_('../../../../combinator');
-            const anchor_1 = _dereq_('../../../inline/autolink/anchor');
-            const source_1 = _dereq_('../../../source');
+            const combinator_1 = _dereq_('../../../combinator');
+            const anchor_1 = _dereq_('../../inline/autolink/anchor');
+            const source_1 = _dereq_('../../source');
             const typed_dom_1 = _dereq_('typed-dom');
             exports.cite = (0, combinator_1.creator)((0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.validate)('>>', (0, combinator_1.reverse)((0, combinator_1.tails)([
                 (0, source_1.str)(/^>*(?=>>)/),
@@ -5844,9 +5851,9 @@ require = function () {
             ])));
         },
         {
-            '../../../../combinator': 27,
-            '../../../inline/autolink/anchor': 92,
-            '../../../source': 128,
+            '../../../combinator': 27,
+            '../../inline/autolink/anchor': 92,
+            '../../source': 128,
             'typed-dom': 26
         }
     ],
@@ -5855,11 +5862,11 @@ require = function () {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.quote = exports.syntax = void 0;
-            const parser_1 = _dereq_('../../../../combinator/data/parser');
-            const combinator_1 = _dereq_('../../../../combinator');
-            const math_1 = _dereq_('../../../inline/math');
-            const source_1 = _dereq_('../../../source');
-            const autolink_1 = _dereq_('../../../autolink');
+            const parser_1 = _dereq_('../../../combinator/data/parser');
+            const combinator_1 = _dereq_('../../../combinator');
+            const math_1 = _dereq_('../../inline/math');
+            const source_1 = _dereq_('../../source');
+            const autolink_1 = _dereq_('../../autolink');
             const typed_dom_1 = _dereq_('typed-dom');
             exports.syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
             exports.quote = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)('>', (0, combinator_1.union)([
@@ -5912,11 +5919,11 @@ require = function () {
             ]);
         },
         {
-            '../../../../combinator': 27,
-            '../../../../combinator/data/parser': 47,
-            '../../../autolink': 62,
-            '../../../inline/math': 116,
-            '../../../source': 128,
+            '../../../combinator': 27,
+            '../../../combinator/data/parser': 47,
+            '../../autolink': 62,
+            '../../inline/math': 116,
+            '../../source': 128,
             'typed-dom': 26
         }
     ],
@@ -9350,7 +9357,7 @@ require = function () {
             exports.info = void 0;
             const scope_1 = _dereq_('./scope');
             function info(source) {
-                const match = (0, scope_1.scope)(source, 'section, article, aside, blockquote, .quote, pre, .math, .media');
+                const match = (0, scope_1.scope)(source, '.invalid');
                 return {
                     url: find('a:not(.email):not(.account):not(.channel):not(.hashtag):not(.hashnum):not(.anchor)').filter(el => [
                         'http:',
@@ -9362,7 +9369,7 @@ require = function () {
                     channel: find('a.channel'),
                     hashtag: find('a.hashtag'),
                     hashnum: find('a.hashnum'),
-                    mention: find('.cite > a.anchor'),
+                    reply: find('.cite > a.anchor'),
                     anchor: find(':not(.cite) > a.anchor'),
                     media: find('.media[data-src]')
                 };
@@ -9387,7 +9394,7 @@ require = function () {
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.quote = void 0;
             const parser_1 = _dereq_('../combinator/data/parser');
-            const cite_1 = _dereq_('../parser/block/paragraph/mention/cite');
+            const cite_1 = _dereq_('../parser/block/reply/cite');
             const typed_dom_1 = _dereq_('typed-dom');
             function quote(anchor, range) {
                 var _a, _b;
@@ -9466,7 +9473,7 @@ require = function () {
         },
         {
             '../combinator/data/parser': 47,
-            '../parser/block/paragraph/mention/cite': 83,
+            '../parser/block/reply/cite': 83,
             'typed-dom': 26
         }
     ],
@@ -9476,7 +9483,8 @@ require = function () {
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.scope = void 0;
             const global_1 = _dereq_('spica/global');
-            function scope(base, bound = `${ 'id' in base && base.id ? `#${ base.id }, ` : '' }section, article, aside, blockquote`) {
+            function scope(base, filter = '', bound = `${ 'id' in base && base.id ? `#${ base.id }, ` : '' }section, article, aside, blockquote, pre, .quote, .math, .media`) {
+                bound += filter && `, ${ filter }`;
                 const memory = new global_1.WeakMap();
                 const context = 'id' in base && base.closest(bound) || null;
                 return el => {

package/index.d.ts

@@ -22,7 +22,7 @@ export function normalize(source: string): string;
 export function quote(anchor: string, range: Range): string;
 export function toc(source: DocumentFragment | HTMLElement | ShadowRoot): HTMLUListElement;
 export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info;
-export function scope(base: DocumentFragment | HTMLElement | ShadowRoot, bound?: string): (el: Element) => boolean;
+export function scope(base: DocumentFragment | HTMLElement | ShadowRoot, filter?: string, bound?: string): (el: Element) => boolean;
 export function sync(editor: HTMLElement, viewer: HTMLElement, bottom?: Element | null): () => void;
 
 export type ParserOptions = Omit<Partial<ParserSettings>, 'chunk'>;
@@ -76,7 +76,7 @@ export interface Info {
   readonly channel: HTMLAnchorElement[];
   readonly hashtag: HTMLAnchorElement[];
   readonly hashnum: HTMLAnchorElement[];
-  readonly mention: HTMLAnchorElement[];
+  readonly reply: HTMLAnchorElement[];
   readonly anchor: HTMLAnchorElement[];
   readonly media: HTMLElement[];
 }

package/markdown.d.ts

@@ -87,6 +87,7 @@ export namespace MarkdownParser {
       BlockParser.MathBlockParser,
       BlockParser.ExtensionParser,
       BlockParser.BlockquoteParser,
+      BlockParser.ReplyParser,
       BlockParser.ParagraphParser,
     ]> {
   }
@@ -550,65 +551,66 @@ export namespace MarkdownParser {
         }
       }
     }
-    export interface ParagraphParser extends
+    export interface ReplyParser extends
+      // >>1
+      // > text
       // abc
-      Block<'paragraph'>,
+      Block<'reply'>,
       Parser<HTMLParagraphElement, Context, [
-        ParagraphParser.MentionParser,
         Parser<string | HTMLElement, Context, [
-          ParagraphParser.MentionParser.QuoteParser,
+          ReplyParser.CiteParser,
+          ReplyParser.QuoteParser,
+        ]>,
+        Parser<string | HTMLElement, Context, [
+          ReplyParser.QuoteParser,
           InlineParser,
         ]>,
       ]> {
     }
-    export namespace ParagraphParser {
-      export interface MentionParser extends
-        // >>1
-        // > text
-        Block<'paragraph/mention'>,
+    export namespace ReplyParser {
+      export interface CiteParser extends
+        Block<'reply/cite'>,
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
-          ParagraphParser.MentionParser.CiteParser,
-          ParagraphParser.MentionParser.QuoteParser,
+          SourceParser.StrParser,
+          InlineParser.AutolinkParser.AnchorParser,
         ]> {
       }
-      export namespace MentionParser {
-        export interface CiteParser extends
-          Block<'paragraph/mention/cite'>,
-          Parser<HTMLSpanElement | HTMLBRElement, Context, [
-            SourceParser.StrParser,
-            InlineParser.AutolinkParser.AnchorParser,
+      export interface QuoteParser extends
+        Block<'reply/quote'>,
+        Parser<HTMLSpanElement | HTMLBRElement, Context, [
+          QuoteParser.BlockParser,
+          QuoteParser.PlaceholderParser,
+        ]> {
+      }
+      export namespace QuoteParser {
+        export interface BlockParser extends
+          Block<'reply/quote/block'>,
+          Parser<string | HTMLElement, Context, [
+            TextParser,
           ]> {
         }
-        export interface QuoteParser extends
-          Block<'paragraph/mention/quote'>,
-          Parser<HTMLSpanElement | HTMLBRElement, Context, [
-            QuoteParser.BlockParser,
-            QuoteParser.PlaceholderParser,
+        export interface TextParser extends
+          Block<'reply/quote/text'>,
+          Parser<string | HTMLElement, Context, [
+            InlineParser.MathParser,
+            AutolinkParser,
           ]> {
         }
-        export namespace QuoteParser {
-          export interface BlockParser extends
-            Block<'paragraph/mention/quote/block'>,
-            Parser<string | HTMLElement, Context, [
-              TextParser,
-            ]> {
-          }
-          export interface TextParser extends
-            Block<'paragraph/mention/quote/text'>,
-            Parser<string | HTMLElement, Context, [
-              InlineParser.MathParser,
-              AutolinkParser,
-            ]> {
-          }
-          export interface PlaceholderParser extends
-            Block<'paragraph/mention/quote/placeholder'>,
-            Parser<string | HTMLElement, Context, [
-              SourceParser.StrParser,
-            ]> {
-          }
+        export interface PlaceholderParser extends
+          Block<'reply/quote/placeholder'>,
+          Parser<string | HTMLElement, Context, [
+            SourceParser.StrParser,
+          ]> {
         }
       }
     }
+    export interface ParagraphParser extends
+      // abc
+      Block<'paragraph'>,
+      Parser<HTMLParagraphElement, Context, [
+        InlineParser,
+      ]> {
+    }
   }
   export interface InlineParser extends
     Markdown<'inline'>,

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.231.2",
+  "version": "0.232.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1918,9 +1918,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001313",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001313.tgz",
-      "integrity": "sha512-rI1UN0koZUiKINjysQDuRi2VeSCce3bYJNmDcj3PIKREiAmjakugBul1QSkg/fPrlULYl6oWfGg3PbgOSY9X4Q==",
+      "version": "1.0.30001314",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz",
+      "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==",
       "dev": true
     },
     "chalk": {
@@ -3024,9 +3024,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.76",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz",
-      "integrity": "sha512-3Vftv7cenJtQb+k00McEBZ2vVmZ/x+HEF7pcZONZIkOsESqAqVuACmBxMv0JhzX7u0YltU0vSqRqgBSTAhFUjA==",
+      "version": "1.4.77",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.77.tgz",
+      "integrity": "sha512-fiDxw8mO9Ph1Z0bjX2sFTPpi0J0QkOiwOJF+5Q0J0baNc/F9lLePAvDPlnoxvbUYYMizqrKPeotRRkJ9LtxAew==",
       "dev": true
     },
     "elliptic": {
@@ -3243,14 +3243,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "version": "0.10.56",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.56.tgz",
+      "integrity": "sha512-YUhqzoMnIjMW5y8FzaMxsCu0eWCwq32GrlwhOhbQmL5OiZReWFm/KvRiYuvqf3CaG/zZ36Kyb4KfVe674cafCQ==",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
       }
     },
     "es6-iterator": {
@@ -7896,9 +7896,9 @@
       "dev": true
     },
     "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
       "dev": true
     },
     "nice-try": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.231.2",
+  "version": "0.232.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/block/extension/table.ts

@@ -127,7 +127,7 @@ function attributes(source: string) {
       ? { 'data-highlight-level': +highlight! > 1 ? highlight : undefined }
       : {
           'data-invalid-syntax': 'table',
-          'data-invalid-type': 'highlight',
+          'data-invalid-type': 'syntax',
           'data-invalid-description': 'Too much highlight level.',
         },
   };

package/src/parser/block/paragraph.test.ts

@@ -28,28 +28,20 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser(' a')), [['<p>a</p>'], '']);
     });
 
-    it('mention', () => {
-      assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a<br><a href="?comment=2" class="anchor">&gt;&gt;2</a></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
+    it('anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>1 a\nb')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1 a\n>>2')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br><a href="?comment=2" class="anchor">&gt;&gt;2</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1 a\n>>b')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br><a href="?comment=b" class="anchor">&gt;&gt;b</a></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br><span class="quote">&gt;&gt; b</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1 a\n>> b')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a> a<br>&gt;&gt; b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>11.')), [['<p><a href="?comment=11" class="anchor">&gt;&gt;11</a>.</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>11 a')), [['<p><a href="?comment=11" class="anchor">&gt;&gt;11</a> a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>>11 a')), [['<p>&gt;<a href="?comment=11" class="anchor">&gt;&gt;11</a> a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p><span class="quote">&gt;&gt; a</span><br><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>> a\n>>1')), [['<p>&gt;&gt; a<br><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a>>1')), [['<p>a<a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a >>1')), [['<p>a <a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n>>1')), [['<p>a<br><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n>>1\nb')), [['<p>a<br><a href="?comment=1" class="anchor">&gt;&gt;1</a><br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br><span class="quote">&gt;&gt; b</span><br>c</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br>&gt;&gt; b<br>c</p>'], '']);
       assert.deepStrictEqual(inspect(parser(' >>1')), [['<p><a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser(' >>>1')), [['<p>&gt;<a href="?comment=1" class="anchor">&gt;&gt;1</a></p>'], '']);
     });

package/src/parser/block/paragraph.ts

@@ -1,24 +1,10 @@
 import { ParagraphParser } from '../block';
-import { union, subsequence, some, block, rewrite, trim, fmap } from '../../combinator';
-import { mention } from './paragraph/mention';
-import { quote, syntax as delimiter } from './paragraph/mention/quote';
+import { union, some, block, trim, fmap } from '../../combinator';
 import { inline } from '../inline';
-import { anyline } from '../source';
 import { localize } from '../locale';
 import { visualize } from '../util';
 import { html, defrag } from 'typed-dom';
-import { push, pop } from 'spica/array';
 
 export const paragraph: ParagraphParser = block(localize(fmap(
-  subsequence([
-    some(mention),
-    some(union([
-      quote,
-      fmap(
-        rewrite(
-          some(anyline, delimiter),
-          trim(visualize(some(inline)))),
-        ns => push(ns, [html('br')])),
-    ])),
-  ]),
-  ns => [html('p', defrag(pop(ns)[0]))])));
+  trim(visualize(some(union([inline])))),
+  ns => [html('p', defrag(ns))])));

package/src/parser/block/{paragraph/mention → reply}/cite.test.ts

@@ -1,8 +1,8 @@
 import { cite } from './cite';
-import { some } from '../../../../combinator';
-import { inspect } from '../../../../debug.test';
+import { some } from '../../../combinator';
+import { inspect } from '../../../debug.test';
 
-describe('Unit: parser/block/paragraph/mention/cite', () => {
+describe('Unit: parser/block/reply/cite', () => {
   describe('cite', () => {
     const parser = (source: string) => some(cite)(source, {});
 

package/src/parser/block/{paragraph/mention → reply}/cite.ts

@@ -1,10 +1,10 @@
-import { ParagraphParser } from '../../../block';
-import { tails, line, validate, creator, reverse, fmap } from '../../../../combinator';
-import { anchor } from '../../../inline/autolink/anchor';
-import { str } from '../../../source';
+import { ReplyParser } from '../../block';
+import { tails, line, validate, creator, reverse, fmap } from '../../../combinator';
+import { anchor } from '../../inline/autolink/anchor';
+import { str } from '../../source';
 import { html, define, defrag } from 'typed-dom';
 
-export const cite: ParagraphParser.MentionParser.CiteParser = creator(line(fmap(validate(
+export const cite: ReplyParser.CiteParser = creator(line(fmap(validate(
   '>>',
   reverse(tails([
     str(/^>*(?=>>)/),

package/src/parser/block/{paragraph/mention → reply}/quote.test.ts

@@ -1,8 +1,8 @@
 import { quote } from './quote';
-import { some } from '../../../../combinator';
-import { inspect } from '../../../../debug.test';
+import { some } from '../../../combinator';
+import { inspect } from '../../../debug.test';
 
-describe('Unit: parser/block/paragraph/mention/quote', () => {
+describe('Unit: parser/block/reply/quote', () => {
   describe('quote', () => {
     const parser = (source: string) => some(quote)(source, {});
 

package/src/parser/block/{paragraph/mention → reply}/quote.ts

@@ -1,14 +1,14 @@
-import { ParagraphParser } from '../../../block';
-import { eval } from '../../../../combinator/data/parser';
-import { union, some, block, line, validate, rewrite, creator, lazy, fmap } from '../../../../combinator';
-import { math } from '../../../inline/math';
-import { str, anyline } from '../../../source';
-import { autolink } from '../../../autolink';
+import { ReplyParser } from '../../block';
+import { eval } from '../../../combinator/data/parser';
+import { union, some, block, line, validate, rewrite, creator, lazy, fmap } from '../../../combinator';
+import { math } from '../../inline/math';
+import { str, anyline } from '../../source';
+import { autolink } from '../../autolink';
 import { html, defrag } from 'typed-dom';
 
 export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
 
-export const quote: ParagraphParser.MentionParser.QuoteParser = lazy(() => creator(block(fmap(validate(
+export const quote: ReplyParser.QuoteParser = lazy(() => creator(block(fmap(validate(
   '>',
   union([
     rewrite(
@@ -33,7 +33,7 @@ export const quote: ParagraphParser.MentionParser.QuoteParser = lazy(() => creat
   ]),
   false)));
 
-const qblock: ParagraphParser.MentionParser.QuoteParser.BlockParser = (source, context) => {
+const qblock: ReplyParser.QuoteParser.BlockParser = (source, context) => {
   source = source.replace(/\n$/, '');
   const lines = source.match(/^.*\n?/mg)!;
   assert(lines);
@@ -69,7 +69,7 @@ const qblock: ParagraphParser.MentionParser.QuoteParser.BlockParser = (source, c
   return [defrag(nodes), ''];
 };
 
-const text: ParagraphParser.MentionParser.QuoteParser.TextParser = union([
+const text: ReplyParser.QuoteParser.TextParser = union([
   math,
   autolink,
 ]);

package/src/parser/block/reply.test.ts

@@ -0,0 +1,22 @@
+import { reply } from './reply';
+import { some } from '../../combinator';
+import { inspect } from '../../debug.test';
+
+describe('Unit: parser/block/reply', () => {
+  describe('reply', () => {
+    const parser = (source: string) => some(reply)(source, {});
+
+    it('basic', () => {
+      assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br>a<br><a href="?comment=2" class="anchor">&gt;&gt;2</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a href="?comment=2" class="anchor" data-depth="1">&gt;2</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">&gt;<a href="?comment=1" class="anchor" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
+    });
+
+  });
+
+});

package/src/parser/block/reply.ts

@@ -0,0 +1,27 @@
+import { ReplyParser } from '../block';
+import { inits, subsequence, some, block, validate, rewrite, trim, fmap } from '../../combinator';
+import { cite } from './reply/cite';
+import { quote, syntax as delimiter } from './reply/quote';
+import { inline } from '../inline';
+import { anyline } from '../source';
+import { localize } from '../locale';
+import { visualize } from '../util';
+import { html, defrag } from 'typed-dom';
+import { push, pop } from 'spica/array';
+
+export const reply: ReplyParser = block(validate('>', localize(fmap(
+  some(inits([
+    some(inits([
+      cite,
+      quote,
+    ])),
+    subsequence([
+      some(quote),
+      fmap(
+        rewrite(
+          some(anyline, delimiter),
+          trim(visualize(some(inline)))),
+        ns => push(ns, [html('br')])),
+    ]),
+  ])),
+  ns => [html('p', defrag(pop(ns)[0]))]))));

package/src/parser/block.ts

@@ -13,6 +13,7 @@ import { blockquote } from './block/blockquote';
 import { codeblock } from './block/codeblock';
 import { mathblock } from './block/mathblock';
 import { extension } from './block/extension';
+import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
 import { html } from 'typed-dom';
 import { rnd0Z } from 'spica/random';
@@ -29,6 +30,7 @@ export import CodeBlockParser = BlockParser.CodeBlockParser;
 export import MathBlockParser = BlockParser.MathBlockParser;
 export import ExtensionParser = BlockParser.ExtensionParser;
 export import BlockquoteParser = BlockParser.BlockquoteParser;
+export import ReplyParser = BlockParser.ReplyParser;
 export import ParagraphParser = BlockParser.ParagraphParser;
 
 export const block: BlockParser = creator(error(
@@ -46,6 +48,7 @@ export const block: BlockParser = creator(error(
     mathblock,
     extension,
     blockquote,
+    reply,
     paragraph
   ]))));
 

package/src/parser/util.ts

@@ -229,7 +229,7 @@ export function stringify(nodes: readonly (HTMLElement | string)[]): string {
     }
     else {
       assert(!node.matches('br') && !node.querySelector('br'));
-      // Note: Doesn't reflect line breaks.
+      // NOTE: Doesn't reflect line breaks.
       acc += node.innerText;
     }
   }

package/src/util/info.test.ts

@@ -14,7 +14,7 @@ describe('Unit: util/info', () => {
           channel: [],
           hashtag: [],
           hashnum: [],
-          mention: [],
+          reply: [],
           anchor: [],
           media: [],
         });

package/src/util/info.ts

@@ -2,7 +2,7 @@ import { Info } from '../..';
 import { scope } from './scope';
 
 export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info {
-  const match = scope(source, 'section, article, aside, blockquote, .quote, pre, .math, .media');
+  const match = scope(source, '.invalid');
   return {
     url: find<HTMLAnchorElement>('a:not(.email):not(.account):not(.channel):not(.hashtag):not(.hashnum):not(.anchor)')
       .filter(el => ['http:', 'https:'].includes(el.protocol)),
@@ -13,7 +13,7 @@ export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info
     channel: find('a.channel'),
     hashtag: find('a.hashtag'),
     hashnum: find('a.hashnum'),
-    mention: find('.cite > a.anchor'),
+    reply: find('.cite > a.anchor'),
     anchor: find(':not(.cite) > a.anchor'),
     media: find('.media[data-src]'),
   };

package/src/util/quote.ts

@@ -1,5 +1,5 @@
 import { exec } from '../combinator/data/parser';
-import { cite } from '../parser/block/paragraph/mention/cite';
+import { cite } from '../parser/block/reply/cite';
 import { define } from 'typed-dom';
 
 export function quote(anchor: string, range: Range): string {

package/src/util/scope.ts

@@ -2,8 +2,10 @@ import { undefined, WeakMap } from 'spica/global';
 
 export function scope(
   base: DocumentFragment | HTMLElement | ShadowRoot,
-  bound: string = `${'id' in base && base.id ? `#${base.id}, ` : ''}section, article, aside, blockquote`,
+  filter: string = '',
+  bound: string = `${'id' in base && base.id ? `#${base.id}, ` : ''}section, article, aside, blockquote, pre, .quote, .math, .media`,
 ): (el: Element) => boolean {
+  bound += filter && `, ${filter}`;
   const memory = new WeakMap<Node, boolean>();
   const context = 'id' in base && base.closest(bound) || null;
   return el => {

package/src/parser/block/paragraph/mention.ts

@@ -1,9 +0,0 @@
-import { ParagraphParser } from '../../block';
-import { inits, some, validate } from '../../../combinator';
-import { cite } from './mention/cite';
-import { quote } from './mention/quote';
-
-export const mention: ParagraphParser.MentionParser = validate('>', inits([
-  some(cite),
-  quote,
-]));