@zombie-mermaid/core 4.0.0 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zombie-mermaid/core",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "license": "MIT",
   "description": "Shared types, theme, and text/statement utilities used by every zombie-mermaid renderer.",
   "repository": {

package/src/__tests__/cluster-edges.test.ts

@@ -0,0 +1,47 @@
+import { describe, it, expect } from 'vitest'
+import { parseMermaid } from '@zombie-mermaid/mermaid-parser'
+import { withoutOwnClusterEdges } from '../cluster-edges.ts'
+
+const pairs = (src: string) =>
+  withoutOwnClusterEdges(parseMermaid(src)).edges.map(
+    (e) => `${e.source}>${e.target}`,
+  )
+
+describe('withoutOwnClusterEdges (#1310)', () => {
+  it('drops an edge from a member node to its subgraph', () => {
+    expect(
+      pairs('flowchart TD; subgraph Sub; B; end; A --> B; B --> Sub'),
+    ).toEqual(['A>B'])
+  })
+
+  it('drops an edge from a subgraph to one of its members', () => {
+    expect(
+      pairs('flowchart TD; subgraph Sub; B; end; A --> B; Sub --> B'),
+    ).toEqual(['A>B'])
+  })
+
+  it('drops edges between a nested member, its enclosing subgraphs, and nested subgraphs', () => {
+    expect(
+      pairs(
+        'flowchart TD; subgraph Outer; subgraph Inner; B; end; end; A --> B; B --> Outer; Inner --> B; Outer --> Inner',
+      ),
+    ).toEqual(['A>B'])
+  })
+
+  it('keeps an edge from an outside node to a subgraph', () => {
+    expect(
+      pairs('flowchart TD; subgraph Sub; B; end; X --> Sub; A --> B'),
+    ).toEqual(['X>Sub', 'A>B'])
+  })
+
+  it('keeps an edge between two subgraphs', () => {
+    expect(
+      pairs('flowchart TD; subgraph P; A; end; subgraph Q; B; end; P --> Q'),
+    ).toEqual(['P>Q'])
+  })
+
+  it('returns the same graph object when nothing is dropped', () => {
+    const g = parseMermaid('flowchart TD; subgraph Sub; B; end; X --> Sub')
+    expect(withoutOwnClusterEdges(g)).toBe(g)
+  })
+})

package/src/__tests__/diagram-type.test.ts

@@ -59,6 +59,21 @@ describe('detectDiagramType', () => {
     expect(detectDiagramType('xychart-foo\nx-axis [a, b]')).toBe('flowchart')
   })
 
+  it('detects pie charts with or without trailing header content', () => {
+    expect(detectDiagramType('pie\n"A" : 1')).toBe('pie')
+    expect(detectDiagramType('  pie  ')).toBe('pie')
+    expect(detectDiagramType('pie showData\n"A" : 1')).toBe('pie')
+    expect(detectDiagramType('pie title Pets\n"A" : 1')).toBe('pie')
+    expect(detectDiagramType('pie\ttitle Pets')).toBe('pie')
+    expect(detectDiagramType('%% comment\npie\n"A" : 1')).toBe('pie')
+  })
+
+  it('matches the pie header case-sensitively and as a whole word, like Mermaid', () => {
+    expect(detectDiagramType('Pie\n"A" : 1')).toBe('flowchart')
+    expect(detectDiagramType('PIE\n"A" : 1')).toBe('flowchart')
+    expect(detectDiagramType('pieChart\n"A" : 1')).toBe('flowchart')
+  })
+
   it('falls back to flowchart for unrecognized input', () => {
     expect(detectDiagramType('')).toBe('flowchart')
     expect(detectDiagramType('not a real header')).toBe('flowchart')

package/src/__tests__/theme.test.ts

@@ -131,30 +131,33 @@ describe('buildStyleBlock – font handling', () => {
   })
 })
 
-describe('buildStyleBlock – mono font (#1061)', () => {
+describe('buildStyleBlock – mono font embed (#1061, #1319)', () => {
+  // core ships no font data; the caller supplies the embed (svg-renderer's
+  // buildSvgStyleBlock supplies the real subset — see src/__tests__/styles.test.ts).
+  const embed = {
+    family: 'Test Mono',
+    faceCss:
+      "@font-face { font-family: 'Test Mono'; src: url(data:font/woff2;base64,AAAA) format('woff2'); }",
+  }
+
   it('never reaches out to Google Fonts for the .mono rule', () => {
-    const block = buildStyleBlock('Inter', true)
-    // The main `font` still gets its own Google Fonts @import (unrelated to
-    // this regression test), but nothing in the block should ever request
-    // JetBrains Mono from a third-party CDN.
-    expect(block).not.toContain('fonts.googleapis.com/css2?family=JetBrains')
+    const block = buildStyleBlock('Inter', embed)
+    expect(block).not.toContain('fonts.googleapis.com/css2?family=Test')
   })
 
-  it('embeds a self-hosted @font-face as a base64 woff2 data URI for the mono font', () => {
-    const block = buildStyleBlock('Inter', true)
-    expect(block).toContain('@font-face')
-    expect(block).toContain('data:font/woff2;base64,')
-    expect(block).toContain("font-family: 'JetBrains Mono NL';")
+  it('inlines the supplied @font-face verbatim', () => {
+    const block = buildStyleBlock('Inter', embed)
+    expect(block).toContain(`  ${embed.faceCss}`)
   })
 
-  it("leads the .mono rule's font stack with the self-hosted family name", () => {
-    const block = buildStyleBlock('Inter', true)
+  it("leads the .mono rule's font stack with the supplied family name", () => {
+    const block = buildStyleBlock('Inter', embed)
     expect(block).toContain(
-      "  .mono { font-family: 'JetBrains Mono NL', 'SF Mono', 'Fira Code', ui-monospace, monospace; }",
+      "  .mono { font-family: 'Test Mono', 'SF Mono', 'Fira Code', ui-monospace, monospace; }",
     )
   })
 
-  it('emits neither the @font-face embed nor the .mono rule when hasMonoFont is false', () => {
+  it('emits neither the @font-face embed nor the .mono rule when mono is false', () => {
     const block = buildStyleBlock('Inter', false)
     expect(block).not.toContain('@font-face')
     expect(block).not.toContain('.mono')

package/src/cluster-edges.ts

@@ -0,0 +1,78 @@
+// ============================================================================
+// Edges between a node and a subgraph that contains it (#1310)
+//
+// Real mermaid.js (11.17.2, checked headlessly) accepts `B --> Sub` with B
+// inside Sub, and `Sub --> B`, without erroring, but its layout produces a
+// zero-length path (`M x,yZ`) for the edge: no line joins the two, only a
+// stray arrowhead marker is left floating beside the node. Both renderers
+// here treat such an edge as undrawable and omit it; this module is the one
+// place that decides which edges those are, so the SVG and ASCII renderers
+// cannot disagree.
+// ============================================================================
+
+import type { MermaidGraph, MermaidSubgraph } from './types.ts'
+
+/** Collect `id` and every descendant subgraph into `byId`. */
+function indexSubgraph(
+  sg: MermaidSubgraph,
+  byId: Map<string, MermaidSubgraph>,
+): void {
+  byId.set(sg.id, sg)
+  for (const child of sg.children) indexSubgraph(child, byId)
+}
+
+/**
+ * True when one endpoint of `edge` is a subgraph id and the other is a node or
+ * subgraph nested inside it, at any depth.
+ */
+export function isEdgeWithinOwnCluster(
+  edge: { source: string; target: string },
+  subgraphById: Map<string, MermaidSubgraph>,
+): boolean {
+  const contains = (clusterId: string, innerId: string): boolean => {
+    const sg = subgraphById.get(clusterId)
+    if (!sg) return false
+    const inside = new Set<string>()
+    collectInsideIds(sg, inside)
+    return inside.has(innerId)
+  }
+  return (
+    contains(edge.target, edge.source) || contains(edge.source, edge.target)
+  )
+}
+
+/** Every node id and descendant subgraph id nested inside `sg`. */
+function collectInsideIds(sg: MermaidSubgraph, out: Set<string>): void {
+  for (const id of sg.nodeIds) out.add(id)
+  for (const child of sg.children) {
+    out.add(child.id)
+    collectInsideIds(child, out)
+  }
+}
+
+/**
+ * `graph` without its edges between a node and a subgraph that contains it.
+ * The parser also registers a subgraph id used as an edge endpoint as a
+ * placeholder entry in `graph.nodes`; one no remaining edge refers to is
+ * removed too, so the result equals the graph parsed without those edges.
+ * Returns `graph` itself (same reference) when it has none, and never mutates
+ * its input.
+ */
+export function withoutOwnClusterEdges(graph: MermaidGraph): MermaidGraph {
+  if (graph.subgraphs.length === 0) return graph
+  const byId = new Map<string, MermaidSubgraph>()
+  for (const sg of graph.subgraphs) indexSubgraph(sg, byId)
+  const edges = graph.edges.filter((e) => !isEdgeWithinOwnCluster(e, byId))
+  if (edges.length === graph.edges.length) return graph
+
+  const referenced = new Set<string>()
+  for (const e of edges) {
+    referenced.add(e.source)
+    referenced.add(e.target)
+  }
+  const nodes = new Map(graph.nodes)
+  for (const id of byId.keys()) {
+    if (!referenced.has(id)) nodes.delete(id)
+  }
+  return { ...graph, nodes, edges }
+}

package/src/diagram-type.ts

@@ -25,6 +25,7 @@ export const DIAGRAM_TYPES = [
   'architecture',
 
   'c4',
+  'pie',
 ] as const
 
 /** The diagram types this library can detect and route to a renderer. */
@@ -40,7 +41,14 @@ export type DiagramType = (typeof DIAGRAM_TYPES)[number]
  * routing and parsing can never disagree about where the header ends.
  */
 export function detectDiagramType(text: string): DiagramType {
-  const firstLine = splitStatements(text)[0]?.text.toLowerCase() ?? ''
+  const header = splitStatements(text)[0]?.text ?? ''
+  const firstLine = header.toLowerCase()
+
+  // Case-sensitive, unlike the other headers: Mermaid's pie detector is
+  // `/^\s*pie/` and its grammar keyword `pie` must be followed by
+  // whitespace, a comment, or the end of input, so `Pie` and `pie:` are not
+  // pie charts there either.
+  if (/^pie(?:\s|$)/.test(header)) return 'pie'
 
   if (/^xychart(?:-beta)?(?:\s|$)/.test(firstLine)) return 'xychart'
   if (/^architecture(?:-beta)?\s*$/.test(firstLine)) return 'architecture'

package/src/index.ts

@@ -21,6 +21,7 @@
 // ============================================================================
 
 export * from './click-directive.ts'
+export * from './cluster-edges.ts'
 export * from './color-utils.ts'
 export * from './diagram-type.ts'
 export * from './direction.ts'

package/src/multiline-utils.ts

@@ -30,7 +30,7 @@ export function normalizeBrTags(label: string): string {
       ? unquoted.slice(1, -1)
       : unquoted
 
-  return (
+  return decodeMermaidEntities(
     unfenced
       .replace(/<br\s*\/?>/gi, '\n')
       .replace(/\\n/g, '\n')
@@ -38,7 +38,71 @@ export function normalizeBrTags(label: string): string {
       // Markdown formatting → HTML tags (order matters: ** before *)
       .replace(/\*\*(.+?)\*\*/g, '<b>$1</b>')
       .replace(/(?<!\*)\*([^\s*](?:[^*]*[^\s*])?)\*(?!\*)/g, '<i>$1</i>')
-      .replace(/~~(.+?)~~/g, '<s>$1</s>')
+      .replace(/~~(.+?)~~/g, '<s>$1</s>'),
+  )
+}
+
+const MAX_CODEPOINT = 0x10ffff
+
+const NAMED_ENTITIES: Record<string, string> = {
+  quot: '"',
+  amp: '&',
+  lt: '<',
+  gt: '>',
+  apos: "'",
+  nbsp: '\u00a0',
+}
+
+/** Code point -> character, or undefined when it is not a usable scalar value. */
+function codePointToChar(cp: number): string | undefined {
+  const usable =
+    Number.isInteger(cp) &&
+    cp > 0 &&
+    cp <= MAX_CODEPOINT &&
+    !(cp >= 0xd800 && cp <= 0xdfff)
+  return usable ? String.fromCodePoint(cp) : undefined
+}
+
+/**
+ * Decode Mermaid's entity codes (`#quot;`, `#lt;`, `#35;`, `#x5B;`), the way
+ * Mermaid writes characters that would otherwise end a label or break its
+ * syntax. Call it on a single already-parsed label, never on diagram source:
+ * decoding up front would let the characters it produces (`<`, `"`, `[`)
+ * change how the line parses, and would hit `#fff;` colors in style lines.
+ * Unknown names and out-of-range numbers are left untouched.
+ */
+export function decodeMermaidEntities(text: string): string {
+  return text.replace(
+    /#([xX][0-9a-fA-F]+|[0-9]+|[a-zA-Z]+);/g,
+    (match, code: string) => {
+      if (/^x/i.test(code)) {
+        return codePointToChar(parseInt(code.slice(1), 16)) ?? match
+      }
+      if (/^[0-9]+$/.test(code)) {
+        return codePointToChar(parseInt(code, 10)) ?? match
+      }
+      return NAMED_ENTITIES[code.toLowerCase()] ?? match
+    },
+  )
+}
+
+/**
+ * Decode HTML/XML entities (`&quot;`, `&lt;`, `&#35;`, `&#x5B;`) in one label,
+ * in a single pass so `&amp;lt;` becomes `&lt;` rather than `<`. Used by the
+ * ASCII renderer, which (unlike SVG) has no source-level decode step.
+ */
+export function decodeXmlEntitiesInLabel(text: string): string {
+  return text.replace(
+    /&(#[xX][0-9a-fA-F]+|#[0-9]+|quot|amp|lt|gt|apos);/g,
+    (match, code: string) => {
+      if (/^#x/i.test(code)) {
+        return codePointToChar(parseInt(code.slice(2), 16)) ?? match
+      }
+      if (code.startsWith('#')) {
+        return codePointToChar(parseInt(code.slice(1), 10)) ?? match
+      }
+      return NAMED_ENTITIES[code] ?? match
+    },
   )
 }
 

package/src/theme.ts

@@ -14,10 +14,6 @@
 import { escapeXml, escapeAttr } from './multiline-utils.ts'
 import { parseHexColor } from './color-utils.ts'
 import { f } from './render-utils.ts'
-import {
-  MONO_FONT_FAMILY as SVG_MONO_FONT_FAMILY,
-  MONO_FONT_FACE_CSS as SVG_MONO_FONT_FACE_CSS,
-} from './generated/mono-font-subset.ts'
 
 // ============================================================================
 // Types
@@ -39,6 +35,17 @@ export interface SvgEmitOptions {
   styleAttribute?: boolean
 }
 
+/**
+ * A self-hosted monospace font a caller embeds in the SVG `<style>` block
+ * for the `.mono` rule. See `buildStyleBlock`.
+ */
+export interface MonoFontEmbed {
+  /** Font family name, listed first in the `.mono` rule's font stack. */
+  family: string
+  /** The complete `@font-face { ... }` rule (typically a base64 data URI). */
+  faceCss: string
+}
+
 /**
  * Diagram color configuration.
  *
@@ -418,24 +425,17 @@ export function styleOpenTag(nonce?: string): string {
  * Any other value is treated as a literal font name: sanitized and quoted
  * exactly as before.
  *
- * `hasMonoFont`'s `.mono` rule (class-diagram method signatures, ER-diagram
- * attribute types) never reaches out to Google Fonts at all — it used to
- * `@import` 'JetBrains Mono' from Google's CDN, a third-party network
- * dependency a published library's default SVG output had no business
- * making (#1061, filed as a follow-up from #1059's ASCII-side self-hosting
- * fix). It now embeds {@link SVG_MONO_FONT_FACE_CSS} — a small, subsetted
- * (Basic Latin + Latin-1 Supplement), self-hosted `@font-face` as a base64
- * `woff2` data URI, generated by scripts/build-mono-font-subset.ts into
- * ./generated/mono-font-subset.ts — directly in the SVG's own `<style>`
- * block. Unlike `font` above, this isn't caller-configurable: it's the same
- * embed for every consumer, on by default, with no network request either
- * way — a strict improvement over the dead-or-alive CDN fetch it replaces,
- * and the only way a *standalone* SVG (no surrounding host page providing
- * its own copy of the font) renders `.mono` text correctly out of the box.
+ * `mono`'s `.mono` rule (class-diagram method signatures, ER-diagram
+ * attribute types) never reaches out to Google Fonts at all. The caller
+ * supplies a self-hosted {@link MonoFontEmbed} (a base64 `woff2` `@font-face`
+ * plus its family name), which is inlined directly in the SVG's own `<style>`
+ * block (#1061). The font data itself lives in `@zombie-mermaid/svg-renderer`
+ * (see its `buildSvgStyleBlock`), not here, so ASCII-only consumers of
+ * `core` never carry it (#1319). Pass `false` to omit the `.mono` rule.
  */
 export function buildStyleBlock(
   font: string,
-  hasMonoFont: boolean,
+  mono: MonoFontEmbed | false,
   nonce?: string,
 ): string {
   const isVarReference = isSafeCssVarReference(font)
@@ -475,11 +475,11 @@ export function buildStyleBlock(
     // Self-hosted, embedded @font-face for `.mono` text — see the doc
     // comment above for why this never goes through the CDN-import/skip
     // logic `font` above does.
-    ...(hasMonoFont ? [`  ${SVG_MONO_FONT_FACE_CSS}`] : []),
+    ...(mono ? [`  ${mono.faceCss}`] : []),
     `  text { font-family: ${isVarReference ? safeFont : `'${safeFont}'`}, system-ui, sans-serif; }`,
-    ...(hasMonoFont
+    ...(mono
       ? [
-          `  .mono { font-family: '${SVG_MONO_FONT_FAMILY}', 'SF Mono', 'Fira Code', ui-monospace, monospace; }`,
+          `  .mono { font-family: '${mono.family}', 'SF Mono', 'Fira Code', ui-monospace, monospace; }`,
         ]
       : []),
     `  svg {${derivedVars}`,
@@ -560,6 +560,14 @@ function nextTitleId(): string {
   return `zm-title-${titleIdCounter}`
 }
 
+/** Same scheme as `nextTitleId`, for the root `<desc>` (`description`). */
+let descIdCounter = 0
+
+function nextDescId(): string {
+  descIdCounter += 1
+  return `zm-desc-${descIdCounter}`
+}
+
 /**
  * Test-only: reset the title-id counter so id assertions in tests don't
  * depend on how many titled diagrams earlier tests in the same file rendered.
@@ -567,6 +575,7 @@ function nextTitleId(): string {
  */
 export function __resetSvgTitleIdCounterForTests(): void {
   titleIdCounter = 0
+  descIdCounter = 0
 }
 
 /**
@@ -669,6 +678,11 @@ export function themeStyleDeclarations(
  *                              See #239 — forces no root `role` so the link
  *                              stays reachable, regardless of `decorative`.
  * @param styleAttribute - Emit the root `style="…"` attribute. Default true.
+ * @param description - Accessible description: a `<desc id="zm-desc-N">`
+ *                      after the title plus `aria-describedby` on the root.
+ *                      Follows the same rules as `title` (dropped when
+ *                      decorative without interactive links). Used for
+ *                      Mermaid's `accDescr`.
  */
 export function svgOpenTag(
   width: number,
@@ -679,6 +693,7 @@ export function svgOpenTag(
   decorative?: boolean,
   hasInteractiveLinks?: boolean,
   styleAttribute: boolean = true,
+  description?: string,
 ): string {
   const styleAttr = styleAttribute
     ? ` style="${themeStyleDeclarations(colors, transparent)}"`
@@ -686,23 +701,24 @@ export function svgOpenTag(
 
   let a11yAttrs = ''
   let titleEl = ''
-  if (hasInteractiveLinks) {
-    // No root role: role="img" or aria-hidden would hide a real, focusable
-    // <a href> descendant from assistive tech while leaving it Tab-reachable.
-    if (title) {
-      const id = nextTitleId()
-      a11yAttrs = ` aria-labelledby="${id}"`
-      titleEl = `\n  <title id="${id}">${escapeXml(title)}</title>`
-    }
-  } else if (decorative) {
+  const named = hasInteractiveLinks || !decorative
+  if (!hasInteractiveLinks && decorative) {
     a11yAttrs = ' aria-hidden="true"'
-  } else {
+  } else if (!hasInteractiveLinks) {
+    // No root role with interactive links: role="img" or aria-hidden would
+    // hide a real, focusable <a href> descendant from assistive tech while
+    // leaving it Tab-reachable.
     a11yAttrs = ' role="img"'
-    if (title) {
-      const id = nextTitleId()
-      a11yAttrs += ` aria-labelledby="${id}"`
-      titleEl = `\n  <title id="${id}">${escapeXml(title)}</title>`
-    }
+  }
+  if (named && title) {
+    const id = nextTitleId()
+    a11yAttrs += ` aria-labelledby="${id}"`
+    titleEl = `\n  <title id="${id}">${escapeXml(title)}</title>`
+  }
+  if (named && description) {
+    const id = nextDescId()
+    a11yAttrs += ` aria-describedby="${id}"`
+    titleEl += `\n  <desc id="${id}">${escapeXml(description)}</desc>`
   }
 
   return (

package/src/generated/mono-font-subset.ts

@@ -1,32 +0,0 @@
-/**
- * GENERATED FILE — do not edit by hand.
- *
- * Regenerate with `pnpm run build:mono-font`
- * (scripts/build-mono-font-subset.ts), which subsets
- * third_party/fonts/jetbrains-mono-nl/JetBrainsMonoNL-Regular.ttf down to
- * Basic Latin + Latin-1 Supplement — the self-hosted, embeddable
- * `@font-face` packages/core/src/theme.ts's `buildStyleBlock()` inlines
- * into an SVG's own `<style>` for its `.mono` rule (class-diagram method
- * signatures, ER-diagram attribute types), replacing a Google Fonts CDN
- * `@import` this library's SVG output previously depended on by default
- * (#1061). See that script's header comment for why this subset is
- * deliberately narrower than the site's own (demo/components/generated/
- * mono-font-subset.ts).
- */
-
-/** The self-hosted family name every consumer's font stack should list
- * first — matches this subset's own `name` table entry. */
-export const MONO_FONT_FAMILY = 'JetBrains Mono NL'
-
-/** The `@font-face` rule embedding the subset as a base64 `woff2` data
- * URI — no separate network request, no page-depth-relative path to get
- * wrong (see the script header comment for why data-URI over a static
- * asset file). */
-export const MONO_FONT_FACE_CSS = `@font-face {
-  font-family: 'JetBrains Mono NL';
-  font-style: normal;
-  font-weight: 400;
-  font-display: swap;
-  src: url(data:font/woff2;base64,d09GMgABAAAAABvAAAwAAAAAPWAAABtwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGkAGYACDNhEICuRsz2ELgyYAATYCJAOGPgQgBYREByAbWjAjEcHGARCEduZRlMfRhcj+eWAbMx8MXsFY1AMYgxQLh2GYMVuWSbQZOjzvQhHrXnbH28KzVPg3QpJZomrI6lliLI+KSSeVPYryGIWmPDYrgaI8OLLE8fIV9/c6y/e+ZNB7khbIPiKu+INtefkIygBJXcZuFw+Bd3fmquSqTJ+0GZ7fZg+wWJs7K0AUEQHJD5//iQ+S309/SlLBBtTtTnc7t3bhLlxduEx3nbtd9Lz0omqTc5mf7DQLP00WgKwmeiAKtX1uOXD1m1fn56okB8lB6wJO7Z8Opg7bqe/enmXs3EmWrFiWq4A+OTnKTz74OFCwi3by/3t2iVFFoK29qd2IthumsRuv5Xn6e1P/ycxLsdVgFa8K29qdH9DYWoB6t0RxwVKIsolbF+tMMrFCOoWXa82cBTkvrXqlGUCkBSmWlle2L8Cg7fNXktAIFKNoUCxjQbGaHYUWR7FZBsVRWY/ipJrCrkymZYO6nIcBR5tZcoafBSsL9MHZOmiHe0D1qMY169//GZD7sGUAoFx/yQfatPi2mSk5ooSsSbQx17Jy+Db1SxKE8aTWuFYD7VPayMwe5T74XysImHYWcGebWTc76pJ7HHCbGbucsMV+m91iqylnnXbGDnejcBCXr0KRYiXKVahUpVotlmZsLThaCbQTEpHY61b7XHSH50ihVDQwRiZmFnZOLm4eXmFRMXE9EgYMGjIsY7eH7HHBIdsddswRxz3sPs+634g7nXe7B7zgQeess97z5txr2mWTRt1low022SmbYEmwxSWxcsuVyldmpeuUWmoAhjr1GjU4iYmPqw2PWJNuCjIQJTkYQs1AR6+DDa4TQYsU5OMXEnBKl35JvfqkRKRRYGuWAzwD5AHwBgy9AuPzAHQsA6g2F22ArcaiJK4FLOGUTfjczAOi09DoW3devO+kaxMaMa8gmnNPE88T2D03jpQesXjo+WQRF27Tt5wdHcEoo7TDA4JxlJjjLGRDj8UmgjlF4RiYpa9Nr1NqlzlOnwlLqNR3aYDrlnrxyvJlfnUiwY7vVPolzqhkudc/tZz68DiHq/w+E/R2Bropp6LvsiryPX9oFRUdp8BvtcqR7CIEljGybitd4ruc7rukT/USp5/rkpd79y6sKFzS297oZdW3bV9AVbVqbEVWvNXyckZjXtK24167T7KvPySRHH0TsyHX4Hml8T5eBXzPCH+oy/YcP2IVSWmpc4SYu18gsbiXXbG/z+0x13MtaZIB68OiuoUN4HoPCFiBkC7evAOLOMZFDiFbAtd4cUuU46LESBDZpLWxINCKJI9F1FJgIEL+yPhsWiHIncwpme575DUoqWOTewANVUiYELRy/RO3pFfZItSupWVguD7kgQsIROA4PoueKBIyhIxjLNhimywSjBwj9IBsBpHtmAsdCvuxKeBMlnKiv2Y8kNlAyI1kz+BMSP9L+EnW7nZPJ1nXeWUqJwYLvTVsWDjXnC9fdrmY5Tmajwpnsl4El4XXsg1kznl9lEhYzay/WxAZZCqcsVEXnknVgaxQOfWpbhIXTCHqqHHqTNPdLCMpbjZYPaRTVaWcd/AGN0oQXW8dZw/x9B45OOD8Zlrtvv31r989wDzV7Re9OlifPAc5Vp2FqvZSb+NPhd5drG7JpyRbIS3b+aP99Q5uWjBuc9GDzR6ogjm7ZoyUgtGHepyrE9JBzNDVHQhdFpIxBJv3gSLZ98DXrgEIQshFnGarRL+9LOBhmQAWBiRNG29iEAHFGCQfEcER6/ERIw8A/t02Sq0rOixukCY4wmD+muTjZAhCQI4zkPWziP1rZCRyXUAjDcUDMNPcVh2nJRrNCw1I9eiOsNIIBe0a7gJw1SX69+e8n0n/If5h4GzQw/X/i107vaGDjEzRGfdx+kiNxz1AHPF7LqUkY41tnmBQ2BuZu8HVCKMR2gqB1yY53axDZkje4gE7kWbfb1oXKEbzO8zQWRH9dbmghC1bONNchvbTxSwvAehKLQtMuBCcptpZxrHVzKnbWgkdR/uICkx8z0wlGCTaE5HtZaO3OoQtaP0YEEZZlUOToc3G6E4/T1Zc9SZpt0VUMCDcVV3jH+1/ZMjlzzIEA4RkEmJ5wm5Yxg0JJmleMuYIHujwjnTO9L5IJtYfnyQ7QW8TIdRyu6MbhFOZdOvHjK+adNvnNrxXSmXq2GZObgLrtU0Fi9sZ68KCdoriWgKAhR3jcT0LMetcKHpIzLeBWwmdlVuj862GEKqYoUYXYI7J1aB0GDw7kQZT6GLUg1oHwvbQPSTRMI8yBl88Q8cJdO8IUnpDuuFBbozvlV0RXqMeuriJ1wMjC6aVlgeuagm0NzZPDjhTtWdmdO6CNd7mwhgpNrNJgzEOhtJgnzcXy1Z1g+qWMd0L8R9+Qsai1gJky00glgdozpR8yAyQBzSy60cQkhmSYVM7Ixm3UJJIGmV400psSVeuloAjOWB6Bs3kEYIuErS3mIG17CGtXHpqOgSgw3vBJ0oAZ665B5LZxtbQWEAYYb58CGFfBZzZdB7NHGmZQUqUv7SquY7z8jlZCNFB/vj1XGv6Bo3JgS6BCrFirdTDI8uRoeHfCgajzR5t9PHhMG3UscnQ3VFEhjCcOjEbbpQ8qg85RdNK6t1qrw6SYkP4MZ3ldKA0GSswd61+4R8bf+afGmeDuoGnbOxo61qqsEem1mi3xq5WVTfmCLJ8GA/S3UP0TRt91SEmu/gAudfkEfZG7X76sFz+XAw2ByxOTOk9CB8y/YHyKw1fvRQHK3HYFA/QA6XtzdqwVG4+d7PRrKS7g005zjSigW8fMnRxRfu9aeKG35+/Mgm5kE+1rjrQrG8qhS251jwORdt6nbozX9w0a+QlEJZTqql9cmMe5e/qatQcukutYVOwThBJmBoZHRJ1ACu1L/xlxz1VM57xn2C0Ssi7q5dnT2M09YWVe2kG6nzi+zjEA4OMZ0KrBf2Aw0eRMDXHwi8HZq3R65RZI9VqnWpc9oTgeSKQDVjrL9l8olXT1hzWhI2wqwmboeFovbK1MbSRkbPlDM3o8mITq5N7hVOIWwmeK6rT+8XT/W0CCALOUm73b3XLdyoTlBsMxsO0V8SD8Y9tOJqECYjqcq0DNobGQHPOSU/SgbXd6RhyRU1aH1Us0oxrerqYAx7oyzUVfA/pBXeZLm4Lna76lVVrleOc0PBMVfeW6esxHFyOU9ZUVYRDBZPaFDhmFh4KrkmM1GnXubN05M22m2OZMVjSlo8q2hsiZmIXZL65XOsiajVdjrO4VNa0UgkP1GrDWIVVskQjIAHiT6YxUHFq+lWC44HFIq/RuhSI0hHa2qxZbTUs0VGkk2Cdi9YWsb/bQlhX6J4Ou03T3EDnVIuQzta2ZS4O+3nC+m/v/Kz3mvhZs/rZsPxZ1/z9rJh0L/jpbhCMf/R+q0C9m+t/XctXffrIe+5/VdNB8er6/76rfeD6lfumU3J74wvC4htTEuCffzk6FPFIMM9W2mGE12BqDaT6ohsOjspUCqEQVcjGJONKvUom1xuU40BAj6YHw4awsCioh0IkjKggSKWCDTCgCSBFMmT9iIBXXxBjJUeX5if4KxH9ciJBMD+GMI2y+ea0rawObRMB3/zDurhQElLXqyVhvB5d2BpRGTpU9Wh3tUaAz0oYCYT6O/+xz9gHovOHCePHLJyVZSRAcP4s4fxZTsg0gGu6hsLGhLpVDUdvJb6/x/xG/zwp+VpC9lX8axzky28T3UZsBDVYSk+MjcRJNaZHEH0vqfPIvPiqEeCbJ2V9B6ThS8FHVnefwBOdYHKe3GwggH5+gw/qgjbMuzw86prsmwQjqyxDg7kd2eciHkDOr/pg6LosPRVv2OdaN3t/aCVNxdgH2PTw8HBSlMyscJlJiGshHIJ9BmApUwKiBwQajRv6FIbw8GDYN7TIrh3PExpPrs+RZOllUsWH2z7SnZOr8yqpm67e9AfwzX8TX5UJh/W1i+9qmdgFYXoFjOmgXYCcJ2f2qrp4Qo/cO9IX2Xspa68MRcQSlVK6FxyZi5/Mms6OjWbCSFjs2O4+qKURfeaxhb8grEOBwJgegtCBEYX3uQX++QU01C70Kw3GxKe3wpEdwtWiTZslakwGqbWSzYBLT04MhkmFWYPAHTpZSyvy4ECVptASx2QCl79NAQfahE4pyVfDQiEK81nHk8PV+kJ8wNS1ehhc2zwmviae2wzY9HjvUKiALJDLtAo5pJXHz2E4OQi+f/Cqb/zHJ1e4RKIC95NjP/gfugp6nVdtkvI2GpZVlIO16cpDaLRFLlZUlPXay8qt7qvDKINHQ/LzaQiKMQDr1eFnunuG3l7LJA3Mtam3I8+EXh3rHv9iLdNoZKyd+BJcy3/3ua7t7PteW7ny4/tK5id/PnCQeo6GuCv/w7UR4B+6igTMAo6xs1l4kt070v5bPpmFDNh90WTQeb0nSk05ZG1GlVkpNs+2RFtanwIX6Gin32iwkepOY5O8ptpZY0UNuJynbtPpkLZW1OrWTX+QZJlqanQ1dtTaibIR3tiYlpcxbzU1mmuq/Y27LbX9jUlrta2FvQ4Y6bBVHqMkyHlyljJOyeAK2BbqDx4IhPqHzNJ/1LOav6ViRAvPwIi2P4MxbSY8pgxmYlQX2YBKJBAmX3s3jKkhCSqtJ6muTAy8QoBjYuyHC9KoT090MZ0I9wcOBEP9NhhXZCiU8VlynkxQYlZ5tVmiNAR1r7VE+rdmVv0PaKZrusWSmFrdHg6IlC1HDiyT/noJIQ8a8TGxLtzz6C0aPNFmHnq0fTuCSXviUq0VMVlRlPsQuPACNj00mume7MYPegjtEgj9SNjdrtBiMj7C7CLzNGn8LSOoQFWYQqHCUPD2llliNo12GvQHiAOILL1ALGwBs3PEfq6dw6d4aEPmdsgR6g1kAqF+B2QWD1GDHqYt3uVZ0WB2KuHCqGRCAngc+FxWUuJGSGkLxdwpMgLDKpEE0SIB4CCenDxH0N+4nwCeOWIc1qgVd2cRgdzQ2HAMhObJ3Ym9H3efz36gOnHXr72/gfEOpx377hHiOmWds+YkAeRMSwdVs5TZUHqIEqEzhbBFedB+qPb3ivLfag8bpkx5xemBj0kmdK8bVirZuZFMumdNIp2KRtVJrOnxPGErpEKRm5GsAsnUOwStgIMPn1fPjCI7N/E+9NpGFnS7T54m7tjC/Syfc7n69za5Sg2vWSlXaRQzxfyXG/4G3rk4roBtob5ghDezKqK0Ax37o7UdufPE+jZp21rrkRaOfcdYOjDnNqJFraPBcB+R2Pt79Y8285n9CzmJ/AWGmGSCGjUqEKcvHuSS3FUjkEKNBEBxri9KmEgmyWvh97J0SN7u4jGFSakPd7pa8KhF6a1gNLW0Shtkuu2FU4XT5qjdB3wlinZfQKBU+lvbO8UQ4pHT5s3dernYGxaoZEQbbNLJZDqdU4q3ClWo8PkVqbSSEhDRdFpU6juJO/eT+xeIBXUFtXyWAM304PBQKEAG5EpMLEEw+YJnGeVPDzBCY8Oz/7Yh702XLOjdJljtYVjE6xh2sEIj1Kwj26IwWj5hO0O6zuBnROAboIEVYI0RvQHwnyi7Z1Gy70TyeXHj81h9z+LHS5Mjc8kX9ZJvrx8/kuDCHP7mi7TQTbb0u1zuu5FVtmD+VUCSgtUtxC5SulpLgPzHOYHGxgkeWbmyuapMWMvXPs8Tftj8JFdM2891NM5Vl5FiTkkpYD/U/hUX537Vni0VVwoqcTXgCQDf3DwZgCGtWAJr4QDJdCdoDX4Y/q8h9EcC2PRZQ4EKu8LtKpNcb+KiQj/miA/6uXxpRfmS8vYNr1gKnohnZE/f0n34+hs2HySA0/YzbTnb1SzXYJAC08MkNTyWjsRGh8PtkrRG99QVEwFq6LGRoRAp12rlhPPRWsFqufhwC3Gz/dwDnpzuAS8/NDoEpmcN2+mn48WPNf54kTwMGFUeAEeu1sqejWwgeJRHRmP9AzHO9mVsoWNJGdSjbauPfn68NTonqX2MV412SUQRFQYleyDMiuIOrRZ3oMULBR6hbSoZJZ97xU7ZANh0bUIo61JqLRF0EW2b2i2TCp1dbUokOMsxmV/dRkMXhYta5bG3R6g9J1GjQqGWJWLNiGBWUQCxGuQKC4G0Qv4NgSfnJLV3ETXKgEQYUemgRALS6hKm7WnAjs/jbRPotGabvSONdd2YRsH+CfM9d7RlSuq/rq9b3KAru0vT0NSiqdvR3HAHPDX6HgrYq3SeTpWOUcViVTEYlawmbcr1Jlqpz3jv0RtlKk8nyF556zX+6LeiohNvYlq5o7A394lSx59XF5AxjbaRXcmvbBvkhRqFSCJrnF99eaNPsOjAbSX9/EqbhYpfbHxMG7Fz+MRZ7caHVqQ98lfB3p0yrZQrLzVXV5lLi/tSWSXF4dv5b4vt6NNjzVyt9MrO813ufGw643I94wqjfTD1l8Grd4l4fVoeYO9v2l1Xt7sJ75915KQMavc2QzUna4oife7rkXK71LcWU5PtluJ3y/LLnKrKj4aVBWWg4uK5Hq+1Shcq1fHFVGIxFZhvneQjBgyCDBg64ZjA4u2SoErKJe3CVFBe3bVcrPipdEJg3JKFcc6eLlTG9QiyFs2IIc8HOB/XtCG+x58UzH1Ykmwst/Q2Zq/u78AKJ+wThc6OiURxr4FMX8mHc4I3ziO+k/fFf778/vvLLgAb81UXGq6dC6F9M8MSPvvV+dLhFczGvllg6C8RnA7qIDiz9346tqP69sv7Lu3LUKpy/R+w8cetlyz8icn7P0iNuZBlftvGsVyyWggRFlyM9wVc7nd3O3Msyw5p1qBpPI2u0eRo6+12ujk4hyuTkWtAMUNO46DmjhT5jGuVQaDfViaT1x3aLLWwGqXazTPydLORA7mZLR0Z8GXOohP4BPJI7KRbDIYCAi/2n/4N379k/01wGy6eyG+nwVQtjuAAihg/MoLLjY/+8MgPPU9+9+RPjjyZLIL8QO3Hx75PXHAHSnbfFwDO5LLjOWywYmq9nR7p88x4OpT+aVkvX2fPiUWonSRH/PTM02IOSe2MRew56/bZ2vnI/bfez20H3w85ne8p4G/t9vcJG1AiKxyO712ufyDl/zbbiwSxoKjO+8JuB0pJh1Eq7TBKGBfZTCb7IiiYWufPTfZQHCTvjDPnmKEE7+3Aw9223PXydURupBt0ktxFz/w5ri+x9huInl5X3ro9d3O46JXP7snesyTX29bSijw8B4zRVBGrtFzXgxuvviJhOtKRcCQVBe4gH4XEsj+F9anq7+/HD9WXsOv0DRMpHEBjxifLI8zet3bdijx79taNP7mKXAWuBbRH8UefdH+5YP+m+m114/a67dump+sjNDDBRgXYlxnv1NW9w2A+l17uc98dNk4bn/3hygfse/Gz+Jkf0vsH7IhLuJu1ZPimylzhHvLMW1FARRDF9Fa6Im81wLAHFvQ9toUHMHDnfZMQPv0a0P6PQTpMxigtOXq1iCvGHOsSTAfdPSZgtV3cYD+/oXOQkn6qSfrGuhQFvO9EDPql6NLORnYAdi/v/OmqId81+npVfTVaXV/1WELfOWLwqZQxCdeUmqq6p0x15X/JZXVAM+eYwDSTbvumnfvWpCYnU8stDtLQ4XTpMgYtjjQFp6iYw+7ByUi6xx5NpvwDxjoOc5o90nInk3lXS4Y9Dd7Kc8fibinuCRppc0JMrAu6zGKC22qXuvmWFsZ3zMannviHHI7uODf9UKTrxiOlBIuBS1MCdPyuKm5SIBWcBP/Pfe3o8Ztwc4/Pge8gd+A7QMFeb5LQBevGuHz+dlZD3UrvsrfVAkYHSybTiaiQ2CgxxJwuvjVmzlEFFQWN/FYjs1bx21gJtgQPKWRqzcdUtKsJEVgSpC/Lfo8YFdbfzehYcu+NAuaxYsDuN6UgZa9+Rq/sTUEm8/AJGL4tntzTynNIZ6Q8u4crlysaMWKOgAexSzRw+2R750gk6smHloOyclA+qW4ZKEfbX8cts7foB/G9kku+f56/AinRl23a+9HbENmUaNsjorL3ylq1CLAfVxM4ghJWtVqKKLIqVGLmRyzWApPxUzHrj+D//tPk6abHx8lxD5eV4KHNlbWVVXWVlXVVU/Qf7AL25trOaFOitpZ4jjqBan1qKto/BQbXJ6ZCA1Pgo/Vbp2xTU5FOs9UM2EERCgsEKkSF114OKioo5eUU99UB+GxLlX1/Jr+qvgqt4uSzTvZIAbM7jIgRbP3zdLy6gNT0p+hgvc4zbGGRoNmWhStpzeQIVYXNZL7/O5rLIlzyxeaYgAIAyAUWNQzOsm2qGzayTaol7pQLF8QyeaIPDIiGATaEKRIvsQMugUvgkni15nitBLgWroVr4Vq4FW6FW+HWuAhS0sNTavdZtkr1wyibUG1xrVzoIDB5qfBkLOoGGCFIWVJWge0wUDalDsfV8jgCQbBwSEgdj3usgr2wF/bCXuGFlBtOwAk4ASfiwyLRYS4tdyH8OUuGRRz2bFaWD1wNu/vGOeqdHx4refhUHpVnC89n2/n7+2FtJvN9/89F5G0AuOhdawXKP2Bd40fWdfzQpfP6e5mo3vPoLFSJj/ML9QVAjv78NXf7XYDzqIfOoYpcwf/Po7NorR6oLeqv/rXy4SE6FE1jCchlkXUR1A7MHEAt+D3Ug0vxYTPlSRjnXerILH+eKx5ycFz8UD6q6ehI1I6rDr7bgW/Jwt9z1LbU4duk7MzZPF/z/M2UfwQTJmpL3u2gw+HakAyNvoRqrnl1ue78o/rKlSbE3cpQgDp5aQzG+4PL5f/1Lrf+Afj6if8Ec6Vv/DP5/1D9Z3cBugmAQPcfnwd1erB8LfgM8doZB0ek7pevin+7D27RXlHBuHkfS0A4oibpQ8JebvVxYyQ8fpEivhDhK8Iq9Rz7Vau+69PJBXvMDnfF9jzHAUKqyItvL7v62GlxgaE4rp/CdZNIdfjHPkY6537+4JgpGDBCEFFhM24xdTcbzHvNVVfKgsmkaRrUxwjuTxonKGIm2xC5Kgw7/VUAN3b0ouqhEg9F/Rv0+i7WNrAuw0kpjTkcZGZ87WMVwB/DdgbTqvlK+2iETDiYL20eXxFpXm66pmu6lvs/CvCc+wywyupZ6VijjHP7Y50OgKc05FtoUMSW4Pt3y7LApS3bJJNbMVIrs+Jwf4FDMRkqKSEJA9LMBh3SJ2dhwkGI6TaiT0iKU0xKWoJ+/TX4Wgm0aQd5/oyMuJAREoP/k7YyIT/LKJ5WEk20zy7GIRQ9qrAm7YWa3K7Jt6YmrPHcNFCBHAifTVS3pYbykNWHyxO69bhj8Ql/ILLsb4nYhF0o41JgJS/ZEQkc9ZPuegalpIlkRNaQt3MZLq5uCap+ZWlYq0h0VP24evYJ1/16E5rXbdc24AMC) format('woff2');
-  unicode-range: U+0020-007E, U+00A0-00FF;
-}`