securemark 0.263.1 → 0.265.0

package/src/parser/source/text.ts

@@ -3,10 +3,9 @@ import { union, creation, focus } from '../../combinator';
 import { str } from './str';
 import { html } from 'typed-dom/dom';
 
-export const delimiter = /[\s\x00-\x7F]|\S[#>]|[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？][^\S\n]*(?=\\\n)/u;
+export const delimiter = /[\s\x00-\x7F]|\S[#>]/u;
 export const nonWhitespace = /[\S\n]|$/;
 export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
-const nssb = /^[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？][^\S\n]*(?=\\\n)/u;
 const repeat = str(/^(.)\1*/);
 
 export const text: TextParser = creation(1, false, ({ source, context }) => {
@@ -16,26 +15,14 @@ export const text: TextParser = creation(1, false, ({ source, context }) => {
     case -1:
       return [[source], ''];
     case 0:
-      switch (source[0]) {
-        case '\x1B':
-        case '\\':
-          if (!nssb.test(source.slice(1))) break;
-          assert(source[0] !== '\x1B');
-          return text({ source: source.slice(1), context });
-        default:
-          const i = source.match(nssb)?.[0].length ?? -1;
-          if (i !== -1) return [[source[0], html('span', { class: 'linebreak' })], source.slice(i + 2)];
-      }
       switch (source[0]) {
         case '\x1B':
         case '\\':
           switch (source[1]) {
             case undefined:
-              assert(source[0] !== '\x1B');
-              return [[], ''];
             case '\n':
               assert(source[0] !== '\x1B');
-              return [[html('span', { class: 'linebreak' }, ' ')], source.slice(2)];
+              return [[], source.slice(1)];
             default:
               return [[source.slice(1, 2)], source.slice(2)];
           }

package/src/parser/visibility.ts

@@ -108,10 +108,7 @@ export function isStartLooseNodes(nodes: readonly (HTMLElement | string)[]): boo
   for (let i = 0; i < nodes.length; ++i) {
     const node = nodes[i];
     if (isVisible(node)) return true;
-    if (typeof node === 'object') {
-      if (node.tagName === 'BR') break;
-      if (node.className === 'linebreak') break;
-    }
+    if (typeof node === 'object' && node.tagName === 'BR') break;
   }
   return false;
 }
@@ -143,8 +140,6 @@ function isVisible(node: HTMLElement | string, strpos?: number): boolean {
         case 'BR':
         case 'WBR':
           return false;
-        case 'SPAN':
-          return node.className !== 'linebreak';
         default:
           return true;
       }

package/src/util/toc.ts

@@ -1,8 +1,6 @@
 import { push } from 'spica/array';
 import { html } from 'typed-dom/dom';
 
-// Bug: Firefox
-//const selector = `:scope > :is(h1, h2, h3, h4, h5, h6, aside.aside)[id]`;
 const selector = ':is(h1, h2, h3, h4, h5, h6, aside.aside)[id]';
 
 export function toc(source: DocumentFragment | HTMLElement | ShadowRoot): HTMLUListElement {

package/src/parser/locale/ja.test.ts

@@ -1,14 +0,0 @@
-import { japanese } from './ja';
-
-describe('Unit: parser/locale/ja', () => {
-  describe('japanese', () => {
-    it('ja', () => {
-      assert(japanese('、'));
-      assert(japanese('。'));
-      assert(japanese('！'));
-      assert(japanese('？'));
-    });
-
-  });
-
-});

package/src/parser/locale/ja.ts

@@ -1,3 +0,0 @@
-export function japanese(char: string): boolean {
-  return /^[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？]/u.test(char);
-}

package/src/parser/locale.test.ts

@@ -1,26 +0,0 @@
-import { block } from './block';
-import { some } from '../combinator';
-import { inspect } from '../debug.test';
-
-describe('Unit: parser/locale', () => {
-  describe('locale', () => {
-    const parser = (source: string) => some(block)({ source, context: {} });
-
-    it('basic', () => {
-      assert.deepStrictEqual(inspect(parser('。\\\n0')), [['<p>。<span class="linebreak"></span>0</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('。 \\\n0')), [['<p>。<span class="linebreak"></span>0</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('_。_\\\n0')), [['<p><em>。</em><span class="linebreak"></span>0</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('!> 。\\\n0')), [['<blockquote><section><p>。<span class="linebreak"></span>0</p><h2>References</h2><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('[。](a)\\\n0')), [['<p><ruby>。<rp>(</rp><rt>a</rt><rp>)</rp></ruby><span class="linebreak"></span>0</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('[。　](a )\\\n0')), [['<p><ruby>。<rp>(</rp><rt>a</rt><rp>)</rp></ruby><span class="linebreak"></span>0</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('。<wbr>\\\n0')), [['<p>。<wbr><span class="linebreak"></span>0</p>'], '']);
-    });
-
-    it('ja', () => {
-      assert.deepStrictEqual(inspect(parser('。\\\n0')), [['<p>。<span class="linebreak"></span>0</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('\\。\\\n0')), [['<p>。<span class="linebreak"></span>0</p>'], '']);
-    });
-
-  });
-
-});

package/src/parser/locale.ts

@@ -1,61 +0,0 @@
-import { Parser } from '../combinator/data/parser';
-import { fmap } from '../combinator';
-import { japanese } from './locale/ja';
-import { html } from 'typed-dom/dom';
-
-export function localize<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function localize(parser: Parser<HTMLElement | string>): Parser<HTMLElement | string> {
-  return fmap(parser, ns => {
-    if (ns.length === 0) return ns;
-    const el = ns.length === 1 && typeof ns[0] === 'object'
-      ? ns[0]
-      : html('div', ns);
-    for (let es = el.querySelectorAll('.linebreak:not(:empty)'),
-             len = es.length, i = 0; i < len; ++i) {
-      const el = es[i];
-      assert(el.firstChild!.textContent === ' ');
-      if (!check(el)) continue;
-      el.firstChild!.remove();
-    }
-    return ns;
-  });
-}
-
-function check(el: Element): boolean {
-  const char = lastChar(el);
-  if (!char) return false;
-  assert([...char].length === 1);
-  return japanese(char);
-}
-
-function lastChar(node: Element | Text | null): string {
-  while (node = node?.previousSibling as typeof node) {
-    if (!('id' in node)) return [...node.data.slice(-2)].pop() ?? '';
-    if (node.firstChild) return [...text(node).slice(-2)].pop() ?? '';
-    switch (node.tagName) {
-      case 'BR':
-        return '';
-      case 'SPAN':
-        switch (node.className) {
-          case 'linebreak':
-            return '';
-        }
-    }
-  }
-  return '';
-}
-
-function text(el: Element): string {
-  switch (el.tagName) {
-    case 'RUBY':
-      for (let ns = el.childNodes, i = ns.length; i--;) {
-        const child = ns[i] as Text | Element;
-        if ('id' in child) continue;
-        return child.data;
-      }
-      assert(false);
-      return '';
-    default:
-      return el.textContent!;
-  }
-}