securemark 0.268.2 → 0.269.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.269.0
+
+- Change media syntax to line-level syntax.
+
 ## 0.268.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.268.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.269.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -4274,14 +4274,11 @@ exports.parse = parse;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.lineurl = exports.autolink = void 0;
+exports.autolink = void 0;
 const combinator_1 = __webpack_require__(2087);
-const link_1 = __webpack_require__(9628);
 const autolink_1 = __webpack_require__(6051);
 const source_1 = __webpack_require__(6743);
-const util_1 = __webpack_require__(9437);
-exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, combinator_1.line)((0, combinator_1.subsequence)([exports.lineurl, (0, combinator_1.some)((0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource]))]))));
-exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.focus)(/^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, util_1.format)((0, combinator_1.tails)([(0, source_1.str)('!'), link_1.link]))));
+exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.convert)(source => `\r${source}`, (0, combinator_1.some)((0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource]))));
 
 /***/ }),
 
@@ -5378,7 +5375,7 @@ const combinator_1 = __webpack_require__(2087);
 const inline_1 = __webpack_require__(1160);
 const visibility_1 = __webpack_require__(7618);
 const dom_1 = __webpack_require__(3252);
-exports.paragraph = (0, combinator_1.block)((0, combinator_1.fmap)((0, visibility_1.visualize)((0, combinator_1.trimEnd)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline])))), ns => [(0, dom_1.html)('p', (0, dom_1.defrag)(ns))]));
+exports.paragraph = (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.convert)(source => `\r${source}`, (0, visibility_1.visualize)((0, combinator_1.trimEnd)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]))))), ns => [(0, dom_1.html)('p', (0, dom_1.defrag)(ns))]));
 
 /***/ }),
 
@@ -5462,7 +5459,6 @@ const combinator_1 = __webpack_require__(2087);
 const math_1 = __webpack_require__(8946);
 const autolink_1 = __webpack_require__(6051);
 const source_1 = __webpack_require__(6743);
-const autolink_2 = __webpack_require__(7185);
 const dom_1 = __webpack_require__(3252);
 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.creation)(1, false, (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)('>', (0, combinator_1.union)([(0, combinator_1.rewrite)((0, combinator_1.some)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|')[0]), source_1.anyline)), qblock), (0, combinator_1.rewrite)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|').slice(1).join('|')), source_1.anyline), (0, combinator_1.line)((0, combinator_1.union)([(0, source_1.str)(/^.+/)])))])), ns => [(0, dom_1.html)('span', ns.length > 1 ? {
@@ -5482,7 +5478,7 @@ const qblock = ({
   const quotes = source.match(/^>+[^\S\n]/mg);
   const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
   const nodes = (0, parser_1.eval)(text({
-    source: content,
+    source: `\r${content}`,
     context
   }), []);
   nodes.unshift(quotes.shift());
@@ -5508,7 +5504,7 @@ const qblock = ({
   nodes.unshift('');
   return [nodes, ''];
 };
-const text = (0, combinator_1.some)((0, combinator_1.line)((0, combinator_1.subsequence)([autolink_2.lineurl, (0, combinator_1.some)((0, combinator_1.union)([math_1.math, autolink_1.autolink, source_1.linebreak, source_1.unescsource]))])));
+const text = (0, combinator_1.some)((0, combinator_1.union)([math_1.math, autolink_1.autolink, source_1.linebreak, source_1.unescsource]));
 
 /***/ }),
 
@@ -5702,7 +5698,7 @@ const shortmedia_1 = __webpack_require__(4189);
 const autolink_1 = __webpack_require__(6051);
 const bracket_1 = __webpack_require__(5196);
 const source_1 = __webpack_require__(6743);
-exports.inline = (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, comment_1.comment, math_1.math, extension_1.extension, ruby_1.ruby, link_1.link, media_1.media, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.shortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
+exports.inline = (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, comment_1.comment, math_1.math, extension_1.extension, ruby_1.ruby, link_1.textlink, link_1.linemedialink, media_1.linemedia, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.lineshortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
 var indexee_1 = __webpack_require__(1269);
 Object.defineProperty(exports, "indexee", ({
   enumerable: true,
@@ -5776,7 +5772,7 @@ const hashnum_1 = __webpack_require__(5631);
 const anchor_1 = __webpack_require__(6495);
 const source_1 = __webpack_require__(6743);
 const util_1 = __webpack_require__(9437);
-exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-9a-z]|\S[#>])/i, (0, combinator_1.constraint)(2 /* State.autolink */, false, (0, combinator_1.syntax)(2 /* Syntax.autolink */, 1, 1, ~1 /* State.shortcut */, (0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email,
+exports.autolink = (0, combinator_1.validate)(/^(?:[@#>0-9a-z\r\n]|\S[#>])/i, (0, combinator_1.constraint)(2 /* State.autolink */, false, (0, combinator_1.syntax)(2 /* Syntax.autolink */, 1, 1, ~1 /* State.shortcut */, (0, combinator_1.union)([(0, combinator_1.some)((0, combinator_1.union)([url_1.lineurl])), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email,
 // Escape unmatched email-like strings.
 (0, combinator_1.focus)(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z])*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i, ({
   source
@@ -5793,7 +5789,7 @@ exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-
 // Escape unmatched hashtag-like strings.
 (0, source_1.str)(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|')*/u.source.replace('emoji', hashtag_1.emoji), 'u')),
 // Escape invalid leading characters.
-(0, source_1.str)(/^[0-9\p{Sc}](?=>)/u), anchor_1.anchor]))))), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)]);
+(0, source_1.str)(/^[0-9\p{Sc}](?=>)/u), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])]))));
 
 /***/ }),
 
