← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1168: (GIS) Removed unnecessary code and files.

 

------------------------------------------------------------
revno: 1168
committer: admin <admin@laptop>
branch nick: trunk
timestamp: Fri 2009-12-04 15:22:48 +0100
message:
  (GIS) Removed unnecessary code and files.
removed:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/cufon-yui.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/mp_700.font.js
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/cufon-yui.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/cufon-yui.js	2009-10-02 13:47:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/cufon-yui.js	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2009 Simo Kinnunen.
- * Licensed under the MIT license.
- *
- * @version 1.08
- */
-var Cufon=(function(){var m=function(){return m.replace.apply(null,arguments)};var x=m.DOM={ready:(function(){var C=false,E={loaded:1,complete:1};var B=[],D=function(){if(C){return}C=true;for(var F;F=B.shift();F()){}};if(document.addEventListener){document.addEventListener("DOMContentLoaded",D,false);window.addEventListener("pageshow",D,false)}if(!window.opera&&document.readyState){(function(){E[document.readyState]?D():setTimeout(arguments.callee,10)})()}if(document.readyState&&document.createStyleSheet){(function(){try{document.body.doScroll("left");D()}catch(F){setTimeout(arguments.callee,1)}})()}q(window,"load",D);return function(F){if(!arguments.length){D()}else{C?F():B.push(F)}}})(),root:function(){return document.documentElement||document.body}};var n=m.CSS={Size:function(C,B){this.value=parseFloat(C);this.unit=String(C).match(/[a-z%]*$/)[0]||"px";this.convert=function(D){return D/B*this.value};this.convertFrom=function(D){return D/this.value*B};this.toString=function(){return this.value+this.unit}},addClass:function(C,B){var D=C.className;C.className=D+(D&&" ")+B;return C},color:j(function(C){var B={};B.color=C.replace(/^rgba\((.*?),\s*([\d.]+)\)/,function(E,D,F){B.opacity=parseFloat(F);return"rgb("+D+")"});return B}),fontStretch:j(function(B){if(typeof B=="number"){return B}if(/%$/.test(B)){return parseFloat(B)/100}return{"ultra-condensed":0.5,"extra-condensed":0.625,condensed:0.75,"semi-condensed":0.875,"semi-expanded":1.125,expanded:1.25,"extra-expanded":1.5,"ultra-expanded":2}[B]||1}),getStyle:function(C){var B=document.defaultView;if(B&&B.getComputedStyle){return new a(B.getComputedStyle(C,null))}if(C.currentStyle){return new a(C.currentStyle)}return new a(C.style)},gradient:j(function(F){var G={id:F,type:F.match(/^-([a-z]+)-gradient\(/)[1],stops:[]},C=F.substr(F.indexOf("(")).match(/([\d.]+=)?(#[a-f0-9]+|[a-z]+\(.*?\)|[a-z]+)/ig);for(var E=0,B=C.length,D;E<B;++E){D=C[E].split("=",2).reverse();G.stops.push([D[1]||E/(B-1),D[0]])}return G}),quotedList:j(function(E){var D=[],C=/\s*((["'])([\s\S]*?[^\\])\2|[^,]+)\s*/g,B;while(B=C.exec(E)){D.push(B[3]||B[1])}return D}),recognizesMedia:j(function(G){var E=document.createElement("style"),D,C,B;E.type="text/css";E.media=G;try{E.appendChild(document.createTextNode("/**/"))}catch(F){}C=g("head")[0];C.insertBefore(E,C.firstChild);D=(E.sheet||E.styleSheet);B=D&&!D.disabled;C.removeChild(E);return B}),removeClass:function(D,C){var B=RegExp("(?:^|\\s+)"+C+"(?=\\s|$)","g");D.className=D.className.replace(B,"");return D},supports:function(D,C){var B=document.createElement("span").style;if(B[D]===undefined){return false}B[D]=C;return B[D]===C},textAlign:function(E,D,B,C){if(D.get("textAlign")=="right"){if(B>0){E=" "+E}}else{if(B<C-1){E+=" "}}return E},textShadow:j(function(F){if(F=="none"){return null}var E=[],G={},B,C=0;var D=/(#[a-f0-9]+|[a-z]+\(.*?\)|[a-z]+)|(-?[\d.]+[a-z%]*)|,/ig;while(B=D.exec(F)){if(B[0]==","){E.push(G);G={};C=0}else{if(B[1]){G.color=B[1]}else{G[["offX","offY","blur"][C++]]=B[2]}}}E.push(G);return E}),textTransform:(function(){var B={uppercase:function(C){return C.toUpperCase()},lowercase:function(C){return C.toLowerCase()},capitalize:function(C){return C.replace(/\b./g,function(D){return D.toUpperCase()})}};return function(E,D){var C=B[D.get("textTransform")];return C?C(E):E}})(),whiteSpace:(function(){var D={inline:1,"inline-block":1,"run-in":1};var C=/^\s+/,B=/\s+$/;return function(H,F,G,E){if(E){if(E.nodeName.toLowerCase()=="br"){H=H.replace(C,"")}}if(D[F.get("display")]){return H}if(!G.previousSibling){H=H.replace(C,"")}if(!G.nextSibling){H=H.replace(B,"")}return H}})()};n.ready=(function(){var B=!n.recognizesMedia("all"),E=false;var D=[],H=function(){B=true;for(var K;K=D.shift();K()){}};var I=g("link"),J=g("style");function C(K){return K.disabled||G(K.sheet,K.media||"screen")}function G(M,P){if(!n.recognizesMedia(P||"all")){return true}if(!M||M.disabled){return false}try{var Q=M.cssRules,O;if(Q){search:for(var L=0,K=Q.length;O=Q[L],L<K;++L){switch(O.type){case 2:break;case 3:if(!G(O.styleSheet,O.media.mediaText)){return false}break;default:break search}}}}catch(N){}return true}function F(){if(document.createStyleSheet){return true}var L,K;for(K=0;L=I[K];++K){if(L.rel.toLowerCase()=="stylesheet"&&!C(L)){return false}}for(K=0;L=J[K];++K){if(!C(L)){return false}}return true}x.ready(function(){if(!E){E=n.getStyle(document.body).isUsable()}if(B||(E&&F())){H()}else{setTimeout(arguments.callee,10)}});return function(K){if(B){K()}else{D.push(K)}}})();function s(D){var C=this.face=D.face,B={"\u0020":1,"\u00a0":1,"\u3000":1};this.glyphs=D.glyphs;this.w=D.w;this.baseSize=parseInt(C["units-per-em"],10);this.family=C["font-family"].toLowerCase();this.weight=C["font-weight"];this.style=C["font-style"]||"normal";this.viewBox=(function(){var F=C.bbox.split(/\s+/);var E={minX:parseInt(F[0],10),minY:parseInt(F[1],10),maxX:parseInt(F[2],10),maxY:parseInt(F[3],10)};E.width=E.maxX-E.minX;E.height=E.maxY-E.minY;E.toString=function(){return[this.minX,this.minY,this.width,this.height].join(" ")};return E})();this.ascent=-parseInt(C.ascent,10);this.descent=-parseInt(C.descent,10);this.height=-this.ascent+this.descent;this.spacing=function(L,N,E){var O=this.glyphs,M,K,G,P=[],F=0,J=-1,I=-1,H;while(H=L[++J]){M=O[H]||this.missingGlyph;if(!M){continue}if(K){F-=G=K[H]||0;P[I-1]-=G}F+=P[++I]=~~(M.w||this.w)+N+(B[H]?E:0);K=M.k}P.total=F;return P}}function f(){var C={},B={oblique:"italic",italic:"oblique"};this.add=function(D){(C[D.style]||(C[D.style]={}))[D.weight]=D};this.get=function(H,I){var G=C[H]||C[B[H]]||C.normal||C.italic||C.oblique;if(!G){return null}I={normal:400,bold:700}[I]||parseInt(I,10);if(G[I]){return G[I]}var E={1:1,99:0}[I%100],K=[],F,D;if(E===undefined){E=I>400}if(I==500){I=400}for(var J in G){if(!k(G,J)){continue}J=parseInt(J,10);if(!F||J<F){F=J}if(!D||J>D){D=J}K.push(J)}if(I<F){I=F}if(I>D){I=D}K.sort(function(M,L){return(E?(M>=I&&L>=I)?M<L:M>L:(M<=I&&L<=I)?M>L:M<L)?-1:1});return G[K[0]]}}function r(){function D(F,G){if(F.contains){return F.contains(G)}return F.compareDocumentPosition(G)&16}function B(G){var F=G.relatedTarget;if(!F||D(this,F)){return}C(this,G.type=="mouseover")}function E(F){C(this,F.type=="mouseenter")}function C(F,G){setTimeout(function(){var H=d.get(F).options;m.replace(F,G?h(H,H.hover):H,true)},10)}this.attach=function(F){if(F.onmouseenter===undefined){q(F,"mouseover",B);q(F,"mouseout",B)}else{q(F,"mouseenter",E);q(F,"mouseleave",E)}}}function u(){var C=[],D={};function B(H){var E=[],G;for(var F=0;G=H[F];++F){E[F]=C[D[G]]}return E}this.add=function(F,E){D[F]=C.push(E)-1};this.repeat=function(){var E=arguments.length?B(arguments):C,F;for(var G=0;F=E[G++];){m.replace(F[0],F[1],true)}}}function A(){var D={},B=0;function C(E){return E.cufid||(E.cufid=++B)}this.get=function(E){var F=C(E);return D[F]||(D[F]={})}}function a(B){var D={},C={};this.extend=function(E){for(var F in E){if(k(E,F)){D[F]=E[F]}}return this};this.get=function(E){return D[E]!=undefined?D[E]:B[E]};this.getSize=function(F,E){return C[F]||(C[F]=new n.Size(this.get(F),E))};this.isUsable=function(){return !!B}}function q(C,B,D){if(C.addEventListener){C.addEventListener(B,D,false)}else{if(C.attachEvent){C.attachEvent("on"+B,function(){return D.call(C,window.event)})}}}function v(C,B){var D=d.get(C);if(D.options){return C}if(B.hover&&B.hoverables[C.nodeName.toLowerCase()]){b.attach(C)}D.options=B;return C}function j(B){var C={};return function(D){if(!k(C,D)){C[D]=B.apply(null,arguments)}return C[D]}}function c(F,E){var B=n.quotedList(E.get("fontFamily").toLowerCase()),D;for(var C=0;D=B[C];++C){if(i[D]){return i[D].get(E.get("fontStyle"),E.get("fontWeight"))}}return null}function g(B){return document.getElementsByTagName(B)}function k(C,B){return C.hasOwnProperty(B)}function h(){var C={},B,F;for(var E=0,D=arguments.length;B=arguments[E],E<D;++E){for(F in B){if(k(B,F)){C[F]=B[F]}}}return C}function o(E,M,C,N,F,D){var K=document.createDocumentFragment(),H;if(M===""){return K}var L=N.separate;var I=M.split(p[L]),B=(L=="words");if(B&&t){if(/^\s/.test(M)){I.unshift("")}if(/\s$/.test(M)){I.push("")}}for(var J=0,G=I.length;J<G;++J){H=z[N.engine](E,B?n.textAlign(I[J],C,J,G):I[J],C,N,F,D,J<G-1);if(H){K.appendChild(H)}}return K}function l(D,M){var C=D.nodeName.toLowerCase();if(M.ignore[C]){return}var E=!M.textless[C];var B=n.getStyle(v(D,M)).extend(M);var F=c(D,B),G,K,I,H,L,J;if(!F){return}for(G=D.firstChild;G;G=I){K=G.nodeType;I=G.nextSibling;if(E&&K==3){if(H){H.appendData(G.data);D.removeChild(G)}else{H=G}if(I){continue}}if(H){D.replaceChild(o(F,n.whiteSpace(H.data,B,H,J),B,M,G,D),H);H=null}if(K==1){if(G.firstChild){if(G.nodeName.toLowerCase()=="cufon"){z[M.engine](F,null,B,M,G,D)}else{arguments.callee(G,M)}}J=G}}}var t=" ".split(/\s+/).length==0;var d=new A();var b=new r();var y=new u();var e=false;var z={},i={},w={autoDetect:false,engine:null,forceHitArea:false,hover:false,hoverables:{a:true},ignore:{applet:1,canvas:1,col:1,colgroup:1,head:1,iframe:1,map:1,optgroup:1,option:1,script:1,select:1,style:1,textarea:1,title:1,pre:1},printable:true,selector:(window.Sizzle||(window.jQuery&&function(B){return jQuery(B)})||(window.dojo&&dojo.query)||(window.Ext&&Ext.query)||(window.YAHOO&&YAHOO.util&&YAHOO.util.Selector&&YAHOO.util.Selector.query)||(window.$$&&function(B){return $$(B)})||(window.$&&function(B){return $(B)})||(document.querySelectorAll&&function(B){return document.querySelectorAll(B)})||g),separate:"words",textless:{dl:1,html:1,ol:1,table:1,tbody:1,thead:1,tfoot:1,tr:1,ul:1},textShadow:"none"};var p={words:/\s/.test("\u00a0")?/[^\S\u00a0]+/:/\s+/,characters:"",none:/^/};m.now=function(){x.ready();return m};m.refresh=function(){y.repeat.apply(y,arguments);return m};m.registerEngine=function(C,B){if(!B){return m}z[C]=B;return m.set("engine",C)};m.registerFont=function(D){if(!D){return m}var B=new s(D),C=B.family;if(!i[C]){i[C]=new f()}i[C].add(B);return m.set("fontFamily",'"'+C+'"')};m.replace=function(D,C,B){C=h(w,C);if(!C.engine){return m}if(!e){n.addClass(x.root(),"cufon-active cufon-loading");n.ready(function(){n.addClass(n.removeClass(x.root(),"cufon-loading"),"cufon-ready")});e=true}if(C.hover){C.forceHitArea=true}if(C.autoDetect){delete C.fontFamily}if(typeof C.textShadow=="string"){C.textShadow=n.textShadow(C.textShadow)}if(typeof C.color=="string"&&/^-/.test(C.color)){C.textGradient=n.gradient(C.color)}else{delete C.textGradient}if(!B){y.add(D,arguments)}if(D.nodeType||typeof D=="string"){D=[D]}n.ready(function(){for(var F=0,E=D.length;F<E;++F){var G=D[F];if(typeof G=="string"){m.replace(C.selector(G),C,true)}else{l(G,C)}}});return m};m.set=function(B,C){w[B]=C;return m};return m})();Cufon.registerEngine("canvas",(function(){var b=document.createElement("canvas");if(!b||!b.getContext||!b.getContext.apply){return}b=null;var a=Cufon.CSS.supports("display","inline-block");var e=!a&&(document.compatMode=="BackCompat"||/frameset|transitional/i.test(document.doctype.publicId));var f=document.createElement("style");f.type="text/css";f.appendChild(document.createTextNode(("cufon{text-indent:0;}@media screen,projection{cufon{display:inline;display:inline-block;position:relative;vertical-align:middle;"+(e?"":"font-size:1px;line-height:1px;")+"}cufon cufontext{display:-moz-inline-box;display:inline-block;width:0;height:0;overflow:hidden;text-indent:-10000in;}"+(a?"cufon canvas{position:relative;}":"cufon canvas{position:absolute;}")+"}@media print{cufon{padding:0;}cufon canvas{display:none;}}").replace(/;/g,"!important;")));document.getElementsByTagName("head")[0].appendChild(f);function d(p,h){var n=0,m=0;var g=[],o=/([mrvxe])([^a-z]*)/g,k;generate:for(var j=0;k=o.exec(p);++j){var l=k[2].split(",");switch(k[1]){case"v":g[j]={m:"bezierCurveTo",a:[n+~~l[0],m+~~l[1],n+~~l[2],m+~~l[3],n+=~~l[4],m+=~~l[5]]};break;case"r":g[j]={m:"lineTo",a:[n+=~~l[0],m+=~~l[1]]};break;case"m":g[j]={m:"moveTo",a:[n=~~l[0],m=~~l[1]]};break;case"x":g[j]={m:"closePath"};break;case"e":break generate}h[g[j].m].apply(h,g[j].a)}return g}function c(m,k){for(var j=0,h=m.length;j<h;++j){var g=m[j];k[g.m].apply(k,g.a)}}return function(V,w,P,t,C,W){var k=(w===null);if(k){w=C.getAttribute("alt")}var A=V.viewBox;var m=P.getSize("fontSize",V.baseSize);var B=0,O=0,N=0,u=0;var z=t.textShadow,L=[];if(z){for(var U=z.length;U--;){var F=z[U];var K=m.convertFrom(parseFloat(F.offX));var I=m.convertFrom(parseFloat(F.offY));L[U]=[K,I];if(I<B){B=I}if(K>O){O=K}if(I>N){N=I}if(K<u){u=K}}}var Z=Cufon.CSS.textTransform(w,P).split("");var E=V.spacing(Z,~~m.convertFrom(parseFloat(P.get("letterSpacing"))||0),~~m.convertFrom(parseFloat(P.get("wordSpacing"))||0));if(!E.length){return null}var h=E.total;O+=A.width-E[E.length-1];u+=A.minX;var s,n;if(k){s=C;n=C.firstChild}else{s=document.createElement("cufon");s.className="cufon cufon-canvas";s.setAttribute("alt",w);n=document.createElement("canvas");s.appendChild(n);if(t.printable){var S=document.createElement("cufontext");S.appendChild(document.createTextNode(w));s.appendChild(S)}}var aa=s.style;var H=n.style;var j=m.convert(A.height);var Y=Math.ceil(j);var M=Y/j;var G=M*Cufon.CSS.fontStretch(P.get("fontStretch"));var J=h*G;var Q=Math.ceil(m.convert(J+O-u));var o=Math.ceil(m.convert(A.height-B+N));n.width=Q;n.height=o;H.width=Q+"px";H.height=o+"px";B+=A.minY;H.top=Math.round(m.convert(B-V.ascent))+"px";H.left=Math.round(m.convert(u))+"px";var r=Math.max(Math.ceil(m.convert(J)),0)+"px";if(a){aa.width=r;aa.height=m.convert(V.height)+"px"}else{aa.paddingLeft=r;aa.paddingBottom=(m.convert(V.height)-1)+"px"}var X=n.getContext("2d"),D=j/A.height;X.scale(D,D*M);X.translate(-u,-B);X.save();function T(){var x=V.glyphs,ab,l=-1,g=-1,y;X.scale(G,1);while(y=Z[++l]){var ab=x[Z[l]]||V.missingGlyph;if(!ab){continue}if(ab.d){X.beginPath();if(ab.code){c(ab.code,X)}else{ab.code=d("m"+ab.d,X)}X.fill()}X.translate(E[++g],0)}X.restore()}if(z){for(var U=z.length;U--;){var F=z[U];X.save();X.fillStyle=F.color;X.translate.apply(X,L[U]);T()}}var q=t.textGradient;if(q){var v=q.stops,p=X.createLinearGradient(0,A.minY,0,A.maxY);for(var U=0,R=v.length;U<R;++U){p.addColorStop.apply(p,v[U])}X.fillStyle=p}else{X.fillStyle=P.get("color")}T();return s}})());Cufon.registerEngine("vml",(function(){var e=document.namespaces;if(!e){return}e.add("cvml","urn:schemas-microsoft-com:vml");e=null;var b=document.createElement("cvml:shape");b.style.behavior="url(#default#VML)";if(!b.coordsize){return}b=null;var h=(document.documentMode||0)<8;document.write(('<style type="text/css">cufoncanvas{text-indent:0;}@media screen{cvml\\:shape,cvml\\:rect,cvml\\:fill,cvml\\:shadow{behavior:url(#default#VML);display:block;antialias:true;position:absolute;}cufoncanvas{position:absolute;text-align:left;}cufon{display:inline-block;position:relative;vertical-align:'+(h?"middle":"text-bottom")+";}cufon cufontext{position:absolute;left:-10000in;font-size:1px;}a cufon{cursor:pointer}}@media print{cufon cufoncanvas{display:none;}}</style>").replace(/;/g,"!important;"));function c(i,j){return a(i,/(?:em|ex|%)$|^[a-z-]+$/i.test(j)?"1em":j)}function a(l,m){if(m==="0"){return 0}if(/px$/i.test(m)){return parseFloat(m)}var k=l.style.left,j=l.runtimeStyle.left;l.runtimeStyle.left=l.currentStyle.left;l.style.left=m.replace("%","em");var i=l.style.pixelLeft;l.style.left=k;l.runtimeStyle.left=j;return i}function f(l,k,j,n){var i="computed"+n,m=k[i];if(isNaN(m)){m=k.get(n);k[i]=m=(m=="normal")?0:~~j.convertFrom(a(l,m))}return m}var g={};function d(p){var q=p.id;if(!g[q]){var n=p.stops,o=document.createElement("cvml:fill"),i=[];o.type="gradient";o.angle=180;o.focus="0";o.method="sigma";o.color=n[0][1];for(var m=1,l=n.length-1;m<l;++m){i.push(n[m][0]*100+"% "+n[m][1])}o.colors=i.join(",");o.color2=n[l][1];g[q]=o}return g[q]}return function(ac,G,Y,C,K,ad,W){var n=(G===null);if(n){G=K.alt}var I=ac.viewBox;var p=Y.computedFontSize||(Y.computedFontSize=new Cufon.CSS.Size(c(ad,Y.get("fontSize"))+"px",ac.baseSize));var y,q;if(n){y=K;q=K.firstChild}else{y=document.createElement("cufon");y.className="cufon cufon-vml";y.alt=G;q=document.createElement("cufoncanvas");y.appendChild(q);if(C.printable){var Z=document.createElement("cufontext");Z.appendChild(document.createTextNode(G));y.appendChild(Z)}if(!W){y.appendChild(document.createElement("cvml:shape"))}}var ai=y.style;var R=q.style;var l=p.convert(I.height),af=Math.ceil(l);var V=af/l;var P=V*Cufon.CSS.fontStretch(Y.get("fontStretch"));var U=I.minX,T=I.minY;R.height=af;R.top=Math.round(p.convert(T-ac.ascent));R.left=Math.round(p.convert(U));ai.height=p.convert(ac.height)+"px";var F=Y.get("color");var ag=Cufon.CSS.textTransform(G,Y).split("");var L=ac.spacing(ag,f(ad,Y,p,"letterSpacing"),f(ad,Y,p,"wordSpacing"));if(!L.length){return null}var k=L.total;var x=-U+k+(I.width-L[L.length-1]);var ah=p.convert(x*P),X=Math.round(ah);var O=x+","+I.height,m;var J="r"+O+"ns";var u=C.textGradient&&d(C.textGradient);var o=ac.glyphs,S=0;var H=C.textShadow;var ab=-1,aa=0,w;while(w=ag[++ab]){var D=o[ag[ab]]||ac.missingGlyph,v;if(!D){continue}if(n){v=q.childNodes[aa];while(v.firstChild){v.removeChild(v.firstChild)}}else{v=document.createElement("cvml:shape");q.appendChild(v)}v.stroked="f";v.coordsize=O;v.coordorigin=m=(U-S)+","+T;v.path=(D.d?"m"+D.d+"xe":"")+"m"+m+J;v.fillcolor=F;if(u){v.appendChild(u.cloneNode(false))}var ae=v.style;ae.width=X;ae.height=af;if(H){var s=H[0],r=H[1];var B=Cufon.CSS.color(s.color),z;var N=document.createElement("cvml:shadow");N.on="t";N.color=B.color;N.offset=s.offX+","+s.offY;if(r){z=Cufon.CSS.color(r.color);N.type="double";N.color2=z.color;N.offset2=r.offX+","+r.offY}N.opacity=B.opacity||(z&&z.opacity)||1;v.appendChild(N)}S+=L[aa++]}var M=v.nextSibling,t,A;if(C.forceHitArea){if(!M){M=document.createElement("cvml:rect");M.stroked="f";M.className="cufon-vml-cover";t=document.createElement("cvml:fill");t.opacity=0;M.appendChild(t);q.appendChild(M)}A=M.style;A.width=X;A.height=af}else{if(M){q.removeChild(M)}}ai.width=Math.max(Math.ceil(p.convert(k*P)),0);if(h){var Q=Y.computedYAdjust;if(Q===undefined){var E=Y.get("lineHeight");if(E=="normal"){E="1em"}else{if(!isNaN(E)){E+="em"}}Y.computedYAdjust=Q=0.5*(a(ad,E)-parseFloat(ai.height))}if(Q){ai.marginTop=Math.ceil(Q)+"px";ai.marginBottom=Q+"px"}}return y}})());
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/mp_700.font.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/mp_700.font.js	2009-10-02 13:47:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/font/mp_700.font.js	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*!
- * The following copyright notice may not be removed under any circumstances.
- * 
- * Copyright:
- * © 2000, 2004 Adobe Systems Incorporated. All Rights Reserved. U.S. Patent
- * D454,582.
- * 
- * Trademark:
- * Myriad is either a registered trademark or a trademark of Adobe Systems
- * Incorporated in the United States and/or other countries.
- * 
- * Full name:
- * MyriadPro-Bold
- * 
- * Designer:
- * Robert Slimbach and Carol Twombly
- * 
- * Vendor URL:
- * http://www.adobe.com/type
- * 
- * License information:
- * http://www.adobe.com/type/legal.html
- */
-Cufon.registerFont({"w":1136,"face":{"font-family":"mp","font-weight":700,"font-stretch":"normal","units-per-em":"2048","panose-1":"2 11 7 3 3 4 3 2 2 4","ascent":"1536","descent":"-512","x-height":"23","bbox":"-82 -1837 1987 512","underline-thickness":"102.4","underline-position":"-102.4","stemh":"229","stemv":"311","unicode-range":"U+0020-U+2122"},"glyphs":{" ":{"w":413,"k":{"T":80,"V":76,"W":76,"Y":82,"\u2018":156,"\u201c":156}},"!":{"d":"391,-453r-233,0r-47,-927r325,0xm274,23r-2,0v-109,0,-182,-81,-182,-187v0,-109,75,-186,184,-186v109,0,181,77,183,186v0,106,-72,187,-183,187","w":548},"\"":{"d":"72,-1417r276,0r-47,555r-182,0xm465,-1417r276,0r-47,555r-182,0","w":813,"k":{"T":-18,"J":119,"C":18,"G":18,"O":18,"Q":18,"\u00d8":18,"V":-18,"W":-18,"X":-8,"Y":-16,"A":94,"\u00c6":94,"\u00c5":94,"f":-51,"g":39,"c":27,"d":27,"e":27,"o":27,"q":27,"\u00f8":27,"t":-45,"v":-12,"w":-12,"y":-12,",":256,".":256,"\u2026":256}},"#":{"d":"457,-555r186,0r33,-229r-187,0xm373,0r-185,0r54,-367r-166,0r0,-188r198,0r33,-229r-174,0r0,-191r203,0r51,-356r182,0r-51,356r187,0r53,-356r182,0r-53,356r164,0r0,191r-193,0r-33,229r170,0r0,188r-200,0r-52,367r-184,0r51,-367r-186,0","w":1126},"$":{"d":"662,178r-201,0r0,-194v-137,-6,-270,-43,-348,-88r61,-240v86,47,207,90,340,90v117,0,197,-45,197,-127v0,-78,-65,-127,-217,-178v-219,-74,-369,-176,-369,-375v0,-180,127,-321,346,-364r0,-195r201,0r0,180v137,6,229,35,297,68r-60,231v-53,-23,-148,-69,-295,-69v-133,0,-176,57,-176,114v0,68,72,110,246,176v244,86,342,199,342,383v0,182,-128,338,-364,379r0,209"},"%":{"d":"428,-1354r2,0v227,0,356,169,356,396v0,279,-175,426,-368,426v-203,0,-363,-154,-363,-404v0,-238,146,-418,373,-418xm422,-1184r-2,0v-90,0,-133,107,-133,242v0,139,47,240,137,240v88,0,131,-90,131,-242v0,-135,-37,-240,-133,-240xm600,23r-168,0r766,-1375r166,0xm1386,-801r3,0v227,0,356,168,356,395v0,279,-176,424,-369,424v-201,0,-360,-151,-362,-401v0,-238,145,-418,372,-418xm1382,-631r-2,0v-92,0,-133,107,-133,240v-2,139,45,239,135,239v88,0,131,-89,131,-239v0,-135,-35,-240,-131,-240","w":1802},"&":{"d":"1376,0r-362,0r-90,-98v-90,70,-215,121,-379,121v-334,0,-482,-199,-482,-392v0,-182,105,-313,263,-395r0,-8v-59,-66,-105,-168,-105,-266v0,-174,138,-365,414,-365v213,0,375,125,375,324v0,139,-83,258,-273,354r-2,8v80,88,164,188,232,258v55,-86,98,-213,116,-336r279,0v-37,209,-106,388,-229,525xm588,-203r2,0v80,0,147,-30,188,-69v-86,-86,-198,-211,-311,-338v-57,41,-109,100,-109,190v0,117,89,217,230,217xm625,-1208r-2,0v-78,0,-123,69,-123,141v0,70,33,131,94,199v100,-70,151,-123,151,-203v0,-66,-38,-137,-120,-137","w":1388},"\u2019":{"d":"195,-1399r292,-18v-63,199,-153,399,-245,553r-189,18v61,-176,115,-373,142,-553","w":532,"k":{"i":106,"T":-35,"J":184,"C":72,"G":72,"O":72,"Q":72,"\u00d8":72,"V":-29,"W":-29,"X":-10,"Y":-25,"A":176,"\u00c6":176,"\u00c5":176,"M":18,"S":35,"g":127,"b":12,"h":12,"k":12,"l":12,"m":106,"n":106,"p":106,"r":106,"c":190,"d":190,"e":190,"o":190,"q":190,"\u00f8":190,"s":190,"t":43,"v":39,"w":39,"y":39,"a":70,"\u00e6":70,"\u00e5":70,"\u2019":133,"\u201d":133,",":406,".":406,"\u2026":406," ":139}},"(":{"d":"356,-1415r217,0v-117,188,-206,462,-206,829v0,360,91,634,206,824r-217,0v-111,-158,-233,-431,-233,-826v2,-397,122,-667,233,-827","w":643,"k":{"T":-45,"J":-20,"C":47,"G":47,"O":47,"Q":47,"\u00d8":47,"V":-55,"W":-55,"X":-10,"Y":-61,"A":39,"\u00c6":39,"\u00c5":39,"j":-102}},")":{"d":"289,238r-217,0v113,-188,207,-466,207,-828v0,-362,-92,-635,-207,-825r217,0v109,158,233,426,233,825v-2,399,-124,668,-233,828","w":643},"*":{"d":"582,-1403r180,103r-221,260r2,6r325,-66r0,207r-327,-57r-2,6r223,252r-182,106r-117,-317r-4,2r-119,315r-176,-106r219,-256r0,-4r-322,59r0,-207r318,64r2,-4r-217,-258r182,-105r115,313r4,0","w":929},"+":{"d":"510,-1090r201,0r0,447r428,0r0,192r-428,0r0,451r-201,0r0,-451r-428,0r0,-192r428,0r0,-447","w":1220},",":{"d":"211,225r-207,19v63,-182,119,-396,148,-582r317,-20v-68,209,-160,423,-258,583","w":532,"k":{"\"":250,"'":250,"\u2018":256,"\u201c":256,"\u2019":266,"\u201d":266}},"-":{"d":"61,-643r537,0r0,209r-537,0r0,-209","w":659,"k":{"T":113,"J":12,"C":-25,"G":-25,"O":-25,"Q":-25,"\u00d8":-25,"V":49,"W":49,"X":35,"Y":123,"A":10,"\u00c6":10,"\u00c5":10,"g":-8,"c":-33,"d":-33,"e":-33,"o":-33,"q":-33,"\u00f8":-33}},".":{"d":"285,23r-2,0v-104,0,-181,-80,-181,-189v0,-111,76,-190,185,-190v109,0,182,77,182,190v0,109,-73,189,-184,189","w":532,"k":{"\"":250,"'":250,"\u2018":256,"\u201c":256,"\u2019":266,"\u201d":266}},"\/":{"d":"240,82r-207,0r438,-1485r207,0","w":677},"0":{"d":"573,-1354v356,0,496,317,496,682v0,412,-166,695,-506,695v-344,0,-495,-310,-497,-687v0,-385,163,-690,507,-690xm569,-1118v-115,0,-192,145,-190,454v-2,305,71,451,192,451v121,0,187,-152,187,-455v0,-295,-64,-450,-189,-450"},"1":{"d":"483,0r0,-1055r-4,0r-254,121r-51,-233r352,-164r258,0r0,1331r-301,0"},"2":{"d":"1030,0r-944,0r0,-188r172,-156v291,-260,432,-409,436,-565v0,-109,-65,-195,-219,-195v-115,0,-215,58,-285,111r-88,-224v100,-76,257,-137,437,-137v301,0,467,176,467,418v0,223,-162,402,-355,574r-123,102r0,4r502,0r0,256"},"3":{"d":"78,-72r63,-233v55,29,183,82,310,82v162,0,243,-78,243,-178v0,-131,-131,-191,-268,-191r-127,0r0,-223r121,0v104,-2,237,-41,237,-154v0,-80,-65,-139,-196,-139v-109,0,-224,47,-279,80r-63,-225v80,-51,239,-101,411,-101v285,0,443,150,443,332v0,141,-80,252,-244,309r0,4v160,29,289,150,289,324v0,236,-207,408,-545,408v-172,0,-317,-46,-395,-95"},"4":{"d":"932,0r-295,0r0,-317r-590,0r0,-203r504,-811r381,0r0,780r160,0r0,234r-160,0r0,317xm338,-551r299,0r0,-295v0,-80,4,-162,10,-248r-8,0v-43,86,-78,164,-123,248r-178,291r0,4"},"5":{"d":"975,-1331r0,256r-516,0r-29,205v29,-4,53,-4,86,-4v127,0,256,28,350,96v100,68,162,178,162,334v0,248,-213,467,-571,467v-162,0,-297,-37,-371,-76r55,-234v59,29,180,66,301,66v129,0,267,-62,267,-203v0,-137,-109,-221,-375,-221v-74,0,-125,4,-180,12r88,-698r733,0"},"6":{"d":"936,-1350r0,240v-35,0,-72,0,-121,4v-276,23,-399,164,-434,320r6,0v66,-68,158,-107,283,-107v223,0,411,158,411,434v0,264,-202,482,-491,482v-354,0,-529,-265,-529,-582v0,-250,93,-459,236,-592v133,-121,305,-187,514,-197v57,-4,94,-4,125,-2xm586,-207r2,0v109,0,178,-100,178,-235v0,-123,-66,-230,-199,-230v-84,0,-153,51,-184,119v-8,16,-12,41,-12,78v6,141,74,268,215,268"},"7":{"d":"100,-1331r940,0r0,196r-548,1135r-330,0r549,-1071r0,-4r-611,0r0,-256"},"8":{"d":"303,-682r0,-6v-129,-66,-192,-174,-192,-291v0,-225,203,-375,469,-375v311,0,440,180,440,342v0,115,-62,227,-193,293r0,6v129,49,244,160,244,332v0,242,-203,404,-512,404v-338,0,-493,-191,-493,-371v0,-160,92,-271,237,-334xm571,-193v111,0,183,-71,183,-165v0,-117,-86,-187,-209,-220v-102,29,-162,103,-162,199v-2,96,71,186,188,186xm565,-1143v-106,0,-162,70,-162,154v0,90,83,147,189,180v72,-20,135,-86,135,-170v0,-82,-47,-164,-162,-164"},"9":{"d":"184,18r0,-243v39,4,74,4,135,0v94,-6,191,-33,263,-82v86,-59,143,-146,168,-246r-7,-2v-59,61,-145,96,-266,96v-225,0,-416,-157,-416,-415v0,-260,209,-480,502,-480v342,0,504,263,504,574v0,276,-88,479,-233,612v-127,115,-301,178,-508,186v-53,4,-107,2,-142,0xm555,-1126r-2,0v-104,0,-182,94,-180,233v0,115,61,213,188,213v84,0,143,-41,172,-88v10,-18,17,-39,17,-78v0,-141,-54,-280,-195,-280"},":":{"d":"285,-639r-2,0v-104,0,-181,-80,-181,-186v0,-111,76,-189,185,-189v109,0,180,76,182,189v0,106,-73,186,-184,186xm285,23r-2,0v-104,0,-181,-81,-181,-187v0,-111,76,-188,185,-188v109,0,180,75,182,188v0,106,-73,187,-184,187","w":532},";":{"d":"209,225r-205,19v63,-182,119,-396,150,-582r313,-20v-68,209,-160,423,-258,583xm297,-639r-2,0v-106,0,-182,-80,-180,-186v0,-111,73,-189,182,-189v109,0,180,76,182,189v0,106,-71,186,-182,186","w":532},"<":{"d":"119,-457r0,-176r983,-457r0,218r-744,325r0,4r744,326r0,217","w":1220},"=":{"d":"1139,-666r-1057,0r0,-190r1057,0r0,190xm1139,-242r-1057,0r0,-190r1057,0r0,190","w":1220},">":{"d":"1102,-639r0,188r-983,451r0,-217r760,-326r0,-4r-760,-325r0,-218","w":1220},"?":{"d":"555,-449r-272,0r-2,-53v-6,-104,28,-210,120,-319v66,-80,119,-145,119,-215v0,-72,-47,-119,-149,-123v-68,0,-150,24,-203,61r-70,-223v76,-43,197,-84,342,-84v270,0,394,150,394,320v0,156,-97,258,-175,344v-76,84,-106,164,-104,256r0,36xm412,23r-2,0v-106,0,-181,-81,-181,-187v0,-111,77,-186,183,-186v111,0,182,75,184,186v0,106,-73,187,-184,187","w":911},"@":{"d":"907,-512r29,-195v-16,-4,-37,-8,-64,-8v-135,0,-241,133,-241,291v0,78,34,127,102,127v76,0,156,-96,174,-215xm1081,23r37,116v-123,57,-230,74,-375,74v-340,0,-639,-244,-639,-645v0,-418,303,-780,766,-780v360,0,619,247,619,591v0,299,-168,488,-389,488v-96,0,-166,-49,-176,-158r-4,0v-63,104,-156,158,-265,158v-133,0,-229,-98,-229,-266v0,-250,184,-478,479,-478v90,0,193,23,244,52r-62,379v-20,121,-5,176,52,178v88,2,198,-110,198,-346v0,-266,-172,-473,-489,-473v-313,0,-588,245,-588,636v0,342,219,537,524,537v104,0,215,-22,297,-63","w":1576},"A":{"d":"852,-354r-395,0r-99,354r-323,0r422,-1380r409,0r428,1380r-336,0xm502,-588r305,0r-86,-293v-25,-82,-50,-184,-70,-266r-4,0v-20,82,-40,186,-63,266","w":1343,"k":{"T":170,"J":-31,"C":51,"G":51,"O":51,"Q":51,"\u00d8":51,"U":72,"V":121,"W":121,"X":49,"Y":195,"Z":-12,"f":27,"g":29,"b":12,"h":12,"k":12,"l":12,"j":12,"i":12,"m":12,"n":12,"p":12,"r":12,"c":29,"d":29,"e":29,"o":29,"q":29,"\u00f8":29,"s":6,"t":41,"u":31,"v":63,"w":63,"y":63,"x":6,"-":16,"\u2013":16,"\u2014":16,")":37,"]":37,"}":37,"\"":94,"'":94,"\u2018":90,"\u201c":90,"\u2019":133,"\u201d":133}},"B":{"d":"135,-6r0,-1356v82,-16,248,-29,404,-29v190,0,307,19,407,78v96,51,166,146,166,271v0,123,-71,237,-227,294r0,5v158,43,274,162,274,340v0,125,-57,222,-143,292v-100,80,-269,125,-543,125v-154,0,-268,-10,-338,-20xm444,-1155r0,321r103,0v164,0,252,-68,252,-170v0,-104,-80,-159,-221,-159v-68,0,-107,4,-134,8xm444,-610r0,389v31,4,68,4,121,4v141,0,266,-56,266,-199v0,-139,-124,-194,-280,-194r-107,0","w":1236,"k":{"T":37,"V":23,"W":23,"Y":70,"A":8,"\u00c6":8,"\u00c5":8,"c":-12,"d":-12,"e":-12,"o":-12,"q":-12,"\u00f8":-12,"v":12,"w":12,"y":12,"a":-6,"\u00e6":-6,"\u00e5":-6,"-":-25,"\u2013":-25,"\u2014":-25,",":31,".":31,"\u2026":31}},"C":{"d":"1102,-283r47,244v-57,29,-186,62,-354,62v-477,0,-723,-300,-723,-693v0,-471,335,-733,753,-733v162,0,285,33,340,62r-63,247v-63,-27,-151,-51,-262,-51v-248,0,-441,150,-441,457v0,276,164,450,443,450v94,0,199,-20,260,-45","w":1218,"k":{"T":-29,"J":-20,"C":61,"G":61,"O":61,"Q":61,"\u00d8":61,"V":-18,"W":-18,"X":-6,"Y":-14,"A":-20,"\u00c6":-20,"\u00c5":-20,"b":6,"h":6,"k":6,"l":6,"i":8,"m":8,"n":8,"p":8,"r":8,"c":39,"d":39,"e":39,"o":39,"q":39,"\u00f8":39,"u":41,"v":68,"w":68,"y":68,"a":20,"\u00e6":20,"\u00e5":20,"z":-14,")":-18,"]":-18,"}":-18,"\"":-12,"'":-12,"\u2019":-16,"\u201d":-16}},"D":{"d":"135,-6r0,-1356v115,-18,264,-29,422,-29v262,0,432,48,565,148v143,106,234,276,234,520v0,264,-97,446,-230,559v-145,121,-367,178,-637,178v-162,0,-276,-10,-354,-20xm449,-1139r0,903v27,6,69,7,108,7v283,2,467,-154,467,-484v2,-287,-166,-438,-434,-438v-70,0,-114,6,-141,12","w":1425,"k":{"T":57,"V":14,"W":14,"X":68,"Y":76,"A":33,"\u00c6":33,"\u00c5":33,"f":-20,"g":-8,"b":-6,"h":-6,"k":-6,"l":-6,"i":-8,"m":-8,"n":-8,"p":-8,"r":-8,"t":-27,"u":-10,"v":-20,"w":-20,"y":-20,"x":25,"z":6,"-":-25,"\u2013":-25,"\u2014":-25,")":39,"]":39,"}":39,"\u2019":-12,"\u201d":-12,",":82,".":82,"\u2026":82}},"E":{"d":"956,-838r0,254r-507,0r0,328r567,0r0,256r-881,0r0,-1380r852,0r0,256r-538,0r0,286r507,0","w":1093,"k":{"T":-10,"J":-45,"V":-14,"W":-14,"f":10,"g":14,"b":-8,"h":-8,"k":-8,"l":-8,"j":10,"c":8,"d":8,"e":8,"o":8,"q":8,"\u00f8":8,"s":-8,"t":12,"u":20,"v":25,"w":25,"y":25,"z":-12,",":16,".":16,"\u2026":16}},"F":{"d":"135,0r0,-1380r844,0r0,256r-530,0r0,315r495,0r0,254r-495,0r0,555r-314,0","w":1079,"k":{"J":141,"A":137,"\u00c6":137,"\u00c5":137,"M":29,"g":18,"b":31,"h":31,"k":31,"l":31,"i":41,"m":41,"n":41,"p":41,"r":41,"c":53,"d":53,"e":53,"o":53,"q":53,"\u00f8":53,"u":57,"v":41,"w":41,"y":41,"a":80,"\u00e6":80,"\u00e5":80,":":37,";":37,",":184,".":184,"\u2026":184}},"G":{"d":"1288,-791r0,728v-96,33,-279,77,-461,77v-252,0,-434,-63,-561,-186v-127,-119,-196,-299,-194,-502v2,-459,335,-721,788,-721v178,0,315,35,383,68r-65,250v-76,-33,-170,-60,-322,-60v-260,0,-457,148,-457,447v0,285,179,452,435,452v72,0,128,-8,153,-20r0,-289r-213,0r0,-244r514,0","w":1396,"k":{"b":-6,"h":-6,"k":-6,"l":-6,"i":-6,"m":-6,"n":-6,"p":-6,"r":-6,"c":-12,"d":-12,"e":-12,"o":-12,"q":-12,"\u00f8":-12,"u":-6,"v":14,"w":14,"y":14,"a":-16,"\u00e6":-16,"\u00e5":-16,"\u2019":35,"\u201d":35}},"H":{"d":"135,-1380r314,0r0,530r514,0r0,-530r311,0r0,1380r-311,0r0,-578r-514,0r0,578r-314,0r0,-1380","w":1411,"k":{"Y":37,"f":-10,"b":-6,"h":-6,"k":-6,"l":-6,"i":-6,"m":-6,"n":-6,"p":-6,"r":-6,"c":6,"d":6,"e":6,"o":6,"q":6,"\u00f8":6,"s":6,"t":-14,"x":6,"z":-6}},"I":{"d":"135,-1380r314,0r0,1380r-314,0r0,-1380","w":583,"k":{"Y":37,"f":-10,"b":-6,"h":-6,"k":-6,"l":-6,"i":-6,"m":-6,"n":-6,"p":-6,"r":-6,"c":6,"d":6,"e":6,"o":6,"q":6,"\u00f8":6,"s":6,"t":-14,"x":6,"z":-6}},"J":{"d":"406,-512r0,-868r311,0r0,872v0,393,-189,531,-492,531v-72,0,-166,-13,-227,-33r35,-252v43,14,99,24,160,24v131,0,213,-59,213,-274","w":841,"k":{"v":-6,"w":-6,"y":-6,"a":10,"\u00e6":10,"\u00e5":10,")":-27,"]":-27,"}":-27,",":14,".":14,"\u2026":14}},"K":{"d":"135,0r0,-1380r309,0r0,610r7,0v31,-53,63,-103,94,-152r313,-458r383,0r-457,587r482,793r-365,0r-338,-596r-119,145r0,451r-309,0","w":1257,"k":{"T":-12,"J":-59,"C":68,"G":68,"O":68,"Q":68,"\u00d8":68,"Y":31,"Z":-35,"A":-27,"\u00c6":-27,"\u00c5":-27,"g":27,"c":35,"d":35,"e":35,"o":35,"q":35,"\u00f8":35,"u":39,"v":84,"w":84,"y":84,":":-14,";":-14,"-":47,"\u2013":47,"\u2014":47,")":-14,"]":-14,"}":-14,"\"":-8,"'":-8,"\u2018":16,"\u201c":16,"\u2019":-8,"\u201d":-8,",":-18,".":-18,"\u2026":-18}},"L":{"d":"135,0r0,-1380r314,0r0,1118r548,0r0,262r-862,0","w":1046,"k":{"\u00d8":78,"T":213,"J":-57,"C":78,"G":78,"O":78,"Q":78,"U":63,"V":133,"W":133,"Y":184,"A":-12,"\u00c6":-12,"\u00c5":-12,"f":6,"j":8,"c":18,"d":18,"e":18,"o":18,"q":18,"\u00f8":18,"t":10,"u":23,"v":74,"w":74,"y":74,"a":-8,"\u00e6":-8,"\u00e5":-8,"-":37,"\u2013":37,"\u2014":37,"\"":207,"'":207,"\u2018":248,"\u201c":248,"\u2019":199,"\u201d":199}},"M":{"d":"1323,0r-20,-528v-6,-166,-13,-367,-13,-568r-6,0v-43,176,-101,373,-154,535r-167,538r-244,0r-148,-532v-45,-164,-92,-361,-125,-541r-4,0v-8,186,-14,400,-24,572r-25,524r-289,0r89,-1380r415,0r135,460v43,158,86,332,117,494r6,0v39,-160,86,-342,131,-496r148,-458r407,0r76,1380r-305,0","w":1732,"k":{"T":27,"A":6,"\u00c6":6,"\u00c5":6,"j":-6,"i":-12,"m":-12,"n":-12,"p":-12,"r":-12,"c":-6,"d":-6,"e":-6,"o":-6,"q":-6,"\u00f8":-6,"a":-6,"\u00e6":-6,"\u00e5":-6,"-":-6,"\u2013":-6,"\u2014":-6}},"N":{"d":"422,0r-287,0r0,-1380r365,0r286,506v82,145,165,317,226,473r6,0v-20,-182,-27,-369,-27,-578r0,-401r287,0r0,1380r-328,0r-295,-532v-82,-147,-171,-326,-239,-488r-6,2v8,182,12,377,12,602r0,416","w":1413,"k":{"Y":37,"f":-10,"b":-6,"h":-6,"k":-6,"l":-6,"i":-6,"m":-6,"n":-6,"p":-6,"r":-6,"c":6,"d":6,"e":6,"o":6,"q":6,"\u00f8":6,"s":6,"t":-14,"x":6,"z":-6}},"O":{"d":"743,-1403v424,0,656,317,656,698v0,453,-275,728,-678,728v-410,0,-649,-310,-649,-703v0,-414,263,-723,671,-723xm735,-1155v-211,0,-334,201,-334,469v0,270,127,461,336,461v211,0,332,-201,332,-469v0,-248,-119,-461,-334,-461","w":1468,"k":{"T":57,"V":14,"W":14,"X":68,"Y":76,"A":33,"\u00c6":33,"\u00c5":33,"f":-20,"g":-8,"b":-6,"h":-6,"k":-6,"l":-6,"i":-8,"m":-8,"n":-8,"p":-8,"r":-8,"t":-27,"u":-10,"v":-20,"w":-20,"y":-20,"x":25,"z":6,"-":-25,"\u2013":-25,"\u2014":-25,")":39,"]":39,"}":39,"\u2019":-12,"\u201d":-12,",":82,".":82,"\u2026":82}},"P":{"d":"135,0r0,-1362v96,-16,232,-29,422,-29v193,0,330,37,422,111v88,70,147,184,147,319v0,135,-45,250,-127,328v-106,100,-264,146,-448,146v-41,0,-78,-3,-107,-7r0,494r-309,0xm444,-1143r0,408v27,6,60,8,105,8v166,0,268,-84,268,-225v0,-127,-88,-203,-244,-203v-63,0,-106,6,-129,12","w":1189,"k":{"J":156,"V":14,"W":14,"X":57,"Y":41,"Z":18,"A":123,"\u00c6":123,"\u00c5":123,"M":29,"g":51,"i":18,"m":18,"n":18,"p":18,"r":18,"c":49,"d":49,"e":49,"o":49,"q":49,"\u00f8":49,"s":43,"t":-25,"u":20,"v":-16,"w":-16,"y":-16,"a":37,"\u00e6":37,"\u00e5":37,":":20,";":20,"-":27,"\u2013":27,"\u2014":27,")":8,"]":8,"}":8,"\u2018":-35,"\u201c":-35,"\u2019":-53,"\u201d":-53,",":295,".":295,"\u2026":295}},"Q":{"d":"1405,-4r-90,242v-197,-57,-361,-117,-545,-195v-31,-12,-63,-18,-96,-20v-311,-20,-602,-250,-602,-701v0,-414,261,-725,673,-725v422,0,654,319,654,696v0,313,-146,535,-328,617r0,8v106,31,225,55,334,78xm735,-225r2,0v209,0,332,-199,332,-469v0,-252,-119,-461,-332,-461v-213,0,-336,209,-336,467v-2,262,125,463,334,463","w":1468,"k":{"T":57,"V":14,"W":14,"X":68,"Y":76,"A":33,"\u00c6":33,"\u00c5":33,"f":-20,"g":-8,"b":-6,"h":-6,"k":-6,"l":-6,"i":-8,"m":-8,"n":-8,"p":-8,"r":-8,"t":-27,"u":-10,"v":-20,"w":-20,"y":-20,"x":25,"z":6,"-":-25,"\u2013":-25,"\u2014":-25,")":39,"]":39,"}":39,"\u2019":-12,"\u201d":-12,",":82,".":82,"\u2026":82}},"R":{"d":"135,0r0,-1362v100,-16,250,-29,416,-29v205,0,348,31,446,109v82,66,127,162,127,289v0,176,-124,297,-243,340r0,6v96,39,149,131,184,258v43,156,86,336,113,389r-320,0v-23,-41,-55,-152,-96,-322v-37,-172,-96,-219,-223,-221r-95,0r0,543r-309,0xm444,-1149r0,381r123,0v156,0,248,-78,248,-199v0,-127,-86,-190,-229,-192v-76,0,-119,6,-142,10","w":1214,"k":{"J":-12,"C":8,"G":8,"O":8,"Q":8,"\u00d8":8,"U":10,"V":12,"W":12,"X":-16,"Y":39,"A":-18,"\u00c6":-18,"\u00c5":-18,"b":-16,"h":-16,"k":-16,"l":-16,"i":-20,"m":-20,"n":-20,"p":-20,"r":-20,"t":-20,"v":-8,"w":-8,"y":-8,"a":-18,"\u00e6":-18,"\u00e5":-18,"\u2019":-12,"\u201d":-12}},"S":{"d":"82,-63r63,-259v84,43,214,86,347,86v143,0,219,-59,219,-149v0,-86,-66,-136,-232,-195v-229,-80,-379,-206,-379,-407v0,-236,197,-416,523,-416v156,0,270,33,352,70r-70,252v-55,-27,-154,-66,-289,-66v-135,0,-200,61,-200,133v0,88,78,127,256,195v244,90,358,216,358,411v0,231,-178,431,-557,431v-158,0,-313,-43,-391,-86","w":1105,"k":{"\u00e6":-16,"b":8,"h":8,"k":8,"l":8,"j":18,"c":-14,"d":-14,"e":-14,"o":-14,"q":-14,"\u00f8":-14,"t":10,"v":31,"w":31,"y":31,"a":-16,"\u00e5":-16,"-":-25,"\u2013":-25,"\u2014":-25,"\u2018":18,"\u201c":18,"\u2019":29,"\u201d":29}},"T":{"d":"401,0r0,-1118r-370,0r0,-262r1061,0r0,262r-377,0r0,1118r-314,0","w":1122,"k":{"i":111,"T":-45,"J":109,"C":59,"G":59,"O":59,"Q":59,"\u00d8":59,"V":-57,"W":-57,"X":-37,"Y":-14,"A":147,"\u00c6":147,"\u00c5":147,"M":8,"S":18,"g":125,"b":25,"h":25,"k":25,"l":25,"m":111,"n":111,"p":111,"r":111,"c":166,"d":166,"e":166,"o":166,"q":166,"\u00f8":166,"s":147,"u":111,"v":106,"w":106,"y":106,"x":29,"a":135,"\u00e6":135,"\u00e5":135,"z":117,":":74,";":74,"-":123,"\u2013":123,"\u2014":123,")":-63,"]":-63,"}":-63,"\"":-18,"'":-18,"\u2019":-35,"\u201d":-35,",":170,".":170,"\u2026":170}},"U":{"d":"133,-1380r313,0r0,794v0,238,90,359,250,359v164,0,254,-115,254,-359r0,-794r312,0r0,774v0,426,-216,629,-576,629v-348,0,-553,-193,-553,-633r0,-770","w":1396,"k":{"A":61,"\u00c6":61,"\u00c5":61,"f":-10,"s":27,"v":10,"w":10,"y":10,"x":25,"a":12,"\u00e6":12,"\u00e5":12,"z":18,",":47,".":47,"\u2026":47}},"V":{"d":"825,0r-364,0r-443,-1380r342,0r168,583v47,164,90,322,123,494r6,0v35,-166,78,-330,125,-488r176,-589r332,0","w":1302,"k":{"\u00c6":111,"T":-43,"J":80,"C":16,"G":16,"O":16,"Q":16,"\u00d8":16,"V":-10,"W":-10,"A":111,"\u00c5":111,"S":16,"g":16,"b":16,"h":16,"k":16,"l":16,"i":55,"m":55,"n":55,"p":55,"r":55,"c":86,"d":86,"e":86,"o":86,"q":86,"\u00f8":86,"s":82,"t":16,"u":61,"v":31,"w":31,"y":31,"a":86,"\u00e6":86,"\u00e5":86,":":45,";":45,"-":51,"\u2013":51,"\u2014":51,")":-59,"]":-59,"}":-59,"\"":-27,"'":-27,"\u2019":-20,"\u201d":-20,",":141,".":141,"\u2026":141}},"W":{"d":"700,0r-342,0r-327,-1380r334,0r104,567v31,166,59,344,82,483r4,0v23,-150,55,-315,90,-485r117,-565r332,0r110,581v31,162,54,309,74,463r4,0v20,-154,51,-315,80,-479r113,-565r317,0r-356,1380r-338,0r-117,-594v-27,-139,-50,-268,-66,-426r-4,0v-25,156,-47,287,-80,426","w":1818,"k":{"\u00c6":111,"T":-43,"J":80,"C":16,"G":16,"O":16,"Q":16,"\u00d8":16,"V":-10,"W":-10,"A":111,"\u00c5":111,"S":16,"g":16,"b":16,"h":16,"k":16,"l":16,"i":55,"m":55,"n":55,"p":55,"r":55,"c":86,"d":86,"e":86,"o":86,"q":86,"\u00f8":86,"s":82,"t":16,"u":61,"v":31,"w":31,"y":31,"a":86,"\u00e6":86,"\u00e5":86,":":45,";":45,"-":51,"\u2013":51,"\u2014":51,")":-59,"]":-59,"}":-59,"\"":-27,"'":-27,"\u2019":-20,"\u201d":-20,",":141,".":141,"\u2026":141}},"X":{"d":"1223,0r-361,0r-125,-250v-51,-96,-84,-168,-123,-248r-4,0v-29,80,-63,152,-106,248r-115,250r-356,0r399,-698r-385,-682r359,0r120,252v41,84,72,151,105,229r4,0v33,-88,59,-149,94,-229r117,-252r356,0r-389,673","w":1255,"k":{"T":-12,"J":-20,"C":78,"G":78,"O":78,"Q":78,"\u00d8":78,"V":-18,"W":-18,"X":23,"Y":-25,"A":27,"\u00c6":27,"\u00c5":27,"i":6,"m":6,"n":6,"p":6,"r":6,"c":39,"d":39,"e":39,"o":39,"q":39,"\u00f8":39,"u":25,"v":76,"w":76,"y":76,"a":18,"\u00e6":18,"\u00e5":18,"-":37,"\u2013":37,"\u2014":37,"\"":-8,"'":-8,"\u2018":23,"\u201c":23}},"Y":{"d":"766,0r-311,0r0,-565r-437,-815r357,0r141,331v43,100,72,175,107,265r4,0v31,-86,63,-167,104,-265r139,-331r351,0r-455,805r0,575","w":1234,"k":{"J":141,"C":96,"G":96,"O":96,"Q":96,"\u00d8":96,"V":-39,"W":-39,"X":45,"Y":53,"A":188,"\u00c6":188,"\u00c5":188,"M":43,"S":59,"B":37,"D":37,"E":37,"F":37,"H":37,"I":37,"K":37,"L":37,"N":37,"P":37,"R":37,"g":166,"b":31,"h":31,"k":31,"l":31,"i":43,"m":43,"n":43,"p":43,"r":43,"c":223,"d":223,"e":223,"o":223,"q":223,"\u00f8":223,"s":131,"t":92,"u":147,"v":109,"w":109,"y":109,"x":115,"a":190,"\u00e6":190,"\u00e5":190,"z":100,":":102,";":102,"-":127,"\u2013":127,"\u2014":127,")":-68,"]":-68,"}":-68,"\"":-18,"'":-18,"\u2018":25,"\u201c":25,"\u2019":-6,"\u201d":-6,",":242,".":242,"\u2026":242}},"Z":{"d":"47,0r0,-168r658,-946r0,-8r-596,0r0,-258r1001,0r0,180r-643,934r0,8r653,0r0,258r-1073,0","w":1181,"k":{"J":-45,"C":45,"G":45,"O":45,"Q":45,"\u00d8":45,"X":10,"Y":-12,"A":-16,"\u00c6":-16,"\u00c5":-16,"c":18,"d":18,"e":18,"o":18,"q":18,"\u00f8":18,"u":23,"v":33,"w":33,"y":33,"a":-8,"\u00e6":-8,"\u00e5":-8,"-":16,"\u2013":16,"\u2014":16}},"[":{"d":"559,229r-420,0r0,-1634r420,0r0,172r-194,0r0,1290r194,0r0,172","w":643,"k":{"T":-45,"J":-20,"C":47,"G":47,"O":47,"Q":47,"\u00d8":47,"V":-55,"W":-55,"X":-10,"Y":-61,"A":39,"\u00c6":39,"\u00c5":39,"j":-102}},"\\":{"d":"643,82r-205,0r-413,-1485r206,0","w":675},"]":{"d":"86,-1405r418,0r0,1634r-418,0r0,-172r195,0r0,-1290r-195,0r0,-172","w":643},"^":{"d":"1135,-362r-224,0r-299,-730r-6,0r-301,730r-219,0r430,-969r189,0","w":1220},"_":{"d":"0,154r1024,0r0,102r-1024,0r0,-102","w":1024},"\u2018":{"d":"346,-866r-291,20v63,-201,152,-401,246,-555r188,-16v-63,174,-114,373,-143,551","w":532,"k":{"i":49,"T":-39,"J":176,"C":80,"G":80,"O":80,"Q":80,"\u00d8":80,"V":-25,"W":-25,"X":-14,"Y":-29,"Z":-6,"A":147,"\u00c6":147,"\u00c5":147,"M":12,"S":12,"f":27,"g":129,"b":-8,"h":-8,"k":-8,"l":-8,"j":6,"m":49,"n":49,"p":49,"r":49,"c":131,"d":131,"e":131,"o":131,"q":131,"\u00f8":131,"s":84,"u":63,"a":80,"\u00e6":80,"\u00e5":80,"z":16,"\u2018":133,"\u201c":133,",":313,".":313,"\u2026":313}},"a":{"d":"961,-592r0,348v0,96,4,189,14,244r-281,0r-18,-100r-6,0v-66,80,-168,123,-287,123v-203,0,-324,-148,-324,-308v0,-260,234,-385,588,-383r0,-14v0,-53,-28,-129,-182,-129v-102,0,-211,35,-277,76r-57,-201v70,-39,207,-88,389,-88v334,0,441,196,441,432xm657,-365r0,-108v-164,-2,-290,37,-290,158v0,80,52,118,122,118v78,0,142,-51,162,-114v4,-16,6,-36,6,-54","w":1081},"b":{"d":"125,-299r0,-1155r311,0r0,571r4,0v59,-86,164,-141,303,-141v240,0,416,199,414,506v0,360,-230,541,-459,541v-117,0,-229,-43,-301,-162r-4,0r-12,139r-264,0v4,-66,8,-186,8,-299xm436,-573r0,147v0,20,2,39,6,55v20,84,93,148,183,148v133,0,215,-103,215,-283v0,-156,-70,-278,-215,-278v-84,0,-163,63,-183,153v-4,18,-6,38,-6,58","w":1224,"k":{"T":100,"g":-6,"c":-6,"d":-6,"e":-6,"o":-6,"q":-6,"\u00f8":-6,"v":18,"w":18,"y":18,"x":49,"z":18,"-":-33,"\u2013":-33,"\u2014":-33,")":16,"]":16,"}":16,"\"":41,"'":41,"\u2019":53,"\u201d":53,",":70,".":70,"\u2026":70}},"c":{"d":"840,-256r37,231v-55,25,-160,48,-279,48v-324,0,-530,-200,-530,-515v0,-293,200,-532,573,-532v82,0,172,14,238,39r-50,231v-37,-16,-92,-30,-174,-30v-164,0,-270,116,-268,280v0,184,123,281,275,281v74,0,131,-13,178,-33","w":923,"k":{"T":29,"f":-14,"c":23,"d":23,"e":23,"o":23,"q":23,"\u00f8":23,"t":-33,"v":-31,"w":-31,"y":-31,"a":-8,"\u00e6":-8,"\u00e5":-8,"-":-25,"\u2013":-25,"\u2014":-25,"\"":-12,"'":-12,"\u2018":-63,"\u201c":-63,"\u2019":-33,"\u201d":-33,",":14,".":14,"\u2026":14}},"d":{"d":"784,-1454r312,0r0,1155v0,113,4,231,8,299r-277,0r-14,-147r-4,0v-63,113,-184,170,-313,170v-238,0,-428,-204,-428,-515v-2,-338,208,-532,448,-532v123,0,219,43,264,113r4,0r0,-543xm784,-446r0,-132v0,-16,-2,-39,-4,-55v-18,-84,-86,-153,-182,-153v-141,0,-215,126,-215,284v0,170,84,277,213,277v90,0,162,-62,180,-150v6,-23,8,-44,8,-71","w":1220,"k":{"\u2019":-8,"\u201d":-8,",":18,".":18,"\u2026":18}},"e":{"d":"1010,-401r-645,0v10,129,137,190,282,190v106,0,193,-14,277,-41r41,211v-102,41,-228,64,-363,64v-340,0,-534,-199,-534,-512v0,-254,157,-535,505,-535v324,0,447,252,447,500v0,53,-6,100,-10,123xm362,-614r369,0v0,-76,-33,-203,-176,-203v-131,0,-185,119,-193,203","w":1081,"k":{"T":84,"v":12,"w":12,"y":12,"x":25,"-":-61,"\u2013":-61,"\u2014":-61,"\"":6,"'":6,"\u2019":47,"\u201d":47,",":33,".":33,"\u2026":33}},"f":{"d":"473,0r-313,0r0,-772r-131,0r0,-229r131,0r0,-39v0,-121,37,-254,127,-336v78,-74,186,-101,276,-101v70,0,123,9,166,21r-12,239v-27,-8,-60,-14,-101,-14v-102,0,-145,80,-145,178r0,52r201,0r0,229r-199,0r0,772","w":698,"k":{"g":16,"c":20,"d":20,"e":20,"o":20,"q":20,"\u00f8":20,"s":12,"t":-31,":":-57,";":-57,"-":6,"\u2013":6,"\u2014":6,")":-147,"]":-147,"}":-147,"\"":-86,"'":-86,"\u2018":-84,"\u201c":-84,"\u2019":-129,"\u201d":-129,",":80,".":80,"\u2026":80}},"g":{"d":"1073,-705r0,560v0,193,-38,350,-151,450v-111,94,-261,123,-408,123v-131,0,-270,-27,-360,-78r61,-235v63,37,174,75,291,75v147,0,260,-80,260,-264r0,-65r-4,0v-59,84,-155,131,-270,131v-248,0,-424,-201,-424,-490v0,-322,208,-526,454,-526v137,0,224,59,275,141r4,0r10,-118r270,0v-4,63,-8,146,-8,296xm762,-446r0,-148v0,-20,-2,-41,-6,-57v-23,-82,-82,-137,-168,-137v-113,0,-205,102,-205,284v0,150,74,266,205,266v80,0,144,-53,164,-127v8,-23,10,-54,10,-81","w":1198,"k":{"T":70,"\u2019":43,"\u201d":43,",":35,".":35,"\u2026":35}},"h":{"d":"125,0r0,-1454r311,0r0,571r4,0v33,-43,74,-77,123,-102v47,-25,105,-39,162,-39v199,0,350,137,350,438r0,586r-311,0r0,-551v0,-131,-45,-221,-162,-221v-82,0,-133,53,-156,108v-8,20,-10,47,-10,70r0,594r-311,0","w":1200,"k":{"T":117,"t":12,"v":39,"w":39,"y":39,"\"":29,"'":29,"\u2019":53,"\u201d":53}},"i":{"d":"436,0r-311,0r0,-1001r311,0r0,1001xm281,-1438v100,0,163,68,165,158v0,86,-65,156,-167,156v-98,0,-164,-70,-162,-156v-2,-90,64,-158,164,-158","w":561,"k":{"\u2019":-12,"\u201d":-12}},"j":{"d":"-51,440r-31,-243v82,-6,145,-25,184,-66v45,-47,62,-127,62,-326r0,-806r313,0r0,880v0,219,-49,352,-141,438v-92,86,-237,123,-387,123xm322,-1438v100,0,161,68,163,158v0,86,-64,156,-168,156v-98,0,-161,-70,-161,-156v0,-90,64,-158,166,-158","w":595,"k":{"\u2019":-12,"\u201d":-12,",":20,".":20,"\u2026":20}},"k":{"d":"436,-1454r0,874r4,0v23,-41,47,-81,72,-120r203,-301r375,0r-359,405r410,596r-383,0r-242,-412r-80,99r0,313r-311,0r0,-1454r311,0","w":1110,"k":{"T":57,"g":29,"b":-23,"h":-23,"k":-23,"l":-23,"i":-20,"m":-20,"n":-20,"p":-20,"r":-20,"c":29,"d":29,"e":29,"o":29,"q":29,"\u00f8":29,"v":-6,"w":-6,"y":-6,"a":-10,"\u00e6":-10,"\u00e5":-10,":":-6,";":-6,"-":10,"\u2013":10,"\u2014":10,"\u2019":-29,"\u201d":-29,",":-8,".":-8,"\u2026":-8}},"l":{"d":"125,0r0,-1454r311,0r0,1454r-311,0","w":563,"k":{"\u2019":-8,"\u201d":-8,",":18,".":18,"\u2026":18}},"m":{"d":"125,0r0,-682v0,-125,-4,-231,-8,-319r262,0r14,135r6,0v43,-63,131,-158,303,-158v129,0,232,66,275,170r4,0v37,-53,82,-92,129,-121v55,-33,116,-49,190,-49v193,0,338,135,338,434r0,590r-303,0r0,-545v0,-145,-47,-229,-147,-229v-72,0,-124,49,-144,108v-8,23,-12,55,-12,80r0,586r-303,0r0,-561v0,-127,-45,-213,-143,-213v-80,0,-128,61,-146,112v-10,25,-12,53,-12,78r0,584r-303,0","w":1761,"k":{"T":117,"t":12,"v":39,"w":39,"y":39,"\"":29,"'":29,"\u2019":53,"\u201d":53}},"n":{"d":"125,0r0,-682v0,-125,-4,-231,-8,-319r270,0r14,137r7,0v41,-63,143,-160,309,-160v205,0,358,135,358,430r0,594r-311,0r0,-555v0,-129,-45,-217,-158,-217v-86,0,-137,60,-157,117v-8,20,-13,48,-13,77r0,578r-311,0","w":1200,"k":{"T":117,"t":12,"v":39,"w":39,"y":39,"\"":29,"'":29,"\u2019":53,"\u201d":53}},"o":{"d":"602,-1024v307,0,512,211,512,512v0,367,-260,535,-528,535v-293,0,-518,-193,-518,-517v0,-324,212,-530,534,-530xm594,-803v-150,0,-205,154,-205,301v0,172,72,301,205,301v121,0,199,-121,199,-301v0,-150,-58,-301,-199,-301","w":1181,"k":{"T":100,"g":-6,"c":-6,"d":-6,"e":-6,"o":-6,"q":-6,"\u00f8":-6,"v":18,"w":18,"y":18,"x":49,"z":18,"-":-33,"\u2013":-33,"\u2014":-33,")":16,"]":16,"}":16,"\"":41,"'":41,"\u2019":53,"\u201d":53,",":70,".":70,"\u2026":70}},"p":{"d":"125,406r0,-1072v0,-131,-4,-243,-8,-335r270,0r14,139r5,0v74,-106,188,-162,333,-162v219,0,416,191,416,510v0,365,-232,537,-455,537v-121,0,-215,-49,-260,-115r-4,0r0,498r-311,0xm436,-567r0,137v0,25,2,47,6,65v20,84,93,148,183,148v135,0,215,-113,215,-283v0,-160,-72,-280,-211,-280v-88,0,-167,65,-187,157v-4,16,-6,38,-6,56","w":1224,"k":{"T":100,"g":-6,"c":-6,"d":-6,"e":-6,"o":-6,"q":-6,"\u00f8":-6,"v":18,"w":18,"y":18,"x":49,"z":18,"-":-33,"\u2013":-33,"\u2014":-33,")":16,"]":16,"}":16,"\"":41,"'":41,"\u2019":53,"\u201d":53,",":70,".":70,"\u2026":70}},"q":{"d":"784,406r0,-531r-4,0v-63,94,-164,148,-297,148v-217,0,-415,-191,-415,-510v0,-358,229,-537,442,-537v129,0,223,47,278,139r5,0r8,-116r301,0v-2,96,-6,197,-6,301r0,1106r-312,0xm784,-432r0,-150v0,-16,-2,-35,-6,-51v-16,-80,-84,-149,-178,-149v-143,0,-215,120,-215,282v0,168,80,277,211,277v88,0,160,-60,180,-142v6,-20,8,-47,8,-67","w":1218,"k":{"T":76,"\u2019":43,"\u201d":43,",":14,".":14,"\u2026":14}},"r":{"d":"125,0r0,-672v0,-147,-4,-243,-8,-329r268,0r10,184r8,0v51,-145,175,-207,271,-207v29,0,42,0,65,4r0,295v-23,-6,-49,-10,-84,-10v-115,0,-193,61,-213,157v-4,20,-6,45,-6,70r0,508r-311,0","w":778,"k":{"T":41,"f":-55,"g":16,"b":6,"h":6,"k":6,"l":6,"c":16,"d":16,"e":16,"o":16,"q":16,"\u00f8":16,"t":-43,"u":6,"v":-37,"w":-37,"y":-37,"x":-27,"a":23,"\u00e6":23,"\u00e5":23,"z":-14,":":8,";":8,"\u2018":-23,"\u201c":-23,"\u2019":-37,"\u201d":-37,",":133,".":133,"\u2026":133}},"s":{"d":"68,-49r55,-223v57,35,176,75,268,75v94,0,133,-33,133,-84v0,-51,-30,-75,-147,-114v-207,-70,-287,-182,-285,-299v0,-188,160,-330,408,-330v117,0,221,26,282,57r-55,215v-45,-25,-131,-57,-217,-57v-76,0,-119,31,-119,82v0,47,39,72,162,115v190,66,270,162,272,309v0,186,-147,326,-434,326v-131,0,-247,-31,-323,-72","w":888,"k":{"T":72,"\u2019":25,"\u201d":25,",":20,".":20,"\u2026":20}},"t":{"d":"168,-1190r305,-84r0,273r223,0r0,229r-223,0r0,362v0,121,29,177,123,177v43,0,61,-3,92,-9r2,236v-41,16,-115,29,-203,29v-100,0,-184,-38,-233,-89v-57,-59,-86,-155,-86,-296r0,-410r-133,0r0,-229r133,0r0,-189","w":751,"k":{"g":10,"c":10,"d":10,"e":10,"o":10,"q":10,"\u00f8":10,"v":-10,"w":-10,"y":-10,"\u2018":-14,"\u201c":-14,"\u2019":-23,"\u201d":-23,",":16,".":16,"\u2026":16}},"u":{"d":"1069,-1001r0,679v0,131,4,238,8,322r-270,0r-14,-141r-7,0v-39,61,-133,164,-313,164v-203,0,-352,-128,-352,-437r0,-587r313,0r0,538v0,145,47,234,156,234v86,0,135,-60,155,-109v8,-18,11,-43,11,-68r0,-595r313,0","w":1193,"k":{"T":76,"\u2019":43,"\u201d":43,",":14,".":14,"\u2026":14}},"v":{"d":"18,-1001r338,0r136,464v25,84,43,164,57,244r6,0v16,-82,32,-158,55,-244r129,-464r328,0r-373,1001r-311,0","w":1085,"k":{"T":76,"g":29,"c":31,"d":31,"e":31,"o":31,"q":31,"\u00f8":31,"s":33,"v":-39,"w":-39,"y":-39,"a":14,"\u00e6":14,"\u00e5":14,":":-10,";":-10,"-":14,"\u2013":14,"\u2014":14,"\u2018":-51,"\u201c":-51,"\u2019":-41,"\u201d":-41,",":98,".":98,"\u2026":98}},"w":{"d":"23,-1001r317,0r80,409v20,102,41,215,57,330r4,0v20,-115,49,-230,74,-328r107,-411r245,0r101,399v27,113,53,225,73,340r4,0v14,-115,35,-227,58,-342r86,-397r305,0r-307,1001r-293,0r-94,-352v-25,-98,-44,-187,-64,-312r-4,0v-18,125,-38,220,-65,312r-101,352r-293,0","w":1554,"k":{"T":76,"g":29,"c":31,"d":31,"e":31,"o":31,"q":31,"\u00f8":31,"s":33,"v":-39,"w":-39,"y":-39,"a":14,"\u00e6":14,"\u00e5":14,":":-10,";":-10,"-":14,"\u2013":14,"\u2014":14,"\u2018":-51,"\u201c":-51,"\u2019":-41,"\u201d":-41,",":98,".":98,"\u2026":98}},"x":{"d":"14,-1001r348,0r99,165r82,150r4,0v27,-53,51,-105,78,-154r88,-161r338,0r-330,477r334,524r-353,0r-100,-180v-29,-49,-53,-101,-78,-152r-6,0v-25,53,-51,103,-76,152r-94,180r-342,0r340,-510","w":1062,"k":{"T":59,"c":45,"d":45,"e":45,"o":45,"q":45,"\u00f8":45,"s":16,"t":-27,"v":-39,"w":-39,"y":-39,"-":8,"\u2013":8,"\u2014":8,"\u2019":-29,"\u201d":-29}},"y":{"d":"12,-1001r346,0r150,491v16,59,37,133,49,186r6,0v14,-53,31,-129,45,-186r123,-491r334,0r-234,659v-143,397,-239,557,-352,657v-109,94,-223,128,-301,138r-65,-265v39,-6,88,-24,135,-53v47,-25,98,-74,129,-125v10,-14,16,-31,16,-45v0,-10,-2,-26,-14,-51","w":1071,"k":{"T":76,"g":29,"c":31,"d":31,"e":31,"o":31,"q":31,"\u00f8":31,"s":33,"v":-39,"w":-39,"y":-39,"a":14,"\u00e6":14,"\u00e5":14,":":-10,";":-10,"-":14,"\u2013":14,"\u2014":14,"\u2018":-51,"\u201c":-51,"\u2019":-41,"\u201d":-41,",":98,".":98,"\u2026":98}},"z":{"d":"45,0r0,-178r315,-395v57,-68,103,-118,160,-179r0,-4r-440,0r0,-245r819,0r0,186r-301,379v-55,66,-107,129,-164,184r0,4r481,0r0,248r-870,0","w":960,"k":{"T":59,"c":14,"d":14,"e":14,"o":14,"q":14,"\u00f8":14,"v":-18,"w":-18,"y":-18,"\u2019":-35,"\u201d":-35}},"{":{"d":"61,-510r0,-158v141,-4,156,-78,156,-139v0,-51,-6,-105,-12,-160v-6,-55,-10,-110,-10,-161v0,-193,121,-277,311,-277r72,0r0,174r-37,0v-92,2,-125,56,-125,146v0,35,6,73,10,114v4,43,10,91,10,142v2,154,-61,212,-174,237r0,4v113,25,176,84,174,240v0,53,-6,100,-10,143v-4,41,-10,80,-10,115v0,90,31,145,125,147r37,0r0,172r-74,0v-182,0,-309,-73,-309,-278v0,-51,4,-107,10,-162v6,-55,12,-109,12,-160v0,-57,-15,-135,-156,-139","w":643,"k":{"T":-45,"J":-20,"C":47,"G":47,"O":47,"Q":47,"\u00d8":47,"V":-55,"W":-55,"X":-10,"Y":-61,"A":39,"\u00c6":39,"\u00c5":39,"j":-102}},"|":{"d":"180,-1536r217,0r0,2048r-217,0r0,-2048","w":579},"}":{"d":"582,-668r0,158v-139,4,-156,82,-156,139v0,51,6,105,12,160v6,55,13,111,13,162v0,205,-128,278,-312,278r-73,0r0,-172r36,0v94,-2,125,-57,125,-147v0,-35,-4,-74,-10,-115v-4,-43,-10,-90,-10,-143v-2,-156,61,-215,176,-240r0,-4v-115,-25,-178,-83,-176,-237v0,-51,6,-99,10,-142v6,-41,10,-79,10,-114v0,-90,-33,-144,-125,-146r-36,0r0,-174r71,0v193,0,314,84,314,277v0,51,-7,106,-13,161v-6,55,-12,109,-12,160v0,61,17,135,156,139","w":643},"~":{"d":"283,-393r-195,0v-2,-274,119,-383,285,-383v100,0,169,32,286,98v90,49,146,80,195,80v49,0,78,-43,84,-166r195,0v12,293,-117,387,-273,387v-98,0,-176,-37,-287,-98v-90,-53,-145,-86,-194,-86v-51,0,-88,35,-96,168","w":1220},"'":{"d":"72,-1417r276,0r-47,555r-182,0","w":419,"k":{"T":-18,"J":119,"C":18,"G":18,"O":18,"Q":18,"\u00d8":18,"V":-18,"W":-18,"X":-8,"Y":-16,"A":94,"\u00c6":94,"\u00c5":94,"f":-51,"g":39,"c":27,"d":27,"e":27,"o":27,"q":27,"\u00f8":27,"t":-45,"v":-12,"w":-12,"y":-12,",":256,".":256,"\u2026":256}},"\u201c":{"d":"344,-866r-291,20v63,-201,152,-401,246,-555r188,-16v-63,174,-114,373,-143,551xm743,-866r-290,20v63,-201,151,-401,245,-555r189,-16v-61,174,-115,373,-144,551","w":929,"k":{"i":49,"T":-39,"J":176,"C":80,"G":80,"O":80,"Q":80,"\u00d8":80,"V":-25,"W":-25,"X":-14,"Y":-29,"Z":-6,"A":147,"\u00c6":147,"\u00c5":147,"M":12,"S":12,"f":27,"g":129,"b":-8,"h":-8,"k":-8,"l":-8,"j":6,"m":49,"n":49,"p":49,"r":49,"c":131,"d":131,"e":131,"o":131,"q":131,"\u00f8":131,"s":84,"u":63,"a":80,"\u00e6":80,"\u00e5":80,"z":16,"\u2018":133,"\u201c":133,",":313,".":313,"\u2026":313}},"\u2013":{"d":"61,-616r902,0r0,192r-902,0r0,-192","w":1024,"k":{"T":113,"J":12,"C":-25,"G":-25,"O":-25,"Q":-25,"\u00d8":-25,"V":49,"W":49,"X":35,"Y":123,"A":10,"\u00c6":10,"\u00c5":10,"g":-8,"c":-33,"d":-33,"e":-33,"o":-33,"q":-33,"\u00f8":-33}},"\u201d":{"d":"195,-1399r290,-18v-63,199,-153,399,-245,553r-189,18v61,-176,115,-373,144,-553xm594,-1399r291,-18v-63,199,-152,399,-246,553r-188,18v61,-176,114,-373,143,-553","w":929,"k":{"i":106,"T":-35,"J":184,"C":72,"G":72,"O":72,"Q":72,"\u00d8":72,"V":-29,"W":-29,"X":-10,"Y":-25,"A":176,"\u00c6":176,"\u00c5":176,"M":18,"S":35,"g":127,"b":12,"h":12,"k":12,"l":12,"m":106,"n":106,"p":106,"r":106,"c":190,"d":190,"e":190,"o":190,"q":190,"\u00f8":190,"s":190,"t":43,"v":39,"w":39,"y":39,"a":70,"\u00e6":70,"\u00e5":70,"\u2019":133,"\u201d":133,",":406,".":406,"\u2026":406," ":139}},"\u2026":{"d":"340,23r-2,0v-106,0,-180,-80,-180,-189v0,-111,75,-190,184,-190v106,0,182,77,182,190v0,109,-73,189,-184,189xm1024,23r-2,0v-106,0,-182,-80,-182,-189v0,-111,78,-190,184,-190v109,0,182,77,184,190v0,109,-73,189,-184,189xm1708,23r-2,0v-106,0,-182,-80,-182,-189v0,-111,78,-190,184,-190v109,0,182,77,184,190v0,109,-73,189,-184,189","w":2048,"k":{"\"":250,"'":250,"\u2018":256,"\u201c":256,"\u2019":266,"\u201d":266}},"`":{"d":"8,-1438r287,0r176,312r-213,0","w":614},"\u2014":{"d":"61,-616r1926,0r0,192r-1926,0r0,-192","w":2048,"k":{"T":113,"J":12,"C":-25,"G":-25,"O":-25,"Q":-25,"\u00d8":-25,"V":49,"W":49,"X":35,"Y":123,"A":10,"\u00c6":10,"\u00c5":10,"g":-8,"c":-33,"d":-33,"e":-33,"o":-33,"q":-33,"\u00f8":-33}},"\u00c6":{"d":"326,0r-322,0r590,-1380r1051,0r0,256r-568,0r37,293r522,0r0,253r-481,0r41,322r524,0r0,256r-792,0r-49,-377r-402,0xm569,-627r275,0r-41,-334v-8,-61,-17,-132,-25,-200r-6,0r-70,203","w":1777,"k":{"T":-10,"J":-45,"V":-14,"W":-14,"f":10,"g":14,"b":-8,"h":-8,"k":-8,"l":-8,"j":10,"c":8,"d":8,"e":8,"o":8,"q":8,"\u00f8":8,"s":-8,"t":12,"u":20,"v":25,"w":25,"y":25,"z":-12,",":16,".":16,"\u2026":16}},"\u00d8":{"d":"315,135r-168,-131r115,-174v-123,-129,-190,-313,-190,-518v0,-406,266,-715,665,-715v113,0,217,25,305,72r113,-166r178,119r-116,172v121,129,182,313,182,508v0,451,-281,721,-664,721v-109,0,-209,-25,-295,-70xm440,-438r457,-670v-45,-33,-99,-51,-160,-51v-221,0,-352,197,-352,469v0,94,16,170,53,252r2,0xm1034,-930r-450,662v41,31,90,47,151,47v217,0,350,-192,350,-473v0,-76,-14,-154,-45,-234","w":1468,"k":{"T":57,"V":14,"W":14,"X":68,"Y":76,"A":33,"\u00c6":33,"\u00c5":33,"f":-20,"g":-8,"b":-6,"h":-6,"k":-6,"l":-6,"i":-8,"m":-8,"n":-8,"p":-8,"r":-8,"t":-27,"u":-10,"v":-20,"w":-20,"y":-20,"x":25,"z":6,"-":-25,"\u2013":-25,"\u2014":-25,")":39,"]":39,"}":39,"\u2019":-12,"\u201d":-12,",":82,".":82,"\u2026":82}},"\u00e6":{"d":"1577,-416r-635,0v6,127,112,207,270,207v125,0,203,-20,281,-53r43,209v-111,57,-244,76,-369,76v-166,0,-313,-64,-381,-179r-8,0v-78,106,-198,179,-372,179v-219,0,-347,-144,-347,-314v0,-246,238,-370,592,-368r0,-29v0,-29,-32,-121,-190,-121v-104,0,-207,39,-268,76r-62,-197v74,-41,204,-94,354,-94v162,0,271,58,330,162r6,0v78,-102,195,-162,342,-162v297,0,420,254,420,498v0,39,-6,85,-6,110xm659,-365r0,-104v-166,-2,-294,43,-294,156v0,78,59,116,129,116v78,0,132,-49,157,-104v8,-16,8,-39,8,-64xm940,-625r356,0v2,-66,-27,-196,-170,-196v-131,0,-184,122,-186,196","w":1644,"k":{"T":84,"v":12,"w":12,"y":12,"x":25,"-":-61,"\u2013":-61,"\u2014":-61,"\"":6,"'":6,"\u2019":47,"\u201d":47,",":33,".":33,"\u2026":33}},"\u00f8":{"d":"590,-1024r2,0v88,0,172,16,242,53r96,-141r108,76r-92,137v106,92,168,227,168,395v0,356,-262,527,-522,527v-86,0,-168,-17,-238,-54r-100,146r-102,-82r90,-133v-109,-88,-174,-224,-174,-400v0,-315,213,-524,522,-524xm408,-340r292,-426v-31,-23,-65,-37,-110,-37v-162,0,-223,162,-223,301v0,55,9,115,36,160xm776,-653r-291,415v29,27,66,37,105,37v139,0,223,-119,223,-295v0,-49,-8,-108,-31,-155","w":1181,"k":{"T":100,"g":-6,"c":-6,"d":-6,"e":-6,"o":-6,"q":-6,"\u00f8":-6,"v":18,"w":18,"y":18,"x":49,"z":18,"-":-33,"\u2013":-33,"\u2014":-33,")":16,"]":16,"}":16,"\"":41,"'":41,"\u2019":53,"\u201d":53,",":70,".":70,"\u2026":70}},"\u2122":{"d":"55,-1380r488,0r0,137r-160,0r0,422r-170,0r0,-422r-158,0r0,-137xm1309,-821r-164,0r-10,-246v-2,-61,0,-131,-2,-217r-11,0v-16,76,-33,156,-47,217r-57,236r-162,0r-51,-238v-8,-53,-23,-141,-35,-215r-10,0v0,76,-2,154,-4,217r-13,246r-159,0r34,-559r263,0r37,137v10,43,18,88,32,178r2,0v14,-68,27,-123,41,-178r41,-137r244,0","w":1331},"\u00d7":{"d":"82,-940r133,-137r395,403r396,-403r133,137r-394,401r394,402r-135,137r-394,-401r-393,401r-135,-137r393,-402","w":1220},"\u00c5":{"d":"852,-354r-395,0r-99,354r-323,0r422,-1380r409,0r428,1380r-336,0xm502,-588r305,0r-86,-293v-25,-82,-50,-184,-70,-266r-4,0v-20,82,-40,186,-63,266xm666,-1837r2,0v154,0,231,88,231,201v0,113,-86,198,-233,198v-150,0,-236,-87,-236,-196v0,-111,84,-203,236,-203xm664,-1733r-2,0v-57,0,-89,48,-89,99v0,47,34,92,91,92v57,0,90,-41,90,-94v0,-51,-33,-97,-90,-97","w":1343,"k":{"T":170,"J":-31,"C":51,"G":51,"O":51,"Q":51,"\u00d8":51,"U":72,"V":121,"W":121,"X":49,"Y":195,"Z":-12,"f":27,"g":29,"b":12,"h":12,"k":12,"l":12,"j":12,"i":12,"m":12,"n":12,"p":12,"r":12,"c":29,"d":29,"e":29,"o":29,"q":29,"\u00f8":29,"s":6,"t":41,"u":31,"v":63,"w":63,"y":63,"x":6,"-":16,"\u2013":16,"\u2014":16,")":37,"]":37,"}":37,"\"":94,"'":94,"\u2018":90,"\u201c":90,"\u2019":133,"\u201d":133}},"\u00e5":{"d":"545,-1104v-145,0,-238,-85,-238,-196v0,-115,86,-207,240,-207v150,0,229,87,229,204v0,113,-90,199,-231,199xm543,-1206v61,0,94,-46,94,-99v0,-51,-33,-100,-96,-100v-59,0,-90,51,-90,102v0,47,35,97,92,97xm961,-592r0,348v0,96,4,189,14,244r-281,0r-18,-100r-6,0v-66,80,-168,123,-287,123v-203,0,-324,-148,-324,-308v0,-260,234,-385,588,-383r0,-14v0,-53,-28,-129,-182,-129v-102,0,-211,35,-277,76r-57,-201v70,-39,207,-88,389,-88v334,0,441,196,441,432xm657,-365r0,-108v-164,-2,-290,37,-290,158v0,80,52,118,122,118v78,0,142,-51,162,-114v4,-16,6,-36,6,-54","w":1081},"\u00a0":{"w":413,"k":{"T":80,"V":76,"W":76,"Y":82,"\u2018":156,"\u201c":156}}}});

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2009-10-02 13:47:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html	2009-12-04 14:22:48 +0000
@@ -47,13 +47,6 @@
         <script type="text/javascript" src="script/config.js"></script>
         <script type="text/javascript" src="script/index.js"></script>
 		
-		<!-- Font -->
-		<script type="text/javascript" src="font/cufon-yui.js"></script>
-        <script type="text/javascript" src="font/mp_700.font.js"></script>
-		<script type="text/javascript">
-			Cufon('h1');
-		</script>
-
 </head>
 
 <body>