docrev 0.9.3 → 0.9.5

package/lib/pptx-themes.ts

@@ -367,419 +367,6 @@ function generateTheme(theme: PptxTheme): string {
 </a:theme>`;
 }
 
-/**
- * Generate slide master with background
- */
-function generateSlideMaster(theme: PptxTheme): string {
-  // For dark themes, set explicit background
-  let bgFill = '<a:solidFill><a:schemeClr val="lt1"/></a:solidFill>';
-  if (theme.background) {
-    bgFill = `<a:solidFill><a:srgbClr val="${theme.background}"/></a:solidFill>`;
-  }
-
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<p:sldMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
-  <p:cSld>
-    <p:bg>
-      <p:bgPr>
-        ${bgFill}
-        <a:effectLst/>
-      </p:bgPr>
-    </p:bg>
-    <p:spTree>
-      <p:nvGrpSpPr>
-        <p:cNvPr id="1" name=""/>
-        <p:cNvGrpSpPr/>
-        <p:nvPr/>
-      </p:nvGrpSpPr>
-      <p:grpSpPr>
-        <a:xfrm>
-          <a:off x="0" y="0"/>
-          <a:ext cx="0" cy="0"/>
-          <a:chOff x="0" y="0"/>
-          <a:chExt cx="0" cy="0"/>
-        </a:xfrm>
-      </p:grpSpPr>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="2" name="Title Placeholder 1"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph type="title"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr>
-          <a:xfrm>
-            <a:off x="838200" y="365125"/>
-            <a:ext cx="10515600" cy="1325563"/>
-          </a:xfrm>
-          <a:prstGeom prst="rect"><a:avLst/></a:prstGeom>
-        </p:spPr>
-        <p:txBody>
-          <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/>
-          <a:lstStyle>
-            <a:lvl1pPr algn="l">
-              <a:defRPr sz="4400" b="0">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-                <a:latin typeface="+mj-lt"/>
-                <a:ea typeface="+mj-ea"/>
-                <a:cs typeface="+mj-cs"/>
-              </a:defRPr>
-            </a:lvl1pPr>
-          </a:lstStyle>
-          <a:p><a:r><a:rPr lang="en-US"/><a:t>Click to edit Master title style</a:t></a:r></a:p>
-        </p:txBody>
-      </p:sp>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="3" name="Text Placeholder 2"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph type="body" idx="1"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr>
-          <a:xfrm>
-            <a:off x="838200" y="1825625"/>
-            <a:ext cx="10515600" cy="4351338"/>
-          </a:xfrm>
-          <a:prstGeom prst="rect"><a:avLst/></a:prstGeom>
-        </p:spPr>
-        <p:txBody>
-          <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/>
-          <a:lstStyle>
-            <a:lvl1pPr marL="0" indent="0" algn="l">
-              <a:buNone/>
-              <a:defRPr sz="2800">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-                <a:latin typeface="+mn-lt"/>
-              </a:defRPr>
-            </a:lvl1pPr>
-            <a:lvl2pPr marL="457200" indent="0" algn="l">
-              <a:buNone/>
-              <a:defRPr sz="2400">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-                <a:latin typeface="+mn-lt"/>
-              </a:defRPr>
-            </a:lvl2pPr>
-            <a:lvl3pPr marL="914400" indent="0" algn="l">
-              <a:buNone/>
-              <a:defRPr sz="2000">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-                <a:latin typeface="+mn-lt"/>
-              </a:defRPr>
-            </a:lvl3pPr>
-            <a:lvl4pPr marL="1371600" indent="0" algn="l">
-              <a:buNone/>
-              <a:defRPr sz="1800">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-                <a:latin typeface="+mn-lt"/>
-              </a:defRPr>
-            </a:lvl4pPr>
-            <a:lvl5pPr marL="1828800" indent="0" algn="l">
-              <a:buNone/>
-              <a:defRPr sz="1800">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-                <a:latin typeface="+mn-lt"/>
-              </a:defRPr>
-            </a:lvl5pPr>
-          </a:lstStyle>
-          <a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US"/><a:t>Click to edit Master text styles</a:t></a:r></a:p>
-          <a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US"/><a:t>Second level</a:t></a:r></a:p>
-          <a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US"/><a:t>Third level</a:t></a:r></a:p>
-        </p:txBody>
-      </p:sp>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="4" name="Slide Number Placeholder 3"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph type="sldNum" sz="quarter" idx="4"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr>
-          <a:xfrm>
-            <a:off x="8610600" y="6356350"/>
-            <a:ext cx="2743200" cy="365125"/>
-          </a:xfrm>
-          <a:prstGeom prst="rect"><a:avLst/></a:prstGeom>
-        </p:spPr>
-        <p:txBody>
-          <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/>
-          <a:lstStyle>
-            <a:lvl1pPr algn="r">
-              <a:defRPr sz="1200">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-              </a:defRPr>
-            </a:lvl1pPr>
-          </a:lstStyle>
-          <a:p>
-            <a:fld id="{B6F15528-21DE-4FAA-801F-C0D5B2D67AA7}" type="slidenum">
-              <a:rPr lang="en-US" smtClean="0"/>
-              <a:t>‹#›</a:t>
-            </a:fld>
-            <a:endParaRPr lang="en-US"/>
-          </a:p>
-        </p:txBody>
-      </p:sp>
-    </p:spTree>
-  </p:cSld>
-  <p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
-  <p:sldLayoutIdLst>
-    <p:sldLayoutId id="2147483649" r:id="rId1"/>
-    <p:sldLayoutId id="2147483650" r:id="rId2"/>
-  </p:sldLayoutIdLst>
-  <p:txStyles>
-    <p:titleStyle>
-      <a:lvl1pPr algn="l">
-        <a:defRPr sz="4400" b="0" kern="1200">
-          <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-          <a:latin typeface="+mj-lt"/>
-          <a:ea typeface="+mj-ea"/>
-          <a:cs typeface="+mj-cs"/>
-        </a:defRPr>
-      </a:lvl1pPr>
-    </p:titleStyle>
-    <p:bodyStyle>
-      <a:lvl1pPr marL="0" indent="0" algn="l">
-        <a:buNone/>
-        <a:defRPr sz="2800" kern="1200">
-          <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-          <a:latin typeface="+mn-lt"/>
-          <a:ea typeface="+mn-ea"/>
-          <a:cs typeface="+mn-cs"/>
-        </a:defRPr>
-      </a:lvl1pPr>
-      <a:lvl2pPr marL="457200" indent="0" algn="l">
-        <a:buNone/>
-        <a:defRPr sz="2400" kern="1200">
-          <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-          <a:latin typeface="+mn-lt"/>
-        </a:defRPr>
-      </a:lvl2pPr>
-      <a:lvl3pPr marL="914400" indent="0" algn="l">
-        <a:buNone/>
-        <a:defRPr sz="2000" kern="1200">
-          <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-          <a:latin typeface="+mn-lt"/>
-        </a:defRPr>
-      </a:lvl3pPr>
-      <a:lvl4pPr marL="1371600" indent="0" algn="l">
-        <a:buNone/>
-        <a:defRPr sz="1800" kern="1200">
-          <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-          <a:latin typeface="+mn-lt"/>
-        </a:defRPr>
-      </a:lvl4pPr>
-      <a:lvl5pPr marL="1828800" indent="0" algn="l">
-        <a:buNone/>
-        <a:defRPr sz="1800" kern="1200">
-          <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-          <a:latin typeface="+mn-lt"/>
-        </a:defRPr>
-      </a:lvl5pPr>
-    </p:bodyStyle>
-    <p:otherStyle>
-      <a:defPPr><a:defRPr lang="en-US"/></a:defPPr>
-    </p:otherStyle>
-  </p:txStyles>
-</p:sldMaster>`;
-}
-
-/**
- * Generate slide master relationships
- */
-function generateSlideMasterRels(): string {
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout1.xml"/>
-  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout2.xml"/>
-  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="../theme/theme1.xml"/>
-</Relationships>`;
-}
-
-/**
- * Generate title slide layout
- */
-function generateTitleLayout(theme: PptxTheme): string {
-  let bgFill = '<a:solidFill><a:schemeClr val="lt1"/></a:solidFill>';
-  if (theme.background) {
-    bgFill = `<a:solidFill><a:srgbClr val="${theme.background}"/></a:solidFill>`;
-  }
-
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="title" preserve="1">
-  <p:cSld name="Title Slide">
-    <p:bg>
-      <p:bgPr>
-        ${bgFill}
-        <a:effectLst/>
-      </p:bgPr>
-    </p:bg>
-    <p:spTree>
-      <p:nvGrpSpPr>
-        <p:cNvPr id="1" name=""/>
-        <p:cNvGrpSpPr/>
-        <p:nvPr/>
-      </p:nvGrpSpPr>
-      <p:grpSpPr>
-        <a:xfrm>
-          <a:off x="0" y="0"/>
-          <a:ext cx="0" cy="0"/>
-          <a:chOff x="0" y="0"/>
-          <a:chExt cx="0" cy="0"/>
-        </a:xfrm>
-      </p:grpSpPr>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="2" name="Title 1"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph type="ctrTitle"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr>
-          <a:xfrm>
-            <a:off x="1524000" y="1122363"/>
-            <a:ext cx="9144000" cy="2387600"/>
-          </a:xfrm>
-        </p:spPr>
-        <p:txBody>
-          <a:bodyPr anchor="b"/>
-          <a:lstStyle>
-            <a:lvl1pPr algn="ctr">
-              <a:defRPr sz="6000">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-              </a:defRPr>
-            </a:lvl1pPr>
-          </a:lstStyle>
-          <a:p><a:r><a:rPr lang="en-US"/><a:t>Click to edit title</a:t></a:r></a:p>
-        </p:txBody>
-      </p:sp>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="3" name="Subtitle 2"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph type="subTitle" idx="1"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr>
-          <a:xfrm>
-            <a:off x="1524000" y="3602038"/>
-            <a:ext cx="9144000" cy="1655762"/>
-          </a:xfrm>
-        </p:spPr>
-        <p:txBody>
-          <a:bodyPr/>
-          <a:lstStyle>
-            <a:lvl1pPr marL="0" indent="0" algn="ctr">
-              <a:buNone/>
-              <a:defRPr sz="2400">
-                <a:solidFill><a:schemeClr val="dk1"/></a:solidFill>
-              </a:defRPr>
-            </a:lvl1pPr>
-          </a:lstStyle>
-          <a:p><a:r><a:rPr lang="en-US"/><a:t>Click to edit subtitle</a:t></a:r></a:p>
-        </p:txBody>
-      </p:sp>
-    </p:spTree>
-  </p:cSld>
-  <p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr>
-</p:sldLayout>`;
-}
-
-/**
- * Generate content slide layout
- */
-function generateContentLayout(theme: PptxTheme): string {
-  let bgFill = '<a:solidFill><a:schemeClr val="lt1"/></a:solidFill>';
-  if (theme.background) {
-    bgFill = `<a:solidFill><a:srgbClr val="${theme.background}"/></a:solidFill>`;
-  }
-
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="obj" preserve="1">
-  <p:cSld name="Title and Content">
-    <p:bg>
-      <p:bgPr>
-        ${bgFill}
-        <a:effectLst/>
-      </p:bgPr>
-    </p:bg>
-    <p:spTree>
-      <p:nvGrpSpPr>
-        <p:cNvPr id="1" name=""/>
-        <p:cNvGrpSpPr/>
-        <p:nvPr/>
-      </p:nvGrpSpPr>
-      <p:grpSpPr>
-        <a:xfrm>
-          <a:off x="0" y="0"/>
-          <a:ext cx="0" cy="0"/>
-          <a:chOff x="0" y="0"/>
-          <a:chExt cx="0" cy="0"/>
-        </a:xfrm>
-      </p:grpSpPr>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="2" name="Title 1"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph type="title"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr/>
-        <p:txBody>
-          <a:bodyPr/>
-          <a:lstStyle/>
-          <a:p><a:r><a:rPr lang="en-US"/><a:t>Click to edit title</a:t></a:r></a:p>
-        </p:txBody>
-      </p:sp>
-      <p:sp>
-        <p:nvSpPr>
-          <p:cNvPr id="3" name="Content Placeholder 2"/>
-          <p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr>
-          <p:nvPr><p:ph idx="1"/></p:nvPr>
-        </p:nvSpPr>
-        <p:spPr/>
-        <p:txBody>
-          <a:bodyPr/>
-          <a:lstStyle/>
-          <a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US"/><a:t>Click to edit text</a:t></a:r></a:p>
-        </p:txBody>
-      </p:sp>
-    </p:spTree>
-  </p:cSld>
-  <p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr>
-</p:sldLayout>`;
-}
-
-/**
- * Generate slide layout relationships
- */
-function generateSlideLayoutRels(): string {
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" Target="../slideMasters/slideMaster1.xml"/>
-</Relationships>`;
-}
-
-/**
- * Generate docProps/core.xml
- */
-function generateCore(themeName: string): string {
-  const now = new Date().toISOString();
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <dc:title>${themeName} Theme</dc:title>
-  <dc:creator>docrev</dc:creator>
-  <cp:lastModifiedBy>docrev</cp:lastModifiedBy>
-  <dcterms:created xsi:type="dcterms:W3CDTF">${now}</dcterms:created>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">${now}</dcterms:modified>
-</cp:coreProperties>`;
-}
-
-/**
- * Generate docProps/app.xml
- */
-function generateApp(): string {
-  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
-  <Application>docrev</Application>
-  <PresentationFormat>Widescreen</PresentationFormat>
-  <Slides>0</Slides>
-</Properties>`;
-}
-
 /**
  * Get pandoc's default reference.pptx as a base template
  */

