[latex3-commits] [git/LaTeX3-latex3-pdfresources] backendtest: more test changes (0703760)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon Sep 2 21:23:08 CEST 2019
Repository : https://github.com/latex3/pdfresources
On branch : backendtest
Link : https://github.com/latex3/pdfresources/commit/0703760281dbfcdf088cafbcf6657fb76e5ff856
>---------------------------------------------------------------
commit 0703760281dbfcdf088cafbcf6657fb76e5ff856
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Sep 2 21:23:08 2019 +0200
more test changes
>---------------------------------------------------------------
0703760281dbfcdf088cafbcf6657fb76e5ff856
.../calculationsortorder.pdftex.tpf | 290 ++++++++++----------
.../calculationsortorder.pvt | 15 +-
.../calculationsortorder.tpf | 305 +++++++++++----------
testfiles-pool/calculationsortorder.pvt | 15 +-
testfiles/metadata.xetex.tpf | 76 +++--
testfiles/pgfpatches.xetex.tpf | 75 +++--
testfiles/viewerpreferences.xetex.tpf | 68 +++--
7 files changed, 455 insertions(+), 389 deletions(-)
diff --git a/testfiles-pool/calculationsortorder.tpf b/testfiles-noxetex/calculationsortorder.pdftex.tpf
similarity index 57%
copy from testfiles-pool/calculationsortorder.tpf
copy to testfiles-noxetex/calculationsortorder.pdftex.tpf
index 59f224c..a380180 100644
--- a/testfiles-pool/calculationsortorder.tpf
+++ b/testfiles-noxetex/calculationsortorder.pdftex.tpf
@@ -1,28 +1,25 @@
%PDF-1.5
%ÐÔÅØ
6 0 obj
-<< /S /GoTo /D [7 0 R /Fit] >>
-endobj
-8 0 obj
<< /Type/Encoding/Differences[24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring/tilde 39/quotesingle 96/grave
128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin/fraction/guilsinglleft/guilsinglright/minus/perthousand/quotedblbase/quotedblleft/quotedblright/quoteleft/quoteright/quotesinglbase/trademark/fi/fl/Lslash/OE/Scaron/Ydieresis/Zcaron/dotlessi/lslash/oe/scaron/zcaron
164/currency 166/brokenbar 168/dieresis/copyright/ordfeminine 172/logicalnot/.notdef/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu 183/periodcentered/cedilla/onesuperior/ordmasculine 188/onequarter/onehalf/threequarters
192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis] >>
endobj
-9 0 obj
+7 0 obj
<< /Type/Font/Subtype/Type1/Name/ZaDb/BaseFont/ZapfDingbats >>
endobj
-10 0 obj
-<< /Type/Font/Subtype/Type1/Name/Helv/BaseFont/Helvetica/Encoding 8 0 R >>
+8 0 obj
+<< /Type/Font/Subtype/Type1/Name/Helv/BaseFont/Helvetica/Encoding 6 0 R >>
endobj
-11 0 obj
+9 0 obj
<<
/Type /XObject
/Subtype /Form
/BBox [0 0 3.905 7.054]
/FormType 1
/Matrix [1 0 0 1 0 0]
-/Resources 12 0 R
+/Resources 10 0 R
/Length 60
>>
stream
@@ -32,20 +29,20 @@ BT
ET
endstream
endobj
-12 0 obj
+10 0 obj
<<
-/Font << /F25 13 0 R >>
+/Font << /F25 11 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-14 0 obj
+12 0 obj
<<
/Type /XObject
/Subtype /Form
/BBox [0 0 36.496 13.693]
/FormType 1
/Matrix [1 0 0 1 0 0]
-/Resources 15 0 R
+/Resources 13 0 R
/Length 325
>>
stream
@@ -71,20 +68,20 @@ q
Q
endstream
endobj
-15 0 obj
+13 0 obj
<<
-/Font << /F26 16 0 R >>
+/Font << /F26 14 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-17 0 obj
+15 0 obj
<<
/Type /XObject
/Subtype /Form
/BBox [0 0 42.862 13.693]
/FormType 1
/Matrix [1 0 0 1 0 0]
-/Resources 18 0 R
+/Resources 16 0 R
/Length 326
>>
stream
@@ -110,117 +107,120 @@ q
Q
endstream
endobj
-18 0 obj
+16 0 obj
<<
-/Font << /F26 16 0 R >>
+/Font << /F26 14 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-24 0 obj
+23 0 obj
<<
-/Length 153
+/Length 180
>>
stream
BT
-/F8 9.9626 Tf 148.712 707.125 Td [(Gamma)]TJ 0 -11.955 Td [(Gamma)]TJ 0 -11.955 Td [(Alpha)]TJ 0 -23.911 Td [(Beta)]TJ 154.421 -520.049 Td [(1)]TJ
+/F8 9.9626 Tf 148.712 707.125 Td [(Gamma3)]TJ 0 -11.955 Td [(Gamma)]TJ 0 -11.955 Td [(Gamma2)]TJ 0 -11.955 Td [(Alpha)]TJ 0 -23.911 Td [(Beta)]TJ 154.421 -508.094 Td [(1)]TJ
ET
endstream
endobj
-7 0 obj
+5 0 obj
<<
/Type /Page
-/Contents 24 0 R
-/Resources 23 0 R
+/Contents 23 0 R
+/Resources 22 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 28 0 R
-/Annots [ 19 0 R 20 0 R 21 0 R 22 0 R ]
+/Parent 27 0 R
+/Annots [ 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R ]
>>
endobj
-19 0 obj
+17 0 obj
<<
/Type /Annot
-/Rect [185.422 706.129 232.246 718.084]
-/Subtype/Widget/F 4/T(gamma)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); var f_gamma = this.getField("gamma2"); event.value = f_alpha.value + f_beta.value +f_gamma.value; )>>>>/MaxLen 40
+/Rect [190.403 706.129 237.228 718.084]
+/Subtype/Widget/F 4/P 5 0 R/T(gamma3)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); var f_gamma = this.getField("gamma2"); event.value = f_alpha.value + f_beta.value +f_gamma.value; )>>>>/MaxLen 40
>>
endobj
-20 0 obj
+18 0 obj
<<
/Type /Annot
/Rect [185.422 694.174 232.246 706.129]
-/Subtype/Widget/F 4/T(gamma2)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); event.value = f_alpha.value + 2*f_beta.value; )>>>>/MaxLen 40
+/Subtype/Widget/F 4/P 5 0 R/T(gamma)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); var f_gamma = this.getField("gamma2"); event.value = f_alpha.value + f_beta.value +f_gamma.value; )>>>>/MaxLen 40
>>
endobj
-21 0 obj
+19 0 obj
<<
/Type /Annot
-/Rect [177.327 680.281 224.152 694.174]
-/Subtype/Widget/F 4/T(alpha)/FT/Tx/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V(0)/MaxLen 40
+/Rect [190.403 682.219 237.228 694.174]
+/Subtype/Widget/F 4/P 5 0 R/T(gamma2)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); event.value = f_alpha.value + 2*f_beta.value; )>>>>/MaxLen 40
>>
endobj
-22 0 obj
+20 0 obj
<<
/Type /Annot
-/Rect [171.377 658.308 218.202 670.263]
-/Subtype/Widget/F 4/T(beta)/FT/Tx/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V(0)/MaxLen 40
+/Rect [177.327 668.326 224.152 682.219]
+/Subtype/Widget/F 4/P 5 0 R/T(alpha)/FT/Tx/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V(0)/MaxLen 40
>>
endobj
-25 0 obj
+21 0 obj
<<
-/D [7 0 R /XYZ 132.768 754.95 null]
+/Type /Annot
+/Rect [171.377 646.353 218.202 658.308]
+/Subtype/Widget/F 4/P 5 0 R/T(beta)/FT/Tx/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V(0)/MaxLen 40
>>
endobj
-26 0 obj
+24 0 obj
<<
-/D [7 0 R /XYZ 133.768 717.088 null]
+/D [5 0 R /XYZ 132.768 754.95 null]
>>
endobj
-23 0 obj
+25 0 obj
<<
-/ExtGState 1 0 R /ColorSpace 2 0 R /Pattern 3 0 R /Shading 4 0 R /Properties 5 0 R
-/Font << /F8 27 0 R >>
-/ProcSet [ /PDF /Text ]
+/D [5 0 R /XYZ 133.768 717.088 null]
>>
endobj
-1 0 obj
-<< >>
+22 0 obj
+<<
+/Font << /F8 26 0 R >>
+/ProcSet [ /PDF /Text ]
+>>
endobj
-2 0 obj
-<< >>
+28 0 obj
+[ 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R ]
endobj
-3 0 obj
-<< >>
+29 0 obj
+[ 18 0 R 19 0 R 17 0 R ]
endobj
-4 0 obj
-<< >>
+30 0 obj
+<< /ZaDb 7 0 R /Helv 8 0 R >>
endobj
-5 0 obj
-<< >>
+31 0 obj
+<< /Font 30 0 R >>
endobj
-29 0 obj
-<< /Fields[19 0 R 20 0 R 21 0 R 22 0 R]/CO[19 0 R 20 0 R]/DR<</Font<</ZaDb 9 0 R /Helv 10 0 R>>>>/DA(/Helv 10 Tf 0 g)/NeedAppearances true >>
+32 0 obj
+<< /DA (/Helv 10 Tf 0 g) /NeedAppearances true /Fields 28 0 R /CO 29 0 R /DR 31 0 R >>
endobj
-30 0 obj
+33 0 obj
[500 500 500 500 500 500 500 500 500 277.8 277.8 277.8 777.8 472.2 472.2 777.8 750 708.3 722.2 763.9 680.6 652.8 784.7 750 361.1 513.9 777.8 625 916.7 750 777.8 680.6 777.8 736.1 555.6 722.2 750 750 1027.8 750 750 611.1 277.8 500 277.8 500 277.8 277.8 500 555.6 444.4 555.6 444.4 305.6 500 555.6 277.8 305.6 527.8 277.8 833.3 555.6 500 555.6 527.8 391.7 394.4 388.9]
endobj
-31 0 obj
+34 0 obj
[638.9 736.1 645.8 555.6 680.6 687.5 666.7 944.5 666.7 666.7 611.1 288.9 500 288.9 500 277.8 277.8 480.6 516.7 444.4 516.7 444.4 305.6 500 516.7 238.9 266.7 488.9 238.9 794.4 516.7 500 516.7 516.7 341.7 383.3 361.1 516.7]
endobj
-32 0 obj
+35 0 obj
[392]
endobj
-33 0 obj
+36 0 obj
<<
-/Length1 1511
-/Length2 10012
+/Length1 1545
+/Length2 10416
/Length3 0
-/Length 11523
+/Length 11961
>>
[BINARY STREAM]
endobj
-34 0 obj
+37 0 obj
<<
/Type /FontDescriptor
-/FontName /AYEPZS+CMR10
+/FontName /WXHPPB+CMR10
/Flags 4
/FontBBox [-40 -250 1009 750]
/Ascent 694
@@ -229,11 +229,11 @@ endobj
/ItalicAngle 0
/StemV 69
/XHeight 431
-/CharSet (/A/B/G/a/e/h/l/m/one/p/t)
-/FontFile 33 0 R
+/CharSet (/A/B/G/a/e/h/l/m/one/p/t/three/two)
+/FontFile 36 0 R
>>
endobj
-35 0 obj
+38 0 obj
<<
/Length1 1458
/Length2 6860
@@ -242,7 +242,7 @@ endobj
>>
[BINARY STREAM]
endobj
-36 0 obj
+39 0 obj
<<
/Type /FontDescriptor
/FontName /XYLNGW+CMSS10
@@ -255,10 +255,10 @@ endobj
/StemV 78
/XHeight 444
/CharSet (/P/S/b/i/m/t/u)
-/FontFile 35 0 R
+/FontFile 38 0 R
>>
endobj
-37 0 obj
+40 0 obj
<<
/Length1 1568
/Length2 967
@@ -267,7 +267,7 @@ endobj
>>
[BINARY STREAM]
endobj
-38 0 obj
+41 0 obj
<<
/Type /FontDescriptor
/FontName /GCRMMP+Dingbats
@@ -280,125 +280,127 @@ endobj
/StemV 0
/XHeight 400
/CharSet (/a97)
-/FontFile 37 0 R
+/FontFile 40 0 R
>>
endobj
-27 0 obj
+26 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /AYEPZS+CMR10
-/FontDescriptor 34 0 R
+/BaseFont /WXHPPB+CMR10
+/FontDescriptor 37 0 R
/FirstChar 49
/LastChar 116
-/Widths 30 0 R
+/Widths 33 0 R
>>
endobj
-16 0 obj
+14 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /XYLNGW+CMSS10
-/FontDescriptor 36 0 R
+/FontDescriptor 39 0 R
/FirstChar 80
/LastChar 117
-/Widths 31 0 R
+/Widths 34 0 R
>>
endobj
-13 0 obj
+11 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /GCRMMP+Dingbats
-/FontDescriptor 38 0 R
+/FontDescriptor 41 0 R
/FirstChar 123
/LastChar 123
-/Widths 32 0 R
+/Widths 35 0 R
>>
endobj
-28 0 obj
+27 0 obj
<<
/Type /Pages
/Count 1
-/Kids [7 0 R]
+/Kids [5 0 R]
>>
endobj
-39 0 obj
+42 0 obj
<<
-/Names [(Doc-Start) 26 0 R (page.1) 25 0 R]
+/Names [(Doc-Start) 25 0 R (page.1) 24 0 R]
/Limits [(Doc-Start) (page.1)]
>>
endobj
-40 0 obj
+43 0 obj
<<
-/Dests 39 0 R
+/Dests 42 0 R
>>
endobj
-41 0 obj
+44 0 obj
<<
/Type /Catalog
-/Pages 28 0 R
-/Names 40 0 R
-/PageMode /UseOutlines/AcroForm 29 0 R
-/OpenAction 6 0 R
+/Pages 27 0 R
+/Names 43 0 R
+/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/AcroForm 32 0 R
>>
endobj
-42 0 obj
+45 0 obj
<<
-/Producer (pdfTeX)/Creator (LaTeX with hyperref)
+/Producer (pdfTeX)/Author ()/Title ()/Subject ()/Creator (LaTeX with hyperref)/CreationDate ()/ModDate ()/Keywords ()
/Trapped /False
>>
endobj
xref
-0 43
-0000000000 65535 f
-0000004644 00000 n
-0000004666 00000 n
-0000004688 00000 n
-0000004710 00000 n
-0000004732 00000 n
+0 46
+0000000001 65535 f
+0000000002 00000 f
+0000000003 00000 f
+0000000004 00000 f
+0000000000 00000 f
+0000003025 00000 n
0000000015 00000 n
-0000003046 00000 n
-0000000061 00000 n
-0000001245 00000 n
-0000001323 00000 n
-0000001414 00000 n
-0000001639 00000 n
-0000029190 00000 n
-0000001709 00000 n
-0000002201 00000 n
-0000029049 00000 n
-0000002271 00000 n
-0000002764 00000 n
-0000003200 00000 n
-0000003610 00000 n
-0000003969 00000 n
-0000004172 00000 n
-0000004491 00000 n
-0000002834 00000 n
-0000004374 00000 n
-0000004432 00000 n
-0000028909 00000 n
-0000029334 00000 n
-0000004754 00000 n
-0000004912 00000 n
-0000005295 00000 n
-0000005533 00000 n
-0000005555 00000 n
-0000017177 00000 n
-0000017416 00000 n
-0000025832 00000 n
-0000026061 00000 n
-0000028693 00000 n
-0000029392 00000 n
-0000029489 00000 n
-0000029525 00000 n
-0000029647 00000 n
+0000001199 00000 n
+0000001277 00000 n
+0000001367 00000 n
+0000001591 00000 n
+0000030006 00000 n
+0000001661 00000 n
+0000002153 00000 n
+0000029865 00000 n
+0000002223 00000 n
+0000002716 00000 n
+0000003186 00000 n
+0000003605 00000 n
+0000004023 00000 n
+0000004390 00000 n
+0000004601 00000 n
+0000004928 00000 n
+0000002786 00000 n
+0000004811 00000 n
+0000004869 00000 n
+0000029725 00000 n
+0000030150 00000 n
+0000004997 00000 n
+0000005052 00000 n
+0000005093 00000 n
+0000005140 00000 n
+0000005176 00000 n
+0000005280 00000 n
+0000005663 00000 n
+0000005901 00000 n
+0000005923 00000 n
+0000017983 00000 n
+0000018232 00000 n
+0000026648 00000 n
+0000026877 00000 n
+0000029509 00000 n
+0000030208 00000 n
+0000030305 00000 n
+0000030341 00000 n
+0000030469 00000 n
trailer
-<< /Size 43
-/Root 41 0 R
-/Info 42 0 R
+<< /Size 46
+/Root 44 0 R
+/Info 45 0 R
>>
startxref
-29734
+30625
%%EOF
diff --git a/testfiles-pool/calculationsortorder.pvt b/testfiles-noxetex/calculationsortorder.pvt
similarity index 80%
copy from testfiles-pool/calculationsortorder.pvt
copy to testfiles-noxetex/calculationsortorder.pvt
index e96f61f..45120ee 100644
--- a/testfiles-pool/calculationsortorder.pvt
+++ b/testfiles-noxetex/calculationsortorder.pvt
@@ -1,14 +1,15 @@
% !Mode:: "TeX:DE:UTF-8:Main"
-%\input{regression-test}
+% ok for pdftex and luatex. Perhaps some changes to avoid a two pass are possible/needed
+% fails with xetex because of the missing \pdf_link_last:
+\input{regression-test}
\documentclass{article}
-\usepackage[customdriver=hluatex-experimental]
-{hyperref}
+\usepackage{l3pdf}
\ExplSyntaxOn
\pdf_uncompress:
-
\ExplSyntaxOff
+\usepackage[customdriver=hluatex-experimental]
+{hyperref}
\begin{document}
-
\begin{Form}
\TextField[
maxlen=40,
@@ -18,8 +19,8 @@
var f_gamma = this.getField("gamma2");
event.value = f_alpha.value + f_beta.value +f_gamma.value;
},
- align=2,height=10pt,width=45pt,name=gamma,readonly=true,calculatesortkey=c
- ]{Gamma}
+ align=2,height=10pt,width=45pt,name=gamma3,readonly=true,calculatesortkey=c
+ ]{Gamma3}
\TextField[
maxlen=40,
diff --git a/testfiles-pool/calculationsortorder.luatex.tpf b/testfiles-noxetex/calculationsortorder.tpf
similarity index 62%
copy from testfiles-pool/calculationsortorder.luatex.tpf
copy to testfiles-noxetex/calculationsortorder.tpf
index 71a588c..baef9a5 100644
--- a/testfiles-pool/calculationsortorder.luatex.tpf
+++ b/testfiles-noxetex/calculationsortorder.tpf
@@ -1,22 +1,19 @@
%PDF-1.5
%ÌÕÁÔÅØÐÄÆ
6 0 obj
-<< /S /GoTo /D [ 7 0 R /Fit ] >>
-endobj
-8 0 obj
<< /Type/Encoding/Differences[24/breve/caron/circumflex/dotaccent/hungarumlaut/ogonek/ring/tilde 39/quotesingle 96/grave
128/bullet/dagger/daggerdbl/ellipsis/emdash/endash/florin/fraction/guilsinglleft/guilsinglright/minus/perthousand/quotedblbase/quotedblleft/quotedblright/quoteleft/quoteright/quotesinglbase/trademark/fi/fl/Lslash/OE/Scaron/Ydieresis/Zcaron/dotlessi/lslash/oe/scaron/zcaron
164/currency 166/brokenbar 168/dieresis/copyright/ordfeminine 172/logicalnot/.notdef/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu 183/periodcentered/cedilla/onesuperior/ordmasculine 188/onequarter/onehalf/threequarters
192/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis] >>
endobj
-9 0 obj
+7 0 obj
<< /Type/Font/Subtype/Type1/Name/ZaDb/BaseFont/ZapfDingbats >>
endobj
-10 0 obj
-<< /Type/Font/Subtype/Type1/Name/Helv/BaseFont/Helvetica/Encoding 8 0 R >>
+8 0 obj
+<< /Type/Font/Subtype/Type1/Name/Helv/BaseFont/Helvetica/Encoding 6 0 R >>
endobj
-11 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 3.905 7.054 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 12 0 R /Length 45 >>
+9 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 3.905 7.054 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 10 0 R /Length 45 >>
stream
BT
/F26 9.96264 Tf
@@ -24,11 +21,11 @@ BT
ET
endstream
endobj
-12 0 obj
-<< /Font << /F26 13 0 R >> /ProcSet [ /PDF /Text ] >>
+10 0 obj
+<< /Font << /F26 11 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-14 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 36.503 14.127 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 15 0 R /Length 328 >>
+12 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 36.503 14.127 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 13 0 R /Length 328 >>
stream
q
1 0 0 1 0 13.928 cm
@@ -52,11 +49,11 @@ q
Q
endstream
endobj
-15 0 obj
-<< /Font << /F27 16 0 R >> /ProcSet [ /PDF /Text ] >>
+13 0 obj
+<< /Font << /F27 14 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-17 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 42.869 14.127 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 18 0 R /Length 331 >>
+15 0 obj
+<< /Type /XObject /Subtype /Form /FormType 1 /BBox [ 0 0 42.869 14.127 ] /Matrix [ 1 0 0 1 0 0 ] /Resources 16 0 R /Length 331 >>
stream
q
1 0 0 1 0 13.928 cm
@@ -80,97 +77,100 @@ q
Q
endstream
endobj
-18 0 obj
-<< /Font << /F27 16 0 R >> /ProcSet [ /PDF /Text ] >>
+16 0 obj
+<< /Font << /F27 14 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-24 0 obj
-<< /Length 271 >>
+23 0 obj
+<< /Length 332 >>
stream
BT
/F15 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<003A001C004B004B001C>]TJ
+1 0 0 1 148.712 707.125 Tm [<003A001C004B004B001C006A>]TJ
1 0 0 1 148.712 695.17 Tm [<003A001C004B004B001C>]TJ
-1 0 0 1 148.712 683.215 Tm [<001B00480054003F001C>]TJ
-1 0 0 1 148.712 659.304 Tm [<002200320069001C>]TJ
+1 0 0 1 148.712 683.215 Tm [<003A001C004B004B001C006B>]TJ
+1 0 0 1 148.712 671.26 Tm [<001B00480054003F001C>]TJ
+1 0 0 1 148.712 647.349 Tm [<002200320069001C>]TJ
1 0 0 1 303.133 139.255 Tm [<0052>]TJ
ET
endstream
endobj
-7 0 obj
-<< /Type /Page /Contents 24 0 R /Resources 23 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 28 0 R /Annots 29 0 R >>
+5 0 obj
+<< /Type /Page /Contents 23 0 R /Resources 22 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 27 0 R /Annots 28 0 R >>
endobj
-29 0 obj
-[ 19 0 R 20 0 R 21 0 R 22 0 R ]
+28 0 obj
+[ 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R ]
endobj
-19 0 obj
-<< /Type /Annot /Rect [ 185.415 705.91 232.239 718.084 ]
- /Subtype/Widget/F 4/T(gamma)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); var f_gamma = this.getField("gamma2"); event.value = f_alpha.value + f_beta.value +f_gamma.value; )>>>>/MaxLen 40
+17 0 obj
+<< /Type /Annot /Rect [ 190.396 705.91 237.22 718.084 ]
+ /Subtype/Widget/F 4/T(gamma3)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); var f_gamma = this.getField("gamma2"); event.value = f_alpha.value + f_beta.value +f_gamma.value; )>>>>/MaxLen 40
>>
endobj
-20 0 obj
+18 0 obj
<< /Type /Annot /Rect [ 185.415 693.955 232.239 706.129 ]
+ /Subtype/Widget/F 4/T(gamma)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); var f_gamma = this.getField("gamma2"); event.value = f_alpha.value + f_beta.value +f_gamma.value; )>>>>/MaxLen 40
+ >>
+endobj
+19 0 obj
+<< /Type /Annot /Rect [ 190.396 681.999 237.22 694.174 ]
/Subtype/Widget/F 4/T(gamma2)/FT/Tx/Ff 1/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/AA<</C<</S/JavaScript/JS(var f_alpha = this.getField("alpha"); var f_beta = this.getField("beta"); event.value = f_alpha.value + 2*f_beta.value; )>>>>/MaxLen 40
>>
endobj
-21 0 obj
-<< /Type /Annot /Rect [ 177.335 680.286 224.159 694.174 ]
+20 0 obj
+<< /Type /Annot /Rect [ 177.335 668.331 224.159 682.219 ]
/Subtype/Widget/F 4/T(alpha)/FT/Tx/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V(0)/MaxLen 40
>>
endobj
-22 0 obj
-<< /Type /Annot /Rect [ 171.367 658.199 218.192 670.263 ]
+21 0 obj
+<< /Type /Annot /Rect [ 171.367 646.243 218.192 658.308 ]
/Subtype/Widget/F 4/T(beta)/FT/Tx/Q 2/BS<</W 1 /S /S>>/MK<</BC[1 0 0]/BG[1 1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V(0)/MaxLen 40
>>
endobj
-25 0 obj
-<< /D [ 7 0 R /XYZ 132.768 754.95 null ] >>
-endobj
-26 0 obj
-<< /D [ 7 0 R /XYZ 133.768 717.088 null ] >>
-endobj
-23 0 obj
-<< /ExtGState 1 0 R /ColorSpace 2 0 R /Pattern 3 0 R /Shading 4 0 R /Properties 5 0 R /Font << /F15 27 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1 0 obj
-<< >>
-endobj
-2 0 obj
-<< >>
+24 0 obj
+<< /D [ 5 0 R /XYZ 132.768 754.95 null ] >>
endobj
-3 0 obj
-<< >>
+25 0 obj
+<< /D [ 5 0 R /XYZ 133.768 717.088 null ] >>
endobj
-4 0 obj
-<< >>
+22 0 obj
+<< /Font << /F15 26 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-5 0 obj
-<< >>
+29 0 obj
+[ 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R ]
endobj
30 0 obj
-<< /Fields[19 0 R 20 0 R 21 0 R 22 0 R]/CO[19 0 R 20 0 R]/DR<</Font<</ZaDb 9 0 R /Helv 10 0 R>>>>/DA(/Helv 10 Tf 0 g)/NeedAppearances true >>
+[ 18 0 R 19 0 R 17 0 R ]
endobj
31 0 obj
-[ 27 [ 750 500 ] 34 [ 708 ] 50 [ 444 ] 58 [ 785 ] 63 [ 556 ] 72 [ 278 ] 75 [ 833 ] 82 [ 500 ] 84 [ 556 ] 105 [ 389 ] ]
+<< /ZaDb 7 0 R /Helv 8 0 R >>
+endobj
+32 0 obj
+<< /Font 31 0 R >>
endobj
33 0 obj
-<< /Length 14 >>
-[BINARY STREAM]
+<< /DA (/Helv 10 Tf 0 g) /NeedAppearances true /Fields 29 0 R /CO 30 0 R /DR 32 0 R >>
endobj
34 0 obj
-<< /Subtype /CIDFontType0C /Length 1820 >>
+[ 27 [ 750 500 ] 34 [ 708 ] 50 [ 444 ] 58 [ 785 ] 63 [ 556 ] 72 [ 278 ] 75 [ 833 ] 82 [ 500 ] 84 [ 556 ] 105 [ 389 500 500 ] ]
+endobj
+36 0 obj
+<< /Length 14 >>
[BINARY STREAM]
endobj
-32 0 obj
-<< /Type /FontDescriptor /FontName /NCFZSK+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 34 0 R /CIDSet 33 0 R >>
+37 0 obj
+<< /Subtype /CIDFontType0C /Length 2094 >>
+[BINARY STREAM]
endobj
35 0 obj
-<< /Length 833 >>
+<< /Type /FontDescriptor /FontName /XDDCZP+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 37 0 R /CIDSet 36 0 R >>
+endobj
+38 0 obj
+<< /Length 861 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-NCFZSK-LMRoman10-Regular-0)
-%%Title: (TeX-NCFZSK-LMRoman10-Regular-0 TeX NCFZSK-LMRoman10-Regular 0)
+%%BeginResource: CMap (TeX-XDDCZP-LMRoman10-Regular-0)
+%%Title: (TeX-XDDCZP-LMRoman10-Regular-0 TeX XDDCZP-LMRoman10-Regular 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -178,17 +178,17 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (NCFZSK-LMRoman10-Regular)
+/Ordering (XDDCZP-LMRoman10-Regular)
/Supplement 0
>> def
-/CMapName /TeX-Identity-NCFZSK-LMRoman10-Regular def
+/CMapName /TeX-Identity-XDDCZP-LMRoman10-Regular def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-11 beginbfchar
+13 beginbfchar
<001B> <0041>
<001C> <0061>
<0022> <0042>
@@ -200,6 +200,8 @@ endbfrange
<0052> <0031>
<0054> <0070>
<0069> <0074>
+<006A> <0033>
+<006B> <0032>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -209,27 +211,27 @@ end
%%EOF
endstream
endobj
-27 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /NCFZSK+LMRoman10-Regular /DescendantFonts [ 36 0 R ] /ToUnicode 35 0 R >>
+26 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XDDCZP+LMRoman10-Regular /DescendantFonts [ 39 0 R ] /ToUnicode 38 0 R >>
endobj
-36 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /NCFZSK+LMRoman10-Regular /FontDescriptor 32 0 R /W 31 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+39 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XDDCZP+LMRoman10-Regular /FontDescriptor 35 0 R /W 34 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-37 0 obj
+40 0 obj
[ 35 [ 517 ] 66 [ 239 ] 75 [ 794 ] 83 [ 639 ] 97 [ 556 ] 105 [ 361 ] 109 [ 517 ] ]
endobj
-39 0 obj
+42 0 obj
<< /Length 14 >>
[BINARY STREAM]
endobj
-40 0 obj
+43 0 obj
<< /Subtype /CIDFontType0C /Length 1052 >>
[BINARY STREAM]
endobj
-38 0 obj
-<< /Type /FontDescriptor /FontName /ISVPDC+LMSans10-Regular /Flags 4 /FontBBox [ -420 -309 1431 1154 ] /Ascent 1154 /CapHeight 694 /Descent -309 /ItalicAngle 0 /StemV 93 /XHeight 444 /FontFile3 40 0 R /CIDSet 39 0 R >>
-endobj
41 0 obj
+<< /Type /FontDescriptor /FontName /ISVPDC+LMSans10-Regular /Flags 4 /FontBBox [ -420 -309 1431 1154 ] /Ascent 1154 /CapHeight 694 /Descent -309 /ItalicAngle 0 /StemV 93 /XHeight 444 /FontFile3 43 0 R /CIDSet 42 0 R >>
+endobj
+44 0 obj
<< /Length 771 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -271,94 +273,97 @@ end
%%EOF
endstream
endobj
-16 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ISVPDC+LMSans10-Regular /DescendantFonts [ 42 0 R ] /ToUnicode 41 0 R >>
+14 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ISVPDC+LMSans10-Regular /DescendantFonts [ 45 0 R ] /ToUnicode 44 0 R >>
endobj
-42 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ISVPDC+LMSans10-Regular /FontDescriptor 38 0 R /W 37 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+45 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ISVPDC+LMSans10-Regular /FontDescriptor 41 0 R /W 40 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-43 0 obj
+46 0 obj
[392 ]
endobj
-45 0 obj
+48 0 obj
<< /Length1 1568 /Length2 967 /Length3 0 /Length 2535 >>
[BINARY STREAM]
endobj
-44 0 obj
-<< /Type /FontDescriptor /FontName /GCRMMP+Dingbats /Flags 4 /FontBBox [ -1 -143 981 819 ] /Ascent 708 /CapHeight 708 /Descent 0 /ItalicAngle 0 /StemV 0 /XHeight 400 /CharSet( /a97) /FontFile 45 0 R >>
+47 0 obj
+<< /Type /FontDescriptor /FontName /GCRMMP+Dingbats /Flags 4 /FontBBox [ -1 -143 981 819 ] /Ascent 708 /CapHeight 708 /Descent 0 /ItalicAngle 0 /StemV 0 /XHeight 400 /CharSet( /a97) /FontFile 48 0 R >>
endobj
-13 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /GCRMMP+Dingbats /FontDescriptor 44 0 R /FirstChar 123 /LastChar 123 /Widths 43 0 R >>
+11 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /GCRMMP+Dingbats /FontDescriptor 47 0 R /FirstChar 123 /LastChar 123 /Widths 46 0 R >>
endobj
-28 0 obj
-<< /Type /Pages /Count 1 /Kids [ 7 0 R ] >>
+27 0 obj
+<< /Type /Pages /Count 1 /Kids [ 5 0 R ] >>
endobj
-46 0 obj
-<< /Names [ (Doc-Start) 26 0 R (page.1) 25 0 R ] /Limits [ (Doc-Start) (page.1) ] >>
+49 0 obj
+<< /Names [ (Doc-Start) 25 0 R (page.1) 24 0 R ] /Limits [ (Doc-Start) (page.1) ] >>
endobj
-47 0 obj
-<< /Dests 46 0 R >>
+50 0 obj
+<< /Dests 49 0 R >>
endobj
-48 0 obj
-<< /Type /Catalog /Pages 28 0 R /Names 47 0 R /PageMode /UseOutlines/AcroForm 30 0 R /OpenAction 6 0 R >>
+51 0 obj
+<< /Type /Catalog /Pages 27 0 R /Names 50 0 R /PageMode /UseOutlines/OpenAction [5 0 R /Fit]/AcroForm 33 0 R >>
endobj
-49 0 obj
-<< /Producer (LuaTeX)/Creator (LaTeX with hyperref) /Trapped /False >>
+52 0 obj
+<< /Producer (LuaTeX)/Author ()/Title ()/Subject ()/Creator (LaTeX with hyperref)/CreationDate ()/ModDate ()/Keywords () /Trapped /False >>
endobj
xref
-0 50
-0000000000 65535 f
-0000004823 00000 n
-0000004845 00000 n
-0000004867 00000 n
-0000004889 00000 n
-0000004911 00000 n
+0 53
+0000000001 65535 f
+0000000002 00000 f
+0000000003 00000 f
+0000000004 00000 f
+0000000000 00000 f
+0000003191 00000 n
0000000020 00000 n
-0000003180 00000 n
-0000000068 00000 n
-0000001252 00000 n
-0000001330 00000 n
-0000001421 00000 n
-0000001636 00000 n
-0000014288 00000 n
-0000001706 00000 n
-0000002206 00000 n
-0000011062 00000 n
-0000002276 00000 n
-0000002779 00000 n
-0000003359 00000 n
-0000003772 00000 n
-0000004135 00000 n
-0000004342 00000 n
-0000004669 00000 n
-0000002849 00000 n
-0000004548 00000 n
-0000004608 00000 n
-0000008333 00000 n
-0000014432 00000 n
-0000003311 00000 n
-0000004933 00000 n
-0000005091 00000 n
-0000007204 00000 n
-0000005226 00000 n
-0000005300 00000 n
-0000007440 00000 n
-0000008487 00000 n
-0000008687 00000 n
-0000009996 00000 n
-0000008786 00000 n
-0000008860 00000 n
-0000010231 00000 n
-0000011215 00000 n
-0000011414 00000 n
-0000014070 00000 n
-0000011437 00000 n
-0000014493 00000 n
-0000014594 00000 n
-0000014630 00000 n
-0000014752 00000 n
+0000001204 00000 n
+0000001282 00000 n
+0000001372 00000 n
+0000001586 00000 n
+0000014960 00000 n
+0000001656 00000 n
+0000002156 00000 n
+0000011734 00000 n
+0000002226 00000 n
+0000002729 00000 n
+0000003377 00000 n
+0000003790 00000 n
+0000004204 00000 n
+0000004566 00000 n
+0000004773 00000 n
+0000005100 00000 n
+0000002799 00000 n
+0000004979 00000 n
+0000005039 00000 n
+0000009005 00000 n
+0000015104 00000 n
+0000003322 00000 n
+0000005170 00000 n
+0000005225 00000 n
+0000005266 00000 n
+0000005313 00000 n
+0000005349 00000 n
+0000005453 00000 n
+0000007848 00000 n
+0000005596 00000 n
+0000005670 00000 n
+0000008084 00000 n
+0000009159 00000 n
+0000009359 00000 n
+0000010668 00000 n
+0000009458 00000 n
+0000009532 00000 n
+0000010903 00000 n
+0000011887 00000 n
+0000012086 00000 n
+0000014742 00000 n
+0000012109 00000 n
+0000015165 00000 n
+0000015266 00000 n
+0000015302 00000 n
+0000015430 00000 n
trailer
-<< /Size 50 /Root 48 0 R /Info 49 0 R >>
+<< /Size 53 /Root 51 0 R /Info 52 0 R >>
startxref
-14839
+15586
%%EOF
diff --git a/testfiles-pool/calculationsortorder.pvt b/testfiles-pool/calculationsortorder.pvt
index e96f61f..45120ee 100644
--- a/testfiles-pool/calculationsortorder.pvt
+++ b/testfiles-pool/calculationsortorder.pvt
@@ -1,14 +1,15 @@
% !Mode:: "TeX:DE:UTF-8:Main"
-%\input{regression-test}
+% ok for pdftex and luatex. Perhaps some changes to avoid a two pass are possible/needed
+% fails with xetex because of the missing \pdf_link_last:
+\input{regression-test}
\documentclass{article}
-\usepackage[customdriver=hluatex-experimental]
-{hyperref}
+\usepackage{l3pdf}
\ExplSyntaxOn
\pdf_uncompress:
-
\ExplSyntaxOff
+\usepackage[customdriver=hluatex-experimental]
+{hyperref}
\begin{document}
-
\begin{Form}
\TextField[
maxlen=40,
@@ -18,8 +19,8 @@
var f_gamma = this.getField("gamma2");
event.value = f_alpha.value + f_beta.value +f_gamma.value;
},
- align=2,height=10pt,width=45pt,name=gamma,readonly=true,calculatesortkey=c
- ]{Gamma}
+ align=2,height=10pt,width=45pt,name=gamma3,readonly=true,calculatesortkey=c
+ ]{Gamma3}
\TextField[
maxlen=40,
diff --git a/testfiles/metadata.xetex.tpf b/testfiles/metadata.xetex.tpf
index 103af15..46632e4 100644
--- a/testfiles/metadata.xetex.tpf
+++ b/testfiles/metadata.xetex.tpf
@@ -49,23 +49,38 @@ endobj
18 0 obj
<</HideToolbar true/NonFullScreenPageMode/UseNone/NumCopies 4>>
endobj
+24 0 obj
+<</Names[(Doc-Start)21 0 R(page.1)22 0 R(page.2)23 0 R]>>
+endobj
+21 0 obj
+[3 0 R/XYZ 133.77 667.2 null]
+endobj
+22 0 obj
+[3 0 R/XYZ 132.77 705.06 null]
+endobj
+23 0 obj
+[15 0 R/XYZ 132.77 705.06 null]
+endobj
+25 0 obj
+<</Dests 24 0 R>>
+endobj
3 0 obj
-<</Resources 14 0 R/Type/Page/Parent 21 0 R/Contents[13 0 R]>>
+<</Resources 14 0 R/Type/Page/Parent 26 0 R/Contents[13 0 R]>>
endobj
15 0 obj
-<</Resources 20 0 R/Type/Page/Parent 21 0 R/Contents[19 0 R]>>
+<</Resources 20 0 R/Type/Page/Parent 26 0 R/Contents[19 0 R]>>
endobj
-21 0 obj
+26 0 obj
<</Type/Pages/Count 2/Kids[3 0 R 15 0 R]/MediaBox[0 0 612 792]>>
endobj
2 0 obj
<</Creator(LaTeX with hyperref)/Producer(xdvipdfmx)/Author<feff0055006c00720069006b006500200046006900730063006800650072>/Title<feff0041002000740065007300740020006f00660020006d0065007400610064006100740061>/CreationDate(D:20160520090000-00'00')>>
endobj
1 0 obj
-<</OCProperties 17 0 R/ViewerPreferences 18 0 R/PageMode/UseOutlines/PageLayout/SinglePage/OpenAction[3 0 R/Fit]/Pages
-21 0 R/Type/Catalog>>
+<</OCProperties 17 0 R/ViewerPreferences 18 0 R/PageMode/UseOutlines/PageLayout/SinglePage/OpenAction[3 0 R/Fit]/Names
+25 0 R/Pages 26 0 R/Type/Catalog>>
endobj
-22 0 obj
+27 0 obj
<</Length 931>>
stream
/CIDInit /ProcSet findresource begin
@@ -131,38 +146,38 @@ end
end
endstream
endobj
-24 0 obj
+29 0 obj
<</Subtype/CIDFontType0C/Length 5494>>
[BINARY STREAM]
endobj
-25 0 obj
+30 0 obj
[27[750 500]35[556]42[722 444]45[278 764 556]49[681 444]54[653 306]59[500]63[556
333 361 278]68[306]71[625 278]74[917 833 750 556]81[500 500 681 556]88[278]90[778
528]96[392 556 394]105[389]107[500 750 556]111[750 528]114[722]118[528]]
endobj
-26 0 obj
+31 0 obj
<</Length 15>>
[BINARY STREAM]
endobj
11 0 obj
<</Type/Font/Subtype/CIDFontType0/BaseFont/APWWDF+LMRoman10-Regular/CIDSystemInfo<</Registry(Adobe)/Ordering(Identity)/Supplement
-0>>/FontDescriptor 23 0 R/DW 280/W 25 0 R>>
+0>>/FontDescriptor 28 0 R/DW 280/W 30 0 R>>
endobj
-23 0 obj
+28 0 obj
<</Type/FontDescriptor/Ascent 806/Descent -194/StemV 69/CapHeight 806/AvgWidth 549/FontBBox[-430
-290 1417 1127]/ItalicAngle 0/Flags 6/Style<</Panose<000000000500000000000000>>>/FontName/APWWDF+LMRoman10-Regular/FontFile3
-24 0 R/CIDSet 26 0 R>>
+29 0 R/CIDSet 31 0 R>>
endobj
12 0 obj
<</Type/Font/Subtype/Type0/BaseFont/APWWDF+LMRoman10-Regular-Identity-H/Encoding/Identity-H/DescendantFonts[11 0 R]/ToUnicode
-22 0 R>>
+27 0 R>>
endobj
xref
-0 27
+0 32
0000000000 65535 f
-0000022821 00000 n
-0000022561 00000 n
-0000022323 00000 n
+0000023070 00000 n
+0000022810 00000 n
+0000022572 00000 n
0000021719 00000 n
0000021739 00000 n
0000021759 00000 n
@@ -170,25 +185,30 @@ xref
0000021799 00000 n
0000021896 00000 n
0000022165 00000 n
-0000029841 00000 n
-0000030292 00000 n
+0000030103 00000 n
+0000030554 00000 n
0000000015 00000 n
0000016009 00000 n
-0000022401 00000 n
+0000022650 00000 n
0000021994 00000 n
0000022195 00000 n
0000022243 00000 n
0000016150 00000 n
0000021578 00000 n
-0000022480 00000 n
-0000022977 00000 n
-0000030031 00000 n
-0000023958 00000 n
-0000029525 00000 n
-0000029777 00000 n
+0000022397 00000 n
+0000022443 00000 n
+0000022490 00000 n
+0000022323 00000 n
+0000022538 00000 n
+0000022729 00000 n
+0000023239 00000 n
+0000030293 00000 n
+0000024220 00000 n
+0000029787 00000 n
+0000030039 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<2fb69ba422d36cf2a25ad816dc2e52fd><2fb69ba422d36cf2a25ad816dc2e52fd>]/Size
-27>>
+32>>
startxref
-30443
+30705
%%EOF
diff --git a/testfiles/pgfpatches.xetex.tpf b/testfiles/pgfpatches.xetex.tpf
index 5e68371..47af573 100644
--- a/testfiles/pgfpatches.xetex.tpf
+++ b/testfiles/pgfpatches.xetex.tpf
@@ -76,22 +76,38 @@ stream
q 0.3985 w 0.0 0.0 m 3.08846 3.08846 l S Q
endstream
endobj
+29 0 obj
+<</Names[(Doc-Start)26 0 R(page.1)27 0 R(page.2)28 0 R]>>
+endobj
+26 0 obj
+[3 0 R/XYZ 133.77 667.2 null]
+endobj
+27 0 obj
+[3 0 R/XYZ 132.77 705.06 null]
+endobj
+28 0 obj
+[20 0 R/XYZ 132.77 705.06 null]
+endobj
+30 0 obj
+<</Dests 29 0 R>>
+endobj
3 0 obj
-<</Resources 19 0 R/Type/Page/Parent 26 0 R/Contents[18 0 R]>>
+<</Resources 19 0 R/Type/Page/Parent 31 0 R/Contents[18 0 R]>>
endobj
20 0 obj
-<</Resources 25 0 R/Type/Page/Parent 26 0 R/Contents[24 0 R]>>
+<</Resources 25 0 R/Type/Page/Parent 31 0 R/Contents[24 0 R]>>
endobj
-26 0 obj
+31 0 obj
<</Type/Pages/Count 2/Kids[3 0 R 20 0 R]/MediaBox[0 0 612 792]>>
endobj
2 0 obj
<</Creator(LaTeX with hyperref)/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
endobj
1 0 obj
-<</OCProperties 22 0 R/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Pages 26 0 R/Type/Catalog>>
+<</OCProperties 22 0 R/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 30 0 R/Pages
+31 0 R/Type/Catalog>>
endobj
-27 0 obj
+32 0 obj
<</Length 398>>
stream
/CIDInit /ProcSet findresource begin
@@ -119,36 +135,36 @@ end
end
endstream
endobj
-29 0 obj
+34 0 obj
<</Subtype/CIDFontType0C/Length 1003>>
[BINARY STREAM]
endobj
-30 0 obj
+35 0 obj
[35[556]82[500]107[500]116[528]]
endobj
-31 0 obj
+36 0 obj
<</Length 15>>
[BINARY STREAM]
endobj
16 0 obj
<</Type/Font/Subtype/CIDFontType0/BaseFont/APWWDF+LMRoman10-Regular/CIDSystemInfo<</Registry(Adobe)/Ordering(Identity)/Supplement
-0>>/FontDescriptor 28 0 R/DW 280/W 30 0 R>>
+0>>/FontDescriptor 33 0 R/DW 280/W 35 0 R>>
endobj
-28 0 obj
+33 0 obj
<</Type/FontDescriptor/Ascent 806/Descent -194/StemV 69/CapHeight 806/AvgWidth 549/FontBBox[-430
-290 1417 1127]/ItalicAngle 0/Flags 6/Style<</Panose<000000000500000000000000>>>/FontName/APWWDF+LMRoman10-Regular/FontFile3
-29 0 R/CIDSet 31 0 R>>
+34 0 R/CIDSet 36 0 R>>
endobj
17 0 obj
<</Type/Font/Subtype/Type0/BaseFont/APWWDF+LMRoman10-Regular-Identity-H/Encoding/Identity-H/DescendantFonts[16 0 R]/ToUnicode
-27 0 R>>
+32 0 R>>
endobj
xref
-0 32
+0 37
0000000000 65535 f
-0000004860 00000 n
-0000004753 00000 n
-0000004515 00000 n
+0000005109 00000 n
+0000005002 00000 n
+0000004764 00000 n
0000003682 00000 n
0000003702 00000 n
0000003722 00000 n
@@ -161,25 +177,30 @@ xref
0000003762 00000 n
0000003860 00000 n
0000004131 00000 n
-0000006606 00000 n
-0000007057 00000 n
+0000006868 00000 n
+0000007319 00000 n
0000000015 00000 n
0000001159 00000 n
-0000004593 00000 n
+0000004842 00000 n
0000003959 00000 n
0000004163 00000 n
0000002439 00000 n
0000001301 00000 n
0000001884 00000 n
-0000004672 00000 n
-0000004969 00000 n
-0000006796 00000 n
-0000005417 00000 n
-0000006493 00000 n
-0000006542 00000 n
+0000004589 00000 n
+0000004635 00000 n
+0000004682 00000 n
+0000004515 00000 n
+0000004730 00000 n
+0000004921 00000 n
+0000005231 00000 n
+0000007058 00000 n
+0000005679 00000 n
+0000006755 00000 n
+0000006804 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<d1d8b4034adb0dce4a347fc8dfdae61a><d1d8b4034adb0dce4a347fc8dfdae61a>]/Size
-32>>
+37>>
startxref
-7208
+7470
%%EOF
diff --git a/testfiles/viewerpreferences.xetex.tpf b/testfiles/viewerpreferences.xetex.tpf
index ef1c9d0..e3eb645 100644
--- a/testfiles/viewerpreferences.xetex.tpf
+++ b/testfiles/viewerpreferences.xetex.tpf
@@ -40,20 +40,32 @@ endobj
12 0 obj
<</HideToolbar true/NonFullScreenPageMode/UseNone/NumCopies 4>>
endobj
-3 0 obj
-<</Resources 17 0 R/Type/Page/Parent 18 0 R/Contents[16 0 R]>>
+20 0 obj
+<</Names[(Doc-Start)18 0 R(page.1)19 0 R]>>
endobj
18 0 obj
+[3 0 R/XYZ 133.77 667.2 null]
+endobj
+19 0 obj
+[3 0 R/XYZ 132.77 705.06 null]
+endobj
+21 0 obj
+<</Dests 20 0 R>>
+endobj
+3 0 obj
+<</Resources 17 0 R/Type/Page/Parent 22 0 R/Contents[16 0 R]>>
+endobj
+22 0 obj
<</Type/Pages/Count 1/Kids[3 0 R]/MediaBox[0 0 612 792]>>
endobj
2 0 obj
<</Creator(TeX)/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
endobj
1 0 obj
-<</OCProperties 11 0 R/ViewerPreferences 12 0 R/Lang(de-DE)/PageMode/UseOutlines/PageLayout/SinglePage/OpenAction[3 0 R/Fit]/Pages
-18 0 R/Type/Catalog>>
+<</OCProperties 11 0 R/ViewerPreferences 12 0 R/Lang(de-DE)/PageMode/UseOutlines/PageLayout/SinglePage/OpenAction[3 0 R/Fit]/Names
+21 0 R/Pages 22 0 R/Type/Catalog>>
endobj
-19 0 obj
+23 0 obj
<</Length 398>>
stream
/CIDInit /ProcSet findresource begin
@@ -81,36 +93,36 @@ end
end
endstream
endobj
-21 0 obj
+25 0 obj
<</Subtype/CIDFontType0C/Length 929>>
[BINARY STREAM]
endobj
-22 0 obj
+26 0 obj
[28[500]35[556]43[444]82[500]]
endobj
-23 0 obj
+27 0 obj
<</Length 11>>
[BINARY STREAM]
endobj
14 0 obj
<</Type/Font/Subtype/CIDFontType0/BaseFont/APWWDF+LMRoman10-Regular/CIDSystemInfo<</Registry(Adobe)/Ordering(Identity)/Supplement
-0>>/FontDescriptor 20 0 R/DW 280/W 22 0 R>>
+0>>/FontDescriptor 24 0 R/DW 280/W 26 0 R>>
endobj
-20 0 obj
+24 0 obj
<</Type/FontDescriptor/Ascent 806/Descent -194/StemV 69/CapHeight 806/AvgWidth 549/FontBBox[-430
-290 1417 1127]/ItalicAngle 0/Flags 6/Style<</Panose<000000000500000000000000>>>/FontName/APWWDF+LMRoman10-Regular/FontFile3
-21 0 R/CIDSet 23 0 R>>
+25 0 R/CIDSet 27 0 R>>
endobj
15 0 obj
<</Type/Font/Subtype/Type0/BaseFont/APWWDF+LMRoman10-Regular-Identity-H/Encoding/Identity-H/DescendantFonts[14 0 R]/ToUnicode
-19 0 R>>
+23 0 R>>
endobj
xref
-0 24
+0 28
0000000000 65535 f
-0000001187 00000 n
-0000001096 00000 n
-0000000944 00000 n
+0000001374 00000 n
+0000001283 00000 n
+0000001131 00000 n
0000000340 00000 n
0000000360 00000 n
0000000380 00000 n
@@ -121,19 +133,23 @@ xref
0000000816 00000 n
0000000864 00000 n
0000000786 00000 n
-0000002911 00000 n
-0000003362 00000 n
+0000003111 00000 n
+0000003562 00000 n
0000000015 00000 n
0000000199 00000 n
-0000001022 00000 n
-0000001355 00000 n
-0000003101 00000 n
-0000001803 00000 n
-0000002804 00000 n
-0000002851 00000 n
+0000001004 00000 n
+0000001050 00000 n
+0000000944 00000 n
+0000001097 00000 n
+0000001209 00000 n
+0000001555 00000 n
+0000003301 00000 n
+0000002003 00000 n
+0000003004 00000 n
+0000003051 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<7f428725bdb67706a21a993579fb3775><7f428725bdb67706a21a993579fb3775>]/Size
-24>>
+28>>
startxref
-3513
+3713
%%EOF
More information about the latex3-commits
mailing list