From 23f2af35018105b5e409b6479bf8b659859a4a85 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 20 Mar 2023 15:56:24 +0800 Subject: [PATCH] :arrow_up: https://github.com/siyuan-note/siyuan/issues/7699 --- app/src/asset/anno.ts | 2 +- app/src/asset/index.ts | 2 + .../pdf/annotation_editor_layer_builder.js | 48 +- app/src/asset/pdf/annotation_layer_builder.js | 118 +- app/src/asset/pdf/app.js | 3565 +- app/src/asset/pdf/app_options.js | 181 +- app/src/asset/pdf/event_utils.js | 10 +- app/src/asset/pdf/genericcom.js | 60 +- app/src/asset/pdf/l10n_utils.js | 18 +- app/src/asset/pdf/password_prompt.js | 4 +- app/src/asset/pdf/pdf_attachment_viewer.js | 5 +- app/src/asset/pdf/pdf_cursor_tools.js | 10 +- app/src/asset/pdf/pdf_document_properties.js | 16 +- app/src/asset/pdf/pdf_find_bar.js | 7 +- app/src/asset/pdf/pdf_find_controller.js | 140 +- app/src/asset/pdf/pdf_link_service.js | 14 + app/src/asset/pdf/pdf_outline_viewer.js | 21 +- app/src/asset/pdf/pdf_page_view.js | 658 +- app/src/asset/pdf/pdf_presentation_mode.js | 31 +- app/src/asset/pdf/pdf_scripting_manager.js | 40 +- app/src/asset/pdf/pdf_thumbnail_viewer.js | 11 +- app/src/asset/pdf/pdf_viewer.js | 521 +- app/src/asset/pdf/pdfjs.js | 2 +- app/src/asset/pdf/secondary_toolbar.js | 3 +- .../asset/pdf/struct_tree_layer_builder.js | 45 +- app/src/asset/pdf/text_highlighter.js | 10 +- app/src/asset/pdf/text_layer_builder.js | 146 +- app/src/asset/pdf/toolbar.js | 27 +- app/src/asset/pdf/ui_utils.js | 46 +- app/src/asset/pdf/view_history.js | 2 - app/src/asset/pdf/viewer.js | 335 +- app/src/asset/pdf/xfa_layer_builder.js | 54 +- app/src/assets/scss/pdf/_pdf.scss | 18 +- .../scss/pdf/annotation_layer_builder.scss | 176 +- app/src/assets/scss/pdf/pdf_viewer.scss | 92 +- app/stage/protyle/js/pdf/pdf.js | 15774 +++- app/stage/protyle/js/pdf/pdf.worker.js | 64503 +++++++++++++++- .../js/pdf/standard_fonts/FoxitDingbats.pfb | Bin 0 -> 29513 bytes .../js/pdf/standard_fonts/FoxitFixed.pfb | Bin 0 -> 17597 bytes .../js/pdf/standard_fonts/FoxitFixedBold.pfb | Bin 0 -> 18055 bytes .../standard_fonts/FoxitFixedBoldItalic.pfb | Bin 0 -> 19151 bytes .../pdf/standard_fonts/FoxitFixedItalic.pfb | Bin 0 -> 18746 bytes .../js/pdf/standard_fonts/FoxitSans.pfb | Bin 0 -> 15025 bytes .../js/pdf/standard_fonts/FoxitSansBold.pfb | Bin 0 -> 16344 bytes .../standard_fonts/FoxitSansBoldItalic.pfb | Bin 0 -> 16418 bytes .../js/pdf/standard_fonts/FoxitSansItalic.pfb | Bin 0 -> 16339 bytes .../js/pdf/standard_fonts/FoxitSerif.pfb | Bin 0 -> 19469 bytes .../js/pdf/standard_fonts/FoxitSerifBold.pfb | Bin 0 -> 19395 bytes .../standard_fonts/FoxitSerifBoldItalic.pfb | Bin 0 -> 20733 bytes .../pdf/standard_fonts/FoxitSerifItalic.pfb | Bin 0 -> 21227 bytes .../js/pdf/standard_fonts/FoxitSymbol.pfb | Bin 0 -> 16729 bytes .../js/pdf/standard_fonts/LICENSE_FOXIT | 27 + .../js/pdf/standard_fonts/LICENSE_LIBERATION | 102 + .../standard_fonts/LiberationSans-Bold.ttf | Bin 0 -> 137052 bytes .../LiberationSans-BoldItalic.ttf | Bin 0 -> 135124 bytes .../standard_fonts/LiberationSans-Italic.ttf | Bin 0 -> 162036 bytes .../standard_fonts/LiberationSans-Regular.ttf | Bin 0 -> 139512 bytes 57 files changed, 83865 insertions(+), 2979 deletions(-) create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitDingbats.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitFixed.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitFixedBold.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitFixedBoldItalic.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitFixedItalic.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSans.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSansBold.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSansBoldItalic.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSansItalic.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSerif.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSerifBold.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSerifBoldItalic.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSerifItalic.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/FoxitSymbol.pfb create mode 100644 app/stage/protyle/js/pdf/standard_fonts/LICENSE_FOXIT create mode 100644 app/stage/protyle/js/pdf/standard_fonts/LICENSE_LIBERATION create mode 100644 app/stage/protyle/js/pdf/standard_fonts/LiberationSans-Bold.ttf create mode 100644 app/stage/protyle/js/pdf/standard_fonts/LiberationSans-BoldItalic.ttf create mode 100644 app/stage/protyle/js/pdf/standard_fonts/LiberationSans-Italic.ttf create mode 100644 app/stage/protyle/js/pdf/standard_fonts/LiberationSans-Regular.ttf diff --git a/app/src/asset/anno.ts b/app/src/asset/anno.ts index fec8605ac..05551c38a 100644 --- a/app/src/asset/anno.ts +++ b/app/src/asset/anno.ts @@ -531,7 +531,7 @@ export const getHighlight = (element: HTMLElement) => { const showHighlight = (selected: IPdfAnno, pdf: any, hl?: boolean) => { const pageIndex = selected.index; const page = pdf.pdfViewer.getPageView(pageIndex); - let textLayerElement = page.textLayer.textLayerDiv; + let textLayerElement = page.textLayer.div; if (!textLayerElement.lastElementChild) { return; } diff --git a/app/src/asset/index.ts b/app/src/asset/index.ts index cb69751de..1060a80e7 100644 --- a/app/src/asset/index.ts +++ b/app/src/asset/index.ts @@ -284,6 +284,8 @@ export class Asset extends Model { + +