From 9548c51651d010ec8fd8fbf0213a2d7c60e051ce Mon Sep 17 00:00:00 2001 From: Tan Kian-ting Date: Mon, 20 Nov 2023 23:23:56 +0800 Subject: [PATCH] optimize the speed --- output.pdf | Bin 11725 -> 11595 bytes src/libclo/breakLines.js | 121 +++++++++++++++++---------------------- src/libclo/breakLines.ts | 13 +++-- src/libclo/index.js | 80 +++++++++++++++++--------- src/libclo/index.ts | 112 ++++++++++++++++++++++++++---------- 5 files changed, 194 insertions(+), 132 deletions(-) diff --git a/output.pdf b/output.pdf index 14c2d0a1620fd37abbcf87e13c1239a1d1b706b6..11d94c0b40653cf2cf6c77dd8a94c05fdd197d9e 100644 GIT binary patch delta 5556 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 delta 5711 zcmah}c|4SR`#zB+5v8*45m|>AGDwr9mDC^;qnNT!)|tV0qKuPm6p<`7Y0l9gk=+bY zjHPU46d7tPWg5#cWEtLZ-rxIqm-EN(`Qv%MpZjy)*L{7j`?{ZQkN5D5CBdT>piEsw zbzrbyBwe%K1wXg0Gb7XyY^ffbAte(No>6x^;fLkhwm)+3Wyl^nx{qT0HL{}$J}9Sq zebuQY^&^!WJtbLd!jw!}Jma<@x;BS6$s>h*30VKN%*xqX<0Lh2t~PJ+MtZlF(7?v8 z<&m75>x8)V<;RG)ew&oXJVRh(?N{7ZHSm#Q*Q0^}c>Ibq6)uxyh}c{;)Y%wx_?1H_ z2eu|rO>wIZ2gDSBjb7OqCz~HD0fn17D&;uVpEkTV!THTI<)AzB3o3}XhBn8ot!sU* z69=c3cgQ^tS~<=``{v8mMi3&lcBXMfcc!~Mmie){OHP+WLpI=U*?0A_BDR2?)b6?G zC&#ZGyZ>W7D4I4=eB+&D?D_fg4!v(RBc{A$?xG3abq@0yQs!N=d&O5ovC(&)Se=L> zNYyz^G&=Z}I!uge7*oDY-LOVRSU<3O+_kd0l)m^tWzFl^Ep!tt@kDvbi@TNU(D-#I zZVhU;4jttYTX{tO`znvf-URx_H~R`V`^Ez~H}$#%<6z2##Jo?62<~m_5&d& zb|Kkr47YPdORV7SPnfk)?koOJ$Zz(xoR@ZQ@Eq^1E`{EcBrB*=j%|QuK>4=c=3>N^Vt7 zOlkUMYHDq2CEPw9Zf~JiG=3%wH{m8U?PkR(dGSRemFsJ1okqF#?Ym)iqI$~Cibm;%+wH1dbxj~5J4cM=z&No z^6H)yX299?F)^!nx3mP}GvPu?0DZ zE(MMpO53ee0(;{(xt`y=6av9}+86N~;}UZ36gVvk#)aUC012`2qKT_8Zw2@2Vn(;T*+q9;Xl$DMUUp zb{;PJU;9{)DTEjaP;JlULYmO^k=0eHVTN?Qb_ z&4*E@5N~0j78q#DBEE7FFEG6g!$(PmY!h6q&H`tdFkW7%Fv}{~vEN(}6I}XrLYfi^ z!9aH`;=|_g3DXkDX$heog{~F_u|fcxwI-gJ9xf~LSDUOk>>HU<$7Uy#qL91a<}|Y! z#SOLb(iR5`%msyP_R{J|6B_T>CVDQtG>0dfdk;?U;aI7UHotB=CZJaI@hks$tE~YP zOK`63t#icIonJA$iC!%{edirXCl?mSF78 z6ZUerTNT!-wXZ?y zo26?sA2Dv8$wCY^+T^T$;MEWHj>Uv8`82r(HF?REoMZI8X7u5m`^+=JN9PN1vS7Ag z)R6Vrk>wo#OM*8+y-_T>gr`-+#ApYxsgE0LMQ%?GF+Wjxchk{h1~jJ?wwI0X-1~k> zXj0DrEYu!>iA_wgFEW&(%lL7G1l9#qnqE61#ye$Xf9{5?3Hab_wGdK4qihuqIwPj2*Qe?F{D&1?pZA0{poQVQ2c_+Z(#{0$e+ka&R}iBs%uGle z_$d)7DwJk|g$fNZ%%z1c5|c2#H`^#LD`a_92n(rOhi{ z{bBiN-ZE?vy88_!K2@?yx-xhYh`)@M;^orm^+P~pKlnrq`%)vl9 z#zH)4Le;6WUau!YQSu?JTZ52O0r4utQ21jw5~g^wpZ^1F_TXzu7_F8r-byK5aTOsM*l7$^p5%9Hci)2x%@1| zYsVr6Ik6y?P1BVoxV?sW5!Ln|?U|79RxVG4c<}`Uklz-P^Jwdev_>Ut?0X{3p;g_s zp7rf)`)|UWF42htdKqq7s^z!hDfg4M*B!(^84F;Ac27Lm)uHRHTCRB9%T@r36xdGY zW;Uf?G!1FwLcgP$BZofhu!u`_A35|q7Cd+`VmU-BH-d;kpGuQ%4tG3b{J~zo@U#|C z?mObrt;o#Pwy@*UtL#4O9)V~1{+@iXYFR(o`}gbRevGAIm(#k_RW&jvQ!Z95xT?!N zWi-cqP-sq8^C)-RG8}Z zf*o4WLAdZWSDj=$c}UdfF5F+o(d$@wBEp#mE)RH+RxeMsiGk(Ohu-363`1ZS(4Eud zh4tkRF6Y#mp3HbwYL>zG)lF7%lpPBij9}E+0m;Nc_-kh_J>gkoiifou7eJI9Qh+@t z85Fpc!E4AvuUy82nSRC5R=O8Hy9Dr?zS{SvewFi*q-&3E_inOR?`e((=eYi=p%&3Npw#y0__6Wq2M_vVtdhCS`HmaXaGh>^F zT^VlW`s@yd%~9^V$_|_aY}~lZLcDzHp-yM+F}1cQCe9MDa%q>3_{QWz9@uI}R`zpw z>R^V;XKlC-H#*xa4?gafI><6O$rggmCI23s*q;{_EaO0JeMt5~tKH4}BbzwWByy7E za?Fj3C@bBR*C=CuTk^u$4zdMte?nxS{4dpHALtTQSN%wEHvl?(xglZh#+A=x#(@hq z%Q_EyiyKBs{%Ml|#nEmj75y~!Op|Bz#-EJZ2Y?LOyVssWYsj@>;bM7*_z;C{I)Nxz ziESb}L6>vnkp76*9<^s-=rknndJ5g0digbv-SH@`qG8UBD069ak$k{jthQRF#HQc) zWKr$Dn>_%0D#F?YrS?7P!S~=ugPAhHD_!mSHPzIEL-Pq_OSmp;r#m_1hX2ft=syd| z_A6}xGoP}_>j8J8>;mFV4cNO*Hmbu1;Ub5Umv;sgN0+#2MKbR7UGwh8s`j8cF;Hj~|_8#~5UjEo+Yi+sYX5wfWM(p1Qm^;~IRd zT)(t1-nAxxaXCbJdYSXWw44#68tAs)rQb3N8G>Xd2fm~7|tVwby*|e;{HTc`v3$?pHHi28GpN2>m56k`; zVK5Wb5*_%p*N!Lp+;6u+j~(?u$sOQ{OqUeb%#Z}VbFPtHT@{!ldJcw?`#EotaihSAZ zdX2nRPG?WN+D8u&Uy`xo-`ZcNJ}7^rJ|F__N=)~wtyU1^4eo{y;+kCnDq^sz2S%MF zUGns<0J#Do)tlGLNHfZT-8e$sz(96!)p7!PNF*RbKZ!3tD=IBi+S5Cq%=hT>8>G)A zmWM@owapO|7}d09`GYf*Z%VW)sSfFnC!_COz8fk0);Y3ytMyoUyf_TC?g~3{&`0>` zdcdg_Jyt;dG%OEjJ+0F{U|ke&(XXVT+?C!{kig#`L^z#P19Ghm9D3?$n|?pX`gSRa z|37JZ6P@9VNrL)eFd)(gWUu#T(ui+QU zMXEaBL21JS=ZpL`t6)?#tP$nQH(B6=M^SkTR|cu-K#0eyr58_MRvq@cM9Y)<=6+Mn-MlF!(m6J>W!m-u|<#pSYRY40i; zOk4w9$^Eh==z`IzA!8VCZkAqScOImV6D`3_?dID$csRHwptu1c^l{4}C--wkWOM!V zp=*HvmaF*oiJg5Kc0nk`c3mG%=eY#+;m^!{nhZZfjT3>=c^*Me8X|uWU>~#ocA0L@J|9fs zmFhtUgTGy9)SQZXF|(Xod>|<^zobDQqD8&(RCk`_v~j8CQ|0Vo2FRr^PgkKRa_klF zi}>9^*|M$VNQ$w0Q6wDWJ6z{p#C2*dlh&=Qp}BotPACOJNGi1B_|h%W+%IS+V7R`t z`62C!nTykvk!hNH>+Z@~&2YV$>UfFE&51I>1s=w}ydO_+UQ*u{eVRAI;VJs-mWri6 z)Q_fsJOGZ_Ky@%*g5FA3u;;jZQ6!>r|NWZi+=1aHH6g4m-LvQ7*v7lgjL6>Lf#??p zS~DVLmYxY&P2TropVslWtwoLku9;O&Scdr0k$?~zt5Y&+)0La+*>C8{49PQ(^^5gB zSH_i`@;tNkJ+^9dv9Ib0xC>vp{=G8J^;B|p>DKx0hUaz$?%P-irayh7uNT5S`o=3G zQpNZ|RhoeZrZ>j8`SycKn5Vx%)Fb(`FktK9u}}VKgDBDApDx63*ou1A3E)!%W!hxi zrmY;^N1``G;hd<6_8n$$dK%hcrm;m|wupatOD)4srGyObx6I*=?b3tqBHn4cfn0vmSZeUC+(WE^U4i4oJRLEQ?X=`Ka>H9!ke0>s>Uw=X*9`1ZY|NVe&|t?^?9LiiBlg z$Y|kfCGxqp46akcg#HA#@-jThyJPLK#LYkSYtB+?M%gz;K2>f;^hJTQeLL1rF9&*A zFQzM--$<`*M$%G-&IgY*)m$2VkQz9)4yw`PC7$gLIm6%dg1P}jMyXDAwUZg?v5j}< z+MGat+>mk^uw}lX&8yl8rF+UfoAYGdpNieLLHikq&3cs9-yrQ)1v&k4iVobqXJ93! zP`P>PJ1YO=t&px}oIG7QW~H`@IG^2@D~1g54UY&zUJc$pp{@mpfk3K8s;ErW zgSJ9PK_({VudW{yK45JOGEp_!epEwL#r`@NfsMgNe~W=k`Q`tU2QtYd>z)TJO#hZ{ zW?}xfbW?Ni(f@@o1)H1yEoT0AN~Y!}f6D`#fWX_e;Q!=qW_0wg;D5!8&CLF{iJ2KF z^M#%@!p8z^f;75j3Ob5J`dkMez2 tmp) { - this.prevNodes[itemsLength - 1] = k; - a = tmp; - } + let lineWidthFixed = lineWidth * 0.75; + let itemsLength = items.length; + this.lineCostStorage = Array(itemsLength); + this.prevNodes = Array(itemsLength).fill(null); + for (var i = 0; i < itemsLength; i++) { + this.lineCostStorage[i] = Array(itemsLength).fill(null); + } + this.totalCostAuxStorage = Array(itemsLength).fill(null); + let a = Infinity; + for (var k = itemsLength - 2; this.lineCost(items, k + 1, itemsLength - 1, lineWidthFixed) < Infinity; k--) { + let tmp = this.totalCostAux(items, k, lineWidthFixed); + if (a > tmp) { + this.prevNodes[itemsLength - 1] = k; + a = tmp; } - console.log("~~~", lineWidth); - console.log(items[itemsLength - 2]); - return a; - }); + } + return a; } /** * check the total cost item[0..j]. @@ -110,29 +97,26 @@ class BreakLineAlgorithm { * @param lineWidth */ totalCostAux(items, j, lineWidth) { - return __awaiter(this, void 0, void 0, function* () { - if (this.totalCostAuxStorage[j] !== null) { - return this.totalCostAuxStorage[j]; - } - let rawLineCost = yield this.lineCost(items, 0, j, lineWidth); - if (rawLineCost != Infinity) { - this.totalCostAuxStorage[j] = rawLineCost ** 3.0; - return rawLineCost ** 3.0; - } - else { - var returnCost = Infinity; - for (var k = 0; k < j; k++) { - let tmp1 = yield Promise.all([this.totalCostAux(items, k, lineWidth), this.lineCost(items, k + 1, j, lineWidth)]); - let tmp = tmp1[0] + tmp1[1] ** 3; - if (returnCost > tmp) { - this.prevNodes[j] = k; - returnCost = tmp; - } + if (this.totalCostAuxStorage[j] !== null) { + return this.totalCostAuxStorage[j]; + } + let rawLineCost = this.lineCost(items, 0, j, lineWidth); + if (rawLineCost != Infinity) { + this.totalCostAuxStorage[j] = rawLineCost ** 3.0; + return rawLineCost ** 3.0; + } + else { + var returnCost = Infinity; + for (var k = 0; k < j; k++) { + let tmp = this.totalCostAux(items, k, lineWidth) + this.lineCost(items, k + 1, j, lineWidth) ** 3.0; + if (returnCost > tmp) { + this.prevNodes[j] = k; + returnCost = tmp; } - this.totalCostAuxStorage[j] = returnCost; - return returnCost; } - }); + this.totalCostAuxStorage[j] = returnCost; + return returnCost; + } } /** * check the line cost of a line containing items[i..j] @@ -142,31 +126,30 @@ class BreakLineAlgorithm { * @param lineWidth line width */ lineCost(items, i, j, lineWidth) { - return __awaiter(this, void 0, void 0, function* () { - if (this.lineCostStorage[i] !== null && this.lineCostStorage[i][j] !== null) { - return this.lineCostStorage[i][j]; + if (this.lineCostStorage[i][j] !== null) { + console.log("AA"); + return this.lineCostStorage[i][j]; + } + if (!this.isBreakPoint(items[j])) { + this.lineCostStorage[i][j] = Infinity; + return Infinity; + } + else { + var tmpItemWidth = 0; + for (var k = i; k < j; k++) { + tmpItemWidth += this.origWidth(items[k]); } - if (!this.isBreakPoint(items[j])) { + tmpItemWidth += this.newLineWidth(items[j]); + if (tmpItemWidth > lineWidth) { this.lineCostStorage[i][j] = Infinity; return Infinity; } else { - var tmpItemWidth = 0; - for (var k = i; k < j; k++) { - tmpItemWidth += this.origWidth(items[k]); - } - tmpItemWidth += this.newLineWidth(items[j]); - if (tmpItemWidth > lineWidth) { - this.lineCostStorage[i][j] = Infinity; - return Infinity; - } - else { - let returnValue = (lineWidth - tmpItemWidth); - this.lineCostStorage[i][j] = returnValue; - return returnValue; - } + let returnValue = (lineWidth - tmpItemWidth); + this.lineCostStorage[i][j] = returnValue; + return returnValue; } - }); + } } } exports.BreakLineAlgorithm = BreakLineAlgorithm; diff --git a/src/libclo/breakLines.ts b/src/libclo/breakLines.ts index f761b18..7ab8c0d 100644 --- a/src/libclo/breakLines.ts +++ b/src/libclo/breakLines.ts @@ -51,6 +51,7 @@ export class BreakLineAlgorithm { } segmentedNodes(items : BoxesItem[], lineWidth : number) : BoxesItem[][]{ + let lineWidthFixed = lineWidth; this.totalCost(items ,lineWidthFixed); let nodeList = this.generateBreakLineNodeList(); @@ -64,6 +65,8 @@ export class BreakLineAlgorithm { up = nodeList[i+1]; } + + return res; } @@ -105,16 +108,15 @@ export class BreakLineAlgorithm { let a = Infinity; for(var k=itemsLength-2; this.lineCost(items, k+1,itemsLength-1, lineWidthFixed) < Infinity; k--){ + let tmp = this.totalCostAux(items, k, lineWidthFixed); - + if (a > tmp){ this.prevNodes[itemsLength-1] = k a = tmp; } + } - - console.log("~~~", lineWidth); - console.log((items[itemsLength-2])); return a; } @@ -163,7 +165,8 @@ export class BreakLineAlgorithm { * @param lineWidth line width */ lineCost(items : BoxesItem[], i : number, j : number, lineWidth: number) : number{ - if (this.lineCostStorage[i] !== null && this.lineCostStorage[i][j] !== null){ + if (this.lineCostStorage[i][j] !== null){ + console.log("AA") return this.lineCostStorage[i][j]; } diff --git a/src/libclo/index.js b/src/libclo/index.js index 2840b3d..9d9e8a8 100644 --- a/src/libclo/index.js +++ b/src/libclo/index.js @@ -245,8 +245,13 @@ exports.hyphenTkTree = hyphenTkTree; function calculateTextWidthHeight(element, style) { return __awaiter(this, void 0, void 0, function* () { var res = []; + var styleCache = {}; + var fontCache = {}; for (var i = 0; i < element.length; i++) { - res.push(yield calculateTextWidthHeightAux(element[i], style)); + let item = yield calculateTextWidthHeightAux(element[i], style, styleCache, fontCache); + styleCache = item[1]; + fontCache = item[2]; + res.push(item[0]); } res = res.flat(); return res; @@ -258,15 +263,25 @@ exports.calculateTextWidthHeight = calculateTextWidthHeight; * @param preprocessed * @param defaultFontStyle */ -function calculateTextWidthHeightAux(element, style) { +function calculateTextWidthHeightAux(element, style, styleCache, fontCache) { return __awaiter(this, void 0, void 0, function* () { var result = []; - let fontPair = (0, canva_1.fontStyleTofont)(style); - if (fontPair.path.match(/\.ttc$/)) { - var font = yield fontkit.openSync(fontPair.path, fontPair.psName); + var font; + if (style === styleCache) { + font = fontCache; } else { - var font = yield fontkit.openSync(fontPair.path); + let fontPair = (0, canva_1.fontStyleTofont)(style); + if (fontPair.path.match(/\.ttc$/)) { + font = yield fontkit.openSync(fontPair.path, fontPair.psName); + styleCache = style; + fontCache = font; + } + else { + font = yield fontkit.openSync(fontPair.path); + styleCache = style; + fontCache = font; + } } if (!Array.isArray(element)) { var run = font.layout(element, undefined, undefined, undefined, "ltr"); @@ -287,14 +302,14 @@ function calculateTextWidthHeightAux(element, style) { }; result.push(item); } - return result; + return [result, styleCache, fontCache]; } else if (element[0] == "bp") { - var beforeNewLine = yield calculateTextWidthHeightAux(element[1], style); + var beforeNewLine = (yield calculateTextWidthHeightAux(element[1], style, styleCache, fontCache))[0]; if (Array.isArray(beforeNewLine)) { beforeNewLine = beforeNewLine.flat(); } - let afterNewLine = yield calculateTextWidthHeightAux(element[2], style); + let afterNewLine = (yield calculateTextWidthHeightAux(element[2], style, styleCache, fontCache))[0]; if (Array.isArray(afterNewLine)) { afterNewLine = afterNewLine.flat(); } @@ -302,14 +317,14 @@ function calculateTextWidthHeightAux(element, style) { original: beforeNewLine, newLined: afterNewLine, }; - return breakPointNode; + return [breakPointNode, styleCache, fontCache]; } else if (element[0] == "hglue" && !Array.isArray(element[1])) { let hGlue = { stretchFactor: parseFloat(element[1]) }; - return hGlue; + return [hGlue, styleCache, fontCache]; } else { - return calculateTextWidthHeight(element, style); + return [yield calculateTextWidthHeight(element, style), styleCache, fontCache]; } }); } @@ -362,47 +377,58 @@ class Clo { let defaultFontStyle = this.attrs.defaultFrameStyle.textStyle; let a = yield calculateTextWidthHeight(preprocessed, defaultFontStyle); let breakLineAlgorithms = new breakLines.BreakLineAlgorithm(); - // TODO - //console.log(breakLineAlgorithms.totalCost(a,70)); let segmentedNodes = breakLineAlgorithms.segmentedNodes(a, this.attrs.defaultFrameStyle.width); let segmentedNodesToBox = this.segmentedNodesToFrameBox(segmentedNodes, this.attrs.defaultFrameStyle); let boxesFixed = this.fixenBoxesPosition(segmentedNodesToBox); - // generate pdf7 + // generate pdf const doc = new PDFDocument({ size: 'A4' }); doc.pipe(fs.createWriteStream('output.pdf')); this.grid(doc); - yield this.putText(doc, boxesFixed); + let styleCache = {}; + let fontPairCache = { path: "", psName: "" }; + yield this.putText(doc, boxesFixed, styleCache, fontPairCache); // putChar doc.end(); }); } - putText(doc, box) { + putText(doc, box, styleCache, fontPairCache) { return __awaiter(this, void 0, void 0, function* () { + var fontPair; if (box.textStyle !== null) { - let fontInfo = (0, canva_1.fontStyleTofont)(box.textStyle); - if (fontInfo.path.match(/\.ttc$/g)) { - doc - .font(fontInfo.path, fontInfo.psName) - .fontSize(box.textStyle.size * 0.75); + if (box.textStyle == styleCache) { + fontPair = fontPairCache; } else { - doc - .font(fontInfo.path) - .fontSize(box.textStyle.size * 0.75); // 0.75 must added! + fontPair = (0, canva_1.fontStyleTofont)(box.textStyle); + styleCache = box.textStyle; + fontPairCache = fontPair; + if (fontPair.path.match(/\.ttc$/g)) { + doc + .font(fontPair.path, fontPair.psName) + .fontSize(box.textStyle.size * 0.75); + } + else { + doc + .font(fontPair.path) + .fontSize(box.textStyle.size * 0.75); // 0.75 must added! + } } if (box.textStyle.color !== undefined) { doc.fill(box.textStyle.color); } if (Array.isArray(box.content)) { for (var k = 0; k < box.content.length; k++) { - doc = yield this.putText(doc, box.content[k]); + let tmp = yield this.putText(doc, box.content[k], styleCache, fontPairCache); + doc = tmp[0]; + styleCache = tmp[1]; + fontPairCache = tmp[2]; } } else if (box.content !== null) { yield doc.text(box.content, (box.x !== null ? box.x : undefined), (box.y !== null ? box.y : undefined)); } } - return doc; + return [doc, styleCache, fontPairCache]; }); } ; diff --git a/src/libclo/index.ts b/src/libclo/index.ts index e5c2108..f48f448 100644 --- a/src/libclo/index.ts +++ b/src/libclo/index.ts @@ -1,9 +1,11 @@ import {tkTree} from "../parser"; -import {FontStyle, TextStyle, TextWeight, fontStyleTofont} from "../canva"; +import {FontStyle, TextStyle, TextWeight, fontStyleTofont, fontPathPSNamePair} from "../canva"; import * as fontkit from "fontkit"; import * as breakLines from "./breakLines"; const PDFDocument = require('pdfkit'); import * as fs from "fs"; +import { Style } from "util"; +import { time } from "console"; /** @@ -279,6 +281,8 @@ export function hyphenTkTree(arr : tkTree, lang: string) : tkTree{ return result; } + + /** * calculate the text width and Height with a given `TextStyle` * @param preprocessed @@ -286,9 +290,14 @@ export function hyphenTkTree(arr : tkTree, lang: string) : tkTree{ */ export async function calculateTextWidthHeight(element : tkTree, style : TextStyle): Promise { var res = []; + var styleCache = {}; + var fontCache = {}; for (var i=0; istyleCache, fontCache); + styleCache = item[1]; + fontCache = item[2]; + res.push(item[0]); } res = res.flat(); @@ -302,18 +311,37 @@ export async function calculateTextWidthHeight(element : tkTree, style : TextSty * @param preprocessed * @param defaultFontStyle */ -export async function calculateTextWidthHeightAux(element : tkTree, style : TextStyle): Promise { +export async function calculateTextWidthHeightAux(element : tkTree, + style : TextStyle, + styleCache : TextStyle, + fontCache : fontkit.Font): Promise<[BoxesItem, TextStyle, fontkit.Font] > { var result : BoxesItem = []; - + var font; + + if (style === styleCache){ + font = fontCache; + }else { let fontPair = fontStyleTofont(style); + if (fontPair.path.match(/\.ttc$/)){ - var font = await fontkit.openSync(fontPair.path, fontPair.psName); + font = await fontkit.openSync(fontPair.path, fontPair.psName); + styleCache = style; + fontCache = font; + } else{ - var font = await fontkit.openSync(fontPair.path); + font = await fontkit.openSync(fontPair.path); + styleCache = style; + fontCache = font; + } + + + } + + if (!Array.isArray(element)){ var run = font.layout(element, undefined, undefined, undefined, "ltr"); @@ -340,19 +368,20 @@ export async function calculateTextWidthHeightAux(element : tkTree, style : Text result.push(item); } - return result; + return [result, styleCache, fontCache]; }else if(element[0] == "bp"){ - var beforeNewLine = await calculateTextWidthHeightAux(element[1], style); + + var beforeNewLine = (await calculateTextWidthHeightAux(element[1], style, styleCache, fontCache))[0]; if (Array.isArray(beforeNewLine)){ beforeNewLine = beforeNewLine.flat(); } - let afterNewLine = await calculateTextWidthHeightAux(element[2], style); + let afterNewLine = (await calculateTextWidthHeightAux(element[2], style, styleCache, fontCache))[0]; if (Array.isArray(afterNewLine)){ afterNewLine = afterNewLine.flat(); } @@ -362,13 +391,13 @@ export async function calculateTextWidthHeightAux(element : tkTree, style : Text newLined : afterNewLine, } - return breakPointNode; + return [breakPointNode, styleCache, fontCache]; }else if(element[0] == "hglue" && !Array.isArray(element[1])){ let hGlue : HGlue = {stretchFactor : parseFloat(element[1])} - return hGlue; + return [hGlue, styleCache, fontCache]; } else{ - return calculateTextWidthHeight(element, style); + return [await calculateTextWidthHeight(element, style), styleCache, fontCache]; } } @@ -428,56 +457,72 @@ export class Clo{ } public async generatePdf(){ + // preprocessed var preprocessed = this.mainStream; for (var i = 0; ithis.attrs.defaultFrameStyle); - let boxesFixed = this.fixenBoxesPosition(segmentedNodesToBox); - // generate pdf7 + // generate pdf const doc = new PDFDocument({size: 'A4'}); doc.pipe(fs.createWriteStream('output.pdf')); this.grid(doc); - await this.putText(doc, boxesFixed); + let styleCache : any = {}; + let fontPairCache : fontPathPSNamePair = {path : "", psName : ""}; + await this.putText(doc, boxesFixed, styleCache, fontPairCache); // putChar doc.end(); + } - async putText(doc : PDFKit.PDFDocument, box : Box): Promise{ + async putText(doc : PDFKit.PDFDocument, box : Box, styleCache : TextStyle, + fontPairCache : fontPathPSNamePair): + Promise<[PDFKit.PDFDocument, TextStyle, fontPathPSNamePair]>{ + var fontPair; + if (box.textStyle !== null){ - let fontInfo = fontStyleTofont(box.textStyle); - - if (fontInfo.path.match(/\.ttc$/g)){ - doc - .font(fontInfo.path, fontInfo.psName) - .fontSize(box.textStyle.size * 0.75);} - else{ - doc - .font(fontInfo.path) - .fontSize(box.textStyle.size * 0.75); // 0.75 must added! - } + + if(box.textStyle == styleCache){ + fontPair = fontPairCache; + }else{ + fontPair = fontStyleTofont(box.textStyle); + styleCache = box.textStyle; + fontPairCache = fontPair; + + if (fontPair.path.match(/\.ttc$/g)){ + doc + .font(fontPair.path, fontPair.psName) + .fontSize(box.textStyle.size * 0.75);} + else{ + doc + .font(fontPair.path) + .fontSize(box.textStyle.size * 0.75); // 0.75 must added! + } + } if (box.textStyle.color !== undefined){ doc.fill(box.textStyle.color); @@ -486,7 +531,10 @@ export class Clo{ if (Array.isArray(box.content)){ for (var k=0; k