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

Added fill, stroke, line-join & font attr

Browse Source
This commit is contained in:
pramodhkp 2014-07-03 21:33:31 +05:30
parent 03f1de3403
commit 0688fd3d70
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/display/svg.js
View File

@ -33,8 +33,10 @@ function createScratchSVG(width, height) {
var SVGExtraState = (function SVGExtraStateClosure() { var SVGExtraState = (function SVGExtraStateClosure() {
function SVGExtraState(old) { function SVGExtraState(old) {
// Are soft masks and alpha values shapes or opacities? // Are soft masks and alpha values shapes or opacities?
this.fontSize = 0;
this.fontSizeScale = 1; this.fontSizeScale = 1;
this.fontWeight = 'normal';
this.fontSize = 'normal';
this.textMatrix = IDENTITY_MATRIX; this.textMatrix = IDENTITY_MATRIX;
this.fontMatrix = FONT_IDENTITY_MATRIX; this.fontMatrix = FONT_IDENTITY_MATRIX;
this.leading = 0; this.leading = 0;
@ -313,6 +315,9 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
case OPS.fillStroke: case OPS.fillStroke:
this.fillStroke(); this.fillStroke();
break; break;
case OPS.eoFillStroke:
this.eoFillStroke();
break;
case OPS.clip: case OPS.clip:
this.clip('nonzero'); this.clip('nonzero');
break; break;
@ -453,8 +458,13 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
} }
current.tspan.setAttributeNS(null, 'x', current.xcoords.join(' ')); current.tspan.setAttributeNS(null, 'x', current.xcoords.join(' '));
current.tspan.setAttributeNS(null, 'y', -current.y);
current.tspan.setAttributeNS(null, 'font-family', current.fontFamily); current.tspan.setAttributeNS(null, 'font-family', current.fontFamily);
current.tspan.setAttributeNS(null, 'font-size', current.fontSize + 'px'); current.tspan.setAttributeNS(null, 'font-size', current.fontSize + 'px');
current.tspan.setAttributeNS(null, 'font-style', current.fontStyle);
current.tspan.setAttributeNS(null, 'font-weight', current.fontWeight);
current.tspan.setAttributeNS(null, 'stroke', 'none');
current.tspan.setAttributeNS(null, 'fill', current.fillColor);
current.txtElement.setAttributeNS(null, 'transform', current.txtElement.setAttributeNS(null, 'transform',
'matrix(' + current.textMatrix + ') scale(1, -1)' ); 'matrix(' + current.textMatrix + ') scale(1, -1)' );
@ -485,10 +495,6 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
var italic = fontObj.italic ? 'italic' : 'normal'; var italic = fontObj.italic ? 'italic' : 'normal';
current.font.style = (bold == 'normal' ?
(italic == 'normal' ?
'' : 'font-weight:' + italic) :
'font-weight:' + bold);
if (size < 0) { if (size < 0) {
size = -size; size = -size;
@ -498,6 +504,12 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
} }
current.fontSize = size; current.fontSize = size;
current.fontFamily = fontObj.loadedName; current.fontFamily = fontObj.loadedName;
current.fontWeight = bold;
current.fontStyle = italic;
current.tspan = document.createElementNS(NS, 'svg:tspan');
current.tspan.setAttributeNS(null, 'y', -current.y);
current.xcoords = [];
}, },
endText: function SVGGraphics_endText(args) { endText: function SVGGraphics_endText(args) {
@ -524,6 +536,8 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
setFillRGBColor: function SVGGraphics_setFillRGBColor(r, g, b) { setFillRGBColor: function SVGGraphics_setFillRGBColor(r, g, b) {
var color = Util.makeCssRgb(arguments); var color = Util.makeCssRgb(arguments);
this.current.fillColor = color; this.current.fillColor = color;
this.current.tspan = document.createElementNS(NS, 'svg:tspan');
this.current.xcoords = [];
}, },
setDash: function SVGGraphics_setDash(dashArray, dashPhase) { setDash: function SVGGraphics_setDash(dashArray, dashPhase) {
this.current.dashArray = dashArray; this.current.dashArray = dashArray;
@ -586,6 +600,7 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
current.path.setAttributeNS(null, 'stroke-miterlimit', current.path.setAttributeNS(null, 'stroke-miterlimit',
current.miterLimit); current.miterLimit);
current.path.setAttributeNS(null, 'stroke-linecap', current.lineCap); current.path.setAttributeNS(null, 'stroke-linecap', current.lineCap);
current.path.setAttributeNS(null, 'stroke-linejoin', current.lineJoin);
current.path.setAttributeNS(null, 'stroke-width', current.path.setAttributeNS(null, 'stroke-width',
current.lineWidth + 'px'); current.lineWidth + 'px');
current.path.setAttributeNS(null, 'stroke-dasharray', current.dashArray); current.path.setAttributeNS(null, 'stroke-dasharray', current.dashArray);
@ -704,8 +719,15 @@ var SVGGraphics = (function SVGGraphicsClosure(ctx) {
}, },
fillStroke: function SVGGraphics_fillStroke() { fillStroke: function SVGGraphics_fillStroke() {
this.fill(); // Order is important since stroke wants fill to be none.
// First stroke, then if fill needed, it will be overwritten.
this.stroke(); this.stroke();
this.fill();
},
eoFillStroke: function SVGGraphics_eoFillStroke() {
this.current.element.setAttributeNS(null, 'fill-rule', 'evenodd');
this.fillStroke();
}, },
closeStroke: function SVGGraphics_closeStroke() { closeStroke: function SVGGraphics_closeStroke() {