@@ -5949,12 +5945,13 @@ exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combin
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.url = void 0;
+exports.lineurl = exports.url = void 0;
 const combinator_1 = __webpack_require__(2087);
 const link_1 = __webpack_require__(9628);
 const source_1 = __webpack_require__(6743);
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['http://', 'https://'], (0, combinator_1.rewrite)((0, combinator_1.open)(/^https?:\/\/(?=[\x21-\x7E])/, (0, combinator_1.focus)(/^[\x21-\x7E]+/, (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.unescsource, closer)])))), (0, combinator_1.convert)(url => `{ ${url} }`, (0, combinator_1.union)([link_1.unsafelink])))));
+exports.lineurl = (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.tails)([(0, source_1.str)('!'), (0, combinator_1.focus)(/^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))]));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.precedence)(2, (0, combinator_1.union)([(0, combinator_1.surround)('(', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')'), ')', true), (0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']'), ']', true), (0, combinator_1.surround)('{', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}'), '}', true), (0, combinator_1.surround)('"', (0, combinator_1.precedence)(8, (0, combinator_1.some)(source_1.unescsource, '"')), '"', true)]))));
 
 /***/ }),
@@ -6419,7 +6416,7 @@ exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0,
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.resolve = exports.option = exports.uri = exports.unsafelink = exports.link = void 0;
+exports.resolve = exports.option = exports.uri = exports.unsafelink = exports.linemedialink = exports.medialink = exports.textlink = exports.link = void 0;
 const combinator_1 = __webpack_require__(2087);
 const inline_1 = __webpack_require__(1160);
 const html_1 = __webpack_require__(5994);
@@ -6432,11 +6429,12 @@ const optspec = {
   rel: ['nofollow']
 };
 Object.setPrototypeOf(optspec, null);
-exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([medialink, textlink])));
-const textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
+exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([exports.medialink, exports.textlink])));
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
   return parse(content, params, rest, context);
 }))));
-const medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
+exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
+exports.linemedialink = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.medialink]), /^(?=[^\S\n]*(?:$|\n))/);
 exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.precedence)(2, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
 exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, source_1.str)(/^\S+/)), (0, source_1.str)(/^[^\s{}]+/)]);
 exports.option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+nofollow(?=[^\S\n]|})/), () => [` rel="nofollow"`]), (0, source_1.str)(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|})/), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[^\s{}]+/), opt => [` \\${opt.slice(1)}`])]);
@@ -6601,7 +6599,7 @@ const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, comb
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.media = void 0;
+exports.linemedia = exports.media = void 0;
 const combinator_1 = __webpack_require__(2087);
 const link_1 = __webpack_require__(9628);
 const html_1 = __webpack_require__(5994);
@@ -6646,6 +6644,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '
     context
   });
 }))))));
+exports.linemedia = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.media]), /^(?=[^\S\n]*(?:$|\n))/);
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ')'), (0, source_1.str)(')'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']'), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), '}'), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(8, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, source_1.txt]), '"')), (0, source_1.str)('"'), true)])));
 const option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*x[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` width="${opt.slice(1).split('x')[0]}"`, ` height="${opt.slice(1).split('x')[1]}"`]), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*:[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` aspect-ratio="${opt.slice(1).split(':').join('/')}"`]), link_1.option]);
 function sanitize(target, uri, alt) {
@@ -6825,11 +6824,13 @@ function attributes(texts, rubies) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.shortmedia = void 0;
+exports.lineshortmedia = exports.shortmedia = void 0;
 const combinator_1 = __webpack_require__(2087);
 const url_1 = __webpack_require__(4318);
 const media_1 = __webpack_require__(1303);
+const source_1 = __webpack_require__(6743);
 exports.shortmedia = (0, combinator_1.rewrite)((0, combinator_1.constraint)(8 /* State.media */, false, (0, combinator_1.open)('!', url_1.url)), (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media])));
+exports.lineshortmedia = (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.focus)(/^!https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media]))));
 
 /***/ }),
 
