@syncfusion/ej2-pdf-export 30.1.37 → 30.1.41

package/dist/es6/ej2-pdf-export.es2015.js

@@ -990,6 +990,11 @@ class DictionaryProperties {
          * @private
          */
         this.cIDToGIDMap = 'CIDToGIDMap';
+        /**
+         * Specifies the value of 'cIDFontType0C'.
+         * @private
+         */
+        this.cIDFontType0C = 'CIDFontType0C';
         /**
          * Specifies the value of 'identity'.
          * @private
@@ -1010,6 +1015,11 @@ class DictionaryProperties {
          * @private
          */
         this.cIDSystemInfo = 'CIDSystemInfo';
+        /**
+         * Specifies the value of 'CIDFontType0'.
+         * @private
+         */
+        this.cIDFontType0 = 'CIDFontType0';
         /**
          * Specifies the value of 'fontName'.
          * @private
@@ -1070,6 +1080,11 @@ class DictionaryProperties {
          * @private
          */
         this.fontFile2 = 'FontFile2';
+        /**
+         * Specifies the value of 'fontFile3'.
+         * @private
+         */
+        this.fontFile3 = 'FontFile3';
         /**
          * Specifies the value of 'maxWidth'.
          * @private
@@ -10836,6 +10851,7 @@ class TtfReader {
         this.missedGlyphs = 0;
         this.tableNames = ['cvt ', 'fpgm', 'glyf', 'head', 'hhea', 'hmtx', 'loca', 'maxp', 'prep'];
         this.entrySelectors = [0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4];
+        this._isOpenTypeFont = false;
         this.fontData = fontData;
         this.initialize();
     }
@@ -10955,6 +10971,9 @@ class TtfReader {
             this.offset = this.readInt32(this.offset);
             version = this.readInt32(this.offset);
         }
+        if (version === 0x4f54544f) {
+            this._isOpenTypeFont = true;
+        }
         return version;
     }
     readNameTable() {
@@ -11373,7 +11392,7 @@ class TtfReader {
         // NOTE: Strange!
         this.metrics.stemV = 80;
         this.metrics.widthTable = this.updateWidth();
-        this.metrics.contains = this.tableDirectory.containsKey('CFF');
+        this.metrics.contains = this.tableDirectory.containsKey('CFF ');
         this.metrics.subScriptSizeFactor = headTable.unitsPerEm / os2Table.ySubscriptYSize;
         this.metrics.superscriptSizeFactor = headTable.unitsPerEm / os2Table.ySuperscriptYSize;
     }
@@ -11892,6 +11911,15 @@ class TtfReader {
         let fontProgram = this.getFontProgram(newLocaUpdated, newGlyphTable, glyphTableSize, newLocaSize);
         return fontProgram;
     }
+    _readCompactFontFormatTable() {
+        const tableInfo = this.getTable('CFF ');
+        const length = tableInfo.length;
+        const offset = tableInfo.offset;
+        const cffData = new Array(length);
+        this.setOffset(offset);
+        const result = this.read(cffData, 0, length);
+        return result.buffer;
+    }
     /**
      * Reconverts string to be in proper format saved into PDF file.
      */
@@ -12366,7 +12394,12 @@ class UnicodeTrueTypeFont {
         this.descendantFont.isResource = true;
         this.descendantFont.descendantFontBeginSave = new SaveDescendantFontEventHandler(this);
         this.descendantFont.items.setValue(this.dictionaryProperties.type, new PdfName(this.dictionaryProperties.font));
-        this.descendantFont.items.setValue(this.dictionaryProperties.subtype, new PdfName(this.dictionaryProperties.cIDFontType2));
+        if (this.ttfReader && this.ttfReader._isOpenTypeFont) {
+            this.descendantFont.items.setValue(this.dictionaryProperties.subtype, new PdfName(this.dictionaryProperties.cIDFontType0));
+        }
+        else {
+            this.descendantFont.items.setValue(this.dictionaryProperties.subtype, new PdfName(this.dictionaryProperties.cIDFontType2));
+        }
         this.descendantFont.items.setValue(this.dictionaryProperties.baseFont, new PdfName(this.subsetName));
         this.descendantFont.items.setValue(this.dictionaryProperties.cIDToGIDMap, new PdfName(this.dictionaryProperties.identity));
         this.descendantFont.items.setValue(this.dictionaryProperties.dw, new PdfNumber(1000));
@@ -12395,7 +12428,13 @@ class UnicodeTrueTypeFont {
         descriptor.items.setValue(this.dictionaryProperties.descent, new PdfNumber(metrics.winDescent));
         descriptor.items.setValue(this.dictionaryProperties.leading, new PdfNumber(metrics.leading));
         descriptor.items.setValue(this.dictionaryProperties.avgWidth, new PdfNumber(metrics.widthTable[32]));
-        descriptor.items.setValue(this.dictionaryProperties.fontFile2, new PdfReferenceHolder(this.fontProgram));
+        if (this.ttfReader.metrics.contains) {
+            descriptor.items.setValue(this.dictionaryProperties.fontFile3, new PdfReferenceHolder(this.fontProgram));
+            this.fontProgram.items.setValue(this.dictionaryProperties.subtype, new PdfName(this.dictionaryProperties.cIDFontType0C));
+        }
+        else {
+            descriptor.items.setValue(this.dictionaryProperties.fontFile2, new PdfReferenceHolder(this.fontProgram));
+        }
         descriptor.items.setValue(this.dictionaryProperties.maxWidth, new PdfNumber(metrics.widthTable[32]));
         descriptor.items.setValue(this.dictionaryProperties.xHeight, new PdfNumber(0));
         descriptor.items.setValue(this.dictionaryProperties.stemH, new PdfNumber(0));
@@ -12591,13 +12630,20 @@ class UnicodeTrueTypeFont {
      * Generates font program.
      */
     generateFontProgram() {
-        let fontProgram = null;
         this.usedChars = (this.usedChars === null || this.usedChars === undefined) ? new Dictionary() : this.usedChars;
         this.ttfReader.setOffset(0);
-        fontProgram = this.ttfReader.readFontProgram(this.usedChars);
-        this.fontProgram.clearStream();
-        this.fontProgram.isResource = true;
-        this.fontProgram.writeBytes(fontProgram);
+        if (this.ttfReader.metrics.contains && this.ttfReader._isOpenTypeFont) {
+            const cffData = this.ttfReader._readCompactFontFormatTable();
+            this.fontProgram.clearStream();
+            this.fontProgram.isResource = true;
+            this.fontProgram.writeBytes(cffData);
+        }
+        else {
+            const fontProgram = this.ttfReader.readFontProgram(this.usedChars);
+            this.fontProgram.clearStream();
+            this.fontProgram.isResource = true;
+            this.fontProgram.writeBytes(fontProgram);
+        }
     }
     /**
      * Calculates flags for the font descriptor.
@@ -29094,7 +29140,7 @@ class PdfGrid extends PdfLayoutElement {
             hasChanged = true;
         }
         if (typeof param.bounds.height === 'undefined' || param.bounds.height === 0) {
-            height = param.page.getClientSize().height - param.bounds.y;
+            height = param.page.getClientSize().height;
             hasChanged = true;
         }
         if (hasChanged) {
@@ -30767,12 +30813,12 @@ class PdfGridLayouter extends ElementLayouter {
             return result;
         }
         else {
-            let location = new PointF(this.currentBounds.x, this.currentBounds.y);
+            let loc = new PointF(this.currentBounds.x, this.currentBounds.y);
             // if (row.grid.isChildGrid && row.grid.allowRowBreakAcrossPages && this.startLocation.x !== this.currentBounds.x && row.width <
             //                 this.currentPage.getClientSize().width) {
             //     location.x = this.startLocation.x;
             // }
-            result.bounds = new RectangleF(location, new SizeF(0, 0));
+            result.bounds = new RectangleF(loc, new SizeF(0, 0));
             height = this.ReCalculateHeight(row, height);
             for (let i = this.cellStartIndex; i <= this.cellEndIndex; i++) {
                 let cancelSpans = ((i > this.cellEndIndex + 1) && (row.cells.getCell(i).columnSpan > 1));
@@ -30799,14 +30845,14 @@ class PdfGridLayouter extends ElementLayouter {
                 let cellstyle = row.cells.getCell(i).style;
                 let tempValue = ((typeof row.cells.getCell(i).value === 'string' &&
                     row.cells.getCell(i).value !== null) ? row.cells.getCell(i).value : '');
-                row.cells.getCell(i).style = this.RaiseBeforeCellDraw(this.currentGraphics, this.currentRowIndex, i, new RectangleF(location, size), tempValue, cellstyle);
+                row.cells.getCell(i).style = this.RaiseBeforeCellDraw(this.currentGraphics, this.currentRowIndex, i, new RectangleF(loc, size), tempValue, cellstyle);
                 //row.cells.getCell(i).style = cellstyle;
                 {
                     if (row.cells.getCell(i).value instanceof PdfGrid) {
                         let grid = row.cells.getCell(i).value;
                         grid.parentCellIndex = i;
                     }
-                    let stringResult = row.cells.getCell(i).draw(this.currentGraphics, new RectangleF(location, size), cancelSpans);
+                    let stringResult = row.cells.getCell(i).draw(this.currentGraphics, new RectangleF(loc, size), cancelSpans);
                     if (row.grid.style.allowHorizontalOverflow && (row.cells.getCell(i).columnSpan > this.cellEndIndex ||
                         i + row.cells.getCell(i).columnSpan > this.cellEndIndex + 1) && this.cellEndIndex < row.cells.count - 1) {
                         row.rowOverflowIndex = this.cellEndIndex;
@@ -30825,26 +30871,26 @@ class PdfGridLayouter extends ElementLayouter {
                 tempValue = ((typeof row.cells.getCell(i).value === 'string' &&
                     row.cells.getCell(i).value !== null) ? row.cells.getCell(i).value : '');
                 if (!cancelSpans) {
-                    this.raiseAfterCellDraw(this.currentGraphics, this.currentRowIndex, i, new RectangleF(location, size), tempValue, row.cells.getCell(i).style);
+                    this.raiseAfterCellDraw(this.currentGraphics, this.currentRowIndex, i, new RectangleF(loc, size), tempValue, row.cells.getCell(i).style);
                 }
                 if (row.cells.getCell(i).value instanceof PdfGrid) {
                     let grid = row.cells.getCell(i).value;
                     if (this.Grid.columns.getColumn(i).width >= this.currentGraphics.clientSize.width) {
-                        location.x = grid.rowLayoutBoundsWidth;
-                        location.x += grid.style.cellSpacing;
+                        loc.x = grid.rowLayoutBoundsWidth;
+                        loc.x += grid.style.cellSpacing;
                     }
                     else {
-                        location.x += this.Grid.columns.getColumn(i).width;
+                        loc.x += this.Grid.columns.getColumn(i).width;
                     }
                 }
                 else {
-                    location.x += this.Grid.columns.getColumn(i).width;
+                    loc.x += this.Grid.columns.getColumn(i).width;
                 }
             }
             if (!row.rowMergeComplete || row.isRowHeightSet) {
                 this.currentBounds.y += height;
             }
-            result.bounds = new RectangleF(new PointF(result.bounds.x, result.bounds.y), new SizeF(location.x, location.y));
+            result.bounds = new RectangleF(new PointF(result.bounds.x, result.bounds.y), new SizeF(loc.x, loc.y));
         }
     }
     isFitToCell(currentHeight, grid, gridRow) {