@openpresentation/opf-render 0.6.0 → 0.7.0

package/README.md

@@ -1,9 +1,11 @@
 # OPF Render
 
-Version 0.6.0 requires core 0.8.0 and renders its accepted quote body/source geometry without fitting it again. Adaptive footer allocation, readability floors and strict failures are shared with the coordinated PPTX 0.6.0 exporter. The 41 reviewed quote-footer raster changes keep their outer content boxes; see [the raster review](docs/evidence/shared-quote-raster-review.json). Glyph containment and separation do not establish native pixel equivalence.
+Version 0.7.0 requires core 0.9.0 and renders accepted quote and code geometry without fitting it again. Code filename/language/body parts preserve source whitespace, literal tabs and metadata case and expose trace targets for editing. The [43 reviewed code raster changes](docs/evidence/shared-code/raster-review.json) retain the other 762 corpus hashes. Planned coordinated releases PPTX 0.7.0 and editor 0.6.0 will add native source recovery and editing. Glyph containment and separation do not establish native pixel equivalence.
 
 Deterministic local renderer for Open Presentation Format documents. The shared SVG core implements validation, catalog resolution, placeholder binding and text layout. Node APIs additionally convert SVG to PNG and raster-backed PDF.
 
+Code strings that [XML 1.0 cannot represent](https://www.w3.org/TR/xml/#charsets) reject rendering with `invalid-code-text`, the OPF field path and UTF-16 offset. Input JSON stays unchanged. Tabs, line endings and valid supplementary Unicode remain accepted; schema validity and XML serialization do not certify font coverage or native fidelity.
+
 ## Scope
 
 - Package: `@openpresentation/opf-render`

package/dist/svg.js

@@ -370,7 +370,9 @@ function inferLayoutId(slide) {
   if (slide.table) return "table-1x";
   if (slide.image) return "image-1x";
   if (slide.video) return "media-1x";
-  if (slide.code) return "code-1x";
+  // Unspecified code layout uses the same automatic flow as core pagination
+  // and PPTX export. An explicit code-1x preset still reserves its own slots.
+  if (slide.code !== undefined) return "blank";
   if (slide.items || slide.bullets) return "list-1x";
   if (slide.text || slide.metric || slide.quote || slide.timeline) return "text-1x";
   if (slide.subtitle) return "title-subtitle";
@@ -768,8 +770,14 @@ function renderMedia(item, box, bound, options) {
 }
 
 function renderCode(item, box, bound, options) {
-  const code = typeof item.value === "string" ? item.value : item.value?.source ?? stableJson(item.value);
-  const label = typeof item.value === "object" && item.value?.language ? String(item.value.language) : "code";
+  const layout = item.codeLayout;
+  if (!layout) throw new OPFRenderError('missing-code-layout', 'Code rendering requires a coordinated core build with shared code geometry.', {path:item.path});
+  for (const part of layout.parts) {
+    // XML 1.0 Char excludes controls and unpaired UTF-16 surrogates. The u flag
+    // keeps valid supplementary characters (surrogate pairs) accepted.
+    const invalid = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\uD800-\uDFFF\uFFFE\uFFFF]/u.exec(part.text);
+    if (invalid) throw new OPFRenderError('invalid-code-text', `Code text contains U+${invalid[0].codePointAt(0).toString(16).toUpperCase().padStart(4,'0')} at UTF-16 offset ${invalid.index}, which XML cannot represent; edit that character before rendering.`, {path:part.path});
+  }
   const children = [
     tag("rect", {
       x: box.x,
@@ -780,27 +788,28 @@ function renderCode(item, box, bound, options) {
       stroke: "#334155",
       "stroke-width": 1,
       ...traceAttrs(options, item.path)
-    }),
-    tag("text", {
-      x: box.x + 18,
-      y: box.y + 28,
-      fill: "#93C5FD",
-      "font-family": fontStack(bound.design.fonts.code, "monospace"),
-      "font-size": 14,
-      "font-weight": 700,
-      ...traceAttrs(options, item.path)
-    }, escapeText(label.toUpperCase())),
-    renderTextBox(code, { x: box.x + 18, y: box.y + 46, width: box.width - 36, height: box.height - 64 }, bound, {
-      path: item.path,
-      fontSize: 18,
-      fontFamily: bound.design.fonts.code,
-      fontWeight: 400,
-      fill: "#E5E7EB",
-      options,
-      preserveNewlines: true
     })
   ];
-  return tag("g", traceAttrs(options, item.path), children.join("\n"));
+  for (const part of layout.parts) {
+    if (!part.fit) throw new OPFRenderError('layout-overflow', 'Code content has no usable internal space; increase its cell size before rendering.', {path:part.path,issues:layout.diagnostics});
+    const lines=part.fit.sourceLines.map((line,index)=>tag('text',{
+      x:stableNumber(part.box.x),y:stableNumber(part.box.y+part.fit.fontSize+index*part.fit.lineHeight),
+      'text-anchor':'start','font-family':fontStack(part.style.fontFamily,'monospace'),
+      'font-size':stableNumber(part.fit.fontSize),'font-weight':part.style.fontWeight,'font-style':part.style.italic?'italic':undefined,
+      'xml:space':'preserve',style:'white-space:pre','text-rendering':'geometricPrecision',fill:part.role==='body'?'#E5E7EB':'#93C5FD',
+      ...traceAttrs(options,part.path),...(options.trace?{'data-opf-code-role':part.role,'data-opf-generated':part.generated?'true':undefined,
+        'data-opf-text-start':line.start,'data-opf-text-end':line.end,'data-opf-text-next-start':line.nextStart,'data-opf-line-boundary':line.boundary}:{}),
+    },line.segments.map(segment=>tag('tspan',{
+      x:stableNumber(part.box.x+segment.x),
+      // SVG's CSS tab-size does not place literal tabs at their measured stops.
+      ...(segment.kind==='tab'?{textLength:stableNumber(segment.width),lengthAdjust:'spacingAndGlyphs'}:{}),
+      ...(options.trace?{'data-opf-segment':segment.kind,'data-opf-text-start':segment.start,'data-opf-text-end':segment.end}:{}),
+    },escapeText(part.text.slice(segment.start,segment.end)))).join('')));
+    children.push(tag('g',{...traceAttrs(options,part.path),...(options.trace?{'data-opf-code-role':part.role,'data-opf-generated':part.generated?'true':undefined,
+      'data-opf-box-x':part.box.x,'data-opf-box-y':part.box.y,'data-opf-box-width':part.box.width,'data-opf-box-height':part.box.height}:{}),
+      ...(part.fit.overflow?{'data-opf-overflow':'true'}:{})},lines.join('\n')));
+  }
+  return tag("g", {...traceAttrs(options,item.path),...(options.trace?{'data-opf-code-container':'true'}:{})}, children.join("\n"));
 }
 
 function renderMetric(item, box, bound, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-render",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Deterministic local OPF renderer for SVG, PNG, and PDF output.",
   "license": "MIT",
   "type": "module",
@@ -64,7 +64,9 @@
     "golden:update": "npm run build && node test/golden.mjs --update",
     "prepack": "npm run build",
     "build:browser-check": "node scripts/build-browser-check.mjs",
-    "test:styled-table": "node test/styled-table.mjs"
+    "test:styled-table": "node test/styled-table.mjs",
+    "test:code": "node test/shared-code.mjs",
+    "test:code-browser": "node test/shared-code-browser.mjs"
   },
   "dependencies": {
     "@expo-google-fonts/arimo": "0.4.3",
@@ -75,7 +77,7 @@
     "@expo-google-fonts/roboto": "^0.4.3",
     "@expo-google-fonts/roboto-mono": "^0.4.2",
     "@expo-google-fonts/tinos": "0.4.2",
-    "@openpresentation/opf": "^0.8.0",
+    "@openpresentation/opf": "^0.9.0",
     "@resvg/resvg-js": "^2.6.2",
     "fontkit": "^2.0.4",
     "pdf-lib": "^1.17.1",