teechart.js 4.0.1 → 4.0.2

package/README.md

@@ -6,8 +6,7 @@
 
 Powerful yet flexible JavaScript charting for designers & developers.
 
-[![npm](https://img.shields.io/npm/v/teechart)](https://www.npmjs.com/package/teechart)
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/Steema/TeeChartJS/ci.yml?branch=main)](https://github.com/Steema/TeeChartJS/actions)
+[![npm](https://img.shields.io/npm/v/teechart.js)](https://www.npmjs.com/package/teechart.js)
 [![License](https://img.shields.io/badge/license-Steema-blue)](https://www.steema.com/licensing/html5)
 
 ## Documentation

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "teechart.js",
   "description": "Charting module using TeeChart for JavaScript",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "type": "module",
   "workspaces": ["demos"],
   "tags": ["html5", "canvas", "chart", "graph", "plot", "visualization"],

package/dist/Tween.js

@@ -1,13 +0,0 @@
-// tween.js r5 - http://github.com/sole/tween.js
-var TWEEN=TWEEN||function(){var a,e,c=60,b=false,h=[],i;return{setFPS:function(f){c=f||60},start:function(f){arguments.length!=0&&this.setFPS(f);e=setInterval(this.update,1E3/c)},stop:function(){clearInterval(e)},setAutostart:function(f){(b=f)&&!e&&this.start()},add:function(f){h.push(f);b&&!e&&this.start()},getAll:function(){return h},removeAll:function(){h=[]},remove:function(f){a=h.indexOf(f);a!==-1&&h.splice(a,1)},update:function(f){a=0;i=h.length;for(f=f||Date.now();a<i;)if(h[a].update(f))a++;
-else{h.splice(a,1);i--}i==0&&b==true&&this.stop()}}}();
-TWEEN.Tween=function(a){var e={},c={},b={},h=1E3,i=0,f=null,n=TWEEN.Easing.Linear.EaseNone,k=null,l=null,m=null;this.to=function(d,g){if(g!==null)h=g;for(var j in d)if(a[j]!==null)b[j]=d[j];return this};this.start=function(d){TWEEN.add(this);f=d?d+i:Date.now()+i;for(var g in b)if(a[g]!==null){e[g]=a[g];c[g]=b[g]-a[g]}return this};this.stop=function(){TWEEN.remove(this);return this};this.delay=function(d){i=d;return this};this.easing=function(d){n=d;return this};this.chain=function(d){k=d};this.onUpdate=
-function(d){l=d;return this};this.onComplete=function(d){m=d;return this};this.update=function(d){var g,j;if(d<f)return true;d=(d-f)/h;d=d>1?1:d;j=n(d);for(g in c)a[g]=e[g]+c[g]*j;l!==null&&l.call(a,j);if(d==1){m!==null&&m.call(a);k!==null&&k.start();return false}return true}};TWEEN.Easing={Linear:{},Quadratic:{},Cubic:{},Quartic:{},Quintic:{},Sinusoidal:{},Exponential:{},Circular:{},Elastic:{},Back:{},Bounce:{}};TWEEN.Easing.Linear.EaseNone=function(a){return a};
-TWEEN.Easing.Quadratic.EaseIn=function(a){return a*a};TWEEN.Easing.Quadratic.EaseOut=function(a){return-a*(a-2)};TWEEN.Easing.Quadratic.EaseInOut=function(a){if((a*=2)<1)return 0.5*a*a;return-0.5*(--a*(a-2)-1)};TWEEN.Easing.Cubic.EaseIn=function(a){return a*a*a};TWEEN.Easing.Cubic.EaseOut=function(a){return--a*a*a+1};TWEEN.Easing.Cubic.EaseInOut=function(a){if((a*=2)<1)return 0.5*a*a*a;return 0.5*((a-=2)*a*a+2)};TWEEN.Easing.Quartic.EaseIn=function(a){return a*a*a*a};
-TWEEN.Easing.Quartic.EaseOut=function(a){return-(--a*a*a*a-1)};TWEEN.Easing.Quartic.EaseInOut=function(a){if((a*=2)<1)return 0.5*a*a*a*a;return-0.5*((a-=2)*a*a*a-2)};TWEEN.Easing.Quintic.EaseIn=function(a){return a*a*a*a*a};TWEEN.Easing.Quintic.EaseOut=function(a){return(a-=1)*a*a*a*a+1};TWEEN.Easing.Quintic.EaseInOut=function(a){if((a*=2)<1)return 0.5*a*a*a*a*a;return 0.5*((a-=2)*a*a*a*a+2)};TWEEN.Easing.Sinusoidal.EaseIn=function(a){return-Math.cos(a*Math.PI/2)+1};
-TWEEN.Easing.Sinusoidal.EaseOut=function(a){return Math.sin(a*Math.PI/2)};TWEEN.Easing.Sinusoidal.EaseInOut=function(a){return-0.5*(Math.cos(Math.PI*a)-1)};TWEEN.Easing.Exponential.EaseIn=function(a){return a==0?0:Math.pow(2,10*(a-1))};TWEEN.Easing.Exponential.EaseOut=function(a){return a==1?1:-Math.pow(2,-10*a)+1};TWEEN.Easing.Exponential.EaseInOut=function(a){if(a==0)return 0;if(a==1)return 1;if((a*=2)<1)return 0.5*Math.pow(2,10*(a-1));return 0.5*(-Math.pow(2,-10*(a-1))+2)};
-TWEEN.Easing.Circular.EaseIn=function(a){return-(Math.sqrt(1-a*a)-1)};TWEEN.Easing.Circular.EaseOut=function(a){return Math.sqrt(1- --a*a)};TWEEN.Easing.Circular.EaseInOut=function(a){if((a/=0.5)<1)return-0.5*(Math.sqrt(1-a*a)-1);return 0.5*(Math.sqrt(1-(a-=2)*a)+1)};TWEEN.Easing.Elastic.EaseIn=function(a){var e,c=0.1,b=0.4;if(a==0)return 0;if(a==1)return 1;b||(b=0.3);if(!c||c<1){c=1;e=b/4}else e=b/(2*Math.PI)*Math.asin(1/c);return-(c*Math.pow(2,10*(a-=1))*Math.sin((a-e)*2*Math.PI/b))};
-TWEEN.Easing.Elastic.EaseOut=function(a){var e,c=0.1,b=0.4;if(a==0)return 0;if(a==1)return 1;b||(b=0.3);if(!c||c<1){c=1;e=b/4}else e=b/(2*Math.PI)*Math.asin(1/c);return c*Math.pow(2,-10*a)*Math.sin((a-e)*2*Math.PI/b)+1};
-TWEEN.Easing.Elastic.EaseInOut=function(a){var e,c=0.1,b=0.4;if(a==0)return 0;if(a==1)return 1;b||(b=0.3);if(!c||c<1){c=1;e=b/4}else e=b/(2*Math.PI)*Math.asin(1/c);if((a*=2)<1)return-0.5*c*Math.pow(2,10*(a-=1))*Math.sin((a-e)*2*Math.PI/b);return c*Math.pow(2,-10*(a-=1))*Math.sin((a-e)*2*Math.PI/b)*0.5+1};TWEEN.Easing.Back.EaseIn=function(a){return a*a*(2.70158*a-1.70158)};TWEEN.Easing.Back.EaseOut=function(a){return(a-=1)*a*(2.70158*a+1.70158)+1};
-TWEEN.Easing.Back.EaseInOut=function(a){if((a*=2)<1)return 0.5*a*a*(3.5949095*a-2.5949095);return 0.5*((a-=2)*a*(3.5949095*a+2.5949095)+2)};TWEEN.Easing.Bounce.EaseIn=function(a){return 1-TWEEN.Easing.Bounce.EaseOut(1-a)};TWEEN.Easing.Bounce.EaseOut=function(a){return(a/=1)<1/2.75?7.5625*a*a:a<2/2.75?7.5625*(a-=1.5/2.75)*a+0.75:a<2.5/2.75?7.5625*(a-=2.25/2.75)*a+0.9375:7.5625*(a-=2.625/2.75)*a+0.984375};
-TWEEN.Easing.Bounce.EaseInOut=function(a){if(a<0.5)return TWEEN.Easing.Bounce.EaseIn(a*2)*0.5;return TWEEN.Easing.Bounce.EaseOut(a*2-1)*0.5+0.5};

package/dist/date.format.js

@@ -1,145 +0,0 @@
-/*
- * Date Format 1.2.3
- * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
- * MIT license
- *
- * Includes enhancements by Scott Trenda <scott.trenda.net>
- * and Kris Kowal <cixar.com/~kris.kowal/>
- *
- * Accepts a date, a mask, or a date and a mask.
- * Returns a formatted version of the given date.
- * The date defaults to the current date/time.
- * The mask defaults to dateFormat.masks.default.
- */
-
-/*
- * Additions by Steema Software
- *
- * function Date.msecsRound(min,max)
- * Returns nearest to min logical date in msecs.
- *
- */
-
-Date.prototype.msecsRound=function(min,max) {
-   var days=Math.round((max-min)/86400000);
-
-   if (days>60) {
-     var d=new Date(min), m=d.getMonth(), y=d.getFullYear();
-     if (m<12) m++; else { m=1; y++ }
-     return new Date(y,m,1).getTime();
-   }
-   else
-     return min;
-}
-
-var dateFormat = function () {
-	var	token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
-		timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
-		timezoneClip = /[^-+\dA-Z]/g,
-		pad = function (val, len) {
-			val = String(val);
-			len = len || 2;
-			while (val.length < len) val = "0" + val;
-			return val;
-		};
-
-	// Regexes and supporting functions are cached through closure
-	return function (date, mask, utc) {
-		var dF = dateFormat;
-
-		// You can't provide utc if you skip other args (use the "UTC:" mask prefix)
-		if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
-			mask = date;
-			date = undefined;
-		}
-
-		// Passing date through Date applies Date.parse, if necessary
-		date = date ? new Date(date) : new Date;
-		if (isNaN(date)) throw SyntaxError("invalid date");
-
-		mask = String(dF.masks[mask] || mask || dF.masks["default"]);
-
-		// Allow setting the utc argument via the mask
-		if (mask.slice(0, 4) == "UTC:") {
-			mask = mask.slice(4);
-			utc = true;
-		}
-
-		var	_ = utc ? "getUTC" : "get",
-			d = date[_ + "Date"](),
-			D = date[_ + "Day"](),
-			m = date[_ + "Month"](),
-			y = date[_ + "FullYear"](),
-			H = date[_ + "Hours"](),
-			M = date[_ + "Minutes"](),
-			s = date[_ + "Seconds"](),
-			L = date[_ + "Milliseconds"](),
-			o = utc ? 0 : date.getTimezoneOffset(),
-			flags = {
-				d:    d,
-				dd:   pad(d),
-				ddd:  dF.i18n.dayNames[D],
-				dddd: dF.i18n.dayNames[D + 7],
-				m:    m + 1,
-				mm:   pad(m + 1),
-				mmm:  dF.i18n.monthNames[m],
-				mmmm: dF.i18n.monthNames[m + 12],
-				yy:   String(y).slice(2),
-				yyyy: y,
-				h:    H % 12 || 12,
-				hh:   pad(H % 12 || 12),
-				H:    H,
-				HH:   pad(H),
-				M:    M,
-				MM:   pad(M),
-				s:    s,
-				ss:   pad(s),
-				l:    pad(L, 3),
-				L:    pad(L > 99 ? Math.round(L / 10) : L),
-				t:    H < 12 ? "a"  : "p",
-				tt:   H < 12 ? "am" : "pm",
-				T:    H < 12 ? "A"  : "P",
-				TT:   H < 12 ? "AM" : "PM",
-				Z:    utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
-				o:    (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
-				S:    ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
-			};
-
-		return mask.replace(token, function ($0) {
-			return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
-		});
-	};
-}();
-
-// Some common format strings
-dateFormat.masks = {
-	"default":      "ddd mmm dd yyyy HH:MM:ss",
-	shortDate:      "m/d/yy",
-	mediumDate:     "mmm d, yyyy",
-	longDate:       "mmmm d, yyyy",
-	fullDate:       "dddd, mmmm d, yyyy",
-	shortTime:      "h:MM TT",
-	mediumTime:     "h:MM:ss TT",
-	longTime:       "h:MM:ss TT Z",
-	isoDate:        "yyyy-mm-dd",
-	isoTime:        "HH:MM:ss",
-	isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
-	isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
-};
-
-// Internationalization strings
-dateFormat.i18n = {
-	dayNames: [
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
-		"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-	],
-	monthNames: [
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-		"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
-	]
-};
-
-// For convenience...
-Date.prototype.format = function (mask, utc) {
-	return dateFormat(this, mask, utc);
-};

package/dist/excanvas/canvas.text.js

@@ -1,489 +0,0 @@
-/* $Id$ */
-
-/** 
- * @projectDescription An cross-browser implementation of the HTML5 <canvas> text methods
- * @author Fabien M�nager
- * @version $Revision$
- * @license MIT License <http://www.opensource.org/licenses/mit-license.php>
- */
-
-/**
- * Known issues:
- * - The 'light' font weight is not supported, neither is the 'oblique' font style.
- * - Optimize the different hacks (for Opera9)
- */
-
-window.Canvas = window.Canvas || {};
-window.Canvas.Text = {
-  // http://mondaybynoon.com/2007/04/02/linux-font-equivalents-to-popular-web-typefaces/
-  equivalentFaces: {
-    // Web popular fonts
-    'arial': ['liberation sans', 'nimbus sans l', 'freesans', 'optimer', 'dejavu sans'],
-    'times new roman': ['liberation serif', 'helvetiker', 'linux libertine', 'freeserif'],
-    'courier new': ['dejavu sans mono', 'liberation mono', 'nimbus mono l', 'freemono'],
-    'georgia': ['nimbus roman no9 l', 'helvetiker'],
-    'helvetica': ['nimbus sans l', 'helvetiker', 'freesans'],
-    'tahoma': ['dejavu sans', 'optimer', 'bitstream vera sans'],
-    'verdana': ['dejavu sans', 'optimer', 'bitstream vera sans']
-  },
-  genericFaces: {
-    'serif': ['times new roman', 'georgia', 'garamond', 'bodoni', 'minion web', 'itc stone serif', 'bitstream cyberbit'],
-    'sans-serif': ['arial', 'verdana', 'trebuchet', 'tahoma', 'helvetica', 'itc avant garde gothic', 'univers', 'futura', 
-                   'gill sans', 'akzidenz grotesk', 'attika', 'typiko new era', 'itc stone sans', 'monotype gill sans 571'],
-    'monospace': ['courier', 'courier new', 'prestige', 'everson mono'],
-    'cursive': ['caflisch script', 'adobe poetica', 'sanvito', 'ex ponto', 'snell roundhand', 'zapf-chancery'],
-    'fantasy': ['alpha geometrique', 'critter', 'cottonwood', 'fb reactor', 'studz']
-  },
-  faces: {},
-  scaling: 0.962,
-  _styleCache: {}
-};
-
-/** The implementation of the text functions */
-(function(){
-  var isOpera9 = (window.opera && /Opera\/9/.test(navigator.userAgent)), // It seems to be faster when the hacked methods are used. But there are artifacts with Opera 10.
-      proto = window.CanvasRenderingContext2D ? window.CanvasRenderingContext2D.prototype : document.createElement('canvas').getContext('2d').__proto__,
-      ctxt = window.Canvas.Text;
-
-  // Global options
-  ctxt.options = {
-    fallbackCharacter: ' ', // The character that will be drawn when not present in the font face file
-    dontUseMoz: false, // Don't use the builtin Firefox 3.0 functions (mozDrawText, mozPathText and mozMeasureText)
-    reimplement: false, // Don't use the builtin official functions present in Chrome 2, Safari 4, and Firefox 3.1+
-    debug: false, // Debug mode, not used yet
-    autoload: false // Specify the directory containing the face files or false
-  };
-  
-  var scripts = document.getElementsByTagName("script"),
-      parts = scripts[scripts.length-1].src.split('?');
-  
-  ctxt.basePath = parts[0].substr(0, parts[0].lastIndexOf("/")+1);
-  
-  if (parts[1]) {
-    var options = parts[1].split('&');
-    for (var j = options.length-1; j >= 0; --j) {
-      var pair = options[j].split('=');
-      ctxt.options[pair[0]] = pair[1];
-    }
-  }
-  
-  // What is the browser's implementation ?
-  var moz = !ctxt.options.dontUseMoz && proto.mozDrawText && !proto.fillText;
-
-  // If the text functions are already here or if on the iPhone (fillText exists) : nothing to do !
-  if (proto.fillText && !ctxt.options.reimplement && !/iphone/i.test(navigator.userAgent)) {
-    // This property is needed, when including the font face files
-    return window._typeface_js = {loadFace: function(){}};
-  }
-  
-  function getCSSWeightEquivalent(weight){
-    switch(String(weight)) {
-      case 'bolder':
-      case 'bold':
-      case '900':
-      case '800':
-      case '700': return 'bold';
-      case '600':
-      case '500':
-      case '400':
-      default:
-      case 'normal': return 'normal';
-      //default: return 'light';
-    }
-  }
-  
-  function getElementStyle(e){
-    if (document.defaultView && document.defaultView.getComputedStyle) {
-      return document.defaultView.getComputedStyle(e, null);
-    }
-    return e.currentStyle || e.style;
-  }
-  
-  function getXHR(){
-    if (!ctxt.xhr) {
-      var methods = [
-        function(){return new XMLHttpRequest()},
-        function(){return new ActiveXObject('Msxml2.XMLHTTP')},
-        function(){return new ActiveXObject('Microsoft.XMLHTTP')}
-      ];
-      for (var i = 0; i < methods.length; i++) {
-        try {
-          ctxt.xhr = methods[i](); 
-          break;
-        } 
-        catch (e) {}
-      }
-    }
-    return ctxt.xhr;
-  }
-
-  function arrayContains(a, v){
-    var i, l = a.length;
-    for (i = l-1; i >= 0; --i) if (a[i] === v) return true;
-    return false;
-  }
-  
-  ctxt.lookupFamily = function(family){
-    var faces = this.faces, face, i, f, list,
-        equiv = this.equivalentFaces,
-        generic = this.genericFaces;
-        
-    if (faces[family]) return faces[family];
-    
-    if (generic[family]) {
-      for (i = 0; i < generic[family].length; i++) {
-        if (f = this.lookupFamily(generic[family][i])) return f;
-      }
-    }
-    
-    if (!(list = equiv[family])) return false;
-
-    for (i = 0; i < list.length; i++)
-      if (face = faces[list[i]]) return face;
-    return false;
-  }
-
-  ctxt.getFace = function(family, weight, style){
-    var face = this.lookupFamily(family);
-    if (!face) return false;
-    
-    if (face && 
-        face[weight] && 
-        face[weight][style]) return face[weight][style];
-    
-    if (!this.options.autoload) return false;
-    
-    var faceName = (family.replace(/[ -]/g, '_')+'-'+weight+'-'+style),
-        xhr = this.xhr,
-        url = this.basePath+this.options.autoload+'/'+faceName+'.js';
-
-    xhr = getXHR();
-    xhr.open("get", url, false);
-    xhr.send(null);
-    if(xhr.status == 200) {
-      eval(xhr.responseText);
-      return this.faces[family][weight][style];
-    }
-    else throw 'Unable to load the font ['+family+' '+weight+' '+style+']';
-  };
-  
-  ctxt.loadFace = function(data){
-    var family = data.familyName.toLowerCase();
-
-    this.faces[family] = this.faces[family] || {};
-    
-    if (data.strokeFont) {
-      this.faces[family].normal = this.faces[family].normal || {};
-      this.faces[family].normal.normal = data;
-      this.faces[family].normal.italic = data;
-      
-      this.faces[family].bold = this.faces[family].normal || {};
-      this.faces[family].bold.normal = data;
-      this.faces[family].bold.italic = data;
-    }
-    else {
-      this.faces[family][data.cssFontWeight] = this.faces[family][data.cssFontWeight] || {};
-      this.faces[family][data.cssFontWeight][data.cssFontStyle] = data;
-    }
-    return data;
-  };
-
-  // To use the typeface.js face files
-  window._typeface_js = {faces: ctxt.faces, loadFace: ctxt.loadFace};
-  
-  ctxt.getFaceFromStyle = function(style){
-    var weight = getCSSWeightEquivalent(style.weight),
-        families = style.family, i, face;
-        
-    for (i = 0; i < families.length; i++) {
-      // The iPhone adds "-webkit-" at the beginning
-      if (face = this.getFace(families[i].toLowerCase().replace(/^-webkit-/, ""), weight, style.style)) {
-        return face;
-      }
-    }
-    return false;
-  };
-  
-  // Default values
-  // Firefox 3.5 throws an error when redefining these properties
-  try {
-    proto.font = "10px sans-serif";
-    proto.textAlign = "start";
-    proto.textBaseline = "alphabetic";
-  }
-  catch(e){}
-  
-  proto.parseStyle = function(styleText){
-    if (ctxt._styleCache[styleText]) return this.getComputedStyle(ctxt._styleCache[styleText]);
-    
-    var style = {}, computedStyle, families;
-    
-    if (!this._elt) {
-      this._elt = document.createElement('span');
-      this.canvas.appendChild(this._elt);
-    }
-    
-    // Default style
-    this.canvas.font = '10px sans-serif';
-    this._elt.style.font = styleText;
-    
-    computedStyle = getElementStyle(this._elt);
-    style.size = computedStyle.fontSize;
-    style.weight = getCSSWeightEquivalent(computedStyle.fontWeight);
-    style.style = computedStyle.fontStyle;
-    
-    families = computedStyle.fontFamily.split(',');
-    for(i = 0; i < families.length; i++) {
-      families[i] = families[i].replace(/^["'\s]*/, '').replace(/["'\s]*$/, '');
-    }
-    style.family = families;
-    return this.getComputedStyle(ctxt._styleCache[styleText] = style);
-  };
-  
-  proto.buildStyle = function (style){
-    return style.style+' '+style.weight+' '+style.size+'px "'+style.family+'"';
-  };
-
-  proto.renderText = function(text, style){
-    var face = ctxt.getFaceFromStyle(style),
-        scale = (style.size / face.resolution) * 0.75,
-        offset = 0, i, 
-        chars = String(text).split(''), 
-        length = chars.length;
-    
-    if (!isOpera9) {
-      this.scale(scale, -scale);
-      this.lineWidth /= scale;
-    }
-    
-    for (i = 0; i < length; i++) {
-      offset += this.renderGlyph(chars[i], face, scale, offset);
-    }
-  };
-
-  if (isOpera9) {
-    proto.renderGlyph = function(c, face, scale, offset){
-      var i, cpx, cpy, outline, action, length,
-          glyph = face.glyphs[c] || face.glyphs[ctxt.options.fallbackCharacter];
-
-      if (!glyph) return;
-  
-      if (glyph.o) {
-        outline = glyph._cachedOutline || (glyph._cachedOutline = glyph.o.split(' '));
-        length = outline.length;
-        for (i = 0; i < length; ) {
-          action = outline[i++];
-  
-          switch(action) {
-            case 'm':
-              this.moveTo(outline[i++]*scale+offset, outline[i++]*-scale);
-              break;
-            case 'l':
-              this.lineTo(outline[i++]*scale+offset, outline[i++]*-scale);
-              break;
-            case 'q':
-              cpx = outline[i++]*scale+offset;
-              cpy = outline[i++]*-scale;
-              this.quadraticCurveTo(outline[i++]*scale+offset, outline[i++]*-scale, cpx, cpy);
-              break;
-            case 'b':
-              cpx = outline[i++]*scale+offset;
-              cpy = outline[i++]*-scale;
-              this.bezierCurveTo(outline[i++]*scale+offset, outline[i++]*-scale, outline[i++]*scale+offset, outline[i++]*-scale, cpx, cpy);
-              break;
-          }
-        }
-      }
-      return glyph.ha*scale;
-    };
-  }
-  else {
-    proto.renderGlyph = function(c, face){
-      var i, cpx, cpy, outline, action, length,
-          glyph = face.glyphs[c] || face.glyphs[ctxt.options.fallbackCharacter];
-      
-      if (!glyph) return;
-
-      if (glyph.o) {
-        outline = glyph._cachedOutline || (glyph._cachedOutline = glyph.o.split(' '));
-        length = outline.length;
-        for (i = 0; i < length; ) {
-          action = outline[i++];
- 
-          switch(action) {
-            case 'm':
-              this.moveTo(outline[i++], outline[i++]);
-              break;
-            case 'l':
-              this.lineTo(outline[i++], outline[i++]);
-              break;
-            case 'q':
-              cpx = outline[i++];
-              cpy = outline[i++];
-              this.quadraticCurveTo(outline[i++], outline[i++], cpx, cpy);
-              break;
-            case 'b':
-              cpx = outline[i++];
-              cpy = outline[i++];
-              this.bezierCurveTo(outline[i++], outline[i++], outline[i++], outline[i++], cpx, cpy);
-              break;
-          }
-        }
-      }
-      if (glyph.ha) this.translate(glyph.ha, 0);
-    };
-  }
-  
-  proto.getTextExtents = function(text, style){
-    var width = 0, height = 0, ha = 0, 
-        face = ctxt.getFaceFromStyle(style),
-        i, length = text.length, glyph;
-    
-    for (i = 0; i < length; i++) {
-      glyph = face.glyphs[text.charAt(i)] || face.glyphs[ctxt.options.fallbackCharacter];
-      width += Math.max(glyph.ha, glyph.x_max);
-      ha += glyph.ha;
-    }
-    
-    return {
-      width: width,
-      height: face.lineHeight,
-      ha: ha
-    };
-  };
-  
-  proto.getComputedStyle = function(style){
-    var p, canvasStyle = getElementStyle(this.canvas), 
-        computedStyle = {},
-        s = style.size,
-        canvasFontSize = parseFloat(canvasStyle.fontSize),
-        fontSize = parseFloat(s);
-    
-    for (p in style) {
-      computedStyle[p] = style[p];
-    }
-    
-    // Compute the size
-    if (typeof s === 'number' || s.indexOf('px') != -1) 
-      computedStyle.size = fontSize;
-    else if (s.indexOf('em') != -1)
-      computedStyle.size = canvasFontSize * fontSize;
-    else if (s.indexOf('%') != -1)
-      computedStyle.size = (canvasFontSize / 100) * fontSize;
-    else if (s.indexOf('pt') != -1)
-      computedStyle.size = fontSize / 0.75;
-    else
-      computedStyle.size = canvasFontSize;
-    
-    return computedStyle;
-  };
-  
-  proto.getTextOffset = function(text, style, face){
-    var canvasStyle = getElementStyle(this.canvas),
-        metrics = this.measureText(text), 
-        scale = (style.size / face.resolution) * 0.75,
-        offset = {x: 0, y: 0, metrics: metrics, scale: scale};
-
-    switch (this.textAlign) {
-      default:
-      case null:
-      case 'left': break;
-      case 'center': offset.x = -metrics.width/2; break;
-      case 'right':  offset.x = -metrics.width; break;
-      case 'start':  offset.x = (canvasStyle.direction == 'rtl') ? -metrics.width : 0; break;
-      case 'end':    offset.x = (canvasStyle.direction == 'ltr') ? -metrics.width : 0; break;
-    }
-    
-    switch (this.textBaseline) {
-      case 'alphabetic': break;
-      default:
-      case null:
-      case 'ideographic':
-      case 'bottom': offset.y = face.descender; break;
-      case 'hanging': 
-      case 'top': offset.y = face.ascender; break;
-      case 'middle': offset.y = (face.ascender + face.descender) / 2; break;
-    }
-    offset.y *= scale;
-    return offset;
-  };
-
-  proto.drawText = function(text, x, y, maxWidth, stroke){
-    var style = this.parseStyle(this.font),
-        face = ctxt.getFaceFromStyle(style),
-        offset = this.getTextOffset(text, style, face);
-        
-    this.save();
-    this.translate(x + offset.x, y + offset.y);
-    if (face.strokeFont && !stroke) {
-      this.strokeStyle = this.fillStyle;
-    }
-    this.lineCap = "round";
-    this.beginPath();
-
-    if (moz) {
-      this.mozTextStyle = this.buildStyle(style);
-      this[stroke ? 'mozPathText' : 'mozDrawText'](text);
-    }
-    else {
-      this.scale(ctxt.scaling, ctxt.scaling);
-      this.renderText(text, style);
-      if (face.strokeFont) {
-        this.lineWidth = 2 + style.size * (style.weight == 'bold' ? 0.08 : 0.015) / 2;
-      }
-    }
-
-    this[(stroke || (face.strokeFont && !moz)) ? 'stroke' : 'fill']();
-
-    this.closePath();
-    this.restore();
-    
-    if (ctxt.options.debug) {
-      var left = Math.floor(offset.x + x) + 0.5,
-          top = Math.floor(y)+0.5;
-          
-      this.save();
-      this.strokeStyle = '#F00';
-      this.lineWidth = 0.5;
-      this.beginPath();
-      
-      // Text baseline
-      this.moveTo(left + offset.metrics.width, top);
-      this.lineTo(left, top);
-      
-      // Text align
-      this.moveTo(left - offset.x, top + offset.y);
-      this.lineTo(left - offset.x, top + offset.y - style.size);
-      
-      this.stroke();
-      this.closePath();
-      this.restore();
-    }
-  };
-  
-  proto.fillText = function(text, x, y, maxWidth){
-    this.drawText(text, x, y, maxWidth, false);
-  };
-  
-  proto.strokeText = function(text, x, y, maxWidth){
-    this.drawText(text, x, y, maxWidth, true);
-  };
-  
-  proto.measureText = function(text){
-    var style = this.parseStyle(this.font), 
-        dim = {width: 0};
-    
-    if (moz) {
-      this.mozTextStyle = this.buildStyle(style);
-      dim.width = this.mozMeasureText(text);
-    }
-    else {
-      var face = ctxt.getFaceFromStyle(style),
-          scale = (style.size / face.resolution) * 0.75;
-          
-      dim.width = this.getTextExtents(text, style).ha * scale * ctxt.scaling;
-    }
-    
-    return dim;
-  };
-})();