@chialab/pdfjs-lib 1.0.0-alpha.45 → 1.0.0-alpha.47

package/dist/browser/index.js

@@ -27977,6 +27977,7 @@ var SvgCanvasContext = class {
     __publicField(this, "_ctx", null);
     __publicField(this, "_currentStyle", {
       strokeStyle: "#000000",
+      colorSpace: null,
       fillStyle: "#000000",
       fillRule: "nonzero",
       filter: "none",
@@ -28645,6 +28646,9 @@ var SvgCanvasContext = class {
     }
     this._currentMarked = this._markedStack.pop() ?? null;
   }
+  setColorSpace(colorSpaceInfo) {
+    this._currentStyle.colorSpace = colorSpaceInfo ?? null;
+  }
   _ensureTransformationGroup() {
     const group = {
       tag: "g",
@@ -28870,6 +28874,11 @@ var SvgCanvasContext = class {
         currentElement.attrs["stroke-dasharray"] = `${this._currentStyle.lineDash.map((entry) => `${entry * Math.max(scale.x, scale.y)}`).join(",")}`;
       }
     }
+    const colorSpace = this._currentStyle.colorSpace;
+    if (colorSpace) {
+      currentElement.attrs["color-space-name"] = colorSpace.name;
+      currentElement.attrs["color-space-type"] = colorSpace.type;
+    }
   }
   _addPathCommand(command) {
     if (!this._currentElement || !isSvgPath(this._currentElement)) {
@@ -29849,42 +29858,16 @@ async function createTextLayer(page, {
     }
     if (oldTextItem?.glyphs.length) {
       if (newTextItem) {
-        const text = oldTextItem.glyphs.map((g) => g[0].unicode).join("") || "";
-        const dir = bidi(text).dir;
-        const firstGlyph = oldTextItem.glyphs[0];
-        const lastGlyph = oldTextItem.glyphs.at(-1);
-        const scale = oldTextItem.scaleX * oldTextItem.fontSize;
         const top = oldTextItem.top;
         const bottom = oldTextItem.top + oldTextItem.fontSize;
-        const left = oldTextItem.left;
-        const right = oldTextItem.left + (lastGlyph[1] + lastGlyph[2]) * scale;
         const nextTop = newTextItem.top;
         const nextBottom = newTextItem.top + newTextItem.fontSize;
-        switch (dir) {
-          case "ltr": {
-            if (newTextItem.left - right < lastGlyph[2] * scale) {
-              if (nextTop > top && nextTop < bottom || nextBottom > top && nextBottom < bottom) {
-                return;
-              }
-              if (checkNewLine(oldTextItem, newTextItem, true)) {
-                appendNewLineAsNeeded();
-                return;
-              }
-            }
-            break;
-          }
-          case "rtl": {
-            if (left - newTextItem.left < firstGlyph[2] * scale) {
-              if (nextTop > top && nextTop < bottom || nextBottom > top && nextBottom < bottom) {
-                return;
-              }
-              if (checkNewLine(oldTextItem, newTextItem, true)) {
-                appendNewLineAsNeeded();
-                return;
-              }
-            }
-            break;
-          }
+        if (nextTop > top && nextTop < bottom || nextBottom > top && nextBottom < bottom || nextTop <= top && nextBottom >= bottom) {
+          return;
+        }
+        if (checkNewLine(oldTextItem, newTextItem, true)) {
+          appendNewLineAsNeeded();
+          return;
         }
       }
       closeMarkedContent();
@@ -30224,7 +30207,9 @@ var {
   endText,
   beginMarkedContent,
   beginMarkedContentProps,
-  endMarkedContent
+  endMarkedContent,
+  setFillRGBColor,
+  setStrokeRGBColor
 } = CanvasGraphics.prototype;
 CanvasGraphics.prototype.beginDrawing = function(options) {
   if (this.ctx instanceof SvgCanvasContext) {
@@ -30262,12 +30247,26 @@ CanvasGraphics.prototype.endMarkedContent = function(opIdx) {
   }
   endMarkedContent.call(this, opIdx);
 };
+CanvasGraphics.prototype.setFillRGBColor = function(opIdx, color, colorSpaceInfo) {
+  if (this.ctx instanceof SvgCanvasContext) {
+    this.ctx.setColorSpace(colorSpaceInfo);
+  }
+  setFillRGBColor.call(this, opIdx, color);
+};
+CanvasGraphics.prototype.setStrokeRGBColor = function(opIdx, color, colorSpaceInfo) {
+  if (this.ctx instanceof SvgCanvasContext) {
+    this.ctx.setColorSpace(colorSpaceInfo);
+  }
+  setStrokeRGBColor.call(this, opIdx, color);
+};
 Object.assign(CanvasGraphics.prototype, {
   [OPS.beginText]: CanvasGraphics.prototype.beginText,
   [OPS.endText]: CanvasGraphics.prototype.endText,
   [OPS.beginMarkedContent]: CanvasGraphics.prototype.beginMarkedContent,
   [OPS.beginMarkedContentProps]: CanvasGraphics.prototype.beginMarkedContentProps,
-  [OPS.endMarkedContent]: CanvasGraphics.prototype.endMarkedContent
+  [OPS.endMarkedContent]: CanvasGraphics.prototype.endMarkedContent,
+  [OPS.setFillRGBColor]: CanvasGraphics.prototype.setFillRGBColor,
+  [OPS.setStrokeRGBColor]: CanvasGraphics.prototype.setStrokeRGBColor
 });
 
 // src/index.ts

package/dist/browser/worker.js

@@ -24067,7 +24067,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
   let x = 0, y = 0;
   let stems = 0;
   let firstPoint = null;
-  function parse(code) {
+  function parse2(code) {
     let i = 0;
     while (i < code.length) {
       let stackClean = false;
@@ -24149,7 +24149,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
             subrCode = font.subrs[n + font.subrsBias];
           }
           if (subrCode) {
-            parse(subrCode);
+            parse2(subrCode);
           }
           break;
         case 11:
@@ -24348,7 +24348,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
           n = stack.pop() + font.gsubrsBias;
           subrCode = font.gsubrs[n];
           if (subrCode) {
-            parse(subrCode);
+            parse2(subrCode);
           }
           break;
         case 30:
@@ -24416,7 +24416,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
       }
     }
   }
-  parse(charStringCode);
+  parse2(charStringCode);
 }
 var NOOP = "";
 var Commands = class {
@@ -77537,6 +77537,41 @@ AnnotationFactory.saveNewAnnotations = async (evaluator, task, annotations, imag
   return data;
 };
 
+// src/lib/ColorSpace.ts
+var colorSpacesInfo = /* @__PURE__ */ new Map();
+var parse = ColorSpaceUtils.parse;
+ColorSpaceUtils.parse = function(args) {
+  const { cs, resources } = args;
+  const result = parse.call(this, args);
+  if (!resources) {
+    return result;
+  }
+  const colorSpaces = resources.get("ColorSpace");
+  if (!(colorSpaces instanceof Dict) || !(cs instanceof Name)) {
+    return result;
+  }
+  const entry = colorSpaces.get(cs.name);
+  if (!entry) {
+    return result;
+  }
+  const type = entry[0] instanceof Name ? entry[0].name : null;
+  const name = entry[1] instanceof Name ? entry[1].name : null;
+  if (!type || !name) {
+    return result;
+  }
+  if (result instanceof ColorSpace) {
+    colorSpacesInfo.set(result, { type, name });
+    return result;
+  }
+  return result.then((result2) => {
+    colorSpacesInfo.set(result2, { type, name });
+    return result2;
+  });
+};
+var getColorSpaceInfo = (cs) => {
+  return colorSpacesInfo.get(cs) || null;
+};
+
 // src/lib/Evaluator.ts
 var collectMarkedContentLanguage = (stream, xref) => {
   const map = /* @__PURE__ */ new Map();
@@ -77577,8 +77612,22 @@ var collectMarkedContentLanguage = (stream, xref) => {
   stream.pos = pos;
   return map;
 };
+var getColorSpace = PartialEvaluator.prototype._getColorSpace;
+PartialEvaluator.prototype._getColorSpace = function(...args) {
+  const self2 = this;
+  const result = getColorSpace.apply(this, args);
+  if (result instanceof ColorSpace) {
+    self2._currentColorSpace = result;
+    return result;
+  }
+  return result.then((cs) => {
+    self2._currentColorSpace = cs;
+    return cs;
+  });
+};
 var getOperatorList = PartialEvaluator.prototype.getOperatorList;
 PartialEvaluator.prototype.getOperatorList = async function(options, ...args) {
+  const self2 = this;
   const { stream, operatorList } = options;
   const languages = collectMarkedContentLanguage(stream, this.xref);
   const addOp = operatorList.addOp;
@@ -77594,6 +77643,9 @@ PartialEvaluator.prototype.getOperatorList = async function(options, ...args) {
         }
       }
     }
+    if ((fn === OPS.setFillRGBColor || fn === OPS.setStrokeRGBColor) && self2._currentColorSpace) {
+      args2.push(getColorSpaceInfo(self2._currentColorSpace));
+    }
     return addOp.call(this, fn, args2);
   };
   await getOperatorList.call(this, options, ...args);

package/dist/lib/ColorSpace.d.ts

@@ -0,0 +1,6 @@
+import { ColorSpace } from '../pdf.js/src/core/colorspace';
+export type ColorSpaceInfo = {
+    type: string;
+    name: string;
+};
+export declare const getColorSpaceInfo: (cs: ColorSpace) => ColorSpaceInfo | null;

package/dist/lib/SvgCanvasContext.d.ts

@@ -1,7 +1,9 @@
+import type { ColorSpaceInfo } from './ColorSpace';
 import { Path2D } from './Path2D';
 import { type SvgElement, type SvgNode, type SvgRoot } from './Svg';
 interface CanvasStyle {
     strokeStyle: string | SvgLinearGradient | SvgPattern;
+    colorSpace: ColorSpaceInfo | null;
     fillStyle: string | SvgLinearGradient | SvgRadialGradient | SvgPattern;
     fillRule: CanvasFillRule;
     filter: string;
@@ -141,6 +143,7 @@ export declare class SvgCanvasContext {
         id: number;
     } | null): void;
     endMarkedContent(): void;
+    setColorSpace(colorSpaceInfo?: ColorSpaceInfo | null): void;
     protected _ensureTransformationGroup(): SvgElement;
     protected _addNode(node: SvgNode, parent?: SvgElement): void;
     protected _applyStyleState(styleState: CanvasStyle): void;

package/dist/node/index.js

@@ -26578,6 +26578,7 @@ var SvgCanvasContext = class {
     __publicField(this, "_ctx", null);
     __publicField(this, "_currentStyle", {
       strokeStyle: "#000000",
+      colorSpace: null,
       fillStyle: "#000000",
       fillRule: "nonzero",
       filter: "none",
@@ -27246,6 +27247,9 @@ var SvgCanvasContext = class {
     }
     this._currentMarked = this._markedStack.pop() ?? null;
   }
+  setColorSpace(colorSpaceInfo) {
+    this._currentStyle.colorSpace = colorSpaceInfo ?? null;
+  }
   _ensureTransformationGroup() {
     const group = {
       tag: "g",
@@ -27471,6 +27475,11 @@ var SvgCanvasContext = class {
         currentElement.attrs["stroke-dasharray"] = `${this._currentStyle.lineDash.map((entry) => `${entry * Math.max(scale.x, scale.y)}`).join(",")}`;
       }
     }
+    const colorSpace = this._currentStyle.colorSpace;
+    if (colorSpace) {
+      currentElement.attrs["color-space-name"] = colorSpace.name;
+      currentElement.attrs["color-space-type"] = colorSpace.type;
+    }
   }
   _addPathCommand(command) {
     if (!this._currentElement || !isSvgPath(this._currentElement)) {
@@ -28450,42 +28459,16 @@ async function createTextLayer(page, {
     }
     if (oldTextItem?.glyphs.length) {
       if (newTextItem) {
-        const text = oldTextItem.glyphs.map((g) => g[0].unicode).join("") || "";
-        const dir = bidi(text).dir;
-        const firstGlyph = oldTextItem.glyphs[0];
-        const lastGlyph = oldTextItem.glyphs.at(-1);
-        const scale = oldTextItem.scaleX * oldTextItem.fontSize;
         const top = oldTextItem.top;
         const bottom = oldTextItem.top + oldTextItem.fontSize;
-        const left = oldTextItem.left;
-        const right = oldTextItem.left + (lastGlyph[1] + lastGlyph[2]) * scale;
         const nextTop = newTextItem.top;
         const nextBottom = newTextItem.top + newTextItem.fontSize;
-        switch (dir) {
-          case "ltr": {
-            if (newTextItem.left - right < lastGlyph[2] * scale) {
-              if (nextTop > top && nextTop < bottom || nextBottom > top && nextBottom < bottom) {
-                return;
-              }
-              if (checkNewLine(oldTextItem, newTextItem, true)) {
-                appendNewLineAsNeeded();
-                return;
-              }
-            }
-            break;
-          }
-          case "rtl": {
-            if (left - newTextItem.left < firstGlyph[2] * scale) {
-              if (nextTop > top && nextTop < bottom || nextBottom > top && nextBottom < bottom) {
-                return;
-              }
-              if (checkNewLine(oldTextItem, newTextItem, true)) {
-                appendNewLineAsNeeded();
-                return;
-              }
-            }
-            break;
-          }
+        if (nextTop > top && nextTop < bottom || nextBottom > top && nextBottom < bottom || nextTop <= top && nextBottom >= bottom) {
+          return;
+        }
+        if (checkNewLine(oldTextItem, newTextItem, true)) {
+          appendNewLineAsNeeded();
+          return;
         }
       }
       closeMarkedContent();
@@ -28825,7 +28808,9 @@ var {
   endText,
   beginMarkedContent,
   beginMarkedContentProps,
-  endMarkedContent
+  endMarkedContent,
+  setFillRGBColor,
+  setStrokeRGBColor
 } = CanvasGraphics.prototype;
 CanvasGraphics.prototype.beginDrawing = function(options) {
   if (this.ctx instanceof SvgCanvasContext) {
@@ -28863,12 +28848,26 @@ CanvasGraphics.prototype.endMarkedContent = function(opIdx) {
   }
   endMarkedContent.call(this, opIdx);
 };
+CanvasGraphics.prototype.setFillRGBColor = function(opIdx, color, colorSpaceInfo) {
+  if (this.ctx instanceof SvgCanvasContext) {
+    this.ctx.setColorSpace(colorSpaceInfo);
+  }
+  setFillRGBColor.call(this, opIdx, color);
+};
+CanvasGraphics.prototype.setStrokeRGBColor = function(opIdx, color, colorSpaceInfo) {
+  if (this.ctx instanceof SvgCanvasContext) {
+    this.ctx.setColorSpace(colorSpaceInfo);
+  }
+  setStrokeRGBColor.call(this, opIdx, color);
+};
 Object.assign(CanvasGraphics.prototype, {
   [OPS.beginText]: CanvasGraphics.prototype.beginText,
   [OPS.endText]: CanvasGraphics.prototype.endText,
   [OPS.beginMarkedContent]: CanvasGraphics.prototype.beginMarkedContent,
   [OPS.beginMarkedContentProps]: CanvasGraphics.prototype.beginMarkedContentProps,
-  [OPS.endMarkedContent]: CanvasGraphics.prototype.endMarkedContent
+  [OPS.endMarkedContent]: CanvasGraphics.prototype.endMarkedContent,
+  [OPS.setFillRGBColor]: CanvasGraphics.prototype.setFillRGBColor,
+  [OPS.setStrokeRGBColor]: CanvasGraphics.prototype.setStrokeRGBColor
 });
 
 // src/index.ts

package/dist/node/worker.js

@@ -24069,7 +24069,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
   let x = 0, y = 0;
   let stems = 0;
   let firstPoint = null;
-  function parse(code) {
+  function parse2(code) {
     let i = 0;
     while (i < code.length) {
       let stackClean = false;
@@ -24151,7 +24151,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
             subrCode = font.subrs[n + font.subrsBias];
           }
           if (subrCode) {
-            parse(subrCode);
+            parse2(subrCode);
           }
           break;
         case 11:
@@ -24350,7 +24350,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
           n = stack.pop() + font.gsubrsBias;
           subrCode = font.gsubrs[n];
           if (subrCode) {
-            parse(subrCode);
+            parse2(subrCode);
           }
           break;
         case 30:
@@ -24418,7 +24418,7 @@ function compileCharString(charStringCode, cmds, font, glyphId) {
       }
     }
   }
-  parse(charStringCode);
+  parse2(charStringCode);
 }
 var NOOP = "";
 var Commands = class {
@@ -77539,6 +77539,41 @@ AnnotationFactory.saveNewAnnotations = async (evaluator, task, annotations, imag
   return data;
 };
 
+// src/lib/ColorSpace.ts
+var colorSpacesInfo = /* @__PURE__ */ new Map();
+var parse = ColorSpaceUtils.parse;
+ColorSpaceUtils.parse = function(args) {
+  const { cs, resources } = args;
+  const result = parse.call(this, args);
+  if (!resources) {
+    return result;
+  }
+  const colorSpaces = resources.get("ColorSpace");
+  if (!(colorSpaces instanceof Dict) || !(cs instanceof Name)) {
+    return result;
+  }
+  const entry = colorSpaces.get(cs.name);
+  if (!entry) {
+    return result;
+  }
+  const type = entry[0] instanceof Name ? entry[0].name : null;
+  const name = entry[1] instanceof Name ? entry[1].name : null;
+  if (!type || !name) {
+    return result;
+  }
+  if (result instanceof ColorSpace) {
+    colorSpacesInfo.set(result, { type, name });
+    return result;
+  }
+  return result.then((result2) => {
+    colorSpacesInfo.set(result2, { type, name });
+    return result2;
+  });
+};
+var getColorSpaceInfo = (cs) => {
+  return colorSpacesInfo.get(cs) || null;
+};
+
 // src/lib/Evaluator.ts
 var collectMarkedContentLanguage = (stream, xref) => {
   const map = /* @__PURE__ */ new Map();
@@ -77579,8 +77614,22 @@ var collectMarkedContentLanguage = (stream, xref) => {
   stream.pos = pos;
   return map;
 };
+var getColorSpace = PartialEvaluator.prototype._getColorSpace;
+PartialEvaluator.prototype._getColorSpace = function(...args) {
+  const self2 = this;
+  const result = getColorSpace.apply(this, args);
+  if (result instanceof ColorSpace) {
+    self2._currentColorSpace = result;
+    return result;
+  }
+  return result.then((cs) => {
+    self2._currentColorSpace = cs;
+    return cs;
+  });
+};
 var getOperatorList = PartialEvaluator.prototype.getOperatorList;
 PartialEvaluator.prototype.getOperatorList = async function(options, ...args) {
+  const self2 = this;
   const { stream, operatorList } = options;
   const languages = collectMarkedContentLanguage(stream, this.xref);
   const addOp = operatorList.addOp;
@@ -77596,6 +77645,9 @@ PartialEvaluator.prototype.getOperatorList = async function(options, ...args) {
         }
       }
     }
+    if ((fn === OPS.setFillRGBColor || fn === OPS.setStrokeRGBColor) && self2._currentColorSpace) {
+      args2.push(getColorSpaceInfo(self2._currentColorSpace));
+    }
     return addOp.call(this, fn, args2);
   };
   await getOperatorList.call(this, options, ...args);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@chialab/pdfjs-lib",
 	"description": "A custom Mozilla's PDF.js build with better Node support and extras.",
-	"version": "1.0.0-alpha.45",
+	"version": "1.0.0-alpha.47",
 	"type": "module",
 	"author": "Chialab <dev@chialab.it>",
 	"license": "MIT",