@@ -7336,7 +7337,8 @@ const combinator_1 = __webpack_require__(2087);
 const text_1 = __webpack_require__(7763);
 const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 exports.escsource = (0, combinator_1.creation)(1, false, ({
-  source
+  source,
+  context
 }) => {
   if (source === '') return;
   const i = source.search(delimiter);
@@ -7345,6 +7347,9 @@ exports.escsource = (0, combinator_1.creation)(1, false, ({
       return [[source], ''];
     case 0:
       switch (source[0]) {
+        case '\r':
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
         case '\x1B':
           return [[source.slice(1, 2)], source.slice(2)];
         case '\\':
@@ -7458,6 +7463,9 @@ exports.text = (0, combinator_1.creation)(1, false, ({
       return [[source], ''];
     case 0:
       switch (source[0]) {
+        case '\r':
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
         case '\x1B':
         case '\\':
           switch (source[1]) {
@@ -7489,7 +7497,7 @@ exports.text = (0, combinator_1.creation)(1, false, ({
   }
 });
 exports.txt = (0, combinator_1.union)([exports.text]);
-exports.linebreak = (0, combinator_1.focus)('\n', (0, combinator_1.union)([exports.text]));
+exports.linebreak = (0, combinator_1.focus)(/^[\r\n]/, (0, combinator_1.union)([exports.text]));
 function isAlphanumeric(char) {
   if (char < '0' || '\x7F' < char) return false;
   return '0' <= char && char <= '9' || 'a' <= char && char <= 'z' || 'A' <= char && char <= 'Z';
@@ -7511,7 +7519,8 @@ exports.unescsource = void 0;
 const combinator_1 = __webpack_require__(2087);
 const text_1 = __webpack_require__(7763);
 exports.unescsource = (0, combinator_1.creation)(1, false, ({
-  source
+  source,
+  context
 }) => {
   if (source === '') return;
   const i = source.search(text_1.delimiter);
@@ -7520,6 +7529,11 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
       return [[source], ''];
     case 0:
       {
+        switch (source[0]) {
+          case '\r':
+            context.resources && ++context.resources.clock;
+            return [[], source.slice(1)];
+        }
         const b = source[0] !== '\n' && source[0].trimStart() === '';
         const i = b || (0, text_1.isAlphanumeric)(source[0]) ? source.search(b ? text_1.nonWhitespace : text_1.nonAlphanumeric) || 1 : 1;
         return [[source.slice(0, i - +b || 1)], source.slice(i - +b || 1)];
@@ -7532,7 +7546,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 /***/ }),
 
 /***/ 9437:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
@@ -7540,12 +7554,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = exports.format = void 0;
-const combinator_1 = __webpack_require__(2087);
-function format(parser) {
-  return (0, combinator_1.convert)(source => source.replace(/(?<=^!?)https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=[^\S\n]*(?:$|\n))/gm, '{ $& }'), parser);
-}
-exports.format = format;
+exports.stringify = void 0;
 function stringify(nodes) {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {
@@ -7577,13 +7586,12 @@ const parser_1 = __webpack_require__(6728);
 const combinator_1 = __webpack_require__(2087);
 const htmlentity_1 = __webpack_require__(1562);
 const source_1 = __webpack_require__(6743);
-const util_1 = __webpack_require__(9437);
 const normalize_1 = __webpack_require__(185);
 const memoize_1 = __webpack_require__(1808);
 const array_1 = __webpack_require__(8112);
 function visualize(parser) {
   const blankline = new RegExp(/^(?:\\$|\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>)+$/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'gm');
-  return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)((0, util_1.format)(parser), (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
+  return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
 }
 exports.visualize = visualize;
 function hasVisible(nodes, {

package/markdown.d.ts

@@ -346,7 +346,7 @@ export namespace MarkdownParser {
               BlockquoteParser,
               PlaceholderParser,
               InlineParser.MediaParser,
-              InlineParser.ShortmediaParser,
+              InlineParser.ShortMediaParser,
             ]>,
             SourceParser.EmptyLineParser,
             InlineParser,
@@ -598,13 +598,10 @@ export namespace MarkdownParser {
         export interface TextParser extends
           Block<'reply/quote/text'>,
           Parser<string | HTMLElement, Context, [
-            AutolinkParser.LineUrlParser,
-            Parser<string | HTMLElement, Context, [
-              InlineParser.MathParser,
-              InlineParser.AutolinkParser,
-              SourceParser.LinebreakParser,
-              SourceParser.UnescapableSourceParser,
-            ]>,
+            InlineParser.MathParser,
+            InlineParser.AutolinkParser,
+            SourceParser.LinebreakParser,
+            SourceParser.UnescapableSourceParser,
           ]> {
         }
         export interface PlaceholderParser extends
@@ -633,8 +630,9 @@ export namespace MarkdownParser {
       InlineParser.MathParser,
       InlineParser.ExtensionParser,
       InlineParser.RubyParser,
-      InlineParser.LinkParser,
-      InlineParser.MediaParser,
+      InlineParser.LinkParser.TextLinkParser,
+      InlineParser.LinkParser.LineMediaLinkParser,
+      InlineParser.MediaParser.LineMediaParser,
       InlineParser.HTMLParser,
       InlineParser.InsertionParser,
       InlineParser.DeletionParser,
@@ -643,7 +641,7 @@ export namespace MarkdownParser {
       InlineParser.EmphasisParser,
       InlineParser.CodeParser,
       InlineParser.HTMLEntityParser,
-      InlineParser.ShortmediaParser,
+      InlineParser.ShortMediaParser.LineShortMediaParser,
       InlineParser.AutolinkParser,
       InlineParser.BracketParser,
       SourceParser.TextParser,
@@ -842,6 +840,12 @@ export namespace MarkdownParser {
       ]> {
     }
     export namespace LinkParser {
+      export interface LineMediaLinkParser extends
+        Inline<'link/linemedialink'>,
+        Parser<HTMLElement, Context, [
+          LinkParser.MediaLinkParser,
+        ]> {
+      }
       export interface TextLinkParser extends
         Inline<'link/textlink'>,
         Parser<HTMLAnchorElement, Context, [
@@ -856,7 +860,7 @@ export namespace MarkdownParser {
         Parser<HTMLAnchorElement, Context, [
           Parser<HTMLElement[], Context, [
             MediaParser,
-            ShortmediaParser,
+            ShortMediaParser,
           ]>,
           LinkParser.ParameterParser,
         ]> {
@@ -872,7 +876,7 @@ export namespace MarkdownParser {
         Inline<'link/content'>,
         Parser<(HTMLElement | string)[], Context, [
           MediaParser,
-          ShortmediaParser,
+          ShortMediaParser,
           InlineParser,
         ]> {
       }
@@ -917,6 +921,12 @@ export namespace MarkdownParser {
       ]> {
     }
     export namespace MediaParser {
+      export interface LineMediaParser extends
+        Inline<'media/linemedia'>,
+        Parser<HTMLElement, Context, [
+          MediaParser,
+        ]> {
+      }
       export interface TextParser extends
         Inline<'media/text'>,
         Parser<string[], Context, [
@@ -1060,28 +1070,41 @@ export namespace MarkdownParser {
       Inline<'unsafehtmlentity'>,
       Parser<string, Context, []> {
     }
-    export interface ShortmediaParser extends
+    export interface ShortMediaParser extends
       // !https://host
       Inline<'shortmedia'>,
       Parser<HTMLElement, Context, [
         MediaParser,
       ]> {
     }
+    export namespace ShortMediaParser {
+      export interface LineShortMediaParser extends
+        Inline<'shortmedia/lineshortmedia'>,
+        Parser<HTMLElement, Context, [
+          MediaParser,
+        ]> {
+      }
+    }
     export interface AutolinkParser extends
       Inline<'autolink'>,
       Parser<HTMLElement | string, Context, [
-        AutolinkParser.UrlParser,
-        AutolinkParser.EmailParser,
-        SourceParser.StrParser,
-        AutolinkParser.ChannelParser,
-        AutolinkParser.AccountParser,
-        SourceParser.StrParser,
-        SourceParser.StrParser,
-        AutolinkParser.HashtagParser,
-        AutolinkParser.HashnumParser,
-        SourceParser.StrParser,
-        SourceParser.StrParser,
-        AutolinkParser.AnchorParser,
+        Parser<HTMLElement | string, Context, [
+          AutolinkParser.UrlParser.LineUrlParser,
+        ]>,
+        Parser<HTMLElement | string, Context, [
+          AutolinkParser.UrlParser,
+          AutolinkParser.EmailParser,
+          SourceParser.StrParser,
+          AutolinkParser.ChannelParser,
+          AutolinkParser.AccountParser,
+          SourceParser.StrParser,
+          SourceParser.StrParser,
+          AutolinkParser.HashtagParser,
+          AutolinkParser.HashnumParser,
+          SourceParser.StrParser,
+          SourceParser.StrParser,
+          AutolinkParser.AnchorParser,
+        ]>,
       ]> {
     }
     export namespace AutolinkParser {
@@ -1093,6 +1116,13 @@ export namespace MarkdownParser {
         ]> {
       }
       export namespace UrlParser {
+        export interface LineUrlParser extends
+          Inline<'url/lineurl'>,
+          Parser<string | HTMLElement, Context, [
+            SourceParser.StrParser,
+            InlineParser.LinkParser.UnsafeLinkParser,
+          ]> {
+        }
         export interface BracketParser extends
           Inline<'url/bracket'>,
           Parser<string, Context, [
@@ -1176,23 +1206,11 @@ export namespace MarkdownParser {
   export interface AutolinkParser extends
     Markdown<'autolink'>,
     Parser<string | HTMLElement, Context, [
-      AutolinkParser.LineUrlParser,
-      Parser<string | HTMLElement, Context, [
-        InlineParser.AutolinkParser,
-        SourceParser.LinebreakParser,
-        SourceParser.UnescapableSourceParser,
-      ]>,
+      InlineParser.AutolinkParser,
+      SourceParser.LinebreakParser,
+      SourceParser.UnescapableSourceParser,
     ]> {
   }
-  export namespace AutolinkParser {
-    export interface LineUrlParser extends
-      Markdown<'autolink/lineurl'>,
-      Parser<string | HTMLElement, Context, [
-        SourceParser.StrParser,
-        InlineParser.LinkParser,
-      ]> {
-    }
-  }
   export namespace SourceParser {
     interface Source<T extends string> extends Markdown<`source/${T}`> { }
     export interface TextParser extends

package/package.json

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

package/src/parser/autolink.test.ts

@@ -6,8 +6,8 @@ describe('Unit: parser/autolink', () => {
     const parser = (source: string) => autolink({ source, context: {} });
 
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser(' http://host')), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('!http://host')), [['!', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host#\\')), [['<a class="url" href="http://host#\\" target="_blank">http://host#\\</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host#\\')), [['!', '<a class="url" href="http://host#\\" target="_blank">http://host#\\</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#a')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('\\\n')), [['\\', '<br>'], '']);

package/src/parser/autolink.ts

@@ -1,21 +1,14 @@
 import { MarkdownParser } from '../../markdown';
-import { union, tails, subsequence, some, line, focus, lazy } from '../combinator';
-import { link } from './inline/link';
+import { union, some, convert, lazy } from '../combinator';
 import { autolink as autolink_ } from './inline/autolink';
-import { linebreak, unescsource, str } from './source';
-import { format } from './util';
+import { linebreak, unescsource } from './source';
 
 export import AutolinkParser = MarkdownParser.AutolinkParser;
 
-export const autolink: AutolinkParser = lazy(() => some(line(subsequence([
-  lineurl,
+export const autolink: AutolinkParser = lazy(() =>
+  convert(source => `\r${source}`,
   some(union([
     autolink_,
     linebreak,
     unescsource,
-  ])),
-]))));
-
-export const lineurl: AutolinkParser.LineUrlParser = lazy(() => focus(
-  /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
-  format(tails([str('!'), link]))));
+  ]))));

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

@@ -30,9 +30,11 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('_a\n<wbr>_\nb')), [['<p>_a<br><wbr>_<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('*a\n<wbr>*\nb')), [['<p>*a<br><wbr>*<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb')), [['<p>==a<br><wbr>==<br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('http://host#!')), [['<p><a class="url" href="http://host#!" target="_blank">http://host#!</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host#\\')), [['<p><a class="url" href="http://host#\\" target="_blank">http://host#\\</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\nhttp://host#\\ \nb')), [['<p>a<br><a class="url" href="http://host#\\" target="_blank">http://host#\\</a><br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('!http://host#!')), [['<p><a href="http://host#!" target="_blank"><img class="media" data-src="http://host#!" alt=""></a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host#\\')), [['<p><a href="http://host#\\" target="_blank"><img class="media" data-src="http://host#\\" alt=""></a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host#\\ a')), [['<p>!<a class="url" href="http://host#" target="_blank">http://host#</a> a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser(' !http://host#\\')), [['<p> !<a class="url" href="http://host#" target="_blank">http://host#</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('\ta')), [['<p>\ta</p>'], '']);
     });
 

package/src/parser/block/paragraph.ts

@@ -1,9 +1,10 @@
 import { ParagraphParser } from '../block';
-import { union, some, block, trimEnd, fmap } from '../../combinator';
+import { union, some, block, convert, trimEnd, fmap } from '../../combinator';
 import { inline } from '../inline';
 import { visualize } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
 export const paragraph: ParagraphParser = block(fmap(
-  visualize(trimEnd(some(union([inline])))),
+  convert(source => `\r${source}`,
+  visualize(trimEnd(some(union([inline]))))),
   ns => [html('p', defrag(ns))]));

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

@@ -55,9 +55,9 @@ describe('Unit: parser/block/reply/quote', () => {
       assert.deepStrictEqual(inspect(parser('> $-a, $-b')), [['<span class="quote">&gt; $-a, $-b</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> $a=b$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> ${a}$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('> http://host#!')), [['<span class="quote">&gt; <a class="url" href="http://host#!" target="_blank">http://host#!</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> http://host#\\')), [['<span class="quote">&gt; <a class="url" href="http://host#\\" target="_blank">http://host#\\</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> a\n> http://host#\\ \n> b')), [['<span class="quote">&gt; a<br>&gt; <a class="url" href="http://host#\\" target="_blank">http://host#\\</a> <br>&gt; b</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('> !http://host#!')), [['<span class="quote">&gt; !<a class="url" href="http://host#!" target="_blank">http://host#!</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> !http://host#\\')), [['<span class="quote">&gt; !<a class="url" href="http://host#\\" target="_blank">http://host#\\</a></span>', '<br>'], '']);
     });
 
   });

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

@@ -1,10 +1,9 @@
 import { ReplyParser } from '../../block';
 import { eval } from '../../../combinator/data/parser';
-import { union, subsequence, some, creation, block, line, validate, rewrite, lazy, fmap } from '../../../combinator';
+import { union, some, creation, block, line, validate, rewrite, lazy, fmap } from '../../../combinator';
 import { math } from '../../inline/math';
 import { autolink } from '../../inline/autolink';
 import { linebreak, unescsource, str, anyline } from '../../source';
-import { lineurl } from '../../autolink';
 import { html, defrag } from 'typed-dom/dom';
 
 export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
@@ -42,7 +41,7 @@ const qblock: ReplyParser.QuoteParser.BlockParser = ({ source, context }) => {
   assert(quotes);
   assert(quotes.length > 0);
   const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
-  const nodes = eval(text({ source: content, context }), []);
+  const nodes = eval(text({ source: `\r${content}`, context }), []);
   nodes.unshift(quotes.shift()!);
   for (let i = 0; i < nodes.length; ++i) {
     const child = nodes[i] as string | Text | Element;
@@ -72,12 +71,9 @@ const qblock: ReplyParser.QuoteParser.BlockParser = ({ source, context }) => {
   return [nodes, ''];
 };
 
-const text: ReplyParser.QuoteParser.TextParser = some(line(subsequence([
-  lineurl,
-  some(union([
-    math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
-    autolink,
-    linebreak,
-    unescsource,
-  ])),
-])));
+const text: ReplyParser.QuoteParser.TextParser = some(union([
+  math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
+  autolink,
+  linebreak,
+  unescsource,
+]));

package/src/parser/inline/autolink/url.test.ts

@@ -28,6 +28,8 @@ describe('Unit: parser/inline/autolink/url', () => {
       assert.deepStrictEqual(inspect(parser('http://a#( )')), [['<a class="url" href="http://a#" target="_blank">http://a#</a>'], '( )']);
       assert.deepStrictEqual(inspect(parser('http://a#(\n)')), [['<a class="url" href="http://a#" target="_blank">http://a#</a>'], '(\n)']);
       assert.deepStrictEqual(inspect(parser('http://[::]')), [['<a class="url" href="http://[::]" target="_blank">http://[::]</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('\rhttp://a#\\')), [['<a class="url" href="http://a#\\" target="_blank">http://a#\\</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('\rhttp://a#\\\nhttp://b#\\')), [['<a class="url" href="http://a#\\" target="_blank">http://a#\\</a>', '<br>', '<a class="url" href="http://b#\\" target="_blank">http://b#\\</a>'], '']);
     });
 
     it('trailing symbols', () => {

package/src/parser/inline/autolink/url.ts

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
-import { union, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { union, tails, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
-import { unescsource } from '../../source';
+import { linebreak, unescsource, str } from '../../source';
 
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 
@@ -13,6 +13,17 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
     url => `{ ${url} }`,
     union([unsafelink])))));
 
+export const lineurl: AutolinkParser.UrlParser.LineUrlParser = open(
+  linebreak,
+  tails([
+    str('!'),
+    focus(
+      /^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
+      convert(
+        url => `{ ${url} }`,
+        unsafelink)),
+  ]));
+
 const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(precedence(2, union([
   surround('(', some(union([bracket, unescsource]), ')'), ')', true),
   surround('[', some(union([bracket, unescsource]), ']'), ']', true),

package/src/parser/inline/autolink.ts

@@ -1,6 +1,6 @@
 import { AutolinkParser } from '../inline';
 import { union, some, syntax, constraint, validate, focus, fmap } from '../../combinator';
-import { url } from './autolink/url';
+import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
 import { channel } from './autolink/channel';
 import { account } from './autolink/account';
@@ -11,34 +11,37 @@ import { str } from '../source';
 import { Syntax, State } from '../context';
 import { stringify } from '../util';
 
-export const autolink: AutolinkParser = fmap(
-  validate(/^(?:[@#>0-9a-z]|\S[#>])/i,
+export const autolink: AutolinkParser =
+  validate(/^(?:[@#>0-9a-z\r\n]|\S[#>])/i,
   constraint(State.autolink, false,
   syntax(Syntax.autolink, 1, 1, ~State.shortcut,
-  some(union([
-    url,
-    email,
-    // Escape unmatched email-like strings.
-    focus(
-      /^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z])*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i,
-      ({ source }) => {
-        if (source.length > 255 || source.includes('@')) return [[source], ''];
-        const i = source.indexOf('_');
-        if (i === -1) return [[source], ''];
-        return [[source.slice(0, i)], source.slice(i)];
-      }),
-    channel,
-    account,
-    // Escape unmatched account-like strings.
-    str(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
-    // Escape invalid leading characters.
-    str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji)(?=#)/u.source.replace('emoji', emoji), 'u')),
-    hashtag,
-    hashnum,
-    // Escape unmatched hashtag-like strings.
-    str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|')*/u.source.replace('emoji', emoji), 'u')),
-    // Escape invalid leading characters.
-    str(/^[0-9\p{Sc}](?=>)/u),
-    anchor,
-  ]))))),
-  ns => ns.length === 1 ? ns : [stringify(ns)]);
+  union([
+    some(union([lineurl])),
+    fmap(some(union([
+      url,
+      email,
+      // Escape unmatched email-like strings.
+      focus(
+        /^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z])*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i,
+        ({ source }) => {
+          if (source.length > 255 || source.includes('@')) return [[source], ''];
+          const i = source.indexOf('_');
+          if (i === -1) return [[source], ''];
+          return [[source.slice(0, i)], source.slice(i)];
+        }),
+      channel,
+      account,
+      // Escape unmatched account-like strings.
+      str(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
+      // Escape invalid leading characters.
+      str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji)(?=#)/u.source.replace('emoji', emoji), 'u')),
+      hashtag,
+      hashnum,
+      // Escape unmatched hashtag-like strings.
+      str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|')*/u.source.replace('emoji', emoji), 'u')),
+      // Escape invalid leading characters.
+      str(/^[0-9\p{Sc}](?=>)/u),
+      anchor,
+    ])),
+    ns => ns.length === 1 ? ns : [stringify(ns)]),
+  ]))));

package/src/parser/inline/extension/placeholder.test.ts

@@ -48,7 +48,7 @@ describe('Unit: parser/inline/extension/placeholder', () => {
       assert.deepStrictEqual(inspect(parser('[^a[% b %][% c %]]')), [['<span class="invalid">a<span class="comment"><input type="checkbox"><span>[% b %]</span></span><span class="comment"><input type="checkbox"><span>[% c %]</span></span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^\\]]')), [['<span class="invalid">]</span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^(])]')), [['<span class="invalid"><span class="paren">(])</span></span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[^!http://host]')), [['<span class="invalid"><a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a></span>'], '']);
+      assert.deepStrictEqual(inspect(parser('[^!http://host]')), [['<span class="invalid">!<a class="url" href="http://host" target="_blank">http://host</a></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^[% a %]]')), [['<span class="invalid"><span class="comment"><input type="checkbox"><span>[% a %]</span></span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[^[% a %]b]')), [['<span class="invalid"><span class="comment"><input type="checkbox"><span>[% a %]</span></span>b</span>'], '']);
     });

package/src/parser/inline/link.ts

@@ -4,7 +4,7 @@ import { Result } from '../../combinator/data/parser';
 import { union, inits, tails, sequence, some, constraint, syntax, creation, precedence, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
-import { unescsource, str } from '../source';
+import { linebreak, unescsource, str } from '../source';
 import { Syntax, State } from '../context';
 import { trimNode } from '../visibility';
 import { stringify } from '../util';
@@ -21,7 +21,7 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], union([
   textlink,
 ])));
 
-const textlink: LinkParser.TextLinkParser = lazy(() =>
+export const textlink: LinkParser.TextLinkParser = lazy(() =>
   constraint(State.link, false,
   syntax(Syntax.link, 2, 10, State.linkers | State.media,
   bind(reverse(tails([
@@ -37,7 +37,7 @@ const textlink: LinkParser.TextLinkParser = lazy(() =>
     return parse(content, params, rest, context);
   }))));
 
-const medialink: LinkParser.MediaLinkParser = lazy(() =>
+export const medialink: LinkParser.MediaLinkParser = lazy(() =>
   constraint(State.link | State.media, false,
   syntax(Syntax.link, 2, 10, State.linkers,
   bind(reverse(sequence([
@@ -50,6 +50,11 @@ const medialink: LinkParser.MediaLinkParser = lazy(() =>
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
     parse(content, params, rest, context)))));
 
+export const linemedialink: LinkParser.LineMediaLinkParser = surround(
+  linebreak,
+  union([medialink]),
+  /^(?=[^\S\n]*(?:$|\n))/);
+
 export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
   creation(10, precedence(2,
   bind(reverse(tails([

package/src/parser/inline/media.ts

@@ -3,7 +3,7 @@ import { union, inits, tails, some, syntax, creation, precedence, constraint, va
 import { unsafelink, uri, option as linkoption, resolve } from './link';
 import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
-import { txt, str } from '../source';
+import { txt, linebreak, str } from '../source';
 import { Syntax, State } from '../context';
 import { ReadonlyURL } from 'spica/url';
 import { unshift, push } from 'spica/array';
@@ -61,6 +61,11 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
       ({ source: `{ ${INSECURE_URI}${params.join('')} }${rest}`, context });
   }))))));
 
+export const linemedia: MediaParser.LineMediaParser = surround(
+  linebreak,
+  union([media]),
+  /^(?=[^\S\n]*(?:$|\n))/);
+
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union([
   surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),

package/src/parser/inline/shortmedia.ts

@@ -1,12 +1,21 @@
-import { ShortmediaParser } from '../inline';
-import { union, constraint, rewrite, open, convert } from '../../combinator';
+import { ShortMediaParser } from '../inline';
+import { union, constraint, focus, rewrite, open, convert } from '../../combinator';
 import { url } from './autolink/url';
 import { media } from './media';
+import { linebreak } from '../source';
 import { State } from '../context';
 
-export const shortmedia: ShortmediaParser = rewrite(
+export const shortmedia: ShortMediaParser = rewrite(
   constraint(State.media, false,
   open('!', url)),
   convert(
     source => `!{ ${source.slice(1)} }`,
     union([media])));
+
+export const lineshortmedia: ShortMediaParser.LineShortMediaParser = open(
+  linebreak,
+  focus(
+    /^!https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
+    convert(
+      source => `!{ ${source.slice(1)} }`,
+      union([media]))));

package/src/parser/inline.test.ts

@@ -56,11 +56,11 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('{}')), [['{', '}'], '']);
       assert.deepStrictEqual(inspect(parser('{a}')), [['<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('{{a}}')), [['<span class="template">{{a}}</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('!{}')), [['!', '{', '}'], '']);
-      assert.deepStrictEqual(inspect(parser('!{a}')), [['<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('!{{a}}')), [['!', '<span class="template">{{a}}</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('!{{{a}}}')), [['!', '<span class="template">{{{a}}}</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('!!{a}')), [['!', '<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('\r!{}')), [['!', '{', '}'], '']);
+      assert.deepStrictEqual(inspect(parser('\r!{a}')), [['<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('\r!{{a}}')), [['!', '<span class="template">{{a}}</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('\r!{{{a}}}')), [['!', '<span class="template">{{{a}}}</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('\r!!{a}')), [['!', '!', '<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('${a}')), [['$', '<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('${{a}}')), [['$', '<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${{{a}}}')), [['$', '<span class="template">{{{a}}}</span>'], '']);
@@ -105,11 +105,8 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('0http://host')), [['0http', ':', '/', '/', 'host'], '']);
       assert.deepStrictEqual(inspect(parser('0aAhttp://host')), [['0aAhttp', ':', '/', '/', 'host'], '']);
       assert.deepStrictEqual(inspect(parser('?http://host')), [['?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0!http://host')), [['0', '<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('0!http://host')), [['0', '!', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('0?http://host')), [['0', '?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0!!http://host')), [['0', '!', '<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0?!http://host')), [['0', '?', '<a href="http://host" target="_blank"><img class="media" data-src="http://host" alt=""></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0!?http://host')), [['0', '!', '?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_http://host')), [['_', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_http://host_')), [['<em><a class="url" href="http://host" target="_blank">http://host</a></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*http://host*')), [['<strong><a class="url" href="http://host" target="_blank">http://host</a></strong>'], '']);

package/src/parser/inline.ts

@@ -7,7 +7,7 @@ import { comment } from './inline/comment';
 import { math } from './inline/math';
 import { extension } from './inline/extension';
 import { ruby } from './inline/ruby';
-import { link } from './inline/link';
+import { textlink, linemedialink } from './inline/link';
 import { html } from './inline/html';
 import { insertion } from './inline/insertion';
 import { deletion } from './inline/deletion';
@@ -15,9 +15,9 @@ import { mark } from './inline/mark';
 import { emphasis } from './inline/emphasis';
 import { strong } from './inline/strong';
 import { code } from './inline/code';
-import { media } from './inline/media';
+import { linemedia } from './inline/media';
 import { htmlentity } from './inline/htmlentity';
-import { shortmedia } from './inline/shortmedia';
+import { lineshortmedia } from './inline/shortmedia';
 import { autolink } from './inline/autolink';
 import { bracket } from './inline/bracket';
 import { text } from './source';
@@ -41,7 +41,7 @@ export import CodeParser = InlineParser.CodeParser;
 export import MediaParser = InlineParser.MediaParser;
 export import HTMLEntityParser = InlineParser.HTMLEntityParser;
 export import UnsafeHTMLEntityParser = InlineParser.UnsafeHTMLEntityParser;
-export import ShortmediaParser = InlineParser.ShortmediaParser;
+export import ShortMediaParser = InlineParser.ShortMediaParser;
 export import AutolinkParser = InlineParser.AutolinkParser;
 export import BracketParser = InlineParser.BracketParser;
 
@@ -53,8 +53,9 @@ export const inline: InlineParser = union([
   math,
   extension,
   ruby,
-  link,
-  media,
+  textlink,
+  linemedialink,
+  linemedia,
   html,
   insertion,
   deletion,
@@ -63,7 +64,7 @@ export const inline: InlineParser = union([
   emphasis,
   code,
   htmlentity,
-  shortmedia,
+  lineshortmedia,
   autolink,
   bracket,
   text

package/src/parser/source/escapable.ts

@@ -4,7 +4,7 @@ import { nonWhitespace } from './text';
 
 const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 
-export const escsource: EscapableSourceParser = creation(1, false, ({ source }) => {
+export const escsource: EscapableSourceParser = creation(1, false, ({ source, context }) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {
@@ -12,6 +12,10 @@ export const escsource: EscapableSourceParser = creation(1, false, ({ source })
       return [[source], ''];
     case 0:
       switch (source[0]) {
+        case '\r':
+          assert(!source.includes('\r', 1));
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
         case '\x1B':
           return [[source.slice(1, 2)], source.slice(2)];
         case '\\':

package/src/parser/source/text.ts

@@ -16,6 +16,10 @@ export const text: TextParser = creation(1, false, ({ source, context }) => {
       return [[source], ''];
     case 0:
       switch (source[0]) {
+        case '\r':
+          assert(!source.includes('\r', 1));
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
         case '\x1B':
         case '\\':
           switch (source[1]) {
@@ -60,7 +64,7 @@ export const txt: TxtParser = union([
   text,
 ]) as TxtParser;
 
-export const linebreak: LinebreakParser = focus('\n', union([
+export const linebreak: LinebreakParser = focus(/^[\r\n]/, union([
   text,
 ])) as LinebreakParser;
 

package/src/parser/source/unescapable.ts

@@ -2,7 +2,7 @@ import { UnescapableSourceParser } from '../source';
 import { creation } from '../../combinator';
 import { delimiter, nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
 
-export const unescsource: UnescapableSourceParser = creation(1, false, ({ source }) => {
+export const unescsource: UnescapableSourceParser = creation(1, false, ({ source, context }) => {
   assert(source[0] !== '\x1B');
   if (source === '') return;
   const i = source.search(delimiter);
@@ -10,6 +10,12 @@ export const unescsource: UnescapableSourceParser = creation(1, false, ({ source
     case -1:
       return [[source], ''];
     case 0: {
+      switch (source[0]) {
+        case '\r':
+          assert(!source.includes('\r', 1));
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
+      }
       const b = source[0] !== '\n' && source[0].trimStart() === '';
       const i = b || isAlphanumeric(source[0])
         ? source.search(b ? nonWhitespace : nonAlphanumeric) || 1

package/src/parser/util.ts

@@ -1,13 +1,3 @@
-import { Parser } from '../combinator/data/parser';
-import { convert } from '../combinator';
-
-export function format<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function format<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
-  return convert(
-    source => source.replace(/(?<=^!?)https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=[^\S\n]*(?:$|\n))/gm, '{ $& }'),
-    parser);
-}
-
 export function stringify(nodes: readonly (HTMLElement | string)[]): string {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {

package/src/parser/visibility.ts

@@ -4,7 +4,6 @@ import { union, some, verify, convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
 import { State } from './context';
-import { format } from './util';
 import { invisibleHTMLEntityNames } from './api/normalize';
 import { reduce } from 'spica/memoize';
 import { push } from 'spica/array';
@@ -17,7 +16,7 @@ export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Pa
   return union([
     convert(
       source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
-      verify(format(parser), (ns, rest, context) => !rest && hasVisible(ns, context))),
+      verify(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
     some(union([linebreak, unescsource])),
   ]);
 }

package/src/util/quote.test.ts

@@ -5,10 +5,10 @@ describe('Unit: util/quote', () => {
   describe('quote', () => {
     it('basic', () => {
       const range = document.createRange();
-      const el = parse('>>1\n>2\n> a\n>>4 `b` ${c}$ !{d}\n [e](f) ').firstElementChild!;
+      const el = parse('>>1\n>2\n> a\n>>4 `b` ${c}$\n!{d}\n [e](f) ').firstElementChild!;
       range.setStart(el.firstChild!.firstChild!, 0);
       range.setEnd(el.lastChild!.lastChild!.lastChild!, 1);
-      assert(quote('3', range) === `>>>1\n> >2\n>> a\n>>3\n> >>4 \`b\` \${c}$ !{d}\n>  e`);
+      assert(quote('3', range) === `>>>1\n> >2\n>> a\n>>3\n> >>4 \`b\` \${c}$\n> !{d}\n>  e`);
     });
 
     it('adjustment', () => {