securemark 0.268.2 → 0.269.1

package/src/parser/processor/footnote.ts

@@ -1,4 +1,4 @@
-import { text } from '../inline/extension/indexee';
+import { identity, text } from '../inline/extension/indexee';
 import { frag, html, define } from 'typed-dom/dom';
 
 export function* footnote(
@@ -44,13 +44,15 @@ function build(
     }
     const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
     const titles = new Map<string, string>();
-    const contents = new Map<string, DocumentFragment>();
+    const contents = new Map<string, HTMLSpanElement>();
     for (let len = refs.length, i = 0; i < len; ++i) {
       if (i % 10 === 9) yield;
       const ref = refs[i];
       const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild!.innerHTML}`;
       if (titles.has(identifier)) continue;
-      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
+      const content = html('span',
+        { id: identity(opts.id, text(ref.firstElementChild!), 'note') },
+        ref.firstElementChild!.cloneNode(true).childNodes);
       const title = text(content).trim();
       if (!title) continue;
       titles.set(identifier, title);
@@ -100,7 +102,6 @@ function build(
       const title = titles.get(identifier);
       assert(title !== '');
       assert(syntax !== 'annotation' || title);
-      const content = frag(ref.firstElementChild!.cloneNode(true).childNodes);
       const refIndex = ++count;
       const refId = opts.id !== ''
         ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}`
@@ -134,7 +135,7 @@ function build(
         html('a',
           {
             href: refId && `#${refId}`,
-            title: abbr && text(content).trim() || undefined,
+            title: abbr && text(frag(ref.firstElementChild!.cloneNode(true).childNodes)).trim() || undefined,
           },
           `^${refIndex}`));
     }

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', () => {