Add support of transparency grouping

dvipdfmx.def

@@ -130,21 +130,24 @@
   \fi
 }
 \let\Gread@bmp\Gread@pdf
+\newif\ifGread@transgroup
 \def\Ginclude@pdf#1{%
   \let\Gin@decode\@empty
   \Gin@interpolatefalse
-  \Ginclude@dvipdfmx{#1}{epdf}%
+  \Gread@transgrouptrue
+  \Ginclude@dvipdfmx{#1}%
 }
 \def\Ginclude@bmp#1{%
   \let\Gin@page\@empty
   \let\Gin@pagebox\@empty
-  \Ginclude@dvipdfmx{#1}{image}%
+  \Gread@transgroupfalse
+  \Ginclude@dvipdfmx{#1}%
 }
-\def\Ginclude@dvipdfmx#1#2{%
+\def\Ginclude@dvipdfmx#1{%
   \Gin@log{<#1>}%
   \bgroup
   \def\@tempa{!}%
-    \special{pdf:#2\GPT@space
+    \special{pdf:image\GPT@space
       \ifx\Gin@page\@empty\else page\GPT@space\Gin@page\GPT@space\fi
       \ifx\Gin@pagebox\@empty\else pagebox\GPT@space\Gin@pagebox\GPT@space\fi
       bbox\GPT@space\Gin@llx\GPT@space\Gin@lly\GPT@space\Gin@urx\GPT@space\Gin@ury\GPT@space
@@ -155,9 +158,11 @@
       \ifnum0%
         \ifx\Gin@decode\@empty\else 1\fi
         \ifGin@interpolate 1\fi
+        \ifGread@transgroup 1\fi
         >0 %
         <<%
           \ifx\Gin@decode\@empty\else /Decode[\Gin@decode]\fi
+          \ifGread@transgroup/Group<</S/Transparency/K false/I false>>\fi
           \ifGin@interpolate /Interpolate true\fi
         >>%
       \fi

luatex.def

@@ -248,6 +248,7 @@
 \@ifundefined{Gin@interpolate}
   {\csname newif\endcsname\ifGin@interpolate}
   {}
+\newif\ifGread@transgroup
 \def\Gread@@pdftex#1{%
   \edef\Gin@attr@hash{%
     \ifx\Gin@pagebox\@empty
@@ -271,9 +272,11 @@
         \ifnum0%
           \ifx\Gin@decode\@empty\else 1\fi
           \ifGin@interpolate 1\fi
+          \ifGread@transgroup 1\fi
           >0 %
           attr{%
             \ifx\Gin@decode\@empty\else/Decode[\Gin@decode]\fi
+            \ifGread@transgroup/Group<</S/Transparency/K false/I false>>\fi
             \ifGin@interpolate/Interpolate true\fi
           }%
         \fi
@@ -309,13 +312,15 @@
 }
 \def\Gread@png#1{%
   \let\Gin@page\@empty
+  \Gread@transgroupfalse
   \Gread@pdftex{#1}%
 }
 \let\Gread@jpg\Gread@png
 \expandafter\let\csname Gread@jbig2\endcsname\Gread@png
 \def\Gread@pdf#1{%
   \let\Gin@decode\@empty
   \Gin@interpolatefalse
+  \Gread@transgrouptrue
   \Gread@pdftex{#1}%
 }
 \let\Gread@mps\Gread@eps

pdftex.def

@@ -258,6 +258,7 @@ E     \else
 \@ifundefined{Gin@interpolate}
   {\csname newif\endcsname\ifGin@interpolate}
   {}
+\newif\ifGread@transgroup
 \def\Gread@@pdftex#1{%
   \edef\Gin@attr@hash{%
     \ifx\Gin@pagebox\@empty
@@ -281,9 +282,11 @@ E     \else
         \ifnum0%
           \ifx\Gin@decode\@empty\else 1\fi
           \ifGin@interpolate 1\fi
+          \ifGread@transgroup 1\fi
           >0 %
           attr{%
             \ifx\Gin@decode\@empty\else/Decode[\Gin@decode]\fi
+            \ifGread@transgroup/Group<</S/Transparency/K false/I false>>\fi
             \ifGin@interpolate/Interpolate true\fi
           }%
         \fi
@@ -320,13 +323,15 @@ E     \else
 \def\Gread@png#1{%
   \let\Gin@page\@empty
   \let\Gin@pagebox\@empty
+  \Gread@transgroupfalse
   \Gread@pdftex{#1}%
 }
 \let\Gread@jpg\Gread@png
 \expandafter\let\csname Gread@jbig2\endcsname\Gread@png
 \def\Gread@pdf#1{%
   \let\Gin@decode\@empty
   \Gin@interpolatefalse
+  \Gread@transgrouptrue
   \Gread@pdftex{#1}%
 }
 \let\Gread@mps\Gread@eps

testfiles-plain/eplain-001.xetex.tlg

@@ -47,4 +47,4 @@ xetex.def: ....-..-.. v... Graphics/color driver for xetex
 \Gin@req@width=\dimen...
 ))
 example-image.pdf: Graphic file (type pdf)
-<use example-image.pdf>
+<example-image.pdf>

testfiles-xetex/xetex001.tlg

@@ -1,13 +1,13 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 File: example-image-a.pdf Graphic file (type pdf)
-<use example-image-a.pdf>
+<example-image-a.pdf>
 File: example-image-a.pdf Graphic file (type pdf)
-<use example-image-a.pdf, page 1>
+<example-image-a.pdf>
 File: az2.pdf Graphic file (type pdf)
-<use az2.pdf>
+<az2.pdf>
 File: az2.pdf Graphic file (type pdf)
-<use az2.pdf>
+<az2.pdf>
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\glue 16.0
@@ -24,18 +24,7 @@ Completed box being shipped out [1]
 ...\hbox(240.8994+0.0)x345.0, glue set 8.80078fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(240.8994+0.0)x321.19922
-.....\hbox(240.9+0.0)x321.20001
-......\hbox(240.9+0.0)x321.20001
-.......\hbox(240.9+0.0)x0.0
-........\special{pdf:btrans}
-........\special{x:scale 1 1}
-........\hbox(240.9+0.0)x0.0, glue set - 321.20001fil
-.........\hbox(240.9+0.0)x321.20001
-..........\XeTeXpdffile "./example-image-a.pdf"
-.........\glue 0.0 plus 1.0fil minus 1.0fil
-........\special{pdf:etrans}
-.......\kern 321.20001
-.......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{pdf:image pagebox cropbox bbox 0 0 319.99922 239.9994 clip 0 width 321.19922pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -45,18 +34,7 @@ Completed box being shipped out [1]
 ...\hbox(240.8994+0.0)x345.0, glue set 8.80078fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(240.8994+0.0)x321.19922
-.....\hbox(240.9+0.0)x321.20001
-......\hbox(240.9+0.0)x321.20001
-.......\hbox(240.9+0.0)x0.0
-........\special{pdf:btrans}
-........\special{x:scale 1 1}
-........\hbox(240.9+0.0)x0.0, glue set - 321.20001fil
-.........\hbox(240.9+0.0)x321.20001
-..........\XeTeXpdffile "./example-image-a.pdf"
-.........\glue 0.0 plus 1.0fil minus 1.0fil
-........\special{pdf:etrans}
-.......\kern 321.20001
-.......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{pdf:image page 1 pagebox cropbox bbox 0 0 319.99922 239.9994 clip 0 width 321.19922pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -66,18 +44,7 @@ Completed box being shipped out [1]
 ...\hbox(50.18736+0.0)x345.0, glue set 299.88759fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(50.18736+0.0)x30.11241
-.....\hbox(50.1875+0.0)x30.1125
-......\hbox(50.1875+0.0)x30.1125
-.......\hbox(50.1875+0.0)x0.0
-........\special{pdf:btrans}
-........\special{x:scale 1 1}
-........\hbox(50.1875+0.0)x0.0, glue set - 30.1125fil
-.........\hbox(50.1875+0.0)x30.1125
-..........\XeTeXpdffile "./az2.pdf"
-.........\glue 0.0 plus 1.0fil minus 1.0fil
-........\special{pdf:etrans}
-.......\kern 30.1125
-.......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{pdf:image pagebox cropbox bbox 0 0 29.99992 49.99988 clip 0 width 30.11241pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -110,18 +77,7 @@ Completed box being shipped out [2]
 ...\hbox(36.13489+0.0)x345.0, glue set 293.86511fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(36.13489+0.0)x36.13489
-.....\hbox(36.135+0.0)x36.135
-......\hbox(36.135+0.0)x36.135
-.......\hbox(36.135+0.0)x0.0
-........\special{pdf:btrans}
-........\special{x:scale 1 1}
-........\hbox(36.135+0.0)x0.0, glue set - 36.135fil
-.........\hbox(36.135+0.0)x36.135
-..........\XeTeXpdffile "./az2.pdf"
-.........\glue 0.0 plus 1.0fil minus 1.0fil
-........\special{pdf:etrans}
-.......\kern 36.135
-.......\glue 0.0 plus 1.0fil minus 1.0fil
+.....\special{pdf:image pagebox artbox bbox 0 0 35.9999 35.9999 clip 0 width 36.13489pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0

testfiles/dvipdfmx001.luatex.tlg

@@ -30,7 +30,7 @@ Completed box being shipped out [1]
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
 ....\hbox(240.9+0.0)x321.2, direction TLT
-.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) }
+.....\special{pdf:image pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -45,7 +45,7 @@ Completed box being shipped out [1]
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
 ....\hbox(240.9+0.0)x321.2, direction TLT
-.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) }
+.....\special{pdf:image page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -60,7 +60,7 @@ Completed box being shipped out [1]
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
 ....\hbox(50.1875+0.0)x30.11249, direction TLT
-.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) }
+.....\special{pdf:image pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -99,7 +99,7 @@ Completed box being shipped out [2]
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
 ....\hbox(36.135+0.0)x36.135, direction TLT
-.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) }
+.....\special{pdf:image pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0

testfiles/dvipdfmx001.tlg

@@ -25,7 +25,7 @@ Completed box being shipped out [1]
 ...\hbox(240.9+0.0)x345.0, glue set 8.8fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(240.9+0.0)x321.2
-.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) }
+.....\special{pdf:image pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -35,7 +35,7 @@ Completed box being shipped out [1]
 ...\hbox(240.9+0.0)x345.0, glue set 8.8fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(240.9+0.0)x321.2
-.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) }
+.....\special{pdf:image page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -45,7 +45,7 @@ Completed box being shipped out [1]
 ...\hbox(50.1875+0.0)x345.0, glue set 299.88751fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(50.1875+0.0)x30.11249
-.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) }
+.....\special{pdf:image pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -79,7 +79,7 @@ Completed box being shipped out [2]
 ...\hbox(36.135+0.0)x345.0, glue set 293.865fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(36.135+0.0)x36.135
-.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) }
+.....\special{pdf:image pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0

testfiles/dvipdfmx001.xetex.tlg

@@ -25,7 +25,7 @@ Completed box being shipped out [1]
 ...\hbox(240.9+0.0)x345.0, glue set 8.8fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(240.9+0.0)x321.2
-.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) }
+.....\special{pdf:image pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -35,7 +35,7 @@ Completed box being shipped out [1]
 ...\hbox(240.9+0.0)x345.0, glue set 8.8fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(240.9+0.0)x321.2
-.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) }
+.....\special{pdf:image page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -45,7 +45,7 @@ Completed box being shipped out [1]
 ...\hbox(50.1875+0.0)x345.0, glue set 299.88751fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(50.1875+0.0)x30.11249
-.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) }
+.....\special{pdf:image pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -79,7 +79,7 @@ Completed box being shipped out [2]
 ...\hbox(36.135+0.0)x345.0, glue set 293.865fil
 ....\hbox(0.0+0.0)x15.0
 ....\hbox(36.135+0.0)x36.135
-.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) }
+.....\special{pdf:image pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) <</Group<</S/Transparency/K false/I false>>>>}
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0