summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-08-29 03:02:07 +0000
committerNorbert Preining <norbert@preining.info>2021-08-29 03:02:07 +0000
commit66f6e60b6dc60cc08482030b92df223b6a51b15f (patch)
treee64c800b73c0989d7e812b4a703088ceb131e0c4 /macros/latex
parentb11ef0810f2b6a651ce97d7e639f9c85efeedbd5 (diff)
CTAN sync 202108290302
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/babel-contrib/dutch/README.md8
-rw-r--r--macros/latex/contrib/babel-contrib/dutch/dutch.dtx23
-rw-r--r--macros/latex/contrib/babel-contrib/dutch/dutch.ins6
-rw-r--r--macros/latex/contrib/babel-contrib/dutch/dutch.pdfbin149196 -> 159006 bytes
-rw-r--r--macros/latex/contrib/l3build/CHANGELOG.md21
-rw-r--r--macros/latex/contrib/l3build/README.md2
-rw-r--r--macros/latex/contrib/l3build/l3build-arguments.lua6
-rw-r--r--macros/latex/contrib/l3build/l3build-check.lua76
-rw-r--r--macros/latex/contrib/l3build/l3build-ctan.lua50
-rw-r--r--macros/latex/contrib/l3build/l3build-file-functions.lua46
-rw-r--r--macros/latex/contrib/l3build/l3build-upload.lua40
-rw-r--r--macros/latex/contrib/l3build/l3build-variables.lua3
-rw-r--r--macros/latex/contrib/l3build/l3build-zip.lua119
-rw-r--r--macros/latex/contrib/l3build/l3build.12
-rw-r--r--macros/latex/contrib/l3build/l3build.dtx39
-rwxr-xr-x[-rw-r--r--]macros/latex/contrib/l3build/l3build.lua33
-rw-r--r--macros/latex/contrib/l3build/l3build.pdfbin708832 -> 740399 bytes
-rw-r--r--macros/latex/contrib/lwarp/README.txt2
-rw-r--r--macros/latex/contrib/lwarp/lwarp.dtx1720
-rw-r--r--macros/latex/contrib/lwarp/lwarp.ins2
-rw-r--r--macros/latex/contrib/lwarp/lwarp.pdfbin3118198 -> 3136003 bytes
-rwxr-xr-xmacros/latex/contrib/lwarp/lwarpmk.lua2
-rw-r--r--macros/latex/contrib/mecaso/README.md10
-rw-r--r--macros/latex/contrib/mecaso/mecaso.pdfbin0 -> 239748 bytes
-rw-r--r--macros/latex/contrib/mecaso/mecaso.sty281
-rw-r--r--macros/latex/contrib/mecaso/mecaso.tex443
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/README.md2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx205
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdfbin948089 -> 952620 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx61
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdfbin591169 -> 594274 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx24
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdfbin577331 -> 578684 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdfbin527111 -> 526994 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdfbin547881 -> 547745 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdfbin530911 -> 530763 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdfbin534125 -> 533988 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdfbin526311 -> 526155 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdfbin576314 -> 576165 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdfbin505534 -> 505392 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdfbin739256 -> 739113 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdfbin553330 -> 553221 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdfbin673135 -> 672870 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx34
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdfbin663896 -> 665368 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdfbin518296 -> 518167 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx4
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdfbin418329 -> 418232 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx13
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdfbin536935 -> 537194 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx156
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdfbin0 -> 384131 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx16
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin421483 -> 423095 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx6
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins8
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin446355 -> 446276 bytes
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty2
-rw-r--r--macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty2
-rw-r--r--macros/latex/contrib/tagpdf/README.md4
-rw-r--r--macros/latex/contrib/tagpdf/ex-AF-file.pdfbin19689 -> 23868 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-AF-file.tex19
-rw-r--r--macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdfbin34118 -> 17702 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-alt-actualtext.tex20
-rw-r--r--macros/latex/contrib/tagpdf/ex-attribute-luatex.pdfbin6484 -> 6633 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-attribute.pdfbin16308 -> 16458 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-attribute.tex6
-rw-r--r--macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdfbin7687 -> 7825 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-formula-problem.tex18
-rw-r--r--macros/latex/contrib/tagpdf/ex-mc-manual-para-split.pdfbin23366 -> 23337 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-mc-manual-para-split.tex18
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdfbin16709 -> 16874 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-list.tex24
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdfbin18353 -> 18414 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.pdf536
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex22
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdfbin93867 -> 20930 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex26
-rw-r--r--macros/latex/contrib/tagpdf/ex-softhyphen.pdfbin6286 -> 6831 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-softhyphen.tex51
-rw-r--r--macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdfbin4357 -> 4520 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex7
-rw-r--r--macros/latex/contrib/tagpdf/ex-structure-luatex.pdfbin12226 -> 12392 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-structure.tex19
-rw-r--r--macros/latex/contrib/tagpdf/ex-tagpdf-template.pdfbin4722 -> 19365 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-tagpdf-template.tex28
-rw-r--r--macros/latex/contrib/tagpdf/global-ex.pngbin8281 -> 5 bytes
-rw-r--r--macros/latex/contrib/tagpdf/pac3.PNGbin141163 -> 5 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-backend.dtx8
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-checks.dtx92
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-code.pdfbin1082745 -> 1139025 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx437
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx49
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx31
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-roles.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-space.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-struct.dtx96
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-tree.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-user.dtx217
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.dtx14
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.pdf43729
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.tex222
-rw-r--r--macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty25
118 files changed, 27129 insertions, 22115 deletions
diff --git a/macros/latex/contrib/babel-contrib/dutch/README.md b/macros/latex/contrib/babel-contrib/dutch/README.md
index cfa7417b5a..49eb16054e 100644
--- a/macros/latex/contrib/babel-contrib/dutch/README.md
+++ b/macros/latex/contrib/babel-contrib/dutch/README.md
@@ -1,4 +1,4 @@
-Dutch 3.8j
+Dutch 3.8k
--------------
This is the babel style for Dutch.
@@ -18,3 +18,9 @@ Changes 3.8j
* Fix: with shorthands=off some captions (eg, \appendixname) raised an
error.
* Added 'afrikaans.ldf' (which is just a verbatim copy of 'dutch,ldf').
+
+
+Changes 3.8k
+------------
+
+* Use \ij instead of "y in captions.
diff --git a/macros/latex/contrib/babel-contrib/dutch/dutch.dtx b/macros/latex/contrib/babel-contrib/dutch/dutch.dtx
index 49abc9a37c..5d84e67b2a 100644
--- a/macros/latex/contrib/babel-contrib/dutch/dutch.dtx
+++ b/macros/latex/contrib/babel-contrib/dutch/dutch.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2020 Johannes L. Braams and any individual authors
+% Copyright 1989-2021 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{307}
+% \CheckSum{300}
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -36,12 +36,12 @@
%<code>\ProvidesLanguage{dutch}
%\fi
%\ProvidesFile{dutch.dtx}
- [2020/10/29 v3.8j Dutch support from the babel system]
+ [2021/08/28 v3.8k Dutch support from the babel system]
%\iffalse
%% File `dutch.dtx'
%
%% Dutch Language Definition File
-%% Copyright (C) 1989 - 2020
+%% Copyright (C) 1989 - 2021
%% by Johannes Braams, TeXniek
%
% This file is part of the babel system, it provides the source
@@ -155,7 +155,6 @@
% \changes{dutch-3.2c}{1991/10/22}{removed use of \cs{@ifundefined}}
% \changes{dutch-3.3a}{1991/11/11}{Moved code to the beginning of the
% file and added \cs{selectlanguage} call}
-% \begin{macrocode}
% \changes{dutch-3.8a}{1996/10/04}{made check dependant on
% \cs{CurrentOption}}
%
@@ -230,7 +229,7 @@
% \changes{dutch-3.8b}{1997/01/06}{Use \texttt{Bew"ys} instead of
% \texttt{Bewijs}}
% \changes{dutch-3.8h}{2000/09/19}{Added \cs{glossaryname}}
-% \changes{dutch-3.8j}{2020/10/29}{Don't use shorthands directly}
+% \changes{dutch-3.8k}{2021/08/28}{Don't use shorthands}
% \begin{macrocode}
\begingroup
\catcode`\"\active
@@ -241,22 +240,22 @@
\def\abstractname{Samenvatting}%
\def\bibname{Bibliografie}%
\def\chaptername{Hoofdstuk}%
- \def\appendixname{B\babelshorthand{"y}lage}%
+ \def\appendixname{B\ij lage}%
\def\contentsname{Inhoudsopgave}%
- \def\listfigurename{L\babelshorthand{"y}st van figuren}%
- \def\listtablename{L\babelshorthand{"y}st van tabellen}%
+ \def\listfigurename{L\ij st van figuren}%
+ \def\listtablename{L\ij st van tabellen}%
\def\indexname{Index}%
\def\figurename{Figuur}%
\def\tablename{Tabel}%
\def\partname{Deel}%
- \def\enclname{B\babelshorthand{"y}lage(n)}%
+ \def\enclname{B\ij lage(n)}%
\def\ccname{cc}%
\def\headtoname{Aan}%
\def\pagename{Pagina}%
\def\seename{zie}%
\def\alsoname{zie ook}%
- \def\proofname{Bew\babelshorthand{"y}s}%
- \def\glossaryname{Verklarende Woordenl\babelshorthand{"y}st}%
+ \def\proofname{Bew\ij s}%
+ \def\glossaryname{Verklarende Woordenl\ij st}%
}
}\x
% \end{macrocode}
diff --git a/macros/latex/contrib/babel-contrib/dutch/dutch.ins b/macros/latex/contrib/babel-contrib/dutch/dutch.ins
index 199142f03a..12ec7c5f31 100644
--- a/macros/latex/contrib/babel-contrib/dutch/dutch.ins
+++ b/macros/latex/contrib/babel-contrib/dutch/dutch.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2020 Johannes L. Braams and any individual authors
+%% Copyright 1989-2021 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2020 Johannes L. Braams and any individual authors
+Copyright 1989-2021 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2020 Johannes L. Braams and any individual authors
+Copyright 1989-2021 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/macros/latex/contrib/babel-contrib/dutch/dutch.pdf b/macros/latex/contrib/babel-contrib/dutch/dutch.pdf
index 86f3e44306..10b9f23f19 100644
--- a/macros/latex/contrib/babel-contrib/dutch/dutch.pdf
+++ b/macros/latex/contrib/babel-contrib/dutch/dutch.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index e46a935c3f..f5be81a937 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,23 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2021-08-28]
+
+### Fixed
+- Creation of zip files on Windows
+- Only match filename and not full path for `exefiles`
+
+## [2021-08-27]
+
+### Added
+- Add the `--show-saves` flag for `l3build check` to generate a list of
+ `l3build save` commands to regenerate all failing tests
+
+### Changed
+- No longer call an external program to generate `zip` files and generate
+ them directly instead. This disables the options `zipexe` and `zipopts`.
+- Copy TDS-style zip files to main dir
+
## [2021-05-06]
### Fixed
@@ -492,7 +509,9 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2021-05-06...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2021-08-28...HEAD
+[2021-08-28]: https://github.com/latex3/l3build/compare/2021-08-27...2021-08-28
+[2021-08-27]: https://github.com/latex3/l3build/compare/2021-05-06...2021-08-27
[2021-05-06]: https://github.com/latex3/l3build/compare/2021-05-05...2021-05-06
[2021-05-05]: https://github.com/latex3/l3build/compare/2020-06-04...2021-05-05
[2020-06-04]: https://github.com/latex3/l3build/compare/2020-03-25...2020-06-04
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index 219b1ad36c..635693ae9f 100644
--- a/macros/latex/contrib/l3build/README.md
+++ b/macros/latex/contrib/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2021-05-06
+Release 2021-08-28
Overview
--------
diff --git a/macros/latex/contrib/l3build/l3build-arguments.lua b/macros/latex/contrib/l3build/l3build-arguments.lua
index 80f19d66ad..8f62e8b433 100644
--- a/macros/latex/contrib/l3build/l3build-arguments.lua
+++ b/macros/latex/contrib/l3build/l3build-arguments.lua
@@ -139,6 +139,12 @@ option_list =
desc = "If 'halt-on-error' stops, show the full log of the failure",
type = "boolean"
},
+ ["show-saves"] =
+ {
+ desc = "If tests fail, show the l3build save invocation to regenerate the tests",
+ short = "S",
+ type = "boolean"
+ },
shuffle =
{
desc = "Shuffle order of tests",
diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua
index 47ab19ced6..f83dee4e44 100644
--- a/macros/latex/contrib/l3build/l3build-check.lua
+++ b/macros/latex/contrib/l3build/l3build-check.lua
@@ -574,14 +574,16 @@ function runcheck(name, hide)
if options["engine"] then
checkengines = options["engine"]
end
+ local failedengines = {}
-- Used for both .lvt and .pvt tests
local test_type = test_types[kind]
local function check_and_diff(engine)
- runtest(name, engine, hide, test_type.test, test_type, true)
+ runtest(name, engine, hide, test_type.test, test_type, not forcecheckruns)
local errorlevel = base_compare(test_type,name,engine)
if errorlevel == 0 then
return errorlevel
end
+ failedengines[#failedengines + 1] = engine
if options["show-log-on-error"] then
showfailedlog(name)
end
@@ -595,14 +597,20 @@ function runcheck(name, hide)
setup_check(name,engine)
local errlevel = check_and_diff(engine)
if errlevel ~= 0 and options["halt-on-error"] then
- return 1
+ return 1, failedengines
end
if errlevel > errorlevel then
errorlevel = errlevel
end
end
+ for i=1, #failedengines do
+ if failedengines[i] == stdengine then
+ failedengines = {stdengine}
+ break
+ end
+ end
-- Return everything
- return errorlevel
+ return errorlevel, failedengines
end
function setup_check(name, engine)
@@ -845,11 +853,57 @@ function testexists(test)
end
end
+-- A short auxiliary to print the list of differences for check
+local function showsavecommands(failurelist)
+ local savecmds = {}
+ local checkcmd = "l3build check --show-saves"
+ local prefix = "l3build save"
+ if options.config and options.config[1] ~= 'build' then
+ local config = " -c " .. options.config[1]
+ prefix = prefix .. config
+ checkcmd = checkcmd .. config
+ end
+ for name, engines in pairs(failurelist) do
+ for i = 1, #engines do
+ local engine = engines[i]
+ local cmd = savecmds[engine]
+ if not cmd then
+ if engine == stdengine then
+ cmd = prefix
+ else
+ cmd = prefix .. " -e " .. engine
+ end
+ end
+ savecmds[engine] = cmd .. " " .. name
+ if engine == stdengine then
+ checkcmd = checkcmd .. " " .. name
+ end
+ end
+ end
+ print(" To regenerate the test files, run\n")
+ local f = open(testdir .. "/.savecommands", "w")
+ for _, cmds in pairs(savecmds) do
+ print(" " .. cmds)
+ f:write(cmds, "\n")
+ end
+ f:write"\n"
+ if savecmds[stdengine] then
+ print("\n Afterwards test for engine specific changes using\n")
+ print(" " .. checkcmd)
+ f:write(checkcmd)
+ end
+ f:close()
+ print("")
+end
+
function check(names)
local errorlevel = 0
if testfiledir ~= "" and direxists(testfiledir) then
if not options["rerun"] then
- checkinit()
+ errorlevel = checkinit()
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
end
local hide = true
if names and next(names) then
@@ -933,11 +987,13 @@ function check(names)
end
-- Actually run the tests
print("Running checks on")
+ local failurelist = {}
for i, name in ipairs(names) do
print(" " .. name .. " (" .. i .. "/" .. #names ..")")
- local errlevel = runcheck(name, hide)
+ local errlevel, failedengines = runcheck(name, hide)
-- Return value must be 1 not errlevel
if errlevel ~= 0 then
+ failurelist[name] = failedengines
if options["halt-on-error"] then
return 1
else
@@ -949,6 +1005,9 @@ function check(names)
end
if errorlevel ~= 0 then
checkdiff()
+ if options["show-saves"] then
+ showsavecommands(failurelist)
+ end
else
print("\n All checks passed\n")
end
@@ -994,7 +1053,12 @@ function showfaileddiff()
end
function save(names)
- checkinit()
+ do
+ local errorlevel = checkinit()
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
+ end
local engines = options["engine"] or {stdengine}
if names == nil then
print("Arguments are required for the save command")
diff --git a/macros/latex/contrib/l3build/l3build-ctan.lua b/macros/latex/contrib/l3build/l3build-ctan.lua
index fd1491dd58..e5b3b7e8f8 100644
--- a/macros/latex/contrib/l3build/l3build-ctan.lua
+++ b/macros/latex/contrib/l3build/l3build-ctan.lua
@@ -25,9 +25,12 @@ for those people who are interested.
local pairs = pairs
local print = print
+local attributes = lfs.attributes
local lower = string.lower
local match = string.match
+local newzip = require"l3build-zip"
+
-- Copy files to the main CTAN release directory
function copyctan()
mkdir(ctandir .. "/" .. ctanpkg)
@@ -68,33 +71,33 @@ end
function ctan()
-- Always run tests for all engines
options["engine"] = nil
- local function dirzip(dir, name)
- local zipname = name .. ".zip"
- local function tab_to_str(table)
- local string = ""
- for _,i in ipairs(table) do
- string = string .. " " .. "\"" .. i .. "\""
+ local function dirzip(dir, zipname)
+ zipname = zipname .. ".zip"
+ local zip = newzip(dir .. '/' .. zipname)
+ local function tab_to_check(table)
+ local patterns = {}
+ for n,i in ipairs(table) do
+ patterns[n] = glob_to_pattern(i)
+ end
+ return function(name)
+ for n, patt in ipairs(patterns) do
+ if name:match"([^/]*)$":match(patt) then return true end
+ end
+ return false
end
- return string
end
-- Convert the tables of files to quoted strings
- local binfiles = tab_to_str(binaryfiles)
- local exclude = tab_to_str(excludefiles)
+ local binfile = tab_to_check(binaryfiles)
+ local exclude = tab_to_check(excludefiles)
+ local exefile = tab_to_check(exefiles)
-- First, zip up all of the text files
- run(
- dir,
- zipexe .. " " .. zipopts .. " -ll ".. zipname .. " " .. "."
- .. (
- (binfiles or exclude) and (" -x" .. binfiles .. " " .. exclude)
- or ""
- )
- )
- -- Then add the binary ones
- run(
- dir,
- zipexe .. " " .. zipopts .. " -g ".. zipname .. " " .. ". -i" ..
- binfiles .. (exclude and (" -x" .. exclude) or "")
- )
+ for _, p in ipairs(tree(dir, "**")) do
+ local src = p.src:sub(3) -- Strip ./
+ if not (attributes(p.cwd, "mode") == "directory" or exclude(src) or src == zipname) then
+ zip:add(p.cwd, src, binfile(src), exefile(src))
+ end
+ end
+ return zip:close()
end
local errorlevel
local standalone = false
@@ -146,6 +149,7 @@ function ctan()
dirzip(tdsdir, ctanpkg .. ".tds")
if packtdszip then
cp(ctanpkg .. ".tds.zip", tdsdir, ctandir)
+ cp(ctanpkg .. ".tds.zip", tdsdir, currentdir)
end
dirzip(ctandir, ctanzip)
cp(ctanzip .. ".zip", ctandir, currentdir)
diff --git a/macros/latex/contrib/l3build/l3build-file-functions.lua b/macros/latex/contrib/l3build/l3build-file-functions.lua
index 6ca1cc6011..53364bd301 100644
--- a/macros/latex/contrib/l3build/l3build-file-functions.lua
+++ b/macros/latex/contrib/l3build/l3build-file-functions.lua
@@ -211,6 +211,20 @@ function cleandir(dir)
return rm(dir, "**")
end
+function direxists(dir)
+ return attributes(dir, "mode") == "directory"
+end
+
+function fileexists(file)
+ local f = open(file, "r")
+ if f ~= nil then
+ f:close()
+ return true
+ else
+ return false -- also file exits and is not readable
+ end
+end
+
-- Copy files 'quietly'
function cp(glob, source, dest)
local errorlevel
@@ -218,7 +232,7 @@ function cp(glob, source, dest)
-- p_src is a path relative to `source` whereas
-- p_cwd is the counterpart relative to the current working directory
if os_type == "windows" then
- if attributes(p.cwd, "mode") == "directory" then
+ if direxists(p.cwd) then
errorlevel = execute(
'xcopy /y /e /i "' .. unix_to_win(p.cwd) .. '" "'
.. unix_to_win(dest .. '/' .. p.src) .. '" > nul'
@@ -241,31 +255,6 @@ function cp(glob, source, dest)
return 0
end
--- OS-dependent test for a directory
-function direxists(dir)
- local errorlevel
- if os_type == "windows" then
- errorlevel =
- execute("if not exist \"" .. unix_to_win(dir) .. "\" exit 1")
- else
- errorlevel = execute("[ -d '" .. dir .. "' ]")
- end
- if errorlevel ~= 0 then
- return false
- end
- return true
-end
-
-function fileexists(file)
- local f = open(file, "r")
- if f ~= nil then
- f:close()
- return true
- else
- return false -- also file exits and is not readable
- end
-end
-
-- Generate a table containing all file names of the given glob or all files
-- if absent
function filelist(path, glob)
@@ -309,16 +298,13 @@ function tree(src_path, glob)
local function always_true()
return true
end
- local function is_dir(file)
- return attributes(file, "mode") == "directory"
- end
---@type table<integer,tree_entry_t>
local result = { {
src = ".",
cwd = src_path,
} }
for glob_part, sep in glob:gmatch("([^/]+)(/?)/*") do
- local accept = sep == "/" and is_dir or always_true
+ local accept = sep == "/" and direxists or always_true
---Feeds the given table according to `glob_part`
---@param p tree_entry_t path counterpart relative to the current working directory
---@param table table
diff --git a/macros/latex/contrib/l3build/l3build-upload.lua b/macros/latex/contrib/l3build/l3build-upload.lua
index 629d2ee7c7..47268f5b6a 100644
--- a/macros/latex/contrib/l3build/l3build-upload.lua
+++ b/macros/latex/contrib/l3build/l3build-upload.lua
@@ -116,11 +116,24 @@ function upload(tagnames)
end
-- avoid lower level error from post command if zip file missing
- local zip=open(trim_space(tostring(uploadfile)),"r")
- if zip~=nil then
- close(zip)
- else
- error("Missing zip file '" .. tostring(uploadfile) .. "'")
+ local ziptime = lfs.attributes(trim_space(tostring(uploadfile)), 'modification')
+ if not ziptime then
+ error("Missing zip file '" .. tostring(uploadfile) .. "'. \z
+ Maybe you forgot to run 'l3build ctan' first?")
+ end
+ local age = os.time() - ziptime
+ if age >= 86400 then
+ print(string.format("------------------------------------------\n\z
+ | The local archive is older than %3i days. |\n\z
+ | Are you sure that you executed 'l3build ctan' first? |\n\z
+ --------------------------------------------------------",
+ age // 86400))
+ print("Are you sure you want to continue? [y/n]" )
+ io.stdout:write("> "):flush()
+ if lower(read(),1,1) ~= "y" then
+ print'Aborting'
+ return 1
+ end
end
ctan_post = construct_ctan_post(uploadfile,options["debug"])
@@ -174,12 +187,23 @@ end
end
-- if upload requested and validation succeeded repost to the upload URL
- if (exit_status==0 or exit_status==nil) then
+ if (exit_status==0 or exit_status==nil) then
if (ctanupload ~=nil and ctanupload ~=false and ctanupload ~= true) then
if (match(fp_return,"WARNING")) then
- print("Warnings from CTAN package validation:" .. fp_return:gsub("%[","\n["):gsub("%]%]","]\n]"))
+ print("Warnings from CTAN package validation:" .. fp_return:gsub("%[","\n["):gsub("%]%]","]\n]"))
else
- print("Validation successful." )
+ print("Validation successful." )
+ end
+ print("" )
+ if age < 86400 and age >= 60 then
+ if age >= 3600 then
+ print("----------------------------------------------------" )
+ print(string.format("| The local archive is older than %2i hours. |", age//3600 ))
+ print("| Have you executed l3build ctan first? If so ... |" )
+ print("----------------------------------------------------" )
+ else
+ print(string.format("The local archive is %i minutes old.", age//60 ))
+ end
end
print("Do you want to upload to CTAN? [y/n]" )
local answer=""
diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua
index e3ae64e13b..f1032004b6 100644
--- a/macros/latex/contrib/l3build/l3build-variables.lua
+++ b/macros/latex/contrib/l3build/l3build-variables.lua
@@ -84,6 +84,7 @@ demofiles = demofiles or { }
docfiles = docfiles or { }
dynamicfiles = dynamicfiles or { }
excludefiles = excludefiles or {"*~"}
+exefiles = exefiles or { }
installfiles = installfiles or {"*.sty","*.cls"}
makeindexfiles = makeindexfiles or {"*.ist"}
scriptfiles = scriptfiles or { }
@@ -106,12 +107,10 @@ unpackdeps = unpackdeps or { }
-- Executable names plus following options
typesetexe = typesetexe or "pdflatex"
unpackexe = unpackexe or "pdftex"
-zipexe = zipexe or "zip"
checkopts = checkopts or "-interaction=nonstopmode"
typesetopts = typesetopts or "-interaction=nonstopmode"
unpackopts = unpackopts or ""
-zipopts = zipopts or "-v -r -X"
-- Engines for testing
checkengines = checkengines or {"pdftex", "xetex", "luatex"}
diff --git a/macros/latex/contrib/l3build/l3build-zip.lua b/macros/latex/contrib/l3build/l3build-zip.lua
new file mode 100644
index 0000000000..06f37cd8b3
--- /dev/null
+++ b/macros/latex/contrib/l3build/l3build-zip.lua
@@ -0,0 +1,119 @@
+--[[
+
+File l3build-zip.lua Copyright (C) 2021 The LaTeX Project
+
+It may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this
+license or (at your option) any later version. The latest version
+of this license is in the file
+
+ http://www.latex-project.org/lppl.txt
+
+This file is part of the "l3build bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
+
+-----------------------------------------------------------------------
+
+The development version of the bundle can be found at
+
+ https://github.com/latex3/l3build
+
+for those people who are interested.
+
+--]]
+
+local concat = table.concat
+local open = io.open
+local osdate = os.date
+local pack = string.pack
+local setmetatable = setmetatable
+local iotype = io.type
+
+local compress = zlib.compress
+local crc32 = zlib.crc32
+
+local function encode_time(unix)
+ local t = osdate('*t', unix)
+ local date = t.day | (t.month << 5) | ((t.year-1980) << 9)
+ local time = (t.sec//2) | (t.min << 5) | (t.hour << 11)
+ return date, time
+end
+
+local meta = {__index = {
+ add = function(z, filename, innername, binary, executable)
+ innername = innername or filename
+
+ local offset = z.f:seek'cur'
+
+ local content do
+ local f = iotype(filename) and filename or assert(open(filename, binary and 'rb' or 'r'))
+ content = f:read'*a'
+ f:close()
+ end
+ local crc32 = crc32(crc32(), content)
+ local compressed = compress(content, nil, nil, -15)
+ if #compressed >= #content then
+ compressed = nil
+ end
+ local date, time = encode_time(nil)
+ z.f:write(pack("<c4I2I2I2I2I2I4I4I4I2I2",
+ 'PK\3\4',
+ compressed and 20 or 10, -- ZIP 2.0 to allow deflate
+ 0, -- We never set flags
+ compressed and 8 or 0, -- Always use deflate
+ time,
+ date,
+ crc32,
+ compressed and #compressed or #content,
+ #content,
+ #innername,
+ 0),
+ innername,
+ compressed or content)
+ local central = pack("<c4I2I2I2I2I2I2I4I4I4I2I2I2I2I2I4I4",
+ 'PK\1\2',
+ (3 << 8) | 63, -- Use UNIX attributes, written against ZIP 6.3
+ compressed and 20 or 10, -- ZIP 2.0 to allow deflate
+ 0, -- We never set flags
+ compressed and 8 or 0, -- Always use deflate
+ time,
+ date,
+ crc32,
+ compressed and #compressed or #content,
+ #content,
+ #innername,
+ 0, -- no extra data
+ 0, -- no comment
+ 0, -- Disc 0
+ binary and 0 or 1,
+ (executable and 0x81ED--[[0100755]] or 0x81A4--[[0100644]]) << 16,
+ offset)
+ z.central[#z.central+1] = central .. innername
+ end,
+ close = function(z, comment)
+ comment = comment or ''
+
+ local offset = z.f:seek'cur'
+ local central = concat(z.central)
+ z.f:write(central, pack("<c4I2I2I2I2I4I4I2",
+ 'PK\5\6',
+ 0, -- This is disc 0
+ 0, -- central dictionary started on disc 0
+ #z.central, -- Central disctionary entries on this disc
+ #z.central, -- Central disctionary entries on all discs
+ #central,
+ offset,
+ #comment), comment)
+ return z.f:close()
+ end,
+}}
+
+return function(filename)
+ local f, msg = open(filename, 'wb')
+ if not f then return f, msg end
+ return setmetatable({
+ f = f,
+ offset = 1,
+ central = {},
+ }, meta)
+end
diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index 8e21697dab..6c2f071a46 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2021-05-06"
+.TH l3build 1 "2021-08-28"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx
index 5171f10972..8d34055227 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -121,7 +121,6 @@
\luavarseparator
\luavarset{typesetexe} {"pdflatex"} {Executable for compiling \texttt{doc(s)}}
\luavarset{unpackexe} {"pdftex"} {Executable for running \texttt{unpack}}
-\luavarset{zipexe} {"zip"} {Executable for creating archive with \texttt{ctan}}
\luavarset{biberexe} {"biber"} {Biber executable}
\luavarset{bibtexexe} {"bibtex8"} {\BibTeX{} executable}
\luavarset{makeindexexe} {"makeindex"}{MakeIndex executable}
@@ -130,7 +129,6 @@
\luavarset{checkopts} {"-interaction=nonstopmode"}{Options passed to engine when running checks}
\luavarset{typesetopts}{"-interaction=nonstopmode"}{Options passed to engine when typesetting}
\luavarset{unpackopts} {""} {Options passed to engine when unpacking}
-\luavarset{zipopts} {"-v -r -X"} {Options passed to zip program}
\luavarset{biberopts} {""} {Biber options}
\luavarset{bibtexopts} {"-W"} {\BibTeX{} options}
\luavarset{makeindexopts}{""} {MakeIndex options}
@@ -148,6 +146,7 @@
\luavarseparator
\luavarset{asciiengines}{\{"pdftex"\}}{Engines which should log as pure ASCII}
\luavarset{checkruns} {1} {Number of runs to complete for a test before comparing the log}
+\luavarset{forcecheckruns}{false} {Always run \texttt{checkruns} runs and never stop early}
\luavarset{ctanreadme}{"README.md"} {Name of the file to send to CTAN as \texttt{README.\meta{ext}}}
\luavarset{ctanzip}{ctanpkg ... "-ctan"}{Name of the zip file (without extension) created for upload to CTAN}
\luavarset{epoch} {1463734800} {Epoch (Unix date) to set for test runs}
@@ -237,7 +236,7 @@
% }^^A
% }
%
-% \date{Released 2021-05-06}
+% \date{Released 2021-08-28}
%
% \maketitle
% \tableofcontents
@@ -314,7 +313,7 @@
%
% When the build system runs, it creates a directory |build/| for various unpacking, compilation, and testing purposes.
% For a module, this build folder can be in the main directory of the package itself, but for a bundle it should be common for the bundle itself and for all modules within that bundle.
-% A |build/| folder can be safety deleted; all material within is re-generated for each command of the \pkg{l3build} system.
+% A |build/| folder can be safely deleted; all material within is re-generated for each command of the \pkg{l3build} system.
%
% \subsection{The \texttt{build.lua} file}
%
@@ -379,6 +378,8 @@
% \item |--rerun| Run tests without unpacking/set up
% \item |--show-log-on-error| To be used in addition to \texttt{--halt-on-error} and results
% in the full \texttt{.log} file of a failed test to be shown on the console
+% \item |--show-saves| (|-S|) When tests fail, print the \texttt{l3build save} commands needed
+% to regenerate the tests assuming that the failures were false negatives.
% \item |--shuffle| Shuffle the order in which tests run
% \item |--texmfhome| Sets the location of the user tree for installing
% \end{itemize}
@@ -495,7 +496,7 @@
%
% Binary files should be specified with the \var{binaryfiles} variable (default \luavar{binaryfiles}); these are added to the zip archive without normalising line endings (text files are automatically converted to Unix-style line endings).
%
-% To create the archive, by default the binary \var{zipexe} is used (\luavar{zipexe}) with options \var{zipopts} (|-v -r -X|). The intermediate build directories \var{ctandir} and \var{tdsdir} are used to construct the archive.
+% The intermediate build directories \var{ctandir} and \var{tdsdir} are used to construct the archive.
% \end{buildcmd}
%
%
@@ -1117,6 +1118,34 @@
% \label{fig:test-tasks}
% \end{figure}
%
+% \subsection{Instructions for rebuilding test output}
+%
+% Sometimes changes to fundamental parts of the code can cause a lot of tests
+% to fail even though the actually tested systems are still working correctly.
+% This is especially common when the logging and error reporting systems
+% changes and therefore all log file based tests using the component fail with
+% these changes.
+%
+% In these cases, the option |--show-saves| can be passed to
+% |l3build check| in order to generate a list of |l3build save| commands which
+% can be executed to regenerate the expected output of all tests which fail.
+% Additionally it sometimes prints a list of |l3build check| commands for tests
+% which might still fail due to engine differences after running the |save|
+% commands. After running all these |l3build check| commands and all
+% |l3build save| commands listed by them, all tests will succeed.
+%
+% When bundles are used |l3build check --show-saves| has to be executed
+% separately for every module in the bundle.
+%
+% This option is potentially dangerous and therefore should only be used with
+% care. It can easily hide valid test failures between a bunch of spurious
+% changes. Therefore you should always take a close look at the difference
+% files generated by |l3build check| before running the generated
+% |l3build save| commands. Additionally it should only be used when you are
+% aware of the reason why a large number of tests failed and the change
+% causing the failures has been tested separately to have no unintended
+% side effects.
+%
% \subsection{Epoch setting}
%
% To produce predictable output when using dates, the test system offers the
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 8299439764..51b7a493e3 100644..100755
--- a/macros/latex/contrib/l3build/l3build.lua
+++ b/macros/latex/contrib/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2021-05-06"
+release_date = "2021-08-28"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -43,6 +43,8 @@ local print = print
local select = select
local tonumber = tonumber
local exit = os.exit
+local open = io.open
+local stdout = io.stdout
-- l3build setup and functions
kpse.set_program_name("kpsewhich")
@@ -160,6 +162,35 @@ if options["target"] == "check" then
end
print("")
end
+ if options["show-saves"] then
+ local savecmds, recheckcmds = "", ""
+ for _,config in ipairs(failed) do
+ local testdir = testdir
+ if config ~= "build" then
+ testdir = testdir .. "-" .. config
+ end
+ local f = open(testdir .. "/.savecommands")
+ if not f then
+ print("Error: Cannot find save commands for configuration " ..
+ config)
+ exit(2)
+ end
+ for line in f:lines() do
+ if line == "" then break end
+ savecmds = savecmds .. " " .. line .. "\n"
+ end
+ for line in f:lines() do
+ recheckcmds = recheckcmds .. " " .. line .. "\n"
+ end
+ f:close()
+ end
+ print"To regenerate the test files, run\n"
+ print(savecmds)
+ if recheckcmds ~= "" then
+ print"To detect engine specific differences, run after that\n"
+ print(recheckcmds)
+ end
+ end
exit(1)
else
-- Avoid running the 'main' set of tests twice
diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf
index 447ba668a8..fe2778114f 100644
--- a/macros/latex/contrib/l3build/l3build.pdf
+++ b/macros/latex/contrib/l3build/l3build.pdf
Binary files differ
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt
index 84c75558b6..b493fb76a1 100644
--- a/macros/latex/contrib/lwarp/README.txt
+++ b/macros/latex/contrib/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.900 README.txt
+LaTeX lwarp package v0.901 README.txt
Files included are:
diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx
index fce36d1771..1f899bfa1f 100644
--- a/macros/latex/contrib/lwarp/lwarp.dtx
+++ b/macros/latex/contrib/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2021/07/17 v0.900 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2021/08/27 v0.901 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -1602,11 +1602,6 @@ from the \pkg{hyperref} package:
\end{sourcedisplay}
\item \optn{showonlyrefs} does not work in \brand{MathJax}, and will result
in a difference in equation numbering compared to the print version.
- \item Due to \brand{MathJax} limitations, the following do not render well:
- \cs{overbracket}, \cs{underbracket}, \cs{overbrace}, \cs{underbrace},
- \env{rcases}, \env{drcases}, \cs{Aboxed}, and \linebreak \cs{ArrowBetweenLines}.
- \item For the new \env{cases}-like environments,
- \cs{text} must be used to set the normal roman font if desired.
\item \env{alignat} in \brand{MathJax} requires math mode, but
in \LaTeX\ it doesn't. It may be required to use \env{warpHTML} and
\env{warpprint} to isolate a version for each mode.
@@ -1698,9 +1693,11 @@ It is recommended to use \pkg{cleveref} instead of \pkg{ntheorem}'s
\newcommand{\limitsgraphics}{%
Per \cref{tab:includegraphicsfilenames},
image filenames may be specified either with or without an extension.
-\trouble[case sensitive]{image>not displayed}
-\trouble{image>extension case}
+\trouble{image>not displayed>extension}
+\trouble{image>filename extension}
\trouble{filename>image extension}
+\trouble{graphics>image not displayed>extension}
+\trouble{graphics>\cs{graphicspath}}
\gindex{image>file names}
\gindex{graphics>file names}
\gindex{includegraphics=\cs{includegraphics}>file names}
@@ -1708,9 +1705,11 @@ image filenames may be specified either with or without an extension.
\gindex{filename>images}
If an extension is given it will be used as-is, for either print or \HTML\ output.
If no extension is given, a list of possible extensions is tried, which depends
+\margintag{file extensions}
on whether print or \HTML\ is being generated. This allows a \PDF\ file for
print and a \SVG\ file for \HTML, for example.
If no extension is given, the automatic search will only return lowercase extensions,
+\watchout[case sensitive]
even if the filename actually has an uppercase extension, and \pkg{lwarp} cannot
get around this problem, so image file extensions must be lowercase
to be seen by the \HTML\ browser with \pkg{lwarp}.
@@ -1789,6 +1788,18 @@ If a file extension is not used,
for \HTML\ the file extension priorities
are: \SVG, \GIF, \PNG, then \JPG.
+A complication occurs if a file of the same name exists elsewhere in the \TeX\ tree,
+\margintag{duplicate files}
+\trouble[image not displayed]{graphics>image not displayed>duplicate file}
+\trouble{image>not displayed>duplicate file}
+\trouble{graphicspath=\cs{graphicspath}}
+such as a test image from some \LaTeX\ package.
+\TeX\ looks in the local document directory before considering the directories
+specified by \cs{graphicspath}, but the \TeX\ tree is found as ``local'', so any
+file in the tree is found before the directories in \cs{graphicspath}.
+To use such an image, it must be copied to the document's directory to be used for \HTML,
+and furthermore must be in the document's base directory instead of an images subdirectory.
+
If using the older \pkg{graphics} syntax, use both optional arguments
\trouble[\pkg{graphics} vs. \pkg{graphicx}]{graphics>optional arguments}
\trouble{includegraphics=\cs{includegraphics}>optional arguments}
@@ -1796,7 +1807,7 @@ for \cs{includegraphics}.
A single optional parameter is interpreted as the newer \pkg{graphicx} syntax.
Note that viewports are not supported by \pkg{lwarp} \Dash
\trouble[viewport]{graphics>viewport}
-\trouble[viewport]{image>viewport}
+\trouble{image>viewport}
\trouble{viewport}
the entire image will be shown.
@@ -1857,7 +1868,9 @@ Avoid using the \cs{includegraphics} \optn{scale} option. Change:
\newcommand{\limitssvgimages}{%
When a math expression, \env{picture}, or \tikz\ environment is added or
\trouble[adding/removing]{SVG image>out of order}
-\trouble{graphics>images out of order}
+\trouble{graphics>incorrect>added or removed}
+\trouble{image>incorrect>added or removed}
+\trouble{math>incorrect>added or removed}
removed, the \SVG\ images must be re-created by entering \cmds{lwarpmk limages}
to maintain the proper image-file associations.
Inline \SVG\ math may be hashed and thus not need to be recreated, but
@@ -1886,9 +1899,9 @@ time to get the page numbers back in sync, then remake the images one more time.
Incorrect \SVG\ images will also occur if the document
changes the \progcode{page} counter:
\trouble[page counter]{page counter>SVG images}
-\trouble{SVG image>incorrect}
-\trouble{math>incorrect}
-\trouble{image>incorrect}
+\trouble{SVG image>incorrect>page counter}
+\trouble{image>incorrect>page counter}
+\trouble{graphics>incorrect>page counter}
\begin{sourcedisplay}
\cs{setcounter}\{page\}\{<value>\}
\end{sourcedisplay}
@@ -2102,7 +2115,7 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
\item When defining environments or macros which include \env{tabular} and
\trouble[Misplaced alignment tab character \&]%
{Misplaced alignment tab character \&>tabular>macros}
- \trouble{tabular>Misplaced alignment tab character \&>macros}
+ \trouble{tabular=\env{tabular}>Misplaced alignment tab character \&>macros}
instances of the \texttt{\&} character, it may be
necessary to make \texttt{\&} active before the environment or macro is defined,
then restore \texttt{\&} to its default catcode after, using the following commands.
@@ -2118,8 +2131,8 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
\item \limitsresumetabular
\item To automate the use of \cs{StartDefiningTabulars}
\gindex{StartDefiningTabulars=\cs{StartDefiningTabulars}}
- \gindex{tabular>StartDefiningTabulars=\cs{StartDefiningTabulars}}
- \gindex{tabular>in environments, catcode of \&}
+ \gindex{tabular=\env{tabular}>StartDefiningTabulars=\cs{StartDefiningTabulars}}
+ \gindex{tabular=\env{tabular}>in environments, catcode of \&}
\margintag{For developers:}
and \cs{EndDefiningTabulars},
these macros may be embedded inside an \HTML\ environment definition
@@ -2151,9 +2164,9 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
\item [Cell contents:] \
\begin{itemize}
\item Using a custom macro inside a tabular data cell
- \trouble[macro in a table]{tabular>macro inside}
- \trouble{tabular>row corruption}
- \gindex{tabular>macros inside}
+ \trouble[macro in a table]{tabular=\env{tabular}>macro inside}
+ \trouble{tabular=\env{tabular}>row corruption}
+ \gindex{tabular=\env{tabular}>macros inside}
may result in an extra \HTML\ data cell tag, corrupting the \HTML\ table.
To avoid this, use \cs{TabularMacro} just before the macro.
This is ignored in print mode.
@@ -2164,7 +2177,14 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
\end {itemize}
\item [Column specifiers:] \
+ \gindex{tabular=\env{tabular}>column specifier}
+ \trouble{tabular=\env{tabular}>column specifier}
\begin{itemize}
+ \item Due to the way math is gathered for processing,
+ \watchout[math]
+ column specifiers such as \progcode{>\{\$\}c<\{\$\}} do not work with \pkg{lwarp}.
+ Instead, each cell must specify math mode individually.
+
\item Only one each of \texttt{@} and \texttt{!}
\margintag{\texttt{@} and \texttt{!}}
is used at each column, and they are used in that order.
@@ -2175,8 +2195,30 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
and \texttt{!} cells on the second and later rows in the \cs{multirow}
which do not appear in the \HTML\ version.
- \item \cs{newcolumntype} is ignored; unknown column types are set to \texttt{l}.
- \trouble[\cs{newcolumntype}]{tabular>newcolumntype=\cs{newcolumntype}}
+ \item If \cs{newcolumntype} does not work for \HTML,
+ \trouble[\cs{newcolumntype}]{tabular=\env{tabular}>newcolumntype=\cs{newcolumntype} and \cs{HTMLnewcolumntype}}
+ \trouble{newcolumntype=\cs{newcolumntype}}
+ add a simplified column type using \cs{HTMLnewcolumntype}.
+
+ \item \pkg{lwarp} detects each of the following,
+ \margintag{font and alignment}
+ \trouble{tabular=\env{tabular}>text-align=\progcode{text-align}}
+ \trouble{text-align=\progcode{text-align}}
+ \gindex{text-align=\progcode{text-align}}
+ \gindex{tabular=\env{tabular}>text-align=\progcode{text-align}}
+ and sets \HTML\ \CSS\ appropriately:
+ \begin{sourcedisplay}
+ >\{\cs{centering}\cs{arraybackslash}\} \\
+ >\{\cs{raggedright}\cs{arraybackslash}\} \\
+ >\{\cs{raggedleft}\cs{arraybackslash}\} \\
+ >\{\cs{itshape}\} \\
+ >\{\cs{bfseries}\} \\
+ >\{\cs{bfseries}\cs{itshape}\}
+ \end{sourcedisplay}
+ These may be used with \cs{newcolumntype}, such as:
+ \begin{sourcedisplay}
+ \cs{newcolumntype}\{P\}[1]\{>\{\cs{centering}\cs{arraybackslash}\}p\{\#1\}\} \\
+ \end{sourcedisplay}
\end{itemize}
\item [Rules:] \
@@ -2208,9 +2250,9 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
\item For \cs{toprule} and \cs{bottomrule},
\trouble[\cs{warpprintonly}]{Misplaced \cs{noalign}>tabular>rules}
- \trouble{tabular>rules}
+ \trouble{tabular=\env{tabular}>rules}
when combined with a \env{warpprint} or \env{warpHTML} environment,
- \trouble[Misplaced \cs{noalign}]{tabular>Misplaced \protect\cs{noalign}}%
+ \trouble[Misplaced \cs{noalign}]{tabular=\env{tabular}>Misplaced \protect\cs{noalign}}%
if a ``Misplaced \cs{noalign}'' error occurs,
change
\begin{sourcedisplay}
@@ -2234,7 +2276,7 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
do not apply to \HTML\ inside \cs{warpprintonly\{\}}.
\item For S columns (from the \pkg{siunitx} package),
\trouble[S columns]{siunitx=\pkg{siunitx}>S column}
- \trouble{tabular>S column}
+ \trouble{tabular=\env{tabular}>S column}
while producing print output,
anything non-numeric must be placed
inside \{ \} braces, including commands such as \cs{multirow}.
@@ -2321,8 +2363,8 @@ or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xta
\newcommand{\limitsresumetabular}{%
When creating a new environment
-\trouble[\env{tabular} inside another environment]{tabular>inside an environment}
-\trouble{tabular>corrupt rows}
+\trouble[\env{tabular} inside another environment]{tabular=\env{tabular}>inside an environment}
+\trouble{tabular=\env{tabular}>corrupt rows}
which contains a \env{tabular} environment,
\pkg{lwarp}'s emulation of the tabular does not automatically resume
when the containing enviroment ends, resulting in corrupted \HTML\ rows.
@@ -2349,7 +2391,7 @@ Use one of either \cs{endhead} or \cs{endfirsthead} for both print and \HTML,
and use a \cs{warpprintonly} macro to disable the other head phrase,
and also the \cs{endfoot} and \cs{endfirstfoot} phrases.
(See \cref{sec:limitsthreeparttablex} if using \pkg{threeparttablex}.)
-\trouble{tabular>endhead=\cs{endhead}, \cs{endfoot}, \cs{endlastfoot}}
+\trouble{tabular=\env{tabular}>endhead=\cs{endhead}, \cs{endfoot}, \cs{endlastfoot}}
\begin{sourcedisplay}
\cs{begin}\{longtable\}\{ [column specifiers] \} \\
{[} \dots ] \cs{endfirsthead} \quad \textgreen{\% or \cs{endhead}, for print and HTML} \\
@@ -2371,7 +2413,7 @@ Use the \cs{warpprintonly} macro instead of the \env{warpprint} environment.
Doing so helps avoid ``Misplaced \cs{noalign}.'' when using \cs{begin}\{warpprint\}.
\cs{kill} is ignored, place a \cs{kill} line inside
-\trouble[\cs{kill}]{tabular>kill=\cs{kill}}
+\trouble[\cs{kill}]{tabular=\env{tabular}>kill=\cs{kill}}
\begin{sourcedisplay}
\cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\}
\end{sourcedisplay}
@@ -2798,14 +2840,14 @@ defining macros using \cs{ttabbox} with a tabular inside.
See \cref{sec:limitstabular}.
When combined with the \pkg{subfig} package,
-\trouble[\pkg{subfig} package]{floatrow>with \pkg{subfig}}
+\trouble[\pkg{subfig} package]{floatrow=\pkg{floatrow}>with \pkg{subfig}}
\trouble{subfig=\pkg{subfig}>with \pkg{floatrow}}
while inside a \env{subfloatrow} \cs{ffigbox} and \cs{ttabbox}
must have the caption in the first of the two of the mandatory arguments.
The emulation of \pkg{floatrow} does not support \cs{FBwidth} or \cs{FBheight}.
These values are pre-set to \texttt{.3\cs{linewidth}} and \texttt{2in}.
-\trouble[\cs{FBwidth}, \cs{FBheight}]{floatrow>\cs{FBwidth} and \cs{FBheight}}
+\trouble[\cs{FBwidth}, \cs{FBheight}]{floatrow=\pkg{floatrow}>\cs{FBwidth} and \cs{FBheight}}
Possible solutions include:
\begin{itemize}
\item Use fixed lengths. \pkg{lwarp} will scale the \HTML\ lengths appropriately.
@@ -2848,9 +2890,8 @@ output for \optn{per-mode} and \optn{quotient-mode}.
Some units will require that the expression be placed inside math mode.
\trouble[math mode required]{siunitx=\pkg{siunitx}}
-Tabular \texttt{S} columns are rendered as simple \texttt{c} columns,
+Tabular \texttt{S} and {s} columns are rendered as simple \texttt{c} columns.
\trouble[\env{tabular}]{siunitx=\pkg{siunitx}>tabular S and s columns}
-and tabular \texttt{s} columns are not supported.
These may be replaced by \texttt{c} columns with each cell contained in
\cs{num} or \cs{si}.
@@ -3100,7 +3141,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{54342}
+% \CheckSum{53937}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3242,6 +3283,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.898}{2021/05/29}{\ 2021/05/29}
% \changes{v0.899}{2021/06/29}{\ 2021/06/29}
% \changes{v0.900}{2021/07/17}{\ 2021/07/17}
+% \changes{v0.901}{2021/08/27}{\ 2021/08/27}
@@ -3467,6 +3509,26 @@ This boolean may be tested by the user for later use.
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.901:] Tabular columns, float caption \CSS, \brand{MathJax} packages.
+% \begin{itemize}
+% \item Added \env{warpsvg} to isolate \SVG\ math, as opposed to \env{warpMathJax}.
+% \margintag{core}
+% \item Improved float caption \CSS\ for newer browsers.
+% \item Improved emulation of \cs{newcolumntype}.
+% \item Added \cs{HTMLnewcolumntype}. See \cref{sec:htmlsettings},
+% \item \progcode{>\{\cs{centering}\cs{arraybackslash}\}}, etc.
+% now sets \HTML\ \CSS\ \progcode{text-align}.
+% Also detects \cs{itshape}, \cs{bfseries}, and \cs{bfseries}\cs{itshape}.
+% See \cref{sec:limitstabular}.
+% \item Now uses \brand{MathJax} 3.2 packages for \pkg{centernot}, \pkg{colortbl},
+% \margintag{\brand{MathJax}}
+% \pkg{gensymb}, \pkg{mathtools}, \pkg{textcomp}, \pkg{upgreek}.
+% \item \pkg{dcolumn}: Now works inside a \env{lateximage}.
+% \margintag{packages}
+% \item Added \pkg{mwe}.
+% \item Added \pkg{lltjp-tascmac}, which fixed \pkg{ascmac}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.900:] Package updates.
% \begin{itemize}
% \item Fix for detecting |\usepackage{lwarp}|.
@@ -5777,7 +5839,7 @@ This boolean may be tested by the user for later use.
% \spkg{accents}\ejax, \spkg{amscd}\sjax, \spkg{amscdx}, \spkg{autobreak}\ejax, \ipkg{autonum},
% \mpkg{backnaur}\ejax, \mpkg{bm}\ejax, \spkg{braket}\sjax,
% \mpkg{breqn}\ijax, \mpkg{bussproofs}\sjax, \mpkg{cases}\ijax,
-% \spkg{centernot}\ejax, \spkg{cmbright}\ejax,
+% \spkg{centernot}\sjax, \spkg{cmbright}\ejax,
% \spkg{colonequals}\ejax, \spkg{decimal}\ejax,
% \spkg{delarray}, \mpkg{DotArrow}\ejax, \spkg{dotlessi}\ejax, \spkg{dotlessj}\sjax,
% \spkg{esvect}\ejax, \spkg{extarrows}\ejax, \spkg{fixmath}\ejax,
@@ -5790,7 +5852,7 @@ This boolean may be tested by the user for later use.
% \spkg{mathdots}\ejax, \spkg{mathfixs}\ejax,
% \spkg{mathpazo}\ejax, \spkg{mathptmx}\ejax,
% \spkg{mathpunctspace}\ijax,
-% \spkg{mathspec}\ejax, \mpkg{mathtools}\ejax, \spkg{mattens}\ejax,
+% \spkg{mathspec}\ejax, \mpkg{mathtools}\sjax, \spkg{mattens}\ejax,
% \spkg{maybemath}\ijax, \spkg{mdwmath}\ejax,
% \mpkg{mismath}\ejax, \spkg{mleftright}\ejax,
% \spkg{multiobjective}\ejax, \mpkg{nccmath}\ejax,
@@ -5804,7 +5866,7 @@ This boolean may be tested by the user for later use.
% \spkg{subsupscripts}\ejax, \spkg{tensind}, \spkg{tensor}\ejax,
% \spkg{textualicomma}\ijax,
% \spkg{txfonts}\ejax, \spkg{txgreeks}\ejax,
-% \spkg{unicode-math}\ejax, \spkg{upgreek}\ejax,
+% \spkg{unicode-math}\ejax, \spkg{upgreek}\sjax,
% \spkg{ushort}\ejax, \mpkg{witharrows}\ejax,
% \mpkg{xfakebold}\ejax, \mpkg{xy}.
% Many others work as-is. \\
@@ -5836,7 +5898,8 @@ This boolean may be tested by the user for later use.
% Tabular: &
% \env{tabular} environment, \mpkg{array}\ejax, \epkg{arydshln}\ejax,
% \mpkg{bigdelim}\ejax, \mpkg{bigstrut}\ejax, \mpkg{booktabs}\ejax,
-% \mpkg{colortbl}\ijax, \mpkg{ctable}, \mpkg{diagbox}, \mpkg{hhline}\ejax, \epkg{longtable},
+% \mpkg{colortbl}\sjax, \mpkg{ctable}, \mpkg{dcolumn}, \mpkg{diagbox},
+% \mpkg{hhline}\ejax, \epkg{longtable},
% \epkg{ltablex}, \epkg{ltxtable},
% \mpkg{multirow}\ejax, \epkg{supertabular}, \epkg{tabularx}, \epkg{tabulary},
% \epkg{threeparttable}, \mpkg{threeparttablex},
@@ -5959,12 +6022,12 @@ This boolean may be tested by the user for later use.
% Symbols: & Native \LaTeX\ diacriticals, \mpkg{academicons}, \spkg{amssymb}\sjax,
% \mpkg{bbding}, \mpkg{ccicons},
% \mpkg{chemgreek}, \mpkg{dingbat}, \spkg{euro}, \mpkg{eurosym},
-% \mpkg{fontawesome}, \mpkg{fontawesome5}, \spkg{gensymb}\ejax, \spkg{latexsym}\sjax,
+% \mpkg{fontawesome}, \mpkg{fontawesome5}, \spkg{gensymb}\sjax, \spkg{latexsym}\sjax,
% \mpkg{marvosym},
% \mpkg{metalogo}, \mpkg{metalogox},
% \mpkg{pifont},
% \spkg{textalpha},
-% \mpkg{textcomp}, \spkg{textgreek},
+% \mpkg{textcomp}\sjax, \spkg{textgreek},
% \mpkg{typicons},
% \mpkg{xunicode}.
% \\
@@ -6033,7 +6096,7 @@ This boolean may be tested by the user for later use.
% Package handling: & \spkg{catoptions}. \\
%
% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress}, \mpkg{lipsum},
-% \ipkg{lua-visual-debug}, \ipkg{refcheck},
+% \ipkg{lua-visual-debug}, \mpkg{mwe}, \ipkg{refcheck},
% \ipkg{srcltx}, \ipkg{srctex}, \ipkg{vpe}, \ipkg{xbmks}. \\
%
% \midrule
@@ -8183,6 +8246,8 @@ This boolean may be tested by the user for later use.
% \cs{HTMLPageTop} & PS & Heading for the other pages. \\
% \cs{HTMLPageBottom} & PS & Footer for the other pages. \\
% \midrule
+% \cs{HTMLnewcolumntype} & D & \cs{newcolumntype} for \HTML. \\
+% \midrule
% \cs{IndexPageSeparator} & P & Index page list separator. \\
% \cs{IndexRangeSeparator} & P & Index page range separator. \\
% \midrule
@@ -8547,6 +8612,20 @@ This boolean may be tested by the user for later use.
% Redefine with \cs{renewcommand}.
% \describeAltTextOpenClose
%
+% \ItemDescribeMacro{\HTMLnewcolumntype}
+% \cs{newcolumntype} may not always work with \pkg{lwarp} for \HTML\ output,
+% \trouble{newcolumntype=\cs{newcolumntype}}
+% \trouble{htmlnewcolumntype=\cs{HTMLnewcolumntype}}
+% \trouble{array=\env{array}>newcolumntype=\cs{newcolumntype} and \cs{HTMLnewcolumntype}}
+% \trouble{tabular=\env{tabular}>newcolumntype=\cs{newcolumntype} and \cs{HTMLnewcolumntype}}
+% \gindex{array=\env{array}>newcolumntype=\cs{newcolumntype} and \cs{HTMLnewcolumntype}}
+% \gindex{tabular=\env{tabular}>newcolumntype=\cs{newcolumntype} and \cs{HTMLnewcolumntype}}
+% \gindex{newcolumntype=\cs{newcolumntype} and \cs{HTMLnewcolumntype}}
+% \gindex{HTMLnewcolumntype=\cs{HTMLnewcolumntype} and \cs{newcolumntype}}
+% since it often involves \TeX\ boxes and fills.
+% To provide a simplified column type for \HTML,
+% add \cs{HTMLnewcolumntype} in addition.
+%
% \ItemDescribeEnv{warpprint} An environment which is only used
% while generating print output. Place inside anything which does not
% apply to \HTML\ and which may cause problems with \pkg{lwarp}.
@@ -8811,6 +8890,16 @@ This boolean may be tested by the user for later use.
% Do not nest \env{warpMathJax} inside itself. \watchout[nesting]
% \env{warpMathJax} may be used inside \env{warpHTML}.
%
+% \DescribeEnv{warpsvg}
+% Anything which is to be done only while using print output or
+% \HTML\ output with \SVG\ math
+% is surrounded by a \env{warpsvg} environment.
+% |\end{warpsvg}| must appear on its own line.
+% \trouble[\texttt{\cs{end}\{warpsvg\}}]{warpsvg}
+% Do not nest \env{warpsvg} inside itself. \watchout[nesting]
+% \env{warpsvg} may be used inside \env{warpHTML}.
+%
+%
%
% \subsection{Commands to be placed into the \env{warpprint} environment}
% \label{sec:printcommands}
@@ -10543,7 +10632,6 @@ This boolean may be tested by the user for later use.
%
% \DescribePackage{graphics}%
% \DescribePackage{graphicx}%
-%
% \begin{table}
% \caption{\cs{includegraphics} and file names}
% \label{tab:includegraphicsfilenames}
@@ -10570,7 +10658,6 @@ This boolean may be tested by the user for later use.
% \end{threeparttable}
% \end{center}
% \end{table}
-%
% \limitsgraphics
%
%
@@ -10677,17 +10764,17 @@ This boolean may be tested by the user for later use.
%
% \subsubsection{\pkg{multirow} package}
% \gindex{multirow=\pkg{multirow}>mrowcell=\cs{mrowcell} and \cs{mcolrowcell}}
-% \gindex{tabular>multirow=\pkg{multirow} \cs{mrowcell} and \cs{mcolrowcell}}
+% \gindex{tabular=\env{tabular}>multirow=\pkg{multirow} \cs{mrowcell} and \cs{mcolrowcell}}
% \gindex{mrowcell=\cs{mrowcell}}
% \gindex{mcolrowcell=\cs{mcolrowcell}}
% \trouble{multirow=\pkg{multirow}>mrowcell=\cs{mrowcell} and \cs{mcolrowcell}}
-% \trouble{tabular>multirow=\pkg{multirow} \cs{mrowcell} and \cs{mcolrowcell}}
+% \trouble{tabular=\env{tabular}>multirow=\pkg{multirow} \cs{mrowcell} and \cs{mcolrowcell}}
% \trouble{mrowcell=\cs{mrowcell}}
% \trouble{mcolrowcell=\cs{mcolrowcell}}
% \gindex{multicolumn=\cs{multicolumn}>with \cs{multirow}}
% \gindex{multirow=\cs{multirow}>with \cs{multicolumn}}
-% \gindex{tabular>multicolumn=\cs{multicolumn} with \cs{multirow}}
-% \trouble{tabular>multicolumn=\cs{multicolumn} with \cs{multirow}}
+% \gindex{tabular=\env{tabular}>multicolumn=\cs{multicolumn} with \cs{multirow}}
+% \trouble{tabular=\env{tabular}>multicolumn=\cs{multicolumn} with \cs{multirow}}
% \limitsmultirow
%
% \subsubsection{\pkg{longtable} package}
@@ -12302,10 +12389,13 @@ This boolean may be tested by the user for later use.
% \end{description}
%
% \item [Images are appearing in strange places:] ~
-% \trouble{image>incorrect}
-% \trouble{SVG image>incorrect}
+% \trouble{image>incorrect>added or removed}
+% \trouble{graphics>incorrect>added or removed}
+% \trouble{SVG image>incorrect>added or removed}
+% \trouble{math>incorrect>added or removed}
% \begin{itemize}
-% \item Enter \cmds{lwarpmk limages} to refresh the \env{lateximage} images.
+% \item When images are added or removed,
+% Enter \cmds{lwarpmk limages} to refresh the \env{lateximage} images.
% \end{itemize}
%
% \item[\SVG\ images:] \
@@ -12503,9 +12593,9 @@ This boolean may be tested by the user for later use.
% In order to make it easier to locate a solution,
% the same issue may be addressed by more than one entry.
%
-% Entries with higher page numbers are often duplicates of entries with
+% Entries starting with page \pageref{source} are often duplicates of entries with
% lower page numbers, as the same warning may occur within the user manual
-% and again within the source code for a given package.
+% and again within the source code.
% }
%
% \printindex[trb][Troubleshooting Index]
@@ -12630,6 +12720,7 @@ This boolean may be tested by the user for later use.
% \section{Source code}
%
% ^^A *source
+% \label{source}
%
% This is where the documented source code for \pkg{lwarp} begins,
% continuing through the following sections all the way to the
@@ -13036,6 +13127,7 @@ This boolean may be tested by the user for later use.
\LWR@checkloadnever{cals}{}
\LWR@checkloadnever{cellspace}{}
\LWR@checkloadnever{cgloss4e}{}
+\LWR@checkloadnever{collcell}{}
\LWR@checkloadnever{colophon}{}
\LWR@checkloadnever{cooltooltips}{}
\LWR@checkloadnever{covington}{}
@@ -13421,6 +13513,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{lips}
\LWR@loadafter{listings}
\LWR@loadafter{listliketab}
+\LWR@loadafter{lltjp-tascmac}
\LWR@loadafter{longtable}
\LWR@loadafter{lpic}
\LWR@loadafter{lscape}
@@ -13485,6 +13578,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{multirow}
\LWR@loadafter{multitoc}
\LWR@loadafter{musicography}
+\LWR@loadafter{mwe}
\LWR@loadafter{nameauth}
\LWR@loadafter{nameref}
\LWR@loadafter{natbib}
@@ -15153,6 +15247,24 @@ This boolean may be tested by the user for later use.
% \end{environment}
+% \begin{environment}{warpsvg}
+% Only if \SVG\ math is being used along with \HTML,
+% or in print mode.
+% \changes{v0.901}{2021/08/26}{Added.}
+% \begin{macrocode}
+\begin{warpprint}
+\LWR@includecomment{warpsvg}{mathsvg}
+\end{warpprint}
+
+\begin{warpHTML}
+\ifbool{mathjax}
+ {\LWR@excludecomment{warpsvg}{mathsvg}}
+ {\LWR@includecomment{warpsvg}{mathsvg}}
+\end{warpHTML}
+% \end{macrocode}
+% \end{environment}
+
+
% \begin{environment}{LWRcreatelwarpmk}
% Optionally generate a local copy of \prog{lwarpmk}.
% Default to no.
@@ -16640,14 +16752,26 @@ This boolean may be tested by the user for later use.
%
% \begin{macro}{\LWR@formatted@checkname} \marg{name}
% \changes{v0.893}{2020/11/15}{Added.}
+% \changes{v0.901}{2021/08/18}{Improved error handling.}
% \begin{macrocode}
\newcommand*{\LWR@formatted@checkname}[1]{%
+ \ifcsundef{#1}{%
+ \ifcsundef{LWR@print@#1}{%
+ \PackageError{lwarp}
+ {%
+ \LWRbackslash#1 or \protect\LWR@print@#1\MessageBreak
+ must be defined before using \protect\LWR@formatted, etc%
+ }
+ {Perhaps #1 is misspelled.}
+ }{\relax}%
+ }{\relax}%
\ifcsundef{LWR@HTML@#1}{%
\PackageError{lwarp}
{%
- \protect\LWR@HTML@#1 is not defined%
+ \protect\LWR@HTML@#1 must be defined
+ before using \protect\LWR@formatted, etc%
}
- {Perhaps it is misspelled.}
+ {Perhaps #1 is misspelled.}
}{\relax}%
}
% \end{macrocode}
@@ -16655,14 +16779,26 @@ This boolean may be tested by the user for later use.
%
% \begin{macro}{\LWR@formatted@checkendname} \marg{name}
% \changes{v0.893}{2020/11/15}{Added.}
+% \changes{v0.901}{2021/08/18}{Improved error handling.}
% \begin{macrocode}
\newcommand*{\LWR@formatted@checkendname}[1]{%
+ \ifcsundef{end#1}{%
+ \ifcsundef{endLWR@print@#1}{%
+ \PackageError{lwarp}
+ {%
+ \protect\end#1 or \protect\endLWR@print@#1\MessageBreak
+ must be defined before using \protect\LWR@formatted, etc%
+ }
+ {Perhaps #1 is misspelled.}
+ }{\relax}%
+ }{\relax}%
\ifcsundef{endLWR@HTML@#1}{%
\PackageError{lwarp}
{%
- \protect\endLWR@HTML@#1 is not defined%
+ \protect\endLWR@HTML@#1 must be defined
+ before using \protect\LWR@formatted, etc%
}
- {Perhaps it is misspelled.}
+ {Perhaps #1 is misspelled.}
}{\relax}%
}
% \end{macrocode}
@@ -16783,6 +16919,24 @@ This boolean may be tested by the user for later use.
% \end{macrocode}
+% Print versions.
+%
+% \codeprint
+% \begin{macrocode}
+\begin{warpprint}
+% \end{macrocode}
+
+% \changes{v0.901}{2021/08/20}{Added print versions of \cs{LWR@formatted}, etc.}
+% \begin{macrocode}
+\newcommand*{\LWR@formatted}[1]{}
+\newcommand*{\LWR@expandableformatted}[1]{}
+\newcommand*{\LWR@formattedenv}[1]{}
+\newcommand*{\LWR@expandableformattedenv}[1]{}
+% \end{macrocode}
+
+% \begin{macrocode}
+\end{warpprint}
+% \end{macrocode}
% \section{\HTML-conversion output modifications}
@@ -17761,6 +17915,8 @@ This boolean may be tested by the user for later use.
% \changes{v0.894}{2020/12/15}{\filenm{lwarp.css}: \TeX\ logos no longer below baseline.}
% \changes{v0.896}{2021/03/04}{\filenm{lwarp.css}: Added \element{main}, adjusted \element{sidetoccontainer} margin.}
% \changes{v0.899}{2021/06/25}{\filenm{lwarp.css}: Improved \pkg{multicol}.}
+% \changes{v0.901}{2021/08/20}{\filenm{lwarp.css}: Tabular cell text alignment.}
+% \changes{v0.901}{2021/08/20}{\filenm{lwarp.css}: Improved captions.}
%
% ^^A *lwarp.css
%
@@ -17841,9 +17997,11 @@ kbd, span.texttt, p span.texttt {
pre { padding: 3pt ; }
-span.strong, span.textbf, div.strong, div.textbf { font-weight: bold; }
+span.strong, span.textbf, div.strong, div.textbf, table td.tdbfseries { font-weight: bold; }
-span.textit, div.textit { font-style: italic; }
+span.textit, div.textit, table td.tditshape { font-style: italic; }
+
+table td.tdbfit { font-weight: bold ; font-style:italic }
span.textmd, div.textmd { font-weight: normal; }
@@ -18758,6 +18916,12 @@ figure.subfigure, figure.subtable {
div.figurecaption .minipage { margin:0 ; padding: 0 }
+/* for subcaptions: */
+figure div.minipage div.figurecaption {
+ max-width: 100% ; /* fallback if min() does not work */
+ max-width: min(30em,100%)
+}
+
div.minipage figure { border: none ; box-shadow: none ; }
div.minipage figure.table { margin: 0ex }
div.minipage div.footnotes { margin: 1ex 2em 0ex 2em }
@@ -18769,12 +18933,20 @@ div.floatrow figure { display: inline-block ; margin: 1ex 2% ; }
div.floatfoot { font-size: .85em ;
border-top: 1px solid silver ; line-height: 1.2 ; }
+/* Center if only one line, "start" align if more than one line: */
div.figurecaption , .lstlistingtitle {
font-size: .85em ;
- text-align: center ;
font-weight: bold ;
- margin-top: 1ex ;
- margin-bottom: 1ex ;
+ text-align: start ;
+ margin: 1ex auto;
+ width: max-content;
+ max-width: 100%;
+}
+
+/* A marginblock is small, so always center and don't mess with the width. */
+div.marginblock div.figurecaption {
+ width: 100% ;
+ text-align: center ;
}
figure.subfigure div.figurecaption, figure.subtable div.figurecaption {
@@ -18840,9 +19012,6 @@ table td.tdr { text-align: right ; vertical-align: middle ; }
table td.tdp { text-align: left ; vertical-align: bottom ; }
table td.tdm { text-align: left ; vertical-align: middle ; }
table td.tdb { text-align: left ; vertical-align: top ; }
-table td.tdP { text-align: center ; vertical-align: bottom ; }
-table td.tdM { text-align: center ; vertical-align: middle ; }
-table td.tdB { text-align: center ; vertical-align: top ; }
table td.tvertbarl { border-left: 1px solid black }
table td.tvertbarldouble { border-left: 4px double black }
@@ -18854,6 +19023,10 @@ table td.tvertbarldoubledash { border-left: 2px dashed black }
table td.tvertbarrdash { border-right: 1px dashed black }
table td.tvertbarrdoubledash { border-right: 2px dashed black }
+table td.tdcenter { text-align: center}
+table td.tdleft { text-align: left}
+table td.tdright { text-align: right}
+
/* for cmidrules: */
table td.tdrule {
@@ -20578,7 +20751,7 @@ MathJax = {
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.900"
+printversion = "v0.901"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -21874,7 +22047,7 @@ end -- not --version
% \cs{StopDefiningTabulars}
% \trouble[Misplaced alignment tab character \&]
% {Misplaced alignment tab character \&>tabular>macros}
-% \trouble{tabular>Misplaced alignment tab character \&>rules}
+% \trouble{tabular=\env{tabular}>Misplaced alignment tab character \&>rules}
% before and after defining macros or environments which include
% the tabular |&| character in their definitions.
%
@@ -21939,9 +22112,9 @@ end -- not --version
% \section{Localizing dynamic math}
% \label{sec:localizingdynamicmath}
-% \trouble{SVG image>math incorrect}
+% \trouble{SVG image>math incorrect>dymamic}
% \gindex{SVG>dynamic math}
-% \trouble{math>incorrect}
+% \trouble{math>incorrect>dynamic}
% \trouble{math>dynamic}
% \trouble{mathjax=\brand{MathJax}>errors}
% \gindex{math>dynamic}
@@ -29621,13 +29794,13 @@ end -- not --version
% See \cref{sec:dataarray}.
%
% \DescribeObject{LWR@colbeforespec} A data array of specifications for |>| columns.
-%
+%
% \DescribeObject{LWR@colafterspec} A data array of specifications for |<| columns.
%
% \DescribeObject{LWR@colbarspec} A data array of specifications for vertical rules.
-
-
+% \DescribeObject{LWR@coladdclass} A data array of extra \CSS\ class, as set by |>|.
+%
% \DescribeCounter{LWR@cellcolordepth}
% Counts how many cell color \element{div}s were added to the current tabular data cell.
% \begin{macrocode}
@@ -29635,7 +29808,6 @@ end -- not --version
% \end{macrocode}
-
% \subsubsection{Multicolumn variables}
% \begin{macrocode}
@@ -29678,7 +29850,7 @@ end -- not --version
-% \subsection{Handling \&, @, !, and bar}
+% \subsection{Handling \progcode{\&}, \progcode{@}, \progcode{!}, and bar}
%
% \begin{minipage}{\linewidth}
% For technical discussion regarding problems redefining |\&|, See: \\
@@ -29864,7 +30036,7 @@ end -- not --version
-% \subsubsection{Filling an unfinished row}
+% \subsection{Filling an unfinished row}
% \begin{macro}{\LWR@tabularfinishrow}
% Adds empty table cells if necessary to finish the row.
@@ -30059,14 +30231,17 @@ end -- not --version
% \end{macrocode}
%
%
-% \begin{macro}{\LWR@parseatcolumn}
+% \begin{macro}{\LWR@parseatcolumn} \marg{this column type}
%
% Handles |@{text}| columns.
%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
+%
% \changes{v0.33}{2017/07/07}{Fix: Column alignment with leftmost \progcode{@}.}
%
% \begin{macrocode}
-\newcommand*{\LWR@parseatcolumn}{%
+\newcommand*{\LWR@parseatcolumn}[1]{%
% \end{macrocode}
% Move to the next token after the '@':
% \begin{macrocode}
@@ -30110,13 +30285,16 @@ end -- not --version
% \end{macro}
%
%
-% \begin{macro}{\LWR@parsebangcolumn}
+% \begin{macro}{\LWR@parsebangcolumn} \marg{this column type}
% Handles |!{text}| columns.
%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
+%
% \changes{v0.22}{2017/02/28}{Added tabular \progcode{!!} column.}
%
% \begin{macrocode}
-\newcommand*{\LWR@parsebangcolumn}{%
+\newcommand*{\LWR@parsebangcolumn}[1]{%
% \end{macrocode}
% Move to the next token after the '!':
% \begin{macrocode}
@@ -30157,18 +30335,58 @@ end -- not --version
% \end{macro}
%
%
+% \begin{macro}{\LWR@checkbeforeaddclass} \marg{compared csname} \marg{\CSS\ class to add}
+% \begin{macrocode}
+\newcommand*{\LWR@checkbeforeaddclass}[2]{%
+ \ifcsstrequal{LWR@tempone}{#1}%
+ {%
+ \LWR@setexparray{LWR@coladdclass}%
+ {\arabic{LWR@tabletotalLaTeXcolsnext}}%
+ { #2}% space is intentional
+ }{}%
+}
+% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\LWR@parsebeforecolumn}
+%
+% \begin{macro}{\LWR@checkmathcolpar} Error if using math in column parameters.
+% \changes{v0.901}{2021/08/21}{Error if math in column specifier.}
+% \begin{macrocode}
+\newcommand*{\LWR@checkmathcolpar}{%
+ \IfSubStr{\detokenize\expandafter{\LWR@colparameter}}{\LWRdollar}%
+ {%
+ \PackageError{lwarp}%
+ {%
+ Lwarp does not support `$' in column specifiers.\MessageBreak
+ Specify `$' math for each cell in the column.\MessageBreak
+ Enter 'h' for more info%
+ }%
+ {%
+ For example, replace `>{$}c<{$}' with `c', and then\MessageBreak
+ use `$cell contents$' for each cell in the column.%
+ }%
+ }{}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR@parsebeforecolumn} \marg{this column type}
%
% Handles |>{text}| columns.
%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
+%
% \begin{macrocode}
-\newcommand*{\LWR@parsebeforecolumn}{%
+\newcommand*{\LWR@parsebeforecolumn}[1]{%
% \end{macrocode}
+%
% Move to the next token after the '>':
% \begin{macrocode}
\defaddtocounter{LWR@tablecolspecindex}{1}%
% \end{macrocode}
+%
% Read the next token, expanding once into \cs{LWR@colparameter}:
% \begin{macrocode}
\expandarg%
@@ -30176,29 +30394,56 @@ end -- not --version
{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]%
\fullexpandarg%
% \end{macrocode}
+%
+% Error if using |>{$}|, which is not supported by \pkg{lwarp}.
+% \changes{v0.901}{2021/08/21}{Error if math in column specifier.}
+% \begin{macrocode}
+ \LWR@checkmathcolpar%
+% \end{macrocode}
+%
% Store the result into a data array, expanding once out of \cs{LWR@colparameter}:
% \changes{v0.79}{2020/01/16}{Remove outermost braces.}
% \begin{macrocode}
\LWR@setexparray{LWR@colbeforespec}%
{\arabic{LWR@tabletotalLaTeXcolsnext}}%
{\expandafter\@firstofone\LWR@colparameter}%
+%
+ \edef\LWR@tempone{\expandafter\@firstofone\LWR@colparameter}%
+% \end{macrocode}
+%
+% If detect |>{\centering\arraybackslash}| or related, add a \CSS\ class.
+% \changes{v0.901}{2021/08/20}{Tabular cell text alignment.}
+% \begin{macrocode}
+ \LWR@checkbeforeaddclass{LWR@detect@centeringarraybackslash}{tdcenter}
+ \LWR@checkbeforeaddclass{LWR@detect@raggedrightarraybackslash}{tdleft}
+ \LWR@checkbeforeaddclass{LWR@detect@raggedleftarraybackslash}{tdright}
+ \LWR@checkbeforeaddclass{LWR@detect@itshape}{tditshape}
+ \LWR@checkbeforeaddclass{LWR@detect@bfseries}{tdbfseries}
+ \LWR@checkbeforeaddclass{LWR@detect@bfit}{tdbfit}
+% \end{macrocode}
+% \begin{macrocode}
\let\LWR@colparameter\relax%
\booltrue{LWR@validtablecol}%
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\LWR@parseaftercolumn}
+% \begin{macro}{\LWR@parseaftercolumn} \marg{this column type}
%
% Handles |<{text}| columns.
%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
+%
% \begin{macrocode}
-\newcommand*{\LWR@parseaftercolumn}{%
+\newcommand*{\LWR@parseaftercolumn}[1]{%
% \end{macrocode}
+%
% Move to the next token after the '<':
% \begin{macrocode}
\defaddtocounter{LWR@tablecolspecindex}{1}%
% \end{macrocode}
+%
% Read the next token, expanding once into \cs{LWR@colparameter}:
% \begin{macrocode}
\expandarg%
@@ -30206,6 +30451,13 @@ end -- not --version
{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]%
\fullexpandarg%
% \end{macrocode}
+%
+% Error if using |>{$}|, which is not supported by \pkg{lwarp}.
+% \changes{v0.901}{2021/08/21}{Error if math in column specifier.}
+% \begin{macrocode}
+ \LWR@checkmathcolpar%
+% \end{macrocode}
+%
% Store the result into a data array, expanding once out of \cs{LWR@colparameter}:
% \changes{v0.79}{2020/01/16}{Remove outermost braces.}
% \begin{macrocode}
@@ -30219,15 +30471,21 @@ end -- not --version
% \end{macro}
%
%
-% \begin{macro}{\LWR@parsebarcolumn} \qquad Handles vertical rules.
+% \begin{macro}{\LWR@parsebarcolumn} \marg{this column type}
+%
+% Handles vertical rules.
+%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
%
% \changes{v0.41}{2017/10/07}{Added vertical rules.}
% \changes{v0.56}{2018/04/30}{Adds support for double vertical rules.}
%
% \begin{macrocode}
-\newcommand*{\LWR@parsebarcolumn}{%
+\newcommand*{\LWR@parsebarcolumn}[1]{%
\LWR@traceinfo{LWR@parsebarcolumn}%
% \end{macrocode}
+%
% Remember the bar at this position:
% \begin{macrocode}
\ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}%
@@ -30257,13 +30515,19 @@ end -- not --version
% \end{macro}
%
%
-% \begin{macro}{\LWR@parsecoloncolumn} \qquad Handles vertical rules.
+% \begin{macro}{\LWR@parsecoloncolumn} \marg{this column type}
+%
+% Handles vertical rules.
+%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
%
% \changes{v0.56}{2018/05/04}{\pkg{arydshln}: Added.}
% \begin{macrocode}
-\newcommand*{\LWR@parsecoloncolumn}{%
+\newcommand*{\LWR@parsecoloncolumn}[1]{%
\LWR@traceinfo{LWR@parsecoloncolumn}%
% \end{macrocode}
+%
% Remember the bar at this position:
% \begin{macrocode}
\ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}%
@@ -30289,32 +30553,46 @@ end -- not --version
% \end{macro}
%
%
-% \begin{macro}{\LWR@parsesemicoloncolumn} \qquad Handles vertical rules.
+% \begin{macro}{\LWR@parsesemicoloncolumn} \marg{this column type}
+%
+% Handles vertical rules.
+%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
+%
+% The arguments to the column type are absorbed by \cs{LWR@columntype@<char>},
+% defined by \cs{LWR@modifycolumntype}.
%
% \changes{v0.56}{2018/05/04}{\pkg{arydshln}: Added.}
% \begin{macrocode}
-\newcommand*{\LWR@parsesemicoloncolumn}{%
+\newcommand*{\LWR@parsesemicoloncolumn}[1]{%
% \end{macrocode}
+%
% Treat |;| as a |:| column:
% \begin{macrocode}
- \LWR@parsecoloncolumn%
-% \end{macrocode}
-% Skip the following width token:
-% \begin{macrocode}
- \defaddtocounter{LWR@tablecolspecindex}{1}%
+ \LWR@parsecoloncolumn{}%
}
% \end{macrocode}
% \end{macro}
%
%
-% \subsection{Parsing `l', `c', or `r' columns}
+% \subsection{Parsing common column types}
%
-% \begin{macro}{\LWR@parsenormalcolumn} \marg{thiscolumn}
+% \begin{macro}{\LWR@parsenormalcolumn} \marg{this column type}
%
% Add to the accumulated column specs, advance counters,
% and pre-clear another column of at, before, and after specs.
+%
+% \cs{newcolumntype} definitons use \cs{LWR@parsenormalcolumn},
+% so an \HTML\ and print version are given so that they may work inside
+% a \env{lateximage}.
+%
+% The arguments to the column type are absorbed by \cs{LWR@columntype@<char>},
+% defined by \cs{LWR@modifycolumntype}.
+%
+% \changes{v0.901}{2021/08/12}{Improved \cs{newcolumntype} emulation.}
% \begin{macrocode}
-\newcommand*{\LWR@parsenormalcolumn}[1]{%
+\newcommand*{\LWR@HTML@LWR@parsenormalcolumn}[1]{%
\defaddtocounter{LWR@tabletotalLaTeXcols}{1}%
\defaddtocounter{LWR@tabletotalLaTeXcolsnext}{1}%
% \end{macrocode}
@@ -30329,45 +30607,33 @@ end -- not --version
\LWR@setexparray{LWR@colbeforespec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}%
\LWR@setexparray{LWR@colafterspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}%
\LWR@setexparray{LWR@colbarspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}%
+ \LWR@setexparray{LWR@coladdclass}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}%
\booltrue{LWR@validtablecol}%
}
-% \end{macrocode}
-% \end{macro}
+\newcommand*{\LWR@print@LWR@parsenormalcolumn}[1]{}
-% \subsection{Parsing `p', `m', or `b' columns}
-%
-% \begin{macro}{\LWR@parsepcolumn} \marg{thiscolumn}
-% The width will be ignored.
-% \begin{macrocode}
-\newcommand*{\LWR@parsepcolumn}[1]{%
-% \end{macrocode}
-% Converts to the given column type:
-% \begin{macrocode}
- \LWR@parsenormalcolumn{#1}%
-% \end{macrocode}
-% Skips the following width token:
-% \begin{macrocode}
- \defaddtocounter{LWR@tablecolspecindex}{1}%
-}
+\LWR@formatted{LWR@parsenormalcolumn}
% \end{macrocode}
% \end{macro}
+
% \subsection{Parsing `w' columns}
%
-% \begin{macro}{\LWR@parsewcolumn}
+% \begin{macro}{\LWR@parsewcolumn} \marg{this column type}
% The width will be ignored.
+%
+% The arguments to the column type are absorbed by \cs{LWR@columntype@<char>},
+% defined by \cs{LWR@modifycolumntype}.
+%
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
+%
% \begin{macrocode}
-\newcommand*{\LWR@parsewcolumn}{%
-% \end{macrocode}
-% \begin{macrocode}
+\newcommand*{\LWR@parsewcolumn}[1]{%
\LWR@columnspeclookahead{1}%
\expandafter\LWR@parsenormalcolumn\expandafter{\LWR@strresulttwo}%
-% \end{macrocode}
-% Skips the following width and alignment tokens:
-% \begin{macrocode}
- \defaddtocounter{LWR@tablecolspecindex}{2}%
}
% \end{macrocode}
% \end{macro}
@@ -30375,143 +30641,41 @@ end -- not --version
% \subsection{Parsing '*' columns}
%
-% \begin{macro}{\LWR@parsestarcolumn}
+% \begin{macro}{\LWR@parsestarcolumn} \marg{this column type}
% Star columns should already have been expanded, so this should never be used.
-% \begin{macrocode}
-\newcommand*{\LWR@parsestarcolumn}{%
- \defaddtocounter{LWR@tablecolspecindex}{2}%
-}
-% \end{macrocode}
-% \end{macro}
-
-
-% \subsection{Parsing `D' columns}
%
-% From the \pkg{dcolumn} package.
+% The arguments to the column type are absorbed by \cs{LWR@columntype@<char>},
+% defined by \cs{LWR@modifycolumntype}.
%
-% \begin{macro}{\LWR@parseDcolumn} \marg{thiscolumn}
-% The three parameters will be ignored.
-%
-% \changes{v0.22}{2017/02/24}{Added tabular \progcode{D} column.}
+% The argument is ignored,
+% but provided for compatibility with \cs{LWR@parsenormalcolumn}.
%
% \begin{macrocode}
-\newcommand*{\LWR@parseDcolumn}[1]{%
-% \end{macrocode}
-% Converts to the given column type.
-% \begin{macrocode}
- \LWR@parsenormalcolumn{#1}%
-% \end{macrocode}
-% Skips the following three parameters.
-% \begin{macrocode}
- \defaddtocounter{LWR@tablecolspecindex}{3}%
-}
+\newcommand*{\LWR@parsestarcolumn}[1]{}
% \end{macrocode}
% \end{macro}
+
% \subsection{Expanding the star column specifications}
-% \DescribeCounter{LWR@starcount}
-% Internal count for duplicating star columns.
-% \begin{macrocode}
-\newcount\LWR@starcount
-% \end{macrocode}
-%
-% \begin{macro}{\LWR@expcolspec}
-% Temporary storage used to build the expanded column specifier.
-% \begin{macrocode}
-\newcommand*{\LWR@expcolspec}{}
-% \end{macrocode}
-% \end{macro}
-%
-% \DescribeCounter{LWR@splitstarindex}
-% Indexes into the column specifiers.
-% \begin{macrocode}
-\newcounter{LWR@splitstarindex}
-% \end{macrocode}
-%
-% \DescribeCounter{LWR@splitstarcopies}
-% Number of copies.
-% \begin{macrocode}
-\newcounter{LWR@splitstarcopies}
-% \end{macrocode}
-%
-% \begin{macro}{\LWR@splitstarcontents}
-% Contents to duplicate.
-% \begin{macrocode}
-\newcommand*{\LWR@splitstarcontents}{}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\expandcolspec} Expands \cs{LWR@origcolspec} for star columns.
-% \changes{v0.71}{2019/04/26}{Added support for tabular `\texttt{*}' column.}
-% \begin{macrocode}
-\newcommand*{\expandcolspec}{%
-% \end{macrocode}
-%
-% Find the position of any star token.
-% \begin{macrocode}
- \StrPosition{\LWR@origcolspec}{*}[\LWR@tempone]%
-% \end{macrocode}
-%
-% Expand until no stars are found:
-% \begin{macrocode}
- \whileboolexpr{ test {\ifnumgreater{\LWR@tempone}{0}}}%
- {%
-% \end{macrocode}
-%
-% Begin with any characters to the left of the star.
-% \begin{macrocode}
- \setcounter{LWR@splitstarindex}{\LWR@tempone}%
- \addtocounter{LWR@splitstarindex}{-1}%
- \StrLeft{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\LWR@expcolspec]%
-% \end{macrocode}
-%
-% Move past the star to remember its number of copies.
-% \begin{macrocode}
- \addtocounter{LWR@splitstarindex}{2}%
- \StrChar{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\LWR@tempone]%
- \setcounter{LWR@splitstarcopies}{\expandafter\@firstofone\LWR@tempone}%
-% \end{macrocode}
-%
-% Move past the number of copies and remember the contents.
-% \begin{macrocode}
- \addtocounter{LWR@splitstarindex}{1}%
- \StrChar{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\LWR@splitstarcontents]%
-% \end{macrocode}
-%
-% For each copy, append the contents.
-% \begin{macrocode}
- \ifnumgreater{\value{LWR@splitstarcopies}}{0}%
- {%
- \LWR@starcount=\value{LWR@splitstarcopies}%
- \loop
- \appto\LWR@expcolspec{%
-% \end{macrocode}
-% (Remove the enclosing braces.)
-% \begin{macrocode}
- \expandafter\@firstofone\LWR@splitstarcontents%
- }%
- \advance \LWR@starcount -1
- \ifnum \LWR@starcount>0 \repeat
- }{}%
-% \end{macrocode}
+
+% \begin{macro}{\LWR@expandpreamble} \marg{tabular preamble}
%
-% Remove any token to the left, and append the rightmost remainding tokens.
-% \begin{macrocode}
- \StrGobbleLeft{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\colspecremainder]%
- \appto{\LWR@expcolspec}{\colspecremainder}%
-% \end{macrocode}
+% From \pkg{array} \cs{@mkpream}.
%
-% Remember the final result.
-% \begin{macrocode}
- \edef\LWR@origcolspec{\LWR@expcolspec}%
-% \end{macrocode}
-%
-% See if more stars exist.
+% The resulting expanded preamble is stored in \cs{the}\cs{@temptokena}.
+% Assign as:
+% \begin{sourceverb}
+% \edef\destination{\the\@temptokena}
+% \end{sourceverb}
% \begin{macrocode}
- \StrPosition{\LWR@origcolspec}{*}[\LWR@tempone]%
+\newcommand*{\LWR@expandpreamble}[1]{%
+ \edef\@tempa{\@temptokena={#1}}%
+ \@tempa%
+ \@tempswatrue%
+ \@whilesw\if@tempswa\fi{%
+ \@tempswafalse\the\NC@list%
}%
}
% \end{macrocode}
@@ -30522,7 +30686,7 @@ end -- not --version
% \HTML\ \CSS\ cannot exactly match the \LaTeX{} concept of a baseline for
% a table row.
-% \trouble[tabular baselines]{tabular>baselines}
+% \trouble[tabular baselines]{tabular=\env{tabular}>baselines}
% \Cref{tab:baseline} shows the \LaTeX{} results for various
% vertical-alignment choices, with the baseline of the first column drawn across
% all the columns for comparison.
@@ -30530,7 +30694,7 @@ end -- not --version
%
% \begin{table}
% \caption{Tabular baseline\label{tab:baseline}}
-% \gindex{tabular>baseline}\gindex{baseline>tabular}
+% \gindex{tabular=\env{tabular}>baseline}\gindex{baseline>tabular}
% \centering
% \smallskip
% \begin{tabular}{lp{.25in}m{.25in}b{.25in}r}
@@ -30546,16 +30710,22 @@ end -- not --version
% \end{tabular}
% \end{table}
%
+%
% \Cref{tab:columnconversions} describes how each kind of column is
% converted to \HTML.
%
+%
% \begin{table}
% \caption{Tabular \HTML\ column conversions\label{tab:columnconversions}}
-% \gindex{tabular>HTML colummn conversion}
+% \gindex{tabular=\env{tabular}>HTML colummn conversion}
% \gindex{HTML>tabular column conversion}
%
% \medskip
%
+% Each cell is given a \CSS\ class of \attribute{td<columntype>}.
+%
+% \medskip
+%
% \hrule
% \begin{description}[parsep=.5ex]
% \item [l, r, c:] Converted to table cells without paragraph tags. \\
@@ -30575,18 +30745,197 @@ end -- not --version
% \item [m:] With paragraph tags, \CSS\ |vertical-align:middle|.
% \item [b:] With paragraph tags, \CSS\ |vertical-align:top| so that the bottom of the
% text is closest to the middle of the text line.
+% \item [w and W:] Converted to |l|, |c|, or |r|. No paragraph tags.
% \item [P, M, B:] Horizontally-centered versions.
-% \item [S:] Converted to 'r'. Ignores optional argument. From the \pkg{siunitx} package.
-% \item [D:] Converted to 'c'. From the \pkg{dcolumn} package.
+% \item [S:] Treated as '|c|'. Ignores optional argument. From the \pkg{siunitx} package.
+% \item [D:] Treated as '|c|'. From the \pkg{dcolumn} package.
% \item [@, !, \textgreater{}, \textless{}:] One each, in that order.
% \item [\textbar:] Vertical rule.
-% \item [Unknown:] Converted to 'l'.
-% \item [\cs{newcolumn}:] Currently treated as unknown.
+% \item [Unknown:] Converted to '|l|'.
+% \item [\cs{newcolumntype}:] Expands to its replacement text.
+% \item [\cs{HTMLnewcolumntype}:] Provides simplified replacement text for \HTML.
+% \end{description}
+% \hrule
+% \end{table}
+%
+% \Cref{tab:columnmacros} shows the various internal macros generated for
+% each column type.
+%
+% \begin{table}
+% \caption{HTML column type internal macros}
+% \label{tab:columnmacros}
+% \hrule
+% \begin{description}
+% \item[\texttt{<coltype>}:] The single-letter column type,
+% such as \texttt{c} or \texttt{X}.
+% \item[Created by \cs{LWR@modifycolumntype}:] Used by \pkg{lwarp} to add
+% \HTML\ functionality to each built-in column type.
+% \begin{description}
+% \item[\cs{LWR@columntype@<coltype>}:] Handles tabular columns
+% depending on the type.
+% Calls \cs{LWR@parsenormalcolumn} or related,
+% then advances \cs{LWR@tablecolspecindex}.
+% \item[\cs{LWR@columntype@mctype@<coltype>}:] Generates the
+% \cs{multicolumn} \HTML\ cell \CSS\ class.
+% Calls \cs{LWR@printmccoltype@normal} or related.
+% \item[\cs{LWR@columntype@mcdata@<coltype>}:] Generates the
+% \cs{multicolumn} \HTML\ cell data.
+% Calls \cs{LWR@printmccoldata@normal} or related.
+% \end{description}
+% \item[Created by \cs{newcolumntype}:] From \pkg{array}.
+% \begin{description}
+% \item[\cs{NC@find@<coltype>}:] Internally used to parse
+% the column specifier.
+% \item[\cs{NC@rewrite@<coltype>}:] Stores the print-mode replacement text.
+% \end{description}
+% \item[Created by \cs{HTMLnewcolumntype}:] From \pkg{lwarp}.
+% \begin{description}
+% \item[\cs{LWR@print@NC@rewrite@<coltype>}:] Copied
+% from \cs{NC@rewrite@<type>}.
+% \item[\cs{LWR@HTML@NC@rewrite@<coltype>}:] Stores the
+% \HTML-mode replacement text.
+% \item[\cs{NC@rewrite@<coltype>}:] Redefined to use
+% the print or \HTML\ version.
+% \end{description}
% \end{description}
% \hrule
% \end{table}
%
%
+% \begin{macro}{\LWR@modifycolumntype}
+% \marg{1: column type letter}
+% \marg{2: number args to ignore}
+% \marg{3: csname of the cell action}
+% \marg{4: csname of the multicolumn print type action}
+% \marg{5: csname of the multicolumn print data action}
+%
+% Add \HTML\ functionality to an existing print version column type.
+%
+% \changes{v0.901}{2021/08/17}{Improved \cs{newcolumntype} emulation.}
+% \begin{macrocode}
+\newcommand*{\LWR@modifycolumntype}[5]{%
+ \LWR@traceinfo{LWR@modifycolumntype !#1!#2!#3!#4!#5!}%
+ \LWR@traceinfo{LWR@modifycolumntype #1}%
+ \edef\@tempa{%
+ \noexpand\csdef{LWR@columntype@#1}{%
+ \noexpand\@nameuse{#3}{#1}%
+ \noexpand\defaddtocounter{LWR@tablecolspecindex}{#2}%
+ }%
+ \noexpand\csdef{LWR@columntype@mctype@#1}{%
+ \noexpand\@nameuse{#4}{#1}%
+ }%
+ \noexpand\csdef{LWR@columntype@mcdata@#1}{%
+ \noexpand\@nameuse{#5}{#2}%
+ }%
+ }%
+ \@tempa%
+ \LWR@traceinfo{LWR@modifycolumntype done}%
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macrocode}
+\LWR@modifycolumntype{l}{0}{LWR@parsenormalcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@normal}
+
+\LWR@modifycolumntype{c}{0}{LWR@parsenormalcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@normal}
+
+\LWR@modifycolumntype{r}{0}{LWR@parsenormalcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@normal}
+% \end{macrocode}
+% \begin{macrocode}
+\LWR@modifycolumntype{@}{0}{LWR@parseatcolumn}
+ {LWR@printmccoltype@ignore}{LWR@printmccoldata@other}
+
+\LWR@modifycolumntype{!}{0}{LWR@parsebangcolumn}
+ {LWR@printmccoltype@ignore}{LWR@printmccoldata@other}
+
+\LWR@modifycolumntype{>}{0}{LWR@parsebeforecolumn}
+ {LWR@printmccoltype@ignore}{LWR@printmccoldata@other}
+
+\LWR@modifycolumntype{<}{0}{LWR@parseaftercolumn}
+ {LWR@printmccoltype@ignore}{LWR@printmccoldata@other}
+
+\LWR@modifycolumntype{|}{0}{LWR@parsebarcolumn}
+ {LWR@printmccoltype@vertbar}{LWR@printmccoldata@skip}
+
+\LWR@modifycolumntype{:}{0}{LWR@parsecoloncolumn}
+ {LWR@printmccoltype@colon}{LWR@printmccoldata@skip}
+
+\LWR@modifycolumntype{;}{1}{LWR@parsesemicoloncolumn}
+ {LWR@printmccoltype@semicolon}{LWR@printmccoldata@skip}
+% \end{macrocode}
+% \begin{macrocode}
+\LWR@modifycolumntype{p}{1}{LWR@parsenormalcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@paragraph}
+
+\LWR@modifycolumntype{m}{1}{LWR@parsenormalcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@paragraph}
+
+\LWR@modifycolumntype{b}{1}{LWR@parsenormalcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@paragraph}
+% \end{macrocode}
+% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
+% \begin{macrocode}
+\LWR@modifycolumntype{w}{2}{LWR@parsewcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@normal}
+
+\LWR@modifycolumntype{W}{2}{LWR@parsewcolumn}
+ {LWR@printmccoltype@normal}{LWR@printmccoldata@normal}
+% \end{macrocode}
+% A star column:
+% \begin{macrocode}
+\LWR@modifycolumntype{*}{2}{LWR@parsestarcolumn}
+ {LWR@printmccoltype@ignore}{LWR@printmccoldata@skip}
+% \end{macrocode}
+%
+%
+%
+% \begin{macro}{\HTMLnewcolumntype} \marg{col type} \oarg{num args} \marg{replacement text}
+%
+% A user-level macro to creates an \HTML\ version
+% of the replacement text for the column type.
+%
+% This is the equivalent to:
+% \begin{sourceverb}
+% \newcommand*{\LWR@HTML@NC@rewrite@<columntype>}[<num args>]
+% {\NC@find <replacement text>}
+% \LWR@formatted{NC@rewrite@<columntype>}
+% \end{sourceverb}
+%
+% \changes{v0.901}{2021/08/17}{Improved \cs{newcolumntype} emulation.}
+% \begin{macrocode}
+\NewDocumentCommand{\HTMLnewcolumntype}{m O{0} m}{%
+ \expandafter\newcommand\expandafter*%
+ \csname LWR@HTML@NC@rewrite@#1\endcsname[#2]{\NC@find #3}%
+ \LWR@formatted{NC@rewrite@#1}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+%
+% \codeprint
+% \begin{macrocode}
+\begin{warpprint}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\NewDocumentCommand{\HTMLnewcolumntype}{m O{0} m}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\end{warpprint}
+% \end{macrocode}
+%
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+%
%
% \begin{macro}{\LWR@parsetablecols} \marg{colspecs}
%
@@ -30621,7 +30970,8 @@ end -- not --version
%
% Expand any star columns:
% \begin{macrocode}
- \expandcolspec%
+ \LWR@expandpreamble{\LWR@origcolspec}%
+ \edef\LWR@origcolspec{\the\@temptokena}%
% \end{macrocode}
%
% The parsed column spec data array, |LWR@tablecolspec|,
@@ -30650,6 +31000,9 @@ end -- not --version
\LWR@setexparray{LWR@colbarspec}{1}{}%
\LWR@setexparray{LWR@colbarspec}{2}{}%
\LWR@setexparray{LWR@colbarspec}{3}{}%
+ \LWR@setexparray{LWR@coladdclass}{1}{}%
+ \LWR@setexparray{LWR@coladdclass}{2}{}%
+ \LWR@setexparray{LWR@coladdclass}{3}{}%
% \end{macrocode}
% Starting at the first column specification:
% \begin{macrocode}
@@ -30703,70 +31056,18 @@ end -- not --version
{% not an optional tabular argument
% \end{macrocode}
% Not inside an optional argument, so consider the column type:
+% \changes{v0.901}{2021/08/12}{Improved \cs{newcolumntype} emulation.}
% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{l}{\LWR@parsenormalcolumn{l}}{}%
- \IfStrEq{\LWR@strresult}{c}{\LWR@parsenormalcolumn{c}}{}%
- \IfStrEq{\LWR@strresult}{r}{\LWR@parsenormalcolumn{r}}{}%
- \IfStrEq{\LWR@strresult}{L}{\LWR@parsenormalcolumn{l}}{}%
- \IfStrEq{\LWR@strresult}{C}{\LWR@parsenormalcolumn{c}}{}%
- \IfStrEq{\LWR@strresult}{R}{\LWR@parsenormalcolumn{r}}{}%
- \IfStrEq{\LWR@strresult}{J}{\LWR@parsenormalcolumn{l}}{}%
-% \end{macrocode}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{S}{\LWR@parsenormalcolumn{c}}{}%
- \IfStrEq{\LWR@strresult}{s}{\LWR@parsenormalcolumn{c}}{}%
-% \end{macrocode}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{\detokenize{@}}{\LWR@parseatcolumn}{}%
- \IfStrEq{\LWR@strresult}{!}{\LWR@parsebangcolumn}{}%
- \IfStrEq{\LWR@strresult}{>}{\LWR@parsebeforecolumn}{}%
- \IfStrEq{\LWR@strresult}{<}{\LWR@parseaftercolumn}{}%
- \IfStrEq{\LWR@strresult}{|}{\LWR@parsebarcolumn}{}%
- \IfStrEq{\LWR@strresult}{:}{\LWR@parsecoloncolumn}{}%
- \IfStrEq{\LWR@strresult}{;}{\LWR@parsesemicoloncolumn}{}%
-% \end{macrocode}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{p}{\LWR@parsepcolumn{p}}{}%
- \IfStrEq{\LWR@strresult}{m}{\LWR@parsepcolumn{m}}{}%
- \IfStrEq{\LWR@strresult}{b}{\LWR@parsepcolumn{b}}{}%
-% \end{macrocode}
-% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{w}{\LWR@parsewcolumn}{}%
- \IfStrEq{\LWR@strresult}{W}{\LWR@parsewcolumn}{}%
-% \end{macrocode}
-% A star column:
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{*}{\LWR@parsestarcolumn}{}%
-% \end{macrocode}
-% From the \pkg{dcolumn} package:
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{D}{\LWR@parseDcolumn{c}}{}%
-% \end{macrocode}
-% From the \pkg{tabularx} package.
-% X column has no parameter, but will be given paragraph tags.
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{X}{\LWR@parsenormalcolumn{X}}{}%
-% \end{macrocode}
-% \begin{docsidebar}
-% \raggedright
-% Many people define centered versions ``|P|'', ``|M|'', and ``|B|'':
-% \begin{Verbatim}[tabsize=4,gobble=2]
-% \newcolumntype{P}[1]{>{\centering\arraybackslash}p{#1}}
-% \end{Verbatim}
-% \vspace{-\baselineskip}
-% \end{docsidebar}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{P}{\LWR@parsepcolumn{P}}{}%
- \IfStrEq{\LWR@strresult}{M}{\LWR@parsepcolumn{M}}{}%
- \IfStrEq{\LWR@strresult}{B}{\LWR@parsepcolumn{B}}{}%
+ \ifcsdef{LWR@columntype@\LWR@strresult}%
+ {\csuse{LWR@columntype@\LWR@strresult}}%
+ {}%
% \end{macrocode}
-% If this column was an invalid column type, convert it to an |l| column:
+% If an unknown column type, use |l|:
% \begin{macrocode}
- \ifbool{LWR@validtablecol}{}{%
- \LWR@traceinfo{invalid column type: \LWR@strresult}%
- \LWR@parsenormalcolumn{l}%
- }%
+ \ifbool{LWR@validtablecol}{}{%
+ \LWR@traceinfo{invalid column type: \LWR@strresult}%
+ \LWR@parsenormalcolumn{l}%
+ }%
}% not an optional column argument
% \end{macrocode}
% If read the closing bracket, no longer inside the optional argument:
@@ -30985,8 +31286,8 @@ end -- not --version
% Create an empty cell if muting for the \cs{bottomrule}:
% \begin{macrocode}
\ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}%
- {}%
- {\LWR@atbangspec}%
+ {}%
+ {\LWR@atbangspec}%
%
\LWR@htmltag{/td}\LWR@orignewline%
\global\booltrue{LWR@tabularcelladded}%
@@ -31022,7 +31323,7 @@ end -- not --version
-% \subsection{Data opening tag}
+% \subsection{Cell opening tag}
% \begin{macro}{\LWR@thiscolspec} Temporary storage.
@@ -31045,20 +31346,24 @@ end -- not --version
\LWR@traceinfo{LWR@tabledatasinglecolumntag}%
\LWR@maybenewtablerow%
% \end{macrocode}
+%
% Don't start a new paragraph tag if have already started one:
% \begin{macrocode}
\ifbool{LWR@intabularmetadata}%
{%
% \end{macrocode}
+%
% If have found the end of tabular command, do not create the next data cell:
% \begin{macrocode}
\ifbool{LWR@exitingtabular}{}%
{% not exiting tabular
% \end{macrocode}
+%
% Print the |@| and |!| contents before first column:
% \begin{macrocode}
\LWR@tabularleftedge%
% \end{macrocode}
+%
% Fetch the current column's alignment character into \cs{LWR@strresult}:
% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.}
% \begin{macrocode}
@@ -31066,6 +31371,7 @@ end -- not --version
\LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}%
}%
% \end{macrocode}
+%
% Print the start of a new table data cell:
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
% \begin{macrocode}
@@ -31073,18 +31379,32 @@ end -- not --version
\LWR@htmltag{%
td class=\textquotedbl{}td%
% \end{macrocode}
+%
% Append this column's spec:
% \begin{macrocode}
\LWR@strresult%
% \end{macrocode}
+%
% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag.
% Also add vertical bar tags.
% \begin{macrocode}
\LWR@addcmidruletrim%
\LWR@addleftmostbartag%
\LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}%
+% \end{macrocode}
+%
+% Add any tabular |>| column text alignment or font control \CSS:
+% \changes{v0.901}{2021/08/20}{Tabular cell text alignment.}
+% \begin{macrocode}
+ \LWR@getexparray{LWR@coladdclass}%
+ {\arabic{LWR@tableLaTeXcolindex}}%
+% \end{macrocode}
+%
+% Close the class description:
+% \begin{macrocode}
\textquotedbl{}%
% \end{macrocode}
+%
% Add styles for rules, alignment:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
@@ -31092,6 +31412,7 @@ end -- not --version
\LWR@addcmidrulewidth%
\LWR@addcdashline%
% \end{macrocode}
+%
% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.}
% \begin{macrocode}
\xdef\LWR@thiscolspec{%
@@ -31100,27 +31421,26 @@ end -- not --version
}%
\LWR@addformatwpalignment{\LWR@thiscolspec}%
% \end{macrocode}
+%
% Add styles for cell and rule colors:
% \changes{v0.48}{2018/02/08}{\pkg{colortbl}: Added.}
% \begin{macrocode}
\LWR@addtabularrowcolor%
\LWR@addtabularrulecolors%
% \end{macrocode}
+%
% \begin{macrocode}
\LWR@tdendstyles%
}% HTML td
\LWR@traceinfo{LWR@tabledatasinglecolumntag: done printing td tag}%
% \end{macrocode}
+%
% If this is a |p|, |m|, |b|, or X column, allow paragraphs:
% \begin{macrocode}
\ifboolexpr{%
test{ \ifdefstring{\LWR@strresult}{p} } or
test{ \ifdefstring{\LWR@strresult}{m} } or
- test{ \ifdefstring{\LWR@strresult}{b} } or
- test{ \ifdefstring{\LWR@strresult}{P} } or
- test{ \ifdefstring{\LWR@strresult}{M} } or
- test{ \ifdefstring{\LWR@strresult}{B} } or
- test{ \ifdefstring{\LWR@strresult}{X} }
+ test{ \ifdefstring{\LWR@strresult}{b} }
}%
{% allow pars
\LWR@traceinfo{LWR@tabledatasinglecolumntag: about to LWR@startpars}%
@@ -31130,6 +31450,7 @@ end -- not --version
}% allow pars
{}% no pars
% \end{macrocode}
+%
% Print the |>| contents unless muted for the \cs{bottomrule}:
% \begin{macrocode}
\ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}%
@@ -31503,7 +31824,8 @@ end -- not --version
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\LWR@addformatwpalignment}
+% \begin{macro}{\LWR@addformatwpalignment} \marg{colspec}
+%
% If |FormatWP|, adds a \attribute{style} for the alignment.
%
% Must be placed between \cs{LWR@tdstartstyles} and \cs{LWR@tdendstyles}.
@@ -31520,9 +31842,6 @@ end -- not --version
\IfSubStr{#1}{p}{\LWR@WPcell{left}{bottom}}{}%
\IfSubStr{#1}{m}{\LWR@WPcell{left}{middle}}{}%
\IfSubStr{#1}{b}{\LWR@WPcell{left}{top}}{}%
- \IfSubStr{#1}{P}{\LWR@WPcell{center}{bottom}}{}%
- \IfSubStr{#1}{M}{\LWR@WPcell{center}{middle}}{}%
- \IfSubStr{#1}{B}{\LWR@WPcell{center}{top}}{}%
}{}%
}
% \end{macrocode}
@@ -31750,96 +32069,106 @@ end -- not --version
% \subsubsection{Parsing multicolumns}
+% \begin{macro}{\LWR@printmccoltype@normal} \marg{col type}
+%
+% Prints the column type, and remembers that any vertical bars
+% are no longer on the left edge.
+% \begin{macrocode}
+\newcommand*{\LWR@printmccoltype@normal}[1]{%
+ #1%
+ \boolfalse{LWR@mcolvertbaronleft}%
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR@printmccoltype@ignore} \marg{col type}
+%
+% This type does not print a multi-column data cell.
+% \begin{macrocode}
+\newcommand*{\LWR@printmccoltype@ignore}[1]{}%
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR@printmccoltype@vertbar} \marg{col type}
+%
+% Adds a left or right vertical bar.
+% \begin{macrocode}
+\newcommand*{\LWR@printmccoltype@vertbar}[1]{%
+ \ifbool{LWR@mcolvertbaronleft}%
+ {\defaddtocounter{LWR@mcolvertbarsl}{1}}% left edge
+ {\defaddtocounter{LWR@mcolvertbarsr}{1}}% not left edge
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\LWR@printmccoltype@colon} \marg{col type}
+%
+% Adds a left or right vertical bar.
+% \begin{macrocode}
+\newcommand*{\LWR@printmccoltype@colon}[1]{%
+ \ifbool{LWR@mcolvertbaronleft}%
+ {\defaddtocounter{LWR@mcolvertbarsldash}{1}}% left edge
+ {\defaddtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\LWR@printmccoltype@semicolon} \marg{col type}
+%
+% Adds a left or right vertical bar.
+% \begin{macrocode}
+\let\LWR@printmccoltype@semicolon\LWR@printmccoltype@colon
+% \end{macrocode}
+% \end{macro}
+
+
% \begin{macro}{\LWR@printmccoltype} \marg{colspec}
% Print any valid column type found. Does not print |@|, |!|, |>|, or |<| columns
% or their associated tokens.
%
% This is printed as part of the table data tag's |class|.
+%
+% \cs{LWR@columntype@mctype@<type>} is defined by \cs{LWR@modifycolumntype}.
% \begin{macrocode}
\newcommand*{\LWR@printmccoltype}[1]{%
\LWR@traceinfo{lwr@printmccoltype -#1-}%
% \end{macrocode}
+%
% Get one token of the column spec:
% \begin{macrocode}
\StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
% \end{macrocode}
-% Add to the \HTML\ tag depending on which column type is found:
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{l}{l}{}%
- \IfStrEq{\LWR@strresult}{c}{c}{}%
- \IfStrEq{\LWR@strresult}{r}{r}{}%
- \IfStrEq{\LWR@strresult}{p}{p}{}%
- \IfStrEq{\LWR@strresult}{m}{m}{}%
- \IfStrEq{\LWR@strresult}{b}{b}{}%
- \IfStrEq{\LWR@strresult}{P}{P}{}%
- \IfStrEq{\LWR@strresult}{M}{M}{}%
- \IfStrEq{\LWR@strresult}{B}{B}{}%
-% \end{macrocode}
-% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{w}{w}{}%
- \IfStrEq{\LWR@strresult}{W}{W}{}%
-% \end{macrocode}
-% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{S}{c}{}%
- \IfStrEq{\LWR@strresult}{s}{c}{}%
-% \end{macrocode}
+%
+% Detokenize to avoid problems with special characters:
% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{X}{p}{}%
+ \edef\LWR@strresult{\detokenize\expandafter{\LWR@strresult}}%
% \end{macrocode}
-% \changes{v0.43}{2017/11/07}{Added vertical rules.}
-% \changes{v0.56}{2018/04/30}{Adds support for double vertical rules.}
-% \changes{v0.56}{2018/05/05}{Adds support for dashed vertical rules.}
+%
+% Add to the \HTML\ tag depending on which column type is found:
+% \changes{v0.901}{2021/08/17}{Improved \cs{newcolumntype} emulation.}
+%
% \begin{macrocode}
- \IfStrEq{\LWR@strresult}{|}%
- {%
- \ifbool{LWR@mcolvertbaronleft}%
- {\defaddtocounter{LWR@mcolvertbarsl}{1}}% left edge
- {\defaddtocounter{LWR@mcolvertbarsr}{1}}% not left edge
- }%
- {%
- \IfStrEq{\LWR@strresult}{:}%
- {%
- \ifbool{LWR@mcolvertbaronleft}%
- {\defaddtocounter{LWR@mcolvertbarsldash}{1}}% left edge
- {\defaddtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge
- }%
- {%
- \IfStrEq{\LWR@strresult}{;}%
- {%
- \ifbool{LWR@mcolvertbaronleft}%
- {\defaddtocounter{LWR@mcolvertbarsldash}{1}}% left edge
- {\defaddtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge
- }%
- {\boolfalse{LWR@mcolvertbaronleft}}%
- }%
- }%
+ \ifcsdef{LWR@columntype@mctype@\LWR@strresult}%
+ {\csuse{LWR@columntype@mctype@\LWR@strresult}}%
+ {\boolfalse{LWR@mcolvertbaronleft}}%
\LWR@traceinfo{lwr@printmccoltype done}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\LWR@multicolpartext} \marg{num parameters}
-% Print the data with paragraph tags, advance to bypass the given number of parameters.
-% \changes{v0.56}{2018/05/12}{Fix: \cs{multicolumn} parameters.}
-% \begin{macrocode}
-\newcommand*{\LWR@multicolpartext}[1]{%
- \LWR@startpars%
- \LWR@multicoltext%
- \defaddtocounter{LWR@tablemulticolspos}{#1}%
- \LWR@stoppars%
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\LWR@multicolother} \marg{colspec}
+% \begin{macro}{\LWR@printmccoldata@other} \marg{num args to skip} \marg{entire colspec}
+%
% For |@|, |!|, |>|, |<|, print the next token without paragraph tags:
% \begin{macrocode}
-\newcommand*{\LWR@multicolother}[1]{%
+\newcommand*{\LWR@printmccoldata@other}[2]{%
\defaddtocounter{LWR@tablemulticolspos}{1}%
- \StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
+ \StrChar{#2}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
\LWR@strresult%
% \end{macrocode}
+%
% A valid column data type was found:
% \begin{macrocode}
\booltrue{LWR@validtablecol}%
@@ -31847,11 +32176,14 @@ end -- not --version
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\LWR@multicolskip}
+% \begin{macro}{\LWR@printmccoldata@skip} \marg{num args to skip} \marg{entire colspec}
+%
% Nothing to print for this column type.
% \begin{macrocode}
-\newcommand*{\LWR@multicolskip}{%
+\newcommand*{\LWR@printmccoldata@skip}[2]{%
+ \defaddtocounter{LWR@tablemulticolspos}{#1}%
% \end{macrocode}
+%
% A valid column data type was found:
% \begin{macrocode}
\booltrue{LWR@validtablecol}%
@@ -31859,74 +32191,73 @@ end -- not --version
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\LWR@printmccoldata} \marg{colspec}
+
+% For \cs{LWR@printmccoldata@...>}, \marg{num args to skip} is provided by
+% \cs{LWR@columntype@mcdata@<coltype>} when it was defined by
+% \cs{LWR@modifycolumntype}.
+% \cs{entire colspec} is provided by \cs{LWR@printmccoldata} when it uses
+% \cs{LWR@columntype@mcdata@<coltype>}.
+
+% \begin{macro}{\LWR@printmccoldata@normal} \marg{num args to skip} \marg{entire colspec}
+% \begin{macrocode}
+\newcommand*{\LWR@printmccoldata@normal}[2]{%
+ \LWR@multicoltext%
+ \defaddtocounter{LWR@tablemulticolspos}{#1}%
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\LWR@printmccoldata@paragraph} \marg{num args to skip} \marg{entire colspec}
+% \begin{macrocode}
+\newcommand*{\LWR@printmccoldata@paragraph}[2]{%
+ \LWR@startpars%
+ \LWR@multicoltext%
+ \defaddtocounter{LWR@tablemulticolspos}{#1}%
+ \LWR@stoppars%
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR@printmccoldata} \marg{entire colspec}
+%
% Print the data for any valid column type found.
%
% \changes{v0.22}{2017/02/28}{Added tabular \progcode{D}, \progcode{!!},
% and \progcode{X} columns.}
%
% \changes{v0.23}{2017/03/02}{Fix for vert bar column type.}
+% \changes{v0.901}{2021/08/17}{Improved \cs{newcolumntype} emulation.}
%
% \begin{macrocode}
\newcommand*{\LWR@printmccoldata}[1]{%
\LWR@traceinfo{lwr@printmccoldata -#1}%
% \end{macrocode}
+%
% Not yet found a valid column type:
% \begin{macrocode}
\boolfalse{LWR@validtablecol}%
% \end{macrocode}
+%
% Get one token of the column spec, into a local copy in case nested.
% \begin{macrocode}
\StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
\edef\LWR@printmccoldatatoken{\LWR@strresult}%
% \end{macrocode}
+%
% Print the text depending on which column type is found.
% Also handles |@|, |>|, |<| as it comes to them.
% \begin{macrocode}
- \IfStrEq{\LWR@printmccoldatatoken}{l}{\LWR@multicoltext}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{c}{\LWR@multicoltext}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{r}{\LWR@multicoltext}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{D}{%
- \defaddtocounter{LWR@tablemulticolspos}{3}% skip parameters
- \LWR@multicoltext%
- }{}%
-% \end{macrocode}
-% \changes{v0.56}{2018/05/12}{Fix: \cs{multicolumn} parameters.}
-% \changes{v0.72}{2019/06/07}{Fix: \cs{multicolumn} parameters.}
-% \begin{macrocode}
- \IfStrEq{\LWR@printmccoldatatoken}{p}{\LWR@multicolpartext{2}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{m}{\LWR@multicolpartext{2}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{b}{\LWR@multicolpartext{2}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{P}{\LWR@multicolpartext{2}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{M}{\LWR@multicolpartext{2}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{B}{\LWR@multicolpartext{2}}{}%
-% \end{macrocode}
-% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
-% \begin{macrocode}
- \IfStrEq{\LWR@printmccoldatatoken}{w}{\LWR@multicolpartext{3}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{W}{\LWR@multicolpartext{3}}{}%
-% \end{macrocode}
-% \begin{macrocode}
- \IfStrEq{\LWR@printmccoldatatoken}{S}{\LWR@multicoltext}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{s}{\LWR@multicoltext}{}%
-% \end{macrocode}
-% \begin{macrocode}
- \IfStrEq{\LWR@printmccoldatatoken}{X}{\LWR@multicolpartext{1}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{|}{\LWR@multicolskip}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{:}{\LWR@multicolskip}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{;}{%
- \LWR@multicolskip%
- \defaddtocounter{LWR@tablemulticolspos}{1}% skip parameter
- }{}%
- \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{@}}{\LWR@multicolother{#1}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{!}}{\LWR@multicolother{#1}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{>}}{\LWR@multicolother{#1}}{}%
- \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{<}}{\LWR@multicolother{#1}}{}%
+ \ifcsdef{LWR@columntype@mcdata@\LWR@printmccoldatatoken}%
+ {\csuse{LWR@columntype@mcdata@\LWR@printmccoldatatoken}{#1}}%
+ {}%
% \end{macrocode}
-% If an invalid column type:
+%
+% If an unknown column type, print the text:
% \begin{macrocode}
\ifbool{LWR@validtablecol}{}{\LWR@multicoltext{}}%
% \end{macrocode}
+%
% Tracing:
% \begin{macrocode}
\LWR@traceinfo{lwr@printmccoldata done}%
@@ -31938,7 +32269,7 @@ end -- not --version
% \begin{macro}{\parsemulticolumnalignment}
-% \marg{1: colspec} \marg{2: printresults}
+% \marg{1: colspec} \marg{2: printresults csname}
%
% Scan the multicolumn specification and execute the printfunction
% for each entry.
@@ -31951,6 +32282,7 @@ end -- not --version
\StrLen{#1}[\LWR@strresult]%
\defcounter{LWR@tablemulticolswidth}{\LWR@strresult}%
% \end{macrocode}
+%
% Scan across the tokens in the column spec:
% \begin{macrocode}
\whileboolexpr{%
@@ -31961,10 +32293,12 @@ end -- not --version
}%
{%
% \end{macrocode}
+%
% Execute the assigned print function for each token in the column spec:
% \begin{macrocode}
- #2{#1}%
+ \csuse{#2}{#1}%
% \end{macrocode}
+%
% Move to the next token in the column spec:
% \begin{macrocode}
\defaddtocounter{LWR@tablemulticolspos}{1}%
@@ -32052,7 +32386,8 @@ end -- not --version
\NewDocumentCommand{\LWR@domulticolumn}{o o m m m +m}{%
\LWR@traceinfo{LWR@domulticolumn -#1- -#2- -#4- -#5-}%
% \end{macrocode}
-% Remember the text to be inserted, and
+%
+% Remember the text to be inserted, and when used
% remember that a valid column type was found:
% \begin{macrocode}
\renewcommand{\LWR@multicoltext}{%
@@ -32060,6 +32395,13 @@ end -- not --version
\booltrue{LWR@validtablecol}%
}%
% \end{macrocode}
+%
+% Expand the preamble and save it.
+% \begin{macrocode}
+ \LWR@expandpreamble{#5}%
+ \edef\LWR@origmccolspec{\the\@temptokena}%
+% \end{macrocode}
+%
% Compute the rightmost column to be included.
% This is used to create the right trim.
% \changes{v0.43}{2017/11/07}{Fix: Multicolumn trim.}
@@ -32068,10 +32410,12 @@ end -- not --version
\defaddtocounter{LWR@lastmulticolumn}{#3}%
\defaddtocounter{LWR@lastmulticolumn}{-1}%
% \end{macrocode}
+%
% Row processing:
% \begin{macrocode}
\LWR@maybenewtablerow%
% \end{macrocode}
+%
% Begin the opening table data tag:
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
% \begin{macrocode}
@@ -32090,6 +32434,7 @@ end -- not --version
% \begin{macrocode}
class=\textquotedbl{}td%
% \end{macrocode}
+%
% Print the column type and vertical bars:
% \begin{macrocode}
\defcounter{LWR@mcolvertbarsl}{0}%
@@ -32097,8 +32442,9 @@ end -- not --version
\defcounter{LWR@mcolvertbarsldash}{0}%
\defcounter{LWR@mcolvertbarsrdash}{0}%
\booltrue{LWR@mcolvertbaronleft}%
- \LWR@parsemulticolumnalignment{#5}{\LWR@printmccoltype}%
+ \LWR@parsemulticolumnalignment{\LWR@origmccolspec}{LWR@printmccoltype}%
% \end{macrocode}
+%
% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag.
%
% If this position had a ``Y'' then add ``rule'' for a horizontal rule:
@@ -32114,6 +32460,7 @@ end -- not --version
{\arabic{LWR@lastmulticolumn}}%
}%
% \end{macrocode}
+%
% Also add vertical bar class.
% \changes{v0.41}{2017/10/07}{Added vertical rules.}
% \changes{v0.43}{2017/11/07}{Fix for vertical rules.}
@@ -32131,11 +32478,13 @@ end -- not --version
\ifnumcomp{\value{LWR@mcolvertbarsrdash}}{>}{1}%
{ tvertbarrdoubledash}{}%
% \end{macrocode}
+%
% Close the class tag's opening quote:
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
% \begin{macrocode}
\textquotedbl{}%
% \end{macrocode}
+%
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
\LWR@tdstartstyles%
@@ -32163,17 +32512,18 @@ end -- not --version
% \begin{macrocode}
\LWR@addtabularrowcolor%
% \end{macrocode}
+%
% Other styles:
% \begin{macrocode}
\LWR@addcmidrulewidth%
\LWR@addcdashline%
\LWR@addtabularhrulecolor%
\LWR@addmulticolvertrulecolor%
- \LWR@addformatwpalignment{#5}%
+ \LWR@addformatwpalignment{\LWR@origmccolspec}%
\LWR@tdendstyles%
}% end of the opening table data tag
\boolfalse{LWR@intabularmetadata}%
- \LWR@parsemulticolumnalignment{#5}{\LWR@printmccoldata}%
+ \LWR@parsemulticolumnalignment{\LWR@origmccolspec}{LWR@printmccoldata}%
}
% \end{macrocode}
% \end{macro}
@@ -32228,6 +32578,7 @@ end -- not --version
\NewDocumentCommand{\LWR@longtabledatacaptiontag}{s o +m}
{%
% \end{macrocode}
+%
% Remember the latest name for \cs{nameref}:
% \begin{macrocode}
\IfValueTF{#2}{% optional given?
@@ -32237,6 +32588,7 @@ end -- not --version
}% optional given
{\LWR@setlatestname{#3}}% no optional
% \end{macrocode}
+%
% Create a multicolumn across all the columns:
%
% Figure out how many extra \HTML\ columns to add for |@| and |!| columns
@@ -32244,14 +32596,16 @@ end -- not --version
% \begin{macrocode}
\LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalLaTeXcols}}%
% \end{macrocode}
-% Create the multicolumn tag:
+%
+% Create the multicolumn tag. The caption will be centered by the \CSS\ caption class.
% \begin{macrocode}
\LWR@domulticolumn{\arabic{LWR@tabletotalLaTeXcols}}%
{\arabic{LWR@tabhtmlcoltotal}}%
- {P}%
+ {p}%
{% \LWR@domulticolumn
\IfBooleanTF{#1}% star?
% \end{macrocode}
+%
% Star version, show a caption but do not make a LOT entry:
% \begin{macrocode}
{% yes star
@@ -32261,6 +32615,7 @@ end -- not --version
}%
{% No star:
% \end{macrocode}
+%
% Not the star version:
%
% Don't step the counter if |\caption[]{A caption.}|
@@ -32277,6 +32632,7 @@ end -- not --version
}%
}{}%
% \end{macrocode}
+%
% Create an \HTML\ caption. Afterwards, maybe make a LOT entry.
% \begin{macrocode}
\LWR@figcaption%
@@ -32285,19 +32641,23 @@ end -- not --version
\LWR@isolate{#3}%
\endLWR@figcaption%
% \end{macrocode}
+%
% See if an optional caption was given:
% \begin{macrocode}
\ifblank{#2}% TOC entry empty
% \end{macrocode}
+%
% if the optional caption was given, but empty, do not form a \TOC\ entry
% \begin{macrocode}
{}%
% \end{macrocode}
+%
% If the optional caption was given, but might only be |[]|:
% \begin{macrocode}
{% TOC entry not empty
\IfNoValueTF{#2}% No TOC entry?
% \end{macrocode}
+%
% The optional caption is |[]|:
% \begin{macrocode}
{% No TOC entry
@@ -32311,6 +32671,7 @@ end -- not --version
}%
}% end of No TOC entry
% \end{macrocode}
+%
% The optional caption has text enclosed:
% \begin{macrocode}
{% yes TOC entry
@@ -32326,6 +32687,7 @@ end -- not --version
}% end of TOC entry not empty
}% end of no star
% \end{macrocode}
+%
% Skip any trailing |@| or |!| columns for this cell:
% \begin{macrocode}
\booltrue{LWR@skipatbang}%
@@ -38123,7 +38485,7 @@ end -- not --version
% the environment's contents which
% were automatically captured by the \AmS{} environment.
%
-% For \brand{MathJax}: Each environment is syched with \LaTeX's equation numbers,
+% For \brand{MathJax}: Each environment is synched with \LaTeX's equation numbers,
% typeset with \LaTeX\ inside an \HTML\ comment, then
% printed to \HTML\ output for \brand{MathJax} to process.
%
@@ -39527,6 +39889,19 @@ end -- not --version
% \end{macrocode}
% \end{environment}
+
+% \pkg{xcolor} is known to have been loaded, and provided
+% \HTML\ versions of the following, and the print versions are provide above,
+% so now they may be \cs{LW@formatted}.
+% \changes{v0.901}{2021/08/20}{\pkg{xcolor}: Moved \cs{LWR@formatted}.}
+% \begin{macrocode}
+\LWR@formatted{colorbox}
+\LWR@formatted{colorboxBlock}
+\LWR@formatted{fcolorbox}
+\LWR@formatted{fcolorboxBlock}
+\LWR@formattedenv{fcolorminipage}
+% \end{macrocode}
+
% \begin{macrocode}
\LWR@traceinfo{xcolor patches done}
}{}% xcolor loaded
@@ -40530,6 +40905,7 @@ color:\LWR@origpound\LWR@tempcolor%
% \begin{macro}{\texteb} \marg{text} \qquad From \pkg{nfssext-cfr}.
% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
% \begin{macrocode}
+\@ifpackageloaded{nfssext-cfr}{
\DeclareRobustCommand{\LWR@HTML@texteb}[1]{%
{%
\LWR@HTML@ebweight%
@@ -40538,6 +40914,9 @@ color:\LWR@origpound\LWR@tempcolor%
}
\LWR@formatted{texteb}
+}{% if not loaded
+ \providerobustcmd{\texteb}[1]{}
+}
% \end{macrocode}
% \end{macro}
@@ -40545,6 +40924,7 @@ color:\LWR@origpound\LWR@tempcolor%
% \begin{macro}{\textlg} \marg{text} \qquad From \pkg{nfssext-cfr}.
% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
% \begin{macrocode}
+\@ifpackageloaded{nfssext-cfr}{
\DeclareRobustCommand{\LWR@HTML@textlg}[1]{%
{%
\LWR@HTML@lgweight%
@@ -40553,6 +40933,9 @@ color:\LWR@origpound\LWR@tempcolor%
}
\LWR@formatted{textlg}
+}{% if not loaded
+ \providerobustcmd{\textlg}[1]{}
+}
% \end{macrocode}
% \end{macro}
@@ -40830,22 +41213,26 @@ color:\LWR@origpound\LWR@tempcolor%
% \begin{macro}{\ebweight} From \pkg{nfssext-cfr}.
% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
% \begin{macrocode}
+\@ifpackageloaded{nfssext-cfr}{
\newrobustcmd*{\LWR@HTML@ebweight}{%
\LWR@print@ebweight%
\renewcommand*{\LWR@f@series}{eb}%
}
\LWR@formatted{ebweight}
+}{}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\lgweight} From \pkg{nfssext-cfr}.
% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
% \begin{macrocode}
+\@ifpackageloaded{nfssext-cfr}{
\newrobustcmd*{\LWR@HTML@lgweight}{%
\LWR@print@lgweight%
\renewcommand*{\LWR@f@series}{lg}%
}
\LWR@formatted{lgweight}
+}{}
% \end{macrocode}
% \end{macro}
@@ -42111,6 +42498,34 @@ color:\LWR@origpound\LWR@tempcolor%
% \end{macrocode}
+
+% \section{Loading \pkg{array}}
+%
+% \pkg{array} is required for \pkg{lwarp}'s column parsing.
+% It and its patches are now loaded.
+%
+% \changes{v0.901}{2021/08/19}{\pkg{array}: Now required.}
+%
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+\RequirePackage{array}
+% \end{macrocode}
+%
+% The following are compared with the tabular preamble |>| to add \CSS\ classes
+% to adjust tabular cells.
+% Defined here now that \cs{arraybackslash} is defined after \pkg{array} is loaded.
+% \begin{macrocode}
+\edef\LWR@detect@centeringarraybackslash{\centering\arraybackslash}
+\edef\LWR@detect@raggedrightarraybackslash{\raggedright\arraybackslash}
+\edef\LWR@detect@raggedleftarraybackslash{\raggedleft\arraybackslash}
+\def\LWR@detect@itshape{\itshape}
+\def\LWR@detect@bfseries{\bfseries}
+\def\LWR@detect@bfit{\bfseries\itshape}
+\end{warpHTML}
+% \end{macrocode}
+
+
% \section{Loading \pkg{everyshi} patches}
%
% \pkg{everyshi} is emulated by the \LaTeX\ core, so its patches are loaded
@@ -42594,6 +43009,7 @@ color:\LWR@origpound\LWR@tempcolor%
{Keys/values are ignored in MathJax.\MessageBreak
\protect\Cdots, etc. do not span multiple cells.\MessageBreak
AutoNiceMatrix, etc. are not supported for MathJax.\MessageBreak
+ \protect\CodeBefore\space cannot be done with MathJax.\MessageBreak
\LWR@forceSVGmessage{nicematrix}%
}
\LWR@nomathjaxwarn{pb-diagram}
@@ -44981,14 +45397,25 @@ color:\LWR@origpound\LWR@tempcolor%
%
% \codehtml
%
-% Remove the default nullfied macros:
+% If \pkg{array} is not yet loaded, remove the default nullfied macros:
+% \changes{v0.901}{2021/08/20}{\pkg{array}: Fixed if \pkg{array} already loaed.}
% \begin{macrocode}
-\let\firsthline\relax
-\let\lasthline\relax
+\@ifpackageloaded{array}{}{%
+ \let\firsthline\relax
+ \let\lasthline\relax
+}
\LWR@ProvidesPackagePass{array}[2018/12/30]
% \end{macrocode}
%
+% Provide simplified column types for \HTML:
+% \changes{v0.901}{2021/08/12}{\pkg{array}: Improved \cs{newcolumntype} emulation.}
+% \begin{macrocode}
+\HTMLnewcolumntype{w}[2]{#1}
+\HTMLnewcolumntype{W}[2]{#1}
+% \end{macrocode}
+%
+% More \HTML\ versions:
% \begin{macrocode}
\newcommand*{\LWR@HTML@firsthline}{\LWR@HTMLhline}%
\LWR@expandableformatted{firsthline}
@@ -44999,6 +45426,7 @@ color:\LWR@origpound\LWR@tempcolor%
%
% \changes{v0.69}{2019/03/09}{\pkg{array}: Fix for \cs{tabularnewline}.}
% \begin{macrocode}
+\let\tabularnewline\\
\providecommand*{\LWR@HTML@tabularnewline}{\LWR@tabularendofline}
\LWR@formatted{tabularnewline}
% \end{macrocode}
@@ -48107,8 +48535,8 @@ s%
% \DescribePackage{cases}
% \pkg{cases} is patched for use by \pkg{lwarp}.
%
-%
% While using \brand{MathJax}, \pkg{cases} objects are converted to \SVG\ math images.
+% The MathJax 3.2 \pkg{cases} package does not yet work with \pkg{lwarp}.
%
% \changes{v0.58}{2018/06/08}{\pkg{cases}: Added.}
%
@@ -48241,6 +48669,7 @@ s%
%
% \changes{v0.80}{2020/02/08}{\pkg{centernot}: Added.}
% \changes{v0.89}{2020/08/17}{\pkg{centernot}: Improved.}
+% \changes{v0.901}{2021/08/26}{\pkg{centernot}: Now uses \brand{MathJax} 3.2 package.}
%
% \codehtml
%
@@ -48248,17 +48677,9 @@ s%
\LWR@ProvidesPackagePass{centernot}[2016/05/16]
% \end{macrocode}
%
-% Based on \href{https://github.com/mathjax/MathJax/issues/2107}
-% {\texttt{https://github.com/mathjax/MathJax/issues/2107}}
-% with \cs{textstyle} removed to work with sub \Slash super scripts.
-%
% \begin{macrocode}
-\LWR@origRequirePackage{lwarp-common-mathjax-overlaysymbols}
-
\begin{warpMathJax}
-\CustomizeMathJax{\newcommand{\centernot}[1]{%
- \LWRoverlaysymbols{\unicode{x2215}}{#1}
-}}
+\CustomizeMathJax{\require{centernot}}
\end{warpMathJax}
% \end{macrocode}
%
@@ -51204,7 +51625,12 @@ name = \chemmacros_translate:n {scheme-name}
% inside the data area of the tabular.
%
% \changes{v0.57}{2018/06/02}{\pkg{colortbl}: New system for switching print and \HTML\ outputs.}
+%
+% \cs{columncolor} is provided here to satisfy \cs{LWR@formatted}'s test for
+% the existence of the print-mode macro.
% \begin{macrocode}
+\ProvideDocumentCommand{\columncolor}{O{named} m o o}{}%
+
\NewDocumentCommand{\LWR@HTML@columncolor}{O{named} m o o}{%
\convertcolorspec{#1}{#2}{HTML}\LWR@columnHTMLcolor%
\LWR@addtabularcellcolor%
@@ -51296,13 +51722,31 @@ name = \chemmacros_translate:n {scheme-name}
% \end{macrocode}
% \end{noindmacro}
-% For \brand{MathJax}, colors are discarded.
+% For \brand{MathJax}, use the \brand{MathJax} package.
+% The unused macro options are ignored.
% \changes{v0.894}{2020/12/22}{\pkg{colortbl}: Added \brand{MathJax} emulation.}
% \begin{macrocode}
\begin{warpMathJax}
-\CustomizeMathJax{\newcommand{\columncolor}[2][]{\LWRabsorbtwooptions}}
-\CustomizeMathJax{\let\rowcolor\columncolor}
-\CustomizeMathJax{\let\cellcolor\columncolor}
+
+\CustomizeMathJax{\require{colortbl}}
+\CustomizeMathJax{\let\LWRorigcolumncolor\columncolor}
+\CustomizeMathJax{\renewcommand{\columncolor}[2][named]{%
+ \LWRorigcolumncolor[#1]{#2}%
+ \LWRabsorbtwooptions%
+}}
+
+\CustomizeMathJax{\let\LWRorigrowcolor\rowcolor}
+\CustomizeMathJax{\renewcommand{\rowcolor}[2][named]{%
+ \LWRorigrowcolor[#1]{#2}%
+ \LWRabsorbtwooptions%
+}}
+
+\CustomizeMathJax{\let\LWRorigcellcolor\cellcolor}
+\CustomizeMathJax{\renewcommand{\cellcolor}[2][named]{%
+ \LWRorigcellcolor[#1]{#2}%
+ \LWRabsorbtwooptions%
+}}
+
\end{warpMathJax}
% \end{macrocode}
@@ -51775,12 +52219,29 @@ name = \chemmacros_translate:n {scheme-name}
% \label{sec:dcolumn}
%
% \changes{v0.22}{2017/02/24}{\pkg{dcolumn}: Added.}
+% \changes{v0.901}{2021/08/12}{\pkg{dcolumn}: Works inside \env{lateximage}.}
%
% \DescribePackage{dcolumn}
-% \pkg{dcolumn} is emulated by the \pkg{lwarp} core.
+% \pkg{dcolumn} is used as-is in a \env{lateximage}, and
+% is emulated by the \pkg{lwarp} core.
+%
+% \pkg{dcolumn} used to be \cs{LWR@ProvidesPackageDrop} in prior versions of \pkg{lwarp},
+% but is now supported for print mode.
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{dcolumn}[2014/10/28]
+% \end{macrocode}
%
+% Due to how the |D| column is created, cannot use \cs{HTMLnewcolumntype} here.
+% An \HTML\ version neutralizes the lower-level macros, leaving a |c| column type.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{dcolumn}[2014/10/28]
+\newcommand*{\LWR@HTML@DC@}[3]{}
+\LWR@formatted{DC@}
+
+\providecommand*{\DC@end}{}
+
+\newcommand*{\LWR@HTML@DC@end}{}
+\LWR@formatted{DC@end}
% \end{macrocode}
%
% \iffalse
@@ -58169,9 +58630,10 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
%
% \DescribePackage{gensymb}
% \pkg{gensymb} works as-is for \SVG\ math, and
-% is emulated for \brand{MathJax}.
+% uses the \brand{MathJax} package.
%
% \changes{v0.80}{2020/02/09}{\pkg{gensymb}: Added.}
+% \changes{v0.901}{2021/08/26}{\pkg{gensymb}: Use \brand{MathJax} 3.2 package.}
%
% \codehtml
%
@@ -58181,11 +58643,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
%
% \begin{macrocode}
\begin{warpMathJax}
-\CustomizeMathJax{\newcommand{\degree}{\mathrm{^\circ}}}
-\CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}}
-\CustomizeMathJax{\newcommand{\perthousand}{\unicode{x2030}}}
-\CustomizeMathJax{\newcommand{\ohm}{\mathrm{\Omega}}}
-\CustomizeMathJax{\newcommand{\micro}{\mathrm{\unicode{x00B5}}}}
+\CustomizeMathJax{\require{gensymb}}
\end{warpMathJax}
% \end{macrocode}
%
@@ -58620,6 +59078,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\DeclareGraphicsRule{.SVG}{svg}{.SVG}{}
}
% \end{macrocode}
+%
% Inside a \env{lateximage}, allow \PDF\ instead of \SVG:
% \changes{v0.61}{2018/10/06}{Fix: \EPS\ for \DVI\ \LaTeX.}
% \begin{macrocode}
@@ -59039,6 +59498,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \begin{macrocode}
\textquotedbl\LWR@indentHTML%
% \end{macrocode}
+%
% Only include a style tag if a width, height, angle, or scale was given:
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
% \begin{macrocode}
@@ -59086,6 +59546,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\textquotedbl\LWR@indentHTML%
}{}%
% \end{macrocode}
+%
% Set the class and alt tag:
% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
% \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
@@ -59195,11 +59656,18 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\begingroup%
\LetLtxMacro\Gin@setfile\LWR@HTML@Gin@setfile%
\edef\LWR@tempone{#4}%
- \StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]%
- \StrSubstitute{\LWR@tempone}{.PDF}{.SVG}[\LWR@tempone]%
+% \end{macrocode}
+%
+% \PDF\ extensions are removed to allow a search for another
+% graphics format such as \SVG\ or \PNG.
+% \begin{macrocode}
+ \StrSubstitute{\LWR@tempone}{.pdf}{}[\LWR@tempone]%
+ \StrSubstitute{\LWR@tempone}{.PDF}{}[\LWR@tempone]%
+% \end{macrocode}
+% \begin{macrocode}
\LWR@replaceEPSSVG%
\xdef\LWR@parsedfilename{\LWR@tempone}%
- \Ginclude@graphics{\detokenize\expandafter{\LWR@tempone}}%
+ \Ginclude@graphics{\detokenize\expandafter{\LWR@parsedfilename}}%
\endgroup%
\filename@parse{\LWR@parsedfilename}%
% \end{macrocode}
@@ -62316,6 +62784,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \begin{noindenvironment}{KFLT@marginfloat} \oarg{offset} \marg{type}
% \changes{v0.42}{2017/10/26}{\pkg{keyfloat}: If \progcode{FormatWP} add explicit \HTML\ style.}
% \changes{v0.896}{2021/03/05}{\pkg{keyfloat}: Added \ARIA\ role.}
+% \changes{v0.901}{2021/08/22}{\pkg{keyfloat}: More room.}
% \begin{macrocode}
\DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
{%
@@ -62326,7 +62795,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
(note)%
{marginblock}%
\renewcommand*{\@captype}{#2}%
- \minipage{\LWR@usersmarginparwidth}%
+ \minipage{1.2\LWR@usersmarginparwidth}%
\setlength{\marginparwidth}{.95\LWR@usersmarginparwidth}%
}
{%
@@ -64226,6 +64695,30 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
%
%
+% \iffalse
+%<*lltjp-tascmac>
+% \fi
+%
+% \part{lwarp-lltjp-tascmac.sty}
+%
+% \section{lltjp-tascmac}
+%
+% \DescribePackage{lltjp-tascmac}
+% \pkg{lltjp-tascmac} is a patch for \pkg{tascmac}, and is ignored.
+%
+% \changes{v0.901}{2021/08/19}{\pkg{lltjp-tascmac}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{lltjp-tascmac}[2020/12/24]
+% \end{macrocode}
+%
+% \iffalse
+%</lltjp-tascmac>
+% \fi
+%
+%
%
%
% \iffalse
@@ -64370,8 +64863,9 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
\def\endlastfoot{\LWR@longtable@headerror}
% \end{macrocode}
%
-% \changes{v0.69}{2019/03/09}{\pkg{array}: Fix for \cs{tabularnewline}.}
+% \changes{v0.69}{2019/03/09}{\pkg{longtable}: Fix for \cs{tabularnewline}.}
% \begin{macrocode}
+\let\tabularnewline\\
\providecommand*{\LWR@HTML@tabularnewline}{\LWR@tabularendofline}
\LWR@formatted{tabularnewline}
% \end{macrocode}
@@ -64635,6 +65129,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \end{macrocode}
% \end{noindmacro}
%
+%
% \iffalse
%</ltxtable>
% \fi
@@ -66297,88 +66792,30 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \end{macrocode}
%
%
-% For \brand{MathJax}:
+% For \brand{MathJax}.
+%
+% The \brand{MathJax} package is used, and improvements are added.
%
% \changes{v0.79}{2020/01/26}{\pkg{mathtools}: Added \brand{MathJax} emulation.}
% \changes{v0.87}{2020/05/20}{\pkg{mathtools}: Updated starred macros.}
% \changes{v0.87}{2020/05/20}{\pkg{mathtools}: Improved \cs{underbraket}, \cs{overbracket}.}
% \changes{v0.891}{2020/09/19}{\pkg{mathtools}: Improved \cs{underbraket}, \cs{overbracket}.}
+% \changes{v0.901}{2021/08/26}{\pkg{mathtools}: Uses \brand{MathJax} 3.2 package.}
% \begin{macrocode}
\begin{warpMathJax}
+\CustomizeMathJax{\require{mathtools}}
+
\LWR@infoprocessingmathjax{mathtools}
-\CustomizeMathJax{\newcommand{\mathllap}[2][]{{#1#2}}}
-\CustomizeMathJax{\newcommand{\mathrlap}[2][]{{#1#2}}}
-\CustomizeMathJax{\newcommand{\mathclap}[2][]{{#1#2}}}
-\CustomizeMathJax{\newcommand{\mathmbox}[1]{#1}}
-\CustomizeMathJax{\newcommand{\clap}[1]{#1}}
-\CustomizeMathJax{\newcommand{\LWRmathmakebox}[2][]{#2}}
-\CustomizeMathJax{\newcommand{\mathmakebox}[1][]{\LWRmathmakebox}}
-\CustomizeMathJax{\newcommand{\cramped}[2][]{{#1#2}}}
-\CustomizeMathJax{\newcommand{\crampedllap}[2][]{{#1#2}}}
-\CustomizeMathJax{\newcommand{\crampedrlap}[2][]{{#1#2}}}
-\CustomizeMathJax{\newcommand{\crampedclap}[2][]{{#1#2}}}
\CustomizeMathJax{\newenvironment{crampedsubarray}[1]{}{}}
-\CustomizeMathJax{\newcommand{\crampedsubstack}{}}
-% \end{macrocode}
-% \changes{v0.89}{2020/08/21}{\pkg{mathtools}: Minor improvements.}
-% \begin{macrocode}
+
\CustomizeMathJax{\newcommand{\smashoperator}[2][]{#2\limits}}
-% \end{macrocode}
-% \changes{v0.89}{2020/08/21}{\pkg{mathtools}: Added \cs{adjustlimits}.}
-% \begin{macrocode}
-\CustomizeMathJax{\newcommand{\adjustlimits}{}}
-% \end{macrocode}
-% \begin{macrocode}
-\CustomizeMathJax{\newcommand{\SwapAboveDisplaySkip}{}}
-\CustomizeMathJax{\require{extpfeil}}
-\CustomizeMathJax{\Newextarrow\xleftrightarrow{10,10}{0x2194}}
-\CustomizeMathJax{\Newextarrow\xLeftarrow{10,10}{0x21d0}}
-\CustomizeMathJax{\Newextarrow\xhookleftarrow{10,10}{0x21a9}}
-\CustomizeMathJax{\Newextarrow\xmapsto{10,10}{0x21a6}}
-\CustomizeMathJax{\Newextarrow\xRightarrow{10,10}{0x21d2}}
-\CustomizeMathJax{\Newextarrow\xLeftrightarrow{10,10}{0x21d4}}
-\CustomizeMathJax{\Newextarrow\xhookrightarrow{10,10}{0x21aa}}
-\CustomizeMathJax{\Newextarrow\xrightharpoondown{10,10}{0x21c1}}
-\CustomizeMathJax{\Newextarrow\xleftharpoondown{10,10}{0x21bd}}
-\CustomizeMathJax{\Newextarrow\xrightleftharpoons{10,10}{0x21cc}}
-\CustomizeMathJax{\Newextarrow\xrightharpoonup{10,10}{0x21c0}}
-\CustomizeMathJax{\Newextarrow\xleftharpoonup{10,10}{0x21bc}}
-\CustomizeMathJax{\Newextarrow\xleftrightharpoons{10,10}{0x21cb}}
-
-\CustomizeMathJax{\newcommand{\LWRdounderbracket}[3]{%
- \mathinner{\underset{#3}{\underline{\llcorner{#1}\lrcorner}}}%
-}}
-\CustomizeMathJax{\newcommand{\LWRunderbracket}[2][]{\LWRdounderbracket{#2}}}
-\CustomizeMathJax{\newcommand{\underbracket}[1][]{\LWRunderbracket}}
-\CustomizeMathJax{\newcommand{\LWRdooverbracket}[3]{%
- \mathinner{\overset{#3}{\overline{\ulcorner{#1}\urcorner}}}%
-}}
-\CustomizeMathJax{\newcommand{\LWRoverbracket}[2][]{\LWRdooverbracket{#2}}}
-\CustomizeMathJax{\newcommand{\overbracket}[1][]{\LWRoverbracket}}
+\CustomizeMathJax{\newcommand{\SwapAboveDisplaySkip}{}}
\CustomizeMathJax{\newcommand{\LaTeXunderbrace}[1]{\underbrace{#1}}}
\CustomizeMathJax{\newcommand{\LaTeXoverbrace}[1]{\overbrace{#1}}}
-\CustomizeMathJax{\newenvironment{matrix*}[1][]{\begin{matrix}}{\end{matrix}}}
-\CustomizeMathJax{\newenvironment{pmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
-\CustomizeMathJax{\newenvironment{bmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
-\CustomizeMathJax{\newenvironment{Bmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
-\CustomizeMathJax{\newenvironment{vmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
-\CustomizeMathJax{\newenvironment{Vmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
-\CustomizeMathJax{\newenvironment{smallmatrix*}[1][]{\begin{matrix}}{\end{matrix}}}
-\CustomizeMathJax{\newenvironment{psmallmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
-\CustomizeMathJax{\newenvironment{bsmallmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
-\CustomizeMathJax{\newenvironment{Bsmallmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
-\CustomizeMathJax{\newenvironment{vsmallmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
-\CustomizeMathJax{\newenvironment{Vsmallmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
-\CustomizeMathJax{\newenvironment{psmallmatrix}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
-\CustomizeMathJax{\newenvironment{bsmallmatrix}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
-\CustomizeMathJax{\newenvironment{Bsmallmatrix}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
-\CustomizeMathJax{\newenvironment{vsmallmatrix}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
-\CustomizeMathJax{\newenvironment{Vsmallmatrix}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
-
\CustomizeMathJax{\newcommand{\LWRmultlined}[1][]{\begin{multline*}}}
\CustomizeMathJax{\newenvironment{multlined}[1][]{\LWRmultlined}{\end{multline*}}}
@@ -66388,50 +66825,8 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
\CustomizeMathJax{\let\LWRorigshoveright\shoveright}
\CustomizeMathJax{\renewcommand{\shoveright}[1][]{\LWRorigshoveright}}
-\CustomizeMathJax{\newenvironment{dcases}{\begin{cases}}{\end{cases}}}
-\CustomizeMathJax{\newenvironment{dcases*}{\begin{cases}}{\end{cases}}}
-\CustomizeMathJax{\newenvironment{rcases}{\begin{cases}}{\end{cases}}}
-\CustomizeMathJax{\newenvironment{rcases*}{\begin{cases}}{\end{cases}}}
-\CustomizeMathJax{\newenvironment{drcases}{\begin{cases}}{\end{cases}}}
-\CustomizeMathJax{\newenvironment{drcases*}{\begin{cases}}{\end{cases}}}
-\CustomizeMathJax{\newenvironment{cases*}{\begin{cases}}{\end{cases}}}
-
-\CustomizeMathJax{\newcommand{\MoveEqLeft}[1][]{}}
-
-\CustomizeMathJax{% special parsing to handle '&' in argument
- \def\LWRAboxed#1&#2&#3!|!{\fbox{\(#1\)}&\fbox{\(#2\)}}
- \newcommand{\Aboxed}[1]{\LWRAboxed#1&&!|!}
-}
-% \end{macrocode}
-%
-% \changes{v0.86}{2020/05/09}{\pkg{mathtools}: Added \cs{ArrowBetweenLines*}.}
-% \begin{macrocode}
-\CustomizeMathJax{
- \newcommand{\LWRABLines}[1][\Updownarrow]{#1 \notag \\}% star/nostar the same
- \newcommand{\ArrowBetweenLines}{\ifstar\LWRABLines\LWRABLines}
-}
-% \end{macrocode}
-%
-% \changes{v0.85}{2020/05/01}{\pkg{mathtools}: Fixed: \cs{shortintertext}.}
-% \changes{v0.86}{2020/05/09}{\pkg{mathtools}: Added starred delimited macros.}
-% \begin{macrocode}
\CustomizeMathJax{\newcommand{\shortintertext}[1]{\text{#1}\notag \\}}
-\CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}}
-% \end{macrocode}
-%
-% \changes{v0.86}{2020/05/09}{\pkg{mathtools}: Added \cs{shortvdotswithin*}.}
-% \begin{macrocode}
-\CustomizeMathJax{\newcommand{\LWRshortvdotswithinstar}[1]{\vdots \hspace{.5em} & \\}}
-\CustomizeMathJax{\newcommand{\LWRshortvdotswithinnostar}[1]{& \hspace{.5em}\vdots \\}}
-\CustomizeMathJax{%
- \newcommand{\shortvdotswithin}%
- {\ifstar\LWRshortvdotswithinstar\LWRshortvdotswithinnostar}%
-}
-
-\CustomizeMathJax{\newcommand{\MTFlushSpaceAbove}{}}
-\CustomizeMathJax{\newcommand{\MTFlushSpaceBelow}{\\}}
-
\LetLtxMacro\LWR@mathtools@orig@DeclarePairedDelimiter\DeclarePairedDelimiter
\renewcommand{\DeclarePairedDelimiter}[3]{
\LWR@mathtools@orig@DeclarePairedDelimiter{#1}{#2}{#3}
@@ -66537,44 +66932,8 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
\@onlypreamble\DeclareParedDelimiterXPP
\@onlypreamble\DeclareParedDelimiterX
-\CustomizeMathJax{\newcommand\lparen{(}}
-\CustomizeMathJax{\newcommand\rparen{)}}
-\CustomizeMathJax{\newcommand{\ordinarycolon}{:}}
-% \end{macrocode}
-% \changes{v0.89}{2020/08/21}{\pkg{mathtools}: Minor improvements.}
-% \changes{v0.891}{2020/09/08}{\pkg{mathtools}: Uses Unicode and \cs{mathrel}.}
-% \begin{macrocode}
\CustomizeMathJax{\newcommand{\vcentcolon}{\mathrel{\unicode{x2236}}}}
-\CustomizeMathJax{\newcommand\dblcolon{\mathrel{\unicode{x2237}}}}
-\CustomizeMathJax{\newcommand\coloneqq{\mathrel{\unicode{x2236}\!=}}}
-\CustomizeMathJax{\newcommand\Coloneqq{\mathrel{\unicode{x2237}\!=}}}
-\CustomizeMathJax{\newcommand\coloneq{\mathrel{\unicode{x2236}-}}}
-\CustomizeMathJax{\newcommand\Coloneq{\mathrel{\unicode{x2237}-}}}
-
-\CustomizeMathJax{\newcommand\eqqcolon{\mathrel{=\!\unicode{x2236}}}}
-\CustomizeMathJax{\newcommand\Eqqcolon{\mathrel{=\!\unicode{x2237}}}}
-\CustomizeMathJax{\newcommand\eqcolon{\mathrel{-\unicode{x2236}}}}
-\CustomizeMathJax{\newcommand\Eqcolon{\mathrel{-\unicode{x2237}}}}
-
-\CustomizeMathJax{\newcommand\colonapprox{\mathrel{\unicode{x2236}\!\approx}}}
-\CustomizeMathJax{\newcommand\Colonapprox{\mathrel{\unicode{x2237}\!\approx}}}
-\CustomizeMathJax{\newcommand\colonsim{\mathrel{\unicode{x2236}\!\sim}}}
-\CustomizeMathJax{\newcommand\Colonsim{\mathrel{\unicode{x2237}\!\sim}}}
-
-% \end{macrocode}
-% \changes{v0.89}{2020/08/21}{\pkg{mathtools}: Minor improvements.}
-% \begin{macrocode}
-\CustomizeMathJax{\newcommand{\nuparrow}{\mathrel{\cancel{\uparrow}}}}
-\CustomizeMathJax{\newcommand{\ndownarrow}{\mathrel{\cancel{\downarrow}}}}
-\CustomizeMathJax{\newcommand{\bigtimes}{\mathop{\Large\times}\limits}}
-
-\CustomizeMathJax{\newcommand{\prescript}[3]{{}^{#1}_{#2}#3}}
-
-
-\CustomizeMathJax{\newenvironment{lgathered}{\begin{gathered}}{\end{gathered}}}
-\CustomizeMathJax{\newenvironment{rgathered}{\begin{gathered}}{\end{gathered}}}
-
\LetLtxMacro\LWR@mathtools@orig@newgathered\newgathered
\renewcommand{\newgathered}[4]{%
\LWR@mathtools@orig@newgathered{#1}{#2}{#3}{#4}%
@@ -66586,8 +66945,6 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
}
\@onlypreamble\newgathered
-\CustomizeMathJax{\newcommand{\splitfrac}[2]{{}^{#1}_{#2}}}
-\CustomizeMathJax{\let\splitdfrac\splitfrac}
\end{warpMathJax}
% \end{macrocode}
%
@@ -67773,7 +68130,7 @@ background:
% \pkg{lwarp} does not support
% \trouble[nested math]{mhchem=\pkg{mhchem}>nested dollar signs}
% the use of nested dollar signs in \pkg{mhchem} expressions.
-% \gindex{array>mhchem=\pkg{mhchem}}
+% \gindex{array=\env{array}>mhchem=\pkg{mhchem}}
% \gindex{math>mhchem=\pkg{mhchem}}
%
% For some examples from the \pkg{mhchem} manual, change as follows:
@@ -69471,6 +69828,46 @@ class=\textquotedbl{}td%
%
%
%
+% \iffalse
+%<*mwe>
+% \fi
+%
+% \part{lwarp-mwe.sty}
+%
+% \section{mwe}
+%
+% \credits{Martin Scharrer}
+%
+% \DescribePackage{mwe}
+% \pkg{mwe} is used as-is, but a warning is issued to copy the images
+% to the local directory.
+%
+% \changes{v0.901}{2021/08/02}{\pkg{mwe}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{mwe}[2018/03/30]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AtEndDocument{%
+ \PackageWarningNoLine{lwarp}{%
+ For package mwe, copy any mwe images to be used for\MessageBreak
+ HTML, such as PNG or JPG, to the document's base\MessageBreak
+ directory. Neither a subdirectory nor the mwe\MessageBreak
+ directory will work, due to the TeX file search\MessageBreak
+ algorithm%
+ }%
+}%
+% \end{macrocode}
+%
+% \iffalse
+%</mwe>
+% \fi
+%
+%
+%
%
% \iffalse
%<*nameauth>
@@ -70790,6 +71187,11 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
% More approximations:
% \begin{macrocode}
\CustomizeMathJax{\let\hdottedline\hdashline}
+% \end{macrocode}
+%
+% \changes{v0.901}{2021/08/26}{\pkg{nicematrix}: Added \cs{Hline}.}
+% \begin{macrocode}
+\CustomizeMathJax{\let\Hline\hline}
\CustomizeMathJax{\newcommand{\ldots}[1][]{\dots}}
\CustomizeMathJax{\newcommand{\Cdots}[1][]{\cdots}}
@@ -73027,8 +73429,8 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
%
% Option \optn{link} and \optn{linkname} work:
% \begin{Verbatim}[tabsize=4,gobble=2,frame=lines]
-% \hyperlink{<filename>.pdf.<pagenubmer}}{some text}
-% \hyperlink{<linkname>.<pagenubmer}}{some text}
+% \hyperlink{<filename>.pdf.<pagenubmer}{some text}
+% \hyperlink{<linkname>.<pagenubmer}{some text}
% \end{Verbatim}
%
% Options which make no sense in \HTML\ are disabled.
@@ -77975,6 +78377,16 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar}
}% AtBeginDocument
% \end{macrocode}
+
+% Support the |S| and |s| column types:
+% \changes{v0.901}{2021/08/18}{\pkg{siunitx}: Improved \cs{newcolumntype} emulation.}
+% \begin{macrocode}
+\AtBeginDocument{
+\HTMLnewcolumntype{S}{c}
+\HTMLnewcolumntype{s}{c}
+}
+% \end{macrocode}
+
%
% \cs{@ensuredmath} is not supported inside an \cs{hbox}, so it must
% temporarily be restored to its original.
@@ -80006,7 +80418,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\CustomizeMathJax{\newcommand{\iid}{\;\stackrel{\mb{\mathrm{iid}}}{\sim}\;}}
\CustomizeMathJax{\newcommand{\ind}{\;\stackrel{\mb{\mathrm{ind}}}{\sim}\;}}
\CustomizeMathJax{\newcommand{\indpr}{%
- \;\stackrel{\mb{\mathrm{ind}}}{\stackrel{\mb{\mathrm{prior}}}{\sim}}\;%
+ \;\stackrel{\mb{\mathrm{ind}}}{\stackrel{\mb{\mathrm{prior}}}{\sim}}\;
}}
\CustomizeMathJax{\newcommand{\post}{\;\stackrel{\mb{\mathrm{post}}}{\sim}\;}}
\CustomizeMathJax{\newcommand{\prior}{\;\stackrel{\mb{\mathrm{prior}}}{\sim}\;}}
@@ -81606,16 +82018,25 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\RequirePackage{array}
% \end{macrocode}
+% \cs{tabularxcolumn} is ignored.
+% All |X| columns will be |p| for now. The width is ignored.
+% \changes{v0.901}{2021/08/17}{\pkg{tabularx}: Improved \cs{newcolumntype} emulation.}
+% \begin{macrocode}
+\def\tabularxcolumn#1{p{#1}}
+\newcolumntype{X}{p{1in}}
+% \end{macrocode}
+%
% \begin{macrocode}
\DeclareDocumentEnvironment{tabularx}{m o m}
-{\tabular{#3}}
-{\endtabular}
+ {\tabular{#3}}
+ {\endtabular}
\DeclareDocumentEnvironment{tabularx*}{m o m}
-{\tabular{#3}}
-{\endtabular}
+ {\tabular{#3}}
+ {\endtabular}
% \end{macrocode}
-
+%
+%
% \iffalse
%</tabularx>
% \fi
@@ -81659,7 +82080,17 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\NewDocumentEnvironment{tabulary*}{m o m}
{\tabular{#3}}
{\endtabular}
-
+% \end{macrocode}
+%
+% \changes{v0.901}{2021/08/17}{\pkg{tabulary}: Improved \cs{newcolumntype} emulation.}
+% \begin{macrocode}
+\newcolumntype{L}{l}
+\newcolumntype{C}{c}
+\newcolumntype{R}{r}
+\newcolumntype{J}{l}
+% \end{macrocode}
+%
+% \begin{macrocode}
\newdimen\tymin
\newdimen\tymax
\def\tyformat{}
@@ -82484,6 +82915,9 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \DescribePackage{textcomp}
% \pkg{textcomp} is patched for use by \pkg{lwarp}.
%
+% For \brand{MathJax}, the \brand{MathJax} packge is used.
+%
+%
% \subsection{Limitations}
%
% \limitstextcomp
@@ -82677,6 +83111,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \end{macrocode}
%
%
+% For \brand{MathJax}:
+% \changes{v0.901}{2021/08/26}{\pkg{textcomp}: Uses \pkg{MathJax} 3.2 package.}
+% \begin{macrocode}
+\CustomizeMathJax{\require{textcomp}}
+% \end{macrocode}
%
% \iffalse
%</textcomp>
@@ -86674,6 +87113,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% emulated for \brand{MathJax}.
%
% \changes{v0.89}{2020/08/10}{\pkg{upgreek}: Added.}
+% \changes{v0.901}{2021/08/26}{\pkg{upgreek}: Use \brand{MathJax} package.}
%
% \codehtml
%
@@ -86683,14 +87123,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% For \brand{MathJax}:
% \begin{macrocode}
-\LWR@origRequirePackage{lwarp-common-mathjax-letters}
-
\begin{warpMathJax}
-\LWR@infoprocessingmathjax{upgreek}
-
-\LWR@mathjax@addgreek@l@up{up}{}
-\LWR@mathjax@addgreek@u@up{Up}{}
-
+\CustomizeMathJax{\require{upgreek}}
\end{warpMathJax}
% \end{macrocode}
%
@@ -88111,10 +88545,6 @@ padding:\LWR@printlength{\fboxsep}%
]{colorbox}{#3}%
\endgroup%
}
-
-\AtBeginDocument{
- \LWR@formatted{colorbox}
-}
% \end{macrocode}
% \end{macro}
@@ -88148,10 +88578,6 @@ padding:\LWR@printlength{\fboxsep}%
% \begin{macrocode}
\global\booltrue{LWR@minipagethispar}%
}
-
-\AtBeginDocument{
- \LWR@formatted{colorboxBlock}
-}
% \end{macrocode}
% \end{macro}
@@ -88185,10 +88611,6 @@ padding:\LWR@printlength{\fboxsep}%
}%
\endgroup%
}
-
-\AtBeginDocument{
- \LWR@formatted{fcolorbox}
-}
% \end{macrocode}
% \end{macro}
@@ -88239,10 +88661,6 @@ padding:\LWR@printlength{\fboxsep}%
\global\booltrue{LWR@minipagethispar}%
\LWR@traceinfo{HTML fcolorboxBlock done}%
}
-
-\AtBeginDocument{
- \LWR@formatted{fcolorboxBlock}
-}
% \end{macrocode}
% \end{macro}
@@ -88306,10 +88724,6 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \begin{macrocode}
\global\booltrue{LWR@minipagethispar}%
}
-
-\AtBeginDocument{
-\LWR@formattedenv{fcolorminipage}
-}
% \end{macrocode}
% \end{environment}
%
@@ -88841,7 +89255,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% Relies on \pkg{tabularx}.
%
% At present, an \env{xltabular} without a caption or with only a \cs{caption*}
-% \trouble[table numbering]{tabular>numbering}
+% \trouble[table numbering]{tabular=\env{tabular}>numbering}
% \trouble{xltabular=\pkg{xltabular}>numbering}
% may be misnumbered in \HTML, so it may be necessary to place at the end
% of the table:
diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins
index 143e4ba4f1..5d3ad912df 100644
--- a/macros/latex/contrib/lwarp/lwarp.ins
+++ b/macros/latex/contrib/lwarp/lwarp.ins
@@ -285,6 +285,7 @@ version 2005/12/01 or later.
\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}
\file{lwarp-listliketab.sty}{\from{lwarp.dtx}{listliketab}}
\file{lwarp-lltjext.sty}{\from{lwarp.dtx}{lltjext}}
+\file{lwarp-lltjp-tascmac.sty}{\from{lwarp.dtx}{lltjp-tascmac}}
\file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}}
\file{lwarp-lpic.sty}{\from{lwarp.dtx}{lpic}}
\file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}}
@@ -350,6 +351,7 @@ version 2005/12/01 or later.
\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
\file{lwarp-multitoc.sty}{\from{lwarp.dtx}{multitoc}}
\file{lwarp-musicography.sty}{\from{lwarp.dtx}{musicography}}
+\file{lwarp-mwe.sty}{\from{lwarp.dtx}{mwe}}
\file{lwarp-nameauth.sty}{\from{lwarp.dtx}{nameauth}}
\file{lwarp-nameref.sty}{\from{lwarp.dtx}{nameref}}
\file{lwarp-natbib.sty}{\from{lwarp.dtx}{natbib}}
diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf
index aafbad9edd..ccdf3d87da 100644
--- a/macros/latex/contrib/lwarp/lwarp.pdf
+++ b/macros/latex/contrib/lwarp/lwarp.pdf
Binary files differ
diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua
index 6206329a3b..0b276a9301 100755
--- a/macros/latex/contrib/lwarp/lwarpmk.lua
+++ b/macros/latex/contrib/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.900"
+printversion = "v0.901"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
diff --git a/macros/latex/contrib/mecaso/README.md b/macros/latex/contrib/mecaso/README.md
new file mode 100644
index 0000000000..99941e068e
--- /dev/null
+++ b/macros/latex/contrib/mecaso/README.md
@@ -0,0 +1,10 @@
+# mecaso
+
+Un package LaTeX pour les formules en mécanique des solides indéformables.
+
+Créé par Youssef DERRAZI, v1.0
+
+Ce package est libre : vous pouvez le redistribuer et/ou le modifie selon les termes de la Licence Publique Générale GNU, version 3 de la licence, ou (à votre choix) toute version ultérieure.
+
+Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE. Voir la Licence Publique Générale GNU pour plus de détails.
+
diff --git a/macros/latex/contrib/mecaso/mecaso.pdf b/macros/latex/contrib/mecaso/mecaso.pdf
new file mode 100644
index 0000000000..43264cd58a
--- /dev/null
+++ b/macros/latex/contrib/mecaso/mecaso.pdf
Binary files differ
diff --git a/macros/latex/contrib/mecaso/mecaso.sty b/macros/latex/contrib/mecaso/mecaso.sty
new file mode 100644
index 0000000000..dd2f5c2bb4
--- /dev/null
+++ b/macros/latex/contrib/mecaso/mecaso.sty
@@ -0,0 +1,281 @@
+%Mecaso, un package LaTeX pour les formules en mécanique du solide
+%Conçu par : Youssef DERRAZI, version 1.0
+%Distribué sous la license GNU Public License V3.0
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{mecaso}[2021/08/27 v1.0]
+
+\RequirePackage{amsmath}
+\RequirePackage{amssymb}
+\RequirePackage{mathrsfs}
+
+%Commands :
+\newcommand{\R}{\mathbb{R}}
+
+%Derivative on line \Dex[R]{u(t)} :
+\newcommand{\Dex}[2][R]{\frac{d}{dt}{#2}\bigg|_{#1}}
+
+%Derivative on fraction \Din[R]{u(t)} :
+\newcommand{\Din}[2][R]{\frac{d{#2}}{dt}\bigg|_{#1}}
+
+%Vector representation \Vct{AB} :
+\newcommand{\Vct}[1]{\overrightarrow{#1}}
+
+%################################### A-Kinematics :
+
+%Rotation vector definition \Rotation[R]{S} :
+\newcommand{\Rotation}[2][R]{\Vct{\omega}_{#2/#1}}
+
+%Velocity vector definition \Vel[R]{A}{S} :
+\newcommand{\Vel}[3][R]{\Vct{v}_{#2\in #3/#1}}
+
+%Transport formula for velocities \VARK[R]{A}{B}{S} :
+\newcommand{\VARK}[4][R]{\Vel[#1]{#3}{#4}=\Vel[#1]{#2}{#4}+\Rotation[#1]{#4}\times\Vct{#2 #3}}
+
+%################################### B-Statics :
+
+%Force vector definition \Force[S]{Ext} :
+\newcommand{\Force}[2][S]{\Vct{F}_{#2\rightarrow #1}}
+
+%Moment vector definition with force precision \Moment[S]{Ext}{A} :
+\newcommand{\Moment}[3][S]{\Vct{M}_{#3}(\Vct{F}_{#2\rightarrow #1})}
+
+%Moment vector definition without force precision \Gmoment{Force}{A} :
+\newcommand{\Gmoment}[2]{\Vct{M}_{#2}(#1)}
+
+%Transport formula for moments with force precision \VARS[S]{A}{B}{Ext} :
+\newcommand{\VARS}[4][S]{\Moment[#1]{#4}{#3}=\Moment[#1]{#4}{#2}+\Force[#1]{#4}\times\Vct{#2 #3}}
+
+%Transport formula for moments without force precision \GVARS{Force}{A}{B} :
+\newcommand{\GVARS}[3]{\Gmoment{#1}{#3}=\Gmoment{#1}{#2}+{#1}\times\Vct{#2 #3}}
+
+%Volumetric force resultant \Vnet[S]{f}{Ext} :
+\newcommand{\Vnet}[3][S]{\iiint_{M \in #1}\Vct{#2}_{#3\rightarrow #1}(M)dm}
+
+%Volumetric force resultant with explicit volume \VVnet[S]{f}{Ext} :
+\newcommand{\VVnet}[3][S]{\iiint_{M \in #1}\rho(M)\Vct{#2}_{#3\rightarrow #1}(M)dV}
+
+%Surface force resultant \Snet[S]{T}{Ext} :
+\newcommand{\Snet}[3][S]{\iint_{M \in \partial #1}\Vct{#2}_{#3\rightarrow #1}(M)dS}
+
+%Surface force resultant with explicit normal \SSnet[S]{T}{Ext}{n} :
+\newcommand{\SSnet}[4][S]{\iint_{M \in \partial #1}{#2}_{#3\rightarrow #1}(M)\Vct{#4}dS}
+
+%################################### C-Kinetics :
+
+%Momentum vector definition \Psr[R]{S} :
+\newcommand{\Psr}[2][R]{\Vct{p}_{#2/#1}}
+
+%Momentum vector 2nd definition \Mv[R]{S} :
+\newcommand{\Mv}[2][R]{m_{#2}\Vel[#1]{G}{#2}}
+
+%Angular momentum integral def \Lmi[R]{A}{S}:
+\newcommand{\Lmi}[3][R]{\int_{M \in {#3}}\Vct{#2 M}\times \Vel[#1]{M}{#3} dm}
+
+%Angular momentum definition \Lm[R]{A}{S} :
+\newcommand{\Lm}[3][R]{\Vct{L}_{#2, #3/#1}}
+
+%Transport formula for angular momenta \VARC[R]{A}{B}{S} :
+\newcommand{\VARC}[4][R]{\Lm[#1]{#3}{#4}=\Lm[#1]{#2}{#4}+\Psr[#1]{#4}\times\Vct{#2 #3}}
+
+%Alternate transport formula for angular momenta \AVARC[R]{A}{B}{S} :
+\newcommand{\AVARC}[4][R]{\Lm[#1]{#3}{#4}=\Lm[#1]{#2}{#4}+\Mv[#1]{#4}\times\Vct{#2 #3}}
+
+%Inertia tensor definition \Inertia[R]{A}{S} :
+\newcommand{\Inertia}[3][R]{\overline{\overline{I}}_{#2}(#3/#1)}
+
+%Angular momentum general definition on arbitrary point \LA[R]{A}{S} :
+\newcommand{\LA}[3][R]{m_{#3}\Vct{#2 G}\times \Vel[#1]{G}{#3}+\Inertia[#1]{#2}{#3} \cdot \Rotation[#1]{#3}}
+
+%Angular momentum general definition on fixed point and/or center of gravity \LF[R]{A}{S} :
+\newcommand{\LF}[3][R]{\Inertia[#1]{#2}{#3} \cdot \Rotation[#1]{#3}}
+
+%Transport inertia tensor from G to A \Ip[S]{G}{A} :
+\newcommand{\Ip}[3][S]{\overline{\overline{I}}_{\Vct{#3 #2}}(#1)}
+
+%Huygens formula \Huygens[R]{G}{A}{S} :
+\newcommand{\Huygens}[4][R]{\Inertia[#1]{#3}{#4}=\Inertia[#1]{#2}{#4}+ \Ip[#4]{#2}{#3}}
+
+%Standard inertia tensor explicit expression \InertiaE[R]{A}{S} :
+\newcommand{\InertiaE}[3][R]{\begin{Bmatrix}
+A_{#3} & -D_{#3} & -E_{#3} \\
+-D_{#3} & B_{#3} & -F_{#3} \\
+-E_{#3} & -F_{#3} & C_{#3}
+\end{Bmatrix}_{ (#3 / #1) }}
+
+%################################### C-Dynamics :
+
+%Acceleration vector definition \Acc[R]{A}{S} :
+\newcommand{\Acc}[3][R]{\Vct{\Gamma}_{#2\in #3/#1}}
+
+%Acceleration vector differential definition \Accd[R]{A}{S} :
+\newcommand{\Accd}[3][R]{\Dex[#1]{\Vel[#1]{#2}{#3}}}
+
+%Coriolis acceleration vector \Coriolis{R_0}{R_1}{A}{S} :
+\newcommand{\Coriolis}[4]{2\Rotation[#1]{#2}\times\Vel[#2]{#3}{#4}}
+
+%Transport acceleration vector \Entr{R_0}{R_1}{O}{A} :
+\newcommand{\Entr}[4]{\Acc[#1]{#3}{#2}+\Rotation[#1]{#2}\times(\Rotation[#1]{#2}\times \Vct{#3 #4})+\Dex[#1]{\Rotation[#1]{#2}}\times\Vct{#3 #4}}
+
+%Acceleration momentum vector definition \Am[R]{S} :
+\newcommand{\Am}[2][R]{\Vct{d}_{#2/#1}}
+
+%Acceleration momentum vector 2nd definition \Amg[R]{S} :
+\newcommand{\Amg}[2][R]{m_{#2}\Acc[#1]{G}{#2}}
+
+%Dynamic momentum integral def \IDelta[R]{A}{S}:
+\newcommand{\IDelta}[3][R]{\int_{M \in {#3}}\Vct{#2 M}\times \Acc[#1]{M}{#3} dm}
+
+%Dynamic momentum definition \ADelta[R]{A}{S} :
+\newcommand{\ADelta}[3][R]{\Vct{\delta}_{#2, #3/#1}}
+
+%Transport formula for dynamic momenta \VARD[R]{A}{B}{S} :
+\newcommand{\VARD}[4][R]{\ADelta[#1]{#3}{#4}=\ADelta[#1]{#2}{#4}+\Am[#1]{#4}\times\Vct{#2 #3}}
+
+%Alternate transport formula for dynamic momenta \AARD[R]{A}{B}{S} :
+\newcommand{\AVARD}[4][R]{\ADelta[#1]{#3}{#4}=\ADelta[#1]{#2}{#4}+\Amg[#1]{#4}\times\Vct{#2 #3}}
+
+%Dynamic momentum general expression \EDelta[R]{A}{S} :
+\newcommand{\EDelta}[3][R]{\Dex[#1]{\Lm[#1]{#2}{#3}}+m_{#3}\Vct{v}_{#2/#1}\times\Vct{v}_{G/#1}}
+
+%Dynamic momentum general expression for fixed point or center of gravity \FDelta[R]{G}{S} :
+\newcommand{\FDelta}[3][R]{\Dex[#1]{\Lm[#1]{#2}{#3}}}
+
+%################################### D-Screw field representation :
+
+%Kinematic screw field on a point \Ktor[R]{A}{S}:
+\newcommand{\Ktor}[3][R]{\begin{Bmatrix}
+\mathscr{V}_{({#3}/{#1})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+\Rotation[#3]{#1} \\
+\Vel[#1]{#2}{#3}
+\end{Bmatrix}_{#2}}
+
+%Explicit kinematic screw field for a support \EKtor[R]{A}{S} :
+\newcommand{\EKtor}[3][R]{\begin{Bmatrix}
+\mathscr{V}_{({#3}/{#1})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+\omega_{x,({#3}/{#1})} & v_{x,(#2\in #3/#1)} \\
+\omega_{y,({#3}/{#1})} & v_{y,(#2\in #3/#1)} \\
+\omega_{z,({#3}/{#1})} & v_{z,(#2\in #3/#1)}
+\end{Bmatrix}_{#2}}
+
+%Static screw field on a point \Stor[S]{Ext}{A}:
+\newcommand{\Stor}[3][S]{\begin{Bmatrix}
+\mathscr{T}_{({#2}\rightarrow{#1})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+\Force[#1]{#2} \\
+\Moment[#1]{#2}{#3}
+\end{Bmatrix}_{#3}}
+
+%Kinetic screw field on a point \Ctor[R]{A}{S}:
+\newcommand{\Ctor}[3][R]{\begin{Bmatrix}
+\mathscr{C}_{({#3}/{#1})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+\Psr[#3]{#1} \\
+\Lm[#1]{#2}{#3}
+\end{Bmatrix}_{#2}}
+
+%Dynamic screw field on a point \Dtor[R]{A}{S}:
+\newcommand{\Dtor}[3][R]{\begin{Bmatrix}
+\mathscr{D}_{({#3}/{#1})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+\Am[#3]{#1} \\
+\ADelta[#1]{#2}{#3}
+\end{Bmatrix}_{#2}}
+
+%Explicit static screw field for a support \Ltor{S_1}{S_2}{A} :
+\newcommand{\Ltor}[3]{\begin{Bmatrix}
+\mathscr{L}_{({#1}\rightarrow{#2})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+X_{({#1}\rightarrow{#2})} & L_{({#1}\rightarrow{#2})} \\
+Y_{({#1}\rightarrow{#2})} & M_{({#1}\rightarrow{#2})} \\
+Z_{({#1}\rightarrow{#2})} & N_{({#1}\rightarrow{#2})}
+\end{Bmatrix}_{#3}}
+
+%Explicit static screw field for a planar support \Lptor{S_1}{S_2}{A} :
+\newcommand{\Lptor}[3]{\begin{Bmatrix}
+\mathscr{L}_{({#1}\rightarrow{#2})}
+\end{Bmatrix}=
+\begin{Bmatrix}
+X_{({#1}\rightarrow{#2})} & 0 \\
+Y_{({#1}\rightarrow{#2})} & 0 \\
+0 & M_{({#1}\rightarrow{#2})}
+\end{Bmatrix}_{#3}}
+
+%Empty screw field template on a point \Ftor[S/R]{W}{A}{B}{O}:
+\newcommand{\Ftor}[5][Ref]{\begin{Bmatrix}
+\mathscr{#2}_{#1}
+\end{Bmatrix}=
+\begin{Bmatrix}
+{#3} \\
+{#4}
+\end{Bmatrix}_{#5}}
+
+%Empty explicit screw field template on a point \LFtor[S/R]{W}{X}{Y}{Z}{X}{Y}{Z}{0}:
+\newcommand{\LFtor}[9][Ref]{\begin{Bmatrix}
+\mathscr{#2}_{#1}
+\end{Bmatrix}=
+\begin{Bmatrix}
+{#3} & {#6} \\
+{#4} & {#7} \\
+{#5} & {#8}
+\end{Bmatrix}_{#9}}
+
+%################################### E-Energy and power :
+
+%Power delivered from ext to S \Pow[R]{S}{Ext} :
+\newcommand{\Pow}[3][R]{P_{(#3 \rightarrow #2/#1)}}
+
+%Power delivered from ext to S, screw expression \Ptor[R]{S}{Ext} :
+\newcommand{\Ptor}[3][R]{\begin{Bmatrix}
+\mathscr{T}_{({#3}\rightarrow{#2})}
+\end{Bmatrix} \otimes \begin{Bmatrix}
+\mathscr{V}_{({#2}/{#1})}
+\end{Bmatrix}}
+
+%Power delivered from ext to S, explicit expression \Power[R]{A}{S}{Ext} :
+\newcommand{\Power}[4][R]{\Force[#3]{#4}\cdot\Vel[#1]{#2}{#3} + \Gmoment{\Force[#3]{#4}}{#2}\cdot \Rotation[#1]{#3}}
+
+%Power delivered from ext to S, integral expression \IPow[R]{S}{f} :
+\newcommand{\IPow}[3][R]{\int_{M \in #2} \Vct{#3}(M)\cdot \Vel[#1]{M}{#2} dm}
+
+%Internal support power \LPow{S_1}{S_2} :
+\newcommand{\LPow}[2]{P_{(#1 \leftrightarrow #2)}}
+
+%Internal support power, screw definition \PLtor{S_1}{S_2} :
+\newcommand{\PLtor}[2]{\begin{Bmatrix}
+\mathscr{T}_{({#1}\rightarrow{#2})}
+\end{Bmatrix} \otimes \begin{Bmatrix}
+\mathscr{V}_{({#2}/{#1})}
+\end{Bmatrix}}
+
+%Kinetic energy, integral expression \KE[R]{S}:
+\newcommand{\KE}[2][R]{ \frac{1}{2}\int_{M \in #2} \Vel[#1]{M}{#2}^{2}dm }
+
+%Kinetic energy, screw expression \KEtor[R]{S}:
+\newcommand{\KEtor}[2][R]{\frac{1}{2} \begin{Bmatrix}
+\mathscr{C}_{(#2 / #1)}
+\end{Bmatrix} \otimes \begin{Bmatrix}
+\mathscr{V}_{(#2 / #1)}
+\end{Bmatrix}}
+
+%Kinetic energy, translation only \KineticT[R]{A}{S}:
+\newcommand{\KineticT}[3][R]{\frac{1}{2}m_{#3}\Vel[#1]{#2}{#3}^{2}}
+
+%Kinetic energy, rotation about center only \KineticR[R]{C}{S}:
+\newcommand{\KineticR}[3][R]{\frac{1}{2}\Rotation[#1]{#3} \cdot (\Inertia[#1]{#2}{#3} \cdot \Rotation[#1]{#3})}
+
+%Kinetic energy, general expression \Kinetic[R]{A}{S}:
+\newcommand{\Kinetic}[3][R]{\KineticT[#1]{#2}{#3} + \KineticR[#1]{#2}{#3} + m_{#3} \Rotation[#1]{#3} \cdot( \Vct{#2 G} \times \Vel[#1]{#2}{#3}) }
+
+%Kinetic energy written in G \KineticG[R]{S}:
+\newcommand{\KineticG}[2][R]{\KineticT[#1]{G}{#2} + \KineticR[#1]{G}{#2}}
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/mecaso/mecaso.tex b/macros/latex/contrib/mecaso/mecaso.tex
new file mode 100644
index 0000000000..def07cb8a9
--- /dev/null
+++ b/macros/latex/contrib/mecaso/mecaso.tex
@@ -0,0 +1,443 @@
+\documentclass[12pt]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[french]{babel}
+\usepackage{amsmath}
+\usepackage{amssymb}
+\usepackage{mathrsfs}
+\usepackage{mecaso}
+\usepackage{draftwatermark}
+
+
+
+\begin{document}
+\SetWatermarkText{\textsc{Y.\textsc{Derrazi}}}
+\SetWatermarkLightness{0.8}
+\SetWatermarkScale{4}
+
+\title{- mecaso -\\Package pour les formules en mécanique du solide}
+\author{Youssef \textsc{Derrazi}}
+\maketitle
+
+\pagenumbering{roman}
+\tableofcontents
+\newpage
+\pagenumbering{arabic}
+
+\section{Introduction}
+Ce package a été crée par moi-même, ingénieur génie civil et (à ce moment) candidat à l'agrégation externe de mécanique. Ce package regroupe un certain nombre de routines indispensables pour faciliter l'écriture de quelques expressions assez fastidieuses en mécanique du solide indéformable.
+\vspace{12pt}
+
+Prenant conscience que ce package est loin d'être complet, il est toujours conseillé d'utiliser \verb|renewcommand| dans un fichier \verb|*.sty| externe en attendant les mises à jour.
+\vspace{12pt}
+
+Pour toute remarque ou question, prière de prendre contact à l'adresse mail suivante : \verb|derrazi.youssef.97@gmail.com|.
+\vspace{12pt}
+
+Ce package est déployé sous la license GNU General Public License V3.0.
+
+\subsection{Différences notables}
+Le package suivant fait hérésie sur certains points par rapport au programme en vigueur aux universités françaises/marocaines :
+
+\begin{itemize}
+\item Le produit vectoriel est noté par une croix $\times$ au lieu d'un chapeau $\wedge$;
+\item Le moment cinétique est noté $L$ au lieu de $\sigma$;
+\item La résultante dynamique a un nom : $d$;
+\item Le vecteur vitesse de rotation est représenté par $\omega$;
+\item Les moments de forces sont en $M$ script.
+\end{itemize}
+
+\section{Mise en place du package}
+
+Le package est appelé par la commande : \verb|\usepackage{mecaso}|, il nécessite néanmoins les packages suivants : \verb|amsmath|, \verb|amssymb| et \verb|mathrsfs|.
+
+\newpage
+
+\section{Opérations mathématiques générales}
+
+\subsection{Définition d'un vecteur}
+La commande \verb| \Vct{} | prend comme entrée toute expression fournie par l'utilisateur et y accroche une flèche. Dans l'exemple qui suit, la ligne \verb| \Vct{OM} | donne : $$ \Vct{OM} $$
+
+\subsection{Dérivée temporelle par rapport à un repère}
+Il existe dans ce package deux commandes permettant d'écrire la dérivée d'une fonction par rapport au temps et par rapport à un repère $R$.
+
+\subsubsection{Dérivée temporelle avec expression en nominateur}
+La commande \verb| \Din{} | prend comme entrée toute expression fournie par l'utilisateur et la met en nominateur de l'opérateur dérivation par rapport à un repère arbitraire $R$. Dans l'exemple qui suit, la ligne \verb| \Din{f(t)} | donne : $$ \Din{f(t)} $$
+
+La commande \verb| \Din[]{} | permet d'affecter un repère différent dans la case entre crochets comme elle peut servir de case d'évaluation. Dans l'exemple qui suit, la ligne \verb| \Din[t=t_0]{f(t)} | donne : $$ \Din[t=t_0]{f(t)} $$
+
+Ces mêmes commandes peuvent être utilisées avec les vecteurs moyennant l'imbrication suivante \verb| \Din{\Vct{}} | ou bien \verb| \Din[]{\Vct{}} |. Dans l'exemple qui suit, la ligne \verb| \Din[R_G]{\Vct{B}} | donne : $$ \Din[R_G]{\Vct{B}} $$
+
+\subsubsection{Dérivée temporelle avec expression à la ligne}
+Pour les longues expressions, la commande \verb| \Dex{} | prend comme entrée toute expression fournie par l'utilisateur et la met à la ligne de l'opérateur dérivation par rapport à un repère arbitraire $R$. Dans l'exemple qui suit, la ligne \verb| \Dex{f(t)} | donne : $$ \Dex{f(t)} $$
+
+La commande \verb| \Dex[]{} | permet d'affecter un repère différent dans la case entre crochets comme elle peut servir de case d'évaluation. Dans l'exemple qui suit, la ligne \verb| \Dex[t=t_0]{f(t)} | donne : $$ \Dex[t=t_0]{f(t)} $$
+
+Ces mêmes commandes peuvent être utilisées avec les vecteurs moyennant l'imbrication suivante \verb| \Dex{\Vct{}} | ou bien \verb| \Dex[]{\Vct{}} |. Dans l'exemple qui suit, la ligne \verb| \Dex[R_G]{\Vct{B}} | donne : $$ \Dex[R_G]{\Vct{B}} $$
+
+\newpage
+
+\section{Cinématique}
+
+\subsection{Vecteur vitesse de rotation}
+La commande \verb| \Rotation{} | écrit le vecteur vitesse de rotation par rapport à un repère arbitraire $R$, elle prend en entrée le nom du solide. Dans l'exemple qui suit, \verb| \Rotation{E} | donne : $$\Rotation{E}$$
+
+La commande \verb| \Rotation[]{} | écrit le vecteur vitesse de rotation par rapport à un repère précisé entre crochets. Dans l'exemple qui suit, la commande \verb| \Rotation[0]{1} | donne : $$\Rotation[0]{1}$$
+
+\subsection{Vecteur vitesse d'un point lié à un solide}
+La commande \verb| \Vel{}{} | écrit le vecteur vitesse d'un point lié à un solide dans son mouvement par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \Vel{M}{S} | donne : $$\Vel{M}{S}$$
+
+La commande \verb| \Vel[]{}{} | permet la modification du repère d'évaluation. Elle prend \textbf{dans l'ordre} le repère entre crochets, puis le point d'évaluation puis le solide. Dans l'exemple qui suit, \verb| \Vel[R_g]{A}{S} | donne : $$\Vel[R_g]{A}{S}$$
+
+\subsection{Transport d'un vecteur vitesse : formule de Varignon}
+La commande \verb| \VARK{}{}{} | écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} le point déjà connu, puis le point que l'on désire évaluer puis le solide concerné. Dans l'exemple qui suit, \verb| \VARK{A}{B}{S} | donne : $$\VARK{A}{B}{S}$$
+
+Pour préciser un repère quelconque, la commande \verb| \VARK[]{}{}{} | pourra être utilisée. Dans l'exemple qui suit, \verb| \VARK[R_0]{M}{G}{S} | donne : $$\VARK[R_0]{M}{G}{S}$$
+
+\subsection{Vecteur accélération d'un point lié à un solide}
+La commande \verb| \Acc{}{} | écrit le vecteur accélération d'un point lié à un solide dans son mouvement par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \Acc{M}{S} | donne : $$\Acc{M}{S}$$
+
+La commande \verb| \Acc[]{}{} | permet la modification du repère d'évaluation. Elle prend \textbf{dans l'ordre} le repère entre crochets, puis le point d'évaluation puis le solide. Dans l'exemple qui suit, \verb| \Acc[R_g]{M}{S} | donne : $$\Acc[R_g]{M}{S}$$
+
+\subsection{Accélération d'entrainement}
+La commande \verb| \Entr{}{}{}{} | écrit le vecteur accélération d'entraintement d'un point lié à un solide par rapport à deux repères. Elle prend \textbf{dans l'ordre} le repère de base, le repère de composition, le point d'origine puis le point de calcul. Dans l'exemple qui suit, \verb| \Entr{0}{1}{O}{M} | donne : $$\Entr{0}{1}{O}{M}$$
+
+\subsection{Accélération de Coriolis}
+La commande \verb| \Coriolis{}{}{}{} | écrit le vecteur accélération de \textsc{Coriolis} d'un point lié à un solide. Elle prend \textbf{dans l'ordre} le repère de base, le repère de passage, le point de calcul puis le solide. Dans l'exemple qui suit, \verb| \Coriolis{0}{1}{M}{2} | donne : $$\Coriolis{0}{1}{M}{2}$$
+
+\newpage
+
+\section{Statique}
+
+\subsection{Vecteur force}
+La commande \verb| \Force{} | permet d'écrire le vecteur force appliqué par un élément quelconque sur un solide de référence $S$. Dans l'exemple qui suit, la commande \verb| \Force{E_1} | donne : $$\Force{E_1}$$
+
+La commande \verb| \Force[]{} | permet d'écrire le vecteur force appliqué par un élément sur un solide que l'on précise entre crochets. Dans l'exemple qui suit, la commande \verb| \Force[D]{E_1} | donne : $$\Force[D]{E_1}$$
+
+\subsection{Vecteur moment de force}
+
+\subsubsection{Vecteur moment de force en un point, sans préciser la force}
+La commande \verb| \Moment{}{} | permet d'écrire le vecteur moment de force en précisant \textbf{dans l'ordre} l'élément qui applique la force puis le point de calcul. Dans l'exemple qui suit, la commande \verb| \Moment{Ext}{O} | donne : $$\Moment{Ext}{O}$$
+
+La commande \verb| \Moment[]{}{} | permet d'écrire le vecteur moment de force en précisant d'abord le nom du solide en jeu, puis \textbf{dans l'ordre} l'élément qui applique la force puis le point de calcul. Dans l'exemple qui suit, la commande \verb| \Moment[I]{II}{G} | donne : $$\Moment[I]{II}{G}$$
+
+\subsubsection{Vecteur moment de force en un point, en explicitant la force}
+Si l'expression de la force en jeu n'est pas standard,\verb| \Gmoment{}{} | permet d'écrire le vecteur moment de force en précisant \textbf{dans l'ordre} l'expression de la force puis le point de calcul. Dans l'exemple qui suit, la commande \verb| \Gmoment{\Vct{W}}{A} | donne : $$\Gmoment{\Vct{W}}{A}$$
+
+L'expression de la force peut être quelconque, par exemple si la force s'écrit $\Vct{P}_{eau \rightarrow S}$, on peut l'injecter dans la commande pour obtenir : $$\Gmoment{\Vct{P}_{eau \rightarrow S}}{O}$$
+
+\subsection{Résultante d'une force volumique}
+
+Le package fournit deux expressions pour l'évalutation d'une résultante sur un volume : un expression avec élément de masse $dm$ et une expression avec élément de volume $dV$.
+
+\subsubsection{Résultante d'une force volumique sur une mesure de masse}
+
+La commande \verb| \Vnet{}{} | prend \textbf{dans l'ordre} l'expression de la distribution de force massique puis le milieu appliquant celle-ci pour donner l'expression de l'intégrale sur la masse d'un solide $S$ arbitraire. Dans l'exemple qui suit, la commande \verb| \Vnet{f}{ext} | donne : $$\Vnet{f}{ext}$$
+
+La commande \verb| \Vnet[]{}{} | permet d'expliciter le nom du solide au début. Dans l'exemple qui suit, la commande \verb| \Vnet[V]{f}{ext} | donne : $$\Vnet[V]{f}{ext}$$
+
+\subsubsection{Résultante d'une force volumique sur une mesure de volume}
+
+La commande \verb| \VVnet{}{} | prend \textbf{dans l'ordre} l'expression de la distribution de force puis le milieu appliquant celle-ci pour donner l'expression de l'intégrale sur la masse d'un solide $S$ arbitraire. Dans l'exemple qui suit, la commande \verb| \VVnet{q}{ext} | donne : $$\VVnet{q}{ext}$$
+
+La commande \verb| \VVnet[]{}{} | permet d'expliciter le nom du solide au début. Dans l'exemple qui suit, la commande \verb| \VVnet[II]{q}{I} | donne : $$\VVnet[II]{q}{I}$$
+
+\subsection{Résultante d'une pression}
+
+Le package fournit deux expressions pour l'évalutation d'une résultante sur une surface : un expression sans précision du vecteur normal et une expression avec précision de celui-ci.
+
+\subsubsection{Résultante d'une force surfacique générale}
+
+La commande \verb| \Snet{}{} | prend \textbf{dans l'ordre} l'expression de la distribution de la pression puis le milieu appliquant celle-ci pour donner l'expression de l'intégrale sur une surface $\partial S$ d'un solide $S$ arbitraire. Dans l'exemple qui suit, la commande \verb| \Snet{T}{A} | donne : $$\Snet{T}{A}$$
+
+La commande \verb| \Snet[]{}{} | permet d'expliciter le nom du solide au début. Dans l'exemple qui suit, la commande \verb| \Snet[E]{\sigma}{A} | donne : $$\Snet[E]{\sigma}{A}$$
+
+\subsubsection{Résultante d'une force surfacique avec précision du vecteur normal}
+
+La commande \verb| \SSnet{}{}{} | prend \textbf{dans l'ordre} l'expression de la distribution de la pression puis le milieu appliquant celle-ci \textbf{puis} l'expression du vecteur normal pour donner l'expression de l'intégrale sur une surface $\partial S$ d'un solide $S$ arbitraire. Dans l'exemple qui suit, la commande \verb| \SSnet{T}{A}{n} | donne : $$\SSnet{T}{A}{n}$$
+
+La commande \verb| \SSnet[]{}{}{} | permet d'expliciter le nom du solide au début. Dans l'exemple qui suit, la commande \verb| \SSnet[B]{p}{A}{n} | donne : $$\SSnet[B]{p}{A}{n}$$
+
+\subsection{Transport d'un vecteur moment : formule de Varignon}
+
+\subsubsection{Transport d'un vecteur moment sans expliciter la force}
+
+La commande \verb| \VARS{}{}{} | écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} le point déjà connu, puis le point que l'on désire évaluer puis l'élément appliquant la force sur un solide $S$ arbitraire. Dans l'exemple qui suit, \verb| \VARS{A}{B}{ext} | donne : $$\VARS{A}{B}{ext}$$
+
+Pour préciser le solide en jeu, la commande \verb| \VARS[]{}{}{} | pourra être utilisée. Dans l'exemple qui suit, \verb| \VARS[S]{M}{C}{ext} | donne : $$\VARS[S]{M}{S}{ext}$$
+
+\subsubsection{Transport d'un vecteur moment avec précision de la force}
+
+La commande \verb| \GVARS{}{}{} | fonctionne comme la commande \verb| \Gmoment | et écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} l'expression de la force, puis le point déjà connu, puis le point où l'on désire évaluer. Dans l'exemple qui suit, \verb| \GVARS{\Vct{W}}{A}{B} | donne : $$ \GVARS{\Vct{W}}{A}{B}$$
+
+\newpage
+
+\section{Cinétique}
+
+\subsection{Vecteur quantité de mouvement}
+
+Le package propose deux expressions de la quantité de mouvement selon l'usage de l'utilisateur; une expression directe puis une expression qui continent la masse du solide ainsi que la vitesse de son centre de gravité.
+
+\subsubsection{Vecteur quantité de mouvement, expression directe}
+
+La commande \verb| \Psr{} | prend comme entrée le nom du solide et écrit le vecteur quantité de mouvement par rapport à un repère arbitraire $R$. La commande \verb| \Psr{E} | donne : $$\Psr{E}$$
+
+La commande \verb| \Psr[]{} | permet de préciser le nom du repère en jeu. La commande \verb| \Psr[R_0]{S} | donne : $$\Psr[R_0]{S}$$
+
+\subsubsection{Vecteur quantité de mouvement, expression alternative}
+
+La commande \verb| \Mv{} | prend comme entrée le nom du solide et écrit le vecteur quantité de mouvement par rapport à un repère arbitraire $R$. La commande \verb| \Mv{E} | donne : $$\Mv{E}$$
+
+La commande \verb| \Mv[]{} | permet de préciser le nom du repère en jeu. La commande \verb| \Mv[R_0]{S} | donne : $$\Mv[R_0]{S}$$
+
+\subsubsection{Remarque sur l'expression intégrale}
+
+L'expression intégrale de la quantité de mouvement peut être obtenue en utilisant la commande \verb|\int_{M\in S}\Vel[R]{M}{S}dm| : $$\Psr{S}=\int_{M\in S}\Vel{M}{S}dm$$
+
+\subsection{Tenseur d'inertie}
+
+\subsubsection{Expression du tenseur d'inertie}
+
+La commande \verb|\Inertia{}{}| permet d'écrire l'expression de la matrice d'inertie en précisant \textbf{dans l'ordre} le point de calcul puis le solide en jeu. La commande \verb|\Inertia{O}{S}| donne : $$\Inertia{O}{S}$$
+
+La commande \verb|\Inertia[]{}{}| permet en plus de préciser le repère de référence. La commande \verb|\Inertia[R_0]{A}{E}| donne : $$\Inertia[R_0]{A}{E}$$
+
+\subsubsection{Expression matricielle du tenseur d'inertie}
+
+La commande \verb|\InertiaE{}{}| permet d'écrire l'expression matricielle de la matrice d'inertie en précisant \textbf{dans l'ordre} le point de calcul puis le solide en jeu. La commande \verb|\InertiaE{O}{S}| donne : $$\InertiaE{O}{S}$$
+
+La commande \verb|\InertiaE[]{}{}| permet en plus de préciser le repère de référence. La commande \verb|\InertiaE[R_0]{A}{E}| donne : $$\InertiaE[R_0]{A}{E}$$
+
+\subsubsection{Matrice de transfert}
+
+La commande \verb|\Ip{}{}| permet d'écrire l'expression de la matrice de tranfert d'un point à un autre, elle prend comme entrées \textbf{dans l'ordre} le point où la matrice est déjà exprimée puis le point vers lequel on désire transférer. Dans l'exemple qui suit, la commande \verb|\Ip{G}{A}| donne : $$\Ip{G}{A}$$
+
+Pour préciser le solide en jeu, on utilise la commande \verb|\Ip[]{}{}| en explicitant le nom du solide au début. Dans l'exemple qui suit, la commande \verb|\Ip[E]{B}{A}| donne : $$\Ip[E]{B}{A}$$
+
+\subsubsection{Theorème d'Huygens}
+
+La commande \verb|\Huygens{}{}{}| écrit le théorème d'\textsc{Huygens} entre deux points. Elle prend comme entrées \textbf{dans l'ordre} le point de départ, le point d'arrivée et le nom du solide. Dans l'exemple qui suit, la commande \verb|\Huygens{G}{A}{S}| donne : $$\Huygens{G}{A}{S}$$
+
+Pour préciser le repère en jeu, on utilise la commande \verb|\Huygens[]{}{}{}| en explicitant le nom du repère au début. Dans l'exemple qui suit, la commande \verb|\Huygens[R_0]{B}{A}{S}| donne : $$\Huygens[R_0]{B}{A}{S}$$
+
+\subsection{Moment cinétique}
+Nous précisons ici toutes les commandes relatives au moment cinétique présentes dans ce package, elle vont de la définition par intégrale jusqu'à la formule explicite en utilisant la matrice d'inertie.
+\vspace{12pt}
+
+La commande \verb| \Lm{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \Lm{O}{S} | donne : $$\Lm{O}{S}$$
+
+La commande \verb| \Lm[]{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \Lm[R_g]{A}{S} | donne : $$\Lm[R_g]{A}{S}$$
+
+\subsubsection{Moment cinétique, définition par intégrale}
+La commande \verb| \Lmi{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \Lmi{O}{S} | donne : $$\Lmi{O}{S}$$
+
+La commande \verb| \Lmi[]{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \Lmi[R_g]{A}{S} | donne : $$\Lmi[R_g]{A}{S}$$
+
+\subsubsection{Moment cinétique, expression complète}
+La commande \verb| \LA{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \LA{O}{S} | donne : $$\LA{O}{S}$$
+
+La commande \verb| \LA[]{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \LA[R_g]{A}{S} | donne : $$\LA[R_g]{A}{S}$$
+
+\subsubsection{Moment cinétique, cas d'un point fixe ou du centre de gravité}
+La commande \verb| \LF{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \LF{O}{S} | donne : $$\LF{O}{S}$$
+
+La commande \verb| \LF[]{}{} | écrit le vecteur moment cinétique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \LF[R_g]{G}{S} | donne : $$\LF[R_g]{G}{S}$$
+
+\subsection{Transport du moment cinétique : formule de Varignon}
+
+\subsubsection{Transport du moment cinétique : première formule}
+La commande \verb| \VARC{}{}{} | écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} le point déjà connu, puis le point que l'on désire évaluer puis le solide concerné. Dans l'exemple qui suit, \verb| \VARC{A}{B}{S} | donne : $$\VARC{A}{B}{S}$$
+
+Pour préciser un repère quelconque, la commande \verb| \VARC[]{}{}{} | pourra être utilisée. Dans l'exemple qui suit, \verb| \VARC[R_0]{M}{G}{S} | donne : $$\VARC[R_0]{M}{G}{S}$$
+
+\subsubsection{Transport du moment cinétique : deuxième formule}
+Pour expliciter la quantité de mouvement, la commande \verb| \AVARC{}{}{} | écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} le point déjà connu, puis le point que l'on désire évaluer puis le solide concerné. Dans l'exemple qui suit, \verb| \AVARC{A}{B}{S} | donne : $$\AVARC{A}{B}{S}$$
+
+Pour préciser un repère quelconque, la commande \verb| \AVARC[]{}{}{} | pourra être utilisée. Dans l'exemple qui suit, \verb| \AVARC[R_0]{M}{G}{S} | donne : $$\AVARC[R_0]{M}{G}{S}$$
+
+\newpage
+
+\section{Dynamique}
+
+\subsection{Vecteur quantité d'accélération}
+
+Le package propose deux expressions de la quantité d'accélération selon l'usage de l'utilisateur; une expression directe puis une expression qui continent la masse du solide ainsi que l'accélération de son centre de gravité.
+
+\subsubsection{Vecteur quantité d'accélération, expression directe}
+
+La commande \verb| \Am{} | prend comme entrée le nom du solide et écrit le vecteur quantité de mouvement par rapport à un repère arbitraire $R$. La commande \verb| \Am{E} | donne : $$\Am{E}$$
+
+La commande \verb| \Am[]{} | permet de préciser le nom du repère en jeu. La commande \verb| \Am[R_0]{S} | donne : $$\Am[R_0]{S}$$
+
+\subsubsection{Vecteur quantité d'accélération, expression alternative}
+
+La commande \verb| \Amg{} | prend comme entrée le nom du solide et écrit le vecteur quantité de mouvement par rapport à un repère arbitraire $R$. La commande \verb| \Amg{E} | donne : $$\Amg{E}$$
+
+La commande \verb| \Amg[]{} | permet de préciser le nom du repère en jeu. La commande \verb| \Amg[R_0]{S} | donne : $$\Amg[R_0]{S}$$
+
+\subsubsection{Remarque sur l'expression intégrale}
+
+L'expression intégrale de la quantité d'accélération peut être obtenue en utilisant la commande \verb|\int_{M\in S}\Acc[R]{M}{S}dm| : $$\Am{S}=\int_{M\in S}\Acc{M}{S}dm$$
+
+\subsection{Moment dynamique}
+Nous précisons ici toutes les commandes relatives au moment dynamique présentes dans ce package, elle vont de la définition par intégrale jusqu'à la formule explicite en utilisant le moment cinétique.
+\vspace{12pt}
+
+La commande \verb| \ADelta{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \ADelta{O}{S} | donne : $$\ADelta{O}{S}$$
+
+La commande \verb| \ADelta[]{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \ADelta[R_g]{A}{S} | donne : $$\ADelta[R_g]{A}{S}$$
+
+\subsubsection{Moment dynamique, définition par intégrale}
+La commande \verb| \IDelta{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \IDelta{O}{S} | donne : $$\IDelta{O}{S}$$
+
+La commande \verb| \IDelta[]{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \IDelta[R_g]{A}{S} | donne : $$\IDelta[R_g]{A}{S}$$
+
+\subsubsection{Moment dynamique, expression complète}
+La commande \verb| \EDelta{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \EDelta{O}{S} | donne : $$\EDelta{O}{S}$$
+
+La commande \verb| \EDelta[]{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \EDelta[R_g]{A}{S} | donne : $$\EDelta[R_g]{A}{S}$$
+
+\subsubsection{Moment dynamique, cas d'un point fixe ou du centre de gravité}
+La commande \verb| \FDelta{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère arbitraire. Elle prend \textbf{dans l'ordre} le point d'évaluation, puis le solide. Dans l'exemple qui suit, \verb| \FDelta{O}{S} | donne : $$\FDelta{O}{S}$$
+
+La commande \verb| \FDelta[]{}{} | écrit le vecteur moment dynamique d'un solide dans par rapport à un repère précisé au début. Elle prend \textbf{dans l'ordre} le repère, le point d'évaluation puis le solide. Dans l'exemple qui suit, la commande \verb| \FDelta[R_g]{A}{S} | donne : $$\FDelta[R_g]{A}{S}$$
+
+\subsection{Transport du moment dynamique : formule de Varignon}
+
+\subsubsection{Transport du moment dynamique : première formule}
+La commande \verb| \VARD{}{}{} | écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} le point déjà connu, puis le point que l'on désire évaluer puis le solide concerné. Dans l'exemple qui suit, \verb| \VARD{A}{B}{S} | donne : $$\VARD{A}{B}{S}$$
+
+Pour préciser un repère quelconque, la commande \verb| \VARD[]{}{}{} | pourra être utilisée. Dans l'exemple qui suit, \verb| \VARD[R_0]{M}{G}{S} | donne : $$\VARD[R_0]{M}{G}{S}$$
+
+\subsubsection{Transport du moment dynamique : deuxième formule}
+La commande \verb| \AVARD{}{}{} | écrit directement la formule de \textsc{Varignon} entre deux points $A$ et $B$ sur un repère arbitraire $R$. Elle prend comme entrées \textbf{dans l'ordre} le point déjà connu, puis le point que l'on désire évaluer puis le solide concerné. Dans l'exemple qui suit, \verb| \AVARD{A}{B}{S} | donne : $$\AVARD{A}{B}{S}$$
+
+Pour préciser un repère quelconque, la commande \verb| \AVARD[]{}{}{} | pourra être utilisée. Dans l'exemple qui suit, \verb| \AVARD[R_0]{M}{G}{S} | donne : $$\AVARD[R_0]{M}{G}{S}$$
+
+\newpage
+
+\section{Energétique et puissance}
+
+\subsection{Puissance délivrée}
+La commande \verb| \Pow{}{} | permet d'exprimer la puissance délivrée par un solide sur un solide par rapport à un repère arbitraire $R$. Elle prend \textbf{dans l'ordre} le solide concerné, puis le milieu délivrant la puissance. Dans l'exemple qui suit, \verb| \Pow{S}{\overline{S}} | donne : $$\Pow{S}{\overline{S}}$$
+
+La commande \verb| \Pow[]{}{} | permet, en plus, de tenir compte d'un repère choisi. Elle prend \textbf{dans l'ordre} le repère de calcul, le solide concerné, puis le milieu délivrant la puissance. Dans l'exemple qui suit, cette commande \verb| \Pow[R_0]{S}{\overline{S}} | donne : $$\Pow[R_0]{S}{\overline{S}}$$
+
+\subsubsection{Puisance délivrée : expression torsorielle implicite}
+La commande \verb| \Ptor{}{} | permet d'exprimer la puissance délivrée par un solide sur un solide par rapport à un repère arbitraire $R$ sous forme de co-moment du torseur cinématique avec le torseur d'action mécanique. Elle prend \textbf{dans l'ordre} le solide concerné, puis le milieu délivrant la puissance. Dans l'exemple qui suit, \verb| \Ptor{S}{\overline{S}} | donne : $$\Ptor{S}{\overline{S}}$$
+
+La commande \verb| \Ptor[]{}{} | permet, en plus, de tenir compte d'un repère choisi. Elle prend \textbf{dans l'ordre} le repère de calcul, le solide concerné, puis le milieu délivrant la puissance. Dans l'exemple qui suit, cette commande \verb| \Ptor[R_0]{S}{\overline{S}} | donne : $$\Ptor[R_0]{S}{\overline{S}}$$
+
+\subsubsection{Puisance délivrée : expression torsorielle explicite}
+La commande \verb| \Power{}{}{} | permet d'exprimer la puissance délivrée par un solide sur un solide par rapport à un repère arbitraire $R$ en évaluant en un point le co-moment du torseur cinématique avec le torseur d'action mécanique. Elle prend \textbf{dans l'ordre} le point d'évaluation, le solide concerné, puis le milieu délivrant la puissance. Dans l'exemple qui suit, la commande \verb| \Power{M}{S}{\overline{S}} | donne : $$\Power{M}{S}{\overline{S}}$$
+
+La commande \verb| \Power[]{}{}{} | permet, en plus, de tenir compte d'un repère choisi. Elle prend \textbf{dans l'ordre} le repère de calcul, le solide concerné, puis le milieu délivrant la puissance. Dans l'exemple qui suit, cette commande \verb| \Power[R_0]{M}{S}{\overline{S}} | donne : $$\Power[R_0]{M}{S}{\overline{S}}$$
+
+\subsubsection{Puissance délivrée par un champ de force massique}
+La commande \verb| \IPow{}{} | permet d'exprimer la puissance délivrée par un champ de force massique sur un solide par rapport à un repère arbitraire $R$. Elle prend \textbf{dans l'ordre} le solide concerné, puis l'expression du champ de force. Dans l'exemple qui suit, \verb| \IPow{S}{\Vct{f}} | donne : $$\IPow{S}{f}$$
+
+La commande \verb| \IPow[]{}{}{} | permet, en plus, de tenir compte d'un repère choisi. Elle prend \textbf{dans l'ordre} le repère de calcul, le solide concerné, puis l'expression du champ de force. Dans l'exemple qui suit, cette commande \verb| \IPow[R_0]{S}{T} | donne : $$\IPow[R_0]{S}{T}$$
+
+\subsection{Puissance de liaison}
+La commande \verb| \LPow{}{} | permet d'exprimer la puissance de liaison entre deux solides. Elle prend \textbf{dans l'ordre} le premier puis le deuxième solide. Dans l'exemple qui suit, \verb| \LPow{I}{II} | donne : $$\LPow{I}{II}$$
+
+\subsubsection{Puisance de liaison : expression torsorielle implicite}
+La commande \verb| \PLtor{}{} | permet d'exprimer la puissance de liaison entre deux solides sous forme d'écriture torsorielle. Elle prend \textbf{dans l'ordre} le premier puis le deuxième solide. Dans l'exemple qui suit, \verb| \PLtor{I}{II} | donne : $$\PLtor{I}{II}$$
+
+\subsection{Energie cinétique d'un solide}
+La commande \verb| \KE{} | permet d'exprimer sous forme intégrale l'énergie cinétique d'un solide par rapport à un repère arbitraire $R$. Elle prend comme paramètre le nom du solide. Dans l'exemple qui suit, \verb| \KE{D} | donne : $$\KE{D}$$
+
+La commande \verb| \KE[]{} | permet d'exprimer sous forme intégrale l'énergie cinétique d'un solide par rapport à un repère déterminé. Elle prend comme paramètre le nom du solide précédé du nom du repère. Dans l'exemple qui suit, \verb| \KE[0]{1} | donne : $$\KE[0]{1}$$
+\textbf{N.B. :} Il n'existe pas de commande directe pour écrire $T_{S/R}$ : \verb|T_{S/R}|
+
+\subsubsection{Energie cinétique : expression torsorielle implicite}
+La commande \verb| \KEtor{} | permet d'exprimer sous forme torsorielle l'énergie cinétique d'un solide par rapport à un repère arbitraire $R$. Elle prend comme paramètre le nom du solide. Dans l'exemple qui suit, \verb| \KEtor{D} | donne : $$\KEtor{D}$$
+
+La commande \verb| \KEtor[]{} | permet d'exprimer sous forme torsorielle l'énergie cinétique d'un solide par rapport à un repère déterminé. Elle prend comme paramètre le nom du solide précédé du nom du repère. Dans l'exemple qui suit, \verb| \KEtor[0]{1} | donne : $$\KEtor[0]{1}$$
+
+\subsubsection{Energie cinétique : mouvement de translation seule}
+La commande \verb| \KineticT{}{} | permet d'exprimer sous forme explicite l'énergie cinétique d'un solide en translation par rapport à un repère arbitraire $R$. Elle prend comme paramètre le point d'évaluation puis le nom du solide. Dans l'exemple qui suit, \verb| \KineticT{A}{S} | donne : $$\KineticT{A}{S}$$
+
+La commande \verb| \KineticT[]{}{} | permet de tenir compte du repère choisi. Elle prend comme paramètre le le point d'évaluation puis le nom du solide précédé du nom du repère. Dans l'exemple qui suit, la commande \verb| \KineticT[R_g]{A}{S} | donne : $$\KineticT[R_g]{A}{S}$$
+
+\subsubsection{Energie cinétique : mouvement de rotation seule}
+La commande \verb| \KineticR{}{} | permet d'exprimer sous forme explicite l'énergie cinétique d'un solide en rotation par rapport à un repère arbitraire $R$. Elle prend comme paramètre le point d'évaluation puis le nom du solide. Dans l'exemple qui suit, \verb| \KineticR{A}{S} | donne : $$\KineticR{A}{S}$$
+
+La commande \verb| \KineticR[]{}{} | permet de tenir compte du repère choisi. Elle prend comme paramètre le le point d'évaluation puis le nom du solide précédé du nom du repère. Dans l'exemple qui suit, la commande \verb| \KineticR[R_g]{A}{S} | donne : $$\KineticR[R_g]{A}{S}$$
+
+\subsubsection{Energie cinétique : expression générale}
+La commande \verb| \Kinetic{}{} | permet d'exprimer sous forme explicite l'énergie cinétique d'un solide par rapport à un repère arbitraire $R$. Elle prend comme paramètre le point d'évaluation puis le nom du solide. Dans l'exemple qui suit, \verb| \Kinetic{A}{S} | donne : $$\Kinetic{A}{S}$$
+
+La commande \verb| \Kinetic[]{}{} | permet de tenir compte du repère choisi. Elle prend comme paramètre le le point d'évaluation puis le nom du solide précédé du nom du repère. Dans l'exemple qui suit, la commande suivante \verb| \Kinetic[R_g]{A}{S} | donne : $$\Kinetic[R_g]{A}{S}$$
+
+\subsubsection{Energie cinétique : cas du centre de gravité}
+La commande \verb| \KineticG{} | permet d'exprimer sous forme explicite l'énergie cinétique d'un solide par rapport à un repère arbitraire $R$ exprimée au centre de gravité de celui-ci. Elle prend comme paramètre le nom du solide. Dans l'exemple qui suit, \verb| \KineticG{S} | donne : $$\KineticG{S}$$
+
+La commande \verb| \KineticG[]{} | permet de tenir compte du repère choisi. Elle prend comme paramètre le le point d'évaluation puis le nom du solide précédé du nom du repère. Dans l'exemple qui suit, la commande suivante \verb| \KineticG[R_g]{S} | donne : $$\KineticG[R_g]{S}$$
+
+\newpage
+
+\section{Torseurs}
+
+\subsection{Torseur cinématique}
+La commande \verb|\Ktor[]{}{}| permet d'exprimer le torseur cinématique en un point du solide. Elle prend comme entrées le nom du repère (facultative), le point d'évaluation et le nom du solide. La commande \verb|\Ktor[R]{G}{S}| donne : $$\Ktor[R]{G}{S}$$
+
+La commande \verb|\EKtor[]{}{}| permet d'exprimer explicitement le torseur cinématique en un point du solide. Elle prend comme entrées le nom du repère (facultative), le point d'évaluation et le nom du solide. La commande \verb|\EKtor[R]{G}{S}| donne : $$\EKtor[R]{G}{S}$$
+
+\subsection{Torseur d'action mécanique}
+La commande \verb|\Stor[]{}{}| permet d'exprimer le torseur statique en un point du solide. Elle prend comme entrées le nom du solide (facultative), le milieu exerçant l'action et le point de calcul. La commande \verb|\Stor[S]{ext}{A}| donne : $$\Stor[S]{ext}{A}$$
+
+La commande \verb|\Ltor{}{}{}| permet d'exprimer le torseur statique d'une liaison entre deux solides. Elle prend comme entrées les noms des solides puis le point de calcul. La commande \verb|\Ltor{I}{II}{O}| donne : $$\Ltor{I}{II}{O}$$
+
+La commande \verb|\Lptor{}{}{}| permet d'exprimer le torseur statique d'une liaison entre deux solides en mouvemnent plan. Elle prend comme entrées les noms des solides puis le point de calcul. La commande \verb|\Lptor{I}{II}{O}| donne : $$\Lptor{I}{II}{O}$$
+
+\subsection{Torseur cinétique}
+La commande \verb|\Ctor[]{}{}| permet d'exprimer le torseur cinétique en un point du solide. Elle prend comme entrées le nom du repère (facultative), le point d'évaluation et le nom du solide. La commande \verb|\Ctor[R]{A}{S}| donne : $$\Ctor[R]{A}{S}$$
+
+\subsection{Torseur dynamique}
+La commande \verb|\Dtor[]{}{}| permet d'exprimer le torseur dynamique en un point du solide. Elle prend comme entrées le nom du repère (facultative), le point d'évaluation et le nom du solide. La commande \verb|\Dtor[R]{A}{S}| donne : $$\Dtor[R]{A}{S}$$
+
+\subsection{Torseur personnalisé}
+La commande \verb|\Ftor[]{}{}{}{}| permet d'exprimer un torseur personnalisé. Elle prend comme entrées le nom du repère (facultative), la lettre représentant le torseur (alphabet), l'expression de la résultante puis du moment et enfin le point d'évaluation. La commande (assez longue) suivante \verb|\Ftor[S/R]{W}{\Vct{R}}{\Vct{M}_{A}}{A}| donne : $$\Ftor[S/R]{W}{\Vct{R}}{\Vct{M}_{A}}{A}$$
+
+\subsection{Torseur personnalisé explicite}
+La commande \verb|\LFtor[]{}{}{}{}{}{}{}{}| permet d'exprimer un torseur personnalisé explicite. Elle prend comme entrées le nom du repère (facultative), la lettre représentant le torseur (alphabet), respectivement les trois composantes de la résultante, les trois composantes du moment et enfin le point d'évaluation.
+La commande \verb|\LFtor[S/R]{F}{X}{Y}{Z}{L}{M}{N}{G}| donne : $$\LFtor[S/R]{F}{X}{Y}{Z}{L}{M}{N}{G}$$
+
+\newpage
+
+\section{Exemples}
+\textbf{Formule de Boor :}
+
+\verb|\Din[0]{\Vct{AB}}=\Din[1]{\Vct{AB}}+\Rotation[0]{1}\times\Vct{AB}|
+$$\Din[0]{\Vct{AB}}=\Din[1]{\Vct{AB}}+\Rotation[0]{1}\times\Vct{AB}$$
+
+\textbf{Roulement sans glissement en I :}
+
+\verb|\Vel[1]{I}{2}=\Vct{0}|
+$$\Vel[1]{I}{2}=\Vct{0}$$
+
+\textbf{Composition des vitesses :}
+
+\verb|\Vel[0]{A}{n}=\sum_{i=}^{n-1}\Vel[i]{A}{i+1}|
+$$\Vel[0]{A}{n}=\sum_{i=0}^{n-1}\Vel[i]{A}{i+1}$$
+
+\textbf{Accélération :}
+
+\verb|\Acc[R]{A}{S}=\Dex[R]{\Vel[R]{A}{S}}|
+$$\Acc[R]{A}{S}=\Dex[R]{\Vel[R]{A}{S}}$$
+
+\textbf{Pincipe fondamental de la dynamique 1 :}
+
+\verb|\sum_{i=1}^{n}\Force[S]{S_i}=\Amg[R]{S}|
+$$\sum_{i=1}^{n}\Force[S]{S_i}=\Amg[R]{S}$$
+
+\textbf{Pincipe fondamental de la dynamique 2 :}
+
+\verb|\sum_{i=1}^{n}\Force[S]{S_i}=\Amg[R]{S}|
+$$\sum_{i=1}^{n}\Moment[S]{S_i}{O}=\ADelta[R]{O}{S}$$
+
+\textbf{Theorème de l'énergie cinétique}
+
+\verb|\Dex{T_{S/R}}=\Pow[R]{S{\overline{S}}|
+$$\Dex{T_{S/R}}=\Pow[R]{S}{\overline{S}}$$
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
index e9ff54953d..62ad8aee74 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
@@ -5,6 +5,15 @@ first release 0.95a, 2021-02-23 will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project uses date-based 'snapshot' version identifiers.
+## [2021-08-28]
+### Changed
+ - colorscheme 'original' has been renamed to 'primary-colors'
+ - color key is overwritten to use l3color
+
+### Added
+ - preliminary support for standard A-2a and A-3a
+ - output patches to firstaid to support interruption of links
+ and tagging of paragraphs with page splits.
## [2021-07-31]
### Added
diff --git a/macros/latex/contrib/pdfmanagement-testphase/README.md b/macros/latex/contrib/pdfmanagement-testphase/README.md
index fd565a6ea6..a438100385 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/README.md
+++ b/macros/latex/contrib/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
# LaTeX PDF management testphase bundle
-Version: 0.95h, 2021-07-31
+Version: 0.95i, 2021-08-28
This package is used during a test phase to load the new PDF management code
of LaTeX.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
index fca7c1c3ac..94d5f5c395 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
@@ -22,7 +22,7 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2021-07-31 v0.95h
+\ProvidesPackage{color-ltx}[2021-08-28 v0.95i
Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2021/03/07 v1.2e) (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
index 4e0296c641..24f129b8ff 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
@@ -86,7 +86,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -357,8 +357,12 @@
% Some main changes are
% \begin{itemize}
% \item The default colors have been changed.
-% \item |citecolor| is no longer set with |allcolors| and it is not part of the
-% color scheme, it is only supported for compability.
+% \item Citations have by default no special color, they are
+% colored like other internal links. You can use |citecolor| and |citebordercolor| to
+% assign them a special color. This color is not reset if you use |allcolors| or
+% switch to another color scheme. If you want the colors to follow |linkcolor| again
+% you should remove the label |hyp/cite| and/or |hyp/citeborder|
+% from the hook |hyp/link/cite|.
% \item a number of color schemes have been predefined.
% \end{itemize}
%
@@ -438,7 +442,7 @@
%
% The new key |colorscheme| allows to switch the colors (both for text and borders)
% with a key word. It takes one of the values
-% |orginal| (the colors as \pkg{hyperref} uses normally), |phelype|, |daleif|,
+% |primary-colors| (the colors as \pkg{hyperref} uses normally), |phelype|, |daleif|,
% |szabolcsA|, |szabolcsB|, |tivv|, |julian|, |henryford|.
%
% The names refer to the authors in answers and comments in
@@ -758,6 +762,34 @@
% \end{itemize}
% \end{itemize}
%
+% \subsection{Names of destinations}
+% hyperref creates two types of destination names: For numbered structures
+% (so when the anchor is set by \cs{refstepcounter}) it builds the name
+% from the counter name and the \cs{theH...} representation: |<counter name>.\theH<counter name>|.
+%
+% For unnumbered structures, e.g. starred chapters or anchors created with \cs{phantomsection}
+% it uses names like |section*.<number>| and |chapter*.<number>|.
+%
+% Typically the name of destination can be retrieved by setting a label, this works also
+% with unnumbered sections.
+% The anchor and also the page can be retrieve in an expandable way
+% with the help of commands from the
+% \pkg{refcount} package which is loaded by hyperref. For example with the
+% following commands it is possible to use the label to create a bookmark:
+%
+% \begin{verbatim}
+% \bookmark[dest=\getrefbykeydefault{label}{anchor}{Doc-Start}]{my bookmark}
+% \bookmark[dest=page.\getrefbykeydefault{label}{page}{Doc-Start}]{my bookmark}
+% \end{verbatim}
+%
+% If a \cs{HyperDestNameFilter} is defined, this must be added around the definition,
+% so actually the full code has to look like this
+% \begin{verbatim}
+% \bookmark[dest=
+% \HyperDestNameFilter{\getrefbykeydefault{label}{anchor}{Doc-Start}}]{mysection}
+% \end{verbatim}
+% To simplify this hyperref provides |\hyperget{anchor}{label}| and
+% |\hyperget{pageanchor}{label}|
%
%\section{Assorted key descriptions}\label{sec:keydesc}
%The following gives a few details to some keys that are perhaps not
@@ -910,6 +942,7 @@
%
%^^A %% \l_@@_dest_pdfview_tl
%^^A %% list of commands which probably will have to change
+%^^A TODO: move hrefurl, hrefrun, hrefpdf into hyperref. They should also work
% \end{documentation}
% \begin{implementation}
% \part{\pkg{hyperref-generic} driver implementation}
@@ -918,7 +951,7 @@
%<@@=hyp>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2021-07-31 v0.95h %
+\ProvidesFile{hgeneric-testphase.def}[2021-08-28 v0.95i %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
@@ -1091,6 +1124,16 @@
No~value~is~equivalent~to~using~`true`.
}
% \end{macrocode}
+% A message for creator and producer which can't be removed.
+% \begin{macrocode}
+\msg_new:nnn
+ { hyp }
+ { empty-info-value }
+ {
+ Empty~value~for~key~#1.\\
+ This~isn't~honored~by~all~backends.
+ }
+% \end{macrocode}
% \section{Variants}
% \begin{macrocode}
\cs_generate_variant:Nn\pdf_destination:nn {nf}
@@ -1164,6 +1207,21 @@
}
}
% \end{macrocode}
+%
+% Hyperref creates a number of destinations automatically. E.g. in unnumbered
+% chapters and sections and with \cs{phantomsection}. The following key allows
+% to force a specific name for the destination so that it can be used by bookmarks.
+% \begin{macrocode}
+\keys_define:nn { hyp / setup }
+ {
+ next-anchor .code:n =
+ {
+ \AddToHookNext{__hyp/dest/make}
+ {\Hy@MakeCurrentHref{#1}}
+ }
+ }
+% \end{macrocode}
+%
% Allow non-ascii in href, and add more href versions.
% We add a few new keys:
% |urlencode| to force percent encoding (\cs{hrefurl}, \cs{href})
@@ -1179,13 +1237,13 @@
\tl_new:N \l_@@_href_pdf_destination_tl
\tl_new:N \l_@@_href_pdf_page_tl
\tl_new:N \l_@@_href_run_parameter_tl
-\cs_new_protected:Npn \@@_href_url_format {\begingroup\Url}
+\cs_new_protected:Npn \@@_href_url_format: {\begingroup\Url}
\keys_define:nn { hyp / href }
{
,urlencode .bool_set:N = \l_@@_href_url_encode_bool
- ,format .code:n = { \cs_set_eq:NN \@@_href_url_format #1 },
+ ,format .code:n = { \cs_set:Nn \@@_href_url_format: {#1} },
,protocol .tl_set:N = \l_@@_href_url_protocol_tl
,destination .tl_set:N = \l_@@_href_pdf_destination_tl
,pdfremotestartview .code:n =
@@ -1227,7 +1285,7 @@
,href / urlencode .initial:n = {false}
,href / protocol .tl_set:N = \l_@@_href_url_protocol_tl
,href / destination .tl_set:N = \l_@@_href_pdf_destination_tl
- ,href / format .code:n = { \cs_set_eq:NN \@@_href_url_format #1 }
+ ,href / format .code:n = { \cs_set:Nn \@@_href_url_format:{#1} }
}
\hook_new_pair:nn{cmd/href/before}{cmd/href/after}
@@ -1343,7 +1401,7 @@
\cs_new_protected:Npn \@@_href_url_aux:n #1
{
\exp_args:Nno
- \hyper@linkurl{\@@_href_url_format {#1}}
+ \hyper@linkurl{\@@_href_url_format: {#1}}
{\l_@@_href_url_protocol_tl#1}
\group_end:
\hook_use:n{cmd/url/after}
@@ -1386,22 +1444,37 @@
%
% \begin{macrocode}
\hook_new:n{hyp/link/cite}
-\color_set:nnn {hyp/color/cite}{HTML}{2E7E2A}
-\color_set:nn {hyp/color/citeborder}{hyp/color/cite!60!white}
+%\color_set:nnn {hyp/color/cite}{HTML}{2E7E2A}
+%\color_set:nn {hyp/color/citeborder}{hyp/color/cite!60!white}
\keys_define:nn { hyp / setup }
{
- ,citecolor .code:n = {\@@_color_set:ne {hyp/color/cite}{#1}}
+ ,citecolor .code:n = {\@@_color_set:ne {hyp/color/cite}{#1}\@@_citecolor_hook_init:}
,citebordercolor
- .code:n = {\@@_color_set:ne {hyp/color/citeborder}{#1}}
+ .code:n = {\@@_color_set:ne {hyp/color/citeborder}{#1}\@@_citebordercolor_hook_init:}
}
-\hook_gput_code:nnn { hyp/link/cite }{hyp/cite}
- {
- \keys_set:nn { hyp / setup }
- {
- ,linkbordercolor= hyp/color/citeborder
- ,linkcolor = hyp/color/cite
- }
+\cs_new_protected:Npn \@@_citecolor_hook_init:
+ {
+ \hook_gput_code:nnn { hyp/link/cite }{hyp/cite}
+ {
+ \keys_set:nn { hyp / setup }
+ {
+ linkcolor = hyp/color/cite
+ }
+ }
+ \cs_gset_eq:NN \@@_citecolor_hook_init: \prg_do_nothing:
}
+\cs_new_protected:Npn \@@_citebordercolor_hook_init:
+ {
+ \hook_gput_code:nnn { hyp/link/cite }{hyp/citeborder}
+ {
+ \keys_set:nn { hyp / setup }
+ {
+ linkbordercolor = hyp/color/citeborder
+ }
+ }
+ \cs_gset_eq:NN \@@_citebordercolor_hook_init: \prg_do_nothing:
+ }
+
% \end{macrocode}
% \section{Checks}
% The driver can not work properly if the pdfmanagement is not active,
@@ -1416,11 +1489,27 @@
{ \msg_error:nn { hyp}{ missing-resource-management } }
% \end{macrocode}
% Outlines/bookmarks require the bookmark package.
-% TODO check pdfpagemode if booksmarks are suppressed.
+% TODO check pdfpagemode if bookmarks are suppressed.
+% TODO We overwrite the color key here for now, but this should be moved to bookmark
+%
% \begin{macrocode}
+\AddToHook { package / after / bookmark}
+ {
+ \define@key{BKM}{color}
+ {
+ \__hyp_color_set:ne {__hyp/tmpa}{#1}
+ \color_export:nVN
+ {__hyp/tmpa}
+ \g__hyp_bordercolormodel_str
+ \BKM@color
+ }
+ }
\legacy_if:nT { Hy@bookmarks }
{
- \AddToHook{begindocument/before}[hyperref/bookmark]{\RequirePackage{bookmark}}
+ \AddToHook{begindocument/before}[hyperref/bookmark]
+ {
+ \RequirePackage{bookmark}
+ }
}
\legacy_if:nT {Hy@draft}
{
@@ -2332,43 +2421,17 @@
% \section{Link decorations}
% \subsection{Functions to export and select colors}
% We support two input syntax: color expressions and model with values.
-% \begin{function}{\@@_color_export:nnN}
-% \begin{syntax}
-% \cs{@@_color_export:nnN} \Arg{color} \Arg{export format} \meta{tlvar}
-% \end{syntax}
-% This exports a color as space separated numbers as needed in in |/C|.
-% \Arg{color} should have either the format |[model]{value}| or be a color expression.
-% For examples: |[rgb]{1,0,.5}| or |red!50!blue|. The export format is either
-% |space-sep-cmyk| or |space-sep-rgb|.
-% \end{function}
-% \begin{macro}{\@@_color_export:nnN,\@@_color_export_aux:wnnN}
-% Color keys need to parse color expressions. Two input types are supported:
-% |color=[rgb]{1,0,.5}| and |color=red!50!blue|. The colors are exported
-% to PDF syntax (space separated numbers).
+% Exporting can be done by first setting the color with \cs{@@_color_set:nn}
+% (if needed to a temporary color name)
+% and then using \cs{color_export:nnN}. But we need a variant as the export
+% format |space-sep-cmyk| or |space-sep-rgb| is stored in a tl.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_color_export:nnN #1 #2 #3
- {
- \tl_if_head_eq_charcode:nNTF {#1}[ %]
- {
- \@@_color_export_aux:wnnN #1 {#2} #3
- }
- {
- \color_export:nnN {#1} {#2} #3
- }
- }
-
-\cs_new_protected:Npn \@@_color_export_aux:wnnN [#1] #2 #3 #4
- {
- \color_export:nnnN {#1}{#2}{#3}#4
- }
-
-\cs_generate_variant:Nn \@@_color_export:nnN {xVN}
+\cs_generate_variant:Nn \color_export:nnN {nVN}
% \end{macrocode}
-% \end{macro}
%
% \begin{function}{\@@_color_select:n}
% \begin{syntax}
-% \cs{@@_color_select:nN} \Arg{color} \\
+% \cs{@@_color_select:n} \Arg{color} \\
% \end{syntax}
% These commands select a (text) color.
% \Arg{color} should have either the format |[model]{value}| or be a color expression.
@@ -2400,7 +2463,7 @@
%
% \begin{function}{\@@_color_set:nn}
% \begin{syntax}
-% \cs{@@_color_set:nN} \Arg{ name } \Arg{color} \\
+% \cs{@@_color_set:nn} \Arg{ name } \Arg{color} \\
% \end{syntax}
% These commands store the color in \Arg{name}.
% \Arg{color} should have either the format |[model]{value}| or be a color expression.
@@ -2535,7 +2598,11 @@
{ C }
}
{
- \@@_color_export:xVN {##1}\g_@@_bordercolormodel_str \l_@@_tmpa_tl
+ \@@_color_set:ne {hyp/color/#1border}{##1}
+ \color_export:nVN
+ {hyp/color/#1border}
+ \g_@@_bordercolormodel_str
+ \l_@@_tmpa_tl
\pdfannot_dict_put:nnx
{link/#2}
{ C }
@@ -3763,7 +3830,8 @@
% \subsubsection{\enquote{info keys}}
% \begin{hypkey}{pdfauthor,pdftitle,pdfcreator,pdfsubject,pdfproducer,pdfkeywords}
% The keys store their value also in the metadate container, so that hyperxmp can
-% use them.
+% use them. Creator and Producer can't be removed with the pdfmanagement,
+% but we allow to set an empty value.
% \begin{macrocode}
\cs_new_protected:Npn \@@_setup_info_key:nn #1 #2
{
@@ -3773,7 +3841,22 @@
{
\tl_if_blank:nTF {##1}
{
- \pdfmanagement_remove:nn {Info}{#2}
+ \str_case:nnF { #1 }
+ {
+ {creator}
+ {
+ \msg_info:nnn { hyp }{ empty-info-value } { pdfcreator }
+ \pdfmanagement_add:nnx {Info}{Creator}{()}
+ }
+ {producer}
+ {
+ \msg_info:nnn { hyp }{ empty-info-value } { pdfproducer }
+ \pdfmanagement_add:nnx {Info}{Producer}{()}
+ }
+ }
+ {
+ \pdfmanagement_remove:nn {Info}{#2}
+ }
}
{
\@@_text_pdfstring_info:nN {##1}\l_@@_tmpa_str
@@ -3838,7 +3921,7 @@
\pdfmanagement_remove:nn {Info}{#2}
}
{
- \pdfmanagement_add:nnx {Info}{#2}{(\tl_to_str:n {##1})}
+ \pdfmanagement_add:nnx {Info}{#2}{(##1)}
}
\@@_store_metadata:nn {pdf#1}{##1}
}
@@ -3852,7 +3935,7 @@
\pdfmanagement_remove:nn {Info}{#2}
}
{
- \pdfmanagement_add:nnx {Info}{#2}{(\tl_to_str:n {##1})}
+ \pdfmanagement_add:nnx {Info}{#2}{(##1)}
}
\exp_args:Nx \@@_store_metadata:nn {pdf\str_lowercase:n{#1}}{##1}
}
@@ -5312,7 +5395,7 @@
%,menubordercolor=
%,runbordercolor=
-\prop_const_from_keyval:Nn \c_@@_colorscheme_original_prop
+\prop_const_from_keyval:cn { c_@@_colorscheme_primary-colors_prop }
{
linkcolor = [rgb]{1,0,0}, %red
filecolor = [rgb]{0,1,1}, %cyan
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
index 1ec46ba75c..8066c863d6 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
index f948928f94..56e9dd45db 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
%
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2021-07-31}{0.95h}
+\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2021-08-28}{0.95i}
{Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF}
\cs_if_exist:NT \pdfmanagement_add:nnn
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
index 0102b1c574..7c902d8b92 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
@@ -45,7 +45,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
%
@@ -56,27 +56,27 @@
% \begin{macrocode}
%<drivers>\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-testphase-dvipdfmx.def}{2021-07-31}{}
+ {l3backend-testphase-dvipdfmx.def}{2021-08-28}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-testphase-dvips.def}{2021-07-31}{}
+ {l3backend-testphase-dvips.def}{2021-08-28}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-testphase-dvisvgm.def}{2021-07-31}{}
+ {l3backend-testphase-dvisvgm.def}{2021-08-28}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-testphase-luatex.def}{2021-07-31}{}
+ {l3backend-testphase-luatex.def}{2021-08-28}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-testphase-pdftex.def}{2021-07-31}{}
+ {l3backend-testphase-pdftex.def}{2021-08-28}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
%</pdftex>
%<*xdvipdfmx>
- {l3backend-testphase-xetex.def}{2021-07-31}{}
+ {l3backend-testphase-xetex.def}{2021-08-28}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
%</xdvipdfmx>
% \end{macrocode}
@@ -1153,6 +1153,53 @@
%</dvisvgm>
% \end{macrocode}
% \end{macro}
+% \subsubsection{Additional annotation commands}
+% Starting with texlive 2021 pdftex and luatex offer commands to interrupt
+% a link. That can for example be used to exclude the header and footer from
+% the link. We add here backend support for this.
+% \begin{macrocode}
+%<*drivers>
+\cs_new_protected:Npn \@@_backend_link_off:{}
+\cs_new_protected:Npn \@@_backend_link_on: {}
+%</drivers>
+%<*pdftex>
+\cs_if_exist:NT \pdfrunninglinkoff
+ {
+ \cs_set_protected:Npn \@@_backend_link_off:
+ {
+ \pdfrunninglinkoff
+ }
+ \cs_set_protected:Npn \@@_backend_link_on:
+ {
+ \pdfrunninglinkon
+ }
+ }
+%</pdftex>
+%<*luatex>
+\int_compare:nNnT {\tex_luatexversion:D } > {112}
+ {
+ \cs_set_protected:Npn \@@_backend_link_off:
+ {
+ \pdfextension linkstate 1
+ }
+ \cs_set_protected:Npn \@@_backend_link_on:
+ {
+ \pdfextension linkstate 0
+ }
+ }
+%</luatex>
+%<*dvipdfmx|xdvipdfmx>
+ \cs_set_protected:Npn \@@_backend_link_off:
+ {
+ \@@_backend:n { nolink }
+ }
+ \cs_set_protected:Npn \@@_backend_link_on:
+ {
+ \@@_backend:n { link }
+ }
+%</dvipdfmx|xdvipdfmx>
+% \end{macrocode}
+%
% \subsubsection{Form XObject / backend }
% \begin{macro}{ \@@_backend_xform_new:nnnn }
% \begin{arguments}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
index 9addd760c8..cf05f338c0 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
index 8bd41b49c8..03df126efd 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
@@ -52,7 +52,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -336,6 +336,18 @@
% \end{syntax}
% This sets the dimension of the link margin.
% \end{function}
+%
+% \begin{function}[added=2021-08-19]{\pdfannot_link_off:,\pdfannot_link_on:}
+% In most engines links can broken over lines and pages. The backends then create
+% intermediate link objects to catch all the content between the start and end of
+% the links, mostly based on some heuristics using the boxlevel. This can
+% lead to the unpleasant result that header and footer are part of the link too.
+% Since texlive 2021 pdflatex and lualatex has commands similar to a special already
+% included in dvipdfmx which allows to interrupt a link. The commands must be used
+% with care: typically they must be outside a box that would be catched by link to
+% have the wanted effect.
+%
+% \end{function}
% \begin{function}[added = 2020-12-04]{ \pdfannot_dict_put:nnn }
% \begin{syntax}
% \cs{pdfannot_dict_put:nnn} \Arg{dictionary name} \Arg{key} \Arg{value}
@@ -424,7 +436,7 @@
% \begin{macrocode}
%<@@=pdfannot>
%<*header>
-\ProvidesExplPackage{l3pdfannot}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdfannot}{2021-08-28}{0.95i}
{PDF-annotations}
\RequirePackage{l3pdfdict}
%</header>
@@ -600,6 +612,14 @@
}
% \end{macrocode}
% \end{variable}
+%
+% \subsection{Interruption of links}
+% \begin{macrocode}
+\cs_new_protected:Nn \pdfannot_link_off: { \__pdf_backend_link_off: }
+\cs_new_protected:Nn \pdfannot_link_on: { \__pdf_backend_link_on: }
+% \end{macrocode}
+%
+%
% \subsubsection{Annotations, subtype Link /management}
%
% \begin{macro}{\pdfannot_link:nnn,\pdfannot_link:nxn}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
index d2924f459a..bb8974469c 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
index e80d6097cb..354d9a8654 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -212,7 +212,7 @@
% \begin{macrocode}
%<@@=pdfdict>
%<*header>
-\ProvidesExplPackage{l3pdfdict}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdfdict}{2021-08-28}{0.95i}
{Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
index b548db0e6a..864ec52bd8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
index 77bf53bd85..85852e8cd5 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
index 8ca1a9bf06..d44f2aaa3d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
index a1386fcc08..11d1c869df 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
@@ -68,7 +68,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
index 6733f3ea39..6268527c46 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
index de162d3ab7..81047dfe3d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
index 93a763cc9c..146f100385 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
index 02889ec5e3..0045b14ba6 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
@@ -59,7 +59,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
index 5397bcb5e3..867145ba5a 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
index b25b7ead14..45f6a3527f 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
@@ -87,7 +87,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
index 045af32e84..2c04b5a2b8 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
index 1289d54de9..792b7df7ad 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
index 1bacb22920..a3eedc92dc 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
index 5a1d17809e..d7b2b40424 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
@@ -73,7 +73,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -970,7 +970,7 @@
%<*package>
%<@@=pdffield>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2021-07-31}{0.95h}%
+\ProvidesExplPackage{l3pdffield-testphase}{2021-08-28}{0.95i}%
{form fields}
% \end{macrocode}
% \subsection{hyperref specific command}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
index c271631238..addd600158 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
index 56e927b41d..46426e01a2 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -400,7 +400,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdffile}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdffile}{2021-08-28}{0.95i}
{embedding and referencing files in PDF---LaTeX PDF management testphase bundle}
\RequirePackage{l3pdftools} %temporarly!!
%</header>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
index 37cad7dd54..68e65183e4 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
index c3de57b74c..7cb4bf4eeb 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -61,7 +61,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -622,7 +622,7 @@
%<@@=pdfmanagement>
%<*header>
%
-\ProvidesExplPackage{l3pdfmanagement}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdfmanagement}{2021-08-28}{0.95i}
{Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
index 5e1cb6535c..3c21347de4 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
index 3ca574f02a..0b83ac71ff 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -223,6 +223,8 @@
% \item[|unicode|] that is set in the U-standards, A-2u and A-3u and means that
% every text should be in unicode. This is not something that can be enforced or
% tested from TeX, but in a current LaTeX normally ToUnicode are set for all fonts.
+% \item[|tagged|] that is set in A-2a and A-3a and means that the pdf must be
+% tagged. This is currently neither tested not enforced somewhere.
% \end{description}
%
% \subsubsection{Tests with values and special handlers}
@@ -343,7 +345,7 @@
% \begin{macrocode}
%<@@=pdfmeta>
%<*header>
-\ProvidesExplPackage{l3pdfmeta}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdfmeta}{2021-08-28}{0.95i}
{PDF-Standards---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
@@ -515,8 +517,10 @@
% be found in info/pdfstandard.tex.
% \begin{variable}{
% \g_@@_standard_pdf/A-1B_prop ,
+% \g_@@_standard_pdf/A-2A_prop ,
% \g_@@_standard_pdf/A-2B_prop ,
% \g_@@_standard_pdf/A-2U_prop ,
+% \g_@@_standard_pdf/A-3A_prop ,
% \g_@@_standard_pdf/A-3B_prop ,
% \g_@@_standard_pdf/A-3U_prop ,
% }
@@ -606,6 +610,19 @@
\prop_gput:cnn
{ g_@@_standard_pdf/A-2U_prop }{unicode}{}
+%A-2a ==============
+\prop_new:c { g_@@_standard_pdf/A-2A_prop }
+\prop_gset_eq:cc
+ { g_@@_standard_pdf/A-2A_prop }
+ { g_@@_standard_pdf/A-2B_prop }
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-2A_prop }{name}{pdf/A-2A}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-2A_prop }{conformance}{A}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-2A_prop }{tagged}{}
+
+
%A-3b ==============
\prop_new:c { g_@@_standard_pdf/A-3B_prop }
\prop_gset_eq:cc
@@ -621,7 +638,6 @@
\prop_gremove:cn
{ g_@@_standard_pdf/A-3B_prop }
{ embed_content}
-
%A-3u ==============
\prop_new:c { g_@@_standard_pdf/A-3U_prop }
\prop_gset_eq:cc
@@ -633,6 +649,18 @@
{ g_@@_standard_pdf/A-3U_prop }{conformance}{U}
\prop_gput:cnn
{ g_@@_standard_pdf/A-3U_prop }{unicode}{}
+
+%A-3a ==============
+\prop_new:c { g_@@_standard_pdf/A-3A_prop }
+\prop_gset_eq:cc
+ { g_@@_standard_pdf/A-3A_prop }
+ { g_@@_standard_pdf/A-3B_prop }
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-3A_prop }{name}{pdf/A-3A}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-3A_prop }{conformance}{A}
+\prop_gput:cnn
+ { g_@@_standard_pdf/A-3A_prop }{tagged}{}
% \end{macrocode}
% \end{variable}
%
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
index d85623dae6..6466964faf 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
index efed778e78..4b35e21e17 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
@@ -53,7 +53,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -215,7 +215,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdftools}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdftools}{2021-08-28}{0.95i}
{candidate commands for l3pdf---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
index ee977c642c..d9f94b94ae 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
index 0591756bf0..86ecfccb45 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
@@ -52,7 +52,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -136,7 +136,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*header>
-\ProvidesExplPackage{l3pdfxform}{2021-07-31}{0.95h}
+\ProvidesExplPackage{l3pdfxform}{2021-08-28}{0.95i}
{command to create xforms (beta)---LaTeX PDF management testphase bundle}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
index 59336ced8e..2046decacb 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
index 4e7eecc1ab..9af1a938eb 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -103,12 +103,13 @@
% \item[\texttt{lang}] to set the Lang entry in the Catalog.
% E.g. \texttt{lang=de-DE}. The initial value is |en-US|
% \item[\texttt{pdfstandard}] Choice key to set the pdf standard.
-% Currently |A-1b|, |A-2b|, |A-2u|, |A-3b| and |A-3u| are accepted as
+% Currently |A-1b|, |A-2a|, |A-2b|, |A-2u|, |A-3a|, |A-3b| and |A-3u| are accepted as
% values. The casing is irrelevant, |a-1b| works too.
% The underlying code to ensure the requirements (as far as they
% can be ensured) is incomplete, but a color profile is included and the
% /OutputIntent is set. The |u| variants for example do not force unicode,
-% but they will pass the information to hyperref and hyperxmp.
+% but they will pass the information to hyperref and hyperxmp. The |a| variants
+% do \emph{not} enforce (or even test) a tagged pdf yet.
% More information can be found in the documentation
% of \pkg{l3pdfmeta}.
% \item[\texttt{colorprofiles}] This allows to load icc-colorprofiles. Details
@@ -182,7 +183,7 @@
% \begin{macrocode}
%<@@=pdfmanagement>
%<*header>
-\ProvidesExplPackage{ltdocinit}{2021-07-31}{0.95h}
+\ProvidesExplPackage{ltdocinit}{2021-08-28}{0.95i}
{Initialize document metadata}
%</header>
% \end{macrocode}
@@ -253,7 +254,7 @@
% Load more modules, the testphase code and the firstaid code.
% \begin{macrocode}
\g_@@_testphase_tl
- \RequirePackage{pdfmanagement-firstaid}
+ \RequirePackage{pdfmanagement-firstaid}
}
}
% \end{macrocode}
@@ -355,7 +356,7 @@
\keys_set:nn {document / metadata} {_pdfstandard=\str_uppercase:n{#1}}
}
,_pdfstandard .choices:nn =
- {A-1B,A-2B,A-2U,A-3B,A-3U}
+ {A-1B,A-2A,A-2B,A-2U,A-3A,A-3B,A-3U}
{
\prop_if_exist:cT { g__pdfmeta_standard_pdf/#1_prop }
{
diff --git a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
index 4d155d2c4c..1bc3aa262d 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
new file mode 100644
index 0000000000..7b67c520b3
--- /dev/null
+++ b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
@@ -0,0 +1,156 @@
+% \iffalse meta-comment
+%
+%% File: output-patches.dtx (C) Copyright 2020-2021 Frank Mittelbach
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% https://www.latex-project.org/lppl.txt
+%
+%<*driver>
+\documentclass{l3doc}
+
+\EnableCrossrefs
+\CodelineIndex
+\begin{document}
+ \DocInput{output-patches-tmp-ltx.dtx}
+\end{document}
+%</driver>
+%
+% \fi
+%
+% \providecommand\hook[1]{\texttt{#1}}
+%
+%
+%
+% \title{Temporary output patches for tagging and better link support}
+% \author{Frank Mittelbach \and Ulrike Fischer}
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% This package contains a few patches of internal \LaTeX{} needed
+% to support paragraph tagging across
+% page boundaries (in \pdfTeX) and improve the behaviour of links across page breaks.
+%
+% Until this get properly integrated with the kernel code this has
+% to be taken as a prototype and code, interfaces as well as
+% behavior may change without notice and certainly without any
+% backwards compatibility!
+%
+%
+% \StopEventually{\setlength\IndexMin{200pt} \PrintIndex }
+%
+%
+% \section{The Implementation}
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ProvidesPackage{output-patches-tmp-ltx}
+ [2021-08-20 v0.95 Temporary patches of output commands]
+\RequirePackage{etoolbox}
+% \end{macrocode}
+%
+%
+% \subsection{Patching the OR}
+% This add hooks around header and footer.
+% At first initialize the hooks
+% \begin{macrocode}
+\newcommand\@kernel@before@head{}
+\newcommand\@kernel@before@foot{}
+\newcommand\@kernel@after@head{}
+\newcommand\@kernel@after@foot{}
+\newcommand\@kernel@before@footins{}
+\newcommand\@kernel@before@cclv{}
+\newcommand\@mult@ptagging@hook{}
+% \end{macrocode}
+%
+% \begin{macrocode}
+
+\patchcmd\@outputpage
+ {\vfil\color@hbox\normalcolor\hb@xt@\textwidth{\@thehead}\color@endbox}
+ {\vfil\@kernel@before@head\color@hbox\normalcolor\hb@xt@\textwidth{\@thehead}\color@endbox\@kernel@after@head}
+ {\typeout{Patching header in \string\@outputpage}}{\PATCHerror }
+
+
+\patchcmd\@outputpage
+ {\color@hbox\normalcolor\hb@xt@\textwidth{\@thefoot}\color@endbox}
+ {\@kernel@before@foot\color@hbox\normalcolor\hb@xt@\textwidth{\@thefoot}\color@endbox\@kernel@after@foot}
+ {\typeout{Patching footer in \string\@outputpage}}{\PATCHerror }
+% \end{macrocode}
+%
+% \begin{macro}{\@makecol}
+% We have to patch \cs{@makecol} in two places:
+% \begin{itemize}
+% \item
+% update 255 up front to add missing tmb/tme if necessary
+% \item
+% update the \cs{footins} stream if that one got split
+% \end{itemize}
+% \begin{macrocode}
+
+\patchcmd\@makecol
+ {\vskip\skip\footins}
+ {\vskip\skip\footins\@kernel@before@footins}
+ {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
+
+% for some reason patching with etoolbox only works in this order ...
+
+\pretocmd\@makecol{\@kernel@before@cclv}
+ {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{\pkg{multicol} adjustments}
+%
+% The patches for pkg{multicol} are fairly minimal:
+% \begin{itemize}
+% \item At the start of the environment anything already on the
+% page is picked up and stored in \cs{partial@page}, we may need to add
+% a TMB to that (it should have a proper TME). This has to happen
+% in the \enquote{main} stream context.
+% \item
+% \item
+% \end{itemize}
+%
+% \begin{macrocode}
+\AddToHook{package/after/multicol}{% multicol needs later loading
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \patchcmd\page@sofar
+ {\setbox\z@\hbox{p}\global\dimen\tw@\dp\z@}%
+ {%
+ \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@
+ \@mult@ptagging@hook
+ }%
+ {\typeout{Patching \string\page@sofar\space for tagging}}{\PATCHerror}%
+}
+% \end{macrocode}
+%
+% \subsection{Interrupt hooks}
+% This requires the l3pdfannot module!
+% We add the code here an not in hyperref, as it should also work with links
+% created directly with the l3pdfannot commands. The file is only
+% loaded by the pdfmanagement, so no need to test if the commands exist.
+% \begin{macrocode}
+\ExplSyntaxOn
+\def\@kernel@before@head{\pdfannot_link_off:}
+\def\@kernel@before@foot{\pdfannot_link_off:}
+\def\@kernel@after@head {\pdfannot_link_on:}
+\def\@kernel@after@foot {\pdfannot_link_on:}
+\ExplSyntaxOff
+% \end{macrocode}
+%
+% \begin{macrocode}
+\endinput
+%</package>
+% \end{macrocode}
+%
+% \Finale
+%
diff --git a/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
new file mode 100644
index 0000000000..30d2a68ced
--- /dev/null
+++ b/macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
index fdfe7b4279..b7a12f5545 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
@@ -22,7 +22,7 @@
%% This work consists of the main source file pdflscape-ltx.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{pdflscape-ltx}{2021-07-31}{0.95h}
+\ProvidesExplPackage{pdflscape-ltx}{2021-08-28}{0.95i}
{Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
index 1295c4b6bf..65f3f7cfa4 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -67,11 +67,11 @@
% |firstaidoff={name1,name2,...}|.
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{pdfmanagement-firstaid}{2021-07-31}{0.95h}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2021-08-28}{0.95i}
{LaTeX PDF management testphase bundle / firstaid-patches}
%<@@=pdfmanagement>
-\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer}
+\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer,output}
{
\bool_new:c { g_@@_firstaid_#1_bool }
\bool_gset_true:c { g_@@_firstaid_#1_bool }
@@ -86,6 +86,16 @@
\msg_new:nnn { pdfmanagement } { firstaid }
{ loading~pdfmanagement~firstaid~code~for~#1 }
% \end{macrocode}
+% \subsection{Output routine}
+% This load as few patches for the LaTeX output routine commands. They add
+% hooks for the interruption of links and for paragraph tagging.
+% \begin{macrocode}
+\bool_if:NT \g_@@_firstaid_output_bool
+ {
+ \RequirePackage{output-patches-tmp-ltx}
+ }
+% \end{macrocode}
+
% \subsection{\pkg{beamer}}
% \pkg{beamer} makes use of the now unsupported syntax |linkbordercolor={.5 .5 .5}|.
% To avoid an error we define this color as a name.
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index 5206d4027b..7f601e819e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
index 37dc11f65b..313f2d326e 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Version 0.95h, released 2021-07-31}
+% \date{Version 0.95i, released 2021-08-28}
%
% \maketitle
% \begin{documentation}
@@ -384,7 +384,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\ProvidesExplPackage{pdfmanagement-testphase}{2021-07-31}{0.95h}
+\ProvidesExplPackage{pdfmanagement-testphase}{2021-08-28}{0.95i}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
@@ -411,7 +411,7 @@
% to allow to set it in the document.
% \begin{macrocode}
%<*header>
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2021-07-31}{0.95h}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2021-08-28}{0.95i}
{PDF~management~code~(testphase)}
%</header>
%<*package>
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
index e6ab7caa43..5f0656d898 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
@@ -215,6 +215,14 @@ and all files in that bundle must be distributed together.
}
}
+\generate
+ {
+ \file {output-patches-tmp-ltx.sty}
+ {
+ \from{output-patches-tmp-ltx.dtx}{package}
+ }
+ }
+
\def\MetaPrefix{-- }
\def\defaultpostamble{%
\MetaPrefix^^J%
diff --git a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index 64f1d65c19..32ea161de1 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
index e7cf7c36e5..61235bc846 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
@@ -3,7 +3,7 @@
%% a replacement for transparent sty from Heiko Oberdiek
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{transparent-ltx}{2021-07-31}{0.95h}
+\ProvidesExplPackage{transparent-ltx}{2021-08-28}{0.95i}
{Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}%
\RequirePackage{l3opacity}
diff --git a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index 12c87fdd33..45cd4413cf 100644
--- a/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
%% LaTeX2e file `xcolor-patches.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2021-07-31 v0.95h patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2021-08-28 v0.95i patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/tagpdf/README.md b/macros/latex/contrib/tagpdf/README.md
index 488a7d9d18..d21932976e 100644
--- a/macros/latex/contrib/tagpdf/README.md
+++ b/macros/latex/contrib/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.91
-Packagedate: 2021/07/03
+Packageversion: 0.92
+Packagedate: 2021/08/27
Author: Ulrike Fischer
## License
diff --git a/macros/latex/contrib/tagpdf/ex-AF-file.pdf b/macros/latex/contrib/tagpdf/ex-AF-file.pdf
index ce952f342d..a1b7db7c77 100644
--- a/macros/latex/contrib/tagpdf/ex-AF-file.pdf
+++ b/macros/latex/contrib/tagpdf/ex-AF-file.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-AF-file.tex b/macros/latex/contrib/tagpdf/ex-AF-file.tex
index 92b78a55ad..3e569807db 100644
--- a/macros/latex/contrib/tagpdf/ex-AF-file.tex
+++ b/macros/latex/contrib/tagpdf/ex-AF-file.tex
@@ -7,20 +7,20 @@
\documentclass{article}
\usepackage{tagpdf}
+\usepackage{iftex}
\tagpdfsetup{tabsorder=structure,
- activate-all}
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
+ activate,
+ interwordspace
+ }
-\tagpdfifluatexT
- {
+\iftutex
\usepackage{fontspec}
\usepackage{unicode-math}
\usepackage{luacode}
\newfontface\zerowidthfont{freeserif}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
\usepackage{graphicx}
\begin{filecontents}{example-input-file.tex}
@@ -30,8 +30,6 @@ Additional info!
\begin{document}
\pagestyle{empty}
-\tagstructbegin{tag=Document}
-
\ExplSyntaxOn
\pdffile_embed_file:nnn{example-input-file.tex}{}{tag/AFtest}
@@ -59,5 +57,4 @@ Additional info!
\tagmcend
\tagstructend
-\tagstructend
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf b/macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
index dec0f3aa08..3cda28e0da 100644
--- a/macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
+++ b/macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-alt-actualtext.tex b/macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
index 822f1091be..148a010701 100644
--- a/macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
+++ b/macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
@@ -7,29 +7,27 @@
\usepackage{tagpdf}
\tagpdfsetup{tabsorder=structure,
- uncompress,activate-all}
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
+ activate}
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\usepackage{unicode-math}
\usepackage{luacode}
\newfontface\zerowidthfont{freeserif}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
+
\usepackage{graphicx}
% This is not a perfectly tagged document!
+% It doesn't use paratagging!
% one sentence is not marked (luatex will mark it as artifact)
% with pdflatex there is a encoding problem with the math
\begin{document}
\pagestyle{empty}
-\tagstructbegin{tag=Document}
%This isn't read by voice software
Etwas unmarkierter Text.
@@ -175,5 +173,5 @@ Etwas unmarkierter Text.
\includegraphics[width=1cm]{example-image-duck}
\tagmcend
-\tagstructend
+
\end{document}
diff --git a/macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf b/macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
index f95703a983..f813c0e919 100644
--- a/macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
+++ b/macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-attribute.pdf b/macros/latex/contrib/tagpdf/ex-attribute.pdf
index 7965c0d854..9871e6a033 100644
--- a/macros/latex/contrib/tagpdf/ex-attribute.pdf
+++ b/macros/latex/contrib/tagpdf/ex-attribute.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-attribute.tex b/macros/latex/contrib/tagpdf/ex-attribute.tex
index d58f1526ab..fb1eb963e4 100644
--- a/macros/latex/contrib/tagpdf/ex-attribute.tex
+++ b/macros/latex/contrib/tagpdf/ex-attribute.tex
@@ -4,7 +4,7 @@
\documentclass{scrartcl}
\usepackage[english]{babel}
\usepackage{tagpdf}
-\tagpdfsetup{activate-all}
+\tagpdfsetup{activate}
\ExplSyntaxOn
\pdfmanagement_add:nnn{Info}{Title}{(Title)}
@@ -20,7 +20,7 @@
}
\begin{document}
\pagestyle{empty} %
-\tagstructbegin{tag=Document}
+
\tagstructbegin{tag=Table}
\begin{center}
@@ -61,5 +61,5 @@
\end{center}
\tagstructend
-\tagstructend
+
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf b/macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
index 88bb27d4a8..5a9f8e03a9 100644
--- a/macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
+++ b/macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-formula-problem.tex b/macros/latex/contrib/tagpdf/ex-formula-problem.tex
index 4f5032a5e5..31b311500b 100644
--- a/macros/latex/contrib/tagpdf/ex-formula-problem.tex
+++ b/macros/latex/contrib/tagpdf/ex-formula-problem.tex
@@ -8,26 +8,22 @@
\usepackage{tagpdf}
\tagpdfsetup{tabsorder=structure,
- activate-all}
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
+ activate}
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\usepackage{unicode-math}
\usepackage{luacode}
\newfontface\zerowidthfont{freeserif}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
\usepackage{graphicx}
% ndva doesn't read the alt text of the formulas
\begin{document}
\pagestyle{empty}
-\tagstructbegin{tag=Document}
\tagstructbegin{tag=P}
\tagmcbegin{tag=P}
@@ -55,5 +51,5 @@
\tagmcend
\tagstructend
-\tagstructend
+
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.pdf b/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.pdf
index 620366f001..3dedd62f26 100644
--- a/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.pdf
+++ b/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.tex b/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.tex
index 1872e6f1fa..d89e3601f4 100644
--- a/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.tex
+++ b/macros/latex/contrib/tagpdf/ex-mc-manual-para-split.tex
@@ -13,22 +13,16 @@
\usepackage{tagpdf}
\usepackage{amsmath}
\usepackage{graphicx}
-\tagpdfifpdftexT
- {
- \usepackage[utf8]{inputenc}
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
- \usepackage{fontspec}
+\usepackage{iftex}
+\iftutex
+ \usepackage{fontspec}
\usepackage{luacode}
- }
-
+\else
+ \usepackage[T1]{fontenc}
+\fi
\tagpdfsetup{tabsorder=structure,
activate-mc,
- uncompress
}
\newsavebox\mybox
diff --git a/macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf b/macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf
index 05d9865f0c..9ddd1a9f99 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf
+++ b/macros/latex/contrib/tagpdf/ex-patch-list-luatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-patch-list.tex b/macros/latex/contrib/tagpdf/ex-patch-list.tex
index f3f149b20c..d6485c86fe 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-list.tex
+++ b/macros/latex/contrib/tagpdf/ex-patch-list.tex
@@ -6,29 +6,29 @@
%It uses a command to end \item (\meti). It is perhaps possible to hide this command
% inside \item/end{list}, but with nested list it is not so easy.
+% not really up-to-date, with paratagging one could simplify things.
+
% Pay attention to casing. Li/LI, Lbody/Lbody are different.
%no page break involved. So the example works in lua and generic mode
\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfversion=1.7,lang=en-UK,uncompress}
+\DeclareDocumentMetadata{pdfversion=1.7,uncompress}
\documentclass{scrbook}
\usepackage[english]{babel}
\usepackage{tagpdf}
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\usepackage{luacode}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
+
\tagpdfsetup{tabsorder=structure,
- activate-all,
+ activate,
}
\usepackage{lipsum}%\textheight3cm
@@ -75,7 +75,7 @@
%I don't want to handle pagestyles, so set everything to empty:
\pagestyle{empty}\renewcommand\chapterpagestyle{empty}
-\tagstructbegin{tag=Document}
+
\begin{itemize}
\item \TAGP Ducks say quack\PGAT\meti
@@ -92,5 +92,5 @@
\item[marmots] \TAGP brown\PGAT\meti
\end{description}
-\tagstructend %Document
+
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf b/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
index ca36f06b5f..c0e033318c 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
+++ b/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.pdf b/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.pdf
index 3ea368b585..4b1ceb47ad 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.pdf
+++ b/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.pdf
@@ -1,49 +1,47 @@
%PDF-1.7
%
-10 0 obj
+11 0 obj
<< /MCID 0 >>
endobj
-15 0 obj
+16 0 obj
<< /MCID 1 >>
endobj
-17 0 obj
+18 0 obj
<< /MCID 2 >>
endobj
-19 0 obj
+20 0 obj
<< /MCID 3 >>
endobj
-22 0 obj
+23 0 obj
<< /MCID 4 >>
endobj
-24 0 obj
+25 0 obj
<< /MCID 5 >>
endobj
-27 0 obj
+28 0 obj
<< /MCID 6 >>
endobj
-29 0 obj
+30 0 obj
<< /MCID 7 >>
endobj
-31 0 obj
+32 0 obj
<< /MCID 8 >>
endobj
-34 0 obj
+35 0 obj
<< /MCID 9 >>
endobj
-36 0 obj
+37 0 obj
<< /MCID 10 >>
endobj
-38 0 obj
+39 0 obj
<< /MCID 11 >>
endobj
-40 0 obj
+41 0 obj
<<
-/Length 5620
+/Length 5594
>>
stream
/opacity1 gs
-/opacity1 gs
-/opacity1 gs
/H1 /l3pdf1 BDC
BT
/F32 20.6625 Tf 59.528 690.672 Td [(Contents)]TJ
@@ -457,64 +455,60 @@ EMC
endstream
endobj
-11 0 obj
+12 0 obj
<<
/Type /Page
-/Contents 40 0 R
-/Resources 39 0 R
+/Contents 41 0 R
+/Resources 40 0 R
/MediaBox [0 0 595.276 841.89]
/Tabs /S /StructParents 0
-/Parent 43 0 R
+/Parent 44 0 R
>>
endobj
-39 0 obj
+40 0 obj
<<
-/Properties <</l3pdf1 10 0 R /l3pdf2 15 0 R /l3pdf3 17 0 R /l3pdf4 19 0 R /l3pdf5 22 0 R /l3pdf6 24 0 R /l3pdf7 27 0 R /l3pdf8 29 0 R /l3pdf9 31 0 R /l3pdf10 34 0 R /l3pdf11 36 0 R /l3pdf12 38 0 R >>/ExtGState 1 0 R
-/Font << /F32 41 0 R /F29 42 0 R >>
+/Properties <</l3pdf1 11 0 R /l3pdf2 16 0 R /l3pdf3 18 0 R /l3pdf4 20 0 R /l3pdf5 23 0 R /l3pdf6 25 0 R /l3pdf7 28 0 R /l3pdf8 30 0 R /l3pdf9 32 0 R /l3pdf10 35 0 R /l3pdf11 37 0 R /l3pdf12 39 0 R >>/ExtGState 1 0 R
+/Font << /F32 42 0 R /F29 43 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-46 0 obj
+47 0 obj
<<
-/Length 39
+/Length 13
>>
stream
/opacity1 gs
-/opacity1 gs
-/opacity1 gs
endstream
endobj
-45 0 obj
+46 0 obj
<<
/Type /Page
-/Contents 46 0 R
-/Resources 44 0 R
+/Contents 47 0 R
+/Resources 45 0 R
/MediaBox [0 0 595.276 841.89]
/Tabs /S /StructParents 1
-/Parent 43 0 R
+/Parent 44 0 R
>>
endobj
-44 0 obj
+45 0 obj
<<
/ExtGState 1 0 R
/ProcSet [ /PDF ]
>>
endobj
-48 0 obj
+49 0 obj
<< /MCID 0 >>
endobj
-50 0 obj
+51 0 obj
<< /MCID 1 >>
endobj
-52 0 obj
+53 0 obj
<<
-/Length 183
+/Length 157
>>
stream
/opacity1 gs
-/opacity1 gs
-/opacity1 gs
/H1 /l3pdf13 BDC
BT
/F32 20.6625 Tf 59.528 690.672 Td [(1)]TJ
@@ -528,85 +522,81 @@ EMC
endstream
endobj
-49 0 obj
+50 0 obj
<<
/Type /Page
-/Contents 52 0 R
-/Resources 51 0 R
+/Contents 53 0 R
+/Resources 52 0 R
/MediaBox [0 0 595.276 841.89]
/Tabs /S /StructParents 2
-/Parent 43 0 R
+/Parent 44 0 R
>>
endobj
-51 0 obj
+52 0 obj
<<
-/Properties <</l3pdf13 48 0 R /l3pdf14 50 0 R >>/ExtGState 1 0 R
-/Font << /F32 41 0 R >>
+/Properties <</l3pdf13 49 0 R /l3pdf14 51 0 R >>/ExtGState 1 0 R
+/Font << /F32 42 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-55 0 obj
+56 0 obj
<<
-/Length 39
+/Length 13
>>
stream
/opacity1 gs
-/opacity1 gs
-/opacity1 gs
endstream
endobj
-54 0 obj
+55 0 obj
<<
/Type /Page
-/Contents 55 0 R
-/Resources 53 0 R
+/Contents 56 0 R
+/Resources 54 0 R
/MediaBox [0 0 595.276 841.89]
/Tabs /S /StructParents 3
-/Parent 43 0 R
+/Parent 44 0 R
>>
endobj
-53 0 obj
+54 0 obj
<<
/ExtGState 1 0 R
/ProcSet [ /PDF ]
>>
endobj
-57 0 obj
+58 0 obj
<< /MCID 0 >>
endobj
-60 0 obj
+61 0 obj
<< /MCID 1 >>
endobj
-61 0 obj
+62 0 obj
<< /MCID 2 >>
endobj
-63 0 obj
+64 0 obj
<< /MCID 3 >>
endobj
-64 0 obj
+65 0 obj
<< /MCID 4 >>
endobj
-66 0 obj
+67 0 obj
<< /MCID 5 >>
endobj
-67 0 obj
+68 0 obj
<< /MCID 6 >>
endobj
-69 0 obj
+70 0 obj
<< /MCID 7 >>
endobj
1 0 obj
<< /opacity1 <</ca 1/CA 1>> >>
endobj
-71 0 obj
+72 0 obj
<<
-/Length 622
+/Length 595
>>
stream
/opacity1 gs
-/opacity1 gs
-/opacity1 gs
/H1 /l3pdf15 BDC
BT
/F32 20.6625 Tf 59.528 690.672 Td [(chapter)]TJ
@@ -619,7 +609,7 @@ ET
EMC
/H2 /l3pdf17 BDC
BT
-/F41 14.3462 Tf 80.586 649.367 Td [(section)]TJ
+/F41 14.3462 Tf 88.826 649.367 Td [(section)]TJ
ET
EMC
/H3 /l3pdf18 BDC
@@ -629,7 +619,7 @@ ET
EMC
/H3 /l3pdf19 BDC
BT
-/F42 11.9552 Tf 87.167 624.619 Td [(subsection)]TJ
+/F42 11.9552 Tf 93.89 624.619 Td [(subsection)]TJ
ET
EMC
/H4 /l3pdf20 BDC
@@ -647,128 +637,131 @@ EMC
endstream
endobj
-58 0 obj
+59 0 obj
<<
/Type /Page
-/Contents 71 0 R
-/Resources 70 0 R
+/Contents 72 0 R
+/Resources 71 0 R
/MediaBox [0 0 595.276 841.89]
/Tabs /S /StructParents 4
-/Parent 43 0 R
+/Parent 44 0 R
>>
endobj
-70 0 obj
+71 0 obj
<<
-/Properties <</l3pdf15 57 0 R /l3pdf16 60 0 R /l3pdf17 61 0 R /l3pdf18 63 0 R /l3pdf19 64 0 R /l3pdf20 66 0 R /l3pdf21 67 0 R /l3pdf22 69 0 R >>/ExtGState 1 0 R
-/Font << /F32 41 0 R /F41 72 0 R /F42 73 0 R /F31 74 0 R /F29 42 0 R >>
+/Properties <</l3pdf15 58 0 R /l3pdf16 61 0 R /l3pdf17 62 0 R /l3pdf18 64 0 R /l3pdf19 65 0 R /l3pdf20 67 0 R /l3pdf21 68 0 R /l3pdf22 70 0 R >>/ExtGState 1 0 R
+/Font << /F32 42 0 R /F41 73 0 R /F42 74 0 R /F31 75 0 R /F29 43 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-75 0 obj
+76 0 obj
<< /Marked true >>
endobj
6 0 obj
-<< /Nums [0 [ 9 0 R 14 0 R 16 0 R 18 0 R 21 0 R 23 0 R 26 0 R 28 0 R 30 0 R 33 0 R 35 0 R 37 0 R ]
+<< /Nums [0 [ 10 0 R 15 0 R 17 0 R 19 0 R 22 0 R 24 0 R 27 0 R 29 0 R 31 0 R 34 0 R 36 0 R 38 0 R ]
1 [ ]
-2 [ 47 0 R 47 0 R ]
+2 [ 48 0 R 48 0 R ]
3 [ ]
-4 [ 56 0 R 59 0 R 59 0 R 62 0 R 62 0 R 65 0 R 65 0 R 68 0 R ]
+4 [ 57 0 R 60 0 R 60 0 R 63 0 R 63 0 R 66 0 R 66 0 R 69 0 R ]
] >>
endobj
7 0 obj
-<< >>
+<< /DocumentFragment /Art /Aside /Note /Title /H1 /Sub /Span /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /FENote /Note /Em /Span /Strong /Span >>
endobj
8 0 obj
-<< /Type /StructElem /S /Document /P 5 0 R /K [9 0 R 12 0 R 47 0 R 56 0 R 59 0 R 62 0 R 65 0 R 68 0 R] >>
+[ ]
endobj
9 0 obj
-<< /Type /StructElem /S /H1 /P 8 0 R /K <</Type /MCR /Pg 11 0 R/MCID 0>> >>
+<< /Type /StructElem /S /Document /P 5 0 R /K [10 0 R 13 0 R 48 0 R 57 0 R 60 0 R 63 0 R 66 0 R 69 0 R] >>
endobj
-12 0 obj
-<< /Type /StructElem /S /TOC /P 8 0 R /K [13 0 R 20 0 R 25 0 R 32 0 R] >>
+10 0 obj
+<< /Type /StructElem /S /H1 /P 9 0 R /K <</Type /MCR /Pg 12 0 R/MCID 0>> >>
endobj
13 0 obj
-<< /Type /StructElem /S /TOCI /P 12 0 R /K [14 0 R 16 0 R 18 0 R] >>
+<< /Type /StructElem /S /TOC /P 9 0 R /K [14 0 R 21 0 R 26 0 R 33 0 R] >>
endobj
14 0 obj
-<< /Type /StructElem /S /Lbl /P 13 0 R /K <</Type /MCR /Pg 11 0 R/MCID 1>> >>
+<< /Type /StructElem /S /TOCI /P 13 0 R /K [15 0 R 17 0 R 19 0 R] >>
endobj
-16 0 obj
-<< /Type /StructElem /S /P /P 13 0 R /K <</Type /MCR /Pg 11 0 R/MCID 2>> >>
+15 0 obj
+<< /Type /StructElem /S /Lbl /P 14 0 R /K <</Type /MCR /Pg 12 0 R/MCID 1>> >>
endobj
-18 0 obj
-<< /Type /StructElem /S /Reference /P 13 0 R /K <</Type /MCR /Pg 11 0 R/MCID 3>> >>
+17 0 obj
+<< /Type /StructElem /S /P /P 14 0 R /K <</Type /MCR /Pg 12 0 R/MCID 2>> >>
endobj
-20 0 obj
-<< /Type /StructElem /S /TOCI /P 12 0 R /K [21 0 R 23 0 R] >>
+19 0 obj
+<< /Type /StructElem /S /Reference /P 14 0 R /K <</Type /MCR /Pg 12 0 R/MCID 3>> >>
endobj
21 0 obj
-<< /Type /StructElem /S /P /P 20 0 R /K <</Type /MCR /Pg 11 0 R/MCID 4>> >>
+<< /Type /StructElem /S /TOCI /P 13 0 R /K [22 0 R 24 0 R] >>
endobj
-23 0 obj
-<< /Type /StructElem /S /Reference /P 20 0 R /K <</Type /MCR /Pg 11 0 R/MCID 5>> >>
+22 0 obj
+<< /Type /StructElem /S /P /P 21 0 R /K <</Type /MCR /Pg 12 0 R/MCID 4>> >>
endobj
-25 0 obj
-<< /Type /StructElem /S /TOCI /P 12 0 R /K [26 0 R 28 0 R 30 0 R] >>
+24 0 obj
+<< /Type /StructElem /S /Reference /P 21 0 R /K <</Type /MCR /Pg 12 0 R/MCID 5>> >>
endobj
26 0 obj
-<< /Type /StructElem /S /Lbl /P 25 0 R /K <</Type /MCR /Pg 11 0 R/MCID 6>> >>
+<< /Type /StructElem /S /TOCI /P 13 0 R /K [27 0 R 29 0 R 31 0 R] >>
endobj
-28 0 obj
-<< /Type /StructElem /S /P /P 25 0 R /K <</Type /MCR /Pg 11 0 R/MCID 7>> >>
+27 0 obj
+<< /Type /StructElem /S /Lbl /P 26 0 R /K <</Type /MCR /Pg 12 0 R/MCID 6>> >>
endobj
-30 0 obj
-<< /Type /StructElem /S /Reference /P 25 0 R /K <</Type /MCR /Pg 11 0 R/MCID 8>> >>
+29 0 obj
+<< /Type /StructElem /S /P /P 26 0 R /K <</Type /MCR /Pg 12 0 R/MCID 7>> >>
endobj
-32 0 obj
-<< /Type /StructElem /S /TOCI /P 12 0 R /K [33 0 R 35 0 R 37 0 R] >>
+31 0 obj
+<< /Type /StructElem /S /Reference /P 26 0 R /K <</Type /MCR /Pg 12 0 R/MCID 8>> >>
endobj
33 0 obj
-<< /Type /StructElem /S /Lbl /P 32 0 R /K <</Type /MCR /Pg 11 0 R/MCID 9>> >>
+<< /Type /StructElem /S /TOCI /P 13 0 R /K [34 0 R 36 0 R 38 0 R] >>
endobj
-35 0 obj
-<< /Type /StructElem /S /P /P 32 0 R /K <</Type /MCR /Pg 11 0 R/MCID 10>> >>
+34 0 obj
+<< /Type /StructElem /S /Lbl /P 33 0 R /K <</Type /MCR /Pg 12 0 R/MCID 9>> >>
endobj
-37 0 obj
-<< /Type /StructElem /S /Reference /P 32 0 R /K <</Type /MCR /Pg 11 0 R/MCID 11>> >>
+36 0 obj
+<< /Type /StructElem /S /P /P 33 0 R /K <</Type /MCR /Pg 12 0 R/MCID 10>> >>
endobj
-47 0 obj
-<< /Type /StructElem /S /H1 /P 8 0 R /K [<</Type /MCR /Pg 49 0 R/MCID 0>> <</Type /MCR /Pg 49 0 R/MCID 1>>] >>
+38 0 obj
+<< /Type /StructElem /S /Reference /P 33 0 R /K <</Type /MCR /Pg 12 0 R/MCID 11>> >>
endobj
-56 0 obj
-<< /Type /StructElem /S /H1 /P 8 0 R /K <</Type /MCR /Pg 58 0 R/MCID 0>> >>
+48 0 obj
+<< /Type /StructElem /S /H1 /P 9 0 R /K [<</Type /MCR /Pg 50 0 R/MCID 0>> <</Type /MCR /Pg 50 0 R/MCID 1>>] >>
endobj
-59 0 obj
-<< /Type /StructElem /S /H2 /P 8 0 R /K [<</Type /MCR /Pg 58 0 R/MCID 1>> <</Type /MCR /Pg 58 0 R/MCID 2>>] >>
+57 0 obj
+<< /Type /StructElem /S /H1 /P 9 0 R /K <</Type /MCR /Pg 59 0 R/MCID 0>> >>
endobj
-62 0 obj
-<< /Type /StructElem /S /H3 /P 8 0 R /K [<</Type /MCR /Pg 58 0 R/MCID 3>> <</Type /MCR /Pg 58 0 R/MCID 4>>] >>
+60 0 obj
+<< /Type /StructElem /S /H2 /P 9 0 R /K [<</Type /MCR /Pg 59 0 R/MCID 1>> <</Type /MCR /Pg 59 0 R/MCID 2>>] >>
endobj
-65 0 obj
-<< /Type /StructElem /S /H4 /P 8 0 R /K [<</Type /MCR /Pg 58 0 R/MCID 5>> <</Type /MCR /Pg 58 0 R/MCID 6>>] >>
+63 0 obj
+<< /Type /StructElem /S /H3 /P 9 0 R /K [<</Type /MCR /Pg 59 0 R/MCID 3>> <</Type /MCR /Pg 59 0 R/MCID 4>>] >>
endobj
-68 0 obj
-<< /Type /StructElem /S /P /P 8 0 R /K <</Type /MCR /Pg 58 0 R/MCID 7>> /ActualText <FEFF0061006200630021> >>
+66 0 obj
+<< /Type /StructElem /S /H4 /P 9 0 R /K [<</Type /MCR /Pg 59 0 R/MCID 5>> <</Type /MCR /Pg 59 0 R/MCID 6>>] >>
+endobj
+69 0 obj
+<< /Type /StructElem /S /P /P 9 0 R /K <</Type /MCR /Pg 59 0 R/MCID 7>> /ActualText <FEFF0061006200630021> >>
endobj
5 0 obj
-<< /Type /StructTreeRoot /K 8 0 R /ParentTree 6 0 R /RoleMap 7 0 R >>
+<< /Type /StructTreeRoot /K 9 0 R /ParentTree 6 0 R /RoleMap 7 0 R /Namespaces 8 0 R >>
endobj
-77 0 obj
+78 0 obj
[565 489.6 565 502.5 336.6 550.8 565 259 289.6 534.4 259 871 565 550.8 565 565 374.3 422.3 397.8 565]
endobj
-78 0 obj
+79 0 obj
[312.4 562.4 562.4 562.4 562.4 562.4 562.4 562.4 562.4 562.4 562.4 562.4 312.4 312.4 874.8 874.8 874.8 531.1 749.8 742.9 746.3 718.6 808.8 671.1 639.9 749.8 786.8 305.5 527.6 774.1 608.6 974.3 786.8 830.8 715.1 830.8 724.4 624.8 768.3 764.9 742.9 1055.3 742.9 742.9 687.3 339 562.4 339 687.3 874.8 312.4 539.2 578.6 499.9 578.6 510.9 343.7 562.4 578.6 266.1 297.4 547.3 266.1 891 578.6 562.4 578.6 578.6 383 431.1 406.1 578.6]
endobj
-79 0 obj
+80 0 obj
[319.1 574.4 574.4 574.4 574.4 574.4 574.4 574.4 574.4 574.4 574.4 574.4 319.1 319.1 893.5 893.5 893.5 542.5 765.8 767.2 766.5 733.9 830.3 681.6 649.7 765.8 820.1 320.4 543.1 799.1 617.8 1011.6 820.1 840.5 734.6 840.5 740 638.2 776.7 793.6 767.2 1086.3 767.2 767.2 702 348.3 574.4 348.3 702 893.5 319.1 550.7 590.8 510.6 590.8 523.9 351 574.4 590.8 271.7 303.7 558.9 271.7 909.9 590.8 574.4 590.8 590.8 391.2 440.4 414.8]
endobj
-80 0 obj
+81 0 obj
[276.4 497.2 497.2 497.2 497.2 497.2 497.2 497.2 497.2 497.2 497.2 497.2 276.4 276.4 773.2 773.2 773.2 469.6 773.2 745.3 704 718 759.2 676.4 648.8 780 745.3 358.9 510.8 772.9 621.2 910.9 745.3 773.2 676.4 773.2 731.6 552.4 718 745.3 745.3 1021.3 745.3 745.3 607.6 276.4 497.2 276.4 607.6 773.2 276.4 497.2 552.4 442 552.4 442 304 497.2 552.4 276.4 304 524.8 276.4 828.4 552.4 497.2 552.4 524.8 386.8 392.3 386.8 552.4 524.8 718 524.8]
endobj
-81 0 obj
+82 0 obj
[584.9 584.9 584.9 584.9 584.9 584.9 584.9 584.9 584.9 325 325 909.9 909.9 909.9 552.4 779.9 781.2 780.6 747.4 845.5 706.8 674.3 779.9 822.5 326.3 553.1 813.7 641.8 1017.4 822.5 868.6 748.1 868.6 759.9 649.9 803.6 801.8 781.2 1106.2 781.2 781.2 714.9 343.9 584.9 343.9 714.9 909.9 325 562.8 605.7 519.9 605.7 522.6 357.5 584.9 605.7 280.8 313.3 573.2 280.8 930.7 605.7 584.9 605.7 605.7 400.3 448.4 422.4]
endobj
-82 0 obj
+83 0 obj
<<
/Length1 721
/Length2 14150
@@ -856,7 +849,7 @@ Yoe${S·$`gW~_99kuOW"i = l}yz}Q}xihʢ
DpXاfZR l8s먴up{M+ Tky SB vRu3
endstream
endobj
-83 0 obj
+84 0 obj
<<
/Type /FontDescriptor
/FontName /HHSFZO+SFRM1095
@@ -869,10 +862,10 @@ endobj
/StemV 50
/XHeight 430
/CharSet (/a/b/c/e/five/g/h/i/n/o/one/p/period/r/s/t/three/u/x)
-/FontFile 82 0 R
+/FontFile 83 0 R
>>
endobj
-84 0 obj
+85 0 obj
<<
/Length1 738
/Length2 12419
@@ -942,7 +935,7 @@ nOvՃeM~Y
ZC^s&0lV1śMpS VP(=譾|dT([T{~>\R C[$iJ+fV qI%w2b-ז?1҆U{m^YZ{%.Lw jJUUpu+a^D;G, ajh_j#J8Vqct]8 a'БO['yCux*1KnBAQ厅Ea34gvK%g~fː4o3gIaV(7̶>@A#Xɱ*wNq +rcݮ4K#XCulIӨj%12륽~)$H58!"+HUgOLw&Ѧ >kscA
endstream
endobj
-85 0 obj
+86 0 obj
<<
/Type /FontDescriptor
/FontName /FKLUEV+SFSX1095
@@ -955,10 +948,10 @@ endobj
/StemV 50
/XHeight 459
/CharSet (/b/c/e/i/n/o/s/t/u)
-/FontFile 84 0 R
+/FontFile 85 0 R
>>
endobj
-86 0 obj
+87 0 obj
<<
/Length1 738
/Length2 12694
@@ -1034,7 +1027,7 @@ IR4o X[|#,?;.ҠR
ګɗ0?1` * θ1W%*‚+6%'
endstream
endobj
-87 0 obj
+88 0 obj
<<
/Type /FontDescriptor
/FontName /KKGAAD+SFSX1200
@@ -1047,10 +1040,10 @@ endobj
/StemV 50
/XHeight 458
/CharSet (/b/c/e/i/n/o/one/period/s/t/u)
-/FontFile 86 0 R
+/FontFile 87 0 R
>>
endobj
-88 0 obj
+89 0 obj
<<
/Length1 738
/Length2 11968
@@ -1123,7 +1116,7 @@ Mz
uoCpMcQ؋6lԁa:@k L5̚ \\C<
endstream
endobj
-89 0 obj
+90 0 obj
<<
/Type /FontDescriptor
/FontName /RQIEES+SFSX1440
@@ -1136,10 +1129,10 @@ endobj
/StemV 50
/XHeight 451
/CharSet (/c/e/i/n/o/one/period/s/t)
-/FontFile 88 0 R
+/FontFile 89 0 R
>>
endobj
-90 0 obj
+91 0 obj
<<
/Length1 738
/Length2 8972
@@ -1203,7 +1196,7 @@ B4CZHh|8cxH?B3&>Otݹ[F[>)ΘԠ72K0qt8쮖A$
D%3[#_X*@7
endstream
endobj
-91 0 obj
+92 0 obj
<<
/Type /FontDescriptor
/FontName /FEKEGK+SFSX2074
@@ -1216,16 +1209,16 @@ endobj
/StemV 50
/XHeight 447
/CharSet (/C/a/c/e/h/n/o/one/p/r/s/t)
-/FontFile 90 0 R
+/FontFile 91 0 R
>>
endobj
-76 0 obj
+77 0 obj
<<
/Type /Encoding
/Differences [46/period 49/one 51/three 53/five 67/C 97/a/b/c 101/e 103/g/h/i 110/n/o/p 114/r/s/t/u 120/x]
>>
endobj
-92 0 obj
+93 0 obj
<<
/Length 1996
>>
@@ -1368,20 +1361,20 @@ end
endstream
endobj
-42 0 obj
+43 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /HHSFZO+SFRM1095
-/FontDescriptor 83 0 R
+/FontDescriptor 84 0 R
/FirstChar 46
/LastChar 120
-/Widths 80 0 R
-/Encoding 76 0 R
-/ToUnicode 92 0 R
+/Widths 81 0 R
+/Encoding 77 0 R
+/ToUnicode 93 0 R
>>
endobj
-93 0 obj
+94 0 obj
<<
/Length 1996
>>
@@ -1524,20 +1517,20 @@ end
endstream
endobj
-74 0 obj
+75 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /FKLUEV+SFSX1095
-/FontDescriptor 85 0 R
+/FontDescriptor 86 0 R
/FirstChar 98
/LastChar 117
-/Widths 77 0 R
-/Encoding 76 0 R
-/ToUnicode 93 0 R
+/Widths 78 0 R
+/Encoding 77 0 R
+/ToUnicode 94 0 R
>>
endobj
-94 0 obj
+95 0 obj
<<
/Length 1996
>>
@@ -1680,20 +1673,20 @@ end
endstream
endobj
-73 0 obj
+74 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /KKGAAD+SFSX1200
-/FontDescriptor 87 0 R
+/FontDescriptor 88 0 R
/FirstChar 46
/LastChar 117
-/Widths 78 0 R
-/Encoding 76 0 R
-/ToUnicode 94 0 R
+/Widths 79 0 R
+/Encoding 77 0 R
+/ToUnicode 95 0 R
>>
endobj
-95 0 obj
+96 0 obj
<<
/Length 1996
>>
@@ -1836,20 +1829,20 @@ end
endstream
endobj
-72 0 obj
+73 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /RQIEES+SFSX1440
-/FontDescriptor 89 0 R
+/FontDescriptor 90 0 R
/FirstChar 46
/LastChar 116
-/Widths 79 0 R
-/Encoding 76 0 R
-/ToUnicode 95 0 R
+/Widths 80 0 R
+/Encoding 77 0 R
+/ToUnicode 96 0 R
>>
endobj
-96 0 obj
+97 0 obj
<<
/Length 1996
>>
@@ -1992,149 +1985,150 @@ end
endstream
endobj
-41 0 obj
+42 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /FEKEGK+SFSX2074
-/FontDescriptor 91 0 R
+/FontDescriptor 92 0 R
/FirstChar 49
/LastChar 116
-/Widths 81 0 R
-/Encoding 76 0 R
-/ToUnicode 96 0 R
+/Widths 82 0 R
+/Encoding 77 0 R
+/ToUnicode 97 0 R
>>
endobj
-43 0 obj
+44 0 obj
<<
/Type /Pages
/Count 5
-/Kids [11 0 R 45 0 R 49 0 R 54 0 R 58 0 R]
+/Kids [12 0 R 46 0 R 50 0 R 55 0 R 59 0 R]
>>
endobj
-97 0 obj
+98 0 obj
<<
/Type /Catalog
-/Pages 43 0 R
-/MarkInfo 75 0 R/Lang (en-US)/StructTreeRoot 5 0 R
+/Pages 44 0 R
+/MarkInfo 76 0 R/Lang (en-US)/StructTreeRoot 5 0 R
>>
endobj
-98 0 obj
+99 0 obj
<<
-/Producer (pdfTeX-1.40.21)
+/Producer (pdfTeX-1.40.23)
/Creator (TeX)
-/CreationDate (D:20210223094129+01'00')
-/ModDate (D:20210223094129+01'00')
+/CreationDate (D:20210713163210+02'00')
+/ModDate (D:20210713163210+02'00')
/Trapped /False
-/PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.21 (TeX Live 2020/W32TeX) kpathsea version 6.3.2)
+/PTEX.Fullbanner (This is pdfTeX, Version 3.141592653-2.6-1.40.23 (TeX Live 2021/W32TeX) kpathsea version 6.3.3)
>>
endobj
xref
-0 99
+0 100
0000000002 65535 f
-0000007935 00000 n
+0000007831 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000011793 00000 n
-0000009121 00000 n
-0000009334 00000 n
-0000009356 00000 n
-0000009478 00000 n
+0000011814 00000 n
+0000008990 00000 n
+0000009204 00000 n
+0000009355 00000 n
+0000009375 00000 n
+0000009498 00000 n
0000000015 00000 n
-0000006068 00000 n
-0000009570 00000 n
-0000009661 00000 n
-0000009747 00000 n
+0000006042 00000 n
+0000009591 00000 n
+0000009682 00000 n
+0000009768 00000 n
0000000046 00000 n
-0000009842 00000 n
+0000009863 00000 n
0000000077 00000 n
-0000009935 00000 n
+0000009956 00000 n
0000000108 00000 n
-0000010036 00000 n
-0000010115 00000 n
+0000010057 00000 n
+0000010136 00000 n
0000000139 00000 n
-0000010208 00000 n
+0000010229 00000 n
0000000170 00000 n
-0000010309 00000 n
-0000010395 00000 n
+0000010330 00000 n
+0000010416 00000 n
0000000201 00000 n
-0000010490 00000 n
+0000010511 00000 n
0000000232 00000 n
-0000010583 00000 n
+0000010604 00000 n
0000000263 00000 n
-0000010684 00000 n
-0000010770 00000 n
+0000010705 00000 n
+0000010791 00000 n
0000000294 00000 n
-0000010865 00000 n
+0000010886 00000 n
0000000325 00000 n
-0000010959 00000 n
+0000010980 00000 n
0000000357 00000 n
-0000006210 00000 n
+0000006184 00000 n
0000000389 00000 n
-0000090493 00000 n
-0000081561 00000 n
-0000090671 00000 n
-0000006749 00000 n
-0000006607 00000 n
-0000006509 00000 n
-0000011061 00000 n
-0000006807 00000 n
-0000007111 00000 n
-0000006838 00000 n
-0000007253 00000 n
-0000006869 00000 n
-0000007629 00000 n
-0000007487 00000 n
-0000007389 00000 n
-0000011189 00000 n
-0000007687 00000 n
-0000008663 00000 n
-0000011282 00000 n
-0000007718 00000 n
-0000007749 00000 n
-0000011410 00000 n
-0000007780 00000 n
-0000007811 00000 n
-0000011538 00000 n
-0000007842 00000 n
-0000007873 00000 n
-0000011666 00000 n
-0000007904 00000 n
-0000008805 00000 n
-0000007982 00000 n
-0000088260 00000 n
-0000086027 00000 n
-0000083794 00000 n
-0000009085 00000 n
-0000079361 00000 n
-0000011879 00000 n
-0000011997 00000 n
-0000012440 00000 n
-0000012878 00000 n
-0000013329 00000 n
-0000013751 00000 n
-0000028720 00000 n
-0000028991 00000 n
-0000042246 00000 n
-0000042483 00000 n
-0000056013 00000 n
-0000056261 00000 n
-0000069065 00000 n
-0000069309 00000 n
-0000079116 00000 n
-0000079506 00000 n
-0000081739 00000 n
-0000083972 00000 n
-0000086205 00000 n
-0000088438 00000 n
-0000090758 00000 n
-0000090860 00000 n
+0000090532 00000 n
+0000081600 00000 n
+0000090710 00000 n
+0000006697 00000 n
+0000006555 00000 n
+0000006483 00000 n
+0000011082 00000 n
+0000006755 00000 n
+0000007033 00000 n
+0000006786 00000 n
+0000007175 00000 n
+0000006817 00000 n
+0000007525 00000 n
+0000007383 00000 n
+0000007311 00000 n
+0000011210 00000 n
+0000007583 00000 n
+0000008532 00000 n
+0000011303 00000 n
+0000007614 00000 n
+0000007645 00000 n
+0000011431 00000 n
+0000007676 00000 n
+0000007707 00000 n
+0000011559 00000 n
+0000007738 00000 n
+0000007769 00000 n
+0000011687 00000 n
+0000007800 00000 n
+0000008674 00000 n
+0000007878 00000 n
+0000088299 00000 n
+0000086066 00000 n
+0000083833 00000 n
+0000008954 00000 n
+0000079400 00000 n
+0000011918 00000 n
+0000012036 00000 n
+0000012479 00000 n
+0000012917 00000 n
+0000013368 00000 n
+0000013790 00000 n
+0000028759 00000 n
+0000029030 00000 n
+0000042285 00000 n
+0000042522 00000 n
+0000056052 00000 n
+0000056300 00000 n
+0000069104 00000 n
+0000069348 00000 n
+0000079155 00000 n
+0000079545 00000 n
+0000081778 00000 n
+0000084011 00000 n
+0000086244 00000 n
+0000088477 00000 n
+0000090797 00000 n
+0000090899 00000 n
trailer
-<< /Size 99
-/Root 97 0 R
-/Info 98 0 R
-/ID [<C421EEA71FB95AB1F6B5F65261AA2F65> <C421EEA71FB95AB1F6B5F65261AA2F65>] >>
+<< /Size 100
+/Root 98 0 R
+/Info 99 0 R
+/ID [<A273A391B74CA8F331548AD088A757DA> <A273A391B74CA8F331548AD088A757DA>] >>
startxref
-91127
+91167
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex b/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex
index 52277eef3a..ab46a9ac97 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex
+++ b/macros/latex/contrib/tagpdf/ex-patch-sectioning-koma.tex
@@ -8,6 +8,10 @@
%no page break involved. So the example works in lua and generic mode
+% unclear if everything still works. They have been some changes in koma
+% doesn't take paratagging into account.
+
+
\RequirePackage{pdfmanagement-testphase}
\DeclareDocumentMetadata{pdfversion=1.7,uncompress}
@@ -16,20 +20,18 @@
\usepackage{tagpdf}
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\usepackage{luacode}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
+
\tagpdfsetup{tabsorder=structure,
- activate-all,
+ activate,
}
@@ -158,7 +160,6 @@
%I don't want to handle pagestyles, so set everything to empty:
\pagestyle{empty}\renewcommand\chapterpagestyle{empty}
-\tagstructbegin{tag=Document}
\tableofcontents
@@ -174,5 +175,4 @@
\tagmcend
\tagstructend
-\tagstructend %Document
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf b/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf
index 46f5f36354..6ba2eec79e 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf
+++ b/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex b/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex
index aefda1cbcb..1177fd2dc4 100644
--- a/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex
+++ b/macros/latex/contrib/tagpdf/ex-patch-sectioning-memoir.tex
@@ -1,5 +1,9 @@
% !Mode:: "TeX:DE:UTF-8:Main"
%chapter not correct!!
+% 13.07.2021 doesn't use paratagging!
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{pdfversion=1.7,uncompress}
+
\documentclass[a4paper,oneside]{memoir}
\settocdepth{subsubsection}
\setsecnumdepth{subsubsection}
@@ -9,25 +13,17 @@
\usepackage{tagpdf}
-\tagpdfifpdftexT
- {
- %set language / can also be done with hyperref
- \pdfcatalog{/Lang (en-US)}
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
- %set language / can also be done with hyperref
- \pdfextension catalog{/Lang (en-US)}
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\usepackage{luacode}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
\tagpdfsetup{tabsorder=structure,
- activate-all,
- uncompress
+ activate,interwordspace
}
\usepackage{lipsum}%\textheight3cm
@@ -213,7 +209,6 @@
%% missing yet: chapter titles
\begin{document}
-\tagstructbegin{tag=Document}
\tableofcontents*
@@ -246,7 +241,6 @@ test
\section*{Starred section}
-\tagstructend
\end{document}
diff --git a/macros/latex/contrib/tagpdf/ex-softhyphen.pdf b/macros/latex/contrib/tagpdf/ex-softhyphen.pdf
index 249edec1d6..8f7271a6e6 100644
--- a/macros/latex/contrib/tagpdf/ex-softhyphen.pdf
+++ b/macros/latex/contrib/tagpdf/ex-softhyphen.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-softhyphen.tex b/macros/latex/contrib/tagpdf/ex-softhyphen.tex
index 7fb5c34a22..e5b14e13c4 100644
--- a/macros/latex/contrib/tagpdf/ex-softhyphen.tex
+++ b/macros/latex/contrib/tagpdf/ex-softhyphen.tex
@@ -2,10 +2,13 @@
% !! needs lualatex
% this sets the hyphen used by automatic hyphenation to 00AD
% this improves copy&pasting
-% the example gives aaaaaaa-aaaaaaaaaaaaa-aaaaaa Ministerpräsident
+% the example gives
+% aaaaaaa-aaaaaa aaaaaaa-aaaaaa
+% Ministerpräsident
% when copied from adobe
-% open problem: line ends are not copy&pasted as spaces.
-% see also pull request #1, branch fake-space
+% sumatra doesn't understand this and copies Mi­nisterprä­sident
+
+
\RequirePackage{pdfmanagement-testphase}
\DeclareDocumentMetadata{pdfversion=1.7,uncompress}
@@ -14,28 +17,38 @@
\usepackage[ngerman]{babel} %to get some hyphenation
\usepackage{tagpdf}
\tagpdfsetup{tabsorder=structure,
- activate-all, %deactivate to see the difference
+ activate, %deactivate to see the difference
+ interwordspace,
+ paratagging
}
\usepackage{fontspec}
-
-\prehyphenchar`\^^ad
+% we must remove the invisible feature
+\setmainfont{TeX Gyre Pagella}[RawFeature={-invisible}]
+\prehyphenchar"AD
\pagestyle{empty}
\textwidth=1cm
\begin{document}
-\tagstructbegin{tag=Document}
- \tagstructbegin{tag=P}
- \tagmcbegin{tag=P}
- aaaaaaa-aaaaaa aaaaaaa-aaaaaa
- \tagmcend
- \tagstructend
-
- \tagstructbegin{tag=P}
- \tagmcbegin{tag=P}
- Ministerpräsident
- \tagmcend
- \tagstructend
-\tagstructend
+
+aaaaaaa-aaaaaa aaaaaaa-aaaaaa
+
+Ministerpräsident
+
\end{document}
+
+aaaaaaa-
+aaaaaa
+aaaaaaa-
+aaaaaa
+Mi­
+nisterprä­
+sident
+
+
+aaaaaaa-aaaaaa aaaaaaa-aaaaaa
+Ministerpräsident
+
+aaaaaaa-aaaaaa aaaaaaa-aaaaaa
+Ministerpräsident \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf b/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
index e1ccf5ef44..1d4b5312e9 100644
--- a/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
+++ b/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex b/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
index 554efad01e..d04f8824fb 100644
--- a/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
+++ b/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
@@ -8,16 +8,15 @@
\makeatletter
%\def\lst@outputspace{\pdffakespace\ } %not so good
% this here works fine with luatex, if the font has a space glyph:
+% the pdf then has four space glyphs. But this doesn't mean that they get copied&pasted!
\def\lst@visiblespace{\lst@ttfamily{\char32}{\char32}}
% with pdftex this could work
%\def\lst@visiblespace{\lst@ttfamily{\pdffakespace\ }{\pdffakespace\ }}
-\tagpdfsetup{activate-all,interwordspace=on,show-spaces,log=v}
+\tagpdfsetup{activate,interwordspace=on,show-spaces,log=v}
\begin{document}\pagestyle{empty}
-\tagstructbegin{tag=Document}
\tagmcbegin{tag=P}
\begin{lstlisting}[showspaces]
aaa aaa xxxx
\end{lstlisting}
\tagmcend
-\tagstructend
-\end{document} \ No newline at end of file
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-structure-luatex.pdf b/macros/latex/contrib/tagpdf/ex-structure-luatex.pdf
index 7f0ee51146..fce47848aa 100644
--- a/macros/latex/contrib/tagpdf/ex-structure-luatex.pdf
+++ b/macros/latex/contrib/tagpdf/ex-structure-luatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-structure.tex b/macros/latex/contrib/tagpdf/ex-structure.tex
index 58beb931d1..8ce5b624b8 100644
--- a/macros/latex/contrib/tagpdf/ex-structure.tex
+++ b/macros/latex/contrib/tagpdf/ex-structure.tex
@@ -7,31 +7,28 @@
\usepackage{tagpdf}
\usepackage{amsmath}
\usepackage{graphicx}
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
-\tagpdfifluatexT
- {
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\usepackage{luacode}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
\tagpdfsetup{tabsorder=structure,
- activate-all,
- uncompress
+ activate
}
\newsavebox\mybox
+% this works only as we have only one page. Footer/header must be handle in the output routine.
\usepackage{fancyhdr}
\pagestyle{fancy}
\fancyhf{}
\cfoot{\tagmcbegin{artifact=pagination}\thepage\tagmcend}
\begin{document}
-\tagstructbegin{tag=Document}
\tagstructbegin{tag=Sect}
\tagstructbegin{tag=H}
@@ -74,5 +71,5 @@
\tagstructend %L
\tagstructend %Sect
-\tagstructend %Document
+
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf b/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
index 9554ba8e32..699f824495 100644
--- a/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
+++ b/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-tagpdf-template.tex b/macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
index a7a1432dc8..a2b0db1164 100644
--- a/macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
+++ b/macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
@@ -3,33 +3,31 @@
%this is more or less minimal template that can be used as starting point
%it doesn't set everything that would be needed!
\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{lang=en-UK, uncompress}
+\DeclareDocumentMetadata
+ {
+ uncompress,
+ pdfversion=2.0
+ }
\documentclass{scrartcl}
\usepackage[english]{babel}
\usepackage{tagpdf}
-
-\tagpdfifpdftexT
- {
- \usepackage[T1]{fontenc}
- }
-
-\tagpdfifluatexT
- {
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
- }
+\else
+ \usepackage[T1]{fontenc}
+\fi
\tagpdfsetup
{
tabsorder=structure,
- activate-all,
+ activate, %adds Document structure
+ paratagging, %activates tagging of paragraphs.
+ interwordspace %actives interword spaces (lualatex, pdflatex)
}
\begin{document}
\pagestyle{empty} %
-\tagstructbegin{tag=Document}
-\tagmcbegin{tag=P}
a paragraph
-\tagmcend
-\tagstructend
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/global-ex.png b/macros/latex/contrib/tagpdf/global-ex.png
index 90bb73d157..f1ad7558e4 100644
--- a/macros/latex/contrib/tagpdf/global-ex.png
+++ b/macros/latex/contrib/tagpdf/global-ex.png
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/pac3.PNG b/macros/latex/contrib/tagpdf/pac3.PNG
index a3955577a9..f1ad7558e4 100644
--- a/macros/latex/contrib/tagpdf/pac3.PNG
+++ b/macros/latex/contrib/tagpdf/pac3.PNG
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
index 6f92a5fc09..f28a02ea6e 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
@@ -51,13 +51,13 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2021-07-03} {0.91}
+\ProvidesExplFile {tagpdf-luatex.def} {2021-08-27} {0.92}
{tagpdf~driver~for~luatex}
% \end{macrocode}
% \section{Loading the lua}
@@ -161,8 +161,8 @@
local ProvidesLuaModule = {
name = "tagpdf",
- version = "0.91", --TAGVERSION
- date = "2021-07-03", --TAGDATE
+ version = "0.92", --TAGVERSION
+ date = "2021-08-27", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
index 7ae61bb808..5cdbc60cf6 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
@@ -52,7 +52,7 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{documentation}
% \section{Commands}
@@ -174,9 +174,21 @@
% & |tree-mcid-index-wrong|
% & warning
% TODO: should trigger a standard rerun message.
+% \\
+% in |enddocument/info|-hook
+% & |para-hook-count-wrong|
+% & error (warning?)
% \end{tabular}
%
% \normalsize
+% \subsection{Messages from the ptagging code}
+% A few messages are issued in generic
+% mode from the code which reinserts missing TMB/TME.
+% This is currently done if log-level is larger than zero.
+% TODO: reconsider log-level and messages when this code
+% settles down.
+%
+%
% \subsection{Warning messages from the lua-code}
% The messages are triggered if the log-level is at least equal to the number.
%
@@ -239,7 +251,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-checks-code} {2021-08-27} {0.92}
{part of tagpdf - code related to checks, conditionals, debugging and messages}
%</header>
% \end{macrocode}
@@ -383,6 +395,25 @@
{engine/output~mode~#1~doesn't~support~the~interword~spaces}
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\@@_check_typeout_v:n}
+% A simple logging function. By default is gobbles its argument, but
+% the log-keys sets it to typeout.
+% \begin{macrocode}
+\cs_set_eq:NN \@@_check_typeout_v:n \use_none:n
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{para-hook-count-wrong}
+% At the end of the document we check if the count of para-begin and para-end is
+% identical. If not we issue a warning: this is normally a coding error and
+% and breaks the structure.
+% \begin{macrocode}
+\msg_new:nnnn { tag } {para-hook-count-wrong}
+ {The~number~of~automatic~begin~(#1)~and~end~(#2)~para~hooks~differ!}
+ {This~quite~probably~a~coding~error~and~the~structure~will~be~wrong!}
+% \end{macrocode}
+% \end{macro}
% \section{Retrieving data}
% \begin{macro}[EXP]{\tag_get:n}
% This retrieves some data.
@@ -700,6 +731,63 @@
}
% \end{macrocode}
% \end{macro}
+%
+% \subsection{Checks related to the state of MC on a page or in a split stream}
+% The following checks are currently only usable in generic mode as they
+% rely on the marks defined in the mc-generic module. They are used to detect
+% if a mc-chunk has been split by a page break or similar and additional
+% end/begin commands are needed.
+%
+% \begin{macro}[pTF]{\@@_check_mc_in_galley:}
+% At first we need a test to decide if |\tag_mc_begin:n| (tmb) and |\tag_mc_end:|
+% (tme) has been used at all on the current galley. As each command issues
+% two slightly different marks we can do it by comparing firstmarks and botmarks.
+% The test assumes that the marks have been already mapped into the sequence with
+% |\@@_mc_get_marks:|. As |\seq_if_eq:NNTF| doesn't exist we use the tl-test.
+% \begin{macrocode}
+\prg_new_conditional:Npnn \@@_check_if_mc_in_galley: { T,F,TF }
+ {
+ \tl_if_eq:NNTF \l_@@_mc_firstmarks_seq \l_@@_mc_botmarks_seq
+ { \prg_return_false: }
+ { \prg_return_true: }
+ }
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}[pTF]{\@@_check_if_mc_tmb_missing:}
+% This checks if a extra top mark (\enquote{extra-tmb}) is needed.
+% According to the analysis this the case if the firstmarks start with
+% |e-| or |b+|.
+% Like above we assume that the marks content is already in the seq's.
+% \begin{macrocode}
+\prg_new_conditional:Npnn \@@_check_if_mc_tmb_missing: { T,F,TF }
+ {
+ \bool_if:nTF
+ {
+ \str_if_eq_p:ee {\seq_item:Nn \l_@@_mc_firstmarks_seq {1}}{e-}
+ ||
+ \str_if_eq_p:ee {\seq_item:Nn \l_@@_mc_firstmarks_seq {1}}{b+}
+ }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}[pTF]{\@@_check_if_mc_tme_missing:}
+% This checks if a extra bottom mark (\enquote{extra-tme}) is needed.
+% According to the analysis this the case if the botmarks starts with
+% |b+|.
+% Like above we assume that the marks content is already in the seq's.
+% \begin{macrocode}
+\prg_new_conditional:Npnn \@@_check_if_mc_tme_missing: { T,F,TF }
+ {
+ \str_if_eq:eeTF {\seq_item:Nn \l_@@_mc_botmarks_seq {1}}{b+}
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macrocode}
%</package>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-code.pdf b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
index 181292b176..46d3a425fd 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-code.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
index 6c617e00ff..903b38d5a3 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
@@ -50,14 +50,16 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
+% \begin{documentation}
+% \end{documentation}
% \begin{implementation}
% \section{Marked content code -- generic mode}
% \begin{macrocode}
%<@@=tag>
%<*generic>
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2021-08-27} {0.92}
{part of tagpdf - code related to marking chunks - generic mode}
%</generic>
% \end{macrocode}
@@ -91,11 +93,411 @@
% \end{macrocode}
% \end{variable}
+% \begin{variable}
+% {
+% \g_@@_mc_marks,
+% }
+% a marks register to keep track of the mc's at page breaks and a sequence
+% to keep track of the data for the continuation
+% extra-tmb. We probably will need to track mc-marks
+% in more than one stream, so the seq contains the name of the stream.
+%
+% \begin{macrocode}
+\newmarks \g_@@_mc_marks
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{variable}
+% {
+% \g_@@_mc_main_marks_seq,
+% \g_@@_mc_footnote_marks_seq,
+% \g_@@_mc_multicol_marks_seq
+% }
+% Each stream has an associated global seq variable holding the
+% bottom marks from the/a previous chunk in the stream.
+% We provide three by default: main, footnote and multicol.
+% TODO: perhaps an interface for more streams will be needed.
+% \begin{macrocode}
+\seq_new:N \g_@@_mc_main_marks_seq
+\seq_new:N \g_@@_mc_footnote_marks_seq
+\seq_new:N \g_@@_mc_multicol_marks_seq
+% \end{macrocode}
+% \end{variable}
+
+% \begin{variable}{\l_@@_mc_firstmarks_seq,\l_@@_mc_botmarks_seq}
+% The marks content contains a number of data which we will have to access and
+% compare, so we will store it locally in two sequences.
+% topmarks is unusable in LaTeX so we ignore it.
+%
+% \begin{macrocode}
+\seq_new:N \l_@@_mc_firstmarks_seq
+\seq_new:N \l_@@_mc_botmarks_seq
+% \end{macrocode}
+% \end{variable}
+%
% \subsection{Functions}
+%
+% \begin{macro}{\@@_mc_begin_marks:nn,\@@_mc_artifact_begin_marks:n,\@@_mc_end_marks:}
+% Generic mode need to set marks for the page break and split stream handling.
+% We always set two marks to be able to detect the case when no mark is on a
+% page/galley. MC-begin commands will set (b,-,data) and (b,+,data),
+% MC-end commands will set (e,-,data) and (e,+,data).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mc_begin_marks:nn #1 #2 %#1 tag, #2 label
+ {
+ \tex_marks:D \g_@@_mc_marks
+ {
+ b-, %first of begin pair
+ \int_use:N\c@g_@@_MCID_abs_int, %mc-num
+ \g_@@_struct_stack_current_tl, %structure num
+ #1, %tag
+ \bool_if:NT \l_@@_mc_key_stash_bool{stash}, % stash info
+ #2, %label
+ }
+ \tex_marks:D \g_@@_mc_marks
+ {
+ b+, % second of begin pair
+ \int_use:N\c@g_@@_MCID_abs_int, %mc-num
+ \g_@@_struct_stack_current_tl, %structure num
+ #1, %tag
+ \bool_if:NT \l_@@_mc_key_stash_bool{stash}, % stash info
+ #2, %label
+ }
+ }
+\cs_generate_variant:Nn \@@_mc_begin_marks:nn {oo}
+\cs_new_protected:Npn \@@_mc_artifact_begin_marks:n #1 %#1 type
+ {
+ \tex_marks:D \g_@@_mc_marks
+ {
+ b-, %first of begin pair
+ \int_use:N\c@g_@@_MCID_abs_int, %mc-num
+ -1, %structure num
+ #1 %type
+ }
+ \tex_marks:D \g_@@_mc_marks
+ {
+ b+, %first of begin pair
+ \int_use:N\c@g_@@_MCID_abs_int, %mc-num
+ -1, %structure num
+ #1 %Type
+ }
+ }
+
+\cs_new_protected:Npn \@@_mc_end_marks:
+ {
+ \tex_marks:D \g_@@_mc_marks
+ {
+ e-, %first of end pair
+ \int_use:N\c@g_@@_MCID_abs_int, %mc-num
+ \g_@@_struct_stack_current_tl, %structure num
+ }
+ \tex_marks:D \g_@@_mc_marks
+ {
+ e+, %second of end pair
+ \int_use:N\c@g_@@_MCID_abs_int, %mc-num
+ \g_@@_struct_stack_current_tl, %structure num
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@@_mc_disable_marks:}
+% This disables the marks. They can't be reenabled, so it should only
+% be used in groups.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mc_disable_marks:
+ {
+ \cs_set_eq:NN \@@_mc_begin_marks:nn \use_none:nn
+ \cs_set_eq:NN \@@_mc_artifact_begin_marks:n \use_none:n
+ \cs_set_eq:NN \@@_mc_end_marks: \prg_do_nothing:
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@@_mc_get_marks:}
+% This stores the current content of the marks in the sequences. It naturally
+% should only be used in places where it makes sense.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mc_get_marks:
+ {
+ \exp_args:NNx
+ \seq_set_from_clist:Nn \l_@@_mc_firstmarks_seq
+ { \tex_firstmarks:D \g_@@_mc_marks }
+ \exp_args:NNx
+ \seq_set_from_clist:Nn \l_@@_mc_botmarks_seq
+ { \tex_botmarks:D \g_@@_mc_marks }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_mc_store:nnn}
+% This inserts the mc-chunk \meta{mc-num} into the structure {struct-num}
+% after the \meta{mc-prev}.
+% The structure must already exist.
+% The additional mcid dictionary is stored in a property. The item is retrieved
+% when the kid entry is built. We test if there is already
+% an addition and append if needed.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mc_store:nnn #1 #2 #3 %#1 mc-prev, #2 mc-num #3 structure-num
+ {
+ %\prop_show:N \g_@@_struct_cont_mc_prop
+ \prop_get:NnNTF \g_@@_struct_cont_mc_prop {#1} \l_@@_tmpa_tl
+ {
+ \prop_gput:Nnx \g_@@_struct_cont_mc_prop {#1}{ \l_@@_tmpa_tl \@@_struct_mcid_dict:n {#2}}
+ }
+ {
+ \prop_gput:Nnx \g_@@_struct_cont_mc_prop {#1}{ \@@_struct_mcid_dict:n {#2}}
+ }
+ \prop_gput:Nxx \g_@@_mc_parenttree_prop
+ {#2}
+ {#3}
+ }
+\cs_generate_variant:Nn \@@_mc_store:nnn {xxx}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_mc_insert_extra_tmb:n,\@@_mc_insert_extra_tme:n}
+% These two functions should be used in the output routine at the place
+% where a mc-literal could be missing due to a page break or some other split.
+% They check (with the help of the marks) if a extra-tmb or extra-tme is needed.
+% The tmb command stores also the mc into the structure, the tme has to store
+% the data for a following extra-tmb.
+% The argument takes a stream name like main or footnote to allow different handling
+% there.
+% The content of the marks must be stored before (with |\@@_mc_get_marks:|
+% or manually)
+% into |\l_@@_mc_firstmarks_seq| and |\l_@@_mc_botmarks_seq| so that the tests
+% can use them.
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mc_insert_extra_tmb:n #1 % #1 stream: e.g. main or footnote
+ {
+ \@@_check_typeout_v:n {=>~ first~ \seq_use:Nn \l__tag_mc_firstmarks_seq {,~}}
+ \@@_check_typeout_v:n {=>~ bot~ \seq_use:Nn \l__tag_mc_botmarks_seq {,~}}
+ \@@_check_if_mc_tmb_missing:TF
+ {
+ \@@_check_typeout_v:n {=>~ TMB~ ~ missing~ --~ inserted}
+ %test if artifact
+ \int_compare:nNnTF { \seq_item:cn { g_@@_mc_#1_marks_seq } {3} } = {-1}
+ {
+ \tl_set:Nx \l_@@_tmpa_tl { \seq_item:cn { g_@@_mc_#1_marks_seq } {4} }
+ \@@_mc_handle_artifact:N \l_@@_tmpa_tl
+ }
+ {
+ \exp_args:Nx
+ \@@_mc_bdc_mcid:n
+ {
+ \seq_item:cn { g_@@_mc_#1_marks_seq } {4}
+ }
+ \str_if_eq:eeTF
+ {
+ \seq_item:cn { g_@@_mc_#1_marks_seq } {5}
+ }
+ {}
+ {
+ %store
+ \@@_mc_store:xxx
+ {
+ \seq_item:cn { g_@@_mc_#1_marks_seq } {2}
+ }
+ { \int_eval:n{\c@g__tag_MCID_abs_int} }
+ {
+ \seq_item:cn { g_@@_mc_#1_marks_seq } {3}
+ }
+ }
+ {
+ %stashed -> warning!!
+ }
+ }
+ }
+ {
+ \@@_check_typeout_v:n {=>~ TMB~ not~ missing}
+ }
+ }
+\cs_new_protected:Npn \@@_mc_insert_extra_tme:n #1 % #1 stream, eg. main or footnote
+ {
+ \@@_check_if_mc_tme_missing:TF
+ {
+ \@@_check_typeout_v:n {=>~ TME~ ~ missing~ --~ inserted}
+ \@@_mc_emc:
+ \seq_gset_eq:cN
+ { g_@@_mc_#1_marks_seq }
+ \l_@@_mc_botmarks_seq
+ }
+ {
+ \@@_check_typeout_v:n {=>~ TME~ not~ missing}
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Looking at MC marks in boxes}
+% \begin{macro}{\@@_add_missing_mcs:Nn}
+% Assumptions:
+% \begin{itemize}
+% \item
+% test for tagging active outside;
+% \item
+% mark retrieval also outside.
+% \end{itemize}
+%
+% This takes a box register as its first argument (or the register
+% number in a count register, as used by \pkg{multicol}). It adds
+% an extra tmb at the top of the box if necessary and similarly
+% an extra tme at the end. This is done by adding hboxes in a way
+% that the positioning and the baseline of the given box is not
+% altered. The result is written back to the box.
+%
+% The second argument is the stream this box belongs to und is
+% currently either \texttt{main} for the main galley,
+% \texttt{footnote} for footnote note text, or \texttt{multicol}
+% for boxes produced for columns in that environment. Other streams
+% may follow over time.
+% \begin{macrocode}
+\cs_new:Npn\@@_add_missing_mcs:Nn #1 #2 {
+ \vbadness \@M
+ \vfuzz \c_max_dim
+ \vbox_set_to_ht:Nnn #1 { \box_ht:N #1 } {
+ \hbox_set:Nn \l_@@_tmpa_box { \@@_mc_insert_extra_tmb:n {#2} }
+ \hbox_set:Nn \l_@@_tmpb_box { \@@_mc_insert_extra_tme:n {#2} }
+ \int_compare:nNnT {\l_@@_loglevel_int} > { 0 }
+ {
+ \seq_log:c { g_@@_mc_#2_marks_seq}
+ }
+% \end{macrocode}
+% The box placed on the top gets zero size and thus will not affect
+% the box dimensions of the box we are modifying.
+% \begin{macrocode}
+ \box_set_ht:Nn \l_@@_tmpa_box \c_zero_dim
+ \box_set_dp:Nn \l_@@_tmpa_box \c_zero_dim
+% \end{macrocode}
+% The box added at the bottom will get the depth of the original
+% box. This way we can arrange that from the outside everything
+% looks as before.
+% \begin{macrocode}
+ \box_set_ht:Nn \l_@@_tmpb_box \c_zero_dim
+ \box_set_dp:Nn \l_@@_tmpb_box { \box_dp:N #1 }
+% \end{macrocode}
+% We need to set \cs{boxmaxdepth} in case the original box has an
+% unusually large depth, otherwise that depth is not preserved when
+% we string things together.
+% \begin{macrocode}
+ \boxmaxdepth \@maxdepth
+ \box_use_drop:N \l_@@_tmpa_box
+ \vbox_unpack_drop:N #1
+% \end{macrocode}
+% Back up by the depth of the box as we add that later again.
+% \begin{macrocode}
+ \tex_kern:D -\box_dp:N \l_@@_tmpb_box
+% \end{macrocode}
+% And we don't want any glue added when we add the box.
+% \begin{macrocode}
+ \nointerlineskip
+ \box_use_drop:N \l_@@_tmpb_box
+ }
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\@@_add_missing_mcs_to_stream:Nn}
+% This is the main command to add mc to the stream. It is therefor
+% guarded by the mc-boolean.
+%
+% If we aren't in the main stream then processing is a bit more
+% complicated because to get at the marks in the box we need to
+% artifically split it and then look at the split marks.
+%
+% First argument is the box to update and the second is the \enquote{stream}.
+% In lua mode the command is a no-op.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_add_missing_mcs_to_stream:Nn #1#2
+ {
+ \@@_check_if_active_mc:T {
+% \end{macrocode}
+% First set up a temp box for trial splitting.
+% \begin{macrocode}
+ \vbadness\maxdimen
+ \box_set_eq:NN \l_@@_tmpa_box #1
+% \end{macrocode}
+% Split the box to the largest size available. This should give us
+% all content (but to be sure that there is no issue we could test
+% out test box is empty now (not done).
+% \begin{macrocode}
+ \vbox_set_split_to_ht:NNn \l_@@_tmpa_box \l_@@_tmpa_box \c_max_dim
+% \end{macrocode}
+% As a side effect of this split we should now have the first and
+% bottom split marks set up. We use this to set up
+% \cs{l_@@_mc_firstmarks_seq}
+% \begin{macrocode}
+ \exp_args:NNx
+ \seq_set_from_clist:Nn \l_@@_mc_firstmarks_seq
+ { \tex_splitfirstmarks:D \g_@@_mc_marks }
+% \end{macrocode}
+% Some debugging info:
+% \begin{macrocode}
+% \iow_term:n { First~ mark~ from~ this~ box: }
+% \seq_log:N \l__tag_mc_firstmarks_seq
+% \end{macrocode}
+% If this mark was empty then clearly the bottom mark will too be
+% empty. Thus in this case we make use of the saved bot mark from
+% the previous chunk. Note that if this is the first chunk in the
+% stream the global seq would contain a random value, but then we
+% can't end in this branch because the basis assumption is that
+% streams are properly marked up so the first chunk would always
+% have a mark at the beginning!
+% \begin{macrocode}
+ \seq_if_empty:NTF \l_@@_mc_firstmarks_seq
+ {
+ \@@_check_typeout_v:n
+ {
+ No~ marks~ so~ use~ saved~ bot~ mark:~
+ \seq_use:cn {g__tag_mc_#2_marks_seq} {,~} \iow_newline:
+ }
+ \seq_set_eq:Nc \l_@@_mc_firstmarks_seq {g_@@_mc_#2_marks_seq}
+% \end{macrocode}
+% We also update the bot mark to the same value so that we can
+% later apply \cs{@@_add_missing_mcs:Nn} with the data
+% structures in place (see assumptions made there).
+% \begin{macrocode}
+ \seq_set_eq:NN \l_@@_mc_botmarks_seq \l_@@_mc_firstmarks_seq
+ }
+% \end{macrocode}
+% If there was a first mark then there is also a bot mark (and it
+% can't be the same as our marks always come in pairs).
+% So if that branch is chosen we update
+% \cs{l_@@_mc_botmarks_seq} from the bot mark.
+% \begin{macrocode}
+ {
+ \@@_check_typeout_v:n
+ {
+ Pick~ up~ new~ bot~ mark!
+ }
+ \exp_args:NNx
+ \seq_set_from_clist:Nn \l_@@_mc_botmarks_seq
+ { \tex_splitbotmarks:D \g_@@_mc_marks }
+ }
+% \end{macrocode}
+% Finally we call \cs{@@_add_missing_mcs:Nn} to add any missing
+% tmb/tme as needed,
+% \begin{macrocode}
+ \@@_add_missing_mcs:Nn #1 {#2}
+%%
+ \seq_gset_eq:cN {g_@@_mc_#2_marks_seq} \l_@@_mc_botmarks_seq
+%%
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[pTF]{\@@_mc_if_in:,\tag_mc_if_in:}
% This is a test if a mc is open or not. It depends simply on a global boolean:
% mc-chunks are added linearly so nesting should not be relevant.
+%
+% One exception are header and footer (perhaps they are more, but for now
+% it doesn't seem so, so there are no dedicated code to handle this situation):
+% When they are built and added to the page we could be both inside or outside a mc-chunk.
+% But header and footer should ignore this and not push/pop or warn about nested mc.
+% It is therefore important there to set and reset the boolean manually.
+% See the tagpddocu-patches.sty for an example.
% \begin{macrocode}
\prg_new_conditional:Nnn \@@_mc_if_in: {p,T,F,TF}
{
@@ -238,6 +640,7 @@
\cs_new_protected:Npn \@@_mc_handle_artifact:N #1
% #1 is a var containing the artifact type
{
+ \int_gincr:N \c@g_@@_MCID_abs_int
\tl_if_empty:NTF #1
{ \@@_mc_bmc_artifact: }
{ \exp_args:NV\@@_mc_bmc_artifact:n #1 }
@@ -271,12 +674,15 @@
\bool_if:NTF \l_@@_mc_artifact_bool
{ %handle artifact
\@@_mc_handle_artifact:N \l_@@_mc_artifact_type_tl
+ \exp_args:NV
+ \@@_mc_artifact_begin_marks:n \l_@@_mc_artifact_type_tl
}
{ %handle mcid type
\@@_check_mc_tag:N \l_@@_mc_key_tag_tl
\@@_mc_handle_mcid:VV
\l_@@_mc_key_tag_tl
\l_@@_mc_key_properties_tl
+ \@@_mc_begin_marks:oo{\l_@@_mc_key_tag_tl}{\l_@@_mc_key_label_tl}
\tl_if_empty:NF {\l_@@_mc_key_label_tl}
{
\exp_args:NV
@@ -298,6 +704,7 @@
\bool_gset_false:N \g_@@_in_mc_bool
\tl_gset:Nn \g_@@_mc_key_tag_tl { }
\@@_mc_emc:
+ \@@_mc_end_marks:
}
}
% \end{macrocode}
@@ -311,8 +718,8 @@
% \begin{macro}
% {
% tag,raw,
-% alttext,alttext-o,
-% actualtext,actualtext-o,
+% alttext,
+% actualtext,
% label,artifact
% }
% \begin{macrocode}
@@ -327,17 +734,7 @@
{
\tl_put_right:Nx \l_@@_mc_key_properties_tl { #1 }
},
- alttext .code:n = % Alt property
- {
- \str_set_convert:Nnon
- \l_@@_tmpa_str
- { #1 }
- { default }
- { utf16/hex }
- \tl_put_right:Nn \l_@@_mc_key_properties_tl { /Alt~< }
- \tl_put_right:No \l_@@_mc_key_properties_tl { \l_@@_tmpa_str>~ }
- },
- alttext-o .code:n = % Alt property
+ alttext .code:n = % Alt property
{
\str_set_convert:Noon
\l_@@_tmpa_str
@@ -349,16 +746,6 @@
},
actualtext .code:n = % ActualText property
{
- \str_set_convert:Nnon
- \l_@@_tmpa_str
- { #1 }
- { default }
- { utf16/hex }
- \tl_put_right:Nn \l_@@_mc_key_properties_tl { /ActualText~< }
- \tl_put_right:No \l_@@_mc_key_properties_tl { \l_@@_tmpa_str>~ }
- },
- actualtext-o .code:n = % ActualText property
- {
\str_set_convert:Noon
\l_@@_tmpa_str
{ #1 }
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
index 7fff1672ea..2698b7ad59 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{implementation}
@@ -91,7 +91,7 @@
% \begin{macrocode}
%<@@=tag>
%<*luamode>
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2021-08-27} {0.92}
{tagpdf - mc code only for the luamode }
%</luamode>
% \end{macrocode}
@@ -152,6 +152,13 @@
}
% \end{macrocode}
% \subsection{Commands}
+% \begin{macro}{\@@_add_missing_mcs_to_stream:Nn}
+% This command is used in the output routine by the ptagging code.
+% It should do nothing in luamode.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_add_missing_mcs_to_stream:Nn #1#2 {}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_mc_if_in:,\tag_mc_if_in:}
% This tests, if we are in an mc, for attributes
% this means to check against a number.
@@ -352,8 +359,8 @@
% \begin{macro}
% {
% tag,raw,
-% alttext,alttext-o,
-% actualtext,actualtext-o,
+% alttext,
+% actualtext,
% label,artifact
% }
% TODO: check conversion, check if local/global setting is right.
@@ -379,23 +386,6 @@
},
alttext .code:n = % Alt property
{
- \str_set_convert:Nnon
- \l_@@_tmpa_str
- { #1 }
- { default }
- { utf16/hex }
- \tl_put_right:Nn \l_@@_mc_key_properties_tl { /Alt~< }
- \tl_put_right:No \l_@@_mc_key_properties_tl { \l_@@_tmpa_str>~ }
- \lua_now:e
- {
- ltx.@@.func.store_mc_data
- (
- \@@_get_mc_abs_cnt:,"alt","/Alt~<\str_use:N \l_@@_tmpa_str>"
- )
- }
- },
- alttext-o .code:n = % Alt property
- {
\str_set_convert:Noon
\l_@@_tmpa_str
{ #1 }
@@ -413,23 +403,6 @@
},
actualtext .code:n = % Alt property
{
- \str_set_convert:Nnon
- \l_@@_tmpa_str
- { #1 }
- { default }
- { utf16/hex }
- \tl_put_right:Nn \l_@@_mc_key_properties_tl { /Alt~< }
- \tl_put_right:No \l_@@_mc_key_properties_tl { \l_@@_tmpa_str>~ }
- \lua_now:e
- {
- ltx.@@.func.store_mc_data
- (
- \@@_get_mc_abs_cnt:,"actualtext","/ActualText~<\str_use:N \l_@@_tmpa_str>"
- )
- }
- },
- actualtext-o .code:n = % Alt property
- {
\str_set_convert:Noon
\l_@@_tmpa_str
{ #1 }
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
index 13f0310589..17f6df0fcf 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -145,17 +145,17 @@
% \verb+raw=/Alt (Hello)+ will insert an alternative Text.
% \end{function}
%
-% \begin{function}{alttext,alttext-o}
+% \begin{function}{alttext}
% This key inserts an \texttt{/Alt} value in the property dictionary of the BDC operator.
-% The value is handled as verbatim string, commands are not expanded. With |alttext-o|
-% the value is expanded once.
+% The value is handled as verbatim string, commands are not expanded.
+% The value will be expanded first once.
% \end{function}
%
-% \begin{function}{actualtext,actualtext-o}
+% \begin{function}{actualtext}
% This key inserts an \texttt{/ActualText} value in the property dictionary
% of the BDC operator. The value is handled as verbatim string,
-% commands are not expanded.With |actualtext-o|
-% the value is expanded once.
+% commands are not expanded.
+% The value will be expanded first once.
% \end{function}
%
% \begin{function}{label}
@@ -178,7 +178,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2021-08-27} {0.92}
{part of tagpdf - code related to marking chunks -
code shared by generic and luamode }
%</header>
@@ -217,7 +217,7 @@
% \end{variable}
%
% \begin{variable}{\g_@@_in_mc_bool}
-% This booleans records if a mc is open, to test nesting.
+% This booleans record if a mc is open, to test nesting.
% \begin{macrocode}
\bool_new:N \g_@@_in_mc_bool
% \end{macrocode}
@@ -273,6 +273,7 @@
% \end{macrocode}
% \end{variable}
%
+%
% \subsection{Functions}
% \begin{macro}{\_@@_mc_handle_mc_label:n}
% The commands labels a mc-chunk. It is used if the user explicitly
@@ -408,6 +409,10 @@
%
% \begin{macro}{stash,__artifact-bool,__artifact-type}
% the two internal artifact keys are use to define the public |artifact|.
+% For now we add support for the subtypes Header and Footer.
+% Watermark,PageNum, LineNum,Redaction,Bates will be added if some use case
+% emerges. If some use case for /BBox and /Attached emerges, it will be perhaps
+% necessary to adapt the code.
% \begin{macrocode}
\keys_define:nn { @@ / mc }
{
@@ -418,6 +423,14 @@
{
\tl_set:Nn \l_@@_mc_artifact_type_tl { Pagination }
},
+ __artifact-type / pagination/header .code:n =
+ {
+ \tl_set:Nn \l_@@_mc_artifact_type_tl { Pagination/Subtype/Header }
+ },
+ __artifact-type / pagination/footer .code:n =
+ {
+ \tl_set:Nn \l_@@_mc_artifact_type_tl { Pagination/Subtype/Footer }
+ },
__artifact-type / layout .code:n =
{
\tl_set:Nn \l_@@_mc_artifact_type_tl { Layout }
diff --git a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
index 5cc18b0b0f..78dccdc02a 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
@@ -50,13 +50,13 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-roles-code} {2021-08-27} {0.92}
{part of tagpdf - code related to roles and structure names}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-space.dtx b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
index ea84729718..c2a999cc1b 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-space.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
@@ -50,13 +50,13 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-space-code} {2021-08-27} {0.92}
{part of tagpdf - code related to real space chars}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
index 3d2dace5d7..610d631333 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -123,15 +123,15 @@
% Commands are not expanded. |title-o| will expand the value once.
% \end{function}
%
-% \begin{function}{alttext,alttext-o}
+% \begin{function}{alttext}
% This key inserts an \texttt{/Alt} value in the dictionary of structure object.
% The value is handled as verbatim string and hex encoded.
-% |alttext-o| will expand the value once.
+% The value will be expanded first once.
% \end{function}
-% \begin{function}{actualtext,actualtext-o}
+% \begin{function}{actualtext}
% This key inserts an \texttt{/ActualText} value in the dictionary of structure object.
% The value is handled as verbatim string and hex encoded.
-% |actualtext-o| will expand the value once.
+% The value will be expanded first once.
% \end{function}
% \begin{function}{lang}
% This key allows to set the language for a structure element. The value should be a bcp-identifier,
@@ -211,7 +211,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-struct-code} {2021-08-27} {0.92}
{part of tagpdf - code related to storing structure}
%</header>
% \end{macrocode}
@@ -238,6 +238,16 @@
\@@_seq_new:N \g_@@_struct_objR_seq
% \end{macrocode}
% \end{variable}
+
+% \begin{variable}{\g_@@_struct_cont_mc_prop}
+% in generic mode it can happen after
+% a page break that we have to inject into a structure
+% sequence an additional mc after. We will store this additional
+% info in a property. The key is the absolut mc num, the value the pdf directory.
+% \begin{macrocode}
+\@@_prop_new:N \g_@@_struct_cont_mc_prop
+% \end{macrocode}
+% \end{variable}
%
% \begin{variable}{\g_@@_struct_stack_seq}
% A stack sequence for the structure stack.
@@ -426,28 +436,44 @@
% Commands to store the kids. Kids in a structure can be a reference to a mc-chunk,
% an object reference to another structure element, or a object reference to an
% annotation (through an OBJR object).
-% \begin{macro}{\@@_struct_kid_mc_gput_right:nn}
+% \begin{macro}{\@@_struct_kid_mc_gput_right:nn,\@@_struct_kid_mc_gput_right:nx}
% The command to store an mc-chunk, this is a dictionary of type MCR.
% It would be possible to write out the content directly as unnamed object
% and to store only the object reference, but probably this would be slower,
% and the PDF is more readable like this.
% The code doesn't try to avoid the use of the /Pg key by checking page numbers.
% That imho only slows down without much gain.
+% In generic mode the page break code will perhaps to have to insert
+% an additional mcid after an existing one. For this we use a property list
+% At first an auxiliary to write the MCID dict. This should normally be expanded!
+% \begin{macrocode}
+\cs_new:Npn \@@_struct_mcid_dict:n #1 %#1 MCID absnum
+ {
+ <<
+ /Type \c_space_tl /MCR \c_space_tl
+ /Pg
+ \c_space_tl
+ \pdf_pageobject_ref:n { \@@_ref_value:enn{mcid-#1}{tagabspage}{1} }
+ /MCID \c_space_tl \@@_ref_value:enn{mcid-#1}{tagmcid}{1}
+ >>
+ }
+% \end{macrocode}
% \begin{macrocode}
\cs_new_protected:Npn \@@_struct_kid_mc_gput_right:nn #1 #2 %#1 structure num, #2 MCID absnum%
{
\@@_seq_gput_right:cx
{ g_@@_struct_kids_#1_seq }
{
- <<
- /Type \c_space_tl /MCR \c_space_tl
- /Pg
- \c_space_tl
- \pdf_pageobject_ref:n { \@@_ref_value:enn{mcid-#2}{tagabspage}{1} }
- /MCID \c_space_tl \@@_ref_value:enn{mcid-#2}{tagmcid}{1}
- >>
+ \@@_struct_mcid_dict:n {#2}
+ }
+ \@@_seq_gput_right:cn
+ { g_@@_struct_kids_#1_seq }
+ {
+ \prop_item:Nn \g_@@_struct_cont_mc_prop {#2}
}
}
+\cs_generate_variant:Nn \@@_struct_kid_mc_gput_right:nn {nx}
+
% \end{macrocode}
% \end{macro}
% \begin{macro}
@@ -522,6 +548,18 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_struct_fill_kid_key:n #1 %#1 is the struct num
{
+ \bool_if:NF\g_@@_mode_lua_bool
+ {
+ \seq_clear:N \l_@@_tmpa_seq
+ \seq_map_inline:cn { g_@@_struct_kids_#1_seq }
+ { \seq_put_right:Nx \l_@@_tmpa_seq { ##1 } }
+ %\seq_show:c { g_@@_struct_kids_#1_seq }
+ %\seq_show:N \l_@@_tmpa_seq
+ \seq_remove_all:Nn \l_@@_tmpa_seq {}
+ %\seq_show:N \l_@@_tmpa_seq
+ \seq_gset_eq:cN { g_@@_struct_kids_#1_seq } \l_@@_tmpa_seq
+ }
+
\int_case:nnF
{
\seq_count:c
@@ -706,8 +744,8 @@
% {
% label,stash,tag,
% title,title-o,
-% alttext,alttext-o,
-% actualtext,actualtext-o
+% alttext,
+% actualtext,
% lang,ref,E
% }
% \begin{macrocode}
@@ -759,18 +797,6 @@
},
alttext .code:n = % Alt property
{
- \str_set_convert:Nnon
- \l_@@_tmpa_str
- { #1 }
- { default }
- { utf16/hex }
- \@@_prop_gput:cnx
- { g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_prop }
- { Alt }
- { <\l_@@_tmpa_str> }
- },
- alttext-o .code:n = % Alt property
- {
\str_set_convert:Noon
\l_@@_tmpa_str
{ #1 }
@@ -783,18 +809,6 @@
},
actualtext .code:n = % ActualText property
{
- \str_set_convert:Nnon
- \l_@@_tmpa_str
- { #1 }
- { default }
- { utf16/hex }
- \@@_prop_gput:cnx
- { g_@@_struct_\int_eval:n {\c@g_@@_struct_abs_int}_prop }
- { ActualText }
- { <\l_@@_tmpa_str>}
- },
- actualtext-o .code:n = % ActualText property
- {
\str_set_convert:Noon
\l_@@_tmpa_str
{ #1 }
@@ -1059,7 +1073,7 @@
% \section{Attributes and attribute classes}
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-attr-code} {2021-08-27} {0.92}
{part of tagpdf - code related to attributes and attribute classes}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
index 1f9c12fb35..b8e1b0d54a 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
@@ -51,13 +51,13 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-tree-code} {2021-08-27} {0.92}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-user.dtx b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
index 4b408a60ea..23737dfc29 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-user.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.91, released 2021-07-03}
+% \date{Version 0.92, released 2021-08-27}
% \maketitle
% \begin{documentation}
% \section{Setup commands}
@@ -179,6 +179,18 @@
% faster then |\tagpdfsetup|. But I'm not sure if the names are good.
% \end{function}
%
+% \subsection{Header and footer}
+% Header and footer are automatically excluded from tagging. This can for
+% now to allow debugging be disabled with the following key, but probably
+% this key will disappear again. If some real content is in the header and
+% footer, tagging must be restarted there explicitly.
+%
+% \begin{function}{exclude-header-footer}
+% \begin{syntax}
+% |exclude-header-footer| = |true|\verb+|+|false|
+% \end{syntax}%
+% \end{function}
+
% \subsection{Link tagging}
% Links need a special structure and cross reference system.
% This is added through hooks of the l3pdfannot module and will work
@@ -201,7 +213,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-user} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf-user} {2021-08-27} {0.92}
{tagpdf - user commands}
%</header>
% \end{macrocode}
@@ -385,7 +397,56 @@
}
% \end{macrocode}
% \end{macro}
-%
+% \begin{macro}{mc-marks}
+% It maps the mc-marks into the sequences and then shows them.
+% This allows to inspect the first and last mc-Mark on a page.
+% It should only be used in the shipout (header/footer).
+% \begin{macrocode}
+\keys_define:nn { @@ / show }
+ {
+ mc-marks .choice: ,
+ mc-marks / show .code:n =
+ {
+ \@@_mc_get_marks:
+ \@@_check_if_mc_in_galley:TF
+ {
+ \iow_term:n {Marks~from~this~page:~}
+ }
+ {
+ \iow_term:n {Marks~from~a~previous~page:~}
+ }
+ \seq_show:N \l_@@_mc_firstmarks_seq
+ \seq_show:N \l_@@_mc_botmarks_seq
+ \@@_check_if_mc_tmb_missing:T
+ {
+ \iow_term:n {BDC~missing~on~this~page!}
+ }
+ \@@_check_if_mc_tme_missing:T
+ {
+ \iow_term:n {EMC~missing~on~this~page!}
+ }
+ },
+ mc-marks / use .code:n =
+ {
+ \@@_mc_get_marks:
+ \@@_check_if_mc_in_galley:TF
+ { Marks~from~this~page:~}
+ { Marks~from~a~previous~page:~}
+ \seq_use:Nn \l_@@_mc_firstmarks_seq {,~}\quad
+ \seq_use:Nn \l_@@_mc_botmarks_seq {,~}\quad
+ \@@_check_if_mc_tmb_missing:T
+ {
+ BDC~missing~
+ }
+ \@@_check_if_mc_tme_missing:T
+ {
+ EMC~missing
+ }
+ },
+ mc-marks .default:n = show
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{struct-stack}
% \begin{macrocode}
\keys_define:nn { @@ / show }
@@ -449,7 +510,8 @@
% \begin{macrocode}
\bool_new:N \l_@@_para_bool
\bool_new:N \l_@@_para_show_bool
-\int_new:N \g_@@_para_int
+\int_new:N \g_@@_para_begin_int
+\int_new:N \g_@@_para_end_int
% \end{macrocode}
% \end{macro}
%
@@ -475,13 +537,13 @@
% \begin{macrocode}
\AddToHook{para/begin}
{
- \int_gincr:N \g_@@_para_int
- \bool_if:NT \l__tag_para_bool
+ \bool_if:NT \l_@@_para_bool
{
+ \int_gincr:N \g_@@_para_begin_int
\tag_struct_begin:n {tag=P}
\bool_if:NT \l_@@_para_show_bool
{ \tag_mc_begin:n{artifact}
- \llap{\color_select:n{red}\tiny\int_use:N\g_@@_para_int\ }
+ \llap{\color_select:n{red}\tiny\int_use:N\g_@@_para_begin_int\ }
\tag_mc_end:
}
\tag_mc_begin:n {tag=P}
@@ -489,17 +551,57 @@
}
\AddToHook{para/end}
{
- \bool_if:NT \l__tag_para_bool
+ \bool_if:NT \l_@@_para_bool
{
+ \int_gincr:N \g_@@_para_end_int
\tag_mc_end:
\bool_if:NT \l_@@_para_show_bool
{ \tag_mc_begin:n{artifact}
- \rlap{\color_select:n{red}\tiny\ \int_use:N\g_@@_para_int}
+ \rlap{\color_select:n{red}\tiny\ \int_use:N\g_@@_para_end_int}
\tag_mc_end:
}
\tag_struct_end:
}
}
+\AddToHook{enddocument/info}
+ {
+ \int_compare:nNnF {\g__tag_para_begin_int}={\g__tag_para_end_int}
+ {
+ \msg_error:nnxx
+ {tag}
+ {para-hook-count-wrong}
+ {\int_use:N\g__tag_para_begin_int}
+ {\int_use:N\g__tag_para_end_int}
+ }
+ }
+% \end{macrocode}
+% In generic mode we need the additional code from the ptagging tests.
+% \begin{macrocode}
+\AddToHook{begindocument/before}
+ {
+ \bool_if:NF \g_@@_mode_lua_bool
+ {
+ \cs_if_exist:NT \@kernel@before@footins
+ {
+ \tl_put_right:Nn \@kernel@before@footins
+ { \@@_add_missing_mcs_to_stream:Nn \footins {footnote} }
+ \tl_put_right:Nn \@kernel@before@cclv
+ {
+ \@@_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c@page}
+ \@@_add_missing_mcs_to_stream:Nn \@cclv {main}
+ }
+ \tl_put_right:Nn \@mult@ptagging@hook
+ {
+ \@@_check_typeout_v:n {====>~In~\string\page@sofar}
+ \process@cols\mult@gfirstbox
+ {
+ \@@_add_missing_mcs_to_stream:Nn \count@ {multicol}
+ }
+ \@@_add_missing_mcs_to_stream:Nn \mult@rightbox {multicol}
+ }
+ }
+ }
+ }
% \end{macrocode}
% \begin{macro}
% {
@@ -509,11 +611,104 @@
% This two command switch para mode on and off. |\tagpdfsetup| could be used
% too but is longer.
% \begin{macrocode}
-\newcommand\tagpdfparaOn {\bool_set_true:N \l__tag_para_bool}
-\newcommand\tagpdfparaOff{\bool_set_false:N \l__tag_para_bool}
+\newcommand\tagpdfparaOn {\bool_set_true:N \l_@@_para_bool}
+\newcommand\tagpdfparaOff{\bool_set_false:N \l_@@_para_bool}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}
+% {
+% \tagpdfsuppressmarks
+% }
+% This command allows to suppress the creation of the marks. It takes an argument
+% which should normally be one of the mc-commands, puts a group around it and
+% suppress the marks creation in this group. This command should be used if
+% the begin and end command are at different boxing levels. E.g.
+% \begin{verbatim}
+% \@hangfrom
+% {
+% \tagstructbegin{tag=H1}%
+% \tagmcbegin {tag=H1}%
+% #2
+% }
+% {#3\tagpdfsuppressmarks{\tagmcend}\tagstructend}%
+% \end{verbatim}
+% \begin{macrocode}
+\NewDocumentCommand\tagpdfsuppressmarks{m}
+ {{\use:c{@@_mc_disable_marks:} #1}}
+% \end{macrocode}
+% \end{macro}
+% \subsection{Header and footer}
+% Header and footer should normally be tagged as artifacts. The following code
+% requires the new hooks.
+% For now we allow to disable this function, but probably the code should always there at
+% the end.
+% TODO check if Pagination should be changeable.
+% \begin{macrocode}
+\cs_new_protected:Npn\@@_hook_kernel_before_head:{}
+\cs_new_protected:Npn\@@_hook_kernel_after_head:{}
+\cs_new_protected:Npn\@@_hook_kernel_before_foot:{}
+\cs_new_protected:Npn\@@_hook_kernel_after_foot:{}
+
+\AddToHook{begindocument}
+ {
+ \cs_if_exist:NT \@kernel@before@head
+ {
+ \tl_put_right:Nn \@kernel@before@head {\@@_hook_kernel_before_head:}
+ \tl_put_left:Nn \@kernel@after@head {\@@_hook_kernel_after_head:}
+ \tl_put_right:Nn \@kernel@before@foot {\@@_hook_kernel_before_foot:}
+ \tl_put_left:Nn \@kernel@after@foot {\@@_hook_kernel_after_foot:}
+ }
+ }
+
+\bool_new:N \g_@@_saved_in_mc_bool
+\cs_new_protected:Npn \@@_exclude_headfoot_begin:
+ {
+ \bool_set_false:N \l_@@_para_bool
+ \bool_if:NTF \g_@@_mode_lua_bool
+ {
+ \tag_mc_end_push:
+ }
+ {
+ \bool_gset_eq:NN \g_@@_saved_in_mc_bool \g_@@_in_mc_bool
+ \bool_gset_false:N \g_@@_in_mc_bool
+ }
+ \tag_mc_begin:n {artifact}
+ }
+\cs_new_protected:Npn \@@_exclude_headfoot_end:
+ {
+ \tag_mc_end:
+ \bool_if:NTF \g_@@_mode_lua_bool
+ {
+ \tag_mc_begin_pop:n{}
+ }
+ {
+ \bool_gset_eq:NN \g_@@_in_mc_bool\g_@@_saved_in_mc_bool
+ }
+ }
+
+\keys_define:nn { @@ / setup }
+ {
+ exclude-header-footer .choice:,
+ exclude-header-footer / true .code:n =
+ {
+ \cs_set_eq:NN \@@_hook_kernel_before_head: \@@_exclude_headfoot_begin:
+ \cs_set_eq:NN \@@_hook_kernel_before_foot: \@@_exclude_headfoot_begin:
+ \cs_set_eq:NN \@@_hook_kernel_after_head: \@@_exclude_headfoot_end:
+ \cs_set_eq:NN \@@_hook_kernel_after_foot: \@@_exclude_headfoot_end:
+ },
+ exclude-header-footer / false .code:n =
+ {
+ \cs_set_eq:NN \@@_hook_kernel_before_head: \prg_do_nothing:
+ \cs_set_eq:NN \@@_hook_kernel_before_foot: \prg_do_nothing:
+ \cs_set_eq:NN \@@_hook_kernel_after_head: \prg_do_nothing:
+ \cs_set_eq:NN \@@_hook_kernel_after_foot: \prg_do_nothing:
+ },
+ exclude-header-footer .default:n = true,
+ exclude-header-footer .initial:n = true
+ }
+% \end{macrocode}
+
% \subsection{Links}
% We need to close and reopen mc-chunks around links.
% Currently we handle URI and GoTo (internal) links.
diff --git a/macros/latex/contrib/tagpdf/tagpdf.dtx b/macros/latex/contrib/tagpdf/tagpdf.dtx
index 2cb6e3d063..0aeac22d7f 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf.dtx
@@ -29,7 +29,7 @@
% \begin{macrocode}
%<@@=tag>
%<*package>
-\ProvidesExplPackage {tagpdf} {2021-07-03} {0.91}
+\ProvidesExplPackage {tagpdf} {2021-08-27} {0.92}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -139,7 +139,9 @@
% \l_@@_tmpa_seq,
% \l_@@_tmpb_seq,
% \l_@@_tmpa_clist,
-% \l_@@_tmpa_int
+% \l_@@_tmpa_int,
+% \l_@@_tmpa_box,
+% \l_@@_tmpb_box
% }
% A few temporary variables
% \begin{macrocode}
@@ -150,6 +152,8 @@
\seq_new:N \l_@@_tmpb_seq
\clist_new:N \l_@@_tmpa_clist
\int_new:N \l_@@_tmpa_int
+\box_new:N \l_@@_tmpa_box
+\box_new:N \l_@@_tmpb_box
% \end{macrocode}
% \end{variable}
% Attribute lists for the label command. We have a list for
@@ -393,7 +397,11 @@
% \begin{macrocode}
log .choice:,
log / none .code:n = {\int_set:Nn \l_@@_loglevel_int { 0 }},
- log / v .code:n = {\int_set:Nn \l_@@_loglevel_int { 1 }},
+ log / v .code:n =
+ {
+ \int_set:Nn \l_@@_loglevel_int { 1 }
+ \cs_set_protected:Nn \@@_check_typeout_v:n { \iow_term:x {##1} }
+ },
log / vv .code:n = {\int_set:Nn \l_@@_loglevel_int { 2 }},
log / vvv .code:n = {\int_set:Nn \l_@@_loglevel_int { 3 }},
log / all .code:n = {\int_set:Nn \l_@@_loglevel_int { 10 }},
diff --git a/macros/latex/contrib/tagpdf/tagpdf.pdf b/macros/latex/contrib/tagpdf/tagpdf.pdf
index df23d1ffa6..58004f717f 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf.pdf
@@ -63,13 +63,20 @@ endobj
195 0 obj
<< /Type/OBJR/Obj 192 0 R >>
endobj
-198 0 obj
-<< /Length 30683 >>
+203 0 obj
+<< /Type/OBJR/Obj 200 0 R >>
+endobj
+206 0 obj
+<< /Length 31710 >>
stream
/opacity1 gs
/Artifact BMC
+EMC
+/Artifact BMC
0 g 0 G
EMC
+/Artifact BMC
+EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
EMC
@@ -124,7 +131,7 @@ BT
/F66 20.66252 Tf
1 0 0 1 213.273 756.938 Tm [<0069001C003B0054002F00370067>]TJ
/F65 20.66252 Tf
-1 0 0 1 285.943 756.938 Tm [<0054001C002B0046001C003B0032002D0067007000790058004E0052>]TJ
+1 0 0 1 285.943 756.938 Tm [<0054001C002B0046001C003B0032002D0067007000790058004E006B>]TJ
ET
EMC
/Artifact BMC
@@ -190,7 +197,7 @@ EMC
/P<</MCID 5>> BDC
BT
/F65 14.3462 Tf
-1 0 0 1 260.811 663.015 Tm [<006B0079006B005200400079006400400079006A>]TJ
+1 0 0 1 260.811 663.015 Tm [<006B0079006B00520040007900330040006B0064>]TJ
ET
EMC
/Artifact BMC
@@ -535,7 +542,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 403.722 Tm [<001200150001>]TJ
+1 0 0 1 83.092 403.722 Tm [<001200130001>]TJ
0 g 0 G
ET
EMC
@@ -551,7 +558,7 @@ EMC
/P<</MCID 16>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 403.722 Tm [<0031>12<0053>20<0046004700420044004600010055005000010057>5<004600530054004A0050004F00010011000F001A>]TJ
+1 0 0 1 90.773 403.722 Tm [<0031>12<0053>20<0046004700420044004600010055005000010057>5<004600530054004A0050004F00010011000F001A0013>]TJ
ET
EMC
/Artifact BMC
@@ -567,7 +574,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 403.722 Tm [<000100120015>]TJ
+1 0 0 1 520.866 403.722 Tm [<000100120013>]TJ
0 g 0 G
ET
EMC
@@ -575,7 +582,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 379.263 Tm [<001200160001>]TJ
+1 0 0 1 83.092 379.263 Tm [<001200140001>]TJ
0 g 0 G
ET
EMC
@@ -591,7 +598,7 @@ EMC
/P<</MCID 20>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 379.263 Tm [<0031>12<0053>20<0046004700420044004600010055005000010057>5<004600530054004A0050004F00010011000F001900010042004F00450001004F00460058>6<00460053>]TJ
+1 0 0 1 90.773 379.263 Tm [<002A>18<004F00550053>6<00500045005600440055004A0050004F>]TJ
ET
EMC
/Artifact BMC
@@ -607,7 +614,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 379.263 Tm [<000100120016>]TJ
+1 0 0 1 520.866 379.263 Tm [<000100120014>]TJ
0 g 0 G
ET
EMC
@@ -615,7 +622,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 354.805 Tm [<001200170001>]TJ
+1 0 0 1 108.183 365.714 Tm [<001200150001>]TJ
0 g 0 G
ET
EMC
@@ -625,29 +632,33 @@ EMC
/Lbl<</MCID 23>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 354.805 Tm [<0014000F>]TJ
+1 0 0 1 90.773 365.714 Tm [<0013000F0012000F>]TJ
ET
EMC
/P<</MCID 24>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 354.805 Tm [<002A>18<004F00550053>6<00500045005600440055004A0050004F>]TJ
+1 0 0 1 115.864 365.714 Tm [<0035>100<004200480048004A004F004800010042004F00450001004200440044004600540054004A0043004A004D004A0055005A>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
+BT
+/F68 10.90909 Tf
+1 0 0 1 244.032 365.714 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+ET
EMC
/Reference<</MCID 25>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 354.805 Tm [<0014>]TJ
+1 0 0 1 515.084 365.714 Tm [<0015>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 354.805 Tm [<000100120017>]TJ
+1 0 0 1 520.866 365.714 Tm [<000100120015>]TJ
0 g 0 G
ET
EMC
@@ -655,7 +666,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 341.256 Tm [<001200180001>]TJ
+1 0 0 1 108.183 352.165 Tm [<001200160001>]TJ
0 g 0 G
ET
EMC
@@ -665,33 +676,33 @@ EMC
/Lbl<</MCID 27>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 341.256 Tm [<0014000F0012000F>]TJ
+1 0 0 1 90.773 352.165 Tm [<0013000F0013000F>]TJ
ET
EMC
/P<</MCID 28>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 341.256 Tm [<0035>100<004200480048004A004F004800010042004F00450001004200440044004600540054004A0043004A004D004A0055005A>]TJ
+1 0 0 1 115.864 352.165 Tm [<0026>4<004F0048004A004F0046005400010042004F00450001004E0050004500460054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 244.032 341.256 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 218.998 352.165 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 29>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 341.256 Tm [<0015>]TJ
+1 0 0 1 515.084 352.165 Tm [<0015>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 341.256 Tm [<000100120018>]TJ
+1 0 0 1 520.866 352.165 Tm [<000100120016>]TJ
0 g 0 G
ET
EMC
@@ -699,7 +710,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 327.707 Tm [<001200190001>]TJ
+1 0 0 1 108.183 338.616 Tm [<001200170001>]TJ
0 g 0 G
ET
EMC
@@ -709,33 +720,33 @@ EMC
/Lbl<</MCID 31>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 327.707 Tm [<0014000F0013000F>]TJ
+1 0 0 1 90.773 338.616 Tm [<0013000F0014000F>]TJ
ET
EMC
/P<</MCID 32>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 327.707 Tm [<0026>4<004F0048004A004F0046005400010042004F00450001004E0050004500460054>]TJ
+1 0 0 1 115.864 338.616 Tm [<0033>20<0046004700460053>20<0046004F00440046005400010042004F00450001005500420053>6<004800460055000100310025002700010057>5<004600530054004A0050004F>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 218.998 327.707 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 294.101 338.616 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 33>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 327.707 Tm [<0015>]TJ
+1 0 0 1 515.084 338.616 Tm [<0015>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 327.707 Tm [<000100120019>]TJ
+1 0 0 1 520.866 338.616 Tm [<000100120017>]TJ
0 g 0 G
ET
EMC
@@ -743,7 +754,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 314.157 Tm [<0012001A0001>]TJ
+1 0 0 1 108.183 325.066 Tm [<001200180001>]TJ
0 g 0 G
ET
EMC
@@ -753,33 +764,33 @@ EMC
/Lbl<</MCID 35>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 314.157 Tm [<0014000F0014000F>]TJ
+1 0 0 1 90.773 325.066 Tm [<0013000F0015000F>]TJ
ET
EMC
/P<</MCID 36>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 314.157 Tm [<0033>20<0046004700460053>20<0046004F00440046005400010042004F00450001005500420053>6<004800460055000100310025002700010057>5<004600530054004A0050004F>]TJ
+1 0 0 1 115.864 325.066 Tm [<0037>60<0042004D004A004500420055004A0050004F>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 294.101 314.157 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 177.274 325.066 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 37>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 314.157 Tm [<0016>]TJ
+1 0 0 1 515.084 325.066 Tm [<0016>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 314.157 Tm [<00010012001A>]TJ
+1 0 0 1 520.866 325.066 Tm [<000100120018>]TJ
0 g 0 G
ET
EMC
@@ -787,7 +798,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 300.608 Tm [<001300110001>]TJ
+1 0 0 1 108.183 311.517 Tm [<001200190001>]TJ
0 g 0 G
ET
EMC
@@ -797,33 +808,33 @@ EMC
/Lbl<</MCID 39>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 300.608 Tm [<0014000F0015000F>]TJ
+1 0 0 1 90.773 311.517 Tm [<0013000F0016000F>]TJ
ET
EMC
/P<</MCID 40>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 300.608 Tm [<0037>60<0042004D004A004500420055004A0050004F>]TJ
+1 0 0 1 115.864 311.517 Tm [<0026>6<00590042004E0051004D00460054000100580042004F0055004600450002>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 177.274 300.608 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 210.653 311.517 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>]TJ
ET
EMC
/Reference<</MCID 41>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 300.608 Tm [<0016>]TJ
+1 0 0 1 515.084 311.517 Tm [<0016>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 300.608 Tm [<000100130011>]TJ
+1 0 0 1 520.866 311.517 Tm [<000100120019>]TJ
0 g 0 G
ET
EMC
@@ -831,7 +842,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 287.059 Tm [<001300120001>]TJ
+1 0 0 1 83.092 287.059 Tm [<0012001A0001>]TJ
0 g 0 G
ET
EMC
@@ -841,21 +852,17 @@ EMC
/Lbl<</MCID 43>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 287.059 Tm [<0014000F0016000F>]TJ
+1 0 0 1 74.409 287.059 Tm [<0014000F>]TJ
ET
EMC
/P<</MCID 44>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 287.059 Tm [<0026>6<00590042004E0051004D00460054000100580042004F0055004600450002>]TJ
+1 0 0 1 90.773 287.059 Tm [<002400490042004F004800460054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
-BT
-/F68 10.90909 Tf
-1 0 0 1 210.653 287.059 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>]TJ
-ET
EMC
/Reference<</MCID 45>> BDC
BT
@@ -867,7 +874,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 287.059 Tm [<000100130012>]TJ
+1 0 0 1 520.866 287.059 Tm [<00010012001A>]TJ
0 g 0 G
ET
EMC
@@ -875,7 +882,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 273.51 Tm [<001300130001>]TJ
+1 0 0 1 108.183 273.51 Tm [<001300110001>]TJ
0 g 0 G
ET
EMC
@@ -885,7 +892,7 @@ EMC
/Lbl<</MCID 47>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 273.51 Tm [<0014000F0017000F>]TJ
+1 0 0 1 90.773 273.51 Tm [<0014000F0012000F>]TJ
ET
EMC
/P<</MCID 48>> BDC
@@ -911,7 +918,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 273.51 Tm [<000100130013>]TJ
+1 0 0 1 520.866 273.51 Tm [<000100130011>]TJ
0 g 0 G
ET
EMC
@@ -919,7 +926,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 259.961 Tm [<001300140001>]TJ
+1 0 0 1 108.183 259.961 Tm [<001300120001>]TJ
0 g 0 G
ET
EMC
@@ -929,7 +936,7 @@ EMC
/Lbl<</MCID 51>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 259.961 Tm [<0014000F0018000F>]TJ
+1 0 0 1 90.773 259.961 Tm [<0014000F0013000F>]TJ
ET
EMC
/P<</MCID 52>> BDC
@@ -955,7 +962,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 259.961 Tm [<000100130014>]TJ
+1 0 0 1 520.866 259.961 Tm [<000100130012>]TJ
0 g 0 G
ET
EMC
@@ -963,7 +970,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 246.411 Tm [<001300150001>]TJ
+1 0 0 1 108.183 246.411 Tm [<001300130001>]TJ
0 g 0 G
ET
EMC
@@ -973,7 +980,7 @@ EMC
/Lbl<</MCID 55>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 246.411 Tm [<0014000F0019000F>]TJ
+1 0 0 1 90.773 246.411 Tm [<0014000F0014000F>]TJ
ET
EMC
/P<</MCID 56>> BDC
@@ -999,7 +1006,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 246.411 Tm [<000100130015>]TJ
+1 0 0 1 520.866 246.411 Tm [<000100130013>]TJ
0 g 0 G
ET
EMC
@@ -1007,7 +1014,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 232.862 Tm [<001300160001>]TJ
+1 0 0 1 108.183 232.862 Tm [<001300140001>]TJ
0 g 0 G
ET
EMC
@@ -1017,7 +1024,7 @@ EMC
/Lbl<</MCID 59>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 232.862 Tm [<0014000F001A000F>]TJ
+1 0 0 1 90.773 232.862 Tm [<0014000F0015000F>]TJ
ET
EMC
/P<</MCID 60>> BDC
@@ -1043,7 +1050,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 232.862 Tm [<000100130016>]TJ
+1 0 0 1 520.866 232.862 Tm [<000100130014>]TJ
0 g 0 G
ET
EMC
@@ -1051,7 +1058,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 219.313 Tm [<001300170001>]TJ
+1 0 0 1 108.183 219.313 Tm [<001300150001>]TJ
0 g 0 G
ET
EMC
@@ -1061,7 +1068,7 @@ EMC
/Lbl<</MCID 63>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 219.313 Tm [<0014000F00120011000F>]TJ
+1 0 0 1 90.773 219.313 Tm [<0014000F0016000F>]TJ
ET
EMC
/P<</MCID 64>> BDC
@@ -1080,14 +1087,14 @@ EMC
/Reference<</MCID 65>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 219.313 Tm [<0018>]TJ
+1 0 0 1 515.084 219.313 Tm [<0017>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 219.313 Tm [<000100130017>]TJ
+1 0 0 1 520.866 219.313 Tm [<000100130015>]TJ
0 g 0 G
ET
EMC
@@ -1095,7 +1102,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 205.764 Tm [<001300180001>]TJ
+1 0 0 1 108.183 205.764 Tm [<001300160001>]TJ
0 g 0 G
ET
EMC
@@ -1105,7 +1112,7 @@ EMC
/Lbl<</MCID 67>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 205.764 Tm [<0014000F00120012000F>]TJ
+1 0 0 1 90.773 205.764 Tm [<0014000F0017000F>]TJ
ET
EMC
/P<</MCID 68>> BDC
@@ -1131,7 +1138,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 205.764 Tm [<000100130018>]TJ
+1 0 0 1 520.866 205.764 Tm [<000100130016>]TJ
0 g 0 G
ET
EMC
@@ -1139,7 +1146,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 192.215 Tm [<001300190001>]TJ
+1 0 0 1 108.183 192.215 Tm [<001300170001>]TJ
0 g 0 G
ET
EMC
@@ -1149,7 +1156,7 @@ EMC
/Lbl<</MCID 71>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 192.215 Tm [<0014000F00120013000F>]TJ
+1 0 0 1 90.773 192.215 Tm [<0014000F0018000F>]TJ
ET
EMC
/P<</MCID 72>> BDC
@@ -1175,7 +1182,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 192.215 Tm [<000100130019>]TJ
+1 0 0 1 520.866 192.215 Tm [<000100130017>]TJ
0 g 0 G
ET
EMC
@@ -1183,7 +1190,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 178.665 Tm [<0013001A0001>]TJ
+1 0 0 1 108.183 178.665 Tm [<001300180001>]TJ
0 g 0 G
ET
EMC
@@ -1193,7 +1200,7 @@ EMC
/Lbl<</MCID 75>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 178.665 Tm [<0014000F00120014000F>]TJ
+1 0 0 1 90.773 178.665 Tm [<0014000F0019000F>]TJ
ET
EMC
/P<</MCID 76>> BDC
@@ -1219,7 +1226,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 178.665 Tm [<00010013001A>]TJ
+1 0 0 1 520.866 178.665 Tm [<000100130018>]TJ
0 g 0 G
ET
EMC
@@ -1227,7 +1234,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 165.116 Tm [<001400110001>]TJ
+1 0 0 1 108.183 165.116 Tm [<001300190001>]TJ
0 g 0 G
ET
EMC
@@ -1237,13 +1244,13 @@ EMC
/Lbl<</MCID 79>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 165.116 Tm [<0014000F00120015000F>]TJ
+1 0 0 1 90.773 165.116 Tm [<0014000F001A000F>]TJ
ET
EMC
/P<</MCID 80>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 165.116 Tm [<002400490042004F0048004600540001004A004F00010057>5<004600530054004A0050004F00010011000F001A>]TJ
+1 0 0 1 115.864 165.116 Tm [<002400490042004F0048004600540001004A004F00010057>5<004600530054004A0050004F00010011000F001A0011>]TJ
ET
EMC
/Artifact BMC
@@ -1263,7 +1270,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 165.116 Tm [<000100140011>]TJ
+1 0 0 1 520.866 165.116 Tm [<000100130019>]TJ
0 g 0 G
ET
EMC
@@ -1271,7 +1278,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 151.567 Tm [<001400120001>]TJ
+1 0 0 1 108.183 151.567 Tm [<0013001A0001>]TJ
0 g 0 G
ET
EMC
@@ -1281,20 +1288,20 @@ EMC
/Lbl<</MCID 83>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 151.567 Tm [<0014000F00120016000F>]TJ
+1 0 0 1 90.773 151.567 Tm [<0014000F00120011000F>]TJ
ET
EMC
/P<</MCID 84>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 151.567 Tm [<0031>12<0053>6<005000500047000100500047000100440050004F0044004600510055001B0001>-75<00550049004600010055004200480048004A004F0048000100500047000100550049004600010045005000440056004E0046004F005500420055004A0050004F0001004A005500540046004D0047>]TJ
+1 0 0 1 115.864 151.567 Tm [<002400490042004F0048004600540001004A004F00010057>5<004600530054004A0050004F00010011000F001A0013>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 402.583 151.567 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 235.687 151.567 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 85>> BDC
@@ -1307,12 +1314,60 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 151.567 Tm [<000100140012>]TJ
+1 0 0 1 520.866 151.567 Tm [<00010013001A>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 108.183 138.018 Tm [<001400110001>]TJ
0 g 0 G
+ET
+EMC
+/Link<</MCID 86>> BDC
+0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
+EMC
+/Lbl<</MCID 87>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 90.773 138.018 Tm [<0014000F00120012000F>]TJ
+ET
+EMC
+/P<</MCID 88>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 115.864 138.018 Tm [<0031>12<0053>6<005000500047000100500047000100440050004F0044004600510055001B0001>-75<00550049004600010055004200480048004A004F0048000100500047000100550049004600010045005000440056004E0046004F005500420055004A0050004F0001004A005500540046004D0047>]TJ
+ET
+EMC
+/Artifact BMC
+0 g 0 G
+BT
+/F68 10.90909 Tf
+1 0 0 1 402.583 138.018 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+ET
+EMC
+/Reference<</MCID 89>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 515.084 138.018 Tm [<001A>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 520.866 138.018 Tm [<000100140011>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+EMC
+/Artifact BMC
+0 g 0 G
+EMC
+/Artifact BMC
EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
@@ -1359,179 +1414,192 @@ EMC
endstream
endobj
17 0 obj
-<< /Type /Page /Contents 198 0 R /Resources 197 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 0/Tabs /S /Parent 207 0 R /Annots 208 0 R >>
+<< /Type /Page /Contents 206 0 R /Resources 205 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 0/Tabs /S /Parent 215 0 R /Annots 216 0 R >>
endobj
-208 0 obj
-[ 33 0 R 40 0 R 48 0 R 56 0 R 64 0 R 72 0 R 80 0 R 88 0 R 96 0 R 104 0 R 112 0 R 120 0 R 128 0 R 136 0 R 144 0 R 152 0 R 160 0 R 168 0 R 176 0 R ]
+216 0 obj
+[ 33 0 R 40 0 R 48 0 R 56 0 R 64 0 R 72 0 R 80 0 R 88 0 R 96 0 R 104 0 R 112 0 R 120 0 R 128 0 R 136 0 R 144 0 R 152 0 R 160 0 R 168 0 R 176 0 R 184 0 R ]
endobj
33 0 obj
-<< /Type /Annot /Subtype /Link /Contents (url) /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://github.com/u-fischer/tagpdf) >> /StructParent 37 /Rect [ 196.109 484.616 399.167 496.874 ]
+<< /Type /Annot /Subtype /Link /Contents (url) /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://github.com/u-fischer/tagpdf) >> /StructParent 39 /Rect [ 196.109 484.616 399.167 496.874 ]
>>
endobj
40 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 38 /Rect [ 73.413 402.594 196.158 412.812 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 40 /Rect [ 73.413 402.594 201.94 412.812 ]/A << /S /GoTo /D (section.1) >> >>
endobj
48 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 39 /Rect [ 73.413 378.136 250.573 388.354 ]/A << /S /GoTo /D (section.2) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 41 /Rect [ 73.413 378.136 154.878 388.354 ]/A << /S /GoTo /D (section.2) >> >>
endobj
56 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 40 /Rect [ 73.413 353.678 154.878 363.896 ]/A << /S /GoTo /D (section.3) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 42 /Rect [ 89.777 362.078 239.097 374.805 ]/A << /S /GoTo /D (subsection.2.1) >> >>
endobj
64 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 41 /Rect [ 89.777 337.62 239.097 350.347 ]/A << /S /GoTo /D (subsection.3.1) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 43 /Rect [ 89.777 348.529 213.286 361.256 ]/A << /S /GoTo /D (subsection.2.2) >> >>
endobj
72 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 42 /Rect [ 89.777 324.07 213.286 336.797 ]/A << /S /GoTo /D (subsection.3.2) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 44 /Rect [ 89.777 334.979 285.635 347.706 ]/A << /S /GoTo /D (subsection.2.3) >> >>
endobj
80 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 43 /Rect [ 89.777 310.521 285.635 323.248 ]/A << /S /GoTo /D (subsection.3.3) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 45 /Rect [ 89.777 323.939 167.249 334.157 ]/A << /S /GoTo /D (subsection.2.4) >> >>
endobj
88 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 44 /Rect [ 89.777 299.481 167.249 309.699 ]/A << /S /GoTo /D (subsection.3.4) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 46 /Rect [ 89.777 308.012 206.337 320.608 ]/A << /S /GoTo /D (subsection.2.5) >> >>
endobj
96 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 45 /Rect [ 89.777 283.554 206.337 296.15 ]/A << /S /GoTo /D (subsection.3.5) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 47 /Rect [ 73.413 283.423 134.348 296.15 ]/A << /S /GoTo /D (section.3) >> >>
endobj
104 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 46 /Rect [ 89.777 269.874 188.729 282.601 ]/A << /S /GoTo /D (subsection.3.6) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 48 /Rect [ 89.777 269.874 188.729 282.601 ]/A << /S /GoTo /D (subsection.3.1) >> >>
endobj
112 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 47 /Rect [ 89.777 256.324 188.729 269.051 ]/A << /S /GoTo /D (subsection.3.7) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 49 /Rect [ 89.777 256.324 188.729 269.051 ]/A << /S /GoTo /D (subsection.3.2) >> >>
endobj
120 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 48 /Rect [ 89.777 242.775 188.729 255.502 ]/A << /S /GoTo /D (subsection.3.8) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 50 /Rect [ 89.777 242.775 188.729 255.502 ]/A << /S /GoTo /D (subsection.3.3) >> >>
endobj
128 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 49 /Rect [ 89.777 229.226 233.238 241.953 ]/A << /S /GoTo /D (subsection.3.9) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 51 /Rect [ 89.777 229.226 233.238 241.953 ]/A << /S /GoTo /D (subsection.3.4) >> >>
endobj
136 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 50 /Rect [ 89.777 215.677 227.457 228.404 ]/A << /S /GoTo /D (subsection.3.10) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 52 /Rect [ 89.777 215.677 227.457 228.404 ]/A << /S /GoTo /D (subsection.3.5) >> >>
endobj
144 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 51 /Rect [ 89.777 202.128 233.238 214.855 ]/A << /S /GoTo /D (subsection.3.11) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 53 /Rect [ 89.777 202.128 233.238 214.855 ]/A << /S /GoTo /D (subsection.3.6) >> >>
endobj
152 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 52 /Rect [ 89.777 188.578 233.238 201.305 ]/A << /S /GoTo /D (subsection.3.12) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 54 /Rect [ 89.777 188.578 233.238 201.305 ]/A << /S /GoTo /D (subsection.3.7) >> >>
endobj
160 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 53 /Rect [ 89.777 175.029 233.238 187.756 ]/A << /S /GoTo /D (subsection.3.13) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 55 /Rect [ 89.777 175.029 233.238 187.756 ]/A << /S /GoTo /D (subsection.3.8) >> >>
endobj
168 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 54 /Rect [ 89.777 161.48 227.457 174.207 ]/A << /S /GoTo /D (subsection.3.14) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 56 /Rect [ 89.777 161.48 233.238 174.207 ]/A << /S /GoTo /D (subsection.3.9) >> >>
endobj
176 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 55 /Rect [ 89.777 147.931 395.162 160.658 ]/A << /S /GoTo /D (subsection.3.15) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 57 /Rect [ 89.777 147.931 233.238 160.658 ]/A << /S /GoTo /D (subsection.3.10) >> >>
endobj
-199 0 obj
+184 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 58 /Rect [ 89.777 134.382 395.162 147.109 ]/A << /S /GoTo /D (subsection.3.11) >> >>
+endobj
+207 0 obj
<< /D [ 17 0 R /XYZ 73.409 809.993 null ] >>
endobj
-200 0 obj
+208 0 obj
<< /D [ 17 0 R /XYZ 74.409 771.732 null ] >>
endobj
-206 0 obj
+214 0 obj
<< /D [ 17 0 R /XYZ 74.409 454.273 null ] >>
endobj
-197 0 obj
-<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F65 201 0 R /F66 202 0 R /F68 203 0 R /F69 204 0 R /F71 205 0 R >> >>
+205 0 obj
+<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F65 209 0 R /F66 210 0 R /F68 211 0 R /F69 212 0 R /F71 213 0 R >> >>
endobj
-233 0 obj
-<< /Type/OBJR/Obj 230 0 R >>
+242 0 obj
+<< /Type/OBJR/Obj 239 0 R >>
endobj
-241 0 obj
-<< /Type/OBJR/Obj 238 0 R >>
+250 0 obj
+<< /Type/OBJR/Obj 247 0 R >>
endobj
-249 0 obj
-<< /Type/OBJR/Obj 246 0 R >>
+258 0 obj
+<< /Type/OBJR/Obj 255 0 R >>
endobj
-257 0 obj
-<< /Type/OBJR/Obj 254 0 R >>
+266 0 obj
+<< /Type/OBJR/Obj 263 0 R >>
endobj
-265 0 obj
-<< /Type/OBJR/Obj 262 0 R >>
+274 0 obj
+<< /Type/OBJR/Obj 271 0 R >>
endobj
-273 0 obj
-<< /Type/OBJR/Obj 270 0 R >>
+282 0 obj
+<< /Type/OBJR/Obj 279 0 R >>
endobj
-281 0 obj
-<< /Type/OBJR/Obj 278 0 R >>
+290 0 obj
+<< /Type/OBJR/Obj 287 0 R >>
endobj
-289 0 obj
-<< /Type/OBJR/Obj 286 0 R >>
+298 0 obj
+<< /Type/OBJR/Obj 295 0 R >>
endobj
-297 0 obj
-<< /Type/OBJR/Obj 294 0 R >>
+306 0 obj
+<< /Type/OBJR/Obj 303 0 R >>
endobj
-305 0 obj
-<< /Type/OBJR/Obj 302 0 R >>
+314 0 obj
+<< /Type/OBJR/Obj 311 0 R >>
endobj
-313 0 obj
-<< /Type/OBJR/Obj 310 0 R >>
+322 0 obj
+<< /Type/OBJR/Obj 319 0 R >>
endobj
-321 0 obj
-<< /Type/OBJR/Obj 318 0 R >>
+330 0 obj
+<< /Type/OBJR/Obj 327 0 R >>
endobj
-329 0 obj
-<< /Type/OBJR/Obj 326 0 R >>
+338 0 obj
+<< /Type/OBJR/Obj 335 0 R >>
endobj
-337 0 obj
-<< /Type/OBJR/Obj 334 0 R >>
+346 0 obj
+<< /Type/OBJR/Obj 343 0 R >>
endobj
-345 0 obj
-<< /Type/OBJR/Obj 342 0 R >>
+354 0 obj
+<< /Type/OBJR/Obj 351 0 R >>
endobj
-353 0 obj
-<< /Type/OBJR/Obj 350 0 R >>
+362 0 obj
+<< /Type/OBJR/Obj 359 0 R >>
endobj
-361 0 obj
-<< /Type/OBJR/Obj 358 0 R >>
+370 0 obj
+<< /Type/OBJR/Obj 367 0 R >>
endobj
-369 0 obj
-<< /Type/OBJR/Obj 366 0 R >>
+378 0 obj
+<< /Type/OBJR/Obj 375 0 R >>
endobj
-377 0 obj
-<< /Type/OBJR/Obj 374 0 R >>
+386 0 obj
+<< /Type/OBJR/Obj 383 0 R >>
endobj
-385 0 obj
-<< /Type/OBJR/Obj 382 0 R >>
+394 0 obj
+<< /Type/OBJR/Obj 391 0 R >>
endobj
-393 0 obj
-<< /Type/OBJR/Obj 390 0 R >>
+402 0 obj
+<< /Type/OBJR/Obj 399 0 R >>
endobj
-401 0 obj
-<< /Type/OBJR/Obj 398 0 R >>
+410 0 obj
+<< /Type/OBJR/Obj 407 0 R >>
endobj
-409 0 obj
-<< /Type/OBJR/Obj 406 0 R >>
+418 0 obj
+<< /Type/OBJR/Obj 415 0 R >>
endobj
-417 0 obj
-<< /Type/OBJR/Obj 414 0 R >>
+426 0 obj
+<< /Type/OBJR/Obj 423 0 R >>
endobj
-425 0 obj
-<< /Type/OBJR/Obj 422 0 R >>
+434 0 obj
+<< /Type/OBJR/Obj 431 0 R >>
endobj
-433 0 obj
-<< /Type/OBJR/Obj 430 0 R >>
+442 0 obj
+<< /Type/OBJR/Obj 439 0 R >>
endobj
-441 0 obj
-<< /Type/OBJR/Obj 438 0 R >>
+450 0 obj
+<< /Type/OBJR/Obj 447 0 R >>
endobj
-449 0 obj
-<< /Type/OBJR/Obj 446 0 R >>
+458 0 obj
+<< /Type/OBJR/Obj 455 0 R >>
endobj
-456 0 obj
-<< /Type/OBJR/Obj 454 0 R >>
+466 0 obj
+<< /Type/OBJR/Obj 463 0 R >>
endobj
-464 0 obj
-<< /Type/OBJR/Obj 461 0 R >>
+473 0 obj
+<< /Type/OBJR/Obj 471 0 R >>
endobj
-471 0 obj
-<< /Length 34962 >>
+481 0 obj
+<< /Type/OBJR/Obj 478 0 R >>
+endobj
+487 0 obj
+<< /Type/OBJR/Obj 486 0 R >>
+endobj
+490 0 obj
+<< /Length 36027 >>
stream
/opacity1 gs
/Artifact BMC
+EMC
+/Artifact BMC
0 g 0 G
EMC
+/Artifact BMC
+EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
EMC
@@ -1567,7 +1635,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 760.773 Tm [<001400130001>]TJ
+1 0 0 1 83.092 760.773 Tm [<001400120001>]TJ
0 g 0 G
ET
EMC
@@ -1592,14 +1660,14 @@ EMC
/Reference<</MCID 3>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 515.084 760.773 Tm [<001A>]TJ
+1 0 0 1 509.303 760.773 Tm [<00120011>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 760.773 Tm [<000100140013>]TJ
+1 0 0 1 520.866 760.773 Tm [<000100140012>]TJ
0 g 0 G
ET
EMC
@@ -1607,7 +1675,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 747.224 Tm [<001400140001>]TJ
+1 0 0 1 108.183 747.224 Tm [<001400130001>]TJ
0 g 0 G
ET
EMC
@@ -1643,7 +1711,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 747.224 Tm [<000100140014>]TJ
+1 0 0 1 520.866 747.224 Tm [<000100140013>]TJ
0 g 0 G
ET
EMC
@@ -1651,7 +1719,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 733.675 Tm [<001700110001>]TJ
+1 0 0 1 108.183 733.675 Tm [<001400140001>]TJ
0 g 0 G
ET
EMC
@@ -1680,14 +1748,14 @@ EMC
/Reference<</MCID 11>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 733.675 Tm [<00120011>]TJ
+1 0 0 1 509.303 733.675 Tm [<00120012>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 733.675 Tm [<000100170011>]TJ
+1 0 0 1 520.866 733.675 Tm [<000100140014>]TJ
0 g 0 G
ET
EMC
@@ -1695,7 +1763,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 709.217 Tm [<001700120001>]TJ
+1 0 0 1 83.092 709.217 Tm [<001400150001>]TJ
0 g 0 G
ET
EMC
@@ -1720,14 +1788,14 @@ EMC
/Reference<</MCID 15>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 709.217 Tm [<00120012>]TJ
+1 0 0 1 509.303 709.217 Tm [<00120013>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 709.217 Tm [<000100170012>]TJ
+1 0 0 1 520.866 709.217 Tm [<000100140015>]TJ
0 g 0 G
ET
EMC
@@ -1735,7 +1803,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 695.668 Tm [<001700130001>]TJ
+1 0 0 1 108.183 695.668 Tm [<001400160001>]TJ
0 g 0 G
ET
EMC
@@ -1764,14 +1832,14 @@ EMC
/Reference<</MCID 19>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 695.668 Tm [<00120013>]TJ
+1 0 0 1 509.303 695.668 Tm [<00120014>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 695.668 Tm [<000100170013>]TJ
+1 0 0 1 520.866 695.668 Tm [<000100140016>]TJ
0 g 0 G
ET
EMC
@@ -1779,7 +1847,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 682.118 Tm [<001700140001>]TJ
+1 0 0 1 108.183 682.118 Tm [<001400170001>]TJ
0 g 0 G
ET
EMC
@@ -1808,14 +1876,14 @@ EMC
/Reference<</MCID 23>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 682.118 Tm [<00120013>]TJ
+1 0 0 1 509.303 682.118 Tm [<00120014>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 682.118 Tm [<000100170014>]TJ
+1 0 0 1 520.866 682.118 Tm [<000100140017>]TJ
0 g 0 G
ET
EMC
@@ -1823,7 +1891,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 668.569 Tm [<001700150001>]TJ
+1 0 0 1 143.092 668.569 Tm [<001400180001>]TJ
0 g 0 G
ET
EMC
@@ -1852,14 +1920,14 @@ EMC
/Reference<</MCID 27>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 668.569 Tm [<00120016>]TJ
+1 0 0 1 509.303 668.569 Tm [<00120017>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 668.569 Tm [<000100170015>]TJ
+1 0 0 1 520.866 668.569 Tm [<000100140018>]TJ
0 g 0 G
ET
EMC
@@ -1867,7 +1935,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 655.02 Tm [<001700160001>]TJ
+1 0 0 1 143.092 655.02 Tm [<001400190001>]TJ
0 g 0 G
ET
EMC
@@ -1903,7 +1971,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 655.02 Tm [<000100170016>]TJ
+1 0 0 1 520.866 655.02 Tm [<000100140019>]TJ
0 g 0 G
ET
EMC
@@ -1911,7 +1979,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 641.471 Tm [<001700170001>]TJ
+1 0 0 1 143.092 641.471 Tm [<0014001A0001>]TJ
0 g 0 G
ET
EMC
@@ -1940,14 +2008,14 @@ EMC
/Reference<</MCID 35>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 641.471 Tm [<00120019>]TJ
+1 0 0 1 509.303 641.471 Tm [<0012001A>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 641.471 Tm [<000100170017>]TJ
+1 0 0 1 520.866 641.471 Tm [<00010014001A>]TJ
0 g 0 G
ET
EMC
@@ -1955,7 +2023,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 627.922 Tm [<001700180001>]TJ
+1 0 0 1 143.092 627.922 Tm [<001500110001>]TJ
0 g 0 G
ET
EMC
@@ -1984,14 +2052,14 @@ EMC
/Reference<</MCID 39>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 627.922 Tm [<0012001A>]TJ
+1 0 0 1 509.303 627.922 Tm [<00130011>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 627.922 Tm [<000100170018>]TJ
+1 0 0 1 520.866 627.922 Tm [<000100150011>]TJ
0 g 0 G
ET
EMC
@@ -1999,7 +2067,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 614.372 Tm [<001700190001>]TJ
+1 0 0 1 143.092 614.372 Tm [<001500120001>]TJ
0 g 0 G
ET
EMC
@@ -2015,27 +2083,27 @@ EMC
/P<</MCID 42>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 614.372 Tm [<002D004A004F004C005400010042004F004500010050005500490046005300010042004F004F0050005500420055004A0050004F0054>]TJ
+1 0 0 1 150.773 614.372 Tm [<0029>30<0046004200450046005300010042004F004500010027>36<00500050005500460053>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 294.101 614.372 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 252.377 614.372 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 43>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 614.372 Tm [<00130011>]TJ
+1 0 0 1 509.303 614.372 Tm [<00130012>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 614.372 Tm [<000100170019>]TJ
+1 0 0 1 520.866 614.372 Tm [<000100150012>]TJ
0 g 0 G
ET
EMC
@@ -2043,7 +2111,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 600.823 Tm [<0017001A0001>]TJ
+1 0 0 1 143.092 600.823 Tm [<001500130001>]TJ
0 g 0 G
ET
EMC
@@ -2059,14 +2127,14 @@ EMC
/P<</MCID 46>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 600.823 Tm [<002E>12<004200550049>]TJ
+1 0 0 1 150.773 600.823 Tm [<002D004A004F004C005400010042004F004500010050005500490046005300010042004F004F0050005500420055004A0050004F0054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 185.619 600.823 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 294.101 600.823 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 47>> BDC
@@ -2079,7 +2147,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 600.823 Tm [<00010017001A>]TJ
+1 0 0 1 520.866 600.823 Tm [<000100150013>]TJ
0 g 0 G
ET
EMC
@@ -2087,7 +2155,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 587.274 Tm [<001800110001>]TJ
+1 0 0 1 143.092 587.274 Tm [<001500140001>]TJ
0 g 0 G
ET
EMC
@@ -2103,27 +2171,27 @@ EMC
/P<</MCID 50>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 587.274 Tm [<0034>24<0051004D004A00550001005100420053>10<004200480053>10<0042005100490054>]TJ
+1 0 0 1 150.773 587.274 Tm [<002E>12<004200550049>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 235.687 587.274 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 185.619 587.274 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 51>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 587.274 Tm [<00130013>]TJ
+1 0 0 1 509.303 587.274 Tm [<00130014>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 587.274 Tm [<000100180011>]TJ
+1 0 0 1 520.866 587.274 Tm [<000100150014>]TJ
0 g 0 G
ET
EMC
@@ -2131,7 +2199,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 573.725 Tm [<001800120001>]TJ
+1 0 0 1 143.092 573.725 Tm [<001500150001>]TJ
0 g 0 G
ET
EMC
@@ -2147,27 +2215,27 @@ EMC
/P<</MCID 54>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 573.725 Tm [<0022>25<005600550050004E00420055004A004400010055004200480048004A004F00480001005000470001005100420053>10<004200480053>10<0042005100490054>]TJ
+1 0 0 1 150.773 573.725 Tm [<0034>24<0051004D004A00550001005100420053>10<004200480053>10<0042005100490054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 319.135 573.725 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 235.687 573.725 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 55>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 573.725 Tm [<00130014>]TJ
+1 0 0 1 509.303 573.725 Tm [<00130015>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 573.725 Tm [<000100180012>]TJ
+1 0 0 1 520.866 573.725 Tm [<000100150015>]TJ
0 g 0 G
ET
EMC
@@ -2175,7 +2243,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 560.176 Tm [<001800130001>]TJ
+1 0 0 1 143.092 560.176 Tm [<001500160001>]TJ
0 g 0 G
ET
EMC
@@ -2185,33 +2253,33 @@ EMC
/Lbl<</MCID 57>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 560.176 Tm [<0016000F0014000F>]TJ
+1 0 0 1 115.864 560.176 Tm [<0016000F0013000F001A000F>]TJ
ET
EMC
/P<</MCID 58>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 560.176 Tm [<0035>100<00420054004C00010013001B0001>-75<002E>12<00420053>6<004C004A004F004800010055004900460001005400550053>-8<00560044005500560053>20<0046>]TJ
+1 0 0 1 150.773 560.176 Tm [<0022>25<005600550050004E00420055004A004400010055004200480048004A004F00480001005000470001005100420053>10<004200480053>10<0042005100490054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 269.067 560.176 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 319.135 560.176 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 59>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 560.176 Tm [<00130014>]TJ
+1 0 0 1 509.303 560.176 Tm [<00130016>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 560.176 Tm [<000100180013>]TJ
+1 0 0 1 520.866 560.176 Tm [<000100150016>]TJ
0 g 0 G
ET
EMC
@@ -2219,7 +2287,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 546.626 Tm [<001800140001>]TJ
+1 0 0 1 108.183 546.626 Tm [<001500170001>]TJ
0 g 0 G
ET
EMC
@@ -2229,33 +2297,33 @@ EMC
/Lbl<</MCID 61>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 546.626 Tm [<0016000F0014000F0012000F>]TJ
+1 0 0 1 90.773 546.626 Tm [<0016000F0014000F>]TJ
ET
EMC
/P<</MCID 62>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 546.626 Tm [<0034>24<00550053>-8<00560044005500560053>20<004600010055005A005100460054>]TJ
+1 0 0 1 115.864 546.626 Tm [<0035>100<00420054004C00010013001B0001>-75<002E>12<00420053>6<004C004A004F004800010055004900460001005400550053>-8<00560044005500560053>20<0046>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 235.687 546.626 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 269.067 546.626 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 63>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 546.626 Tm [<00130014>]TJ
+1 0 0 1 509.303 546.626 Tm [<00130016>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 546.626 Tm [<000100180014>]TJ
+1 0 0 1 520.866 546.626 Tm [<000100150017>]TJ
0 g 0 G
ET
EMC
@@ -2263,7 +2331,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 533.077 Tm [<001800150001>]TJ
+1 0 0 1 143.092 533.077 Tm [<001500180001>]TJ
0 g 0 G
ET
EMC
@@ -2273,33 +2341,33 @@ EMC
/Lbl<</MCID 65>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 533.077 Tm [<0016000F0014000F0013000F>]TJ
+1 0 0 1 115.864 533.077 Tm [<0016000F0014000F0012000F>]TJ
ET
EMC
/P<</MCID 66>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 533.077 Tm [<0034>12<004600440055004A0050004F004A004F0048>]TJ
+1 0 0 1 150.773 533.077 Tm [<0034>24<00550053>-8<00560044005500560053>20<004600010055005A005100460054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 210.653 533.077 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>]TJ
+1 0 0 1 235.687 533.077 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 67>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 533.077 Tm [<00130015>]TJ
+1 0 0 1 509.303 533.077 Tm [<00130016>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 533.077 Tm [<000100180015>]TJ
+1 0 0 1 520.866 533.077 Tm [<000100150018>]TJ
0 g 0 G
ET
EMC
@@ -2307,7 +2375,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 519.528 Tm [<001800160001>]TJ
+1 0 0 1 143.092 519.528 Tm [<001500190001>]TJ
0 g 0 G
ET
EMC
@@ -2317,33 +2385,33 @@ EMC
/Lbl<</MCID 69>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 519.528 Tm [<0016000F0014000F0014000F>]TJ
+1 0 0 1 115.864 519.528 Tm [<0016000F0014000F0013000F>]TJ
ET
EMC
/P<</MCID 70>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 519.528 Tm [<0024>12<0050004E004E0042004F00450054000100550050000100450046056D004F004600010055004900460001005400550053>-8<00560044005500560053>20<0046>]TJ
+1 0 0 1 150.773 519.528 Tm [<0034>12<004600440055004A0050004F004A004F0048>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 327.48 519.528 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 210.653 519.528 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>]TJ
ET
EMC
/Reference<</MCID 71>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 519.528 Tm [<00130015>]TJ
+1 0 0 1 509.303 519.528 Tm [<00130017>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 519.528 Tm [<000100180016>]TJ
+1 0 0 1 520.866 519.528 Tm [<000100150019>]TJ
0 g 0 G
ET
EMC
@@ -2351,7 +2419,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 505.979 Tm [<001800170001>]TJ
+1 0 0 1 143.092 505.979 Tm [<0015001A0001>]TJ
0 g 0 G
ET
EMC
@@ -2361,20 +2429,20 @@ EMC
/Lbl<</MCID 73>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 505.979 Tm [<0016000F0014000F0015000F>]TJ
+1 0 0 1 115.864 505.979 Tm [<0016000F0014000F0014000F>]TJ
ET
EMC
/P<</MCID 74>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 505.979 Tm [<0033>20<0050005000550001005400550053>-8<00560044005500560053>20<0046>]TJ
+1 0 0 1 150.773 505.979 Tm [<0024>12<0050004E004E0042004F00450054000100550050000100450046056D004F004600010055004900460001005400550053>-8<00560044005500560053>20<0046>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 227.343 505.979 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 327.48 505.979 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 75>> BDC
@@ -2387,7 +2455,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 505.979 Tm [<000100180017>]TJ
+1 0 0 1 520.866 505.979 Tm [<00010015001A>]TJ
0 g 0 G
ET
EMC
@@ -2395,7 +2463,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 143.092 492.43 Tm [<001800180001>]TJ
+1 0 0 1 143.092 492.43 Tm [<001600110001>]TJ
0 g 0 G
ET
EMC
@@ -2405,33 +2473,33 @@ EMC
/Lbl<</MCID 77>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 492.43 Tm [<0016000F0014000F0016000F>]TJ
+1 0 0 1 115.864 492.43 Tm [<0016000F0014000F0015000F>]TJ
ET
EMC
/P<</MCID 78>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 150.773 492.43 Tm [<0022>12<005500550053>-8<004A0043005600550046005400010042004F004500010042005500550053>-8<004A004300560055004600010044004D00420054005400460054>]TJ
+1 0 0 1 150.773 492.43 Tm [<0033>20<0050005000550001005400550053>-8<00560044005500560053>20<0046>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 310.791 492.43 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 227.343 492.43 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 79>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 492.43 Tm [<00130018>]TJ
+1 0 0 1 509.303 492.43 Tm [<00130019>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 492.43 Tm [<000100180018>]TJ
+1 0 0 1 520.866 492.43 Tm [<000100160011>]TJ
0 g 0 G
ET
EMC
@@ -2439,7 +2507,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 478.88 Tm [<001800190001>]TJ
+1 0 0 1 143.092 478.88 Tm [<001600120001>]TJ
0 g 0 G
ET
EMC
@@ -2449,33 +2517,33 @@ EMC
/Lbl<</MCID 81>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 478.88 Tm [<0016000F0015000F>]TJ
+1 0 0 1 115.864 478.88 Tm [<0016000F0014000F0016000F>]TJ
ET
EMC
/P<</MCID 82>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 478.88 Tm [<0035>100<00420054004C00010014001B0001>-75<00550053>20<004600460001002E>12<0042004F004200480046004E0046004F0055>]TJ
+1 0 0 1 150.773 478.88 Tm [<0022>12<005500550053>-8<004A0043005600550046005400010042004F004500010042005500550053>-8<004A004300560055004600010044004D00420054005400460054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 244.032 478.88 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 310.791 478.88 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 83>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 478.88 Tm [<00130018>]TJ
+1 0 0 1 509.303 478.88 Tm [<0013001A>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 478.88 Tm [<000100180019>]TJ
+1 0 0 1 520.866 478.88 Tm [<000100160012>]TJ
0 g 0 G
ET
EMC
@@ -2483,7 +2551,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 465.331 Tm [<0018001A0001>]TJ
+1 0 0 1 108.183 465.331 Tm [<001600130001>]TJ
0 g 0 G
ET
EMC
@@ -2493,33 +2561,33 @@ EMC
/Lbl<</MCID 85>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 465.331 Tm [<0016000F0016000F>]TJ
+1 0 0 1 90.773 465.331 Tm [<0016000F0015000F>]TJ
ET
EMC
/P<</MCID 86>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 465.331 Tm [<0022000100470056004D004D005A0001004E00420053>6<004C0046004500010056005100010045005000440056004E0046004F00550001004300500045005A>]TJ
+1 0 0 1 115.864 465.331 Tm [<0035>100<00420054004C00010014001B0001>-75<00550053>20<004600460001002E>12<0042004F004200480046004E0046004F0055>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 294.101 465.331 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 244.032 465.331 Tm [<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 87>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 465.331 Tm [<00130019>]TJ
+1 0 0 1 509.303 465.331 Tm [<0013001A>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 465.331 Tm [<00010018001A>]TJ
+1 0 0 1 520.866 465.331 Tm [<000100160013>]TJ
0 g 0 G
ET
EMC
@@ -2527,7 +2595,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 451.782 Tm [<001900110001>]TJ
+1 0 0 1 108.183 451.782 Tm [<001600140001>]TJ
0 g 0 G
ET
EMC
@@ -2537,33 +2605,33 @@ EMC
/Lbl<</MCID 89>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 451.782 Tm [<0016000F0017000F>]TJ
+1 0 0 1 90.773 451.782 Tm [<0016000F0016000F>]TJ
ET
EMC
/P<</MCID 90>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 451.782 Tm [<002D0042005B005A00010042004F004500010042005600550050004E00420055004A004400010055004200480048004A004F0048>]TJ
+1 0 0 1 115.864 451.782 Tm [<0022000100470056004D004D005A0001004E00420053>6<004C0046004500010056005100010045005000440056004E0046004F00550001004300500045005A>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 260.722 451.782 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 294.101 451.782 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 91>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 451.782 Tm [<0013001A>]TJ
+1 0 0 1 509.303 451.782 Tm [<00140011>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 451.782 Tm [<000100190011>]TJ
+1 0 0 1 520.866 451.782 Tm [<000100160014>]TJ
0 g 0 G
ET
EMC
@@ -2571,7 +2639,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 108.183 438.233 Tm [<001900120001>]TJ
+1 0 0 1 108.183 438.233 Tm [<001600150001>]TJ
0 g 0 G
ET
EMC
@@ -2581,33 +2649,33 @@ EMC
/Lbl<</MCID 93>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 438.233 Tm [<0016000F0018000F>]TJ
+1 0 0 1 90.773 438.233 Tm [<0016000F0017000F>]TJ
ET
EMC
/P<</MCID 94>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 115.864 438.233 Tm [<0022>12<00450045004A004F004800010055004200480048004A004F0048000100550050000100440050004E004E0042004F00450054>]TJ
+1 0 0 1 115.864 438.233 Tm [<002D0042005B005A00010042004F004500010042005600550050004E00420055004A004400010055004200480048004A004F0048>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
BT
/F68 10.90909 Tf
-1 0 0 1 269.067 438.233 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+1 0 0 1 260.722 438.233 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
ET
EMC
/Reference<</MCID 95>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 438.233 Tm [<0013001A>]TJ
+1 0 0 1 509.303 438.233 Tm [<00140012>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 438.233 Tm [<000100190012>]TJ
+1 0 0 1 520.866 438.233 Tm [<000100160015>]TJ
0 g 0 G
ET
EMC
@@ -2615,7 +2683,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 413.775 Tm [<001900130001>]TJ
+1 0 0 1 108.183 424.684 Tm [<001600160001>]TJ
0 g 0 G
ET
EMC
@@ -2625,29 +2693,33 @@ EMC
/Lbl<</MCID 97>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 413.775 Tm [<0017000F>]TJ
+1 0 0 1 90.773 424.684 Tm [<0016000F0018000F>]TJ
ET
EMC
/P<</MCID 98>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 413.775 Tm [<0022004D005500460053>-8<004F00420055004A0057>5<004600010055004600590055000D00010022>12<0044005500560042004D0035>100<00460059005500010042004F004500010055004600590055000E00550050000E00540051004600460044004900010054005000470055005800420053>20<0046>]TJ
+1 0 0 1 115.864 424.684 Tm [<0022>12<00450045004A004F004800010055004200480048004A004F0048000100550050000100440050004E004E0042004F00450054>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
+BT
+/F68 10.90909 Tf
+1 0 0 1 269.067 424.684 Tm [<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-499<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>-500<000F>]TJ
+ET
EMC
/Reference<</MCID 99>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 413.775 Tm [<00140011>]TJ
+1 0 0 1 509.303 424.684 Tm [<00140012>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 413.775 Tm [<000100190013>]TJ
+1 0 0 1 520.866 424.684 Tm [<000100160016>]TJ
0 g 0 G
ET
EMC
@@ -2655,7 +2727,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 389.316 Tm [<001900140001>]TJ
+1 0 0 1 83.092 400.225 Tm [<001600170001>]TJ
0 g 0 G
ET
EMC
@@ -2665,13 +2737,13 @@ EMC
/Lbl<</MCID 101>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 389.316 Tm [<0018000F>]TJ
+1 0 0 1 74.409 400.225 Tm [<0017000F>]TJ
ET
EMC
/P<</MCID 102>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 389.316 Tm [<0034>24<00550042004F004500420053>20<004500010055005A00510046005400010042004F00450001004F0046005800010055004200480054>]TJ
+1 0 0 1 90.773 400.225 Tm [<0022004D005500460053>-8<004F00420055004A0057>5<004600010055004600590055000D00010022>12<0044005500560042004D0035>100<00460059005500010042004F004500010055004600590055000E00550050000E00540051004600460044004900010054005000470055005800420053>20<0046>]TJ
ET
EMC
/Artifact BMC
@@ -2680,14 +2752,14 @@ EMC
/Reference<</MCID 103>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 389.316 Tm [<00140011>]TJ
+1 0 0 1 509.303 400.225 Tm [<00140013>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 389.316 Tm [<000100190014>]TJ
+1 0 0 1 520.866 400.225 Tm [<000100160017>]TJ
0 g 0 G
ET
EMC
@@ -2695,7 +2767,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 364.858 Tm [<001900150001>]TJ
+1 0 0 1 83.092 375.767 Tm [<001600180001>]TJ
0 g 0 G
ET
EMC
@@ -2705,13 +2777,13 @@ EMC
/Lbl<</MCID 105>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 364.858 Tm [<0019000F>]TJ
+1 0 0 1 74.409 375.767 Tm [<0018000F>]TJ
ET
EMC
/P<</MCID 106>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 364.858 Tm [<0447>20<0033>20<00460042004D>10<044800010054005100420044004600010048004D005A005100490054>]TJ
+1 0 0 1 90.773 375.767 Tm [<0034>24<00550042004F004500420053>20<004500010055005A00510046005400010042004F00450001004F0046005800010055004200480054>]TJ
ET
EMC
/Artifact BMC
@@ -2720,14 +2792,14 @@ EMC
/Reference<</MCID 107>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 364.858 Tm [<00140013>]TJ
+1 0 0 1 509.303 375.767 Tm [<00140013>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 364.858 Tm [<000100190015>]TJ
+1 0 0 1 520.866 375.767 Tm [<000100160018>]TJ
0 g 0 G
ET
EMC
@@ -2735,7 +2807,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 340.4 Tm [<001900160001>]TJ
+1 0 0 1 83.092 351.309 Tm [<001600190001>]TJ
0 g 0 G
ET
EMC
@@ -2745,13 +2817,13 @@ EMC
/Lbl<</MCID 109>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 340.4 Tm [<001A000F>]TJ
+1 0 0 1 74.409 351.309 Tm [<0019000F>]TJ
ET
EMC
/P<</MCID 110>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 340.4 Tm [<0022>12<00440044004600540054004A0043004A004D004A0055005A0001004A00540001004F0050005500010050004F004D005A00010055004200480048004A004F0048>]TJ
+1 0 0 1 90.773 351.309 Tm [<0447>20<0033>20<00460042004D>10<044800010054005100420044004600010048004D005A005100490054>]TJ
ET
EMC
/Artifact BMC
@@ -2760,14 +2832,14 @@ EMC
/Reference<</MCID 111>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 340.4 Tm [<00140013>]TJ
+1 0 0 1 509.303 351.309 Tm [<00140015>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 340.4 Tm [<000100190016>]TJ
+1 0 0 1 520.866 351.309 Tm [<000100160019>]TJ
0 g 0 G
ET
EMC
@@ -2775,7 +2847,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 315.941 Tm [<001900170001>]TJ
+1 0 0 1 83.092 326.851 Tm [<0016001A0001>]TJ
0 g 0 G
ET
EMC
@@ -2785,13 +2857,13 @@ EMC
/Lbl<</MCID 113>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 315.941 Tm [<00120011000F>]TJ
+1 0 0 1 74.409 326.851 Tm [<001A000F>]TJ
ET
EMC
/P<</MCID 114>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 315.941 Tm [<0025>6<00460043005600480048004A004F0048>]TJ
+1 0 0 1 90.773 326.851 Tm [<0022>12<00440044004600540054004A0043004A004D004A0055005A0001004A00540001004F0050005500010050004F004D005A00010055004200480048004A004F0048>]TJ
ET
EMC
/Artifact BMC
@@ -2800,14 +2872,14 @@ EMC
/Reference<</MCID 115>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 315.941 Tm [<00140014>]TJ
+1 0 0 1 509.303 326.851 Tm [<00140015>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 315.941 Tm [<000100190017>]TJ
+1 0 0 1 520.866 326.851 Tm [<00010016001A>]TJ
0 g 0 G
ET
EMC
@@ -2815,7 +2887,7 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 291.483 Tm [<001900180001>]TJ
+1 0 0 1 83.092 302.392 Tm [<001700110001>]TJ
0 g 0 G
ET
EMC
@@ -2825,13 +2897,13 @@ EMC
/Lbl<</MCID 117>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 291.483 Tm [<00120012000F>]TJ
+1 0 0 1 74.409 302.392 Tm [<00120011000F>]TJ
ET
EMC
/P<</MCID 118>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 291.483 Tm [<0035>100<0050000E00450050>]TJ
+1 0 0 1 90.773 302.392 Tm [<0025>6<00460043005600480048004A004F0048>]TJ
ET
EMC
/Artifact BMC
@@ -2840,14 +2912,14 @@ EMC
/Reference<</MCID 119>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 291.483 Tm [<00140015>]TJ
+1 0 0 1 509.303 302.392 Tm [<00140016>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 291.483 Tm [<000100190018>]TJ
+1 0 0 1 520.866 302.392 Tm [<000100170011>]TJ
0 g 0 G
ET
EMC
@@ -2855,33 +2927,39 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 267.025 Tm [<001900190001>]TJ
+1 0 0 1 83.092 277.934 Tm [<001700120001>]TJ
0 g 0 G
ET
EMC
/Link<</MCID 120>> BDC
0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
EMC
-/P<</MCID 121>> BDC
+/Lbl<</MCID 121>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 74.409 277.934 Tm [<00120012000F>]TJ
+ET
+EMC
+/P<</MCID 122>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 267.025 Tm [<0033>20<0046004700460053>20<0046004F004400460054>]TJ
+1 0 0 1 90.773 277.934 Tm [<0035>100<0050000E00450050>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
EMC
-/Reference<</MCID 122>> BDC
+/Reference<</MCID 123>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 267.025 Tm [<00140016>]TJ
+1 0 0 1 509.303 277.934 Tm [<00140017>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 267.025 Tm [<000100190019>]TJ
+1 0 0 1 520.866 277.934 Tm [<000100170012>]TJ
0 g 0 G
ET
EMC
@@ -2889,55 +2967,89 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 83.092 242.567 Tm [<0019001A0001>]TJ
+1 0 0 1 83.092 253.476 Tm [<001700130001>]TJ
0 g 0 G
ET
EMC
-/Link<</MCID 123>> BDC
+/Link<</MCID 124>> BDC
0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
EMC
-/Lbl<</MCID 124>> BDC
+/P<</MCID 125>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 242.567 Tm [<0022000F>]TJ
+1 0 0 1 74.409 253.476 Tm [<0033>20<0046004700460053>20<0046004F004400460054>]TJ
ET
EMC
-/P<</MCID 125>> BDC
+/Artifact BMC
+0 g 0 G
+EMC
+/Reference<</MCID 126>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 90.773 242.567 Tm [<0034>12<0050004E004600010053>20<0046004E00420053>6<004C00540001004200430050005600550001005500490046000100310025002700010054005A004F005500420059>]TJ
+1 0 0 1 509.303 253.476 Tm [<00140018>]TJ
ET
EMC
/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 520.866 253.476 Tm [<000100170013>]TJ
0 g 0 G
+ET
EMC
-/Reference<</MCID 126>> BDC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 83.092 229.017 Tm [<001700140001>]TJ
+0 g 0 G
+ET
+EMC
+/Link<</MCID 127>> BDC
+0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
+EMC
+/Lbl<</MCID 128>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 74.409 229.017 Tm [<0022000F>]TJ
+ET
+EMC
+/P<</MCID 129>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 509.303 242.567 Tm [<00140016>]TJ
+1 0 0 1 90.773 229.017 Tm [<0034>12<0050004E004600010053>20<0046004E00420053>6<004C00540001004200430050005600550001005500490046000100310025002700010054005A004F005500420059>]TJ
+ET
+EMC
+/Artifact BMC
+0 g 0 G
+EMC
+/Reference<</MCID 130>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 509.303 229.017 Tm [<00140018>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 520.866 242.567 Tm [<00010019001A>]TJ
+1 0 0 1 520.866 229.017 Tm [<000100170014>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
0 g 0 G
EMC
-/H1<</MCID 127>> BDC
+/H1<</MCID 131>> BDC
BT
/F65 14.3462 Tf
-1 0 0 1 74.008 199.15 Tm [<005200580067>]TJ
+1 0 0 1 74.008 185.601 Tm [<005200580067>]TJ
ET
EMC
-/H1<</MCID 128>> BDC
+/H1<</MCID 132>> BDC
BT
/F65 14.3462 Tf
-1 0 0 1 93.461 199.15 Tm [<0053006000320037001C002B00320067006900510067007000320060006200420051004D006700790058004E>]TJ
+1 0 0 1 93.461 185.601 Tm [<0053006000320037001C002B00320067006900510067007000320060006200420051004D006700790058004E006B>]TJ
ET
EMC
/Artifact BMC
@@ -2947,91 +3059,105 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 66.728 166.532 Tm [<001A00120001>]TJ
+1 0 0 1 66.728 152.983 Tm [<001700150001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 129>> BDC
+/P<</MCID 133>> BDC
BT
/F68 10.90909 Tf
-1.02 0 0 1 74.409 166.532 Tm [<002A>18<004F>]TJ
-1 0 0 1 84.98 166.532 Tm [<0001>]TJ
-1.02 0 0 1 88.304 166.532 Tm [<00550049004A0054>]TJ
-1 0 0 1 106.976 166.532 Tm [<0001>]TJ
-1.02 0 0 1 110.3 166.532 Tm [<0057>5<004600530054004A0050004F>]TJ
-1 0 0 1 147.298 166.532 Tm [<0001>]TJ
-1.02 0 0 1 150.622 166.532 Tm [<004D005000550054>]TJ
-1 0 0 1 168.827 166.532 Tm [<0001>]TJ
-1.02 0 0 1 172.151 166.532 Tm [<00500047>]TJ
-1 0 0 1 182.121 166.532 Tm [<0001>]TJ
-1.02 0 0 1 185.445 166.532 Tm [<00550049004A004F00480054>]TJ
-1 0 0 1 216.79 166.532 Tm [<0001>]TJ
-1.02 0 0 1 220.114 166.532 Tm [<004900420057>5<0046>]TJ
-1 0 0 1 243.96 166.532 Tm [<0001>]TJ
-1.02 0 0 1 247.284 166.532 Tm [<004400490042004F004800460045000D>]TJ
-1 0 0 1 293.373 166.532 Tm [<0001>]TJ
-1.02 0 0 1 296.915 166.532 Tm [<004300560055>]TJ
-1 0 0 1 314.14 166.532 Tm [<0001>]TJ
-1.02 0 0 1 317.464 166.532 Tm [<004E005000540055>]TJ
-1 0 0 1 342.834 166.532 Tm [<0001>]TJ
-1.02 0 0 1 346.158 166.532 Tm [<00500047>]TJ
-1 0 0 1 356.128 166.532 Tm [<0001>]TJ
-1.02 0 0 1 359.452 166.532 Tm [<005500490046004E>]TJ
-1 0 0 1 386.024 166.532 Tm [<0001>]TJ
-1.02 0 0 1 389.348 166.532 Tm [<00420053>20<0046>]TJ
-1 0 0 1 404.993 166.532 Tm [<0001>]TJ
-1.02 0 0 1 408.317 166.532 Tm [<004A004F005500460053>-7<004F0042004D001B>]TJ
-1 0 0 1 451.166 166.532 Tm [<0001>]TJ
-1.02 0 0 1 456.178 166.532 Tm [<005500490046>]TJ
-1 0 0 1 472.48 166.532 Tm [<0001>]TJ
-1.02 0 0 1 475.804 166.532 Tm [<0044005000450046>]TJ
-1 0 0 1 500.117 166.532 Tm [<0001>]TJ
-1.02 0 0 1 503.441 166.532 Tm [<004900420054>]TJ
-1 0 0 1 520.866 166.532 Tm [<0001>]TJ
-1.02 0 0 1 74.409 152.983 Tm [<004300460046004F>]TJ
-1 0 0 1 99.39 152.983 Tm [<0001>]TJ
-1.02 0 0 1 102.139 152.983 Tm [<0053>20<00460057004A00460058>6<00460045>]TJ
-1 0 0 1 147.382 152.983 Tm [<0001>]TJ
-1.02 0 0 1 150.131 152.983 Tm [<0042004F0045>]TJ
-1 0 0 1 169.492 152.983 Tm [<0001>]TJ
-1.02 0 0 1 172.241 152.983 Tm [<0044004D00460042004F00460045>]TJ
-1 0 0 1 211.664 152.983 Tm [<0001>]TJ
-1.02 0 0 1 214.413 152.983 Tm [<00560051>40<000D>]TJ
-1 0 0 1 230.425 152.983 Tm [<0001>]TJ
-1.02 0 0 1 233.247 152.983 Tm [<0042>]TJ
-1 0 0 1 239.067 152.983 Tm [<0001>]TJ
-1.02 0 0 1 241.815 152.983 Tm [<004F0056004E004300460053>]TJ
-1 0 0 1 282.419 152.983 Tm [<0001>]TJ
-1.02 0 0 1 285.167 152.983 Tm [<00500047>]TJ
-1 0 0 1 295.137 152.983 Tm [<0001>]TJ
-1.02 0 0 1 297.886 152.983 Tm [<004600530053>6<005000530054>]TJ
-1 0 0 1 327.796 152.983 Tm [<0001>]TJ
-1.02 0 0 1 330.544 152.983 Tm [<0044005000530053>20<00460044005500460045000D>]TJ
-1 0 0 1 381.307 152.983 Tm [<0001>]TJ
-1.02 0 0 1 384.129 152.983 Tm [<005500490046>]TJ
-1 0 0 1 400.43 152.983 Tm [<0001>]TJ
-1.02 0 0 1 403.179 152.983 Tm [<0044005000450046>]TJ
-1 0 0 1 427.492 152.983 Tm [<0001>]TJ
-1.02 0 0 1 430.24 152.983 Tm [<004900420054>]TJ
-1 0 0 1 447.665 152.983 Tm [<0001>]TJ
-1.02 0 0 1 450.414 152.983 Tm [<004300460046004F>]TJ
-1 0 0 1 475.395 152.983 Tm [<0001>]TJ
-1.02 0 0 1 478.143 152.983 Tm [<00510053>6<0050005100460053004D005A>]TJ
-1 0 0 1 520.866 152.983 Tm [<0001>]TJ
-1 0 0 1 74.409 139.433 Tm [<0045005000440056004E0046004F005500460045000100090042004F004500010055004900460001004400500045004600010045005000440056004E0046004F005500420055004A0050004F000100440042004F0001004F0050>30<0058000100430046000100440050004E0051004A004D0046004500010042004F0045000100510053>-8<004A004F005500460045000A000F>]TJ
+0.98 0 0 1 74.409 152.983 Tm [<002A>18<004F>]TJ
+1 0 0 1 84.558 152.983 Tm [<0001>]TJ
+0.98 0 0 1 86.617 152.983 Tm [<00550049004A0054>]TJ
+1 0 0 1 104.556 152.983 Tm [<0001>]TJ
+0.98 0 0 1 106.615 152.983 Tm [<0057>5<004600530054004A0050004F>]TJ
+1 0 0 1 142.16 152.983 Tm [<0001>]TJ
+0.98 0 0 1 144.218 152.983 Tm [<005400560051005100500053>-8<0055>]TJ
+1 0 0 1 182.453 152.983 Tm [<0001>]TJ
+0.98 0 0 1 184.511 152.983 Tm [<004700500053>]TJ
+1 0 0 1 198.249 152.983 Tm [<0001>]TJ
+0.98 0 0 1 200.308 152.983 Tm [<0051004200480046>]TJ
+1 0 0 1 223.454 152.983 Tm [<0001>]TJ
+0.98 0 0 1 225.512 152.983 Tm [<00430053>20<00460042004C0054>]TJ
+1 0 0 1 257.191 152.983 Tm [<0001>]TJ
+0.98 0 0 1 259.25 152.983 Tm [<004A004F>]TJ
+1 0 0 1 268.979 152.983 Tm [<0001>]TJ
+0.98 0 0 1 271.037 152.983 Tm [<005100450047005500460059>]TJ
+1 0 0 1 301.71 152.983 Tm [<0001>]TJ
+0.98 0 0 1 303.768 152.983 Tm [<004900420054>]TJ
+1 0 0 1 320.51 152.983 Tm [<0001>]TJ
+0.98 0 0 1 322.569 152.983 Tm [<004300460046004F>]TJ
+1 0 0 1 346.57 152.983 Tm [<0001>]TJ
+0.98 0 0 1 348.629 152.983 Tm [<00420045004500460045000F>]TJ
+1 0 0 1 381.728 152.983 Tm [<0001>]TJ
+0.98 0 0 1 384.868 152.983 Tm [<00220054>]TJ
+1 0 0 1 396.318 152.983 Tm [<0001>]TJ
+0.98 0 0 1 398.377 152.983 Tm [<00450046005400440053>-8<004A004300460045>]TJ
+1 0 0 1 445.87 152.983 Tm [<0001>]TJ
+0.98 0 0 1 447.928 152.983 Tm [<004A004F>]TJ
+1 0 0 1 457.657 152.983 Tm [<0001>]TJ
+0.98 0 0 1 459.716 152.983 Tm [<0054004600440055004A0050004F>]TJ
+/F46 9.96264 Tf
+1 0 0 1 494.75 152.983 Tm [<0067>]TJ
ET
EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+/Link<</MCID 134>> BDC
+0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
BT
-/F68 5.97758 Tf
-1 0 0 1 461.747 139.433 Tm [<0001001A0012>]TJ
+/F68 10.90909 Tf
+0.98 0 0 1 496.808 152.983 Tm [<0016000F0013000F0019>]TJ
0 g 0 G
ET
EMC
+/P<</MCID 135>> BDC
+BT
+/F68 10.90909 Tf
+0.98 0 0 1 519.473 152.983 Tm [<000D>]TJ
+1 0 0 1 520.866 152.983 Tm [<0001>]TJ
+1.02 0 0 1 74.409 139.433 Tm [<0055004200480048004A004F0048>]TJ
+1 0 0 1 111.541 139.433 Tm [<0001>]TJ
+1.02 0 0 1 114.25 139.433 Tm [<004E00420053>6<004C004600530054>]TJ
+1 0 0 1 155.332 139.433 Tm [<0001>]TJ
+1.02 0 0 1 158.041 139.433 Tm [<004E005600540055>]TJ
+1 0 0 1 183.733 139.433 Tm [<0001>]TJ
+1.02 0 0 1 186.442 139.433 Tm [<00430046>]TJ
+1 0 0 1 198.816 139.433 Tm [<0001>]TJ
+1.02 0 0 1 201.525 139.433 Tm [<00420045004500460045>]TJ
+1 0 0 1 233.026 139.433 Tm [<0001>]TJ
+1.02 0 0 1 235.735 139.433 Tm [<0043>25<005A>]TJ
+1 0 0 1 247.741 139.433 Tm [<0001>]TJ
+/F69 10.90909 Tf
+1.02 0 0 1 250.45 139.433 Tm [<0051004200480046>]TJ
+/F68 10.90909 Tf
+1.02 0 0 1 273.85 139.433 Tm [<000F>]TJ
+1 0 0 1 276.799 139.433 Tm [<0001>]TJ
+1.02 0 0 1 280.835 139.433 Tm [<0035004900420055>]TJ
+1 0 0 1 304.146 139.433 Tm [<0001>]TJ
+1.02 0 0 1 306.855 139.433 Tm [<004E00460042004F0054>]TJ
+1 0 0 1 340.404 139.433 Tm [<0001>]TJ
+1.02 0 0 1 343.112 139.433 Tm [<0055004900420055>]TJ
+1 0 0 1 363.342 139.433 Tm [<0001>]TJ
+1.02 0 0 1 366.051 139.433 Tm [<0042>]TJ
+1 0 0 1 371.87 139.433 Tm [<0001>]TJ
+1.02 0 0 1 374.579 139.433 Tm [<005100420053>10<004200480053>10<004200510049>]TJ
+1 0 0 1 426.543 139.433 Tm [<0001>]TJ
+1.02 0 0 1 429.252 139.433 Tm [<0055004900420055>]TJ
+1 0 0 1 449.481 139.433 Tm [<0001>]TJ
+1.02 0 0 1 452.19 139.433 Tm [<0048005000460054>]TJ
+1 0 0 1 474.968 139.433 Tm [<0001>]TJ
+1.02 0 0 1 477.676 139.433 Tm [<0050>30<0057>5<00460053>]TJ
+1 0 0 1 499.363 139.433 Tm [<0001>]TJ
+1.02 0 0 1 502.072 139.433 Tm [<005500580050>]TJ
+1 0 0 1 520.866 139.433 Tm [<0001>]TJ
+ET
+EMC
+/Artifact BMC
+EMC
/Artifact BMC
0 g 0 G
EMC
+/Artifact BMC
+EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
0 g 0 G
@@ -3076,127 +3202,146 @@ EMC
endstream
endobj
-470 0 obj
-<< /Type /Page /Contents 471 0 R /Resources 469 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 1/Tabs /S /Parent 207 0 R /Annots 473 0 R >>
-endobj
-473 0 obj
-[ 184 0 R 192 0 R 230 0 R 238 0 R 246 0 R 254 0 R 262 0 R 270 0 R 278 0 R 286 0 R 294 0 R 302 0 R 310 0 R 318 0 R 326 0 R 334 0 R 342 0 R 350 0 R 358 0 R 366 0 R 374 0 R 382 0 R 390 0 R 398 0 R 406 0 R 414 0 R 422 0 R 430 0 R 438 0 R 446 0 R 454 0 R 461 0 R ]
+489 0 obj
+<< /Type /Page /Contents 490 0 R /Resources 488 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 1/Tabs /S /Parent 215 0 R /Annots 493 0 R >>
endobj
-184 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 56 /Rect [ 73.413 757.268 120.144 769.482 ]/A << /S /GoTo /D (section.4) >> >>
+493 0 obj
+[ 192 0 R 200 0 R 239 0 R 247 0 R 255 0 R 263 0 R 271 0 R 279 0 R 287 0 R 295 0 R 303 0 R 311 0 R 319 0 R 327 0 R 335 0 R 343 0 R 351 0 R 359 0 R 367 0 R 375 0 R 383 0 R 391 0 R 399 0 R 407 0 R 415 0 R 423 0 R 431 0 R 439 0 R 447 0 R 455 0 R 463 0 R 471 0 R 478 0 R 486 0 R ]
endobj
192 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 57 /Rect [ 89.777 743.588 254.467 756.315 ]/A << /S /GoTo /D (subsection.4.1) >> >>
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 59 /Rect [ 73.413 757.268 120.144 769.482 ]/A << /S /GoTo /D (section.4) >> >>
endobj
-230 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 58 /Rect [ 89.777 730.17 218.282 742.766 ]/A << /S /GoTo /D (subsection.4.2) >> >>
+200 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 60 /Rect [ 89.777 743.588 254.467 756.315 ]/A << /S /GoTo /D (subsection.4.1) >> >>
endobj
-238 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 59 /Rect [ 73.413 705.581 130.104 718.013 ]/A << /S /GoTo /D (section.5) >> >>
+239 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 61 /Rect [ 89.777 730.17 218.282 742.766 ]/A << /S /GoTo /D (subsection.4.2) >> >>
endobj
-246 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 60 /Rect [ 89.777 694.54 172.638 704.758 ]/A << /S /GoTo /D (subsection.5.1) >> >>
+247 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 62 /Rect [ 73.413 705.581 130.104 718.013 ]/A << /S /GoTo /D (section.5) >> >>
endobj
-254 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 61 /Rect [ 89.777 678.482 369.144 691.209 ]/A << /S /GoTo /D (subsection.5.2) >> >>
+255 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 63 /Rect [ 89.777 694.54 172.638 704.758 ]/A << /S /GoTo /D (subsection.5.1) >> >>
endobj
-262 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 62 /Rect [ 114.868 667.409 377.26 677.66 ]/A << /S /GoTo /D (subsubsection.5.2.1) >> >>
+263 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 64 /Rect [ 89.777 678.482 369.144 691.209 ]/A << /S /GoTo /D (subsection.5.2) >> >>
endobj
-270 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 63 /Rect [ 114.868 653.86 350.435 664.111 ]/A << /S /GoTo /D (subsubsection.5.2.2) >> >>
+271 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 65 /Rect [ 114.868 667.409 377.26 677.66 ]/A << /S /GoTo /D (subsubsection.5.2.1) >> >>
endobj
-278 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 64 /Rect [ 114.868 637.835 404.947 650.562 ]/A << /S /GoTo /D (subsubsection.5.2.3) >> >>
+279 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 66 /Rect [ 114.868 653.86 350.435 664.111 ]/A << /S /GoTo /D (subsubsection.5.2.2) >> >>
endobj
-286 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 65 /Rect [ 114.868 624.416 172.737 636.718 ]/A << /S /GoTo /D (subsubsection.5.2.4) >> >>
+287 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 67 /Rect [ 114.868 637.835 404.947 650.562 ]/A << /S /GoTo /D (subsubsection.5.2.3) >> >>
endobj
-294 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 66 /Rect [ 114.868 613.245 290.926 623.463 ]/A << /S /GoTo /D (subsubsection.5.2.5) >> >>
+295 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 68 /Rect [ 114.868 624.416 172.737 636.718 ]/A << /S /GoTo /D (subsubsection.5.2.4) >> >>
endobj
-302 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 67 /Rect [ 114.868 599.696 178.017 609.914 ]/A << /S /GoTo /D (subsubsection.5.2.6) >> >>
+303 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 69 /Rect [ 114.868 613.245 243.853 623.463 ]/A << /S /GoTo /D (subsubsection.5.2.5) >> >>
endobj
-310 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 68 /Rect [ 114.868 583.638 232.169 596.365 ]/A << /S /GoTo /D (subsubsection.5.2.7) >> >>
+311 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 70 /Rect [ 114.868 599.696 290.926 609.914 ]/A << /S /GoTo /D (subsubsection.5.2.6) >> >>
endobj
-318 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 69 /Rect [ 114.868 570.089 312.438 582.816 ]/A << /S /GoTo /D (subsubsection.5.2.8) >> >>
+319 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 71 /Rect [ 114.868 586.147 178.017 596.365 ]/A << /S /GoTo /D (subsubsection.5.2.7) >> >>
endobj
-326 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 70 /Rect [ 89.777 556.539 260.238 569.266 ]/A << /S /GoTo /D (subsection.5.3) >> >>
+327 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 72 /Rect [ 114.868 570.089 232.169 582.816 ]/A << /S /GoTo /D (subsubsection.5.2.8) >> >>
endobj
-334 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 71 /Rect [ 114.868 542.99 226.235 555.335 ]/A << /S /GoTo /D (subsubsection.5.3.1) >> >>
+335 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 73 /Rect [ 114.868 556.539 312.438 569.266 ]/A << /S /GoTo /D (subsubsection.5.2.9) >> >>
endobj
-342 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 72 /Rect [ 114.868 529.441 204.133 541.873 ]/A << /S /GoTo /D (subsubsection.5.3.2) >> >>
+343 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 74 /Rect [ 89.777 542.99 260.238 555.717 ]/A << /S /GoTo /D (subsection.5.3) >> >>
endobj
-350 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 73 /Rect [ 114.868 518.368 321.122 528.619 ]/A << /S /GoTo /D (subsubsection.5.3.3) >> >>
+351 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 75 /Rect [ 114.868 529.441 226.235 541.786 ]/A << /S /GoTo /D (subsubsection.5.3.1) >> >>
endobj
-358 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 74 /Rect [ 114.868 504.852 222.231 514.524 ]/A << /S /GoTo /D (subsubsection.5.3.4) >> >>
+359 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 76 /Rect [ 114.868 515.892 204.133 528.324 ]/A << /S /GoTo /D (subsubsection.5.3.2) >> >>
endobj
-366 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 75 /Rect [ 114.868 491.302 304.42 501.52 ]/A << /S /GoTo /D (subsubsection.5.3.5) >> >>
+367 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 77 /Rect [ 114.868 504.819 321.122 515.07 ]/A << /S /GoTo /D (subsubsection.5.3.3) >> >>
endobj
-374 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 76 /Rect [ 89.777 475.244 240.362 487.971 ]/A << /S /GoTo /D (subsection.5.4) >> >>
+375 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 78 /Rect [ 114.868 491.302 222.231 500.975 ]/A << /S /GoTo /D (subsubsection.5.3.4) >> >>
endobj
-382 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 77 /Rect [ 89.777 461.695 284.686 474.422 ]/A << /S /GoTo /D (subsection.5.5) >> >>
+383 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 79 /Rect [ 114.868 477.753 304.42 487.971 ]/A << /S /GoTo /D (subsubsection.5.3.5) >> >>
endobj
-390 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 78 /Rect [ 89.777 448.146 252.744 460.873 ]/A << /S /GoTo /D (subsection.5.6) >> >>
+391 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 80 /Rect [ 89.777 461.695 240.362 474.422 ]/A << /S /GoTo /D (subsection.5.4) >> >>
endobj
-398 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 79 /Rect [ 89.777 434.597 261.7 447.324 ]/A << /S /GoTo /D (subsection.5.7) >> >>
+399 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 81 /Rect [ 89.777 448.146 284.686 460.873 ]/A << /S /GoTo /D (subsection.5.5) >> >>
endobj
-406 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 80 /Rect [ 73.413 410.269 363.744 422.865 ]/A << /S /GoTo /D (section.6) >> >>
+407 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 82 /Rect [ 89.777 434.597 252.744 447.324 ]/A << /S /GoTo /D (subsection.5.6) >> >>
endobj
-414 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 81 /Rect [ 73.413 385.68 232.093 398.407 ]/A << /S /GoTo /D (section.7) >> >>
+415 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 83 /Rect [ 89.777 421.047 261.7 433.774 ]/A << /S /GoTo /D (subsection.5.7) >> >>
endobj
-422 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 82 /Rect [ 73.413 361.222 187.868 374.014 ]/A << /S /GoTo /D (section.8) >> >>
+423 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 84 /Rect [ 73.413 396.72 363.744 409.316 ]/A << /S /GoTo /D (section.6) >> >>
endobj
-430 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 83 /Rect [ 73.413 336.763 245.435 349.491 ]/A << /S /GoTo /D (section.9) >> >>
+431 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 85 /Rect [ 73.413 372.131 232.093 384.858 ]/A << /S /GoTo /D (section.7) >> >>
endobj
-438 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 84 /Rect [ 73.413 312.305 145.889 325.032 ]/A << /S /GoTo /D (section.10) >> >>
+439 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 86 /Rect [ 73.413 347.673 187.868 360.465 ]/A << /S /GoTo /D (section.8) >> >>
endobj
-446 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 85 /Rect [ 73.413 290.356 120.842 300.574 ]/A << /S /GoTo /D (section.11) >> >>
+447 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 87 /Rect [ 73.413 323.214 245.435 335.941 ]/A << /S /GoTo /D (section.9) >> >>
endobj
-454 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 86 /Rect [ 73.413 265.898 129.068 276.116 ]/A << /S /GoTo /D (section*.29) >> >>
+455 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 88 /Rect [ 73.413 298.756 145.889 311.483 ]/A << /S /GoTo /D (section.10) >> >>
endobj
-461 0 obj
-<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 87 /Rect [ 73.413 238.93 269.871 251.657 ]/A << /S /GoTo /D (appendix.A) >> >>
+463 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 89 /Rect [ 73.413 276.807 120.842 287.025 ]/A << /S /GoTo /D (section.11) >> >>
endobj
-472 0 obj
-<< /D [ 470 0 R /XYZ 73.409 809.993 null ] >>
+471 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 90 /Rect [ 73.413 252.348 129.068 262.566 ]/A << /S /GoTo /D (section*.29) >> >>
endobj
-209 0 obj
-<< /D [ 470 0 R /XYZ 74.409 221.218 null ] >>
+478 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 91 /Rect [ 73.413 225.381 269.871 238.108 ]/A << /S /GoTo /D (appendix.A) >> >>
endobj
-469 0 obj
-<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F68 203 0 R /F65 201 0 R >> >>
+486 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 92 /Rect [ 495.812 149.346 520.469 162.073 ]/A << /S /GoTo /D (subsubsection.5.2.8) >> >>
endobj
-510 0 obj
-<< /Type/OBJR/Obj 509 0 R >>
+491 0 obj
+<< /D [ 489 0 R /XYZ 73.409 809.993 null ] >>
endobj
-521 0 obj
-<< /Length 43230 >>
+217 0 obj
+<< /D [ 489 0 R /XYZ 74.409 207.668 null ] >>
+endobj
+488 0 obj
+<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F68 211 0 R /F65 209 0 R /F46 492 0 R /F69 212 0 R >> >>
+endobj
+530 0 obj
+<< /Type/OBJR/Obj 529 0 R >>
+endobj
+534 0 obj
+<< /Type/OBJR/Obj 533 0 R >>
+endobj
+538 0 obj
+<< /Type/OBJR/Obj 537 0 R >>
+endobj
+549 0 obj
+<< /Type/OBJR/Obj 548 0 R >>
+endobj
+555 0 obj
+<< /Length 45353 >>
stream
/opacity1 gs
/Artifact BMC
+EMC
+/Artifact BMC
0 g 0 G
EMC
+/Artifact BMC
+EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
EMC
@@ -3228,224 +3373,178 @@ EMC
/Artifact BMC
0 g 0 G
EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 66.728 760.773 Tm [<001A00130001>]TJ
-0 g 0 G
-ET
-EMC
/P<</MCID 0>> BDC
BT
/F68 10.90909 Tf
-1.02 0 0 1 74.409 760.773 Tm [<0035004900460053>20<0046>]TJ
-1 0 0 1 103.619 760.773 Tm [<0001>]TJ
-1.02 0 0 1 106.32 760.773 Tm [<00420053>20<0046>]TJ
-1 0 0 1 121.965 760.773 Tm [<0001>]TJ
-1.02 0 0 1 124.667 760.773 Tm [<004F00460057>4<00460053>-6<005500490046004D004600540054>]TJ
-1 0 0 1 187.791 760.773 Tm [<0001>]TJ
-1.02 0 0 1 190.493 760.773 Tm [<0042004D00540050>]TJ
-1 0 0 1 210.689 760.773 Tm [<0001>]TJ
-1.02 0 0 1 213.391 760.773 Tm [<0042>]TJ
-1 0 0 1 219.21 760.773 Tm [<0001>]TJ
-1.02 0 0 1 221.912 760.773 Tm [<004F0056004E004300460053>]TJ
-1 0 0 1 262.515 760.773 Tm [<0001>]TJ
-1.02 0 0 1 265.217 760.773 Tm [<00500047>]TJ
-1 0 0 1 275.187 760.773 Tm [<0001>]TJ
-1.02 0 0 1 277.889 760.773 Tm [<004400490042004F004800460054>]TJ
-1 0 0 1 319.227 760.773 Tm [<0001>]TJ
-1.02 0 0 1 321.928 760.773 Tm [<004700500053>]TJ
-1 0 0 1 336.227 760.773 Tm [<0001>]TJ
-1.02 0 0 1 338.929 760.773 Tm [<005500490046>]TJ
-1 0 0 1 355.23 760.773 Tm [<0001>]TJ
-1.02 0 0 1 357.932 760.773 Tm [<005100560043004D004A0044>]TJ
-1 0 0 1 389.956 760.773 Tm [<0001>]TJ
-1.02 0 0 1 392.658 760.773 Tm [<004A004F005500460053>-7<0047004200440046>19<000D>]TJ
-1 0 0 1 440.08 760.773 Tm [<0001>]TJ
-1.02 0 0 1 442.844 760.773 Tm [<004A004F0044004D00560045004A004F0048>]TJ
-1 0 0 1 490.903 760.773 Tm [<0001>]TJ
-1.02 0 0 1 493.604 760.773 Tm [<00540050004E0046>]TJ
+1.02 0 0 1 74.409 760.773 Tm [<00510042004800460054>]TJ
+1 0 0 1 103.351 760.773 Tm [<0001>]TJ
+1.02 0 0 1 105.937 760.773 Tm [<004E005600540055>]TJ
+1 0 0 1 131.63 760.773 Tm [<0001>]TJ
+1.02 0 0 1 134.215 760.773 Tm [<004800460055>]TJ
+1 0 0 1 149.549 760.773 Tm [<0001>]TJ
+1.02 0 0 1 152.134 760.773 Tm [<0042004F>]TJ
+1 0 0 1 164.842 760.773 Tm [<0001>]TJ
+1.02 0 0 1 167.427 760.773 Tm [<0046004F0045>]TJ
+1 0 0 1 186.688 760.773 Tm [<0001>]TJ
+1.02 0 0 1 189.274 760.773 Tm [<004E00420053>6<004C00460053>]TJ
+1 0 0 1 225.504 760.773 Tm [<0001>]TJ
+1.02 0 0 1 228.09 760.773 Tm [<00420055>]TJ
+1 0 0 1 237.737 760.773 Tm [<0001>]TJ
+1.02 0 0 1 240.322 760.773 Tm [<005500490046>]TJ
+1 0 0 1 256.624 760.773 Tm [<0001>]TJ
+1.02 0 0 1 259.209 760.773 Tm [<0046004F0045>]TJ
+1 0 0 1 278.471 760.773 Tm [<0001>]TJ
+1.02 0 0 1 281.056 760.773 Tm [<0050004F>]TJ
+1 0 0 1 294.364 760.773 Tm [<0001>]TJ
+1.02 0 0 1 296.95 760.773 Tm [<005500490046>]TJ
+1 0 0 1 313.251 760.773 Tm [<0001>]TJ
+1.02 0 0 1 315.837 760.773 Tm [<056D005300540055>]TJ
+1 0 0 1 335.632 760.773 Tm [<0001>]TJ
+1.02 0 0 1 338.218 760.773 Tm [<0051004200480046>]TJ
+1 0 0 1 362.308 760.773 Tm [<0001>]TJ
+1.02 0 0 1 364.894 760.773 Tm [<0042004F0045>]TJ
+1 0 0 1 384.255 760.773 Tm [<0001>]TJ
+1.02 0 0 1 386.841 760.773 Tm [<0042>]TJ
+1 0 0 1 392.66 760.773 Tm [<0001>]TJ
+1.02 0 0 1 395.246 760.773 Tm [<004F00460058>]TJ
+1 0 0 1 416.399 760.773 Tm [<0001>]TJ
+1.02 0 0 1 418.984 760.773 Tm [<004300460048004A004F>]TJ
+1 0 0 1 447.27 760.773 Tm [<0001>]TJ
+1.02 0 0 1 449.855 760.773 Tm [<004E00420053>6<004C00460053>]TJ
+1 0 0 1 486.086 760.773 Tm [<0001>]TJ
+1.02 0 0 1 488.671 760.773 Tm [<0050004F>]TJ
+1 0 0 1 501.979 760.773 Tm [<0001>]TJ
+1.02 0 0 1 504.565 760.773 Tm [<005500490046>]TJ
1 0 0 1 520.866 760.773 Tm [<0001>]TJ
-1 0 0 1 74.409 747.224 Tm [<00430053>20<00460042004C004A004F00480001004400490042004F004800460054>20<000F0001>-75<0024004900460044004C00010055004900460001004400490042004F0048004600010054004600440055004A0050004F000100430046004D0050>30<0058000100470050005300010045004600550042004A004D0054>20<000F>]TJ
+1 0 0 1 74.409 747.224 Tm [<004F00460059005500010051004200480046>20<000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 378.337 747.224 Tm [<0001001A0013>]TJ
+1 0 0 1 124.569 747.224 Tm [<000100170015>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
-0 g 0 G
-EMC
-/H1<</MCID 1>> BDC
-BT
-/F65 14.3462 Tf
-1 0 0 1 74.409 703.808 Tm [<006B00580067>]TJ
-ET
-EMC
-/H1<</MCID 2>> BDC
-BT
-/F65 14.3462 Tf
-1 0 0 1 93.863 703.808 Tm [<0053006000320037001C002B00320067006900510067007000320060006200420051004D00670079005800330067001C004D002F0067004D00320072>31<00320060>]TJ
-ET
-EMC
-/Artifact BMC
-0 g 0 G
-EMC
-/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 671.19 Tm [<0012001300110001>]TJ
+1 0 0 1 66.728 726.9 Tm [<001700160001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 3>> BDC
+/P<</MCID 1>> BDC
BT
/F68 10.90909 Tf
-0.991 0 0 1 74.409 671.19 Tm [<0034>24<005500420053>-7<0055004A004F0048>]TJ
-1 0 0 1 112.837 671.19 Tm [<0001>]TJ
-0.991 0 0 1 115.302 671.19 Tm [<0058004A00550049>]TJ
-1 0 0 1 137.032 671.19 Tm [<0001>]TJ
-0.991 0 0 1 139.498 671.19 Tm [<0057>5<004600530054004A0050004F>]TJ
-1 0 0 1 175.442 671.19 Tm [<0001>]TJ
-0.991 0 0 1 177.908 671.19 Tm [<0011000F0019>]TJ
-1 0 0 1 192.232 671.19 Tm [<0001>]TJ
-0.991 0 0 1 194.697 671.19 Tm [<0050004F0046>]TJ
-1 0 0 1 213.184 671.19 Tm [<0001>]TJ
-0.991 0 0 1 215.649 671.19 Tm [<004E0042004B00500053>]TJ
-1 0 0 1 244.752 671.19 Tm [<0001>]TJ
-0.991 0 0 1 247.217 671.19 Tm [<0054005500460051>]TJ
-1 0 0 1 267.78 671.19 Tm [<0001>]TJ
-0.991 0 0 1 270.245 671.19 Tm [<00550050>30<005800420053>20<00450054>]TJ
-1 0 0 1 308.993 671.19 Tm [<0001>]TJ
-0.991 0 0 1 311.458 671.19 Tm [<004A004F0055004600480053>10<00420055004A0050004F>]TJ
-1 0 0 1 365.736 671.19 Tm [<0001>]TJ
-0.991 0 0 1 368.202 671.19 Tm [<00500047>]TJ
-1 0 0 1 377.888 671.19 Tm [<0001>]TJ
-0.991 0 0 1 380.354 671.19 Tm [<005500490046>]TJ
-1 0 0 1 396.191 671.19 Tm [<0001>]TJ
-0.991 0 0 1 398.657 671.19 Tm [<0044005000450046>]TJ
-1 0 0 1 422.279 671.19 Tm [<0001>]TJ
-0.991 0 0 1 424.744 671.19 Tm [<004A004F00550050>]TJ
-1 0 0 1 444.539 671.19 Tm [<0001>]TJ
-0.991 0 0 1 447.004 671.19 Tm [<005500490046>]TJ
-1 0 0 1 462.842 671.19 Tm [<0001>]TJ
-0.991 0 0 1 465.307 671.19 Tm [<002D>]TJ
-/F68 7.63636 Tf
-1 0 0 1 467.52 673.454 Tm [<0022>]TJ
-/F68 10.90909 Tf
-0.991 0 0 1 470.733 671.19 Tm [<0035>]TJ
-1 0 0 1 475.628 668.517 Tm [<0026>]TJ
-0.991 0 0 1 480.876 671.19 Tm [<0039>]TJ
-1 0 0 1 487.622 671.19 Tm [<0001>]TJ
-0.991 0 0 1 490.087 671.19 Tm [<004C00460053>-8<004F0046004D>]TJ
-1 0 0 1 520.866 671.19 Tm [<0001>]TJ
-1 0 0 1 74.409 657.64 Tm [<0049004200540001004300460046004F000100450050004F0046001B0001>-74<003500490046000100440050004500460001004F0050>30<005800010053>20<0046004D004A0046005400010050004F00010055004900460001>1<004F004600580001002D>]TJ
-/F68 7.63636 Tf
-1 0 0 1 311.582 659.905 Tm [<0022>]TJ
-/F68 10.90909 Tf
-1 0 0 1 314.795 657.64 Tm [<0035>]TJ
-1 0 0 1 319.751 654.968 Tm [<0026>]TJ
-1 0 0 1 324.998 657.64 Tm [<003900010031002500270001004E0042004F004200480046004E0046004F0055000F0001>-74<00350049004A00540001004E0042004F004200480046004E0046004F0055000D>131<0001>]TJ
-1.02 0 0 1 73.995 644.091 Tm [<00580049004A00440049>]TJ
-1 0 0 1 104.806 644.091 Tm [<0001>]TJ
-1.02 0 0 1 107.78 644.091 Tm [<004A0054>]TJ
-1 0 0 1 115.869 644.091 Tm [<0001>]TJ
-1.02 0 0 1 118.842 644.091 Tm [<004700500053>]TJ
-1 0 0 1 133.141 644.091 Tm [<0001>]TJ
-1.02 0 0 1 136.114 644.091 Tm [<0042>]TJ
-1 0 0 1 141.934 644.091 Tm [<0001>]TJ
-1.02 0 0 1 144.907 644.091 Tm [<005500460054005500510049004200540046>]TJ
-1 0 0 1 193.043 644.091 Tm [<0001>]TJ
-1.02 0 0 1 196.017 644.091 Tm [<00510053>6<0050>29<0057004A004500460045>]TJ
-1 0 0 1 241.011 644.091 Tm [<0001>]TJ
-1.02 0 0 1 243.984 644.091 Tm [<00420054>]TJ
-1 0 0 1 254.655 644.091 Tm [<0001>]TJ
-1.02 0 0 1 257.628 644.091 Tm [<0042004F>]TJ
-1 0 0 1 270.335 644.091 Tm [<0001>]TJ
-1.02 0 0 1 273.309 644.091 Tm [<00460059005500460053>-7<004F0042004D>]TJ
-1 0 0 1 314.211 644.091 Tm [<0001>]TJ
-1.02 0 0 1 317.184 644.091 Tm [<005100420044004C004200480046>20<000D>]TJ
-1 0 0 1 361.17 644.091 Tm [<0001>]TJ
-/F71 10.90909 Tf
-1 0 0 1 364.273 644.091 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D0069004000690032006200690054003F001C00620032>]TJ
-/F68 10.90909 Tf
-1.02 0 0 1 496 644.091 Tm [<000D>]TJ
-1 0 0 1 498.949 644.091 Tm [<0001>]TJ
-1.02 0 0 1 502.052 644.091 Tm [<00510053>20<0046000E>]TJ
-1.02 0 0 1 74.409 630.542 Tm [<005100420053>20<00460054>]TJ
-1 0 0 1 101.671 630.542 Tm [<0001>]TJ
-1.02 0 0 1 105.019 630.542 Tm [<005500490046>]TJ
-1 0 0 1 121.321 630.542 Tm [<0001>]TJ
-1.02 0 0 1 124.668 630.542 Tm [<00480053>6<00500056004F0045>]TJ
-1 0 0 1 161.422 630.542 Tm [<0001>]TJ
-1.02 0 0 1 164.77 630.542 Tm [<004700500053>]TJ
-1 0 0 1 179.068 630.542 Tm [<0001>]TJ
-1.02 0 0 1 182.416 630.542 Tm [<004300460055005500460053>]TJ
-1 0 0 1 212.493 630.542 Tm [<0001>]TJ
-1.02 0 0 1 215.841 630.542 Tm [<005400560051005100500053>-8<0055>]TJ
-1 0 0 1 255.632 630.542 Tm [<0001>]TJ
-1.02 0 0 1 258.98 630.542 Tm [<004700500053>]TJ
-1 0 0 1 273.279 630.542 Tm [<0001>]TJ
-1.02 0 0 1 276.626 630.542 Tm [<005500420048004800460045>]TJ
-1 0 0 1 310.22 630.542 Tm [<0001>]TJ
-1.02 0 0 1 313.568 630.542 Tm [<003100250027>]TJ
-1 0 0 1 335.366 630.542 Tm [<0001>]TJ
-1.02 0 0 1 338.713 630.542 Tm [<004A004F>]TJ
-1 0 0 1 348.839 630.542 Tm [<0001>]TJ
-1.02 0 0 1 352.187 630.542 Tm [<002D>]TJ
-/F68 7.63636 Tf
-1 0 0 1 354.58 632.807 Tm [<0022>]TJ
-/F68 10.90909 Tf
-1.02 0 0 1 357.792 630.542 Tm [<0035>]TJ
-1 0 0 1 362.884 627.869 Tm [<0026>]TJ
-1.02 0 0 1 368.131 630.542 Tm [<0039000F>]TJ
-1 0 0 1 378.023 630.542 Tm [<0001>]TJ
-1.02 0 0 1 383.976 630.542 Tm [<002A>24<0055>]TJ
-1 0 0 1 391.42 630.542 Tm [<0001>]TJ
-1.02 0 0 1 394.768 630.542 Tm [<004A0054>]TJ
-1 0 0 1 402.858 630.542 Tm [<0001>]TJ
-1.02 0 0 1 406.205 630.542 Tm [<005100420053>-8<0055>]TJ
-1 0 0 1 427.036 630.542 Tm [<0001>]TJ
-1.02 0 0 1 430.384 630.542 Tm [<00500047>]TJ
-1 0 0 1 440.354 630.542 Tm [<0001>]TJ
-1.02 0 0 1 443.701 630.542 Tm [<0042>]TJ
-1 0 0 1 449.521 630.542 Tm [<0001>]TJ
-1.02 0 0 1 452.869 630.542 Tm [<004D00420053>6<004800460053>]TJ
-1 0 0 1 481.889 630.542 Tm [<0001>]TJ
-1.02 0 0 1 485.237 630.542 Tm [<00510053>6<0050004B004600440055>]TJ
-1 0 0 1 520.866 630.542 Tm [<0001>]TJ
-0.98 0 0 1 74.409 616.993 Tm [<00550050>]TJ
-1 0 0 1 84.256 616.993 Tm [<0001>]TJ
-0.98 0 0 1 86.667 616.993 Tm [<0042005600550050004E00420055004A00440042004D004D005A>]TJ
-1 0 0 1 153.1 616.993 Tm [<0001>]TJ
-0.98 0 0 1 155.512 616.993 Tm [<00480046004F00460053>10<004200550046>]TJ
-1 0 0 1 197.493 616.993 Tm [<0001>]TJ
-0.98 0 0 1 199.904 616.993 Tm [<005500420048004800460045>]TJ
-1 0 0 1 232.18 616.993 Tm [<0001>]TJ
-0.98 0 0 1 234.591 616.993 Tm [<003100250027>]TJ
-1 0 0 1 255.535 616.993 Tm [<0001>]TJ
+0.997 0 0 1 74.409 726.9 Tm [<0038>10<004A00550049>]TJ
+1 0 0 1 98.03 726.9 Tm [<0001>]TJ
+0.997 0 0 1 100.476 726.9 Tm [<004D00560042004D0042005500460059>]TJ
+1 0 0 1 139.13 726.9 Tm [<0001>]TJ
+0.997 0 0 1 141.575 726.9 Tm [<0055004900420055>]TJ
+1 0 0 1 161.349 726.9 Tm [<0001>]TJ
+0.997 0 0 1 163.794 726.9 Tm [<004A0054>]TJ
+1 0 0 1 171.701 726.9 Tm [<0001>]TJ
+0.997 0 0 1 174.146 726.9 Tm [<0053>10<00420055004900460053>]TJ
+1 0 0 1 204.119 726.9 Tm [<0001>]TJ
+0.997 0 0 1 206.564 726.9 Tm [<004600420054005A>]TJ
+1 0 0 1 228.089 726.9 Tm [<0001>]TJ
+0.997 0 0 1 230.534 726.9 Tm [<00550050>]TJ
+1 0 0 1 240.551 726.9 Tm [<0001>]TJ
+0.997 0 0 1 242.996 726.9 Tm [<0046004F005400560053>20<0046>20<000D>]TJ
+1 0 0 1 278.911 726.9 Tm [<0001>]TJ
+0.997 0 0 1 281.358 726.9 Tm [<0058004A00550049>]TJ
+1 0 0 1 303.219 726.9 Tm [<0001>]TJ
+0.997 0 0 1 305.665 726.9 Tm [<00510045056E0042005500460059>]TJ
+1 0 0 1 345.722 726.9 Tm [<0001>]TJ
+0.997 0 0 1 348.168 726.9 Tm [<004A0055>]TJ
+1 0 0 1 355.074 726.9 Tm [<0001>]TJ
+0.997 0 0 1 357.519 726.9 Tm [<0053>20<004600520056004A0053>20<00460054>]TJ
+1 0 0 1 397.643 726.9 Tm [<0001>]TJ
+0.997 0 0 1 400.088 726.9 Tm [<00520056004A00550046>]TJ
+1 0 0 1 425.604 726.9 Tm [<0001>]TJ
+0.997 0 0 1 428.049 726.9 Tm [<0054005000510049004A00540055004A00440042005500460045>]TJ
+1 0 0 1 494.015 726.9 Tm [<0001>]TJ
+0.997 0 0 1 496.46 726.9 Tm [<0044005000450046>20<000F>]TJ
+1 0 0 1 520.866 726.9 Tm [<0001>]TJ
+0.98 0 0 1 74.071 713.351 Tm [<003500490046>]TJ
+1 0 0 1 92.695 713.351 Tm [<0001>]TJ
+0.98 0 0 1 94.484 713.351 Tm [<004E00460055004900500045>]TJ
+1 0 0 1 132.575 713.351 Tm [<0001>]TJ
+0.98 0 0 1 134.364 713.351 Tm [<004A0054>]TJ
+1 0 0 1 142.136 713.351 Tm [<0001>]TJ
+0.98 0 0 1 143.925 713.351 Tm [<00450046005400440053>-8<004A004300460045>]TJ
+1 0 0 1 191.418 713.351 Tm [<0001>]TJ
+0.98 0 0 1 193.207 713.351 Tm [<004A004F>]TJ
+1 0 0 1 202.935 713.351 Tm [<0001>]TJ
+0.98 0 0 1 204.724 713.351 Tm [<0027>20<0053>11<0042004F004C>]TJ
+1 0 0 1 232.561 713.351 Tm [<0001>]TJ
+0.98 0 0 1 234.35 713.351 Tm [<002E>12<004A005500550046004D0043004200440049>83<0445>115<0054>]TJ
+1 0 0 1 292.548 713.351 Tm [<0001>]TJ
+0.98 0 0 1 294.337 713.351 Tm [<00550042004D004C>]TJ
+1 0 0 1 312.191 713.351 Tm [<0001>]TJ
+0.98 0 0 1 313.98 713.351 Tm [<00420055>]TJ
+1 0 0 1 323.249 713.351 Tm [<0001>]TJ
+0.98 0 0 1 325.038 713.351 Tm [<003500360028>]TJ
+/F46 9.96264 Tf
+1 0 0 1 347.98 713.351 Tm [<0067>]TJ
+/F68 10.90909 Tf
+0.98 0 0 1 349.769 713.351 Tm [<0013001100130012>]TJ
+1 0 0 1 372.434 713.351 Tm [<0001>]TJ
+0.98 0 0 1 374.223 713.351 Tm [<0447>]TJ
+/F46 9.96264 Tf
+1 0 0 1 379.119 713.351 Tm [<0067>]TJ
+/F68 10.90909 Tf
+0.98 0 0 1 379.228 713.351 Tm [<0035>104<0042004E004A004F0048>]TJ
+1 0 0 1 415.501 713.351 Tm [<0001>]TJ
+0.98 0 0 1 417.29 713.351 Tm [<005500490046>]TJ
+1 0 0 1 432.952 713.351 Tm [<0001>]TJ
+0.98 0 0 1 434.741 713.351 Tm [<00430046004200540055>]TJ
+1 0 0 1 460.56 713.351 Tm [<0001>]TJ
+0.98 0 0 1 462.349 713.351 Tm [<0443>]TJ
+1 0 0 1 473.04 713.351 Tm [<0001>]TJ
+0.98 0 0 1 474.828 713.351 Tm [<0022>12<00450057>6<0042004F004400460054>]TJ
+1 0 0 1 520.866 713.351 Tm [<0001>]TJ
+0.98 0 0 1 74.409 699.802 Tm [<004A004F>]TJ
+1 0 0 1 84.138 699.802 Tm [<0001>]TJ
+0.98 0 0 1 85.811 699.802 Tm [<005100420053>10<004200480053>10<004200510049>]TJ
+1 0 0 1 135.729 699.802 Tm [<0001>]TJ
+0.98 0 0 1 137.402 699.802 Tm [<0055004200480048004A004F0048>]TJ
+1 0 0 1 173.077 699.802 Tm [<0001>]TJ
+0.98 0 0 1 174.75 699.802 Tm [<0058004A00550049>]TJ
+1 0 0 1 196.239 699.802 Tm [<0001>]TJ
+0.98 0 0 1 197.912 699.802 Tm [<0051004500470035>104<00460039>]TJ
+1 0 0 1 231.908 699.802 Tm [<0001>]TJ
+0.98 0 0 1 233.58 699.802 Tm [<0042004F0045>]TJ
+1 0 0 1 252.182 699.802 Tm [<0001>]TJ
+0.98 0 0 1 253.855 699.802 Tm [<0039>6<00460035>104<004600390448>]TJ
+1 0 0 1 288.544 699.802 Tm [<0001>]TJ
ET
EMC
-/Link<</MCID 4>> BDC
+/Link<</MCID 2>> BDC
0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
BT
/F71 10.90909 Tf
-1 0 0 1 257.946 616.993 Tm [<003F0069006900540062002C0066006600720072007200580048001C0069003200740040>-56<00540060005100440032002B0069005800510060003B0066004D0032007200620066006B0079006B00790066005200520066006A00790066>]TJ
-1 0 0 1 74.409 603.444 Tm [<0069001C003B003B0032002F0040>-56<0054002F00370040>-56<003600610040>-56<00620069006D002F00760066>]TJ
+1 0 0 1 290.216 699.802 Tm [<003F0069006900540062002C0066006600760051006D0069006D005800230032006600610077003E004100320032007000760051006A006C005C006900340052004E003800380052>]TJ
0 g 0 G
ET
EMC
+/P<</MCID 3>> BDC
+BT
+/F68 10.90909 Tf
+0.98 0 0 1 496.397 699.802 Tm [<000F>]TJ
+1 0 0 1 499.23 699.802 Tm [<0001>]TJ
+0.98 0 0 1 502.243 699.802 Tm [<003500490046>]TJ
+1 0 0 1 520.866 699.802 Tm [<0001>]TJ
+1 0 0 1 74.409 686.253 Tm [<004F004600580001004400500045004600010053>20<004600520056004A0053>20<00460054000100420001004F0046005800010057>5<004600530054004A0050004F00010050004700010055004900460001005100450047004E0042004F004200480046004E0046004F0055000E0055004600540055005100490042005400460001005100420044004C004200480046>20<000F>]TJ
+ET
+EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 190.787 603.444 Tm [<0001001200130011>]TJ
+1 0 0 1 446.726 686.253 Tm [<000100170016>]TJ
0 g 0 G
ET
EMC
@@ -3453,139 +3552,37 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 583.12 Tm [<0012001300120001>]TJ
+1 0 0 1 66.728 665.929 Tm [<001700170001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 5>> BDC
+/P<</MCID 4>> BDC
BT
/F68 10.90909 Tf
-0.98 0 0 1 74.409 583.12 Tm [<00380049004A004D0046>]TJ
-1 0 0 1 102.537 583.12 Tm [<0001>]TJ
-0.98 0 0 1 104.87 583.12 Tm [<00550049004A0054>]TJ
-1 0 0 1 122.809 583.12 Tm [<0001>]TJ
-0.98 0 0 1 125.142 583.12 Tm [<004A0054>]TJ
-1 0 0 1 132.915 583.12 Tm [<0001>]TJ
-0.98 0 0 1 135.247 583.12 Tm [<0042>]TJ
-1 0 0 1 140.839 583.12 Tm [<0001>]TJ
-0.98 0 0 1 143.172 583.12 Tm [<004E0042004B00500053>]TJ
-1 0 0 1 171.952 583.12 Tm [<0001>]TJ
-0.98 0 0 1 174.284 583.12 Tm [<004A004E00510053>6<0050>31<0057>5<0046004E0046004F00550443004A0055>]TJ
-1 0 0 1 257.656 583.12 Tm [<0001>]TJ
-0.98 0 0 1 259.988 583.12 Tm [<0058004A004D004D>]TJ
-1 0 0 1 277.276 583.12 Tm [<0001>]TJ
-0.98 0 0 1 279.608 583.12 Tm [<004700500053>]TJ
-1 0 0 1 293.346 583.12 Tm [<0001>]TJ
-0.98 0 0 1 295.679 583.12 Tm [<004600590042004E0051004D0046>]TJ
-1 0 0 1 336.807 583.12 Tm [<0001>]TJ
-0.98 0 0 1 339.14 583.12 Tm [<0042004D004D0050>31<0058>]TJ
-1 0 0 1 364.742 583.12 Tm [<0001>]TJ
-0.98 0 0 1 367.075 583.12 Tm [<00550050>]TJ
-1 0 0 1 376.921 583.12 Tm [<0001>]TJ
-0.98 0 0 1 379.254 583.12 Tm [<005600540046>]TJ
-1 0 0 1 395.889 583.12 Tm [<0001>]TJ
-0.98 0 0 1 398.222 583.12 Tm [<005500420048005100450047>]TJ
-1 0 0 1 429.354 583.12 Tm [<0001>]TJ
-0.98 0 0 1 431.687 583.12 Tm [<0058004A00550049>]TJ
-1 0 0 1 453.176 583.12 Tm [<0001>]TJ
-0.98 0 0 1 455.508 583.12 Tm [<004E00500053>20<0046>]TJ
-1 0 0 1 480.976 583.12 Tm [<0001>]TJ
-0.98 0 0 1 483.309 583.12 Tm [<0046004F0048004A004F00460054>]TJ
-1 0 0 1 520.866 583.12 Tm [<0001>]TJ
-1.02 0 0 1 74.409 569.571 Tm [<00420054>]TJ
-1 0 0 1 85.081 569.571 Tm [<0001>]TJ
-1.02 0 0 1 88.096 569.571 Tm [<005500490046>]TJ
-1 0 0 1 104.398 569.571 Tm [<0001>]TJ
-1.02 0 0 1 107.414 569.571 Tm [<004F00460058>]TJ
-1 0 0 1 128.567 569.571 Tm [<0001>]TJ
-1.02 0 0 1 131.582 569.571 Tm [<003100250027>]TJ
-1 0 0 1 153.381 569.571 Tm [<0001>]TJ
-1.02 0 0 1 156.396 569.571 Tm [<004E0042004F004200480046004E0046004F0055>]TJ
-1 0 0 1 223.404 569.571 Tm [<0001>]TJ
-1.02 0 0 1 226.42 569.571 Tm [<005400560051005100500053>-8<00550054>]TJ
-1 0 0 1 271.063 569.571 Tm [<0001>]TJ
-1.02 0 0 1 274.079 569.571 Tm [<0042004D004D>]TJ
-1 0 0 1 286.107 569.571 Tm [<0001>]TJ
-1.02 0 0 1 289.123 569.571 Tm [<004E0042004B00500053>]TJ
-1 0 0 1 319.078 569.571 Tm [<0001>]TJ
-1.02 0 0 1 322.094 569.571 Tm [<0046004F0048004A004F00460054>]TJ
-1 0 0 1 361.184 569.571 Tm [<0001>]TJ
-1.02 0 0 1 364.199 569.571 Tm [<0042004F0045>]TJ
-1 0 0 1 383.561 569.571 Tm [<0001>]TJ
-1.02 0 0 1 386.577 569.571 Tm [<0042004D004D0050>30<0058>6<00460045>]TJ
-1 0 0 1 425.544 569.571 Tm [<0001>]TJ
-1.02 0 0 1 428.56 569.571 Tm [<00550050>]TJ
-1 0 0 1 438.809 569.571 Tm [<0001>]TJ
-1.02 0 0 1 441.824 569.571 Tm [<004200450045>]TJ
-1 0 0 1 460.952 569.571 Tm [<0001>]TJ
-1.02 0 0 1 463.968 569.571 Tm [<005400560051005100500053>-8<0055>]TJ
-1 0 0 1 503.759 569.571 Tm [<0001>]TJ
-1.02 0 0 1 506.775 569.571 Tm [<004700500053>]TJ
-1 0 0 1 520.866 569.571 Tm [<0001>]TJ
-1.02 0 0 1 74.409 556.021 Tm [<00420054005400500044004A0042005500460045>]TJ
-1 0 0 1 127.13 556.021 Tm [<0001>]TJ
-1.02 0 0 1 130.001 556.021 Tm [<056D004D004600540443004A0055>]TJ
-1 0 0 1 168.657 556.021 Tm [<0001>]TJ
-1.02 0 0 1 171.528 556.021 Tm [<0042004D00540050>]TJ
-1 0 0 1 191.724 556.021 Tm [<0001>]TJ
-1.02 0 0 1 194.594 556.021 Tm [<004E00460042004F0054>]TJ
-1 0 0 1 228.143 556.021 Tm [<0001>]TJ
-1.02 0 0 1 231.014 556.021 Tm [<0055004900420055>]TJ
-1 0 0 1 251.243 556.021 Tm [<0001>]TJ
-1.02 0 0 1 254.114 556.021 Tm [<00550049004A0054>]TJ
-1 0 0 1 272.785 556.021 Tm [<0001>]TJ
-1.02 0 0 1 275.656 556.021 Tm [<0057>5<004600530054004A0050004F>]TJ
-1 0 0 1 312.654 556.021 Tm [<0001>]TJ
-1.02 0 0 1 315.525 556.021 Tm [<0053>20<004600520056004A0053>20<00460054>]TJ
-1 0 0 1 356.584 556.021 Tm [<0001>]TJ
-1.02 0 0 1 359.455 556.021 Tm [<0042>]TJ
-1 0 0 1 365.275 556.021 Tm [<0001>]TJ
-1.02 0 0 1 368.145 556.021 Tm [<0054005100460044004A0042004D>]TJ
-1 0 0 1 403.163 556.021 Tm [<0001>]TJ
-1.02 0 0 1 406.033 556.021 Tm [<00540046005500560051>]TJ
-1 0 0 1 433.941 556.021 Tm [<0001>]TJ
-1.02 0 0 1 436.811 556.021 Tm [<00500047>]TJ
-1 0 0 1 446.781 556.021 Tm [<0001>]TJ
-1.02 0 0 1 449.652 556.021 Tm [<005500490046>]TJ
-1 0 0 1 465.953 556.021 Tm [<0001>]TJ
-1.02 0 0 1 468.824 556.021 Tm [<0045005000440056004E0046004F0055>]TJ
-1 0 0 1 520.866 556.021 Tm [<0001>]TJ
-1.009 0 0 1 74.409 542.472 Tm [<0042004F0045>]TJ
-1 0 0 1 93.562 542.472 Tm [<0001>]TJ
-1.009 0 0 1 96.014 542.472 Tm [<004A0054>]TJ
-1 0 0 1 104.017 542.472 Tm [<0001>]TJ
-1.009 0 0 1 106.469 542.472 Tm [<004A004F00440050004E005100420055004A0043004D0046>]TJ
-1 0 0 1 173.206 542.472 Tm [<0001>]TJ
-1.009 0 0 1 175.658 542.472 Tm [<0058004A00550049>]TJ
-1 0 0 1 197.783 542.472 Tm [<0001>]TJ
-1.009 0 0 1 200.235 542.472 Tm [<0042>]TJ
-1 0 0 1 205.992 542.472 Tm [<0001>]TJ
-1.009 0 0 1 208.444 542.472 Tm [<004F0056004E004300460053>]TJ
-1 0 0 1 248.61 542.472 Tm [<0001>]TJ
-1.009 0 0 1 251.062 542.472 Tm [<00500047>]TJ
-1 0 0 1 260.925 542.472 Tm [<0001>]TJ
-1.009 0 0 1 263.377 542.472 Tm [<005100420044004C0042004800460054>10<000D>]TJ
-1 0 0 1 311.797 542.472 Tm [<0001>]TJ
-1.009 0 0 1 314.249 542.472 Tm [<005400460046>]TJ
-1 0 0 1 330.364 542.472 Tm [<0001>]TJ
-1.009 0 0 1 332.816 542.472 Tm [<005500490046>]TJ
-1 0 0 1 348.942 542.472 Tm [<0001>]TJ
-1.009 0 0 1 351.394 542.472 Tm [<0045005000440056004E0046004F005500420055004A0050004F>]TJ
-1 0 0 1 428.786 542.472 Tm [<0001>]TJ
-1.009 0 0 1 431.239 542.472 Tm [<00500047>]TJ
-1 0 0 1 441.101 542.472 Tm [<0001>]TJ
-/F71 10.90909 Tf
-1 0 0 1 443.553 542.472 Tm [<0054002F0037004B001C004D001C003B0032004B0032004D00690040>]TJ
-1 0 0 1 74.409 528.923 Tm [<00690032006200690054003F001C006200320067>]TJ
+1 0 0 1 74.409 665.929 Tm [<0031>6<004D004600420054004600010044004900460044004C00010042004D0054005000010054004600440055004A0050004F>]TJ
+/F46 9.96264 Tf
+1 0 0 1 197.289 665.929 Tm [<0067>]TJ
+ET
+EMC
+/Link<</MCID 5>> BDC
+0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
+BT
/F68 10.90909 Tf
-1 0 0 1 128.409 528.923 Tm [<00470050005300010045004600550042004A004D0054>20<000F>]TJ
+1 0 0 1 199.744 665.929 Tm [<0016000F0013000F0019>]TJ
+0 g 0 G
+ET
+EMC
+/P<</MCID 6>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 222.871 665.929 Tm [<000100470050005300010051005000540054004A0043004D004600010051004A005500470042004D004D0054>20<000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 180.119 528.923 Tm [<0001001200130012>]TJ
+1 0 0 1 321.304 665.929 Tm [<000100170017>]TJ
0 g 0 G
ET
EMC
@@ -3593,161 +3590,89 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 508.599 Tm [<0012001300130001>]TJ
+1 0 0 1 66.728 645.605 Tm [<001700180001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 6>> BDC
+/P<</MCID 7>> BDC
BT
/F68 10.90909 Tf
-1.02 0 0 1 74.409 508.599 Tm [<0022004F00500055004900460053>]TJ
-1 0 0 1 115.413 508.599 Tm [<0001>]TJ
-1.02 0 0 1 118.651 508.599 Tm [<004A004E005100500053>-7<00550042004F0055>]TJ
-1 0 0 1 170.124 508.599 Tm [<0001>]TJ
-1.02 0 0 1 173.361 508.599 Tm [<0054005500460051>]TJ
-1 0 0 1 194.525 508.599 Tm [<0001>]TJ
-1.02 0 0 1 197.762 508.599 Tm [<004A0054>]TJ
-1 0 0 1 205.852 508.599 Tm [<0001>]TJ
-1.02 0 0 1 209.089 508.599 Tm [<005500490046>]TJ
-1 0 0 1 225.39 508.599 Tm [<0001>]TJ
-1.02 0 0 1 228.628 508.599 Tm [<004F00460058>]TJ
-1 0 0 1 249.781 508.599 Tm [<0001>]TJ
-1.02 0 0 1 253.018 508.599 Tm [<004900500050004C>]TJ
-1 0 0 1 278.444 508.599 Tm [<0001>]TJ
-1.02 0 0 1 281.681 508.599 Tm [<004E0042004F004200480046004E0046004F0055>]TJ
-1 0 0 1 348.689 508.599 Tm [<0001>]TJ
-1.02 0 0 1 351.926 508.599 Tm [<004A004F>]TJ
-1 0 0 1 362.052 508.599 Tm [<0001>]TJ
-1.02 0 0 1 365.289 508.599 Tm [<002D>]TJ
-/F68 7.63636 Tf
-1 0 0 1 367.682 510.864 Tm [<0022>]TJ
-/F68 10.90909 Tf
-1.02 0 0 1 370.895 508.599 Tm [<0035>]TJ
-1 0 0 1 375.987 505.926 Tm [<0026>]TJ
-1.02 0 0 1 381.234 508.599 Tm [<0039001B>]TJ
-1 0 0 1 391.126 508.599 Tm [<0001>]TJ
-1.02 0 0 1 395.964 508.599 Tm [<005500490046>]TJ
-1 0 0 1 412.266 508.599 Tm [<0001>]TJ
-1.02 0 0 1 415.503 508.599 Tm [<004F00460058>6<004600540055>]TJ
-1 0 0 1 450.988 508.599 Tm [<0001>]TJ
-1.02 0 0 1 454.225 508.599 Tm [<004500460057>5<0046004D00500051004E0046004F0055>]TJ
-1 0 0 1 520.866 508.599 Tm [<0001>]TJ
-1.02 0 0 1 74.137 495.05 Tm [<0057>5<004600530054004A0050004F>]TJ
-1 0 0 1 111.135 495.05 Tm [<0001>]TJ
-1.02 0 0 1 114.178 495.05 Tm [<004900420054>]TJ
-1 0 0 1 131.603 495.05 Tm [<0001>]TJ
-1.02 0 0 1 134.646 495.05 Tm [<004900500050004C0054>]TJ
-1 0 0 1 164.923 495.05 Tm [<0001>]TJ
-1.02 0 0 1 167.966 495.05 Tm [<004700500053>]TJ
-1 0 0 1 182.264 495.05 Tm [<0001>]TJ
-1.02 0 0 1 185.307 495.05 Tm [<005100420053>10<004200480053>10<0042005100490054>]TJ
-1 0 0 1 242.123 495.05 Tm [<0001>]TJ
-1.02 0 0 1 245.166 495.05 Tm [<00580049004A00440049>]TJ
-1 0 0 1 275.977 495.05 Tm [<0001>]TJ
-1.02 0 0 1 279.02 495.05 Tm [<0054004900500056004D0045>]TJ
-1 0 0 1 313.548 495.05 Tm [<0001>]TJ
-1.02 0 0 1 316.59 495.05 Tm [<00420055>]TJ
-1 0 0 1 326.238 495.05 Tm [<0001>]TJ
-1.02 0 0 1 329.28 495.05 Tm [<005500490046>]TJ
-1 0 0 1 345.582 495.05 Tm [<0001>]TJ
-1.02 0 0 1 348.625 495.05 Tm [<0046004F0045>]TJ
-1 0 0 1 367.886 495.05 Tm [<0001>]TJ
-1.02 0 0 1 370.929 495.05 Tm [<0042004D004D0050>30<0058>]TJ
-1 0 0 1 397.59 495.05 Tm [<0001>]TJ
-1.02 0 0 1 400.632 495.05 Tm [<00550050>]TJ
-1 0 0 1 410.88 495.05 Tm [<0001>]TJ
-1.02 0 0 1 413.923 495.05 Tm [<005500420048>]TJ
-1 0 0 1 429.357 495.05 Tm [<0001>]TJ
-1.02 0 0 1 432.399 495.05 Tm [<004E0042004F005A>]TJ
-1 0 0 1 461.008 495.05 Tm [<0001>]TJ
-1.02 0 0 1 464.05 495.05 Tm [<005100420053>10<004200480053>10<0042005100490054>]TJ
-1 0 0 1 520.866 495.05 Tm [<0001>]TJ
-0.992 0 0 1 74.409 481.501 Tm [<0042005600550050004E00420055004A00440042004D004D005A>97<000F>]TJ
-1 0 0 1 143.467 481.501 Tm [<0001>]TJ
-0.992 0 0 1 146.737 481.501 Tm [<003500490046>]TJ
-1 0 0 1 165.589 481.501 Tm [<0001>]TJ
-0.992 0 0 1 168.037 481.501 Tm [<0054004E0042004D004D>]TJ
-1 0 0 1 194.442 481.501 Tm [<0001>]TJ
-0.992 0 0 1 196.89 481.501 Tm [<0053>20<00460045>]TJ
-1 0 0 1 212.911 481.501 Tm [<0001>]TJ
-0.992 0 0 1 215.358 481.501 Tm [<004F0056004E0043004600530054>]TJ
-1 0 0 1 259.566 481.501 Tm [<0001>]TJ
-0.992 0 0 1 262.013 481.501 Tm [<00420053>6<00500056004F0045>]TJ
-1 0 0 1 297.788 481.501 Tm [<0001>]TJ
-0.992 0 0 1 300.236 481.501 Tm [<005100420053>10<004200480053>10<0042005100490054>]TJ
-1 0 0 1 355.486 481.501 Tm [<0001>]TJ
-0.992 0 0 1 357.934 481.501 Tm [<004A004F>]TJ
-1 0 0 1 367.782 481.501 Tm [<0001>]TJ
-0.992 0 0 1 370.23 481.501 Tm [<005500490046>]TJ
-1 0 0 1 386.084 481.501 Tm [<0001>]TJ
-0.992 0 0 1 388.531 481.501 Tm [<0045005000440056004E0046004F005500420055004A0050004F>]TJ
-1 0 0 1 464.62 481.501 Tm [<0001>]TJ
-0.992 0 0 1 467.067 481.501 Tm [<005400490050>30<0058>]TJ
-1 0 0 1 492.576 481.501 Tm [<0001>]TJ
-0.992 0 0 1 495.024 481.501 Tm [<005500490046004E>]TJ
-1 0 0 1 520.866 481.501 Tm [<0001>]TJ
-1.02 0 0 1 74.409 467.952 Tm [<004A004F>]TJ
-1 0 0 1 84.535 467.952 Tm [<0001>]TJ
-1.02 0 0 1 87.296 467.952 Tm [<004200440055004A0050004F000F>]TJ
-1 0 0 1 121.957 467.952 Tm [<0001>]TJ
-1.02 0 0 1 126.148 467.952 Tm [<003500490046>]TJ
-1 0 0 1 145.532 467.952 Tm [<0001>]TJ
-1.02 0 0 1 148.293 467.952 Tm [<004E0042004A004F>]TJ
-1 0 0 1 174.509 467.952 Tm [<0001>]TJ
-1.02 0 0 1 177.269 467.952 Tm [<00510053>6<00500043004D0046004E>]TJ
-1 0 0 1 220.465 467.952 Tm [<0001>]TJ
-1.02 0 0 1 223.226 467.952 Tm [<004900460053>20<0046>]TJ
-1 0 0 1 245.525 467.952 Tm [<0001>]TJ
-1.02 0 0 1 248.286 467.952 Tm [<004A0054>]TJ
-1 0 0 1 256.375 467.952 Tm [<0001>]TJ
-1.02 0 0 1 259.136 467.952 Tm [<004F00500055>]TJ
-1 0 0 1 276.272 467.952 Tm [<0001>]TJ
-1.02 0 0 1 279.032 467.952 Tm [<00550050>]TJ
-1 0 0 1 289.281 467.952 Tm [<0001>]TJ
-1.02 0 0 1 292.041 467.952 Tm [<005500420048>]TJ
-1 0 0 1 307.475 467.952 Tm [<0001>]TJ
-1.02 0 0 1 310.235 467.952 Tm [<0042>]TJ
-1 0 0 1 316.055 467.952 Tm [<0001>]TJ
-1.02 0 0 1 318.816 467.952 Tm [<005100420053>10<004200480053>10<004200510049000D>]TJ
-1 0 0 1 373.729 467.952 Tm [<0001>]TJ
-1.02 0 0 1 376.566 467.952 Tm [<004300560055>]TJ
-1 0 0 1 393.791 467.952 Tm [<0001>]TJ
-1.02 0 0 1 396.552 467.952 Tm [<00550050>]TJ
-1 0 0 1 406.8 467.952 Tm [<0001>]TJ
-1.02 0 0 1 409.56 467.952 Tm [<00420057>5<0050004A0045>]TJ
-1 0 0 1 437.245 467.952 Tm [<0001>]TJ
-1.02 0 0 1 440.006 467.952 Tm [<00550050>]TJ
-1 0 0 1 450.254 467.952 Tm [<0001>]TJ
-1.02 0 0 1 453.015 467.952 Tm [<005500420048>]TJ
-1 0 0 1 468.448 467.952 Tm [<0001>]TJ
-1.02 0 0 1 471.209 467.952 Tm [<005500500050>]TJ
-1 0 0 1 487.877 467.952 Tm [<0001>]TJ
-1.02 0 0 1 490.638 467.952 Tm [<004E0042004F005A>-10<001B>]TJ
-1 0 0 1 520.866 467.952 Tm [<0001>]TJ
-1 0 0 1 74.409 454.402 Tm [<005100420053>10<004200480053>10<004200510049005400010051005000510001005600510001004A004F0001004E0042004F005A00010051004D0042004400460054>20<000F>]TJ
+1.02 0 0 1 74.409 645.605 Tm [<0022004D00540050>]TJ
+1 0 0 1 95.852 645.605 Tm [<0001>]TJ
+1.02 0 0 1 98.876 645.605 Tm [<004F00460058>]TJ
+1 0 0 1 120.029 645.605 Tm [<0001>]TJ
+1.02 0 0 1 123.054 645.605 Tm [<004A004F>]TJ
+1 0 0 1 133.18 645.605 Tm [<0001>]TJ
+1.02 0 0 1 136.204 645.605 Tm [<00550049004A0054>]TJ
+1 0 0 1 154.876 645.605 Tm [<0001>]TJ
+1.02 0 0 1 157.901 645.605 Tm [<0057>5<004600530054004A0050004F>]TJ
+1 0 0 1 194.899 645.605 Tm [<0001>]TJ
+1.02 0 0 1 197.923 645.605 Tm [<004A0054>]TJ
+1 0 0 1 206.013 645.605 Tm [<0001>]TJ
+1.02 0 0 1 209.038 645.605 Tm [<005500490046>]TJ
+1 0 0 1 225.339 645.605 Tm [<0001>]TJ
+1.02 0 0 1 228.364 645.605 Tm [<00490042004F0045004D004A004F0048>]TJ
+1 0 0 1 273.496 645.605 Tm [<0001>]TJ
+1.02 0 0 1 276.521 645.605 Tm [<00500047>]TJ
+1 0 0 1 286.491 645.605 Tm [<0001>]TJ
+1.02 0 0 1 289.515 645.605 Tm [<004900460042004500460053>]TJ
+1 0 0 1 324.511 645.605 Tm [<0001>]TJ
+1.02 0 0 1 327.535 645.605 Tm [<0042004F0045>]TJ
+1 0 0 1 346.897 645.605 Tm [<0001>]TJ
+1.02 0 0 1 349.921 645.605 Tm [<004700500050005500460053>-10<001B>]TJ
+1 0 0 1 383.247 645.605 Tm [<0001>]TJ
+1.02 0 0 1 387.66 645.605 Tm [<005500490046005A>]TJ
+1 0 0 1 409.592 645.605 Tm [<0001>]TJ
+1.02 0 0 1 412.617 645.605 Tm [<0058004A004D004D>]TJ
+1 0 0 1 430.61 645.605 Tm [<0001>]TJ
+1.02 0 0 1 433.634 645.605 Tm [<004F0050>30<0058>]TJ
+1 0 0 1 455.154 645.605 Tm [<0001>]TJ
+1.02 0 0 1 458.179 645.605 Tm [<00430046>]TJ
+1 0 0 1 470.553 645.605 Tm [<0001>]TJ
+1.02 0 0 1 473.577 645.605 Tm [<005500420048004800460045>]TJ
+1 0 0 1 507.17 645.605 Tm [<0001>]TJ
+1.02 0 0 1 510.195 645.605 Tm [<00420054>]TJ
+1 0 0 1 520.866 645.605 Tm [<0001>]TJ
+1 0 0 1 74.409 632.056 Tm [<00420053>-8<0055004A0047004200440055005400010042005600550050004E00420055004A00440042004D004D005A>95<000F0001>-75<0034>12<0046004600010054004600440055004A0050004F>]TJ
+/F46 9.96264 Tf
+1 0 0 1 245.038 632.056 Tm [<0067>]TJ
+ET
+EMC
+/Link<</MCID 8>> BDC
+0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
+BT
+/F68 10.90909 Tf
+1 0 0 1 247.493 632.056 Tm [<0016000F0013000F0016>]TJ
+0 g 0 G
+ET
+EMC
+/P<</MCID 9>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 270.62 632.056 Tm [<000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 246.991 454.402 Tm [<0001001200130013>]TJ
+1 0 0 1 273.511 632.056 Tm [<000100170018>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
0 g 0 G
EMC
-/H1<</MCID 7>> BDC
+/H1<</MCID 10>> BDC
BT
/F65 14.3462 Tf
-1 0 0 1 74.409 410.986 Tm [<006A00580067>]TJ
+1 0 0 1 74.409 588.64 Tm [<006B00580067>]TJ
ET
EMC
-/H1<</MCID 8>> BDC
+/H1<</MCID 11>> BDC
BT
/F65 14.3462 Tf
-1 0 0 1 93.863 410.986 Tm [<0041004D006900600051>-31<002F006D002B006900420051004D>]TJ
+1 0 0 1 93.863 588.64 Tm [<0041004D006900600051>-31<002F006D002B006900420051004D>]TJ
ET
EMC
/Artifact BMC
@@ -3757,347 +3682,347 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 378.368 Tm [<0012001300150001>]TJ
+1 0 0 1 66.728 556.021 Tm [<001700190001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 9>> BDC
+/P<</MCID 12>> BDC
BT
/F68 10.90909 Tf
-0.98 0 0 1 74.409 378.368 Tm [<0034>20<004A004F00440046>]TJ
-1 0 0 1 100.497 378.368 Tm [<0001>]TJ
-0.98 0 0 1 102.824 378.368 Tm [<004E0042004F005A>]TJ
-1 0 0 1 130.31 378.368 Tm [<0001>]TJ
-0.98 0 0 1 132.636 378.368 Tm [<005A>6<004600420053>]TJ
-1 0 0 1 153.224 378.368 Tm [<0001>]TJ
-0.98 0 0 1 155.551 378.368 Tm [<005500490046>]TJ
-1 0 0 1 171.213 378.368 Tm [<0001>]TJ
-0.98 0 0 1 173.539 378.368 Tm [<00440053>20<004600420055004A0050004F>]TJ
-1 0 0 1 213.44 378.368 Tm [<0001>]TJ
-0.98 0 0 1 215.766 378.368 Tm [<00500047>]TJ
-1 0 0 1 225.345 378.368 Tm [<0001>]TJ
-0.98 0 0 1 227.671 378.368 Tm [<004200440044004600540054004A0043004D0046>]TJ
-1 0 0 1 276.668 378.368 Tm [<0001>]TJ
-0.98 0 0 1 278.994 378.368 Tm [<003100250027000E056D004D00460054>]TJ
-1 0 0 1 323.789 378.368 Tm [<0001>]TJ
-0.98 0 0 1 326.115 378.368 Tm [<0058004A00550049>]TJ
-1 0 0 1 347.604 378.368 Tm [<0001>]TJ
-0.98 0 0 1 349.93 378.368 Tm [<002D>]TJ
+0.98 0 0 1 74.409 556.021 Tm [<0034>20<004A004F00440046>]TJ
+1 0 0 1 100.497 556.021 Tm [<0001>]TJ
+0.98 0 0 1 102.824 556.021 Tm [<004E0042004F005A>]TJ
+1 0 0 1 130.31 556.021 Tm [<0001>]TJ
+0.98 0 0 1 132.636 556.021 Tm [<005A>6<004600420053>]TJ
+1 0 0 1 153.224 556.021 Tm [<0001>]TJ
+0.98 0 0 1 155.551 556.021 Tm [<005500490046>]TJ
+1 0 0 1 171.213 556.021 Tm [<0001>]TJ
+0.98 0 0 1 173.539 556.021 Tm [<00440053>20<004600420055004A0050004F>]TJ
+1 0 0 1 213.44 556.021 Tm [<0001>]TJ
+0.98 0 0 1 215.766 556.021 Tm [<00500047>]TJ
+1 0 0 1 225.345 556.021 Tm [<0001>]TJ
+0.98 0 0 1 227.671 556.021 Tm [<004200440044004600540054004A0043004D0046>]TJ
+1 0 0 1 276.668 556.021 Tm [<0001>]TJ
+0.98 0 0 1 278.994 556.021 Tm [<003100250027000E056D004D00460054>]TJ
+1 0 0 1 323.789 556.021 Tm [<0001>]TJ
+0.98 0 0 1 326.115 556.021 Tm [<0058004A00550049>]TJ
+1 0 0 1 347.604 556.021 Tm [<0001>]TJ
+0.98 0 0 1 349.93 556.021 Tm [<002D>]TJ
/F68 7.63636 Tf
-1 0 0 1 352.075 380.632 Tm [<0022>]TJ
-/F68 10.90909 Tf
-0.98 0 0 1 355.288 378.368 Tm [<0035>]TJ
-1 0 0 1 360.109 375.695 Tm [<0026>]TJ
-0.98 0 0 1 365.356 378.368 Tm [<0039>]TJ
-1 0 0 1 372.027 378.368 Tm [<0001>]TJ
-0.98 0 0 1 374.353 378.368 Tm [<00580049004A00440049>]TJ
-1 0 0 1 403.956 378.368 Tm [<0001>]TJ
-0.98 0 0 1 406.283 378.368 Tm [<00440050004F004700500053>-8<004E>]TJ
-1 0 0 1 448.066 378.368 Tm [<0001>]TJ
-0.98 0 0 1 450.393 378.368 Tm [<00550050>]TJ
-1 0 0 1 460.239 378.368 Tm [<0001>]TJ
-0.98 0 0 1 462.565 378.368 Tm [<005500490046>]TJ
-1 0 0 1 478.228 378.368 Tm [<0001>]TJ
-0.98 0 0 1 480.554 378.368 Tm [<00310025002700100036>41<0022>]TJ
-1 0 0 1 520.866 378.368 Tm [<0001>]TJ
-0.992 0 0 1 74.409 364.818 Tm [<005400550042004F004500420053>20<0045>]TJ
-1 0 0 1 117.799 364.818 Tm [<0001>]TJ
-0.992 0 0 1 120.255 364.818 Tm [<004900420054>]TJ
-1 0 0 1 137.202 364.818 Tm [<0001>]TJ
-0.992 0 0 1 139.658 364.818 Tm [<004300460046004F>]TJ
-1 0 0 1 163.953 364.818 Tm [<0001>]TJ
-0.992 0 0 1 166.409 364.818 Tm [<0050004F>]TJ
-1 0 0 1 179.352 364.818 Tm [<0001>]TJ
-0.992 0 0 1 181.808 364.818 Tm [<005500490046>]TJ
-1 0 0 1 197.662 364.818 Tm [<0001>]TJ
-0.992 0 0 1 200.118 364.818 Tm [<004200480046004F00450042>]TJ
-1 0 0 1 235.798 364.818 Tm [<0001>]TJ
-0.992 0 0 1 238.254 364.818 Tm [<00500047>]TJ
-1 0 0 1 247.95 364.818 Tm [<0001>]TJ
-0.992 0 0 1 250.407 364.818 Tm [<0035>]TJ
-1 0 0 1 255.308 362.146 Tm [<0026>]TJ
-0.992 0 0 1 260.556 364.818 Tm [<0039000E004E004600460055004A004F00480054>20<000F>]TJ
-1 0 0 1 319.225 364.818 Tm [<0001>]TJ
-0.992 0 0 1 322.503 364.818 Tm [<002E>12<0042004F005A>]TJ
-1 0 0 1 350.42 364.818 Tm [<0001>]TJ
-0.992 0 0 1 352.876 364.818 Tm [<0051004600500051004D0046>]TJ
-1 0 0 1 386.423 364.818 Tm [<0001>]TJ
-0.992 0 0 1 388.88 364.818 Tm [<004200480053>20<00460046>]TJ
-1 0 0 1 415.279 364.818 Tm [<0001>]TJ
-0.992 0 0 1 417.735 364.818 Tm [<0055004900420055>]TJ
-1 0 0 1 437.409 364.818 Tm [<0001>]TJ
-0.992 0 0 1 439.865 364.818 Tm [<00550049004A0054>]TJ
-1 0 0 1 458.024 364.818 Tm [<0001>]TJ
-0.992 0 0 1 460.48 364.818 Tm [<004A0054>]TJ
-1 0 0 1 468.348 364.818 Tm [<0001>]TJ
-0.992 0 0 1 470.804 364.818 Tm [<004A004E005100500053>-8<00550042004F0055>]TJ
-1 0 0 1 520.866 364.818 Tm [<0001>]TJ
-1.02 0 0 1 74.409 351.269 Tm [<0042004F0045>]TJ
-1 0 0 1 93.771 351.269 Tm [<0001>]TJ
-1.02 0 0 1 96.946 351.269 Tm [<0033>20<005000540054>]TJ
-1 0 0 1 120.013 351.269 Tm [<0001>]TJ
-1.02 0 0 1 123.188 351.269 Tm [<002E>30<005000500053>20<0046>]TJ
-1 0 0 1 156.024 351.269 Tm [<0001>]TJ
-1.02 0 0 1 159.199 351.269 Tm [<004900420054>]TJ
-1 0 0 1 176.625 351.269 Tm [<0001>]TJ
-1.02 0 0 1 179.8 351.269 Tm [<00450050004F0046>]TJ
-1 0 0 1 205.481 351.269 Tm [<0001>]TJ
-1.02 0 0 1 208.656 351.269 Tm [<00520056004A00550046>]TJ
-1 0 0 1 234.761 351.269 Tm [<0001>]TJ
-1.02 0 0 1 237.936 351.269 Tm [<00540050004E0046>]TJ
-1 0 0 1 265.198 351.269 Tm [<0001>]TJ
-1.02 0 0 1 268.373 351.269 Tm [<005800500053>6<004C>]TJ
-1 0 0 1 293.431 351.269 Tm [<0001>]TJ
-1.02 0 0 1 296.607 351.269 Tm [<0050004F>]TJ
-1 0 0 1 309.915 351.269 Tm [<0001>]TJ
-1.02 0 0 1 313.09 351.269 Tm [<004A0055000F>]TJ
-1 0 0 1 323.104 351.269 Tm [<0001>]TJ
-1.02 0 0 1 328.538 351.269 Tm [<0035004900460053>20<0046>]TJ
-1 0 0 1 357.748 351.269 Tm [<0001>]TJ
-1.02 0 0 1 360.923 351.269 Tm [<004A0054>]TJ
-1 0 0 1 369.012 351.269 Tm [<0001>]TJ
-1.02 0 0 1 372.187 351.269 Tm [<0042004D00540050>]TJ
-1 0 0 1 392.383 351.269 Tm [<0001>]TJ
-1.02 0 0 1 395.558 351.269 Tm [<0042>]TJ
-1 0 0 1 401.378 351.269 Tm [<0001>]TJ
-1.02 0 0 1 404.553 351.269 Tm [<003500360028000E004E0042004A004D004A004F0048>]TJ
-1 0 0 1 471.138 351.269 Tm [<0001>]TJ
-1.02 0 0 1 474.313 351.269 Tm [<004D004A00540055>]TJ
-1 0 0 1 489.335 351.269 Tm [<0001>]TJ
-1.02 0 0 1 492.51 351.269 Tm [<0042004F0045>]TJ
-1 0 0 1 511.872 351.269 Tm [<0001>]TJ
-1.02 0 0 1 515.047 351.269 Tm [<0042>]TJ
-1 0 0 1 520.866 351.269 Tm [<0001>]TJ
-1 0 0 1 73.995 337.72 Tm [<0058>6<0046004300510042004800460001003C0016003E0001004500460045004A00440042005500460045000100550050000100550049004A00540001005500490046004E0046>20<000F>]TJ
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 254.824 337.72 Tm [<0001001200130015>]TJ
-0 g 0 G
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 63.56 317.396 Tm [<0012001300160001>]TJ
+1 0 0 1 352.075 558.286 Tm [<0022>]TJ
+/F68 10.90909 Tf
+0.98 0 0 1 355.288 556.021 Tm [<0035>]TJ
+1 0 0 1 360.109 553.349 Tm [<0026>]TJ
+0.98 0 0 1 365.356 556.021 Tm [<0039>]TJ
+1 0 0 1 372.027 556.021 Tm [<0001>]TJ
+0.98 0 0 1 374.353 556.021 Tm [<00580049004A00440049>]TJ
+1 0 0 1 403.956 556.021 Tm [<0001>]TJ
+0.98 0 0 1 406.283 556.021 Tm [<00440050004F004700500053>-8<004E>]TJ
+1 0 0 1 448.066 556.021 Tm [<0001>]TJ
+0.98 0 0 1 450.393 556.021 Tm [<00550050>]TJ
+1 0 0 1 460.239 556.021 Tm [<0001>]TJ
+0.98 0 0 1 462.565 556.021 Tm [<005500490046>]TJ
+1 0 0 1 478.228 556.021 Tm [<0001>]TJ
+0.98 0 0 1 480.554 556.021 Tm [<00310025002700100036>41<0022>]TJ
+1 0 0 1 520.866 556.021 Tm [<0001>]TJ
+0.992 0 0 1 74.409 542.472 Tm [<005400550042004F004500420053>20<0045>]TJ
+1 0 0 1 117.799 542.472 Tm [<0001>]TJ
+0.992 0 0 1 120.255 542.472 Tm [<004900420054>]TJ
+1 0 0 1 137.202 542.472 Tm [<0001>]TJ
+0.992 0 0 1 139.658 542.472 Tm [<004300460046004F>]TJ
+1 0 0 1 163.953 542.472 Tm [<0001>]TJ
+0.992 0 0 1 166.409 542.472 Tm [<0050004F>]TJ
+1 0 0 1 179.352 542.472 Tm [<0001>]TJ
+0.992 0 0 1 181.808 542.472 Tm [<005500490046>]TJ
+1 0 0 1 197.662 542.472 Tm [<0001>]TJ
+0.992 0 0 1 200.118 542.472 Tm [<004200480046004F00450042>]TJ
+1 0 0 1 235.798 542.472 Tm [<0001>]TJ
+0.992 0 0 1 238.254 542.472 Tm [<00500047>]TJ
+1 0 0 1 247.95 542.472 Tm [<0001>]TJ
+0.992 0 0 1 250.407 542.472 Tm [<0035>]TJ
+1 0 0 1 255.308 539.799 Tm [<0026>]TJ
+0.992 0 0 1 260.556 542.472 Tm [<0039000E004E004600460055004A004F00480054>20<000F>]TJ
+1 0 0 1 319.225 542.472 Tm [<0001>]TJ
+0.992 0 0 1 322.503 542.472 Tm [<002E>12<0042004F005A>]TJ
+1 0 0 1 350.42 542.472 Tm [<0001>]TJ
+0.992 0 0 1 352.876 542.472 Tm [<0051004600500051004D0046>]TJ
+1 0 0 1 386.423 542.472 Tm [<0001>]TJ
+0.992 0 0 1 388.88 542.472 Tm [<004200480053>20<00460046>]TJ
+1 0 0 1 415.279 542.472 Tm [<0001>]TJ
+0.992 0 0 1 417.735 542.472 Tm [<0055004900420055>]TJ
+1 0 0 1 437.409 542.472 Tm [<0001>]TJ
+0.992 0 0 1 439.865 542.472 Tm [<00550049004A0054>]TJ
+1 0 0 1 458.024 542.472 Tm [<0001>]TJ
+0.992 0 0 1 460.48 542.472 Tm [<004A0054>]TJ
+1 0 0 1 468.348 542.472 Tm [<0001>]TJ
+0.992 0 0 1 470.804 542.472 Tm [<004A004E005100500053>-8<00550042004F0055>]TJ
+1 0 0 1 520.866 542.472 Tm [<0001>]TJ
+1.02 0 0 1 74.409 528.923 Tm [<0042004F0045>]TJ
+1 0 0 1 93.771 528.923 Tm [<0001>]TJ
+1.02 0 0 1 96.946 528.923 Tm [<0033>20<005000540054>]TJ
+1 0 0 1 120.013 528.923 Tm [<0001>]TJ
+1.02 0 0 1 123.188 528.923 Tm [<002E>30<005000500053>20<0046>]TJ
+1 0 0 1 156.024 528.923 Tm [<0001>]TJ
+1.02 0 0 1 159.199 528.923 Tm [<004900420054>]TJ
+1 0 0 1 176.625 528.923 Tm [<0001>]TJ
+1.02 0 0 1 179.8 528.923 Tm [<00450050004F0046>]TJ
+1 0 0 1 205.481 528.923 Tm [<0001>]TJ
+1.02 0 0 1 208.656 528.923 Tm [<00520056004A00550046>]TJ
+1 0 0 1 234.761 528.923 Tm [<0001>]TJ
+1.02 0 0 1 237.936 528.923 Tm [<00540050004E0046>]TJ
+1 0 0 1 265.198 528.923 Tm [<0001>]TJ
+1.02 0 0 1 268.373 528.923 Tm [<005800500053>6<004C>]TJ
+1 0 0 1 293.431 528.923 Tm [<0001>]TJ
+1.02 0 0 1 296.607 528.923 Tm [<0050004F>]TJ
+1 0 0 1 309.915 528.923 Tm [<0001>]TJ
+1.02 0 0 1 313.09 528.923 Tm [<004A0055000F>]TJ
+1 0 0 1 323.104 528.923 Tm [<0001>]TJ
+1.02 0 0 1 328.538 528.923 Tm [<0035004900460053>20<0046>]TJ
+1 0 0 1 357.748 528.923 Tm [<0001>]TJ
+1.02 0 0 1 360.923 528.923 Tm [<004A0054>]TJ
+1 0 0 1 369.012 528.923 Tm [<0001>]TJ
+1.02 0 0 1 372.187 528.923 Tm [<0042004D00540050>]TJ
+1 0 0 1 392.383 528.923 Tm [<0001>]TJ
+1.02 0 0 1 395.558 528.923 Tm [<0042>]TJ
+1 0 0 1 401.378 528.923 Tm [<0001>]TJ
+1.02 0 0 1 404.553 528.923 Tm [<003500360028000E004E0042004A004D004A004F0048>]TJ
+1 0 0 1 471.138 528.923 Tm [<0001>]TJ
+1.02 0 0 1 474.313 528.923 Tm [<004D004A00540055>]TJ
+1 0 0 1 489.335 528.923 Tm [<0001>]TJ
+1.02 0 0 1 492.51 528.923 Tm [<0042004F0045>]TJ
+1 0 0 1 511.872 528.923 Tm [<0001>]TJ
+1.02 0 0 1 515.047 528.923 Tm [<0042>]TJ
+1 0 0 1 520.866 528.923 Tm [<0001>]TJ
+1 0 0 1 73.995 515.374 Tm [<0058>6<0046004300510042004800460001003C0016003E0001004500460045004A00440042005500460045000100550050000100550049004A00540001005500490046004E0046>20<000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 254.824 515.374 Tm [<000100170019>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 495.05 Tm [<0017001A0001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 10>> BDC
+/P<</MCID 13>> BDC
BT
/F68 10.90909 Tf
-1.017 0 0 1 74.409 317.396 Tm [<0023>12<00560055>]TJ
-1 0 0 1 91.983 317.396 Tm [<0001>]TJ
-1.017 0 0 1 94.44 317.396 Tm [<004A004F>]TJ
-1 0 0 1 104.536 317.396 Tm [<0001>]TJ
-1.017 0 0 1 106.993 317.396 Tm [<004E005A>]TJ
-1 0 0 1 122.848 317.396 Tm [<0001>]TJ
-1.017 0 0 1 125.305 317.396 Tm [<00500051004A004F004A0050004F>]TJ
-1 0 0 1 165.046 317.396 Tm [<0001>]TJ
-1.017 0 0 1 167.503 317.396 Tm [<004E004A00540054004A004F0048>]TJ
-1 0 0 1 206.511 317.396 Tm [<0001>]TJ
-1.017 0 0 1 208.969 317.396 Tm [<00420053>20<0046>]TJ
-1 0 0 1 224.567 317.396 Tm [<0001>]TJ
-1.017 0 0 1 227.024 317.396 Tm [<004E00460042004F0054>]TJ
-1 0 0 1 260.474 317.396 Tm [<0001>]TJ
-1.017 0 0 1 262.931 317.396 Tm [<00550050>]TJ
-1 0 0 1 273.15 317.396 Tm [<0001>]TJ
+1.017 0 0 1 74.409 495.05 Tm [<0023>12<00560055>]TJ
+1 0 0 1 91.983 495.05 Tm [<0001>]TJ
+1.017 0 0 1 94.44 495.05 Tm [<004A004F>]TJ
+1 0 0 1 104.536 495.05 Tm [<0001>]TJ
+1.017 0 0 1 106.993 495.05 Tm [<004E005A>]TJ
+1 0 0 1 122.848 495.05 Tm [<0001>]TJ
+1.017 0 0 1 125.305 495.05 Tm [<00500051004A004F004A0050004F>]TJ
+1 0 0 1 165.046 495.05 Tm [<0001>]TJ
+1.017 0 0 1 167.503 495.05 Tm [<004E004A00540054004A004F0048>]TJ
+1 0 0 1 206.511 495.05 Tm [<0001>]TJ
+1.017 0 0 1 208.969 495.05 Tm [<00420053>20<0046>]TJ
+1 0 0 1 224.567 495.05 Tm [<0001>]TJ
+1.017 0 0 1 227.024 495.05 Tm [<004E00460042004F0054>]TJ
+1 0 0 1 260.474 495.05 Tm [<0001>]TJ
+1.017 0 0 1 262.931 495.05 Tm [<00550050>]TJ
+1 0 0 1 273.15 495.05 Tm [<0001>]TJ
/F69 10.90909 Tf
-1.017 0 0 1 275.607 317.396 Tm [<0046>10<0059005100460053004A004E0046004F0055>]TJ
-1 0 0 1 332.866 317.396 Tm [<0001>]TJ
-/F68 10.90909 Tf
-1.017 0 0 1 335.323 317.396 Tm [<0058004A00550049>]TJ
-1 0 0 1 357.623 317.396 Tm [<0001>]TJ
-1.017 0 0 1 360.08 317.396 Tm [<0055004200480048004A004F0048>]TJ
-1 0 0 1 397.103 317.396 Tm [<0001>]TJ
-1.017 0 0 1 399.56 317.396 Tm [<0042004F0045>]TJ
-1 0 0 1 418.865 317.396 Tm [<0001>]TJ
-1.017 0 0 1 421.322 317.396 Tm [<004200440044004600540054004A0043004A004D004A0055005A>95<000F>]TJ
-1 0 0 1 484.236 317.396 Tm [<0001>]TJ
-1.017 0 0 1 487.517 317.396 Tm [<002E>30<00460042004F0054>]TJ
-1 0 0 1 520.866 317.396 Tm [<0001>]TJ
-1.02 0 0 1 74.409 303.847 Tm [<00550050>]TJ
-1 0 0 1 84.658 303.847 Tm [<0001>]TJ
-1.02 0 0 1 87.226 303.847 Tm [<00550053>-18<005A>]TJ
-1 0 0 1 101.213 303.847 Tm [<0001>]TJ
-1.02 0 0 1 103.781 303.847 Tm [<005000560055000D>]TJ
-1 0 0 1 123.721 303.847 Tm [<0001>]TJ
-1.02 0 0 1 126.317 303.847 Tm [<00490050>30<0058>]TJ
-1 0 0 1 147.704 303.847 Tm [<0001>]TJ
-1.02 0 0 1 150.272 303.847 Tm [<0045004A056F00440056004D0055>]TJ
-1 0 0 1 189.696 303.847 Tm [<0001>]TJ
-1.02 0 0 1 192.264 303.847 Tm [<004A0055>]TJ
-1 0 0 1 199.329 303.847 Tm [<0001>]TJ
-1.02 0 0 1 201.897 303.847 Tm [<004A0054>]TJ
-1 0 0 1 209.987 303.847 Tm [<0001>]TJ
-1.02 0 0 1 212.555 303.847 Tm [<00550050>]TJ
-1 0 0 1 222.803 303.847 Tm [<0001>]TJ
-1.02 0 0 1 225.371 303.847 Tm [<005500420048>]TJ
-1 0 0 1 240.805 303.847 Tm [<0001>]TJ
-1.02 0 0 1 243.373 303.847 Tm [<00540050004E0046>]TJ
-1 0 0 1 270.634 303.847 Tm [<0001>]TJ
-1.02 0 0 1 273.202 303.847 Tm [<005400550053>-8<00560044005500560053>20<00460054>10<000D>]TJ
-1 0 0 1 326.647 303.847 Tm [<0001>]TJ
-1.02 0 0 1 329.243 303.847 Tm [<004E00460042004F0054>]TJ
-1 0 0 1 362.792 303.847 Tm [<0001>]TJ
-1.02 0 0 1 365.36 303.847 Tm [<00550050>]TJ
-1 0 0 1 375.608 303.847 Tm [<0001>]TJ
-1.02 0 0 1 378.176 303.847 Tm [<00550053>-18<005A>]TJ
-1 0 0 1 392.163 303.847 Tm [<0001>]TJ
-1.02 0 0 1 394.731 303.847 Tm [<005000560055000D>]TJ
-1 0 0 1 414.671 303.847 Tm [<0001>]TJ
-1.02 0 0 1 417.267 303.847 Tm [<00490050>30<0058>]TJ
-1 0 0 1 438.654 303.847 Tm [<0001>]TJ
-1.02 0 0 1 441.222 303.847 Tm [<004E005600440049>]TJ
-1 0 0 1 470.509 303.847 Tm [<0001>]TJ
-1.02 0 0 1 473.077 303.847 Tm [<0055004200480048004A004F0048>]TJ
-1 0 0 1 510.209 303.847 Tm [<0001>]TJ
-1.02 0 0 1 512.777 303.847 Tm [<004A0054>]TJ
-1 0 0 1 520.866 303.847 Tm [<0001>]TJ
-0.997 0 0 1 74.409 290.298 Tm [<0053>20<00460042004D004D005A>]TJ
-1 0 0 1 101.269 290.298 Tm [<0001>]TJ
-0.997 0 0 1 103.738 290.298 Tm [<004F00460046004500460045>]TJ
-1 0 0 1 140.25 290.298 Tm [<0001>]TJ
-0.997 0 0 1 142.719 290.298 Tm [<0009005400550042004F004500420053>20<00450054>]TJ
-1 0 0 1 194.878 290.298 Tm [<0001>]TJ
-0.997 0 0 1 197.347 290.298 Tm [<0042004F0045>]TJ
-1 0 0 1 216.272 290.298 Tm [<0001>]TJ
-0.997 0 0 1 218.741 290.298 Tm [<0057>6<0042004D004A004500420055005000530054>]TJ
-1 0 0 1 267.226 290.298 Tm [<0001>]TJ
-0.997 0 0 1 269.695 290.298 Tm [<00450050004F>81<0445>77<0055>]TJ
-1 0 0 1 294.248 290.298 Tm [<0001>]TJ
-0.997 0 0 1 296.717 290.298 Tm [<004F004600460045>]TJ
-1 0 0 1 321.135 290.298 Tm [<0001>]TJ
-0.997 0 0 1 323.604 290.298 Tm [<00550050>]TJ
-1 0 0 1 333.621 290.298 Tm [<0001>]TJ
-0.997 0 0 1 336.09 290.298 Tm [<00430046>]TJ
-1 0 0 1 348.185 290.298 Tm [<0001>]TJ
-0.997 0 0 1 350.654 290.298 Tm [<0053>-8<004A004800490055>]TJ
-1 0 0 1 374.138 290.298 Tm [<0001>]TJ
-0.997 0 0 1 376.607 290.298 Tm [<044D000A000D>]TJ
-1 0 0 1 394.173 290.298 Tm [<0001>]TJ
-0.997 0 0 1 396.646 290.298 Tm [<004E00460042004F0054>]TJ
-1 0 0 1 429.438 290.298 Tm [<0001>]TJ
-0.997 0 0 1 431.907 290.298 Tm [<00550050>]TJ
-1 0 0 1 441.924 290.298 Tm [<0001>]TJ
-0.997 0 0 1 444.394 290.298 Tm [<0055004600540055>]TJ
-1 0 0 1 462.209 290.298 Tm [<0001>]TJ
-0.997 0 0 1 464.678 290.298 Tm [<0058004900420055>]TJ
-1 0 0 1 489.063 290.298 Tm [<0001>]TJ
-0.997 0 0 1 491.532 290.298 Tm [<0046004D00540046>]TJ
-1 0 0 1 510.49 290.298 Tm [<0001>]TJ
-0.997 0 0 1 512.959 290.298 Tm [<004A0054>]TJ
-1 0 0 1 520.866 290.298 Tm [<0001>]TJ
-1.012 0 0 1 74.409 276.749 Tm [<004F00460046004500460045>]TJ
-1 0 0 1 111.471 276.749 Tm [<0001>]TJ
-1.012 0 0 1 113.918 276.749 Tm [<00540050>]TJ
-1 0 0 1 125.102 276.749 Tm [<0001>]TJ
-1.012 0 0 1 127.549 276.749 Tm [<0055004900420055>]TJ
-1 0 0 1 147.62 276.749 Tm [<0001>]TJ
-1.012 0 0 1 150.067 276.749 Tm [<0042>]TJ
-1 0 0 1 155.841 276.749 Tm [<0001>]TJ
-1.012 0 0 1 158.289 276.749 Tm [<003100250027>]TJ
-1 0 0 1 179.916 276.749 Tm [<0001>]TJ
-1.012 0 0 1 182.363 276.749 Tm [<005800500053>6<004C0054>]TJ
-1 0 0 1 212.038 276.749 Tm [<0001>]TJ
-1.012 0 0 1 214.486 276.749 Tm [<0046>20<000F0048000F>]TJ
-1 0 0 1 231.53 276.749 Tm [<0001>]TJ
-1.012 0 0 1 234.8 276.749 Tm [<0058004A00550049>]TJ
-1 0 0 1 256.991 276.749 Tm [<0001>]TJ
-1.012 0 0 1 259.438 276.749 Tm [<0042>]TJ
-1 0 0 1 265.212 276.749 Tm [<0001>]TJ
-1.012 0 0 1 267.659 276.749 Tm [<005400440053>20<00460046004F>]TJ
-1 0 0 1 300.204 276.749 Tm [<0001>]TJ
-1.012 0 0 1 302.651 276.749 Tm [<0053>20<00460042004500460053>60<000F>]TJ
-1 0 0 1 337.001 276.749 Tm [<0001>]TJ
-1.012 0 0 1 340.271 276.749 Tm [<0038>10<004A00550049005000560055>]TJ
-1 0 0 1 381.107 276.749 Tm [<0001>]TJ
-1.012 0 0 1 383.554 276.749 Tm [<0054005600440049>]TJ
-1 0 0 1 407.235 276.749 Tm [<0001>]TJ
-1.012 0 0 1 409.683 276.749 Tm [<00460059005100460053>-7<004A004E0046004F00550054>]TJ
-1 0 0 1 472.013 276.749 Tm [<0001>]TJ
-1.012 0 0 1 474.461 276.749 Tm [<004A0055>]TJ
-1 0 0 1 481.471 276.749 Tm [<0001>]TJ
-1.012 0 0 1 483.919 276.749 Tm [<004A0054>]TJ
-1 0 0 1 491.945 276.749 Tm [<0001>]TJ
-1.012 0 0 1 494.392 276.749 Tm [<004A004E00490050>]TJ
-1 0 0 1 520.866 276.749 Tm [<0001>]TJ
-1.008 0 0 1 74.409 263.199 Tm [<00520056004A00550046>]TJ
-1 0 0 1 100.207 263.199 Tm [<0001>]TJ
-1.008 0 0 1 102.656 263.199 Tm [<0045004A056F00440056004D0055>]TJ
-1 0 0 1 141.616 263.199 Tm [<0001>]TJ
-1.008 0 0 1 144.066 263.199 Tm [<00550050>]TJ
-1 0 0 1 154.193 263.199 Tm [<0001>]TJ
-1.008 0 0 1 156.643 263.199 Tm [<004800460055>]TJ
-1 0 0 1 171.796 263.199 Tm [<0001>]TJ
-1.008 0 0 1 174.245 263.199 Tm [<0042>]TJ
-1 0 0 1 179.996 263.199 Tm [<0001>]TJ
-1.008 0 0 1 182.445 263.199 Tm [<004700460046004D004A004F0048>]TJ
-1 0 0 1 216.05 263.199 Tm [<0001>]TJ
-1.008 0 0 1 218.499 263.199 Tm [<00420043005000560055>]TJ
-1 0 0 1 247.618 263.199 Tm [<0001>]TJ
-1.008 0 0 1 250.067 263.199 Tm [<0058004900420055>]TJ
-1 0 0 1 274.721 263.199 Tm [<0001>]TJ
-1.008 0 0 1 277.17 263.199 Tm [<004900420054>]TJ
-1 0 0 1 294.391 263.199 Tm [<0001>]TJ
-1.008 0 0 1 296.84 263.199 Tm [<00550050>]TJ
-1 0 0 1 306.968 263.199 Tm [<0001>]TJ
-1.008 0 0 1 309.417 263.199 Tm [<00430046>]TJ
-1 0 0 1 321.645 263.199 Tm [<0001>]TJ
-1.008 0 0 1 324.094 263.199 Tm [<00450050004F0046>20<000D>]TJ
-1 0 0 1 352.165 263.199 Tm [<0001>]TJ
-1.008 0 0 1 354.616 263.199 Tm [<00580049004A00440049>]TJ
-1 0 0 1 385.064 263.199 Tm [<0001>]TJ
-1.008 0 0 1 387.514 263.199 Tm [<004C00460053>-7<004F0046004D>]TJ
-1 0 0 1 418.82 263.199 Tm [<0001>]TJ
-1.008 0 0 1 421.269 263.199 Tm [<004400490042004F004800460054>]TJ
-1 0 0 1 462.121 263.199 Tm [<0001>]TJ
-1.008 0 0 1 464.57 263.199 Tm [<00420053>20<0046>]TJ
-1 0 0 1 480.028 263.199 Tm [<0001>]TJ
-1.008 0 0 1 482.477 263.199 Tm [<004F00460046004500460045000D>]TJ
-1 0 0 1 520.866 263.199 Tm [<0001>]TJ
-1 0 0 1 74.409 249.65 Tm [<00490050>30<00580001005100420044004C004200480046005400010054004900500056004D004500010043004600010042004500420051005500460045000F>]TJ
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 239.726 249.65 Tm [<0001001200130016>]TJ
-0 g 0 G
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 63.56 229.326 Tm [<0012001300170001>]TJ
+1.017 0 0 1 275.607 495.05 Tm [<0046>10<0059005100460053004A004E0046004F0055>]TJ
+1 0 0 1 332.866 495.05 Tm [<0001>]TJ
+/F68 10.90909 Tf
+1.017 0 0 1 335.323 495.05 Tm [<0058004A00550049>]TJ
+1 0 0 1 357.623 495.05 Tm [<0001>]TJ
+1.017 0 0 1 360.08 495.05 Tm [<0055004200480048004A004F0048>]TJ
+1 0 0 1 397.103 495.05 Tm [<0001>]TJ
+1.017 0 0 1 399.56 495.05 Tm [<0042004F0045>]TJ
+1 0 0 1 418.865 495.05 Tm [<0001>]TJ
+1.017 0 0 1 421.322 495.05 Tm [<004200440044004600540054004A0043004A004D004A0055005A>95<000F>]TJ
+1 0 0 1 484.236 495.05 Tm [<0001>]TJ
+1.017 0 0 1 487.517 495.05 Tm [<002E>30<00460042004F0054>]TJ
+1 0 0 1 520.866 495.05 Tm [<0001>]TJ
+1.02 0 0 1 74.409 481.501 Tm [<00550050>]TJ
+1 0 0 1 84.658 481.501 Tm [<0001>]TJ
+1.02 0 0 1 87.226 481.501 Tm [<00550053>-18<005A>]TJ
+1 0 0 1 101.213 481.501 Tm [<0001>]TJ
+1.02 0 0 1 103.781 481.501 Tm [<005000560055000D>]TJ
+1 0 0 1 123.721 481.501 Tm [<0001>]TJ
+1.02 0 0 1 126.317 481.501 Tm [<00490050>30<0058>]TJ
+1 0 0 1 147.704 481.501 Tm [<0001>]TJ
+1.02 0 0 1 150.272 481.501 Tm [<0045004A056F00440056004D0055>]TJ
+1 0 0 1 189.696 481.501 Tm [<0001>]TJ
+1.02 0 0 1 192.264 481.501 Tm [<004A0055>]TJ
+1 0 0 1 199.329 481.501 Tm [<0001>]TJ
+1.02 0 0 1 201.897 481.501 Tm [<004A0054>]TJ
+1 0 0 1 209.987 481.501 Tm [<0001>]TJ
+1.02 0 0 1 212.555 481.501 Tm [<00550050>]TJ
+1 0 0 1 222.803 481.501 Tm [<0001>]TJ
+1.02 0 0 1 225.371 481.501 Tm [<005500420048>]TJ
+1 0 0 1 240.805 481.501 Tm [<0001>]TJ
+1.02 0 0 1 243.373 481.501 Tm [<00540050004E0046>]TJ
+1 0 0 1 270.634 481.501 Tm [<0001>]TJ
+1.02 0 0 1 273.202 481.501 Tm [<005400550053>-8<00560044005500560053>20<00460054>10<000D>]TJ
+1 0 0 1 326.647 481.501 Tm [<0001>]TJ
+1.02 0 0 1 329.243 481.501 Tm [<004E00460042004F0054>]TJ
+1 0 0 1 362.792 481.501 Tm [<0001>]TJ
+1.02 0 0 1 365.36 481.501 Tm [<00550050>]TJ
+1 0 0 1 375.608 481.501 Tm [<0001>]TJ
+1.02 0 0 1 378.176 481.501 Tm [<00550053>-18<005A>]TJ
+1 0 0 1 392.163 481.501 Tm [<0001>]TJ
+1.02 0 0 1 394.731 481.501 Tm [<005000560055000D>]TJ
+1 0 0 1 414.671 481.501 Tm [<0001>]TJ
+1.02 0 0 1 417.267 481.501 Tm [<00490050>30<0058>]TJ
+1 0 0 1 438.654 481.501 Tm [<0001>]TJ
+1.02 0 0 1 441.222 481.501 Tm [<004E005600440049>]TJ
+1 0 0 1 470.509 481.501 Tm [<0001>]TJ
+1.02 0 0 1 473.077 481.501 Tm [<0055004200480048004A004F0048>]TJ
+1 0 0 1 510.209 481.501 Tm [<0001>]TJ
+1.02 0 0 1 512.777 481.501 Tm [<004A0054>]TJ
+1 0 0 1 520.866 481.501 Tm [<0001>]TJ
+0.997 0 0 1 74.409 467.952 Tm [<0053>20<00460042004D004D005A>]TJ
+1 0 0 1 101.269 467.952 Tm [<0001>]TJ
+0.997 0 0 1 103.738 467.952 Tm [<004F00460046004500460045>]TJ
+1 0 0 1 140.25 467.952 Tm [<0001>]TJ
+0.997 0 0 1 142.719 467.952 Tm [<0009005400550042004F004500420053>20<00450054>]TJ
+1 0 0 1 194.878 467.952 Tm [<0001>]TJ
+0.997 0 0 1 197.347 467.952 Tm [<0042004F0045>]TJ
+1 0 0 1 216.272 467.952 Tm [<0001>]TJ
+0.997 0 0 1 218.741 467.952 Tm [<0057>6<0042004D004A004500420055005000530054>]TJ
+1 0 0 1 267.226 467.952 Tm [<0001>]TJ
+0.997 0 0 1 269.695 467.952 Tm [<00450050004F>81<0445>77<0055>]TJ
+1 0 0 1 294.248 467.952 Tm [<0001>]TJ
+0.997 0 0 1 296.717 467.952 Tm [<004F004600460045>]TJ
+1 0 0 1 321.135 467.952 Tm [<0001>]TJ
+0.997 0 0 1 323.604 467.952 Tm [<00550050>]TJ
+1 0 0 1 333.621 467.952 Tm [<0001>]TJ
+0.997 0 0 1 336.09 467.952 Tm [<00430046>]TJ
+1 0 0 1 348.185 467.952 Tm [<0001>]TJ
+0.997 0 0 1 350.654 467.952 Tm [<0053>-8<004A004800490055>]TJ
+1 0 0 1 374.138 467.952 Tm [<0001>]TJ
+0.997 0 0 1 376.607 467.952 Tm [<044D000A000D>]TJ
+1 0 0 1 394.173 467.952 Tm [<0001>]TJ
+0.997 0 0 1 396.646 467.952 Tm [<004E00460042004F0054>]TJ
+1 0 0 1 429.438 467.952 Tm [<0001>]TJ
+0.997 0 0 1 431.907 467.952 Tm [<00550050>]TJ
+1 0 0 1 441.924 467.952 Tm [<0001>]TJ
+0.997 0 0 1 444.394 467.952 Tm [<0055004600540055>]TJ
+1 0 0 1 462.209 467.952 Tm [<0001>]TJ
+0.997 0 0 1 464.678 467.952 Tm [<0058004900420055>]TJ
+1 0 0 1 489.063 467.952 Tm [<0001>]TJ
+0.997 0 0 1 491.532 467.952 Tm [<0046004D00540046>]TJ
+1 0 0 1 510.49 467.952 Tm [<0001>]TJ
+0.997 0 0 1 512.959 467.952 Tm [<004A0054>]TJ
+1 0 0 1 520.866 467.952 Tm [<0001>]TJ
+1.012 0 0 1 74.409 454.402 Tm [<004F00460046004500460045>]TJ
+1 0 0 1 111.471 454.402 Tm [<0001>]TJ
+1.012 0 0 1 113.918 454.402 Tm [<00540050>]TJ
+1 0 0 1 125.102 454.402 Tm [<0001>]TJ
+1.012 0 0 1 127.549 454.402 Tm [<0055004900420055>]TJ
+1 0 0 1 147.62 454.402 Tm [<0001>]TJ
+1.012 0 0 1 150.067 454.402 Tm [<0042>]TJ
+1 0 0 1 155.841 454.402 Tm [<0001>]TJ
+1.012 0 0 1 158.289 454.402 Tm [<003100250027>]TJ
+1 0 0 1 179.916 454.402 Tm [<0001>]TJ
+1.012 0 0 1 182.363 454.402 Tm [<005800500053>6<004C0054>]TJ
+1 0 0 1 212.038 454.402 Tm [<0001>]TJ
+1.012 0 0 1 214.486 454.402 Tm [<0046>20<000F0048000F>]TJ
+1 0 0 1 231.53 454.402 Tm [<0001>]TJ
+1.012 0 0 1 234.8 454.402 Tm [<0058004A00550049>]TJ
+1 0 0 1 256.991 454.402 Tm [<0001>]TJ
+1.012 0 0 1 259.438 454.402 Tm [<0042>]TJ
+1 0 0 1 265.212 454.402 Tm [<0001>]TJ
+1.012 0 0 1 267.659 454.402 Tm [<005400440053>20<00460046004F>]TJ
+1 0 0 1 300.204 454.402 Tm [<0001>]TJ
+1.012 0 0 1 302.651 454.402 Tm [<0053>20<00460042004500460053>60<000F>]TJ
+1 0 0 1 337.001 454.402 Tm [<0001>]TJ
+1.012 0 0 1 340.271 454.402 Tm [<0038>10<004A00550049005000560055>]TJ
+1 0 0 1 381.107 454.402 Tm [<0001>]TJ
+1.012 0 0 1 383.554 454.402 Tm [<0054005600440049>]TJ
+1 0 0 1 407.235 454.402 Tm [<0001>]TJ
+1.012 0 0 1 409.683 454.402 Tm [<00460059005100460053>-7<004A004E0046004F00550054>]TJ
+1 0 0 1 472.013 454.402 Tm [<0001>]TJ
+1.012 0 0 1 474.461 454.402 Tm [<004A0055>]TJ
+1 0 0 1 481.471 454.402 Tm [<0001>]TJ
+1.012 0 0 1 483.919 454.402 Tm [<004A0054>]TJ
+1 0 0 1 491.945 454.402 Tm [<0001>]TJ
+1.012 0 0 1 494.392 454.402 Tm [<004A004E00490050>]TJ
+1 0 0 1 520.866 454.402 Tm [<0001>]TJ
+1.008 0 0 1 74.409 440.853 Tm [<00520056004A00550046>]TJ
+1 0 0 1 100.207 440.853 Tm [<0001>]TJ
+1.008 0 0 1 102.656 440.853 Tm [<0045004A056F00440056004D0055>]TJ
+1 0 0 1 141.616 440.853 Tm [<0001>]TJ
+1.008 0 0 1 144.066 440.853 Tm [<00550050>]TJ
+1 0 0 1 154.193 440.853 Tm [<0001>]TJ
+1.008 0 0 1 156.643 440.853 Tm [<004800460055>]TJ
+1 0 0 1 171.796 440.853 Tm [<0001>]TJ
+1.008 0 0 1 174.245 440.853 Tm [<0042>]TJ
+1 0 0 1 179.996 440.853 Tm [<0001>]TJ
+1.008 0 0 1 182.445 440.853 Tm [<004700460046004D004A004F0048>]TJ
+1 0 0 1 216.05 440.853 Tm [<0001>]TJ
+1.008 0 0 1 218.499 440.853 Tm [<00420043005000560055>]TJ
+1 0 0 1 247.618 440.853 Tm [<0001>]TJ
+1.008 0 0 1 250.067 440.853 Tm [<0058004900420055>]TJ
+1 0 0 1 274.721 440.853 Tm [<0001>]TJ
+1.008 0 0 1 277.17 440.853 Tm [<004900420054>]TJ
+1 0 0 1 294.391 440.853 Tm [<0001>]TJ
+1.008 0 0 1 296.84 440.853 Tm [<00550050>]TJ
+1 0 0 1 306.968 440.853 Tm [<0001>]TJ
+1.008 0 0 1 309.417 440.853 Tm [<00430046>]TJ
+1 0 0 1 321.645 440.853 Tm [<0001>]TJ
+1.008 0 0 1 324.094 440.853 Tm [<00450050004F0046>20<000D>]TJ
+1 0 0 1 352.165 440.853 Tm [<0001>]TJ
+1.008 0 0 1 354.616 440.853 Tm [<00580049004A00440049>]TJ
+1 0 0 1 385.064 440.853 Tm [<0001>]TJ
+1.008 0 0 1 387.514 440.853 Tm [<004C00460053>-7<004F0046004D>]TJ
+1 0 0 1 418.82 440.853 Tm [<0001>]TJ
+1.008 0 0 1 421.269 440.853 Tm [<004400490042004F004800460054>]TJ
+1 0 0 1 462.121 440.853 Tm [<0001>]TJ
+1.008 0 0 1 464.57 440.853 Tm [<00420053>20<0046>]TJ
+1 0 0 1 480.028 440.853 Tm [<0001>]TJ
+1.008 0 0 1 482.477 440.853 Tm [<004F00460046004500460045000D>]TJ
+1 0 0 1 520.866 440.853 Tm [<0001>]TJ
+1 0 0 1 74.409 427.304 Tm [<00490050>30<00580001005100420044004C004200480046005400010054004900500056004D004500010043004600010042004500420051005500460045000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 239.726 427.304 Tm [<00010017001A>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 406.98 Tm [<001800110001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 11>> BDC
+/P<</MCID 14>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 229.326 Tm [<00350049004A00540001005100420044004C004200480046000100550053>-8<004A0046005400010055005000010044004D005000540046000100550049004A0054000100480042005100010043>25<005A00010050056C00460053>-8<004A004F00480001>]TJ
+1 0 0 1 74.409 406.98 Tm [<00350049004A00540001005100420044004C004200480046000100550053>-8<004A0046005400010055005000010044004D005000540046000100550049004A0054000100480042005100010043>25<005A00010050056C00460053>-8<004A004F00480001>]TJ
/F69 10.90909 Tf
-1 0 0 1 301.94 229.326 Tm [<004400500053>26<0046>-73<0001>]TJ
+1 0 0 1 301.94 406.98 Tm [<004400500053>26<0046>-73<0001>]TJ
/F68 10.90909 Tf
-1 0 0 1 324.904 229.326 Tm [<00440050004E004E0042004F004500540001005500500001005500420048000100420001003100250027>]TJ
+1 0 0 1 324.904 406.98 Tm [<00440050004E004E0042004F004500540001005500500001005500420048000100420001003100250027>]TJ
/F68 7.63636 Tf
-1 0 0 1 442.558 233.286 Tm [<0012>]TJ
+1 0 0 1 442.558 410.94 Tm [<0012>]TJ
/F68 10.90909 Tf
-1 0 0 1 447.216 229.326 Tm [<000F>]TJ
+1 0 0 1 447.216 406.98 Tm [<000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 450.107 229.326 Tm [<0001001200130018>]TJ
+1 0 0 1 450.107 406.98 Tm [<000100180011>]TJ
0 g 0 G
ET
EMC
@@ -4105,67 +4030,67 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 209.003 Tm [<0012001300190001>]TJ
+1 0 0 1 66.728 386.656 Tm [<001800120001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 12>> BDC
+/P<</MCID 15>> BDC
BT
/F68 10.90909 Tf
-0.98 0 0 1 74.409 209.003 Tm [<002E>24<005A>]TJ
-1 0 0 1 89.644 209.003 Tm [<0001>]TJ
-0.98 0 0 1 91.718 209.003 Tm [<0049005000510046>]TJ
-1 0 0 1 116.371 209.003 Tm [<0001>]TJ
-0.98 0 0 1 118.444 209.003 Tm [<004A0054>]TJ
-1 0 0 1 126.217 209.003 Tm [<0001>]TJ
-0.98 0 0 1 128.29 209.003 Tm [<0055004900420055>]TJ
-1 0 0 1 147.726 209.003 Tm [<0001>]TJ
-0.98 0 0 1 149.799 209.003 Tm [<005500490046>]TJ
-1 0 0 1 165.462 209.003 Tm [<0001>]TJ
-0.98 0 0 1 167.535 209.003 Tm [<004C004F0050>31<0058004D0046004500480046>]TJ
-1 0 0 1 219.726 209.003 Tm [<0001>]TJ
-0.98 0 0 1 221.799 209.003 Tm [<00480042004A004F00460045>]TJ
-1 0 0 1 254.567 209.003 Tm [<0001>]TJ
-0.98 0 0 1 256.64 209.003 Tm [<0043>26<005A>]TJ
-1 0 0 1 268.165 209.003 Tm [<0001>]TJ
-0.98 0 0 1 270.238 209.003 Tm [<005500490046>]TJ
-1 0 0 1 285.9 209.003 Tm [<0001>]TJ
-0.98 0 0 1 287.974 209.003 Tm [<005600540046>]TJ
-1 0 0 1 304.609 209.003 Tm [<0001>]TJ
-0.98 0 0 1 306.682 209.003 Tm [<00500047>]TJ
-1 0 0 1 316.261 209.003 Tm [<0001>]TJ
-0.98 0 0 1 318.334 209.003 Tm [<00550049004A0054>]TJ
-1 0 0 1 336.274 209.003 Tm [<0001>]TJ
-0.98 0 0 1 338.347 209.003 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 377.989 209.003 Tm [<0001>]TJ
-0.98 0 0 1 380.062 209.003 Tm [<0058004A004D004D>]TJ
-1 0 0 1 397.35 209.003 Tm [<0001>]TJ
-0.98 0 0 1 399.423 209.003 Tm [<00420055>]TJ
-1 0 0 1 408.692 209.003 Tm [<0001>]TJ
-0.98 0 0 1 410.766 209.003 Tm [<005500490046>]TJ
-1 0 0 1 426.428 209.003 Tm [<0001>]TJ
-0.98 0 0 1 428.501 209.003 Tm [<0046004F0045>]TJ
-1 0 0 1 447.007 209.003 Tm [<0001>]TJ
-0.98 0 0 1 449.08 209.003 Tm [<0042004D004D0050>31<0058>]TJ
-1 0 0 1 474.683 209.003 Tm [<0001>]TJ
-0.98 0 0 1 476.756 209.003 Tm [<00550050>]TJ
-1 0 0 1 486.603 209.003 Tm [<0001>]TJ
-0.98 0 0 1 488.676 209.003 Tm [<004500460044004A00450046>]TJ
-1 0 0 1 520.866 209.003 Tm [<0001>]TJ
-1 0 0 1 74.409 195.453 Tm [<004A004700010042004F0045000100490050>30<00580001004400500045004600010055005000010045005000010055004200480048004A004F004800010054004900500056004D00450001004300460001005100420053>-8<005500010050004700010055004900460001002D>]TJ
+0.98 0 0 1 74.409 386.656 Tm [<002E>24<005A>]TJ
+1 0 0 1 89.644 386.656 Tm [<0001>]TJ
+0.98 0 0 1 91.718 386.656 Tm [<0049005000510046>]TJ
+1 0 0 1 116.371 386.656 Tm [<0001>]TJ
+0.98 0 0 1 118.444 386.656 Tm [<004A0054>]TJ
+1 0 0 1 126.217 386.656 Tm [<0001>]TJ
+0.98 0 0 1 128.29 386.656 Tm [<0055004900420055>]TJ
+1 0 0 1 147.726 386.656 Tm [<0001>]TJ
+0.98 0 0 1 149.799 386.656 Tm [<005500490046>]TJ
+1 0 0 1 165.462 386.656 Tm [<0001>]TJ
+0.98 0 0 1 167.535 386.656 Tm [<004C004F0050>31<0058004D0046004500480046>]TJ
+1 0 0 1 219.726 386.656 Tm [<0001>]TJ
+0.98 0 0 1 221.799 386.656 Tm [<00480042004A004F00460045>]TJ
+1 0 0 1 254.567 386.656 Tm [<0001>]TJ
+0.98 0 0 1 256.64 386.656 Tm [<0043>26<005A>]TJ
+1 0 0 1 268.165 386.656 Tm [<0001>]TJ
+0.98 0 0 1 270.238 386.656 Tm [<005500490046>]TJ
+1 0 0 1 285.9 386.656 Tm [<0001>]TJ
+0.98 0 0 1 287.974 386.656 Tm [<005600540046>]TJ
+1 0 0 1 304.609 386.656 Tm [<0001>]TJ
+0.98 0 0 1 306.682 386.656 Tm [<00500047>]TJ
+1 0 0 1 316.261 386.656 Tm [<0001>]TJ
+0.98 0 0 1 318.334 386.656 Tm [<00550049004A0054>]TJ
+1 0 0 1 336.274 386.656 Tm [<0001>]TJ
+0.98 0 0 1 338.347 386.656 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 377.989 386.656 Tm [<0001>]TJ
+0.98 0 0 1 380.062 386.656 Tm [<0058004A004D004D>]TJ
+1 0 0 1 397.35 386.656 Tm [<0001>]TJ
+0.98 0 0 1 399.423 386.656 Tm [<00420055>]TJ
+1 0 0 1 408.692 386.656 Tm [<0001>]TJ
+0.98 0 0 1 410.766 386.656 Tm [<005500490046>]TJ
+1 0 0 1 426.428 386.656 Tm [<0001>]TJ
+0.98 0 0 1 428.501 386.656 Tm [<0046004F0045>]TJ
+1 0 0 1 447.007 386.656 Tm [<0001>]TJ
+0.98 0 0 1 449.08 386.656 Tm [<0042004D004D0050>31<0058>]TJ
+1 0 0 1 474.683 386.656 Tm [<0001>]TJ
+0.98 0 0 1 476.756 386.656 Tm [<00550050>]TJ
+1 0 0 1 486.603 386.656 Tm [<0001>]TJ
+0.98 0 0 1 488.676 386.656 Tm [<004500460044004A00450046>]TJ
+1 0 0 1 520.866 386.656 Tm [<0001>]TJ
+1 0 0 1 74.409 373.107 Tm [<004A004700010042004F0045000100490050>30<00580001004400500045004600010055005000010045005000010055004200480048004A004F004800010054004900500056004D00450001004300460001005100420053>-8<005500010050004700010055004900460001002D>]TJ
/F68 7.63636 Tf
-1 0 0 1 328.002 197.718 Tm [<0022>]TJ
+1 0 0 1 328.002 375.372 Tm [<0022>]TJ
/F68 10.90909 Tf
-1 0 0 1 331.215 195.453 Tm [<0035>]TJ
-1 0 0 1 336.171 192.781 Tm [<0026>]TJ
-1 0 0 1 341.418 195.453 Tm [<00390001004C00460053>-8<004F0046004D000F>]TJ
+1 0 0 1 331.215 373.107 Tm [<0035>]TJ
+1 0 0 1 336.171 370.434 Tm [<0026>]TJ
+1 0 0 1 341.418 373.107 Tm [<00390001004C00460053>-8<004F0046004D000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 384.629 195.453 Tm [<0001001200130019>]TJ
+1 0 0 1 384.629 373.107 Tm [<000100180012>]TJ
0 g 0 G
ET
EMC
@@ -4173,98 +4098,417 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 175.13 Tm [<00120013001A0001>]TJ
+1 0 0 1 66.728 352.783 Tm [<001800130001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 13>> BDC
+/P<</MCID 16>> BDC
+BT
+/F68 10.90909 Tf
+1.02 0 0 1 74.409 352.783 Tm [<003500490046>]TJ
+1 0 0 1 93.793 352.783 Tm [<0001>]TJ
+1.02 0 0 1 96.692 352.783 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 137.952 352.783 Tm [<0001>]TJ
+1.02 0 0 1 140.851 352.783 Tm [<0045005000460054>]TJ
+1 0 0 1 164.496 352.783 Tm [<0001>]TJ
+1.02 0 0 1 167.395 352.783 Tm [<004F00500055>]TJ
+1 0 0 1 184.531 352.783 Tm [<0001>]TJ
+1.02 0 0 1 187.43 352.783 Tm [<00510042005500440049>]TJ
+1 0 0 1 216.116 352.783 Tm [<0001>]TJ
+1.02 0 0 1 219.015 352.783 Tm [<00440050004E004E0042004F00450054>]TJ
+1 0 0 1 275.709 352.783 Tm [<0001>]TJ
+1.02 0 0 1 278.607 352.783 Tm [<00470053>6<0050004E>]TJ
+1 0 0 1 303.11 352.783 Tm [<0001>]TJ
+1.02 0 0 1 306.009 352.783 Tm [<00500055004900460053>]TJ
+1 0 0 1 333.059 352.783 Tm [<0001>]TJ
+1.02 0 0 1 335.958 352.783 Tm [<005100420044004C0042004800460054>20<000F>]TJ
+1 0 0 1 384.795 352.783 Tm [<0001>]TJ
+1.02 0 0 1 389.401 352.783 Tm [<002A>24<0055>]TJ
+1 0 0 1 396.845 352.783 Tm [<0001>]TJ
+1.02 0 0 1 399.744 352.783 Tm [<004A0054>]TJ
+1 0 0 1 407.834 352.783 Tm [<0001>]TJ
+1.02 0 0 1 410.733 352.783 Tm [<0042004D00540050>]TJ
+1 0 0 1 430.929 352.783 Tm [<0001>]TJ
+1.02 0 0 1 433.828 352.783 Tm [<004F00500055>]TJ
+1 0 0 1 450.964 352.783 Tm [<0001>]TJ
+1.02 0 0 1 453.863 352.783 Tm [<0042004F>]TJ
+1 0 0 1 466.57 352.783 Tm [<0001>]TJ
+1.02 0 0 1 469.469 352.783 Tm [<0042004A004E>]TJ
+1 0 0 1 488.797 352.783 Tm [<0001>]TJ
+1.02 0 0 1 491.696 352.783 Tm [<00500047>]TJ
+1 0 0 1 501.666 352.783 Tm [<0001>]TJ
+1.02 0 0 1 504.565 352.783 Tm [<005500490046>]TJ
+1 0 0 1 520.866 352.783 Tm [<0001>]TJ
+1.01 0 0 1 74.409 339.234 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 115.265 339.234 Tm [<0001>]TJ
+1.01 0 0 1 117.705 339.234 Tm [<00550050>]TJ
+1 0 0 1 127.852 339.234 Tm [<0001>]TJ
+1.01 0 0 1 130.292 339.234 Tm [<004500460057>5<0046004D00500051>]TJ
+1 0 0 1 169.836 339.234 Tm [<0001>]TJ
+1.01 0 0 1 172.276 339.234 Tm [<0054005600440049>]TJ
+1 0 0 1 195.91 339.234 Tm [<0001>]TJ
+1.01 0 0 1 198.349 339.234 Tm [<0051004200550044004900460054>20<000F>]TJ
+1 0 0 1 239.919 339.234 Tm [<0001>]TJ
+1.01 0 0 1 243.186 339.234 Tm [<00380049004A004D0046>]TJ
+1 0 0 1 272.175 339.234 Tm [<0001>]TJ
+1.01 0 0 1 274.615 339.234 Tm [<00420055>]TJ
+1 0 0 1 284.168 339.234 Tm [<0001>]TJ
+1.01 0 0 1 286.608 339.234 Tm [<005500490046>]TJ
+1 0 0 1 302.749 339.234 Tm [<0001>]TJ
+1.01 0 0 1 305.189 339.234 Tm [<0046004F0045>]TJ
+1 0 0 1 324.261 339.234 Tm [<0001>]TJ
+1.01 0 0 1 326.701 339.234 Tm [<004400490042004F004800460054>]TJ
+1 0 0 1 367.634 339.234 Tm [<0001>]TJ
+1.01 0 0 1 370.073 339.234 Tm [<00550050>]TJ
+1 0 0 1 380.221 339.234 Tm [<0001>]TJ
+1.01 0 0 1 382.661 339.234 Tm [<0057>6<00420053>-7<004A005000560054>]TJ
+1 0 0 1 419.328 339.234 Tm [<0001>]TJ
+1.01 0 0 1 421.768 339.234 Tm [<00440050004E004E0042004F00450054>]TJ
+1 0 0 1 477.905 339.234 Tm [<0001>]TJ
+1.01 0 0 1 480.345 339.234 Tm [<004A004F>]TJ
+1 0 0 1 490.371 339.234 Tm [<0001>]TJ
+1.01 0 0 1 492.811 339.234 Tm [<004E0042004F005A>]TJ
+1 0 0 1 520.866 339.234 Tm [<0001>]TJ
+0.98 0 0 1 74.409 325.685 Tm [<0044004D00420054005400460054>]TJ
+1 0 0 1 107.765 325.685 Tm [<0001>]TJ
+0.98 0 0 1 109.807 325.685 Tm [<0042004F0045>]TJ
+1 0 0 1 128.41 325.685 Tm [<0001>]TJ
+0.98 0 0 1 130.452 325.685 Tm [<005100420044004C0042004800460054>]TJ
+1 0 0 1 174.755 325.685 Tm [<0001>]TJ
+0.98 0 0 1 176.797 325.685 Tm [<0058004A004D004D>]TJ
+1 0 0 1 194.084 325.685 Tm [<0001>]TJ
+0.98 0 0 1 196.127 325.685 Tm [<00430046>]TJ
+1 0 0 1 208.015 325.685 Tm [<0001>]TJ
+0.98 0 0 1 210.057 325.685 Tm [<004F00460046004500460045>]TJ
+1 0 0 1 245.947 325.685 Tm [<0001>]TJ
+0.98 0 0 1 247.989 325.685 Tm [<00550050>]TJ
+1 0 0 1 257.835 325.685 Tm [<0001>]TJ
+0.98 0 0 1 259.878 325.685 Tm [<004800460055>]TJ
+1 0 0 1 274.61 325.685 Tm [<0001>]TJ
+0.98 0 0 1 276.652 325.685 Tm [<005500420048004800460045>]TJ
+1 0 0 1 308.928 325.685 Tm [<0001>]TJ
+0.98 0 0 1 310.97 325.685 Tm [<003100250027>]TJ
+1 0 0 1 331.914 325.685 Tm [<0001>]TJ
+0.98 0 0 1 333.955 325.685 Tm [<056D004D00460054>]TJ
+1 0 0 1 353.616 325.685 Tm [<0001>]TJ
+0.98 0 0 1 355.658 325.685 Tm [<0442>]TJ
+1 0 0 1 361.004 325.685 Tm [<0001>]TJ
+0.98 0 0 1 363.046 325.685 Tm [<0042004F0045>]TJ
+1 0 0 1 381.648 325.685 Tm [<0001>]TJ
+0.98 0 0 1 383.691 325.685 Tm [<005500490046>]TJ
+1 0 0 1 399.353 325.685 Tm [<0001>]TJ
+0.98 0 0 1 401.395 325.685 Tm [<004600590042004E0051004D00460054>]TJ
+1 0 0 1 447.184 325.685 Tm [<0001>]TJ
+0.98 0 0 1 449.226 325.685 Tm [<0042004400440050004E00510042004F005A004A004F0048>]TJ
+1 0 0 1 520.866 325.685 Tm [<0001>]TJ
+0.994 0 0 1 74.409 312.136 Tm [<005500490046>]TJ
+1 0 0 1 90.295 312.136 Tm [<0001>]TJ
+0.994 0 0 1 92.763 312.136 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 132.971 312.136 Tm [<0001>]TJ
+0.994 0 0 1 135.438 312.136 Tm [<00550053>-18<005A>]TJ
+1 0 0 1 149.074 312.136 Tm [<0001>]TJ
+0.994 0 0 1 151.541 312.136 Tm [<000900500053>]TJ
+1 0 0 1 165.811 312.136 Tm [<0001>]TJ
+0.994 0 0 1 168.278 312.136 Tm [<0058004A004D004D>]TJ
+1 0 0 1 185.812 312.136 Tm [<0001>]TJ
+0.994 0 0 1 188.28 312.136 Tm [<00550053>-18<005A000A>]TJ
+1 0 0 1 205.711 312.136 Tm [<0001>]TJ
+0.994 0 0 1 208.178 312.136 Tm [<00550050>]TJ
+1 0 0 1 218.165 312.136 Tm [<0001>]TJ
+0.994 0 0 1 220.632 312.136 Tm [<005400490050>30<0058>]TJ
+1 0 0 1 246.193 312.136 Tm [<0001>]TJ
+0.994 0 0 1 248.66 312.136 Tm [<0057>6<00420053>-7<004A005000560054>]TJ
+1 0 0 1 284.746 312.136 Tm [<0001>]TJ
+0.994 0 0 1 287.214 312.136 Tm [<005400550053>10<0042005500460048004A00460054>]TJ
+1 0 0 1 333.849 312.136 Tm [<0001>]TJ
+0.994 0 0 1 336.317 312.136 Tm [<0442>]TJ
+1 0 0 1 341.738 312.136 Tm [<0001>]TJ
+0.994 0 0 1 344.206 312.136 Tm [<00550049004600540046>]TJ
+1 0 0 1 370.393 312.136 Tm [<0001>]TJ
+0.994 0 0 1 372.86 312.136 Tm [<004400490042004F004800460054>]TJ
+1 0 0 1 413.144 312.136 Tm [<0001>]TJ
+0.994 0 0 1 415.612 312.136 Tm [<0054004900500056004D0045>]TJ
+1 0 0 1 449.259 312.136 Tm [<0001>]TJ
+0.994 0 0 1 451.727 312.136 Tm [<004A004F>]TJ
+1 0 0 1 461.594 312.136 Tm [<0001>]TJ
+0.994 0 0 1 464.062 312.136 Tm [<004E005A>]TJ
+1 0 0 1 479.557 312.136 Tm [<0001>]TJ
+0.994 0 0 1 482.024 312.136 Tm [<00500051004A004F004A0050004F>]TJ
+1 0 0 1 520.866 312.136 Tm [<0001>]TJ
+0.98 0 0 1 74.409 298.587 Tm [<00430046>]TJ
+1 0 0 1 86.298 298.587 Tm [<0001>]TJ
+0.98 0 0 1 88.386 298.587 Tm [<00450050004F0046>]TJ
+1 0 0 1 113.06 298.587 Tm [<0001>]TJ
+0.98 0 0 1 115.148 298.587 Tm [<0043>26<005A>]TJ
+1 0 0 1 126.673 298.587 Tm [<0001>]TJ
+0.98 0 0 1 128.76 298.587 Tm [<005500490046>]TJ
+1 0 0 1 144.422 298.587 Tm [<0001>]TJ
+0.98 0 0 1 146.51 298.587 Tm [<0044004D004200540054>10<000D>]TJ
+1 0 0 1 172.431 298.587 Tm [<0001>]TJ
+0.98 0 0 1 174.592 298.587 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 214.234 298.587 Tm [<0001>]TJ
+0.98 0 0 1 216.322 298.587 Tm [<0042004F0045>]TJ
+1 0 0 1 234.924 298.587 Tm [<0001>]TJ
+0.98 0 0 1 237.012 298.587 Tm [<0045005000440056004E0046004F0055>]TJ
+1 0 0 1 287.013 298.587 Tm [<0001>]TJ
+0.98 0 0 1 289.101 298.587 Tm [<00580053>-8<004A0055004600530054>]TJ
+1 0 0 1 322.664 298.587 Tm [<0001>]TJ
+0.98 0 0 1 324.751 298.587 Tm [<005500490046004E00540046004D0057>5<00460054>]TJ
+1 0 0 1 378.909 298.587 Tm [<0001>]TJ
+0.98 0 0 1 380.997 298.587 Tm [<00560054004A004F0048>]TJ
+1 0 0 1 407.425 298.587 Tm [<0001>]TJ
+0.98 0 0 1 409.513 298.587 Tm [<0042>]TJ
+1 0 0 1 415.104 298.587 Tm [<0001>]TJ
+0.98 0 0 1 417.192 298.587 Tm [<00540046004F0054004A0043004D0046>]TJ
+1 0 0 1 456.609 298.587 Tm [<0001>]TJ
+0.98 0 0 1 458.697 298.587 Tm [<00220031>6<002A>]TJ
+1 0 0 1 475.565 298.587 Tm [<0001>]TJ
+0.98 0 0 1 477.652 298.587 Tm [<00510053>6<0050>30<0057004A004500460045>]TJ
+1 0 0 1 520.866 298.587 Tm [<0001>]TJ
+1.02 0 0 1 74.409 285.037 Tm [<0043>25<005A>]TJ
+1 0 0 1 86.416 285.037 Tm [<0001>]TJ
+1.02 0 0 1 89.005 285.037 Tm [<005500490046>]TJ
+1 0 0 1 105.307 285.037 Tm [<0001>]TJ
+1.02 0 0 1 107.896 285.037 Tm [<004C00460053>-7<004F0046004D>]TJ
+1 0 0 1 139.574 285.037 Tm [<0001>]TJ
+1.02 0 0 1 142.163 285.037 Tm [<0042004F0045>]TJ
+1 0 0 1 161.525 285.037 Tm [<0001>]TJ
+1.02 0 0 1 164.114 285.037 Tm [<004F00500055>]TJ
+1 0 0 1 181.25 285.037 Tm [<0001>]TJ
+1.02 0 0 1 183.84 285.037 Tm [<0043>25<005A>]TJ
+1 0 0 1 195.846 285.037 Tm [<0001>]TJ
+1.02 0 0 1 198.435 285.037 Tm [<00540050004E0046>]TJ
+1 0 0 1 225.697 285.037 Tm [<0001>]TJ
+1.02 0 0 1 228.287 285.037 Tm [<00460059005500460053>-7<004F0042004D>]TJ
+1 0 0 1 269.189 285.037 Tm [<0001>]TJ
+1.02 0 0 1 271.778 285.037 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 313.038 285.037 Tm [<0001>]TJ
+1.02 0 0 1 315.627 285.037 Tm [<0055004900420055>]TJ
+1 0 0 1 335.857 285.037 Tm [<0001>]TJ
+1.02 0 0 1 338.446 285.037 Tm [<0042004500450054>]TJ
+1 0 0 1 362.426 285.037 Tm [<0001>]TJ
+1.02 0 0 1 365.015 285.037 Tm [<0051004200550044004900460054>]TJ
+1 0 0 1 404.272 285.037 Tm [<0001>]TJ
+1.02 0 0 1 406.862 285.037 Tm [<00460057>4<00460053>-17<005A0058004900460053>19<0046>]TJ
+1 0 0 1 464.858 285.037 Tm [<0001>]TJ
+1.02 0 0 1 467.447 285.037 Tm [<0042004F0045>]TJ
+1 0 0 1 486.809 285.037 Tm [<0001>]TJ
+1.02 0 0 1 489.398 285.037 Tm [<005800500056004D0045>]TJ
+1 0 0 1 520.866 285.037 Tm [<0001>]TJ
+0.98 0 0 1 74.409 271.488 Tm [<004F004600460045>]TJ
+1 0 0 1 98.411 271.488 Tm [<0001>]TJ
+0.98 0 0 1 100.602 271.488 Tm [<00440050004F005400550042004F0055>]TJ
+1 0 0 1 142.916 271.488 Tm [<0001>]TJ
+0.98 0 0 1 145.107 271.488 Tm [<004E0042004A004F00550046004F0042004F00440046>]TJ
+1 0 0 1 209.092 271.488 Tm [<0001>]TJ
+0.98 0 0 1 211.284 271.488 Tm [<0442>]TJ
+1 0 0 1 216.629 271.488 Tm [<0001>]TJ
+0.98 0 0 1 218.82 271.488 Tm [<0050004F0046>]TJ
+1 0 0 1 237.102 271.488 Tm [<0001>]TJ
+0.98 0 0 1 239.293 271.488 Tm [<0050004F004D005A>]TJ
+1 0 0 1 260.471 271.488 Tm [<0001>]TJ
+0.98 0 0 1 262.663 271.488 Tm [<004F004600460045>]TJ
+1 0 0 1 286.664 271.488 Tm [<0001>]TJ
+0.98 0 0 1 288.855 271.488 Tm [<00550050>]TJ
+1 0 0 1 298.701 271.488 Tm [<0001>]TJ
+0.98 0 0 1 300.892 271.488 Tm [<004D00500050004C>]TJ
+1 0 0 1 321.814 271.488 Tm [<0001>]TJ
+0.98 0 0 1 324.005 271.488 Tm [<00420055>]TJ
+1 0 0 1 333.274 271.488 Tm [<0001>]TJ
+0.98 0 0 1 335.466 271.488 Tm [<005100420044004C0042004800460054>]TJ
+1 0 0 1 379.769 271.488 Tm [<0001>]TJ
+0.98 0 0 1 381.96 271.488 Tm [<004D004A004C0046>]TJ
+1 0 0 1 399.151 271.488 Tm [<0001>]TJ
+0.98 0 0 1 401.342 271.488 Tm [<005500460059001500490055>]TJ
+1 0 0 1 431.544 271.488 Tm [<0001>]TJ
+0.98 0 0 1 433.735 271.488 Tm [<00500053>]TJ
+1 0 0 1 444.062 271.488 Tm [<0001>]TJ
+0.98 0 0 1 446.253 271.488 Tm [<0043004A0045004A>]TJ
+1 0 0 1 465.262 271.488 Tm [<0001>]TJ
+0.98 0 0 1 467.453 271.488 Tm [<00500053>]TJ
+1 0 0 1 477.78 271.488 Tm [<0001>]TJ
+0.98 0 0 1 479.971 271.488 Tm [<0049005A0051004600530053>20<00460047>]TJ
+1 0 0 1 520.866 271.488 Tm [<0001>]TJ
+1 0 0 1 74.409 257.939 Tm [<005500500001005400460046000100490050>30<005800010045004A056F00440056004D005500010042004F0045000100540050004E00460055004A004E00460054000100470053>10<00420048004A004D0046000100550049004A00540001004A0054>20<000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 312.478 257.939 Tm [<000100180013>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 237.615 Tm [<001800140001>]TJ
+0 g 0 G
+ET
+EMC
+/P<</MCID 17>> BDC
+BT
+/F68 10.90909 Tf
+1.014 0 0 1 74.409 237.615 Tm [<0034>12<0050>]TJ
+1 0 0 1 86.643 237.615 Tm [<0001>]TJ
+1.014 0 0 1 89.088 237.615 Tm [<00550049004A0054>]TJ
+1 0 0 1 107.65 237.615 Tm [<0001>]TJ
+1.014 0 0 1 110.094 237.615 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 151.112 237.615 Tm [<0001>]TJ
+1.014 0 0 1 153.556 237.615 Tm [<00450046004D004A004300460053>9<004200550046004D005A>]TJ
+1 0 0 1 212.617 237.615 Tm [<0001>]TJ
+1.014 0 0 1 215.062 237.615 Tm [<00440050004F00440046004F00550053>10<0042005500460054>]TJ
+1 0 0 1 279.894 237.615 Tm [<0001>]TJ
+1.014 0 0 1 282.339 237.615 Tm [<0050004F>]TJ
+1 0 0 1 295.569 237.615 Tm [<0001>]TJ
+1.014 0 0 1 298.014 237.615 Tm [<005500490046>]TJ
+1 0 0 1 314.22 237.615 Tm [<0001>]TJ
+1.014 0 0 1 316.664 237.615 Tm [<004300420054004A00440054>]TJ
+1 0 0 1 347.416 237.615 Tm [<0001>]TJ
+1.014 0 0 1 349.861 237.615 Tm [<0442>]TJ
+1 0 0 1 355.392 237.615 Tm [<0001>]TJ
+1.014 0 0 1 357.837 237.615 Tm [<0042004F0045>]TJ
+1 0 0 1 377.084 237.615 Tm [<0001>]TJ
+1.014 0 0 1 379.529 237.615 Tm [<00550049004A0054>]TJ
+1 0 0 1 398.091 237.615 Tm [<0001>]TJ
+1.014 0 0 1 400.536 237.615 Tm [<0042004D0053>20<004600420045005A>]TJ
+1 0 0 1 437.171 237.615 Tm [<0001>]TJ
+1.014 0 0 1 439.616 237.615 Tm [<00520056004A00550046>]TJ
+1 0 0 1 465.567 237.615 Tm [<0001>]TJ
+1.014 0 0 1 468.012 237.615 Tm [<0042>]TJ
+1 0 0 1 473.797 237.615 Tm [<0001>]TJ
+1.014 0 0 1 476.242 237.615 Tm [<004D00500055000D>]TJ
+1 0 0 1 492.448 237.615 Tm [<0001>]TJ
+1.014 0 0 1 494.894 237.615 Tm [<0055004900460053>20<0046>]TJ
+1 0 0 1 520.866 237.615 Tm [<0001>]TJ
+1 0 0 1 74.409 224.066 Tm [<00420053>20<00460001004E0056004400490001004E00500053>20<004600010045004600550042004A004D00540001004A004F0057>5<0050004D0057>5<004600450001004200540001002A0001004600590051004600440055004600450001005800490046004F0001002A00010054005500420053>-8<005500460045000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 371.049 224.066 Tm [<000100180014>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 203.742 Tm [<001800150001>]TJ
+0 g 0 G
+ET
+EMC
+/P<</MCID 18>> BDC
+BT
+/F68 10.90909 Tf
+0.989 0 0 1 74.409 203.742 Tm [<002A0445>72<004E>]TJ
+1 0 0 1 90.354 203.742 Tm [<0001>]TJ
+0.989 0 0 1 92.822 203.742 Tm [<005400560053>20<0046>]TJ
+1 0 0 1 113.584 203.742 Tm [<0001>]TJ
+0.989 0 0 1 116.052 203.742 Tm [<0055004900420055>]TJ
+1 0 0 1 135.667 203.742 Tm [<0001>]TJ
+0.989 0 0 1 138.135 203.742 Tm [<004A0055>]TJ
+1 0 0 1 144.986 203.742 Tm [<0001>]TJ
+0.989 0 0 1 147.454 203.742 Tm [<004900420054>]TJ
+1 0 0 1 164.35 203.742 Tm [<0001>]TJ
+0.989 0 0 1 166.818 203.742 Tm [<0043005600480054>20<000F>]TJ
+1 0 0 1 192.759 203.742 Tm [<0001>]TJ
+0.989 0 0 1 196.073 203.742 Tm [<0023>12<005600480054>]TJ
+1 0 0 1 219.761 203.742 Tm [<0001>]TJ
+0.989 0 0 1 222.23 203.742 Tm [<0053>20<0046005100500053>-7<00550054>9<000D>]TJ
+1 0 0 1 259.984 203.742 Tm [<0001>]TJ
+0.989 0 0 1 262.455 203.742 Tm [<0054005600480048004600540055004A0050004F0054>]TJ
+1 0 0 1 319.627 203.742 Tm [<0001>]TJ
+0.989 0 0 1 322.095 203.742 Tm [<0042004F0045>]TJ
+1 0 0 1 340.868 203.742 Tm [<0001>]TJ
+0.989 0 0 1 343.336 203.742 Tm [<00440050004E004E0046004F00550054>]TJ
+1 0 0 1 395.469 203.742 Tm [<0001>]TJ
+0.989 0 0 1 397.937 203.742 Tm [<00440042004F>]TJ
+1 0 0 1 415.61 203.742 Tm [<0001>]TJ
+0.989 0 0 1 418.078 203.742 Tm [<00430046>]TJ
+1 0 0 1 430.075 203.742 Tm [<0001>]TJ
+0.989 0 0 1 432.544 203.742 Tm [<00420045004500460045>]TJ
+1 0 0 1 463.087 203.742 Tm [<0001>]TJ
+0.989 0 0 1 465.556 203.742 Tm [<00550050>]TJ
+1 0 0 1 475.492 203.742 Tm [<0001>]TJ
+0.989 0 0 1 477.961 203.742 Tm [<005500490046>]TJ
+1 0 0 1 493.767 203.742 Tm [<0001>]TJ
+0.989 0 0 1 496.235 203.742 Tm [<004A0054005400560046>]TJ
+1 0 0 1 520.866 203.742 Tm [<0001>]TJ
+1 0 0 1 74.409 190.193 Tm [<00550053>10<00420044004C0046005300010050004F00010048004A0055004900560043>40<000F0001>]TJ
+ET
+EMC
+/Link<</MCID 19>> BDC
+0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
+BT
+/F71 10.90909 Tf
+1 0 0 1 165.02 190.193 Tm [<003F0069006900540062002C00660066003B00420069003F006D00230058002B0051004B0066006D0040>-56<003700420062002B003F0032006000660069001C003B0054002F0037>]TJ
+0 g 0 G
+ET
+EMC
+/P<</MCID 20>> BDC
+BT
+/F68 10.90909 Tf
+1 0 0 1 366.086 190.193 Tm [<000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 368.977 190.193 Tm [<000100180015>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 169.869 Tm [<001800160001>]TJ
+0 g 0 G
+ET
+EMC
+/P<</MCID 21>> BDC
BT
/F68 10.90909 Tf
-1.02 0 0 1 74.409 175.13 Tm [<003500490046>]TJ
-1 0 0 1 93.793 175.13 Tm [<0001>]TJ
-1.02 0 0 1 96.692 175.13 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 137.952 175.13 Tm [<0001>]TJ
-1.02 0 0 1 140.851 175.13 Tm [<0045005000460054>]TJ
-1 0 0 1 164.496 175.13 Tm [<0001>]TJ
-1.02 0 0 1 167.395 175.13 Tm [<004F00500055>]TJ
-1 0 0 1 184.531 175.13 Tm [<0001>]TJ
-1.02 0 0 1 187.43 175.13 Tm [<00510042005500440049>]TJ
-1 0 0 1 216.116 175.13 Tm [<0001>]TJ
-1.02 0 0 1 219.015 175.13 Tm [<00440050004E004E0042004F00450054>]TJ
-1 0 0 1 275.709 175.13 Tm [<0001>]TJ
-1.02 0 0 1 278.607 175.13 Tm [<00470053>6<0050004E>]TJ
-1 0 0 1 303.11 175.13 Tm [<0001>]TJ
-1.02 0 0 1 306.009 175.13 Tm [<00500055004900460053>]TJ
-1 0 0 1 333.059 175.13 Tm [<0001>]TJ
-1.02 0 0 1 335.958 175.13 Tm [<005100420044004C0042004800460054>20<000F>]TJ
-1 0 0 1 384.795 175.13 Tm [<0001>]TJ
-1.02 0 0 1 389.401 175.13 Tm [<002A>24<0055>]TJ
-1 0 0 1 396.845 175.13 Tm [<0001>]TJ
-1.02 0 0 1 399.744 175.13 Tm [<004A0054>]TJ
-1 0 0 1 407.834 175.13 Tm [<0001>]TJ
-1.02 0 0 1 410.733 175.13 Tm [<0042004D00540050>]TJ
-1 0 0 1 430.929 175.13 Tm [<0001>]TJ
-1.02 0 0 1 433.828 175.13 Tm [<004F00500055>]TJ
-1 0 0 1 450.964 175.13 Tm [<0001>]TJ
-1.02 0 0 1 453.863 175.13 Tm [<0042004F>]TJ
-1 0 0 1 466.57 175.13 Tm [<0001>]TJ
-1.02 0 0 1 469.469 175.13 Tm [<0042004A004E>]TJ
-1 0 0 1 488.797 175.13 Tm [<0001>]TJ
-1.02 0 0 1 491.696 175.13 Tm [<00500047>]TJ
-1 0 0 1 501.666 175.13 Tm [<0001>]TJ
-1.02 0 0 1 504.565 175.13 Tm [<005500490046>]TJ
-1 0 0 1 520.866 175.13 Tm [<0001>]TJ
-1.01 0 0 1 74.409 161.58 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 115.265 161.58 Tm [<0001>]TJ
-1.01 0 0 1 117.705 161.58 Tm [<00550050>]TJ
-1 0 0 1 127.852 161.58 Tm [<0001>]TJ
-1.01 0 0 1 130.292 161.58 Tm [<004500460057>5<0046004D00500051>]TJ
-1 0 0 1 169.836 161.58 Tm [<0001>]TJ
-1.01 0 0 1 172.276 161.58 Tm [<0054005600440049>]TJ
-1 0 0 1 195.91 161.58 Tm [<0001>]TJ
-1.01 0 0 1 198.349 161.58 Tm [<0051004200550044004900460054>20<000F>]TJ
-1 0 0 1 239.919 161.58 Tm [<0001>]TJ
-1.01 0 0 1 243.186 161.58 Tm [<00380049004A004D0046>]TJ
-1 0 0 1 272.175 161.58 Tm [<0001>]TJ
-1.01 0 0 1 274.615 161.58 Tm [<00420055>]TJ
-1 0 0 1 284.168 161.58 Tm [<0001>]TJ
-1.01 0 0 1 286.608 161.58 Tm [<005500490046>]TJ
-1 0 0 1 302.749 161.58 Tm [<0001>]TJ
-1.01 0 0 1 305.189 161.58 Tm [<0046004F0045>]TJ
-1 0 0 1 324.261 161.58 Tm [<0001>]TJ
-1.01 0 0 1 326.701 161.58 Tm [<004400490042004F004800460054>]TJ
-1 0 0 1 367.634 161.58 Tm [<0001>]TJ
-1.01 0 0 1 370.073 161.58 Tm [<00550050>]TJ
-1 0 0 1 380.221 161.58 Tm [<0001>]TJ
-1.01 0 0 1 382.661 161.58 Tm [<0057>6<00420053>-7<004A005000560054>]TJ
-1 0 0 1 419.328 161.58 Tm [<0001>]TJ
-1.01 0 0 1 421.768 161.58 Tm [<00440050004E004E0042004F00450054>]TJ
-1 0 0 1 477.905 161.58 Tm [<0001>]TJ
-1.01 0 0 1 480.345 161.58 Tm [<004A004F>]TJ
-1 0 0 1 490.371 161.58 Tm [<0001>]TJ
-1.01 0 0 1 492.811 161.58 Tm [<004E0042004F005A>]TJ
-1 0 0 1 520.866 161.58 Tm [<0001>]TJ
+1 0 0 1 74.409 169.869 Tm [<0031>6<004D004600420054004600010042004D0054005000010044004900460044004C000100550049004600010048004A005500490056004300010054004A0055004600010047005000530001004F004600580001004600590042004E0051004D0046005400010042004F00450001004A004E00510053>6<0050>30<0057>5<0046004E0046004F00550054>20<000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 419.497 169.869 Tm [<000100180016>]TJ
+0 g 0 G
ET
EMC
/Artifact BMC
0 g 0 G
q
-1 0 0 1 74.409 147.979 cm
+1 0 0 1 74.409 147.997 cm
[] 0 d 0 J 0.398 w 0 0 m 178.58 0 l S
Q
EMC
-/P<</MCID 14>> BDC
+/P<</MCID 22>> BDC
BT
/F68 5.97758 Tf
-1 0 0 1 79.706 140.773 Tm [<0012>]TJ
+1 0 0 1 79.706 140.791 Tm [<0012>]TJ
/F68 8.96638 Tf
-1 0 0 1 83.376 137.519 Tm [<002A>18<004F000100440042005400460001005A>6<00500056000100450050004F>80<0445>75<00550001004C004F0050>30<005800010058004900420055000100550049004A00540001004E00460042004F0054001B0001>-75<0055004900460053>20<004600010058004A004D004D000100430046000100540050004E00460001004600590051004D0042004F00420055004A0050004F00540001004D004200550046005300010050004F000F>]TJ
+1 0 0 1 83.376 137.536 Tm [<002A>18<004F000100440042005400460001005A>6<00500056000100450050004F>80<0445>75<00550001004C004F0050>30<005800010058004900420055000100550049004A00540001004E00460042004F0054001B0001>-75<0055004900460053>20<004600010058004A004D004D000100430046000100540050004E00460001004600590051004D0042004F00420055004A0050004F00540001004D004200550046005300010050004F000F>]TJ
ET
EMC
/Artifact BMC
0 g 0 G
+EMC
+/Artifact BMC
0 g 0 G
EMC
+/Artifact BMC
+EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
0 g 0 G
@@ -4309,44 +4553,48 @@ EMC
endstream
endobj
-520 0 obj
-<< /Type /Page /Contents 521 0 R /Resources 519 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 2/Tabs /S /Parent 207 0 R /Annots 524 0 R >>
+554 0 obj
+<< /Type /Page /Contents 555 0 R /Resources 553 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 2/Tabs /S /Parent 215 0 R /Annots 557 0 R >>
endobj
-524 0 obj
-[ 509 0 R 523 0 R ]
+557 0 obj
+[ 529 0 R 533 0 R 537 0 R 548 0 R ]
endobj
-509 0 obj
-<< /Type /Annot /Subtype /Link /Contents (url) /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/news/2020/11/30/tagged-pdf-FS-study/) >> /StructParent 88 /Rect [ 256.95 613.302 521.862 626.084 ]
+529 0 obj
+<< /Type /Annot /Subtype /Link /Contents (url) /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://youtu.be/SZHIeevyo3U?t=19551) >> /StructParent 93 /Rect [ 289.219 696.166 497.394 708.893 ]
>>
endobj
-523 0 obj
-<< /Type /Annot /Subtype /Link /Contents (url) /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/news/2020/11/30/tagged-pdf-FS-study/) >> /StructParent 88 /Rect [ 73.413 599.753 191.784 612.011 ]
-
- >>
+533 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 94 /Rect [ 198.748 662.424 223.867 675.02 ]/A << /S /GoTo /D (subsubsection.5.2.8) >> >>
endobj
-522 0 obj
-<< /D [ 520 0 R /XYZ 73.409 809.993 null ] >>
+537 0 obj
+<< /Type /Annot /Subtype /Link /Contents (ref) /Border [0 0 0] /H /I /C [0.701176 0.4 0.414118] /StructParent 95 /Rect [ 246.497 628.42 271.617 641.147 ]/A << /S /GoTo /D (subsubsection.5.2.5) >> >>
endobj
-210 0 obj
-<< /D [ 520 0 R /XYZ 74.409 725.875 null ] >>
+548 0 obj
+<< /Type /Annot /Subtype /Link /Contents (url) /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://github.com/u-fischer/tagpdf) >> /StructParent 96 /Rect [ 164.024 186.503 367.082 199.284 ]
+
+ >>
endobj
-211 0 obj
-<< /D [ 520 0 R /XYZ 74.409 433.053 null ] >>
+556 0 obj
+<< /D [ 554 0 R /XYZ 73.409 809.993 null ] >>
endobj
-519 0 obj
-<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F68 203 0 R /F65 201 0 R /F71 205 0 R /F69 204 0 R >> >>
+218 0 obj
+<< /D [ 554 0 R /XYZ 74.409 610.707 null ] >>
endobj
-529 0 obj
-<< /Type/OBJR/Obj 528 0 R >>
+553 0 obj
+<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F68 211 0 R /F46 492 0 R /F71 213 0 R /F65 209 0 R /F69 212 0 R >> >>
endobj
-544 0 obj
-<< /Length 40112 >>
+572 0 obj
+<< /Length 41807 >>
stream
/opacity1 gs
/Artifact BMC
+EMC
+/Artifact BMC
0 g 0 G
EMC
+/Artifact BMC
+EMC
/Artifact<</Type /Pagination>> BDC
0 g 0 G
EMC
@@ -4377,302 +4625,77 @@ EMC
EMC
/Artifact BMC
0 g 0 G
-EMC
-/P<</MCID 0>> BDC
-BT
-/F68 10.90909 Tf
-0.98 0 0 1 74.409 760.773 Tm [<0044004D00420054005400460054>]TJ
-1 0 0 1 107.765 760.773 Tm [<0001>]TJ
-0.98 0 0 1 109.807 760.773 Tm [<0042004F0045>]TJ
-1 0 0 1 128.41 760.773 Tm [<0001>]TJ
-0.98 0 0 1 130.452 760.773 Tm [<005100420044004C0042004800460054>]TJ
-1 0 0 1 174.755 760.773 Tm [<0001>]TJ
-0.98 0 0 1 176.797 760.773 Tm [<0058004A004D004D>]TJ
-1 0 0 1 194.084 760.773 Tm [<0001>]TJ
-0.98 0 0 1 196.127 760.773 Tm [<00430046>]TJ
-1 0 0 1 208.015 760.773 Tm [<0001>]TJ
-0.98 0 0 1 210.057 760.773 Tm [<004F00460046004500460045>]TJ
-1 0 0 1 245.947 760.773 Tm [<0001>]TJ
-0.98 0 0 1 247.989 760.773 Tm [<00550050>]TJ
-1 0 0 1 257.835 760.773 Tm [<0001>]TJ
-0.98 0 0 1 259.878 760.773 Tm [<004800460055>]TJ
-1 0 0 1 274.61 760.773 Tm [<0001>]TJ
-0.98 0 0 1 276.652 760.773 Tm [<005500420048004800460045>]TJ
-1 0 0 1 308.928 760.773 Tm [<0001>]TJ
-0.98 0 0 1 310.97 760.773 Tm [<003100250027>]TJ
-1 0 0 1 331.914 760.773 Tm [<0001>]TJ
-0.98 0 0 1 333.955 760.773 Tm [<056D004D00460054>]TJ
-1 0 0 1 353.616 760.773 Tm [<0001>]TJ
-0.98 0 0 1 355.658 760.773 Tm [<0442>]TJ
-1 0 0 1 361.004 760.773 Tm [<0001>]TJ
-0.98 0 0 1 363.046 760.773 Tm [<0042004F0045>]TJ
-1 0 0 1 381.648 760.773 Tm [<0001>]TJ
-0.98 0 0 1 383.691 760.773 Tm [<005500490046>]TJ
-1 0 0 1 399.353 760.773 Tm [<0001>]TJ
-0.98 0 0 1 401.395 760.773 Tm [<004600590042004E0051004D00460054>]TJ
-1 0 0 1 447.184 760.773 Tm [<0001>]TJ
-0.98 0 0 1 449.226 760.773 Tm [<0042004400440050004E00510042004F005A004A004F0048>]TJ
-1 0 0 1 520.866 760.773 Tm [<0001>]TJ
-0.994 0 0 1 74.409 747.224 Tm [<005500490046>]TJ
-1 0 0 1 90.295 747.224 Tm [<0001>]TJ
-0.994 0 0 1 92.763 747.224 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 132.971 747.224 Tm [<0001>]TJ
-0.994 0 0 1 135.438 747.224 Tm [<00550053>-18<005A>]TJ
-1 0 0 1 149.074 747.224 Tm [<0001>]TJ
-0.994 0 0 1 151.541 747.224 Tm [<000900500053>]TJ
-1 0 0 1 165.811 747.224 Tm [<0001>]TJ
-0.994 0 0 1 168.278 747.224 Tm [<0058004A004D004D>]TJ
-1 0 0 1 185.812 747.224 Tm [<0001>]TJ
-0.994 0 0 1 188.28 747.224 Tm [<00550053>-18<005A000A>]TJ
-1 0 0 1 205.711 747.224 Tm [<0001>]TJ
-0.994 0 0 1 208.178 747.224 Tm [<00550050>]TJ
-1 0 0 1 218.165 747.224 Tm [<0001>]TJ
-0.994 0 0 1 220.632 747.224 Tm [<005400490050>30<0058>]TJ
-1 0 0 1 246.193 747.224 Tm [<0001>]TJ
-0.994 0 0 1 248.66 747.224 Tm [<0057>6<00420053>-7<004A005000560054>]TJ
-1 0 0 1 284.746 747.224 Tm [<0001>]TJ
-0.994 0 0 1 287.214 747.224 Tm [<005400550053>10<0042005500460048004A00460054>]TJ
-1 0 0 1 333.849 747.224 Tm [<0001>]TJ
-0.994 0 0 1 336.317 747.224 Tm [<0442>]TJ
-1 0 0 1 341.738 747.224 Tm [<0001>]TJ
-0.994 0 0 1 344.206 747.224 Tm [<00550049004600540046>]TJ
-1 0 0 1 370.393 747.224 Tm [<0001>]TJ
-0.994 0 0 1 372.86 747.224 Tm [<004400490042004F004800460054>]TJ
-1 0 0 1 413.144 747.224 Tm [<0001>]TJ
-0.994 0 0 1 415.612 747.224 Tm [<0054004900500056004D0045>]TJ
-1 0 0 1 449.259 747.224 Tm [<0001>]TJ
-0.994 0 0 1 451.727 747.224 Tm [<004A004F>]TJ
-1 0 0 1 461.594 747.224 Tm [<0001>]TJ
-0.994 0 0 1 464.062 747.224 Tm [<004E005A>]TJ
-1 0 0 1 479.557 747.224 Tm [<0001>]TJ
-0.994 0 0 1 482.024 747.224 Tm [<00500051004A004F004A0050004F>]TJ
-1 0 0 1 520.866 747.224 Tm [<0001>]TJ
-0.98 0 0 1 74.409 733.675 Tm [<00430046>]TJ
-1 0 0 1 86.298 733.675 Tm [<0001>]TJ
-0.98 0 0 1 88.386 733.675 Tm [<00450050004F0046>]TJ
-1 0 0 1 113.06 733.675 Tm [<0001>]TJ
-0.98 0 0 1 115.148 733.675 Tm [<0043>26<005A>]TJ
-1 0 0 1 126.673 733.675 Tm [<0001>]TJ
-0.98 0 0 1 128.76 733.675 Tm [<005500490046>]TJ
-1 0 0 1 144.422 733.675 Tm [<0001>]TJ
-0.98 0 0 1 146.51 733.675 Tm [<0044004D004200540054>10<000D>]TJ
-1 0 0 1 172.431 733.675 Tm [<0001>]TJ
-0.98 0 0 1 174.592 733.675 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 214.234 733.675 Tm [<0001>]TJ
-0.98 0 0 1 216.322 733.675 Tm [<0042004F0045>]TJ
-1 0 0 1 234.924 733.675 Tm [<0001>]TJ
-0.98 0 0 1 237.012 733.675 Tm [<0045005000440056004E0046004F0055>]TJ
-1 0 0 1 287.013 733.675 Tm [<0001>]TJ
-0.98 0 0 1 289.101 733.675 Tm [<00580053>-8<004A0055004600530054>]TJ
-1 0 0 1 322.664 733.675 Tm [<0001>]TJ
-0.98 0 0 1 324.751 733.675 Tm [<005500490046004E00540046004D0057>5<00460054>]TJ
-1 0 0 1 378.909 733.675 Tm [<0001>]TJ
-0.98 0 0 1 380.997 733.675 Tm [<00560054004A004F0048>]TJ
-1 0 0 1 407.425 733.675 Tm [<0001>]TJ
-0.98 0 0 1 409.513 733.675 Tm [<0042>]TJ
-1 0 0 1 415.104 733.675 Tm [<0001>]TJ
-0.98 0 0 1 417.192 733.675 Tm [<00540046004F0054004A0043004D0046>]TJ
-1 0 0 1 456.609 733.675 Tm [<0001>]TJ
-0.98 0 0 1 458.697 733.675 Tm [<00220031>6<002A>]TJ
-1 0 0 1 475.565 733.675 Tm [<0001>]TJ
-0.98 0 0 1 477.652 733.675 Tm [<00510053>6<0050>30<0057004A004500460045>]TJ
-1 0 0 1 520.866 733.675 Tm [<0001>]TJ
-1.02 0 0 1 74.409 720.126 Tm [<0043>25<005A>]TJ
-1 0 0 1 86.416 720.126 Tm [<0001>]TJ
-1.02 0 0 1 89.005 720.126 Tm [<005500490046>]TJ
-1 0 0 1 105.307 720.126 Tm [<0001>]TJ
-1.02 0 0 1 107.896 720.126 Tm [<004C00460053>-7<004F0046004D>]TJ
-1 0 0 1 139.574 720.126 Tm [<0001>]TJ
-1.02 0 0 1 142.163 720.126 Tm [<0042004F0045>]TJ
-1 0 0 1 161.525 720.126 Tm [<0001>]TJ
-1.02 0 0 1 164.114 720.126 Tm [<004F00500055>]TJ
-1 0 0 1 181.25 720.126 Tm [<0001>]TJ
-1.02 0 0 1 183.84 720.126 Tm [<0043>25<005A>]TJ
-1 0 0 1 195.846 720.126 Tm [<0001>]TJ
-1.02 0 0 1 198.435 720.126 Tm [<00540050004E0046>]TJ
-1 0 0 1 225.697 720.126 Tm [<0001>]TJ
-1.02 0 0 1 228.287 720.126 Tm [<00460059005500460053>-7<004F0042004D>]TJ
-1 0 0 1 269.189 720.126 Tm [<0001>]TJ
-1.02 0 0 1 271.778 720.126 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 313.038 720.126 Tm [<0001>]TJ
-1.02 0 0 1 315.627 720.126 Tm [<0055004900420055>]TJ
-1 0 0 1 335.857 720.126 Tm [<0001>]TJ
-1.02 0 0 1 338.446 720.126 Tm [<0042004500450054>]TJ
-1 0 0 1 362.426 720.126 Tm [<0001>]TJ
-1.02 0 0 1 365.015 720.126 Tm [<0051004200550044004900460054>]TJ
-1 0 0 1 404.272 720.126 Tm [<0001>]TJ
-1.02 0 0 1 406.862 720.126 Tm [<00460057>4<00460053>-17<005A0058004900460053>19<0046>]TJ
-1 0 0 1 464.858 720.126 Tm [<0001>]TJ
-1.02 0 0 1 467.447 720.126 Tm [<0042004F0045>]TJ
-1 0 0 1 486.809 720.126 Tm [<0001>]TJ
-1.02 0 0 1 489.398 720.126 Tm [<005800500056004D0045>]TJ
-1 0 0 1 520.866 720.126 Tm [<0001>]TJ
-0.98 0 0 1 74.409 706.577 Tm [<004F004600460045>]TJ
-1 0 0 1 98.411 706.577 Tm [<0001>]TJ
-0.98 0 0 1 100.602 706.577 Tm [<00440050004F005400550042004F0055>]TJ
-1 0 0 1 142.916 706.577 Tm [<0001>]TJ
-0.98 0 0 1 145.107 706.577 Tm [<004E0042004A004F00550046004F0042004F00440046>]TJ
-1 0 0 1 209.092 706.577 Tm [<0001>]TJ
-0.98 0 0 1 211.284 706.577 Tm [<0442>]TJ
-1 0 0 1 216.629 706.577 Tm [<0001>]TJ
-0.98 0 0 1 218.82 706.577 Tm [<0050004F0046>]TJ
-1 0 0 1 237.102 706.577 Tm [<0001>]TJ
-0.98 0 0 1 239.293 706.577 Tm [<0050004F004D005A>]TJ
-1 0 0 1 260.471 706.577 Tm [<0001>]TJ
-0.98 0 0 1 262.663 706.577 Tm [<004F004600460045>]TJ
-1 0 0 1 286.664 706.577 Tm [<0001>]TJ
-0.98 0 0 1 288.855 706.577 Tm [<00550050>]TJ
-1 0 0 1 298.701 706.577 Tm [<0001>]TJ
-0.98 0 0 1 300.892 706.577 Tm [<004D00500050004C>]TJ
-1 0 0 1 321.814 706.577 Tm [<0001>]TJ
-0.98 0 0 1 324.005 706.577 Tm [<00420055>]TJ
-1 0 0 1 333.274 706.577 Tm [<0001>]TJ
-0.98 0 0 1 335.466 706.577 Tm [<005100420044004C0042004800460054>]TJ
-1 0 0 1 379.769 706.577 Tm [<0001>]TJ
-0.98 0 0 1 381.96 706.577 Tm [<004D004A004C0046>]TJ
-1 0 0 1 399.151 706.577 Tm [<0001>]TJ
-0.98 0 0 1 401.342 706.577 Tm [<005500460059001500490055>]TJ
-1 0 0 1 431.544 706.577 Tm [<0001>]TJ
-0.98 0 0 1 433.735 706.577 Tm [<00500053>]TJ
-1 0 0 1 444.062 706.577 Tm [<0001>]TJ
-0.98 0 0 1 446.253 706.577 Tm [<0043004A0045004A>]TJ
-1 0 0 1 465.262 706.577 Tm [<0001>]TJ
-0.98 0 0 1 467.453 706.577 Tm [<00500053>]TJ
-1 0 0 1 477.78 706.577 Tm [<0001>]TJ
-0.98 0 0 1 479.971 706.577 Tm [<0049005A0051004600530053>20<00460047>]TJ
-1 0 0 1 520.866 706.577 Tm [<0001>]TJ
-1 0 0 1 74.409 693.027 Tm [<005500500001005400460046000100490050>30<005800010045004A056F00440056004D005500010042004F0045000100540050004E00460055004A004E00460054000100470053>10<00420048004A004D0046000100550049004A00540001004A0054>20<000F>]TJ
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 312.478 693.027 Tm [<000100120013001A>]TJ
0 g 0 G
-ET
EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+/H2<</MCID 0>> BDC
BT
-/F68 5.97758 Tf
-1 0 0 1 63.56 672.704 Tm [<0012001600170001>]TJ
-0 g 0 G
+/F65 11.95517 Tf
+1 0 0 1 74.409 760.773 Tm [<006B0058005200580067>]TJ
ET
EMC
-/P<</MCID 1>> BDC
+/H2<</MCID 1>> BDC
BT
-/F68 10.90909 Tf
-1.014 0 0 1 74.409 672.704 Tm [<0034>12<0050>]TJ
-1 0 0 1 86.643 672.704 Tm [<0001>]TJ
-1.014 0 0 1 89.088 672.704 Tm [<00550049004A0054>]TJ
-1 0 0 1 107.65 672.704 Tm [<0001>]TJ
-1.014 0 0 1 110.094 672.704 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 151.112 672.704 Tm [<0001>]TJ
-1.014 0 0 1 153.556 672.704 Tm [<00450046004D004A004300460053>9<004200550046004D005A>]TJ
-1 0 0 1 212.617 672.704 Tm [<0001>]TJ
-1.014 0 0 1 215.062 672.704 Tm [<00440050004F00440046004F00550053>10<0042005500460054>]TJ
-1 0 0 1 279.894 672.704 Tm [<0001>]TJ
-1.014 0 0 1 282.339 672.704 Tm [<0050004F>]TJ
-1 0 0 1 295.569 672.704 Tm [<0001>]TJ
-1.014 0 0 1 298.014 672.704 Tm [<005500490046>]TJ
-1 0 0 1 314.22 672.704 Tm [<0001>]TJ
-1.014 0 0 1 316.664 672.704 Tm [<004300420054004A00440054>]TJ
-1 0 0 1 347.416 672.704 Tm [<0001>]TJ
-1.014 0 0 1 349.861 672.704 Tm [<0442>]TJ
-1 0 0 1 355.392 672.704 Tm [<0001>]TJ
-1.014 0 0 1 357.837 672.704 Tm [<0042004F0045>]TJ
-1 0 0 1 377.084 672.704 Tm [<0001>]TJ
-1.014 0 0 1 379.529 672.704 Tm [<00550049004A0054>]TJ
-1 0 0 1 398.091 672.704 Tm [<0001>]TJ
-1.014 0 0 1 400.536 672.704 Tm [<0042004D0053>20<004600420045005A>]TJ
-1 0 0 1 437.171 672.704 Tm [<0001>]TJ
-1.014 0 0 1 439.616 672.704 Tm [<00520056004A00550046>]TJ
-1 0 0 1 465.567 672.704 Tm [<0001>]TJ
-1.014 0 0 1 468.012 672.704 Tm [<0042>]TJ
-1 0 0 1 473.797 672.704 Tm [<0001>]TJ
-1.014 0 0 1 476.242 672.704 Tm [<004D00500055000D>]TJ
-1 0 0 1 492.448 672.704 Tm [<0001>]TJ
-1.014 0 0 1 494.894 672.704 Tm [<0055004900460053>20<0046>]TJ
-1 0 0 1 520.866 672.704 Tm [<0001>]TJ
-1 0 0 1 74.409 659.154 Tm [<00420053>20<00460001004E0056004400490001004E00500053>20<004600010045004600550042004A004D00540001004A004F0057>5<0050004D0057>5<004600450001004200540001002A0001004600590051004600440055004600450001005800490046004F0001002A00010054005500420053>-8<005500460045000F>]TJ
+/F65 11.95517 Tf
+1 0 0 1 100.854 760.773 Tm [<0068>92<001C003B003B0042004D003B0067001C004D002F0067001C002B002B003200620062004200230042004800420069>31<0076>]TJ
ET
EMC
/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 371.049 659.154 Tm [<0001001200160017>]TJ
0 g 0 G
-ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 638.831 Tm [<0012001600180001>]TJ
+1 0 0 1 66.728 732.431 Tm [<001800170001>]TJ
0 g 0 G
ET
EMC
/P<</MCID 2>> BDC
BT
/F68 10.90909 Tf
-0.989 0 0 1 74.409 638.831 Tm [<002A0445>72<004E>]TJ
-1 0 0 1 90.354 638.831 Tm [<0001>]TJ
-0.989 0 0 1 92.822 638.831 Tm [<005400560053>20<0046>]TJ
-1 0 0 1 113.584 638.831 Tm [<0001>]TJ
-0.989 0 0 1 116.052 638.831 Tm [<0055004900420055>]TJ
-1 0 0 1 135.667 638.831 Tm [<0001>]TJ
-0.989 0 0 1 138.135 638.831 Tm [<004A0055>]TJ
-1 0 0 1 144.986 638.831 Tm [<0001>]TJ
-0.989 0 0 1 147.454 638.831 Tm [<004900420054>]TJ
-1 0 0 1 164.35 638.831 Tm [<0001>]TJ
-0.989 0 0 1 166.818 638.831 Tm [<0043005600480054>20<000F>]TJ
-1 0 0 1 192.759 638.831 Tm [<0001>]TJ
-0.989 0 0 1 196.073 638.831 Tm [<0023>12<005600480054>]TJ
-1 0 0 1 219.761 638.831 Tm [<0001>]TJ
-0.989 0 0 1 222.23 638.831 Tm [<0053>20<0046005100500053>-7<00550054>9<000D>]TJ
-1 0 0 1 259.984 638.831 Tm [<0001>]TJ
-0.989 0 0 1 262.455 638.831 Tm [<0054005600480048004600540055004A0050004F0054>]TJ
-1 0 0 1 319.627 638.831 Tm [<0001>]TJ
-0.989 0 0 1 322.095 638.831 Tm [<0042004F0045>]TJ
-1 0 0 1 340.868 638.831 Tm [<0001>]TJ
-0.989 0 0 1 343.336 638.831 Tm [<00440050004E004E0046004F00550054>]TJ
-1 0 0 1 395.469 638.831 Tm [<0001>]TJ
-0.989 0 0 1 397.937 638.831 Tm [<00440042004F>]TJ
-1 0 0 1 415.61 638.831 Tm [<0001>]TJ
-0.989 0 0 1 418.078 638.831 Tm [<00430046>]TJ
-1 0 0 1 430.075 638.831 Tm [<0001>]TJ
-0.989 0 0 1 432.544 638.831 Tm [<00420045004500460045>]TJ
-1 0 0 1 463.087 638.831 Tm [<0001>]TJ
-0.989 0 0 1 465.556 638.831 Tm [<00550050>]TJ
-1 0 0 1 475.492 638.831 Tm [<0001>]TJ
-0.989 0 0 1 477.961 638.831 Tm [<005500490046>]TJ
-1 0 0 1 493.767 638.831 Tm [<0001>]TJ
-0.989 0 0 1 496.235 638.831 Tm [<004A0054005400560046>]TJ
-1 0 0 1 520.866 638.831 Tm [<0001>]TJ
-1 0 0 1 74.409 625.281 Tm [<00550053>10<00420044004C0046005300010050004F00010048004A0055004900560043>40<000F0001>]TJ
-ET
-EMC
-/Link<</MCID 3>> BDC
-0.281 0.275 0.485 rg 0.281 0.275 0.485 RG
-BT
-/F71 10.90909 Tf
-1 0 0 1 165.02 625.281 Tm [<003F0069006900540062002C00660066003B00420069003F006D00230058002B0051004B0066006D0040>-56<003700420062002B003F0032006000660069001C003B0054002F0037>]TJ
-0 g 0 G
-ET
-EMC
-/P<</MCID 4>> BDC
-BT
+1.016 0 0 1 74.409 732.431 Tm [<00380049004A004D0046>]TJ
+1 0 0 1 103.571 732.431 Tm [<0001>]TJ
+1.016 0 0 1 106.014 732.431 Tm [<005500490046>]TJ
+1 0 0 1 122.252 732.431 Tm [<0001>]TJ
+1.016 0 0 1 124.695 732.431 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 165.793 732.431 Tm [<0001>]TJ
+1.016 0 0 1 168.237 732.431 Tm [<004A0054>]TJ
+1 0 0 1 176.295 732.431 Tm [<0001>]TJ
+1.016 0 0 1 178.738 732.431 Tm [<004F0042004E00460045>]TJ
+1 0 0 1 213.951 732.431 Tm [<0001>]TJ
+/F71 10.90909 Tf
+1 0 0 1 216.394 732.431 Tm [<0069001C003B0054002F00370067>]TJ
+/F68 10.90909 Tf
+1.016 0 0 1 253.201 732.431 Tm [<005500490046>]TJ
+1 0 0 1 269.439 732.431 Tm [<0001>]TJ
+1.016 0 0 1 271.882 732.431 Tm [<004800500042004D>]TJ
+1 0 0 1 292.93 732.431 Tm [<0001>]TJ
+1.016 0 0 1 295.374 732.431 Tm [<004A0054>]TJ
+1 0 0 1 303.432 732.431 Tm [<0001>]TJ
+1.016 0 0 1 305.875 732.431 Tm [<00420044005500560042004D004D005A>]TJ
+1 0 0 1 345.289 732.431 Tm [<0001>]TJ
+/F69 10.90909 Tf
+1.016 0 0 1 347.732 732.431 Tm [<004200440044004600540054004A0043004D0046>]TJ
+1 0 0 1 396.288 732.431 Tm [<0001>]TJ
+/F68 10.90909 Tf
+1.016 0 0 1 398.731 732.431 Tm [<003100250027000E056D004D00460054>20<000F>]TJ
+1 0 0 1 447.886 732.431 Tm [<0001>]TJ
+1.016 0 0 1 451.155 732.431 Tm [<0035>100<004200480048004A004F0048>]TJ
+1 0 0 1 490.099 732.431 Tm [<0001>]TJ
+1.016 0 0 1 492.542 732.431 Tm [<004A0054>]TJ
+1 0 0 1 500.6 732.431 Tm [<0001>]TJ
+/F69 10.90909 Tf
+1.016 0 0 1 503.044 732.431 Tm [<0050004F0046>]TJ
/F68 10.90909 Tf
-1 0 0 1 366.086 625.281 Tm [<000F>]TJ
+1 0 0 1 74.409 718.882 Tm [<0053>20<004600520056004A0053>20<0046004E0046004F005500010047005000530001004200440044004600540054004A0043004A004D004A0055005A0001>-1<0043005600550001>-1<0055004900460053>19<0046000100420053>20<00460001005000550049004600530054>19<000F0001>-76<002A0001>-1<0058004A004D004D0001>-1<004E0046004F0055004A0050004F0001>-1<00540050004E00460001004D00420055004600530001>-1<0050004F0001>-1<004A004F0001>-1<00550049004A00540001>-1<0045005000440056000E>]TJ
+1 0 0 1 74.409 705.333 Tm [<004E0046004F005500420055004A0050004F000D00010042004F0045000104420001004A0047000100540046004F0054004A0043004D0046000104420001002A00010058004A004D004D00010042004D00540050000100550053>-18<005A000100550050000100420045004500010044005000450046>20<000D0001004C0046005A005400010050005300010055004A0051005400010047005000530001005500490046004E000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 368.977 625.281 Tm [<0001001200160018>]TJ
+1 0 0 1 451.34 705.333 Tm [<000100180017>]TJ
0 g 0 G
ET
EMC
@@ -4680,37 +4703,81 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 604.958 Tm [<0012001600190001>]TJ
+1 0 0 1 66.728 685.009 Tm [<001800180001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 5>> BDC
+/P<</MCID 3>> BDC
BT
/F68 10.90909 Tf
-1 0 0 1 74.409 604.958 Tm [<0031>6<004D004600420054004600010042004D0054005000010044004900460044004C000100550049004600010048004A005500490056004300010054004A0055004600010047005000530001004F004600580001004600590042004E0051004D0046005400010042004F00450001004A004E00510053>6<0050>30<0057>5<0046004E0046004F00550054>20<000F>]TJ
+0.98 0 0 1 74.409 685.009 Tm [<0034>12<0050>]TJ
+1 0 0 1 86.228 685.009 Tm [<0001>]TJ
+0.98 0 0 1 88.501 685.009 Tm [<005500490046>]TJ
+1 0 0 1 104.163 685.009 Tm [<0001>]TJ
+0.98 0 0 1 106.435 685.009 Tm [<004F0042004E0046>]TJ
+1 0 0 1 134.007 685.009 Tm [<0001>]TJ
+0.98 0 0 1 136.28 685.009 Tm [<00500047>]TJ
+1 0 0 1 145.859 685.009 Tm [<0001>]TJ
+0.98 0 0 1 148.131 685.009 Tm [<005500490046>]TJ
+1 0 0 1 163.793 685.009 Tm [<0001>]TJ
+0.98 0 0 1 166.065 685.009 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 205.707 685.009 Tm [<0001>]TJ
+0.98 0 0 1 207.98 685.009 Tm [<004A0054>]TJ
+1 0 0 1 215.752 685.009 Tm [<0001>]TJ
+0.98 0 0 1 218.024 685.009 Tm [<0042>]TJ
+1 0 0 1 223.616 685.009 Tm [<0001>]TJ
+0.98 0 0 1 225.888 685.009 Tm [<0043004A0055>]TJ
+1 0 0 1 239.07 685.009 Tm [<0001>]TJ
+0.98 0 0 1 241.342 685.009 Tm [<00580053>6<0050004F0048000F>]TJ
+1 0 0 1 274.824 685.009 Tm [<0001>]TJ
+0.98 0 0 1 278.036 685.009 Tm [<00220054>]TJ
+1 0 0 1 289.486 685.009 Tm [<0001>]TJ
+0.98 0 0 1 291.758 685.009 Tm [<00460059>12<0044005600540046>]TJ
+1 0 0 1 324.256 685.009 Tm [<0001>]TJ
+0.98 0 0 1 326.528 685.009 Tm [<002A>]TJ
+1 0 0 1 330.259 685.009 Tm [<0001>]TJ
+0.98 0 0 1 332.531 685.009 Tm [<00440042004F>]TJ
+1 0 0 1 350.043 685.009 Tm [<0001>]TJ
+0.98 0 0 1 352.315 685.009 Tm [<0050004F004D005A>]TJ
+1 0 0 1 373.494 685.009 Tm [<0001>]TJ
+0.98 0 0 1 375.767 685.009 Tm [<00540042005A>]TJ
+1 0 0 1 391.429 685.009 Tm [<0001>]TJ
+0.98 0 0 1 393.701 685.009 Tm [<0055004900420055>]TJ
+1 0 0 1 413.137 685.009 Tm [<0001>]TJ
+0.98 0 0 1 415.41 685.009 Tm [<004A0055>]TJ
+1 0 0 1 422.198 685.009 Tm [<0001>]TJ
+0.98 0 0 1 424.471 685.009 Tm [<004A0054>]TJ
+1 0 0 1 432.243 685.009 Tm [<0001>]TJ
+0.98 0 0 1 434.515 685.009 Tm [<0054004900500053>-8<005500460053>]TJ
+1 0 0 1 469.414 685.009 Tm [<0001>]TJ
+0.98 0 0 1 471.686 685.009 Tm [<0042004F0045>]TJ
+1 0 0 1 490.288 685.009 Tm [<0001>]TJ
+0.98 0 0 1 492.561 685.009 Tm [<004600420054004A00460053>]TJ
+1 0 0 1 520.866 685.009 Tm [<0001>]TJ
+1 0 0 1 74.409 671.46 Tm [<00550050000100510053>6<0050004F00500056004F00440046>20<000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 419.497 604.958 Tm [<0001001200160019>]TJ
+1 0 0 1 144.119 671.46 Tm [<000100180018>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
0 g 0 G
EMC
-/H2<</MCID 6>> BDC
+/H2<</MCID 4>> BDC
BT
/F65 11.95517 Tf
-1 0 0 1 74.409 566.863 Tm [<006A0058005200580067>]TJ
+1 0 0 1 74.409 633.365 Tm [<006B0058006B00580067>]TJ
ET
EMC
-/H2<</MCID 7>> BDC
+/H2<</MCID 5>> BDC
BT
/F65 11.95517 Tf
-1 0 0 1 100.854 566.863 Tm [<0068>92<001C003B003B0042004D003B0067001C004D002F0067001C002B002B003200620062004200230042004800420069>31<0076>]TJ
+1 0 0 1 100.854 633.365 Tm [<0031004D003B0042004D003200620067001C004D002F0067004B0051>-31<002F00320062>]TJ
ET
EMC
/Artifact BMC
@@ -4720,56 +4787,51 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 538.521 Tm [<0012001700110001>]TJ
+1 0 0 1 66.728 605.023 Tm [<001800190001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 8>> BDC
+/P<</MCID 6>> BDC
BT
/F68 10.90909 Tf
-1.016 0 0 1 74.409 538.521 Tm [<00380049004A004D0046>]TJ
-1 0 0 1 103.571 538.521 Tm [<0001>]TJ
-1.016 0 0 1 106.014 538.521 Tm [<005500490046>]TJ
-1 0 0 1 122.252 538.521 Tm [<0001>]TJ
-1.016 0 0 1 124.695 538.521 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 165.793 538.521 Tm [<0001>]TJ
-1.016 0 0 1 168.237 538.521 Tm [<004A0054>]TJ
-1 0 0 1 176.295 538.521 Tm [<0001>]TJ
-1.016 0 0 1 178.738 538.521 Tm [<004F0042004E00460045>]TJ
-1 0 0 1 213.951 538.521 Tm [<0001>]TJ
-/F71 10.90909 Tf
-1 0 0 1 216.394 538.521 Tm [<0069001C003B0054002F00370067>]TJ
-/F68 10.90909 Tf
-1.016 0 0 1 253.201 538.521 Tm [<005500490046>]TJ
-1 0 0 1 269.439 538.521 Tm [<0001>]TJ
-1.016 0 0 1 271.882 538.521 Tm [<004800500042004D>]TJ
-1 0 0 1 292.93 538.521 Tm [<0001>]TJ
-1.016 0 0 1 295.374 538.521 Tm [<004A0054>]TJ
-1 0 0 1 303.432 538.521 Tm [<0001>]TJ
-1.016 0 0 1 305.875 538.521 Tm [<00420044005500560042004D004D005A>]TJ
-1 0 0 1 345.289 538.521 Tm [<0001>]TJ
-/F69 10.90909 Tf
-1.016 0 0 1 347.732 538.521 Tm [<004200440044004600540054004A0043004D0046>]TJ
-1 0 0 1 396.288 538.521 Tm [<0001>]TJ
-/F68 10.90909 Tf
-1.016 0 0 1 398.731 538.521 Tm [<003100250027000E056D004D00460054>20<000F>]TJ
-1 0 0 1 447.886 538.521 Tm [<0001>]TJ
-1.016 0 0 1 451.155 538.521 Tm [<0035>100<004200480048004A004F0048>]TJ
-1 0 0 1 490.099 538.521 Tm [<0001>]TJ
-1.016 0 0 1 492.542 538.521 Tm [<004A0054>]TJ
-1 0 0 1 500.6 538.521 Tm [<0001>]TJ
-/F69 10.90909 Tf
-1.016 0 0 1 503.044 538.521 Tm [<0050004F0046>]TJ
-/F68 10.90909 Tf
-1 0 0 1 74.409 524.972 Tm [<0053>20<004600520056004A0053>20<0046004E0046004F005500010047005000530001004200440044004600540054004A0043004A004D004A0055005A0001>-1<0043005600550001>-1<0055004900460053>19<0046000100420053>20<00460001005000550049004600530054>19<000F0001>-76<002A0001>-1<0058004A004D004D0001>-1<004E0046004F0055004A0050004F0001>-1<00540050004E00460001004D00420055004600530001>-1<0050004F0001>-1<004A004F0001>-1<00550049004A00540001>-1<0045005000440056000E>]TJ
-1 0 0 1 74.409 511.422 Tm [<004E0046004F005500420055004A0050004F000D00010042004F0045000104420001004A0047000100540046004F0054004A0043004D0046000104420001002A00010058004A004D004D00010042004D00540050000100550053>-18<005A000100550050000100420045004500010044005000450046>20<000D0001004C0046005A005400010050005300010055004A0051005400010047005000530001005500490046004E000F>]TJ
+1.01 0 0 1 74.409 605.023 Tm [<003500490046>]TJ
+1 0 0 1 93.603 605.023 Tm [<0001>]TJ
+1.01 0 0 1 96.068 605.023 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 136.924 605.023 Tm [<0001>]TJ
+1.01 0 0 1 139.389 605.023 Tm [<005800500053>6<004C0054>]TJ
+1 0 0 1 169.005 605.023 Tm [<0001>]TJ
+1.01 0 0 1 171.47 605.023 Tm [<0044005600530053>20<0046004F0055004D005A>]TJ
+1 0 0 1 216.885 605.023 Tm [<0001>]TJ
+1.01 0 0 1 219.35 605.023 Tm [<0058004A00550049>]TJ
+1 0 0 1 241.496 605.023 Tm [<0001>]TJ
+1.01 0 0 1 243.962 605.023 Tm [<00510045056E0042005500460059>]TJ
+1 0 0 1 284.542 605.023 Tm [<0001>]TJ
+1.01 0 0 1 287.007 605.023 Tm [<0042004F0045>]TJ
+1 0 0 1 306.178 605.023 Tm [<0001>]TJ
+1.01 0 0 1 308.643 605.023 Tm [<004D00560042004D0042005500460059000F>]TJ
+1 0 0 1 350.722 605.023 Tm [<0001>]TJ
+1.01 0 0 1 354.026 605.023 Tm [<0027>10<004A005300540055>]TJ
+1 0 0 1 376.392 605.023 Tm [<0001>]TJ
+1.01 0 0 1 378.857 605.023 Tm [<00540055004600510054>]TJ
+1 0 0 1 404.618 605.023 Tm [<0001>]TJ
+1.01 0 0 1 407.083 605.023 Tm [<004900420057>5<0046>]TJ
+1 0 0 1 430.694 605.023 Tm [<0001>]TJ
+1.01 0 0 1 433.159 605.023 Tm [<004300460046004F>]TJ
+1 0 0 1 457.895 605.023 Tm [<0001>]TJ
+1.01 0 0 1 460.36 605.023 Tm [<00450050004F0046>]TJ
+1 0 0 1 485.79 605.023 Tm [<0001>]TJ
+1.01 0 0 1 488.255 605.023 Tm [<00550050>]TJ
+1 0 0 1 498.403 605.023 Tm [<0001>]TJ
+1.01 0 0 1 500.868 605.023 Tm [<0042004D00540050>]TJ
+1 0 0 1 520.866 605.023 Tm [<0001>]TJ
+1 0 0 1 74.409 591.474 Tm [<0046004F00420043004D00460001005400560051005100500053>-8<00550001004700500053000100590046004D004200550046005900010042004F004500010055004900460001004D0042005500460059000E00450057004A00510054000E0053>6<0050005600550046001C0001004300560055000100550049004A00540001004A0054004F>80<0445>75<00550001005A>6<004600550001004E0056004400490001005500460054005500460045000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 451.34 511.422 Tm [<0001001200170011>]TJ
+1 0 0 1 478.689 591.474 Tm [<000100180019>]TJ
0 g 0 G
ET
EMC
@@ -4777,195 +4839,514 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 491.099 Tm [<0012001700120001>]TJ
+1 0 0 1 66.728 571.15 Tm [<0018001A0001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 9>> BDC
+/P<</MCID 7>> BDC
BT
/F68 10.90909 Tf
-0.98 0 0 1 74.409 491.099 Tm [<0034>12<0050>]TJ
-1 0 0 1 86.228 491.099 Tm [<0001>]TJ
-0.98 0 0 1 88.501 491.099 Tm [<005500490046>]TJ
-1 0 0 1 104.163 491.099 Tm [<0001>]TJ
-0.98 0 0 1 106.435 491.099 Tm [<004F0042004E0046>]TJ
-1 0 0 1 134.007 491.099 Tm [<0001>]TJ
-0.98 0 0 1 136.28 491.099 Tm [<00500047>]TJ
-1 0 0 1 145.859 491.099 Tm [<0001>]TJ
-0.98 0 0 1 148.131 491.099 Tm [<005500490046>]TJ
-1 0 0 1 163.793 491.099 Tm [<0001>]TJ
-0.98 0 0 1 166.065 491.099 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 205.707 491.099 Tm [<0001>]TJ
-0.98 0 0 1 207.98 491.099 Tm [<004A0054>]TJ
-1 0 0 1 215.752 491.099 Tm [<0001>]TJ
-0.98 0 0 1 218.024 491.099 Tm [<0042>]TJ
-1 0 0 1 223.616 491.099 Tm [<0001>]TJ
-0.98 0 0 1 225.888 491.099 Tm [<0043004A0055>]TJ
-1 0 0 1 239.07 491.099 Tm [<0001>]TJ
-0.98 0 0 1 241.342 491.099 Tm [<00580053>6<0050004F0048000F>]TJ
-1 0 0 1 274.824 491.099 Tm [<0001>]TJ
-0.98 0 0 1 278.036 491.099 Tm [<00220054>]TJ
-1 0 0 1 289.486 491.099 Tm [<0001>]TJ
-0.98 0 0 1 291.758 491.099 Tm [<00460059>12<0044005600540046>]TJ
-1 0 0 1 324.256 491.099 Tm [<0001>]TJ
-0.98 0 0 1 326.528 491.099 Tm [<002A>]TJ
-1 0 0 1 330.259 491.099 Tm [<0001>]TJ
-0.98 0 0 1 332.531 491.099 Tm [<00440042004F>]TJ
-1 0 0 1 350.043 491.099 Tm [<0001>]TJ
-0.98 0 0 1 352.315 491.099 Tm [<0050004F004D005A>]TJ
-1 0 0 1 373.494 491.099 Tm [<0001>]TJ
-0.98 0 0 1 375.767 491.099 Tm [<00540042005A>]TJ
-1 0 0 1 391.429 491.099 Tm [<0001>]TJ
-0.98 0 0 1 393.701 491.099 Tm [<0055004900420055>]TJ
-1 0 0 1 413.137 491.099 Tm [<0001>]TJ
-0.98 0 0 1 415.41 491.099 Tm [<004A0055>]TJ
-1 0 0 1 422.198 491.099 Tm [<0001>]TJ
-0.98 0 0 1 424.471 491.099 Tm [<004A0054>]TJ
-1 0 0 1 432.243 491.099 Tm [<0001>]TJ
-0.98 0 0 1 434.515 491.099 Tm [<0054004900500053>-8<005500460053>]TJ
-1 0 0 1 469.414 491.099 Tm [<0001>]TJ
-0.98 0 0 1 471.686 491.099 Tm [<0042004F0045>]TJ
-1 0 0 1 490.288 491.099 Tm [<0001>]TJ
-0.98 0 0 1 492.561 491.099 Tm [<004600420054004A00460053>]TJ
-1 0 0 1 520.866 491.099 Tm [<0001>]TJ
-1 0 0 1 74.409 477.549 Tm [<00550050000100510053>6<0050004F00500056004F00440046>20<000F>]TJ
+0.98 0 0 1 74.409 571.15 Tm [<003500490046>]TJ
+1 0 0 1 93.033 571.15 Tm [<0001>]TJ
+0.98 0 0 1 95.114 571.15 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 134.756 571.15 Tm [<0001>]TJ
+0.98 0 0 1 136.837 571.15 Tm [<004900420054>]TJ
+1 0 0 1 153.579 571.15 Tm [<0001>]TJ
+0.98 0 0 1 155.66 571.15 Tm [<005500580050>]TJ
+1 0 0 1 173.717 571.15 Tm [<0001>]TJ
+0.98 0 0 1 175.798 571.15 Tm [<004E0050004500460054001B>]TJ
+1 0 0 1 211.217 571.15 Tm [<0001>]TJ
+0.98 0 0 1 214.303 571.15 Tm [<005500490046>]TJ
+1 0 0 1 229.965 571.15 Tm [<0001>]TJ
+/F69 10.90909 Tf
+0.98 0 0 1 232.046 571.15 Tm [<00480046004F00460053004A0044>]TJ
+1 0 0 1 266.075 571.15 Tm [<0001>]TJ
+0.98 0 0 1 268.156 571.15 Tm [<004E005000450046>]TJ
+1 0 0 1 295.562 571.15 Tm [<0001>]TJ
+/F68 10.90909 Tf
+0.98 0 0 1 297.643 571.15 Tm [<00580049004A00440049>]TJ
+1 0 0 1 327.246 571.15 Tm [<0001>]TJ
+0.98 0 0 1 329.327 571.15 Tm [<0054004900500056004D0045>]TJ
+1 0 0 1 362.501 571.15 Tm [<0001>]TJ
+0.98 0 0 1 364.582 571.15 Tm [<005800500053>6<004C>]TJ
+1 0 0 1 388.656 571.15 Tm [<0001>]TJ
+0.98 0 0 1 390.737 571.15 Tm [<004A004F>]TJ
+1 0 0 1 400.465 571.15 Tm [<0001>]TJ
+0.98 0 0 1 402.546 571.15 Tm [<00550049004600500053>-18<005A>]TJ
+1 0 0 1 434.146 571.15 Tm [<0001>]TJ
+0.98 0 0 1 436.227 571.15 Tm [<0058004A00550049>]TJ
+1 0 0 1 457.716 571.15 Tm [<0001>]TJ
+0.98 0 0 1 459.797 571.15 Tm [<00460057>5<00460053>-18<005A>]TJ
+1 0 0 1 485.889 571.15 Tm [<0001>]TJ
+0.98 0 0 1 487.97 571.15 Tm [<0046004F0048004A004F0046>]TJ
+1 0 0 1 520.866 571.15 Tm [<0001>]TJ
+1 0 0 1 74.409 557.601 Tm [<0042004F004500010055004900460001>]TJ
+/F69 10.90909 Tf
+1 0 0 1 114.282 557.601 Tm [<004D005600420001004E005000450046>-73<0001>]TJ
+/F68 10.90909 Tf
+1 0 0 1 163.34 557.601 Tm [<00580049004A004400490001005800500053>6<004C005400010050004F004D005A00010058004A005500490001004D00560042004D0042005500460059000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 144.119 477.549 Tm [<0001001200170012>]TJ
+1 0 0 1 317.889 557.601 Tm [<00010018001A>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 537.277 Tm [<001900110001>]TJ
0 g 0 G
+ET
EMC
-/H2<</MCID 10>> BDC
+/P<</MCID 8>> BDC
BT
-/F65 11.95517 Tf
-1 0 0 1 74.409 439.454 Tm [<006A0058006B00580067>]TJ
+/F68 10.90909 Tf
+1.02 0 0 1 74.409 537.277 Tm [<002A>]TJ
+1 0 0 1 78.293 537.277 Tm [<0001>]TJ
+1.02 0 0 1 81.038 537.277 Tm [<004A004E0051004D0046004E0046004F005500460045>]TJ
+1 0 0 1 149.215 537.277 Tm [<0001>]TJ
+1.02 0 0 1 151.96 537.277 Tm [<005500490046>]TJ
+1 0 0 1 168.261 537.277 Tm [<0001>]TJ
+1.02 0 0 1 171.007 537.277 Tm [<00480046004F00460053>-8<004A0044>]TJ
+1 0 0 1 208.294 537.277 Tm [<0001>]TJ
+1.02 0 0 1 211.039 537.277 Tm [<004E005000450046>]TJ
+1 0 0 1 240.104 537.277 Tm [<0001>]TJ
+1.02 0 0 1 242.849 537.277 Tm [<056D005300540055000F>]TJ
+1 0 0 1 265.593 537.277 Tm [<0001>]TJ
+1.02 0 0 1 269.738 537.277 Tm [<002E>30<005000540055004D005A>]TJ
+1 0 0 1 303.743 537.277 Tm [<0001>]TJ
+1.02 0 0 1 306.488 537.277 Tm [<0043004600440042005600540046>]TJ
+1 0 0 1 347.514 537.277 Tm [<0001>]TJ
+1.02 0 0 1 350.26 537.277 Tm [<004E005A>]TJ
+1 0 0 1 366.161 537.277 Tm [<0001>]TJ
+1.02 0 0 1 368.906 537.277 Tm [<005500460059>]TJ
+1 0 0 1 383.861 537.277 Tm [<0001>]TJ
+1.02 0 0 1 386.606 537.277 Tm [<0054004C004A004D004D0054>]TJ
+1 0 0 1 411.587 537.277 Tm [<0001>]TJ
+1.02 0 0 1 414.332 537.277 Tm [<00420053>20<0046>]TJ
+1 0 0 1 429.977 537.277 Tm [<0001>]TJ
+1.02 0 0 1 432.722 537.277 Tm [<004E005600440049>]TJ
+1 0 0 1 462.009 537.277 Tm [<0001>]TJ
+1.02 0 0 1 464.755 537.277 Tm [<004300460055005500460053>]TJ
+1 0 0 1 494.832 537.277 Tm [<0001>]TJ
+1.02 0 0 1 497.577 537.277 Tm [<005500490042004F>]TJ
+1 0 0 1 520.866 537.277 Tm [<0001>]TJ
+0.992 0 0 1 74.409 523.728 Tm [<004E005A>]TJ
+1 0 0 1 89.874 523.728 Tm [<0001>]TJ
+0.992 0 0 1 92.338 523.728 Tm [<004D00560042>]TJ
+1 0 0 1 107.575 523.728 Tm [<0001>]TJ
+0.992 0 0 1 110.039 523.728 Tm [<0054004C004A004D004D0054>]TJ
+1 0 0 1 134.334 523.728 Tm [<0001>]TJ
+0.992 0 0 1 136.797 523.728 Tm [<0042004F0045>]TJ
+1 0 0 1 155.627 523.728 Tm [<0001>]TJ
+0.992 0 0 1 158.091 523.728 Tm [<002A>]TJ
+1 0 0 1 161.868 523.728 Tm [<0001>]TJ
+0.992 0 0 1 164.332 523.728 Tm [<00580042004F005500460045>]TJ
+1 0 0 1 200.758 523.728 Tm [<0001>]TJ
+0.992 0 0 1 203.222 523.728 Tm [<00550050>]TJ
+1 0 0 1 213.189 523.728 Tm [<0001>]TJ
+0.992 0 0 1 215.653 523.728 Tm [<004800460055>]TJ
+1 0 0 1 230.565 523.728 Tm [<0001>]TJ
+0.992 0 0 1 233.029 523.728 Tm [<005500490046>]TJ
+1 0 0 1 248.883 523.728 Tm [<0001>]TJ
+0.992 0 0 1 251.347 523.728 Tm [<005500460059>]TJ
+1 0 0 1 265.891 523.728 Tm [<0001>]TJ
+0.992 0 0 1 268.355 523.728 Tm [<0054004A00450046>]TJ
+1 0 0 1 288.257 523.728 Tm [<0001>]TJ
+0.992 0 0 1 290.72 523.728 Tm [<0053>-8<004A004800490055>]TJ
+1 0 0 1 314.087 523.728 Tm [<0001>]TJ
+0.992 0 0 1 316.551 523.728 Tm [<00430046004700500053>20<0046>]TJ
+1 0 0 1 347.831 523.728 Tm [<0001>]TJ
+0.992 0 0 1 350.295 523.728 Tm [<0054005500420053>-8<0055004A004F0048>]TJ
+1 0 0 1 387.892 523.728 Tm [<0001>]TJ
+0.992 0 0 1 390.356 523.728 Tm [<00550050>]TJ
+1 0 0 1 400.323 523.728 Tm [<0001>]TJ
+0.992 0 0 1 402.787 523.728 Tm [<056D004800490055>]TJ
+1 0 0 1 425.307 523.728 Tm [<0001>]TJ
+0.992 0 0 1 427.771 523.728 Tm [<0058004A00550049>]TJ
+1 0 0 1 449.523 523.728 Tm [<0001>]TJ
+0.992 0 0 1 451.986 523.728 Tm [<0042005500550053>-8<004A00430056005500460054>]TJ
+1 0 0 1 499.572 523.728 Tm [<0001>]TJ
+0.992 0 0 1 502.036 523.728 Tm [<0042004F0045>]TJ
+1 0 0 1 520.866 523.728 Tm [<0001>]TJ
+1 0 0 1 74.409 510.179 Tm [<004F005000450046000100550053>10<00420057>5<004600530054004A004F0048000F>]TJ
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 154.177 510.179 Tm [<000100190011>]TJ
+0 g 0 G
+ET
+EMC
+/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 66.728 489.855 Tm [<001900120001>]TJ
+0 g 0 G
ET
EMC
-/H2<</MCID 11>> BDC
+/P<</MCID 9>> BDC
BT
-/F65 11.95517 Tf
-1 0 0 1 100.854 439.454 Tm [<0031004D003B0042004D003200620067001C004D002F0067004B0051>-31<002F00320062>]TJ
+/F68 10.90909 Tf
+0.98 0 0 1 74.409 489.855 Tm [<00380049004A004D0046>]TJ
+1 0 0 1 102.537 489.855 Tm [<0001>]TJ
+0.98 0 0 1 104.675 489.855 Tm [<005500490046>]TJ
+1 0 0 1 120.337 489.855 Tm [<0001>]TJ
+0.98 0 0 1 122.475 489.855 Tm [<00480046004F00460053>-8<004A0044>]TJ
+1 0 0 1 158.304 489.855 Tm [<0001>]TJ
+0.98 0 0 1 160.442 489.855 Tm [<004E005000450046>]TJ
+1 0 0 1 188.366 489.855 Tm [<0001>]TJ
+0.98 0 0 1 190.504 489.855 Tm [<004A0054>]TJ
+1 0 0 1 198.276 489.855 Tm [<0001>]TJ
+0.98 0 0 1 200.414 489.855 Tm [<004F00500055>]TJ
+1 0 0 1 216.878 489.855 Tm [<0001>]TJ
+0.98 0 0 1 219.016 489.855 Tm [<004300420045>]TJ
+1 0 0 1 237.393 489.855 Tm [<0001>]TJ
+0.98 0 0 1 239.531 489.855 Tm [<0042004F0045>]TJ
+1 0 0 1 258.133 489.855 Tm [<0001>]TJ
+0.98 0 0 1 260.271 489.855 Tm [<002A>]TJ
+1 0 0 1 264.002 489.855 Tm [<0001>]TJ
+0.98 0 0 1 266.14 489.855 Tm [<005400510046004F0055>]TJ
+1 0 0 1 293.092 489.855 Tm [<0001>]TJ
+0.98 0 0 1 295.229 489.855 Tm [<00520056004A00550046>]TJ
+1 0 0 1 320.31 489.855 Tm [<0001>]TJ
+0.98 0 0 1 322.448 489.855 Tm [<00540050004E0046>]TJ
+1 0 0 1 348.641 489.855 Tm [<0001>]TJ
+0.98 0 0 1 350.779 489.855 Tm [<0055004A004E0046>]TJ
+1 0 0 1 372.93 489.855 Tm [<0001>]TJ
+0.98 0 0 1 375.068 489.855 Tm [<00550050>]TJ
+1 0 0 1 384.914 489.855 Tm [<0001>]TJ
+0.98 0 0 1 387.052 489.855 Tm [<004800460055>]TJ
+1 0 0 1 401.784 489.855 Tm [<0001>]TJ
+0.98 0 0 1 403.922 489.855 Tm [<004A0055>]TJ
+1 0 0 1 410.711 489.855 Tm [<0001>]TJ
+0.98 0 0 1 412.848 489.855 Tm [<005800500053>6<004C004A004F0048>]TJ
+1 0 0 1 452.21 489.855 Tm [<0001>]TJ
+0.98 0 0 1 454.347 489.855 Tm [<002A>]TJ
+1 0 0 1 458.079 489.855 Tm [<0001>]TJ
+0.98 0 0 1 460.216 489.855 Tm [<004F00460057>5<00460053>-8<005500490046004D004600540054>]TJ
+1 0 0 1 520.866 489.855 Tm [<0001>]TJ
+0.98 0 0 1 74.409 476.306 Tm [<00550049004A004F004C>]TJ
+1 0 0 1 99.907 476.306 Tm [<0001>]TJ
+0.98 0 0 1 102.083 476.306 Tm [<0055004900420055>]TJ
+1 0 0 1 121.519 476.306 Tm [<0001>]TJ
+0.98 0 0 1 123.695 476.306 Tm [<005500490046>]TJ
+1 0 0 1 139.357 476.306 Tm [<0001>]TJ
+0.98 0 0 1 141.532 476.306 Tm [<004D00560042>]TJ
+1 0 0 1 156.585 476.306 Tm [<0001>]TJ
+0.98 0 0 1 158.761 476.306 Tm [<004E005000450046>]TJ
+1 0 0 1 186.686 476.306 Tm [<0001>]TJ
+0.98 0 0 1 188.861 476.306 Tm [<004A0054>]TJ
+1 0 0 1 196.633 476.306 Tm [<0001>]TJ
+0.98 0 0 1 198.809 476.306 Tm [<005500490046>]TJ
+1 0 0 1 214.471 476.306 Tm [<0001>]TJ
+0.98 0 0 1 216.647 476.306 Tm [<00470056005500560053>20<0046>]TJ
+1 0 0 1 246.124 476.306 Tm [<0001>]TJ
+0.98 0 0 1 248.299 476.306 Tm [<0042004F0045>]TJ
+1 0 0 1 266.902 476.306 Tm [<0001>]TJ
+0.98 0 0 1 269.077 476.306 Tm [<005500490046>]TJ
+1 0 0 1 284.739 476.306 Tm [<0001>]TJ
+0.98 0 0 1 286.915 476.306 Tm [<0050004F004D005A>]TJ
+1 0 0 1 308.094 476.306 Tm [<0001>]TJ
+0.98 0 0 1 310.269 476.306 Tm [<0050004F0046>]TJ
+1 0 0 1 328.551 476.306 Tm [<0001>]TJ
+0.98 0 0 1 330.726 476.306 Tm [<0055004900420055>]TJ
+1 0 0 1 350.162 476.306 Tm [<0001>]TJ
+0.98 0 0 1 352.338 476.306 Tm [<0058004A004D004D>]TJ
+1 0 0 1 369.625 476.306 Tm [<0001>]TJ
+0.98 0 0 1 371.801 476.306 Tm [<00430046>]TJ
+1 0 0 1 383.689 476.306 Tm [<0001>]TJ
+0.98 0 0 1 385.865 476.306 Tm [<0056005400420043004D0046>]TJ
+1 0 0 1 417.467 476.306 Tm [<0001>]TJ
+0.98 0 0 1 419.643 476.306 Tm [<004700500053>]TJ
+1 0 0 1 433.381 476.306 Tm [<0001>]TJ
+0.98 0 0 1 435.556 476.306 Tm [<004D00420053>6<004800460053>]TJ
+1 0 0 1 463.436 476.306 Tm [<0001>]TJ
+0.98 0 0 1 465.611 476.306 Tm [<0045005000440056004E0046004F00550054>20<000F>]TJ
+1 0 0 1 520.866 476.306 Tm [<0001>]TJ
+1.006 0 0 1 74.409 462.757 Tm [<003100250027>]TJ
+1 0 0 1 95.909 462.757 Tm [<0001>]TJ
+1.006 0 0 1 98.357 462.757 Tm [<004A0054>]TJ
+1 0 0 1 106.335 462.757 Tm [<0001>]TJ
+1.006 0 0 1 108.783 462.757 Tm [<0042>]TJ
+1 0 0 1 114.523 462.757 Tm [<0001>]TJ
+1.006 0 0 1 116.971 462.757 Tm [<0051004200480046>]TJ
+1 0 0 1 140.731 462.757 Tm [<0001>]TJ
+1.006 0 0 1 143.179 462.757 Tm [<00500053>-8<004A0046004F00550042005500460045>]TJ
+1 0 0 1 194.991 462.757 Tm [<0001>]TJ
+1.006 0 0 1 197.439 462.757 Tm [<004700500053>-7<004E00420055>]TJ
+1 0 0 1 231.273 462.757 Tm [<0001>]TJ
+1.006 0 0 1 233.721 462.757 Tm [<0042004F0045>]TJ
+1 0 0 1 252.817 462.757 Tm [<0001>]TJ
+1.006 0 0 1 255.265 462.757 Tm [<00540050>]TJ
+1 0 0 1 266.382 462.757 Tm [<0001>]TJ
+1.006 0 0 1 268.83 462.757 Tm [<005500490046>]TJ
+1 0 0 1 284.908 462.757 Tm [<0001>]TJ
+1.006 0 0 1 287.356 462.757 Tm [<00420043004A004D004A0055005A>]TJ
+1 0 0 1 318.436 462.757 Tm [<0001>]TJ
+1.006 0 0 1 320.884 462.757 Tm [<00500047>]TJ
+1 0 0 1 330.717 462.757 Tm [<0001>]TJ
+1.006 0 0 1 333.165 462.757 Tm [<004D00560042005500460059>]TJ
+1 0 0 1 363.367 462.757 Tm [<0001>]TJ
+1.006 0 0 1 365.815 462.757 Tm [<00550050>]TJ
+1 0 0 1 375.923 462.757 Tm [<0001>]TJ
+1.006 0 0 1 378.371 462.757 Tm [<004E0042004F004A00510056004D004200550046>]TJ
+1 0 0 1 435.767 462.757 Tm [<0001>]TJ
+1.006 0 0 1 438.215 462.757 Tm [<00510042004800460054>]TJ
+1 0 0 1 466.76 462.757 Tm [<0001>]TJ
+1.006 0 0 1 469.208 462.757 Tm [<0042004F0045>]TJ
+1 0 0 1 488.304 462.757 Tm [<0001>]TJ
+1.006 0 0 1 490.752 462.757 Tm [<004F0050004500460054>]TJ
+1 0 0 1 520.866 462.757 Tm [<0001>]TJ
+0.98 0 0 1 74.409 449.207 Tm [<00420047005500460053>]TJ
+1 0 0 1 96.743 449.207 Tm [<0001>]TJ
+0.98 0 0 1 99.123 449.207 Tm [<005500490046>]TJ
+1 0 0 1 114.785 449.207 Tm [<0001>]TJ
+0.98 0 0 1 117.166 449.207 Tm [<0035>]TJ
+1 0 0 1 121.986 446.535 Tm [<0026>]TJ
+0.98 0 0 1 127.233 449.207 Tm [<0039000E00510053>6<00500044004600540054004A004F0048>]TJ
+1 0 0 1 190.264 449.207 Tm [<0001>]TJ
+0.98 0 0 1 192.645 449.207 Tm [<004A0054>]TJ
+1 0 0 1 200.417 449.207 Tm [<0001>]TJ
+0.98 0 0 1 202.797 449.207 Tm [<0053>20<00460042004D004D005A>]TJ
+1 0 0 1 229.195 449.207 Tm [<0001>]TJ
+0.98 0 0 1 231.575 449.207 Tm [<00560054004600470056004D>]TJ
+1 0 0 1 261.082 449.207 Tm [<0001>]TJ
+0.98 0 0 1 263.462 449.207 Tm [<004900460053>20<0046>21<000F>]TJ
+1 0 0 1 287.489 449.207 Tm [<0001>]TJ
+0.98 0 0 1 290.737 449.207 Tm [<0022004D00540050>]TJ
+1 0 0 1 311.338 449.207 Tm [<0001>]TJ
+0.98 0 0 1 313.719 449.207 Tm [<0058004A00550049>]TJ
+1 0 0 1 335.207 449.207 Tm [<0001>]TJ
+0.98 0 0 1 337.588 449.207 Tm [<004D00560042005500460059>]TJ
+1 0 0 1 367.009 449.207 Tm [<0001>]TJ
+0.98 0 0 1 369.389 449.207 Tm [<0044004900420053>10<004200440055004600530054>]TJ
+1 0 0 1 419.709 449.207 Tm [<0001>]TJ
+0.98 0 0 1 422.089 449.207 Tm [<00420053>20<0046>]TJ
+1 0 0 1 437.112 449.207 Tm [<0001>]TJ
+0.98 0 0 1 439.492 449.207 Tm [<004F00500053>-8<004E0042004D004D005A>]TJ
+1 0 0 1 483.359 449.207 Tm [<0001>]TJ
+0.98 0 0 1 485.739 449.207 Tm [<0042004D0053>20<004600420045005A>]TJ
+1 0 0 1 520.866 449.207 Tm [<0001>]TJ
+1 0 0 1 74.409 435.658 Tm [<0048004A0057>5<0046004F00010042005400010056004F004A0044005000450046>20<000F>]TJ
ET
EMC
/Artifact BMC
+1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
+BT
+/F68 5.97758 Tf
+1 0 0 1 159.479 435.658 Tm [<000100190012>]TJ
0 g 0 G
+ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 411.112 Tm [<0012001700140001>]TJ
+1 0 0 1 66.728 415.334 Tm [<001900130001>]TJ
0 g 0 G
ET
EMC
-/P<</MCID 12>> BDC
+/P<</MCID 10>> BDC
BT
/F68 10.90909 Tf
-1.01 0 0 1 74.409 411.112 Tm [<003500490046>]TJ
-1 0 0 1 93.603 411.112 Tm [<0001>]TJ
-1.01 0 0 1 96.068 411.112 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 136.924 411.112 Tm [<0001>]TJ
-1.01 0 0 1 139.389 411.112 Tm [<005800500053>6<004C0054>]TJ
-1 0 0 1 169.005 411.112 Tm [<0001>]TJ
-1.01 0 0 1 171.47 411.112 Tm [<0044005600530053>20<0046004F0055004D005A>]TJ
-1 0 0 1 216.885 411.112 Tm [<0001>]TJ
-1.01 0 0 1 219.35 411.112 Tm [<0058004A00550049>]TJ
-1 0 0 1 241.496 411.112 Tm [<0001>]TJ
-1.01 0 0 1 243.962 411.112 Tm [<00510045056E0042005500460059>]TJ
-1 0 0 1 284.542 411.112 Tm [<0001>]TJ
-1.01 0 0 1 287.007 411.112 Tm [<0042004F0045>]TJ
-1 0 0 1 306.178 411.112 Tm [<0001>]TJ
-1.01 0 0 1 308.643 411.112 Tm [<004D00560042004D0042005500460059000F>]TJ
-1 0 0 1 350.722 411.112 Tm [<0001>]TJ
-1.01 0 0 1 354.026 411.112 Tm [<0027>10<004A005300540055>]TJ
-1 0 0 1 376.392 411.112 Tm [<0001>]TJ
-1.01 0 0 1 378.857 411.112 Tm [<00540055004600510054>]TJ
-1 0 0 1 404.618 411.112 Tm [<0001>]TJ
-1.01 0 0 1 407.083 411.112 Tm [<004900420057>5<0046>]TJ
-1 0 0 1 430.694 411.112 Tm [<0001>]TJ
-1.01 0 0 1 433.159 411.112 Tm [<004300460046004F>]TJ
-1 0 0 1 457.895 411.112 Tm [<0001>]TJ
-1.01 0 0 1 460.36 411.112 Tm [<00450050004F0046>]TJ
-1 0 0 1 485.79 411.112 Tm [<0001>]TJ
-1.01 0 0 1 488.255 411.112 Tm [<00550050>]TJ
-1 0 0 1 498.403 411.112 Tm [<0001>]TJ
-1.01 0 0 1 500.868 411.112 Tm [<0042004D00540050>]TJ
-1 0 0 1 520.866 411.112 Tm [<0001>]TJ
-1 0 0 1 74.409 397.563 Tm [<0046004F00420043004D00460001005400560051005100500053>-8<00550001004700500053000100590046004D004200550046005900010042004F004500010055004900460001004D0042005500460059000E00450057004A00510054000E0053>6<0050005600550046001C0001004300560055000100550049004A00540001004A0054004F>80<0445>75<00550001005A>6<004600550001004E0056004400490001005500460054005500460045000F>]TJ
+0.994 0 0 1 74.409 415.334 Tm [<003500490046>]TJ
+1 0 0 1 93.299 415.334 Tm [<0001>]TJ
+0.994 0 0 1 95.764 415.334 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 135.972 415.334 Tm [<0001>]TJ
+0.994 0 0 1 138.438 415.334 Tm [<0056005400460054>]TJ
+1 0 0 1 160.038 415.334 Tm [<0001>]TJ
+0.994 0 0 1 162.503 415.334 Tm [<00520056004A00550046>]TJ
+1 0 0 1 187.943 415.334 Tm [<0001>]TJ
+0.994 0 0 1 190.408 415.334 Tm [<0042>]TJ
+1 0 0 1 196.079 415.334 Tm [<0001>]TJ
+0.994 0 0 1 198.544 415.334 Tm [<004D00500055>]TJ
+1 0 0 1 211.557 415.334 Tm [<0001>]TJ
+0.994 0 0 1 214.022 415.334 Tm [<004D004200430046004D0054>]TJ
+1 0 0 1 242.53 415.334 Tm [<0001>]TJ
+0.994 0 0 1 244.995 415.334 Tm [<0009004A004F>]TJ
+1 0 0 1 258.658 415.334 Tm [<0001>]TJ
+0.994 0 0 1 261.123 415.334 Tm [<00480046004F00460053>-8<004A0044>]TJ
+1 0 0 1 297.462 415.334 Tm [<0001>]TJ
+0.994 0 0 1 299.928 415.334 Tm [<004E005000450046>]TJ
+1 0 0 1 328.251 415.334 Tm [<0001>]TJ
+0.994 0 0 1 330.716 415.334 Tm [<004E00500053>20<0046>]TJ
+1 0 0 1 356.551 415.334 Tm [<0001>]TJ
+0.994 0 0 1 359.016 415.334 Tm [<005500490042004F>]TJ
+1 0 0 1 381.712 415.334 Tm [<0001>]TJ
+0.994 0 0 1 384.177 415.334 Tm [<0058004A00550049>]TJ
+1 0 0 1 405.973 415.334 Tm [<0001>]TJ
+0.994 0 0 1 408.438 415.334 Tm [<004D00560042004E005000450046000A000F>]TJ
+1 0 0 1 458.698 415.334 Tm [<0001>]TJ
+0.994 0 0 1 462.003 415.334 Tm [<0022>12<0055>]TJ
+1 0 0 1 472.485 415.334 Tm [<0001>]TJ
+0.994 0 0 1 474.951 415.334 Tm [<005500490046>]TJ
+1 0 0 1 490.836 415.334 Tm [<0001>]TJ
+0.994 0 0 1 493.302 415.334 Tm [<004300460048004A004F>]TJ
+1 0 0 1 520.866 415.334 Tm [<0001>]TJ
+1.009 0 0 1 74.409 401.785 Tm [<004A0055>]TJ
+1 0 0 1 81.399 401.785 Tm [<0001>]TJ
+1.009 0 0 1 83.866 401.785 Tm [<0053>20<0046004D004A00460045>]TJ
+1 0 0 1 112.097 401.785 Tm [<0001>]TJ
+1.009 0 0 1 114.564 401.785 Tm [<0050004F>]TJ
+1 0 0 1 127.728 401.785 Tm [<0001>]TJ
+1.009 0 0 1 130.195 401.785 Tm [<005500490046>]TJ
+1 0 0 1 146.321 401.785 Tm [<0001>]TJ
+/F71 10.90909 Tf
+1 0 0 1 148.787 401.785 Tm [<00780060003200370067>]TJ
+/F68 10.90909 Tf
+1.009 0 0 1 174.163 401.785 Tm [<005100420044004C004200480046>20<000D>]TJ
+1 0 0 1 217.672 401.785 Tm [<0001>]TJ
+1.009 0 0 1 220.142 401.785 Tm [<004300560055>]TJ
+1 0 0 1 237.181 401.785 Tm [<0001>]TJ
+1.009 0 0 1 239.648 401.785 Tm [<00540058004A00550044004900460045>]TJ
+1 0 0 1 284.271 401.785 Tm [<0001>]TJ
+1.009 0 0 1 286.738 401.785 Tm [<004F0050>30<0058>]TJ
+1 0 0 1 308.022 401.785 Tm [<0001>]TJ
+1.009 0 0 1 310.489 401.785 Tm [<00550050>]TJ
+1 0 0 1 320.627 401.785 Tm [<0001>]TJ
+1.009 0 0 1 323.093 401.785 Tm [<0042>]TJ
+1 0 0 1 328.85 401.785 Tm [<0001>]TJ
+1.009 0 0 1 331.317 401.785 Tm [<004F00460058>]TJ
+1 0 0 1 352.242 401.785 Tm [<0001>]TJ
+1.009 0 0 1 354.708 401.785 Tm [<00460059005100460053>-8<004A004E0046004F00550042004D>]TJ
+1 0 0 1 420.883 401.785 Tm [<0001>]TJ
+1.009 0 0 1 423.35 401.785 Tm [<004A004E0051004D0046004E0046004F005500420055004A0050004F>]TJ
+1 0 0 1 504.462 401.785 Tm [<0001>]TJ
+1.009 0 0 1 506.929 401.785 Tm [<004700500053>]TJ
+1 0 0 1 520.866 401.785 Tm [<0001>]TJ
+0.98 0 0 1 74.409 388.236 Tm [<004D004200430046004D0054>20<000F>]TJ
+1 0 0 1 105.126 388.236 Tm [<0001>]TJ
+0.98 0 0 1 108.256 388.236 Tm [<003500490046>]TJ
+1 0 0 1 126.88 388.236 Tm [<0001>]TJ
+0.98 0 0 1 128.906 388.236 Tm [<00450053>10<00420058004300420044004C>]TJ
+1 0 0 1 176.038 388.236 Tm [<0001>]TJ
+0.98 0 0 1 178.064 388.236 Tm [<00500047>]TJ
+1 0 0 1 187.644 388.236 Tm [<0001>]TJ
+0.98 0 0 1 189.67 388.236 Tm [<005500490046>]TJ
+1 0 0 1 205.332 388.236 Tm [<0001>]TJ
+0.98 0 0 1 207.358 388.236 Tm [<004F00460058>]TJ
+1 0 0 1 227.682 388.236 Tm [<0001>]TJ
+0.98 0 0 1 229.708 388.236 Tm [<004E00460055004900500045>]TJ
+1 0 0 1 267.8 388.236 Tm [<0001>]TJ
+0.98 0 0 1 269.826 388.236 Tm [<004A0054>]TJ
+1 0 0 1 277.599 388.236 Tm [<0001>]TJ
+0.98 0 0 1 279.625 388.236 Tm [<0055004900420055>]TJ
+1 0 0 1 299.061 388.236 Tm [<0001>]TJ
+0.98 0 0 1 301.087 388.236 Tm [<005500490046005A>]TJ
+1 0 0 1 322.159 388.236 Tm [<0001>]TJ
+0.98 0 0 1 324.186 388.236 Tm [<00450050004F>83<0445>78<0055>]TJ
+1 0 0 1 348.29 388.236 Tm [<0001>]TJ
+0.98 0 0 1 350.316 388.236 Tm [<0048004A0057>5<0046>]TJ
+1 0 0 1 369.814 388.236 Tm [<0001>]TJ
+0.98 0 0 1 371.841 388.236 Tm [<005A>6<00460055>]TJ
+1 0 0 1 386.356 388.236 Tm [<0001>]TJ
+0.98 0 0 1 388.383 388.236 Tm [<0048005000500045>]TJ
+1 0 0 1 412.672 388.236 Tm [<0001>]TJ
+0.98 0 0 1 414.699 388.236 Tm [<0053>20<00460053>-7<0056004F>]TJ
+1 0 0 1 441.474 388.236 Tm [<0001>]TJ
+0.98 0 0 1 443.501 388.236 Tm [<004E0046005400540042004800460054>]TJ
+1 0 0 1 489.493 388.236 Tm [<0001>]TJ
+0.98 0 0 1 491.519 388.236 Tm [<004A0047>]TJ
+1 0 0 1 498.041 388.236 Tm [<0001>]TJ
+0.98 0 0 1 500.067 388.236 Tm [<005500490046005A>]TJ
+1 0 0 1 520.866 388.236 Tm [<0001>]TJ
+1 0 0 1 74.409 374.687 Tm [<004900420057>5<00460001004400490042004F004800460045000F0001>-75<002A0001004200450057004A00540046000100550050000100560054004600010055004900460001>]TJ
+/F71 10.90909 Tf
+1 0 0 1 239.049 374.687 Tm [<006000320060006D004D0037004200480032002B003F0032002B00460067>]TJ
+/F68 10.90909 Tf
+1 0 0 1 321.686 374.687 Tm [<005100420044004C004200480046000100420054000100420001004A004F005500460053>-8<004E00460045004A0042005500460001005800500053>6<004C000E00420053>6<00500056004F0045000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 478.689 397.563 Tm [<0001001200170014>]TJ
+1 0 0 1 519.98 374.687 Tm [<000100190013>]TJ
0 g 0 G
ET
EMC
/Artifact BMC
+0 g 0 G
+EMC
+/H2<</MCID 11>> BDC
+BT
+/F65 11.95517 Tf
+1 0 0 1 74.409 336.592 Tm [<006B0058006A00580067>]TJ
+ET
+EMC
+/H2<</MCID 12>> BDC
+BT
+/F65 11.95517 Tf
+1 0 0 1 100.854 336.592 Tm [<005F00320037003200600032004D002B003200620067001C004D002F00670069001C>31<0060003B0032006900670053002E00360067007000320060006200420051004D>]TJ
+ET
+EMC
+/Artifact BMC
+0 g 0 G
+EMC
+/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 377.239 Tm [<0012001700150001>]TJ
+1 0 0 1 66.728 308.25 Tm [<001900140001>]TJ
0 g 0 G
ET
EMC
/P<</MCID 13>> BDC
BT
/F68 10.90909 Tf
-0.98 0 0 1 74.409 377.239 Tm [<003500490046>]TJ
-1 0 0 1 93.033 377.239 Tm [<0001>]TJ
-0.98 0 0 1 95.114 377.239 Tm [<005100420044004C004200480046>]TJ
-1 0 0 1 134.756 377.239 Tm [<0001>]TJ
-0.98 0 0 1 136.837 377.239 Tm [<004900420054>]TJ
-1 0 0 1 153.579 377.239 Tm [<0001>]TJ
-0.98 0 0 1 155.66 377.239 Tm [<005500580050>]TJ
-1 0 0 1 173.717 377.239 Tm [<0001>]TJ
-0.98 0 0 1 175.798 377.239 Tm [<004E0050004500460054001B>]TJ
-1 0 0 1 211.217 377.239 Tm [<0001>]TJ
-0.98 0 0 1 214.303 377.239 Tm [<005500490046>]TJ
-1 0 0 1 229.965 377.239 Tm [<0001>]TJ
-/F69 10.90909 Tf
-0.98 0 0 1 232.046 377.239 Tm [<00480046004F00460053004A0044>]TJ
-1 0 0 1 266.075 377.239 Tm [<0001>]TJ
-0.98 0 0 1 268.156 377.239 Tm [<004E005000450046>]TJ
-1 0 0 1 295.562 377.239 Tm [<0001>]TJ
-/F68 10.90909 Tf
-0.98 0 0 1 297.643 377.239 Tm [<00580049004A00440049>]TJ
-1 0 0 1 327.246 377.239 Tm [<0001>]TJ
-0.98 0 0 1 329.327 377.239 Tm [<0054004900500056004D0045>]TJ
-1 0 0 1 362.501 377.239 Tm [<0001>]TJ
-0.98 0 0 1 364.582 377.239 Tm [<005800500053>6<004C>]TJ
-1 0 0 1 388.656 377.239 Tm [<0001>]TJ
-0.98 0 0 1 390.737 377.239 Tm [<004A004F>]TJ
-1 0 0 1 400.465 377.239 Tm [<0001>]TJ
-0.98 0 0 1 402.546 377.239 Tm [<00550049004600500053>-18<005A>]TJ
-1 0 0 1 434.146 377.239 Tm [<0001>]TJ
-0.98 0 0 1 436.227 377.239 Tm [<0058004A00550049>]TJ
-1 0 0 1 457.716 377.239 Tm [<0001>]TJ
-0.98 0 0 1 459.797 377.239 Tm [<00460057>5<00460053>-18<005A>]TJ
-1 0 0 1 485.889 377.239 Tm [<0001>]TJ
-0.98 0 0 1 487.97 377.239 Tm [<0046004F0048004A004F0046>]TJ
-1 0 0 1 520.866 377.239 Tm [<0001>]TJ
-1 0 0 1 74.409 363.69 Tm [<0042004F004500010055004900460001>]TJ
-/F69 10.90909 Tf
-1 0 0 1 114.282 363.69 Tm [<004D005600420001004E005000450046>-73<0001>]TJ
-/F68 10.90909 Tf
-1 0 0 1 163.34 363.69 Tm [<00580049004A004400490001005800500053>6<004C005400010050004F004D005A00010058004A005500490001004D00560042004D0042005500460059000F>]TJ
+0.981 0 0 1 74.409 308.25 Tm [<002E>24<005A>]TJ
+1 0 0 1 89.66 308.25 Tm [<0001>]TJ
+0.981 0 0 1 92.117 308.25 Tm [<004E0042004A004F>]TJ
+1 0 0 1 117.331 308.25 Tm [<0001>]TJ
+0.981 0 0 1 119.788 308.25 Tm [<0053>20<0046004700460053>21<0046004F00440046>]TJ
+1 0 0 1 165.022 308.25 Tm [<0001>]TJ
+0.981 0 0 1 167.48 308.25 Tm [<004700500053>]TJ
+1 0 0 1 181.231 308.25 Tm [<0001>]TJ
+0.981 0 0 1 183.689 308.25 Tm [<005500490046>]TJ
+1 0 0 1 199.367 308.25 Tm [<0001>]TJ
+0.981 0 0 1 201.824 308.25 Tm [<056D005300540055>]TJ
+1 0 0 1 220.862 308.25 Tm [<0001>]TJ
+0.981 0 0 1 223.32 308.25 Tm [<0057>5<004600530054004A0050004F0054>]TJ
+1 0 0 1 263.567 308.25 Tm [<0001>]TJ
+0.981 0 0 1 266.024 308.25 Tm [<00500047>]TJ
+1 0 0 1 275.613 308.25 Tm [<0001>]TJ
+0.981 0 0 1 278.07 308.25 Tm [<00550049004A0054>]TJ
+1 0 0 1 296.028 308.25 Tm [<0001>]TJ
+0.981 0 0 1 298.485 308.25 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 338.167 308.25 Tm [<0001>]TJ
+0.981 0 0 1 340.624 308.25 Tm [<005800420054>]TJ
+1 0 0 1 359.106 308.25 Tm [<0001>]TJ
+0.981 0 0 1 361.564 308.25 Tm [<005500490046>]TJ
+1 0 0 1 377.242 308.25 Tm [<0001>]TJ
+0.981 0 0 1 379.699 308.25 Tm [<00470053>20<00460046>]TJ
+1 0 0 1 398.055 308.25 Tm [<0001>]TJ
+0.981 0 0 1 400.512 308.25 Tm [<0053>20<0046004700460053>21<0046004F00440046>]TJ
+1 0 0 1 445.746 308.25 Tm [<0001>]TJ
+0.981 0 0 1 448.204 308.25 Tm [<004700500053>]TJ
+1 0 0 1 461.955 308.25 Tm [<0001>]TJ
+0.981 0 0 1 464.413 308.25 Tm [<003100250027>]TJ
+1 0 0 1 485.377 308.25 Tm [<0001>]TJ
+0.981 0 0 1 487.835 308.25 Tm [<0012000F0018000F>]TJ
+1 0 0 1 504.85 308.25 Tm [<0001>]TJ
+0.981 0 0 1 508.131 308.25 Tm [<003C0013003E>]TJ
+1 0 0 1 520.866 308.25 Tm [<0001>]TJ
+1 0 0 1 74.409 294.701 Tm [<0042004F004500010054005000010055004900460001005100420044004C00420048004600010042004D005400500001005500420053>6<004800460055005500460045000100550049004A005400010057>5<004600530054004A0050004F000F>]TJ
ET
EMC
/Artifact BMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 317.889 363.69 Tm [<0001001200170015>]TJ
+1 0 0 1 299.878 294.701 Tm [<000100190014>]TJ
0 g 0 G
ET
EMC
@@ -4973,384 +5354,295 @@ EMC
1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
BT
/F68 5.97758 Tf
-1 0 0 1 63.56 343.366 Tm [<0012001700160001>]TJ
+1 0 0 1 66.728 274.377 Tm [<001900150001>]TJ
0 g 0 G
ET
EMC
/P<</MCID 14>> BDC
BT
/F68 10.90909 Tf
-1.02 0 0 1 74.409 343.366 Tm [<002A>]TJ
-1 0 0 1 78.293 343.366 Tm [<0001>]TJ
-1.02 0 0 1 81.038 343.366 Tm [<004A004E0051004D0046004E0046004F005500460045>]TJ
-1 0 0 1 149.215 343.366 Tm [<0001>]TJ
-1.02 0 0 1 151.96 343.366 Tm [<005500490046>]TJ
-1 0 0 1 168.261 343.366 Tm [<0001>]TJ
-1.02 0 0 1 171.007 343.366 Tm [<00480046004F00460053>-8<004A0044>]TJ
-1 0 0 1 208.294 343.366 Tm [<0001>]TJ
-1.02 0 0 1 211.039 343.366 Tm [<004E005000450046>]TJ
-1 0 0 1 240.104 343.366 Tm [<0001>]TJ
-1.02 0 0 1 242.849 343.366 Tm [<056D005300540055000F>]TJ
-1 0 0 1 265.593 343.366 Tm [<0001>]TJ
-1.02 0 0 1 269.738 343.366 Tm [<002E>30<005000540055004D005A>]TJ
-1 0 0 1 303.743 343.366 Tm [<0001>]TJ
-1.02 0 0 1 306.488 343.366 Tm [<0043004600440042005600540046>]TJ
-1 0 0 1 347.514 343.366 Tm [<0001>]TJ
-1.02 0 0 1 350.26 343.366 Tm [<004E005A>]TJ
-1 0 0 1 366.161 343.366 Tm [<0001>]TJ
-1.02 0 0 1 368.906 343.366 Tm [<005500460059>]TJ
-1 0 0 1 383.861 343.366 Tm [<0001>]TJ
-1.02 0 0 1 386.606 343.366 Tm [<0054004C004A004D004D0054>]TJ
-1 0 0 1 411.587 343.366 Tm [<0001>]TJ
-1.02 0 0 1 414.332 343.366 Tm [<00420053>20<0046>]TJ
-1 0 0 1 429.977 343.366 Tm [<0001>]TJ
-1.02 0 0 1 432.722 343.366 Tm [<004E005600440049>]TJ
-1 0 0 1 462.009 343.366 Tm [<0001>]TJ
-1.02 0 0 1 464.755 343.366 Tm [<004300460055005500460053>]TJ
-1 0 0 1 494.832 343.366 Tm [<0001>]TJ
-1.02 0 0 1 497.577 343.366 Tm [<005500490042004F>]TJ
-1 0 0 1 520.866 343.366 Tm [<0001>]TJ
-0.992 0 0 1 74.409 329.817 Tm [<004E005A>]TJ
-1 0 0 1 89.874 329.817 Tm [<0001>]TJ
-0.992 0 0 1 92.338 329.817 Tm [<004D00560042>]TJ
-1 0 0 1 107.575 329.817 Tm [<0001>]TJ
-0.992 0 0 1 110.039 329.817 Tm [<0054004C004A004D004D0054>]TJ
-1 0 0 1 134.334 329.817 Tm [<0001>]TJ
-0.992 0 0 1 136.797 329.817 Tm [<0042004F0045>]TJ
-1 0 0 1 155.627 329.817 Tm [<0001>]TJ
-0.992 0 0 1 158.091 329.817 Tm [<002A>]TJ
-1 0 0 1 161.868 329.817 Tm [<0001>]TJ
-0.992 0 0 1 164.332 329.817 Tm [<00580042004F005500460045>]TJ
-1 0 0 1 200.758 329.817 Tm [<0001>]TJ
-0.992 0 0 1 203.222 329.817 Tm [<00550050>]TJ
-1 0 0 1 213.189 329.817 Tm [<0001>]TJ
-0.992 0 0 1 215.653 329.817 Tm [<004800460055>]TJ
-1 0 0 1 230.565 329.817 Tm [<0001>]TJ
-0.992 0 0 1 233.029 329.817 Tm [<005500490046>]TJ
-1 0 0 1 248.883 329.817 Tm [<0001>]TJ
-0.992 0 0 1 251.347 329.817 Tm [<005500460059>]TJ
-1 0 0 1 265.891 329.817 Tm [<0001>]TJ
-0.992 0 0 1 268.355 329.817 Tm [<0054004A00450046>]TJ
-1 0 0 1 288.257 329.817 Tm [<0001>]TJ
-0.992 0 0 1 290.72 329.817 Tm [<0053>-8<004A004800490055>]TJ
-1 0 0 1 314.087 329.817 Tm [<0001>]TJ
-0.992 0 0 1 316.551 329.817 Tm [<00430046004700500053>20<0046>]TJ
-1 0 0 1 347.831 329.817 Tm [<0001>]TJ
-0.992 0 0 1 350.295 329.817 Tm [<0054005500420053>-8<0055004A004F0048>]TJ
-1 0 0 1 387.892 329.817 Tm [<0001>]TJ
-0.992 0 0 1 390.356 329.817 Tm [<00550050>]TJ
-1 0 0 1 400.323 329.817 Tm [<0001>]TJ
-0.992 0 0 1 402.787 329.817 Tm [<056D004800490055>]TJ
-1 0 0 1 425.307 329.817 Tm [<0001>]TJ
-0.992 0 0 1 427.771 329.817 Tm [<0058004A00550049>]TJ
-1 0 0 1 449.523 329.817 Tm [<0001>]TJ
-0.992 0 0 1 451.986 329.817 Tm [<0042005500550053>-8<004A00430056005500460054>]TJ
-1 0 0 1 499.572 329.817 Tm [<0001>]TJ
-0.992 0 0 1 502.036 329.817 Tm [<0042004F0045>]TJ
-1 0 0 1 520.866 329.817 Tm [<0001>]TJ
-1 0 0 1 74.409 316.268 Tm [<004F005000450046000100550053>10<00420057>5<004600530054004A004F0048000F>]TJ
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 154.177 316.268 Tm [<0001001200170016>]TJ
-0 g 0 G
-ET
-EMC
-/Artifact BMC
-1.0 0.0 0.0 rg 1.0 0.0 0.0 RG
-BT
-/F68 5.97758 Tf
-1 0 0 1 63.56 295.944 Tm [<0012001700170001>]TJ
+1.004 0 0 1 74.409 274.377 Tm [<002A>18<004F>]TJ
+1 0 0 1 84.811 274.377 Tm [<0001>]TJ
+1.004 0 0 1 87.258 274.377 Tm [<0013001100120019>]TJ
+1 0 0 1 110.478 274.377 Tm [<0001>]TJ
+1.004 0 0 1 112.925 274.377 Tm [<003100250027>]TJ
+1 0 0 1 134.382 274.377 Tm [<0001>]TJ
+1.004 0 0 1 136.829 274.377 Tm [<0013000F0011000F>]TJ
+1 0 0 1 154.244 274.377 Tm [<0001>]TJ
+1.004 0 0 1 157.514 274.377 Tm [<004900420054>]TJ
+1 0 0 1 174.666 274.377 Tm [<0001>]TJ
+1.004 0 0 1 177.113 274.377 Tm [<004300460046004F>]TJ
+1 0 0 1 201.702 274.377 Tm [<0001>]TJ
+1.004 0 0 1 204.149 274.377 Tm [<0053>20<0046004D00460042005400460045000D>]TJ
+1 0 0 1 248.088 274.377 Tm [<0001>]TJ
+1.004 0 0 1 250.536 274.377 Tm [<0042004F0045>]TJ
+1 0 0 1 269.594 274.377 Tm [<0001>]TJ
+1.004 0 0 1 272.041 274.377 Tm [<0054004A004F00440046>]TJ
+1 0 0 1 297.846 274.377 Tm [<0001>]TJ
+1.004 0 0 1 300.293 274.377 Tm [<0013001100130011>]TJ
+1 0 0 1 323.513 274.377 Tm [<0001>]TJ
+1.004 0 0 1 325.96 274.377 Tm [<0042004D004D>]TJ
+1 0 0 1 337.8 274.377 Tm [<0001>]TJ
+1.004 0 0 1 340.247 274.377 Tm [<0046004F0048004A004F00460054>]TJ
+1 0 0 1 378.724 274.377 Tm [<0001>]TJ
+1.004 0 0 1 381.171 274.377 Tm [<00440042004F>]TJ
+1 0 0 1 399.111 274.377 Tm [<0001>]TJ
+1.004 0 0 1 401.558 274.377 Tm [<005400460055>]TJ
+1 0 0 1 415.731 274.377 Tm [<0001>]TJ
+1.004 0 0 1 418.178 274.377 Tm [<005500490046>]TJ
+1 0 0 1 434.224 274.377 Tm [<0001>]TJ
+1.004 0 0 1 436.671 274.377 Tm [<0057>5<004600530054004A0050004F>]TJ
+1 0 0 1 473.088 274.377 Tm [<0001>]TJ
+1.004 0 0 1 475.535 274.377 Tm [<00550050>]TJ
+1 0 0 1 485.622 274.377 Tm [<0001>]TJ
+1.004 0 0 1 488.07 274.377 Tm [<0013000F0011000F>]TJ
+1 0 0 1 505.484 274.377 Tm [<0001>]TJ
+1.004 0 0 1 508.755 274.377 Tm [<0034>12<0050>]TJ
+1 0 0 1 520.866 274.377 Tm [<0001>]TJ
+0.988 0 0 1 74.409 260.828 Tm [<005500490046>]TJ
+1 0 0 1 90.2 260.828 Tm [<0001>]TJ
+0.988 0 0 1 92.663 260.828 Tm [<005100420044004C004200480046>]TJ
+1 0 0 1 132.629 260.828 Tm [<0001>]TJ
+0.988 0 0 1 135.092 260.828 Tm [<0058004A004D004D>]TJ
+1 0 0 1 152.521 260.828 Tm [<0001>]TJ
+0.988 0 0 1 154.984 260.828 Tm [<004F0050>30<0058>]TJ
+1 0 0 1 175.819 260.828 Tm [<0001>]TJ
+0.988 0 0 1 178.282 260.828 Tm [<005500420053>6<004800460055>]TJ
+1 0 0 1 206.607 260.828 Tm [<0001>]TJ
+0.988 0 0 1 209.07 260.828 Tm [<003100250027>]TJ
+1 0 0 1 230.185 260.828 Tm [<0001>]TJ
+0.988 0 0 1 232.648 260.828 Tm [<0013000F0011000F>]TJ
+1 0 0 1 249.786 260.828 Tm [<0001>]TJ
+0.988 0 0 1 253.086 260.828 Tm [<00350049004A0054>]TJ
+1 0 0 1 274.157 260.828 Tm [<0001>]TJ
+0.988 0 0 1 276.621 260.828 Tm [<0045005000460054004F>82<0445>78<0055>]TJ
+1 0 0 1 311.175 260.828 Tm [<0001>]TJ
+0.988 0 0 1 313.639 260.828 Tm [<004E00460042004F>]TJ
+1 0 0 1 341.436 260.828 Tm [<0001>]TJ
+0.988 0 0 1 343.9 260.828 Tm [<0055004900420055>]TJ
+1 0 0 1 363.494 260.828 Tm [<0001>]TJ
+0.988 0 0 1 365.958 260.828 Tm [<0013000F0011>]TJ
+1 0 0 1 380.239 260.828 Tm [<0001>]TJ
+0.988 0 0 1 382.703 260.828 Tm [<0058004A004D004D>]TJ
+1 0 0 1 400.131 260.828 Tm [<0001>]TJ
+0.988 0 0 1 402.595 260.828 Tm [<00430046>]TJ
+1 0 0 1 414.58 260.828 Tm [<0001>]TJ
+0.988 0 0 1 417.044 260.828 Tm [<0053>20<004600520056004A0053>21<00460045000D>]TJ
+1 0 0 1 461.404 260.828 Tm [<0001>]TJ
+0.988 0 0 1 463.869 260.828 Tm [<004300560055>]TJ
+1 0 0 1 480.554 260.828 Tm [<0001>]TJ
+0.988 0 0 1 483.018 260.828 Tm [<0055004900420055>]TJ
+1 0 0 1 502.612 260.828 Tm [<0001>]TJ
+0.988 0 0 1 505.076 260.828 Tm [<005500490046>]TJ
+1 0 0 1 520.866 260.828 Tm [<0001>]TJ
+1.018 0 0 1 74.409 247.278 Tm [<0044005000450046>]TJ
+1 0 0 1 98.675 247.278 Tm [<0001>]TJ
+1.018 0 0 1 101.139 247.278 Tm [<0042004F0045>]TJ
+1 0 0 1 120.463 247.278 Tm [<0001>]TJ
+1.018 0 0 1 122.927 247.278 Tm [<005500490046>]TJ
+1 0 0 1 139.197 247.278 Tm [<0001>]TJ
+1.018 0 0 1 141.661 247.278 Tm [<005000510055004A0050004F0054>]TJ
+1 0 0 1 179.997 247.278 Tm [<0001>]TJ
+1.018 0 0 1 182.462 247.278 Tm [<0058004A004D004D>]TJ
+1 0 0 1 200.42 247.278 Tm [<0001>]TJ
+1.018 0 0 1 202.884 247.278 Tm [<00430046>]TJ
+1 0 0 1 215.233 247.278 Tm [<0001>]TJ
+1.018 0 0 1 217.698 247.278 Tm [<0046005900550046004F004500460045>]TJ
+1 0 0 1 264.196 247.278 Tm [<0001>]TJ
+1.018 0 0 1 266.661 247.278 Tm [<00550050>]TJ
+1 0 0 1 276.889 247.278 Tm [<0001>]TJ
+1.018 0 0 1 279.354 247.278 Tm [<005400560051005100500053>-8<0055>]TJ
+1 0 0 1 319.067 247.278 Tm [<0001>]TJ
+1.018 0 0 1 321.531 247.278 Tm [<003100250027>]TJ
+1 0 0 1 343.287 247.278 Tm [<0001>]TJ
+1.018 0 0 1 345.752 247.278 Tm [<0013000F0011000F>]TJ
+1 0 0 1 363.409 247.278 Tm [<0001>]TJ
+1.018 0 0 1 366.712 247.278 Tm [<0030>5<004F0046>]TJ
+1 0 0 1 387.701 247.278 Tm [<0001>]TJ
+1.018 0 0 1 390.166 247.278 Tm [<004600590042004E0051004D0046>]TJ
+1 0 0 1 432.888 247.278 Tm [<0001>]TJ
+1.018 0 0 1 435.353 247.278 Tm [<004A0054>]TJ
+1 0 0 1 443.427 247.278 Tm [<0001>]TJ
+1.018 0 0 1 445.891 247.278 Tm [<005500490046>]TJ
+1 0 0 1 462.161 247.278 Tm [<0001>]TJ
+1.018 0 0 1 464.625 247.278 Tm [<005400560051005100500053>-8<0055>]TJ
+1 0 0 1 504.338 247.278 Tm [<0001>]TJ
+1.018 0 0 1 506.803 247.278 Tm [<004700500053>]TJ
+1 0 0 1 520.866 247.278 Tm [<0001>]TJ
+1 0 0 1 74.409 233.729 Tm [<00420054005400500044004A00420055004600450001056D004D00460054>10<000D00010042004F0050005500490046005300010055004900460001005400560051005100500053>-8<005500010047005000530001004F0042004E00460001005