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

Merge branch 'master' into encoding

Browse Source
This commit is contained in:
sbarman 2011-07-08 15:29:20 -07:00
commit 2bb68cc062
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fonts.js
View File

@ -413,6 +413,7 @@ function getUnicodeRangeFor(value) {
var Font = (function() {
var constructor = function font_constructor(name, file, properties) {
this.name = name;
this.textMatrix = properties.textMatrix || IDENTITY_MATRIX;
this.encoding = properties.encoding;
// If the font is to be ignored, register it like an already loaded font

24
pdf.js
View File

@ -3937,24 +3937,24 @@ var CanvasGraphics = (function() {
showText: function(text) {
// TODO: apply charSpacing, wordSpacing, textHScale
this.ctx.save();
this.ctx.transform.apply(this.ctx, this.current.textMatrix);
this.ctx.scale(1, -1);
var ctx = this.ctx;
var current = this.current;
ctx.save();
ctx.transform.apply(ctx, current.textMatrix);
ctx.scale(1, -1);
if (this.ctx.$showText) {
this.ctx.$showText(this.current.y, Fonts.charsToUnicode(text));
ctx.$showText(current.y, Fonts.charsToUnicode(text));
} else {
text = Fonts.charsToUnicode(text);
this.ctx.translate(this.current.x, -1 * this.current.y);
ctx.translate(current.x, -1 * current.y);
var font = this.current.font;
if (font) {
var fontInfo = Fonts.lookupById(font.id);
if (fontInfo && fontInfo.properties.textMatrix)
this.ctx.transform.apply(this.ctx, fontInfo.properties.textMatrix);
}
this.ctx.fillText(text, 0, 0);
this.current.x += Fonts.measureText(text);
if (font)
ctx.transform.apply(ctx, font.textMatrix);
ctx.fillText(text, 0, 0);
current.x += Fonts.measureText(text);
}
this.ctx.restore();