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

Takes ascent/descent in account in the text layer

Browse Source
This commit is contained in:
Yury Delendik 2014-01-08 13:50:52 -06:00
parent 4d01ff4079
commit 0131101275
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/evaluator.js
View File

@ -919,10 +919,13 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
if (chunk !== '') { if (chunk !== '') {
var bidiText = PDFJS.bidi(chunk, -1, font.vertical); var bidiText = PDFJS.bidi(chunk, -1, font.vertical);
var renderParams = textState.calcRenderParams(); var renderParams = textState.calcRenderParams();
bidiText.x = renderParams.renderMatrix[4] - (textState.fontSize * var fontHeight = textState.fontSize * renderParams.vScale;
renderParams.vScale * Math.sin(renderParams.angle)); var fontAscent = font.ascent ? font.ascent * fontHeight :
bidiText.y = renderParams.renderMatrix[5] + (textState.fontSize * font.descent ? (1 + font.descent) * fontHeight : fontHeight;
renderParams.vScale * Math.cos(renderParams.angle)); bidiText.x = renderParams.renderMatrix[4] - (fontAscent *
Math.sin(renderParams.angle));
bidiText.y = renderParams.renderMatrix[5] + (fontAscent *
Math.cos(renderParams.angle));
if (bidiText.dir == 'ttb') { if (bidiText.dir == 'ttb') {
bidiText.x += renderParams.vScale / 2; bidiText.x += renderParams.vScale / 2;
bidiText.y -= renderParams.vScale; bidiText.y -= renderParams.vScale;

2
src/core/fonts.js
View File

@ -2183,6 +2183,8 @@ var Font = (function FontClosure() {
this.wideChars = properties.wideChars; this.wideChars = properties.wideChars;
this.hasEncoding = properties.hasEncoding; this.hasEncoding = properties.hasEncoding;
this.cmap = properties.cmap; this.cmap = properties.cmap;
this.ascent = properties.ascent / PDF_GLYPH_SPACE_UNITS;
this.descent = properties.descent / PDF_GLYPH_SPACE_UNITS;
this.fontMatrix = properties.fontMatrix; this.fontMatrix = properties.fontMatrix;
if (properties.type == 'Type3') { if (properties.type == 'Type3') {

2
src/display/canvas.js
View File

@ -954,6 +954,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
geometry.fontName = font.loadedName; geometry.fontName = font.loadedName;
geometry.fontFamily = font.fallbackName; geometry.fontFamily = font.fallbackName;
geometry.fontSize = this.current.fontSize; geometry.fontSize = this.current.fontSize;
geometry.ascent = font.ascent;
geometry.descent = font.descent;
return geometry; return geometry;
}, },

6
test/driver.js
View File

@ -197,12 +197,14 @@ SimpleTextLayerBuilder.prototype = {
var ctx = this.ctx, viewport = this.viewport; var ctx = this.ctx, viewport = this.viewport;
// vScale and hScale already contain the scaling to pixel units // vScale and hScale already contain the scaling to pixel units
var fontHeight = geom.fontSize * Math.abs(geom.vScale); var fontHeight = geom.fontSize * Math.abs(geom.vScale);
var fontAscent = geom.ascent ? geom.ascent * fontHeight :
geom.descent ? (1 + geom.descent) * fontHeight : fontHeight;
ctx.save(); ctx.save();
ctx.beginPath(); ctx.beginPath();
ctx.strokeStyle = 'red'; ctx.strokeStyle = 'red';
ctx.fillStyle = 'yellow'; ctx.fillStyle = 'yellow';
ctx.translate(geom.x + (fontHeight * Math.sin(geom.angle)), ctx.translate(geom.x + (fontAscent * Math.sin(geom.angle)),
geom.y - (fontHeight * Math.cos(geom.angle))); geom.y - (fontAscent * Math.cos(geom.angle)));
ctx.rotate(geom.angle); ctx.rotate(geom.angle);
ctx.rect(0, 0, geom.canvasWidth * Math.abs(geom.hScale), fontHeight); ctx.rect(0, 0, geom.canvasWidth * Math.abs(geom.hScale), fontHeight);
ctx.stroke(); ctx.stroke();

6
web/text_layer_builder.js
View File

@ -130,8 +130,10 @@ var TextLayerBuilder = function textLayerBuilder(options) {
textDiv.style.fontSize = fontHeight + 'px'; textDiv.style.fontSize = fontHeight + 'px';
textDiv.style.fontFamily = geom.fontFamily; textDiv.style.fontFamily = geom.fontFamily;
textDiv.style.left = (geom.x + (fontHeight * Math.sin(geom.angle))) + 'px'; var fontAscent = geom.ascent ? geom.ascent * fontHeight :
textDiv.style.top = (geom.y - (fontHeight * Math.cos(geom.angle))) + 'px'; geom.descent ? (1 + geom.descent) * fontHeight : fontHeight;
textDiv.style.left = (geom.x + (fontAscent * Math.sin(geom.angle))) + 'px';
textDiv.style.top = (geom.y - (fontAscent * Math.cos(geom.angle))) + 'px';
// The content of the div is set in the `setTextContent` function. // The content of the div is set in the `setTextContent` function.