2016-10-19 22:59:00

1 files changed, 18 insertions, 0 deletions

diff --git a/tex/context/base/mkiv/lpdf-fmt.lua b/tex/context/base/mkiv/lpdf-fmt.lua
index 62b7eb91e..8bbd3374f 100644
--- a/tex/context/base/mkiv/lpdf-fmt.lua
+++ b/tex/context/base/mkiv/lpdf-fmt.lua
@@ -114,6 +114,7 @@ local formats = utilities.storage.allocate {
         transparency            = true, -- todo: block at lua level
         jbig2_compression       = true, -- todo: block at lua level
         jpeg2000_compression    = true, -- todo: block at lua level
+        include_cidsets         = true,
         inject_metadata         = function()
             -- nothing
         end
@@ -128,6 +129,7 @@ local formats = utilities.storage.allocate {
             cmyk_colors             = true,
             spot_colors             = true,
             internal_icc_profiles   = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 addtoinfo("GTS_PDFXVersion","PDF/X-1a:2001")
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfxid='http://www.npes.org/pdfx/ns/id/'><pdfxid:GTS_PDFXVersion>PDF/X-1a:2001</pdfxid:GTS_PDFXVersion></rdf:Description>",false)
@@ -142,6 +144,7 @@ local formats = utilities.storage.allocate {
             cmyk_colors             = true,
             spot_colors             = true,
             internal_icc_profiles   = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 addtoinfo("GTS_PDFXVersion","PDF/X-1a:2003")
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfxid='http://www.npes.org/pdfx/ns/id/'><pdfxid:GTS_PDFXVersion>PDF/X-1a:2003</pdfxid:GTS_PDFXVersion></rdf:Description>",false)
@@ -160,6 +163,7 @@ local formats = utilities.storage.allocate {
             cielab_colors           = true,
             internal_icc_profiles   = true,
             include_intents         = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 addtoinfo("GTS_PDFXVersion","PDF/X-3:2002")
             end
@@ -178,6 +182,7 @@ local formats = utilities.storage.allocate {
             internal_icc_profiles   = true,
             include_intents         = true,
             jbig2_compression       = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 addtoinfo("GTS_PDFXVersion","PDF/X-3:2003")
             end
@@ -200,6 +205,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true,
             object_compression      = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfxid='http://www.npes.org/pdfx/ns/id/'><pdfxid:GTS_PDFXVersion>PDF/X-4</pdfxid:GTS_PDFXVersion></rdf:Description>",false)
                 insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:VersionID>1</xmpMM:VersionID>",false)
@@ -225,6 +231,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true,
             object_compression      = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfxid='http://www.npes.org/pdfx/ns/id/'><pdfxid:GTS_PDFXVersion>PDF/X-4p</pdfxid:GTS_PDFXVersion></rdf:Description>",false)
                 insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:VersionID>1</xmpMM:VersionID>",false)
@@ -250,6 +257,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true,
             object_compression      = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 -- todo
             end
@@ -274,6 +282,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true,
             object_compression      = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 -- todo
             end
@@ -297,6 +306,7 @@ local formats = utilities.storage.allocate {
             jpeg2000_compression    = true,
             nchannel_colorspace     = true,
             object_compression      = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 -- todo
             end
@@ -316,6 +326,7 @@ local formats = utilities.storage.allocate {
             forms                   = true, -- NEW; forms are allowed (with limitations); no JS,  other restrictions are unknown (TODO)
             tagging                 = true, -- NEW; the only difference to PDF/A-1b
             internal_icc_profiles   = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfaid='http://www.aiim.org/pdfa/ns/id/'><pdfaid:part>1</pdfaid:part><pdfaid:conformance>A</pdfaid:conformance></rdf:Description>",false)
             end
@@ -334,6 +345,7 @@ local formats = utilities.storage.allocate {
             include_intents         = true,
             forms                   = true,
             internal_icc_profiles   = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfaid='http://www.aiim.org/pdfa/ns/id/'><pdfaid:part>1</pdfaid:part><pdfaid:conformance>B</pdfaid:conformance></rdf:Description>",false)
             end
@@ -357,6 +369,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true, -- NEW
             object_compression      = true,
+            include_cidsets         = false,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfaid='http://www.aiim.org/pdfa/ns/id/'><pdfaid:part>2</pdfaid:part><pdfaid:conformance>A</pdfaid:conformance></rdf:Description>",false)
             end
@@ -380,6 +393,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true,
             object_compression      = true,
+            include_cidsets         = false,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfaid='http://www.aiim.org/pdfa/ns/id/'><pdfaid:part>3</pdfaid:part><pdfaid:conformance>A</pdfaid:conformance></rdf:Description>",false)
             end
@@ -402,6 +416,7 @@ local formats = utilities.storage.allocate {
             jbig2_compression       = true,
             jpeg2000_compression    = true,
             object_compression      = true,
+            include_cidsets         = true,
             inject_metadata         = function()
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfaid='http://www.aiim.org/pdfa/ns/id/'><pdfaid:part>3</pdfaid:part><pdfaid:conformance>A</pdfaid:conformance></rdf:Description>",false)
                 injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfuaid='http://www.aiim.org/pdfua/ns/id/'><pdfuaid:part>1</pdfuaid:part></rdf:Description>",false)
@@ -738,6 +753,9 @@ function codeinjections.setformat(s)
                 report_backend("forcing pdf version %s.%s, compression disabled",
                     majorversion,minorversion)
             end
+            if pdf.setomitcidset then
+                pdf.setomitcidset(formatspecification.include_cidsets == false and 1 or 0)
+            end
             --
             -- context.setupcolors { -- not this way
             --     cmyk = spec.cmyk_colors and variables.yes or variables.no,