Merge branch 'issue684' into develop. Issue #684.
This commit is contained in:
commit
f01d347bb1
|
@ -1356,24 +1356,16 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (variant.remap && variant.remap[n]) {
|
if (variant.remap && variant.remap[n]) {
|
||||||
if (variant.remap[n] instanceof Array) {
|
|
||||||
var remap = variant.remap[n];
|
|
||||||
n = remap[0]; variant = this.FONTDATA.VARIANT[remap[1]];
|
|
||||||
} else if (typeof(variant.remap[n]) === "string") {
|
|
||||||
text = variant.remap[n]+text.substr(i+1);
|
|
||||||
i = 0; m = text.length; n = text.charCodeAt(0);
|
|
||||||
} else {
|
|
||||||
n = variant.remap[n];
|
n = variant.remap[n];
|
||||||
if (variant.remap.variant) {variant = this.FONTDATA.VARIANT[variant.remap.variant]}
|
if (variant.remap.variant) {variant = this.FONTDATA.VARIANT[variant.remap.variant]}
|
||||||
}
|
} else if (this.FONTDATA.REMAP[n] && !variant.noRemap) {
|
||||||
}
|
|
||||||
if (this.FONTDATA.REMAP[n] && !variant.noRemap) {
|
|
||||||
n = this.FONTDATA.REMAP[n];
|
n = this.FONTDATA.REMAP[n];
|
||||||
|
}
|
||||||
if (n instanceof Array) {variant = this.FONTDATA.VARIANT[n[1]]; n = n[0]}
|
if (n instanceof Array) {variant = this.FONTDATA.VARIANT[n[1]]; n = n[0]}
|
||||||
if (typeof(n) === "string") {
|
if (typeof(n) === "string") {
|
||||||
text = n+text.substr(i+1);
|
text = n+text.substr(i+1);
|
||||||
i = 0; m = text.length; n = n.charCodeAt(0);
|
m = text.length; i = -1;
|
||||||
}
|
continue;
|
||||||
}
|
}
|
||||||
font = this.lookupChar(variant,n); c = font[n];
|
font = this.lookupChar(variant,n); c = font[n];
|
||||||
if (force || (!this.checkFont(font,SPAN.style) && !c[5].img)) {
|
if (force || (!this.checkFont(font,SPAN.style) && !c[5].img)) {
|
||||||
|
|
|
@ -558,25 +558,16 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (variant.remap && variant.remap[n]) {
|
if (variant.remap && variant.remap[n]) {
|
||||||
if (variant.remap[n] instanceof Array) {
|
|
||||||
var remap = variant.remap[n];
|
|
||||||
n = remap[0]; variant = this.FONTDATA.VARIANT[remap[1]];
|
|
||||||
} else if (typeof(variant.remap[n]) === "string") {
|
|
||||||
text = variant.remap[n]+text.substr(i+1);
|
|
||||||
i = 0; m = text.length; n = text.charCodeAt(0);
|
|
||||||
} else {
|
|
||||||
n = variant.remap[n];
|
n = variant.remap[n];
|
||||||
if (variant.remap.variant) {variant = this.FONTDATA.VARIANT[variant.remap.variant]}
|
if (variant.remap.variant) {variant = this.FONTDATA.VARIANT[variant.remap.variant]}
|
||||||
}
|
} else if (this.FONTDATA.REMAP[n] && !variant.noRemap) {
|
||||||
}
|
|
||||||
if (this.FONTDATA.REMAP[n] && !variant.noRemap) {
|
|
||||||
n = this.FONTDATA.REMAP[n];
|
n = this.FONTDATA.REMAP[n];
|
||||||
|
}
|
||||||
if (n instanceof Array) {variant = this.FONTDATA.VARIANT[n[1]]; n = n[0]}
|
if (n instanceof Array) {variant = this.FONTDATA.VARIANT[n[1]]; n = n[0]}
|
||||||
if (typeof(n) === "string") {
|
if (typeof(n) === "string") {
|
||||||
text = n+text.substr(i+1);
|
text = n+text.substr(i+1);
|
||||||
i = 0; m = text.length;
|
m = text.length; i = -1;
|
||||||
n = n.charCodeAt(0);
|
continue;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
font = this.lookupChar(variant,n); c = font[n];
|
font = this.lookupChar(variant,n); c = font[n];
|
||||||
if (c) {
|
if (c) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user