Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provides right fallback fonts for text layer

Browse Source
This commit is contained in:
Yury Delendik 2012-09-14 10:58:33 -07:00
parent 53c66f8a54
commit ac7b6aeff4
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/canvas.js
View File

@ -596,8 +596,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
(fontObj.bold ? 'bold' : 'normal'); (fontObj.bold ? 'bold' : 'normal');
var italic = fontObj.italic ? 'italic' : 'normal'; var italic = fontObj.italic ? 'italic' : 'normal';
var serif = fontObj.isSerifFont ? 'serif' : 'sans-serif'; var typeface = '"' + name + '", ' + fontObj.fallbackName;
var typeface = '"' + name + '", ' + serif;
// Some font backends cannot handle fonts below certain size. // Some font backends cannot handle fonts below certain size.
// Keeping the font at minimal size and using the fontSizeScale to change // Keeping the font at minimal size and using the fontSizeScale to change
@ -792,7 +791,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
} }
if (textSelection) if (textSelection)
this.textLayer.appendText(text, font.loadedName, fontSize); this.textLayer.appendText(text, font.fallbackName, fontSize);
return text; return text;
}, },
@ -856,7 +855,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
} }
if (textSelection) if (textSelection)
this.textLayer.appendText(text, font.loadedName, fontSize); this.textLayer.appendText(text, font.fallbackName, fontSize);
}, },
nextLineShowText: function CanvasGraphics_nextLineShowText(text) { nextLineShowText: function CanvasGraphics_nextLineShowText(text) {
this.nextLine(); this.nextLine();

10
src/fonts.js
View File

@ -1522,17 +1522,13 @@ var Font = (function FontClosure() {
names = names.split(/[-,_]/g)[0]; names = names.split(/[-,_]/g)[0];
this.isSerifFont = !!(properties.flags & FontFlags.Serif); this.isSerifFont = !!(properties.flags & FontFlags.Serif);
this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic); this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
this.isMonospace = !!(properties.flags & FontFlags.FixedPitch);
var type = properties.type; var type = properties.type;
this.type = type; this.type = type;
// If the font is to be ignored, register it like an already loaded font this.fallbackName = this.isMonospace ? 'monospace' :
// to avoid the cost of waiting for it be be loaded by the platform. this.isSerifFont ? 'serif' : 'sans-serif';
if (properties.ignore) {
this.loadedName = this.isSerifFont ? 'serif' : 'sans-serif';
this.loading = false;
return;
}
this.differences = properties.differences; this.differences = properties.differences;
this.widths = properties.widths; this.widths = properties.widths;

2
test/driver.js
View File

@ -181,7 +181,7 @@ SimpleTextLayerBuilder.prototype = {
ctx.fill(); ctx.fill();
var textContent = bidi(text, -1); var textContent = bidi(text, -1);
ctx.font = fontHeight + 'px sans-serif'; ctx.font = fontHeight + 'px ' + fontName;
ctx.fillStyle = 'black'; ctx.fillStyle = 'black';
ctx.fillText(textContent, text.geom.x, text.geom.y); ctx.fillText(textContent, text.geom.x, text.geom.y);
} }

4
web/viewer.js
View File

@ -1846,7 +1846,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
var textDiv = textDivs.shift(); var textDiv = textDivs.shift();
textLayerDiv.appendChild(textDiv); textLayerDiv.appendChild(textDiv);
ctx.font = textDiv.style.fontSize + ' sans-serif'; ctx.font = textDiv.style.fontSize + ' ' + textDiv.style.fontFamily;
var width = ctx.measureText(textDiv.textContent).width; var width = ctx.measureText(textDiv.textContent).width;
if (width > 0) { if (width > 0) {
@ -1888,9 +1888,9 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
// vScale and hScale already contain the scaling to pixel units // vScale and hScale already contain the scaling to pixel units
var fontHeight = fontSize * text.geom.vScale; var fontHeight = fontSize * text.geom.vScale;
textDiv.dataset.canvasWidth = text.canvasWidth * text.geom.hScale; textDiv.dataset.canvasWidth = text.canvasWidth * text.geom.hScale;
textDiv.dataset.fontName = fontName;
textDiv.style.fontSize = fontHeight + 'px'; textDiv.style.fontSize = fontHeight + 'px';
textDiv.style.fontFamily = fontName;
textDiv.style.left = text.geom.x + 'px'; textDiv.style.left = text.geom.x + 'px';
textDiv.style.top = (text.geom.y - fontHeight) + 'px'; textDiv.style.top = (text.geom.y - fontHeight) + 'px';
textDiv.textContent = PDFJS.bidi(text, -1); textDiv.textContent = PDFJS.bidi(text, -1);