From fc9501a637bbd3038cc4d5e44a7e71613db13ca2 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Wed, 31 Mar 2021 15:07:02 -0700 Subject: [PATCH] Add support for basic structure tree for accessibility. When a PDF is "marked" we now generate a separate DOM that represents the structure tree from the PDF. This DOM is inserted into the element and allows screen readers to walk the tree and have more information about headings, images, links, etc. To link the structure tree DOM (which is empty) to the text layer aria-owns is used. This required modifying the text layer creation so that marked items are now tracked. --- src/core/document.js | 20 ++ src/core/evaluator.js | 39 ++- src/core/obj.js | 29 ++- src/core/struct_tree.js | 335 +++++++++++++++++++++++++ src/core/worker.js | 13 + src/display/api.js | 56 ++++- src/display/text_layer.js | 17 ++ test/driver.js | 1 + test/integration-boot.js | 6 +- test/integration/accessibility_spec.js | 69 +++++ test/pdfs/.gitignore | 1 + test/pdfs/structure_simple.pdf | Bin 0 -> 40264 bytes test/text_layer_test.css | 7 +- test/unit/clitests.json | 1 + test/unit/jasmine-boot.js | 1 + test/unit/struct_tree_spec.js | 108 ++++++++ web/base_viewer.js | 12 + web/interfaces.js | 12 + web/pdf_page_view.js | 35 ++- web/struct_tree_layer_builder.js | 149 +++++++++++ web/text_layer_builder.css | 2 +- web/viewer.css | 12 +- 22 files changed, 911 insertions(+), 14 deletions(-) create mode 100644 src/core/struct_tree.js create mode 100644 test/integration/accessibility_spec.js create mode 100644 test/pdfs/structure_simple.pdf create mode 100644 test/unit/struct_tree_spec.js create mode 100644 web/struct_tree_layer_builder.js diff --git a/src/core/document.js b/src/core/document.js index ff5c76cb8..456b92577 100644 --- a/src/core/document.js +++ b/src/core/document.js @@ -58,6 +58,7 @@ import { calculateMD5 } from "./crypto.js"; import { Linearization } from "./parser.js"; import { OperatorList } from "./operator_list.js"; import { PartialEvaluator } from "./evaluator.js"; +import { StructTreePage } from "./struct_tree.js"; import { XFAFactory } from "./xfa/factory.js"; const DEFAULT_USER_UNIT = 1.0; @@ -104,6 +105,10 @@ class Page { static createObjId() { return `p${pageIndex}_${++idCounters.obj}`; } + + static getPageObjId() { + return `page${ref.toString()}`; + } }; } @@ -406,6 +411,7 @@ class Page { handler, task, normalizeWhitespace, + includeMarkedContent, sink, combineTextItems, }) { @@ -437,12 +443,22 @@ class Page { task, resources: this.resources, normalizeWhitespace, + includeMarkedContent, combineTextItems, sink, }); }); } + async getStructTree() { + const structTreeRoot = await this.pdfManager.ensureCatalog( + "structTreeRoot" + ); + const tree = new StructTreePage(structTreeRoot, this.pageDict); + tree.parse(); + return tree; + } + getAnnotationsData(intent) { return this._parsedAnnotations.then(function (annotations) { const annotationsData = []; @@ -604,6 +620,10 @@ class PDFDocument { static createObjId() { unreachable("Abstract method `createObjId` called."); } + + static getPageObjId() { + unreachable("Abstract method `getPageObjId` called."); + } }; } diff --git a/src/core/evaluator.js b/src/core/evaluator.js index aa7360546..3c49f9783 100644 --- a/src/core/evaluator.js +++ b/src/core/evaluator.js @@ -1913,7 +1913,10 @@ class PartialEvaluator { return; } // Other marked content types aren't supported yet. - args = [args[0].name]; + args = [ + args[0].name, + args[1] instanceof Dict ? args[1].get("MCID") : null, + ]; break; case OPS.beginMarkedContent: @@ -1973,6 +1976,7 @@ class PartialEvaluator { stateManager = null, normalizeWhitespace = false, combineTextItems = false, + includeMarkedContent = false, sink, seenStyles = new Set(), }) { @@ -2573,6 +2577,7 @@ class PartialEvaluator { stateManager: xObjStateManager, normalizeWhitespace, combineTextItems, + includeMarkedContent, sink: sinkWrapper, seenStyles, }) @@ -2650,6 +2655,38 @@ class PartialEvaluator { }) ); return; + case OPS.beginMarkedContent: + if (includeMarkedContent) { + textContent.items.push({ + type: "beginMarkedContent", + tag: isName(args[0]) ? args[0].name : null, + }); + } + break; + case OPS.beginMarkedContentProps: + if (includeMarkedContent) { + flushTextContentItem(); + let mcid = null; + if (isDict(args[1])) { + mcid = args[1].get("MCID"); + } + textContent.items.push({ + type: "beginMarkedContentProps", + id: Number.isInteger(mcid) + ? `${self.idFactory.getPageObjId()}_mcid${mcid}` + : null, + tag: isName(args[0]) ? args[0].name : null, + }); + } + break; + case OPS.endMarkedContent: + if (includeMarkedContent) { + flushTextContentItem(); + textContent.items.push({ + type: "endMarkedContent", + }); + } + break; } // switch if (textContent.items.length >= sink.desiredSize) { // Wait for ready, if we reach highWaterMark. diff --git a/src/core/obj.js b/src/core/obj.js index 9456e85ad..717404fcb 100644 --- a/src/core/obj.js +++ b/src/core/obj.js @@ -60,6 +60,7 @@ import { CipherTransformFactory } from "./crypto.js"; import { ColorSpace } from "./colorspace.js"; import { GlobalImageCache } from "./image_utils.js"; import { MetadataParser } from "./metadata_parser.js"; +import { StructTreeRoot } from "./struct_tree.js"; function fetchDestination(dest) { return isDict(dest) ? dest.get("D") : dest; @@ -200,6 +201,32 @@ class Catalog { return markInfo; } + get structTreeRoot() { + let structTree = null; + try { + structTree = this._readStructTreeRoot(); + } catch (ex) { + if (ex instanceof MissingDataException) { + throw ex; + } + warn("Unable read to structTreeRoot info."); + } + return shadow(this, "structTreeRoot", structTree); + } + + /** + * @private + */ + _readStructTreeRoot() { + const obj = this._catDict.get("StructTreeRoot"); + if (!isDict(obj)) { + return null; + } + const root = new StructTreeRoot(obj); + root.init(); + return root; + } + get toplevelPagesDict() { const pagesObj = this._catDict.get("Pages"); if (!isDict(pagesObj)) { @@ -2626,4 +2653,4 @@ const ObjectLoader = (function () { return ObjectLoader; })(); -export { Catalog, FileSpec, ObjectLoader, XRef }; +export { Catalog, FileSpec, NumberTree, ObjectLoader, XRef }; diff --git a/src/core/struct_tree.js b/src/core/struct_tree.js new file mode 100644 index 000000000..41587d45c --- /dev/null +++ b/src/core/struct_tree.js @@ -0,0 +1,335 @@ +/* Copyright 2021 Mozilla Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { isDict, isName, isRef } from "./primitives.js"; +import { isString, stringToPDFString, warn } from "../shared/util.js"; +import { NumberTree } from "./obj.js"; + +const MAX_DEPTH = 40; + +const StructElementType = { + PAGE_CONTENT: "PAGE_CONTENT", + STREAM_CONTENT: "STREAM_CONTENT", + OBJECT: "OBJECT", + ELEMENT: "ELEMENT", +}; + +class StructTreeRoot { + constructor(rootDict) { + this.dict = rootDict; + this.roleMap = new Map(); + } + + init() { + this.readRoleMap(); + } + + readRoleMap() { + const roleMapDict = this.dict.get("RoleMap"); + if (!isDict(roleMapDict)) { + return; + } + roleMapDict.forEach((key, value) => { + if (!isName(value)) { + return; + } + this.roleMap.set(key, value.name); + }); + } +} + +/** + * Instead of loading the whole tree we load just the page's relevant structure + * elements, which means we need a wrapper structure to represent the tree. + */ +class StructElementNode { + constructor(tree, dict) { + this.tree = tree; + this.dict = dict; + this.kids = []; + this.parseKids(); + } + + get role() { + const nameObj = this.dict.get("S"); + const name = isName(nameObj) ? nameObj.name : ""; + const { root } = this.tree; + if (root.roleMap.has(name)) { + return root.roleMap.get(name); + } + return name; + } + + parseKids() { + let pageObjId = null; + const objRef = this.dict.getRaw("Pg"); + if (isRef(objRef)) { + pageObjId = objRef.toString(); + } + const kids = this.dict.get("K"); + if (Array.isArray(kids)) { + for (const kid of kids) { + const element = this.parseKid(pageObjId, kid); + if (element) { + this.kids.push(element); + } + } + } else { + const element = this.parseKid(pageObjId, kids); + if (element) { + this.kids.push(element); + } + } + } + + parseKid(pageObjId, kid) { + // A direct link to content, the integer is an mcid. + if (Number.isInteger(kid)) { + if (this.tree.pageDict.objId !== pageObjId) { + return null; + } + + return new StructElement({ + type: StructElementType.PAGE_CONTENT, + mcid: kid, + pageObjId, + }); + } + + // Find the dictionary for the kid. + let kidDict = null; + if (isRef(kid)) { + kidDict = this.dict.xref.fetch(kid); + } else if (isDict(kid)) { + kidDict = kid; + } + if (!kidDict) { + return null; + } + const pageRef = kidDict.getRaw("Pg"); + if (isRef(pageRef)) { + pageObjId = pageRef.toString(); + } + + const type = isName(kidDict.get("Type")) ? kidDict.get("Type").name : null; + if (type === "MCR") { + if (this.tree.pageDict.objId !== pageObjId) { + return null; + } + return new StructElement({ + type: StructElementType.STREAM_CONTENT, + refObjId: isRef(kidDict.getRaw("Stm")) + ? kidDict.getRaw("Stm").toString() + : null, + pageObjId, + mcid: kidDict.get("MCID"), + }); + } + + if (type === "OBJR") { + if (this.tree.pageDict.objId !== pageObjId) { + return null; + } + return new StructElement({ + type: StructElementType.OBJECT, + refObjId: isRef(kidDict.getRaw("Obj")) + ? kidDict.getRaw("Obj").toString() + : null, + pageObjId, + }); + } + + return new StructElement({ + type: StructElementType.ELEMENT, + dict: kidDict, + }); + } +} + +class StructElement { + constructor({ + type, + dict = null, + mcid = null, + pageObjId = null, + refObjId = null, + }) { + this.type = type; + this.dict = dict; + this.mcid = mcid; + this.pageObjId = pageObjId; + this.refObjId = refObjId; + this.parentNode = null; + } +} + +class StructTreePage { + constructor(structTreeRoot, pageDict) { + this.root = structTreeRoot; + this.rootDict = structTreeRoot ? structTreeRoot.dict : null; + this.pageDict = pageDict; + this.nodes = []; + } + + parse() { + if (!this.root || !this.rootDict) { + return; + } + + const parentTree = this.rootDict.get("ParentTree"); + if (!parentTree) { + return; + } + const id = this.pageDict.get("StructParents"); + if (!Number.isInteger(id)) { + return; + } + const numberTree = new NumberTree(parentTree, this.rootDict.xref); + const parentArray = numberTree.get(id); + if (!Array.isArray(parentArray)) { + return; + } + const map = new Map(); + for (const ref of parentArray) { + if (isRef(ref)) { + this.addNode(this.rootDict.xref.fetch(ref), map); + } + } + } + + addNode(dict, map, level = 0) { + if (level > MAX_DEPTH) { + warn("StructTree MAX_DEPTH reached."); + return null; + } + + if (map.has(dict)) { + return map.get(dict); + } + + const element = new StructElementNode(this, dict); + map.set(dict, element); + + const parent = dict.get("P"); + + if (!parent || isName(parent.get("Type"), "StructTreeRoot")) { + if (!this.addTopLevelNode(dict, element)) { + map.delete(dict); + } + return element; + } + + const parentNode = this.addNode(parent, map, level + 1); + if (!parentNode) { + return element; + } + let save = false; + for (const kid of parentNode.kids) { + if (kid.type === StructElementType.ELEMENT && kid.dict === dict) { + kid.parentNode = element; + save = true; + } + } + if (!save) { + map.delete(dict); + } + return element; + } + + addTopLevelNode(dict, element) { + const obj = this.rootDict.get("K"); + if (!obj) { + return false; + } + + if (isDict(obj)) { + if (obj.objId !== dict.objId) { + return false; + } + this.nodes[0] = element; + return true; + } + + if (!Array.isArray(obj)) { + return true; + } + let save = false; + for (let i = 0; i < obj.length; i++) { + const kidRef = obj[i]; + if (kidRef && kidRef.toString() === dict.objId) { + this.nodes[i] = element; + save = true; + } + } + return save; + } + + /** + * Convert the tree structure into a simplifed object literal that can + * be sent to the main thread. + * @returns {Object} + */ + get serializable() { + function nodeToSerializable(node, parent, level = 0) { + if (level > MAX_DEPTH) { + warn("StructTree too deep to be fully serialized."); + return; + } + const obj = Object.create(null); + obj.role = node.role; + obj.children = []; + parent.children.push(obj); + const alt = node.dict.get("Alt"); + if (isString(alt)) { + obj.alt = stringToPDFString(alt); + } + + for (const kid of node.kids) { + const kidElement = + kid.type === StructElementType.ELEMENT ? kid.parentNode : null; + if (kidElement) { + nodeToSerializable(kidElement, obj, level + 1); + continue; + } else if ( + kid.type === StructElementType.PAGE_CONTENT || + kid.type === StructElementType.STREAM_CONTENT + ) { + obj.children.push({ + type: "content", + id: `page${kid.pageObjId}_mcid${kid.mcid}`, + }); + } else if (kid.type === StructElementType.OBJECT) { + obj.children.push({ + type: "object", + id: kid.refObjId, + }); + } + } + } + + const root = Object.create(null); + root.children = []; + root.role = "Root"; + for (const child of this.nodes) { + if (!child) { + continue; + } + nodeToSerializable(child, root); + } + return root; + } +} + +export { StructTreePage, StructTreeRoot }; diff --git a/src/core/worker.js b/src/core/worker.js index 8f2a23afd..2011deb4c 100644 --- a/src/core/worker.js +++ b/src/core/worker.js @@ -717,6 +717,7 @@ class WorkerMessageHandler { task, sink, normalizeWhitespace: data.normalizeWhitespace, + includeMarkedContent: data.includeMarkedContent, combineTextItems: data.combineTextItems, }) .then( @@ -745,6 +746,18 @@ class WorkerMessageHandler { }); }); + handler.on("GetStructTree", function wphGetStructTree(data) { + const pageIndex = data.pageIndex; + return pdfManager + .getPage(pageIndex) + .then(function (page) { + return pdfManager.ensure(page, "getStructTree"); + }) + .then(function (structTree) { + return structTree.serializable; + }); + }); + handler.on("FontFallback", function (data) { return pdfManager.fontFallback(data.id, handler); }); diff --git a/src/display/api.js b/src/display/api.js index d20931cd3..2712ae616 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -1013,13 +1013,17 @@ class PDFDocumentProxy { * whitespace with standard spaces (0x20). The default value is `false`. * @property {boolean} disableCombineTextItems - Do not attempt to combine * same line {@link TextItem}'s. The default value is `false`. + * @property {boolean} [includeMarkedContent] - When true include marked + * content items in the items array of TextContent. The default is `false`. */ /** * Page text content. * * @typedef {Object} TextContent - * @property {Array} items - Array of {@link TextItem} objects. + * @property {Array} items - Array of + * {@link TextItem} and {@link TextMarkedContent} objects. TextMarkedContent + * items are included when includeMarkedContent is true. * @property {Object} styles - {@link TextStyle} objects, * indexed by font name. */ @@ -1034,6 +1038,17 @@ class PDFDocumentProxy { * @property {number} width - Width in device space. * @property {number} height - Height in device space. * @property {string} fontName - Font name used by PDF.js for converted font. + * + */ + +/** + * Page text marked content part. + * + * @typedef {Object} TextMarkedContent + * @property {string} type - Either 'beginMarkedContent', + * 'beginMarkedContentProps', or 'endMarkedContent'. + * @property {string} id - The marked content identifier. Only used for type + * 'beginMarkedContentProps'. */ /** @@ -1089,6 +1104,25 @@ class PDFDocumentProxy { * states set. */ +/** + * Structure tree node. The root node will have a role "Root". + * + * @typedef {Object} StructTreeNode + * @property {Array} children - Array of + * {@link StructTreeNode} and {@link StructTreeContent} objects. + * @property {string} role - element's role, already mapped if a role map exists + * in the PDF. + */ + +/** + * Structure tree content. + * + * @typedef {Object} StructTreeContent + * @property {string} type - either "content" for page and stream structure + * elements or "object" for object references. + * @property {string} id - unique id that will map to the text layer. + */ + /** * PDF page operator list. * @@ -1408,6 +1442,7 @@ class PDFPageProxy { streamTextContent({ normalizeWhitespace = false, disableCombineTextItems = false, + includeMarkedContent = false, } = {}) { const TEXT_CONTENT_CHUNK_SIZE = 100; @@ -1417,6 +1452,7 @@ class PDFPageProxy { pageIndex: this._pageIndex, normalizeWhitespace: normalizeWhitespace === true, combineTextItems: disableCombineTextItems !== true, + includeMarkedContent: includeMarkedContent === true, }, { highWaterMark: TEXT_CONTENT_CHUNK_SIZE, @@ -1457,6 +1493,16 @@ class PDFPageProxy { }); } + /** + * @returns {Promise} A promise that is resolved with a + * {@link StructTreeNode} object that represents the page's structure tree. + */ + getStructTree() { + return (this._structTreePromise ||= this._transport.getStructTree( + this._pageIndex + )); + } + /** * Destroys the page object. * @private @@ -1486,6 +1532,7 @@ class PDFPageProxy { this._annotationsPromise = null; this._jsActionsPromise = null; this._xfaPromise = null; + this._structTreePromise = null; this.pendingCleanup = false; return Promise.all(waitOn); } @@ -1521,6 +1568,7 @@ class PDFPageProxy { this._annotationsPromise = null; this._jsActionsPromise = null; this._xfaPromise = null; + this._structTreePromise = null; if (resetStats && this._stats) { this._stats = new StatTimer(); } @@ -2755,6 +2803,12 @@ class WorkerTransport { }); } + getStructTree(pageIndex) { + return this.messageHandler.sendWithPromise("GetStructTree", { + pageIndex, + }); + } + getOutline() { return this.messageHandler.sendWithPromise("GetOutline", null); } diff --git a/src/display/text_layer.js b/src/display/text_layer.js index 6903b1804..c19feae0c 100644 --- a/src/display/text_layer.js +++ b/src/display/text_layer.js @@ -638,6 +638,23 @@ const renderTextLayer = (function renderTextLayerClosure() { _processItems(items, styleCache) { for (let i = 0, len = items.length; i < len; i++) { + if (items[i].str === undefined) { + if ( + items[i].type === "beginMarkedContentProps" || + items[i].type === "beginMarkedContent" + ) { + const parent = this._container; + this._container = document.createElement("span"); + this._container.classList.add("markedContent"); + if (items[i].id !== null) { + this._container.setAttribute("id", `${items[i].id}`); + } + parent.appendChild(this._container); + } else if (items[i].type === "endMarkedContent") { + this._container = this._container.parentNode; + } + continue; + } this._textContentItemsStr.push(items[i].str); appendText(this, items[i], styleCache, this._layoutTextCtx); } diff --git a/test/driver.js b/test/driver.js index a83f64218..801976cb5 100644 --- a/test/driver.js +++ b/test/driver.js @@ -572,6 +572,7 @@ var Driver = (function DriverClosure() { initPromise = page .getTextContent({ normalizeWhitespace: true, + includeMarkedContent: true, }) .then(function (textContent) { return rasterizeTextLayer( diff --git a/test/integration-boot.js b/test/integration-boot.js index e7559ee45..7749c6681 100644 --- a/test/integration-boot.js +++ b/test/integration-boot.js @@ -24,7 +24,11 @@ async function runTests(results) { jasmine.loadConfig({ random: false, spec_dir: "integration", - spec_files: ["scripting_spec.js", "annotation_spec.js"], + spec_files: [ + "scripting_spec.js", + "annotation_spec.js", + "accessibility_spec.js", + ], }); jasmine.addReporter({ diff --git a/test/integration/accessibility_spec.js b/test/integration/accessibility_spec.js new file mode 100644 index 000000000..5db2f98df --- /dev/null +++ b/test/integration/accessibility_spec.js @@ -0,0 +1,69 @@ +/* Copyright 2021 Mozilla Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const { closePages, loadAndWait } = require("./test_utils.js"); + +describe("accessibility", () => { + describe("structure tree", () => { + let pages; + + beforeAll(async () => { + pages = await loadAndWait("structure_simple.pdf", ".structTree"); + }); + + afterAll(async () => { + await closePages(pages); + }); + + it("must build structure that maps to text layer", async () => { + await Promise.all( + pages.map(async ([browserName, page]) => { + await page.waitForSelector(".structTree"); + + // Check the headings match up. + const head1 = await page.$eval( + ".structTree [role='heading'][aria-level='1'] span", + el => + document.getElementById(el.getAttribute("aria-owns")).textContent + ); + expect(head1).withContext(`In ${browserName}`).toEqual("Heading 1"); + const head2 = await page.$eval( + ".structTree [role='heading'][aria-level='2'] span", + el => + document.getElementById(el.getAttribute("aria-owns")).textContent + ); + expect(head2).withContext(`In ${browserName}`).toEqual("Heading 2"); + + // Check the order of the content. + const texts = await page.$$eval(".structTree [aria-owns]", nodes => + nodes.map( + el => + document.getElementById(el.getAttribute("aria-owns")) + .textContent + ) + ); + expect(texts) + .withContext(`In ${browserName}`) + .toEqual([ + "Heading 1", + "This paragraph 1.", + "Heading 2", + "This paragraph 2.", + ]); + }) + ); + }); + }); +}); diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore index f30f9f80e..dbafc86a5 100644 --- a/test/pdfs/.gitignore +++ b/test/pdfs/.gitignore @@ -71,6 +71,7 @@ !issue8570.pdf !issue8697.pdf !issue8702.pdf +!structure_simple.pdf !issue12823.pdf !issue8707.pdf !issue8798r.pdf diff --git a/test/pdfs/structure_simple.pdf b/test/pdfs/structure_simple.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4ab57cd1820a34203f3a77cb1158ea3421234d91 GIT binary patch literal 40264 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 literal 0 HcmV?d00001 diff --git a/test/text_layer_test.css b/test/text_layer_test.css index 6b88f80e4..aac1afbce 100644 --- a/test/text_layer_test.css +++ b/test/text_layer_test.css @@ -23,7 +23,7 @@ bottom: 0; line-height: 1; } -.textLayer > span { +.textLayer span { position: absolute; white-space: pre; -webkit-transform-origin: 0% 0%; @@ -37,3 +37,8 @@ -moz-box-sizing: border-box; box-sizing: border-box; } + +.textLayer .markedContent { + border: none; + background-color: transparent; +} diff --git a/test/unit/clitests.json b/test/unit/clitests.json index 07a2502a5..32c2d4977 100644 --- a/test/unit/clitests.json +++ b/test/unit/clitests.json @@ -34,6 +34,7 @@ "pdf_history_spec.js", "primitives_spec.js", "stream_spec.js", + "struct_tree_spec.js", "type1_parser_spec.js", "ui_utils_spec.js", "unicode_spec.js", diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js index 56aed3cf7..022ec220f 100644 --- a/test/unit/jasmine-boot.js +++ b/test/unit/jasmine-boot.js @@ -80,6 +80,7 @@ async function initializePDFJS(callback) { "pdfjs-test/unit/primitives_spec.js", "pdfjs-test/unit/scripting_spec.js", "pdfjs-test/unit/stream_spec.js", + "pdfjs-test/unit/struct_tree_spec.js", "pdfjs-test/unit/type1_parser_spec.js", "pdfjs-test/unit/ui_utils_spec.js", "pdfjs-test/unit/unicode_spec.js", diff --git a/test/unit/struct_tree_spec.js b/test/unit/struct_tree_spec.js new file mode 100644 index 000000000..255a5e51d --- /dev/null +++ b/test/unit/struct_tree_spec.js @@ -0,0 +1,108 @@ +/* Copyright 2021 Mozilla Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { buildGetDocumentParams } from "./test_utils.js"; +import { getDocument } from "../../src/display/api.js"; + +function equalTrees(rootA, rootB) { + function walk(a, b) { + expect(a.role).toEqual(b.role); + expect(a.type).toEqual(b.type); + expect("children" in a).toEqual("children" in b); + if (!a.children) { + return; + } + expect(a.children.length).toEqual(b.children.length); + for (let i = 0; i < rootA.children.length; i++) { + walk(a.children[i], b.children[i]); + } + } + return walk(rootA, rootB); +} + +describe("struct tree", function () { + describe("getStructTree", function () { + it("parses basic structure", async function () { + const filename = "structure_simple.pdf"; + const params = buildGetDocumentParams(filename); + const loadingTask = getDocument(params); + const doc = await loadingTask.promise; + const page = await doc.getPage(1); + const struct = await page.getStructTree(); + equalTrees( + { + role: "Root", + children: [ + { + role: "Document", + children: [ + { + role: "H1", + children: [ + { role: "NonStruct", children: [{ type: "content" }] }, + ], + }, + { + role: "P", + children: [ + { role: "NonStruct", children: [{ type: "content" }] }, + ], + }, + { + role: "H2", + children: [ + { role: "NonStruct", children: [{ type: "content" }] }, + ], + }, + { + role: "P", + children: [ + { role: "NonStruct", children: [{ type: "content" }] }, + ], + }, + ], + }, + ], + }, + struct + ); + await loadingTask.destroy(); + }); + + it("parses structure with marked content reference", async function () { + const filename = "issue6782.pdf"; + const params = buildGetDocumentParams(filename); + const loadingTask = getDocument(params); + const doc = await loadingTask.promise; + const page = await doc.getPage(1); + const struct = await page.getStructTree(); + equalTrees( + { + role: "Root", + children: [ + { + role: "Part", + children: [ + { role: "P", children: Array(27).fill({ type: "content" }) }, + ], + }, + ], + }, + struct + ); + await loadingTask.destroy(); + }); + }); +}); diff --git a/web/base_viewer.js b/web/base_viewer.js index b8ec64c54..7361de4ab 100644 --- a/web/base_viewer.js +++ b/web/base_viewer.js @@ -41,6 +41,7 @@ import { AnnotationLayerBuilder } from "./annotation_layer_builder.js"; import { NullL10n } from "./l10n_utils.js"; import { PDFPageView } from "./pdf_page_view.js"; import { SimpleLinkService } from "./pdf_link_service.js"; +import { StructTreeLayerBuilder } from "./struct_tree_layer_builder.js"; import { TextLayerBuilder } from "./text_layer_builder.js"; import { XfaLayerBuilder } from "./xfa_layer_builder.js"; @@ -545,6 +546,7 @@ class BaseViewer { textLayerMode: this.textLayerMode, annotationLayerFactory: this, xfaLayerFactory, + structTreeLayerFactory: this, imageResourcesPath: this.imageResourcesPath, renderInteractiveForms: this.renderInteractiveForms, renderer: this.renderer, @@ -1329,6 +1331,16 @@ class BaseViewer { }); } + /** + * @param {PDFPage} pdfPage + * @returns {StructTreeLayerBuilder} + */ + createStructTreeLayerBuilder(pdfPage) { + return new StructTreeLayerBuilder({ + pdfPage, + }); + } + /** * @type {boolean} Whether all pages of the PDF document have identical * widths and heights. diff --git a/web/interfaces.js b/web/interfaces.js index adf9116c2..c8ec18327 100644 --- a/web/interfaces.js +++ b/web/interfaces.js @@ -216,6 +216,17 @@ class IPDFXfaLayerFactory { createXfaLayerBuilder(pageDiv, pdfPage) {} } +/** + * @interface + */ +class IPDFStructTreeLayerFactory { + /** + * @param {PDFPage} pdfPage + * @returns {StructTreeLayerBuilder} + */ + createStructTreeLayerBuilder(pdfPage) {} +} + /** * @interface */ @@ -254,6 +265,7 @@ export { IPDFAnnotationLayerFactory, IPDFHistory, IPDFLinkService, + IPDFStructTreeLayerFactory, IPDFTextLayerFactory, IPDFXfaLayerFactory, IRenderableView, diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js index 64ec61553..6341bc75b 100644 --- a/web/pdf_page_view.js +++ b/web/pdf_page_view.js @@ -49,6 +49,7 @@ import { viewerCompatibilityParams } from "./viewer_compatibility.js"; * The default value is `TextLayerMode.ENABLE`. * @property {IPDFAnnotationLayerFactory} annotationLayerFactory * @property {IPDFXfaLayerFactory} xfaLayerFactory + * @property {IPDFStructTreeLayerFactory} structTreeLayerFactory * @property {string} [imageResourcesPath] - Path for image resources, mainly * for annotation icons. Include trailing slash. * @property {boolean} renderInteractiveForms - Turns on rendering of @@ -104,6 +105,7 @@ class PDFPageView { this.textLayerFactory = options.textLayerFactory; this.annotationLayerFactory = options.annotationLayerFactory; this.xfaLayerFactory = options.xfaLayerFactory; + this.structTreeLayerFactory = options.structTreeLayerFactory; this.renderer = options.renderer || RendererType.CANVAS; this.enableWebGL = options.enableWebGL || false; this.l10n = options.l10n || NullL10n; @@ -119,6 +121,7 @@ class PDFPageView { this.textLayer = null; this.zoomLayer = null; this.xfaLayer = null; + this.structTreeLayer = null; const div = document.createElement("div"); div.className = "page"; @@ -357,6 +360,10 @@ class PDFPageView { this.annotationLayer.cancel(); this.annotationLayer = null; } + if (this._onTextLayerRendered) { + this.eventBus._off("textlayerrendered", this._onTextLayerRendered); + this._onTextLayerRendered = null; + } } cssTransform(target, redrawAnnotations = false) { @@ -559,11 +566,12 @@ class PDFPageView { this.paintTask = paintTask; const resultPromise = paintTask.promise.then( - function () { - return finishPaintTask(null).then(function () { + () => { + return finishPaintTask(null).then(() => { if (textLayer) { const readableStream = pdfPage.streamTextContent({ normalizeWhitespace: true, + includeMarkedContent: true, }); textLayer.setTextContentStream(readableStream); textLayer.render(); @@ -602,6 +610,29 @@ class PDFPageView { this._renderXfaLayer(); } + // The structure tree is currently only supported when the text layer is + // enabled and a canvas is used for rendering. + if (this.structTreeLayerFactory && this.textLayer && this.canvas) { + // The structure tree must be generated after the text layer for the + // aria-owns to work. + this._onTextLayerRendered = event => { + if (event.pageNumber !== this.id) { + return; + } + this.eventBus._off("textlayerrendered", this._onTextLayerRendered); + this._onTextLayerRendered = null; + this.pdfPage.getStructTree().then(tree => { + const treeDom = this.structTreeLayer.render(tree); + treeDom.classList.add("structTree"); + this.canvas.appendChild(treeDom); + }); + }; + this.eventBus._on("textlayerrendered", this._onTextLayerRendered); + this.structTreeLayer = this.structTreeLayerFactory.createStructTreeLayerBuilder( + pdfPage + ); + } + div.setAttribute("data-loaded", true); this.eventBus.dispatch("pagerender", { diff --git a/web/struct_tree_layer_builder.js b/web/struct_tree_layer_builder.js new file mode 100644 index 000000000..86775d70e --- /dev/null +++ b/web/struct_tree_layer_builder.js @@ -0,0 +1,149 @@ +/* Copyright 2021 Mozilla Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const PDF_ROLE_TO_HTML_ROLE = { + // Document level structure types + Document: null, // There's a "document" role, but it doesn't make sense here. + DocumentFragment: null, + // Grouping level structure types + Part: "group", + Sect: "group", // XXX: There's a "section" role, but it's abstract. + Div: "group", + Aside: "note", + NonStruct: "none", + // Block level structure types + P: null, + // H, + H: "heading", + Title: null, + FENote: "note", + // Sub-block level structure type + Sub: "group", + // General inline level structure types + Lbl: null, + Span: null, + Em: null, + Strong: null, + Link: "link", + Annot: "note", + Form: "form", + // Ruby and Warichu structure types + Ruby: null, + RB: null, + RT: null, + RP: null, + Warichu: null, + WT: null, + WP: null, + // List standard structure types + L: "list", + LI: "listitem", + LBody: null, + // Table standard structure types + Table: "table", + TR: "row", + TH: "columnheader", + TD: "cell", + THead: "columnheader", + TBody: null, + TFoot: null, + // Standard structure type Caption + Caption: null, + // Standard structure type Figure + Figure: "figure", + // Standard structure type Formula + Formula: null, + // standard structure type Artifact + Artifact: null, +}; + +const HEADING_PATTERN = /^H(\d+)$/; + +/** + * @typedef {Object} StructTreeLayerBuilderOptions + * @property {PDFPage} pdfPage + */ + +class StructTreeLayerBuilder { + /** + * @param {StructTreeLayerBuilderOptions} options + */ + constructor({ pdfPage }) { + this.pdfPage = pdfPage; + } + + render(structTree) { + return this._walk(structTree); + } + + _setAttributes(structElement, htmlElement) { + if (structElement.alt !== undefined) { + htmlElement.setAttribute("aria-label", structElement.alt); + } + if (structElement.id !== undefined) { + htmlElement.setAttribute("aria-owns", structElement.id); + } + } + + _walk(node) { + if (!node) { + return null; + } + + const element = document.createElement("span"); + if ("role" in node) { + const { role } = node; + const match = role.match(HEADING_PATTERN); + if (match) { + element.setAttribute("role", "heading"); + element.setAttribute("aria-level", match[1]); + } else if (PDF_ROLE_TO_HTML_ROLE[role]) { + element.setAttribute("role", PDF_ROLE_TO_HTML_ROLE[role]); + } + } + + this._setAttributes(node, element); + + if (node.children) { + if (node.children.length === 1 && "id" in node.children[0]) { + // Often there is only one content node so just set the values on the + // parent node to avoid creating an extra span. + this._setAttributes(node.children[0], element); + } else { + for (const kid of node.children) { + element.appendChild(this._walk(kid)); + } + } + } + return element; + } +} + +/** + * @implements IPDFStructTreeLayerFactory + */ +class DefaultStructTreeLayerFactory { + /** + * @param {PDFPage} pdfPage + * @returns {StructTreeLayerBuilder} + */ + createStructTreeLayerBuilder(pdfPage) { + return new StructTreeLayerBuilder({ + pdfPage, + }); + } +} + +export { DefaultStructTreeLayerFactory, StructTreeLayerBuilder }; diff --git a/web/text_layer_builder.css b/web/text_layer_builder.css index 98e76d5c2..1d453b16e 100644 --- a/web/text_layer_builder.css +++ b/web/text_layer_builder.css @@ -24,7 +24,7 @@ line-height: 1; } -.textLayer > span { +.textLayer span { color: transparent; position: absolute; white-space: pre; diff --git a/web/viewer.css b/web/viewer.css index e982b2577..442f57580 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -175,7 +175,7 @@ select { display: none !important; } -.pdfViewer.enablePermissions .textLayer > span { +.pdfViewer.enablePermissions .textLayer span { user-select: none !important; cursor: not-allowed; } @@ -195,12 +195,12 @@ select { display: none; } -.pdfPresentationMode:fullscreen .textLayer > span { +.pdfPresentationMode:fullscreen .textLayer span { cursor: none; } .pdfPresentationMode.pdfPresentationModeControls > *, -.pdfPresentationMode.pdfPresentationModeControls .textLayer > span { +.pdfPresentationMode.pdfPresentationModeControls .textLayer span { cursor: default; } @@ -1653,19 +1653,19 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * { mix-blend-mode: screen; } -#viewer.textLayer-visible .textLayer > span { +#viewer.textLayer-visible .textLayer span { background-color: rgba(255, 255, 0, 0.1); color: rgba(0, 0, 0, 1); border: solid 1px rgba(255, 0, 0, 0.5); box-sizing: border-box; } -#viewer.textLayer-hover .textLayer > span:hover { +#viewer.textLayer-hover .textLayer span:hover { background-color: rgba(255, 255, 255, 1); color: rgba(0, 0, 0, 1); } -#viewer.textLayer-shadow .textLayer > span { +#viewer.textLayer-shadow .textLayer span { background-color: rgba(255, 255, 255, 0.6); color: rgba(0, 0, 0, 1); }