docrev 0.8.5 → 0.9.3

package/lib/pptx-template.ts

@@ -1,13 +1,13 @@
 /**
  * PPTX post-processing
  *
- * Injects logos into each slide of a generated PPTX to match ref.pptx styling.
- * Uses ref.pptx as-is for --reference-doc, then post-processes to add logos.
+ * Pure TypeScript implementation using AdmZip for in-memory ZIP/PPTX manipulation.
+ * No Python dependency required.
  */
 
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, unlinkSync, statSync } from 'node:fs';
-import { join, basename, extname, dirname } from 'node:path';
-import { execSync } from 'node:child_process';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import AdmZip from 'adm-zip';
 
 interface ThemeFonts {
   major?: string;
@@ -31,303 +31,45 @@ interface BuildupConfig {
   enabled?: boolean;
 }
 
-/**
- * Extract PPTX to directory
- */
-async function extractPptx(pptxPath: string, destDir: string): Promise<void> {
-  if (process.platform === 'win32') {
-    const zipPath = pptxPath.replace(/\.pptx$/i, '.zip');
-    const content = readFileSync(pptxPath);
-    writeFileSync(zipPath, content);
-    try {
-      execSync(`powershell -Command "Expand-Archive -LiteralPath '${zipPath}' -DestinationPath '${destDir}' -Force"`, { stdio: 'pipe' });
-    } finally {
-      try { unlinkSync(zipPath); } catch { /* ignore */ }
-    }
-  } else {
-    execSync(`unzip -q "${pptxPath}" -d "${destDir}"`, { stdio: 'pipe' });
-  }
+// =============================================================================
+// Shared Helpers
+// =============================================================================
+
+function getSlideEntries(zip: AdmZip) {
+  return zip.getEntries()
+    .filter(e => /^ppt\/slides\/slide\d+\.xml$/.test(e.entryName))
+    .sort((a, b) => {
+      const na = parseInt(a.entryName.match(/slide(\d+)/)?.[1] || '0');
+      const nb = parseInt(b.entryName.match(/slide(\d+)/)?.[1] || '0');
+      return na - nb;
+    });
 }
 
-/**
- * Create PPTX from directory
- * Uses same compression settings as the original file
- */
-async function createPptx(srcDir: string, pptxPath: string): Promise<void> {
-  const scriptPath = join(dirname(pptxPath), '.zip-create.py');
-  const script = `import zipfile, os, sys
-
-src, dst = sys.argv[1], sys.argv[2]
-
-# Collect all files
-files_to_add = []
-for root, dirs, files in os.walk(src):
-    for f in files:
-        fp = os.path.join(root, f)
-        arcname = os.path.relpath(fp, src).replace(os.sep, '/')
-        files_to_add.append((fp, arcname))
-
-# Write ZIP with DEFLATED compression
-with zipfile.ZipFile(dst, 'w', zipfile.ZIP_DEFLATED, compresslevel=6) as zf:
-    for fp, arcname in files_to_add:
-        zf.write(fp, arcname)
-`;
-
-  writeFileSync(scriptPath, script);
-  try {
-    const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
-    execSync(`${pythonCmd} "${scriptPath}" "${srcDir}" "${pptxPath}"`, { stdio: 'pipe' });
-  } finally {
-    try { unlinkSync(scriptPath); } catch { /* ignore */ }
-  }
+function readEntry(zip: AdmZip, name: string): string {
+  return zip.getEntry(name)?.getData().toString('utf-8') ?? '';
 }
 
-/**
- * Recursively remove directory
- */
-function rmSync(path: string, options?: { recursive?: boolean }): void {
-  const fs = require('node:fs');
-  if (fs.rmSync) {
-    fs.rmSync(path, options);
-  } else {
-    const items = fs.readdirSync(path);
-    for (const item of items) {
-      const itemPath = join(path, item);
-      if (fs.statSync(itemPath).isDirectory()) {
-        rmSync(itemPath, options);
-      } else {
-        fs.unlinkSync(itemPath);
-      }
-    }
-    fs.rmdirSync(path);
-  }
+function updateEntry(zip: AdmZip, name: string, content: string): void {
+  zip.updateFile(name, Buffer.from(content, 'utf-8'));
 }
 
-/**
- * Inject slide numbers into each slide of a PPTX
- * Only adds slide numbers to slides that have a footer (i.e., slides with the green banner).
- * Title slides, section slides, cover slides don't have the banner so they don't get numbers.
- * Uses in-place ZIP modification to preserve file structure.
- */
-export async function injectSlideNumbers(pptxPath: string): Promise<void> {
-  if (!existsSync(pptxPath)) return;
-
-  const scriptPath = join(dirname(pptxPath), '.inject-slidenum.py');
-  const script = `import zipfile, sys, re, os
-
-pptx_path = sys.argv[1]
-temp_path = pptx_path + '.tmp'
-
-# Slide number XML template with manual number (white text, 16pt)
-def get_slidenum_xml(max_id, num):
-    return f'<p:sp><p:nvSpPr><p:cNvPr id="{max_id}" name="Slide Number Placeholder {max_id}"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="8610600" y="6581838"/><a:ext cx="2743200" cy="319024"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr><a:defRPr sz="1600"><a:solidFill><a:srgbClr val="FFFFFF"/></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:r><a:rPr lang="en-GB" sz="1600" dirty="0"><a:solidFill><a:srgbClr val="FFFFFF"/></a:solidFill></a:rPr><a:t>{num}</a:t></a:r></a:p></p:txBody></p:sp>'
-
-def is_content_slide(text):
-    """Check if slide is a content slide (has footer AND body placeholder)"""
-    has_footer = 'type="ftr"' in text
-    has_body = 'idx="1"' in text or 'type="body"' in text
-    return has_footer and has_body
-
-# First pass: identify content slides and assign sequential numbers
-with zipfile.ZipFile(pptx_path, 'r') as zin:
-    slide_numbers = {}  # filename -> sequential number
-    content_num = 1
-
-    # Get all slide files sorted by number
-    slide_files = sorted([f for f in zin.namelist()
-                         if f.startswith('ppt/slides/slide') and f.endswith('.xml')],
-                        key=lambda x: int(re.search(r'slide(\\d+)', x).group(1)))
-
-    for fname in slide_files:
-        text = zin.read(fname).decode('utf-8')
-        if is_content_slide(text) and 'type="sldNum"' not in text:
-            slide_numbers[fname] = content_num
-            content_num += 1
-
-# Second pass: inject numbers
-with zipfile.ZipFile(pptx_path, 'r') as zin:
-    with zipfile.ZipFile(temp_path, 'w') as zout:
-        for item in zin.infolist():
-            content = zin.read(item.filename)
-
-            if item.filename in slide_numbers:
-                text = content.decode('utf-8')
-                # Find max id
-                ids = [int(m) for m in re.findall(r'id="(\\d+)"', text)]
-                max_id = max(ids) + 1 if ids else 100
-
-                # Insert slide number with sequential count
-                slidenum_xml = get_slidenum_xml(max_id, slide_numbers[item.filename])
-                text = text.replace('</p:spTree>', slidenum_xml + '</p:spTree>')
-                content = text.encode('utf-8')
-
-            zout.writestr(item, content)
-
-os.replace(temp_path, pptx_path)
-`;
-
-  writeFileSync(scriptPath, script);
-  try {
-    const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
-    execSync(`${pythonCmd} "${scriptPath}" "${pptxPath}"`, { stdio: 'pipe' });
-  } finally {
-    try { unlinkSync(scriptPath); } catch { /* ignore */ }
-  }
+function findMaxId(xml: string): number {
+  const ids = [...xml.matchAll(/id="(\d+)"/g)].map(m => parseInt(m[1]));
+  return ids.length ? Math.max(...ids) : 0;
 }
 
-/**
- * Inject logos into cover slide of a PPTX (matching ref.pptx style)
- * Uses in-place ZIP modification to preserve file structure.
- */
-export async function injectLogosIntoSlides(pptxPath: string, mediaDir: string | null): Promise<void> {
-  if (!mediaDir || !existsSync(mediaDir) || !existsSync(pptxPath)) return;
-
-  // Check for logo files
-  const logoLeft = join(mediaDir, 'logo-left.png');
-  const logoRight = join(mediaDir, 'logo-right.png');
-
-  const hasLeft = existsSync(logoLeft);
-  const hasRight = existsSync(logoRight);
-
-  if (!hasLeft && !hasRight) return;
-
-  // Read logo files as base64
-  const logoLeftData = hasLeft ? readFileSync(logoLeft).toString('base64') : '';
-  const logoRightData = hasRight ? readFileSync(logoRight).toString('base64') : '';
-
-  const scriptPath = join(dirname(pptxPath), '.inject-logos.py');
-  const script = `import zipfile, sys, re, os, base64
-
-pptx_path = sys.argv[1]
-has_left = ${hasLeft ? 'True' : 'False'}
-has_right = ${hasRight ? 'True' : 'False'}
-logo_left_b64 = """${logoLeftData}"""
-logo_right_b64 = """${logoRightData}"""
-
-temp_path = pptx_path + '.tmp'
-
-# Find next available image number
-def get_next_image_num(zf):
-    max_num = 0
-    for name in zf.namelist():
-        m = re.match(r'ppt/media/image(\\d+)\\.', name)
-        if m:
-            max_num = max(max_num, int(m.group(1)))
-    return max_num + 1
-
-with zipfile.ZipFile(pptx_path, 'r') as zin:
-    next_img = get_next_image_num(zin)
-    right_img_name = f'ppt/media/image{next_img}.png' if has_right else None
-    left_img_name = f'ppt/media/image{next_img + 1}.png' if has_left else None
-
-    with zipfile.ZipFile(temp_path, 'w') as zout:
-        for item in zin.infolist():
-            content = zin.read(item.filename)
-
-            # Update [Content_Types].xml to include png if needed
-            if item.filename == '[Content_Types].xml':
-                text = content.decode('utf-8')
-                if 'Extension="png"' not in text:
-                    text = text.replace('</Types>', '<Default Extension="png" ContentType="image/png"/></Types>')
-                    content = text.encode('utf-8')
-
-            # Update slide1.xml.rels to add image relationships
-            if item.filename == 'ppt/slides/_rels/slide1.xml.rels':
-                text = content.decode('utf-8')
-                # Find max rId
-                rids = [int(m) for m in re.findall(r'Id="rId(\\d+)"', text)]
-                max_rid = max(rids) if rids else 0
-
-                new_rels = []
-                right_rid = None
-                left_rid = None
-
-                if has_right:
-                    max_rid += 1
-                    right_rid = f'rId{max_rid}'
-                    new_rels.append(f'<Relationship Id="{right_rid}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image{next_img}.png"/>')
-
-                if has_left:
-                    max_rid += 1
-                    left_rid = f'rId{max_rid}'
-                    new_rels.append(f'<Relationship Id="{left_rid}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image{next_img + 1}.png"/>')
-
-                if new_rels:
-                    text = text.replace('</Relationships>', ''.join(new_rels) + '</Relationships>')
-                    content = text.encode('utf-8')
-
-                # Store rIds for slide1 modification
-                zout.right_rid = right_rid
-                zout.left_rid = left_rid
-
-            # Update slide1.xml to add picture elements
-            if item.filename == 'ppt/slides/slide1.xml':
-                text = content.decode('utf-8')
-                # Find max id
-                ids = [int(m) for m in re.findall(r'id="(\\d+)"', text)]
-                max_id = max(ids) if ids else 0
-
-                pics = []
-                right_rid = getattr(zout, 'right_rid', None)
-                left_rid = getattr(zout, 'left_rid', None)
-
-                if has_right and right_rid:
-                    max_id += 1
-                    pics.append(f'<p:pic><p:nvPicPr><p:cNvPr id="{max_id}" name="Picture {max_id}"/><p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr><p:nvPr/></p:nvPicPr><p:blipFill><a:blip r:embed="{right_rid}"/><a:stretch><a:fillRect/></a:stretch></p:blipFill><p:spPr><a:xfrm><a:off x="9492000" y="5742001"/><a:ext cx="2700000" cy="1115999"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr></p:pic>')
-
-                if has_left and left_rid:
-                    max_id += 1
-                    pics.append(f'<p:pic><p:nvPicPr><p:cNvPr id="{max_id}" name="Picture {max_id}"/><p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr><p:nvPr/></p:nvPicPr><p:blipFill><a:blip r:embed="{left_rid}"/><a:srcRect t="22495" b="27262"/><a:stretch/></p:blipFill><p:spPr><a:xfrm><a:off x="0" y="5904608"/><a:ext cx="3794408" cy="954349"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr></p:pic>')
-
-                if pics:
-                    text = text.replace('</p:spTree>', ''.join(pics) + '</p:spTree>')
-                    content = text.encode('utf-8')
-
-            zout.writestr(item, content)
-
-        # Add logo image files
-        if has_right:
-            zout.writestr(right_img_name, base64.b64decode(logo_right_b64))
-        if has_left:
-            zout.writestr(left_img_name, base64.b64decode(logo_left_b64))
-
-os.replace(temp_path, pptx_path)
-`;
-
-  writeFileSync(scriptPath, script);
-  try {
-    const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
-    execSync(`${pythonCmd} "${scriptPath}" "${pptxPath}"`, { stdio: 'pipe' });
-  } finally {
-    try { unlinkSync(scriptPath); } catch { /* ignore */ }
-  }
+function findMaxRId(xml: string): number {
+  const rids = [...xml.matchAll(/Id="rId(\d+)"/g)].map(m => parseInt(m[1]));
+  return rids.length ? Math.max(...rids) : 0;
 }
 
-// Legacy exports for compatibility
-export async function generatePptxTemplate(options: TemplateOptions): Promise<string | null> {
-  // No longer modifying template - just return the base template path
-  const { baseTemplate, outputPath } = options;
-  if (baseTemplate && existsSync(baseTemplate)) {
-    // Copy base template to output
-    writeFileSync(outputPath, readFileSync(baseTemplate));
-    return outputPath;
-  }
-  return null;
-}
-
-export function templateNeedsRegeneration(templatePath: string, mediaDir: string, baseTemplate: string): boolean {
-  return false; // No template regeneration needed - we use ref.pptx as-is
-}
-
-export async function injectMediaIntoPptx(pptxPath: string, mediaDir: string): Promise<void> {
-  // Redirect to the new function
-  return injectLogosIntoSlides(pptxPath, mediaDir);
-}
+// =============================================================================
+// 1. Apply Theme Fonts
+// =============================================================================
 
 /**
- * Apply theme fonts to all text in a PPTX
+ * Apply theme fonts to all text in a PPTX.
  * Pandoc generates slides with hardcoded fonts; this replaces them with theme font references.
- * Uses in-place ZIP modification to preserve file structure.
  */
 export async function applyThemeFonts(pptxPath: string, theme: Theme): Promise<void> {
   if (!existsSync(pptxPath) || !theme || !theme.fonts) return;
@@ -335,291 +77,393 @@ export async function applyThemeFonts(pptxPath: string, theme: Theme): Promise<v
   const { major, minor } = theme.fonts;
   if (!major && !minor) return;
 
-  const scriptPath = join(dirname(pptxPath), '.apply-fonts.py');
-  const script = `import zipfile, sys, re, os
-
-pptx_path = sys.argv[1]
-temp_path = pptx_path + '.tmp'
-
-# Fonts to replace with theme fonts
-default_fonts = ['Calibri', 'Arial', 'Helvetica', 'Times New Roman', 'Cambria']
-
-with zipfile.ZipFile(pptx_path, 'r') as zin:
-    with zipfile.ZipFile(temp_path, 'w') as zout:
-        for item in zin.infolist():
-            content = zin.read(item.filename)
-
-            # Process slide XML files
-            if item.filename.startswith('ppt/slides/slide') and item.filename.endswith('.xml'):
-                text = content.decode('utf-8')
-
-                # Replace common pandoc fonts with theme minor font reference
-                for font in default_fonts:
-                    text = re.sub(rf'(<a:latin\\s+typeface="){font}(")', r'\\1+mn-lt\\2', text)
-
-                content = text.encode('utf-8')
-
-            zout.writestr(item, content)
-
-os.replace(temp_path, pptx_path)
-`;
+  const zip = new AdmZip(pptxPath);
+  const defaultFonts = ['Calibri', 'Arial', 'Helvetica', 'Times New Roman', 'Cambria'];
 
-  writeFileSync(scriptPath, script);
-  try {
-    const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
-    execSync(`${pythonCmd} "${scriptPath}" "${pptxPath}"`, { stdio: 'pipe' });
-  } finally {
-    try { unlinkSync(scriptPath); } catch { /* ignore */ }
+  for (const entry of getSlideEntries(zip)) {
+    let text = entry.getData().toString('utf-8');
+    for (const font of defaultFonts) {
+      text = text.replace(
+        new RegExp(`(<a:latin\\s+typeface=")${font}(")`, 'g'),
+        '$1+mn-lt$2'
+      );
+    }
+    updateEntry(zip, entry.entryName, text);
   }
+
+  zip.writeZip(pptxPath);
 }
 
+// =============================================================================
+// 2. Apply Centering
+// =============================================================================
+
 /**
- * Apply vertical centering to slides that have the .center class
- * Uses in-place ZIP modification to preserve file structure.
+ * Apply horizontal centering to slides that have the .center class.
  */
 export async function applyCentering(pptxPath: string, centeredSlideIndices: number[]): Promise<void> {
   if (!existsSync(pptxPath) || !centeredSlideIndices || centeredSlideIndices.length === 0) return;
 
-  const scriptPath = join(dirname(pptxPath), '.apply-centering.py');
-  const indicesJson = JSON.stringify(centeredSlideIndices);
-  const script = `import zipfile, sys, re, os, json
+  const zip = new AdmZip(pptxPath);
+  const centeredFiles = new Set(centeredSlideIndices.map(i => `ppt/slides/slide${i}.xml`));
+
+  for (const entry of getSlideEntries(zip)) {
+    if (!centeredFiles.has(entry.entryName)) continue;
 
-pptx_path = sys.argv[1]
-centered_indices = json.loads('${indicesJson}')
-temp_path = pptx_path + '.tmp'
+    let text = entry.getData().toString('utf-8');
 
-# Build set of slide filenames to center
-centered_files = {f'ppt/slides/slide{i}.xml' for i in centered_indices}
+    // Process each shape separately to skip footer and slide number
+    text = text.replace(/<p:sp>.*?<\/p:sp>/gs, (shape) => {
+      // Skip footer and slide number placeholders
+      if (shape.includes('type="sldNum"') || shape.includes('type="ftr"')) {
+        return shape;
+      }
+
+      // Add algn="ctr" to existing <a:pPr> elements
+      shape = shape.replace(
+        /(<a:pPr)((?:[^/>]|\/(?!>))*)(\s*\/?>)/g,
+        (_match: string, before: string, attrs: string, closing: string) => {
+          attrs = attrs.trimEnd();
+          let isSelfClosing = closing.includes('/');
 
-with zipfile.ZipFile(pptx_path, 'r') as zin:
-    with zipfile.ZipFile(temp_path, 'w') as zout:
-        for item in zin.infolist():
-            content = zin.read(item.filename)
+          if (attrs.endsWith('/')) {
+            attrs = attrs.slice(0, -1).trimEnd();
+            isSelfClosing = true;
+          }
 
-            # Process centered slides
-            if item.filename in centered_files:
-                text = content.decode('utf-8')
+          if (!attrs.includes('algn=')) {
+            attrs += ' algn="ctr"';
+          } else {
+            attrs = attrs.replace(/algn="[^"]*"/, 'algn="ctr"');
+          }
 
-                # Process each shape (<p:sp>) separately to skip footer and slide number
-                def process_shape(shape_match):
-                    shape = shape_match.group(0)
-                    # Skip footer and slide number placeholders
-                    if 'type="sldNum"' in shape or 'type="ftr"' in shape:
-                        return shape
+          return before + attrs + (isSelfClosing ? ' />' : '>');
+        }
+      );
 
-                    # Add algn="ctr" to existing <a:pPr> elements
-                    # Handle both <a:pPr ...> and <a:pPr ... /> (self-closing)
-                    def add_center_align(match):
-                        before, attrs, closing = match.groups()
-                        attrs = attrs.rstrip()
-                        is_self_closing = '/' in closing
+      // Add <a:pPr algn="ctr"/> to paragraphs without pPr
+      shape = shape.replace(/(<a:p>)(<a:r>)/g, '$1<a:pPr algn="ctr"/>$2');
 
-                        if attrs.endswith('/'):
-                            attrs = attrs[:-1].rstrip()
-                            is_self_closing = True
+      return shape;
+    });
+
+    updateEntry(zip, entry.entryName, text);
+  }
 
-                        if 'algn=' not in attrs:
-                            attrs += ' algn="ctr"'
-                        else:
-                            attrs = re.sub(r'algn="[^"]*"', 'algn="ctr"', attrs)
+  zip.writeZip(pptxPath);
+}
 
-                        return before + attrs + (' />' if is_self_closing else '>')
+// =============================================================================
+// 3. Inject Slide Numbers
+// =============================================================================
 
-                    shape = re.sub(r'(<a:pPr)((?:[^/>]|/(?!>))*)(\\s*/?>)', add_center_align, shape)
+function getSlideNumXml(maxId: number, num: number): string {
+  return `<p:sp><p:nvSpPr><p:cNvPr id="${maxId}" name="Slide Number Placeholder ${maxId}"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="8610600" y="6581838"/><a:ext cx="2743200" cy="319024"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr><a:defRPr sz="1600"><a:solidFill><a:srgbClr val="FFFFFF"/></a:solidFill></a:defRPr></a:lvl1pPr></a:lstStyle><a:p><a:r><a:rPr lang="en-GB" sz="1600" dirty="0"><a:solidFill><a:srgbClr val="FFFFFF"/></a:solidFill></a:rPr><a:t>${num}</a:t></a:r></a:p></p:txBody></p:sp>`;
+}
 
-                    # Add <a:pPr algn="ctr"/> to paragraphs without pPr
-                    shape = re.sub(r'(<a:p>)(<a:r>)', r'\\1<a:pPr algn="ctr"/>\\2', shape)
+function isContentSlide(text: string): boolean {
+  const hasFooter = text.includes('type="ftr"');
+  const hasBody = text.includes('idx="1"') || text.includes('type="body"');
+  return hasFooter && hasBody;
+}
 
-                    return shape
+/**
+ * Inject slide numbers into content slides of a PPTX.
+ * Only adds numbers to slides that have a footer and body placeholder.
+ * Title, section, and cover slides are skipped.
+ */
+export async function injectSlideNumbers(pptxPath: string): Promise<void> {
+  if (!existsSync(pptxPath)) return;
 
-                # Process all shapes
-                text = re.sub(r'<p:sp>.*?</p:sp>', process_shape, text, flags=re.DOTALL)
+  const zip = new AdmZip(pptxPath);
+  const slides = getSlideEntries(zip);
 
-                content = text.encode('utf-8')
+  // Pass 1: identify content slides and assign sequential numbers
+  const slideNumbers = new Map<string, number>();
+  let contentNum = 1;
 
-            zout.writestr(item, content)
+  for (const entry of slides) {
+    const text = entry.getData().toString('utf-8');
+    if (isContentSlide(text) && !text.includes('type="sldNum"')) {
+      slideNumbers.set(entry.entryName, contentNum);
+      contentNum++;
+    }
+  }
 
-os.replace(temp_path, pptx_path)
-`;
+  // Pass 2: inject numbers
+  for (const entry of slides) {
+    const num = slideNumbers.get(entry.entryName);
+    if (num === undefined) continue;
 
-  writeFileSync(scriptPath, script);
-  try {
-    const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
-    execSync(`${pythonCmd} "${scriptPath}" "${pptxPath}"`, { stdio: 'pipe' });
-  } finally {
-    try { unlinkSync(scriptPath); } catch { /* ignore */ }
+    let text = entry.getData().toString('utf-8');
+    const maxId = findMaxId(text) + 1;
+    const slideNumXml = getSlideNumXml(maxId, num);
+    text = text.replace('</p:spTree>', slideNumXml + '</p:spTree>');
+    updateEntry(zip, entry.entryName, text);
   }
+
+  zip.writeZip(pptxPath);
 }
 
+// =============================================================================
+// 4. Inject Logos Into Slides
+// =============================================================================
+
 /**
- * Apply buildup greying to slides with buildup content
- * Greys out all bullet items except the last one, which gets the accent color.
- * Only affects actual bullet items (not intro text with buNone).
- * Uses in-place ZIP modification to preserve file structure.
+ * Inject logos into cover slide of a PPTX (matching ref.pptx style).
  */
-export async function applyBuildupColors(pptxPath: string, config: BuildupConfig = {}): Promise<void> {
-  if (!existsSync(pptxPath)) return;
+export async function injectLogosIntoSlides(pptxPath: string, mediaDir: string | null): Promise<void> {
+  if (!mediaDir || !existsSync(mediaDir) || !existsSync(pptxPath)) return;
 
-  // Check if buildup colors are disabled
-  if (config.enabled === false) return;
+  const logoLeftPath = join(mediaDir, 'logo-left.png');
+  const logoRightPath = join(mediaDir, 'logo-right.png');
+  const hasLeft = existsSync(logoLeftPath);
+  const hasRight = existsSync(logoRightPath);
 
-  // Get colors from config with defaults
-  const defaultColor = (config.default || '608C32').replace(/^#/, '');
-  const titleColor = (config.title || defaultColor).replace(/^#/, '');
-  const greyColor = (config.grey || '888888').replace(/^#/, '');
-  const accentColor = (config.accent || defaultColor).replace(/^#/, '');
+  if (!hasLeft && !hasRight) return;
 
-  const scriptPath = join(dirname(pptxPath), '.apply-buildup.py');
-  const script = `import zipfile
-import sys
-import re
-import os
+  const zip = new AdmZip(pptxPath);
 
-pptx_path = sys.argv[1]
-temp_path = pptx_path + '.tmp'
+  // Find next available image number
+  let maxImgNum = 0;
+  for (const entry of zip.getEntries()) {
+    const m = entry.entryName.match(/^ppt\/media\/image(\d+)\./);
+    if (m) maxImgNum = Math.max(maxImgNum, parseInt(m[1]));
+  }
+  const nextImg = maxImgNum + 1;
 
-DEFAULT = '${defaultColor}'
-TITLE = '${titleColor}'
-GREY = '${greyColor}'
-ACCENT = '${accentColor}'
+  const rightImgName = hasRight ? `ppt/media/image${nextImg}.png` : null;
+  const leftImgName = hasLeft ? `ppt/media/image${nextImg + 1}.png` : null;
 
-def get_bullet_paragraphs(body):
-    """Return indices of paragraphs that are actual bullet items (have lvl="0" but NOT buNone)"""
-    paras = list(re.finditer(r'<a:p>.*?</a:p>', body, re.DOTALL))
-    bullet_indices = []
+  // Update [Content_Types].xml to include png if needed
+  const contentTypesXml = readEntry(zip, '[Content_Types].xml');
+  if (contentTypesXml && !contentTypesXml.includes('Extension="png"')) {
+    updateEntry(zip, '[Content_Types].xml',
+      contentTypesXml.replace('</Types>', '<Default Extension="png" ContentType="image/png"/></Types>')
+    );
+  }
 
-    for i, p in enumerate(paras):
-        para_text = p.group(0)
-        if 'lvl="0"' in para_text and '<a:buNone' not in para_text:
-            bullet_indices.append(i)
+  // Update slide1.xml.rels to add image relationships
+  let rightRid: string | null = null;
+  let leftRid: string | null = null;
+  const relsName = 'ppt/slides/_rels/slide1.xml.rels';
+  let relsXml = readEntry(zip, relsName);
 
-    return bullet_indices, paras
+  if (relsXml) {
+    let maxRid = findMaxRId(relsXml);
+    const newRels: string[] = [];
 
+    if (hasRight) {
+      maxRid++;
+      rightRid = `rId${maxRid}`;
+      newRels.push(`<Relationship Id="${rightRid}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image${nextImg}.png"/>`);
+    }
 
-def apply_color_to_para(para, color):
-    """Apply a color to all text runs in a paragraph"""
-    new_para = re.sub(
-        r'<a:rPr\\s*/>',
-        f'<a:rPr><a:solidFill><a:srgbClr val="{color}"/></a:solidFill></a:rPr>',
-        para
-    )
+    if (hasLeft) {
+      maxRid++;
+      leftRid = `rId${maxRid}`;
+      newRels.push(`<Relationship Id="${leftRid}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image${nextImg + 1}.png"/>`);
+    }
 
-    def fix_rpr_with_attrs(m):
-        attrs = m.group(1).strip()
-        return f'<a:rPr {attrs}><a:solidFill><a:srgbClr val="{color}"/></a:solidFill></a:rPr>'
+    if (newRels.length > 0) {
+      relsXml = relsXml.replace('</Relationships>', newRels.join('') + '</Relationships>');
+      updateEntry(zip, relsName, relsXml);
+    }
+  }
 
-    new_para = re.sub(
-        r'<a:rPr\\s+([^>]+?)\\s*/>',
-        fix_rpr_with_attrs,
-        new_para
-    )
+  // Update slide1.xml to add picture elements
+  let slide1Xml = readEntry(zip, 'ppt/slides/slide1.xml');
+  if (slide1Xml) {
+    let maxId = findMaxId(slide1Xml);
+    const pics: string[] = [];
 
-    return new_para
+    if (hasRight && rightRid) {
+      maxId++;
+      pics.push(`<p:pic><p:nvPicPr><p:cNvPr id="${maxId}" name="Picture ${maxId}"/><p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr><p:nvPr/></p:nvPicPr><p:blipFill><a:blip r:embed="${rightRid}"/><a:stretch><a:fillRect/></a:stretch></p:blipFill><p:spPr><a:xfrm><a:off x="9492000" y="5742001"/><a:ext cx="2700000" cy="1115999"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr></p:pic>`);
+    }
 
+    if (hasLeft && leftRid) {
+      maxId++;
+      pics.push(`<p:pic><p:nvPicPr><p:cNvPr id="${maxId}" name="Picture ${maxId}"/><p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr><p:nvPr/></p:nvPicPr><p:blipFill><a:blip r:embed="${leftRid}"/><a:srcRect t="22495" b="27262"/><a:stretch/></p:blipFill><p:spPr><a:xfrm><a:off x="0" y="5904608"/><a:ext cx="3794408" cy="954349"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr></p:pic>`);
+    }
 
-def is_buildup_slide(xml):
-    """Check if slide has buildup marker (animEffect with filter=wipe)"""
-    # Buildup slides have animation effects from pandoc's incremental lists
-    return 'animEffect' in xml or '<a:bldLst>' in xml
+    if (pics.length > 0) {
+      slide1Xml = slide1Xml.replace('</p:spTree>', pics.join('') + '</p:spTree>');
+      updateEntry(zip, 'ppt/slides/slide1.xml', slide1Xml);
+    }
+  }
 
+  // Add logo image files
+  if (hasRight && rightImgName) {
+    zip.addFile(rightImgName, readFileSync(logoRightPath));
+  }
+  if (hasLeft && leftImgName) {
+    zip.addFile(leftImgName, readFileSync(logoLeftPath));
+  }
 
-def color_content_placeholder(xml):
-    """Apply colors to all text in content placeholder.
+  zip.writeZip(pptxPath);
+}
 
-    For buildup slides: grey previous bullet items, accent on last bullet item.
-    For all text (bullets and non-bullets): apply default color unless overridden by buildup.
-    """
+// =============================================================================
+// 5. Apply Buildup Colors
+// =============================================================================
 
-    pattern = r'(<p:sp>.*?<p:ph idx="1"[^/]*/?>.*?<p:txBody>)(.*?)(</p:txBody>.*?</p:sp>)'
-    match = re.search(pattern, xml, re.DOTALL)
+function applyColorToPara(para: string, color: string): string {
+  const fill = `<a:solidFill><a:srgbClr val="${color}"/></a:solidFill>`;
 
-    if not match:
-        return xml
+  // Replace bare <a:rPr/> with colored version
+  let result = para.replace(/<a:rPr\s*\/>/g, `<a:rPr>${fill}</a:rPr>`);
 
-    before_body = match.group(1)
-    body = match.group(2)
-    after_body = match.group(3)
+  // Replace <a:rPr attrs/> (self-closing with attributes) with colored version
+  result = result.replace(/<a:rPr\s+([^>]+?)\s*\/>/g, (_: string, attrs: string) => {
+    return `<a:rPr ${attrs.trim()}>${fill}</a:rPr>`;
+  });
 
-    bullet_indices, paras = get_bullet_paragraphs(body)
-    is_buildup = is_buildup_slide(xml)
+  return result;
+}
 
-    new_body = body
-    offset = 0
+function isBuildupSlide(xml: string): boolean {
+  return xml.includes('animEffect') || xml.includes('<a:bldLst>');
+}
 
-    for i, para_match in enumerate(paras):
-        start = para_match.start() + offset
-        end = para_match.end() + offset
-        para = para_match.group(0)
+function getBulletParagraphs(body: string): {
+  bulletIndices: number[];
+  paras: { start: number; end: number; text: string }[];
+} {
+  const paraRegex = /<a:p>.*?<\/a:p>/gs;
+  const paras: { start: number; end: number; text: string }[] = [];
+  let m: RegExpExecArray | null;
+  while ((m = paraRegex.exec(body)) !== null) {
+    paras.push({ start: m.index, end: m.index + m[0].length, text: m[0] });
+  }
 
-        # Determine color for this paragraph
-        if i in bullet_indices and is_buildup:
-            # Buildup bullet: grey all but last, accent on last
-            if i == bullet_indices[-1]:
-                color = ACCENT
-            else:
-                color = GREY
-        else:
-            # Non-bullet text OR non-buildup slide: use default color
-            color = DEFAULT
+  const bulletIndices: number[] = [];
+  for (let i = 0; i < paras.length; i++) {
+    const paraText = paras[i].text;
+    if (paraText.includes('lvl="0"') && !paraText.includes('<a:buNone')) {
+      bulletIndices.push(i);
+    }
+  }
 
-        new_para = apply_color_to_para(para, color)
-        new_body = new_body[:start] + new_para + new_body[end:]
-        offset += len(new_para) - len(para)
+  return { bulletIndices, paras };
+}
 
-    return xml[:match.start()] + before_body + new_body + after_body + xml[match.end():]
+function colorContentPlaceholder(
+  xml: string,
+  defaultColor: string,
+  greyColor: string,
+  accentColor: string
+): string {
+  const pattern = /(<p:sp>.*?<p:ph idx="1"[^/]*\/?>.*?<p:txBody>)(.*?)(<\/p:txBody>.*?<\/p:sp>)/s;
+  const match = pattern.exec(xml);
+
+  if (!match) return xml;
+
+  const beforeBody = match[1];
+  const body = match[2];
+  const afterBody = match[3];
+
+  const { bulletIndices, paras } = getBulletParagraphs(body);
+  const isBuildup = isBuildupSlide(xml);
+
+  let newBody = body;
+  let offset = 0;
+
+  for (let i = 0; i < paras.length; i++) {
+    const para = paras[i];
+    const start = para.start + offset;
+    const end = para.end + offset;
+    const paraText = para.text;
+
+    let color: string;
+    if (bulletIndices.includes(i) && isBuildup) {
+      color = (i === bulletIndices[bulletIndices.length - 1]) ? accentColor : greyColor;
+    } else {
+      color = defaultColor;
+    }
 
+    const newPara = applyColorToPara(paraText, color);
+    newBody = newBody.slice(0, start) + newPara + newBody.slice(end);
+    offset += newPara.length - paraText.length;
+  }
 
-def color_title_placeholder(xml):
-    """Apply title color to title placeholder (type='title' or type='ctrTitle')."""
+  return xml.slice(0, match.index) + beforeBody + newBody + afterBody + xml.slice(match.index + match[0].length);
+}
 
-    # Match title placeholders: type="title" or type="ctrTitle"
-    pattern = r'(<p:sp>.*?<p:ph[^>]*type="(?:title|ctrTitle)"[^/]*/?>.*?<p:txBody>)(.*?)(</p:txBody>.*?</p:sp>)'
-    match = re.search(pattern, xml, re.DOTALL)
+function colorTitlePlaceholder(xml: string, titleColor: string): string {
+  const pattern = /(<p:sp>.*?<p:ph[^>]*type="(?:title|ctrTitle)"[^/]*\/?>.*?<p:txBody>)(.*?)(<\/p:txBody>.*?<\/p:sp>)/s;
+  const match = pattern.exec(xml);
 
-    if not match:
-        return xml
+  if (!match) return xml;
 
-    before_body = match.group(1)
-    body = match.group(2)
-    after_body = match.group(3)
+  const beforeBody = match[1];
+  const body = match[2];
+  const afterBody = match[3];
 
-    paras = list(re.finditer(r'<a:p>.*?</a:p>', body, re.DOTALL))
+  const paraRegex = /<a:p>.*?<\/a:p>/gs;
+  const paras: { start: number; end: number; text: string }[] = [];
+  let m: RegExpExecArray | null;
+  while ((m = paraRegex.exec(body)) !== null) {
+    paras.push({ start: m.index, end: m.index + m[0].length, text: m[0] });
+  }
 
-    new_body = body
-    offset = 0
+  let newBody = body;
+  let offset = 0;
 
-    for para_match in paras:
-        start = para_match.start() + offset
-        end = para_match.end() + offset
-        para = para_match.group(0)
+  for (const para of paras) {
+    const start = para.start + offset;
+    const end = para.end + offset;
+    const newPara = applyColorToPara(para.text, titleColor);
+    newBody = newBody.slice(0, start) + newPara + newBody.slice(end);
+    offset += newPara.length - para.text.length;
+  }
 
-        new_para = apply_color_to_para(para, TITLE)
-        new_body = new_body[:start] + new_para + new_body[end:]
-        offset += len(new_para) - len(para)
+  return xml.slice(0, match.index) + beforeBody + newBody + afterBody + xml.slice(match.index + match[0].length);
+}
 
-    return xml[:match.start()] + before_body + new_body + after_body + xml[match.end():]
+/**
+ * Apply buildup greying to slides with buildup content.
+ * Greys out all bullet items except the last one, which gets the accent color.
+ * Only affects actual bullet items (not intro text with buNone).
+ */
+export async function applyBuildupColors(pptxPath: string, config: BuildupConfig = {}): Promise<void> {
+  if (!existsSync(pptxPath)) return;
+  if (config.enabled === false) return;
 
-with zipfile.ZipFile(pptx_path, 'r') as zin:
-    with zipfile.ZipFile(temp_path, 'w') as zout:
-        for item in zin.infolist():
-            content = zin.read(item.filename)
+  const defaultColor = (config.default || '608C32').replace(/^#/, '');
+  const titleColor = (config.title || defaultColor).replace(/^#/, '');
+  const greyColor = (config.grey || '888888').replace(/^#/, '');
+  const accentColor = (config.accent || defaultColor).replace(/^#/, '');
 
-            if item.filename.startswith('ppt/slides/slide') and item.filename.endswith('.xml'):
-                text = content.decode('utf-8')
-                text = color_content_placeholder(text)
-                text = color_title_placeholder(text)
-                content = text.encode('utf-8')
+  const zip = new AdmZip(pptxPath);
 
-            zout.writestr(item, content)
+  for (const entry of getSlideEntries(zip)) {
+    let text = entry.getData().toString('utf-8');
+    text = colorContentPlaceholder(text, defaultColor, greyColor, accentColor);
+    text = colorTitlePlaceholder(text, titleColor);
+    updateEntry(zip, entry.entryName, text);
+  }
+
+  zip.writeZip(pptxPath);
+}
 
-os.replace(temp_path, pptx_path)
-`;
+// =============================================================================
+// Legacy Exports (signatures preserved for build.ts compatibility)
+// =============================================================================
 
-  writeFileSync(scriptPath, script);
-  try {
-    const pythonCmd = process.platform === 'win32' ? 'python' : 'python3';
-    execSync(`${pythonCmd} "${scriptPath}" "${pptxPath}"`, { stdio: 'pipe' });
-  } finally {
-    try { unlinkSync(scriptPath); } catch { /* ignore */ }
+export async function generatePptxTemplate(options: TemplateOptions): Promise<string | null> {
+  const { baseTemplate, outputPath } = options;
+  if (baseTemplate && existsSync(baseTemplate)) {
+    writeFileSync(outputPath, readFileSync(baseTemplate));
+    return outputPath;
   }
+  return null;
+}
+
+export function templateNeedsRegeneration(templatePath: string, mediaDir: string, baseTemplate: string): boolean {
+  return false;
+}
+
+export async function injectMediaIntoPptx(pptxPath: string, mediaDir: string): Promise<void> {
+  return injectLogosIntoSlides(pptxPath, mediaDir);
 }