diff --git a/.github/tl_packages b/.github/tl_packages
index fcb7f07..00a1209 100644
--- a/.github/tl_packages
+++ b/.github/tl_packages
@@ -148,7 +148,7 @@ collection-basic
         parskip
         pdfcolfoot
         pdflscape
-        pdfmanagement-testphase
+        pdfmanagement
         pdfpages
         pdftexcmds
         ragged2e
diff --git a/testfiles/github-019b.luatex.tlg b/testfiles/github-019b.luatex.tlg
index 30fcb61..503c354 100644
--- a/testfiles/github-019b.luatex.tlg
+++ b/testfiles/github-019b.luatex.tlg
@@ -14,15 +14,15 @@ Completed box being shipped out [1]
 .\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
 ..\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT
 ...\glue 0.0 plus 1.0fil
+...\pdflinkstate 1
 ...\hbox(0.0+0.0)x345.0, direction TLT
 ....\pdfcolorstack 0 push {0 g 0 G}
 ....\hbox(0.0+0.0)x345.0, direction TLT
 ....\pdfcolorstack 0 pop
+...\pdflinkstate 0
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
 ..\vbox(550.0+0.0)x345.0, glue set 539.94232fil, direction TLT
-...\latelua0{ltx.__pdf.Page.Resources.ExtGState=true}
-...\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])}
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
@@ -64,6 +64,7 @@ Completed box being shipped out [1]
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
+..\pdflinkstate 1
 ..\glue(\baselineskip) 23.34
 ..\hbox(6.66+0.0)x345.0, direction TLT
 ...\pdfcolorstack 0 push {0 g 0 G}
@@ -72,6 +73,7 @@ Completed box being shipped out [1]
 ....\TU/lmr/m/n/10 1
 ....\glue 0.0 plus 1.0fil
 ...\pdfcolorstack 0 pop
+..\pdflinkstate 0
 .\kern0.0
 .\kern-633.0
 .\hbox(0.0+0.0)x0.0, direction TLT
diff --git a/testfiles/github-019b.tlg b/testfiles/github-019b.tlg
index 7fc7aa8..37b0e3c 100644
--- a/testfiles/github-019b.tlg
+++ b/testfiles/github-019b.tlg
@@ -13,10 +13,12 @@ Completed box being shipped out [1]
 .\vbox(617.0+0.0)x345.0, shifted 62.0
 ..\vbox(12.0+0.0)x345.0, glue set 12.0fil
 ...\glue 0.0 plus 1.0fil
+...\pdfrunninglinkoff
 ...\hbox(0.0+0.0)x345.0
 ....\pdfcolorstack 0 push {0 g 0 G}
 ....\hbox(0.0+0.0)x345.0
 ....\pdfcolorstack 0 pop
+...\pdfrunninglinkon
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
 ..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
@@ -51,6 +53,7 @@ Completed box being shipped out [1]
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
+..\pdfrunninglinkoff
 ..\glue(\baselineskip) 23.5849
 ..\hbox(6.4151+0.0)x345.0
 ...\pdfcolorstack 0 push {0 g 0 G}
@@ -59,6 +62,7 @@ Completed box being shipped out [1]
 ....\T1/cmr/m/n/10 1
 ....\glue 0.0 plus 1.0fil
 ...\pdfcolorstack 0 pop
+..\pdfrunninglinkon
 .\kern 0.0
 .\kern -633.0
 .\hbox(0.0+0.0)x0.0
diff --git a/testfiles/github-019b.xetex.tlg b/testfiles/github-019b.xetex.tlg
index 0c73f65..d3418a3 100644
--- a/testfiles/github-019b.xetex.tlg
+++ b/testfiles/github-019b.xetex.tlg
@@ -12,7 +12,7 @@ Completed box being shipped out [1]
 ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
 ...\kern -72.26999
 ...\hbox(0.0+0.0)x0.0
-....\special{pdf: put @thispage <<>>}
+....\special{pdf: put @thispage <</Tabs /S >>}
 ....\special{pdf:put @resources <</ExtGState @pdf.obj1>>}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
 ...\glue 0.0 plus 1.0fil minus 1.0fil
@@ -20,13 +20,17 @@ Completed box being shipped out [1]
 .\vbox(617.0+0.0)x345.0, shifted 62.0
 ..\vbox(12.0+0.0)x345.0, glue set 12.0fil
 ...\glue 0.0 plus 1.0fil