package/lib/protect-restore.ts

@@ -69,6 +69,46 @@ interface ImageRegistry {
   byNumber?: Map<string, { label: string }>;
 }
 
+// =============================================================================
+// Shared Helpers
+// =============================================================================
+
+/**
+ * Replace regex matches with indexed placeholders and collect originals
+ */
+function collectAndReplace(
+  text: string,
+  pattern: RegExp,
+  prefix: string,
+  suffix: string,
+): { text: string; items: ProtectedItem[] } {
+  const items: ProtectedItem[] = [];
+  const result = text.replace(pattern, (match) => {
+    const idx = items.length;
+    const placeholder = `${prefix}${idx}${suffix}`;
+    items.push({ original: match, placeholder });
+    return placeholder;
+  });
+  return { text: result, items };
+}
+
+/**
+ * Restore protected items from placeholders, handling annotation wrappers
+ * (deletion {--...--} and insertion {++...++} wrappers are unwrapped)
+ */
+function restoreProtectedItems(text: string, items: ProtectedItem[]): string {
+  for (const item of items) {
+    const deletionPattern = new RegExp(`\\{--[^}]*?${item.placeholder}[^}]*?--\\}`, 'g');
+    text = text.replace(deletionPattern, item.original);
+
+    const insertionPattern = new RegExp(`\\{\\+\\+[^}]*?${item.placeholder}[^}]*?\\+\\+\\}`, 'g');
+    text = text.replace(insertionPattern, item.original);
+
+    text = text.split(item.placeholder).join(item.original);
+  }
+  return text;
+}
+
 // =============================================================================
 // Public Functions
 // =============================================================================
