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

Optimizes defaults for svg.js

Browse Source
This commit is contained in:
Tim van der Meij 2014-08-14 23:13:15 +02:00
parent 90afb70e44
commit 1d02ace81f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/display/svg.js
View File

@ -20,6 +20,12 @@
'use strict'; 'use strict';
//#if (GENERIC || SINGLE_FILE) //#if (GENERIC || SINGLE_FILE)
var SVG_DEFAULTS = {
fontStyle: 'normal',
fontWeight: 'normal',
fillColor: '#000000'
};
var convertImgDataToPng = (function convertImgDataToPngClosure() { var convertImgDataToPng = (function convertImgDataToPngClosure() {
var PNG_HEADER = var PNG_HEADER =
new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
@ -215,7 +221,7 @@ var convertImgDataToPng = (function convertImgDataToPngClosure() {
var SVGExtraState = (function SVGExtraStateClosure() { var SVGExtraState = (function SVGExtraStateClosure() {
function SVGExtraState() { function SVGExtraState() {
this.fontSizeScale = 1; this.fontSizeScale = 1;
this.fontWeight = 'normal'; this.fontWeight = SVG_DEFAULTS.fontWeight;
this.fontSize = 0; this.fontSize = 0;
this.textMatrix = IDENTITY_MATRIX; this.textMatrix = IDENTITY_MATRIX;
@ -237,7 +243,7 @@ var SVGExtraState = (function SVGExtraStateClosure() {
this.textRise = 0; this.textRise = 0;
// Default foreground and background colors // Default foreground and background colors
this.fillColor = '#000000'; this.fillColor = SVG_DEFAULTS.fillColor;
this.strokeColor = '#000000'; this.strokeColor = '#000000';
this.fillAlpha = 1; this.fillAlpha = 1;
@ -711,10 +717,15 @@ var SVGGraphics = (function SVGGraphicsClosure() {
current.tspan.setAttributeNS(null, 'font-family', current.fontFamily); current.tspan.setAttributeNS(null, 'font-family', current.fontFamily);
current.tspan.setAttributeNS(null, 'font-size', current.tspan.setAttributeNS(null, 'font-size',
pf(current.fontSize) + 'px'); pf(current.fontSize) + 'px');
current.tspan.setAttributeNS(null, 'font-style', current.fontStyle); if (current.fontStyle !== SVG_DEFAULTS.fontStyle) {
current.tspan.setAttributeNS(null, 'font-weight', current.fontWeight); current.tspan.setAttributeNS(null, 'font-style', current.fontStyle);
current.tspan.setAttributeNS(null, 'stroke', 'none'); }
current.tspan.setAttributeNS(null, 'fill', current.fillColor); if (current.fontWeight !== SVG_DEFAULTS.fontWeight) {
current.tspan.setAttributeNS(null, 'font-weight', current.fontWeight);
}
if (current.fillColor !== SVG_DEFAULTS.fillColor) {
current.tspan.setAttributeNS(null, 'fill', current.fillColor);
}
current.txtElement.setAttributeNS(null, 'transform', current.txtElement.setAttributeNS(null, 'transform',
pm(current.textMatrix) + pm(current.textMatrix) +