From d9d033b8ae2bc006dc390cb95acee21c1f785e1a Mon Sep 17 00:00:00 2001 From: Vadim <69987865+ProxyNexus@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:20:44 +0300 Subject: [PATCH 01/24] Updated action dependencies --- .github/workflows/test-pr.yml | 11 +++++++---- .travis.yml | 15 --------------- README.md | 2 +- 3 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 1d5a734..0c38772 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -7,16 +7,19 @@ on: jobs: build: name: Checkout and Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest + + continue-on-error: true strategy: + fail-fast: false matrix: - java-version: [ 11, 16, 17 ] + java-version: [ 11, 16, 17, 21 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: JDK setup - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} distribution: 'temurin' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1fcd838..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: java -sudo: required -dist: bionic - -jdk: - - openjdk11 - -branches: - except: - - /^v|d\d+\.\d+\.\d+$/ - - /^jenkins-veraPDF-model-v|d\\d+\\.\\d+\\.\\d+$/ - -notifications: - slack: - secure: WgsTp3dk8wNWNJkESk1Hg317W1gNtksHPf8XFv2dzLN6ncv718CNwBg/wcFglLVSQk0AViOtpwdWtf1RO67TlvQV2WZHW2E7NLnJjozTCbXpeheywApou24QbW+i+CJaGVwsP1kFRw0hom3EjhF6o0g+tWJE0W4wVy5yX5u7+GYTfMKkRTRVf42AI/vvD6130AmGRQ8eMWGTyw2NU35q6Q6UGRSqpwx+w5dNWW+SXuL9eI5ZedHRu/mEteh7/jMylxM7W14BkZysXO0TmnfklpshjbOsicdIhdhIQ4SffBPSXdkGoE0XCLtLsEi4b+zTKlRTH/4qzJEiXdO7SwFzFt7uGXPx6gLIpnCGoSciikVMpr06ujz2vukR+tFmwLK6W6+R5PpgNVlfeP4WNHfZHGNbr6alp3loYZEA33BjbTOXKFtv68pPuIQ8LCinPL/J8EGyeIVh8xrxgdiswvO51CxpsuY/G6gm9BxcKbZE14GaZjrOhyPMBylZaBdzbOFkzbrgE7O8tYVt/asItUFQGysfBEQZLvb3eBeMK0p6SVmn0YZ5mqh6o5REr68cy4pK2jwcGQegj5vU61TjCIism+tRGxIanTRkUUfOpobpVa3k2saMTglY7/tnuqQsxYKl6eEg2cPeftr/b+M4o2nOtTBJYik93mTKJo9PmhCGZJ4= diff --git a/README.md b/README.md index 29c4ca3..d46a173 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Pre-requisites -------------- In order to generate the model classes you'll need: - * Java 9 - 17, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html). + * Java 9 - 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html). * [Maven v3+](https://maven.apache.org/) If you want to edit and regenerate the model you'll need: From 9858db70d2b7e36cc59059874b51cd8069a0b16e Mon Sep 17 00:00:00 2001 From: Vadim <69987865+ProxyNexus@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:03:28 +0300 Subject: [PATCH 02/24] Updated arlington workflow --- .github/workflows/update-arlington-workflow.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index e812c8e..d60400d 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -9,18 +9,21 @@ jobs: checkout-and-build: runs-on: ubuntu-latest + continue-on-error: true + strategy: + fail-fast: false matrix: - java-version: [11, 16, 17] + java-version: [11, 16, 17, 21] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 ref: integration - name: JDK setup - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} distribution: 'temurin' @@ -44,7 +47,7 @@ jobs: needs: checkout-and-build steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 ref: integration From b50dcc6b0ae7a0fc38cc797bdaa7df93b0d53c1c Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 23 Feb 2024 00:36:47 +0300 Subject: [PATCH 03/24] PDF/UA-2. Add property ghostRefs to SEFENote and add link OpenActionDestination to PDDocument --- src/main/java/PDLayer.mdl | 2 ++ src/main/java/SELayer.mdl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/PDLayer.mdl b/src/main/java/PDLayer.mdl index e51cd21..e1671f5 100644 --- a/src/main/java/PDLayer.mdl +++ b/src/main/java/PDLayer.mdl @@ -53,6 +53,8 @@ type PDDocument extends PDObject { link AA: PDAdditionalActions?; % document open action (OpenAction entry in the Catalog) link OpenAction: PDAction?; + % document open action destination (OpenAction entry in the Catalog) + link OpenActionDestination: PDDestination?; % document outlines (Outlines entry in the Catalog) link Outlines: PDOutline*; % link to the optional content properties dictionary diff --git a/src/main/java/SELayer.mdl b/src/main/java/SELayer.mdl index 7412839..61d09ec 100644 --- a/src/main/java/SELayer.mdl +++ b/src/main/java/SELayer.mdl @@ -345,6 +345,8 @@ type SEFENote extends PDStructElem { property NoteType : String; % comma separated list of object numbers that are missing in the Ref entry of a given FENote property orphanRefs : String; + % comma separated list of object numbers that are present in the Ref entry of a given FENote, while these structure elements do not reference this FENote + property ghostRefs : String; } % structure element (only PDF 2.0) From 5d6fd46dc75ab45927c08f03a3280ce64b8eb5f1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sat, 23 Mar 2024 14:18:26 +0300 Subject: [PATCH 04/24] PDF/UA-2. Add property isRealContent to Glyph --- src/main/java/Operator.mdl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/Operator.mdl b/src/main/java/Operator.mdl index 3d57d3f..1077a6c 100644 --- a/src/main/java/Operator.mdl +++ b/src/main/java/Operator.mdl @@ -568,6 +568,8 @@ type Glyph extends Object { property actualTextPresent: Boolean; % true if an Alt entry is present for this glyph property altPresent: Boolean; + % true if this glyph is a real content + property isRealContent: Boolean; } % glyph in the composite font From 801750c5f82e1fc51b10fc69e12164bfba9f32e6 Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 8 Apr 2024 17:28:12 +0300 Subject: [PATCH 05/24] Add link Kids to PDFormField --- src/main/java/PDLayer.mdl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/PDLayer.mdl b/src/main/java/PDLayer.mdl index e1671f5..0c207e9 100644 --- a/src/main/java/PDLayer.mdl +++ b/src/main/java/PDLayer.mdl @@ -708,6 +708,8 @@ type PDFormField extends PDObject { property TU: String; % value of the Ff entry property Ff: Integer; + % link to kids fields + link Kids: PDFormField*; } % Form field of type text From 7d98c82509f2b5a9e60efd555fa5c4e871da5e5b Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 19 Apr 2024 19:51:18 +0300 Subject: [PATCH 06/24] Add WTPDF declarations properties --- src/main/java/PDLayer.mdl | 2 +- src/main/java/XMPLayer.mdl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/PDLayer.mdl b/src/main/java/PDLayer.mdl index 0c207e9..0b4cbe0 100644 --- a/src/main/java/PDLayer.mdl +++ b/src/main/java/PDLayer.mdl @@ -688,7 +688,7 @@ type PDAcroForm extends PDObject { property NeedAppearances: Boolean; % true if the form dictionary contains XFA key property containsXFA: Boolean; - % all interactive form fields in the document + % root interactive form fields in the document link formFields: PDFormField*; % value of dynamicRender property in XFA property dynamicRender: String; diff --git a/src/main/java/XMPLayer.mdl b/src/main/java/XMPLayer.mdl index 20f9766..03ba106 100644 --- a/src/main/java/XMPLayer.mdl +++ b/src/main/java/XMPLayer.mdl @@ -45,6 +45,9 @@ type MainXMPPackage extends XMPPackage { % value of dc:title property dc_title: String; + + % comma separated list of declarations + property declarations: String; } % XMP property From 8fab0b41e4ff9c6d26621fc576dbed4767860efa Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 4 Dec 2023 16:46:27 +0300 Subject: [PATCH 07/24] Replace link Lang to property in SEMarkedContent From 392c7efaeca11da236cced919df18a76038f23d4 Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 14 May 2024 13:05:58 +0300 Subject: [PATCH 08/24] Update test-pr workflow - remove Java 16 support - move continue-on-error --- .github/workflows/test-pr.yml | 5 ++--- .github/workflows/update-arlington-workflow.yml | 5 ++--- README.md | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 0c38772..309c3ed 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -9,17 +9,16 @@ jobs: name: Checkout and Build runs-on: ubuntu-latest - continue-on-error: true - strategy: fail-fast: false matrix: - java-version: [ 11, 16, 17, 21 ] + java-version: [ 11, 17, 21 ] steps: - uses: actions/checkout@v4 - name: JDK setup uses: actions/setup-java@v4 + continue-on-error: true with: java-version: ${{ matrix.java-version }} distribution: 'temurin' diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index d60400d..3a47a72 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -9,12 +9,10 @@ jobs: checkout-and-build: runs-on: ubuntu-latest - continue-on-error: true - strategy: fail-fast: false matrix: - java-version: [11, 16, 17, 21] + java-version: [11, 17, 21] steps: - name: Checkout code @@ -24,6 +22,7 @@ jobs: ref: integration - name: JDK setup uses: actions/setup-java@v4 + continue-on-error: true with: java-version: ${{ matrix.java-version }} distribution: 'temurin' diff --git a/README.md b/README.md index d46a173..736687f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Pre-requisites -------------- In order to generate the model classes you'll need: - * Java 9 - 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html). + * Java 11, 17 or 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html). * [Maven v3+](https://maven.apache.org/) If you want to edit and regenerate the model you'll need: From cc41c26a0fe712662b3c280e033b221c1a711121 Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 14 May 2024 22:29:53 +0300 Subject: [PATCH 09/24] Change property types to List/Set of String --- src/main/java/SALayer.mdl | 10 ++++++---- src/main/java/SELayer.mdl | 6 ++++-- src/main/java/XMPLayer.mdl | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/SALayer.mdl b/src/main/java/SALayer.mdl index a058001..6ed0b60 100644 --- a/src/main/java/SALayer.mdl +++ b/src/main/java/SALayer.mdl @@ -2,13 +2,15 @@ package org.verapdf.model.salayer; import org.verapdf.model.baselayer.Object; +import java.util.List; + type SAObject extends Object { % id of group in format id: property structureID: String; - % comma separated list of error codes - property errorCodes: String; - % semicolon separated list of error arguments - property errorArguments: String; + % list of error codes + property errorCodes: List; + % list of error arguments + property errorArguments: List>; } % the class corresponding to the high level PDF document structure diff --git a/src/main/java/SELayer.mdl b/src/main/java/SELayer.mdl index 61d09ec..512775e 100644 --- a/src/main/java/SELayer.mdl +++ b/src/main/java/SELayer.mdl @@ -6,6 +6,8 @@ import org.verapdf.model.pdlayer.PDStructElem; import org.verapdf.model.coslayer.CosLang; +import java.util.List; + % the structure element with no mapping to the standard PDF 1.7 or PDF 2.0 tag type SENonStandard extends PDStructElem { % true, if the struct elem has non-standard type, which is not mapped to a standard type @@ -189,8 +191,8 @@ type SEMathMLStructElem extends PDStructElem { % a content item such as text, image, lineart, shading or a form type SEContentItem extends Object { - % ampersand separated list of tags, associated with parents marked content sequences (first operand of the BMC/BDC operators) - property parentsTags: String; + % list of tags, associated with parents marked content sequences (first operand of the BMC/BDC operators) + property parentsTags: List; % type of the parent structure element for parent marked content sequence property parentStructureTag: String; % true, if parent struct element is a part of the structure tree diff --git a/src/main/java/XMPLayer.mdl b/src/main/java/XMPLayer.mdl index 03ba106..9a7a39b 100644 --- a/src/main/java/XMPLayer.mdl +++ b/src/main/java/XMPLayer.mdl @@ -1,7 +1,7 @@ package org.verapdf.model.xmplayer; import org.verapdf.model.baselayer.Object; -import java.util.List; +import java.util.Set; % Parent type for all XMP objects type XMPObject extends Object { @@ -46,8 +46,8 @@ type MainXMPPackage extends XMPPackage { % value of dc:title property dc_title: String; - % comma separated list of declarations - property declarations: String; + % set of declarations + property declarations: Set; } % XMP property From c27887da3d2909665f93453c13ee303ae4078e21 Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 20 May 2024 21:34:12 +0300 Subject: [PATCH 10/24] DEV: v1.27 - bumped version -> 1.27 - updated maven dependency - updated readme --- README.md | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 736687f..0743b48 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ veraPDF-model ============= The veraPDF Validation model described using a Domain Specific Language developed in [XText](https://eclipse.org/Xtext/). -[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.25/job/model/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.25/job/model/ "OPF Jenkins") +[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.27/job/model/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.27/job/model/ "OPF Jenkins") [![Maven Central](https://img.shields.io/maven-central/v/org.verapdf/pdf-model.svg)](https://repo1.maven.org/maven2/org/verapdf/pdf-model/ "Maven central") [![Codacy Badge](https://app.codacy.com/project/badge/Grade/0b6a3e7f350c47d4a1ea1c5b500bbf68)](https://app.codacy.com/gh/veraPDF/veraPDF-model/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade "Codacy grade") diff --git a/pom.xml b/pom.xml index f7b67a4..5632e48 100644 --- a/pom.xml +++ b/pom.xml @@ -27,13 +27,13 @@ org.verapdf verapdf-parent - 1.23.1 + 1.27.1 org.verapdf pdf-model - 1.25.0-SNAPSHOT + 1.27.0-SNAPSHOT veraPDF Validation Model API Java interfaces for the veraPDF Validation model, generated from the Xtext DSL. @@ -69,7 +69,7 @@ - [1.25.0,1.26.0-RC) + [1.27.0,1.28.0-RC) 2.26.0 From 65c52b6157b71b4b23dca5e8e0ca27a9617cbd47 Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 20 May 2024 21:35:26 +0300 Subject: [PATCH 11/24] Fix github actions for updating arlington branch --- .github/workflows/update-arlington-workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index 3a47a72..c9da07e 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -7,6 +7,7 @@ on: jobs: checkout-and-build: + if: github.repository == 'veraPDF/veraPDF-model' runs-on: ubuntu-latest strategy: @@ -31,7 +32,7 @@ jobs: run: | git fetch origin arlington:arlington git checkout -b test-branch arlington - - name: Configure user nameF + - name: Configure user name run: | git config user.name "Git User" git config user.email "user@test.com" @@ -78,6 +79,7 @@ jobs: needs: [checkout-and-build, merge] if: | always() && + github.repository == 'veraPDF/veraPDF-model' && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')) From 482cee1010eac4600bb9d2a9d5ca18cc9bc39e4e Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 21 May 2024 13:15:44 +0300 Subject: [PATCH 12/24] Update github actions for updating arlington branch --- .github/workflows/update-arlington-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index c9da07e..d65aca2 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -37,7 +37,7 @@ jobs: git config user.name "Git User" git config user.email "user@test.com" - name: Add commit to the test branch - run: git cherry-pick -m 1 ${{ github.sha }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} - name: Build project with Maven if: success() run: mvn --batch-mode --update-snapshots verify @@ -63,7 +63,7 @@ jobs: git config user.name "Git User" git config user.email "user@temp.com" - name: Add commit to new branch - run: git cherry-pick -m 1 ${{ github.sha }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} - name: Merge branch into arlington if: success() run: | From 84b110f4b2efc13e448776d571224df84b8b10f6 Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 22 May 2024 15:42:37 +0300 Subject: [PATCH 13/24] Update github actions for updating arlington branch --- .github/workflows/update-arlington-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index d65aca2..c211ba8 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -37,7 +37,7 @@ jobs: git config user.name "Git User" git config user.email "user@test.com" - name: Add commit to the test branch - run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop - name: Build project with Maven if: success() run: mvn --batch-mode --update-snapshots verify @@ -63,7 +63,7 @@ jobs: git config user.name "Git User" git config user.email "user@temp.com" - name: Add commit to new branch - run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} + run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop - name: Merge branch into arlington if: success() run: | From f9022ed99c864c4366722b9a270b2f59dc2b1fbc Mon Sep 17 00:00:00 2001 From: Maxim Date: Sun, 2 Jun 2024 17:19:26 +0300 Subject: [PATCH 14/24] Add property namespaceAndTag to PDStructElem --- src/main/java/PDLayer.mdl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/PDLayer.mdl b/src/main/java/PDLayer.mdl index 0b4cbe0..0072d70 100644 --- a/src/main/java/PDLayer.mdl +++ b/src/main/java/PDLayer.mdl @@ -869,6 +869,9 @@ type PDStructElem extends PDStructTreeNode { property parentStandardType: String; % structure type link S: CosUnicodeName; + % the namespace specified in the element dictionary (or the default namespace, if not explicitly specified) and + % the element tag separated by the colon + property namespaceAndTag: String; % structure type property valueS: String; % standard structure type defined via role map From a8338d821f0b2f006cf5afb72b28b4d7466904aa Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 26 Jun 2024 22:54:21 +0300 Subject: [PATCH 15/24] Update PDExtGState properties --- src/main/java/PDLayer.mdl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/PDLayer.mdl b/src/main/java/PDLayer.mdl index 0072d70..deff3d5 100644 --- a/src/main/java/PDLayer.mdl +++ b/src/main/java/PDLayer.mdl @@ -483,10 +483,12 @@ type PDGroup extends PDObject { % ExtGState dictionary type PDExtGState extends PDResource { - % TR function - property TR: String; % TR2 function - property TR2: String; + property TR2NameValue: String; + % true if the ExtGState dictionary contains TR key + property containsTR: Boolean; + % true if the ExtGState dictionary contains TR2 key + property containsTR2: Boolean; % Halftone dictionary link HT: PDHalftone; % true if the ExtGState dictionary contains HTP key @@ -494,9 +496,11 @@ type PDExtGState extends PDResource { % true if the ExtGState dictionary contains HTO key property containsHTO: Boolean; % String representation of the SMask key ("None" or "Custom") - property SMask: String; + property SMaskNameValue: String; + % true if the ExtGState dictionary contains SMask key + property containsSMask: Boolean; % blend mode - property BM: String; + property BMNameValue: String; % link to blend mode link bm: CosBM?; % fill alpha From 8518730bc9d876d80d64d72be00d30fd8cd54686 Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 9 Jul 2024 21:03:55 +0300 Subject: [PATCH 16/24] Add property containsBM to PDExtGState --- src/main/java/PDLayer.mdl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/PDLayer.mdl b/src/main/java/PDLayer.mdl index deff3d5..3ceff97 100644 --- a/src/main/java/PDLayer.mdl +++ b/src/main/java/PDLayer.mdl @@ -499,6 +499,8 @@ type PDExtGState extends PDResource { property SMaskNameValue: String; % true if the ExtGState dictionary contains SMask key property containsSMask: Boolean; + % true if the ExtGState dictionary contains BM key + property containsBM: Boolean; % blend mode property BMNameValue: String; % link to blend mode From 03ab0a0eb2cf860f63f77b893e8ddfbdba54d56e Mon Sep 17 00:00:00 2001 From: Maxim Date: Fri, 9 Aug 2024 19:49:48 +0300 Subject: [PATCH 17/24] Update license headers --- .github/workflows/test-pr.yml | 21 +++++++++++++++++++ .../workflows/update-arlington-workflow.yml | 21 +++++++++++++++++++ license/template/license.txt | 2 +- pom.xml | 4 ++-- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 309c3ed..8c58b23 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -1,3 +1,24 @@ +# +# This file is part of veraPDF Validation Model API, a module of the veraPDF project. +# Copyright (c) 2015-2024, veraPDF Consortium +# All rights reserved. +# +# veraPDF Validation Model API is free software: you can redistribute it and/or modify +# it under the terms of either: +# +# The GNU General public license GPLv3+. +# You should have received a copy of the GNU General Public License +# along with veraPDF Validation Model API as the LICENSE.GPL file in the root of the source +# tree. If not, see http://www.gnu.org/licenses/ or +# https://www.gnu.org/licenses/gpl-3.0.en.html. +# +# The Mozilla Public License MPLv2+. +# You should have received a copy of the Mozilla Public License along with +# veraPDF Validation Model API as the LICENSE.MPL file in the root of the source tree. +# If a copy of the MPL was not distributed with this file, you can obtain one at +# http://mozilla.org/MPL/2.0/. +# + name: PR QA on: diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index c211ba8..fd7be08 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -1,3 +1,24 @@ +# +# This file is part of veraPDF Validation Model API, a module of the veraPDF project. +# Copyright (c) 2015-2024, veraPDF Consortium +# All rights reserved. +# +# veraPDF Validation Model API is free software: you can redistribute it and/or modify +# it under the terms of either: +# +# The GNU General public license GPLv3+. +# You should have received a copy of the GNU General Public License +# along with veraPDF Validation Model API as the LICENSE.GPL file in the root of the source +# tree. If not, see http://www.gnu.org/licenses/ or +# https://www.gnu.org/licenses/gpl-3.0.en.html. +# +# The Mozilla Public License MPLv2+. +# You should have received a copy of the Mozilla Public License along with +# veraPDF Validation Model API as the LICENSE.MPL file in the root of the source tree. +# If a copy of the MPL was not distributed with this file, you can obtain one at +# http://mozilla.org/MPL/2.0/. +# + name: Update arlington branch on: diff --git a/license/template/license.txt b/license/template/license.txt index 03f6d2b..4e2cdeb 100644 --- a/license/template/license.txt +++ b/license/template/license.txt @@ -1,5 +1,5 @@ This file is part of ${project.name}, a module of the veraPDF project. -Copyright (c) ${project.inceptionYear}, ${owner} <${email}> +Copyright (c) ${project.inceptionYear}-${current.year}, ${owner} <${email}> All rights reserved. ${project.name} is free software: you can redistribute it and/or modify diff --git a/pom.xml b/pom.xml index 5632e48..d644b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@