+...\special{pdf:nolink}
 ...\hbox(0.0+0.0)x345.0
 ....\special{color push gray 0}
 ....\hbox(0.0+0.0)x345.0
 ....\special{color pop}
+...\special{pdf:link}
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
 ..\vbox(550.0+0.0)x345.0, glue set 539.94232fil
+...\special{pdf:majorversion 2}
+...\special{pdf:minorversion 0}
 ...\special{pdf:put @pdf.obj1<</opacity1 <</ca 1/CA 1>>>>}
 ...\special{pdf:trailerid[ <00112233445566778899aabbccddeeff> <00112233445566778899aabbccddeeff> ]}
 ...\write-{}
@@ -49,6 +53,7 @@ Completed box being shipped out [1]
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
+..\special{pdf:nolink}
 ..\glue(\baselineskip) 23.34
 ..\hbox(6.66+0.0)x345.0
 ...\special{color push gray 0}
@@ -57,11 +62,12 @@ Completed box being shipped out [1]
 ....\TU/lmr/m/n/10 1
 ....\glue 0.0 plus 1.0fil
 ...\special{color pop}
+..\special{pdf:link}
 .\kern 0.0
 .\kern 0.0
 .\kern -633.0
 .\hbox(0.0+0.0)x0.0
-..\special{pdf:stream @pdf.obj5 (
+..\special{pdf:stream @pdf.obj21 (
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
 <x:xmpmeta xmlns:x="adobe:ns:meta/">
  <rdf:RDF xmlns:rdf="http://www.w3.org/....-..-..-rdf-syntax-ns#">
@@ -76,7 +82,6 @@ Completed box being shipped out [1]
     xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
     xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/"
     xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
-    xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"
     xmlns:prism="http://prismstandard.org/namespaces/basic/3.0/"
     xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#"
     xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"
@@ -84,7 +89,8 @@ Completed box being shipped out [1]
     xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
     xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
     xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
-    xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#">
+    xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#"
+    xmlns:tdm="http://www.w3.org/ns/tdmrep/">
    <pdfaExtension:schemas>
     <rdf:Bag>
      <rdf:li rdf:parseType="Resource">
@@ -144,21 +150,6 @@ Completed box being shipped out [1]
        </rdf:Seq>
       </pdfaSchema:property>
      </rdf:li>
-     <rdf:li rdf:parseType="Resource">
-      <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
-      <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>
-      <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>
-      <pdfaSchema:property>
-       <rdf:Seq>
-        <rdf:li rdf:parseType="Resource">
-         <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
-         <pdfaProperty:valueType>Text</pdfaProperty:valueType>
-         <pdfaProperty:category>internal</pdfaProperty:category>
-         <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
-        </rdf:li>
-       </rdf:Seq>
-      </pdfaSchema:property>
-     </rdf:li>
      <rdf:li rdf:parseType="Resource">
       <pdfaSchema:schema>PRISM Basic Metadata</pdfaSchema:schema>
       <pdfaSchema:prefix>prism</pdfaSchema:prefix>
@@ -250,11 +241,27 @@ Completed box being shipped out [1]
          <pdfaProperty:description>Number of pages in the print version of the document</pdfaProperty:description>
         </rdf:li>
         <rdf:li rdf:parseType="Resource">
-         <pdfaProperty:name>subtitle</pdfaProperty:name>\ETC.}
+         <pdfaProperty:name>subtitle</pdfaProperty:name>
+         <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+         <pdfaProperty:category>external</pdfaProperty:category>
+         <pdfaProperty:description>Document's subtitle</pdfaProperty:description>
+        </rdf:li>
+       </rdf:Seq>
+      </pdfaSchema:property>
+     </rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <pdfaSchema:schema>TDMRep</pdfaSchema:schema>
+      <pdfaSchema:prefix>tdm</pdfaSchema:prefix>
+      <pdfaSchema:namespaceURI>http://www.w3.org/ns/tdmrep/</pdfaSchema:namespaceURI>
+      <pdfaSchema:property>
+       <rdf:Seq>
+        <rdf:li rdf:parseType="Resource">
+         <pdfaProperty:name>reservation</pdfaProperty:name>
+         <pdfaProperty:va\ETC.}
 ..\special{pdf:docinfo<</Producer (xetex)>>}
 ..\special{pdf:docinfo<</Creator (TeX)>>}
 ..\special{pdf:docinfo<</CreationDate (D:20160520090000Z)>>}
 ..\special{pdf:docinfo<</ModDate (D:20160520090000Z)>>}
 ..\special{pdf:put @catalog<</Lang (en)>>}
-..\special{pdf:put @catalog<</Metadata @pdf.obj5>>}
+..\special{pdf:put @catalog<</Metadata @pdf.obj21>>}
 .\kern 633.0
diff --git a/testfiles/mathcolor-01.luatex.tlg b/testfiles/mathcolor-01.luatex.tlg
index 2ca3780..727080a 100644
--- a/testfiles/mathcolor-01.luatex.tlg
+++ b/testfiles/mathcolor-01.luatex.tlg
@@ -23,7 +23,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 29.5366fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 24.53714fil, direction TLT
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\glue(\topskip) 3.06
@@ -957,9 +957,10 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ......\OT1/cmss/m/n/7 f
+......\kern0.5165 (italic)
 ......\OT1/cmss/m/n/7 o
 ......\kern0.20659 (font)
 ......\OT1/cmss/m/n/7 o
@@ -975,9 +976,10 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ......\OT1/cmss/m/n/7 f
+......\kern0.5165 (italic)
 ......\OT1/cmss/m/n/7 o
 ......\kern0.20659 (font)
 ......\OT1/cmss/m/n/7 o
@@ -994,11 +996,12 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\hbox(4.8611+0.0)x9.91678, direction TLT
+......\hbox(4.8611+0.0)x10.43327, direction TLT
 .......\pdfcolorstack 0 push {0 g 0 G}
 .......\OT1/cmss/m/n/7 f
+.......\kern0.5165 (italic)
 .......\OT1/cmss/m/n/7 o
 .......\kern0.20659 (font)
 .......\OT1/cmss/m/n/7 o
@@ -1026,11 +1029,12 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\hbox(4.8611+0.0)x9.91678, direction TLT
+......\hbox(4.8611+0.0)x10.43327, direction TLT
 .......\pdfcolorstack 0 push {0 g 0 G}
 .......\OT1/cmss/m/n/7 f
+.......\kern0.5165 (italic)
 .......\OT1/cmss/m/n/7 o
 .......\kern0.20659 (font)
 .......\OT1/cmss/m/n/7 o
@@ -1046,11 +1050,12 @@ Completed box being shipped out [1]
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\vbox(18.36115+13.02782)x14.44447, direction TLT
 .....\kern1.0 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\hbox(4.8611+0.0)x9.91678, direction TLT
+......\hbox(4.8611+0.0)x10.43327, direction TLT
 .......\pdfcolorstack 0 push {0 g 0 G}
 .......\OT1/cmss/m/n/7 f
+.......\kern0.5165 (italic)
 .......\OT1/cmss/m/n/7 o
 .......\kern0.20659 (font)
 .......\OT1/cmss/m/n/7 o
@@ -1180,7 +1185,6 @@ Completed box being shipped out [1]
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -1212,7 +1216,7 @@ Completed box being shipped out [2]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 133.45297fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 128.4535fil, direction TLT
 ...\glue(\topskip) 2.95
 ...\hbox(7.05+1.94)x345.0, glue set 207.08fil, direction TLT
 ....\localpar
@@ -2157,7 +2161,6 @@ Completed box being shipped out [2]
 ....\kern0.4398 (italic)
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-01.tlg b/testfiles/mathcolor-01.tlg
index 95a43d5..1413d90 100644
--- a/testfiles/mathcolor-01.tlg
+++ b/testfiles/mathcolor-01.tlg
@@ -23,7 +23,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 31.28424fil
+..\vbox(550.0+0.0)x345.0, glue set 26.28477fil
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\glue(\topskip) 3.05556
@@ -1109,7 +1109,6 @@ Completed box being shipped out [1]
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -1141,7 +1140,7 @@ Completed box being shipped out [2]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 133.79738fil
+..\vbox(550.0+0.0)x345.0, glue set 128.79791fil
 ...\glue(\topskip) 3.05556
 ...\hbox(6.94444+1.94444)x345.0, glue set 207.08308fil
 ....\hbox(0.0+0.0)x15.0
@@ -1984,7 +1983,6 @@ Completed box being shipped out [2]
 ....\kern0.4398
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-01.xetex.tlg b/testfiles/mathcolor-01.xetex.tlg
index e96c747..7fb99cc 100644
--- a/testfiles/mathcolor-01.xetex.tlg
+++ b/testfiles/mathcolor-01.xetex.tlg
@@ -16,7 +16,7 @@ Completed box being shipped out [1]
 ....\special{color pop}
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 29.53674fil
+..\vbox(550.0+0.0)x345.0, glue set 24.53728fil
 ...\write-{}
 ...\special{color push gray 0}
 ...\glue(\topskip) 3.06
@@ -965,7 +965,6 @@ Completed box being shipped out [1]
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -989,7 +988,7 @@ Completed box being shipped out [2]
 ....\special{color pop}
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 133.45303fil
+..\vbox(550.0+0.0)x345.0, glue set 128.45357fil
 ...\glue(\topskip) 2.95
 ...\hbox(7.05+1.93999)x345.0, glue set 207.08fil
 ....\hbox(0.0+0.0)x15.0
@@ -1661,7 +1660,6 @@ Completed box being shipped out [2]
 ....\kern0.4398
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-02.luatex.tlg b/testfiles/mathcolor-02.luatex.tlg
index 2ca3780..727080a 100644
--- a/testfiles/mathcolor-02.luatex.tlg
+++ b/testfiles/mathcolor-02.luatex.tlg
@@ -23,7 +23,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 29.5366fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 24.53714fil, direction TLT
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\glue(\topskip) 3.06
@@ -957,9 +957,10 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ......\OT1/cmss/m/n/7 f
+......\kern0.5165 (italic)
 ......\OT1/cmss/m/n/7 o
 ......\kern0.20659 (font)
 ......\OT1/cmss/m/n/7 o
@@ -975,9 +976,10 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
 ......\OT1/cmss/m/n/7 f
+......\kern0.5165 (italic)
 ......\OT1/cmss/m/n/7 o
 ......\kern0.20659 (font)
 ......\OT1/cmss/m/n/7 o
@@ -994,11 +996,12 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\hbox(4.8611+0.0)x9.91678, direction TLT
+......\hbox(4.8611+0.0)x10.43327, direction TLT
 .......\pdfcolorstack 0 push {0 g 0 G}
 .......\OT1/cmss/m/n/7 f
+.......\kern0.5165 (italic)
 .......\OT1/cmss/m/n/7 o
 .......\kern0.20659 (font)
 .......\OT1/cmss/m/n/7 o
@@ -1026,11 +1029,12 @@ Completed box being shipped out [1]
 ......\hbox(1.0+15.00012)x14.44447, shifted -9.50006, direction TLT
 .......\OMX/cmex/m/n/10 X
 .....\kern1.66666 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\hbox(4.8611+0.0)x9.91678, direction TLT
+......\hbox(4.8611+0.0)x10.43327, direction TLT
 .......\pdfcolorstack 0 push {0 g 0 G}
 .......\OT1/cmss/m/n/7 f
+.......\kern0.5165 (italic)
 .......\OT1/cmss/m/n/7 o
 .......\kern0.20659 (font)
 .......\OT1/cmss/m/n/7 o
@@ -1046,11 +1050,12 @@ Completed box being shipped out [1]
 ....\glue(\thickmuskip) 2.77771 plus 2.77771
 ....\vbox(18.36115+13.02782)x14.44447, direction TLT
 .....\kern1.0 (font)
-.....\hbox(4.8611+0.0)x14.44447, glue set 2.26385fil, direction TLT
+.....\hbox(4.8611+0.0)x14.44447, glue set 2.0056fil, direction TLT
 ......\glue 0.0 plus 1.0fil minus 1.0fil
-......\hbox(4.8611+0.0)x9.91678, direction TLT
+......\hbox(4.8611+0.0)x10.43327, direction TLT
 .......\pdfcolorstack 0 push {0 g 0 G}
 .......\OT1/cmss/m/n/7 f
+.......\kern0.5165 (italic)
 .......\OT1/cmss/m/n/7 o
 .......\kern0.20659 (font)
 .......\OT1/cmss/m/n/7 o
@@ -1180,7 +1185,6 @@ Completed box being shipped out [1]
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -1212,7 +1216,7 @@ Completed box being shipped out [2]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 133.45297fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 128.4535fil, direction TLT
 ...\glue(\topskip) 2.95
 ...\hbox(7.05+1.94)x345.0, glue set 207.08fil, direction TLT
 ....\localpar
@@ -2157,7 +2161,6 @@ Completed box being shipped out [2]
 ....\kern0.4398 (italic)
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-02.tlg b/testfiles/mathcolor-02.tlg
index 95a43d5..1413d90 100644
--- a/testfiles/mathcolor-02.tlg
+++ b/testfiles/mathcolor-02.tlg
@@ -23,7 +23,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 31.28424fil
+..\vbox(550.0+0.0)x345.0, glue set 26.28477fil
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\glue(\topskip) 3.05556
@@ -1109,7 +1109,6 @@ Completed box being shipped out [1]
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -1141,7 +1140,7 @@ Completed box being shipped out [2]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 133.79738fil
+..\vbox(550.0+0.0)x345.0, glue set 128.79791fil
 ...\glue(\topskip) 3.05556
 ...\hbox(6.94444+1.94444)x345.0, glue set 207.08308fil
 ....\hbox(0.0+0.0)x15.0
@@ -1984,7 +1983,6 @@ Completed box being shipped out [2]
 ....\kern0.4398
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-02.xetex.tlg b/testfiles/mathcolor-02.xetex.tlg
index e96c747..7fb99cc 100644
--- a/testfiles/mathcolor-02.xetex.tlg
+++ b/testfiles/mathcolor-02.xetex.tlg
@@ -16,7 +16,7 @@ Completed box being shipped out [1]
 ....\special{color pop}
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 29.53674fil
+..\vbox(550.0+0.0)x345.0, glue set 24.53728fil
 ...\write-{}
 ...\special{color push gray 0}
 ...\glue(\topskip) 3.06
@@ -965,7 +965,6 @@ Completed box being shipped out [1]
 ....\OML/cmm/m/it/10 x
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
@@ -989,7 +988,7 @@ Completed box being shipped out [2]
 ....\special{color pop}
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 133.45303fil
+..\vbox(550.0+0.0)x345.0, glue set 128.45357fil
 ...\glue(\topskip) 2.95
 ...\hbox(7.05+1.93999)x345.0, glue set 207.08fil
 ....\hbox(0.0+0.0)x15.0
@@ -1661,7 +1660,6 @@ Completed box being shipped out [2]
 ....\kern0.4398
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-03.luatex.tlg b/testfiles/mathcolor-03.luatex.tlg
index c5199c0..3616634 100644
--- a/testfiles/mathcolor-03.luatex.tlg
+++ b/testfiles/mathcolor-03.luatex.tlg
@@ -23,7 +23,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 487.03665fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 482.0372fil, direction TLT
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\glue(\topskip) 10.0
@@ -128,7 +128,6 @@ Completed box being shipped out [1]
 ....\OT1/cmr/m/n/10 =
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-03.tlg b/testfiles/mathcolor-03.tlg
index 62b34c0..d61f3d0 100644
--- a/testfiles/mathcolor-03.tlg
+++ b/testfiles/mathcolor-03.tlg
@@ -23,7 +23,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 487.03667fil
+..\vbox(550.0+0.0)x345.0, glue set 482.0372fil
 ...\write-{}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\glue(\topskip) 10.0
@@ -123,7 +123,6 @@ Completed box being shipped out [1]
 ....\OT1/cmr/m/n/10 =
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil
diff --git a/testfiles/mathcolor-03.xetex.tlg b/testfiles/mathcolor-03.xetex.tlg
index 7522273..2d18ce5 100644
--- a/testfiles/mathcolor-03.xetex.tlg
+++ b/testfiles/mathcolor-03.xetex.tlg
@@ -16,7 +16,7 @@ Completed box being shipped out [1]
 ....\special{color pop}
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 487.03667fil
+..\vbox(550.0+0.0)x345.0, glue set 482.0372fil
 ...\write-{}
 ...\special{color push gray 0}
 ...\glue(\topskip) 10.0
@@ -116,7 +116,6 @@ Completed box being shipped out [1]
 ....\OT1/cmr/m/n/10 =
 ...\penalty 0
 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
-...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil