Skip to content

Commit 9f1a73b

Browse files
introfogiText-CI
introfog
authored and
iText-CI
committed
Refactor PDF conformance hierarchy
* Provide new PdfConformance class which store both PDF/A and PDF/UA * Get rid of "level" word everywhere * Always return not null conformance isntance from PdfDocument * Read conformance from PdfReader even for usual PdfDocument's DEVSIX-8571 Autoported commit. Original commit hash: [563a684db]
1 parent 493028b commit 9f1a73b

File tree

15 files changed

+117
-131
lines changed

15 files changed

+117
-131
lines changed

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2ElementsTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,9 @@ public virtual void HtmlToElementsToPDFATest() {
364364
PdfOutputIntent intent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", new
365365
FileStream(sourceFolder + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read));
366366
IList<IElement> elements = HtmlConverter.ConvertToElements(htmlFile, new ConverterProperties().SetBaseUri(
367-
sourceFolder).SetCreateAcroForm(true).SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_4));
367+
sourceFolder).SetCreateAcroForm(true).SetPdfAConformance(PdfAConformance.PDF_A_4));
368368
using (Document document = new Document(new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion
369-
(PdfVersion.PDF_2_0)), PdfAConformanceLevel.PDF_A_4, intent))) {
369+
(PdfVersion.PDF_2_0)), PdfAConformance.PDF_A_4, intent))) {
370370
foreach (IElement element in elements) {
371371
document.Add((IBlockElement)element);
372372
}

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfA3Test.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public virtual void ConvertToPdfA3USimpleTest() {
5454
String cmpPdf = SOURCE_FOLDER + "cmp_simple.pdf";
5555
String destinationPdf = DESTINATION_FOLDER + "simple.pdf";
5656
ConverterProperties converterProperties = new ConverterProperties();
57-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
57+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
5858
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
5959
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
6060
using (FileStream fileInputStream = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
@@ -69,7 +69,7 @@ public virtual void ConvertToPdfA3USimpleFromStringTest() {
6969
String cmpPdf = SOURCE_FOLDER + "cmp_simple.pdf";
7070
String destinationPdf = DESTINATION_FOLDER + "simple.pdf";
7171
ConverterProperties converterProperties = new ConverterProperties();
72-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
72+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
7373
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
7474
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
7575
HtmlConverter.ConvertToPdf("<html>\n" + "<head><title>Test</title></head>\n" + "<body >\n" + "<form>\n" +
@@ -84,7 +84,7 @@ public virtual void ConvertToPdfA3ASimpleTest() {
8484
String cmpPdf = SOURCE_FOLDER + "cmp_simple_a.pdf";
8585
String destinationPdf = DESTINATION_FOLDER + "simple_a.pdf";
8686
ConverterProperties converterProperties = new ConverterProperties();
87-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
87+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
8888
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
8989
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
9090
using (FileStream fileInputStream = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
@@ -102,7 +102,7 @@ public virtual void ConvertToPdfA3ColorsTest() {
102102
String destinationPdf = DESTINATION_FOLDER + "pdfA3ColorTest.pdf";
103103
String cmpPdf = SOURCE_FOLDER + "cmp_pdfA3ColorTest.pdf";
104104
ConverterProperties converterProperties = new ConverterProperties();
105-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
105+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
106106
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
107107
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
108108
using (FileStream fileInputStream = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
@@ -118,7 +118,7 @@ public virtual void ConvertToPdfA3UWithCustomFontProviderTest() {
118118
String cmpPdf = SOURCE_FOLDER + "cmp_simple_custom_font.pdf";
119119
String destinationPdf = DESTINATION_FOLDER + "simple_custom_font.pdf";
120120
ConverterProperties converterProperties = new ConverterProperties();
121-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
121+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
122122
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
123123
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
124124
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
@@ -137,8 +137,8 @@ public virtual void ConvertToPdfA3TaggedTest() {
137137
String cmpPdf = SOURCE_FOLDER + "cmp_pdfA3TaggedTest.pdf";
138138
String destinationPdf = DESTINATION_FOLDER + "pdfA3TaggedTest.pdf";
139139
ConverterProperties converterProperties = new ConverterProperties().SetBaseUri(SOURCE_FOLDER);
140-
PdfADocument pdfADocument = new PdfADocument(new PdfWriter(destinationPdf), PdfAConformanceLevel.PDF_A_3U,
141-
new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", new FileStream(SOURCE_FOLDER
140+
PdfADocument pdfADocument = new PdfADocument(new PdfWriter(destinationPdf), PdfAConformance.PDF_A_3U, new
141+
PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", new FileStream(SOURCE_FOLDER
142142
+ "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
143143
pdfADocument.SetTagged();
144144
HtmlConverter.ConvertToPdf(new FileStream(sourceHtml, FileMode.Open, FileAccess.Read), pdfADocument, converterProperties
@@ -152,7 +152,7 @@ public virtual void ConvertToPdfA3UnreferencedGlyphsTest() {
152152
String html = "<html>\n" + "<head>" + "<title>Test</title></head>\n" + "<body >\n" + "<p>أميرة</p>" + "</body>\n"
153153
+ "</html>";
154154
ConverterProperties converterProperties = new ConverterProperties();
155-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
155+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
156156
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
157157
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
158158
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
@@ -175,7 +175,7 @@ public virtual void ConvertToPdfA3ArabicFontTest() {
175175
String html = "<html>\n" + "<head>" + "<title>Test</title></head>\n" + "<body >\n" + "<p>أميرة</p>" + "</body>\n"
176176
+ "</html>";
177177
ConverterProperties converterProperties = new ConverterProperties();
178-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
178+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
179179
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
180180
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
181181
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
@@ -192,7 +192,7 @@ public virtual void ConvertToPdfA3UnreferencedEmojiTest() {
192192
String html = "<html>\n" + "<head>" + "<title>Test</title></head>\n" + "<body >\n" + "<p>\uD83D\uDE09</p>"
193193
+ "</body>\n" + "</html>";
194194
ConverterProperties converterProperties = new ConverterProperties();
195-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
195+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
196196
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
197197
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
198198
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
@@ -215,7 +215,7 @@ public virtual void ConvertToPdfA3EmojiTest() {
215215
String html = "<html>\n" + "<head>" + "<title>Test</title></head>\n" + "<body>\n" + "<p>\uD83D\uDE09</p>"
216216
+ "</body>\n" + "</html>";
217217
ConverterProperties converterProperties = new ConverterProperties();
218-
converterProperties.SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_3U);
218+
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
219219
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
220220
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
221221
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);

0 commit comments

Comments
 (0)