TrueType encoding for files without font data
This commit is contained in:
parent
7f038536fb
commit
38372ee2f2
12
src/fonts.js
12
src/fonts.js
@ -766,6 +766,7 @@ var Font = (function Font() {
|
|||||||
this.defaultWidth = properties.defaultWidth;
|
this.defaultWidth = properties.defaultWidth;
|
||||||
this.composite = properties.composite;
|
this.composite = properties.composite;
|
||||||
this.toUnicode = properties.toUnicode;
|
this.toUnicode = properties.toUnicode;
|
||||||
|
this.hasEncoding = properties.hasEncoding;
|
||||||
|
|
||||||
this.fontMatrix = properties.fontMatrix;
|
this.fontMatrix = properties.fontMatrix;
|
||||||
if (properties.type == 'Type3')
|
if (properties.type == 'Type3')
|
||||||
@ -827,7 +828,6 @@ var Font = (function Font() {
|
|||||||
this.fontMatrix = properties.fontMatrix;
|
this.fontMatrix = properties.fontMatrix;
|
||||||
this.encoding = properties.baseEncoding;
|
this.encoding = properties.baseEncoding;
|
||||||
this.hasShortCmap = properties.hasShortCmap;
|
this.hasShortCmap = properties.hasShortCmap;
|
||||||
this.hasEncoding = properties.hasEncoding;
|
|
||||||
this.loadedName = getUniqueName();
|
this.loadedName = getUniqueName();
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
};
|
};
|
||||||
@ -2006,10 +2006,14 @@ var Font = (function Font() {
|
|||||||
var glyphName = this.differences[charcode] || this.encoding[charcode];
|
var glyphName = this.differences[charcode] || this.encoding[charcode];
|
||||||
if (!glyphName)
|
if (!glyphName)
|
||||||
glyphName = Encodings.StandardEncoding[charcode];
|
glyphName = Encodings.StandardEncoding[charcode];
|
||||||
|
if (!isNum(width))
|
||||||
|
width = this.widths[glyphName];
|
||||||
|
if (this.noUnicodeAdaptation) {
|
||||||
|
unicode = GlyphsUnicode[glyphName] || charcode;
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (!this.hasEncoding) {
|
if (!this.hasEncoding) {
|
||||||
width = this.widths[charcode] || this.widths[glyphName];
|
unicode = adaptUnicode(charcode);
|
||||||
unicode = this.noUnicodeAdaptation ?
|
|
||||||
charcode : adaptUnicode(charcode);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (this.hasShortCmap) {
|
if (this.hasShortCmap) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user