@@ -103,17 +143,11 @@ export function extractMarkdownPrefix(line: string): MarkdownPrefix {
  * Anchors like {#fig:heatmap} and {#tbl:results} should never be deleted
  */
 export function protectAnchors(md: string): ProtectAnchorsResult {
-  const anchors: ProtectedItem[] = [];
-
   // Match {#fig:label}, {#tbl:label}, {#eq:label}, {#sec:label} etc.
   // Also match with additional attributes like {#fig:label width=50%}
-  const text = md.replace(/\{#(fig|tbl|eq|sec|lst):[^}]+\}/g, (match) => {
-    const idx = anchors.length;
-    const placeholder = `ANCHORBLOCK${idx}ENDANCHOR`;
-    anchors.push({ original: match, placeholder });
-    return placeholder;
-  });
-
+  const { text, items: anchors } = collectAndReplace(
+    md, /\{#(fig|tbl|eq|sec|lst):[^}]+\}/g, 'ANCHORBLOCK', 'ENDANCHOR',
+  );
   return { text, anchors };
 }
 
@@ -164,17 +198,11 @@ export function restoreAnchors(text: string, anchors: ProtectedItem[]): string {
  * References like @fig:label, @tbl:label should be preserved
  */
 export function protectCrossrefs(md: string): ProtectCrossrefsResult {
-  const crossrefs: ProtectedItem[] = [];
-
   // Match @fig:label, @tbl:label, @eq:label, @sec:label
   // Can appear as @fig:label or (@fig:label) or [@fig:label]
-  const text = md.replace(/@(fig|tbl|eq|sec|lst):[a-zA-Z0-9_-]+/g, (match) => {
-    const idx = crossrefs.length;
-    const placeholder = `XREFBLOCK${idx}ENDXREF`;
-    crossrefs.push({ original: match, placeholder });
-    return placeholder;
-  });
-
+  const { text, items: crossrefs } = collectAndReplace(
+    md, /@(fig|tbl|eq|sec|lst):[a-zA-Z0-9_-]+/g, 'XREFBLOCK', 'ENDXREF',
+  );
   return { text, crossrefs };
 }
 
@@ -386,19 +414,7 @@ export function protectImages(md: string, registry: ImageRegistry | null = null)
  * Restore images from placeholders
  */
 export function restoreImages(text: string, images: ProtectedImage[]): string {
-  for (const img of images) {
-    // Handle cases where placeholder might be inside annotations
-    // {--IMAGEBLOCK0ENDIMAGE--} should restore the original image
-    const deletionPattern = new RegExp(`\\{--[^}]*?${img.placeholder}[^}]*?--\\}`, 'g');
-    text = text.replace(deletionPattern, img.original);
-
-    const insertionPattern = new RegExp(`\\{\\+\\+[^}]*?${img.placeholder}[^}]*?\\+\\+\\}`, 'g');
-    text = text.replace(insertionPattern, img.original);
-
-    // Normal replacement
-    text = text.split(img.placeholder).join(img.original);
-  }
-  return text;
+  return restoreProtectedItems(text, images);
 }
 
 /**
@@ -500,17 +516,5 @@ export function protectTables(md: string): ProtectTablesResult {
  * Restore tables from placeholders
  */
 export function restoreTables(text: string, tables: ProtectedTable[]): string {
-  for (const table of tables) {
-    // Handle cases where placeholder might be inside annotations
-    // For tables, we want to preserve the original if it wasn't changed
-    const deletionPattern = new RegExp(`\\{--[^}]*?${table.placeholder}[^}]*?--\\}`, 'g');
-    text = text.replace(deletionPattern, table.original);
-
-    const insertionPattern = new RegExp(`\\{\\+\\+[^}]*?${table.placeholder}[^}]*?\\+\\+\\}`, 'g');
-    text = text.replace(insertionPattern, table.original);
-
-    // Normal replacement
-    text = text.split(table.placeholder).join(table.original);
-  }
-  return text;
+  return restoreProtectedItems(text, tables);
 }

package/lib/slides.ts

@@ -90,16 +90,6 @@ const BEAMER_BACKGROUNDS: Record<string, string> = {
   inverse: '\\setbeamercolor{background canvas}{bg=structure.fg!90!black}\\setbeamercolor{normal text}{fg=white}\\usebeamercolor[fg]{normal text}',
 };
 
-/**
- * Special slide types mapped to Beamer frame options
- */
-const BEAMER_FRAME_OPTIONS: Record<string, string> = {
-  cover: 'plain,noframenumbering,c',
-  thanks: 'plain,noframenumbering,c',
-  section: 'plain,noframenumbering,c',
-  plain: 'plain',
-};
-
 /**
  * Parse a bullet list into a tree structure
  */
@@ -473,33 +463,6 @@ export function parseSlides(markdown: string): Slide[] {
   return slides;
 }
 
-/**
- * Build Beamer frame options string
- */
-function buildBeamerFrameOptions(style: SlideStyle | null): string {
-  if (!style) return '';
-
-  const options: string[] = [];
-
-  // Special slide type options
-  if (style.type && BEAMER_FRAME_OPTIONS[style.type]) {
-    const opts = BEAMER_FRAME_OPTIONS[style.type];
-    if (opts) options.push(...opts.split(','));
-  } else {
-    // Individual options
-    if (style.nonumber) {
-      options.push('noframenumbering');
-    }
-    if (style.center) {
-      options.push('c');
-    }
-  }
-
-  // Deduplicate
-  const unique = [...new Set(options)];
-  return unique.length > 0 ? `[${unique.join(',')}]` : '';
-}
-
 /**
  * Generate Beamer markdown using pandoc's native slide structure
  * Works WITH pandoc, not against it - pandoc creates frames, we add overlays

package/lib/trackchanges.ts

@@ -9,6 +9,7 @@ import * as path from 'path';
 import { execSync } from 'child_process';
 import AdmZip from 'adm-zip';
 import type { TrackChangeMarker } from './types.js';
+import { escapeXml } from './utils.js';
 
 interface PrepareOptions {
   author?: string;
@@ -29,18 +30,6 @@ interface ApplyResult {
   };
 }
 
-/**
- * Escape XML special characters
- */
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;');
-}
-
 /**
  * Prepare text with CriticMarkup annotations for track changes
  * Replaces annotations with markers that can be processed in DOCX