@pascal-app/editor 1.0.3 → 1.0.5

package/src/lib/floorplan/floorplan-extension.ts

@@ -27,6 +27,11 @@ export type FloorplanAnnotationRole =
   | 'structural-grid'
   | 'column-center'
   | 'room-label'
+  /** A room's finish / ceiling-height lines — detail under the name, off in the clean plan. */
+  | 'room-detail'
+  /** The roof plan proper: outline, ridges, hips, slope arrows. Off over a floor plan unless asked. */
+  | 'roof-plan'
+  | 'roof-pitch'
   | 'stair-annotation'
 
 export type FloorplanSchedule = {
@@ -85,6 +90,8 @@ export type FloorplanNodeExtension<N extends AnyNode = AnyNode> = {
     nodes: Readonly<Record<string, AnyNode>>
     levelId: AnyNodeId
     unit: 'metric' | 'imperial'
+    /** A drafted sheet's schedule: marks match the sheet's tags. */
+    drafting?: boolean
   }) => FloorplanSchedule | null
   linkedLevelIds?: (node: N) => readonly AnyNodeId[]
   resolveForDrawing?: (args: {
@@ -98,11 +105,30 @@ type FloorplanGeometryMetadata = {
   annotationRole?: FloorplanAnnotationRole
   annotationObstacle?: 'bounds' | 'outline'
   renderPass?: 'overlay'
+  /**
+   * Annotation text only: the size to print at, in paper points, instead of
+   * the size its role implies. Lets a sheet set a room tag's name larger than
+   * its number without inventing a role per size.
+   */
+  textSizePt?: number
 }
 
 type FloorplanContextExtension = {
   automaticDimensions: boolean
   purpose: FloorplanRenderPurpose
+  /**
+   * Sheet drafting (the Sheets plan viewports): kinds draw the permit-set
+   * convention — fixtures as labelled linework, furniture as light outlines,
+   * no raster sprites. Only `collectSheetGeometry` sets it; the editor and the
+   * read-only viewer never do, so their plans keep today's look.
+   */
+  drafting: boolean
+  /**
+   * The editor canvas draws room labels as screen pills over the plan
+   * (`RoomLabels2D`), so zones skip their drawn tags and wash there. Exports,
+   * sheets and the read-only viewer keep the drawn tags.
+   */
+  roomLabelOverlay: boolean
   metricNotation: FloorplanMetricNotation
   wallDimensionReference: FloorplanWallDimensionReference
 }
@@ -156,6 +182,8 @@ export function createFloorplanContextExtensions(
     [FLOORPLAN_CONTEXT_EXTENSION_KEY]: {
       automaticDimensions: values.automaticDimensions !== false,
       purpose: values.purpose === 'document' ? 'document' : 'edit',
+      drafting: values.drafting === true,
+      roomLabelOverlay: values.roomLabelOverlay === true,
       metricNotation: values.metricNotation === 'millimeters' ? 'millimeters' : 'meters',
       wallDimensionReference: normalizeFloorplanWallDimensionReference(
         values.wallDimensionReference,
@@ -171,6 +199,8 @@ export function readFloorplanContext(ctx: GeometryContext): FloorplanContextExte
     return {
       automaticDimensions: extension.automaticDimensions !== false,
       purpose: extension.purpose === 'document' ? 'document' : 'edit',
+      drafting: extension.drafting === true,
+      roomLabelOverlay: extension.roomLabelOverlay === true,
       metricNotation: extension.metricNotation === 'millimeters' ? 'millimeters' : 'meters',
       wallDimensionReference: normalizeFloorplanWallDimensionReference(
         extension.wallDimensionReference,
@@ -180,6 +210,8 @@ export function readFloorplanContext(ctx: GeometryContext): FloorplanContextExte
   return {
     automaticDimensions: true,
     purpose: 'edit',
+    drafting: false,
+    roomLabelOverlay: false,
     metricNotation: 'meters',
     wallDimensionReference: DEFAULT_FLOORPLAN_WALL_DIMENSION_REFERENCE,
   }

package/src/lib/floorplan/floorplan-mode.test.ts

@@ -62,6 +62,8 @@ describe('floor-plan mode', () => {
       openingMarks: false,
       structuralGrids: false,
       roomLabels: true,
+      roomDetails: false,
+      roofPlan: false,
       stairAnnotations: false,
     })
 
@@ -107,6 +109,8 @@ describe('floor-plan mode', () => {
       openingMarks: false,
       structuralGrids: false,
       roomLabels: true,
+      roomDetails: false,
+      roofPlan: false,
       stairAnnotations: false,
     })
   })

package/src/lib/floorplan/floorplan-mode.ts

@@ -58,6 +58,8 @@ export function resolveFloorplanAnnotationVisibility(
     openingMarks: false,
     structuralGrids: false,
     roomLabels: true,
+    roomDetails: false,
+    roofPlan: false,
     stairAnnotations: false,
   }
   return interactive && context.referencedAnnotationRole

package/src/lib/floorplan/floorplan-pdfkit-document.ts

@@ -1,7 +1,13 @@
+/// <reference path="./pdfkit-standard-fonts.d.ts" />
+import { getProjectFileSink } from '@pascal-app/core'
 import type PdfKitDocument from 'pdfkit'
+import { downloadProjectFile } from '../download-project-file'
 
 type PdfKitDocumentInstance = InstanceType<typeof PdfKitDocument>
 
+/** pdfkit 0.20's browser-build export, which @types/pdfkit does not describe. */
+type PdfKitStandardFontRegistry = { registerStdFonts?: (...fonts: unknown[]) => void }
+
 type PdfTextOptions = {
   align?: 'left' | 'center' | 'right'
   maxWidth?: number
@@ -9,6 +15,124 @@ type PdfTextOptions = {
 
 type PdfShapeStyle = 'F' | 'S'
 
+/**
+ * The faces every exported PDF embeds. pdfkit's standard 14 fonts are
+ * WinAnsi-only: the ≤ ≥ ≈ → △ Δ ⅛ ′ ″ the sheets print came out as byte
+ * pairs of the code point ("≤ 195 mph" printed as `"d 195 mph`), and the
+ * fonts were not embedded at all. Liberation Sans is metric-compatible with
+ * Helvetica, so every width the sheets were laid out against is unchanged;
+ * Geist Mono keeps Courier's 0.6 em advance. Both are SIL OFL 1.1 — the
+ * licences sit beside the files.
+ */
+const PDF_FONT_FILES = {
+  sans: new URL('./pdf-fonts/LiberationSans-Regular.ttf', import.meta.url),
+  'sans-bold': new URL('./pdf-fonts/LiberationSans-Bold.ttf', import.meta.url),
+  mono: new URL('./pdf-fonts/GeistMono-Regular.ttf', import.meta.url),
+  'mono-bold': new URL('./pdf-fonts/GeistMono-Bold.ttf', import.meta.url),
+} as const
+
+export type FloorplanPdfFace = keyof typeof PDF_FONT_FILES
+export type FloorplanPdfFonts = Record<FloorplanPdfFace, ArrayBuffer>
+
+/** pdfkit's built-in faces, used when the embedded ones could not be fetched. */
+const STANDARD_FACES: Record<FloorplanPdfFace, string> = {
+  sans: 'Helvetica',
+  'sans-bold': 'Helvetica-Bold',
+  mono: 'Courier',
+  'mono-bold': 'Courier-Bold',
+}
+
+/** A glyph the face lacks is taken from the other family at the same weight. */
+const OTHER_FAMILY: Record<FloorplanPdfFace, FloorplanPdfFace> = {
+  sans: 'mono',
+  'sans-bold': 'mono-bold',
+  mono: 'sans',
+  'mono-bold': 'sans-bold',
+}
+
+/**
+ * Symbols the sheets print that neither face carries, drawn as linework in
+ * the text's colour, with their advance in em. The warning triangle keeps a
+ * real "!" inside it, so the text layer still reads as a warning.
+ */
+const DRAWN_SYMBOLS = {
+  '⚠': { symbol: 'warning', advanceEm: 0.9 },
+  '▸': { symbol: 'pointer', advanceEm: 0.5 },
+  '∠': { symbol: 'angle', advanceEm: 0.8 },
+} as const
+
+type DrawnSymbol = (typeof DRAWN_SYMBOLS)[keyof typeof DRAWN_SYMBOLS]['symbol']
+
+type TextRun =
+  | { kind: 'text'; face: FloorplanPdfFace; text: string }
+  | { kind: 'symbol'; symbol: DrawnSymbol; advanceEm: number }
+
+/** The SVG `dominant-baseline` values the floor-plan geometry uses. */
+export type FloorplanPdfBaseline = 'auto' | 'alphabetic' | 'middle' | 'central' | 'hanging'
+
+export type FloorplanPdfTextStyle = {
+  fontFamily?: string
+  fontWeight?: number | string
+  fontSize: number
+}
+
+/**
+ * SVG text's white-space handling (`white-space: normal`; the geometry has no
+ * way to ask for `pre`): runs of spaces, tabs and line breaks print as one
+ * space and the ends are trimmed. `APN  06075` reads with one space on
+ * screen, so it does on paper — and is measured that way for anchoring.
+ */
+function collapseSvgWhitespace(text: string): string {
+  return text.replace(/[ \t\r\n]+/g, ' ').trim()
+}
+
+/** pdfkit keeps the current face's metrics and its fontkit font on `_font`; neither is public API. */
+type EmbeddedFace = {
+  ascender: number
+  descender: number
+  xHeight: number
+  font: { hasGlyphForCodePoint: (codePoint: number) => boolean }
+}
+
+let pdfFonts: Promise<FloorplanPdfFonts> | null = null
+
+/** The embedded faces' bytes, fetched once and shared by every export. */
+export function loadFloorplanPdfFonts(): Promise<FloorplanPdfFonts> {
+  if (pdfFonts) return pdfFonts
+  const loading = Promise.all(
+    Object.entries(PDF_FONT_FILES).map(async ([face, url]) => {
+      const response = await fetch(url)
+      if (!response.ok) {
+        throw new Error(
+          `[floorplan-export] Could not load the PDF font ${face} (HTTP ${response.status})`,
+        )
+      }
+      return [face, await response.arrayBuffer()] as const
+    }),
+  ).then((entries) => Object.fromEntries(entries) as FloorplanPdfFonts)
+  pdfFonts = loading
+  // a failed fetch is retried by the next export rather than cached
+  loading.catch(() => {
+    if (pdfFonts === loading) pdfFonts = null
+  })
+  return loading
+}
+
+/** SVG font-family / font-weight → the embedded face that sets it. */
+export function resolveFloorplanPdfFace(
+  fontFamily: string | undefined,
+  fontWeight: number | string | undefined,
+): FloorplanPdfFace {
+  const family = fontFamily?.toLocaleLowerCase() ?? ''
+  const mono = family.includes('mono') || family.includes('courier')
+  const numericWeight = Number.parseInt(String(fontWeight ?? 400), 10)
+  const bold =
+    String(fontWeight).toLocaleLowerCase() === 'bold' ||
+    (Number.isFinite(numericWeight) && numericWeight >= 500)
+  if (mono) return bold ? 'mono-bold' : 'mono'
+  return bold ? 'sans-bold' : 'sans'
+}
+
 export class FloorplanPdfDocument {
   readonly raw: PdfKitDocumentInstance
   readonly internal: {
@@ -19,11 +143,21 @@ export class FloorplanPdfDocument {
   }
 
   private currentFontSize = 12
+  private currentFace: FloorplanPdfFace = 'sans'
   private readonly defaultPageSize: readonly [number, number]
+  private readonly faces = new Map<FloorplanPdfFace, EmbeddedFace>()
+  private readonly embedded: boolean
 
-  constructor(raw: PdfKitDocumentInstance, defaultPageSize: readonly [number, number]) {
+  /** `fonts` null sets every face in pdfkit's standard fonts (WinAnsi only). */
+  constructor(
+    raw: PdfKitDocumentInstance,
+    defaultPageSize: readonly [number, number],
+    fonts: FloorplanPdfFonts | null,
+  ) {
     this.raw = raw
     this.defaultPageSize = defaultPageSize
+    this.embedded = fonts !== null
+    for (const [face, bytes] of Object.entries(fonts ?? {})) raw.registerFont(face, bytes)
     this.internal = {
       pageSize: {
         getWidth: () => this.raw.page?.width ?? this.defaultPageSize[0],
@@ -61,22 +195,17 @@ export class FloorplanPdfDocument {
   }
 
   setFont(family: string, weight: string = 'normal'): this {
-    const normalizedFamily = family.toLocaleLowerCase()
-    const normalizedWeight = weight.toLocaleLowerCase()
-    const bold = normalizedWeight === 'bold' || Number.parseInt(normalizedWeight, 10) >= 500
-    const base = normalizedFamily.includes('courier') ? 'Courier' : 'Helvetica'
-    this.raw.font(bold ? `${base}-Bold` : base)
+    this.currentFace = resolveFloorplanPdfFace(family, weight)
     return this
   }
 
   setFontSize(size: number): this {
     this.currentFontSize = size
-    this.raw.fontSize(size)
     return this
   }
 
   getTextWidth(value: string): number {
-    return this.raw.widthOfString(value, { lineBreak: false })
+    return this.measureRuns(this.textRuns(value, this.currentFace), this.currentFontSize)
   }
 
   splitTextToSize(value: string, maxWidth: number): string[] {
@@ -103,20 +232,58 @@ export class FloorplanPdfDocument {
     baselineY: number,
     options: PdfTextOptions = {},
   ) {
-    const lines = typeof value === 'string' ? value.split('\n') : value
+    const given = typeof value === 'string' ? value.split('\n') : value
+    const lines =
+      options.maxWidth === undefined
+        ? given
+        : given.flatMap((line) => this.splitTextToSize(line, options.maxWidth ?? 0))
     const lineHeight = this.currentFontSize * 1.2
     lines.forEach((line, index) => {
-      const width = this.getTextWidth(line)
+      const runs = this.textRuns(line, this.currentFace)
+      const width = this.measureRuns(runs, this.currentFontSize)
       const drawX =
         options.align === 'center' ? x - width / 2 : options.align === 'right' ? x - width : x
-      this.raw.text(line, drawX, baselineY - this.currentFontSize * 0.78 + index * lineHeight, {
-        lineBreak: false,
-        width: options.maxWidth,
-      })
+      this.drawRuns(runs, drawX, baselineY + index * lineHeight, this.currentFontSize)
     })
     return this
   }
 
+  /** The width `drawText` sets `text` at — the same runs, face by face. */
+  measureText(text: string, style: FloorplanPdfTextStyle): number {
+    const face = resolveFloorplanPdfFace(style.fontFamily, style.fontWeight)
+    return this.measureRuns(this.textRuns(collapseSvgWhitespace(text), face), style.fontSize)
+  }
+
+  /**
+   * Native (selectable, searchable) text in the current fill colour, anchored
+   * at (x, y) the way SVG anchors it: `anchor` is `text-anchor`, `baseline`
+   * is `dominant-baseline`, resolved against the embedded face's metrics.
+   */
+  drawText(
+    text: string,
+    x: number,
+    y: number,
+    style: FloorplanPdfTextStyle,
+    placement: { anchor: 'start' | 'middle' | 'end'; baseline: FloorplanPdfBaseline },
+  ): void {
+    const face = resolveFloorplanPdfFace(style.fontFamily, style.fontWeight)
+    const runs = this.textRuns(collapseSvgWhitespace(text), face)
+    const width = this.measureRuns(runs, style.fontSize)
+    const startX =
+      placement.anchor === 'middle' ? x - width / 2 : placement.anchor === 'end' ? x - width : x
+    const metrics = this.face(face)
+    const em = style.fontSize / 1000
+    const baselineShift =
+      placement.baseline === 'middle'
+        ? (metrics.xHeight / 2) * em
+        : placement.baseline === 'central'
+          ? ((metrics.ascender + metrics.descender) / 2) * em
+          : placement.baseline === 'hanging'
+            ? 0.8 * metrics.ascender * em
+            : 0
+    this.drawRuns(runs, startX, y + baselineShift, style.fontSize)
+  }
+
   line(x1: number, y1: number, x2: number, y2: number): this {
     this.raw.moveTo(x1, y1).lineTo(x2, y2).stroke()
     return this
@@ -165,17 +332,174 @@ export class FloorplanPdfDocument {
     else this.raw.stroke()
     return this
   }
+
+  private setFace(face: FloorplanPdfFace) {
+    return this.raw.font(this.embedded ? face : STANDARD_FACES[face])
+  }
+
+  private face(face: FloorplanPdfFace): EmbeddedFace {
+    let embedded = this.faces.get(face)
+    if (!embedded) {
+      this.setFace(face)
+      embedded = (this.raw as unknown as { _font: EmbeddedFace })._font
+      this.faces.set(face, embedded)
+    }
+    return embedded
+  }
+
+  /** Splits `text` into runs each face can set, plus the symbols drawn as linework. */
+  private textRuns(text: string, face: FloorplanPdfFace): TextRun[] {
+    // printable ASCII is in every face; the standard fonts have no glyph table to consult
+    if (!this.embedded || /^[\x20-\x7e]*$/.test(text)) return [{ kind: 'text', face, text }]
+    const runs: TextRun[] = []
+    for (const char of text) {
+      const codePoint = char.codePointAt(0) ?? 0
+      let runFace = face
+      if (!this.face(face).font.hasGlyphForCodePoint(codePoint)) {
+        const drawn = DRAWN_SYMBOLS[char as keyof typeof DRAWN_SYMBOLS]
+        if (this.face(OTHER_FAMILY[face]).font.hasGlyphForCodePoint(codePoint)) {
+          runFace = OTHER_FAMILY[face]
+        } else if (drawn) {
+          runs.push({ kind: 'symbol', symbol: drawn.symbol, advanceEm: drawn.advanceEm })
+          continue
+        }
+        // anything else prints as the face's .notdef box — visibly missing, never garbage
+      }
+      const last = runs[runs.length - 1]
+      if (last?.kind === 'text' && last.face === runFace) last.text += char
+      else runs.push({ kind: 'text', face: runFace, text: char })
+    }
+    return runs
+  }
+
+  private measureRuns(runs: readonly TextRun[], fontSize: number): number {
+    let width = 0
+    for (const run of runs) {
+      width +=
+        run.kind === 'text'
+          ? this.setFace(run.face).fontSize(fontSize).widthOfString(run.text)
+          : run.advanceEm * fontSize
+    }
+    return width
+  }
+
+  private drawRuns(runs: readonly TextRun[], x: number, baselineY: number, fontSize: number) {
+    let cursor = x
+    for (const run of runs) {
+      if (run.kind === 'text') {
+        this.setFace(run.face).fontSize(fontSize)
+        this.raw.text(run.text, cursor, baselineY, { baseline: 'alphabetic', lineBreak: false })
+        cursor += this.raw.widthOfString(run.text)
+      } else {
+        this.drawSymbol(run.symbol, cursor, baselineY, fontSize)
+        cursor += run.advanceEm * fontSize
+      }
+    }
+  }
+
+  private drawSymbol(symbol: DrawnSymbol, x: number, baselineY: number, fontSize: number) {
+    const raw = this.raw
+    if (symbol === 'angle') {
+      // two strokes from a vertex on the baseline: the base, and a leg rising
+      // to the cap height — filled bands, so the text's own colour paints them
+      const vertex: [number, number] = [x + 0.08 * fontSize, baselineY]
+      const tip: [number, number] = [x + 0.56 * fontSize, baselineY - 0.7 * fontSize]
+      const width = 0.07 * fontSize
+      raw
+        .save()
+        // the base starts a little behind the vertex so the corner is closed
+        .polygon(
+          ...strokeBand([x + 0.05 * fontSize, baselineY], [x + 0.72 * fontSize, baselineY], width),
+        )
+        .polygon(...strokeBand(vertex, tip, width))
+        .fill('non-zero')
+        .restore()
+      return
+    }
+    if (symbol === 'pointer') {
+      // a small solid triangle on the x-height, like a list pointer
+      const midY = baselineY - 0.26 * fontSize
+      const half = 0.17 * fontSize
+      raw
+        .save()
+        .polygon(
+          [x + 0.1 * fontSize, midY - half],
+          [x + 0.4 * fontSize, midY],
+          [x + 0.1 * fontSize, midY + half],
+        )
+        .fill('non-zero')
+        .restore()
+      return
+    }
+    // warning: an outlined triangle from just under the baseline to the cap
+    // height, its "!" standing on the text's own baseline (so text extraction
+    // keeps it on the line it warns about)
+    const left = x + 0.04 * fontSize
+    const width = 0.82 * fontSize
+    const base = baselineY + 0.1 * fontSize
+    const height = 0.82 * fontSize
+    const stroke = 0.07 * fontSize
+    const apex: [number, number] = [left + width / 2, base - height]
+    const outer: [number, number][] = [[left, base], [left + width, base], apex]
+    const leg = Math.hypot(width / 2, height)
+    const inradius = (width * height) / (width + 2 * leg)
+    const centre: [number, number] = [left + width / 2, base - inradius]
+    const k = (inradius - stroke) / inradius
+    const inner = outer.map(
+      ([px, py]) =>
+        [centre[0] + (px - centre[0]) * k, centre[1] + (py - centre[1]) * k] as [number, number],
+    )
+    raw
+      .save()
+      .polygon(...outer)
+      .polygon(...inner)
+      .fill('even-odd')
+      .restore()
+    this.setFace('sans-bold').fontSize(0.55 * fontSize)
+    raw.text('!', centre[0] - raw.widthOfString('!') / 2, baselineY, {
+      baseline: 'alphabetic',
+      lineBreak: false,
+    })
+  }
 }
 
-export async function createFloorplanPdfDocument(defaultPageSize: readonly [number, number]) {
-  const [{ default: PDFDocument }, { default: blobStream }] = await Promise.all([
-    import('pdfkit/js/pdfkit.standalone'),
-    import('blob-stream'),
-  ])
-  const raw = new PDFDocument({ autoFirstPage: false, compress: true, margin: 0 })
+export async function createFloorplanPdfDocument(
+  defaultPageSize: readonly [number, number],
+  options: { title?: string } = {},
+) {
+  const fileSink = getProjectFileSink()
+  const [pdfkit, helvetica, helveticaBold, courier, courierBold, { default: blobStream }, fonts] =
+    await Promise.all([
+      import('pdfkit'),
+      import('pdfkit/standard-fonts/Helvetica'),
+      import('pdfkit/standard-fonts/HelveticaBold'),
+      import('pdfkit/standard-fonts/Courier'),
+      import('pdfkit/standard-fonts/CourierBold'),
+      import('blob-stream'),
+      // an export in the standard fonts beats no export when the font files are unreachable
+      loadFloorplanPdfFonts().catch((error: unknown) => {
+        console.warn('[floorplan-export] Falling back to the standard PDF fonts', error)
+        return null
+      }),
+    ])
+  // The browser build has no standard-font metrics until they are registered, and
+  // the constructor already sets Helvetica; the Node build loads its own and has no registry.
+  ;(pdfkit as PdfKitStandardFontRegistry).registerStdFonts?.(
+    helvetica.default,
+    helveticaBold.default,
+    courier.default,
+    courierBold.default,
+  )
+  const raw = new pdfkit.default({
+    autoFirstPage: false,
+    compress: true,
+    margin: 0,
+    // the viewer's title bar shows the document title, not the file name
+    ...(options.title ? { info: { Title: options.title }, displayTitle: true } : {}),
+  })
   const stream = raw.pipe(blobStream())
   return {
-    doc: new FloorplanPdfDocument(raw, defaultPageSize),
+    doc: new FloorplanPdfDocument(raw, defaultPageSize, fonts),
     save: async (filename: string) => {
       const blob = await new Promise<Blob>((resolve, reject) => {
         stream.on('finish', () => resolve(stream.toBlob('application/pdf')))
@@ -183,12 +507,24 @@ export async function createFloorplanPdfDocument(defaultPageSize: readonly [numb
         raw.on('error', reject)
         raw.end()
       })
-      const url = URL.createObjectURL(blob)
-      const anchor = document.createElement('a')
-      anchor.href = url
-      anchor.download = filename
-      anchor.click()
-      setTimeout(() => URL.revokeObjectURL(url), 0)
+      await downloadProjectFile(blob, filename, fileSink)
     },
   }
 }
+
+/** The quad a straight stroke of `width` from `a` to `b` covers (same winding for any direction). */
+function strokeBand(
+  a: readonly [number, number],
+  b: readonly [number, number],
+  width: number,
+): [number, number][] {
+  const length = Math.hypot(b[0] - a[0], b[1] - a[1])
+  const nx = (-(b[1] - a[1]) / length) * (width / 2)
+  const ny = ((b[0] - a[0]) / length) * (width / 2)
+  return [
+    [a[0] + nx, a[1] + ny],
+    [b[0] + nx, b[1] + ny],
+    [b[0] - nx, b[1] - ny],
+    [a[0] - nx, a[1] - ny],
+  ]
+}