[latex3-commits] [latex3/pdfresources] outline: merge develop (e3f652e)
github at latex-project.org
github at latex-project.org
Sat Oct 26 22:43:12 CEST 2024
Repository : https://github.com/latex3/pdfresources
On branch : outline
Link : https://github.com/latex3/pdfresources/commit/e3f652e947a6cd87ea979afdbf57eccc300bd0c0
>---------------------------------------------------------------
commit e3f652e947a6cd87ea979afdbf57eccc300bd0c0
Merge: 853cf30 e8dda05
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sat Oct 26 22:43:12 2024 +0200
merge develop
>---------------------------------------------------------------
e3f652e947a6cd87ea979afdbf57eccc300bd0c0
.gitattributes | 2 +
CHANGELOG.md | 8 +
README.md | 2 +-
build.lua | 8 +-
firstaid/color-ltx.sty | 4 +-
firstaid/colorspace-patches-tmp-ltx.sty | 2 +-
firstaid/xcolor-patches-tmp-ltx.sty | 2 +-
hyperref-generic.dtx | 4 +-
l3backend-testphase.dtx | 73 +-
l3pdfannot.dtx | 4 +-
l3pdfdict.dtx | 4 +-
l3pdffield-action.dtx | 2 +-
l3pdffield-checkbox.dtx | 4 +-
l3pdffield-choice.dtx | 10 +-
l3pdffield-pushbutton.dtx | 8 +-
l3pdffield-radiobutton.dtx | 4 +-
l3pdffield-textfield.dtx | 2 +-
l3pdffield.dtx | 6 +-
l3pdffile.dtx | 4 +-
l3pdfmanagement.dtx | 4 +-
l3pdfmeta.dtx | 30 +-
l3pdftools.dtx | 28 +-
l3pdfxform.dtx | 4 +-
ltdocinit.dtx | 4 +-
pdfmanagement-firstaid.dtx | 4 +-
pdfmanagement-testphase.dtx | 6 +-
testfiles-dvips/annot-last.tlg | 159 +-
testfiles-dvips/annot.tpf | Bin 3889 -> 4185 bytes
testfiles-dvips/ap-names.tpf | Bin 6339 -> 6222 bytes
testfiles-dvips/bdc-properties.tpf | Bin 4521 -> 4738 bytes
testfiles-dvips/bdc-shipout-log.tlg | 23 +-
testfiles-dvips/bdc-shipout.tpf | Bin 3334 -> 3521 bytes
testfiles-dvips/catalog-remove.tlg | 5 +
testfiles-dvips/catalogAF.tpf | Bin 3981 -> 4265 bytes
testfiles-dvips/colorpatch.lvt | 11 +-
testfiles-dvips/colorpatch.tlg | 25 +-
testfiles-dvips/colorprofile-standard.tpf | Bin 126086 -> 126383 bytes
testfiles-dvips/colorprofile1.tpf | Bin 129301 -> 129597 bytes
testfiles-dvips/destination-options.tpf | Bin 11684 -> 12579 bytes
testfiles-dvips/dict_if_empty.tlg | 113 +-
testfiles-dvips/disable-links.tpf | Bin 14718 -> 16820 bytes
testfiles-dvips/embedfile.tpf | Bin 8325 -> 9034 bytes
testfiles-dvips/formfield-old.tpf | Bin 13675 -> 14535 bytes
testfiles-dvips/infodict.tpf | Bin 3964 -> 4248 bytes
testfiles-dvips/ismap.tpf | Bin 4594 -> 4781 bytes
testfiles-dvips/linkhook.tpf | Bin 7457 -> 8156 bytes
testfiles-dvips/metadata-new.tpf | Bin 25706 -> 25921 bytes
testfiles-dvips/nopdfmanage.tpf | Bin 14108 -> 14293 bytes
testfiles-dvips/pagelabels-log.tlg | 5 +
testfiles-dvips/pagelabels.tpf | Bin 8049 -> 8054 bytes
testfiles-dvips/pdf_pageobject_ref.lvt | 2 +-
testfiles-dvips/pdf_pageobject_ref.tlg | 7 +-
testfiles-dvips/pdffilelink.tpf | Bin 4235 -> 4414 bytes
testfiles-dvips/pdflscape.tpf | Bin 4715 -> 4924 bytes
testfiles-dvips/pgfpatches.tpf | Bin 8165 -> 8354 bytes
testfiles-dvips/show.tlg | 45 +-
testfiles-dvips/structure-destination.tpf | Bin 20174 -> 20552 bytes
testfiles-dvips/text-convert.tlg | 5 +
testfiles-dvips/version-compare.tlg | 165 +-
testfiles-dvips/xform-appearance.tpf | Bin 9127 -> 8936 bytes
testfiles-dvips/xform-clipping-gh25.tpf | Bin 10854 -> 12211 bytes
testfiles-dvips/xform-preamble.tpf | Bin 4676 -> 4981 bytes
testfiles-dvips/xform.tpf | Bin 6052 -> 6462 bytes
testfiles-luatex/fontspec-color-basic.lvt | 2 +-
testfiles-luatex/fontspec-color-basic.tlg | 19 +
testfiles-luatex/fontspec-color-opacity.tlg | 5 +
testfiles-noxetex/calculationsortorder.pdftex.tpf | 330 +-
testfiles-noxetex/colorspace-2.pdftex.tpf | 282 +-
testfiles-noxetex/colorspace.pdftex.tpf | 282 +-
testfiles-noxetex/extgstate-patches.pdftex.tpf | 282 +-
testfiles-noxetex/metadata-newpage.pdftex.tlg | 17977 ++++++++++----------
testfiles-noxetex/metadata-newpage.tlg | 5 +
testfiles-noxetex/metadata.pdftex.tpf | 340 +-
testfiles-noxetex/pdfa2b-test.pdftex.tpf | 292 +-
testfiles-noxetex/pgfpatches.pdftex.tpf | 354 +-
testfiles-noxetex/test-new-transparent.pdftex.tpf | 294 +-
testfiles-noxetex/transparent-tikz.pdftex.tpf | 306 +-
testfiles-pdftex/bookmark-color.tlg | 95 +-
testfiles-pdftex/calculate-textfield.tpf | 300 +-
testfiles-pdftex/catalogAF.tpf | 292 +-
testfiles-pdftex/colorlinks.tpf | 537 +-
testfiles-pdftex/expand-pdfinfo.tlg | 5 +
testfiles-pdftex/gh77-AS-2.lvt | 6 +-
testfiles-pdftex/gh77-AS-2.tlg | 13 +-
testfiles-pdftex/gh77-AS-3.lvt | 7 +-
testfiles-pdftex/gh77-AS-3.tlg | 13 +-
testfiles-pdftex/gh77-AS.lvt | 6 +-
testfiles-pdftex/gh77-AS.tlg | 13 +-
testfiles-pdftex/linkhook.tpf | 575 +-
testfiles-pdftex/metadata-ansi.tpf | 630 +-
testfiles-pdftex/metadata-dates.tpf | 292 +-
testfiles-pdftex/metadata-declaration-schema.tpf | 280 +-
testfiles-pdftex/metadata-declarations.tlg | 5 +
testfiles-pdftex/nested-links.tlg | 205 +-
testfiles-pdftex/no-metadata.tpf | 292 +-
testfiles-pdftex/stop-link.tpf | 850 +-
testfiles-pdftex/structure-destination.tpf | 404 +-
testfiles-pdftex/ua-2-info.tpf | 286 +-
testfiles-pdftex/xmp-new-schema.tlg | 5 +
testfiles-xetex/metadata-newpage.tlg | 5 +
testfiles/a-4f.tpf | 298 +-
testfiles/active-colon.tpf | 322 +-
testfiles/annot-dict.tpf | 282 +-
testfiles/annot-last.luatex.tlg | 5 +
testfiles/annot-last.tlg | 103 +-
testfiles/annot-last.xetex.tlg | 5 +
testfiles/annot.tpf | 282 +-
testfiles/ap-names.tpf | 381 +-
testfiles/bdc-properties.tpf | 292 +-
testfiles/bdc-shipout-log.luatex.tlg | 5 +
testfiles/bdc-shipout-log.tlg | 23 +-
testfiles/bdc-shipout-log.xetex.tlg | 5 +
testfiles/bdc-shipout.tpf | 292 +-
testfiles/catalog-remove.luatex.tlg | 5 +
testfiles/catalog-remove.tlg | 5 +
testfiles/catalog-remove.xetex.tlg | 5 +
testfiles/checkbox.tpf | 371 +-
testfiles/colorpatch.lvt | 11 +-
testfiles/colorpatch.tlg | 25 +-
testfiles/colorprofile-standard.tpf | 280 +-
testfiles/colorprofile1.tpf | 280 +-
testfiles/destination-options.tpf | 635 +-
testfiles/dict_if_empty.luatex.tlg | 5 +
testfiles/dict_if_empty.tlg | 113 +-
testfiles/dict_if_empty.xetex.tlg | 5 +
testfiles/disable-links.tpf | 1075 +-
testfiles/documentmetadata-support-000.luatex.tlg | 5 +
testfiles/documentmetadata-support-000.tlg | 5 +
testfiles/documentmetadata-support-000.xetex.tlg | 5 +
testfiles/embedfile.tpf | 573 +-
testfiles/embedstream.tpf | 286 +-
testfiles/formfield-old.tpf | 906 +-
testfiles/formtextfields.tpf | 294 +-
testfiles/infodict-new.tpf | 292 +-
testfiles/infodict.tpf | 290 +-
testfiles/ismap.tpf | 308 +-
testfiles/linkbordercolor.tpf | 840 +-
testfiles/linkmargin.tpf | 573 +-
testfiles/linktoc.tpf | 872 +-
testfiles/metadata-new-no-hyperref.tpf | 280 +-
testfiles/metadata-new.tpf | 292 +-
testfiles/mixpageattr.tpf | 657 +-
testfiles/ocgcolorlinks.tpf | 978 +-
testfiles/ocproperties.tpf | 280 +-
testfiles/pageattr.tpf | 322 +-
testfiles/pagelabels-log.luatex.tlg | 5 +
testfiles/pagelabels-log.tlg | 5 +
testfiles/pagelabels-log.xetex.tlg | 5 +
testfiles/pagelabels.tpf | 40 +
testfiles/pagesattr.tpf | 290 +-
testfiles/pdf_pageobject_ref.luatex.tlg | 7 +-
testfiles/pdf_pageobject_ref.lvt | 2 +-
testfiles/pdf_pageobject_ref.tlg | 7 +-
testfiles/pdf_pageobject_ref.xetex.tlg | 7 +-
testfiles/pdffilelink.tpf | 304 +-
testfiles/pdflscape.tpf | 290 +-
testfiles/pgfpatches.tpf | 354 +-
testfiles/radiobuttons.tpf | 572 +-
testfiles/show.luatex.tlg | 5 +
testfiles/show.tlg | 45 +-
testfiles/show.xetex.tlg | 5 +
testfiles/tag-checkbox.tpf | 339 +-
testfiles/test-pdfA-4.luatex.tlg | 7 +-
testfiles/test-pdfA-4.lvt | 2 +-
testfiles/test-pdfA-4.tlg | 7 +-
testfiles/test-pdfA-4.xetex.tlg | 7 +-
testfiles/text-convert.tlg | 5 +
testfiles/textfield.tpf | 280 +-
testfiles/thispageattr.tpf | 559 +-
testfiles/transition.tpf | 632 +-
testfiles/u-standard.luatex.tlg | 9 +-
testfiles/u-standard.lvt | 2 +-
testfiles/u-standard.tlg | 9 +-
testfiles/u-standard.xetex.tlg | 9 +-
testfiles/version-compare.luatex.tlg | 5 +
testfiles/version-compare.tlg | 159 +-
testfiles/version-compare.xetex.tlg | 5 +
testfiles/viewerpreferences.tpf | 292 +-
testfiles/xcolorpatch-svgnames.lvt | 2 +-
testfiles/xcolorpatch-svgnames.tlg | 9 +-
testfiles/xcolorpatch.luatex.tlg | 33 +-
testfiles/xcolorpatch.lvt | 14 +-
testfiles/xcolorpatch.tlg | 33 +-
testfiles/xcolorpatch.xetex.tlg | 33 +-
testfiles/xform-appearance.tpf | 341 +-
testfiles/xform-preamble.tpf | 310 +-
testfiles/xform.tpf | 328 +-
187 files changed, 23949 insertions(+), 21277 deletions(-)
diff --cc build.lua
index 1fa7835,58259be..83a71d5
--- a/build.lua
+++ b/build.lua
@@@ -73,9 -72,10 +73,11 @@@ els
"config-luatex", -- luatex
-- "config-dvips", -- latex + dvips
"config-pdftex", -- pdftex
- "config-xetex" -- xetex
+ "config-xetex", -- xetex
+ "config-bookmark" -- temporarly!!!
}
+ -- exclude only record status works again
+ excludetests = {"show","catalog-remove"}
end
-- tagging
diff --cc l3backend-testphase.dtx
index f2bbd15,5fd17ad..b68d685
--- a/l3backend-testphase.dtx
+++ b/l3backend-testphase.dtx
@@@ -2545,134 -2556,8 +2556,136 @@@
%</luatex>
% \end{macrocode}
% \end{macro}
-
++%
+% \subsection{Outline backend}
+%<*dvips>
+\cs_new_protected:Npn \__pdf_backend_action:nnnnnnn #1#2#3#4#5#6#7
+% #1 level (ignored), #2 kid count, #3 open? #4 color (space separated values), #5 flag, #6 action, #7 title,
+ {
+ \__pdf_backend_pdfmark:e
+ {
+ /Title~(\exp_not:n{#7})~
+ /Count~\bool_if:nF{#3}{-}#2~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ /F~#5
+ /Action <<\exp_not:n{#6}>>
+ /OUT
+ }
+ }
+\cs_new_protected:Npn \__pdf_backend_goto:nnnnnnn #1#2#3#4#5#6#7
+% #1 level (ignored), #2 kid count, #3 open? #4 color (space separated values), #5 flag, #6 action, #7 title,
+ {
+ \__pdf_backend_pdfmark:e
+ {
+ /Title~(\exp_not:n{#7})~
+ /Count~\bool_if:nF{#3}{-}#2~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ /F~#5
+ /Action/GoTo/Dest(\exp_not:n{#6})~cvn
+ /OUT
+ }
+ }
+%</dvips>
+%<*pdftex>
+\cs_new_protected:Npn \@@_backend_action:nnnnnnn #1#2#3#4#5#6#7
+% #1 level (ignored), #2 kid count, #3 open? #4 color (space separated values), #5 flag, #6 action, #7 title,
+ {
+ \tex_pdfoutline:D~attr
+ {
+ /F~#5~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ }~
+ user~{<<\exp_not:n{#6}>>}~
+ count~\bool_if:nF{#3}{-}#2~
+ {\exp_not:n{#7}}
+ }
+\cs_new_protected:Npn \@@_backend_goto:nnnnnnn #1#2#3#4#5#6#7
+% #1 level (ignored), #2 kid count, #3 open? #4 color (space separated values), #5 flag, #6 destination, #7 title,
+ {
+ \tex_pdfoutline:D~attr
+ {
+ /F~#5~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ }~
+ \tag_if_active:TF
+ {goto~struct~name~{#6}~name~{#6}}
+ {goto~name~{#6}}~
+ count~\bool_if:nF{#3}{-}#2~
+ {\exp_not:n{#7}}
+ }
+%</pdftex>
+%<*luatex>
+\cs_new_protected:Npn \__pdf_backend_action:nnnnnnn #1#2#3#4#5#6#7
+% #1 level (ignored), #2 kid count, #3 open? #4 color (space separated values), #5 flag, #6 action, #7 title,
+ {
+ \tex_pdfextension:D~outline~attr
+ {
+ /F~#5~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ }~
+ user~{<<\exp_not:n{#6}>>}~
+ count~\bool_if:nF{#3}{-}#2~
+ {\exp_not:n{#7}}
+ }
+\cs_new_protected:Npn \__pdf_backend_goto:nnnnnnn #1#2#3#4#5#6#7
+% #1 level (ignored), #2 kid count, #3 open? #4 color (space separated values), #5 flag, #6 destination, #7 title,
+ {
+ \tex_pdfextension:D~outline~attr
+ {
+ /F~#5~
+ \tl_if_blank:nF { #4 }{/Color~[#4]}
+ }~
+ \tag_if_active:TF
+ {goto~struct~name~{#6}~name~{#6}}
+ {goto~name~{#6}}~
+ count~\bool_if:nF{#3}{-}#2~
+ {\exp_not:n{#7}}
+ }
+%</luatex>
+%<*xdvipdfmx|dvipdfmx>
+\cs_new_protected:Npn \__pdf_backend_action:nnnnnnn #1#2#3#4#5#6#7
+% #1 level, #2 kid count (ignored), #3 open? #4 color (space separated values), #5 flag, #6 action, #7 title,
+ {
+ \tex_special:D
+ {
+ pdf:out~
+ [\bool_if:nF{#3}{-}]~#1~
+ <<
+ /A<<\exp_not:n{#6}>>~
+ /Title~(\exp_not:n{#7})~
+ /F~#5~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ >>
+ }
+ }
+\cs_new_protected:Npn \__pdf_backend_goto:nnnnnnn #1#2#3#4#5#6#7
+% #1 level, #2 kid count (ignored), #3 open? #4 color (space separated values), #5 flag, #6 destination, #7 title,
+ {
+ \tex_special:D
+ {
+ pdf:out~
+ [\bool_if:nF{#3}{-}]~#1~
+ <<
+ /A
+ <<
+ /S/GoTo/D(\exp_not:n{#6})
+ \tag_if_active:T
+ {
+ /SD~@pdf.SDest.#6
+ }
+ >>~
+ /Title~(\exp_not:n{#7})~
+ /F~#5~
+ \tl_if_blank:nF { #4 }{/C~[#4]}
+ >>
+ }
+ }
+%</xdvipdfmx|dvipdfmx>
+%<*dvisvgm>
+\cs_new_protected:Npn \__pdf_backend_action:nnnnnnn #1#2#3#4#5#6#7{}
+\cs_new_protected:Npn \__pdf_backend_goto:nnnnnnn #1#2#3#4#5#6#7 {}
+%</dvisvgm>
+ %
% \subsection{lua code for lualatex}
% \begin{macrocode}
%<*lua>
diff --cc testfiles/formfield-old.tpf
index fbe11bb,17d05b0..d2a5b55
--- a/testfiles/formfield-old.tpf
+++ b/testfiles/formfield-old.tpf
@@@ -323,10 -323,10 +323,14 @@@ endob
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 17.2154 Tf 291.732 665.282 Td [(title)]TJ/F40 11.9552 Tf 6.413 -28.892 Td [(me)]TJ -26.824 -23.312 Td [(Ma)27(y)-326(20,)-326(2016)]TJ/F28 9.9626 Tf -122.609 -43.57 Td [(ab)-28(c)-333(cde)-1000(Male)]TJ
++=======
+ /F38 17.2154 Tf 291.251 665.287 Td [(title)]TJ/F39 11.9552 Tf 6.896 -28.888 Td [(me)]TJ -26.818 -23.375 Td [(Ma)27(y)-326(20,)-326(2016)]TJ/F37 9.9626 Tf -122.617 -43.565 Td [(ab)-28(c)-333(cde)-1000(Male)]TJ
++>>>>>>> develop
ET
q
- 1 0 0 1 216.237 584.651 cm
+ 1 0 0 1 216.22 584.602 cm
[]0 d 0 J 0.398 w 0 0 m 18.73 0 l S
Q
q
@@@ -468,7 -468,7 +472,11 @@@ endob
23 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 27 0 R /F40 28 0 R /F28 29 0 R >>
++=======
+ /Font << /F38 27 0 R /F39 28 0 R /F37 29 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/linkbordercolor.tpf
index f06c5b9,3123f3d..e88d14b
--- a/testfiles/linkbordercolor.tpf
+++ b/testfiles/linkbordercolor.tpf
@@@ -16,9 -16,9 +16,13 @@@ strea
0 g 0 G
0 g 0 G
BT
++<<<<<<< HEAD
+/F28 9.9626 Tf 148.712 657.235 Td [(ab)-28(c)]TJ -14.944 -11.955 Td [(link:)-444(1)]TJ 0 -11.955 Td [(url:)]TJ/F39 9.9626 Tf 19.4 0 Td [(www.blub.de)]TJ/F28 9.9626 Tf -19.4 -11.955 Td [(\014le:)-444(tes)-1(t)-333(\014le)]TJ 0 -11.955 Td [(men)28(u:)-445(Find)]TJ
++=======
+ /F37 9.9626 Tf 148.712 657.235 Td [(ab)-28(c)]TJ -14.944 -11.955 Td [(link:)-444(1)]TJ 0 -11.955 Td [(url:)]TJ/F38 9.9626 Tf 19.395 0 Td [(www.blub.de)]TJ/F37 9.9626 Tf -19.395 -11.955 Td [(\034le:)-444(tes)-1(t)-333(\034le)]TJ 0 -11.955 Td [(men)28(u:)-445(Find)]TJ
++>>>>>>> develop
0 g 0 G
- 169.365 -520.05 Td [(1)]TJ
+ 169.366 -520.05 Td [(1)]TJ
0 g 0 G
ET
endstream
@@@ -76,7 -76,7 +80,11 @@@ endob
12 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F28 16 0 R /F39 17 0 R >>
++=======
+ /Font << /F37 16 0 R /F38 17 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -326,9 -326,9 +334,13 @@@ strea
0 g 0 G
0 g 0 G
BT
++<<<<<<< HEAD
+/F41 14.3462 Tf 133.768 657.235 Td [(1)-1125(a)]TJ
++=======
+ /F40 14.3462 Tf 133.768 657.235 Td [(1)-1100(a)]TJ
++>>>>>>> develop
0 g 0 G
- /F28 9.9626 Tf 169.365 -567.87 Td [(2)]TJ
+ /F37 9.9626 Tf 169.366 -567.87 Td [(2)]TJ
0 g 0 G
ET
endstream
@@@ -355,7 -355,7 +367,11 @@@ endob
21 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F41 25 0 R /F28 16 0 R >>
++=======
+ /Font << /F40 25 0 R /F37 16 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/linkmargin.tpf
index 751d993,5420f87..ac9a7f5
--- a/testfiles/linkmargin.tpf
+++ b/testfiles/linkmargin.tpf
@@@ -10,9 -10,9 +10,13 @@@ strea
0 g 0 G
0 g 0 G
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 657.235 Td [(https://www.latex-)-50(project.org/)]TJ
++=======
+ /F38 9.9626 Tf 148.712 657.235 Td [(https://www.latex-)-50(pro)1(ject.org/)]TJ
++>>>>>>> develop
0 g 0 G
- /F28 9.9626 Tf 154.421 -567.87 Td [(1)]TJ
+ /F37 9.9626 Tf 154.422 -567.87 Td [(1)]TJ
0 g 0 G
ET
endstream
@@@ -47,7 -47,7 +51,11 @@@ endob
7 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 11 0 R /F28 12 0 R >>
++=======
+ /Font << /F38 11 0 R /F37 12 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -297,9 -297,9 +305,13 @@@ strea
0 g 0 G
0 g 0 G
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 657.235 Td [(https://www.latex-)-50(project.org/)]TJ 0 -23.91 Td [(https://www.latex-)-50(project.org/)]TJ
++=======
+ /F38 9.9626 Tf 148.712 657.235 Td [(https://www.latex-)-50(pro)1(ject.org/)]TJ 0 -23.91 Td [(https://www.latex-)-50(pro)1(ject.org/)]TJ
++>>>>>>> develop
0 g 0 G
- /F28 9.9626 Tf 154.421 -543.96 Td [(2)]TJ
+ /F37 9.9626 Tf 154.422 -543.96 Td [(2)]TJ
0 g 0 G
ET
endstream
@@@ -336,7 -336,7 +348,11 @@@ endob
17 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 11 0 R /F28 12 0 R >>
++=======
+ /Font << /F38 11 0 R /F37 12 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/linktoc.tpf
index 163bc4d,7993309..d5303b0
--- a/testfiles/linktoc.tpf
+++ b/testfiles/linktoc.tpf
@@@ -244,7 -244,7 +244,11 @@@ endob
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F28 9.9626 Tf 271.626 700.207 Td [(Figure)-333(1:)-445(\014gure)]TJ 3.418 -30.774 Td [(T)83(able)-333(1:)-444(table)]TJ/F40 14.3462 Tf -141.276 -29.888 Td [(Con)31(ten)31(ts)]TJ/F41 9.9626 Tf 0 -21.918 Td [(1)-925(ab)-32(c)-30684(1)]TJ/F40 14.3462 Tf 0 -32.945 Td [(List)-375(of)-375(Figures)]TJ/F28 9.9626 Tf 14.944 -21.821 Td [(1)-1800(\014gure)-1003(.)-500(.)-500(.)-500(.)-500(.)-499(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-1583(1)]TJ/F40 14.3462 Tf -14.944 -32.946 Td [(List)-375(of)-375(T)94(ables)]TJ/F28 9.9626 Tf 14.944 -21.821 Td [(1)-1800(table)-505(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-499(.)-500(.)-1584(1)]TJ/F40 14.3462 Tf -14.944 -32.946 Td [(1)-1125(ab)-31(c)]TJ/F28 9.9626 Tf 169.365 -335.893 Td [(1)]TJ
++=======
+ /F37 9.9626 Tf 271.635 700.264 Td [(Figure)-333(1:)-445(\034gure)]TJ 3.417 -30.716 Td [(T)83(able)-333(1:)-444(table)]TJ/F39 14.3462 Tf -141.284 -29.888 Td [(Con)31(ten)30(ts)]TJ/F40 9.9626 Tf 0 -21.916 Td [(1)-925(ab)-32(c)-30685(1)]TJ/F39 14.3462 Tf 0 -32.942 Td [(List)-367(of)-366(Figures)]TJ/F37 9.9626 Tf 14.941 -21.818 Td [(1)-1800(\034gure)-1003(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-1587(1)]TJ/F39 14.3462 Tf -14.941 -32.943 Td [(List)-367(of)-366(T)92(ables)]TJ/F37 9.9626 Tf 14.941 -21.818 Td [(1)-1800(ta)1(b)-1(le)-506(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-500(.)-1587(1)]TJ/F39 14.3462 Tf -14.941 -32.942 Td [(1)-1100(ab)-30(c)]TJ/F37 9.9626 Tf 169.366 -336.026 Td [(1)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -337,7 -337,7 +341,11 @@@ endob
11 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F28 14 0 R /F40 19 0 R /F41 20 0 R >>
++=======
+ /Font << /F37 14 0 R /F39 19 0 R /F40 20 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/mixpageattr.tpf
index 3bb37b6,75813a2..b2da1ce
--- a/testfiles/mixpageattr.tpf
+++ b/testfiles/mixpageattr.tpf
@@@ -203,7 -203,7 +203,11 @@@
[]0 d 0 J 0.398 w 0 0 m 343.711 0 l S
Q
BT
++<<<<<<< HEAD
+/F40 24.7871 Tf 133.768 699.875 Td [(co)-26(de)-302(is)-302(on)-302(page)-302(7)]TJ 0 -29.888 Td [(\015oat)-302(is)-302(on)-302(page)-302(7)]TJ/F28 9.9626 Tf 0 -34.71 Td [(is)-458(the)-458(k)28(ey)-458(to)-458(understanding)-458(pu)1(re)-458(logic.)-818(Le)-1(t)-457(us)-458(supp)-28(ose)-458(that,)-489(irresp)-28(ectiv)28(e)-458(of)]TJ 0 -11.955 Td [(all)-443(empirical)-444(conditions,)-470(our)-444(understanding)-443(stands)-443(in)-444(need)-443(of)-443(our)-444(di)1(s)-1(j)1(unctiv)27(e)]TJ 0 -11.955 Td [(judgemen)28(ts.)-502(As)-352(is)-353(sho)28(wn)-352(in)-352(the)-353(writings)-352(of)-352(Aristotle,)-357(pure)-353(logic,)-357(in)-352(the)-352(c)-1(ase)-352(of)]TJ 0 -11.955 Td [(the)-383(discipline)-383(of)-383(natural)-383(reason,)-395(abstracts)-383(from)-383(all)-383(con)27(ten)28(t)-383(of)-383(kno)28(wledge.)-593(Our)]TJ 0 -11.955 Td [(understanding)-406(is)-407(a)-407(represen)28(tation)-407(of,)-425(in)-406(accordance)-407(with)-407(the)-406(principles)-407(of)-406(the)]TJ 0 -11.955 Td [(emplo)28(ymen)27(t)-328(of)-329(the)-329(paralogisms,)-330(time.)-443(I)-329(assert,)-330(as)-329(I)-329(ha)28(v)28(e)-329(sho)28(wn)-329(elsewhere)-1(,)-329(that)]TJ 0 -11.956 Td [(our)-385(concepts)-385(can)-385(b)-27(e)-385(treated)-385(lik)28(e)-385(metaph)27(ysics.)-599(By)-385(means)-385(of)-384(the)-385(Ideal,)-398(it)-385(m)28(ust)]TJ 0 -11.955 Td [(not)-377(b)-28(e)-376(s)-1(u)1(pp)-28(osed)-377(that)-377(the)-377(ob)-55(jects)-377(in)-377(space)-377(and)-377(time)-377(are)-376(what)-377(\014rst)-377(giv)28(e)-377(rise)-377(to)]TJ 0 -11.955 Td [(the)-333(emplo)27(ymen)28(t)-333(of)-333(pure)-334(reason.)]TJ 14.944 -11.955 Td [(As)-451(is)-451(eviden)28(t)-451(up)-28(on)-451(close)-451(examination,)-480(to)-451(a)28(v)27(oid)-450(all)-451(misapprehension,)-481(it)-451(is)]TJ -14.944 -11.955 Td [(necessary)-288(to)-288(explain)-288(that,)-297(on)-288(the)-288(con)27(trary)84(,)-297(the)-288(nev)27(er-ending)-288(regress)-288(in)-288(the)-288(series)]TJ 0 -11.956 Td [(of)-333(empirical)-333(conditions)-332(is)-333(a)-333(represen)28(tation)-333(of)-333(our)-333(in)1(ductiv)27(e)-332(judgemen)27(ts,)-333(y)28(et)-333(the)]TJ 0 -11.955 Td [(things)-390(in)-391(themselv)28(es)-391(pr)1(o)27(v)28(e)-390(the)-391(v)56(alidit)28(y)-391(of,)-404(on)-391(the)-390(con)28(trary)83(,)-405(the)-390(Categories.)-616(It)]TJ 0 -11.955 Td [(remains)-326(a)-327(m)28(ystery)-327(wh)28(y)84(,)-328(indeed,)-328(the)-326(nev)28(er-e)-1(n)1(ding)-327(regress)-326(in)-327(the)-326(series)-326(of)-327(empir-)]TJ 0 -11.955 Td [(ical)-360(conditions)-360(exists)-360(in)-360(phi)1(los)-1(op)1(h)27(y)84(,)-367(but)-360(the)-360(emplo)28(ymen)28(t)-360(of)-360(the)-360(An)28(tinomies,)-366(in)]TJ 0 -11.955 Td [(resp)-28(ect)-332(of)-333(the)-333(in)28(telligible)-332(c)28(haracter,)-333(can)-333(nev)28(er)-332(furnish)-333(a)-332(true)-333(and)-332(demons)-1(t)1(rate)-1(d)]TJ 0 -11.955 Td [(science,)-341(b)-27(ecause,)-341(lik)28(e)-339(the)-339(arc)28(hitectonic)-339(of)-339(pure)-339(reason,)-341(i)1(t)-339(is)-339(just)-339(as)-339(nec)-1(essary)-339(as)]TJ 0 -11.956 Td [(problematic)-380(principles.)-584(The)-380(practical)-380(emplo)28(ymen)28(t)-380(of)-380(the)-380(ob)-55(jects)-380(in)-380(space)-380(and)]TJ 0 -11.955 Td [(time)-381(is)-382(b)28(y)-381(its)-382(v)28(ery)-381(nature)-381(co)-1(n)28(tradictory)84(,)-394(and)-381(the)-381(thing)-381(in)-382(itself)-381(w)28(ould)-381(there)-1(b)28(y)]TJ 0 -11.955 Td [(b)-28(e)-299(m)-1(ad)1(e)-300(to)-300(con)28(tradict)-300(the)-299(Ideal)-300(of)-300(practical)-299(reason.)-434(On)-299(the)-300(other)-300(h)1(and,)-307(natural)]TJ 0 -11.955 Td [(causes)-353(can)-352(not)-353(tak)28(e)-352(accoun)27(t)-352(of,)-357(consequen)27(tly)84(,)-358(th)1(e)-353(An)28(tinomies,)-358(as)-352(will)-353(easily)-352(b)-28(e)]TJ 0 -11.955 Td [(sho)28(wn)-400(in)-399(the)-400(next)-400(section.)-643(Consequen)28(tly)83(,)-416(the)-400(Ideal)-399(of)-400(practical)-399(reason)-400(\050and)-399(I)]TJ 0 -11.955 Td [(assert)-380(that)-380(this)-380(is)-380(true\051)-380(excludes)-380(the)-380(p)-28(ossibilit)28(y)-380(of)-380(our)-379(s)-1(ense)-380(p)-27(erceptions.)-585(Our)]TJ 0 -11.956 Td [(exp)-28(erience)-419(w)28(ould)-419(thereb)27(y)-419(b)-27(e)-420(made)-419(to)-419(con)28(tradict,)-441(for)-419(example,)-440(our)-419(ideas,)-441(but)]TJ 0 -11.955 Td [(the)-409(transcenden)28(tal)-409(ob)-55(jects)-409(in)-409(space)-409(and)-408(time)-409(\050and)-409(let)-409(us)-408(supp)-28(ose)-409(that)-409(this)-408(is)]TJ 0 -11.955 Td [(the)-389(case\051)-389(are)-389(the)-389(clue)-389(to)-389(th)1(e)-389(disco)27(v)28(ery)-389(of)-389(necessit)28(y)83(.)-611(But)-389(the)-388(pro)-28(of)-389(of)-389(this)-389(is)-389(a)]TJ 0 -11.955 Td [(task)-333(from)-334(whic)28(h)-333(w)28(e)-334(can)-333(here)-334(b)-27(e)-334(absolv)28(ed.)]TJ 14.944 -11.955 Td [(As)-415(an)28(y)-414(dedicated)-415(reader)-414(can)-415(clearly)-414(see,)-435(the)-414(Ideal)-415(of)-414(practical)-415(reason)-414(is)-415(a)]TJ -14.944 -11.955 Td [(represen)28(tation)-391(of,)-405(as)-391(far)-391(as)-391(I)-391(kno)28(w,)-406(the)-391(thi)1(ngs)-391(in)-391(themselv)27(es;)-419(as)-391(I)-391(ha)28(v)27(e)-391(sho)28(wn)]TJ 0 -11.956 Td [(elsewhere,)-265(the)-248(phenomena)-247(should)-248(only)-247(b)-28(e)-248(used)-247(as)-248(a)-248(canon)-247(for)-248(our)-247(understanding.)]TJ 0 -11.955 Td [(The)-329(paralogisms)-330(of)-329(practical)-330(reason)-329(are)-329(what)-330(\014rst)-329(giv)28(e)-330(rise)-329(to)-330(the)-329(arc)28(hitectonic)]TJ 0 -11.955 Td [(of)-383(practical)-384(reason.)-595(As)-383(will)-383(easily)-384(b)-28(e)-383(sho)28(wn)-384(in)-383(the)-383(next)-384(section,)-396(reason)-383(w)27(oul)1(d)]TJ 0 -11.955 Td [(thereb)28(y)-261(b)-28(e)-260(made)-261(to)-260(con)27(trad)1(ic)-1(t,)-275(in)-260(view)-261(of)-260(these)-261(considerations,)-275(the)-261(Ideal)-260(of)-261(prac-)]TJ 0 -11.955 Td [(tical)-399(reason,)-415(y)28(et)-399(the)-399(manifold)-399(dep)-28(ends)-398(on)-399(the)-399(phenomena.)-641(Necessit)27(y)-398(dep)-28(ends)]TJ 0 -11.956 Td [(on,)-351(when)-347(th)28(us)-348(treated)-347(as)-348(the)-347(practical)-348(emplo)28(ymen)28(t)-347(of)-348(the)-347(nev)28(er-ending)-348(regress)]TJ 0 -11.955 Td [(in)-316(the)-317(series)-316(of)-317(empir)1(ic)-1(al)-316(conditions,)-320(time.)-438(Human)-317(reason)-316(dep)-28(ends)-316(on)-317(ou)1(r)-317(sense)]TJ 0 -11.955 Td [(p)-28(erceptions,)-284(b)28(y)-272(means)-272(of)-272(analytic)-272(unit)28(y)83(.)-424(There)-272(can)-272(b)-28(e)-272(no)-272(d)1(oubt)-272(that)-272(the)-272(ob)-56(jects)]TJ 0 -11.955 Td [(in)-333(space)-334(and)-333(time)-333(are)-334(what)-333(\014rst)-333(giv)27(e)-333(rise)-333(to)-334(h)28(uman)-333(reason.)]TJ 14.944 -11.955 Td [(Let)-386(us)-386(supp)-28(ose)-386(that)-386(the)-387(noumena)-386(ha)28(v)28(e)-386(nothing)-386(to)-387(do)-386(with)-386(necessit)28(y)83(,)-399(since)]TJ 154.421 -41.727 Td [(7)]TJ
++=======
+ /F39 24.7871 Tf 133.768 700.019 Td [(co)-25(de)-305(is)-304(on)-304(page)-304(7)]TJ 0 -29.888 Td [(\035oat)-304(is)-305(on)-304(page)-304(7)]TJ/F37 9.9626 Tf 0 -34.709 Td [(is)-458(the)-459(k)28(ey)-458(to)-459(understanding)-458(pure)-459(logic.)-819(L)-1(et)-458(us)-458(supp)-28(ose)-459(that,)-489(irresp)-28(ectiv)28(e)-459(of)]TJ 0 -11.955 Td [(all)-444(empirical)-444(conditions,)-472(our)-444(understanding)-444(s)-1(tands)-444(in)-444(need)-444(of)-444(our)-444(disjunctiv)28(e)]TJ 0 -11.955 Td [(judgemen)28(ts.)-503(As)-353(is)-353(sho)28(wn)-353(in)-353(the)-353(writings)-353(of)-352(Aris)-1(to)1(tle)-1(,)-357(pure)-353(logic,)-358(in)-353(the)-352(case)-353(of)]TJ 0 -11.955 Td [(the)-384(discipline)-383(of)-384(natural)-384(r)1(e)-1(ason,)-396(abstracts)-383(from)-384(all)-383(con)27(ten)28(t)-384(of)-383(kno)28(wledge.)-596(Our)]TJ 0 -11.955 Td [(understanding)-408(is)-407(a)-407(represen)27(tation)-407(of,)-426(in)-407(accordance)-407(with)-408(the)-407(principles)-408(of)-407(the)]TJ 0 -11.956 Td [(emplo)28(ymen)27(t)-329(of)-330(the)-330(paralo)1(gis)-1(ms,)-330(time.)-443(I)-330(assert,)-330(as)-330(I)-330(ha)28(v)28(e)-330(sho)28(wn)-330(elsewhere,)-330(that)]TJ 0 -11.955 Td [(our)-385(concepts)-386(can)-385(b)-28(e)-385(treated)-386(lik)28(e)-385(metaph)27(ysics.)-600(By)-386(means)-385(of)-385(the)-386(Ideal,)-398(it)-386(m)28(ust)]TJ 0 -11.955 Td [(not)-377(b)-28(e)-378(supp)-27(osed)-378(that)-377(the)-377(ob)-56(jects)-377(in)-378(space)-377(and)-378(time)-377(are)-377(what)-378(\034rst)-377(giv)28(e)-378(rise)-377(to)]TJ 0 -11.955 Td [(the)-333(emplo)27(ymen)28(t)-333(of)-333(pure)-334(reason.)]TJ 14.944 -11.955 Td [(As)-452(is)-451(eviden)27(t)-451(up)-28(on)-452(close)-451(examination,)-481(to)-452(a)28(v)28(oid)-452(all)-451(misapp)-1(r)1(e)-1(hension,)-481(it)-451(is)]TJ -14.944 -11.955 Td [(necessary)-289(to)-289(explain)-288(that,)-298(on)-289(the)-289(con)28(trary)84(,)-298(the)-289(nev)28(er-ending)-289(regress)-289(in)-288(the)-289(series)]TJ 0 -11.956 Td [(of)-334(empirical)-333(conditions)-334(is)-333(a)-334(represen)28(tation)-334(of)-333(our)-334(inductiv)28(e)-333(jud)-1(g)1(e)-1(men)28(ts,)-333(y)27(et)-333(the)]TJ 0 -11.955 Td [(things)-391(in)-391(themselv)28(es)-391(pro)27(v)28(e)-391(the)-391(v)56(alidit)28(y)-391(of,)-405(on)-391(the)-391(con)27(trar)1(y)83(,)-405(the)-391(Categories)-1(.)-617(It)]TJ 0 -11.955 Td [(remains)-327(a)-327(m)28(ystery)-327(wh)27(y)84(,)-329(indeed,)-328(the)-327(nev)28(er-endin)-1(g)-327(r)1(e)-1(gr)1(e)-1(ss)-327(in)-327(the)-327(series)-327(of)-327(empir-)]TJ 0 -11.955 Td [(ical)-361(conditions)-360(exists)-361(in)-361(philosoph)28(y)83(,)-367(but)-360(the)-361(emplo)28(ymen)27(t)-360(of)-361(the)-360(An)27(tinomies,)-367(in)]TJ 0 -11.955 Td [(resp)-28(ect)-333(of)-333(the)-334(in)28(telligible)-333(c)27(haracter,)-333(can)-333(nev)28(e)-1(r)-333(furnish)-333(a)-333(true)-334(and)-333(demonstrated)]TJ 0 -11.956 Td [(science,)-341(b)-28(ecause,)-341(lik)27(e)-339(the)-340(arc)28(hitectonic)-340(of)-339(pure)-340(reason,)-341(it)-339(is)-340(just)-339(as)-340(necessary)-340(as)]TJ 0 -11.955 Td [(problematic)-381(principles.)-586(The)-380(practical)-381(emplo)28(ymen)28(t)-381(of)-380(the)-381(ob)-55(jects)-381(in)-381(space)-380(and)]TJ 0 -11.955 Td [(time)-382(is)-382(b)28(y)-382(its)-382(v)28(ery)-382(nature)-382(con)28(tradictory)83(,)-394(and)-382(the)-382(thing)-382(in)-382(itself)-381(w)27(ould)-382(thereb)28(y)]TJ 0 -11.955 Td [(b)-28(e)-300(made)-301(to)-300(con)28(tradict)-300(the)-301(Ideal)-300(of)-300(practical)-301(reason.)-433(On)-300(the)-301(other)-300(hand,)-307(natural)]TJ 0 -11.955 Td [(causes)-353(can)-353(not)-353(tak)27(e)-353(accoun)28(t)-353(of,)-358(consequen)27(tly)84(,)-358(the)-353(An)27(tinomies,)-358(as)-353(will)-353(easily)-353(b)-28(e)]TJ 0 -11.955 Td [(sho)28(wn)-400(in)-401(the)-400(next)-400(section.)-645(Consequen)28(tly)83(,)-417(the)-400(Ideal)-400(of)-400(practical)-400(reason)-400(\050and)-401(I)]TJ 0 -11.956 Td [(assert)-381(that)-380(this)-381(is)-380(true\051)-381(excludes)-380(the)-381(p)-28(ossibilit)28(y)-380(of)-381(our)-380(sense)-381(p)-28(erceptions.)-586(Our)]TJ 0 -11.955 Td [(exp)-28(erience)-420(w)28(ould)-420(thereb)28(y)-420(b)-28(e)-419(made)-420(to)-420(con)28(tradict,)-442(for)-419(example,)-442(our)-420(ideas,)-441(but)]TJ 0 -11.955 Td [(the)-281(transcenden)28(tal)-281(ob)-56(jects)-281(in)-281(space)-281(and)-281(time)-281(\050and)-281(let)-280(u)-1(s)-280(su)-1(pp)-27(ose)-281(that)-281(this)-281(is)-281(the)]TJ 0 -11.955 Td [(case\051)-366(are)-366(the)-366(clue)-366(to)-365(the)-366(disco)27(v)28(ery)-365(of)-366(necessit)27(y)84(.)-542(But)-366(the)-366(pro)-28(of)-366(of)-365(this)-366(is)-366(a)-366(task)]TJ 0 -11.955 Td [(from)-333(whic)27(h)-333(w)28(e)-333(can)-334(here)-333(b)-28(e)-333(absolv)28(ed.)]TJ 14.944 -11.955 Td [(As)-415(an)28(y)-415(dedicated)-415(reader)-415(can)-415(clearly)-415(see,)-436(the)-415(Ideal)-415(of)-415(practical)-415(reason)-415(is)-415(a)]TJ -14.944 -11.956 Td [(represen)28(tation)-392(of,)-406(as)-391(far)-391(as)-392(I)-391(kno)28(w,)-406(the)-392(things)-391(in)-392(themselv)28(es;)-421(as)-391(I)-392(ha)28(v)28(e)-391(sho)27(wn)]TJ 0 -11.955 Td [(elsewhere,)-266(the)-248(phenomena)-248(should)-249(only)-248(b)-28(e)-248(used)-249(as)-248(a)-248(canon)-249(for)-248(our)-248(understanding.)]TJ 0 -11.955 Td [(The)-330(paralogisms)-330(of)-330(practical)-330(reason)-330(are)-330(what)-330(\034rst)-330(giv)27(e)-330(rise)-330(to)-330(the)-330(arc)28(hitectonic)]TJ 0 -11.955 Td [(of)-384(practical)-384(reason.)-596(As)-384(will)-384(easily)-384(b)-28(e)-384(sho)28(wn)-384(in)-384(the)-384(next)-384(section,)-396(reason)-384(w)27(o)1(u)-1(ld)]TJ 0 -11.955 Td [(thereb)28(y)-261(b)-28(e)-261(m)-1(ade)-261(to)-261(con)28(tradict,)-276(in)-261(view)-261(of)-261(thes)-1(e)-261(considerations,)-276(the)-261(Ideal)-261(of)-261(prac-)]TJ 0 -11.955 Td [(tical)-400(r)1(e)-1(ason,)-416(y)28(et)-399(the)-400(manifold)-399(dep)-28(ends)-400(on)-399(the)-400(phenomena.)-643(Necessit)28(y)-400(dep)-28(ends)]TJ 0 -11.956 Td [(on,)-352(when)-348(th)28(us)-348(treated)-349(a)1(s)-349(the)-348(practical)-348(emplo)28(ymen)28(t)-349(o)1(f)-349(the)-348(nev)28(er-ending)-348(regress)]TJ 0 -11.955 Td [(in)-317(the)-317(series)-317(of)-317(emp)-1(ir)1(i)-1(cal)-317(conditions,)-320(time.)-439(Human)-317(reason)-317(dep)-28(ends)-317(on)-317(our)-317(sense)]TJ 0 -11.955 Td [(p)-28(erceptions,)-285(b)28(y)-273(means)-272(of)-273(analytic)-272(unit)27(y)84(.)-424(T)-1(here)-272(can)-273(b)-28(e)-272(no)-273(doubt)-273(that)-272(the)-273(ob)-55(jects)]TJ 0 -11.955 Td [(in)-333(space)-334(and)-333(time)-333(are)-334(what)-333(\034rst)-333(giv)28(e)-334(rise)-333(to)-333(h)28(uman)-334(reason.)]TJ 14.944 -11.955 Td [(Let)-387(us)-387(supp)-28(ose)-386(that)-387(the)-387(noumena)-387(ha)28(v)28(e)-387(nothing)-387(to)-386(do)-387(with)-387(necessit)28(y)83(,)-400(since)]TJ -14.944 -11.956 Td [(kno)28(wledge)-404(of)-404(the)-405(Categories)-404(is)-404(a)-404(p)-28(osteriori.)-657(Hume)-404(tells)-404(us)-404(that)-404(the)-404(transcen-)]TJ 169.366 -29.916 Td [(7)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -220,7 -220,7 +224,11 @@@ endob
25 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F40 28 0 R /F28 8 0 R >>
++=======
+ /Font << /F39 28 0 R /F37 8 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/ocgcolorlinks.tpf
index 6f7acbe,ff2e519..a946f4e
--- a/testfiles/ocgcolorlinks.tpf
+++ b/testfiles/ocgcolorlinks.tpf
@@@ -268,11 -268,11 +268,15 @@@ strea
0 g 0 G
0 g 0 G
BT
++<<<<<<< HEAD
+/F40 14.3462 Tf 133.768 656.438 Td [(1)-1125(h)31(yp)-31(erref)-375(colors)-375(/)-375(colorlinks)]TJ/F28 9.9626 Tf 5.978 -22.817 Td [(default)-333(color)-3370(example)]TJ
++=======
+ /F39 14.3462 Tf 133.768 656.551 Td [(1)-1100(h)31(yp)-31(erref)-366(colors)-367(/)-367(c)1(olorlinks)]TJ/F37 9.9626 Tf 5.978 -22.814 Td [(default)-333(color)-3369(example)]TJ
++>>>>>>> develop
ET
q
- 1 0 0 1 133.768 629.835 cm
- []0 d 0 J 0.398 w 0 0 m 257.478 0 l S
+ 1 0 0 1 133.768 629.951 cm
+ []0 d 0 J 0.398 w 0 0 m 257.422 0 l S
Q
1 0 0 rg 1 0 0 RG
BT
@@@ -334,13 -334,13 +338,21 @@@ B
ET
/OC /l3pdf7 BDC
BT
++<<<<<<< HEAD
+/F41 9.9626 Tf 227.86 537.581 Td [(https://www.latex-)-50(project.org/)]TJ
++=======
+ /F40 9.9626 Tf 227.841 537.697 Td [(https://www.latex-)-50(pro)1(ject.org/)]TJ
++>>>>>>> develop
ET
EMC
/OC /l3pdf8 BDC
0.54118 0.0 0.52941 rg 0.54118 0.0 0.52941 RG
BT
++<<<<<<< HEAD
+/F41 9.9626 Tf 227.86 537.581 Td [(https://www.latex-)-50(project.org/)]TJ
++=======
+ /F40 9.9626 Tf 227.841 537.697 Td [(https://www.latex-)-50(pro)1(ject.org/)]TJ
++>>>>>>> develop
0 g 0 G
ET
EMC
@@@ -379,11 -379,11 +391,15 @@@ B
ET
EMC
BT
++<<<<<<< HEAD
+/F40 14.3462 Tf 133.768 459.405 Td [(2)-1125(h)31(yp)-31(erref)-375(colors)-375(/)-375(b)-31(order)]TJ/F28 9.9626 Tf 5.978 -22.817 Td [(default)-333(color)-8184(example)]TJ
++=======
+ /F39 14.3462 Tf 133.768 459.636 Td [(2)-1100(h)31(yp)-31(erref)-366(colors)-367(/)-367(b)-30(order)]TJ/F37 9.9626 Tf 5.978 -22.814 Td [(default)-333(color)-8182(example)]TJ
++>>>>>>> develop
ET
q
- 1 0 0 1 133.768 432.802 cm
- []0 d 0 J 0.398 w 0 0 m 305.437 0 l S
+ 1 0 0 1 133.768 433.037 cm
+ []0 d 0 J 0.398 w 0 0 m 305.369 0 l S
Q
1 0 0 rg 1 0 0 RG
BT
@@@ -445,13 -445,13 +461,21 @@@ B
ET
/OC /l3pdf19 BDC
BT
++<<<<<<< HEAD
+/F41 9.9626 Tf 275.819 340.548 Td [(https://www.latex-)-50(project.org/)]TJ
++=======
+ /F40 9.9626 Tf 275.789 340.783 Td [(https://www.latex-)-50(p)1(roject.org/)]TJ
++>>>>>>> develop
ET
EMC
/OC /l3pdf20 BDC
0.54118 0.0 0.52941 rg 0.54118 0.0 0.52941 RG
BT
++<<<<<<< HEAD
+/F41 9.9626 Tf 275.819 340.548 Td [(https://www.latex-)-50(project.org/)]TJ
++=======
+ /F40 9.9626 Tf 275.789 340.783 Td [(https://www.latex-)-50(p)1(roject.org/)]TJ
++>>>>>>> develop
0 g 0 G
ET
EMC
@@@ -490,9 -490,9 +514,13 @@@ B
ET
EMC
BT
++<<<<<<< HEAD
+/F40 14.3462 Tf 133.768 263.169 Td [(References)]TJ
++=======
+ /F39 14.3462 Tf 133.768 263.469 Td [(References)]TJ
++>>>>>>> develop
0 g 0 G
- /F28 9.9626 Tf 4.982 -21.821 Td [([1])]TJ
+ /F37 9.9626 Tf 4.98 -21.818 Td [([1])]TJ
0 g 0 G
[-500(some)-333(text)]TJ
0 g 0 G
@@@ -636,7 -636,7 +664,11 @@@ endob
26 0 obj
<<
/Properties <</l3pdf1 8 0 R /l3pdf2 7 0 R /l3pdf3 8 0 R /l3pdf4 7 0 R /l3pdf5 8 0 R /l3pdf6 7 0 R /l3pdf7 8 0 R /l3pdf8 7 0 R /l3pdf9 8 0 R /l3pdf10 7 0 R /l3pdf11 8 0 R /l3pdf12 7 0 R /l3pdf13 8 0 R /l3pdf14 7 0 R /l3pdf15 8 0 R /l3pdf16 7 0 R /l3pdf17 8 0 R /l3pdf18 7 0 R /l3pdf19 8 0 R /l3pdf20 7 0 R /l3pdf21 8 0 R /l3pdf22 7 0 R /l3pdf23 8 0 R /l3pdf24 7 0 R >>/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F40 31 0 R /F28 32 0 R /F41 33 0 R >>
++=======
+ /Font << /F39 31 0 R /F37 32 0 R /F40 33 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/pagelabels.tpf
index 1426a66,0f83ee9..36a4d7b
--- a/testfiles/pagelabels.tpf
+++ b/testfiles/pagelabels.tpf
@@@ -7,7 -7,7 +7,11 @@@
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 147.021 -567.87 Td [(l\350g1)]TJ
++=======
+ /F38 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 147.021 -567.87 Td [(l\350g1)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -33,7 -33,7 +37,11 @@@ endob
6 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 10 0 R >>
++=======
+ /Font << /F38 10 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -44,7 -44,7 +52,11 @@@
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 147.021 -567.87 Td [(l\350g2)]TJ
++=======
+ /F38 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 147.021 -567.87 Td [(l\350g2)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -65,7 -65,7 +77,11 @@@ endob
12 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 10 0 R >>
++=======
+ /Font << /F38 10 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -76,7 -76,7 +92,11 @@@
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 147.021 -567.87 Td [(l\350g3)]TJ
++=======
+ /F38 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 147.021 -567.87 Td [(l\350g3)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -97,7 -97,7 +117,11 @@@ endob
16 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 10 0 R >>
++=======
+ /Font << /F38 10 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -108,7 -108,7 +132,11 @@@
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 155.667 -567.87 Td [(i)]TJ
++=======
+ /F38 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 155.667 -567.87 Td [(i)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -129,7 -129,7 +157,11 @@@ endob
20 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 10 0 R >>
++=======
+ /Font << /F38 10 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -377,7 -377,7 +409,11 @@@ endob
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 155.529 -567.87 Td [(V)]TJ
++=======
+ /F38 9.9626 Tf 148.712 707.125 Td [(abc)]TJ 155.529 -567.87 Td [(V)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -398,7 -398,7 +434,11 @@@ endob
25 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 10 0 R >>
++=======
+ /Font << /F38 10 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/tag-checkbox.tpf
index 4819b64,062799e..ea956a2
--- a/testfiles/tag-checkbox.tpf
+++ b/testfiles/tag-checkbox.tpf
@@@ -21,7 -21,7 +21,11 @@@
Q
1 0 0 1 0 12.752 cm
BT
++<<<<<<< HEAD
+/F41 9.9626 Tf 2.104 -8.767 Td [(\326)]TJ
++=======
+ /F40 9.9626 Tf 2.104 -8.767 Td [(\326)]TJ
++>>>>>>> develop
ET
q
1 0 0 1 11.756 -12.354 cm
@@@ -36,7 -36,7 +40,11 @@@ endob
14 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F41 15 0 R >>
++=======
+ /Font << /F40 15 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/thispageattr.tpf
index 20bf1e8,7281e2e..79012ce
--- a/testfiles/thispageattr.tpf
+++ b/testfiles/thispageattr.tpf
@@@ -7,7 -7,7 +7,11 @@@
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 24.7871 Tf 148.712 700.153 Td [(TEXT)]TJ/F28 9.9626 Tf 154.421 -560.898 Td [(1)]TJ
++=======
+ /F38 24.7871 Tf 148.712 700.019 Td [(TEXT)]TJ/F37 9.9626 Tf 154.422 -560.764 Td [(1)]TJ
++>>>>>>> develop
ET
endstream
endobj
@@@ -23,7 -23,7 +27,11 @@@ endob
5 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 8 0 R /F28 9 0 R >>
++=======
+ /Font << /F38 8 0 R /F37 9 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -34,10 -34,10 +42,14 @@@
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 24.7871 Tf 133.768 594.094 Td [(co)-26(de)-302(is)-302(on)-302(page)-302(1)]TJ 0 -29.888 Td [(\015oat)-302(is)-302(on)-302(page)-302(2)]TJ
++=======
+ /F38 24.7871 Tf 133.768 594.166 Td [(co)-25(de)-305(is)-304(on)-304(page)-304(1)]TJ 0 -29.888 Td [(\035oat)-304(is)-305(on)-304(page)-304(2)]TJ
++>>>>>>> develop
ET
q
- 1 0 0 1 133.768 274.924 cm
+ 1 0 0 1 133.768 274.996 cm
0 0 28.346 283.465 re f
Q
BT
@@@ -58,7 -58,7 +70,11 @@@ endob
11 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 8 0 R /F28 9 0 R >>
++=======
+ /Font << /F38 8 0 R /F37 9 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
@@@ -306,10 -306,10 +322,14 @@@ endob
stream
/opacity1 gs
BT
++<<<<<<< HEAD
+/F39 24.7871 Tf 133.768 594.094 Td [(co)-26(de)-302(is)-302(on)-302(page)-302(1)]TJ 0 -29.888 Td [(\015oat)-302(is)-302(on)-302(page)-302(3)]TJ
++=======
+ /F38 24.7871 Tf 133.768 594.166 Td [(co)-25(de)-305(is)-304(on)-304(page)-304(1)]TJ 0 -29.888 Td [(\035oat)-304(is)-305(on)-304(page)-304(3)]TJ
++>>>>>>> develop
ET
q
- 1 0 0 1 133.768 274.924 cm
+ 1 0 0 1 133.768 274.996 cm
0 0 28.346 283.465 re f
Q
BT
@@@ -330,7 -330,7 +350,11 @@@ endob
15 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 8 0 R /F28 9 0 R >>
++=======
+ /Font << /F38 8 0 R /F37 9 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
diff --cc testfiles/xform-appearance.tpf
index 19b5168,5715757..1c0a77b
--- a/testfiles/xform-appearance.tpf
+++ b/testfiles/xform-appearance.tpf
@@@ -21,7 -21,7 +21,11 @@@
Q
1 0 0 1 0 12.752 cm
BT
++<<<<<<< HEAD
+/F39 9.9626 Tf 2.104 -8.767 Td [(\326)]TJ
++=======
+ /F38 9.9626 Tf 2.104 -8.767 Td [(\326)]TJ
++>>>>>>> develop
ET
q
1 0 0 1 11.756 -12.354 cm
@@@ -36,7 -36,7 +40,11 @@@ endob
6 0 obj
<<
/ExtGState 1 0 R
++<<<<<<< HEAD
+/Font << /F39 7 0 R >>
++=======
+ /Font << /F38 7 0 R >>
++>>>>>>> develop
/ProcSet [ /PDF /Text ]
>>
endobj
More information about the latex3-commits
mailing list.