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

setFont() supports negative size, closes #1049

Browse Source
This commit is contained in:
Artur Adib 2012-01-20 18:41:01 -05:00
parent 86de8aca33
commit 786cccf636
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/canvas.js
View File

@ -551,8 +551,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
throw 'Can\'t find font for ' + fontRefName;
}
// If any of the diagonal elements of a transformation matrix are null
// ctx.restore() will fail in FF. See bugzilla bug #719844.
// A valid matrix needs all main diagonal elements to be non-zero
// This also ensures we bypass FF bugzilla bug #719844.
if (fontObj.fontMatrix[0] === 0 ||
fontObj.fontMatrix[3] === 0 ) {
warn('Invalid font matrix for font ' + fontRefName);
@ -563,9 +563,23 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var name = fontObj.loadedName || 'sans-serif';
// Clone fontMatrix so we can manipulate it without affecting original
this.current.fontMatrix = fontObj.fontMatrix.slice(0);
// The spec for Tf (setFont) says that 'size' specifies the font 'scale',
// and in some docs this can be negative. We implement this in fontMatrix.
if (size < 0) {
size = -size;
this.current.fontMatrix[0] = -fontObj.fontMatrix[0];
this.current.fontMatrix[3] = -fontObj.fontMatrix[3];
}
this.current.font = fontObj;
this.current.fontSize = size;
// Cache font matrix sign
this.current.fontMatrixXSign = this.current.fontMatrix[0] > 0 ? 1 : -1;
var name = fontObj.loadedName || 'sans-serif';
var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
(fontObj.bold ? 'bold' : 'normal');
@ -605,7 +619,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var ctx = this.ctx;
var current = this.current;
var textHScale = current.textHScale;
var fontMatrix = current.font.fontMatrix || IDENTITY_MATRIX;
var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
ctx.transform.apply(ctx, current.textMatrix);
ctx.scale(1, -1);
@ -639,7 +653,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var charSpacing = current.charSpacing;
var wordSpacing = current.wordSpacing;
var textHScale = current.textHScale;
var fontMatrix = font.fontMatrix || IDENTITY_MATRIX;
var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
var textHScale2 = textHScale * fontMatrix[0];
var glyphsLength = glyphs.length;
var textLayer = this.textLayer;
@ -677,7 +691,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
this.restore();
var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
var width = transformed[0] * fontSize + charSpacing;
var width = transformed[0] * fontSize +
current.fontMatrixXSign * charSpacing;
ctx.translate(width, 0);
current.x += width * textHScale;
@ -708,12 +723,13 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var glyph = glyphs[i];
if (glyph === null) {
// word break
x += wordSpacing;
x += current.fontMatrixXSign * wordSpacing;
continue;
}
var char = glyph.fontChar;
var charWidth = glyph.width * fontSize * 0.001 + charSpacing;
var charWidth = glyph.width * fontSize * 0.001 +
current.fontMatrixXSign * charSpacing;
switch (textRenderingMode) {
default: // other unsupported rendering modes
@ -756,7 +772,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var fontSize = current.fontSize;
var textHScale = current.textHScale;
if (!font.coded)
textHScale *= (font.fontMatrix || IDENTITY_MATRIX)[0];
textHScale *= (current.fontMatrix || IDENTITY_MATRIX)[0];
var arrLength = arr.length;
var textLayer = this.textLayer;
var text = {str: '', length: 0, canvasWidth: 0, geom: {}};

1
test/pdfs/issue1049.pdf.link Normal file
View File

@ -0,0 +1 @@
http://ernestinefont.com/wp-content/themes/iA3%201.2.1/assets/pdf/ErnestinePro-InfoGuide.pdf

7
test/test_manifest.json
View File

@ -423,5 +423,12 @@
"rounds": 1,
"link": false,
"type": "eq"
},
{ "id": "issue1049",
"file": "pdfs/issue1049.pdf",
"md5": "15473fffcdde9fb8f3756a4cf1aab347",
"rounds": 1,
"link": true,
"type": "eq"
}
]