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

Use the correct border-style for Annotations, when a dash array is specified (bug 1219400)

Browse Source 
Even though we cannot use the dash array in the display layer, at least ensure that we use the correct border-style.
This commit is contained in:
Jonas Jenwald 2021-10-27 12:55:56 +02:00
parent 74bc6d2625
commit 884caf602e
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/annotation.js
View File

@ -660,7 +660,7 @@ class Annotation {
if (array.length === 4) { if (array.length === 4) {
// Dash array available // Dash array available
this.borderStyle.setDashArray(array[3]); this.borderStyle.setDashArray(array[3], /* forceStyle = */ true);
} }
} }
} else { } else {
@ -981,8 +981,9 @@ class AnnotationBorderStyle {
* @public * @public
* @memberof AnnotationBorderStyle * @memberof AnnotationBorderStyle
* @param {Array} dashArray - The dash array with at least one element * @param {Array} dashArray - The dash array with at least one element
* @param {boolean} [forceStyle]
*/ */
setDashArray(dashArray) { setDashArray(dashArray, forceStyle = false) {
// We validate the dash array, but we do not use it because CSS does not // We validate the dash array, but we do not use it because CSS does not
// allow us to change spacing of dashes. For more information, visit // allow us to change spacing of dashes. For more information, visit
// http://www.w3.org/TR/css3-background/#the-border-style. // http://www.w3.org/TR/css3-background/#the-border-style.
@ -1002,6 +1003,12 @@ class AnnotationBorderStyle {
} }
if (isValid && !allZeros) { if (isValid && !allZeros) {
this.dashArray = dashArray; this.dashArray = dashArray;
if (forceStyle) {
// Even though we cannot use the dash array in the display layer,
// at least ensure that we use the correct border-style.
this.setStyle(Name.get("D"));
}
} else { } else {
this.width = 0; // Adobe behavior when the array is invalid. this.width = 0; // Adobe behavior when the array is invalid.
} }

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

@ -0,0 +1 @@
https://web.archive.org/web/20160212224934/http://www.ghostscript.com/doc/examples/annots.pdf

9
test/test_manifest.json
View File

@ -1822,6 +1822,15 @@
"link": false, "link": false,
"type": "eq" "type": "eq"
}, },
{ "id": "bug1219400",
"file": "pdfs/bug1219400.pdf",
"md5": "a1554914cc9653d5ee0b9220657b334f",
"rounds": 1,
"link": true,
"lastPage": 1,
"type": "eq",
"annotations": true
},
{ "id": "bug1245391", { "id": "bug1245391",
"file": "pdfs/bug1245391_reduced.pdf", "file": "pdfs/bug1245391_reduced.pdf",
"md5": "6c946045ee0f2f663f269717c0f1614a", "md5": "6c946045ee0f2f663f269717c0f1614a",