@papyrus-sdk/ui-react-native 0.2.35-beta.9 → 0.2.36

package/runtime/runtime.js

@@ -109,6 +109,67 @@
 /* @papyrus-comic-runtime:end */
 
 (function () {
+/* @papyrus-epub-reader:start */
+(function(root){
+  function mode(value){return value==='chapter-scroll'?'chapter-scroll':'paged';}
+  function validCfi(value){return typeof value==='string' && value.length<=4096 && /^epubcfi\([^\n<>]+\)$/.test(value);}
+  function options(value){return {manager:'default',flow:mode(value)==='paged'?'paginated':'scrolled-doc',spread:'none',width:'100%',height:'100%',allowScriptedContent:false};}
+  function gesture(start,end,state){
+    if(!start || !end || state.selected || state.interactive || state.multitouch)return null;
+    var dx=end.x-start.x,dy=end.y-start.y,elapsed=end.time-start.time;
+    if(state.mode==='paged' && Math.abs(dx)>=48 && Math.abs(dx)>Math.abs(dy)*1.5 && elapsed>=0 && elapsed<1500)return (dx<0)!==Boolean(state.rtl)?'next':'prev';
+    if(elapsed>=0 && elapsed<450 && Math.hypot(dx,dy)<=12)return 'tap';
+    return null;
+  }
+  function location(raw,count,readingMode,geometry){
+    var start=raw && raw.start;if(!start || !validCfi(start.cfi))return null;
+    var displayed=start.displayed||{},chapter=Math.max(1,(Number(start.index)||0)+1);
+    var visualPage=mode(readingMode)==='paged' && Number.isFinite(displayed.page)?displayed.page:null;
+    var total=mode(readingMode)==='paged' && Number.isFinite(displayed.total)?displayed.total:null;
+    var atStart=Boolean(raw.atStart),atEnd=Boolean(raw.atEnd);
+    // Chromium may round a column offset down by a fraction of a CSS pixel.
+    // Keep epub.js authoritative outside a 1px boundary, and for RTL layouts.
+    if(visualPage!==null && total>0 && geometry && geometry.direction==='ltr' && geometry.pageWidth>0 && Number.isFinite(geometry.offset)){
+      var boundary=Math.round(geometry.offset/geometry.pageWidth);
+      if(Math.abs(geometry.offset-boundary*geometry.pageWidth)<=1){
+        visualPage=Math.min(total,Math.max(1,boundary+1));
+        atStart=chapter===(geometry.firstIndex ?? 0)+1 && visualPage===1;
+        atEnd=chapter===(geometry.lastIndex ?? count-1)+1 && visualPage===total;
+      }
+    }
+    var fraction=total?Math.max(0,(visualPage-1)/total):0;
+    return {version:1,cfi:start.cfi,href:start.href||'',chapter:chapter,chapterCount:count,visualPage:visualPage,visualPageCount:total,progress:Math.min(1,Math.max(0,(chapter-1+fraction)/Math.max(1,count))),mode:mode(readingMode),atStart:atStart,atEnd:atEnd};
+  }
+  function installResizeAnchor(manager,readCfi){
+    var original=manager.resize,anchor=null;
+    function resize(width,height,target){
+      if(validCfi(target))anchor=target;
+      if(!anchor){var current=readCfi();if(validCfi(current))anchor=current;}
+      // epub.js accepts a logical target as its third argument. Keep it across
+      // keyboard/dialog reflows instead of adopting each new viewport start.
+      return original.call(this,width,height,anchor || target);
+    }
+    manager.resize=resize;
+    return {cfi:function(){return anchor;},invalidate:function(){anchor=null;},destroy:function(){if(manager.resize===resize)manager.resize=original;anchor=null;}};
+  }
+  function install(contents,config){
+    var doc=contents.document,win=contents.window,start=null,blocked=false;
+    function point(e){var t=e.changedTouches&&e.changedTouches[0]||e.touches&&e.touches[0];return t?{x:t.clientX,y:t.clientY,time:Date.now()}:null;}
+    function selected(){return Boolean(String(win.getSelection()||'').trim()) || config.blocked();}
+    function interactive(target){return Boolean(target && target.closest && target.closest('a,button,input,textarea,select,[contenteditable="true"],[data-papyrus-overlay],[data-papyrus-ink-capture]'));}
+    function begin(e){start=point(e);blocked=e.touches.length!==1 || selected() || interactive(e.target);}
+    function invalidateScroll(finish){if(config.current() && start && finish && config.mode()==='chapter-scroll' && !blocked && !selected() && Math.abs(finish.y-start.y)>12 && Math.abs(finish.y-start.y)>Math.abs(finish.x-start.x) && config.interact)config.interact();}
+    function move(e){if(e.touches.length!==1)blocked=true;invalidateScroll(point(e));}
+    function end(e){var finish=point(e);invalidateScroll(finish);var action=gesture(start,finish,{mode:config.mode(),rtl:config.rtl(),selected:selected(),interactive:blocked||interactive(e.target)||Boolean(config.annotationHit && config.annotationHit(point(e))),multitouch:blocked});start=null;if(!config.current())return;if(action==='tap')config.tap();else if(action)config.turn(action==='next'?1:-1);}
+    function cancel(){start=null;blocked=true;}
+    function link(e){if(config.current() && e.target?.closest?.('a') && config.interact)config.interact();}
+    doc.addEventListener('touchstart',begin,{passive:true});doc.addEventListener('touchmove',move,{passive:true});doc.addEventListener('touchend',end,{passive:true});doc.addEventListener('touchcancel',cancel,{passive:true});doc.addEventListener('click',link);
+    return function(){doc.removeEventListener('touchstart',begin);doc.removeEventListener('touchmove',move);doc.removeEventListener('touchend',end);doc.removeEventListener('touchcancel',cancel);doc.removeEventListener('click',link);};
+  }
+  root.PapyrusEpubReader={mode:mode,validCfi:validCfi,options:options,gesture:gesture,location:location,installResizeAnchor:installResizeAnchor,install:install};
+})(typeof window==='undefined'?globalThis:window);
+
+/* @papyrus-epub-reader:end */
 /* @papyrus-epub-annotations:start */
 (function (root, factory) {
   if (typeof module === 'object' && module.exports) module.exports = factory();
@@ -120,6 +181,84 @@
       typeof anchor.href === 'string' && !/^(javascript|data):/i.test(anchor.href) &&
       typeof anchor.quote === 'string' && anchor.quote.length > 0 && anchor.quote.length <= 100000;
   }
+  function simplifyPath(points, tolerance, maxPoints) {
+    if (!Array.isArray(points) || points.length <= 2) return Array.isArray(points) ? points.slice() : [];
+    tolerance = Number.isFinite(tolerance) ? Math.max(0, tolerance) : 1.5;
+    maxPoints = Number.isSafeInteger(maxPoints) ? Math.max(2, maxPoints) : 512;
+    var keep = new Uint8Array(points.length); keep[0] = 1; keep[points.length - 1] = 1;
+    var stack = [[0, points.length - 1]], toleranceSquared = tolerance * tolerance;
+    while (stack.length) {
+      var interval = stack.pop(), first = interval[0], last = interval[1], a = points[first], b = points[last];
+      var dx = b.x - a.x, dy = b.y - a.y, lengthSquared = dx * dx + dy * dy, maxDistance = toleranceSquared, split = -1;
+      for (var i = first + 1; i < last; i++) {
+        var p = points[i], ratio = lengthSquared ? Math.max(0, Math.min(1, ((p.x - a.x) * dx + (p.y - a.y) * dy) / lengthSquared)) : 0;
+        var px = a.x + ratio * dx, py = a.y + ratio * dy, ox = p.x - px, oy = p.y - py, distance = ox * ox + oy * oy;
+        if (distance > maxDistance) { maxDistance = distance; split = i; }
+      }
+      if (split >= 0) { keep[split] = 1; stack.push([first, split], [split, last]); }
+    }
+    var result = []; for (var j = 0; j < points.length; j++) if (keep[j]) result.push(points[j]);
+    if (result.length <= maxPoints) return result;
+    var capped = []; for (var k = 0; k < maxPoints; k++) capped.push(result[Math.round(k * (result.length - 1) / (maxPoints - 1))]);
+    return capped;
+  }
+  function compactGesturePoints(points, maxPoints) {
+    if (!Array.isArray(points)) return [];
+    maxPoints = Number.isSafeInteger(maxPoints) ? Math.max(2, maxPoints) : 1024;
+    if (points.length <= maxPoints) return points.slice();
+    var compacted = [];
+    for (var i = 0; i < maxPoints; i++) compacted.push(points[Math.round(i * (points.length - 1) / (maxPoints - 1))]);
+    return compacted;
+  }
+  function densifyPath(points, maxStep, maxPoints) {
+    if (!Array.isArray(points) || !points.length) return [];
+    if (points.length === 1) return points.slice();
+    maxStep = Number.isFinite(maxStep) ? Math.max(1, maxStep) : 12;
+    maxPoints = Number.isSafeInteger(maxPoints) ? Math.max(2, maxPoints) : 512;
+    var cumulative = [0], total = 0;
+    for (var i = 1; i < points.length; i++) {
+      if (![points[i-1].x,points[i-1].y,points[i].x,points[i].y].every(Number.isFinite)) return [];
+      total += Math.hypot(points[i].x-points[i-1].x, points[i].y-points[i-1].y);
+      cumulative.push(total);
+    }
+    if (!total) return [points[0], points[points.length-1]];
+    var intervals = Math.min(maxPoints-1, Math.max(1, Math.ceil(total/maxStep))), result = [], segment = 1;
+    for (var sample = 0; sample <= intervals; sample++) {
+      var distance = total*sample/intervals;
+      while (segment < cumulative.length-1 && cumulative[segment] < distance) segment++;
+      var start = points[segment-1], end = points[segment], span = cumulative[segment]-cumulative[segment-1];
+      var ratio = span ? (distance-cumulative[segment-1])/span : 0;
+      result.push({x:start.x+(end.x-start.x)*ratio,y:start.y+(end.y-start.y)*ratio});
+    }
+    return result;
+  }
+  function createSpatialIndex(entries, cellSize) {
+    cellSize = Number.isFinite(cellSize) ? Math.max(8, cellSize) : 64;
+    var cells = new Map();
+    entries.forEach(function(entry) {
+      var left = Math.floor(entry.left / cellSize), right = Math.floor(entry.right / cellSize);
+      var top = Math.floor(entry.top / cellSize), bottom = Math.floor(entry.bottom / cellSize);
+      for (var x = left; x <= right; x++) for (var y = top; y <= bottom; y++) {
+        var key = x + ':' + y, bucket = cells.get(key); if (!bucket) { bucket = []; cells.set(key, bucket); } bucket.push(entry);
+      }
+    });
+    return {cells:cells,cellSize:cellSize};
+  }
+  function queryNearestTextRect(index, x, y, maxDistance) {
+    if (!index || !Number.isFinite(x) || !Number.isFinite(y) || !Number.isFinite(maxDistance) || maxDistance < 0) return null;
+    var size = index.cellSize, minX = Math.floor((x-maxDistance)/size), maxX = Math.floor((x+maxDistance)/size);
+    var minY = Math.floor((y-maxDistance)/size), maxY = Math.floor((y+maxDistance)/size), seen = new Set(), best = null;
+    for (var cx=minX; cx<=maxX; cx++) for (var cy=minY; cy<=maxY; cy++) {
+      var bucket = index.cells.get(cx+':'+cy); if (!bucket) continue;
+      bucket.forEach(function(entry) {
+        if (seen.has(entry)) return; seen.add(entry);
+        var nearestX = Math.max(entry.left,Math.min(entry.right,x)), nearestY = Math.max(entry.top,Math.min(entry.bottom,y));
+        var dx=x-nearestX,dy=y-nearestY,distance=Math.sqrt(dx*dx+dy*dy);
+        if (distance<=maxDistance && (!best || distance<best.distance)) best={entry:entry,distance:distance,x:nearestX,y:nearestY};
+      });
+    }
+    return best;
+  }
   function textNodes(document) {
     var walker = document.createTreeWalker(document.body, 4);
     var nodes = [], text = '', node;
@@ -169,13 +308,196 @@
     if(win.getComputedStyle(doc.body).position==='static')doc.body.style.position='relative';
     doc.body.appendChild(overlay);
     var registry = new Map(), hitRegions = [];
+    var inkRegistry = new Map(), rangeCache = new Map(), spatialIndex = null, activeGesture = null, inkConfig = {enabled:false,preset:'ink'};
+    var inkSvg = doc.createElementNS('http://www.w3.org/2000/svg','svg');
+    inkSvg.setAttribute('data-papyrus-ink-overlay','');
+    inkSvg.style.cssText = 'position:absolute;left:0;top:0;overflow:visible;pointer-events:none;z-index:1';
+    overlay.appendChild(inkSvg);
+    var inkCanvas = doc.createElement('canvas');
+    inkCanvas.dataset.papyrusInkCapture = '';
+    inkCanvas.style.cssText = 'position:fixed;left:0;top:0;width:1px;height:1px;z-index:2147483000;background:transparent;pointer-events:none;touch-action:none';
+    doc.body.appendChild(inkCanvas);
+    var inkContext = null; try { if(typeof win.CanvasRenderingContext2D==='function')inkContext = inkCanvas.getContext('2d'); } catch (_) {}
+    function resizeCanvas() {
+      var bodyRect=doc.body.getBoundingClientRect(), ratio = Math.max(1,Math.min(3,win.devicePixelRatio || 1));
+      var width=Math.max(1,Math.min(4096,doc.body.clientWidth||bodyRect.width||Math.min(4096,win.innerWidth||1)));
+      var height=Math.max(1,Math.min(4096,doc.body.clientHeight||bodyRect.height||Math.min(4096,win.innerHeight||1)));
+      inkCanvas.style.width=width+'px';inkCanvas.style.height=height+'px';
+      inkCanvas.width = Math.round(width*ratio); inkCanvas.height = Math.round(height*ratio);
+      if (inkContext) { inkContext.setTransform(ratio,0,0,ratio,0,0); inkContext.clearRect(0,0,width,height); }
+    }
+    function collectTextRects() {
+      var walker = doc.createTreeWalker(doc.body,4), node, entries=[];
+      while ((node=walker.nextNode())) {
+        var parent=node.parentElement;
+        if (!parent || parent.closest('script,style,noscript,textarea,[data-papyrus-overlay],[data-papyrus-ink-capture]')) continue;
+        var text=node.nodeValue || '', style=win.getComputedStyle(parent), computed=parseFloat(style.lineHeight);
+        for (var start=0; start<text.length;) {
+          var end=Math.min(text.length,start+24), last=text.charCodeAt(end-1), next=text.charCodeAt(end);
+          if(end<text.length&&last>=0xD800&&last<=0xDBFF&&next>=0xDC00&&next<=0xDFFF)end++;
+          var range=doc.createRange(); range.setStart(node,start); range.setEnd(node,end);
+          var rects=[]; try { rects=Array.from(range.getClientRects()); } catch (_) {}
+          rects.forEach(function(rect) {
+            if (!(rect.width>0 && rect.height>0)) return;
+            entries.push({left:rect.left+win.scrollX,top:rect.top+win.scrollY,right:rect.right+win.scrollX,bottom:rect.bottom+win.scrollY,width:rect.width,height:rect.height,
+              node:node,start:start,end:end,lineHeight:Number.isFinite(computed)&&computed>0?computed:rect.height});
+          });
+          start=end;
+        }
+      }
+      return entries;
+    }
+    function rebuildSpatialIndex() { spatialIndex=createSpatialIndex(collectTextRects(),64); rangeCache.clear(); }
+    function inkViewportExtent() {
+      var root=doc.documentElement,body=doc.body,bodyRect=body.getBoundingClientRect();
+      var width=root.clientWidth||body.clientWidth||bodyRect.width||win.innerWidth||1;
+      var height=root.clientHeight||body.clientHeight||bodyRect.height||win.innerHeight||1;
+      return Math.max(1,Math.min(4096,width),Math.min(4096,height));
+    }
+    function inkStrokeWidthPx(width,preset) {
+      var scale=preset==='highlight'?0.8:preset==='underline'?0.1:0.15;
+      return Math.max(1,Math.min(24,(Number.isFinite(width)?width:0.006)*inkViewportExtent()*scale));
+    }
+    function closestGlyph(entry,x,y,maxDistance) {
+      var source=(entry.node.nodeValue || '').slice(entry.start,entry.end), best=null, offset=0;
+      for (var glyph of source) {
+        var range=doc.createRange(); range.setStart(entry.node,entry.start+offset); range.setEnd(entry.node,entry.start+offset+glyph.length); offset+=glyph.length;
+        var rects=[]; try { rects=Array.from(range.getClientRects()); } catch (_) {}
+        rects.forEach(function(rect) {
+          if (!(rect.width>0 && rect.height>0)) return;
+          var nx=Math.max(rect.left+win.scrollX,Math.min(rect.right+win.scrollX,x)), ny=Math.max(rect.top+win.scrollY,Math.min(rect.bottom+win.scrollY,y));
+          var dx=x-nx,dy=y-ny,distance=Math.sqrt(dx*dx+dy*dy);
+          if (distance<=maxDistance && (!best || distance<best.distance)) best={range:range,rect:rect,distance:distance};
+        });
+      }
+      if (!best || typeof contents.cfiFromRange!=='function') return null;
+      var quote=best.range.toString(), cfiRange; try { cfiRange=contents.cfiFromRange(best.range); } catch (_) { return null; }
+      if (!quote || typeof cfiRange!=='string' || !/^epubcfi\([^\n<>]+\)$/.test(cfiRange)) return null;
+      var lineHeight=Math.max(1,entry.lineHeight || best.rect.height), px=x-(best.rect.left+win.scrollX), py=y-(best.rect.top+win.scrollY);
+      return {cfiRange:cfiRange,quote:quote,x:Math.max(-3,Math.min(3,px/lineHeight)),y:Math.max(-3,Math.min(3,py/lineHeight))};
+    }
+    function renderInkAnnotation(annotation,keep,bodyRect) {
+      var baseRect=bodyRect || doc.body.getBoundingClientRect() || {left:0,top:0};
+      var data=annotation.epubInk;
+      if (!data || data.version!==1 || data.kind!=='epub-ink' || !Array.isArray(data.segments)) return;
+      keep.add(annotation.id);
+      var group=inkRegistry.get(annotation.id);
+      if (!group) { group=doc.createElementNS('http://www.w3.org/2000/svg','g'); group.setAttribute('data-epub-ink-id',annotation.id); inkSvg.appendChild(group); inkRegistry.set(annotation.id,group); }
+      group.replaceChildren();
+      var color=/^#[0-9a-f]{6}$/i.test(annotation.color)?annotation.color:'#2563eb';
+      var opacity=Number.isFinite(annotation.opacity)?Math.max(0,Math.min(1,annotation.opacity)):1;
+      var preset=['ink','highlight','underline'].indexOf(data.preset)>=0?data.preset:'ink';
+      var stroke=inkStrokeWidthPx(annotation.strokeWidth,preset);
+      data.segments.forEach(function(segment) {
+        if (segment.href!==options.href || !Array.isArray(segment.points)) return;
+        var paths=[], current=[];
+        segment.points.forEach(function(point) {
+          var range=rangeCache.get(point.cfiRange);
+          if (!range) { try { range=contents.range(point.cfiRange); } catch (_) { range=null; } if (range) rangeCache.set(point.cfiRange,range); }
+          if (!range || range.toString()!==point.quote) { if(current.length>1)paths.push(current);current=[];return; }
+          var rect; try { rect=range.getBoundingClientRect(); } catch (_) { rect=null; }
+          if (!rect || !(rect.width>0 && rect.height>0)) { if(current.length>1)paths.push(current);current=[];return; }
+          var lineHeight=Math.max(1,rect.height), x=rect.left-baseRect.left+point.x*lineHeight, y=rect.top-baseRect.top+point.y*lineHeight;
+          var previous=current[current.length-1], jumpLimit=Math.max(24,lineHeight*2.5);
+          if (previous && Math.hypot(x-previous.x,y-previous.y)>jumpLimit) { if(current.length>1)paths.push(current);current=[]; }
+          current.push({x:x,y:y,lineHeight:lineHeight});
+        });
+        if(current.length>1)paths.push(current);
+        paths.forEach(function(points) {
+          var d='M '+points[0].x.toFixed(1)+' '+points[0].y.toFixed(1);
+          for(var i=1;i<points.length;i++){var prev=points[i-1],point=points[i],mx=(prev.x+point.x)/2,my=(prev.y+point.y)/2;d+=' Q '+prev.x.toFixed(1)+' '+prev.y.toFixed(1)+' '+mx.toFixed(1)+' '+my.toFixed(1);}
+          var last=points[points.length-1];d+=' L '+last.x.toFixed(1)+' '+last.y.toFixed(1);
+          var path=doc.createElementNS('http://www.w3.org/2000/svg','path');path.setAttribute('d',d);path.setAttribute('fill','none');path.setAttribute('stroke',color);path.setAttribute('stroke-width',String(stroke));path.setAttribute('stroke-linecap','round');path.setAttribute('stroke-linejoin','round');path.setAttribute('opacity',String(opacity));group.appendChild(path);
+        });
+      });
+    }
+    function clearPreview() {
+      if(inkContext)inkContext.clearRect(0,0,inkCanvas.width,inkCanvas.height);
+      inkSvg.querySelectorAll('[data-papyrus-ink-preview]').forEach(function(path){path.remove();});
+    }
+    function createPreviewPath(x,y) {
+      var path=doc.createElementNS('http://www.w3.org/2000/svg','path');
+      path.setAttribute('data-papyrus-ink-preview','');path.setAttribute('d','M '+x.toFixed(1)+' '+y.toFixed(1));path.setAttribute('fill','none');
+      path.setAttribute('stroke',inkConfig.color);path.setAttribute('stroke-width',String(inkStrokeWidthPx(inkConfig.strokeWidth,inkConfig.preset)));
+      path.setAttribute('stroke-linecap','round');path.setAttribute('stroke-linejoin','round');path.setAttribute('opacity',String(inkConfig.opacity));
+      path.style.pointerEvents='none';inkSvg.appendChild(path);return path;
+    }
+    function updatePreviewPath(clientX,clientY) {
+      var bodyRect=doc.body.getBoundingClientRect(),x=clientX-bodyRect.left,y=clientY-bodyRect.top;
+      var gesture=activeGesture;
+      if(!gesture.previewPath||gesture.previewPathPoints>=32){
+        gesture.previewPath=createPreviewPath(gesture.previewLast?gesture.previewLast.x:x,gesture.previewLast?gesture.previewLast.y:y);
+        gesture.previewPathPoints=1;
+      }
+      var pathData=gesture.previewPath.getAttribute('d')||'';
+      gesture.previewPath.setAttribute('d',pathData+' L '+x.toFixed(1)+' '+y.toFixed(1));
+      gesture.previewPathPoints++;
+      gesture.previewLast={x:x,y:y};
+    }
+    function cancelGesture() {
+      var gesture=activeGesture; activeGesture=null; clearPreview();
+      if(gesture)try{inkCanvas.releasePointerCapture(gesture.pointerId);}catch(_){}
+    }
+    function commitGesture() {
+      var gesture=activeGesture; activeGesture=null; clearPreview();
+      if(!gesture || !alive || !options.isCurrent() || !inkConfig.enabled || !spatialIndex) return;
+      var simplified=simplifyPath(gesture.points,1.5,512), anchorSamples=densifyPath(simplified,12,512), segments=[], current=[];
+      anchorSamples.forEach(function(point) {
+        var coarse=queryNearestTextRect(spatialIndex,point.x,point.y,28);
+        var cutoff=coarse?Math.max(12,Math.min(28,0.8*coarse.entry.lineHeight)):12;
+        var anchored=coarse && closestGlyph(coarse.entry,point.x,point.y,cutoff);
+        if(!anchored){if(current.length>1)segments.push({href:options.href,spineIndex:options.spineIndex,points:current});current=[];return;}
+        current.push(anchored);
+      });
+      if(current.length>1)segments.push({href:options.href,spineIndex:options.spineIndex,points:current});
+      segments=segments.slice(0,64);
+      var pointCount=segments.reduce(function(total,segment){return total+segment.points.length;},0);
+      if(!pointCount)return;
+      var width=Math.max(1,doc.documentElement.scrollWidth,win.innerWidth),height=Math.max(1,doc.documentElement.scrollHeight,win.innerHeight);
+      var normalized=simplified.map(function(p){return {x:Math.max(0,Math.min(1,p.x/width)),y:Math.max(0,Math.min(1,p.y/height))};});
+      var minX=Math.min.apply(null,normalized.map(function(p){return p.x;})),maxX=Math.max.apply(null,normalized.map(function(p){return p.x;}));
+      var minY=Math.min.apply(null,normalized.map(function(p){return p.y;})),maxY=Math.max.apply(null,normalized.map(function(p){return p.y;}));
+      var first=segments[0].points[0], href=segments[0].href, documentId=typeof options.documentId==='function'?options.documentId():options.documentId;
+      var annotation={id:'epub-ink-'+Date.now()+'-'+Math.random().toString(36).slice(2,9),type:'ink',pageIndex:(options.spineIndex||0)+1,
+        rect:{x:minX,y:minY,width:Math.min(1-minX,Math.max(0.001,maxX-minX)),height:Math.min(1-minY,Math.max(0.001,maxY-minY))},path:normalized,color:inkConfig.color,opacity:inkConfig.opacity,strokeWidth:inkConfig.strokeWidth,createdAt:Date.now(),content:first.quote,
+        anchor:{version:1,kind:'epub-cfi',cfiRange:first.cfiRange,href:href,spineIndex:options.spineIndex,documentId:documentId,quote:first.quote},
+        epubInk:{version:1,kind:'epub-ink',documentId:documentId,preset:inkConfig.preset,segments:segments}};
+      if(typeof options.onInkCommit==='function')options.onInkCommit(annotation);
+    }
+    function pointerDown(event) {
+      if(!inkConfig.enabled || !alive || !options.isCurrent() || event.button!==undefined && event.button!==0)return;
+      if(activeGesture){cancelGesture();return;}
+      event.preventDefault();event.stopPropagation();
+      activeGesture={pointerId:event.pointerId,points:[{x:event.clientX+win.scrollX,y:event.clientY+win.scrollY}],last:{x:event.clientX,y:event.clientY},previewPath:null,previewPathPoints:0,previewLast:null};
+      updatePreviewPath(event.clientX,event.clientY);
+      try{inkCanvas.setPointerCapture(event.pointerId);}catch(_){}
+    }
+    function pointerMove(event) {
+      if(!activeGesture || activeGesture.pointerId!==event.pointerId)return;
+      if(!options.isCurrent()||!inkConfig.enabled){cancelGesture();return;}
+      event.preventDefault();event.stopPropagation();
+      var point={x:event.clientX+win.scrollX,y:event.clientY+win.scrollY};activeGesture.points.push(point);
+      if(activeGesture.points.length>2048)activeGesture.points=compactGesturePoints(activeGesture.points,1024);
+      if(inkContext){inkContext.beginPath();inkContext.moveTo(activeGesture.last.x,activeGesture.last.y);inkContext.lineTo(event.clientX,event.clientY);inkContext.strokeStyle=inkConfig.color;inkContext.globalAlpha=inkConfig.opacity;inkContext.lineWidth=inkStrokeWidthPx(inkConfig.strokeWidth,inkConfig.preset);inkContext.lineCap='round';inkContext.lineJoin='round';inkContext.stroke();}
+      updatePreviewPath(event.clientX,event.clientY);
+      activeGesture.last={x:event.clientX,y:event.clientY};
+    }
+    function pointerUp(event) {if(!activeGesture || activeGesture.pointerId!==event.pointerId)return;event.preventDefault();event.stopPropagation();var end={x:event.clientX+win.scrollX,y:event.clientY+win.scrollY},last=activeGesture.points[activeGesture.points.length-1];if(Math.hypot(end.x-last.x,end.y-last.y)>0.5){activeGesture.points.push(end);updatePreviewPath(event.clientX,event.clientY);}commitGesture();}
+    function pointerCancel(event) {if(activeGesture && (event.pointerId===undefined || activeGesture.pointerId===event.pointerId))cancelGesture();}
+    resizeCanvas();rebuildSpatialIndex();
+    inkCanvas.addEventListener('pointerdown',pointerDown);inkCanvas.addEventListener('pointermove',pointerMove);inkCanvas.addEventListener('pointerup',pointerUp);inkCanvas.addEventListener('pointercancel',pointerCancel);inkCanvas.addEventListener('lostpointercapture',pointerCancel);
+    win.addEventListener('blur',pointerCancel);win.addEventListener('resize',resizeCanvas);
     function render() {
       frame = 0; if (!alive || !options.isCurrent()) return;
-      var keep = new Set(), noteGroups = new Map();
+      var keep = new Set(), keepInk = new Set(), noteGroups = new Map();
       hitRegions = [];
+      var bodyRect=doc.body.getBoundingClientRect() || {left:0,top:0};
+      inkSvg.setAttribute('width',String(Math.max(doc.documentElement.scrollWidth,win.innerWidth)));
+      inkSvg.setAttribute('height',String(Math.max(doc.documentElement.scrollHeight,win.innerHeight)));
       options.annotations().forEach(function(annotation) {
         var anchor = annotation.anchor;
         if (!validAnchor(anchor) || anchor.href !== options.href || anchor.documentId && options.documentId && anchor.documentId !== options.documentId) return;
+        if(annotation.type==='ink' && annotation.epubInk){renderInkAnnotation(annotation,keepInk,bodyRect);return;}
         var range = resolveRange(contents,anchor); if (!range) return;
         var rects = Array.from(range.getClientRects()).filter(function(r){return r.width>0 && r.height>0;});
         if (!rects.length) return;
@@ -187,6 +509,7 @@
         var color = /^#[0-9a-f]{6}$/i.test(annotation.color) ? annotation.color : '#FFC928';
         var style = annotation.markupStyle || annotation.type;
         var opacity = Number.isFinite(annotation.opacity) ? Math.max(0,Math.min(1,annotation.opacity)) : 0.35;
+        if(style === 'highlight')opacity=Math.min(0.35,opacity);
         rects.forEach(function(rect) {
           var mark = doc.createElement('div');
           var bodyRect=doc.body.getBoundingClientRect();
@@ -199,8 +522,10 @@
         if (hasNote) {
           var last = rects[rects.length-1], button = doc.createElement('button');
           button.textContent = '●'; button.setAttribute('aria-label',options.labels().comment || '');
-          button.style.cssText = 'position:absolute;pointer-events:auto;border:0;background:transparent;color:'+color+';width:44px;height:44px;left:'+Math.max(0,Math.min(doc.documentElement.clientWidth-44,last.right-doc.body.getBoundingClientRect().left))+'px;top:'+(Math.floor(last.top/44)*44-doc.body.getBoundingClientRect().top)+'px';
-          var key = Math.floor(last.top/44);
+          var pageWidth=Math.max(44, options.pageWidth ? options.pageWidth() : win.innerWidth);
+          var bodyRect=doc.body.getBoundingClientRect(), column=Math.max(0,Math.floor((last.left-bodyRect.left)/pageWidth));
+          button.style.cssText = 'position:absolute;pointer-events:auto;border:0;background:transparent;color:'+color+';width:44px;height:44px;left:'+((column+1)*pageWidth-44)+'px;top:'+(Math.floor(last.top/44)*44-doc.body.getBoundingClientRect().top)+'px';
+          var key = column+":"+Math.floor(last.top/44);
           var neighbors=noteGroups.get(key);
           if(!neighbors){neighbors={button:button,ids:[]};noteGroups.set(key,neighbors);group.appendChild(button);}
           neighbors.ids.push(annotation.id);
@@ -211,22 +536,26 @@
         group.button.addEventListener('click',function(e){e.stopPropagation();if(options.isCurrent())options.onTap(group.ids[0],group.ids);});
       });
       registry.forEach(function(group,id){if (!keep.has(id)) {group.remove();registry.delete(id);}});
+      inkRegistry.forEach(function(group,id){if (!keepInk.has(id)) {group.remove();inkRegistry.delete(id);}});
     }
     function schedule() { if (alive && !frame) frame = win.requestAnimationFrame(render); }
+    function rebuildAndSchedule(){if(!alive)return;rebuildSpatialIndex();schedule();}
+    function handleResize(){resizeCanvas();rebuildAndSchedule();}
+    function handleDocumentLoad(){rebuildAndSchedule();}
     function tapMarkup(event) {
       if(!alive || !options.isCurrent() || String(win.getSelection() || '').length || event.target.closest('[data-papyrus-overlay]'))return;
       var hit=hitRegions.find(function(item){return item.rects.some(function(r){return event.clientX>=r.left && event.clientX<=r.right && event.clientY>=r.top && event.clientY<=r.bottom;});});
       if(hit) {event.stopPropagation();options.onTap(hit.id);}
     }
     doc.addEventListener('click',tapMarkup);
-    var observer = typeof win.ResizeObserver === 'function' ? new win.ResizeObserver(schedule) : null;
+    var observer = typeof win.ResizeObserver === 'function' ? new win.ResizeObserver(rebuildAndSchedule) : null;
     if (observer) observer.observe(doc.body);
-    win.addEventListener('resize',schedule); doc.addEventListener('load',schedule,true);
-    if (doc.fonts && doc.fonts.ready) doc.fonts.ready.then(schedule);
+    win.addEventListener('resize',handleResize);win.addEventListener('scroll',schedule); doc.addEventListener('load',handleDocumentLoad,true);
+    if (doc.fonts && doc.fonts.ready) doc.fonts.ready.then(function(){if(alive){rebuildSpatialIndex();schedule();}});
     schedule();
-    return {schedule:schedule, range:function(anchor){return resolveRange(contents,anchor);}, destroy:function(){alive=false;if(frame)win.cancelAnimationFrame(frame);if(observer)observer.disconnect();win.removeEventListener('resize',schedule);doc.removeEventListener('load',schedule,true);doc.removeEventListener('click',tapMarkup);overlay.remove();doc.body.style.position=originalPosition;registry.clear();}};
+    return {schedule:schedule, setInkMode:function(config){var preset=['ink','highlight','underline'].indexOf(config?.preset)>=0?config.preset:'ink';inkConfig={enabled:!!config?.enabled,preset:preset,color:/^#[0-9a-f]{6}$/i.test(config?.color)?config.color:'#2563eb',opacity:Number.isFinite(config?.opacity)?Math.max(0,Math.min(1,config.opacity)):1,strokeWidth:Number.isFinite(config?.strokeWidth)?Math.max(0.0025,Math.min(0.02,config.strokeWidth)):0.006};inkCanvas.style.pointerEvents=inkConfig.enabled?'auto':'none';if(!inkConfig.enabled)cancelGesture();}, invalidateLayout:rebuildAndSchedule, hit:function(x,y){return hitRegions.some(function(item){return item.rects.some(function(r){return x>=r.left && x<=r.right && y>=r.top && y<=r.bottom;});});}, range:function(anchor){return resolveRange(contents,anchor);}, destroy:function(){alive=false;cancelGesture();if(frame)win.cancelAnimationFrame(frame);if(observer)observer.disconnect();win.removeEventListener('resize',handleResize);win.removeEventListener('scroll',schedule);win.removeEventListener('blur',pointerCancel);doc.removeEventListener('load',handleDocumentLoad,true);doc.removeEventListener('click',tapMarkup);inkCanvas.removeEventListener('pointerdown',pointerDown);inkCanvas.removeEventListener('pointermove',pointerMove);inkCanvas.removeEventListener('pointerup',pointerUp);inkCanvas.removeEventListener('pointercancel',pointerCancel);inkCanvas.removeEventListener('lostpointercapture',pointerCancel);inkCanvas.remove();overlay.remove();doc.body.style.position=originalPosition;registry.clear();inkRegistry.clear();rangeCache.clear();}};
   }
-  return {validAnchor:validAnchor,recoverRange:recoverRange,resolveRange:resolveRange,selection:selection,install:install};
+  return {validAnchor:validAnchor,simplifyPath:simplifyPath,compactGesturePoints:compactGesturePoints,densifyPath:densifyPath,createSpatialIndex:createSpatialIndex,queryNearestTextRect:queryNearestTextRect,recoverRange:recoverRange,resolveRange:resolveRange,selection:selection,install:install};
 });
 
 /* @papyrus-epub-annotations:end */
@@ -237,10 +566,12 @@
   let currentType = null;
   let book = null;
   let rendition = null;
+  let epubResizeAnchor = null;
   let documentSessionId = null;
   let annotationDocumentId;
   let annotationLabels = {};
   let epubAnnotations = [];
+  let epubInkMode = {enabled:false,color:'#2563eb',opacity:1,strokeWidth:0.006};
   const epubAnnotationRenderers = new Map();
   let spineItems = [];
   let textPages = [];
@@ -649,6 +980,7 @@
   };
 
   const clearViewer = () => {
+    if(epubResizeAnchor){epubResizeAnchor.destroy();epubResizeAnchor=null;}
     epubAnnotationRenderers.forEach(renderer => renderer.destroy());
     epubAnnotationRenderers.clear();
     if (epubInteractionCleanup) {
@@ -1305,29 +1637,63 @@
       pageCount,
     });
 
+    if (book.locations?.generate) {
+      const activeBook=book;
+      activeBook.locations.generate(150).then(() => {
+        if (isCurrentLoad() && activeBook===book && epubLocation) {
+          epubLocation.progress=activeBook.locations.percentageFromCfi(epubLocation.cfi);
+          sendEvent('EPUB_LOCATION',{documentSessionId,location:epubLocation});
+        }
+      }).catch(() => {});
+    }
+    return renderEpubRendition(loadId,generation,null);
+  };
+
+  const renderEpubRendition = async (loadId,generation,target) => {
+    const diagnosticPayload={loadId};
+    const isCurrentLoad=()=>generation===epubLoadGeneration;
+    if(epubInteractionCleanup)epubInteractionCleanup();
+    if(rendition)rendition.destroy();
     clearViewer();
-    rendition = book.renderTo(viewer, {
-      manager: 'continuous',
-      allowScriptedContent: false,
-      width: '100%',
-      height: '100%',
-      flow: 'scrolled-continuous',
-      spread: 'none',
-    });
+    rendition = book.renderTo(viewer, window.PapyrusEpubReader.options(epubViewMode === 'single' ? 'paged' : 'chapter-scroll'));
     sendEpubDiagnostic('epub.rendition.created', diagnosticPayload);
 
     if (rendition && rendition.hooks && rendition.hooks.content) {
       const session = documentSessionId;
       const activeRendition = rendition;
       rendition.hooks.content.register((contents) => {
+        const removeGestureListeners = window.PapyrusEpubReader.install(contents, {
+          mode: () => epubViewMode === 'single' ? 'paged' : 'chapter-scroll',
+          rtl: () => book.package?.metadata?.direction === 'rtl' || book.spine?.direction === 'rtl',
+          blocked: () => Boolean(nativeMenuSelection && String(nativeMenuSelection.contents?.window?.getSelection() || '').trim()),
+          annotationHit: point => epubAnnotationRenderers.get(contents)?.hit(point.x,point.y),
+          current: () => session === documentSessionId && activeRendition === rendition,
+          interact: () => epubResizeAnchor?.invalidate(),
+          tap: () => sendEvent('EPUB_CONTENT_TAP',{documentSessionId:session}),
+          turn: direction => {
+            epubNavigationQueue = epubNavigationQueue.catch(()=>{}).then(() => {
+              if(session !== documentSessionId || activeRendition !== rendition)return;
+              epubResizeAnchor?.invalidate();
+              return direction<0?activeRendition.prev():activeRendition.next();
+            });
+            epubNavigationQueue.catch(error => sendEvent('EPUB_NAVIGATION_ERROR',{message:String(error)}));
+          },
+        });
+        const gestureCleanup = () => {removeGestureListeners();epubSelectionCleanups.delete(gestureCleanup);};
+        epubSelectionCleanups.add(gestureCleanup);
+        contents.__papyrusGestureCleanup=gestureCleanup;
         const href = spineItems[contents.sectionIndex]?.href;
         if (href && window.PapyrusEpubAnnotations) {
           const renderer = window.PapyrusEpubAnnotations.install(contents, {
             href, get documentId() { return annotationDocumentId; },
+            spineIndex:contents.sectionIndex,
             isCurrent: () => session === documentSessionId && activeRendition === rendition,
+            pageWidth: () => activeRendition.layout?.width || viewer.clientWidth,
             annotations: () => epubAnnotations, labels: () => annotationLabels,
+            onInkCommit: annotation => sendEvent('EPUB_INK_CREATED',{documentSessionId:session,annotation}),
             onTap: (id, ids) => sendEvent("EPUB_ANNOTATION_TAP", {documentSessionId: session, id, ids}),
           });
+          renderer.setInkMode(epubInkMode);
           epubAnnotationRenderers.set(contents,renderer);
         }
         const frame = contents && contents.document ? contents.document.defaultView.frameElement : null;
@@ -1343,8 +1709,7 @@
           typeof selectionWindow.getSelection === 'function'
         ) {
           let selectionTimer = null;
-          let lastSelectionKey = '';
-          let lastSelectionAt = 0;
+
           const reportSelection = () => {
             selectionTimer = null;
             if (session !== documentSessionId || activeRendition !== rendition) return;
@@ -1359,11 +1724,7 @@
             try { cfi = contents.cfiFromRange(range); } catch (_) { return; }
             const anchor = window.PapyrusEpubAnnotations?.selection(contents, cfi, href, annotationDocumentId);
             if (!anchor) return;
-            const key = anchor.cfiRange + ':' + anchor.quote;
-            const now = Date.now();
-            if (key === lastSelectionKey && now - lastSelectionAt < 750) return;
-            lastSelectionKey = key;
-            lastSelectionAt = now;
+            if (nativeMenuSelection?.payload?.anchor?.cfiRange === anchor.cfiRange && nativeMenuSelection?.payload?.anchor?.quote === anchor.quote) return;
             const payload = {documentSessionId: session, text: anchor.quote,
               pageIndex: contents.sectionIndex + 1, anchor};
             nativeMenuSelection = {contents, payload};
@@ -1378,6 +1739,7 @@
             // The content document still emits selectionchange, so resolve its
             // live Range to a CFI before the native menu action can fire.
             if (text) reportSelection();
+            else if (nativeMenuSelection?.contents === contents) nativeMenuSelection = null;
           };
           selectionDocument.addEventListener('selectionchange', handleSelectionChange);
           const selectionCleanup = () => {
@@ -1400,6 +1762,7 @@
       typeof rendition.hooks.unloaded.register === 'function'
     ) {
       rendition.hooks.unloaded.register((view) => {
+        view?.contents?.__papyrusGestureCleanup?.();
         const cleanup = view && view.contents && view.contents.__papyrusSelectionCleanup;
         if (typeof cleanup === 'function') cleanup();
         const renderer = epubAnnotationRenderers.get(view?.contents);
@@ -1415,21 +1778,37 @@
         if (selectionSession !== documentSessionId || selectionRendition !== rendition) return;
         const href = spineItems[contents.sectionIndex]?.href;
         const anchor = href && window.PapyrusEpubAnnotations?.selection(contents,cfiRange,href,annotationDocumentId);
-        if (!anchor) return;
+        if (!anchor || nativeMenuSelection?.payload?.anchor?.cfiRange === anchor.cfiRange && nativeMenuSelection?.payload?.anchor?.quote === anchor.quote) return;
         epubScrollDiagnostics && epubScrollDiagnostics.setSelectionActive(true);
         const payload = {documentSessionId: selectionSession, text: anchor.quote, pageIndex: contents.sectionIndex+1, anchor};
         nativeMenuSelection = {contents, payload};
         sendEvent('EPUB_TEXT_SELECTED', payload);
       });
-      ['rendered','resized','layout'].forEach(name => rendition.on(name, () => {
-        if (selectionSession === documentSessionId && selectionRendition === rendition) epubAnnotationRenderers.forEach(renderer => renderer.schedule());
+      ['rendered','resized','layout','relocated'].forEach(name => rendition.on(name, () => {
+        if (selectionSession === documentSessionId && selectionRendition === rendition) epubAnnotationRenderers.forEach(renderer => name==='relocated'?renderer.schedule():renderer.invalidateLayout());
       }));
       rendition.on('relocated', (location) => {
+        if (selectionSession !== documentSessionId || selectionRendition !== rendition) return;
         const start = location && location.start;
         let index = start && Number.isInteger(start.index) ? start.index : -1;
         if (index < 0 && start && start.href) index = getSpineIndexByHref(start.href);
         if (index < 0 || index >= spineItems.length) return;
         epubScrollDiagnostics && epubScrollDiagnostics.relocated(location);
+        let pageGeometry;
+        const manager=rendition.manager,layout=manager?.layout;
+        if(epubViewMode==='single' && layout?.divisor===1 && !manager?.settings?.fullsize && manager?.settings?.direction==='ltr'){
+          const visible=manager.visible?.();
+          const view=visible?.find(view=>view.index===index);
+          if(view && manager.container){
+            pageGeometry={direction:'ltr',firstIndex:book.spine.first()?.index,lastIndex:book.spine.last()?.index,pageWidth:layout.pageWidth,offset:manager.container.getBoundingClientRect().left-view.position().left};
+          }
+        }
+        epubLocation=window.PapyrusEpubReader.location(location,spineItems.length,epubViewMode==='single'?'paged':'chapter-scroll',pageGeometry);
+        if(epubLocation){
+          epubLocation.cfi=epubResizeAnchor?.cfi() || epubLocation.cfi;
+          if(book.locations?.length?.()>0)epubLocation.progress=book.locations.percentageFromCfi(epubLocation.cfi);
+          sendEvent('EPUB_LOCATION',{documentSessionId,location:epubLocation});
+        }
         const nextPage = index + 1;
         if (nextPage === currentPage) return;
         currentPage = nextPage;
@@ -1437,21 +1816,23 @@
       });
     }
 
+    applyEpubZoom();
     sendEpubDiagnostic('epub.display.start', diagnosticPayload);
     await withEpubStageTimeout(
-      displayEpubPage(0),
+      rendition.display(target || spineItems[0]?.href),
       'rendition.display',
       diagnosticPayload,
     );
     if (!isCurrentLoad()) throw new Error('EPUB load superseded by a newer load');
     sendEpubDiagnostic('epub.display.end', diagnosticPayload);
+    const resizeRendition=rendition;
+    epubResizeAnchor=window.PapyrusEpubReader.installResizeAnchor(resizeRendition.manager,()=>resizeRendition.location?.start?.cfi);
     if (
       rendition &&
       rendition.manager &&
       typeof rendition.manager.on === 'function' &&
       typeof rendition.on === 'function'
     ) {
-      let touchStart = null;
       let lastScrollOffset = -1;
       const manager = rendition.manager;
       epubScrollDiagnostics = createEpubScrollDiagnostics(manager);
@@ -1526,48 +1907,19 @@
           return result;
         };
       }
-      const getTouchPoint = (event) => {
-        const touch =
-          (event && event.changedTouches && event.changedTouches[0]) ||
-          (event && event.touches && event.touches[0]);
-        if (!touch) return null;
-        const x = Number(touch.screenX ?? touch.clientX);
-        const y = Number(touch.screenY ?? touch.clientY);
-        return Number.isFinite(x) && Number.isFinite(y) ? { x, y } : null;
-      };
-      const handleScroll = (event) => {
+      const handleScroll = event => {
         const offsetY = Math.max(0, Number(event && event.top) || 0);
         epubScrollDiagnostics && epubScrollDiagnostics.scroll(event);
-        if (Math.abs(offsetY - lastScrollOffset) < 1) return;
-        lastScrollOffset = offsetY;
-        sendEvent('VIEWER_SCROLL', { offsetY });
-      };
-      const handleTouchStart = (event) => {
-        touchStart = getTouchPoint(event);
-        epubScrollDiagnostics && epubScrollDiagnostics.touchStart(event);
-      };
-      const handleTouchMove = (event) => {
-        epubScrollDiagnostics && epubScrollDiagnostics.touchMove(event);
-      };
-      const handleTouchEnd = (event) => {
-        const end = getTouchPoint(event);
-        const start = touchStart;
-        touchStart = null;
-        const selectedText = event?.target?.ownerDocument?.defaultView?.getSelection?.()?.toString().trim() || '';
-        if (!selectedText && start && end && Math.hypot(end.x - start.x, end.y - start.y) <= 12) {
-          sendEvent('VIEWER_TAP', {});
-        }
-        epubScrollDiagnostics && epubScrollDiagnostics.touchEnd(event);
+        if (Math.abs(offsetY-lastScrollOffset)<1) return;
+        lastScrollOffset=offsetY;
+        sendEvent('VIEWER_SCROLL',{offsetY});
       };
-
       manager.on('scroll', handleScroll);
       const handleScrolled = (event) => {
         epubScrollDiagnostics && epubScrollDiagnostics.settled(event);
       };
       manager.on('scrolled', handleScrolled);
-      rendition.on('touchstart', handleTouchStart);
-      rendition.on('touchmove', handleTouchMove);
-      rendition.on('touchend', handleTouchEnd);
+
       epubInteractionCleanup = () => {
         epubSelectionCleanups.forEach((cleanup) => cleanup());
         epubSelectionCleanups.clear();
@@ -1576,16 +1928,9 @@
         if (originalEnqueue) queue.enqueue = originalEnqueue;
         if (typeof manager.off === 'function') manager.off('scroll', handleScroll);
         if (typeof manager.off === 'function') manager.off('scrolled', handleScrolled);
-        if (typeof rendition.off === 'function') {
-          rendition.off('touchstart', handleTouchStart);
-          rendition.off('touchmove', handleTouchMove);
-          rendition.off('touchend', handleTouchEnd);
-        }
         epubScrollDiagnostics = null;
       };
     }
-    applyEpubZoom();
-
     const outline = await withEpubStageTimeout(
       buildOutline(),
       'outline',
@@ -1599,6 +1944,8 @@
     return { pageCount, outline };
   };
 
+  let epubNavigationQueue = Promise.resolve();
+  let epubNavigationRequest = 0;
   const displayEpubPage = async (pageIndex) => {
     if (!rendition) return;
     const item = spineItems[pageIndex];
@@ -1608,9 +1955,19 @@
       target,
       pageIndex,
     });
-    await rendition.display(target);
-    currentPage = pageIndex + 1;
-    sendState();
+    const activeRendition = rendition;
+    const session = documentSessionId;
+    const request = ++epubNavigationRequest;
+    const navigation = epubNavigationQueue.catch(() => {}).then(async () => {
+      if (request !== epubNavigationRequest || session !== documentSessionId || activeRendition !== rendition) return;
+      epubResizeAnchor?.invalidate();
+      await activeRendition.display(target);
+      if (request !== epubNavigationRequest || session !== documentSessionId || activeRendition !== rendition) return;
+      currentPage = pageIndex + 1;
+      sendState();
+    });
+    epubNavigationQueue = navigation;
+    await navigation;
   };
 
   const getTextContent = async (pageIndex) => {
@@ -1712,6 +2069,8 @@
   };
 
   let nativeMenuSelection = null;
+  let epubViewMode = "single";
+  let epubLocation = null;
 
   const handleCommand = async (message) => {
     const { id, kind, payload } = message;
@@ -1723,7 +2082,13 @@
         documentSessionId = payload.documentSessionId || null;
         epubAnnotations = [];
         annotationDocumentId = undefined;
+        epubInkMode = {enabled:false,color:'#2563eb',opacity:1,strokeWidth:0.006};
         zoom = 1.0;
+        epubViewMode = payload.epubMode === "chapter-scroll" ? "continuous" : "single";
+        epubLocation = null;
+        nativeMenuSelection = null;
+        epubNavigationRequest += 1;
+        epubNavigationQueue = Promise.resolve();
 
         if (currentType === 'text') {
           const result = await loadText(
@@ -1778,17 +2143,24 @@
           epubAnnotationRenderers.forEach(renderer => renderer.schedule());
         } else {
           const annotation = epubAnnotations.find(a => a.id === payload.annotationId);
-          if (!annotation) throw new Error('Annotation not available');
+          if (!annotation || (annotation.anchor.documentId && annotation.anchor.documentId !== annotationDocumentId)) throw new Error('Annotation not available for this document');
           // Navigation uses the CFI, never a synthetic percentage/page rectangle.
           const navigationSession = documentSessionId;
           const activeRendition = rendition;
           // Open the confirmed chapter first, resolve its quote, then navigate its actual range.
-          await activeRendition.display(annotation.anchor.href);
-          if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
-          const contents = activeRendition.getContents().find(c => spineItems[c.sectionIndex]?.href === annotation.anchor.href);
-          const range = contents && window.PapyrusEpubAnnotations.resolveRange(contents,annotation.anchor);
-          if(!range)throw new Error('EPUB anchor unresolved');
-          await activeRendition.display(contents.cfiFromRange(range));
+          epubNavigationRequest += 1;
+          const navigation = epubNavigationQueue.catch(() => {}).then(async () => {
+            if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
+            epubResizeAnchor?.invalidate();
+            await activeRendition.display(annotation.anchor.href);
+            if(navigationSession !== documentSessionId || activeRendition !== rendition)throw new Error('Stale EPUB navigation');
+            const contents = activeRendition.getContents().find(c => spineItems[c.sectionIndex]?.href === annotation.anchor.href);
+            const range = contents && window.PapyrusEpubAnnotations.resolveRange(contents,annotation.anchor);
+            if(!range)throw new Error('EPUB anchor unresolved');
+            await activeRendition.display(contents.cfiFromRange(range));
+          });
+          epubNavigationQueue = navigation;
+          await navigation;
         }
         sendResponse(id,true,null); return;
       }
@@ -1815,12 +2187,61 @@
         return;
       }
 
+      if (kind === 'epub-turn-page') {
+        if (epubViewMode !== 'single') {sendResponse(id,true,null); return;}
+        if (currentType !== 'epub' || payload.documentSessionId !== documentSessionId) throw new Error('Stale EPUB navigation');
+        const active = rendition;
+        epubNavigationQueue = epubNavigationQueue.catch(() => {}).then(() => {
+          if (active !== rendition || payload.documentSessionId !== documentSessionId) return;
+          epubResizeAnchor?.invalidate();
+          return payload.direction < 0 ? active.prev() : active.next();
+        });
+        await epubNavigationQueue;
+        sendResponse(id,true,null); return;
+      }
+
+      if (kind === 'set-epub-view-mode') {
+        if (currentType !== 'epub' || payload.documentSessionId !== documentSessionId) throw new Error('Stale EPUB layout session');
+        const next=payload.epubMode ? (payload.epubMode==='paged'?'single':'continuous') : (payload.viewMode==='single'?'single':'continuous');
+        {
+          epubNavigationQueue=epubNavigationQueue.catch(()=>{}).then(async()=>{
+            if(payload.documentSessionId!==documentSessionId || next===epubViewMode)return;
+            const target=epubResizeAnchor?.cfi() || epubLocation?.cfi;
+            epubViewMode=next;
+            await renderEpubRendition('layout',epubLoadGeneration,target);
+          });
+          await epubNavigationQueue;
+        }
+        sendResponse(id,true,null);return;
+      }
+      if (kind === 'set-epub-ink-mode') {
+        if(currentType!=='epub'||!documentSessionId||payload.documentSessionId!==documentSessionId)throw new Error('Stale EPUB ink session');
+        epubInkMode={enabled:payload.enabled===true,preset:['ink','highlight','underline'].indexOf(payload.preset)>=0?payload.preset:'ink',color:/^#[0-9a-f]{6}$/i.test(payload.color||'')?payload.color:'#2563eb',opacity:Number.isFinite(payload.opacity)?Math.max(0,Math.min(1,payload.opacity)):1,strokeWidth:Number.isFinite(payload.strokeWidth)?Math.max(0.0025,Math.min(0.02,payload.strokeWidth)):0.006};
+        epubAnnotationRenderers.forEach(renderer=>renderer.setInkMode(epubInkMode));
+        sendResponse(id,true,null);return;
+      }
+      if(kind === 'epub-go-to-location'){
+        if(currentType!=='epub' || payload.documentSessionId!==documentSessionId || !window.PapyrusEpubReader.validCfi(payload.cfi))throw new Error('Invalid EPUB location');
+        epubNavigationQueue=epubNavigationQueue.catch(()=>{}).then(()=>{if(payload.documentSessionId!==documentSessionId)return;epubResizeAnchor?.invalidate();return rendition.display(payload.cfi);});
+        await epubNavigationQueue;sendResponse(id,true,null);return;
+      }
+
       if (kind === 'set-zoom') {
-        zoom = Math.max(0.5, Math.min(4.0, payload.zoom || 1.0));
-        applyZoom();
-        sendState();
-        sendResponse(id, true, { zoom });
-        return;
+        const requestedZoom=Math.max(0.5,Math.min(4.0,payload.zoom || 1.0));
+        if(currentType === 'epub') {
+          const session=documentSessionId;
+          epubNavigationQueue=epubNavigationQueue.catch(()=>{}).then(async()=>{
+            if(session!==documentSessionId)return;
+            const active=rendition;
+            const cfi=epubResizeAnchor?.cfi() || epubLocation?.cfi;
+            zoom=requestedZoom;applyEpubZoom();
+            // Let the content CSS update before redisplaying the logical anchor.
+            await new Promise(resolve=>(window.requestAnimationFrame || (callback=>setTimeout(callback,0)))(resolve));
+            if(cfi && active===rendition && session===documentSessionId)await active.display(cfi);
+          });
+          await epubNavigationQueue;
+        } else {zoom=requestedZoom;applyZoom();}
+        sendState();sendResponse(id,true,{zoom});return;
       }
 
       if (kind === 'set-rotation') {