diff --git a/bower.json b/bower.json index 52ba12bc5..dd8dce997 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.682", + "version": "1.0.684", "keywords": [ "Mozilla", "pdf", diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 62d1195d9..fd8bca152 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.682'; -PDFJS.build = '9b3c96d'; +PDFJS.version = '1.0.684'; +PDFJS.build = '5eb6a35'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -6451,6 +6451,12 @@ var AnnotationUtils = (function AnnotationUtilsClosure() { PDFJS.AnnotationUtils = AnnotationUtils; +var SVG_DEFAULTS = { + fontStyle: 'normal', + fontWeight: 'normal', + fillColor: '#000000' +}; + var convertImgDataToPng = (function convertImgDataToPngClosure() { var PNG_HEADER = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); @@ -6646,7 +6652,7 @@ var convertImgDataToPng = (function convertImgDataToPngClosure() { var SVGExtraState = (function SVGExtraStateClosure() { function SVGExtraState() { this.fontSizeScale = 1; - this.fontWeight = 'normal'; + this.fontWeight = SVG_DEFAULTS.fontWeight; this.fontSize = 0; this.textMatrix = IDENTITY_MATRIX; @@ -6668,7 +6674,7 @@ var SVGExtraState = (function SVGExtraStateClosure() { this.textRise = 0; // Default foreground and background colors - this.fillColor = '#000000'; + this.fillColor = SVG_DEFAULTS.fillColor; this.strokeColor = '#000000'; this.fillAlpha = 1; @@ -7142,10 +7148,15 @@ var SVGGraphics = (function SVGGraphicsClosure() { current.tspan.setAttributeNS(null, 'font-family', current.fontFamily); current.tspan.setAttributeNS(null, 'font-size', pf(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); + if (current.fontStyle !== SVG_DEFAULTS.fontStyle) { + current.tspan.setAttributeNS(null, 'font-style', current.fontStyle); + } + 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', pm(current.textMatrix) + diff --git a/build/pdf.js b/build/pdf.js index cbfe696d5..33bd253df 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.682'; -PDFJS.build = '9b3c96d'; +PDFJS.version = '1.0.684'; +PDFJS.build = '5eb6a35'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -6495,6 +6495,12 @@ var AnnotationUtils = (function AnnotationUtilsClosure() { PDFJS.AnnotationUtils = AnnotationUtils; +var SVG_DEFAULTS = { + fontStyle: 'normal', + fontWeight: 'normal', + fillColor: '#000000' +}; + var convertImgDataToPng = (function convertImgDataToPngClosure() { var PNG_HEADER = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); @@ -6690,7 +6696,7 @@ var convertImgDataToPng = (function convertImgDataToPngClosure() { var SVGExtraState = (function SVGExtraStateClosure() { function SVGExtraState() { this.fontSizeScale = 1; - this.fontWeight = 'normal'; + this.fontWeight = SVG_DEFAULTS.fontWeight; this.fontSize = 0; this.textMatrix = IDENTITY_MATRIX; @@ -6712,7 +6718,7 @@ var SVGExtraState = (function SVGExtraStateClosure() { this.textRise = 0; // Default foreground and background colors - this.fillColor = '#000000'; + this.fillColor = SVG_DEFAULTS.fillColor; this.strokeColor = '#000000'; this.fillAlpha = 1; @@ -7186,10 +7192,15 @@ var SVGGraphics = (function SVGGraphicsClosure() { current.tspan.setAttributeNS(null, 'font-family', current.fontFamily); current.tspan.setAttributeNS(null, 'font-size', pf(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); + if (current.fontStyle !== SVG_DEFAULTS.fontStyle) { + current.tspan.setAttributeNS(null, 'font-style', current.fontStyle); + } + 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', pm(current.textMatrix) + diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 75b2bbcab..0e59426b5 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.682'; -PDFJS.build = '9b3c96d'; +PDFJS.version = '1.0.684'; +PDFJS.build = '5eb6a35'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/package.json b/package.json index febd8232a..811503256 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.682", + "version": "1.0.684", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",