commit 662606d20e020a9bf137e518592da69a17ae2972
author airnan <hernantorrisi@gmail.com> Sat May 18 06:19:14 2019 -0400
committer airnan <hernantorrisi@gmail.com> Sat May 18 06:20:12 2019 -0400
tree 87e51b99e0ba83694c2b6d28f3e2d23dfb5b62a2
parent 88119a0ef45f603411a1c7f62c4cdec50838278b

fixed merged characters in fonts

player/js/utils/expressions/ExpressionManager.js

diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js
index 29d3b63..67cd011 100644
--- a/player/js/utils/expressions/ExpressionManager.js
+++ b/player/js/utils/expressions/ExpressionManager.js
@@ -362,7 +362,7 @@
         var height = elem.data.sh ? elem.data.sh : 0;
         var name = elem.data.nm;
         var loopIn, loop_in, loopOut, loop_out, smooth;
-        var toWorld,fromWorld,fromComp,toComp,fromCompToSurface, position, rotation, anchorPoint, scale, thisLayer,thisComp,mask,valueAtTime,velocityAtTime;
+        var toWorld,fromWorld,fromComp,toComp,fromCompToSurface, position, rotation, anchorPoint, scale, thisLayer, thisComp,mask,valueAtTime,velocityAtTime;
         var __expression_functions = [];
         if(data.xf) {
             var i, len = data.xf.length;

player/js/utils/text/TextProperty.js

diff --git a/player/js/utils/text/TextProperty.js b/player/js/utils/text/TextProperty.js
index 69befe2..16bc6e8 100644
--- a/player/js/utils/text/TextProperty.js
+++ b/player/js/utils/text/TextProperty.js
@@ -197,9 +197,9 @@
     }
     documentData.fWeight = fontData.fWeight || fWeight;
     documentData.fStyle = fStyle;
-    len = documentData.t.length;
     documentData.finalSize = documentData.s;
     documentData.finalText = this.buildFinalText(documentData.t);
+    len = documentData.finalText.length;
     documentData.finalLineHeight = documentData.lh;
     var trackingOffset = documentData.tr/1000*documentData.finalSize;
     var charCode;