summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-08-05 03:01:02 +0000
committerNorbert Preining <norbert@preining.info>2022-08-05 03:01:02 +0000
commit572dc806dd00d29ab418ec6deaa36762d1d59ae6 (patch)
tree0e2e600cc1d97a77661ee9976baa119ea8206854
parent6cb109095c2e8fd355cda8b1996dee2f9e12d8a0 (diff)
CTAN sync 202208050301
-rw-r--r--FILES.byname407
-rw-r--r--FILES.byname.gzbin2446399 -> 2446454 bytes
-rw-r--r--FILES.last07days414
-rw-r--r--macros/generic/olsak-misc/README1
-rw-r--r--macros/generic/olsak-misc/cropmarks.tex52
-rw-r--r--macros/latex/contrib/animate/ChangeLog4
-rw-r--r--macros/latex/contrib/animate/animate.pdf1491
-rw-r--r--macros/latex/contrib/animate/animate.sty1393
-rw-r--r--macros/latex/contrib/animate/animate.tex7
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem-doc.pdfbin67899 -> 71867 bytes
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem-doc.tex86
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem.sty26
-rw-r--r--macros/latex/contrib/media4svg/ChangeLog8
-rw-r--r--macros/latex/contrib/media4svg/README.md2
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-1.svg92
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-2.svg40
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-3.svg34
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-4.svg332
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example.tex3
-rw-r--r--macros/latex/contrib/media4svg/media4svg.sty45
-rw-r--r--macros/latex/contrib/media9/ChangeLog5
-rw-r--r--macros/latex/contrib/media9/doc/media9.pdfbin3747996 -> 3660318 bytes
-rw-r--r--macros/latex/contrib/media9/doc/media9.tex15
-rw-r--r--macros/latex/contrib/media9/media9.sty94
-rw-r--r--macros/latex/contrib/media9/pdfbase.sty323
-rw-r--r--macros/latex/contrib/ocgx2/ChangeLog5
-rw-r--r--macros/latex/contrib/ocgx2/ocgbase.sty62
-rw-r--r--macros/latex/contrib/ocgx2/ocgx2.sty72
-rw-r--r--macros/latex/contrib/xsavebox/ChangeLog4
-rw-r--r--macros/latex/contrib/xsavebox/xsavebox.pdfbin378552 -> 378194 bytes
-rw-r--r--macros/latex/contrib/xsavebox/xsavebox.sty62
-rw-r--r--macros/latex/contrib/xsavebox/xsavebox.tex3
-rw-r--r--macros/optex/README4
-rw-r--r--macros/optex/base/alloc.opm5
-rw-r--r--macros/optex/base/doc.opm48
-rw-r--r--macros/optex/base/f-montserrat.opm34
-rw-r--r--macros/optex/base/f-overlock.opm27
-rw-r--r--macros/optex/base/f-stix.opm24
-rw-r--r--macros/optex/base/f-stixtwo.opm28
-rw-r--r--macros/optex/base/f-xits.opm25
-rw-r--r--macros/optex/base/fams-ini.opm22
-rw-r--r--macros/optex/base/fonts-catalog.opm4
-rw-r--r--macros/optex/base/if-macros.opm5
-rw-r--r--macros/optex/base/lang-data.opm78
-rw-r--r--macros/optex/base/lang-decl.opm2
-rw-r--r--macros/optex/base/makeindex.opm214
-rw-r--r--macros/optex/base/math-preload.opm30
-rw-r--r--macros/optex/base/math-unicode.opm106
-rw-r--r--macros/optex/base/more-macros.opm13
-rw-r--r--macros/optex/base/optex.ini2
-rw-r--r--macros/optex/base/parameters.opm4
-rw-r--r--macros/optex/base/pdfuni-string.opm7
-rw-r--r--macros/optex/base/print-unimath.opm3
-rw-r--r--macros/optex/base/sections.opm18
-rw-r--r--macros/optex/base/unimath-codes.opm5
-rw-r--r--macros/optex/doc/optex-doc.pdfbin1415023 -> 1437685 bytes
-rw-r--r--macros/optex/doc/optex-doc.tex2
-rw-r--r--macros/optex/doc/optex-math.tex46
-rw-r--r--macros/optex/doc/optex-userdoc.tex21
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl3
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb153
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2397292 -> 2395704 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
68 files changed, 3352 insertions, 2699 deletions
diff --git a/FILES.byname b/FILES.byname
index bc4f617a90..c4dc6a114e 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2042,7 +2042,7 @@
1989/12/11 | 6196 | biblio/tib/tib.man
1989/03/29 | 23265 | biblio/tib/vitaMake
2005/12/15 | 366385 | biblio/tib.zip
-2022/07/25 | 17864 | CTAN.sites
+2022/08/04 | 17854 | CTAN.sites
2022/07/31 | 45786 | customdice/customdice.dtx
2022/07/31 | 417 | customdice/customdice.ins
2022/07/31 | 369482 | customdice/customdice.pdf
@@ -5267,7 +5267,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2022/08/03 | 89246 | FILES.last07days
+2022/08/04 | 65687 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -188909,7 +188909,7 @@
2015/08/04 | 140785 | install/macros/latex/contrib/alertmessage.tds.zip
2019/12/09 | 365186 | install/macros/latex/contrib/alphalph.tds.zip
2013/03/08 | 2249874 | install/macros/latex/contrib/amsrefs.tds.zip
-2022/02/21 | 3225615 | install/macros/latex/contrib/animate.tds.zip
+2022/08/04 | 3225393 | install/macros/latex/contrib/animate.tds.zip
2014/08/24 | 220789 | install/macros/latex/contrib/answers.tds.zip
2020/01/15 | 195222 | install/macros/latex/contrib/ascmac.tds.zip
2010/03/20 | 235440 | install/macros/latex/contrib/asyfig.tds.zip
@@ -189076,8 +189076,8 @@
2022/06/29 | 1206727 | install/macros/latex/contrib/mathtools.tds.zip
2014/06/19 | 690439 | install/macros/latex/contrib/matlab-prettifier.tds.zip
2013/07/01 | 1898068 | install/macros/latex/contrib/mdframed.tds.zip
-2022/05/18 | 164746 | install/macros/latex/contrib/media4svg.tds.zip
-2022/03/18 | 7473523 | install/macros/latex/contrib/media9.tds.zip
+2022/08/04 | 164644 | install/macros/latex/contrib/media4svg.tds.zip
+2022/08/04 | 7385937 | install/macros/latex/contrib/media9.tds.zip
2022/07/29 | 3655356 | install/macros/latex/contrib/memoir.tds.zip
2020/08/06 | 24409080 | install/macros/latex/contrib/mercatormap.tds.zip
2021/10/15 | 722347 | install/macros/latex/contrib/mfirstuc.tds.zip
@@ -189106,7 +189106,7 @@
2011/09/20 | 179685 | install/macros/latex/contrib/nowidow.tds.zip
2022/02/21 | 7755210 | install/macros/latex/contrib/nwejm.tds.zip
2021/11/16 | 13455928 | install/macros/latex/contrib/oberdiek.tds.zip
-2022/04/01 | 34622 | install/macros/latex/contrib/ocgx2.tds.zip
+2022/08/04 | 34729 | install/macros/latex/contrib/ocgx2.tds.zip
2012/12/08 | 1025300 | install/macros/latex/contrib/ocgx.tds.zip
2017/05/29 | 424133 | install/macros/latex/contrib/pagecolor.tds.zip
2009/09/03 | 151471 | install/macros/latex/contrib/pagenote.tds.zip
@@ -189195,7 +189195,7 @@
2015/05/23 | 564970 | install/macros/latex/contrib/xpiano.tds.zip
2012/12/23 | 1365925 | install/macros/latex/contrib/xpicture.tds.zip
2022/07/14 | 572888 | install/macros/latex/contrib/xpinyin.tds.zip
-2022/03/10 | 386038 | install/macros/latex/contrib/xsavebox.tds.zip
+2022/08/04 | 385608 | install/macros/latex/contrib/xsavebox.tds.zip
2011/07/31 | 387124 | install/macros/latex/contrib/xtab.tds.zip
2009/02/27 | 2323785 | install/macros/latex/contrib/yagusylo.tds.zip
2022/06/13 | 12995687 | install/macros/latex/contrib/yathesis.tds.zip
@@ -197850,17 +197850,17 @@
2005/08/16 | 7427 | macros/generic/olsak-misc/cnv-pu.tex
2015/11/12 | 23178 | macros/generic/olsak-misc/cnv.tex
2005/08/11 | 5764 | macros/generic/olsak-misc/cnv-word.tex
-2022/06/14 | 6129 | macros/generic/olsak-misc/cropmarks.tex
+2022/06/16 | 8209 | macros/generic/olsak-misc/cropmarks.tex
2014/09/09 | 6866 | macros/generic/olsak-misc/eparam.tex
2015/04/08 | 128104 | macros/generic/olsak-misc/fun-coffee.tex
2014/08/22 | 3515 | macros/generic/olsak-misc/openclose.tex
2019/05/08 | 90622 | macros/generic/olsak-misc/qrcode.tex
-2022/06/14 | 1276 | macros/generic/olsak-misc/README
+2022/08/04 | 1322 | macros/generic/olsak-misc/README
2015/11/12 | 7468 | macros/generic/olsak-misc/scanbase.tex
2015/11/12 | 8484 | macros/generic/olsak-misc/scancsv.tex
2014/09/12 | 5807 | macros/generic/olsak-misc/seplist.tex
2016/06/12 | 9551 | macros/generic/olsak-misc/xmlparser.tex
-2022/06/14 | 92698 | macros/generic/olsak-misc.zip
+2022/08/04 | 93361 | macros/generic/olsak-misc.zip
2011/04/09 | 286904 | macros/generic/path/path-doc.pdf
2011/04/09 | 6067 | macros/generic/path/path-doc.tex
2011/04/07 | 14971 | macros/generic/path/path.sty
@@ -206394,10 +206394,10 @@
2007/10/11 | 13856 | macros/latex/contrib/analogclock/clock.ttf
2008/12/22 | 551 | macros/latex/contrib/analogclock/README
2008/12/22 | 69900 | macros/latex/contrib/analogclock.zip
-2022/02/21 | 3751389 | macros/latex/contrib/animate/animate.pdf
-2022/02/21 | 139716 | macros/latex/contrib/animate/animate.sty
-2022/02/21 | 84115 | macros/latex/contrib/animate/animate.tex
-2022/02/21 | 12878 | macros/latex/contrib/animate/ChangeLog
+2022/08/04 | 3751366 | macros/latex/contrib/animate/animate.pdf
+2022/08/04 | 138617 | macros/latex/contrib/animate/animate.sty
+2022/07/29 | 83978 | macros/latex/contrib/animate/animate.tex
+2022/08/04 | 12986 | macros/latex/contrib/animate/ChangeLog
2018/06/26 | 8561 | macros/latex/contrib/animate/files/bye_0.eps
2018/06/26 | 8342 | macros/latex/contrib/animate/files/bye_1.eps
2018/06/26 | 8561 | macros/latex/contrib/animate/files/bye_2.eps
@@ -206406,7 +206406,7 @@
2022/01/26 | 2286 | macros/latex/contrib/animate/files/exp.mp
2022/01/21 | 3127 | macros/latex/contrib/animate/files/scarab.mp
2022/01/21 | 4163 | macros/latex/contrib/animate/README.md
-2022/02/21 | 3223342 | macros/latex/contrib/animate.zip
+2022/08/04 | 3223120 | macros/latex/contrib/animate.zip
2020/07/29 | 19402 | macros/latex/contrib/annee-scolaire/annee-scolaire.dtx
2020/07/29 | 467107 | macros/latex/contrib/annee-scolaire/annee-scolaire-eng.pdf
2020/07/29 | 489195 | macros/latex/contrib/annee-scolaire/annee-scolaire-fra.pdf
@@ -212073,13 +212073,13 @@
2013/04/03 | 3607 | macros/latex/contrib/crbox/crbox.sty
2013/04/03 | 914 | macros/latex/contrib/crbox/README
2013/04/04 | 30542 | macros/latex/contrib/crbox.zip
-2022/07/31 | 67899 | macros/latex/contrib/create-theorem/create-theorem-doc.pdf
-2022/07/31 | 26046 | macros/latex/contrib/create-theorem/create-theorem-doc.tex
-2022/07/31 | 96780 | macros/latex/contrib/create-theorem/create-theorem.sty
-2022/07/31 | 12 | macros/latex/contrib/create-theorem/DEPENDS.txt
-2022/07/31 | 19106 | macros/latex/contrib/create-theorem/LICENSE
-2022/07/31 | 676 | macros/latex/contrib/create-theorem/README.md
-2022/07/31 | 90331 | macros/latex/contrib/create-theorem.zip
+2022/08/04 | 71867 | macros/latex/contrib/create-theorem/create-theorem-doc.pdf
+2022/08/04 | 28770 | macros/latex/contrib/create-theorem/create-theorem-doc.tex
+2022/08/04 | 96827 | macros/latex/contrib/create-theorem/create-theorem.sty
+2022/08/04 | 12 | macros/latex/contrib/create-theorem/DEPENDS.txt
+2022/08/04 | 19106 | macros/latex/contrib/create-theorem/LICENSE
+2022/08/04 | 676 | macros/latex/contrib/create-theorem/README.md
+2022/08/04 | 95041 | macros/latex/contrib/create-theorem.zip
2022/07/24 | 53103 | macros/latex/contrib/crefthe/crefthe-doc.pdf
2022/07/24 | 12431 | macros/latex/contrib/crefthe/crefthe-doc.tex
2022/07/24 | 11442 | macros/latex/contrib/crefthe/crefthe.sty
@@ -222125,17 +222125,17 @@
2021/08/28 | 37506 | macros/latex/contrib/mecaso/mecaso.tex
2021/08/28 | 470 | macros/latex/contrib/mecaso/README.md
2021/08/28 | 225962 | macros/latex/contrib/mecaso.zip
-2022/05/18 | 551 | macros/latex/contrib/media4svg/ChangeLog
-2022/05/18 | 25653 | macros/latex/contrib/media4svg/example/beamer-example-1.svg
-2022/05/18 | 278308 | macros/latex/contrib/media4svg/example/beamer-example-2.svg
-2022/05/18 | 15190 | macros/latex/contrib/media4svg/example/beamer-example-3.svg
-2022/05/18 | 41789 | macros/latex/contrib/media4svg/example/beamer-example-4.svg
-2021/10/18 | 5367 | macros/latex/contrib/media4svg/example/beamer-example.tex
+2022/08/04 | 702 | macros/latex/contrib/media4svg/ChangeLog
+2022/08/04 | 25567 | macros/latex/contrib/media4svg/example/beamer-example-1.svg
+2022/08/04 | 278249 | macros/latex/contrib/media4svg/example/beamer-example-2.svg
+2022/08/04 | 15143 | macros/latex/contrib/media4svg/example/beamer-example-3.svg
+2022/08/04 | 41517 | macros/latex/contrib/media4svg/example/beamer-example-4.svg
+2022/08/04 | 5342 | macros/latex/contrib/media4svg/example/beamer-example.tex
2022/05/18 | 3279 | macros/latex/contrib/media4svg/media4svg.lua
-2022/05/18 | 26124 | macros/latex/contrib/media4svg/media4svg.sty
-2022/05/18 | 5523 | macros/latex/contrib/media4svg/README.md
-2022/05/18 | 163250 | macros/latex/contrib/media4svg.zip
-2022/03/18 | 15662 | macros/latex/contrib/media9/ChangeLog
+2022/08/04 | 25969 | macros/latex/contrib/media4svg/media4svg.sty
+2022/08/04 | 5523 | macros/latex/contrib/media4svg/README.md
+2022/08/04 | 163147 | macros/latex/contrib/media4svg.zip
+2022/08/04 | 15784 | macros/latex/contrib/media9/ChangeLog
2019/01/02 | 7152 | macros/latex/contrib/media9/doc/files/3dsystem.fig
2019/01/02 | 5989 | macros/latex/contrib/media9/doc/files/3dsystem.pdf
2019/01/02 | 1550 | macros/latex/contrib/media9/doc/files/3dsystem.tex
@@ -222163,14 +222163,14 @@
2019/01/02 | 1268 | macros/latex/contrib/media9/doc/files/malte.js
2019/01/02 | 105696 | macros/latex/contrib/media9/doc/files/malte.u3d
2019/01/02 | 20206 | macros/latex/contrib/media9/doc/files/random.mp4
-2022/03/18 | 3747996 | macros/latex/contrib/media9/doc/media9.pdf
-2021/10/18 | 93655 | macros/latex/contrib/media9/doc/media9.tex
+2022/08/04 | 3660318 | macros/latex/contrib/media9/doc/media9.pdf
+2022/07/29 | 93594 | macros/latex/contrib/media9/doc/media9.tex
2021/12/01 | 29121 | macros/latex/contrib/media9/javascript/3Dmenu.js
2019/01/02 | 972 | macros/latex/contrib/media9/javascript/3Dspintool.js
2019/01/02 | 3307 | macros/latex/contrib/media9/javascript/animation.js
2019/01/02 | 2561 | macros/latex/contrib/media9/javascript/asylabels.js
-2022/03/18 | 161574 | macros/latex/contrib/media9/media9.sty
-2022/03/18 | 97961 | macros/latex/contrib/media9/pdfbase.sty
+2022/08/04 | 162116 | macros/latex/contrib/media9/media9.sty
+2022/08/04 | 99805 | macros/latex/contrib/media9/pdfbase.sty
2019/01/02 | 14420 | macros/latex/contrib/media9/players/APlayer9.mxml
2019/01/02 | 206165 | macros/latex/contrib/media9/players/APlayer9.swf
2019/01/02 | 15323 | macros/latex/contrib/media9/players/APlayer.mxml
@@ -222186,7 +222186,7 @@
2019/01/02 | 12571 | macros/latex/contrib/media9/players/VPlayer.mxml
2019/01/02 | 483412 | macros/latex/contrib/media9/players/VPlayer.swf
2020/07/14 | 2053 | macros/latex/contrib/media9/README.md
-2022/03/18 | 7468233 | macros/latex/contrib/media9.zip
+2022/08/04 | 7380647 | macros/latex/contrib/media9.zip
2015/11/12 | 2413 | macros/latex/contrib/medstarbeamer/beamercolorthemeMedStarColors.sty
2015/11/12 | 1715 | macros/latex/contrib/medstarbeamer/example.tex
2015/11/12 | 3149 | macros/latex/contrib/medstarbeamer/medstarbeamer.cls
@@ -224178,12 +224178,12 @@
2013/08/11 | 265647 | macros/latex/contrib/ocgtools/ocgtools.pdf
2010/12/16 | 906 | macros/latex/contrib/ocgtools/README
2013/08/11 | 5062086 | macros/latex/contrib/ocgtools.zip
-2022/04/01 | 7091 | macros/latex/contrib/ocgx2/ChangeLog
+2022/08/04 | 7210 | macros/latex/contrib/ocgx2/ChangeLog
2019/11/05 | 585 | macros/latex/contrib/ocgx2/fixocgx.sty
-2022/04/01 | 25997 | macros/latex/contrib/ocgx2/ocgbase.sty
-2022/04/01 | 109620 | macros/latex/contrib/ocgx2/ocgx2.sty
+2022/08/04 | 26167 | macros/latex/contrib/ocgx2/ocgbase.sty
+2022/08/04 | 110082 | macros/latex/contrib/ocgx2/ocgx2.sty
2019/11/05 | 9976 | macros/latex/contrib/ocgx2/README.md
-2022/04/01 | 33563 | macros/latex/contrib/ocgx2.zip
+2022/08/04 | 33670 | macros/latex/contrib/ocgx2.zip
2012/12/08 | 693034 | macros/latex/contrib/ocgx/demo-ocgx.pdf
2012/12/08 | 14592 | macros/latex/contrib/ocgx/demo-ocgx.tex
2012/12/08 | 156 | macros/latex/contrib/ocgx/ocgx-example-1.tex
@@ -234974,12 +234974,12 @@
2012/05/21 | 1841 | macros/latex/contrib/xpunctuate/xpunctuate.ins
2012/05/23 | 212109 | macros/latex/contrib/xpunctuate/xpunctuate.pdf
2012/05/24 | 204303 | macros/latex/contrib/xpunctuate.zip
-2022/03/10 | 1211 | macros/latex/contrib/xsavebox/ChangeLog
+2022/08/04 | 1297 | macros/latex/contrib/xsavebox/ChangeLog
2020/03/04 | 1589 | macros/latex/contrib/xsavebox/README.md
-2022/03/10 | 378552 | macros/latex/contrib/xsavebox/xsavebox.pdf
-2022/03/10 | 11995 | macros/latex/contrib/xsavebox/xsavebox.sty
-2022/03/10 | 10333 | macros/latex/contrib/xsavebox/xsavebox.tex
-2022/03/10 | 384395 | macros/latex/contrib/xsavebox.zip
+2022/08/04 | 378194 | macros/latex/contrib/xsavebox/xsavebox.pdf
+2022/08/04 | 11761 | macros/latex/contrib/xsavebox/xsavebox.sty
+2022/07/29 | 10266 | macros/latex/contrib/xsavebox/xsavebox.tex
+2022/08/04 | 383965 | macros/latex/contrib/xsavebox.zip
2022/02/12 | 38256 | macros/latex/contrib/xsim/examples/xsim.blanks.pdf
2022/02/12 | 441 | macros/latex/contrib/xsim/examples/xsim.blanks.tex
2022/02/12 | 38372 | macros/latex/contrib/xsim/examples/xsim.boxed-headings.pdf
@@ -238697,15 +238697,15 @@
2007/07/13 | 9394 | macros/omega/latex/contrib/tamil-omega/yudit/Tamil2.my
2007/07/13 | 11462 | macros/omega/latex/contrib/tamil-omega/yudit/yudit.properties
2007/12/12 | 900761 | macros/omega/latex/contrib/tamil-omega.zip
-2022/03/08 | 6806 | macros/optex/base/alloc.opm
+2022/06/10 | 6916 | macros/optex/base/alloc.opm
2022/02/21 | 5439 | macros/optex/base/basic-macros.opm
2022/05/12 | 33518 | macros/optex/base/bib-iso690.opm
2022/05/12 | 5870 | macros/optex/base/bib-simple.opm
2021/05/16 | 13887 | macros/optex/base/cite-bib.opm
2022/03/07 | 20216 | macros/optex/base/colors.opm
-2022/02/05 | 14450 | macros/optex/base/doc.opm
+2022/07/01 | 15245 | macros/optex/base/doc.opm
2021/04/22 | 657 | macros/optex/base/f-adventor.opm
-2022/05/02 | 9618 | macros/optex/base/fams-ini.opm
+2022/07/11 | 10575 | macros/optex/base/fams-ini.opm
2021/04/22 | 1156 | macros/optex/base/f-antt.opm
2022/05/02 | 652 | macros/optex/base/f-baskervald.opm
2021/04/22 | 665 | macros/optex/base/f-baskerville.opm
@@ -238727,21 +238727,26 @@
2021/01/07 | 1536 | macros/optex/base/f-lido.opm
2022/02/22 | 8815 | macros/optex/base/f-lmfonts.opm
2021/04/22 | 1200 | macros/optex/base/f-merriweather.opm
+2022/07/11 | 1423 | macros/optex/base/f-montserrat.opm
2021/04/27 | 1337 | macros/optex/base/f-newcm.opm
2022/01/19 | 9000 | macros/optex/base/fnotes.opm
-2022/02/22 | 4553 | macros/optex/base/fonts-catalog.opm
+2022/07/11 | 4601 | macros/optex/base/fonts-catalog.opm
2022/02/22 | 9448 | macros/optex/base/fonts-opmac.opm
2022/02/12 | 2423 | macros/optex/base/fonts-preload.opm
2022/02/22 | 13849 | macros/optex/base/fonts-resize.opm
2022/03/06 | 39961 | macros/optex/base/fonts-select.opm
+2022/05/22 | 893 | macros/optex/base/f-overlock.opm
2021/04/22 | 694 | macros/optex/base/f-pagella.opm
2021/04/22 | 1515 | macros/optex/base/f-poltawski.opm
2021/04/27 | 2617 | macros/optex/base/f-roboto.opm
2021/04/22 | 690 | macros/optex/base/f-schola.opm
2021/04/22 | 1525 | macros/optex/base/f-sourcepro.opm
+2022/06/03 | 688 | macros/optex/base/f-stix.opm
+2022/06/03 | 904 | macros/optex/base/f-stixtwo.opm
2021/04/22 | 1115 | macros/optex/base/f-technika.opm
2021/04/22 | 684 | macros/optex/base/f-termes.opm
2021/04/22 | 762 | macros/optex/base/f-xcharter.opm
+2022/06/03 | 742 | macros/optex/base/f-xits.opm
2022/03/06 | 20440 | macros/optex/base/graphics.opm
2021/01/07 | 2741 | macros/optex/base/hisyntax-c.opm
2022/05/12 | 1109 | macros/optex/base/hisyntax-html.opm
@@ -238750,41 +238755,41 @@
2021/07/16 | 3014 | macros/optex/base/hisyntax-python.opm
2021/01/07 | 1566 | macros/optex/base/hisyntax-tex.opm
2021/08/31 | 9966 | macros/optex/base/hyperlinks.opm
-2022/05/04 | 12547 | macros/optex/base/if-macros.opm
+2022/06/28 | 12575 | macros/optex/base/if-macros.opm
2022/02/28 | 3269 | macros/optex/base/keyval.opm
-2022/05/13 | 4750 | macros/optex/base/lang-data.opm
-2022/02/19 | 15985 | macros/optex/base/lang-decl.opm
+2022/06/28 | 6663 | macros/optex/base/lang-data.opm
+2022/06/28 | 16033 | macros/optex/base/lang-decl.opm
2022/02/19 | 7290 | macros/optex/base/languages.opm
2021/03/10 | 5218 | macros/optex/base/lists.opm
2021/01/11 | 2377 | macros/optex/base/logos.opm
2021/04/06 | 7398 | macros/optex/base/luatex-ini.opm
-2022/03/18 | 19177 | macros/optex/base/makeindex.opm
+2022/07/01 | 24552 | macros/optex/base/makeindex.opm
2021/07/18 | 6490 | macros/optex/base/maketoc.opm
2021/03/15 | 3770 | macros/optex/base/margins.opm
2021/04/20 | 13569 | macros/optex/base/mathclass.opm
2021/09/15 | 44605 | macros/optex/base/math-macros.opm
-2022/02/22 | 9695 | macros/optex/base/math-preload.opm
-2022/02/21 | 11588 | macros/optex/base/math-unicode.opm
-2022/02/03 | 12400 | macros/optex/base/more-macros.opm
+2022/07/22 | 10719 | macros/optex/base/math-preload.opm
+2022/07/22 | 14925 | macros/optex/base/math-unicode.opm
+2022/05/24 | 12468 | macros/optex/base/more-macros.opm
2022/05/05 | 6328 | macros/optex/base/multicolumns.opm
-2022/05/17 | 4124 | macros/optex/base/optex.ini
+2022/08/04 | 4124 | macros/optex/base/optex.ini
2022/03/10 | 26533 | macros/optex/base/optex.lua
2022/05/04 | 8280 | macros/optex/base/others.opm
2021/02/15 | 4624 | macros/optex/base/outlines.opm
2022/03/07 | 11274 | macros/optex/base/output.opm
-2022/05/12 | 25953 | macros/optex/base/parameters.opm
-2021/02/08 | 5319 | macros/optex/base/pdfuni-string.opm
+2022/07/22 | 26032 | macros/optex/base/parameters.opm
+2022/07/20 | 5518 | macros/optex/base/pdfuni-string.opm
2022/02/19 | 14535 | macros/optex/base/plain-macros.opm
2022/01/13 | 13736 | macros/optex/base/prefixed.opm
-2021/01/07 | 2203 | macros/optex/base/print-unimath.opm
+2022/06/09 | 2309 | macros/optex/base/print-unimath.opm
2022/02/01 | 5290 | macros/optex/base/references.opm
2022/02/05 | 6776 | macros/optex/base/ref-file.opm
-2022/01/13 | 20808 | macros/optex/base/sections.opm
+2022/08/02 | 21126 | macros/optex/base/sections.opm
2022/05/12 | 13008 | macros/optex/base/slides.opm
2022/01/13 | 2754 | macros/optex/base/styles.opm
2022/05/03 | 27870 | macros/optex/base/table.opm
2022/02/05 | 122830 | macros/optex/base/uni-lcuc.opm
-2022/02/22 | 20511 | macros/optex/base/unimath-codes.opm
+2022/07/20 | 20634 | macros/optex/base/unimath-codes.opm
2022/02/08 | 241449 | macros/optex/base/unimath-table.opm
2022/02/08 | 16053 | macros/optex/base/usebib.opm
2022/04/23 | 17666 | macros/optex/base/verbatim.opm
@@ -238799,11 +238804,11 @@
2021/05/27 | 518 | macros/optex/doc/mte-doc.tex
2022/01/13 | 34625 | macros/optex/doc/omls.tex
2020/05/16 | 1460 | macros/optex/doc/optex.1
-2022/05/17 | 1415023 | macros/optex/doc/optex-doc.pdf
-2022/05/17 | 4482 | macros/optex/doc/optex-doc.tex
-2022/04/08 | 69744 | macros/optex/doc/optex-math.tex
+2022/08/04 | 1437685 | macros/optex/doc/optex-doc.pdf
+2022/08/04 | 4482 | macros/optex/doc/optex-doc.tex
+2022/06/22 | 70332 | macros/optex/doc/optex-math.tex
2022/04/22 | 8441 | macros/optex/doc/optex-techdoc.tex
-2022/05/04 | 88124 | macros/optex/doc/optex-userdoc.tex
+2022/07/11 | 88853 | macros/optex/doc/optex-userdoc.tex
2021/05/02 | 1949 | macros/optex/pkg/emoji.opm
2022/03/05 | 327 | macros/optex/pkg/minim-mp.opm
2022/03/06 | 7513 | macros/optex/pkg/minim.opm
@@ -238813,8 +238818,8 @@
2020/11/11 | 85045 | macros/optex/pkg/qrcode.opm
2022/03/18 | 5084 | macros/optex/pkg/tikz.opm
2021/05/02 | 7597 | macros/optex/pkg/vlna.opm
-2022/05/17 | 7810 | macros/optex/README
-2022/05/17 | 2395232 | macros/optex.zip
+2022/08/04 | 8011 | macros/optex/README
+2022/08/04 | 2425056 | macros/optex.zip
2022/01/06 | 732 | macros/pdftex/mptopdf/doc/context/scripts/mkii/mptopdf.man
2022/01/06 | 4557 | macros/pdftex/mptopdf/scripts/context/perl/mptopdf.pl
2022/01/06 | 4608 | macros/pdftex/mptopdf/scripts/context/stubs/mswin/mptopdf.exe
@@ -278891,10 +278896,10 @@
1993/07/19 | 61321 | systems/mac/macmakeindex.sit.hqx
2022/03/17 | 47 | systems/mac/mactex/BasicTeX.pkg.md5
2022/03/17 | 143 | systems/mac/mactex/BasicTeX.pkg.sha512
-2022/07/29 | 38155 | systems/mac/mactex/ExtrasFolder.pdf
+2022/08/03 | 38148 | systems/mac/mactex/ExtrasFolder.pdf
2022/03/17 | 50 | systems/mac/mactex/Ghostscript.pkg.md5
2022/03/17 | 146 | systems/mac/mactex/Ghostscript.pkg.sha512
-2022/07/29 | 1612 | systems/mac/mactex/Licenses.txt
+2022/08/03 | 1612 | systems/mac/mactex/Licenses.txt
2022/03/21 | 4961582623 | systems/mac/mactex/mactex-20220321.pkg
2022/03/21 | 54 | systems/mac/mactex/mactex-20220321.pkg.md5
2022/03/21 | 150 | systems/mac/mactex/mactex-20220321.pkg.sha512
@@ -278904,13 +278909,13 @@
2022/02/28 | 55345960 | systems/mac/mactex/mactex-ghostscript-9.55-20220208.pkg
2022/02/28 | 71 | systems/mac/mactex/mactex-ghostscript-9.55-20220208.pkg.md5
2022/03/17 | 167 | systems/mac/mactex/mactex-ghostscript-9.55-20220208.pkg.sha512
-2022/07/29 | 514569903 | systems/mac/mactex/mactex-MacTeXtras-20220729.zip
-2022/07/29 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220729.zip.md5
-2022/07/29 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220729.zip.sha512
+2022/08/03 | 514579998 | systems/mac/mactex/mactex-MacTeXtras-20220803.zip
+2022/08/03 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220803.zip.md5
+2022/08/03 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220803.zip.sha512
2022/03/21 | 45 | systems/mac/mactex/MacTeX.pkg.md5
2022/03/21 | 141 | systems/mac/mactex/MacTeX.pkg.sha512
-2022/07/29 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
-2022/07/29 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
+2022/08/03 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
+2022/08/03 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
2022/04/03 | 189 | systems/mac/mactex/README
1995/08/15 | 308344 | systems/mac/MakeIndex-Fat-1.0-sit.hqx
1994/04/20 | 2925109 | systems/mac/metafont/bluesky/MAC_MF_0.66.sit.hqx
@@ -284367,8 +284372,8 @@
2019/02/28 | 200188 | systems/texlive/tlnet/archive/euro.doc.r22191.tar.xz
2020/11/02 | 452684 | systems/texlive/tlnet/archive/europasscv.doc.r56829.tar.xz
2020/11/02 | 30320 | systems/texlive/tlnet/archive/europasscv.r56829.tar.xz
-2022/06/18 | 981436 | systems/texlive/tlnet/archive/europecv.doc.r63630.tar.xz
-2022/06/18 | 52112 | systems/texlive/tlnet/archive/europecv.r63630.tar.xz
+2022/08/04 | 995452 | systems/texlive/tlnet/archive/europecv.doc.r64037.tar.xz
+2022/08/04 | 58532 | systems/texlive/tlnet/archive/europecv.r64037.tar.xz
2019/02/28 | 2564 | systems/texlive/tlnet/archive/euro.r22191.tar.xz
2019/02/28 | 14508 | systems/texlive/tlnet/archive/euro.source.r22191.tar.xz
2019/02/28 | 277732 | systems/texlive/tlnet/archive/eurosym.doc.r17265.tar.xz
@@ -287218,9 +287223,9 @@
2022/06/28 | 495380 | systems/texlive/tlnet/archive/lt3luabridge.doc.r63735.tar.xz
2022/06/28 | 3432 | systems/texlive/tlnet/archive/lt3luabridge.r63735.tar.xz
2022/06/28 | 4536 | systems/texlive/tlnet/archive/lt3luabridge.source.r63735.tar.xz
-2022/07/12 | 430040 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r63873.tar.xz
-2022/07/12 | 3156 | systems/texlive/tlnet/archive/lt3rawobjects.r63873.tar.xz
-2022/07/12 | 8532 | systems/texlive/tlnet/archive/lt3rawobjects.source.r63873.tar.xz
+2022/08/04 | 532092 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r64038.tar.xz
+2022/08/04 | 3508 | systems/texlive/tlnet/archive/lt3rawobjects.r64038.tar.xz
+2022/08/04 | 9848 | systems/texlive/tlnet/archive/lt3rawobjects.source.r64038.tar.xz
2019/02/28 | 233152 | systems/texlive/tlnet/archive/ltablex.doc.r34923.tar.xz
2019/02/28 | 2492 | systems/texlive/tlnet/archive/ltablex.r34923.tar.xz
2019/02/28 | 267928 | systems/texlive/tlnet/archive/ltabptch.doc.r17533.tar.xz
@@ -291857,7 +291862,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/08/03 | 419224 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64029.tar.xz
+2022/08/04 | 419224 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64036.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -291881,7 +291886,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/08/03 | 113512 | systems/texlive/tlnet/archive/texlive-scripts.r64029.tar.xz
+2022/08/04 | 113520 | systems/texlive/tlnet/archive/texlive-scripts.r64036.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -292589,8 +292594,8 @@
2019/02/28 | 254104 | systems/texlive/tlnet/archive/tucv.doc.r20680.tar.xz
2019/02/28 | 1860 | systems/texlive/tlnet/archive/tucv.r20680.tar.xz
2019/02/28 | 4996 | systems/texlive/tlnet/archive/tucv.source.r20680.tar.xz
-2022/06/11 | 1132972 | systems/texlive/tlnet/archive/tuda-ci.doc.r63536.tar.xz
-2022/06/11 | 43660 | systems/texlive/tlnet/archive/tuda-ci.r63536.tar.xz
+2022/08/04 | 1132348 | systems/texlive/tlnet/archive/tuda-ci.doc.r64039.tar.xz
+2022/08/04 | 43676 | systems/texlive/tlnet/archive/tuda-ci.r64039.tar.xz
2021/07/16 | 3769988 | systems/texlive/tlnet/archive/tudscr.doc.r59942.tar.xz
2021/07/16 | 160220 | systems/texlive/tlnet/archive/tudscr.r59942.tar.xz
2021/07/16 | 315572 | systems/texlive/tlnet/archive/tudscr.source.r59942.tar.xz
@@ -293703,16 +293708,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/07/17 | 124404 | systems/texlive/tlnet/install-tl
-2022/08/03 | 5808582 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/08/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/08/03 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/08/04 | 5808624 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/08/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/08/04 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/08/03 | 20465130 | systems/texlive/tlnet/install-tl-windows.exe
-2022/08/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/08/03 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/08/03 | 25493379 | systems/texlive/tlnet/install-tl.zip
-2022/08/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/08/03 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/08/04 | 20465315 | systems/texlive/tlnet/install-tl-windows.exe
+2022/08/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/08/04 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/08/04 | 25493404 | systems/texlive/tlnet/install-tl.zip
+2022/08/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/08/04 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -293722,7 +293727,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/05/27 | 49794 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/08/02 | 7287 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/08/03 | 7410 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/07/21 | 222477 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -293764,12 +293769,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/08/03 | 17575869 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/08/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/08/04 | 17575867 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/08/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/08/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/08/03 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/08/03 | 2393368 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/08/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/08/04 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/08/04 | 2397292 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/08/01 | 42206 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -299032,7 +299037,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/08/03 | 658010 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/08/04 | 658010 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -300709,9 +300714,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/07/26 | 39695 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/07/30 | 43515 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/08/03 | 288518 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/08/03 | 1480835 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/08/03 | 1362647 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/08/04 | 288482 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/08/04 | 1480960 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/08/04 | 1362231 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/07/26 | 13519 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/07/30 | 14474 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -300952,102 +300957,102 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/08/03 | 658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/08/03 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/08/03 | 1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/08/03 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/08/03 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/08/03 | 65129 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/08/03 | 95468 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/08/03 | 77210 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/08/03 | 31563 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/08/03 | 394145 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/08/03 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/08/03 | 57506 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/08/03 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/08/03 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/08/03 | 103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/08/03 | 24210 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/08/03 | 481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/08/03 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/08/03 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/08/03 | 45794 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/08/03 | 135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/08/03 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/08/03 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/08/03 | 48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/08/03 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/08/03 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/08/03 | 155431 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/08/03 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/08/03 | 81449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/08/03 | 295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/08/03 | 25118 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/08/03 | 112877 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/08/03 | 73264 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/08/03 | 115578 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/08/03 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/08/03 | 565082 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/08/03 | 247208 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/08/03 | 169679 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/08/03 | 109651 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/08/03 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/08/03 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/08/03 | 682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/08/03 | 599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/08/03 | 527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/08/03 | 103599 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/08/03 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/08/03 | 74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/08/03 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/08/03 | 8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/08/03 | 209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/08/03 | 286686 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/08/03 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/08/03 | 140011 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/08/03 | 325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/08/03 | 181725 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/08/03 | 55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/08/03 | 35229 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/08/03 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/08/03 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/08/03 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/08/03 | 213848 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/08/03 | 41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/08/03 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/08/03 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/08/03 | 245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/08/03 | 88484 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/08/03 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/08/03 | 23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/08/03 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/08/03 | 72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/08/03 | 58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/08/03 | 769655 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/08/03 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/08/03 | 52628 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/08/03 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/08/03 | 27465 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/08/03 | 18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/08/03 | 70940 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/08/03 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/08/03 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/08/03 | 107439 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/08/03 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/08/03 | 62360 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/08/03 | 41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/08/03 | 33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/08/03 | 73684 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/08/03 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/08/03 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/08/03 | 630434 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/08/03 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/08/03 | 288483 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/08/03 | 1478459 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/08/03 | 1362531 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/08/03 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/08/04 | 658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/08/04 | 57316 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/08/04 | 1161752 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/08/04 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/08/04 | 35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/08/04 | 65128 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/08/04 | 95468 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/08/04 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/08/04 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/08/04 | 394143 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/08/04 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/08/04 | 57504 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/08/04 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/08/04 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/08/04 | 103248 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/08/04 | 24211 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/08/04 | 481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/08/04 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/08/04 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/08/04 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/08/04 | 135463 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/08/04 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/08/04 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/08/04 | 48851 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/08/04 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/08/04 | 63239 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/08/04 | 155429 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/08/04 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/08/04 | 81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/08/04 | 295943 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/08/04 | 25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/08/04 | 112876 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/08/04 | 73264 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/08/04 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/08/04 | 43888 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/08/04 | 565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/08/04 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/08/04 | 169678 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/08/04 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/08/04 | 18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/08/04 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/08/04 | 682215 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/08/04 | 599102 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/08/04 | 527569 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/08/04 | 103599 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/08/04 | 2023132 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/08/04 | 74097 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/08/04 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/08/04 | 8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/08/04 | 209139 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/08/04 | 286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/08/04 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/08/04 | 140011 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/08/04 | 325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/08/04 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/08/04 | 55318 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/08/04 | 35230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/08/04 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/08/04 | 48037 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/08/04 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/08/04 | 213846 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/08/04 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/08/04 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/08/04 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/08/04 | 245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/08/04 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/08/04 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/08/04 | 23949 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/08/04 | 37506 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/08/04 | 72976 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/08/04 | 58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/08/04 | 769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/08/04 | 1503051 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/08/04 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/08/04 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/08/04 | 27464 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/08/04 | 18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/08/04 | 70939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/08/04 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/08/04 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/08/04 | 107437 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/08/04 | 2821670 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/08/04 | 62360 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/08/04 | 41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/08/04 | 33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/08/04 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/08/04 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/08/04 | 57500 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/08/04 | 630432 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/08/04 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/08/04 | 288481 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/08/04 | 1479405 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/08/04 | 1363171 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/08/04 | 14434 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/08/03 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/08/04 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -301534,7 +301539,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/08/03 | 957 | systems/win32/miktex/tm/packages/pr.ini
+2022/08/04 | 957 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -303466,7 +303471,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/08/04 | 186 | timestamp
+2022/08/05 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2022/02/28 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 8bf2dee90f..fefddb42a7 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 16e185b6a3..dee0e02e98 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,72 +1,212 @@
+2022/08/04 | 99805 | macros/latex/contrib/media9/pdfbase.sty
+2022/08/04 | 995452 | systems/texlive/tlnet/archive/europecv.doc.r64037.tar.xz
+2022/08/04 | 9848 | systems/texlive/tlnet/archive/lt3rawobjects.source.r64038.tar.xz
+2022/08/04 | 96827 | macros/latex/contrib/create-theorem/create-theorem.sty
+2022/08/04 | 957 | systems/win32/miktex/tm/packages/pr.ini
+2022/08/04 | 95468 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/08/04 | 95041 | macros/latex/contrib/create-theorem.zip
+2022/08/04 | 93361 | macros/generic/olsak-misc.zip
+2022/08/04 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/08/04 | 8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/08/04 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/08/04 | 81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/08/04 | 8011 | macros/optex/README
+2022/08/04 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/08/04 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/08/04 | 769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/08/04 | 74097 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/08/04 | 7385937 | install/macros/latex/contrib/media9.tds.zip
+2022/08/04 | 7380647 | macros/latex/contrib/media9.zip
+2022/08/04 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/08/04 | 73264 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/08/04 | 72976 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/08/04 | 7210 | macros/latex/contrib/ocgx2/ChangeLog
+2022/08/04 | 71867 | macros/latex/contrib/create-theorem/create-theorem-doc.pdf
+2022/08/04 | 70939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/08/04 | 702 | macros/latex/contrib/media4svg/ChangeLog
+2022/08/04 | 682215 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/08/04 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/08/04 | 676 | macros/latex/contrib/create-theorem/README.md
+2022/08/04 | 658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/08/04 | 658010 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/08/04 | 65128 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/08/04 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/08/04 | 63239 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/08/04 | 630432 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/08/04 | 62360 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/08/04 | 599102 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/08/04 | 58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/08/04 | 58532 | systems/texlive/tlnet/archive/europecv.r64037.tar.xz
+2022/08/04 | 5808624 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/08/04 | 57504 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/08/04 | 57500 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/08/04 | 57316 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/08/04 | 565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/08/04 | 55318 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/08/04 | 5523 | macros/latex/contrib/media4svg/README.md
+2022/08/04 | 5342 | macros/latex/contrib/media4svg/example/beamer-example.tex
+2022/08/04 | 532092 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r64038.tar.xz
+2022/08/04 | 527569 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/08/04 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/08/04 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/08/04 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/08/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/08/04 | 48851 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/08/04 | 481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/08/04 | 48037 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/08/04 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/08/04 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/08/04 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/08/04 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/08/04 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/08/04 | 4482 | macros/optex/doc/optex-doc.tex
+2022/08/04 | 43888 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/08/04 | 43676 | systems/texlive/tlnet/archive/tuda-ci.r64039.tar.xz
+2022/08/04 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/08/04 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/08/04 | 419224 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64036.tar.xz
+2022/08/04 | 41517 | macros/latex/contrib/media4svg/example/beamer-example-4.svg
+2022/08/04 | 4124 | macros/optex/base/optex.ini
+2022/08/04 | 41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/08/04 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/08/04 | 394143 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/08/04 | 385608 | install/macros/latex/contrib/xsavebox.tds.zip
+2022/08/04 | 383965 | macros/latex/contrib/xsavebox.zip
+2022/08/04 | 378194 | macros/latex/contrib/xsavebox/xsavebox.pdf
+2022/08/04 | 3751366 | macros/latex/contrib/animate/animate.pdf
+2022/08/04 | 37506 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/08/04 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/08/04 | 3660318 | macros/latex/contrib/media9/doc/media9.pdf
+2022/08/04 | 35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/08/04 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/08/04 | 35230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/08/04 | 3508 | systems/texlive/tlnet/archive/lt3rawobjects.r64038.tar.xz
+2022/08/04 | 34729 | install/macros/latex/contrib/ocgx2.tds.zip
+2022/08/04 | 33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/08/04 | 33670 | macros/latex/contrib/ocgx2.zip
+2022/08/04 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/08/04 | 325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/08/04 | 3225393 | install/macros/latex/contrib/animate.tds.zip
+2022/08/04 | 3223120 | macros/latex/contrib/animate.zip
+2022/08/04 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/08/04 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/08/04 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/08/04 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/08/04 | 295943 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/08/04 | 288482 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/08/04 | 288481 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/08/04 | 28770 | macros/latex/contrib/create-theorem/create-theorem-doc.tex
+2022/08/04 | 286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/08/04 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/08/04 | 2821670 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/08/04 | 278249 | macros/latex/contrib/media4svg/example/beamer-example-2.svg
+2022/08/04 | 27464 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/08/04 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/08/04 | 26167 | macros/latex/contrib/ocgx2/ocgbase.sty
+2022/08/04 | 25969 | macros/latex/contrib/media4svg/media4svg.sty
+2022/08/04 | 25567 | macros/latex/contrib/media4svg/example/beamer-example-1.svg
+2022/08/04 | 25493404 | systems/texlive/tlnet/install-tl.zip
+2022/08/04 | 25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/08/04 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/08/04 | 245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/08/04 | 2425056 | macros/optex.zip
+2022/08/04 | 24211 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/08/04 | 2397292 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/08/04 | 23949 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/08/04 | 213846 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/08/04 | 209139 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/08/04 | 20465315 | systems/texlive/tlnet/install-tl-windows.exe
+2022/08/04 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/08/04 | 2023132 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/08/04 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/08/04 | 19106 | macros/latex/contrib/create-theorem/LICENSE
+2022/08/04 | 18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/08/04 | 18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/08/04 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/08/04 | 17854 | CTAN.sites
+2022/08/04 | 17575867 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/08/04 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/08/04 | 169678 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/08/04 | 164644 | install/macros/latex/contrib/media4svg.tds.zip
+2022/08/04 | 163147 | macros/latex/contrib/media4svg.zip
+2022/08/04 | 162116 | macros/latex/contrib/media9/media9.sty
+2022/08/04 | 15784 | macros/latex/contrib/media9/ChangeLog
+2022/08/04 | 155429 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/08/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/08/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/08/04 | 15143 | macros/latex/contrib/media4svg/example/beamer-example-3.svg
+2022/08/04 | 1503051 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/08/04 | 1480960 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/08/04 | 1479405 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/08/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/08/04 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/08/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/08/04 | 14434 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/08/04 | 1437685 | macros/optex/doc/optex-doc.pdf
+2022/08/04 | 140011 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/08/04 | 138617 | macros/latex/contrib/animate/animate.sty
+2022/08/04 | 1363171 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/08/04 | 1362231 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/08/04 | 135463 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/08/04 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/08/04 | 1322 | macros/generic/olsak-misc/README
+2022/08/04 | 12 | macros/latex/contrib/create-theorem/DEPENDS.txt
+2022/08/04 | 12986 | macros/latex/contrib/animate/ChangeLog
+2022/08/04 | 1297 | macros/latex/contrib/xsavebox/ChangeLog
+2022/08/04 | 11761 | macros/latex/contrib/xsavebox/xsavebox.sty
+2022/08/04 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/08/04 | 1161752 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/08/04 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/08/04 | 113520 | systems/texlive/tlnet/archive/texlive-scripts.r64036.tar.xz
+2022/08/04 | 1132348 | systems/texlive/tlnet/archive/tuda-ci.doc.r64039.tar.xz
+2022/08/04 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/08/04 | 112876 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/08/04 | 110082 | macros/latex/contrib/ocgx2/ocgx2.sty
+2022/08/04 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/08/04 | 107437 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/08/04 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/08/04 | 103599 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/08/04 | 103248 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2022/08/03 | 971052 | systems/texlive/tlnet/archive/postnotes.doc.r64031.tar.xz
2022/08/03 | 9684 | macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
-2022/08/03 | 957 | systems/win32/miktex/tm/packages/pr.ini
-2022/08/03 | 95468 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2022/08/03 | 953 | macros/latex/contrib/europecv/templates/europecv_biber.tex
2022/08/03 | 9383 | macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
2022/08/03 | 934 | macros/latex/contrib/europecv/examples/greek-utf8.tex
2022/08/03 | 916 | macros/latex/contrib/europecv/examples/maltese-maltese.tex
2022/08/03 | 88956 | macros/latex/contrib/europecv/examples/greek-utf8.pdf
2022/08/03 | 8887 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
-2022/08/03 | 88484 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/08/03 | 8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2022/08/03 | 863 | macros/latex/contrib/europecv/examples/maltese-utf8.tex
2022/08/03 | 8579 | macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
2022/08/03 | 8536 | systems/texlive/tlnet/archive/projlib.doc.r64033.tar.xz
2022/08/03 | 83685 | macros/latex/contrib/easybook/easybook.tex
-2022/08/03 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/08/03 | 81449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/08/03 | 8059 | macros/latex/contrib/europecv/templates/cv_template_academic_en.tex
-2022/08/03 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/08/03 | 77210 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/08/03 | 769655 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
2022/08/03 | 765 | macros/latex/contrib/europecv/examples/bulgarian-koi8-r.tex
2022/08/03 | 75610 | macros/latex/contrib/easybook/easybook.dtx
-2022/08/03 | 74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/08/03 | 73684 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/08/03 | 7410 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/08/03 | 7336 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
-2022/08/03 | 73264 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/08/03 | 72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/08/03 | 70940 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2022/08/03 | 7092 | systems/texlive/tlnet/archive/postnotes.r64031.tar.xz
2022/08/03 | 6975 | macros/latex/contrib/europecv/examples/at.pdf
2022/08/03 | 6928 | macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
2022/08/03 | 6881 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
-2022/08/03 | 682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/08/03 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2022/08/03 | 664 | macros/latex/contrib/europecv/templates/europecv_biber.conf
2022/08/03 | 662269 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
+2022/08/03 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220803.zip.md5
2022/08/03 | 6593 | macros/latex/contrib/europecv/templates/europecv_photo.jpg
-2022/08/03 | 658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/08/03 | 658010 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/08/03 | 65129 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2022/08/03 | 6443662 | macros/latex/contrib/tuda-ci.zip
-2022/08/03 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
2022/08/03 | 635898 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
2022/08/03 | 632481 | macros/latex/contrib/easybook.zip
-2022/08/03 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
2022/08/03 | 6315 | macros/latex/contrib/tuda-ci/tex/tudarules.sty
-2022/08/03 | 630434 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2022/08/03 | 627495 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
-2022/08/03 | 62360 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2022/08/03 | 614706 | macros/latex/contrib/europecv/europecv.pdf
2022/08/03 | 60354 | macros/latex/contrib/europecv/europecv.tex
-2022/08/03 | 599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2022/08/03 | 598742 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
2022/08/03 | 590981 | macros/latex/contrib/easybook/easybook.pdf
2022/08/03 | 5890 | macros/latex/contrib/tuda-ci/tex/tudacolors.sty
-2022/08/03 | 58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2022/08/03 | 5859 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
-2022/08/03 | 5808582 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/08/03 | 57506 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/08/03 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/08/03 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
2022/08/03 | 570468 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
2022/08/03 | 567049 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
-2022/08/03 | 565082 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2022/08/03 | 563703 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
2022/08/03 | 559873 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
-2022/08/03 | 55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2022/08/03 | 552031 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
2022/08/03 | 5433 | macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
2022/08/03 | 540465 | macros/latex/contrib/lt3rawobjects.zip
@@ -74,17 +214,11 @@
2022/08/03 | 5381 | macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
2022/08/03 | 536273 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
2022/08/03 | 534965 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
-2022/08/03 | 527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2022/08/03 | 527524 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
-2022/08/03 | 52628 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/08/03 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/08/03 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/08/03 | 514579998 | systems/mac/mactex/mactex-MacTeXtras-20220803.zip
2022/08/03 | 510 | macros/latex/contrib/europecv/templates/europecv_thesis.bib
2022/08/03 | 50180 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
-2022/08/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/08/03 | 48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/08/03 | 481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/08/03 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/08/03 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
2022/08/03 | 4778 | macros/latex/contrib/europecv/templates/cv_template_en.tex
2022/08/03 | 47274 | macros/latex/contrib/europecv/examples/Pythagoras.jpg
2022/08/03 | 4646 | macros/latex/contrib/europecv/examples/EuropeFlagCMYK.eps
@@ -93,76 +227,38 @@
2022/08/03 | 4631 | macros/latex/contrib/europecv/EuropeFlagBW.eps
2022/08/03 | 4595 | macros/latex/contrib/europecv/EuropeFlagBlueCMYK.eps
2022/08/03 | 4588 | macros/latex/contrib/europecv/EuropeFlagWB.eps
-2022/08/03 | 45794 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/08/03 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/08/03 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/08/03 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/08/03 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/08/03 | 4441 | macros/latex/contrib/tuda-ci/tex/tudacolors.def
-2022/08/03 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/08/03 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/08/03 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
2022/08/03 | 4328 | macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
2022/08/03 | 43144 | macros/latex/contrib/tuda-ci/tex/tudapub.cls
2022/08/03 | 423 | macros/latex/contrib/europecv/templates/europecv_pub.bib
2022/08/03 | 4207 | macros/latex/contrib/europecv/CONTRIBUTING.md
-2022/08/03 | 419224 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64029.tar.xz
-2022/08/03 | 41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/08/03 | 41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/08/03 | 394145 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2022/08/03 | 3871 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
2022/08/03 | 3864 | macros/latex/contrib/europecv/CHANGELOG.rst
2022/08/03 | 3815 | macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
+2022/08/03 | 38148 | systems/mac/mactex/ExtrasFolder.pdf
2022/08/03 | 37766 | macros/latex/contrib/europecv/examples/europasslogo.eps
2022/08/03 | 37766 | macros/latex/contrib/europecv/europasslogo.eps
-2022/08/03 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2022/08/03 | 37248 | macros/latex/contrib/europecv/examples/minimal.pdf
-2022/08/03 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2022/08/03 | 3560 | systems/texlive/tlnet/archive/biblatex-software.r64030.tar.xz
-2022/08/03 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/08/03 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/08/03 | 35229 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2022/08/03 | 3438 | macros/latex/contrib/europecv/ecvgr.def
-2022/08/03 | 33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2022/08/03 | 3356 | macros/latex/contrib/europecv/examples/EuropeFlagCMYK-eps-converted-to.pdf
2022/08/03 | 32986 | macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
2022/08/03 | 3287 | macros/latex/contrib/tuda-ci/tex/tudafonts.sty
-2022/08/03 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/08/03 | 325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2022/08/03 | 32496 | macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
-2022/08/03 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
2022/08/03 | 3175 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
-2022/08/03 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
2022/08/03 | 31566 | macros/latex/contrib/europecv/templates/cv_template_en.pdf
-2022/08/03 | 31563 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2022/08/03 | 313808 | systems/texlive/tlnet/archive/biblatex-software.doc.r64030.tar.xz
-2022/08/03 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/08/03 | 295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2022/08/03 | 29286 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
2022/08/03 | 291164 | systems/texlive/tlnet/archive/sillypage.doc.r64034.tar.xz
-2022/08/03 | 288518 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/08/03 | 288483 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/08/03 | 286686 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/08/03 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2022/08/03 | 28251 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
-2022/08/03 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2022/08/03 | 28136 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
-2022/08/03 | 27465 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/08/03 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
2022/08/03 | 2690 | macros/latex/contrib/europecv/examples/europass-cv.tex
2022/08/03 | 26706 | macros/latex/contrib/europecv/europecv.cls
2022/08/03 | 2644 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
2022/08/03 | 2575 | macros/latex/contrib/europecv/README.md
-2022/08/03 | 25493379 | systems/texlive/tlnet/install-tl.zip
2022/08/03 | 25384 | systems/texlive/tlnet/archive/projlib.source.r64033.tar.xz
2022/08/03 | 25256 | systems/texlive/tlnet/archive/projlib.r64033.tar.xz
-2022/08/03 | 25118 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2022/08/03 | 2498 | macros/latex/contrib/europecv/ecvbg.def
-2022/08/03 | 247208 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/08/03 | 245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/08/03 | 24210 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/08/03 | 23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/08/03 | 2393368 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/08/03 | 235510 | macros/latex/contrib/europecv/examples/europass-cv.pdf
2022/08/03 | 2350 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
2022/08/03 | 2340 | macros/latex/contrib/europecv/EuropeFlagBW.pdf
@@ -180,40 +276,28 @@
2022/08/03 | 2169 | macros/latex/contrib/europecv/ecves.def
2022/08/03 | 2166 | macros/latex/contrib/europecv/ecvfi.def
2022/08/03 | 2145 | macros/latex/contrib/europecv/ecvpt.def
-2022/08/03 | 213848 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2022/08/03 | 2129 | macros/latex/contrib/europecv/ecvgl.def
2022/08/03 | 21052 | systems/texlive/tlnet/archive/postnotes.source.r64031.tar.xz
-2022/08/03 | 209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2022/08/03 | 2090 | macros/latex/contrib/europecv/ecvis.def
2022/08/03 | 2084 | macros/latex/contrib/europecv/ecvhu.def
2022/08/03 | 2082 | macros/latex/contrib/europecv/ecvde.def
2022/08/03 | 2062 | macros/latex/contrib/europecv/ecvit.def
2022/08/03 | 2061 | macros/latex/contrib/europecv/ecvda.def
2022/08/03 | 2055 | macros/latex/contrib/europecv/ecven.def
-2022/08/03 | 20465130 | systems/texlive/tlnet/install-tl-windows.exe
2022/08/03 | 2043 | macros/latex/contrib/europecv/ecvsl.def
2022/08/03 | 2034 | macros/latex/contrib/europecv/ecvet.def
-2022/08/03 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/08/03 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2022/08/03 | 2018 | macros/latex/contrib/europecv/ecvsr.def
2022/08/03 | 2015 | macros/latex/contrib/europecv/ecvro.def
2022/08/03 | 19811 | macros/latex/contrib/tuda-ci/tex/tudaposter.cls
-2022/08/03 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2022/08/03 | 19461 | macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
2022/08/03 | 19106 | macros/latex/contrib/europecv/LICENSE
-2022/08/03 | 18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/08/03 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/08/03 | 181725 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
2022/08/03 | 1810 | macros/latex/contrib/europecv/ecvlv.def
2022/08/03 | 1790 | macros/latex/contrib/europecv/ecvmt.def
-2022/08/03 | 17575869 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2022/08/03 | 1755 | macros/latex/contrib/europecv/ecvpl.def
2022/08/03 | 1735 | macros/latex/contrib/europecv/ecvca.def
-2022/08/03 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2022/08/03 | 17292 | macros/latex/contrib/tuda-ci/README.md
2022/08/03 | 1720 | macros/latex/contrib/europecv/ecvno.def
2022/08/03 | 1713 | macros/latex/contrib/europecv/ecvnl.def
-2022/08/03 | 169679 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2022/08/03 | 16916 | macros/latex/contrib/tuda-ci/tex/tudaletter.cls
2022/08/03 | 1686 | macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
2022/08/03 | 1685 | macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
@@ -223,42 +307,19 @@
2022/08/03 | 1680 | macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
2022/08/03 | 16613 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
2022/08/03 | 163 | macros/latex/contrib/europecv/examples/minimal.tex
-2022/08/03 | 155431 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/08/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/08/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/08/03 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/08/03 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220803.zip.sha512
+2022/08/03 | 1612 | systems/mac/mactex/Licenses.txt
2022/08/03 | 1500 | systems/texlive/tlnet/archive/biblatex-software.source.r64030.tar.xz
-2022/08/03 | 1480835 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/08/03 | 1478459 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
2022/08/03 | 14679 | macros/latex/contrib/europecv/europasslogo-eps-converted-to.pdf
-2022/08/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/08/03 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/08/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/08/03 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
2022/08/03 | 14480 | macros/latex/contrib/europecv/examples/europasslogo-eps-converted-to.pdf
-2022/08/03 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2022/08/03 | 14087 | macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
-2022/08/03 | 140011 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/08/03 | 1362647 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/08/03 | 1362531 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/08/03 | 135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
2022/08/03 | 13468 | systems/texlive/tlnet/archive/sillypage.r64034.tar.xz
-2022/08/03 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2022/08/03 | 1305 | macros/latex/contrib/lt3rawobjects/README.md
2022/08/03 | 12842 | macros/latex/contrib/europecv/europasslogo.pdf
2022/08/03 | 1210836 | systems/texlive/tlnet/archive/profcollege.r64032.tar.xz
2022/08/03 | 1187253 | macros/latex/contrib/europecv.zip
-2022/08/03 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/08/03 | 1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/08/03 | 115578 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/08/03 | 113512 | systems/texlive/tlnet/archive/texlive-scripts.r64029.tar.xz
-2022/08/03 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/08/03 | 112877 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/08/03 | 109651 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/08/03 | 107439 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2022/08/03 | 10499 | macros/latex/contrib/europecv/templates/cv_template_en_bieber.tex
-2022/08/03 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/08/03 | 103599 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/08/03 | 103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2022/08/03 | 10078 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
2022/08/03 | 1002 | macros/latex/contrib/europecv/examples/bulgarian-utf8.tex
2022/08/03 | 10015344 | systems/texlive/tlnet/archive/profcollege.doc.r64032.tar.xz
@@ -271,7 +332,6 @@
2022/08/02 | 799628 | systems/texlive/tlnet/archive/hfutthesis.doc.r64025.tar.xz
2022/08/02 | 744396 | systems/texlive/tlnet/archive/proflycee.doc.r64024.tar.xz
2022/08/02 | 729796 | systems/texlive/tlnet/archive/bodeplot.doc.r64022.tar.xz
-2022/08/02 | 7287 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/08/02 | 6980 | systems/texlive/tlnet/archive/customdice.source.r64021.tar.xz
2022/08/02 | 63304 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
2022/08/02 | 568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r64023.tar.xz
@@ -289,6 +349,7 @@
2022/08/02 | 2214355 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
2022/08/02 | 219736 | macros/latex/contrib/sillypage/sillypage.pdf
2022/08/02 | 2188 | macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
+2022/08/02 | 21126 | macros/optex/base/sections.opm
2022/08/02 | 18636 | macros/latex/contrib/sillypage/sillywalk-map.pdf
2022/08/02 | 172433 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
2022/08/02 | 16696 | systems/texlive/tlnet/archive/bodeplot.source.r64022.tar.xz
@@ -341,10 +402,6 @@
2022/08/01 | 104452 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
2022/08/01 | 10007 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
2022/07/31 | 97095 | graphics/pgf/contrib/bodeplot/bodeplot.dtx
-2022/07/31 | 96780 | macros/latex/contrib/create-theorem/create-theorem.sty
-2022/07/31 | 90331 | macros/latex/contrib/create-theorem.zip
-2022/07/31 | 67899 | macros/latex/contrib/create-theorem/create-theorem-doc.pdf
-2022/07/31 | 676 | macros/latex/contrib/create-theorem/README.md
2022/07/31 | 640665 | macros/latex/contrib/colortbl.zip
2022/07/31 | 5868 | systems/texlive/tlnet/archive/unbtex.r64008.tar.xz
2022/07/31 | 534 | graphics/pgf/contrib/customdice/README.md
@@ -356,12 +413,9 @@
2022/07/31 | 369482 | graphics/pgf/contrib/customdice/customdice.pdf
2022/07/31 | 369482 | customdice/customdice.pdf
2022/07/31 | 3623 | graphics/pgf/contrib/bodeplot/README.md
-2022/07/31 | 26046 | macros/latex/contrib/create-theorem/create-theorem-doc.tex
-2022/07/31 | 19106 | macros/latex/contrib/create-theorem/LICENSE
2022/07/31 | 1632 | systems/texlive/tlnet/archive/collection-publishers.r64009.tar.xz
2022/07/31 | 1441108 | systems/texlive/tlnet/archive/unbtex.doc.r64008.tar.xz
2022/07/31 | 1416 | graphics/pgf/contrib/bodeplot/bodeplot.ins
-2022/07/31 | 12 | macros/latex/contrib/create-theorem/DEPENDS.txt
2022/07/31 | 1062592 | graphics/pgf/contrib/bodeplot/bodeplot.pdf
2022/07/30 | 982924 | systems/texlive/tlnet/archive/markdown.doc.r64000.tar.xz
2022/07/30 | 980504 | systems/win32/miktex/tm/packages/markdown__doc.tar.lzma
@@ -546,8 +600,9 @@
2022/07/29 | 972 | macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl
2022/07/29 | 958 | macros/xetex/latex/hfutthesis/hfut-chapters/notation.tex
2022/07/29 | 9391 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex
+2022/07/29 | 93594 | macros/latex/contrib/media9/doc/media9.tex
2022/07/29 | 92 | macros/xetex/latex/hfutthesis/hfut-chapters/complementary.tex
-2022/07/29 | 898 | macros/latex/contrib/pbalance/README.md
+2022/07/29 | 83978 | macros/latex/contrib/animate/animate.tex
2022/07/29 | 832411 | macros/generic/markdown/markdown.pdf
2022/07/29 | 8200 | systems/texlive/tlnet/archive/csassignments.source.r63992.tar.xz
2022/07/29 | 75 | macros/generic/markdown/examples/scientists.csv
@@ -557,24 +612,18 @@
2022/07/29 | 686941 | macros/generic/markdown/markdown.html
2022/07/29 | 665 | fonts/simpleicons/README.md
2022/07/29 | 66145 | macros/latex/contrib/pbalance.zip
-2022/07/29 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220729.zip.md5
2022/07/29 | 6510 | macros/xetex/latex/hfutthesis/hfut-chapters/math.tex
2022/07/29 | 631781 | macros/generic/markdown/markdown.dtx
2022/07/29 | 624 | macros/latex/contrib/unbtex/unbtex-example/apendice-b.tex
-2022/07/29 | 62031 | macros/latex/contrib/pbalance/pbalance.dtx
2022/07/29 | 60629 | macros/xetex/latex/hfutthesis/hfut-figures/hfut-name.pdf
2022/07/29 | 586 | macros/latex/contrib/memoir/doc-src/trims-example.tex
2022/07/29 | 560 | macros/xetex/latex/hfutthesis/hfut-chapters/acknowledgements.tex
2022/07/29 | 558 | macros/latex/contrib/unbtex/unbtex-example/anexo-a.tex
2022/07/29 | 552 | systems/texlive/tlnet/archive/collection-langchinese.r63995.tar.xz
2022/07/29 | 5519 | macros/latex/contrib/memoir/doc-src/memfonts.sty
-2022/07/29 | 538 | macros/latex/contrib/pbalance/LICENSE
2022/07/29 | 535 | macros/xetex/latex/hfutthesis/hfut-chapters/publications.tex
2022/07/29 | 521060 | systems/texlive/tlnet/archive/xduts.r63996.tar.xz
-2022/07/29 | 514569903 | systems/mac/mactex/mactex-MacTeXtras-20220729.zip
2022/07/29 | 5069 | macros/latex/contrib/unbtex/unbtex-example/references.bib
-2022/07/29 | 50436 | macros/latex/contrib/pbalance/pbalance.pdf
-2022/07/29 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
2022/07/29 | 49407 | macros/latex/contrib/memoir/README
2022/07/29 | 489828 | macros/xetex/latex/buctthesis.zip
2022/07/29 | 4885 | macros/xetex/latex/hfutthesis/hfut-bib/hfut.bib
@@ -594,7 +643,6 @@
2022/07/29 | 3884 | systems/texlive/tlnet/archive/csassignments.r63992.tar.xz
2022/07/29 | 38371 | macros/latex/contrib/memoir/mempatch.dtx
2022/07/29 | 38156 | systems/texlive/tlnet/archive/xduts.source.r63996.tar.xz
-2022/07/29 | 38155 | systems/mac/mactex/ExtrasFolder.pdf
2022/07/29 | 3814 | macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex
2022/07/29 | 373 | macros/latex/contrib/unbtex/unbtex-example/codigos/controle.m
2022/07/29 | 36828 | systems/texlive/tlnet/archive/nicematrix.r63993.tar.xz
@@ -637,7 +685,6 @@
2022/07/29 | 22371 | macros/generic/markdown/libraries/markdown-tinyyaml.lua
2022/07/29 | 21622 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-angles.tex
2022/07/29 | 214 | macros/latex/contrib/unbtex/unbtex-example/capitulo5.tex
-2022/07/29 | 2071 | macros/latex/contrib/pbalance/pbalance.ins
2022/07/29 | 206 | macros/latex/contrib/memoir/doc-src/Makeidxglo
2022/07/29 | 2039 | macros/latex/contrib/unbtex/README.md
2022/07/29 | 203838 | macros/latex/contrib/memoir/doc-src/setpage-example.pdf
@@ -661,13 +708,10 @@
2022/07/29 | 16592 | macros/generic/markdown/README.md
2022/07/29 | 16396 | systems/texlive/tlnet/archive/lua-widow-control.r63994.tar.xz
2022/07/29 | 1635 | macros/generic/markdown/examples/latex.tex
-2022/07/29 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220729.zip.sha512
-2022/07/29 | 1612 | systems/mac/mactex/Licenses.txt
2022/07/29 | 1518 | macros/latex/contrib/memoir/doc-src/anvil2.mps
2022/07/29 | 1514098 | macros/latex/contrib/memoir/doc-src/memman.tex
2022/07/29 | 1496 | systems/texlive/tlnet/archive/circuit-macros.r63991.tar.xz
2022/07/29 | 1491 | macros/generic/markdown/examples/context-mkii.tex
-2022/07/29 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
2022/07/29 | 14597 | macros/latex/contrib/memoir/doc-src/memlays.sty
2022/07/29 | 1440 | macros/xetex/latex/hfutthesis/hfut-chapters/intro.tex
2022/07/29 | 14364 | macros/latex/contrib/unbtex/unbtex-example.tex
@@ -697,103 +741,7 @@
2022/07/29 | 11063 | macros/latex/contrib/tkz/tkz-euclide/README.md
2022/07/29 | 1104426 | macros/latex/contrib/tkz/tkz-euclide/doc/tkz-euclide.pdf
2022/07/29 | 106972 | systems/texlive/tlnet/archive/csassignments.doc.r63992.tar.xz
+2022/07/29 | 10266 | macros/latex/contrib/xsavebox/xsavebox.tex
2022/07/29 | 10203 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex
2022/07/29 | 10159 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex
2022/07/29 | 101124 | macros/xetex/latex/buctthesis/buctthesis.dtx
-2022/07/28 | 9469 | macros/luatex/generic/lua-widow-control/lua-widow-control.sty
-2022/07/28 | 926 | macros/xetex/latex/exam-zh/doc/back/package.tex
-2022/07/28 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
-2022/07/28 | 8676 | macros/luatex/generic/lua-widow-control/lwc-manual.mkxl
-2022/07/28 | 841767 | install/macros/luatex/generic/lua-widow-control.tds.zip
-2022/07/28 | 840332 | macros/luatex/generic/lua-widow-control.zip
-2022/07/28 | 824 | macros/xetex/latex/exam-zh/doc/back/development.tex
-2022/07/28 | 7934 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex
-2022/07/28 | 7845 | macros/xetex/latex/exam-zh/CHANGELOG.md
-2022/07/28 | 7843 | macros/luatex/generic/lua-widow-control/CHANGELOG.md
-2022/07/28 | 7808 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-math.tex
-2022/07/28 | 7783 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-utilities.tex
-2022/07/28 | 7688 | macros/xetex/latex/exam-zh/doc/body/installation.tex
-2022/07/28 | 738928 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2022/07/28 | 7321 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-points.tex
-2022/07/28 | 731424 | systems/texlive/tlnet/archive/scripture.doc.r63988.tar.xz
-2022/07/28 | 730 | macros/xetex/latex/exam-zh/doc/body/cover.tex
-2022/07/28 | 707188 | macros/xetex/latex/xduts/xduts.pdf
-2022/07/28 | 7032 | systems/texlive/tlnet/archive/fixdif.source.r63986.tar.xz
-2022/07/28 | 69032 | macros/xetex/latex/exam-zh/tex/exam-zh.cls
-2022/07/28 | 6765 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-axesmin.tex
-2022/07/28 | 6576 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles-by.tex
-2022/07/28 | 6496 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex
-2022/07/28 | 61886 | macros/luatex/generic/lua-widow-control/tb133chernoff-widows.ltx
-2022/07/28 | 6085 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty
-2022/07/28 | 5962 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex
-2022/07/28 | 5911 | macros/luatex/generic/lua-widow-control/tb133chernoff-widows.bib
-2022/07/28 | 5739 | macros/luatex/generic/lua-widow-control/lwc-manual-samples.tex
-2022/07/28 | 5388 | systems/texlive/tlnet/archive/scripture.r63988.tar.xz
-2022/07/28 | 5343 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex
-2022/07/28 | 52853 | macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty
-2022/07/28 | 511876 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2022/07/28 | 5067 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex
-2022/07/28 | 506634 | macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
-2022/07/28 | 474 | macros/xetex/latex/exam-zh/doc/back/about-author.tex
-2022/07/28 | 47183 | macros/luatex/generic/lua-widow-control/tb133chernoff-widows-plot.dat
-2022/07/28 | 4630 | macros/luatex/generic/lua-widow-control/tb133chernoff-widows-figure.ctx
-2022/07/28 | 4601 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex
-2022/07/28 | 4375 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-lib-eu-marks.tex
-2022/07/28 | 43635 | macros/luatex/generic/lua-widow-control/lua-widow-control.lua
-2022/07/28 | 41206 | macros/xetex/latex/exam-zh/tex/exam-zh-question.sty
-2022/07/28 | 4085 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex
-2022/07/28 | 3975 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex
-2022/07/28 | 391523 | macros/luatex/generic/lua-widow-control/tb133chernoff-widows.pdf
-2022/07/28 | 380176 | systems/texlive/tlnet/archive/intopdf.doc.r63987.tar.xz
-2022/07/28 | 36637 | macros/luatex/generic/lua-widow-control/lwc-manual.tex
-2022/07/28 | 3484 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-base.tex
-2022/07/28 | 3473 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-grids.tex
-2022/07/28 | 32 | macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
-2022/07/28 | 3111 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-angles.tex
-2022/07/28 | 3022 | macros/luatex/generic/lua-widow-control/lua-widow-control-2022-02-22.sty
-2022/07/28 | 2987 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-text.tex
-2022/07/28 | 289 | macros/xetex/latex/exam-zh/doc/back/main-changelog.tex
-2022/07/28 | 2861 | macros/xetex/latex/xduts/README.md
-2022/07/28 | 2836 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-triangles.tex
-2022/07/28 | 2823 | macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
-2022/07/28 | 2810 | macros/luatex/generic/lua-widow-control/README.md
-2022/07/28 | 2749 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-modules.tex
-2022/07/28 | 2659251 | graphics/circuit_macros.zip
-2022/07/28 | 25352 | macros/latex/contrib/csassignments/csassignments.dtx
-2022/07/28 | 2444 | systems/texlive/tlnet/archive/intopdf.source.r63987.tar.xz
-2022/07/28 | 238818 | macros/xetex/latex/xduts/xduts.dtx
-2022/07/28 | 237836 | systems/texlive/tlnet/archive/fixdif.doc.r63986.tar.xz
-2022/07/28 | 23735 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-spc.tex
-2022/07/28 | 2268 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-colors.tex
-2022/07/28 | 2233 | macros/luatex/generic/lua-widow-control/lua-widow-control.tex
-2022/07/28 | 2182569 | macros/xetex/latex/exam-zh.zip
-2022/07/28 | 20557 | macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty
-2022/07/28 | 204716 | macros/xetex/latex/exam-zh/doc/figures/gitee-main.png
-2022/07/28 | 20354 | macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty
-2022/07/28 | 2005 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-lib-eu-shape.tex
-2022/07/28 | 1964317 | macros/latex/contrib/nicematrix.zip
-2022/07/28 | 1900 | macros/xetex/latex/exam-zh/doc/exam-zh-doc-setup.tex
-2022/07/28 | 18568 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex
-2022/07/28 | 18460 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-intersections.tex
-2022/07/28 | 18087 | macros/xetex/latex/exam-zh/tex/exam-zh-font.sty
-2022/07/28 | 1807 | macros/luatex/generic/lua-widow-control/lua-widow-control.opm
-2022/07/28 | 1792 | systems/texlive/tlnet/archive/fixdif.r63986.tar.xz
-2022/07/28 | 17804 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex
-2022/07/28 | 171403 | macros/xetex/latex/exam-zh/doc/figures/gitee-release.png
-2022/07/28 | 1612320 | macros/xetex/latex/xduts.zip
-2022/07/28 | 1498 | macros/xetex/latex/exam-zh/doc/body/introduction.tex
-2022/07/28 | 14443 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex
-2022/07/28 | 142906 | macros/latex/contrib/csassignments/csassignments.pdf
-2022/07/28 | 1404 | macros/luatex/generic/lua-widow-control/lwc-manual.bib
-2022/07/28 | 1372 | systems/texlive/tlnet/archive/intopdf.r63987.tar.xz
-2022/07/28 | 13272 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex
-2022/07/28 | 1296290 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2022/07/28 | 12456 | systems/texlive/tlnet/archive/scripture.source.r63988.tar.xz
-2022/07/28 | 1224 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-eu-BB.tex
-2022/07/28 | 119659 | macros/latex/contrib/csassignments.zip
-2022/07/28 | 11492 | macros/xetex/latex/exam-zh/README.md
-2022/07/28 | 11224 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.cfg
-2022/07/28 | 1111 | macros/xetex/latex/xduts/xduts.ins
-2022/07/28 | 1085430 | macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf
-2022/07/28 | 10652 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex
-2022/07/28 | 10463 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex
diff --git a/macros/generic/olsak-misc/README b/macros/generic/olsak-misc/README
index a564097162..a4c9ab33bc 100644
--- a/macros/generic/olsak-misc/README
+++ b/macros/generic/olsak-misc/README
@@ -25,6 +25,7 @@ History:
<Jun. 2016> ver.1 ... files contributed to CTAN as one "bundle" olsak-misc
<May 2019> ... qrcode: bug fixed
<Jun. 2022> ... cropmarks.tex added
+<Aug. 2022> ... middle cropmarks added
License:
-------
diff --git a/macros/generic/olsak-misc/cropmarks.tex b/macros/generic/olsak-misc/cropmarks.tex
index d098f8144e..155581692f 100644
--- a/macros/generic/olsak-misc/cropmarks.tex
+++ b/macros/generic/olsak-misc/cropmarks.tex
@@ -42,6 +42,13 @@
\def\middleB{\vbox to0pt{\kern\gap\copy\vrul\vss}}
\def\middleL{\llap{\copy\hrul\kern\gap}}
\def\middleR{\rlap{\kern\gap\copy\hrul}}
+\def\middleV#1#2{\setbox0=\hbox to#2{#1\kern\gap\hlin#1\hlin\kern\gap#1}%
+ \vbox to0pt{\vss\box0\vss}}
+\def\middleH#1#2{\setbox0=\vbox to#2{#1\kern\gap\vlin#1\vlin\kern\gap#1}%
+ \hbox to0pt{\hss\box0\hss}}
+\def\hlin{\leaders\vrule height.5\mthick depth.5\mthick\hfil}
+\def\vlin{\leaders\hrule width\mthick\vfil}
+\def\middledim{\csname mc?h\the\tmpnum\endcsname}
% \cropmarks{box}
% creates a dimension-less crop marks around the box and prints the box with them:
@@ -61,7 +68,10 @@
\vss \tmpnum=0
\loop \ifnum\tmpnum<\hmiddle
\advance\tmpnum by1
- \hbox to\dimen0{\middleL\hss\middleR}%
+ \hbox to\dimen0
+ \ifcsname mc?h\the\tmpnum\endcsname
+ {\middleH\middleL\middledim \hss \middleH\middleR\middledim}%
+ \else {\middleL\hss\middleR}\fi
\vss \repeat
\hbox to\dimen0{\cropLB\hss\vmiddleloop\middleB \cropRB}
}
@@ -70,7 +80,9 @@
\loop
\ifnum\tmpnum<\vmiddle
\advance\tmpnum by1
- #1\hss
+ \ifcsname mc?v\the\tmpnum\endcsname \middleV#1{\csname mc?v\the\tmpnum\endcsname}%
+ \else #1\fi
+ \hss
\repeat
}
\def\docropmarks{%
@@ -98,6 +110,8 @@
\def\today {\the\year-\othe\month-\othe\day} % you can re-define this format
\ifx\optexversion\undefined \catcode`\_=12 \fi % names can include _ character
+\def\middlecrop #1:#2{\expandafter\def\csname mc?#1\endcsname{#2}}
+
\endinput
@@ -165,3 +179,37 @@ first and then you can add cropmarks for whole sheets. Use another software
(or your TeX macro or use OpTeX trick 0088) for creating sheets and create a
new PDF document. Then set appropriate number of middle marks and read this
new document with sheets at input side when you are using cropmarks.tex
+
+The middle marks are only single lines by default (intendend for paper bend
+only). Sometimes we need to leave a space for crop area here too. This is
+possible by \middlecrop vnum:{dimen} or \middlecrop hnum:{dimen}
+declaration. The "h" is declaration for \hmiddle marks (left+right
+margins) and "v" for \vmiddle marks (top+bottom margins). The "num" is order
+number of given middle mark and dimen is the amout of the space between crop
+marks created here (the single-line mark for paper bend is added between
+them to the center). For example, you can create "imposition sheets" with 8
+pages per sheet shown in the example of the OpTeX trick 0088. See also
+https://en.wikipedia.org/wiki/Imposition. Then you can declare:
+
+ \hmiddle=1 \middlecrop h1: {18mm}
+ \vmiddle=3 \middlecrop v2: {14mm}
+
+It says that there is single \hmiddle mark which is intended for bend
+followed by crop 9mm and there is first and third \vmiddle mark intended for
+bend only and second \vmiddle mark is used for bend followed by crop 7mm.
+We get something like this:
+
+ _| | |_|_| | |_
+
+ page page page page
+
+ _ _
+ _| |_
+ _| |_
+
+
+ page page page page
+ _ _ _ _
+ | | | | | | |
+
+
diff --git a/macros/latex/contrib/animate/ChangeLog b/macros/latex/contrib/animate/ChangeLog
index e30e23a04f..d9da4f0679 100644
--- a/macros/latex/contrib/animate/ChangeLog
+++ b/macros/latex/contrib/animate/ChangeLog
@@ -1,3 +1,7 @@
+2022-08-04
+ * fix: a few obsolete code lines removed; option processing acc. to new
+ LaTeX format 22-06-01
+
2022-02-21
* improvement: svg clipping code simplified
diff --git a/macros/latex/contrib/animate/animate.pdf b/macros/latex/contrib/animate/animate.pdf
index 6920b0466d..33f6b8c81b 100644
--- a/macros/latex/contrib/animate/animate.pdf
+++ b/macros/latex/contrib/animate/animate.pdf
@@ -1,7 +1,7 @@
%PDF-1.4
%
610 0 obj
-<< /Linearized 1 /L 3751389 /H [ 3136261 524 ] /O 1884 /E 3171591 /N 29 /T 3739069 >>
+<< /Linearized 1 /L 3751366 /H [ 3136261 525 ] /O 1884 /E 3171583 /N 29 /T 3739046 >>
endobj
xref
@@ -1280,62 +1280,62 @@ xref
0003135858 00000 n
0003136096 00000 n
0003136261 00000 n
-0003136785 00000 n
-0003137209 00000 n
-0003137340 00000 n
-0003141260 00000 n
-0003141515 00000 n
-0003141734 00000 n
-0003141914 00000 n
-0003142094 00000 n
-0003142274 00000 n
-0003142454 00000 n
-0003142634 00000 n
-0003142814 00000 n
-0003142999 00000 n
-0003143184 00000 n
-0003143364 00000 n
-0003143544 00000 n
-0003143729 00000 n
-0003143914 00000 n
-0003144094 00000 n
-0003144300 00000 n
-0003144512 00000 n
-0003144575 00000 n
-0003144627 00000 n
-0003144732 00000 n
-0003144857 00000 n
-0003144981 00000 n
-0003145352 00000 n
-0003145653 00000 n
-0003146132 00000 n
-0003146531 00000 n
-0003147076 00000 n
-0003147720 00000 n
-0003153969 00000 n
-0003156230 00000 n
-0003166505 00000 n
-0003167062 00000 n
-0003167187 00000 n
-0003167540 00000 n
-0003168280 00000 n
-0003168397 00000 n
-0003168478 00000 n
-0003168636 00000 n
-0003168809 00000 n
-0003168982 00000 n
-0003169175 00000 n
-0003169372 00000 n
-0003169598 00000 n
-0003169773 00000 n
-0003169980 00000 n
-0003170189 00000 n
-0003170387 00000 n
-0003170722 00000 n
-0003171093 00000 n
-0003171266 00000 n
-0003171412 00000 n
-trailer << /Info 218 0 R /Root 611 0 R /Size 1939 /Prev 3739059 /ID [<3f5051c93ffdfa157c0ad1d1ec61c1ae><df5a354dda90328c914c6f06248b0df8>] >>
+0003136786 00000 n
+0003137210 00000 n
+0003137341 00000 n
+0003141252 00000 n
+0003141507 00000 n
+0003141726 00000 n
+0003141906 00000 n
+0003142086 00000 n
+0003142266 00000 n
+0003142446 00000 n
+0003142626 00000 n
+0003142806 00000 n
+0003142991 00000 n
+0003143176 00000 n
+0003143356 00000 n
+0003143536 00000 n
+0003143721 00000 n
+0003143906 00000 n
+0003144086 00000 n
+0003144292 00000 n
+0003144504 00000 n
+0003144567 00000 n
+0003144619 00000 n
+0003144724 00000 n
+0003144849 00000 n
+0003144973 00000 n
+0003145344 00000 n
+0003145645 00000 n
+0003146124 00000 n
+0003146523 00000 n
+0003147068 00000 n
+0003147712 00000 n
+0003153961 00000 n
+0003156222 00000 n
+0003166497 00000 n
+0003167054 00000 n
+0003167179 00000 n
+0003167532 00000 n
+0003168272 00000 n
+0003168389 00000 n
+0003168470 00000 n
+0003168628 00000 n
+0003168801 00000 n
+0003168974 00000 n
+0003169167 00000 n
+0003169364 00000 n
+0003169590 00000 n
+0003169765 00000 n
+0003169972 00000 n
+0003170181 00000 n
+0003170379 00000 n
+0003170714 00000 n
+0003171085 00000 n
+0003171258 00000 n
+0003171404 00000 n
+trailer << /Info 218 0 R /Root 611 0 R /Size 1939 /Prev 3739036 /ID [<75e8fb4f5346631caadd4dd62bc0c8cf><c56a8654f67f089b6bb008ec65f15f3a>] >>
startxref
0
%%EOF
@@ -1442,7 +1442,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJHuqjj[Qbn5
endobj
625 0 obj
-<< /AA << /PC << /JS 624 0 R /S /JavaScript >> /PI << /JS 624 0 R /S /JavaScript >> /PO << /JS 623 0 R /S /JavaScript >> /PV << /JS 623 0 R /S /JavaScript >> >> /AP << /N 616 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65537 /H /N /MK << /I 616 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 333.72 629.38 347.04 638.62 ] /Subtype /Widget /T (anm0) /Type /Annot >>
+<< /AA << /PC << /JS 624 0 R /S /JavaScript >> /PI << /JS 624 0 R /S /JavaScript >> /PO << /JS 623 0 R /S /JavaScript >> /PV << /JS 623 0 R /S /JavaScript >> >> /AP << /N 616 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65537 /H /N /MK << /I 616 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 333.72 629.38 347.04 638.62 ] /Subtype /Widget /T (anm0) /Type /Annot >>
endobj
626 0 obj
<< /BaseFont /DFMPLS+LinLibertineTI /Encoding 1872 0 R /FirstChar 27 /FontDescriptor 627 0 R /LastChar 246 /Subtype /Type1 /ToUnicode 1871 0 R /Type /Font /Widths [ 564 0 0 0 0 0 0 0 0 0 0 0 268 306 313 0 0 219 333 219 291 0 0 0 0 444 0 0 0 0 444 219 0 0 527 0 0 0 667 557 0 667 526 457 664 0 280 414 637 519 804 0 668 499 0 0 454 544 0 597 0 628 0 0 0 0 0 0 0 268 486 478 389 489 401 314 477 519 276 259 486 266 783 518 447 489 0 357 353 307 521 472 688 475 503 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 447 ] >>
@@ -1483,7 +1483,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJHuqjj[Qbn5
endobj
634 0 obj
-<< /AA << /PC << /JS 633 0 R /S /JavaScript >> /PI << /JS 633 0 R /S /JavaScript >> /PO << /JS 632 0 R /S /JavaScript >> /PV << /JS 632 0 R /S /JavaScript >> >> /AP << /N 628 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65537 /H /N /MK << /I 628 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 124.8 547.18 166.8 559.06 ] /Subtype /Widget /T (anm1) /Type /Annot >>
+<< /AA << /PC << /JS 633 0 R /S /JavaScript >> /PI << /JS 633 0 R /S /JavaScript >> /PO << /JS 632 0 R /S /JavaScript >> /PV << /JS 632 0 R /S /JavaScript >> >> /AP << /N 628 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65537 /H /N /MK << /I 628 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 124.8 547.18 166.8 559.06 ] /Subtype /Widget /T (anm1) /Type /Annot >>
endobj
635 0 obj
<< /BaseFont /EPUAGO+LibertinusT1Math /Encoding 1882 0 R /FirstChar 11 /FontDescriptor 636 0 R /LastChar 122 /Subtype /Type1 /ToUnicode 1881 0 R /Type /Font /Widths [ 522 472 458 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 220 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 299 0 0 0 475 503 436 ] >>
@@ -1715,7 +1715,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJHuqjj[Qbn5
endobj
671 0 obj
-<< /AA << /D << /JS (try{if\(a2_playing\){a2_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 670 0 R /S /JavaScript >> /PI << /JS 670 0 R /S /JavaScript >> /PO << /JS 669 0 R /S /JavaScript >> /PV << /JS 669 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a2_playsRight=!a2_playsRight;var\ndoplay=true;if\(a2_idx==8&&a2_playsRight\){a2_stopFirst\(\);}if\(a2_idx==0&&!a2_playsRight\){a2_stopLast\(\);}if\(doplay\){if\(a2_playsRight\){a2_playRight\(\);}else{a2_playLeft\(\);}}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 643 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 643 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 217.2 554.14 376.2 716.14 ] /Subtype /Widget /T (anm2) /Type /Annot >>
+<< /AA << /D << /JS (try{if\(a2_playing\){a2_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 670 0 R /S /JavaScript >> /PI << /JS 670 0 R /S /JavaScript >> /PO << /JS 669 0 R /S /JavaScript >> /PV << /JS 669 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a2_playsRight=!a2_playsRight;var\ndoplay=true;if\(a2_idx==8&&a2_playsRight\){a2_stopFirst\(\);}if\(a2_idx==0&&!a2_playsRight\){a2_stopLast\(\);}if\(doplay\){if\(a2_playsRight\){a2_playRight\(\);}else{a2_playLeft\(\);}}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 643 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 643 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 217.2 554.14 376.2 716.14 ] /Subtype /Widget /T (anm2) /Type /Annot >>
endobj
672 0 obj
<< /BBox [ 0 8270 150 8420 ] /Filter /FlateDecode /FormType 1 /Matrix [ 0.833333 0 0 -0.833333 0 7016.67 ] /Resources << /ProcSet [ /PDF ] >> /Subtype /Form /Type /XObject /Length 165 >>
@@ -4184,7 +4184,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJHuqjj[Qbn5
endobj
1170 0 obj
-<< /AA << /D << /JS (try{if\(a3_playing\){a3_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1169 0 R /S /JavaScript >> /PI << /JS 1169 0 R /S /JavaScript >> /PO << /JS 1168 0 R /S /JavaScript >> /PV << /JS 1168 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a3_playsRight=!a3_playsRight;var\ndoplay=true;if\(a3_idx==100&&a3_playsRight\){a3_stopFirst\(\);}if\(a3_idx==0&&!a3_playsRight\){a3_stopLast\(\);}if\(doplay\){if\(a3_playsRight\){a3_playRight\(\);}else{a3_playLeft\(\);}}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 966 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 966 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 159.12 451.78 434.16 716.14 ] /Subtype /Widget /T (anm3) /Type /Annot >>
+<< /AA << /D << /JS (try{if\(a3_playing\){a3_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1169 0 R /S /JavaScript >> /PI << /JS 1169 0 R /S /JavaScript >> /PO << /JS 1168 0 R /S /JavaScript >> /PV << /JS 1168 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a3_playsRight=!a3_playsRight;var\ndoplay=true;if\(a3_idx==100&&a3_playsRight\){a3_stopFirst\(\);}if\(a3_idx==0&&!a3_playsRight\){a3_stopLast\(\);}if\(doplay\){if\(a3_playsRight\){a3_playRight\(\);}else{a3_playLeft\(\);}}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 966 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 966 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 159.12 451.78 434.16 716.14 ] /Subtype /Widget /T (anm3) /Type /Annot >>
endobj
1171 0 obj
<< /AA << /D << /JS (a3_stopFirst\(\);) /S /JavaScript >> >> /AP << /N 672 0 R >> /BS << /W 0 >> /F 0 /FT /Btn /Ff 65536 /H /I /MK << /I 672 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 229.92 435.94 244.32 450.34 ] /Subtype /Widget /T (3.EndLeft) /Type /Annot >>
@@ -7674,7 +7674,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJHyqjj[Qbno
endobj
1244 0 obj
-<< /AA << /D << /JS (try{if\(a4_playing\){a4_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1243 0 R /S /JavaScript >> /PI << /JS 1243 0 R /S /JavaScript >> /PO << /JS 1242 0 R /S /JavaScript >> /PV << /JS 1242 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a4_playsRight=!a4_playsRight;if\(a4_idx==0\)a4_playsRight=true;if\(a4_idx==28\)a4_playsRight=false;if\(a4_playsRight\){a4_playRight\(\);}else{a4_playLeft\(\);}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 1212 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 1212 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 174.6 584.14 418.68 716.14 ] /Subtype /Widget /T (anm4) /Type /Annot >>
+<< /AA << /D << /JS (try{if\(a4_playing\){a4_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1243 0 R /S /JavaScript >> /PI << /JS 1243 0 R /S /JavaScript >> /PO << /JS 1242 0 R /S /JavaScript >> /PV << /JS 1242 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a4_playsRight=!a4_playsRight;if\(a4_idx==0\)a4_playsRight=true;if\(a4_idx==28\)a4_playsRight=false;if\(a4_playsRight\){a4_playRight\(\);}else{a4_playLeft\(\);}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 1212 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 1212 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 174.6 584.14 418.68 716.14 ] /Subtype /Widget /T (anm4) /Type /Annot >>
endobj
1245 0 obj
<< /AA << /D << /JS (a4_stopFirst\(\);) /S /JavaScript >> >> /AP << /N 672 0 R >> /BS << /W 0 >> /F 0 /FT /Btn /Ff 65536 /H /I /MK << /I 672 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 229.92 568.42 244.32 582.7 ] /Subtype /Widget /T (4.EndLeft) /Type /Annot >>
@@ -16192,7 +16192,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJH}qjj[QbnH
endobj
1742 0 obj
-<< /AA << /D << /JS (try{if\(a5_playing\){a5_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1741 0 R /S /JavaScript >> /PI << /JS 1741 0 R /S /JavaScript >> /PO << /JS 1740 0 R /S /JavaScript >> /PV << /JS 1740 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a5_playsRight=!a5_playsRight;var\ndoplay=true;if\(a5_idx==190&&a5_playsRight\){a5_stopFirst\(\);}if\(a5_idx==0&&!a5_playsRight\){a5_stopLast\(\);}if\(doplay\){if\(a5_playsRight\){a5_playRight\(\);}else{a5_playLeft\(\);}}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 1448 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 1448 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 125.28 395.38 468 716.14 ] /Subtype /Widget /T (anm5) /Type /Annot >>
+<< /AA << /D << /JS (try{if\(a5_playing\){a5_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1741 0 R /S /JavaScript >> /PI << /JS 1741 0 R /S /JavaScript >> /PO << /JS 1740 0 R /S /JavaScript >> /PV << /JS 1740 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a5_playsRight=!a5_playsRight;var\ndoplay=true;if\(a5_idx==190&&a5_playsRight\){a5_stopFirst\(\);}if\(a5_idx==0&&!a5_playsRight\){a5_stopLast\(\);}if\(doplay\){if\(a5_playsRight\){a5_playRight\(\);}else{a5_playLeft\(\);}}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 1448 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 1448 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 125.28 395.38 468 716.14 ] /Subtype /Widget /T (anm5) /Type /Annot >>
endobj
1743 0 obj
<< /AA << /D << /JS (a5_stopFirst\(\);) /S /JavaScript >> >> /AP << /N 672 0 R >> /BS << /W 0 >> /F 0 /FT /Btn /Ff 65536 /H /I /MK << /I 672 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 229.92 379.54 244.32 393.94 ] /Subtype /Widget /T (5.EndLeft) /Type /Annot >>
@@ -16694,7 +16694,7 @@ stream
xLH4/IK׬KS5JJS5k34b M["k4%jj NJHuqjj[Qbn5
endobj
1840 0 obj
-<< /AA << /D << /JS (try{if\(a6_playing\){a6_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1839 0 R /S /JavaScript >> /PI << /JS 1839 0 R /S /JavaScript >> /PO << /JS 1838 0 R /S /JavaScript >> /PV << /JS 1838 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a6_playsRight=!a6_playsRight;if\(a6_idx==0\)a6_playsRight=true;if\(a6_idx==25\)a6_playsRight=false;if\(a6_playsRight\){a6_playRight\(\);}else{a6_playLeft\(\);}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 1786 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/02/21) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 1786 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 176.4 165.34 417 418.66 ] /Subtype /Widget /T (anm6) /Type /Annot >>
+<< /AA << /D << /JS (try{if\(a6_playing\){a6_pause\(\);}}catch\(e\){}) /S /JavaScript >> /PC << /JS 1839 0 R /S /JavaScript >> /PI << /JS 1839 0 R /S /JavaScript >> /PO << /JS 1838 0 R /S /JavaScript >> /PV << /JS 1838 0 R /S /JavaScript >> /U << /JS (try{if\(event.shift\)a6_playsRight=!a6_playsRight;if\(a6_idx==0\)a6_playsRight=true;if\(a6_idx==25\)a6_playsRight=false;if\(a6_playsRight\){a6_playRight\(\);}else{a6_playLeft\(\);}}catch\(e\){}) /S /JavaScript >> >> /AP << /N 1786 0 R >> /BS << /W 0 >> /Contents (animation by animate, v. 2022/08/04) /F 4 /FT /Btn /Ff 65536 /H /N /MK << /I 1786 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 176.4 165.34 417 418.66 ] /Subtype /Widget /T (anm6) /Type /Annot >>
endobj
1841 0 obj
<< /AA << /D << /JS (a6_stopFirst\(\);) /S /JavaScript >> >> /AP << /N 672 0 R >> /BS << /W 0 >> /F 0 /FT /Btn /Ff 65536 /H /I /MK << /I 672 0 R /IF << /FB true /S /A >> /TP 1 >> /Rect [ 229.92 149.62 244.32 163.9 ] /Subtype /Widget /T (6.EndLeft) /Type /Annot >>
@@ -16986,12 +16986,10 @@ endobj
<< /BaseEncoding /WinAnsiEncoding /Differences [ 11 /u1D6FC /u1D6FD /u1D6FE 59 /comma 116 /u1D461 120 /u1D465 /u1D466 /u1D467 ] /Type /Encoding >>
endobj
1883 0 obj
-<< /Filter /FlateDecode /S 425 /O 568 /Length 435 >>
+<< /Filter /FlateDecode /S 425 /O 568 /Length 436 >>
stream
-xc```aпc
- O
-4X"m+zMi1ض;oԟH꿿tftmOgn9=i7
+xc```aпc
+ L IN5,`a`udT`縚5G Su,[dWOserz w`6S A{'cjg!u؛ * `j
endstream
endobj
1884 0 obj
@@ -17001,28 +16999,25 @@ endobj
<< /FT /Btn /Ff 65537 /Rect [ 0.960007 837.94 3.96001 840.94 ] /Subtype /Widget /T (pbs@ARFix@1) /Type /Annot >>
endobj
1886 0 obj
-<< /Filter /FlateDecode /Length 3845 >>
-stream
-x[ms5 e,NzHH8R㨃6+OKQƛu쨻կOKjqv始'D
-&gG?)Кze,.+[OKu*vKǤ\>IP xt
-O2:Rѩ;H%
-X0!8'ɏVxv: '{ݓ`E) ++Gw`{4=9aJHeu1QlOy|bel(cDw/AZikAZ2afvڹn}=iGċ>t۪^}mtUI{+f?NВ|xtu}
-
- QS\^'HW=aqWQҧ'U=9u<w룏i#uA_W[.io0DmdϾºuiSl4/ EŗWGm^lrS6pyv;bG5' 5<G¢2"i<CR&oU0SZ@~I
-L4 9^#1BJ."{yQ:$BƗ\6wΔhD1=,1h Dw$11 +ҩ{kRF9 ,Sh)=ꙧdJv
- o@!FrJ)BLx/^m$ {oHpf(ydw M ^._JFM79%+1Ef=>ЂAͩLci )
-}`U%{f~}_uDJ_0oʚKB 1(LﺓB6 <BYk =Ce\x[a#~V
-TyR,bm. tQKAvp5^t7B rbBNl42Y6Ue&NvolfDI8&`Skz٤Q c'75*|txa~ALY)9i&\)?ERF&ijrU6+sT.z]sD1$r|`AG?<2x._6Z, 6 -4փeDb
- )X-PUh[s^"ɷ)T"4乄U$O}@R0%rt-'QʳXt %$@9e[D]U8ܐ<K.WhԈeo`X(ŚFC;/PÕ]pqHʯ: .Zhs@Hv+B<f!(Ŷvc=NM#p嬖5p ,GK6g_=s4
-<8Ah@Qf=bBRiI3qwBXsw
-!o3 Z0N9 EeR.Óot Cja>AǨkș MiB)+|;nڢMii8Ѐy6P17!9E}/ߺEµ nj|-VrVI#^ޔ4$-(Ժ`[Zp|Xd4kl˔"o :r<eȚ->39 nQ:+hW(%!q-HNf1 ^l!nRcSb(\y7Z*5C^f`C-7h+H-շ-B>~h 3)?JnZCu+'<Ы<W-;QۇL`(C2f}+Dq -ȁ.A?ˢh@qIQ'7l,91TA?&QZ6V:F.[Nva"Dw?xG^m{ϓ&xH\ W=)Ge>wR
-;9!Y#ugi>'[\{-5?ox='MwBBP6GѨAV>%R:V7WȕH)Jޭn䵳'xX>jmڦ>&/睹af)`jbZ _sH[pƧ ZlтmwnXl?r:x  ej
-
->tP=vg ͡@LSy$!?A*͚55宆$y|Q_nux: J^o +1j21b0]|%
-oO|V>% Ң]F=PWD1Iz.fэE+|"N i T %ߨXm;s|k?r>c?mGZA:[Eſ}rkS{|_c=@!x1WW,›E5 w]DovH2̆WJ{q>|:\A0;l:M<LFr|RQW&-P
-c4|un-<̏xaX? E
-Y )/_ 5DXk]"&r9lQo5
-4\b ubmO ;r.'<<\\ S]-=~ A.taXaezC|qLj*T?ܑ >}YGax^\ O4/c"#vuerv!BOo8Yo̧uw*OL<r#&h {|0'J! q|9-"Z_UT%7Yh$AIzɯSƔ\>pZF>):|K/D
+<< /Filter /FlateDecode /Length 3836 >>
+stream
+x[ms5 e,ŎzߒpQWu +OKQ7v쨻կOK'jqz始^ZhM mou˕D݋%:hKǤ\>IP x eeu&t SwJBw\aBpO^};ح<jtN'1S WWN0*mrizr&y)ÔbxQ
+Z>QJ=Dw@ZikAZ2afvڹnli{Ҏg{}. U)4ޓV~#% ૫,
+K.`rN^Ǒ谸u)9,pIUOz59k,9)e}Qn Nl6RzUO:d>:bt8m M֛;([g[ 6eo=fxŃ>bwt&&%mhE!,rF`g9SD͋)- 8)F̘|qSr^zH_#1B-"7ֺdRLw}s0DN^ O!2/NӒOlG[5)VXT}E|ڔ|Sm2%;b7 a#9Ŕ!&]ߣP6B&qi
+Tɜ7X7KFRqe?\ W0] %䡘A0[G@0%ձLqMlK6O$ hH<A*W>LU7vrSgIG"E ΎI8m A"xZ/62ISƶq_lNuF9+wŐq&7(୺Vsm8$Xll5[hˈ< pcd&|};)m!w o;x}1lfĨHAQ.2Fp0dVT+!і8z-[IZb7`ts)m&e>XC_6Na7rfҎ0Rj. Y)gS \U߸=H` UuZMP5~m1+|˝B%BcJKHZLԷ ,`-
+S.GarPkm9,iFyBs< !PN?fyڝ;!x
+gkg҅
+]
+`RQ-Gn"2)7U!0SA̠c~ʵ@`̆&T4!UӔUh~]Rhm;uB,u4 bf TMnHrNmQ'7nspmksCwJvl4EMY!@O61b08AU͇EJF3_jƶL)#G#Y2<s)y@ByRWrnd.ݕd IFpƦCͻYƨT*0c܀
+(3[jXSh޵9嵯=u=<3eAZj#<`O^N#N.9ܱuIpnbe0Gc(I肁]/5| 8qDEČ|#h ؆>D㔧 /rkJ=X97AD+xn<? b (}3iD8zCy
+^
+C4l6󲓄4kH֔r+7ge G}||jMЧP_LPE
+dxG_QQQCr#,@
+?ek+FTt۽уὙ1+zxӍ
+vI';1Cw趁#\)}E$J L9׽݁
+ؼa}km4T컅n zi27,1}"(lx/Q\wSJ@\Z4 iQDk|-pMu41Dʦ&>
+.*op@wچ[ݟYW D?d,Y"z#{G*XRa6Tmw  GÅqæ$-.NZ|dt,8˷&%n|u*jD=m?+ҝr x[>YDFpda+#ʰH#]oQ>~
+=Y\dYO4-ީN?1ȍآi:zFwIk~*0L3 dȷh})W-SlO%%N#RvrIǽ6ͷBྐE(dyS gk)":qw}$gOK+ K눤7u7{2`#VI竄e n.1cA|lͻd0`BC`j ՏLދPNKHێ?2noC1*;%?;42b﬇S څ('>Uf#_Uh>FbsdZF u,^|u?endstream
endobj
1887 0 obj
<< /AA << /PC << /JS 624 0 R /S /JavaScript >> /PI << /JS 624 0 R /S /JavaScript >> /PO << /JS 623 0 R /S /JavaScript >> /PV << /JS 623 0 R /S /JavaScript >> >> /F 2 /Rect [ 333.72 629.38 338.76 634.54 ] /Subtype /Screen /Type /Annot >>
@@ -17589,31 +17584,41 @@ endobj
<< /FT /Btn /Ff 65537 /Rect [ 0.960007 837.94 3.96001 840.94 ] /Subtype /Widget /T (pbs@ARFix@9) /Type /Annot >>
endobj
49 0 obj
-<< /Filter /FlateDecode /Length 6053 >>
-stream
-x]YeGu~)Op<X)D8 2H1n_>nnZ5v,|طvUkT~xxz髻x87¨+ ;݋W>>^m\h-7Gi=|v䛔Z~zx|x{La^o{_HSxl3/}-7/{9wo࣌{%M;/3~_|%Y8BY|o-Y_N({9|[ΌVŅ<xe:2;x?~=MpfCr΄ՇϑιL~y|yf<;U' b<:׬"V+ERԧ;WxyxM::6rzrsיL[#ؼ{$`9j?E29@Ezx;,.޽ư@S8{fC3XX3 8|j/ 4}C 㔆 "#" 2ܤɿC2a@Q}9Y0y=FQF)7nv Kq-eqV 1⧼dQFnd4
-*}Y zXV_œ3Sʭ^̇A µyZiP^FZU(a7]upO^$zKyˣt)XDG9bS>o $UԶVo!"Ig2NH<+7gSb—P4zEXP4z3$bs.s }e.0C܂>:Yaw9~+2P>?*)B4#lҝ#$OXl!k+{H=j[UAG3`w+FszWX&D,a[ǣvW;*pADhA8;=9`4fOQHk1~f
-n1귃|Z^߾PήE  0j8p h0QŽҪEd5d^d]opC,($\܋W1ټL]0@@Mb䝓͎
-Rk HaòDc[ ܻwvhv!SKr~և Zi$ fҲ,xiOˌzMf5QJ(u%Sm ZԮi$*GNh$-Id G
-pH 3gPsNC$>1])??,/×BLd~,d9.qmes
-F|pٽ`ke8
-KрOt5`:[$Z$NAP?ASuÞ(YKt%@%KDBc2R3}P LǯH~DM7 @EƱإ մ#` i`STJe} Kn+O0&s$$S;#nr!F$yį M_(9'h]o;yīt YPuWfeE1=flf(&Ir3cDki݃3!@2%bxPL2VD¿gUgjW*pRVel(8*x 6SQ֧ȚbfqZ#e6-v ̘>bR:Uu^SJmx2l߹eHӘwfqζ+$nW3@aZAAۀX_@/d@j, ,0p,Ls]޹tTՇ1UwOcm
-ITO2)( N7˥Lj P\֦/+[\(x  & n7q8/ ]3?clFq1%kV.KMAN9J獤Ʈ29ӑa%ЫGCO(7A%%
-,z 6Hau
-jͻ)$}1 Hn}¹T^֦p2'j%:X`c<%U mU:=z~,(:!Mo3q'R4_d xV3t٥O1jD°gY5t'O[*UsWVWu`AeuzSVSt6rBY tE`G`~pS0T8z
-MxEHlD@m$u}11M y(1mj :_2;s'' xC%leZO~sk'lǚ!.(j~fSFC3 Cǥ_M))] =!KWLt8v$Q^"i+ 梿Ŭ)=&[=KL>X4Ÿ*"Mb3B8l9]u#IWKmB@s_K
-~jU7C;(V`˹x06)j ".tE/R&YPfhWXq.5*(SJ(=t_m7&T6W9K R9-nmRv|>\GPluS]U_sլB胸j"JJ P#$JZV5> ˅['ʺ
-Vw.C ;A"n*Xc>D?6֫?tlu껱|Ӱ%:4w&UIz%@
-+z4__&=#+p)d YCx,(&i
-A珷5X/nu0a"Izt̀AA#RY;+[eux@?^a\s}nbp@6I
-Fo
-.S8[z\&7Z-G8=L}mzanjRrC
-Xrl7b C(-,QѢVŰZĈ2I"/>>OIޯlD37=Ɓ!ŖyUNt7OW).\W3oӊexmti
-DpPz'6^t)<J 2g,>mqdg]Ϙ
-@8e`O˭b~ ;pa(şe<NW+5-0Z
-!> t`nt&9:YiZ*8zyY-f
-GIݹ8|M(XZ ,Q[мۆ4Ǚz/ZD.-y+vlJmlLʾvX]ʵKS8QoZ Af+(]P ]7Bpxrq7D?/z{PrKk1Wխ=MuR]n|_hK_ŋg
-?,8endstream
+<< /Filter /FlateDecode /Length 6035 >>
+stream
+x]Yu~_Stoi׾8pY@hI#&dNsN VSgVҿ~z3ޥ>}~)w~FuY|q6wgٸ{g;ޫ 6/|Rksx<åۇbs0lS>?p|yfT}<r >x6=|qdR<9<b$s~z/`\k~Ru5 ⸖K|rf<~w40+.5>썷y VLkޏ_lYYwnr΄ՇιL~y|qf<|1nkfhw)qw߼g=˼x :Ho9ݹ9Lo^Zl^vo=0ϟ5p՟"{UY}=_R cX)lf3N,a 5˃
+I & 0> yH(U7N8H
+28*KAS
+2 #D2p
+e῎
+w*I,
+l83R2_%)|}>>܍nJ_#8kA"1꫸sFxJՋy?#
+HŽ~DTT, M9> LBӃDQs ړ$LHEr˦A3U+ uB"1k3p_cJa_#iQ~͎c~2A`uV᷐P5ywtQch5x}<l"5,Q'6 ,,es¯Tf<92EĭJ~0%gbW31Brep[nrsdMX@s<nOocE;%i&rG{EeQuzѺ2 Ёj$?IpF@lV}ST?QORܻ0لZ2YUZ,7ྤڻ#,=\UUupoC][ jĂNaI|Rm#;oݏ6f
+`~X 6 V7P  Xȉ
+h8sF vTqRv
+8i=qz,& I(-3ei-„Pl q15\1(6j/
+!2c]i%AP$pp*x
+bxĺFd%Xz@/d>, ,0pd/Hs]޹tTՇ~1YUOce^~) jIc DD.`!N=|ơ40CQO23) ^/42?0<bbnq54&a)N;PH '؈ے5+`EMO0tHj*?9l:OOᎅ@}7n 5CLe֩.JsMq^Zĸ cI1D1<`fh"&KU!䣯Kw cOhsjRVra/ÐȻ+7i EY~d 7g-)biQw %U4OqPzzpX5`ѻhoA {0ZݏJ8K]F4$:!O$mu@ E!Y ڂM}b=ΑRbBt(æo׾ڪ^WTk4[Q:\z|
+;b]֗ {CvWiAVcH%imxw{Iɬ3%&}VDq H7ϝJ8Vt 5$<M]Ww`}b Q{?HI1H׳'Vn~2[yeYCYzW >./\d` }
+j鿻)$}1 6G~UI@-զo2&j% :`c<%U m Y:
+/Dgܕũt"*Xʓ aҍy݃ޔeƔ}'gUܹP |V@$DѠ.X
+7!7N@R!X[IgSFd&pznT埋fi)DK}1ɖ̡8Aӓ
+̀׬6ZxAƓԛֿ0QHT)t/z ȂB0C;NJtXQEZWBѤj ~0a|5J(PWd*XEֺR9-n}_`lcy%qv]7ZߵmXD]9jV!qGV%-h_xZtAsU['L'sdb>a/;|Oa H|s`4ѕ-yT#!I =
+FŁ4
+t
+PPwnayCJ<k|9$_&5H__؇(xAsF>zMs}Y{ų|Ӱ$s$ di§ SHjXEmu\qLNFkQ|.8i읏JM}yP~҇p9VXѣ:|Oxnng1?d =`fKgWyvZ8Sىlx 
+W&d@ L H$4r+Ӻ;_Q
+ 5Gt&gI $for7)v[-=9f .
+|N|&ɾ607{5i!V
+/5j&b0W;
+ἥIjo4ZLe-{[9Hx]ۻ-7"٥cv\v=i@NWީpləޛNiۋvDhHĢ<=X?ݺl!S
+vkms,bvC>&xR\6³p9#V\m'ۍy8<r6J7Z!cXE}]|aщˁsDG+Ep}.},н_8zfn z&:C-}󪤙莛jX+C]rXyߦcڎP %f-\E Nm<Jyԕ,:@X|ڪv1q Z[u<ϰ=Uy 1-c{O4v0`nt&9u㱒mTkUGO/ ۨdh>61.e -pפ4 H,LJXgWe3R t9+ؼP%sMjG$?&hB˝ڽ? ځ
+<>@cEYV)ϏH@8#F
+b97Zsi(9\}WrhRgw.5_s
+ָ" DT-4o㶡(m-q&яHԥ%/^s{$ԎMO=Xn'՚M\=f[R?YU
+z?k/$_
+gת,whE/rUqiW2&|iT }opÉ
+@E_B/_<
endobj
50 0 obj
<< /R11 612 0 R /R43 1913 0 R >>
@@ -17625,7 +17630,7 @@ endobj
<< /FT /Btn /Ff 65537 /Rect [ 0.960007 837.94 3.96001 840.94 ] /Subtype /Widget /T (pbs@ARFix@10) /Type /Annot >>
endobj
53 0 obj
-<< /Filter /FlateDecode /Length 5525 >>
+<< /Filter /FlateDecode /Length 5528 >>
stream
x\[\G~߿3sKH!
5|P?} 3at׫sɎR*)axV)TϙU.gκ9.{#o C\aqW;a4Pg,;jZ^BLۅt?<$0#">}SAM%͝\Α@#pU@(K|5RVÀuB]*at;"0#vv8p+$ PxZ/?#y>nΌw vc?wЍ1I!paI{[dVg!r:Q@_1\6Y]8qZ\˯K~8
@@ -17637,22 +17642,12 @@ x\[\G~߿3sKH!
8MOOXas`dd O`
rO ƸqGhm0{jSն .
RyT'RZ|瓟0 e
-%%c<h|5Ă(ZɪP&WZ3a1܈g
-ZZ꒞!ȟ]UKRNGHI9:)'FV sTklf oAj͡Pvz=8 v]밖xm( m5yMBR&/DVez!u=$:ص[pqlӤ E(oh 7^|B"X%wT\oo4v-{ ~-YˈYok!`Xg~?A$;O-JPȺixaDza < W#źK"b1pM|܉H"5wzEKES,4~[bWt%'^P+m+ l%2~e1z. lqIMZKsENTK#9YXy Z>1U0O30=q?
-VZjBZH
-\@ByG)Eʦ Ϥ0/{rz:bU)*/6AV[WwdN1ͫ-o-W%p:TV7 D$ c(NuB}-{85E'8n^;:VQ$%zV9>TBA3`) -TjMxzM!5V❐y|AȮ!
-3A{պ9%O*
-ۨ#+ ׫)Su/
-'wו>
-XQ[Z̥%IZF`h]隰 M!vDXr򫧕/
-{i>P+X4ZHJ4x?f[L(dK O͚0 6`VPJ :2t=*xwǗʠ!gfAԧK&;8n@'J,Йq/0( @)0[!;V*AEƻĩ*=|$dv'+)u(E:1I7x4\ֳI.xV*
-t R|lCn %;`s'ߎ)\hC\.B
-r̐ܧȏO~(<>MwJC;,Ͳj@+wvC;ANGqV Ojaz
-nY#U5E"kQs9_f i͗*ޘT,\$Ywj5.D'G} 9843' |զ'9X3&
-gDn7ZwvF>G5A>F19$ լYR}uiA~ЀpuzZ!]JRSg{9-'^LOp^G6? o2nnD=JT5=ӑ`_ZdGߕ
-r7+[ґ-85r:}J@K DN <XEz9˄8 pMxoYoJ|dD B^j>m@m⤠ȤZ5蠒`|pۏǡfFg*‹*ݸ_P tPDx-y4o>=vX.\3BU"vpb~ KtχD+OI/A'y-A[v;Glڇ#o<:RƥVׇ`2laB[b mULg;L`
-isvwSl>uW}q"UdG\64|xHf6۸)_&L\-/ mHB~dF7iB8Kx1+֜`w ov׶;z_.Al?sVl"Ǟ`mwB.<^ze(!FAKûhrDh S8{?Y48cD\.+1+0)s/^$AUg[a.om
-_GXz =BKӕkݔQVEW8ML+ Oc <|1\Tendstream
+%%c<h|5Ă(ZɪP&WZ3a1܈g
+z NI=j+30^\3Ihs 4]).KnU~œP4t/g#
+wF IlK7
+Jx[AGGeVR4,ȿzidՍ$Bs:307:Ŗf0;Vfq+DyǪ_%(wx8U'4x=
+Fg:V,RZAfvE8qK:2fTNO H~ {1)Kh@o1wa m`7[lzAkCg MtTT`5prӓy8S WExQ^ *Q53o5Ϙͧ˅kq&PJ7RNo!=}y}I8(אv)0($%9h.p`Mp`䭂'TGtr5ӸԖJ,Z&y-[(|@ Vl!?-~bilqW\6u.x-Cҧ2N3!0jV”+ކxcجf7EX]˄K0ó2e^ȏ(0Map5vؚlnv\O"˅;( AyΊM]}.Wȅk[ E Đר:H{U|xmSSN-|_9Aw
+g'1ˁFg,ݕ˥w%fEc}{8%sŋ$4,b+Eݻm@`-}W%Ȉthbf;ޣn
endobj
54 0 obj
<< /A << /D (section.7) /S /GoTo >> /Border [ 0 0 0 ] /C [ 0.701176 0.4 0.414118 ] /H /I /Rect [ 145.524 690.827 152.196 701.685 ] /Subtype /Link /Type /Annot >>
@@ -19610,7 +19605,7 @@ endobj
<< /Activation << /Condition /PO /Presentation << /PassContextClick false /Style /Embedded /Transparent true >> >> /Deactivation << /Condition /PC >> >>
endobj
166 0 obj
-<< /AP << /N 157 0 R >> /BS << /S /S /W 0 >> /Contents (media embedded by media9 [1.23\(2021/10/18\)]) /F 4 /NM (click) /Rect [ 172.08 165.34 176.4 169.66 ] /RichMediaContent 164 0 R /RichMediaSettings 165 0 R /Subtype /RichMedia /Type /Annot >>
+<< /AP << /N 157 0 R >> /BS << /S /S /W 0 >> /Contents (media embedded by media9 [1.25\(2022/08/04\)]) /F 4 /NM (click) /Rect [ 172.08 165.34 176.4 169.66 ] /RichMediaContent 164 0 R /RichMediaSettings 165 0 R /Subtype /RichMedia /Type /Annot >>
endobj
167 0 obj
<< /AA << /PC << /JS 1839 0 R /S /JavaScript >> /PI << /JS 1839 0 R /S /JavaScript >> /PO << /JS 1838 0 R /S /JavaScript >> /PV << /JS 1838 0 R /S /JavaScript >> >> /F 2 /Rect [ 176.4 165.34 180.6 169.66 ] /Subtype /Screen /Type /Annot >>
@@ -19897,7 +19892,7 @@ endobj
<< /Count 29 /Kids [ 1884 0 R 1 0 R 9 0 R 16 0 R 22 0 R 31 0 R 37 0 R 43 0 R 47 0 R 51 0 R 58 0 R 64 0 R 73 0 R 83 0 R 87 0 R 96 0 R 100 0 R 107 0 R 116 0 R 122 0 R 129 0 R 141 0 R 147 0 R 154 0 R 170 0 R 176 0 R 180 0 R 184 0 R 192 0 R ] /Type /Pages >>
endobj
218 0 obj
-<< /Author <feff0041006c006500780061006e00640065007200200047007200610068006e> /CreationDate (D:20220221150420+01'00') /Creator <feff004c006100540065005800200077006900740068002000680079007000650072007200650066> /Keywords <feff0069006e0063006c00750064006500200070006f0072007400610062006c0065002000500044004600200061006e0069006d006100740069006f006e002000530056004700200061006e0069006d006100740069006f006e00200061006e0069006d0061007400650064002000500044004600200061006e0069006d006100740065006400200053005600470020006400760069007300760067006d002000680074006d006c0020005400650058003400680074002000770065006200200061006e0069006d006100740069006e006700200065006d00620065006400200061006e0069006d00610074006500640020006700720061007000680069006300730020004c00610054006500580020007000640066004c00610054006500580020004c00750061004c00610054006500580020005000530054007200690063006b00730020007000670066002000540069006b005a0020004c0061005400650058002d00700069006300740075007200650020004d0065007400610050006f0073007400200069006e006c0069006e006500200067007200610070006800690063007300200076006500630074006f007200200067007200610070006800690063007300200061006e0069006d006100740065006400200047004900460020004c006100540065005800200064007600690070007300200070007300320070006400660020006400760069007000640066006d0078002000580065004c00610054006500580020004a0061007600610053006300720069007000740020004100630072006f00620061007400200052006500610064006500720020004b004400450020004f006b0075006c006100720020005000440046002d0058004300680061006e0067006500200046006f0078006900740020005200650061006400650072002000460069007200650066006f00780020004300680072006f006d00650020004300680072006f006d00690075006d> /ModDate (D:20220221150420+01'00') /Producer (GPL Ghostscript 9.55.0) /Subject <feff0044006f00630075006d0065006e0074006100740069006f006e> /Title <feff00540068006500200061006e0069006d0061007400650020005000610063006b006100670065> >>
+<< /Author <feff0041006c006500780061006e00640065007200200047007200610068006e> /CreationDate (D:20220804170136+02'00') /Creator <feff004c006100540065005800200077006900740068002000680079007000650072007200650066> /Keywords <feff0069006e0063006c00750064006500200070006f0072007400610062006c0065002000500044004600200061006e0069006d006100740069006f006e002000530056004700200061006e0069006d006100740069006f006e00200061006e0069006d0061007400650064002000500044004600200061006e0069006d006100740065006400200053005600470020006400760069007300760067006d002000680074006d006c0020005400650058003400680074002000770065006200200061006e0069006d006100740069006e006700200065006d00620065006400200061006e0069006d00610074006500640020006700720061007000680069006300730020004c00610054006500580020007000640066004c00610054006500580020004c00750061004c00610054006500580020005000530054007200690063006b00730020007000670066002000540069006b005a0020004c0061005400650058002d00700069006300740075007200650020004d0065007400610050006f0073007400200069006e006c0069006e006500200067007200610070006800690063007300200076006500630074006f007200200067007200610070006800690063007300200061006e0069006d006100740065006400200047004900460020004c006100540065005800200064007600690070007300200070007300320070006400660020006400760069007000640066006d0078002000580065004c00610054006500580020004a0061007600610053006300720069007000740020004100630072006f00620061007400200052006500610064006500720020004b004400450020004f006b0075006c006100720020005000440046002d0058004300680061006e0067006500200046006f0078006900740020005200650061006400650072002000460069007200650066006f00780020004300680072006f006d00650020004300680072006f006d00690075006d> /ModDate (D:20220804170136+02'00') /Producer (GPL Ghostscript 9.55.0) /Subject <feff0044006f00630075006d0065006e0074006100740069006f006e> /Title <feff00540068006500200061006e0069006d0061007400650020005000610063006b006100670065> >>
endobj
219 0 obj
<< /Limits [ (Doc-Start) (table.4) ] /Names [ (Doc-Start) 221 0 R (Hfootnote.1) 232 0 R (Item.1) 587 0 R (Item.2) 588 0 R (Item.3) 589 0 R (Item.4) 590 0 R (Item.5) 591 0 R (Item.6) 592 0 R (Item.7) 593 0 R (Item.8) 595 0 R (beginend) 242 0 R (cite.chupin) 598 0 R (cite.dvisvgm) 599 0 R (cite.gilg05) 600 0 R (cite.hol) 601 0 R (cite.luque12) 602 0 R (cite.media4svg) 603 0 R (cite.media9) 604 0 R (cite.texsx) 605 0 R (dest:mem) 586 0 R (figure.1) 323 0 R (figure.2) 341 0 R (figure.3) 412 0 R (figure.4) 424 0 R (figure.5) 508 0 R (lstlisting.-1) 255 0 R (lstlisting.-2) 265 0 R (lstlisting.-3) 284 0 R (lstlisting.-4) 324 0 R (lstlisting.-5) 370 0 R (lstlisting.-6) 413 0 R (lstlisting.-7) 480 0 R (lstlisting.-8) 556 0 R (lstlisting.-9) 578 0 R (lstnumber.-1.1) 256 0 R (lstnumber.-1.2) 257 0 R (lstnumber.-1.3) 258 0 R (lstnumber.-1.4) 259 0 R (lstnumber.-1.5) 260 0 R (lstnumber.-1.6) 261 0 R (lstnumber.-1.7) 262 0 R (lstnumber.-2.1) 266 0 R (lstnumber.-2.10) 275 0 R (lstnumber.-2.11) 276 0 R (lstnumber.-2.12) 277 0 R (lstnumber.-2.2) 267 0 R (lstnumber.-2.3) 268 0 R (lstnumber.-2.4) 269 0 R (lstnumber.-2.5) 270 0 R (lstnumber.-2.6) 271 0 R (lstnumber.-2.7) 272 0 R (lstnumber.-2.8) 273 0 R (lstnumber.-2.9) 274 0 R (lstnumber.-3.1) 285 0 R (lstnumber.-3.10) 294 0 R (lstnumber.-3.11) 295 0 R (lstnumber.-3.12) 296 0 R (lstnumber.-3.13) 297 0 R (lstnumber.-3.14) 298 0 R (lstnumber.-3.15) 299 0 R (lstnumber.-3.16) 300 0 R (lstnumber.-3.17) 301 0 R (lstnumber.-3.18) 302 0 R (lstnumber.-3.19) 303 0 R (lstnumber.-3.2) 286 0 R (lstnumber.-3.20) 304 0 R (lstnumber.-3.21) 305 0 R (lstnumber.-3.22) 306 0 R (lstnumber.-3.23) 307 0 R (lstnumber.-3.24) 308 0 R (lstnumber.-3.25) 309 0 R (lstnumber.-3.26) 310 0 R (lstnumber.-3.27) 311 0 R (lstnumber.-3.28) 312 0 R (lstnumber.-3.29) 313 0 R (lstnumber.-3.3) 287 0 R (lstnumber.-3.30) 314 0 R (lstnumber.-3.31) 315 0 R (lstnumber.-3.32) 316 0 R (lstnumber.-3.33) 317 0 R (lstnumber.-3.34) 318 0 R (lstnumber.-3.35) 319 0 R (lstnumber.-3.36) 320 0 R (lstnumber.-3.37) 321 0 R (lstnumber.-3.4) 288 0 R (lstnumber.-3.5) 289 0 R (lstnumber.-3.6) 290 0 R (lstnumber.-3.7) 291 0 R (lstnumber.-3.8) 292 0 R (lstnumber.-3.9) 293 0 R (lstnumber.-4.1) 325 0 R (lstnumber.-4.10) 334 0 R (lstnumber.-4.11) 335 0 R (lstnumber.-4.12) 336 0 R (lstnumber.-4.13) 337 0 R (lstnumber.-4.14) 338 0 R (lstnumber.-4.15) 339 0 R (lstnumber.-4.16) 342 0 R (lstnumber.-4.17) 343 0 R (lstnumber.-4.18) 344 0 R (lstnumber.-4.19) 345 0 R (lstnumber.-4.2) 326 0 R (lstnumber.-4.20) 346 0 R (lstnumber.-4.21) 347 0 R (lstnumber.-4.22) 348 0 R (lstnumber.-4.23) 349 0 R (lstnumber.-4.24) 350 0 R (lstnumber.-4.25) 351 0 R (lstnumber.-4.26) 352 0 R (lstnumber.-4.27) 353 0 R (lstnumber.-4.28) 354 0 R (lstnumber.-4.29) 355 0 R (lstnumber.-4.3) 327 0 R (lstnumber.-4.30) 356 0 R (lstnumber.-4.31) 357 0 R (lstnumber.-4.32) 358 0 R (lstnumber.-4.33) 359 0 R (lstnumber.-4.34) 360 0 R (lstnumber.-4.35) 361 0 R (lstnumber.-4.36) 362 0 R (lstnumber.-4.37) 363 0 R (lstnumber.-4.38) 364 0 R (lstnumber.-4.39) 366 0 R (lstnumber.-4.4) 328 0 R (lstnumber.-4.40) 367 0 R (lstnumber.-4.41) 368 0 R (lstnumber.-4.5) 329 0 R (lstnumber.-4.6) 330 0 R (lstnumber.-4.7) 331 0 R (lstnumber.-4.8) 332 0 R (lstnumber.-4.9) 333 0 R (lstnumber.-5.1) 371 0 R (lstnumber.-5.10) 380 0 R (lstnumber.-5.11) 381 0 R (lstnumber.-5.12) 382 0 R (lstnumber.-5.13) 383 0 R (lstnumber.-5.14) 384 0 R (lstnumber.-5.15) 385 0 R (lstnumber.-5.16) 386 0 R (lstnumber.-5.17) 387 0 R (lstnumber.-5.18) 388 0 R (lstnumber.-5.19) 389 0 R (lstnumber.-5.2) 372 0 R (lstnumber.-5.20) 390 0 R (lstnumber.-5.21) 391 0 R (lstnumber.-5.22) 392 0 R (lstnumber.-5.23) 393 0 R (lstnumber.-5.24) 394 0 R (lstnumber.-5.25) 395 0 R (lstnumber.-5.26) 396 0 R (lstnumber.-5.27) 397 0 R (lstnumber.-5.28) 398 0 R (lstnumber.-5.29) 399 0 R (lstnumber.-5.3) 373 0 R (lstnumber.-5.30) 400 0 R (lstnumber.-5.31) 401 0 R (lstnumber.-5.32) 402 0 R (lstnumber.-5.33) 403 0 R (lstnumber.-5.34) 404 0 R (lstnumber.-5.35) 405 0 R (lstnumber.-5.36) 406 0 R (lstnumber.-5.37) 407 0 R (lstnumber.-5.38) 408 0 R (lstnumber.-5.39) 409 0 R (lstnumber.-5.4) 374 0 R (lstnumber.-5.40) 410 0 R (lstnumber.-5.5) 375 0 R (lstnumber.-5.6) 376 0 R (lstnumber.-5.7) 377 0 R (lstnumber.-5.8) 378 0 R (lstnumber.-5.9) 379 0 R (lstnumber.-6.1) 414 0 R (lstnumber.-6.10) 425 0 R (lstnumber.-6.11) 426 0 R (lstnumber.-6.12) 427 0 R (lstnumber.-6.13) 428 0 R (lstnumber.-6.14) 429 0 R (lstnumber.-6.15) 430 0 R (lstnumber.-6.16) 431 0 R (lstnumber.-6.17) 432 0 R (lstnumber.-6.18) 433 0 R (lstnumber.-6.19) 434 0 R (lstnumber.-6.2) 415 0 R (lstnumber.-6.20) 435 0 R (lstnumber.-6.21) 436 0 R (lstnumber.-6.22) 437 0 R (lstnumber.-6.23) 438 0 R (lstnumber.-6.24) 439 0 R (lstnumber.-6.25) 440 0 R (lstnumber.-6.26) 441 0 R (lstnumber.-6.27) 442 0 R (lstnumber.-6.28) 444 0 R (lstnumber.-6.29) 445 0 R (lstnumber.-6.3) 416 0 R (lstnumber.-6.30) 446 0 R (lstnumber.-6.31) 447 0 R (lstnumber.-6.32) 448 0 R (lstnumber.-6.33) 449 0 R (lstnumber.-6.34) 450 0 R (lstnumber.-6.35) 451 0 R (lstnumber.-6.36) 452 0 R (lstnumber.-6.37) 453 0 R (lstnumber.-6.38) 454 0 R (lstnumber.-6.39) 455 0 R (lstnumber.-6.4) 417 0 R (lstnumber.-6.40) 456 0 R (lstnumber.-6.41) 457 0 R (lstnumber.-6.42) 458 0 R (lstnumber.-6.43) 459 0 R (lstnumber.-6.44) 460 0 R (lstnumber.-6.45) 461 0 R (lstnumber.-6.46) 462 0 R (lstnumber.-6.47) 463 0 R (lstnumber.-6.48) 464 0 R (lstnumber.-6.49) 465 0 R (lstnumber.-6.5) 418 0 R (lstnumber.-6.50) 466 0 R (lstnumber.-6.51) 467 0 R (lstnumber.-6.52) 468 0 R (lstnumber.-6.53) 469 0 R (lstnumber.-6.54) 470 0 R (lstnumber.-6.55) 471 0 R (lstnumber.-6.56) 472 0 R (lstnumber.-6.57) 473 0 R (lstnumber.-6.58) 474 0 R (lstnumber.-6.59) 475 0 R (lstnumber.-6.6) 419 0 R (lstnumber.-6.60) 476 0 R (lstnumber.-6.61) 477 0 R (lstnumber.-6.62) 478 0 R (lstnumber.-6.63) 479 0 R (lstnumber.-6.7) 420 0 R (lstnumber.-6.8) 421 0 R (lstnumber.-6.9) 422 0 R (lstnumber.-7.1) 481 0 R (lstnumber.-7.10) 491 0 R (lstnumber.-7.11) 492 0 R (lstnumber.-7.12) 493 0 R (lstnumber.-7.13) 494 0 R (lstnumber.-7.14) 495 0 R (lstnumber.-7.15) 496 0 R (lstnumber.-7.16) 497 0 R (lstnumber.-7.17) 498 0 R (lstnumber.-7.18) 499 0 R (lstnumber.-7.19) 500 0 R (lstnumber.-7.2) 482 0 R (lstnumber.-7.20) 501 0 R (lstnumber.-7.21) 502 0 R (lstnumber.-7.22) 503 0 R (lstnumber.-7.23) 504 0 R (lstnumber.-7.24) 505 0 R (lstnumber.-7.25) 506 0 R (lstnumber.-7.26) 507 0 R (lstnumber.-7.27) 510 0 R (lstnumber.-7.28) 511 0 R (lstnumber.-7.29) 512 0 R (lstnumber.-7.3) 483 0 R (lstnumber.-7.30) 513 0 R (lstnumber.-7.31) 514 0 R (lstnumber.-7.32) 515 0 R (lstnumber.-7.33) 516 0 R (lstnumber.-7.34) 517 0 R (lstnumber.-7.35) 518 0 R (lstnumber.-7.36) 519 0 R (lstnumber.-7.37) 520 0 R (lstnumber.-7.38) 521 0 R (lstnumber.-7.39) 522 0 R (lstnumber.-7.4) 485 0 R (lstnumber.-7.40) 523 0 R (lstnumber.-7.41) 524 0 R (lstnumber.-7.42) 525 0 R (lstnumber.-7.43) 526 0 R (lstnumber.-7.44) 527 0 R (lstnumber.-7.45) 528 0 R (lstnumber.-7.46) 529 0 R (lstnumber.-7.47) 530 0 R (lstnumber.-7.48) 531 0 R (lstnumber.-7.49) 532 0 R (lstnumber.-7.5) 486 0 R (lstnumber.-7.50) 533 0 R (lstnumber.-7.51) 534 0 R (lstnumber.-7.52) 535 0 R (lstnumber.-7.53) 536 0 R (lstnumber.-7.54) 537 0 R (lstnumber.-7.55) 538 0 R (lstnumber.-7.56) 539 0 R (lstnumber.-7.57) 540 0 R (lstnumber.-7.58) 541 0 R (lstnumber.-7.59) 542 0 R (lstnumber.-7.6) 487 0 R (lstnumber.-7.60) 543 0 R (lstnumber.-7.61) 544 0 R (lstnumber.-7.62) 545 0 R (lstnumber.-7.63) 546 0 R (lstnumber.-7.64) 547 0 R (lstnumber.-7.65) 548 0 R (lstnumber.-7.66) 549 0 R (lstnumber.-7.67) 550 0 R (lstnumber.-7.68) 551 0 R (lstnumber.-7.69) 552 0 R (lstnumber.-7.7) 488 0 R (lstnumber.-7.70) 553 0 R (lstnumber.-7.8) 489 0 R (lstnumber.-7.9) 490 0 R (lstnumber.-8.1) 557 0 R (lstnumber.-8.10) 566 0 R (lstnumber.-8.11) 567 0 R (lstnumber.-8.12) 568 0 R (lstnumber.-8.13) 569 0 R (lstnumber.-8.14) 570 0 R (lstnumber.-8.15) 571 0 R (lstnumber.-8.16) 572 0 R (lstnumber.-8.17) 573 0 R (lstnumber.-8.18) 574 0 R (lstnumber.-8.19) 575 0 R (lstnumber.-8.2) 558 0 R (lstnumber.-8.20) 576 0 R (lstnumber.-8.3) 559 0 R (lstnumber.-8.4) 560 0 R (lstnumber.-8.5) 561 0 R (lstnumber.-8.6) 562 0 R (lstnumber.-8.7) 563 0 R (lstnumber.-8.8) 564 0 R (lstnumber.-8.9) 565 0 R (lstnumber.-9.1) 579 0 R (lstnumber.-9.2) 580 0 R (lstnumber.-9.3) 581 0 R (lstnumber.-9.4) 582 0 R (lstnumber.-9.5) 583 0 R (page.1) 220 0 R (page.10) 241 0 R (page.11) 244 0 R (page.12) 246 0 R (page.13) 250 0 R (page.14) 252 0 R (page.15) 263 0 R (page.16) 278 0 R (page.17) 281 0 R (page.18) 322 0 R (page.19) 340 0 R (page.2) 223 0 R (page.20) 365 0 R (page.21) 411 0 R (page.22) 423 0 R (page.23) 443 0 R (page.24) 484 0 R (page.25) 509 0 R (page.26) 555 0 R (page.27) 577 0 R (page.28) 585 0 R (page.29) 594 0 R (page.3) 226 0 R (page.4) 229 0 R (page.5) 231 0 R (page.6) 233 0 R (page.7) 236 0 R (page.8) 239 0 R (page.9) 240 0 R (section*.1) 222 0 R (section*.2) 234 0 R (section*.3) 235 0 R (section*.4) 245 0 R (section*.5) 247 0 R (section*.6) 249 0 R (section*.7) 251 0 R (section*.8) 254 0 R (section*.9) 597 0 R (section.1) 224 0 R (section.10) 584 0 R (section.11) 596 0 R (section.2) 225 0 R (section.3) 227 0 R (section.4) 228 0 R (section.5) 230 0 R (section.6) 237 0 R (section.7) 264 0 R (section.8) 282 0 R (section.9) 554 0 R (subsection.6.1) 238 0 R (subsection.6.2) 243 0 R (subsection.8.1) 283 0 R (subsection.8.2) 369 0 R (table.1) 248 0 R (table.2) 253 0 R (table.3) 279 0 R (table.4) 280 0 R ] >>
@@ -21079,10 +21074,10 @@ stream
<rdf:Description rdf:about="" xmlns:pdf='http://ns.adobe.com/pdf/1.3/'><pdf:Producer>GPL Ghostscript 9.55.0</pdf:Producer>
<pdf:Keywords>include portable PDF animation SVG animation animated PDF animated SVG dvisvgm html TeX4ht web animating embed animated graphics LaTeX pdfLaTeX LuaLaTeX PSTricks pgf TikZ LaTeX-picture MetaPost inline graphics vector graphics animated GIF LaTeX dvips ps2pdf dvipdfmx XeLaTeX JavaScript Acrobat Reader KDE Okular PDF-XChange Foxit Reader Firefox Chrome Chromium</pdf:Keywords>
</rdf:Description>
-<rdf:Description rdf:about="" xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2022-02-21T15:04:20+01:00</xmp:ModifyDate>
-<xmp:CreateDate>2022-02-21T15:04:20+01:00</xmp:CreateDate>
+<rdf:Description rdf:about="" xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2022-08-04T17:01:36+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2022-08-04T17:01:36+02:00</xmp:CreateDate>
<xmp:CreatorTool>LaTeX with hyperref</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about="" xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:b6d61d7a-cb3b-11f7-0000-8c242f8a5d9a'/>
+<rdf:Description rdf:about="" xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:e29b451c-4c22-11f8-0000-6fab357213a8'/>
<rdf:Description rdf:about="" xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>The animate Package</rdf:li></rdf:Alt></dc:title><dc:creator><rdf:Seq><rdf:li>Alexander Grahn</rdf:li></rdf:Seq></dc:creator><dc:description><rdf:Alt><rdf:li xml:lang='x-default'>Documentation</rdf:li></rdf:Alt></dc:description></rdf:Description>
</rdf:RDF>
</x:xmpmeta>
@@ -21093,616 +21088,616 @@ endobj
xref
0 610
0000000000 65535 f
-0003171591 00000 n
-0003171799 00000 n
-0003171927 00000 n
-0003177816 00000 n
-0003177994 00000 n
-0003178172 00000 n
-0003178354 00000 n
-0003178403 00000 n
-0003178478 00000 n
-0003178686 00000 n
-0003178815 00000 n
-0003181929 00000 n
-0003182181 00000 n
-0003182360 00000 n
-0003182410 00000 n
-0003182473 00000 n
-0003182696 00000 n
-0003182825 00000 n
-0003187597 00000 n
-0003187849 00000 n
-0003187897 00000 n
-0003187973 00000 n
-0003188183 00000 n
-0003188312 00000 n
-0003194471 00000 n
-0003194651 00000 n
-0003194886 00000 n
-0003195150 00000 n
-0003195200 00000 n
-0003195275 00000 n
-0003196358 00000 n
-0003196568 00000 n
-0003196697 00000 n
-0003204491 00000 n
-0003204674 00000 n
-0003204724 00000 n
-0003204813 00000 n
-0003205015 00000 n
-0003205144 00000 n
-0003209740 00000 n
-0003209918 00000 n
-0003209968 00000 n
-0003210044 00000 n
-0003210220 00000 n
-0003210349 00000 n
-0003214569 00000 n
-0003214618 00000 n
-0003214794 00000 n
-0003214923 00000 n
-0003221049 00000 n
-0003221098 00000 n
-0003221307 00000 n
-0003221437 00000 n
-0003227035 00000 n
-0003227213 00000 n
-0003227391 00000 n
-0003227441 00000 n
-0003227518 00000 n
-0003227720 00000 n
-0003227850 00000 n
-0003234911 00000 n
-0003235090 00000 n
-0003235140 00000 n
-0003235202 00000 n
-0003235433 00000 n
-0003235563 00000 n
-0003240962 00000 n
-0003241138 00000 n
-0003241315 00000 n
-0003241492 00000 n
-0003241675 00000 n
-0003241725 00000 n
-0003241787 00000 n
-0003242017 00000 n
-0003242147 00000 n
-0003248803 00000 n
-0003248979 00000 n
-0003249156 00000 n
-0003249339 00000 n
-0003249519 00000 n
-0003249697 00000 n
-0003249747 00000 n
-0003249809 00000 n
-0003249993 00000 n
-0003250123 00000 n
-0003253170 00000 n
-0003253232 00000 n
-0003253455 00000 n
-0003253585 00000 n
-0003257167 00000 n
-0003257343 00000 n
-0003257519 00000 n
-0003257702 00000 n
-0003257881 00000 n
-0003257931 00000 n
-0003257994 00000 n
-0003258178 00000 n
-0003258308 00000 n
-0003261946 00000 n
-0003261995 00000 n
-0003262211 00000 n
-0003262342 00000 n
-0003265728 00000 n
-0003265906 00000 n
-0003266084 00000 n
-0003266135 00000 n
-0003266254 00000 n
-0003266687 00000 n
-0003266818 00000 n
-0003270465 00000 n
-0003270717 00000 n
-0003270895 00000 n
-0003271076 00000 n
-0003271519 00000 n
-0003271570 00000 n
-0003271676 00000 n
-0003272899 00000 n
-0003273030 00000 n
-0003274279 00000 n
-0003274537 00000 n
-0003279586 00000 n
-0003279734 00000 n
-0003279950 00000 n
-0003280081 00000 n
-0003282667 00000 n
-0003282845 00000 n
-0003283026 00000 n
-0003283077 00000 n
-0003283155 00000 n
-0003283783 00000 n
-0003283914 00000 n
-0003287914 00000 n
-0003288171 00000 n
-0003288349 00000 n
-0003288522 00000 n
-0003288758 00000 n
-0003289216 00000 n
-0003289267 00000 n
-0003289359 00000 n
-0003290024 00000 n
-0003290123 00000 n
-0003292173 00000 n
-0003292304 00000 n
-0003293394 00000 n
-0003293651 00000 n
-0003298330 00000 n
-0003298394 00000 n
-0003298610 00000 n
-0003298741 00000 n
-0003303356 00000 n
-0003303534 00000 n
-0003303716 00000 n
-0003303767 00000 n
-0003303817 00000 n
-0003304399 00000 n
-0003304530 00000 n
-0003305224 00000 n
-0003305458 00000 n
-0003659918 00000 n
-0003659995 00000 n
-0003662284 00000 n
-0003662359 00000 n
-0003662516 00000 n
-0003662608 00000 n
-0003662750 00000 n
-0003662920 00000 n
-0003663183 00000 n
-0003663439 00000 n
-0003664325 00000 n
-0003664404 00000 n
-0003664612 00000 n
-0003664743 00000 n
-0003667241 00000 n
-0003667423 00000 n
-0003667474 00000 n
-0003667538 00000 n
-0003667718 00000 n
-0003667849 00000 n
-0003672598 00000 n
-0003672662 00000 n
-0003672842 00000 n
-0003672973 00000 n
-0003678869 00000 n
-0003678933 00000 n
-0003679157 00000 n
-0003679288 00000 n
-0003685065 00000 n
-0003685243 00000 n
-0003685419 00000 n
-0003685595 00000 n
-0003685646 00000 n
-0003685722 00000 n
-0003686018 00000 n
-0003686149 00000 n
-0003691472 00000 n
-0003691695 00000 n
-0003691875 00000 n
-0003692054 00000 n
-0003692233 00000 n
-0003692489 00000 n
-0003692745 00000 n
-0003692947 00000 n
-0003693160 00000 n
-0003693378 00000 n
-0003693593 00000 n
-0003693816 00000 n
-0003694039 00000 n
-0003694090 00000 n
-0003694167 00000 n
-0003694649 00000 n
-0003695026 00000 n
-0003695246 00000 n
-0003695486 00000 n
-0003696460 00000 n
-0003698838 00000 n
-0003699183 00000 n
-0003699406 00000 n
-0003699678 00000 n
-0003701593 00000 n
-0003711056 00000 n
-0003711127 00000 n
-0003711195 00000 n
-0003711263 00000 n
-0003711328 00000 n
-0003711392 00000 n
-0003711457 00000 n
-0003711525 00000 n
-0003711590 00000 n
-0003711655 00000 n
-0003711721 00000 n
-0003711785 00000 n
-0003711854 00000 n
-0003711920 00000 n
-0003711986 00000 n
-0003712052 00000 n
-0003712118 00000 n
-0003712187 00000 n
-0003712253 00000 n
-0003712319 00000 n
-0003712385 00000 n
-0003712454 00000 n
-0003712520 00000 n
-0003712585 00000 n
-0003712650 00000 n
-0003712719 00000 n
-0003712785 00000 n
-0003712851 00000 n
-0003712916 00000 n
-0003712982 00000 n
-0003713048 00000 n
-0003713117 00000 n
-0003713183 00000 n
-0003713249 00000 n
-0003713315 00000 n
-0003713381 00000 n
-0003713447 00000 n
-0003713512 00000 n
-0003713578 00000 n
-0003713644 00000 n
-0003713710 00000 n
-0003713775 00000 n
-0003713841 00000 n
-0003713907 00000 n
-0003713976 00000 n
-0003714042 00000 n
-0003714108 00000 n
-0003714174 00000 n
-0003714240 00000 n
-0003714305 00000 n
-0003714371 00000 n
-0003714437 00000 n
-0003714503 00000 n
-0003714569 00000 n
-0003714635 00000 n
-0003714701 00000 n
-0003714767 00000 n
-0003714833 00000 n
-0003714899 00000 n
-0003714965 00000 n
-0003715031 00000 n
-0003715097 00000 n
-0003715167 00000 n
-0003715234 00000 n
-0003715301 00000 n
-0003715368 00000 n
-0003715435 00000 n
-0003715502 00000 n
-0003715569 00000 n
-0003715635 00000 n
-0003715701 00000 n
-0003715768 00000 n
-0003715835 00000 n
-0003715902 00000 n
-0003715968 00000 n
-0003716034 00000 n
-0003716101 00000 n
-0003716168 00000 n
-0003716235 00000 n
-0003716301 00000 n
-0003716368 00000 n
-0003716435 00000 n
-0003716502 00000 n
-0003716568 00000 n
-0003716634 00000 n
-0003716701 00000 n
-0003716768 00000 n
-0003716835 00000 n
-0003716902 00000 n
-0003716969 00000 n
-0003717036 00000 n
-0003717103 00000 n
-0003717170 00000 n
-0003717237 00000 n
-0003717304 00000 n
-0003717371 00000 n
-0003717438 00000 n
-0003717505 00000 n
-0003717571 00000 n
-0003717638 00000 n
-0003717705 00000 n
-0003717772 00000 n
-0003717839 00000 n
-0003717906 00000 n
-0003717973 00000 n
-0003718038 00000 n
-0003718105 00000 n
-0003718172 00000 n
-0003718239 00000 n
-0003718306 00000 n
-0003718373 00000 n
-0003718440 00000 n
-0003718507 00000 n
-0003718574 00000 n
-0003718641 00000 n
-0003718708 00000 n
-0003718775 00000 n
-0003718842 00000 n
-0003718909 00000 n
-0003718976 00000 n
-0003719043 00000 n
-0003719113 00000 n
-0003719180 00000 n
-0003719247 00000 n
-0003719314 00000 n
-0003719381 00000 n
-0003719448 00000 n
-0003719513 00000 n
-0003719580 00000 n
-0003719647 00000 n
-0003719714 00000 n
-0003719781 00000 n
-0003719848 00000 n
-0003719915 00000 n
-0003719982 00000 n
-0003720049 00000 n
-0003720115 00000 n
-0003720181 00000 n
-0003720248 00000 n
-0003720315 00000 n
-0003720382 00000 n
-0003720448 00000 n
-0003720515 00000 n
-0003720582 00000 n
-0003720649 00000 n
-0003720716 00000 n
-0003720783 00000 n
-0003720850 00000 n
-0003720917 00000 n
-0003720984 00000 n
-0003721051 00000 n
-0003721118 00000 n
-0003721185 00000 n
-0003721252 00000 n
-0003721319 00000 n
-0003721386 00000 n
-0003721452 00000 n
-0003721519 00000 n
-0003721586 00000 n
-0003721653 00000 n
-0003721720 00000 n
-0003721787 00000 n
-0003721854 00000 n
-0003721921 00000 n
-0003721988 00000 n
-0003722055 00000 n
-0003722122 00000 n
-0003722189 00000 n
-0003722256 00000 n
-0003722323 00000 n
-0003722390 00000 n
-0003722454 00000 n
-0003722521 00000 n
-0003722585 00000 n
-0003722652 00000 n
-0003722718 00000 n
-0003722785 00000 n
-0003722852 00000 n
-0003722919 00000 n
-0003722986 00000 n
-0003723052 00000 n
-0003723119 00000 n
-0003723186 00000 n
-0003723253 00000 n
-0003723320 00000 n
-0003723386 00000 n
-0003723453 00000 n
-0003723520 00000 n
-0003723587 00000 n
-0003723653 00000 n
-0003723719 00000 n
-0003723786 00000 n
-0003723856 00000 n
-0003723923 00000 n
-0003723990 00000 n
-0003724057 00000 n
-0003724124 00000 n
-0003724191 00000 n
-0003724258 00000 n
-0003724325 00000 n
-0003724392 00000 n
-0003724459 00000 n
-0003724526 00000 n
-0003724593 00000 n
-0003724660 00000 n
-0003724727 00000 n
-0003724794 00000 n
-0003724861 00000 n
-0003724928 00000 n
-0003724995 00000 n
-0003725062 00000 n
-0003725129 00000 n
-0003725196 00000 n
-0003725263 00000 n
-0003725330 00000 n
-0003725396 00000 n
-0003725460 00000 n
-0003725527 00000 n
-0003725594 00000 n
-0003725661 00000 n
-0003725728 00000 n
-0003725795 00000 n
-0003725862 00000 n
-0003725929 00000 n
-0003725999 00000 n
-0003726066 00000 n
-0003726133 00000 n
-0003726200 00000 n
-0003726266 00000 n
-0003726332 00000 n
-0003726399 00000 n
-0003726466 00000 n
-0003726533 00000 n
-0003726599 00000 n
-0003726665 00000 n
-0003726732 00000 n
-0003726799 00000 n
-0003726866 00000 n
-0003726932 00000 n
-0003726999 00000 n
-0003727066 00000 n
-0003727133 00000 n
-0003727200 00000 n
-0003727267 00000 n
-0003727334 00000 n
-0003727401 00000 n
-0003727465 00000 n
-0003727532 00000 n
-0003727599 00000 n
-0003727666 00000 n
-0003727733 00000 n
-0003727800 00000 n
-0003727866 00000 n
-0003727933 00000 n
-0003728000 00000 n
-0003728067 00000 n
-0003728134 00000 n
-0003728201 00000 n
-0003728268 00000 n
-0003728335 00000 n
-0003728402 00000 n
-0003728469 00000 n
-0003728535 00000 n
-0003728602 00000 n
-0003728666 00000 n
-0003728733 00000 n
-0003728800 00000 n
-0003728867 00000 n
-0003728934 00000 n
-0003729000 00000 n
-0003729066 00000 n
-0003729133 00000 n
-0003729200 00000 n
-0003729267 00000 n
-0003729333 00000 n
-0003729399 00000 n
-0003729466 00000 n
-0003729533 00000 n
-0003729600 00000 n
-0003729666 00000 n
-0003729733 00000 n
-0003729800 00000 n
-0003729867 00000 n
-0003729934 00000 n
-0003730001 00000 n
-0003730068 00000 n
-0003730135 00000 n
-0003730199 00000 n
-0003730266 00000 n
-0003730333 00000 n
-0003730403 00000 n
-0003730470 00000 n
-0003730537 00000 n
-0003730604 00000 n
-0003730670 00000 n
-0003730736 00000 n
-0003730803 00000 n
-0003730870 00000 n
-0003730937 00000 n
-0003731003 00000 n
-0003731069 00000 n
-0003731136 00000 n
-0003731203 00000 n
-0003731270 00000 n
-0003731336 00000 n
-0003731403 00000 n
-0003731470 00000 n
-0003731537 00000 n
-0003731604 00000 n
-0003731671 00000 n
-0003731738 00000 n
-0003731805 00000 n
-0003731869 00000 n
-0003731936 00000 n
-0003732003 00000 n
-0003732070 00000 n
-0003732137 00000 n
-0003732204 00000 n
-0003732270 00000 n
-0003732337 00000 n
-0003732404 00000 n
-0003732471 00000 n
-0003732538 00000 n
-0003732605 00000 n
-0003732672 00000 n
-0003732739 00000 n
-0003732806 00000 n
-0003732873 00000 n
-0003732940 00000 n
-0003733007 00000 n
-0003733074 00000 n
-0003733141 00000 n
-0003733208 00000 n
-0003733275 00000 n
-0003733342 00000 n
-0003733409 00000 n
-0003733476 00000 n
-0003733543 00000 n
-0003733610 00000 n
-0003733677 00000 n
-0003733744 00000 n
-0003733811 00000 n
-0003733878 00000 n
-0003733942 00000 n
-0003734009 00000 n
-0003734076 00000 n
-0003734143 00000 n
-0003734210 00000 n
-0003734277 00000 n
-0003734343 00000 n
-0003734410 00000 n
-0003734477 00000 n
-0003734544 00000 n
-0003734611 00000 n
-0003734678 00000 n
-0003734745 00000 n
-0003734812 00000 n
-0003734879 00000 n
-0003734949 00000 n
-0003735016 00000 n
-0003735083 00000 n
-0003735150 00000 n
-0003735217 00000 n
-0003735284 00000 n
-0003735351 00000 n
-0003735418 00000 n
-0003735485 00000 n
-0003735552 00000 n
-0003735619 00000 n
-0003735686 00000 n
-0003735753 00000 n
-0003735820 00000 n
-0003735887 00000 n
-0003735954 00000 n
-0003736021 00000 n
-0003736091 00000 n
-0003736158 00000 n
-0003736225 00000 n
-0003736292 00000 n
-0003736359 00000 n
-0003736426 00000 n
-0003736493 00000 n
-0003736560 00000 n
-0003736627 00000 n
-0003736694 00000 n
-0003736761 00000 n
-0003736828 00000 n
-0003736867 00000 n
-0003736897 00000 n
-0003737182 00000 n
-trailer << /Size 610 /ID [<3f5051c93ffdfa157c0ad1d1ec61c1ae><df5a354dda90328c914c6f06248b0df8>] >>
+0003171583 00000 n
+0003171791 00000 n
+0003171919 00000 n
+0003177808 00000 n
+0003177986 00000 n
+0003178164 00000 n
+0003178346 00000 n
+0003178395 00000 n
+0003178470 00000 n
+0003178678 00000 n
+0003178807 00000 n
+0003181921 00000 n
+0003182173 00000 n
+0003182352 00000 n
+0003182402 00000 n
+0003182465 00000 n
+0003182688 00000 n
+0003182817 00000 n
+0003187589 00000 n
+0003187841 00000 n
+0003187889 00000 n
+0003187965 00000 n
+0003188175 00000 n
+0003188304 00000 n
+0003194463 00000 n
+0003194643 00000 n
+0003194878 00000 n
+0003195142 00000 n
+0003195192 00000 n
+0003195267 00000 n
+0003196350 00000 n
+0003196560 00000 n
+0003196689 00000 n
+0003204483 00000 n
+0003204666 00000 n
+0003204716 00000 n
+0003204805 00000 n
+0003205007 00000 n
+0003205136 00000 n
+0003209732 00000 n
+0003209910 00000 n
+0003209960 00000 n
+0003210036 00000 n
+0003210212 00000 n
+0003210341 00000 n
+0003214561 00000 n
+0003214610 00000 n
+0003214786 00000 n
+0003214915 00000 n
+0003221023 00000 n
+0003221072 00000 n
+0003221281 00000 n
+0003221411 00000 n
+0003227012 00000 n
+0003227190 00000 n
+0003227368 00000 n
+0003227418 00000 n
+0003227495 00000 n
+0003227697 00000 n
+0003227827 00000 n
+0003234888 00000 n
+0003235067 00000 n
+0003235117 00000 n
+0003235179 00000 n
+0003235410 00000 n
+0003235540 00000 n
+0003240939 00000 n
+0003241115 00000 n
+0003241292 00000 n
+0003241469 00000 n
+0003241652 00000 n
+0003241702 00000 n
+0003241764 00000 n
+0003241994 00000 n
+0003242124 00000 n
+0003248780 00000 n
+0003248956 00000 n
+0003249133 00000 n
+0003249316 00000 n
+0003249496 00000 n
+0003249674 00000 n
+0003249724 00000 n
+0003249786 00000 n
+0003249970 00000 n
+0003250100 00000 n
+0003253147 00000 n
+0003253209 00000 n
+0003253432 00000 n
+0003253562 00000 n
+0003257144 00000 n
+0003257320 00000 n
+0003257496 00000 n
+0003257679 00000 n
+0003257858 00000 n
+0003257908 00000 n
+0003257971 00000 n
+0003258155 00000 n
+0003258285 00000 n
+0003261923 00000 n
+0003261972 00000 n
+0003262188 00000 n
+0003262319 00000 n
+0003265705 00000 n
+0003265883 00000 n
+0003266061 00000 n
+0003266112 00000 n
+0003266231 00000 n
+0003266664 00000 n
+0003266795 00000 n
+0003270442 00000 n
+0003270694 00000 n
+0003270872 00000 n
+0003271053 00000 n
+0003271496 00000 n
+0003271547 00000 n
+0003271653 00000 n
+0003272876 00000 n
+0003273007 00000 n
+0003274256 00000 n
+0003274514 00000 n
+0003279563 00000 n
+0003279711 00000 n
+0003279927 00000 n
+0003280058 00000 n
+0003282644 00000 n
+0003282822 00000 n
+0003283003 00000 n
+0003283054 00000 n
+0003283132 00000 n
+0003283760 00000 n
+0003283891 00000 n
+0003287891 00000 n
+0003288148 00000 n
+0003288326 00000 n
+0003288499 00000 n
+0003288735 00000 n
+0003289193 00000 n
+0003289244 00000 n
+0003289336 00000 n
+0003290001 00000 n
+0003290100 00000 n
+0003292150 00000 n
+0003292281 00000 n
+0003293371 00000 n
+0003293628 00000 n
+0003298307 00000 n
+0003298371 00000 n
+0003298587 00000 n
+0003298718 00000 n
+0003303333 00000 n
+0003303511 00000 n
+0003303693 00000 n
+0003303744 00000 n
+0003303794 00000 n
+0003304376 00000 n
+0003304507 00000 n
+0003305201 00000 n
+0003305435 00000 n
+0003659895 00000 n
+0003659972 00000 n
+0003662261 00000 n
+0003662336 00000 n
+0003662493 00000 n
+0003662585 00000 n
+0003662727 00000 n
+0003662897 00000 n
+0003663160 00000 n
+0003663416 00000 n
+0003664302 00000 n
+0003664381 00000 n
+0003664589 00000 n
+0003664720 00000 n
+0003667218 00000 n
+0003667400 00000 n
+0003667451 00000 n
+0003667515 00000 n
+0003667695 00000 n
+0003667826 00000 n
+0003672575 00000 n
+0003672639 00000 n
+0003672819 00000 n
+0003672950 00000 n
+0003678846 00000 n
+0003678910 00000 n
+0003679134 00000 n
+0003679265 00000 n
+0003685042 00000 n
+0003685220 00000 n
+0003685396 00000 n
+0003685572 00000 n
+0003685623 00000 n
+0003685699 00000 n
+0003685995 00000 n
+0003686126 00000 n
+0003691449 00000 n
+0003691672 00000 n
+0003691852 00000 n
+0003692031 00000 n
+0003692210 00000 n
+0003692466 00000 n
+0003692722 00000 n
+0003692924 00000 n
+0003693137 00000 n
+0003693355 00000 n
+0003693570 00000 n
+0003693793 00000 n
+0003694016 00000 n
+0003694067 00000 n
+0003694144 00000 n
+0003694626 00000 n
+0003695003 00000 n
+0003695223 00000 n
+0003695463 00000 n
+0003696437 00000 n
+0003698815 00000 n
+0003699160 00000 n
+0003699383 00000 n
+0003699655 00000 n
+0003701570 00000 n
+0003711033 00000 n
+0003711104 00000 n
+0003711172 00000 n
+0003711240 00000 n
+0003711305 00000 n
+0003711369 00000 n
+0003711434 00000 n
+0003711502 00000 n
+0003711567 00000 n
+0003711632 00000 n
+0003711698 00000 n
+0003711762 00000 n
+0003711831 00000 n
+0003711897 00000 n
+0003711963 00000 n
+0003712029 00000 n
+0003712095 00000 n
+0003712164 00000 n
+0003712230 00000 n
+0003712296 00000 n
+0003712362 00000 n
+0003712431 00000 n
+0003712497 00000 n
+0003712562 00000 n
+0003712627 00000 n
+0003712696 00000 n
+0003712762 00000 n
+0003712828 00000 n
+0003712893 00000 n
+0003712959 00000 n
+0003713025 00000 n
+0003713094 00000 n
+0003713160 00000 n
+0003713226 00000 n
+0003713292 00000 n
+0003713358 00000 n
+0003713424 00000 n
+0003713489 00000 n
+0003713555 00000 n
+0003713621 00000 n
+0003713687 00000 n
+0003713752 00000 n
+0003713818 00000 n
+0003713884 00000 n
+0003713953 00000 n
+0003714019 00000 n
+0003714085 00000 n
+0003714151 00000 n
+0003714217 00000 n
+0003714282 00000 n
+0003714348 00000 n
+0003714414 00000 n
+0003714480 00000 n
+0003714546 00000 n
+0003714612 00000 n
+0003714678 00000 n
+0003714744 00000 n
+0003714810 00000 n
+0003714876 00000 n
+0003714942 00000 n
+0003715008 00000 n
+0003715074 00000 n
+0003715144 00000 n
+0003715211 00000 n
+0003715278 00000 n
+0003715345 00000 n
+0003715412 00000 n
+0003715479 00000 n
+0003715546 00000 n
+0003715612 00000 n
+0003715678 00000 n
+0003715745 00000 n
+0003715812 00000 n
+0003715879 00000 n
+0003715945 00000 n
+0003716011 00000 n
+0003716078 00000 n
+0003716145 00000 n
+0003716212 00000 n
+0003716278 00000 n
+0003716345 00000 n
+0003716412 00000 n
+0003716479 00000 n
+0003716545 00000 n
+0003716611 00000 n
+0003716678 00000 n
+0003716745 00000 n
+0003716812 00000 n
+0003716879 00000 n
+0003716946 00000 n
+0003717013 00000 n
+0003717080 00000 n
+0003717147 00000 n
+0003717214 00000 n
+0003717281 00000 n
+0003717348 00000 n
+0003717415 00000 n
+0003717482 00000 n
+0003717548 00000 n
+0003717615 00000 n
+0003717682 00000 n
+0003717749 00000 n
+0003717816 00000 n
+0003717883 00000 n
+0003717950 00000 n
+0003718015 00000 n
+0003718082 00000 n
+0003718149 00000 n
+0003718216 00000 n
+0003718283 00000 n
+0003718350 00000 n
+0003718417 00000 n
+0003718484 00000 n
+0003718551 00000 n
+0003718618 00000 n
+0003718685 00000 n
+0003718752 00000 n
+0003718819 00000 n
+0003718886 00000 n
+0003718953 00000 n
+0003719020 00000 n
+0003719090 00000 n
+0003719157 00000 n
+0003719224 00000 n
+0003719291 00000 n
+0003719358 00000 n
+0003719425 00000 n
+0003719490 00000 n
+0003719557 00000 n
+0003719624 00000 n
+0003719691 00000 n
+0003719758 00000 n
+0003719825 00000 n
+0003719892 00000 n
+0003719959 00000 n
+0003720026 00000 n
+0003720092 00000 n
+0003720158 00000 n
+0003720225 00000 n
+0003720292 00000 n
+0003720359 00000 n
+0003720425 00000 n
+0003720492 00000 n
+0003720559 00000 n
+0003720626 00000 n
+0003720693 00000 n
+0003720760 00000 n
+0003720827 00000 n
+0003720894 00000 n
+0003720961 00000 n
+0003721028 00000 n
+0003721095 00000 n
+0003721162 00000 n
+0003721229 00000 n
+0003721296 00000 n
+0003721363 00000 n
+0003721429 00000 n
+0003721496 00000 n
+0003721563 00000 n
+0003721630 00000 n
+0003721697 00000 n
+0003721764 00000 n
+0003721831 00000 n
+0003721898 00000 n
+0003721965 00000 n
+0003722032 00000 n
+0003722099 00000 n
+0003722166 00000 n
+0003722233 00000 n
+0003722300 00000 n
+0003722367 00000 n
+0003722431 00000 n
+0003722498 00000 n
+0003722562 00000 n
+0003722629 00000 n
+0003722695 00000 n
+0003722762 00000 n
+0003722829 00000 n
+0003722896 00000 n
+0003722963 00000 n
+0003723029 00000 n
+0003723096 00000 n
+0003723163 00000 n
+0003723230 00000 n
+0003723297 00000 n
+0003723363 00000 n
+0003723430 00000 n
+0003723497 00000 n
+0003723564 00000 n
+0003723630 00000 n
+0003723696 00000 n
+0003723763 00000 n
+0003723833 00000 n
+0003723900 00000 n
+0003723967 00000 n
+0003724034 00000 n
+0003724101 00000 n
+0003724168 00000 n
+0003724235 00000 n
+0003724302 00000 n
+0003724369 00000 n
+0003724436 00000 n
+0003724503 00000 n
+0003724570 00000 n
+0003724637 00000 n
+0003724704 00000 n
+0003724771 00000 n
+0003724838 00000 n
+0003724905 00000 n
+0003724972 00000 n
+0003725039 00000 n
+0003725106 00000 n
+0003725173 00000 n
+0003725240 00000 n
+0003725307 00000 n
+0003725373 00000 n
+0003725437 00000 n
+0003725504 00000 n
+0003725571 00000 n
+0003725638 00000 n
+0003725705 00000 n
+0003725772 00000 n
+0003725839 00000 n
+0003725906 00000 n
+0003725976 00000 n
+0003726043 00000 n
+0003726110 00000 n
+0003726177 00000 n
+0003726243 00000 n
+0003726309 00000 n
+0003726376 00000 n
+0003726443 00000 n
+0003726510 00000 n
+0003726576 00000 n
+0003726642 00000 n
+0003726709 00000 n
+0003726776 00000 n
+0003726843 00000 n
+0003726909 00000 n
+0003726976 00000 n
+0003727043 00000 n
+0003727110 00000 n
+0003727177 00000 n
+0003727244 00000 n
+0003727311 00000 n
+0003727378 00000 n
+0003727442 00000 n
+0003727509 00000 n
+0003727576 00000 n
+0003727643 00000 n
+0003727710 00000 n
+0003727777 00000 n
+0003727843 00000 n
+0003727910 00000 n
+0003727977 00000 n
+0003728044 00000 n
+0003728111 00000 n
+0003728178 00000 n
+0003728245 00000 n
+0003728312 00000 n
+0003728379 00000 n
+0003728446 00000 n
+0003728512 00000 n
+0003728579 00000 n
+0003728643 00000 n
+0003728710 00000 n
+0003728777 00000 n
+0003728844 00000 n
+0003728911 00000 n
+0003728977 00000 n
+0003729043 00000 n
+0003729110 00000 n
+0003729177 00000 n
+0003729244 00000 n
+0003729310 00000 n
+0003729376 00000 n
+0003729443 00000 n
+0003729510 00000 n
+0003729577 00000 n
+0003729643 00000 n
+0003729710 00000 n
+0003729777 00000 n
+0003729844 00000 n
+0003729911 00000 n
+0003729978 00000 n
+0003730045 00000 n
+0003730112 00000 n
+0003730176 00000 n
+0003730243 00000 n
+0003730310 00000 n
+0003730380 00000 n
+0003730447 00000 n
+0003730514 00000 n
+0003730581 00000 n
+0003730647 00000 n
+0003730713 00000 n
+0003730780 00000 n
+0003730847 00000 n
+0003730914 00000 n
+0003730980 00000 n
+0003731046 00000 n
+0003731113 00000 n
+0003731180 00000 n
+0003731247 00000 n
+0003731313 00000 n
+0003731380 00000 n
+0003731447 00000 n
+0003731514 00000 n
+0003731581 00000 n
+0003731648 00000 n
+0003731715 00000 n
+0003731782 00000 n
+0003731846 00000 n
+0003731913 00000 n
+0003731980 00000 n
+0003732047 00000 n
+0003732114 00000 n
+0003732181 00000 n
+0003732247 00000 n
+0003732314 00000 n
+0003732381 00000 n
+0003732448 00000 n
+0003732515 00000 n
+0003732582 00000 n
+0003732649 00000 n
+0003732716 00000 n
+0003732783 00000 n
+0003732850 00000 n
+0003732917 00000 n
+0003732984 00000 n
+0003733051 00000 n
+0003733118 00000 n
+0003733185 00000 n
+0003733252 00000 n
+0003733319 00000 n
+0003733386 00000 n
+0003733453 00000 n
+0003733520 00000 n
+0003733587 00000 n
+0003733654 00000 n
+0003733721 00000 n
+0003733788 00000 n
+0003733855 00000 n
+0003733919 00000 n
+0003733986 00000 n
+0003734053 00000 n
+0003734120 00000 n
+0003734187 00000 n
+0003734254 00000 n
+0003734320 00000 n
+0003734387 00000 n
+0003734454 00000 n
+0003734521 00000 n
+0003734588 00000 n
+0003734655 00000 n
+0003734722 00000 n
+0003734789 00000 n
+0003734856 00000 n
+0003734926 00000 n
+0003734993 00000 n
+0003735060 00000 n
+0003735127 00000 n
+0003735194 00000 n
+0003735261 00000 n
+0003735328 00000 n
+0003735395 00000 n
+0003735462 00000 n
+0003735529 00000 n
+0003735596 00000 n
+0003735663 00000 n
+0003735730 00000 n
+0003735797 00000 n
+0003735864 00000 n
+0003735931 00000 n
+0003735998 00000 n
+0003736068 00000 n
+0003736135 00000 n
+0003736202 00000 n
+0003736269 00000 n
+0003736336 00000 n
+0003736403 00000 n
+0003736470 00000 n
+0003736537 00000 n
+0003736604 00000 n
+0003736671 00000 n
+0003736738 00000 n
+0003736805 00000 n
+0003736844 00000 n
+0003736874 00000 n
+0003737159 00000 n
+trailer << /Size 610 /ID [<75e8fb4f5346631caadd4dd62bc0c8cf><c56a8654f67f089b6bb008ec65f15f3a>] >>
startxref
216
%%EOF
diff --git a/macros/latex/contrib/animate/animate.sty b/macros/latex/contrib/animate/animate.sty
index 6964db89a1..408cf967f3 100644
--- a/macros/latex/contrib/animate/animate.sty
+++ b/macros/latex/contrib/animate/animate.sty
@@ -11,13 +11,12 @@
% Supports LaTeX->dvips->ps2pdf, (Xe)LaTeX->(x)dvipdfmx, LuaLaTeX,
% pdfLaTeX and LaTeX->dvisvgm workflows.
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\def\@anim@version{2022/02/21}
+\def\@anim@version{2022/08/04}
\ProvidesPackage{animate}
[\@anim@version\space PDF & SVG animations from files and inline graphics]
-\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{iftex}
\RequirePackage{ifdraft}
@@ -25,60 +24,85 @@
%driver options (the only package options we process immediately)
\newboolean{@anim@dvips}
-\setboolean{@anim@dvips}{false}
\newboolean{@anim@dvipdfmx}
-\setboolean{@anim@dvipdfmx}{false}
\newboolean{@anim@dvisvgm}
-\setboolean{@anim@dvisvgm}{false}
-\ifpdf\else
- \setboolean{@anim@dvips}{true}% default dvi mode
- \setboolean{@anim@dvipdfmx}{false}
- \DeclareOptionX{dvips}{%
- \setboolean{@anim@dvips}{true}
- \setboolean{@anim@dvipdfmx}{false}
- }
- \DeclareOptionX{dvipdfmx}{%
- \setboolean{@anim@dvipdfmx}{true}
- \setboolean{@anim@dvips}{false}
+\newboolean{@anim@xetex}
+\newboolean{@anim@export}%exporting animation frames
+
+\ExplSyntaxOn
+\DeclareKeys[anim@pkg]{
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
+
+ dvipdfmx.code:n = {
\PassOptionsToPackage{dvipdfmx}{pdfbase}
+ \PassOptionsToPackage{dvipdfmx}{ocgbase}
\PassOptionsToPackage{dvipdfmx}{graphics}
- }
- \DeclareOptionX{xetex}{%
- \setboolean{@anim@dvipdfmx}{true}
- \setboolean{@anim@dvips}{false}
- \PassOptionsToPackage{xetex}{pdfbase}
- }
- \DeclareOptionX{dvisvgm}{%
- \setboolean{@anim@dvisvgm}{true}
- \setboolean{@anim@dvips}{false}
+ },
+ dvipdfmx.value_forbidden:n = true,
+
+ dvisvgm.code:n = {
\PassOptionsToPackage{dvisvgm}{pdfbase}
\PassOptionsToPackage{dvisvgm}{graphics}
- }
+ },
+ dvisvgm.value_forbidden:n = true,
+
+ export.legacy_if_gset:n = @anim@export,
+ export.default:n = true,
+}
+\ExplSyntaxOff
+\DeclareUnknownKeyHandler[anim@pkg]{}
+
+\ProcessKeyOptions[anim@pkg]
+% remaining package options to be processed near end of this file
+
+\RequirePackage{pdfbase}
+\@ifpackagelater{pdfbase}{2022/08/04}{}{
+ \PackageError{animate}{%
+ Support package `pdfbase.sty' too old.%
+ }{%
+ Please install an up to date version of `pdfbase.sty'.\MessageBreak%
+ Aborting.%
+ }%
+}
+
+\ifpdf\else
+ \setboolean{@anim@dvips}{true}% default dvi mode
\fi
-\newboolean{@anim@xetex}
-\setboolean{@anim@xetex}{false}
-\ifxetex
- \setboolean{@anim@xetex}{true}
+
+\ExplSyntaxOn
+\bool_if:NT\g_pbs_dvipdfmx_bool{
\setboolean{@anim@dvipdfmx}{true}
\setboolean{@anim@dvips}{false}
-\fi
-%exporting animation frames
-\newboolean{@anim@export}
-\setboolean{@anim@export}{false}
+}
+\bool_if:NT\g_pbs_dvisvgm_bool{
+ \setboolean{@anim@dvisvgm}{true}
+ \setboolean{@anim@dvips}{false}
+}
+\sys_if_engine_xetex:T{
+ \bool_if:NT\g_pbs_dvipdfmx_bool{\setboolean{@anim@xetex}{true}}
+ \setboolean{@anim@dvips}{false}
+}
+\ExplSyntaxOff
+
+\RequirePackage{graphics}%\scalebox, \resizebox, \rotatebox
+\RequirePackage{zref-abspage}
+
\newboolean{@anim@insideexport}
-\setboolean{@anim@insideexport}{false}
\newenvironment{anim@export}{%
\global\@anim@insideexporttrue%
}{%
\global\@anim@insideexportfalse%
}
-\DeclareOptionX{export}{\setboolean{@anim@export}{true}}
-
-\DeclareOptionX*{}\ProcessOptionsX*\relax %allow anything as an option
-%(remaining package options will be processed near end of this file)
-
-\RequirePackage{graphics}%\scalebox, \resizebox, \rotatebox
-\RequirePackage{zref-abspage}
% get number of pages in file given as #1 (file basename); #2 extension;
% store result into macro given as #3
@@ -148,7 +172,7 @@
\if@anim@export
\@ifclassloaded{standalone}{}{
\PackageError{animate}{%
- Option `export' requires `standalone' document class.\MessageBreak%
+ Option `export' requires the `standalone' document class.\MessageBreak%
Replace current document class with `standalone'%
}{%
Put the line\MessageBreak%
@@ -162,16 +186,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% low level PDF/SVG operations
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage{pdfbase}
-\@ifpackagelater{pdfbase}{2017/09/29}{}{
- \PackageError{animate}{%
- Support package `pdfbase.sty' too old.%
- }{%
- Please install an up to date version of `pdfbase.sty'.\MessageBreak%
- Aborting.%
- }%
-}
-
\ExplSyntaxOn
\let\@anim@literal\pbs_literal:nn
@@ -193,8 +207,6 @@
\ExplSyntaxOff
\if@anim@dvisvgm
- \setboolean{@anim@export}{false}
-
\def\@anim@updatebbox#1#2#3{\special{dvisvgm:bbox #1 #2 #3 transform}}
%approach similar to OCGs, that is, putting the frame content in an svg group,
@@ -226,8 +238,6 @@
\pbs_pdfannot:nnnn{#1}{#2}{#3}{#4}
\pbs_appendtofields:n{\pbs_pdflastann:}
}
-
- \let\@anim@pdfcatalog\pbs_pdfcatalog:n
\ExplSyntaxOff
\RequirePackage{ocgbase} %OCG generating and configuration macros
@@ -356,7 +366,7 @@
}%
\edef\@anim@curxform{\@anim@getkeyval{xform:\@anim@fingerprint}}%
\ifthenelse{\equal{\@anim@curxform}{}}{%
- % new "<file chksum>.<page>.<graphicx opts>"
+ % new file
\@anim@filebox{#3}{#4}{#5}{\@anim@box}% store file in a box
\edef\@anim@natdims{{\the\wd\@anim@box}{\the\ht\@anim@box}{\the\dp\@anim@box}}%
\@anim@xinline{#1}{#2}{\@anim@box}{newfile}% Form XObject creation
@@ -415,7 +425,7 @@
\fi%
\ifthenelse{\equal{#4}{newfile}\OR\equal{#4}{inline}}{%
\@anim@xform{1}{1}{}{}{#3}%
- %keep a record of XObject number, needed when timeline is built
+ %keep a record of XObject number
\@anim@newkey{img@#2}{\@anim@lastxform}%
}{%
%known file
@@ -496,11 +506,9 @@
\hss%
}%
% rotate content on lscape pages
- \ifnum\@anim@method>\@ne\else%
- \ifx\@anim@lscape\@anim@@lscape%
+ \ifnum\@anim@method>\@ne\else\ifx\@anim@lscape\@anim@@lscape%
\setbox\@anim@box=\hbox{\rotatebox{90}{\box\@anim@box}}%
- \fi%
- \fi%
+ \fi\fi%
\fi%
\ifcase\@anim@method% icon based
\if@anim@singleref\else%
@@ -1577,7 +1585,7 @@
\ifcsname Ginput@path\endcsname% make use of graphic[xs] search path
\let\input@path\Ginput@path%
\fi%
- \setkeys{anim@user}{#1}%
+ \SetKeys[anim@user]{#1}%
\ifx\empty\@anim@bg\empty\xdef\@anim@alpha{}\fi%
\xdef\@anim@btnsize{\the\dimexpr\@anim@btnsize\relax}%
%correct wrong option combination; totalheight overrides height
@@ -2108,7 +2116,7 @@
\ifcsname Ginput@path\endcsname% make use of graphic[xs] search path
\let\input@path\Ginput@path%
\fi%
- \setkeys{anim@user}{#1}%
+ \SetKeys[anim@user]{#1}%
\ifx\empty\@anim@bg\empty\xdef\@anim@alpha{}\fi%
\xdef\@anim@btnsize{\the\dimexpr\@anim@btnsize\relax}%
%correct wrong option combination; totalheight overrides height
@@ -2848,171 +2856,27 @@
}
%command options
-\define@key{anim@user}{label}{%
- \gdef\@anim@label{#1}%
- \ifcsname @anim@#1\endcsname%
- \PackageWarning{animate}{Label #1 multiply defined}
- \ifdefined\@anim@multlabel\else
- \gdef\@anim@multlabel{}%
- \AtEndDocument{%
- \PackageWarningNoLine{animate}{%
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\MessageBreak
- @ There are multiply-defined labels! @\MessageBreak
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@}%
- }%
- \fi%
- \fi%
- \expandafter\gdef\csname @anim@#1\endcsname{}%
-}
-%setting the widget size
-\define@key{anim@user}{width}{%
- \gdef\@anim@widtharg{#1}%
- \ifdefined\@anim@usrwd\else%
- \global\advance\@anim@resizeflags by 4%
- \def\@anim@usrwd{}%
- \fi%
-}
-\define@key{anim@user}{height}{%
- \gdef\@anim@heightarg{#1}%
- \ifdefined\@anim@usrht\else%
- \global\advance\@anim@resizeflags by 2%
- \def\@anim@usrht{}%
- \fi%
-}
-\define@key{anim@user}{totalheight}{%
- \gdef\@anim@totheightarg{#1}%
- \ifdefined\@anim@usrtht\else%
- \global\advance\@anim@resizeflags by \@ne%
- \def\@anim@usrtht{}%
- \fi%
-}
-\define@key{anim@user}{depth}{%
- \PackageWarning{animate}{Ignoring obsolete `depth' option.}%
-}
\newboolean{@anim@iso}
-\define@key{anim@user}{keepaspectratio}[true]{%
- \setboolean{@anim@iso}{#1}%
-}
-\define@key{anim@user}{bb}{%
- \xdef\@anim@bb{bb=#1}%
-}
-\define@key{anim@user}{viewport}{%
- \xdef\@anim@viewport{viewport=#1}%
-}
-\define@key{anim@user}{trim}{%
- \xdef\@anim@trim{trim=#1}%
-}
-\define@key{anim@user}{angle}{%
- \xdef\@anim@angle{angle=#1}%
-}
-\define@key{anim@user}{clip}[true]{%
- %no-op, as embedded graphics are always clipped to widget box
-}
\newboolean{@anim@hiresbb}
-\define@key{anim@user}{hiresbb}[true]{%
- \setboolean{@anim@hiresbb}{#1}%
-}
\newboolean{@anim@interpolate}
-\define@key{anim@user}{interpolate}[true]{%
- \setboolean{@anim@interpolate}{#1}%
-}
-\define@key{anim@user}{pagebox}{%
- \xdef\@anim@pagebox{pagebox=#1}%
-}
-\define@key{anim@user}{scale}{%
- \xdef\@anim@boxscale{#1}%
-}
-\define@key{anim@user}{buttonsize}{%
- \gdef\@anim@btnsize{#1}%
-}
-\def\@anim@colours#1:#2\@nil{% helper macro to get number of colour components
- \xdef\@anim@colour{\@anim@colour\space #1}% and to replace : by ` ' in the arg
- \ifthenelse{\equal{#2}{}}{}{%
- \global\advance\@anim@tmpcnt by \@ne%
- \@anim@colours#2\@nil%
- }%
-}
-\define@key{anim@user}{buttonbg}{%background colour of buttons
- \global\@anim@tmpcnt=\@ne%
- \gdef\@anim@colour{}%
- \@anim@colours#1:\@nil%
- \global\let\@anim@bgcolour\@anim@colour%
- \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1%
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@bg{\@anim@colour\space setgray}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@bg{\@anim@colour\space setrgbcolor}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@bg{\@anim@colour\space setcmykcolor}%
- \fi%
- \fi%
- \fi%
- \else% pdftex and dvipdfmx
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@bg{\@anim@colour\space g}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@bg{\@anim@colour\space rg}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@bg{\@anim@colour\space k}%
- \fi%
- \fi%
- \fi%
- \fi%
-}
-\define@key{anim@user}{buttonfg}{%stroking colour of buttons
- \global\@anim@tmpcnt=\@ne%
- \gdef\@anim@colour{}%
- \@anim@colours#1:\@nil%
- \global\let\@anim@fgcolour\@anim@colour%
- \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1%
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@fg{\@anim@colour\space setgray}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@fg{\@anim@colour\space setrgbcolor}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@fg{\@anim@colour\space setcmykcolor}%
- \fi%
- \fi%
- \fi%
- \else% pdftex and dvipdfmx
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@fg{\@anim@colour\space G}%
- \xdef\@anim@@@fg{\@anim@colour\space g}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@fg{\@anim@colour\space RG}%
- \xdef\@anim@@@fg{\@anim@colour\space rg}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@fg{\@anim@colour\space K}%
- \xdef\@anim@@@fg{\@anim@colour\space k}%
- \fi%
- \fi%
- \fi%
- \fi%
-}
-\define@key{anim@user}{buttonalpha}{%button opacity
- \xdef\@anim@alpha{#1}%
-}
-\define@key{anim@user}{alttext}{%
- \ifthenelse{\equal{#1}{none}}{%
- \gdef\@anim@alttext{}%
- }{%
- \xdef\@anim@alttext{/Contents (#1)}%
- }%
-}
-
\newboolean{@anim@controls}
\newboolean{@anim@controls@play}
\newboolean{@anim@controls@step}
\newboolean{@anim@controls@stop}
\newboolean{@anim@controls@speed}
+\newboolean{@anim@ctrlleft}
+\newboolean{@anim@ctrlright}
+\newboolean{@anim@ctrlcentre}
+\newboolean{@anim@loop}
+\newboolean{@anim@autoplay}
+\newboolean{@anim@autoresume}
+\newboolean{@anim@autopause}
+\newboolean{@anim@palindrome}
+\newboolean{@anim@step}
+\newboolean{@anim@meas}
+\setboolean{@anim@nomouse}{false}
+\newboolean{@anim@draft}
+\def\@anim@mone{-1}\def\@anim@mtwo{-2}
\def\@anim@user@controls@all{%
\setboolean{@anim@controls}{true}%
\setboolean{@anim@controls@play}{true}%
@@ -3027,185 +2891,333 @@
\setboolean{@anim@controls@stop}{false}%
\setboolean{@anim@controls@speed}{false}%
}
-\define@key{anim@user}{controls}[all]{%
- \@anim@user@controls@none%
- \setkeys{anim@user@controls}{#1}%
-}
-\define@key{anim@user@controls}{all}[]{\@anim@user@controls@all}
-\define@key{anim@user@controls}{true}[]{\@anim@user@controls@all}
-\define@key{anim@user@controls}{on}[]{\@anim@user@controls@all}
-\define@key{anim@user@controls}{none}[]{\@anim@user@controls@none}
-\define@key{anim@user@controls}{false}[]{\@anim@user@controls@none}
-\define@key{anim@user@controls}{off}[]{\@anim@user@controls@none}
-\define@key{anim@user@controls}{play}[]{%
- \setboolean{@anim@controls}{true}%
- \setboolean{@anim@controls@play}{true}%
-}
-\define@key{anim@user@controls}{step}[]{%
- \setboolean{@anim@controls}{true}%
- \setboolean{@anim@controls@step}{true}%
-}
-\define@key{anim@user@controls}{stop}[]{%
- \setboolean{@anim@controls}{true}%
- \setboolean{@anim@controls@stop}{true}%
-}
-\define@key{anim@user@controls}{speed}[]{%
- \setboolean{@anim@controls}{true}%
- \setboolean{@anim@controls@speed}{true}%
-}
-
\def\@anim@parse@ctrlsalignarg#1#2#3+#4\@nil{%
\ifthenelse{\equal{#3}{}}{}{\def#1{#3}}%
\ifthenelse{\equal{#4}{}}{#2=\z@}{\@anim@getalignindent#2#4\@nil}%
}
\def\@anim@getalignindent#1#2+\@nil{#1=#2}
-
-\newboolean{@anim@ctrlleft}
-\newboolean{@anim@ctrlright}
-\newboolean{@anim@ctrlcentre}
-\define@key{anim@user}{controlsaligned}{%
- \@anim@parse@ctrlsalignarg\@anim@tmpvar\@anim@tmpdima#1+\@nil%
- \ifthenelse{\equal{\@anim@tmpvar}{left}}{%
- \setboolean{@anim@ctrlleft}{true}%
- \setboolean{@anim@ctrlright}{false}%
- \setboolean{@anim@ctrlcentre}{false}%
- \xdef\@anim@ctrlsindent{\the\@anim@tmpdima}%
- }{%
- \ifthenelse{\equal{\@anim@tmpvar}{right}}{%
- \setboolean{@anim@ctrlleft}{false}%
- \setboolean{@anim@ctrlright}{true}%
- \setboolean{@anim@ctrlcentre}{false}%
- \xdef\@anim@ctrlsindent{\the\@anim@tmpdima}%
- }{%
- \ifthenelse{\equal{\@anim@tmpvar}{center}}{%
- \setboolean{@anim@ctrlleft}{false}%
- \setboolean{@anim@ctrlright}{false}%
- \setboolean{@anim@ctrlcentre}{true}%
- \xdef\@anim@ctrlsindent{\z@}%
- }{}%
- }%
+% helper macro to get number of colour components
+\def\@anim@colours#1{\@anim@@colours#1:\@nil}
+\def\@anim@@colours#1:#2\@nil{% helper macro to get number of colour components
+ \xdef\@anim@colour{\@anim@colour\space #1}% and to replace : by ` ' in the arg
+ \ifthenelse{\equal{#2}{}}{}{%
+ \global\advance\@anim@tmpcnt by \@ne%
+ \@anim@@colours#2\@nil%
}%
}
-\newboolean{@anim@loop}
-\define@key{anim@user}{loop}[true]{%
- \setboolean{@anim@loop}{#1}%
-}
-\newboolean{@anim@autoplay}
-\define@key{anim@user}{autoplay}[true]{%
- \setboolean{@anim@autoplay}{#1}%
- \if@anim@autoplay%
- \setboolean{@anim@autoresume}{false}%
- \fi%
-}
-\newboolean{@anim@autoresume}
-\define@key{anim@user}{autoresume}[true]{%
- \setboolean{@anim@autoresume}{#1}%
- \if@anim@autoresume%
- \setboolean{@anim@autoplay}{false}%
- \fi%
-}
-\newboolean{@anim@autopause}
-\define@key{anim@user}{autopause}[true]{%
- \setboolean{@anim@autopause}{#1}%
-}
-\newboolean{@anim@palindrome}
-\define@key{anim@user}{palindrome}[true]{%
- \setboolean{@anim@palindrome}{#1}%
-}
-\def\@anim@mone{-1}\def\@anim@mtwo{-2}
-\define@key{anim@user}{poster}[first]{% <num> | first | last | none
- \ifthenelse{%
- \equal{#1}{first}%
- }{%
- \gdef\@anim@poster{0}%
- }{%
- \ifthenelse{%
- \equal{#1}{last}%
- }{%
- \gdef\@anim@poster{-1}%
- }{%
- \ifthenelse{%
- \equal{#1}{none}%
- }{%
- \gdef\@anim@poster{-2}%
- }{%
- \ifnum#1<\z@\relax%
- \PackageError{animate}{%
- Poster frame `#1' is out-of-bounds on\MessageBreak%
- input line \the\inputlineno.\MessageBreak%
- Try one of `poster=first' or `poster=none'%
- }{}%
- \fi%
- \gdef\@anim@poster{#1}%
- }%
- }%
- }%
-}
-\newboolean{@anim@step}
-\define@key{anim@user}{step}[true]{%
- \setboolean{@anim@step}{#1}%
-}
-\newboolean{@anim@draft}
-\define@key{anim@user}{draft}[true]{%
- \setboolean{@anim@draft}{#1}%
-}
-\define@key{anim@user}{final}[true]{%
- \ifthenelse{\equal{#1}{true}}{%
- \setboolean{@anim@draft}{false}%
- }{%
- \setboolean{@anim@draft}{true}%
- }%
-}
-\setboolean{@anim@nomouse}{false}
-\define@key{anim@user}{nomouse}[true]{%
- \setboolean{@anim@nomouse}{#1}%
-}
-\define@key{anim@user}{timeline}{%
- \IfFileExists{#1}{%
- \xdef\@anim@tmlnfile{\expandafter\zap@finalspace\@filef@und\@nil}%
- \setboolean{@anim@timeline}{true}%
- }{%
- \PackageError{animate}{timeline file `#1' cannot be opened for reading%
- }{%
- Make sure file `#1' exists and is readable!%
- }%
- }%
-}
-\define@key{anim@user}{begin}{%
- \gdef\@anim@begin{#1}%
-}
-\define@key{anim@user}{end}{%
- \gdef\@anim@end{#1}%
-}
-\define@key{anim@user}{every}{% embed every #1th frame
- \ifnum#1<\@ne\relax\gdef\@anim@every{1}\else\gdef\@anim@every{#1}\fi%
-}
-\newboolean{@anim@meas}
-\define@key{anim@user}{measure}[true]{%
- \setboolean{@anim@meas}{#1}%
-}
-\define@key{anim@user}{method}{%
- \ifthenelse{\equal{#1}{icon}}{%
- \def\@anim@method{\z@}%
- }{%
- \ifthenelse{\equal{#1}{widget}}{%
- \def\@anim@method{\@ne}%
- }{%
- \ifthenelse{\equal{#1}{ocg}}{%
- \def\@anim@method{\tw@}%
- }{}%
- }%
- }%
-}
-\define@key{anim@user}{useocg}[]{%
- \PackageError{animate}{%
- Option `useocg' has been removed.\MessageBreak%
- Use `method=ocg' instead%
- }{}%
-}
+\ExplSyntaxOn
+\DeclareKeys[anim@user]{
+ label.code:n = {
+ \gdef\@anim@label{#1}
+ \ifcsname @anim@#1\endcsname
+ \PackageWarning{animate}{Label~#1~multiply~defined}
+ \ifdefined\@anim@multlabel\else
+ \gdef\@anim@multlabel{}
+ \AtEndDocument{
+ \PackageWarningNoLine{animate}{
+ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\MessageBreak
+ @~There~are~multiply-defined~labels!~@\MessageBreak
+ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@}
+ }
+ \fi
+ \fi
+ \expandafter\gdef\csname @anim@#1\endcsname{}
+ },
+ label.value_required:n = true,
+
+ width.code:n = {
+ \gdef\@anim@widtharg{#1}
+ \ifdefined\@anim@usrwd\else
+ \global\advance\@anim@resizeflags by 4
+ \def\@anim@usrwd{}
+ \fi
+ },
+ width.value_required:n = true,
+
+ height.code:n = {
+ \gdef\@anim@heightarg{#1}
+ \ifdefined\@anim@usrht\else
+ \global\advance\@anim@resizeflags by 2
+ \def\@anim@usrht{}
+ \fi
+ },
+ height.value_required:n = true,
+
+ totalheight.code:n = {
+ \gdef\@anim@totheightarg{#1}
+ \ifdefined\@anim@usrtht\else
+ \global\advance\@anim@resizeflags by \@ne
+ \def\@anim@usrtht{}
+ \fi
+ },
+ totalheight.value_required:n = true,
+
+ keepaspectratio.legacy_if_gset:n = @anim@iso,
+ keepaspectratio.default:n = true,
+
+ bb.code:n = {\xdef\@anim@bb{bb=#1}},
+ bb.value_required:n = true,
+
+ viewport.code:n = {\xdef\@anim@viewport{viewport=#1}},
+ viewport.value_required:n = true,
-\define@key{anim@user}{type}{\gdef\@anim@ftype{#1}}%
+ trim.code:n = {\xdef\@anim@trim{trim=#1}},
+ trim.value_required:n = true,
+
+ angle.code:n = {\xdef\@anim@angle{angle=#1}},
+ angle.value_required:n = true,
+
+ pagebox.code:n = {\xdef\@anim@pagebox{pagebox=#1}},
+ pagebox.value_required:n = true,
+
+ clip.code:n = {}, % no-op, as embedded graphics are always
+ clip.default:n = true, % clipped to widget box
+
+ hiresbb.legacy_if_gset:n = @anim@hiresbb,
+ hiresbb.default:n = true,
+
+ interpolate.legacy_if_gset:n = @anim@interpolate,
+ interpolate.default:n = true,
+
+ scale.tl_gset_x:N = \@anim@boxscale,
+ scale.value_required:n = true,
+
+ buttonsize.tl_gset:N = \@anim@btnsize,
+ buttonsize.value_required:n = true,
+
+ buttonbg.code:n = {
+ \global\@anim@tmpcnt=\@ne
+ \gdef\@anim@colour{}
+ \@anim@colours{#1}
+ \global\let\@anim@bgcolour\@anim@colour
+ \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@bg{\@anim@colour\space setgray}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@bg{\@anim@colour\space setrgbcolor}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@bg{\@anim@colour\space setcmykcolor}
+ \fi
+ \fi
+ \fi
+ \else% pdftex and dvipdfmx
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@bg{\@anim@colour\space g}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@bg{\@anim@colour\space rg}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@bg{\@anim@colour\space k}
+ \fi
+ \fi
+ \fi
+ \fi
+ },
+ buttonbg.value_required:n = true,
+
+ buttonfg.code:n = {
+ \global\@anim@tmpcnt=\@ne
+ \gdef\@anim@colour{}
+ \@anim@colours{#1}
+ \global\let\@anim@fgcolour\@anim@colour
+ \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@fg{\@anim@colour\space setgray}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@fg{\@anim@colour\space setrgbcolor}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@fg{\@anim@colour\space setcmykcolor}
+ \fi
+ \fi
+ \fi
+ \else% pdftex and dvipdfmx
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@fg{\@anim@colour\space G}
+ \xdef\@anim@@@fg{\@anim@colour\space g}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@fg{\@anim@colour\space RG}
+ \xdef\@anim@@@fg{\@anim@colour\space rg}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@fg{\@anim@colour\space K}
+ \xdef\@anim@@@fg{\@anim@colour\space k}
+ \fi
+ \fi
+ \fi
+ \fi
+ },
+ buttonfg.value_required:n = true,
+
+ buttonalpha.tl_gset_x:N = \@anim@alpha,
+ buttonalpha.value_required:n = true,
+
+ alttext.code:n = {
+ \ifthenelse{\equal{#1}{none}}{
+ \gdef\@anim@alttext{}
+ }{
+ \xdef\@anim@alttext{/Contents~(#1)}
+ }
+ },
+ alttext.value_required:n = true,
+
+ controls.multichoice:,
+ controls / all.code:n = {\@anim@user@controls@all},
+ controls / true.code:n = {\@anim@user@controls@all},
+ controls / on.code:n = {\@anim@user@controls@all},
+ controls / none.code:n = {\@anim@user@controls@none},
+ controls / false.code:n = {\@anim@user@controls@none},
+ controls / off.code:n = {\@anim@user@controls@none},
+ controls / play.code:n = {
+ \setboolean{@anim@controls}{true}
+ \setboolean{@anim@controls@play}{true}
+ },
+ controls / step.code:n = {
+ \setboolean{@anim@controls}{true}
+ \setboolean{@anim@controls@step}{true}
+ },
+ controls / stop.code:n = {
+ \setboolean{@anim@controls}{true}
+ \setboolean{@anim@controls@stop}{true}
+ },
+ controls / speed.code:n = {
+ \setboolean{@anim@controls}{true}
+ \setboolean{@anim@controls@speed}{true}
+ },
+ controls.default:n = all,
+
+ controlsaligned.code:n = {
+ \@anim@parse@ctrlsalignarg\@anim@tmpvar\@anim@tmpdima#1+\@nil
+ \ifthenelse{\equal{\@anim@tmpvar}{left}}{
+ \setboolean{@anim@ctrlleft}{true}
+ \setboolean{@anim@ctrlright}{false}
+ \setboolean{@anim@ctrlcentre}{false}
+ \xdef\@anim@ctrlsindent{\the\@anim@tmpdima}
+ }{
+ \ifthenelse{\equal{\@anim@tmpvar}{right}}{
+ \setboolean{@anim@ctrlleft}{false}
+ \setboolean{@anim@ctrlright}{true}
+ \setboolean{@anim@ctrlcentre}{false}
+ \xdef\@anim@ctrlsindent{\the\@anim@tmpdima}
+ }{
+ \ifthenelse{\equal{\@anim@tmpvar}{center}}{
+ \setboolean{@anim@ctrlleft}{false}
+ \setboolean{@anim@ctrlright}{false}
+ \setboolean{@anim@ctrlcentre}{true}
+ \xdef\@anim@ctrlsindent{\z@}
+ }{}
+ }
+ }
+ },
+ controlsaligned.value_required:n = true,
+
+ loop.legacy_if_gset:n = @anim@loop,
+ loop.default:n = true,
+
+ autoplay.code:n = {
+ \setboolean{@anim@autoplay}{#1}
+ \if@anim@autoplay\setboolean{@anim@autoresume}{false}\fi
+ },
+ autoplay.default:n = true,
+
+ autoresume.code:n = {
+ \setboolean{@anim@autoresume}{#1}
+ \if@anim@autoresume\setboolean{@anim@autoplay}{false}\fi
+ },
+ autoresume.default:n = true,
+
+ autopause.legacy_if_gset:n = @anim@autopause,
+ autopause.default:n = true,
+
+ palindrome.legacy_if_gset:n = @anim@palindrome,
+ palindrome.default:n = true,
+
+ poster.choice:, % <num> | first | last | none
+ poster / first.code:n = {\gdef\@anim@poster{0}},
+ poster / last.code:n = {\gdef\@anim@poster{-1}},
+ poster / none.code:n = {\gdef\@anim@poster{-2}},
+ poster / unknown.code:n = {% frame <num>
+ \ifnum#1<\z@\relax
+ \PackageError{animate}{
+ Poster~frame~`#1'~is~out-of-bounds~on\MessageBreak
+ input~line~\the\inputlineno.\MessageBreak
+ Try~one~of~`poster=first'~or~`poster=none'
+ }{}
+ \fi
+ \gdef\@anim@poster{#1}
+ },
+ poster.default:n = first,
+
+ step.legacy_if_gset:n = @anim@step,
+ step.default:n = true,
+
+ draft.legacy_if_gset:n = @anim@draft,
+ draft.default:n = true,
+
+ final.code:n = {
+ \ifthenelse{\equal{#1}{true}}{
+ \setboolean{@anim@draft}{false}
+ }{
+ \setboolean{@anim@draft}{true}
+ }
+ },
+ final.default:n = true,
+
+ nomouse.legacy_if_gset:n = @anim@nomouse,
+ nomouse.default:n = true,
+
+ timeline.code:n = {
+ \IfFileExists{#1}{
+ \xdef\@anim@tmlnfile{\expandafter\zap@finalspace\@filef@und\@nil}
+ \setboolean{@anim@timeline}{true}
+ }{
+ \PackageError{animate}{timeline~file~`#1'~cannot~be~opened~for~reading
+ }{
+ Make~sure~file~`#1'~exists~and~is~readable!
+ }
+ }
+ },
+ timeline.value_required:n = true,
+
+ begin.tl_gset:N = \@anim@begin,
+ begin.value_required:n = true,
+
+ end.tl_gset:N = \@anim@end,
+ end.value_required:n = true,
+
+ every.code:n = {
+ \ifnum#1<\@ne\relax\gdef\@anim@every{1}\else\gdef\@anim@every{#1}\fi
+ },
+ every.value_required:n = true,
+
+ measure.legacy_if_gset:n = @anim@meas,
+ measure.default:n = true,
+
+ method.choices:nn = {icon,widget,ocg} {
+ \ifthenelse{\equal{#1}{icon}}{
+ \def\@anim@method{\z@}
+ }{
+ \ifthenelse{\equal{#1}{widget}}{
+ \def\@anim@method{\@ne}
+ }{
+ \ifthenelse{\equal{#1}{ocg}}{
+ \def\@anim@method{\tw@}
+ }{}
+ }
+ }
+ },
+ method.value_required:n = true,
+
+ type.tl_gset_x:N = \@anim@ftype,
+ type.value_required:n = true,
+}
+\ExplSyntaxOff
%macro to reset macros and booleans
\def\@anim@reset{%
@@ -3274,197 +3286,25 @@
}
%package options
-\define@key{anim@pkg}{dvips}[]{%
- \ifthenelse{\equal{#1}{}}{}{%
- \PackageError{animate}{%
- Package option `dvips' does not accept arguments%
- }{}%
- }%
-}%
-\define@key{anim@pkg}{dvipdfmx}[]{
- \ifthenelse{\equal{#1}{}}{}{%
- \PackageError{animate}{%
- Package option `dvipdfmx' does not accept arguments%
- }{}%
- }%
-}%
-\define@key{anim@pkg}{dvisvgm}[]{
- \ifthenelse{\equal{#1}{}}{}{%
- \PackageError{animate}{%
- Package option `dvisvgm' does not accept arguments%
- }{}%
- }%
-}%
-\define@key{anim@pkg}{xetex}[]{
- \ifthenelse{\equal{#1}{}}{}{%
- \PackageError{animate}{%
- Package option `xetex' does not accept arguments%
- }{}%
- }%
-}%
-\define@key{anim@pkg}{export}[]{
- \ifthenelse{\equal{#1}{}}{}{%
- \PackageError{animate}{%
- Package option `export' does not accept arguments%
- }{}%
- }%
-}%
-\def\@anim@@bg{}
-\def\@anim@@bgcolour{}
-\define@key{anim@pkg}{buttonbg}{%background colour of buttons
- \global\@anim@tmpcnt=\@ne%
- \gdef\@anim@colour{}%
- \@anim@colours#1:\@nil%
- \global\let\@anim@@bgcolour\@anim@colour%
- \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1%
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@@bg{\@anim@colour\space setgray}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@@bg{\@anim@colour\space setrgbcolor}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@@bg{\@anim@colour\space setcmykcolor}%
- \fi%
- \fi%
- \fi%
- \else% pdftex and dvipdfmx
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@@bg{\@anim@colour\space g}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@@bg{\@anim@colour\space rg}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@@bg{\@anim@colour\space k}%
- \fi%
- \fi%
- \fi%
- \fi%
-}
-
-\ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1
- %dvips .OR. dvisvgm
- \def\@anim@@fg{0 setgray}\def\@anim@@@@fg{}
-\else% pdftex and dvipdfmx
- \def\@anim@@fg{0 G}\def\@anim@@@@fg{0 g}
-\fi
-\def\@anim@@fgcolour{}
-\define@key{anim@pkg}{buttonfg}{%stroking colour of buttons
- \global\@anim@tmpcnt=\@ne%
- \gdef\@anim@colour{}%
- \@anim@colours#1:\@nil%
- \global\let\@anim@@fgcolour\@anim@colour%
- \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1%
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@@fg{\@anim@colour\space setgray}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@@fg{\@anim@colour\space setrgbcolor}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@@fg{\@anim@colour\space setcmykcolor}%
- \fi%
- \fi%
- \fi%
- \else% pdftex and dvipdfmx
- \ifnum\@anim@tmpcnt=\@ne\relax%
- \xdef\@anim@@fg{\@anim@colour\space G}%
- \xdef\@anim@@@@fg{\@anim@colour\space g}%
- \else%
- \ifnum\@anim@tmpcnt=3\relax%
- \xdef\@anim@@fg{\@anim@colour\space RG}%
- \xdef\@anim@@@@fg{\@anim@colour\space rg}%
- \else%
- \ifnum\@anim@tmpcnt=4\relax%
- \xdef\@anim@@fg{\@anim@colour\space K}%
- \xdef\@anim@@@@fg{\@anim@colour\space k}%
- \fi%
- \fi%
- \fi%
- \fi%
-}
-\def\@anim@@alpha{}
-\define@key{anim@pkg}{buttonalpha}{%button opacity
- \xdef\@anim@@alpha{#1}%
-}
\newcount\@anim@@resizeflags
-\def\@anim@@widtharg{\width}%
-\define@key{anim@pkg}{width}{%
- \def\@anim@@widtharg{#1}%
- \ifdefined\@anim@pkgwd\else%
- \advance\@anim@@resizeflags by 4%
- \def\@anim@pkgwd{}%
- \fi%
-}
-\def\@anim@@heightarg{\height}%
-\define@key{anim@pkg}{height}{%
- \def\@anim@@heightarg{#1}%
- \ifdefined\@anim@pkght\else%
- \advance\@anim@@resizeflags by 2%
- \def\@anim@pkght{}%
- \fi%
-}
-\def\@anim@@totheightarg{\totalheight}%
-\define@key{anim@pkg}{totalheight}{%
- \def\@anim@@totheightarg{#1}%
- \ifdefined\@anim@pkgtht\else%
- \advance\@anim@@resizeflags by \@ne%
- \def\@anim@pkgtht{}%
- \fi%
-}
+\def\@anim@@widtharg{\width}
+\def\@anim@@heightarg{\height}
+\def\@anim@@totheightarg{\totalheight}
\newboolean{@anim@@iso}
-\define@key{anim@pkg}{keepaspectratio}[true]{%
- \setboolean{@anim@@iso}{#1}%
-}
\def\@anim@@bb{}
-\define@key{anim@pkg}{bb}{%
- \xdef\@anim@bb{bb=#1}%
-}
\def\@anim@@viewport{}
-\define@key{anim@pkg}{viewport}{%
- \xdef\@anim@@viewport{viewport=#1}%
-}
\def\@anim@@trim{}
-\define@key{anim@pkg}{trim}{%
- \xdef\@anim@@trim{trim=#1}%
-}
\def\@anim@@angle{}
-\define@key{anim@pkg}{angle}{%
- \xdef\@anim@@angle{angle=#1}%
-}
-\define@key{anim@pkg}{clip}[true]{%
- %no-op, as embedded graphics are always clipped to widget box
-}
+\def\@anim@@pagebox{}
\newboolean{@anim@@hiresbb}
-\define@key{anim@pkg}{hiresbb}[true]{%
- \setboolean{@anim@@hiresbb}{#1}%
-}
\newboolean{@anim@@interpolate}
-\define@key{anim@pkg}{interpolate}[true]{%
- \setboolean{@anim@@interpolate}{#1}%
-}
-\def\@anim@@pagebox{}
-\define@key{anim@pkg}{pagebox}{%
- \xdef\@anim@@pagebox{pagebox=#1}%
-}
-\def\@anim@@boxscale{1}%
-\define@key{anim@pkg}{scale}{%
- \def\@anim@@boxscale{#1}%
-}
-\def\@anim@@btnsize{1.44em}%
-\define@key{anim@pkg}{buttonsize}{%
- \gdef\@anim@@btnsize{#1}%
-}
+\def\@anim@@boxscale{1}
+\def\@anim@@btnsize{1.44em}
+\def\@anim@@bg{}
+\def\@anim@@bgcolour{}
+\def\@anim@@fgcolour{}
+\def\@anim@@alpha{}
\edef\@anim@@alttext{/Contents (animation by animate, v. \@anim@version)}
-\define@key{anim@pkg}{alttext}{%
- \ifthenelse{\equal{#1}{none}}{%
- \gdef\@anim@@alttext{}%
- }{%
- \xdef\@anim@@alttext{/Contents (#1)}%
- }%
-}
-
\newboolean{@anim@@controls}
\newboolean{@anim@@controls@play}
\newboolean{@anim@@controls@step}
@@ -3484,170 +3324,301 @@
\setboolean{@anim@@controls@stop}{false}%
\setboolean{@anim@@controls@speed}{false}%
}
-\define@key{anim@pkg}{controls}[all]{%
- \@anim@pkg@controls@none%
- \setkeys{anim@pkg@controls}{#1}%
-}
-\define@key{anim@pkg@controls}{all}[]{\@anim@pkg@controls@all}
-\define@key{anim@pkg@controls}{true}[]{\@anim@pkg@controls@all}
-\define@key{anim@pkg@controls}{on}[]{\@anim@pkg@controls@all}
-\define@key{anim@pkg@controls}{none}[]{\@anim@pkg@controls@none}
-\define@key{anim@pkg@controls}{false}[]{\@anim@pkg@controls@none}
-\define@key{anim@pkg@controls}{off}[]{\@anim@pkg@controls@none}
-\define@key{anim@pkg@controls}{play}[]{%
- \setboolean{@anim@@controls}{true}%
- \setboolean{@anim@@controls@play}{true}%
-}
-\define@key{anim@pkg@controls}{step}[]{%
- \setboolean{@anim@@controls}{true}%
- \setboolean{@anim@@controls@step}{true}%
-}
-\define@key{anim@pkg@controls}{stop}[]{%
- \setboolean{@anim@@controls}{true}%
- \setboolean{@anim@@controls@stop}{true}%
-}
-\define@key{anim@pkg@controls}{speed}[]{%
- \setboolean{@anim@@controls}{true}%
- \setboolean{@anim@@controls@speed}{true}%
-}
-
\newboolean{@anim@@ctrlleft}
\newboolean{@anim@@ctrlright}
\newboolean{@anim@@ctrlcentre}
\setboolean{@anim@@ctrlcentre}{true}
\def\@anim@@ctrlsindent{\z@}
-\define@key{anim@pkg}{controlsaligned}{%
- \@anim@parse@ctrlsalignarg\@anim@tmpvar\@anim@tmpdima#1+\@nil%
- \setboolean{@anim@@ctrlcentre}{false}%
- \ifthenelse{\equal{\@anim@tmpvar}{left}}{%
- \setboolean{@anim@@ctrlleft}{true}%
- \edef\@anim@@ctrlsindent{\the\@anim@tmpdima}%
- }{%
- \ifthenelse{\equal{\@anim@tmpvar}{right}}{%
- \setboolean{@anim@@ctrlright}{true}%
- \edef\@anim@@ctrlsindent{\the\@anim@tmpdima}%
- }{\setboolean{@anim@@ctrlcentre}{true}}%
- }%
-}
-
\newboolean{@anim@@loop}
-\setboolean{@anim@@loop}{false}%
-\define@key{anim@pkg}{loop}[true]{%
- \setboolean{@anim@@loop}{#1}%
-}
\newboolean{@anim@@autoplay}
-\setboolean{@anim@@autoplay}{false}
-\define@key{anim@pkg}{autoplay}[true]{%
- \setboolean{@anim@@autoplay}{#1}%
- \if@anim@@autoplay\setboolean{@anim@@autoresume}{false}\fi%
-}
\newboolean{@anim@@autoresume}
-\setboolean{@anim@@autoresume}{false}
-\define@key{anim@pkg}{autoresume}[true]{%
- \setboolean{@anim@@autoresume}{#1}%
- \if@anim@@autoresume\setboolean{@anim@@autoplay}{false}\fi%
-}
\newboolean{@anim@@autopause}
-\setboolean{@anim@@autopause}{false}
-\define@key{anim@pkg}{autopause}[true]{%
- \setboolean{@anim@@autopause}{#1}%
-}
\newboolean{@anim@@palindrome}
-\setboolean{@anim@@palindrome}{false}
-\define@key{anim@pkg}{palindrome}[true]{%
- \setboolean{@anim@@palindrome}{#1}%
-}
\gdef\@anim@@poster{0}%
-\define@key{anim@pkg}{poster}[first]{%
- \ifthenelse{%
- \equal{#1}{first}%
- }{%
- \gdef\@anim@@poster{0}%
- }{%
- \ifthenelse{%
- \equal{#1}{last}%
- }{%
- \gdef\@anim@@poster{-1}%
- }{%
- \ifthenelse{%
- \equal{#1}{none}%
- }{%
- \gdef\@anim@@poster{-2}%
- }{%
- \ifnum#1<\z@\relax%
- \PackageError{animate}{%
- Poster frame `#1' is out-of-bounds on\MessageBreak%
- input line \the\inputlineno.\MessageBreak%
- Try one of `poster=first' or `poster=none'%
- }{}%
- \fi%
- \gdef\@anim@@poster{#1}%
- }%
- }%
- }%
-}
\newboolean{@anim@@step}
-\setboolean{@anim@@step}{false}
-\define@key{anim@pkg}{step}[true]{%
- \setboolean{@anim@@step}{#1}%
-}
\newboolean{@anim@@draft}
\ifdraft{%globally set by document class
\setboolean{@anim@@draft}{true}%
}{%
\setboolean{@anim@@draft}{false}%
-}%
-\define@key{anim@pkg}{draft}[true]{%
- \setboolean{@anim@@draft}{#1}%
- \if@anim@export%
- \setboolean{@anim@@draft}{false}%
- \fi%
-}
-\define@key{anim@pkg}{final}[true]{%
- \ifthenelse{\equal{#1}{true}}{%
- \setboolean{@anim@@draft}{false}%
- }{%
- \setboolean{@anim@@draft}{true}%
- }%
}
\newboolean{@anim@@nomouse}
-\setboolean{@anim@@nomouse}{false}
-\define@key{anim@pkg}{nomouse}[true]{%
- \setboolean{@anim@@nomouse}{#1}%
-}
+\def\@anim@@method{\z@}%default animation method is `icon'
+\def\@anim@@ftype{}% file type (extension) of graphics
+
+\ExplSyntaxOn
+\DeclareKeys[anim@pkg]{
+ width.code:n = {
+ \gdef\@anim@@widtharg{#1}
+ \ifdefined\@anim@pkgwd\else
+ \advance\@anim@@resizeflags by 4
+ \def\@anim@pkgwd{}%
+ \fi%
+ },
+ width.value_required:n = true,
-%file type (extension) of graphics files to be embedded
-\def\@anim@@ftype{}%
-\define@key{anim@pkg}{type}{\def\@anim@@ftype{#1}}%
+ height.code:n = {
+ \gdef\@anim@@heightarg{#1}
+ \ifdefined\@anim@pkght\else
+ \advance\@anim@@resizeflags by 2
+ \def\@anim@pkght{}
+ \fi
+ },
+ height.value_required:n = true,
-% animation method: icon vs. widget vs. ocg based
-\define@key{anim@pkg}{method}{%
- \ifthenelse{\equal{#1}{icon}}{%
- \def\@anim@@method{\z@}%
- }{%
- \ifthenelse{\equal{#1}{widget}}{%
- \def\@anim@@method{\@ne}%
+ totalheight.code:n = {
+ \gdef\@anim@@totheightarg{#1}
+ \ifdefined\@anim@pkgtht\else
+ \advance\@anim@@resizeflags by \@ne
+ \def\@anim@pkgtht{}
+ \fi
+ },
+ totalheight.value_required:n = true,
+
+ keepaspectratio.legacy_if_gset:n = @anim@@iso,
+ keepaspectratio.default:n = true,
+
+ bb.code:n = {\xdef\@anim@@bb{bb=#1}},
+ bb.value_required:n = true,
+
+ viewport.code:n = {\xdef\@anim@@viewport{viewport=#1}},
+ viewport.value_required:n = true,
+
+ trim.code:n = {\xdef\@anim@@trim{trim=#1}},
+ trim.value_required:n = true,
+
+ angle.code:n = {\xdef\@anim@@angle{angle=#1}},
+ angle.value_required:n = true,
+
+ pagebox.code:n = {\xdef\@anim@@pagebox{pagebox=#1}},
+ pagebox.value_required:n = true,
+
+ clip.code:n = {}, % no-op, as embedded graphics are always
+ clip.default:n = true, % clipped to widget box
+
+ hiresbb.legacy_if_gset:n = @anim@@hiresbb,
+ hiresbb.default:n = true,
+
+ interpolate.legacy_if_gset:n = @anim@@interpolate,
+ interpolate.default:n = true,
+
+ scale.tl_gset_x:N = \@anim@@boxscale,
+ scale.value_required:n = true,
+
+ buttonsize.tl_gset:N = \@anim@@btnsize,
+ buttonsize.value_required:n = true,
+
+ buttonbg.code:n = {
+ \global\@anim@tmpcnt=\@ne
+ \gdef\@anim@colour{}
+ \@anim@colours{#1}
+ \global\let\@anim@@bgcolour\@anim@colour
+ \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@@bg{\@anim@colour\space setgray}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@@bg{\@anim@colour\space setrgbcolor}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@@bg{\@anim@colour\space setcmykcolor}
+ \fi
+ \fi
+ \fi
+ \else% pdftex and dvipdfmx
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@@bg{\@anim@colour\space g}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@@bg{\@anim@colour\space rg}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@@bg{\@anim@colour\space k}
+ \fi
+ \fi
+ \fi
+ \fi
+ },
+ buttonbg.value_required:n = true,
+
+ buttonfg.code:n = {
+ \global\@anim@tmpcnt=\@ne
+ \gdef\@anim@colour{}
+ \@anim@@colours#1:\@nil
+ \global\let\@anim@@fgcolour\@anim@colour
+ \ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@@fg{\@anim@colour\space setgray}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@@fg{\@anim@colour\space setrgbcolor}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@@fg{\@anim@colour\space setcmykcolor}
+ \fi
+ \fi
+ \fi
+ \else% pdftex and dvipdfmx
+ \ifnum\@anim@tmpcnt=\@ne\relax
+ \xdef\@anim@@fg{\@anim@colour\space G}
+ \xdef\@anim@@@@fg{\@anim@colour\space g}
+ \else
+ \ifnum\@anim@tmpcnt=3\relax
+ \xdef\@anim@@fg{\@anim@colour\space RG}
+ \xdef\@anim@@@@fg{\@anim@colour\space rg}
+ \else
+ \ifnum\@anim@tmpcnt=4\relax
+ \xdef\@anim@@fg{\@anim@colour\space K}
+ \xdef\@anim@@@@fg{\@anim@colour\space k}
+ \fi
+ \fi
+ \fi
+ \fi
+ },
+ buttonfg.value_required:n = true,
+
+ buttonalpha.tl_gset_x:N = \@anim@@alpha,
+ buttonalpha.value_required:n = true,
+
+ alttext.code:n = {
+ \ifthenelse{\equal{#1}{none}}{
+ \gdef\@anim@@alttext{}
+ }{
+ \xdef\@anim@@alttext{/Contents~(#1)}
+ }
+ },
+ alttext.value_required:n = true,
+
+ controls.multichoice:,
+ controls / all.code:n = {\@anim@pkg@controls@all},
+ controls / true.code:n = {\@anim@pkg@controls@all},
+ controls / on.code:n = {\@anim@pkg@controls@all},
+ controls / none.code:n = {\@anim@pkg@controls@none},
+ controls / false.code:n = {\@anim@pkg@controls@none},
+ controls / off.code:n = {\@anim@pkg@controls@none},
+ controls / play.code:n = {
+ \setboolean{@anim@@controls}{true}
+ \setboolean{@anim@@controls@play}{true}
+ },
+ controls / step.code:n = {
+ \setboolean{@anim@@controls}{true}
+ \setboolean{@anim@@controls@step}{true}
+ },
+ controls / stop.code:n = {
+ \setboolean{@anim@@controls}{true}
+ \setboolean{@anim@@controls@stop}{true}
+ },
+ controls / speed.code:n = {
+ \setboolean{@anim@@controls}{true}
+ \setboolean{@anim@@controls@speed}{true}
+ },
+ controls.default:n = all,
+
+ controlsaligned.code:n = {
+ \@anim@parse@ctrlsalignarg\@anim@tmpvar\@anim@tmpdima#1+\@nil
+ \setboolean{@anim@@ctrlcentre}{false}
+ \ifthenelse{\equal{\@anim@tmpvar}{left}}{
+ \setboolean{@anim@@ctrlleft}{true}
+ \edef\@anim@@ctrlsindent{\the\@anim@tmpdima}
+ }{
+ \ifthenelse{\equal{\@anim@tmpvar}{right}}{
+ \setboolean{@anim@@ctrlright}{true}
+ \edef\@anim@@ctrlsindent{\the\@anim@tmpdima}
+ }{
+ \setboolean{@anim@@ctrlcentre}{true}
+ \xdef\@anim@@ctrlsindent{\z@}
+ }
+ }
+ },
+ controlsaligned.value_required:n = true,
+
+ loop.legacy_if_gset:n = @anim@@loop,
+ loop.default:n = true,
+
+ autoplay.code:n = {
+ \setboolean{@anim@@autoplay}{#1}
+ \if@anim@@autoplay\setboolean{@anim@@autoresume}{false}\fi
+ },
+ autoplay.default:n = true,
+
+ autoresume.code:n = {
+ \setboolean{@anim@@autoresume}{#1}
+ \if@anim@@autoresume\setboolean{@anim@@autoplay}{false}\fi
+ },
+ autoresume.default:n = true,
+
+ autopause.legacy_if_gset:n = @anim@@autopause,
+ autopause.default:n = true,
+
+ palindrome.legacy_if_gset:n = @anim@@palindrome,
+ palindrome.default:n = true,
+
+ poster.choice:, % <num> | first | last | none
+ poster / first.code:n = {\gdef\@anim@@poster{0}},
+ poster / last.code:n = {\gdef\@anim@@poster{-1}},
+ poster / none.code:n = {\gdef\@anim@@poster{-2}},
+ poster / unknown.code:n = {% frame <num>
+ \ifnum#1<\z@\relax
+ \PackageError{animate}{
+ Poster~frame~`#1'~is~out-of-bounds~on\MessageBreak
+ input~line~\the\inputlineno.\MessageBreak
+ Try~one~of~`poster=first'~or~`poster=none'
+ }{}
+ \fi
+ \gdef\@anim@@poster{#1}
+ },
+ poster.default:n = first,
+
+ step.legacy_if_gset:n = @anim@@step,
+ step.default:n = true,
+
+ draft.code:n = {
+ \setboolean{@anim@@draft}{#1}
+ \if@anim@export\setboolean{@anim@@draft}{false}\fi
+ },
+ draft.default:n = true,
+
+ final.code:n = {
+ \ifthenelse{\equal{#1}{true}}{
+ \setboolean{@anim@@draft}{false}
}{%
- \ifthenelse{\equal{#1}{ocg}}{%
- \def\@anim@@method{\tw@}%
- }{}% ignoring wrong input
+ \setboolean{@anim@@draft}{true}
}%
- }%
-}
-\define@key{anim@pkg}{useocg}[]{%
- \PackageError{animate}{%
- Package option `useocg' has been removed.\MessageBreak%
- Use `method=ocg' instead%
- }{}%
+ },
+ final.default:n = true,
+
+ nomouse.legacy_if_gset:n = @anim@@nomouse,
+ nomouse.default:n = true,
+
+ method.choices:nn = {icon,widget,ocg} {
+ \ifthenelse{\equal{#1}{icon}}{
+ \def\@anim@@method{\z@}
+ }{
+ \ifthenelse{\equal{#1}{widget}}{
+ \def\@anim@@method{\@ne}
+ }{
+ \ifthenelse{\equal{#1}{ocg}}{
+ \def\@anim@@method{\tw@}
+ }{}% ignoring wrong input
+ }
+ }
+ },
+ method.value_required:n = true,
+
+ type.tl_gset_x:N = \@anim@@ftype,
+ type.value_required:n = true,
}
+\ExplSyntaxOff
-%default animation method is Icon based
-\def\@anim@@method{\z@}
+\ifnum\if@anim@dvips 1\else\if@anim@dvisvgm 1\else0\fi\fi=1
+ %dvips .OR. dvisvgm
+ \def\@anim@@fg{0 setgray}\def\@anim@@@@fg{}
+\else% pdftex and dvipdfmx
+ \def\@anim@@fg{0 G}\def\@anim@@@@fg{0 g}
+\fi
%process package options
-\def\@anim@setpkgkeys#1{\setkeys{anim@pkg}{#1}}
-\edef\@anim@pkgopts{{\@ptionlist{\@currname.\@currext}}}
-\expandafter\@anim@setpkgkeys\@anim@pkgopts
+\ProcessKeyOptions[anim@pkg]
%%%%%%%%%%%%%%%%%%%%%%%%
% JavaScript part
diff --git a/macros/latex/contrib/animate/animate.tex b/macros/latex/contrib/animate/animate.tex
index 9c1e922325..3c7df213ac 100644
--- a/macros/latex/contrib/animate/animate.tex
+++ b/macros/latex/contrib/animate/animate.tex
@@ -1,5 +1,5 @@
\listfiles
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
% Copyright 2007--\today Alexander Grahn
%
% This material is subject to the LaTeX Project Public License. See
@@ -10,8 +10,7 @@
\ifdefined\outputmode\outputmode=0\fi
\ifdefined\pdfoutput\pdfoutput=0\fi
%%%%%%% pdfmanagement-testphase %%%%%%
-\RequirePackage{pdfmanagement-testphase} % load the package
-\DeclareDocumentMetadata % activates the PDF management interface
+\DocumentMetadata % activates the PDF management interface
{
%uncompress,
}
@@ -361,7 +360,7 @@ interpolate
controls[=all | true | on]
controls=(none | false | off) | {[play][,step][,stop][,speed]}
\end{verbatim}
-Inserts control buttons below the animation widget. Visibility of buttons can be fine-tuned through optional keys. By default, if setting `\verb+controls+' alone, all available buttons are shown, while any of `\verb+none+', `\verb+false+' or `\verb+off+' suppresses them altogether. A comma-separated selection from `\verb+play+', `\verb+step+', `\verb+stop+' and `\verb+speed+' enables corresponding pairs or groups of buttons. Such a comma list must be enclosed in braces, i.\,e. \verb+controls={..., ..., ...}+. If all buttons are shown, their meaning is as follows, from left to right: stop \& first frame, step backwards, play backwards, play forwards, step forwards, stop \& last frame, decrease speed, default speed, increase speed. Both `play' buttons are replaced by a large `pause' button while the animation is playing.
+Inserts control buttons below the animation widget. Visibility of buttons can be fine-tuned through optional keys. By default, if setting `\verb+controls+' alone, all available buttons are shown, while any of `\verb+none+', `\verb+false+' or `\verb+off+' suppresses them altogether. A comma-separated selection from `\verb+play+', `\verb+step+', `\verb+stop+' and `\verb+speed+' enables corresponding pairs or groups of buttons. Such a comma list must be enclosed in braces, i.\,e. \verb+controls={play, stop}+. If all buttons are shown, their meaning is as follows, from left to right: stop \& first frame, step backwards, play backwards, play forwards, step forwards, stop \& last frame, decrease speed, default speed, increase speed. Both `play' buttons are replaced by a large `pause' button while the animation is playing.
\begin{verbatim}
controlsaligned=left[+<indent>] | center | right[+<indent>]
\end{verbatim}
diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
index a8a12f42eb..540dc7052e 100644
--- a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
+++ b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.tex b/macros/latex/contrib/create-theorem/create-theorem-doc.tex
index e041c1dad1..6ac3cb8604 100644
--- a/macros/latex/contrib/create-theorem/create-theorem-doc.tex
+++ b/macros/latex/contrib/create-theorem/create-theorem-doc.tex
@@ -39,6 +39,8 @@
texcsstyle =* \color{code-main},
moretexcs =
{
+ ExplSyntaxOn,ExplSyntaxOff,
+ NewDocumentCommand,NewDocumentEnvironment,
cref,crefname,
Cref,Crefname,
crefformat,
@@ -47,9 +49,11 @@
crefthemark,
selectlanguage,
theoremstyle,
+ proofname,
NameTheorem,
CreateTheorem,
SetTheorem,
+ SetTheoremBinding,
}
}
\lstset{% LaTeX3 commands
@@ -57,6 +61,9 @@
texcsstyle =* \color{code-expl3},
moretexcs =
{
+ tl_new:N,
+ tl_set:Nn,
+ cs_undefine:c,
}
}
\lstnewenvironment{code}{\setstretch{1.05}\LocallyStopLineNumbers}{\ResumeLineNumbers\vspace{-.3\baselineskip}\vspace{-.5\parskip}}
@@ -97,7 +104,7 @@
\begin{document}
-\def\PackageVersion{2022/07/31}
+\def\PackageVersion{2022/08/04}
\title{\createtheorempackage{}\\\smallskip\itshape Initializing theorem-like environments with multilingual support}
\author{Jinwen XU}
@@ -357,6 +364,12 @@ Supported keys are:
\end{itemize}
\end{itemize}
+\medskip
+In some cases, you may define an internal environment (for example, a generic version) first and then use it to define the final environment. You may wish to hide the internal names from the users so that they can use \lstinline|\SetTheorem| with the name of the final environments. This can be done with the following command:
+\begin{code}
+\SetTheoremBinding{(*\meta{list of the name of environments}*)}{(*\meta{the environment to bind with}*)}
+\end{code}
+
\bigskip
\begin{center}
\itshape
@@ -366,9 +379,9 @@ Supported keys are:
\section{Examples}
-\subsection{The environment \texttt{idea}}
+\subsection{The environment {\normalfont\texttt{idea}}}
-First, let's getting familiar with these two commands by creating the environment \texttt{idea}.
+First, let's getting familiar with these two commands by creating the environment {\normalfont\texttt{idea}}.
\begin{code}
\NameTheorem{idea}{
@@ -409,16 +422,16 @@ This is not exciting at all. Now, let's say we are writing a bilingual note in E
}
\end{code}
-With this, if you use \lstinline|\selectlanguage{french}|, the \texttt{idea} environment shall be automatically displayed as \textquote{Idée}. And if you \lstinline|\crefthe| it, the definite article and the name showed up properly just as expected.
+With this, if you use \lstinline|\selectlanguage{french}|, the {\normalfont\texttt{idea}} environment shall be automatically displayed as \textquote{Idée}. And if you \lstinline|\crefthe| it, the definite article and the name showed up properly just as expected.
\medskip
-Next we shall deal with the numbering problem. Let's continue to use this environment \texttt{idea} for demonstration -- suppose that we have set the names up with \lstinline|\NameTheorem|.
+Next we shall deal with the numbering problem. Let's continue to use this environment {\normalfont\texttt{idea}} for demonstration -- suppose that we have set the names up with \lstinline|\NameTheorem|.
\subsection{Let's play with numbering}
Remember the exercise I left you in the previous section? Let's do it together now.
-\subsubsection{Numbered \texttt{idea} and numbered \texttt{idea*}}
+\subsubsection{Numbered {\normalfont\texttt{idea}} and numbered {\normalfont\texttt{idea*}}}
This is easy, \commandoption{copy existed} suffices:
@@ -427,7 +440,7 @@ This is easy, \commandoption{copy existed} suffices:
\CreateTheorem{idea*}{(*\commandoption{copy existed}*) = idea}
\end{code}
-\subsubsection{Numbered \texttt{idea} and unnumbered \texttt{idea*}}
+\subsubsection{Numbered {\normalfont\texttt{idea}} and unnumbered {\normalfont\texttt{idea*}}}
This is the easiest, \commandoption{create starred version} will do.
@@ -438,11 +451,11 @@ This is the easiest, \commandoption{create starred version} will do.
}
\end{code}
-Notice that you cannot use \lstinline|\CreateTheorem{idea*}{|\commandoption{numberless}\lstinline|}| here, since we don't have names defined for \texttt{idea*}.
+Notice that you cannot use \lstinline|\CreateTheorem{idea*}{|\commandoption{numberless}\lstinline|}| here, since we don't have names defined for {\normalfont\texttt{idea*}}.
-\subsubsection{Unnumbered \texttt{idea} and numbered \texttt{idea*}}
+\subsubsection{Unnumbered {\normalfont\texttt{idea}} and numbered {\normalfont\texttt{idea*}}}
-This is a bit tricky: by default we can only create numbered \texttt{idea} or unnumbered \texttt{idea*}, and the question is how to switch them. We shall need an intermediary.
+This is a bit tricky: by default we can only create numbered {\normalfont\texttt{idea}} or unnumbered {\normalfont\texttt{idea*}}, and the question is how to switch them. We shall need an intermediary.
\begin{code}
\CreateTheorem{idea}{(*\commandoption{create starred version}*)}
@@ -451,9 +464,9 @@ This is a bit tricky: by default we can only create numbered \texttt{idea} or un
\CreateTheorem{idea}{(*\commandoption{copy existed}*) = idea-temp}
\end{code}
-\subsubsection{Unnumbered \texttt{idea} and unnumbered \texttt{idea*}}
+\subsubsection{Unnumbered {\normalfont\texttt{idea}} and unnumbered {\normalfont\texttt{idea*}}}
-This is the combination of the first two cases --- we need to create \texttt{idea*} first and then copy it to \texttt{idea}:
+This is the combination of the first two cases --- we need to create {\normalfont\texttt{idea*}} first and then copy it to {\normalfont\texttt{idea}}:
\begin{code}
\CreateTheorem{idea}{(*\commandoption{create starred version}*)}
@@ -461,7 +474,7 @@ This is the combination of the first two cases --- we need to create \texttt{ide
\end{code}
\smallskip
-In each case, the two environments \texttt{idea} and \texttt{idea*} share the same set of names.
+In each case, the two environments {\normalfont\texttt{idea}} and {\normalfont\texttt{idea*}} share the same set of names.
\subsection{The \emph{proofless} version -- theorems with a Q.E.D. symbol}
@@ -473,7 +486,52 @@ Sometimes you may encounter a theorem without a proof, in which case you might w
\CreateTheorem { theorem+* } { (*\commandoption{copy existed}*) = theorem*, (*\commandoption{qed}*) }
\end{code}
-The code above defines two new environments \lstinline|theorem+| and \lstinline|theorem+*| in addition to \lstinline|theorem| and \lstinline|theorem*|. The \lstinline|+| version behaves exactly the same as the usual version, except it has a Q.E.D. symbol.
+The code above defines two new environments \lstinline|theorem+| and \lstinline|theorem+*| in addition to \lstinline|theorem| and \lstinline|theorem*|. The \lstinline|+| version behaves exactly the same as the usual version, except that it has a Q.E.D. symbol.
+
+\subsection{Redefine the {\normalfont\texttt{proof}} environment}
+
+If you wish to have a {\normalfont\texttt{proof}} environment with a custom theorem style, or to have a numbered version {\normalfont\texttt{proof*}} of it, the following code could be helpful:
+
+\begin{code}
+\ExplSyntaxOn
+
+\newcounter { proof }
+\tl_new:N \l_mymodule_name_of_proof_tl
+\CreateTheorem { proof_inner }
+ {
+ (*\commandoption{name}*) = { (*\commandoption{heading}*) = { \l_mymodule_name_of_proof_tl } },
+ (*\commandoption{create-starred-version}*),
+ (*\commandoption{style}*) = remark,
+ (*\commandoption{qed}*),
+ (*\commandoption{shared-counter}*) = proof,
+ }
+
+\cs_undefine:c { proof }
+\cs_undefine:c { endproof }
+\NewDocumentEnvironment { proof } { O{\proofname} }
+ {
+ \tl_set:Nn \l_mymodule_name_of_proof_tl { #1 }
+ \begin { proof_inner* }
+ }
+ {
+ \end { proof_inner* }
+ }
+\NewDocumentEnvironment { proof* } { O{\proofname} }
+ {
+ \tl_set:Nn \l_mymodule_name_of_proof_tl { #1 }
+ \begin { proof_inner }
+ }
+ {
+ \end { proof_inner }
+ }
+
+\SetTheoremBinding { proof } { proof_inner* }
+\SetTheoremBinding { proof* } { proof_inner }
+
+\ExplSyntaxOff
+\end{code}
+
+It defines an environment \lstinline|proof_inner| (with its starred variant) with theorem style \lstinline|remark| to mimic the default style (you are welcome to use your own style here), and with the name to be a variable which is latter used to define the actual environments \lstinline|proof| and \lstinline|proof*|. These two environments are defined in such a way that \lstinline|proof| is the usual unnumbered version and \lstinline|proof*| is the numbered version. The \lstinline|\SetTheoremBinding| lines are to ensure that user can directly write \lstinline|\SetTheorem{proof}| rather than \lstinline|\SetTheorem{proof_inner}|.
\bigskip
diff --git a/macros/latex/contrib/create-theorem/create-theorem.sty b/macros/latex/contrib/create-theorem/create-theorem.sty
index 329217b5b3..411d7f6873 100644
--- a/macros/latex/contrib/create-theorem/create-theorem.sty
+++ b/macros/latex/contrib/create-theorem/create-theorem.sty
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{create-theorem}
- {2022/07/31} {}
+ {2022/08/04} {}
{Initializing theorem-like environments with multilingual support}
\keys_define:nn { create-theorem }
@@ -702,6 +702,8 @@
\bool_new:N \l__crthm_creating_apply_style_bool
\tl_new:N \l__crthm_creating_apply_style_tl
+\bool_new:N \l__crthm_creating_qed_bool
+\tl_new:N \l__crthm_creating_qed_tl
\bool_new:N \l__crthm_creating_numberless_bool
\bool_new:N \l__crthm_creating_create_starred_bool
\bool_new:N \l__crthm_creating_copy_existed_bool
@@ -733,15 +735,8 @@
, apply-style .value_required:n = true
, apply style .meta:n = { style = { #1 } }
, apply style .value_required:n = true
- , qed .code:n = {
- \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /begin } { crthm } { \cs_set:Npn \qedsymbol { \ensuremath { #1 } } \pushQED{\qed} }
- \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /end } { crthm } { \popQED }
- \bool_if:NT \l__crthm_creating_create_starred_bool
- {
- \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl * /begin } { crthm } { \cs_set:Npn \qedsymbol { \ensuremath { #1 } } \pushQED{\qed} }
- \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl * /end } { crthm } { \popQED }
- }
- }
+ , qed .code:n = { \bool_set_true:N \l__crthm_creating_qed_bool
+ \tl_set:Nn \l__crthm_creating_qed_tl { #1 } }
, qed .default:n = \c__crthm_original_qedsymbol_tl
, qed~symbol .meta:n = { qed = #1 }
, qed~symbol .default:n = \c__crthm_original_qedsymbol_tl
@@ -885,6 +880,17 @@
\end{ #1 _crthm_regional }
}
\keys_set:nn { create-theorem-creating / counter-management } { #2 }
+
+ \bool_if:NT \l__crthm_creating_qed_bool
+ {
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /begin } { crthm } { \cs_set:Npn \qedsymbol { \ensuremath { \l__crthm_creating_qed_tl } } \pushQED{\qed} }
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /end } { crthm } { \popQED }
+ \bool_if:NT \l__crthm_creating_create_starred_bool
+ {
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl * /begin } { crthm } { \cs_set:Npn \qedsymbol { \ensuremath { \l__crthm_creating_qed_tl } } \pushQED{\qed} }
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl * /end } { crthm } { \popQED }
+ }
+ }
}
{
\msg_error:nnn { create-theorem } { env-not-named } { #1 }
diff --git a/macros/latex/contrib/media4svg/ChangeLog b/macros/latex/contrib/media4svg/ChangeLog
index 9f427a00d5..5a25d497a9 100644
--- a/macros/latex/contrib/media4svg/ChangeLog
+++ b/macros/latex/contrib/media4svg/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-04
+ * v0.8
+ * fix: option processing acc. to new LaTeX format 22-06-01
+
+2022-05-18
+ * v0.7
+ * fix: let PgUp/PgDown events propagate to parent
+
2022-05-18
* v0.7
* fix: let PgUp/PgDown events propagate to parent
diff --git a/macros/latex/contrib/media4svg/README.md b/macros/latex/contrib/media4svg/README.md
index cf5686653d..5884f5a2ed 100644
--- a/macros/latex/contrib/media4svg/README.md
+++ b/macros/latex/contrib/media4svg/README.md
@@ -1,6 +1,6 @@
# The `media4svg` LaTeX Package
-Version 0.7, 2022/05/18
+Version 0.8, 2022/08/04
© 2020--today, Alexander Grahn
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-1.svg b/macros/latex/contrib/media4svg/example/beamer-example-1.svg
index bf5f1909ce..ce6ee99695 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-1.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-1.svg
@@ -9,20 +9,20 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKcAA0AAAAABbwAAAJHAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEUVQNdiB+HsbGtKZLiGI0ib7c/s9usvua4gkRT+KB//1w970vE5PTB3RNq4hZYw28inoy63iizhoqyeCBv+b7YQdyGL1OGmBbRIJu/T8AP7jAwgbOOd4oUmA810yMtrBZEc9kGvUC/QUuckP97iKUlq7HzDY+V0peQoDXdwePwOC1vkJZFsmasEdG3BYfY4f5d5wwLB8kUVYEQCUATFzeW8BX35r/MzvpVtpCACRI0EqA0ZSAVlonpFKBr+ErKs4LQMgJgBARAQBBeW9X/EL4TwQZKEaOXpgKkKKHBFFM01J78GVJVpZOD58oXnL4VP2g4n89hK3XistnHD5d3zm0rXZxYEvd8uD2hu6aAyfr+uW/K2y5WlIx9cCJujanWh/eWr+SPNvqOlZ07I31ZOaTzO9sIB94PzSq9lptB2l5im9qXx+IXq1bPxAMYO9VlGJ9b+Tgmof4wxqOK4gYgTCncew6uBGMaN0sSH0q3MizfgpOIscBEzDj+H4e/kQo/HJAIPs0YdmCitavwpLk7VQ+qsf/l8mapBsKRRBIupNn4gpQYQtAT7Ntg4i+AgGZDhJEBAHjZQAKLSdAVKCSAIkOIwJkSuwRQC5xQSKkRaJySCYxlslk6n0ey+VOmGxp7elg6obPxobQ6+zkUX31Zm3JUpCRY2mwnKxsM68mrYzoglxYwDtJYPK2XlqFTM5qWKcV1Plaupw+SudguqWbu62zUzdC9zYXGi2vaDOMjvoYiEtzPkMQQwxJ8aK1t/P7aLIMStyjAAA=) format('woff2');}
-@font-face{font-family:ec-lmtt9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJEAA0AAAAABVQAAAHvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCJgcsG1oEIB4H1e0dxldMkX/YYqLi4fl1z//aZ2buI5LmPuHq0W5KUER3E9oPEVENiq8pjWtj89/XZ/G0nFKxAjUqyt25/MCm+Iiq83N1Xt1Exjht1/5Xl1g79iEpkxDw09vf7sNvz8+0cjzS0LinIF1Pn3ATj4vfNSORFBmAAICV++ftRdP8rPv3kTanVyAAGTL0EWCuTKCP3DBU5ELSNP87cP37jxYAUSEAkZAk4ARe5p9zcLmaLiG+k0AB2qOCgRgByFGTQJLyvFN0jA5Fp3x9h6J9p2hftP+5vZtLUnudLkTHvENWcve6DtWHbR/+Udqo9vTL+3vNnnmtFfu/XW6d8uj8H17tnDRh1oTPA/6LNeBFqE992Sb3f6tK8QsjWRIKZFAIvajEl8Dx5UBQvVt7vqPL1M9tO2R/7kIXqqRqeoW2EgjSK2xOyyBVBQCgiCOqEMtIqfgNOwQKnSWQEAIz1QBt7RcgKXQUIDPIVgEKHTwQoKKtdzKRt5O0h7LMQt1ZobcrWyu6euSoY844YxJHj505M4n5Tjju7PDCaQfsU2qpaShNVtpnj9GmegJtmhiN62hLo2rx0RHZTx/YV7ZqjXJyuW/PaBfJmubE0eNGX4g21tvntDMOOdelplvmWdLerDW45lYbQNLqgtNb9TQcAA==) format('woff2');}
-@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATIAA0AAAAACOgAAAR0AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCJgc8Gy4HIB6HsWP6gWRcq0JHhiV4nv827dw3MySZgaqSpKJE3CFm1IyueKgYa6I10b8VsRDFrrlNNeOowEs0APsXqf8BpLv+/anBf89CuW+fYmNZxFKyAo016NfWoKaGiyi0vAt73hJOoF6ZaljzRhmp18u07dYmeP/8XoAAnFl//UmA62/7oqe/qEp5EAPUWrUFCBQ/uSGqFCgMDWBOuDNUjrxuIMqiNqB3qsas55hbXlvyo4xoxVeBAKPozAJD9KNhI0qufJXqdPCaaYFFT0Dvxu20w3ofe8OrXvGcZxNYJzYQghEFKAII5hq8jgFrgwvCSDAQgskvsbDD1wvNbYD0SgHgAGAEGAcZAzITANABFwWAQr86OjYxRO2+ElLbfcQipwEyTEwZJEEyWezSpy33FYdYhkN3T2I6xDz8zbN7Y7lQokwcPv950647AhfE3XPWNA0rcI5byti2NEeAkRV4zbK82pZmNTBB6y5sptI7686LnDmHlx2aM1lXW3eBnoKznAGa9WC5exI3kvW4+D10nez3/eJoxh1D5nZU21+5QM+F+ty9OmizwyDtXXqmUy9wQfymdSD+oZssteUa4hdpXG3PSTM5Lf4zs6do2GfXnaezn3jmiQ2WFcCh+c11tWIqS/wXrMCm955CWV3+8wPphVNnWVg3ZbPInvP8eaE3+OnPnfvr97v2Z6ycMeRK1Wh3T4ZbYv9dmdHN7tpHth1bPWr9qNXb9t/fwcpHHpvzQuYLcx9+fhXRM//0J96kzOzMXwK2RbbtzPmrH7h1bp/13tEfdj50a11TRmel+xHnI7XdFZnc/B31HGud1V2Q39Xdctx7dN4LDy+Y//TD8/jUWeJtK/FUTDEKy2JqxufHTapUdwypT57mSqtKXZAZMaHWfZ9r3IDIKZ2j0s+FRLHh8pwdy8tDJzfduba9Y+XazsbyCCO/KLY+q75FcguP6H8UJ02eUhh9HOW3ctzlo/tdjy/sbM9OnLI7cmpP1vjMpDXle9eUJ913uSUltt89V2Nwv8g3EvSsiTGbWuPaJ0yJiRJmWmeNbZm8rN/yWD1kxQ/2oe33ZXJq0vMPt6SXFFXu8fySFOOJG3fWiO8f6qH3+prXFs4sToqsvdvz05dVlb5VnZ7Cpta0CeuHj937aXZqdVs2AB8JEf3jIJ3voj+yGVc1VlMhBDQwQnjLJv8OkKdGAAH55OYxbX1Tfwu2tC+elR9izIvJnqwHglEACKj1vTEa0xug9hD4ILvMJRQgZaAG0pzeOtNOR95ARJcs9T8JdVE4fPkxGU+NOgI4yGcDQAGCAJlcACCYGQQaNrDbAGiM00zVY2DxFP42gtmAhughKEwoejQKDSAYDOE/10Y/rzHPfD4+iZi3fL5EyLfQAkvF+y0xk5dTNJdITsmcvLpM3xoHcJTEdNyCo0V2ovGzLmO/ZKbXGe2KdCY7vV3Ts4S1QVTi9LjpL3VtcN/DJXxmZw7HysiW59N6fZQrkqwFou0ACnZyAIJikIkmi9m/mqtQsSo1) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-text.f4 {font-family:ec-lmtt9;font-size:8.966376px}
-text.f5 {font-family:ec-lmss8;font-size:7.471995px}
-text.f6 {font-family:ec-lmss9;font-size:8.966376px}
-text.f7 {font-family:ec-lmr9;font-size:8.966376px}
-text.f8 {font-family:ec-lmr12;font-size:14.346196px}
-text.f9 {font-family:nf0;font-size:10.909088px}
-text.f10 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');}
+@font-face{font-family:nf3;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAqcAA0AAAAAElgAAApFAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgyoIBBEICplQlFMLNgABNgIkA2gEIAWCCwdWG70Oo6J+cFIkgH8u2JwV4/pNsQiD6DIMQdvoFCg4+Ly2I9qUZg+/QyXhiIgSIcScImmIONWYVO9ah4poRCsukTcRguBw9//tCR5HgQaURx6ALwykbPU/wLTMDnhIKTq05ogTT7+2JXQaCRlPhEppL7P7n7xMf2qoJNEUSMFEIxEiIZEttEIJ5IANcVmVlJKD+PumBACUg683vneELvy+ZK9+bZS72IMFsEveBeCpIuhRjDUEMHcxaiIfWnHObQGAaIOl+8erznd9wNkYV5sXl3uBQIOcaZtPT1x/PqFoseJlyWfj0KTVEit06jP4F0xxoxauonbdBn4a98Vnzz1y1RVjRo244LxzzoYYIdQChABlHYANq0XFwMTCahlbLQ4VFw/8P8D7+EPCMQAxyUwG8qVSBeotGAqfHCqP/sqar+XGc/IkzKOLtW+5TFvkCpg0zhwwU8icyOZNwOrpG4256ClF0GMg/3G5LBQtWRwcyUioKh+J4BbzkQhFgQiOXEqfDZGDvOVeTiIjgiVg2gkW7qLt0/MvcLd1Fijb5TnC41hAdsowO4u75+3nEO13+urdEcIzZzsLzfis/ACOO75+XJi5iuh53F2RYxe7vncRPY675TML2OWBsloPHACBoxnhDJo+dMjyxC0gAGoUx+Em4UlAuHscIcKOOzERwt3D2rpDxxYOyGtmreCwIfcdRKschO1giw5btrXhzsUdyOpOBMIzBkA9enUNd7+YNyBEL+AvvWc5WC9DeA4jRB9yy63j43deLOSGuSGyEHX0PoXYnW+EGEBWO3iujx0FjJrF3Tc+zCMGPUEQ6BquHa5RKcpxvM4en7hJrB5nt8P1+0DJq6oPIZrgNfRcvKixDdTUHiU8h1XOxWSr+gWiGeFyCtx9CiWOTYd+iSi440xYjtX4w8kHswV8/LOTXvLkY4r9iOz+av8B0QsO6IjbqJVhhYVlEtkNAiHDH/Ve8zE0zq56SniypkCE3OOINVvBGTT1JOAA6o40T3d4FPhARwGaadwtP3Hv1gXcbZ9GAs/hBtVOPpwZSfw8abnZ5t7PnQRXUjJpDyCd0yeBSrn2Cbscou3DL27gbuXwNKLDbnNPRGc8JDyKA0BdJDwjyEqpJ3E3onUzhAcWB4gzTz5Natjnc/f923d4+BBC9LnQ6c7lhQfQT13A0xwMW3daIDyXAbg40U9i4YbQwljRUCGMaA6knYo9ZvJd6CN01MxHLm2biuTh9TDoqBSNU5GYOHQIoSzNuugHHh8kY8rHNL0QDa4DR9J4xmY644F9ePjG8DFEO5egDhKKnGnBe/aA/I7H+qWPPc+dA+pTAcNyPgUAbe8JUx0+rLrvBSwHWR71O0AMAuEIPzE7Gw8ERl2+fR2BJb2AgWVlz7FjrPjJs2Ov8wHRkzs7XRwDSm7NrZDVnRhSHIxpsbxbb/HBg3M7r+aLkPuG1r4Q9tRRLiIXgVKjESEiSQe85tNts+pPxTKDhhHtONvZxoC64B8nf08+x7jHfmZ4UfUi8m3mwSBrcU5CrXZVXL9/+f5T4ZYX1RERgwk9/uX7LMTuGZ7JbAwOMCcRponDG/qW/rzvpsDvcXzTYQ88mtIQRSddVdeWtu3LzDQPKfS2gRU1lUvb8zR3pRzJdIoHGtxQYUK4Kbc+27XEEfsezg2ESnt0UzB/gWx5yeMkVbL5q2NnSdzh3RWvIDfU1W8gFfFd3o6Wcf1f/tzbB+9JacT/Bhc6gwI2c4mtxg82pakKka1YN0b6r1QQsogNf48/EobpF5GxKzZgGPbDjpzOHPjeH8khbG0saTA91puCrNf7JZpVZSFGcyhltYWuTzWXBhepLYOUcDlHYeHwk8S/FQWLV8cUwqb/P/Tb+eFL9Puve4yu0KE93+HyVNP60mh46yH7sH6M9P8uHiNytvYMlqh+d8Tfmb3Wm05Uk76dXb6kOpH2Hlp6YI/LtnqAb/eLMUniiO/4Q6Z0B/kksh8jH+2VssoOvj/9yzCG3krGLhvCSN9z7ZWKXPfkmV8rOPzWSZM7XrZYBGveeOHfF/9z8+YfFMnN5fCjqmRNsslf8RfBKy8vAtosmY7MGOURuWK7nGfaqIgoDDFlZQSsZt9rDrcFdmVL/KNyon9q2OOjHUoYjjUVmUIDygPi6x3tjBbgLtSt3WgvTzGl78bJ+H0BVk16VMEi58aN9Rao+/1MXtaaWcUH+czHwqz172tBBLPWozPf8C6p3jShKma2xGWZ9+H7+uRnwnKLdlT6FWV7zsjfw6l+vgCPuHryD814foj5+20qSZ/IUt1V5RjcXNe0cVNVaK5vRiAva9NvZV5FeyLE/ly5qV0BP9kv2a1N/d/XtJxau9H0sx9Hpd+d4BgSqYIa54b8lDKT347fXA7OaWia1+gY08nASP/mLTGgNf+qEIj4eKRoZnnKv0bCHaupO1vZH9qQXlDYkBHi+0eJMQLLFSr0oCLVpt4dxMOCrVWzxcn5xj+jmqAdkGvYkUB2Yh0YmbDDcKvQYo8P+3XcLy1o+P84cRmcbMfMITTmWyOXLN0xVIJ/U/NzDfR2Zy3lfrCRXuzcsKHOwql2ooWA4kCzp7F2teGHhqJA07GGdNJdvdFWYcwyxxIon1kt8EB0qm43yrOYY2MTLbOoyt6b0n3Y6VTR923ZIUFJZb1WWL5Gs98QYzR/q93tq3gX5uguXr/CsbKMlUk8sWHLOb58i1R8UQmu9QlHxeXClt6VZf+UkCXGlZxB5iKGgZcsahWGcDlv7aPOZGtxQcu5SvKuS1oYQicbTQXCHG0uh5ci2iQK5rLikMQ98CarsrzcCMWrUzRJCdXe2SuUu8ndtzQCeXma6bPSJg97s5AsjYmpSASVz9jmfTg53RWzuSpRX/d/o7qE+UypSTmHDOK/fvt6uCNkcfVuHB7sJrHgGow88wslt6T6/03KMqbOSLqw8Cdk3INcse2PdXgxu6dWYMCXHHR8y9pG45DUZWzRtuqaBLwlKb35tZ+BSYal/GXzZIHT/2wxIpvCUprIJ16SH6aXlrZs56p8yOVY4gYy/vfhTVRp8590ZWRTeB1GPtUpKursfsXNJUwuKe62GPekPgCAywFRhyscpt/GXmazrrdSBgZb8YrHggFednxWPmIRuL679fTbiHpR2ptL1PNtiDb/v/pjvlMCF4ZJwTw9saobTBiBcgcbeW0szwcOjlf5SxA3tq9X/i5DSSTTwEcDkPKzhgzn1eZ94x4vHCc8Hko+NMZD7DjbyoWbT2wmG5BfkqYY3/VSLTt2HgOA+KUmkQDiajMighziexWDnl3FQtiZZWM4W2ujRhdGaKxVDGnUKhalPsA21z/KopVLnxUadYN/PzsQIE+Hdr006Eb1bWUQK1J0DVKvndq1SXYPxYtAanmsaDYW/N1MwfTdrlZDbGS0IdXQ3pY8xuIjkiM+WZkNwK5Vtx5LHfIbxCi3wefblhhBGzgCQHwKABiD0Ebg9WBkFFT8hUqWKkeufAWKFCtXyWIR29DeoUo1JwAAAA==) format('woff2');}
+@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATEAA0AAAAACMwAAARwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCCwc8GxMHIB6FcbPzoNLEd6YsOhz5z3+n/2ufQdM5mZJJhRT2pNIF4b8HkOj7E/fdz0SC8RAFNBrARGoFabCgJShICcqtyO9/AOmuf39q8N+zUC72KTaWRSwhK9Dag5ZxSVpa1O09b0Eq0itQr0w1rHWyHPNLzNv/37cZpKguAkAAPDv5cTUAfLJd4tV2UyppMSRgT3YOwLxtF31FFQMYqQFQilwMVB553QCiDG52/4dqzEk8ANJ8QufzCKLpXwUCeBD1BjixIZBFyZWvUp0OPfQy0OAuUO/GXXbJSUftst02G6yPqIJGgBhCAcDoEG0BI5KQMsqCGjqAJcUv4fT0fsaMAUBdDACoAMAN4Ae0AHQCAAARYMIAACPuaZFsGpGyJsuSsiKOdXbkQgo5kAUFk56sZNKaVOKSKmoNKyop1+9+fj0Wr0qYAvU+5aWiF9V5r0ib/FxRJD7vBUZVMMUFdYAun7eD86wUF7iAAkJpUFOYn577kmz3Cz6kCsl4bm3dq+IT4Lm6QQ2bwffJiacx/ZCmmNF1ZR/Ms7FubQyBplbrt70qvjAO02rE4WxCO20/JoejOe8VTVGibZrifIa7SZPTFLMYVzv5cRg/pSnPbvcEDY/nc1/SlFXrVp3ifB7UNkWZW0sK4zTlFZ935sAasKlrysuCRP+TtYzNDTlLdG09f57xpVv7meFm/U3TzYwZPZ3eVXlqkzM0iv1nRkY3rtYuu/BglsdJj1kXbi7swIxlK/puytzUb+nGmYi+5T891iMpMzvz53nyYPki+v6rF43uZ3Wyh+fhziWj65oyOiu1ZYZltd0VmRj5u29+0Nq7uyC/q7vlYY/7/TctHThg7dL+OG4o6dFWYq4IkQrLYmr88+OCKtk4p/rkMFNaVerAzIiAWm2Byc8uMqTTI/2FZRROve17aVq5Mbhp/Jz2jhlzOhvLI6T8otj6rPoWyi28J/5enBQcUhj9EOziOVq5p83H+MLO9uzEkKuRoZOz/DOTZpdfn12etOBtS0qszaT3MfyuyF0JYlZgzJnWuPaAkJgoY6i1t3dL8NT6yN6i5fTv9c7tCzLxJGjj0pb0kqLKa+afk2LMcX7PpXhboxn/f1zznMJexUmRtRPNP35RVTlsZqe5sKk1LeCkq/f149mp1W3ZAIAjhIj1qIWIb6OPyNJ7jxSYkQEBJCOflOmfA+ilQQCCt6faytqsU3/VceHza+WH8OoxuZaTAHQYACBg7/9jNOb/ALAPolfpqx+MANAGsBnN+b/OtKMju2CiN1P1HxLqNV/6ebzijxp1CKDKJwMABiAEyGQCAIBOTwQAGAs2CAAIvGgIAEi4BSAAIBNsgYAGSzBW4LKCVC6sxMmI02SyNajWQy8j9NdhKPztbh7IN8hAw2GMrOulB4NoJpEMksEM1FMrVrjEjo4WmY6G13SJpUN79TBEmyINyYaBPaUcG54YfiO3CtD0MNQwfebJGESN7cPjdC3KFIk5XDh7AYBRv/rt6z4OAgWLkShXoWJVagA=) format('woff2');}
+@font-face{font-family:nf4;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJMAA0AAAAABTgAAAH1AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCCwcsGz8EAC4OzPM3xRI6XlEfYJb6ScnFeHh+v9q578sO7jOIiGSSWIRthGjSCFGiNbHGNqGfqgCrdWRsrbH8N35Inwnf/7013mg4gW80lOnpl10dwBlHsJemvUDzaYkEGlrmrttrj9XCcuxDUnIKAR9efHkAXzvQ1/cjDYn7CtKN9Ba3cLv4alwkkiIDEACw9vCigxhncdbx/wjb01MQgAwZeguwUCbQW24oSrmQjLP4P/A9/99bAERJACIhAQCC8zL/nEPPtXQN8Z8ECtASJQZgOCDHaAkkKc/bROtoVbTJN7cqWraJlkXLjy3dWpFaanMlWuetMs7Vm1rV6iv136pvfXSzO9xl/tzrONwcVU8ufvd077Qp86Y09P8TG8DjMGbmk7rc3/GWxaeQZkl04QwXguDKaDQSbw4E/+70nmY2VFpl35dhDzVSLT1FRQJBeortaRWkmgAAFHFCDWIVKbGfsEeg0FYCCSEw12hAxWEBkjrtBcj0tVmAQit3BChlHslE3kLSlhgyM3WHQleXjpVKD613yBGXnLTPeb4KW7LYGaddbLfPO+KQqvFGGws5XeC0wybOE40ytWbjjQ3jeeOI2uePHKqOHz22Or16+vBETRNHTR11Cm6x2SHnXXAsUawaN7l1F6njRo+VRBq+gqSIBXs0dDYMAAAA) format('woff2');}
+@font-face{font-family:nf5;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAuYAA0AAAAAFLwAAAtDAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICp4smBcLQgABNgIkA4EABCAFggsHYht9EAAeh7Hj5YBktC9SwNIRzdnsRYBdIEhCkJBLgmuCNEE1AsG8daDid6Waax2pGl5xQd5EiP+40f73wZMgkmYSayaQwJugSS2gQE/05PgQlVsytIlchE7cq/1+1VRL0EiL+7/f+yaGefyVSrJOiOLSrNJIRJKlRAiNoUcO6TT+doqO0eBMAEBWeH3uve3t/Pcdt8g3RxSgzSAAoNZRlwGAMxr0PkSgI4AS8qBojeBDi/b0RgDwNb/d/49izhN4RsfgZYYMGriEhlIiH2otYg54/YP4CqWRoYBem9nm/0lmBGMqlqozXfv39t7w1C2XnTeo3/EgKFRICOhIRIVSo8+FOL1yvkAIwLLqpQJYYza+LSZgtLWzF/0/hf8EAMkgdXUD91HmKaehyFBmISjQ/1YgWBGoDdBHCOSJQhHgowEAQillQqBKBr+Nv1j8J5YQS06Uci0+X41skR1yRXxkjfC1lxAUg4pQIApHGDkjJ+SLpFdlGtmgABSP7LGQkLVHOT2LLXJACrhnECpEnsjn+QGSEBHY8Y1EgDsQqzcCdxEYV/1Y4oTx9e1JxE5gyxgwhqEricePDwEzTjiTN0964f1j2NUeXQp8bTLdNtUz+gnETiZL/54dUBVxkHs7PTpl3HCz2MTewpbjTD/hjkmljF7M9BBucHT0NGpAtmA3yQ4QSLmoig6CqBxEK+CvqsNoD4TrBz5zHGM4T7gYhC0DCBHuJhAeZm5gjNg+Qrjxm+NKMh+NYYsRuLP9O4Ca2tuLMRDurETCZ7YfP4NhknAGZDk3sBMJ2noI14cE7K7B82QWmzIykWG8NwXZuKEH3w2xvb3YIu4u+NtdF2Ge4osPDXfPBlwFZobguKpeKm03AMPFlvY57i6PtZkddRjt9WRy8vp9wknQVuAz3WcmgG0IFzrXiwRsn7SPcHevjhtIA8LAWBBi944EPtOEXwIIc7i4XCfcOMCYHoy9XHX2nqtRe/46Mg7A+xliJ00wa3O0RTw9rBGPpKoHkj2H38CWlN5ehFjpbcIZhqHhxpZu8W5W4iSl6jOwHfTBvcXv6EKPr4/uQiJkGUACgTx4NZq1xwlXCqaVcb2BLcYRxEZlna6nBy4I4isXDvuKKbeQHdeHyFzzTF4fRUZ8aPLy+eXkTWMn5g0YCMUc3gWaYQ91PILwgGIlh8Ut7EDkJV4T1T+pe/tuYNRnXkgF4gVPBV6awBaXoyOsx0WgOvk66SYI2LHJMTTBYAtig0aJoZyZ5xF3DV4mhAMRshw9ihB7MPAatujxWgmZw2cBj8f1hABgjEQiaSglTH/vMGJ2BH4EcliOWgJH8MsgD8ZIxuiqxn0TAD7agINRYylWw7ITdj4yeIw6kqLCJknHIxD5OyJJ2t//kIuLmZC5E6HRiceh5VZN2i2wA/cdGn1MoLt7u4X8LskDjzImEPuccA+Hd0h6mFcanvjSrUFSz8WzPuMBF8VDZw5fMz4a2evey15WLqhPetURXg3kN7DlYFjx7rEX0SeGelIEnoJwNEN4+HGrzu3cCZpnz3DARcKZCJjedGVYYuHsHGK9uRexBI3hx57cEbfyHZxHxWmiyDNYdKQ/4oGdfYGT9OyByNSzQUYkQxuSuK9PKuF3y1TutN75meJe2b3QrzbR0JAFFK3ydyKnoo3BOU8X7wicIdym1MlDAvThsSZTXq1/6w+ABrPc3bXTjfn1phxDTk2CvtBexs/QBLoleD71T5vln7rJgBZcTJ861bPUGBKgU4kv7/KzkULWYoyNqo71m/o6wl2nKVoL8AxF+crdngc/dyNxqVEduZlq/nwBP/zQEpESZE+yU1kMt+ng/+f4we0F0v+C/5O6QEQuG+Ylt78eH0TQ0lhWjuVsrJS+Nb1LRSu0H8l/NafXpslsZGm16eZ/PL5VLVNnOHc5altl8DZHF1HeqlKK9n5KIkSDU63LVoiO0zJJ6pzZHqII8tSbLqG8vIto+vKP1y3GJMfBF/3TAFzIvX9H6zlsEs+IzPaPyctPMlfOJAZ5lg1WO920tc4QWi1Jj/W+u1+T3mpsby8ojBLNq5R8l7zAJyE+16hVpYgy/cJKAqyFeiHWODLNnpk+r3zO4lK4ftv5g47qTDJBin3qhm8SwrfcqpbYSZa/HeVHR0ZG0n5Rby+Huc98tSUk4ZsNZED6h8rgh7J4WVxSlnbUS5mTWlOsK9OEufT77xA7m04diEwL0mqTlIv5mcqqkGLfjnQn36qAkvDdtGNQks9wlC4vKdCnxju+uXgqrwGkn2qmy6yfodmG6aitPnpZXmSmvnLtiloDVHxHslOX7E2wfywefTc3zV93tQwG5tnaW0fn/3+hgeqy+qap+to47aI1fuJ+Z3G/S0h5bFoNs/ZaV5fZ70/V6oV8kMml14g/4DgurF7TVVPFrDQXz9L24t75kk+uZ2eCtr9rJxdg/wgG5tnZk8BTez/oJpnrHZs8nVaJ9JVzKsqXrKquW7WqKjBDWRWHU1f97ENnX8Oi8JRiMJlxeGb7T6k1ZXYU0oWpyvXRdAHlu4yixdFz5LpOev4cbVymt+jTHbTzWmfxWjH8tNVp1GPKe6e1GbXGxIS3VCe/kCQMLfFWxazIqa1elaVWPN5v0mNj9JzS7vDX/8VSPmsM15Fw34l8JLKlRWfJD+byBZrArcHl82d2BDVoMrPrEwJtmuy3ySt3lYDXRG9JEt3I6Ixzza+LMCPTEmBWYzNnUEFeBXG+6PXKczn60pisGZ9jEtOp4G7wLx2eL5+1iSMrnPWxDUjx0VBxqaHfldJPQcDMahOJtwmB/ll0ndYDZPW0fZzXEFHtVD03Lk8tRfWbqf0R5Z1zDSXR/oK4OIaqEEXkGDmbak3htahuc9PI3B+P1a9aW1Wzcl1d1aoVbahXN1jXcH66vPyawbrqtb66/ELDXVxxACst6yrX751iiN6kHBNOGpb1iGNXNH0cr2g0mDqTdLtvS96Zn+HjrSnsKIHO061bafRtQa0bHkfu/H33OsZ8wYkUyKGZJeI+J8djEphzRe1qXvF3vVO8PCHZ1zW7VSTg++gEWO1Qi18t7+zxgH6aujw3Nzwk5b+twl/TbLVBPvLJb7fZeme//1m5GPk66PhYI2IY7tnWa/Hlx2mGomI1GE61LDamzDN1qmQLveWCzE5a9O4LN5PYv29wpzQ8Jl8NXkPkNfSOdK6TqamGWHn+v3muucBfSx2X1hvgk180NdPsV4JKt2Gw3kRDXkK20q/8bfJb/p7jkG3jHkdrqRBtJO3/1Y4t9fWK9jWZe7QIXmyi272i2+kbV5xIbsWfjY55QpmafqVO/ImOumb8i59f/EE1r1rooaGnU8lOtO+uNUxt+xwFX9TZJG2WdoqsVvv4zkubeQsAAE4iCJtPWfHh28iTQsE73UgeBaggXpAACMRC9M9jMJIigPrNf1IVHqgRJf5qTXiff4roS/5f66gnnw8FUwEIYIDJYO6yif9/Ut2nYjZFTQPlFZA/L4+GoJJDWZmAtPF1hewD3+bNmQRQ5zPwCQXKvkVeD0HlAlUJnqXB4QI9kRcf5l1ruwy8YCQPPGirRz1Wthmcva8cxPkMxKMqVjAQ4sdOQ/BirVCQYA3NJAqFFTj0S3kgZywVAIENSIhFB1xFxLcBCuxJrpQHiVxLBeBiLhKWW++AEk1azDVdnXbwJ4P7AmSYZabONmqnAkpPhUihwh3S1IBXNIvpW6KFiHeJkcIhYfC7TmDnbm9pUkSGhis0ipnNMZc2OiQ+5KthCwEYNWnXoU2RTCFCOAO+J0GNYGSAEgTs0wCgoGAq/oDI49mACBw48hQgQqw4adJlyJQlW45ceQoVKVailIGRSZlyZg==) format('woff2');}
+text.f4 {font-family:nf3;font-size:8.966376px}
+text.f5 {font-family:nf0;font-size:7.471995px}
+text.f6 {font-family:nf4;font-size:8.966376px}
+text.f7 {font-family:nf5;font-size:8.966376px}
+text.f8 {font-family:nf6;font-size:14.346196px}
+text.f9 {font-family:nf7;font-size:10.909088px}
+text.f10 {font-family:nf8;font-size:10.909088px}
]]>
</style>
<g id='page1'>
@@ -33,24 +33,24 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f8' x='20.991396' y='-36.786748'><tspan fill='#3333b3'>Presen</tspan><tspan fill='#3333b3' x='61.452587'>tation</tspan><tspan fill='#3333b3' x='102.814193'>example</tspan><tspan fill='#3333b3' x='157.83318'>with</tspan><tspan fill='#3333b3' x='189.829895'>em</tspan><tspan fill='#3333b3' x='207.389171'>b</tspan><tspan fill='#3333b3' x='215.583696'>edded</tspan><tspan fill='#3333b3' x='256.164999'>video</tspan></text>
-<text class='f10' x='73.348038' y='-19.725772'><tspan fill='#3333b3'>Use</tspan><tspan fill='#3333b3' x='94.317851'>a</tspan><tspan fill='#3333b3' x='103.408752'>W</tspan><tspan fill='#3333b3' x='113.712012'>eb</tspan><tspan fill='#3333b3' x='128.257457'>bro</tspan><tspan fill='#3333b3' x='143.742227'>wser</tspan><tspan fill='#3333b3' x='168.681506'>and</tspan><tspan fill='#3333b3' x='189.893486'>press</tspan></text>
-<g stroke-miterlimit='10' transform='translate(226.756681,-23.30713)scale(0.996264,-0.996264)'>
+<text class='f8' x='20.993373' y='-37.206864'><tspan fill='#3333b3'>Presen</tspan><tspan fill='#3333b3' x='61.44965'>tation</tspan><tspan fill='#3333b3' x='102.824078'>example</tspan><tspan fill='#3333b3' x='157.841737'>with</tspan><tspan fill='#3333b3' x='189.833752'>em</tspan><tspan fill='#3333b3' x='207.393502'>b</tspan><tspan fill='#3333b3' x='215.585173'>edded</tspan><tspan fill='#3333b3' x='256.156214'>video</tspan></text>
+<text class='f10' x='73.357843' y='-20.071126'><tspan fill='#3333b3'>Use</tspan><tspan fill='#3333b3' x='94.314199'>a</tspan><tspan fill='#3333b3' x='103.401467'>W</tspan><tspan fill='#3333b3' x='113.710561'>eb</tspan><tspan fill='#3333b3' x='128.252373'>bro</tspan><tspan fill='#3333b3' x='143.743283'>wser</tspan><tspan fill='#3333b3' x='168.670546'>and</tspan><tspan fill='#3333b3' x='189.88872'>press</tspan></text>
+<g stroke-miterlimit='10' transform='translate(226.744354,-23.656238)scale(0.996264,-0.996264)'>
<g fill='#3333b3' stroke='#3333b3'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.85988 5.95204 L -7.85988 5.95204 C -8.641 5.95204 -9.27423 5.31882 -9.27423 4.53769 L -9.27423 -4.53769 C -9.27423 -5.31882 -8.641 -5.95204 -7.85988 -5.95204 L 7.85988 -5.95204 C 8.641 -5.95204 9.27423 -5.31882 9.27423 -4.53769 L 9.27423 4.53769 C 9.27423 5.31882 8.641 5.95204 7.85988 5.95204 Z M -9.27423 -5.95204'/>
+<path d='M 7.86066 5.95828 L -7.86066 5.95828 C -8.64261 5.95828 -9.2765 5.32439 -9.2765 4.54243 L -9.2765 -4.54243 C -9.2765 -5.32439 -8.64261 -5.95828 -7.86066 -5.95828 L 7.86066 -5.95828 C 8.64261 -5.95828 9.2765 -5.32439 9.2765 -4.54243 L 9.2765 4.54243 C 9.2765 5.32439 8.64261 5.95828 7.86066 5.95828 Z M -9.2765 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.27423,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(226.756681,-23.30713)scale(-1,-1)'>
+<g transform='translate(-7.2765,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(226.744354,-23.656238)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='226.756681' y='-23.30713'>F11</text>
+<text class='f6' x='226.744354' y='-23.656238'>F11</text>
</g>
</g>
</g>
@@ -61,25 +61,25 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='139.582264' y='18.182487'>AlexG<tspan x='119.165328' y='59.570449'>18th</tspan><tspan x='144.013865'>Ma</tspan><tspan x='159.165727'>y</tspan><tspan x='168.559897'>2022</tspan></text>
-<rect x='-43.653545' y='87.08414' height='.3985' width='119.056331'/>
-<text class='f7' x='-43.653545' y='102.302052'>Na<tspan x='-32.391712'>vigate</tspan><tspan x='-4.998105'>with</tspan></text>
-<g stroke-miterlimit='10' transform='translate(31.040003,99.358439)scale(0.996264,-0.996264)'>
+<text class='f10' x='139.580744' y='18.135514'>AlexG<tspan x='115.346184' y='60.059399'>4th</tspan><tspan x='134.74254'>A</tspan><tspan x='142.618907'>ugust</tspan><tspan x='172.378897'>2022</tspan></text>
+<rect x='-43.653545' y='87.452373' height='.3985' width='119.056331'/>
+<text class='f7' x='-43.653545' y='102.674282'>Na<tspan x='-32.391778'>vigate</tspan><tspan x='-4.990527'>with</tspan></text>
+<g stroke-miterlimit='10' transform='translate(31.052339,99.727614)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 13.74142 4.89214 L -13.74142 4.89214 C -14.38345 4.89214 -14.90393 4.37166 -14.90393 3.72963 L -14.90393 -3.72963 C -14.90393 -4.37166 -14.38345 -4.89214 -13.74142 -4.89214 L 13.74142 -4.89214 C 14.38345 -4.89214 14.90393 -4.37166 14.90393 -3.72963 L 14.90393 3.72963 C 14.90393 4.37166 14.38345 4.89214 13.74142 4.89214 Z M -14.90393 -4.89214'/>
+<path d='M 13.73633 4.89722 L -13.73633 4.89722 C -14.37901 4.89722 -14.90002 4.3762 -14.90002 3.73352 L -14.90002 -3.73352 C -14.90002 -4.3762 -14.37901 -4.89722 -13.73633 -4.89722 L 13.73633 -4.89722 C 14.37901 -4.89722 14.90002 -4.3762 14.90002 -3.73352 L 14.90002 3.73352 C 14.90002 4.3762 14.37901 4.89722 13.73633 4.89722 Z M -14.90002 -4.89722'/>
</g>
</g>
-<g transform='translate(-12.90393,-2.17967)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(31.040003,99.358439)scale(-1,-1)'>
+<g transform='translate(-12.90002,-2.18193)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(31.052339,99.727614)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f5' x='31.040003' y='99.358439'>P<tspan x='35.891707'>ageUp</tspan></text>
+<text class='f5' x='31.052339' y='99.727614'>P<tspan x='35.901659'>ageUp</tspan></text>
</g>
</g>
</g>
@@ -90,23 +90,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f7' x='49.159296' y='102.302052'>&amp;</text>
-<g stroke-miterlimit='10' transform='translate(74.588879,99.358439)scale(0.996264,-0.996264)'>
+<text class='f7' x='49.17142' y='102.674282'>&amp;</text>
+<g stroke-miterlimit='10' transform='translate(74.596604,99.727614)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 13.88463 4.89214 L -13.88463 4.89214 C -14.52666 4.89214 -15.04713 4.37166 -15.04713 3.72963 L -15.04713 -3.72963 C -15.04713 -4.37166 -14.52666 -4.89214 -13.88463 -4.89214 L 13.88463 -4.89214 C 14.52666 -4.89214 15.04713 -4.37166 15.04713 -3.72963 L 15.04713 3.72963 C 15.04713 4.37166 14.52666 4.89214 13.88463 4.89214 Z M -15.04713 -4.89214'/>
+<path d='M 13.87883 4.89722 L -13.87883 4.89722 C -14.52151 4.89722 -15.04253 4.3762 -15.04253 3.73352 L -15.04253 -3.73352 C -15.04253 -4.3762 -14.52151 -4.89722 -13.87883 -4.89722 L 13.87883 -4.89722 C 14.52151 -4.89722 15.04253 -4.3762 15.04253 -3.73352 L 15.04253 3.73352 C 15.04253 4.3762 14.52151 4.89722 13.87883 4.89722 Z M -15.04253 -4.89722'/>
</g>
</g>
-<g transform='translate(-13.04713,-2.17967)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(74.588879,99.358439)scale(-1,-1)'>
+<g transform='translate(-13.04253,-2.18193)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(74.596604,99.727614)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f5' x='74.588879' y='99.358439'>P<tspan x='79.440584'>ageDn</tspan></text>
+<text class='f5' x='74.596604' y='99.727614'>P<tspan x='79.445923'>ageDn</tspan></text>
</g>
</g>
</g>
@@ -117,23 +117,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f7' x='89.779047' y='102.302052'>,<tspan x='95.410746'>toggle</tspan><tspan x='122.548311'>F</tspan><tspan x='127.795308'>ull-Screen</tspan><tspan x='170.31652'>with</tspan></text>
-<g stroke-miterlimit='10' transform='translate(199.738462,99.358439)scale(0.996264,-0.996264)'>
+<text class='f7' x='89.782181' y='102.674282'>,<tspan x='95.422037'>toggle</tspan><tspan x='122.57223'>F</tspan><tspan x='127.817558'>ull-Screen</tspan><tspan x='170.354052'>with</tspan></text>
+<g stroke-miterlimit='10' transform='translate(199.784203,99.727614)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.10045 4.89214 L -7.10045 4.89214 C -7.74248 4.89214 -8.26295 4.37166 -8.26295 3.72963 L -8.26295 -3.72963 C -8.26295 -4.37166 -7.74248 -4.89214 -7.10045 -4.89214 L 7.10045 -4.89214 C 7.74248 -4.89214 8.26295 -4.37166 8.26295 -3.72963 L 8.26295 3.72963 C 8.26295 4.37166 7.74248 4.89214 7.10045 4.89214 Z M -8.26295 -4.89214'/>
+<path d='M 7.09882 4.89722 L -7.09882 4.89722 C -7.7415 4.89722 -8.26251 4.3762 -8.26251 3.73352 L -8.26251 -3.73352 C -8.26251 -4.3762 -7.7415 -4.89722 -7.09882 -4.89722 L 7.09882 -4.89722 C 7.7415 -4.89722 8.26251 -4.3762 8.26251 -3.73352 L 8.26251 3.73352 C 8.26251 4.3762 7.7415 4.89722 7.09882 4.89722 Z M -8.26251 -4.89722'/>
</g>
</g>
-<g transform='translate(-6.26295,-2.17967)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(199.738462,99.358439)scale(-1,-1)'>
+<g transform='translate(-6.26251,-2.18193)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(199.784203,99.727614)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f5' x='199.738462' y='99.358439'>F11</text>
+<text class='f5' x='199.784203' y='99.727614'>F11</text>
</g>
</g>
</g>
@@ -144,12 +144,12 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f7' x='208.169796' y='102.302052'>.<tspan x='-43.653545' y='120.981971'>T</tspan><tspan x='-37.765957'>o</tspan><tspan x='-30.086438'>build</tspan><tspan x='-6.535404'>this</tspan><tspan x='11.434699'>presen</tspan><tspan x='36.856103'>tation</tspan><tspan x='63.990187'>from</tspan><tspan x='85.769155'>the</tspan><tspan x='101.643449'>source,</tspan><tspan x='132.436952'>run:</tspan></text>
-<text class='f4' x='-43.653545' y='133.186236'>dvilualatex<tspan x='12.834672'>beamer-example</tspan><tspan x='-43.653545' y='144.14514'>dvilualatex</tspan><tspan x='12.834672'>beamer-example</tspan><tspan x='-43.653545' y='155.104044'>dvisvgm</tspan><tspan x='-5.994738'>--bbox=papersize</tspan><tspan x='74.030241'>--font-format=woff2</tspan><tspan x='168.177279'>--zoom=-1</tspan><tspan x='215.25079'>--page=-</tspan><tspan x='257.616949'>--output=%f-%0p.svg</tspan><tspan x='351.763986'>\</tspan><tspan x='281.1528' y='166.062948'>beamer-example</tspan></text>
-<text class='f9' x='357.755493' y='-60.858816'><tspan fill='#bfbfbf'></tspan></text>
+<text class='f7' x='208.215097' y='102.674282'>.<tspan x='-43.653545' y='121.362198'>T</tspan><tspan x='-37.771604'>o</tspan><tspan x='-30.087414'>build</tspan><tspan x='-6.523772'>this</tspan><tspan x='11.453817'>presen</tspan><tspan x='36.864526'>tation</tspan><tspan x='64.014718'>from</tspan><tspan x='85.794051'>the</tspan><tspan x='101.673509'>source,</tspan><tspan x='132.473016'>run:</tspan></text>
+<text class='f4' x='-43.653545' y='133.558467'>dvilualatex<tspan x='12.834631'>beamer-example</tspan><tspan x='-43.653545' y='144.517371'>dvilualatex</tspan><tspan x='12.834631'>beamer-example</tspan><tspan x='-43.653545' y='155.476275'>dvisvgm</tspan><tspan x='-5.994759'>--bbox=papersize</tspan><tspan x='74.030154'>--font-format=woff2</tspan><tspan x='168.177109'>--zoom=-1</tspan><tspan x='215.250589'>--page=-</tspan><tspan x='257.616722'>--output=%f-%0p.svg</tspan><tspan x='351.763677'>\</tspan><tspan x='281.153849' y='166.435179'>beamer-example</tspan></text>
+<text class='f9' x='357.750568' y='-60.856353'><tspan fill='#bfbfbf'></tspan></text>
<a xlink:href='beamer-example-2.svg' xlink:title='beamer-example-2.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.149393' y='-70.15154' width='10.545452' height='10.403634'/>
-<text class='f9' x='369.649393' y='-60.858816'><tspan fill='#adade0'></tspan></text>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.14693' y='-70.149078' width='10.545452' height='10.403634'/>
+<text class='f9' x='369.64693' y='-60.856353'><tspan fill='#adade0'></tspan></text>
</a>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-2.svg b/macros/latex/contrib/media4svg/example/beamer-example-2.svg
index 6f57ce4f4a..dd5135d555 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-2.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-2.svg
@@ -9,16 +9,16 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKcAA0AAAAABbwAAAJHAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEUVQNdiB+HsbGtKZLiGI0ib7c/s9usvua4gkRT+KB//1w970vE5PTB3RNq4hZYw28inoy63iizhoqyeCBv+b7YQdyGL1OGmBbRIJu/T8AP7jAwgbOOd4oUmA810yMtrBZEc9kGvUC/QUuckP97iKUlq7HzDY+V0peQoDXdwePwOC1vkJZFsmasEdG3BYfY4f5d5wwLB8kUVYEQCUATFzeW8BX35r/MzvpVtpCACRI0EqA0ZSAVlonpFKBr+ErKs4LQMgJgBARAQBBeW9X/EL4TwQZKEaOXpgKkKKHBFFM01J78GVJVpZOD58oXnL4VP2g4n89hK3XistnHD5d3zm0rXZxYEvd8uD2hu6aAyfr+uW/K2y5WlIx9cCJujanWh/eWr+SPNvqOlZ07I31ZOaTzO9sIB94PzSq9lptB2l5im9qXx+IXq1bPxAMYO9VlGJ9b+Tgmof4wxqOK4gYgTCncew6uBGMaN0sSH0q3MizfgpOIscBEzDj+H4e/kQo/HJAIPs0YdmCitavwpLk7VQ+qsf/l8mapBsKRRBIupNn4gpQYQtAT7Ntg4i+AgGZDhJEBAHjZQAKLSdAVKCSAIkOIwJkSuwRQC5xQSKkRaJySCYxlslk6n0ey+VOmGxp7elg6obPxobQ6+zkUX31Zm3JUpCRY2mwnKxsM68mrYzoglxYwDtJYPK2XlqFTM5qWKcV1Plaupw+SudguqWbu62zUzdC9zYXGi2vaDOMjvoYiEtzPkMQQwxJ8aK1t/P7aLIMStyjAAA=) format('woff2');}
-@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAqkAA0AAAAAFHgAAApPAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgxIIBBEICp1gl1oLRgABNgIkA0wEIAWCLwdmG0QQAB6FjWNJS1LG9SUJLP08v80/lxLfo8rgERY4iTIbF7CB0dvQRSRva9hae9WFxe+Sn0UAXO5+jebmwMs0C/zDTZJBgJGs/L8GGFprEcUb146kHqJojGPLMnO7ZzKH6WBbUU3imURpYtLgTbqlD0lDTB9S+2U4LdRsAaLIZRYBAEhA76UPOq7ID47NNh+PQjbaAnRAOVOuA4C/q0JvMKHDASjOAh6KIz/VeShqAoAkS8O//heqCS/B53QqFarRqX4bDGjS0czwyPDc1Zn0bLLUG6PZRDMssNjSP+nUhPWrTesx3hRz/n7W75WzTjnphGMOO+hAyEMlSoEkDIU5KVMCfzg1prcxMmY4ts8b1/8XzmpxAICL1xOAcCgGkExkEZEAELWUEwoAJZVOrwoXQjn6K4EAtV9hsxvQZ1B97ZTpVD3lRMrBaH5wfCUNI50ccn+xmCZGTMRCcqRDGUiDqMiImJNHhniuczxiozikQGwaTxhKpm3hIj2SuM4OZEDhCEPqiRown0WLilEqsqE0hNPZtAqcjnnIHsx3A7w3cb90T+kB8B7F/UH0JYmxfF6cneMhb+3m2yjhgm1tGEYnMZ+sz30BvLjfQcF8LS0L8GBgyB3h6wDsGRwSROQA5usTqTmOSMnuYFj0g9ftZnCz/d0joJlWdp0SD4bjQ3PmlcIHotXb2oqnHdKH+QYS2xF5zHcEvP0WElssVDJQ42sRVdEvw3GwBpNQFBEVWC3Fo8ZRilCC5esAivgKv/T+ysyDCXNy/lVvxO4Yk3dJjB/GaU2nMoD0SiZ1cZvFExND/cf1dLILIxkw0iJN/m40nUwwxOeYFEtMFNkubbf19ammDsRlDrejCm/LkdgrmO8VIoOV4DnlcfMzmG8AkfvvB3E/7FUEMWofa3Xw9m5E6cCoqsFkgVcUeBIub+tBvCBwKYIJ18JAuVVqtr/9gXgiT5xGFaz9pNby8VVvy7wmTuiOgFcrFlBdBpH30p9hmE/ik7R1IQkpvYojhP5wSudB67K6vW8wXw8ie0UAqps+1e6Mw4dn/rD/5sgw+11OZLBCCVr8CI2NLD8JkEyyNhS1L5u90xZqvEf9lmV4qtLpyKSHMER27btlzj0HbZltFcegSCopvgPtxHRI7bx9LQjZdkYKG+Ve+yk54Csye2VFKdQE/f3QEgdLyUFjgaJUsLqSRuaxB9vR/8YBzHepqwuh1g1DKC+SVlI7Q7WEOu+JKxdYByAY5YeWNEobGi9NaqPOqhrxUsZZdZXWtR+W1lITJNmbsK6KfceWZllLnwhjdbW3j6iMzdWtD6g1dFEEFfjOfnFnw7ZIawPYRmtFpa6S+rC4KyRISXU4Xu4Ok4pwVZZX1pXGkNilR8e6ECLLXscgUnoa9x82WO9zt0BTR0fsBYwBDl37VeDtPBn3FBe903gSG1AjsutU/LOMbfTw4dFOAK/9wImOoGjpOPDAygr9Jv7KdoTI7u6Ey+KfTtXF7PpC+ajqkb5alhSmlosios2R2LbB/ZdFLAsrZmxtKfRyig3ZBrjNJ1C4jyqIiLLJ5n8AXJVzQndZtUwtIWrX1BQw8uSEyjbkUC3rbohDaP7WEBDURLLl//JkByJDs1sXz50yenyVd1JDxbSm/IhHPP4RkfidfblabX5dcU7lrMb3rn7HUWhdsh9k8OFJa5Y7fn3iiMT0CaNc1U05Null9RGRYF3IacnXq21bsXMr5zdzTXisvsg5zGgaWZanKY/kXBcK1se3S/OXOhsaF0y3Q+gR2XVGjI74P2Ip7N/0afMGiex/2WdKtpm+F9Dlzp4yInL8SeKD9+vqIXjTMXV+eX7drR/w74It+0GGsaNDXMGtre70Qrcto8aZW/XfC6H4MJ/3MDJnRrWrgZzrgs9rii01lmLduHvXA1SXUKOGT6xSyjo2d4jzu3iXy7KPIi5qCAgYsKll594Rc62cSDnotiRDs37JwFgTmoSSt7LG1nu22iXtQu4FJsP10RtJZoHZsg7tG1acXOMoq2qdXi5Ag9wj47gGidRo03URcYtNkyhuCEyJjuEEh18vya2rK5S8CSuMMWSGw5BBh9jemlU/xFIsK42tXbai3miXJ/4QDv8Ta43uX9lHEXatInbwrqR818LlDXWzvc7SSokBF6Gu17nPWFhjSx5Wn1/krk0x5BUMKYHXmr637hEZDfabidieR43s2qYF9dVLV1xZvWK03h41wYwXb8QOOUqthqI0ehH8s1JsjMv45KatqLEhL/mPzATtNHuSI3ftqHtrXTlKQl1XWyyeKb5ZNJJBZzdUWYsa6wuSujZSTMtx7irR+WmJvgTNYk1IM3mcutm6bbmzOml91M9pekEJR0zA//KNNumrLStGFF7LkPXrpKBnt4ZAb3C2cESRPv6J4dOEzq3t1HD5PbJMtDNYNmmJ+EzbQiS4WoiNvye+ePTehZ6Wz1YUkf8uvuJrMkjtEi5PXXH/VUl+4mUNzFBkF3hsBg/7/bsspZZA9bBJVP9yCW1Vyvrnc4ylKqFQ/zX74/84mPwMHZSPVi5r6S/cMf82Tc+iawtWHAFV9Q0Llge17xcyihxjZ7ioogJn1bTjCuDLYN0sr9PuZEcv/oUjNLuwyytBvmvR8oaiyn0ZtowanT3JXmBIGVafD3eWsqLZPO4/Ojya8gcvinih5oQOtFTNgVFs+b9KyNmjKvueVb8UOHIX1Rdlt6cQ+579Sv8sBjda+1DJ4yA6w4JHkZgbustK4vDzZpnKXNHu6Cl5j0p0XJn7g7shMcs1b5GY/XHOiFnu82XA31s4gwH2bHZgMDoUYJtMWjRM6gqERcgPxmm26JBFa0JjsvtxuINImOGI1PpFXLn4Q8nIaqSKW1l2huCnZ+quw4RokAvfyxVazfI9M7dr2oFnrobg0/LtTUOb+D9ScEIzt6hBqGb74j2aGKFJKypfVLVIgJ6MgB4Lof7h+vhc3t7c3TP4q/ISEhYx5TxOKMA+I2yij6iRqH4KayxJPo9CvYYmOiRJXL9kag07EOJAj7FLtpouOizWPqKWFfiPQ6jg2YRc/t7cXRufWsLOsaI/u9axRWLcfwHWOUHEJ9LGYiM87HcWgWF3LowGg+azDPp70TAqBaD8qf50QOBmoH/2AMQRgD907GJooJGb+SsTp375rC/L//+ICsMol/TARCFcIA1gqtSEbIrQDP2MKoYWskEFwwg+3QVI9QQmskoiZxXvA0inZWYXK4Ucywjp/38cTXN+Ec0yPFEphjQNMWpuDGyHP2qEXPrnIeXjoKmcgROPp4ozJp4Ot7uZIdxtCg+Kw305C/h4qjLieDqJtRsxCByHKaaa87iBiRFMOc6ZYwqnLjbdNHM2nmW8ZkpmesaOpvu1zTx07ASnM0mlNqgzM3Iz+FaSz/azxjcrzXqjMl3Z7NFpgnFhStXZdC9feQAqDjHLbBO1I2lYowpvIqxm0htBswkkyk9ph53kp3scoTxN1eATEQ/vgZSMUrYcuQoVK1GqzFDDODiNNIpLpSrVatRqMBoA) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmri10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAP8AA0AAAAAB4QAAAOlAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCLwcuGy4GII7Ctm0TQyxniCdTDEHj4fv9/rf2Pvfdr5I+LlFUsnnoZiGJhUoTC4VGtUhiSDSG83/f6d9pPVtjU2GDWkq++k5SQY/8kzH9vfu4aEyBR//8n2+wTzp2e+tW6QIJtHDTGmCRFmOoXcCUucuUl2JxhvMSxU4I+Lrn3gAAP5bKWGkxynuoAwTJB3wHATxynfgJTCtHlgrVhx0PnfdIB3BOVVGt5mJzCAi6JUtOTjXC+24SmCJgJdCtW+KcAlW1AlNFY7W/tkFG0RJwikQS4wOqYBofocN9r1lZA0StkKAF/ejFH4CYAKDBcnygkbJp5oV0JEVgEJ2B5kSfYO+ZG32YK3foyg7mHhlDnCiC5zd/cHi4H3EuYe4VYF8leNcvo8jrK/t2Ts1g/PL6wYPzBO8w1N3A3B65K5iLOGbXEecc5oaPlfCRvRgDE0pybILXrzi9TfCArRTdA+xegqca1T/emlO9HqTUMuEjAh8+7uD6+jAqu7GGuQvAll8E9hW1K5i7hjiaUdNoxV218AFgS3VpbCiH4xE+0t+3sjIAtO5s8JV/mM1+ntvgWYIXtX0d0Z6IDD0jz0SfoS5nCQwLCTwUjVw5J61hPaxsIuWiH1MRjZ/XYcG5J6no8aE6b99Md9ssc368+L9y5myDe7Gk/Ed9N6dJGWH1URUwf9WOJXu2LdGpt1ZQl5e3n3SwuWccaxcVuM8gwibQ7RbNZKfkI8MJS/bu2PjqtYKKgWKer7GBIP4pofJYf1zlgMqVKce8QMpVaZczv+WRVjazPxW0WrVVzh1wbOCHN1Xq5vLSb6TFzq2w1Gg1j/XiHbTf6agfNZz/JTz86dRvWj9u0pRm+mspfZ3Sxnar+jbkdJdpKveWAhv48VDPscVkg72CuqKiK7PZwkGDqkw6NGUcQRWlmu41AMBrBCvWbQkL+M3aFBL8hnB+PtOj/Kigaa8Ixb+IoXdGCF49UmtPkrT/K0KUX1vJL6HVr8U3hwB0SxDkk/9fxRYWqD+LLwQAaOMKGiD2g/gCpYUlLAcgDELrJAGQCIFNKAC6nYdAag0KUMyTIqCjz8vlrR6fgV80PVI/EBR7yIOOSc1bt0YtQ74CpXIwMcDVa6U5zKpwhyKFyl9fKksGEguFgWSLlCGN6WjXxDNZRxYFz8KoscCzVWh+aVYGyaIYpC2ZkWZKZMEe09rUwvR8MwvghAylyuSQ10lMwiTcMscxKQYQp2HCCQCSptpPor1dgsUCAAAA) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARgAA0AAAAACFgAAAQMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCJgc2G70GIB4FbuwMO1HJ+WaCragoeJ5nU//cB6T00TrJNB2ZeHyimmYmQuewfTFV4j9utP9VgcQBBhY0E6cBZoGnMQd+RxCU/x0F839NvzUOPJJkLT6gH0fLBrp5g0y4CKLKZhXaONqboG3Q3SBc5YkAAbx823tnALx31Yacay71Wp2ABXWru4EQRMlfthQontUAAlmABSYcQxcChbcM7/+epucBUSAIJgObmleGFjIIm800AlSwKREFiyyz0pq3/gdALKT51P/XusC5znZmNgLLSA9CFwmgaEPIGf4fswMiKIENqFdqc4lsA+RDAGgALmgMGUBWAMAEKQqAYlK94qVbs7XEJCp14kgtmLVc+otjlZsFx9JbZErQlluvZK9bnB3zHblE46sLL72yyaxTTw1PbzTn7LPvdioluEqsKYRXwkM6eIW9r4b11O97Gz+gg8vuuu418Qdf/bwTPtvkTPjY14F7wys6uO2510TKw9PFf21YLid8/f58QV/8+t23d0989dwmjgSXiTF1dXVdorncCbvO9q/SwRV7ryw5rpYuNIthOtosmBCTplLY2/mVoHCdn344HHgtlTAqcE/RWvzXWTAZMBUeFf4KaE4g7p/sLL7uNomz7LM+8x4rPpZ66lh8hoz14963Nfasu755pGRcfHR83bK56+KtL5q74MslvRe7U2e9N2Le61+3xhjzDW3mBTp3jO++P764p2HO7G0Nl+WGDD1aenRj9NX7h5ftP+3zRhO6z64pPblV+/pHbnCf47SVrmP3bDw2284932oxtW9ttHphxaTi2sLUjftnz9uzb2qHwYm+Xt9937VVXdzvVLRpUjukGOHHM2Pr1h7ScFm/TZV3NB+/cezQ6u4zYk/VRu9pf7cbu6aWP84f9VZuyFDWq/r4CTfy1Ktzdx0qTtt1+L7de+tz/fmzR9vzzms76KQ2A+577JvpwdJvF2KMXd3arSUV2aqqTeuGzhjWredHyY7uqZVVp0bbD+7eIzujxeBR+Q3j4uNGeDu7zIwGhY04N9HGq6nsCoAbhfR8U4nJt7kbI9Y7JY6hQAthEBZo90bkH02TXxYgWDeF78yp7POr7RifH8qa1Xxf5+k8AGwKg0AVaHiP6XkPoB4iLKZrBQmAbKB+auLRqm6mrqpIyNv5Sl08mhKgDWACUEAIGCAFAGyLCQDFUkYAGFqbSQBYHGciACJst2OQthRFo8g3jFDDt8T4i0ZUuZSVVlkvK4eV5/psDoZZY7WN2e+vt8QinpyUDE8vnkUWSA4lG7hZPcS7SsrJ+HP4ghYkhdcvWeTlUhmvl7doQXIVWKKyPZJdk1daPigYar0Nlq2M5sKrmbjfTZ1NZVjVzGxZgBLM+l/V/D0NN8IY403yAA==) format('woff2');}
-text.f2 {font-family:ec-lmtt10;font-size:10.909088px}
-text.f3 {font-family:ec-lmri10;font-size:10.909088px}
-text.f8 {font-family:ec-lmr12;font-size:14.346196px}
-text.f9 {font-family:nf0;font-size:10.909088px}
-text.f10 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');}
+@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf2;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAP4AA0AAAAAB2AAAAOjAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCCwcuGwoGII7DdGsnY4jFcr7EEDQevt/vf2vvc9/9Ksl1+ndcsllJJHy6aIg0SqBRLZIYQvny03fam9azNTYVNqil5M5JYZz9J2P+L3e4aEyBD3zPN9iR3m6NAZJxIIH10sI1wSKOMdRewJTv7vOUfAiLGeZLlLu9EPBjz71+AP5Id2ik9SifonYQJJ/zHQTw0tTjDzClHJktSBv2vHjPIx3AXVVF9b+52BwEgm6RkiNDjfDZuwSGCFgDmjVL3FWg6vCQMUgw+r/vfysg06iJuEAiQf+AKpjKR2gw32s8awDE4SEkqEE7WvEfIAYAQIUVfKCSsqqmkTRKQoGIaHRU1wnB1tucXsyVO3RlF+YeGUWcKILnN3dwaKgPcS5h7hVgXyV41y+jSPbyvl2npjH+dP3gwTmCdxjqnmBut9wVzEUcs+uIcw5zw0dL+MhBjP5xJTk2wetTnNpJ8ICtFN0N7B6CpxrVN9aaVL3uxNTi4cOAD592cG1tCJVxVjF3HtjyC8C+onYFc1cRRzNqCq14oBbeD2wUFkcHs38swEdG+5aX+0GtMxt85R9ms5/nNnCW4EXtvI5ogyKDz8gz0Weoy1kCQ0ICL0QjGbPSGtZDyiZSLvoxFdH4eR0WnEqmoscG67x9M91ts8z58cI/5cyZBvdiSfnD+m5OEzLC6jIqYP65DUu2HDXWqbdWUJeXt59wsLlnHGsXFbjPIMIm0O0WzWRXyUeGE5ZsPe706rWCioFinq+xgSD+I6EyoD+mckDlyqRjXiDlqrTFmV/yTCubmZ8KWi3aKucOODbww7cqdXN56TfSYueWWWq0msd68Q7a73TUjxrO/RIe/nLq66wfN2lKM/21lL5OamM7695tcrpLNJV7i4EN/Lir5aoR2WCvoK6o6MrcbOGgQVUmHZo0jqCKUk33GgDgK4LV9R3CAv6xtgsJ/uRwfj7DovyooCHPC8VewNA7IwSPz+4pSZK0/ypClL9byS+hHX4tvnyDAJolCPLt/69iCwvg8E/xBQQAqOMx0ABxDiC+Q2lhQVj2QxiE2g0CIBEC2ygAmt2DQGrSDYFiRCRAQ5vXm2vFF+AXVYvUCQuKdUqgYVDFdrXaGwiVIUuFfClKwS/fZgGOK1KovLp9qSwZSCwUBpItUqFMLAzMmbIueBZGkQXeqkLLS7MySBbFIG3JwkyWb5qbWpueZlYBXJehVJkcPSUSc+4I3Ck7TIoBOgIweg6ARNH6A9DhScFiAQA=) format('woff2');}
+@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARYAA0AAAAACEAAAAQDAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCCwc6G6YGII7UVvGHNkkFEY9z/exLW0oCXjgtF8ytqJyop1/MJf87Coau+RyFD/43OpK1+IA+KGmRFO0NMpIRRAXOKoCGwwnaFvWSWtMFrgUIwMu3vXcGwPvBJ0aEwSKvyQnYQR1VdwNeyJP3yRQFhrNrgEEqgKU7ZmunAc/fopn/FzKoHiAMkCl0jaoLO1mYVkVsZ6MBCMCJwoGHGZaygtV/y/8A0GmMb/1/rQuc62xn5kRIkDhAcEQUoLCHYKTx/9jsgAN8wAlY58vpItVWQP6HAkAHwAXMBQkFqQYAbEAaCgCFjStKNrfZYiRcwiRCDAmFbf2lXAy7v81j2PXN0mPFceuV7HH1j4bvNeQSnb6d99Ir542ceqr39DljZ599txEo1lVi78F7JTykW6+w51VvH32ePXMf0K3L7rruNdlbffXzhvfZeWfCx3t1y3XDK7p123Ovifh7T5e9r81WzfC+fn+2R7/49btvn7z01XPnGWJdJtqiO6s9l+hcbnhzR/depVtX7LnSOq+WSTA7YXPGTi1QYgPFsyflFctz3d70h72V1xKIeZbrFF2Xva+LUKrFoqS5sl8BHUOhNH25sfJjx0ae5TzrM/Ox/sfSnjrWPSSte93mtyHOkbu+ecSnzd3sXrt0fK075qLxqS8XF8+6ekfea5h4/esYNHf2vtgJS6/d47vvt/fv3jc2unXfZVk1tcf4HrMh7NX76/0OnPb5nI780RDfk6MT+h65wfUcp61wGc7Cua2Z8a7z7Yt6S0PDgqcDuvrXeHo3HBid2L2/N7E6stQs3f9dnJngfiMgdl5oTb+DH89ojVhzWMdOe2ODzGOy3Te21gbnD4U/tYQB9yTc7Qq/JpQ/zj7GXLFBqt9Unds7buSpV8d3Hu4f2Hnkvl17+uhse0ebnRPnxVWdFFtx32PfDFpLvp1Gm/dwa7b4BGQGBW1cWztUl1f4UWqS69TAoFPDEqrzCzKHFlU3Za9vc7c1mDtylizOlNVwbmSsGdI5EQA3CuklN/nY+DbrRof9nRajKX4E1VA7P+5zyD8Wk18WQGBxfu2xY4ElvzoN7fNd2aQh/3+tnlYPAE4UAALqAfcZBtV7AOpphLSfLsuJBJBWUO8Rokyi5WYiJIhIPd9XRCiT+QigU4ENYBWoZKggjRTDySxmFD4ENWHQiMADYcfg2CVwoHEhGmLzRREAADRKmAvshLNxOQcOzqSLGRazkRVMsA5+QVcKdaxmFRuq1dexmBlMskgjA+QiBKuYJS+VQyoFBZtFRiAL3p1Fqq9bPGNmpWWYReaq2TwZzkktSD27UtlHZ9axnqXrCZpkLlvnGjeWmZbBOmTmrgAUKaUDMmHvQuppoIV2ukRps2NLAQA=) format('woff2');}
+text.f2 {font-family:nf1;font-size:10.909088px}
+text.f3 {font-family:nf2;font-size:10.909088px}
+text.f8 {font-family:nf6;font-size:14.346196px}
+text.f9 {font-family:nf7;font-size:10.909088px}
+text.f10 {font-family:nf8;font-size:10.909088px}
]]>
</style>
<g id='page2'>
@@ -29,15 +29,15 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f8' x='-63.495975' y='-50.743793'><tspan fill='#3333b3'>Video</tspan><tspan fill='#3333b3' x='-23.310372'>file</tspan></text>
-<text class='f10' x='-43.653545' y='-25.961954'>Em<tspan x='-27.441878'>b</tspan><tspan x='-21.078306'>edded</tspan><tspan x='10.436767'>lo</tspan><tspan x='19.224624'>cal</tspan><tspan x='36.194354'>video</tspan><tspan x='64.982436'>file</tspan><tspan x='82.558161'>from</tspan><tspan x='108.345603'>pac</tspan><tspan x='124.406187'>kage</tspan></text>
-<text class='f3' x='149.557993' y='-25.961954'>mwe</text>
-<text class='f2' x='-43.653545' y='-3.446381'>\includemedia[width=24em,height=13.5em]{}{example-movie.mp4}</text>
-<g transform='translate(23.862603,156.213196) scale(-1,-1) translate(23.862603,156.213196) scale(-1)'>
+<text class='f8' x='-63.495975' y='-50.750162'><tspan fill='#3333b3'>Video</tspan><tspan fill='#3333b3' x='-23.312282'>file</tspan></text>
+<text class='f10' x='-43.653545' y='-25.999168'>Em<tspan x='-27.442635'>b</tspan><tspan x='-21.071733'>edded</tspan><tspan x='10.44462'>lo</tspan><tspan x='19.23734'>cal</tspan><tspan x='36.20097'>video</tspan><tspan x='64.990051'>file</tspan><tspan x='82.564589'>from</tspan><tspan x='108.353671'>pac</tspan><tspan x='124.411853'>kage</tspan></text>
+<text class='f3' x='149.557299' y='-25.999168'>mwe</text>
+<text class='f2' x='-43.653545' y='-3.483595'>\includemedia[width=24em,height=13.5em]{}{example-movie.mp4}</text>
+<g transform='translate(23.862603,156.249909) scale(-1,-1) translate(23.862603,156.249909) scale(-1)'>
</g>
<svg height='0' id='msvg_kbdCtrl_0' onfocus='' onkeydown='event.preventDefault();if(!(event.key==="PageDown"||event.key==="PageUp")){event.stopPropagation();}switch(event.key){case" ":if($("0").paused){$("0").play();}else{$("0").pause();}break;case"ArrowUp":if(event.ctrlKey){$("0").muted=false;}else{try{$("0").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("0").muted=true;}else{try{$("0").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("0").currentTime-=$("0").duration/10;}else{$("0").currentTime-=$("0").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("0").currentTime+=$("0").duration/10;}else{$("0").currentTime+=$("0").duration/100;}break;case"Home":$("0").currentTime=0;break;case"End":$("0").currentTime=$("0").duration;break;case"F11":if($("0").requestFullscreen){$("0").requestFullscreen();}break;case"Tab":event.target.blur();break;}' width='0'/>
-<foreignObject height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("0").paused){$("0").play();}else{$("0").pause();}return;' style='cursor: pointer;' transform='translate(23.862603,8.940526)' width='261.81812'>
+<foreignObject height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("0").paused){$("0").play();}else{$("0").pause();}return;' style='cursor: pointer;' transform='translate(23.862603,8.977239)' width='261.81812'>
<video height='100%' id='msvg_0' onclick='event.stopPropagation();' oncontextmenu='event.stopPropagation();' onkeydown='event.preventDefault();if(!(event.key==="PageDown"||event.key==="PageUp")){event.stopPropagation();}switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;case"F11":if(event.target.requestFullscreen){event.target.requestFullscreen();}break;case"Tab":event.target.blur();break;}' onmousedown='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.play();' onplaying='$("kbdCtrl_0").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
<source src='data:audio/mpeg;base64,
AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQACn0NtZGF0AAACrgYF//+q3EXpvebZSLeWLNgg2SPu
@@ -2747,12 +2747,12 @@ AG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYXZmNTcuNzEu
</video>
</foreignObject>
<a xlink:href='beamer-example-1.svg' xlink:title='beamer-example-1.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.255493' y='-70.15154' width='10.545452' height='10.403634'/>
-<text class='f9' x='357.755493' y='-60.858816'><tspan fill='#adade0'></tspan></text>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.250568' y='-70.149078' width='10.545452' height='10.403634'/>
+<text class='f9' x='357.750568' y='-60.856353'><tspan fill='#adade0'></tspan></text>
</a>
<a xlink:href='beamer-example-3.svg' xlink:title='beamer-example-3.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.149393' y='-70.15154' width='10.545452' height='10.403634'/>
-<text class='f9' x='369.649393' y='-60.858816'><tspan fill='#adade0'></tspan></text>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.14693' y='-70.149078' width='10.545452' height='10.403634'/>
+<text class='f9' x='369.64693' y='-60.856353'><tspan fill='#adade0'></tspan></text>
</a>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-3.svg b/macros/latex/contrib/media4svg/example/beamer-example-3.svg
index 3798755a18..06496d9d97 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-3.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-3.svg
@@ -9,14 +9,14 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKcAA0AAAAABbwAAAJHAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEUVQNdiB+HsbGtKZLiGI0ib7c/s9usvua4gkRT+KB//1w970vE5PTB3RNq4hZYw28inoy63iizhoqyeCBv+b7YQdyGL1OGmBbRIJu/T8AP7jAwgbOOd4oUmA810yMtrBZEc9kGvUC/QUuckP97iKUlq7HzDY+V0peQoDXdwePwOC1vkJZFsmasEdG3BYfY4f5d5wwLB8kUVYEQCUATFzeW8BX35r/MzvpVtpCACRI0EqA0ZSAVlonpFKBr+ErKs4LQMgJgBARAQBBeW9X/EL4TwQZKEaOXpgKkKKHBFFM01J78GVJVpZOD58oXnL4VP2g4n89hK3XistnHD5d3zm0rXZxYEvd8uD2hu6aAyfr+uW/K2y5WlIx9cCJujanWh/eWr+SPNvqOlZ07I31ZOaTzO9sIB94PzSq9lptB2l5im9qXx+IXq1bPxAMYO9VlGJ9b+Tgmof4wxqOK4gYgTCncew6uBGMaN0sSH0q3MizfgpOIscBEzDj+H4e/kQo/HJAIPs0YdmCitavwpLk7VQ+qsf/l8mapBsKRRBIupNn4gpQYQtAT7Ntg4i+AgGZDhJEBAHjZQAKLSdAVKCSAIkOIwJkSuwRQC5xQSKkRaJySCYxlslk6n0ey+VOmGxp7elg6obPxobQ6+zkUX31Zm3JUpCRY2mwnKxsM68mrYzoglxYwDtJYPK2XlqFTM5qWKcV1Plaupw+SudguqWbu62zUzdC9zYXGi2vaDOMjvoYiEtzPkMQQwxJ8aK1t/P7aLIMStyjAAA=) format('woff2');}
-@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUgAA0AAAAACXgAAATMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCJgc4G6kHUZQvTgHiZ0KmMthjsVwilKjV7JxjxCuUf5+Ph3/2w933vkxM85bWNKmGOPx0QhSrlGhSEoeERxKRNjn6TfvZxJdIJU2VlJpHKqo0FXe4czh3+XsuCRD7X8LjE9fk/6e3f4EokbdvggfqRWEFb0C7iQ6oiCoo0gqoefi0AqQNwDbobhCu8kII+HrmyzoAfh8YMLrRKJvjOTH5ID8Dj0A+/jC0ImS0EPjhoQfnKY0AjgwX1HWE8jzDplu48OHRSuBuMBgqcpDqZIGHHWnSpkuPQcPXI06j+/e2N7/h9a9+FSSwoiZoiURSO4gW/hrKCjUaNEKTZuHwUzkGxPUEoAX0A6Mg7oN4C0CJOYKirYPJ+2ZZLodFaMMmdM9FBLIGQNZXUyIn5IEIsVJEE2Lcw2JulWbTJcydcKU3bDiivZL69i1i32AFEPx+EDH7MIa9BO+BMHcACQk+Zv9mYLb7rL5P8Fe3onIGYyG7dq3tWoI//fr8cVAj7gASFwO/HwDmXgHzmi+FUpqxu4a5PReOvEFs0sGnBP/Yfj1AFnOaY68wd+bJG4SU/Nq1rWG6L3171UTjnW8vnu1e/nqzPYG4PUg4dUrA7NpVPqSaPcCRfcz+xEFk2UWnT0TsDocrmHvl9AZz9y6t02A0KOmBOO97qyoFqA02bMQiW0M04/+Ko4+wQTf5hMPQgDAw1zCHhATCCL96lQyEgDl+/nTvCVrQLkzD7v2rgbEzl29ALFF3LPxu+7LVqwnesWLt2oNnCZcNsg3fUHfMdwIf0WpC6imLjHJwXlErz4yrEH8pqc6ybDCHZ6xu7/AjNaZenbWu16Qh63p669h2YTCBHt8YkXjz5893Pd2eHrB8uXXt8V6JypFbzhhd+xLVlZ/8QEiaZnnUcTj32z5/zTPPzKqpHpu1x5icski+aNDm9dU0xZw139rmh1VbyVe6eZfeOqZ5Ams6NYQswi7H4KXZKnYuibG2sWxUFZp76ZLBOdV1M7NLfJJcYqiY2b94kllXCZWHvXWyWQK/k/ocXe98TOpZDwtqkYk8npNiGVahfWBtc8n7okZ7yBrsSWc2RnUup+lvRU5YSvTflvV9rq3S/7NQy/xNfmY1NRlMLi8sWk6aFlEXMvNoU3bvj9U94MHr2qn55rKpBVemmVJ0q2x1lqxui2fiCo/4K3d+Kudaf26ElIkIbVhIpS65224xuficFnJje37XlGi9RiY4bYAxOwJ+X05eDyhAJFWXJ5PXNqEe+3yBQzjJ5tUg0vfgvCVNUc0yRT+bmr0k3EmrDgAvkfnFE9LSP2OS6mcJFqbeAgpBsd4er+NCQyiJSO7+LeVRZ406+r+MKP4esEdZXf8otM8zQKNkkDv57vpHKC/0gGIIEo6+Je5wAcQuyC98k+IWJ+nCgkuhR8UPdDHFKsW6IbQ4IAKJEFgVCECjcwikSqsiW2FWJazS4sX4WqP3IBRlk9QMwAobrLBKP3bTWqfd0KlLPwMjuHuv32AEWNOj22D28f1aNKEYBdKjRKI0aRAw1G5ADcKpIQIY6ZNG8K2wnjTvb2mijIF6KpJqaghYxSgVDOEBIQHXlAmAM1PsN6Bt5RTFsFoY7uyrGwL1sGoEZmsAIIVIy1+5gxakSZctX6FSZQ==) format('woff2');}
-text.f2 {font-family:ec-lmtt10;font-size:10.909088px}
-text.f8 {font-family:ec-lmr12;font-size:14.346196px}
-text.f9 {font-family:nf0;font-size:10.909088px}
-text.f10 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');}
+@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUoAA0AAAAACVwAAATRAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCCwc4G44HUZQvThDi50HmpqfZLZqIWla7RMm2Uso5lL/HP95nz/+m/RxI0vTSepoqKTU3KitusOvQdfW/fa48H5zs/btt4AMd8EATDTwMIwiwxAMpofj6HyA2cgmP//2p0UGxH4FnEYllEwRojQ5c0wrYi2hBS7AmTV9Am4uhLkBqAazD9AK8C9wIAAHw/NR3DQCfXWdzs6kYLWEE7lHnATqo0E9CKwK4VCNwyUPrryV9ATQa39Jk6KhTPLoleJ/wq8SHxojRBvV5Fy54WqN+BhlmhLHGD8TqG73bYqN11lppRSQwaAOIGioAHKWJIO+vwbACMAHsmAGwx4TDB9QkAI0KAAgAwArwA7oBvQAAYADE4oqWjnF8LLcYcuMSazxii0DuAK/6ao7kl5AIRkfDM2XByEaoTFth2XCBaccC5XXrDlkvlb5+Teor5gBB3wuDsocx7Bb0EGLaPuIFPWfvRihbI1beFfTLm6lDYYxXV6/2XC3oJ1+ePQpn0vaRsRn6XgDTXkB5qbeiVVa8rjBt17lDr0gt2v9Y0B96rwWqTLMcecG0U49eETnqq9c2h2m+8fXlJJltf33+dPfwy43eAmm7iJ86zyk7tqqS0l3dx9EeZW92P7l20egTSd3mc4lpL/xeMe3OhTUWRoNyIaR577VqFqiN9dkQk2yNZCX6hSYfUuOu6wUH0YcYlCtMI14gRuzFi2IInHL07MneCwygHUzGzr0roXi1dawjVag7Fn2nd/vKlYLu22X16v2nhYB15nVfpFttt2IfyM6CXag5M8vHf1lP+8q8LsZPLd2rXPu0pVesHDwkSrQkjbS520YmWcReI0b2YtvF2AJ58vqMwus/fLwdGvR4n+vzzauPjjQ5+WpLlcTAUYXOXT9EgReTZob00ljut338XNc2Y2aP7pNm7kosLum07xzr8fJymcPsVV951qd1d7NfHhTeeuOI5RFWDbUI5gyvmoQwy2ajf0uOu4drX6fGtpFyy9jZ3XvNmNUSURSQI+XM+jFUrLosOIV4uxe3mfCLGF9jGzmPifFqiIvUmSQerSlxTetivefucSH8vMV6wB3eor+a43Smpt8fDjVpJdl/uPYeFTjQ7p+qDJi3kZ/ZWZqaLC5tbFoqJnVK5yrr5KTqkd9Vj8C9lz2nzWtrnzb/0nSlFd2q2r3K3GtTaOGykPxLt77v0Ab+0BclUzKsaSldbcXDvRaKC89YUZs74hdLizVswhTNGpNYnYFflopXYxpIlHrVme179qMR3vWcT7qo1vUgUdixf+6ifln9zQ6j76XVi9L9rACAo0HceczOgB8SbzJ+KFE8p7UQTRi19oyJ/tck5QiSuy96dv7Qwzn7bxb4r3bYs9zmu97rFMCMg0HRcO/5TkfHA8DvSNi2kCECAKALcB+RJQnKcba4COh4Ur5lyzRuZYQbggdQzwAAOAAhQL5YAACY9UcdkB0Xswg8GxmMBAvnm/C24tFiD44TAOBl8wIjq3GrmZis1aifAcYZqpfR8LO9MFBqhOHGZjU/boB+JIlixZNkIhiuv9R6shjpCZ0oPpcIbwlj7UcP6CclxsZLmdLw/qm8lhyTHnMe2Q2Q9TPaGIPWyUsS5k7gat5LGJfAGj5GtwBwQlL49HZSijLlqtVr1KodAAAA) format('woff2');}
+text.f2 {font-family:nf1;font-size:10.909088px}
+text.f8 {font-family:nf6;font-size:14.346196px}
+text.f9 {font-family:nf7;font-size:10.909088px}
+text.f10 {font-family:nf8;font-size:10.909088px}
]]>
</style>
<g id='page3'>
@@ -27,25 +27,25 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f8' x='-63.495975' y='-50.743793'><tspan fill='#3333b3'>Remote</tspan><tspan fill='#3333b3' x='-11.797129'>video</tspan></text>
-<text class='f10' x='-43.653545' y='-31.381632'>Video<tspan x='-12.441459'>streamed</tspan><tspan x='34.315995'>from</tspan><tspan x='60.103437'>URL</tspan></text>
-<text class='f2' x='-43.653545' y='-8.86606'>\includemedia[width=24em,height=13.5em,url]{}{%<tspan x='-43.653545' y='4.683137'>https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm}</tspan></text>
-<g transform='translate(23.862603,164.342714) scale(-1,-1) translate(23.862603,164.342714) scale(-1)'>
+<text class='f8' x='-63.495975' y='-50.750162'><tspan fill='#3333b3'>Remote</tspan><tspan fill='#3333b3' x='-11.792287'>video</tspan></text>
+<text class='f10' x='-43.653545' y='-31.388306'>Video<tspan x='-12.442646'>streamed</tspan><tspan x='34.302793'>from</tspan><tspan x='60.091875'>URL</tspan></text>
+<text class='f2' x='-43.653545' y='-8.872733'>\includemedia[width=24em,height=13.5em,url]{}{%<tspan x='-43.653545' y='4.676464'>https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm}</tspan></text>
+<g transform='translate(23.862603,164.333593) scale(-1,-1) translate(23.862603,164.333593) scale(-1)'>
</g>
<svg height='0' id='msvg_kbdCtrl_1' onfocus='' onkeydown='event.preventDefault();if(!(event.key==="PageDown"||event.key==="PageUp")){event.stopPropagation();}switch(event.key){case" ":if($("1").paused){$("1").play();}else{$("1").pause();}break;case"ArrowUp":if(event.ctrlKey){$("1").muted=false;}else{try{$("1").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("1").muted=true;}else{try{$("1").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("1").currentTime-=$("1").duration/10;}else{$("1").currentTime-=$("1").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("1").currentTime+=$("1").duration/10;}else{$("1").currentTime+=$("1").duration/100;}break;case"Home":$("1").currentTime=0;break;case"End":$("1").currentTime=$("1").duration;break;case"F11":if($("1").requestFullscreen){$("1").requestFullscreen();}break;case"Tab":event.target.blur();break;}' width='0'/>
-<foreignObject height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("1").paused){$("1").play();}else{$("1").pause();}return;' style='cursor: pointer;' transform='translate(23.862603,17.070044)' width='261.81812'>
+<foreignObject height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("1").paused){$("1").play();}else{$("1").pause();}return;' style='cursor: pointer;' transform='translate(23.862603,17.060923)' width='261.81812'>
<video height='100%' id='msvg_1' onclick='event.stopPropagation();' oncontextmenu='event.stopPropagation();' onkeydown='event.preventDefault();if(!(event.key==="PageDown"||event.key==="PageUp")){event.stopPropagation();}switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;case"F11":if(event.target.requestFullscreen){event.target.requestFullscreen();}break;case"Tab":event.target.blur();break;}' onmousedown='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.play();' onplaying='$("kbdCtrl_1").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
<source src='https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm' type='audio/mpeg'/>
</video>
</foreignObject>
<a xlink:href='beamer-example-2.svg' xlink:title='beamer-example-2.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.255493' y='-70.15154' width='10.545452' height='10.403634'/>
-<text class='f9' x='357.755493' y='-60.858816'><tspan fill='#adade0'></tspan></text>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.250568' y='-70.149078' width='10.545452' height='10.403634'/>
+<text class='f9' x='357.750568' y='-60.856353'><tspan fill='#adade0'></tspan></text>
</a>
<a xlink:href='beamer-example-4.svg' xlink:title='beamer-example-4.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.149393' y='-70.15154' width='10.545452' height='10.403634'/>
-<text class='f9' x='369.649393' y='-60.858816'><tspan fill='#adade0'></tspan></text>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.14693' y='-70.149078' width='10.545452' height='10.403634'/>
+<text class='f9' x='369.64693' y='-60.856353'><tspan fill='#adade0'></tspan></text>
</a>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-4.svg b/macros/latex/contrib/media4svg/example/beamer-example-4.svg
index 9ca065a1ab..c3f79aef3e 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-4.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-4.svg
@@ -9,20 +9,20 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKcAA0AAAAABbwAAAJHAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEUVQNdiB+HsbGtKZLiGI0ib7c/s9usvua4gkRT+KB//1w970vE5PTB3RNq4hZYw28inoy63iizhoqyeCBv+b7YQdyGL1OGmBbRIJu/T8AP7jAwgbOOd4oUmA810yMtrBZEc9kGvUC/QUuckP97iKUlq7HzDY+V0peQoDXdwePwOC1vkJZFsmasEdG3BYfY4f5d5wwLB8kUVYEQCUATFzeW8BX35r/MzvpVtpCACRI0EqA0ZSAVlonpFKBr+ErKs4LQMgJgBARAQBBeW9X/EL4TwQZKEaOXpgKkKKHBFFM01J78GVJVpZOD58oXnL4VP2g4n89hK3XistnHD5d3zm0rXZxYEvd8uD2hu6aAyfr+uW/K2y5WlIx9cCJujanWh/eWr+SPNvqOlZ07I31ZOaTzO9sIB94PzSq9lptB2l5im9qXx+IXq1bPxAMYO9VlGJ9b+Tgmof4wxqOK4gYgTCncew6uBGMaN0sSH0q3MizfgpOIscBEzDj+H4e/kQo/HJAIPs0YdmCitavwpLk7VQ+qsf/l8mapBsKRRBIupNn4gpQYQtAT7Ntg4i+AgGZDhJEBAHjZQAKLSdAVKCSAIkOIwJkSuwRQC5xQSKkRaJySCYxlslk6n0ey+VOmGxp7elg6obPxobQ6+zkUX31Zm3JUpCRY2mwnKxsM68mrYzoglxYwDtJYPK2XlqFTM5qWKcV1Plaupw+SudguqWbu62zUzdC9zYXGi2vaDOMjvoYiEtzPkMQQwxJ8aK1t/P7aLIMStyjAAA=) format('woff2');}
-@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAALAAA0AAAAABdAAAAJqAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCGgcqG9AEUZQMxhCAnwe2OzQYjSvh4ORcIdw8HYrS1PNvehEP3+9HO/e+9/+qJJO4G4o4WUQaicRsouKJ6Uy3TmlUjXijrYAAc9vvjUq8RvOIlCJil0oNDKyziU0ZrALSEpSguFUkIYpPtAtlqN++fv0ERP4fuGl4PiYQgKfXz9Wi4kjCQEvPtXeH4w14QtPRiMe8vUWZFVPOrdleSaSbEPDp8esAvq4fxnVYKFvxSkM+yY94Fl4qvosiSU0XgACAk/enB7DIzX/Hrcv5TwkBKCiYIIBVksAE2QxUVWDx+PS1x18JQLQEIBIJAH5+lO6hs/kI4ngJKuhEN27CPkDFMhF01roUQ9HbGz1NFg8LUgWm3AfXepg64YRk8NV74tzTuMo5brNdxGRHBnaryZlofb7eXx5f320WmPjMqTtGoVDtYuQZlBF69DsDhAF/C+wjOt9Q6A9DpJJ221V0WSgXDIeyMpG14FfoLByHhwv6njSRih+9///7CaLqlIc3RPAneB0YmqOM253KGOe1tRRTvQ3YCkKzi5wCPoSV1X9H9Zf7oW0+s1RJFuACN6yC3MZBRuKdBQTda9dH68Hq/86e8mM7LDWPK535DzolCPJf+TNmZQuUTgEAqGWLCcoWypaSgOoiHSRCYJMP0Ok+AaQOgwRQzFoQQKPHawFajbeKqF1SPzxTbBsyjXG/c61ub5x2dNZ72GrwXVkQTnh76eb3NM6ODDFfyFAz7D01Ipk/UvJkIx0L1RivLYGO5nw0Yj80amP/bCJwo9LLvCO5Dc47arSuHjVD5EXiYhSN/BBv6bnzoIlCyI1OcCpCk+8EAAA=) format('woff2');}
-@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAI8AA0AAAAABSgAAAHnAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCJgcqGzkEIC4KbGPq0EUgPFHGsiy3gQvWn7eMh//fr98+5973vkr64E37/MEkkrSaJBLtE8UqUxpJSzRtkFgk2ogPf673d+cFtMq/Kj6RqACZ6HljNkmscb/G/AdZmQif4oM3faPhBAbgvwcUyAe7YAlF2LRn55IkFGgikWecbtPLR4iwsWIeRQSNQsC7/0/w83XHa82kdOKZhryfb/HQLhW/4EaSmgkAAQCnrzTGgF2Msji6ZvZcAwEoKFhDQFdJYE3ZVlBVgV2j/IlHnxEgWgIQiQSU8jkU/VW25V0QoySoYBwVm8A2ABV7MSBrXY6pZqaemWom/xWT0+XeAzn9YGNqJjceRplZ33YZ7/1e56JPkRWRikoeKEcAXoR93fdY9dezbb4jVJIyoICG8m4b/YBxZ4JgfdCRXqX731T5s9X+khvJYfYwLkGQvREXSgfIIQIAqKWDA0oHSkeOoFrBgEQIHEIBjLuCgNSYFqDYqY2AxpTnArTGvVREnZAmgaQ4pU4aq4q1rXlXt2ycnCRw6/bplAAn7GydhyeOZiZYHsrByrAmRixLFYFdSX3I4nF4PPjJSJP+OJuwHnXYjJ2MLBWGYjexQuvG0wFnTBydLJSLLBflwLuj2qUOVD1cvmgVXDYPVBIqYqIzCwA=) format('woff2');}
-@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAW8AA0AAAAACtgAAAVoAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICosEiFoLKgABNgIkA1AEIAWCJgdKG5sIII7EOIbyD1NsKNnz36Y/5y4b2YWQmscUi0Ja4kScRRKHxOsKNRcq7k9E/ir5Lw0w/P1sGI2RmCFaZAN6f5VhG09wFkkDXNMfb9d8ZgkIx3wAeOZsphVFqAwyLsPXQLwJAAHAU88XqwHgi70jdCI8MSUtBg+wOewsgHl0mb6ElhjAwHPY1QkfWtqc3QhAi5Fc+8/RqGT3cMXNzTF3TyNqupMWsgytT+0Mf3DwghaZMCEXEpxowlAMx8jPAoTLpjVg4E9jl11y0Qm77bLFZpsinHLkBRD0IQaAQQdBKwdVGXgveEPDBzK+EEQ5/igUfkr/dmiPDiBWIBsHKfosBnJHACYCgAqg9QBrD3LKzNsZAIANp4w5Zd2qDMtkCgokJcmneCR1aYAd9yMFdSBvklEodQJ3K0kgkTqSyCtktsESFCSIPRMwr4C9i2KI7V78cWGu7QW57S/FeQkn9PY7iR5h7jO4rM/FeUknS5QkOEhBchKtIsllijEUFjmbtJIXmJwTdjJxiPuFyeZ5Qu6XsU2r/YznRaZd6Xvunwi1nngO1zNTzGZ5DtdfkoJzz36L1Tf/GHi2QsigHaLNtXp3yG5wzwNyP3x5U0SDLcz5Iifntt5+5o7RuaDgBVbAGhnpeMm1kY4GdwbsxGzMUbcpzMK2vuO5VeQFmajk3HaH5RqKJDAxcMOJPRvWQB2n4NxO0QZ3+upLsrmu0P8coDEEKXM8PpCWwtwMurpkWuhZrn8m7A26U8JcIpEEEiBAZC5xnj1wrc/aHwJulN9QnTC6mjtlpE0zljR/chmtqIzh82YUzEtzZluyLGPHZUnZFmfChP5fKu2ZO3clzb38ePkyR5ujdW7a3tyr6FfY2I0+SunSj2H/ks306NgXCBhounLMoU9KT/o/6DeSMMbjiC2PdXgcueW5DuBCccuQT41d1pyJjC3NTncWpiltGJKnjG52jykxNBZ8n/+j1LFKnxYdX1aQNqaxTGkbnDWpcepkG3YG5jud+VJRNG/KjrNEyrVR09jqjL4xBnNKa7omrNQ8z8/f1/cfVYS5V9clVpFTxmNvCG/K09lTi2pyM03N+apjbfLsW0/imycuujB5jqO8RI2LntKw9ERbQcusK02z8qyZxnjJPL/TgQZDUpkk2SvL9CnSdex90zZJm19rHzvH2eCaU2sv1PBZefGS0VpHWcYzHy5nZarCc3TyDGz1lHpK8UXkxgXVxrKeZU3V+oKcoivSfwatPb7nouDNpAjS/bjsPtLxl8A3bxumLairmT6/sX7G9Ora6TOcZl+zVJnSz1xVZrZK+hSLpQy/f1FbMcfkyDdoSidLf50qKRoyo9GMHLtjbNGr0Zn60loTSibnDqX0mqr8K6XPC5uqTYC1m98mXbz9j8XGxVPyp5QbrZhjK84LAQAcIaj7HvWW4XfdES/+nUbiGEDQHJoHeMyLPgwMfWUCQMA3CXl36pR9//cRuR8fNnAdPhvZF+weAB8wIAiYAMBGJaeZCPYFbsoP6UgDEAgAVAQwhkq2BBmsDXWsiKFe7k6Biv5AIt1GCOtAkDgcjP8zcxqUmUCPM/QW4xLVtbeOQAcQgI6IggwAwAAQCEAaVLd4ajOozcBDrgo4hKBawEPEmute8MFJcCCZLxgEgAQcctFewKMz3E/1gj92YCAGYQRGQA8MHDRihB4wYQgGY6T48cPRgiYEQAcVNAiAAQFoQgNiQ00AWYtkewIj66BJ6IB/oRHHh7c0BehUmgBDQFNDbBVIa2iTYxNi35njgG1rDscItFWGchmrufHlYrJWpUFVD7LNATCc/R0BEJj42DBEIBLRSEQWTMhBLkpQijKYIcEKOw==) format('woff2');}
-@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARkAA0AAAAACFgAAAQQAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCLwc2G9EGUVQwYgA+FuNYCu9QED4Ez/N0+/+1z1S3Zq7tHuye/AGj0v+fuFz4vTUW2KYtmGX6a7cHjSmaQBRYGI21ALM88C7Q2HqA58jACxcBAvDK7e+fBnj/6uXZ23JRbnIYM6i96h7AUWTkA7LYalAhGwdn4aOds+pmAHZWqL+dPgyrs1jkeG3nQ6niXla6w00UAjpWFAo7C1jMCmfA1YtY1oHzwqefesJrVSwgZRsKUBxcLig0oibM1b9wsdoonxWl1gLijAJAB8AX8AZJBRkAAExAOgoA1XImeJbJFCeBkiE20SVFavq8YXYz9W8Oun2rvu+4741dXpetlzzyhuHgosZ7jXCoV7cH2PKa4XjjgQvEvvXkSV3Xtp7V9X1sMQwFeu/cHEyfrivQnUKNJwUAA22oN5DUdUDOfbL19X2mi46B/i2v+s2/4XiN2bPn6tvbYK/4CJ440cOI282U78xVwWXtW/v7VakXcG/UCZGc44pTEoND4N36vlfvvPb0jtfd9dRteZdddtdVbHlW39d/8qS+79LjdBFHxHPn3Bv33HBORtTlHOB4ZMu9l8LF28+eFYkYSQKBYB0iaCTaF3tDos5az34e+fjg4+kvLQiNcX+j7Z6GytHRWv8XXWpjMkptpPic9ms6UTaWklMf2Bg7smnbWGZTWPKPNl4Oc//+Iddt/wV+GHR+UkR44ravtoJ7NSWG4wyLSEr98vC29loP142/ejTxYml5qSV1gQg89Liptr0uPf7JjE8SGm/SGbW6l9fdvWbblafM2PiazWD9e7WWuo7pJaW2rqZzcNE+NXy+yjbtuz/MXt8ZHfhh0KLE8AASXXldyCuZk8IjkhZvbBtf0idrvb12+/D0hrkXBtYYk67JAS9VjQ/oKX+7e7qFudUlhQf23lqR2eA1d+k8t+A9Li/vyrvk8w/X+YT/UWkPHax41lsSmLoy6La89rQ6L4f5jkOePLjRNdTN0+PfNCNU/ekZEv5sdMVd6txzabeK979INV/3QIbXDf5a01G5bqyuHICbhIzSm11MfJd9k8X8LirRFMQCNdAMCUQs8i8uEfXVCCDwuOWfmRMepb9ZDe2Lh7gf4OqkUGcBKwoAAXXW+TfDyg1APXToTcqNKBhGzu/WRDGuFBFJI0EIoFOLCQAFCAJUkg4AWJmFAKCw4I4AoBHHFAKAGYMLEAAs2HgADTHZULgCbtJoxs9kxp/dO1vw5hoWsJAVrCCLTFiwcMWKrMq8nsUsYsXnlzGbmUSSTTqZRFJMJDOxk6ZO8DRZFNJ5Z002mbFs+EmtaPiy2TMjs9MzI4sjZ9rTPMF4MaswLS/ttVcU+pfiMpYz1ztiDfXI8w64VVZ6Jp7dWGwG1KO4oP+BtX89HXTRTR/9DAA=) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWwAA0AAAAACiAAAAVbAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCJgc8GzsIIxE2c3IaAeKPxdgNtK1oWYAi3jDRiStZhdPqWdsBKWEHK3LkENsOIDo5wPAxWncsHUEOAHyAGHgCaID/2bYTl2tO64Gity6CSRDQN8a2uax9nnhEY0yKo8C6gMYEwzy2luHVyfniSgAIAF6fe68LAN47PNHY9Cd6SqugAdhSdhmA4gbQ+zAQAxg0KqBjEgBvdVtBS3EypqvE/1PQn53DEzadqtH5IfGzNJQAagz9rBYuUEGNagxDM1oxCmMxAZMw/f+AQBlz37097W5XW9pcVxtbi9CxkA1AEIYYAAbBEjioIP+tCvkPsIWdPcCBBwAHuFp6Nh0A/R/miY61fQHoADoM0C8pAKj9MWAAPWqwgTydiKnVfuRKseREYaQjntzJ5FSOiGw/SiJe46g2F0fE/Sz1cg7glUNQWw5yHA7wSjBx8mEiXmnstXSdPNjNcSppI88rPYesQjNxsMhE0vbjEc84uRuWQ8oRkrgtj1lcQDdO2QNs3Oe/7SqvHDhygsyWbk5+RtLpy5fvH/BCs8TJ67Q7W1yvq+/6ZTmbj6zG28vJ3fIZj6+f2EIf85q0JyPjuWepnxyVjSxSA1nXTWZuT9/l81DNpz3bfHiS95OmHnOh3RupnNFQXJuk3b7XOPnBlS4tRzwUJhZjJ6mPVwBD80RcqY/Mlqhu2Xxcir2t5BxDu3SNk+u1yBeUtAx77IXlUGI5QgtoqhucTCqeOOK6u/PxzGK9eFatsZ1ka5pxFhZtfX/JV+Ix2co+n35dW7u61nUH03Zz8n5PT2XjEZIOywdhecorjQP6eP1mu82fVVa813QvZvj+DQtGN9cIWtM4nbtunEkrjB87brz/0X461G/R6YHuYb7s/xyfGMXF911xcEyOz/dMhzebkj2Tc8rzTwToM3OE0oy6AoPH5KA2t3DTv+/qw7JzMsMUWjI0J2GIMSU2z/Bp4HGRa7d6+e025ZZmhwdXBfmPv7qu3+4PmrF+ij1nk+/zU6EhMsnc0pHm23Bpt4c+1/cvQ7hbW9BkD0NTTmbjjEXXZswzB19wa5+mxoZRWt4uxbvCEKrdofFvyHD3cG1xqm0aZ26YtGDwsLnzG8Lz9BlixvzvQoSy67xTsI97fpMN/hBMy8RRMieY5gU7iMtMgrWq2gp7wV/KcLpQ0fqrQ0VAh+2fZdS+mCvfWZwVL6yurVstWXaptMpsKh/3NboNHvUMnb24qd/sJdfmWBrHPiUNLrMbtj0kd01w9rV73/SXO75twdA53sP8GwLG0NiFOtOtDcOHCdr45mtsq8wYncTFzfTRzndymeSOgpkpnkkJA3X5Y7yXC8sveKIyc+yP2gbP0KkzZc9oY3kKflwt3IypJuFluP3g1r/HOKPeN0lYXTGUhMgtG9eNXvDx5HFhwYxC8oxOS+rz1KcDXFzrdMO1uqjQiuixRw/55uXyAQCshNj0U7ZqfGu02mjegegqBlEIKoIGojtt6J+SSLdMAAg4kJA8bYhz+q92vOrz00Y/t//jWTM7B8AODBCCUBDhPOjPNgMAawah248jjYQeAKgCYJsRQV8hgE4jkE5DRy7QMxFiBYGu2fAbMNyYZiYQAEdkQQ0AYAAI7c9GDBqPHdoqMYNfAweAoApBGAhqwGPTYBvY4TxUILU9GDjAgSoUww3UwBPSrjZwwT4MGWW0CQyMMGoTDEag0FhjTBq9/ATtWomMYsQRpRK1ahYtKiUABsmqhAFgFOc2wpfLsNoT2ltFY0ycmCq2NkdbEUFRQ3J0QvQVrgswV7EJJuq07BEZrOnwnEFpkK4Mq3poqwJgOr3jP8LTmOQrVKxKjVoNGg0EAA==) format('woff2');}
-text.f0 {font-family:ec-lmss8;font-size:7.970112px}
+<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAIkAA0AAAAABQwAAAHNAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCCwcqGx4EIB6FccNdQjRLGeKGfPzll3jof+zbnZm3qgmxph1PZLW2h0qk7TZEI78R4mb6hoJb4pBoX+D5537eX7wzG1a/X6kDTes0mWA25j/IynUXPwoTOIBfA2thWxBokWYUH5LvJgkFmkjk7c3t2Y7ZZM2koiSSCgEv/p/Bl/yTLcYrdSAeGyLv5HPcg63iCzuSNDQGIADgxEp/AXbr1PzgJvlyAwJQKGyigEM0gU1026BpArsH0Y0HbylADBOASCRgKN+hlKdsz1sQgyRoYBQNm2E7QMM+KsjWFmNiaKqdmzDG/62NT9baXTl5d3ViKlfvRU0d3P4a7fzexmhDet9lV71RlWrDL9YDwHrYf+g90vx11oeHPkaukjJQMET5OBxdsXGygmApbt+8nsv+j07Un6W2bWkg+9nBqARBdgZcqgRknwIAaHVACdQB1AEpBc0SFSRC4BgBGLVCAWnErBDLFgMcMuEBKVueKdHGpGkglkMKOGTZUzZs2FOnLK09HUzd8BVYD8ednTyq2pu1pSKHsBQlik5WWD09kfMOKzl4w2imt/Wy6IhVTIqnFWevF/VOOTmcs3Rzt3V2UmQTFu4axRaLPgKtRyF3TQsNMW8AAAA=) format('woff2');}
+@font-face{font-family:nf4;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWsAA0AAAAACrwAAAVYAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICosEiFoLKgABNgIkA1AEIAWCCwdKG4AIIB6FTdlbuJ3Jcn6TUe3wyH94N/1zI5UEmk7MsFEx6lScWOvQ+lxhYmx74gpT8z8jHv5q89923RZ4gIGcuoFFF9iFgSecYRFu/ksDDH+/PIzGSMwUK7IDqngXnVZ4YnfcdIC1jf6okmeWgDDmAeAW9QpNCq9BdwJAABwLXvwYAC61eqf7IjRForfBA/Nm1gHwm4vpz1oYgMFX6NXJhxafMusBWE2qWr8Zojz7bUXzsDNP142IBYASkdP81PYisUJYpXPKJvNoMM4EkxoBYTIpdUb9NLbFZpsE/Own3/jaV5FRijoA0YcCgKGDaGUpcvgOQmmEkQgnDA34ozBOpMhWaK0Nw+iV6RCjRgHaWoiBABPQB2AWsIDbvJsBAEwDuBngnH1ltMUZqRdJZPCNQdSBpNnpCDJSGwoljvpRO+B+iQQSqS2JvJHTGoZgJEHo+AD+POZdjDdtv/1/YZl2knz6KdEfFYjT90YHhWXH4VVPiP6YVUUSCW4ykoFEVSQDZ5xqIiK7TVziBcbACldhxLG+k04teJR8p0S/qq8NnuS0L/WXA4F+auAEvMfruKacADdOkZH1xYCi4haOAMeLETKsQ6y9H//c92fggYPkO3Rql4i6mgyc5MnaE6ev3WtGLhp5gRFgp4y23YzaTEXdKw0MEM08GprRJXznjp9QRV7gRIn1CcsUHUokMCLhlsAvX3yC1XlG1ocUq/Oxr50izath4ASAZhI45zoywJXisjTalrJN5Tivfyb0OttqYRmRSAIJEIjxin6916dhn97subN0pyng8Da2S0uZ7yhqfO11qChf8TkL8/wpnkwlQ5k2PUPOVDxRM0dckvT0H3+KWbblyPvvuVvczctSfs3ehqR9fSd6JafKt/o/I815+L+L6Hl2bv3PHReTGvOi932SMfXrHlY6zB10Z5dmu4GNhU1jX9d3+GTtoGHFmame/BRJw9iNNKTRN7Uovj7vRu4tuW1FXMoQe0leytT6EkkbkzG7ft4cDT/2yvV4cuWCIbwzc7gyyGAdPJ/5OC1xaLwroTnV0r/Y5Y+IDA9/ahro6tbxHVVkJTt+7cs7c2x6ckFVdrqzMdf0X4shc/dRe+OstzbOWeouLTJjU7C4f2q0lte0eGvD4hw13WGXXcvb/VEXH1Miy3p5SVyCvAO/nm2Zbc2t1qct9dR5l1br+RY+I8cuO9QaynCsfbklI900IMtmSMO3weJgMS4O+nJFpaOka0lDZVxeVsFW+Xm8Vbd3favP12TsvR7AFvSpiL8Erp6rm7+ipmrB8vrahQsqqxcs9LjCXXJ5QpKrosSlynEJilKCBxery5Y63bnxluI58uPVRQVjF9a7kHV0Tys4PSU9rrjaiaJ79jhKrarI3Vp8Ir+h0gmoy4ivbHb94duOt+fmzi11qFiqFeb0BQD8QzCv/w3l8MD2Twh/fo3AMgYIkkXyBng8hF42KPrKBCAIDDe9qJESX4SJ7K2DDVSbxpGL2Q8IwwCRYZMBwFReWWaD+e2UH9K2jEQvAOgAMEF53kFaWlCTghni1P4EmMpD0WWPvmljjIujfbzgqiwo2WRwqgy6pw3kUvPWiWiDAG0NxgEABkAIkMK0iyc3og4jVOQqj9WdxuOJVlwegvUNWNQKByMCDI+VqCOP197km4UI8QlcGjSZbBSPCfAzwUnAaawxJi0enqBJg55sTCzGGW95YzSyN+yGiZ0RbSxJG7wFDTs8oamhp81k6Rnfc0yjPRftw2KHnSefAjQNJpioRU6qJytvD+5WVKwmC2Q4Qb0AwBgH2wIIs/jY/gYaZIhoGZyyZCtSrISLTKUD) format('woff2');}
+@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');}
+@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAALIAA0AAAAABcwAAAJ0AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCFwcqG80EAI7DdGsnlxMWZ4gK5UEkHvjs+u9WdY+/0e8DRGquEa6zPbmcwakHHp7L/duL4I6OsiiwbWM9z86jtBdHc4Bcz3sJZnEDNw3PxwQC8PT6O5blkYSBlp5r7w7HG/CEpqMRj3l7izIrppxbs72SSDchwEfXb+/Ad8G8TR0OydhwRY54Lr6DC+GlwvfSIBLlSgACAMzpTtyAjjrGbzVvmfi7HAGQIEErAYyQCGgllSGVCuhY/aevrX5LAEKeAAgREQD8/CjdQ2viFKFaFUEKiihjDRwHSNFLBMU07SQE0W+HSq52uogqyodvC2dvlc81eiO56On/WPFJ5fxncq5fs2cnW27IwJvVTUcbzq1efPXTs5+99tJzmPgTxcfljRRafPZj5Bk1i9K9H7JySdlr/eFxtfh2sfTuxPaRbXNmjO4wfPG+RUsW7x0+eNqBBSPHT+06c24/HywvFBQ/+tW//vx+kZ4+3d+prqo9qf+NtNS1smnGrFEbu751bSnmzJsLawcGmV0E3gh6j3izkPotO+RzX7NUElmAEzjHKsj58G9GwjsHBO59Pm/W8Ub8ipXkx+2wtKb6SorxdyiKIBB/L39GXRoLSVEAAKTJWDWQjCUZa4iA1BKKICIIGEMvQNEmAogK6gkgkVlGADkV1wWQl/OSREhLojrwTGIMzZicJo6fyyt7zDw2spmD7GAt+/BdWZBJ7GYXB+b37GMzG8n000sfmWEy69nJPvrKvAF6GjLS/fRR+/HWEujYt3lj1q9Xn2xYtn7nvr7gDug5pOd53MYiNrKP/Wx1p2X6upDciqJ9e/XhKr31k319+xB3OcFLETT5Ig==) format('woff2');}
+@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARQAA0AAAAACDQAAAP7AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCCwc2G60GURSxAviZYNOpLXgRCGVYBkM7mKdbJnVlqBv8A6/x8P9r5n1/INmZAitghRbZAR2/IHxdI7spADgAFpJRVdaRRWubhY9og3ahvGpDmon0ixkbWlezx5fYBCWISDBK/3/gnMcFPQqs/WQ3XfYzKNIPdIGLHKOpA/A2v8gB8A/xRr1u3YWAp/8P++FjNm1k2kypb2xXkDalO2iTDfGRGjCSooPgF9AnK3oKS0CnZ/pKrJ/ylQhAhgzDEVgjLjCcYBqoNCVJp6OL5//AHWf3Pv4fnztn1lAbURK0h4SkCHqwZhK5gv2LRrMD/dSY5AfifwlUYAgYBDEJYj2AHFPEQJJCDi/L8wlBEfyBGVVMDFldwi765utSQNXZqnp3D7k45UW0Tj15WbedEOqZaMI8S2/gz+v2ywfHorO1d29VZa2DVdVrY10nUO3bbqhVVQfsipY697YA1LhgXiLZc9Qufm296O11pb2+zZ8Nt/Sy/dzGK6evy8gaGkakmZWlUUTG7ZWWVzdyBdswA4NOmRVcZcxqpZhQkwONg0LRX31ss7cxF/Cmvrku0aqqvjrAF7HiDbKzseIrMwFCPIF+iRZ3BloKpoipbgJkxvlgJVzpzs+HoDHGJgKD0G6okcbGVmc7EGM+Rv4Zw7TRNN+aIw0z3o76gKKUmZkc2SpajplfDBNwE+eSKmeJm3MLK1AosZgGh5sLKNNyPWCCdVq8uzGc8F+KA8piTno6jvDLMPAkZQ468E9Lz8lzkRquIYePE/SCr9wsySvKQ5mSVlAzo01OQ56PbZb/mF2onHmdtaz79/uG11by5ha+IWDrrhxKXtPGlbrkZbWMnE+RBWfemDYkibS2ClpMFAeUzhx0I5DWFtVG9ITkpKPndAlSt3DVh/yICGOIwXygXSmFLLYVDhf5mrSFIRb3Fx4BLi2uPCcdhV6npIAioZ2bPS5VLHo9WrTi7MCfmO5dypbGSHKRqE3A+kHKLlENXnnChMgUAjAahEODS4D/I2LTwD4y1HSLTEyoHLhSqdOJ+svQmaZjOIWPGb3Iakr5m8uLIgCXwtRZ70bul9ZWFu9QY5aQRlAGFUgL8TL+eDh+mRBcPHZrwyQt9rtZZz93cYcm/kvSQTQlEKSDYRD9hAtp1+HJU19jUBirfttynoTpmLI8QmURASSEwDwSgKYeBJKGAQhkRmojUKhtEaCUOSETeYekH7g/M0vOXxjmdV2pdMAqKxsvRzN3+B1dO7DExdmTLb/bWGE0EgXjUf/Zmlo2iBzu1ChJDd6jNcy+b1ZMkxTmsXOPqouG6IhnWouAdVbuHnYDKjKqnou43mXUDkUMhEXn3QBpDy1VH6fOX6Kipq6lrQMA) format('woff2');}
+@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWoAA0AAAAACgQAAAVRAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCCwc8GyAIQB6Hsduk02li+w5gyCqcVo9kO84qYQUrcuQQ2w4AHzs5YLbuWDoCHwD4ADHwBECEnvdfsRI3NZzIkiUFH5i3/wFmg87/5ZrTOqDoWy+CSRDQWMvutpW1zSIYY3AcBdYLaEwwzGNLQXYXy8vYCQABwOtz7zkB4H3f1aZkPNFTWgU9wC3lLgPQyAR6H5ZwAAc9D2RKAgB3fCoGuZNNH/L/OXr0HJ605ecTfxjGn+UlBenQjxL54Osu21F/Aw02ylgTTDL9Ci4Zc99uj9122WIzp43WRshUyAAQjCEOAAfDEjTwcHxVxfwHuMHoDjAIAOAB0src6QDof5UKPceEAkxAhwH6BVmZDkAKDnUwdOBSh14MnE4XRr6USl4URyYSyJ9sxO1ZXxhGWSToPXV2d0TsZ6WNeUDQDkHnOMgYDghaNDH1MJGgNbU5nCcPtjDGKxsFQWs95JIGEoNDJVK2H094xtQWOA5pR0hhWx63kQZaoH20Clp7+LargnbgyAmyO1qY+oyU05cv3z8QhIGHqevEnSivLd1+/XJn8RC1L3AbU1s6z3t8/cQW+rjVsHhShM490yh5ahvbsPW/4LrNzva0Xz5f0/Jp67YQgdT9pO+KifDtFW5v1CRbk7I79BpTH1xxioxakXCWrtRJaRc0IDhwHK7UTnZHUotqP66k3tZKjmHoucbUrj1xzCebJwP2wnFIRY/Q/FnqBlOJF4gRa2kph8A5XBfP9jU0lDptacdZOMSuPZRQRQAKtX0h3Z1bnc512cHEFqbuDwzUNh4h5bB6EI6ngtbUs10wbzZu/ky+13wvZcD+DQtGD+wkibZxJn/TOJsojR87bjz90X461H3R6V7+caHc/wtJ0XxC35X7pJSEfM+Z8GZzdmB2SX35iQhzYYlUW9ClwhIwOWqIX7zt33fNccUlhXEaLelXktHXmpNaZvk08rjMhrqCwnbbSmuL46M7RIWPv7qu++4PBmL9FHdmKA/5qdKSmGUfNCwvtNul3QHm0tC/LPF+Q6ImB1iaSwqbZiy6NmOePfqC39BpOmwYJQrGnOAGS6y4Qx/ercA/wHeQV+fmcfZukxb06T93frf4MnOBXDD/uxip7rrgFR3iX95swB+SbZk8SmWSbV60h7zMJrk6dHTBXQpXCrwuNAz+1aMhYpjbn3U0dHFLpd7yrHRpdecuqzusuVTbwW6rH/c12gePWvvNXtzcffaSa3McTRWfUvrUGftvjyldE1187d43PdRh3w5Cvy+4f3i3iDE0dmEvc13dBvSXxPTka2xrLBidxdJmhojzvXwm+aPizQnMyuhlKh8TvFxafiEQjXvsj2K3wNipM9XAZGt9Dn5cLd1M6UjSy3j3PoP/HuONrjNLWt3Qj6TELRvXjV7w8eRxcdEcxZRZvZZ0LdOdjvDx7WIaIJqSYhuSxx49FFpWCgBwEVLXKTcdvrW6DPp3auQ8Z2og4AV6U+OUgf7xQrplAkBAr/+PP/t65/9qFPjPjxrj/G56B3LnABjBAd2YEBN+Hj26GQC4gSBk+/GkkTADQA0AtxkJ+QoROY3InIYpPjBXhhwoU2YjLFX4Vd8KAfBEER16DAMgFEWxFArDiCHB2hx1g486wMPEDvQQsHyyATx2gQfp3MHBCyCAR75goEegyZsZYMAmdDbYUJON0t8E+PNfOVBprDEmVTWeYKjBZFYp0og7l4Ixhsik0iXLLkJWaRkrvLJMazxh6GDZmpIm58pjhmRqOD05O/mkthVgN9gEEw0fTFZm6bUftxZcls78GIQbHdcBcMgCnt8BL2NTrlK1DjrprJsmvQAAAAA=) format('woff2');}
+text.f0 {font-family:nf0;font-size:7.970112px}
text.f1 {font-family:cmr10;font-size:10.909088px}
-text.f2 {font-family:ec-lmtt10;font-size:10.909088px}
-text.f6 {font-family:ec-lmss9;font-size:8.966376px}
-text.f8 {font-family:ec-lmr12;font-size:14.346196px}
-text.f9 {font-family:nf0;font-size:10.909088px}
-text.f10 {font-family:ec-lmr10;font-size:10.909088px}
+text.f2 {font-family:nf1;font-size:10.909088px}
+text.f6 {font-family:nf4;font-size:8.966376px}
+text.f8 {font-family:nf6;font-size:14.346196px}
+text.f9 {font-family:nf7;font-size:10.909088px}
+text.f10 {font-family:nf8;font-size:10.909088px}
]]>
</style>
<g id='page4'>
@@ -33,30 +33,30 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f8' x='-63.495975' y='-50.743793'><tspan fill='#3333b3'>Pla</tspan><tspan fill='#3333b3' x='-43.402798'>y</tspan><tspan fill='#3333b3' x='-36.37901'>er</tspan><tspan fill='#3333b3' x='-19.990946'>con</tspan><tspan fill='#3333b3' x='.689801'>trol</tspan></text>
-<text class='f10' x='-43.653545' y='-32.685079'>The<tspan x='-21.229552'>standard</tspan><tspan x='24.315891'>pla</tspan><tspan x='38.558207'>y</tspan><tspan x='44.012972'>er</tspan><tspan x='56.770611'>con</tspan><tspan x='72.831195'>trols</tspan><tspan x='97.770755'>(option</tspan><tspan x='135.952665'>‘</tspan></text>
-<text class='f2' x='138.982945' y='-32.685079'>controls</text>
-<text class='f10' x='184.801081' y='-32.685079'>’)<tspan x='195.710271'>tak</tspan><tspan x='210.862133'>e</tspan><tspan x='219.347038'>a</tspan><tspan x='228.43794'>lot</tspan><tspan x='244.801674'>of</tspan><tspan x='257.225843'>space</tspan><tspan x='286.377473'>of</tspan><tspan x='298.801642'>the</tspan><tspan x='317.58964'>media</tspan><tspan x='-43.653545' y='-19.135882'>displa</tspan><tspan x='-16.017317'>y</tspan><tspan x='-11.168602'>.</tspan><tspan x='-3.28985'>Therefore,</tspan><tspan x='49.194799'>it</tspan><tspan x='60.103989'>is</tspan><tspan x='71.073719'>not</tspan><tspan x='90.467713'>recommended</tspan><tspan x='159.588238'>to</tspan><tspan x='172.921692'>enable</tspan><tspan x='206.861049'>them.</tspan><tspan x='238.98198'>Nev</tspan><tspan x='257.467109'>ertheless,</tspan><tspan x='-43.653545' y='-5.586685'>in</tspan><tspan x='-34.865772'>teractivit</tspan><tspan x='8.801585'>y</tspan><tspan x='18.054651'>is</tspan><tspan x='28.883278'>still</tspan><tspan x='50.015018'>pro</tspan><tspan x='65.499787'>vided</tspan><tspan x='94.752762'>through</tspan><tspan x='135.85401'>touc</tspan><tspan x='156.157146'>h</tspan><tspan x='165.712941'>or</tspan><tspan x='178.935473'>left</tspan><tspan x='197.885376'>mouse</tspan><tspan x='231.137893'>button</tspan><tspan x='266.754416'>clic</tspan><tspan x='282.209025'>k,</tspan><tspan x='294.520587'>and</tspan><tspan x='315.591465'>through</tspan><tspan x='-43.653545' y='7.962511'>the</tspan><tspan x='-24.865547'>k</tspan><tspan x='-19.410782'>eyb</tspan><tspan x='-2.44085'>oard</tspan><tspan x='22.437869'>as</tspan><tspan x='35.831863'>summarized</tspan><tspan x='96.528123'>in</tspan><tspan x='109.255301'>the</tspan><tspan x='128.043299'>table.</tspan><tspan x='-43.653545' y='21.511708'>Clic</tspan><tspan x='-25.168936'>k</tspan><tspan x='-15.774766'>on</tspan><tspan x='-.623325'>the</tspan><tspan x='18.164673'>media</tspan><tspan x='50.285481'>displa</tspan><tspan x='77.921709'>y</tspan><tspan x='87.315879'>to</tspan><tspan x='100.649333'>start</tspan><tspan x='126.801165'>pla</tspan><tspan x='141.043481'>ybac</tspan><tspan x='162.861878'>k.</tspan><tspan x='176.498442'>T</tspan><tspan x='183.467893'>o</tspan><tspan x='192.558794'>pause</tspan><tspan x='222.922415'>pla</tspan><tspan x='237.164731'>ybac</tspan><tspan x='258.983128'>k,</tspan><tspan x='271.407578'>press</tspan><tspan x='298.831941'>the</tspan><tspan x='317.619938'>left</tspan><tspan x='-43.653545' y='35.060904'>mouse</tspan><tspan x='-10.259925'>button</tspan><tspan x='25.497701'>on</tspan><tspan x='40.649142'>the</tspan><tspan x='59.43714'>media</tspan><tspan x='91.557948'>displa</tspan><tspan x='119.194176'>y</tspan><tspan x='124.042892'>.</tspan><tspan x='131.921644'>Release</tspan><tspan x='170.921733'>it</tspan><tspan x='181.830923'>to</tspan><tspan x='195.164377'>resume</tspan><tspan x='232.224735'>pla</tspan><tspan x='246.467052'>ybac</tspan><tspan x='268.285448'>k.</tspan><tspan x='281.922012'>T</tspan><tspan x='288.891463'>o</tspan><tspan x='297.982364'>pause</tspan><tspan x='-43.653545' y='48.610101'>pla</tspan><tspan x='-29.411228'>ybac</tspan><tspan x='-7.592832'>k</tspan><tspan x='1.801338'>p</tspan><tspan x='8.16491'>ermanen</tspan><tspan x='48.497855'>tly</tspan><tspan x='60.619403'>,</tspan><tspan x='67.286041'>press</tspan><tspan x='94.710403'>the</tspan><tspan x='113.498401'>left</tspan><tspan x='132.589407'>mouse</tspan><tspan x='165.983027'>button</tspan><tspan x='201.740653'>on</tspan><tspan x='216.892094'>the</tspan><tspan x='235.680092'>media</tspan><tspan x='267.800901'>displa</tspan><tspan x='295.437128'>y</tspan><tspan x='304.831298'>and</tspan><tspan x='326.043279'>mo</tspan><tspan x='340.285314'>v</tspan><tspan x='345.740079'>e</tspan><tspan x='-43.653545' y='62.159298'>the</tspan><tspan x='-24.865547'>mouse</tspan><tspan x='8.528073'>out</tspan><tspan x='27.922067'>while</tspan><tspan x='56.40662'>k</tspan><tspan x='61.861385'>eeping</tspan><tspan x='95.800743'>the</tspan><tspan x='114.588741'>button</tspan><tspan x='150.346366'>pressed.</tspan></text>
-<rect x='-43.653545' y='76.704758' height='.3985' width='177.108381'/>
-<text class='f10' x='-37.675945' y='86.58765'>Command<tspan x='63.733564' y='86.58765'>Shortcut</tspan></text>
-<rect x='-43.653545' y='90.652439' height='.3985' width='177.108381'/>
-<text class='f10' x='-37.675945' y='102.323456'>T<tspan x='-30.706495'>oggle</tspan><tspan x='-2.827677'>Pla</tspan><tspan x='12.778275'>y/P</tspan><tspan x='31.111759'>ause</tspan></text>
-<g stroke-miterlimit='10' transform='translate(95.605408,98.742098)scale(0.996264,-0.996264)'>
+<text class='f8' x='-63.495975' y='-50.750162'><tspan fill='#3333b3'>Pla</tspan><tspan fill='#3333b3' x='-43.396949'>y</tspan><tspan fill='#3333b3' x='-36.367307'>er</tspan><tspan fill='#3333b3' x='-19.983953'>con</tspan><tspan fill='#3333b3' x='.703267'>trol</tspan></text>
+<text class='f10' x='-43.653545' y='-32.717398'>The<tspan x='-21.235371'>standard</tspan><tspan x='24.320978'>pla</tspan><tspan x='38.568252'>y</tspan><tspan x='44.022801'>er</tspan><tspan x='56.775523'>con</tspan><tspan x='72.833705'>trols</tspan><tspan x='97.771878'>(option</tspan><tspan x='135.964593'>‘</tspan></text>
+<text class='f2' x='138.997319' y='-32.717398'>controls</text>
+<text class='f10' x='184.815488' y='-32.717398'>’)<tspan x='195.724574'>tak</tspan><tspan x='210.877302'>e</tspan><tspan x='219.353661'>a</tspan><tspan x='228.44093'>lot</tspan><tspan x='244.80456'>of</tspan><tspan x='257.230009'>space</tspan><tspan x='286.36818'>of</tspan><tspan x='298.79363'>the</tspan><tspan x='317.579077'>media</tspan><tspan x='-43.653545' y='-19.168201'>displa</tspan><tspan x='-16.009911'>y</tspan><tspan x='-11.155361'>.</tspan><tspan x='-3.278997'>Therefore,</tspan><tspan x='49.204623'>it</tspan><tspan x='60.113709'>is</tspan><tspan x='71.07734'>not</tspan><tspan x='90.473696'>recommended</tspan><tspan x='159.582766'>to</tspan><tspan x='172.913669'>enable</tspan><tspan x='206.85184'>them.</tspan><tspan x='238.968197'>Nev</tspan><tspan x='257.448197'>ertheless,</tspan><tspan x='-43.653545' y='-5.619004'>in</tspan><tspan x='-34.860815'>teractivit</tspan><tspan x='8.808269'>y</tspan><tspan x='18.055799'>is</tspan><tspan x='28.874239'>still</tspan><tspan x='50.001766'>pro</tspan><tspan x='65.492676'>vided</tspan><tspan x='94.747488'>through</tspan><tspan x='135.860465'>touc</tspan><tspan x='156.162282'>h</tspan><tspan x='165.715267'>or</tspan><tspan x='178.933706'>left</tspan><tspan x='197.879415'>mouse</tspan><tspan x='231.11603'>button</tspan><tspan x='266.741735'>clic</tspan><tspan x='282.189008'>k,</tspan><tspan x='294.498316'>and</tspan><tspan x='315.571298'>through</tspan><tspan x='-43.653545' y='7.930192'>the</tspan><tspan x='-24.868097'>k</tspan><tspan x='-19.413548'>eyb</tspan><tspan x='-2.439013'>oard</tspan><tspan x='22.444615'>as</tspan><tspan x='35.830064'>summarized</tspan><tspan x='96.517318'>in</tspan><tspan x='109.248221'>the</tspan><tspan x='128.033669'>table.</tspan><tspan x='-43.653545' y='21.479389'>Clic</tspan><tspan x='-25.173545'>k</tspan><tspan x='-15.780822'>on</tspan><tspan x='-.628101'>the</tspan><tspan x='18.157346'>media</tspan><tspan x='50.273699'>displa</tspan><tspan x='77.917333'>y</tspan><tspan x='87.310056'>to</tspan><tspan x='100.640959'>start</tspan><tspan x='126.790041'>pla</tspan><tspan x='141.037315'>ybac</tspan><tspan x='162.855495'>k.</tspan><tspan x='176.491858'>T</tspan><tspan x='183.462771'>o</tspan><tspan x='192.550039'>pause</tspan><tspan x='222.910028'>pla</tspan><tspan x='237.157302'>ybac</tspan><tspan x='258.975483'>k,</tspan><tspan x='271.400932'>press</tspan><tspan x='298.815468'>the</tspan><tspan x='317.600915'>left</tspan><tspan x='-43.653545' y='35.028585'>mouse</tspan><tspan x='-10.271738'>button</tspan><tspan x='25.499159'>on</tspan><tspan x='40.651881'>the</tspan><tspan x='59.437328'>media</tspan><tspan x='91.553681'>displa</tspan><tspan x='119.197314'>y</tspan><tspan x='124.051864'>.</tspan><tspan x='131.928228'>Release</tspan><tspan x='170.906397'>it</tspan><tspan x='181.815483'>to</tspan><tspan x='195.146387'>resume</tspan><tspan x='232.193647'>pla</tspan><tspan x='246.440921'>ybac</tspan><tspan x='268.259102'>k.</tspan><tspan x='281.895464'>T</tspan><tspan x='288.866377'>o</tspan><tspan x='297.953645'>pause</tspan><tspan x='-43.653545' y='48.577782'>pla</tspan><tspan x='-29.406271'>ybac</tspan><tspan x='-7.58809'>k</tspan><tspan x='1.804633'>p</tspan><tspan x='8.175535'>ermanen</tspan><tspan x='48.506438'>tly</tspan><tspan x='60.637349'>,</tspan><tspan x='67.3028'>press</tspan><tspan x='94.717336'>the</tspan><tspan x='113.502783'>left</tspan><tspan x='132.593685'>mouse</tspan><tspan x='165.975492'>button</tspan><tspan x='201.746389'>on</tspan><tspan x='216.89911'>the</tspan><tspan x='235.684558'>media</tspan><tspan x='267.80091'>displa</tspan><tspan x='295.444544'>y</tspan><tspan x='304.837267'>and</tspan><tspan x='326.055441'>mo</tspan><tspan x='340.291806'>v</tspan><tspan x='345.746355'>e</tspan><tspan x='-43.653545' y='62.126979'>the</tspan><tspan x='-24.868097'>mouse</tspan><tspan x='8.51371'>out</tspan><tspan x='27.910066'>while</tspan><tspan x='56.393692'>k</tspan><tspan x='61.848241'>eeping</tspan><tspan x='95.786412'>the</tspan><tspan x='114.571859'>button</tspan><tspan x='150.342756'>pressed.</tspan></text>
+<rect x='-43.653545' y='76.672439' height='.3985' width='176.119657'/>
+<text class='f10' x='-37.675945' y='86.555331'>Command<tspan x='63.733837' y='86.555331'>Shortcut</tspan></text>
+<rect x='-43.653545' y='90.62012' height='.3985' width='176.119657'/>
+<text class='f10' x='-37.675945' y='102.302948'>T<tspan x='-30.705033'>oggle</tspan><tspan x='-2.832315'>Pla</tspan><tspan x='12.778595'>y/P</tspan><tspan x='31.116777'>ause</tspan></text>
+<g stroke-miterlimit='10' transform='translate(95.111183,98.717836)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 30.37701 5.95204 L -30.37701 5.95204 C -31.15814 5.95204 -31.79137 5.31882 -31.79137 4.53769 L -31.79137 -4.53769 C -31.79137 -5.31882 -31.15814 -5.95204 -30.37701 -5.95204 L 30.37701 -5.95204 C 31.15814 -5.95204 31.79137 -5.31882 31.79137 -4.53769 L 31.79137 4.53769 C 31.79137 5.31882 31.15814 5.95204 30.37701 5.95204 Z M -31.79137 -5.95204'/>
+<path d='M 29.87917 5.95828 L -29.87917 5.95828 C -30.66112 5.95828 -31.29501 5.32439 -31.29501 4.54243 L -31.29501 -4.54243 C -31.29501 -5.32439 -30.66112 -5.95828 -29.87917 -5.95828 L 29.87917 -5.95828 C 30.66112 -5.95828 31.29501 -5.32439 31.29501 -4.54243 L 31.29501 4.54243 C 31.29501 5.32439 30.66112 5.95828 29.87917 5.95828 Z M -31.29501 -5.95828'/>
</g>
</g>
-<g transform='translate(-29.79137,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(95.605408,98.742098)scale(-1,-1)'>
+<g transform='translate(-29.29501,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(95.111183,98.717836)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='114.03611' y='98.742098'>Space</text>
+<text class='f6' x='113.043935' y='98.717836'>Space</text>
</g>
</g>
</g>
@@ -67,34 +67,34 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='-37.675945' y='116.098657'>Increase<tspan x='4.536229'>v</tspan><tspan x='9.990994'>olume</tspan></text>
-<g stroke-miterlimit='10' transform='translate(72.114626,112.5173)scale(0.996264,-0.996264)'>
+<text class='f10' x='-37.675945' y='116.088122'>Increase<tspan x='4.520405'>v</tspan><tspan x='9.974953'>olume</tspan></text>
+<g stroke-miterlimit='10' transform='translate(72.114899,112.50301)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-0.20001,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(72.114626,112.5173)scale(-1,-1)'>
+<g transform='translate(-0.1998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(72.114899,112.50301)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(72.313891,112.5173)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(72.313951,112.50301)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 -0.79999 L 0.0 6.13994' fill='none'/>
-<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,6.13994)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 -0.79918 L 0.0 5.94109' fill='none'/>
+<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,5.94109)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -115,34 +115,34 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='-37.675945' y='129.873859'>Decrease<tspan x='7.718435'>v</tspan><tspan x='13.1732'>olume</tspan></text>
-<g stroke-miterlimit='10' transform='translate(72.114626,126.292501)scale(0.996264,-0.996264)'>
+<text class='f10' x='-37.675945' y='129.873296'>Decrease<tspan x='7.694949'>v</tspan><tspan x='13.149498'>olume</tspan></text>
+<g stroke-miterlimit='10' transform='translate(72.114899,126.288184)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-0.20001,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(72.114626,126.292501)scale(-1,-1)'>
+<g transform='translate(-0.1998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(72.114899,126.288184)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(72.313891,126.292501)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(72.313951,126.288184)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 6.4749 L 0.0 -0.46503' fill='none'/>
-<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.46503)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 6.29997 L 0.0 -0.44029' fill='none'/>
+<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.44029)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -163,23 +163,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='-37.675945' y='143.64906'>Unm<tspan x='-14.646098'>ute</tspan><tspan x='4.141899'>audio</tspan></text>
-<g stroke-miterlimit='10' transform='translate(73.207147,140.067703)scale(0.996264,-0.996264)'>
+<text class='f10' x='-37.675945' y='143.65847'>Unm<tspan x='-14.646856'>ute</tspan><tspan x='4.138591'>audio</tspan></text>
+<g stroke-miterlimit='10' transform='translate(73.206311,140.073358)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.89476 5.95204 L -7.89476 5.95204 C -8.67589 5.95204 -9.30911 5.31882 -9.30911 4.53769 L -9.30911 -4.53769 C -9.30911 -5.31882 -8.67589 -5.95204 -7.89476 -5.95204 L 7.89476 -5.95204 C 8.67589 -5.95204 9.30911 -5.31882 9.30911 -4.53769 L 9.30911 4.53769 C 9.30911 5.31882 8.67589 5.95204 7.89476 5.95204 Z M -9.30911 -5.95204'/>
+<path d='M 7.89215 5.95828 L -7.89215 5.95828 C -8.6741 5.95828 -9.308 5.32439 -9.308 4.54243 L -9.308 -4.54243 C -9.308 -5.32439 -8.6741 -5.95828 -7.89215 -5.95828 L 7.89215 -5.95828 C 8.6741 -5.95828 9.308 -5.32439 9.308 -4.54243 L 9.308 4.54243 C 9.308 5.32439 8.6741 5.95828 7.89215 5.95828 Z M -9.308 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.30911,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(73.207147,140.067703)scale(-1,-1)'>
+<g transform='translate(-7.308,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(73.206311,140.073358)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='73.207147' y='140.067703'>Ctrl</text>
+<text class='f6' x='73.206311' y='140.073358'>Ctrl</text>
</g>
</g>
</g>
@@ -190,34 +190,34 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f0' x='83.771702' y='142.474844'>+</text>
-<g stroke-miterlimit='10' transform='translate(99.830029,140.067703)scale(0.996264,-0.996264)'>
+<text class='f0' x='83.769756' y='142.483023'>+</text>
+<g stroke-miterlimit='10' transform='translate(99.825103,140.073358)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-0.20001,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(99.830029,140.067703)scale(-1,-1)'>
+<g transform='translate(-0.1998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(99.825103,140.073358)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(100.029294,140.067703)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(100.024156,140.073358)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 -0.79999 L 0.0 6.13994' fill='none'/>
-<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,6.13994)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 -0.79918 L 0.0 5.94109' fill='none'/>
+<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,5.94109)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -238,23 +238,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='-37.675945' y='157.424262'>Mute<tspan x='-8.887583'>audio</tspan></text>
-<g stroke-miterlimit='10' transform='translate(73.207147,153.842904)scale(0.996264,-0.996264)'>
+<text class='f10' x='-37.675945' y='157.443644'>Mute<tspan x='-8.886864'>audio</tspan></text>
+<g stroke-miterlimit='10' transform='translate(73.206311,153.858532)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.89476 5.95204 L -7.89476 5.95204 C -8.67589 5.95204 -9.30911 5.31882 -9.30911 4.53769 L -9.30911 -4.53769 C -9.30911 -5.31882 -8.67589 -5.95204 -7.89476 -5.95204 L 7.89476 -5.95204 C 8.67589 -5.95204 9.30911 -5.31882 9.30911 -4.53769 L 9.30911 4.53769 C 9.30911 5.31882 8.67589 5.95204 7.89476 5.95204 Z M -9.30911 -5.95204'/>
+<path d='M 7.89215 5.95828 L -7.89215 5.95828 C -8.6741 5.95828 -9.308 5.32439 -9.308 4.54243 L -9.308 -4.54243 C -9.308 -5.32439 -8.6741 -5.95828 -7.89215 -5.95828 L 7.89215 -5.95828 C 8.6741 -5.95828 9.308 -5.32439 9.308 -4.54243 L 9.308 4.54243 C 9.308 5.32439 8.6741 5.95828 7.89215 5.95828 Z M -9.308 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.30911,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(73.207147,153.842904)scale(-1,-1)'>
+<g transform='translate(-7.308,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(73.206311,153.858532)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='73.207147' y='153.842904'>Ctrl</text>
+<text class='f6' x='73.206311' y='153.858532'>Ctrl</text>
</g>
</g>
</g>
@@ -265,34 +265,34 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f0' x='83.771702' y='156.250046'>+</text>
-<g stroke-miterlimit='10' transform='translate(99.830029,153.842904)scale(0.996264,-0.996264)'>
+<text class='f0' x='83.769756' y='156.268197'>+</text>
+<g stroke-miterlimit='10' transform='translate(99.825103,153.858532)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-0.20001,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(99.830029,153.842904)scale(-1,-1)'>
+<g transform='translate(-0.1998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(99.825103,153.858532)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(100.029294,153.842904)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(100.024156,153.858532)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 6.4749 L 0.0 -0.46503' fill='none'/>
-<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.46503)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 6.29997 L 0.0 -0.44029' fill='none'/>
+<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.44029)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -313,23 +313,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='-37.675945' y='171.199463'>T<tspan x='-30.706495'>oggle</tspan><tspan x='-2.827677'>F</tspan><tspan x='3.384674'>ull-Screen</tspan></text>
-<g stroke-miterlimit='10' transform='translate(73.172396,167.618106)scale(0.996264,-0.996264)'>
+<text class='f10' x='-37.675945' y='171.228818'>T<tspan x='-30.705033'>oggle</tspan><tspan x='-2.832315'>F</tspan><tspan x='3.385871'>ull-Screen</tspan></text>
+<g stroke-miterlimit='10' transform='translate(73.174935,167.643705)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.85988 5.95204 L -7.85988 5.95204 C -8.641 5.95204 -9.27423 5.31882 -9.27423 4.53769 L -9.27423 -4.53769 C -9.27423 -5.31882 -8.641 -5.95204 -7.85988 -5.95204 L 7.85988 -5.95204 C 8.641 -5.95204 9.27423 -5.31882 9.27423 -4.53769 L 9.27423 4.53769 C 9.27423 5.31882 8.641 5.95204 7.85988 5.95204 Z M -9.27423 -5.95204'/>
+<path d='M 7.86066 5.95828 L -7.86066 5.95828 C -8.64261 5.95828 -9.2765 5.32439 -9.2765 4.54243 L -9.2765 -4.54243 C -9.2765 -5.32439 -8.64261 -5.95828 -7.86066 -5.95828 L 7.86066 -5.95828 C 8.64261 -5.95828 9.2765 -5.32439 9.2765 -4.54243 L 9.2765 4.54243 C 9.2765 5.32439 8.64261 5.95828 7.86066 5.95828 Z M -9.2765 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.27423,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(73.172396,167.618106)scale(-1,-1)'>
+<g transform='translate(-7.2765,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(73.174935,167.643705)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='73.172396' y='167.618106'>F11</text>
+<text class='f6' x='73.174935' y='167.643705'>F11</text>
</g>
</g>
</g>
@@ -340,38 +340,38 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<rect x='154.771657' y='76.704758' height='.3985' width='174.684548'/>
-<text class='f10' x='160.749256' y='86.58765'>Command<tspan x='259.734933' y='86.58765'>Shortcut</tspan></text>
-<rect x='154.771657' y='90.652439' height='.3985' width='174.684548'/>
-<text class='f10' x='160.749256' y='102.323456'>Seek<tspan x='185.901062'>bac</tspan><tspan x='201.961647'>k</tspan><tspan x='211.355816'>1</tspan></text>
-<text class='f1' x='218.628919' y='102.323456'>%</text>
-<g stroke-miterlimit='10' transform='translate(268.115994,98.742098)scale(0.996264,-0.996264)'>
+<rect x='154.771657' y='76.672439' height='.3985' width='173.698195'/>
+<text class='f10' x='160.749256' y='86.555331'>Command<tspan x='259.737578' y='86.555331'>Shortcut</tspan></text>
+<rect x='154.771657' y='90.62012' height='.3985' width='173.698195'/>
+<text class='f10' x='160.749256' y='102.302948'>Seek<tspan x='185.894702'>bac</tspan><tspan x='201.952884'>k</tspan><tspan x='211.345607'>1</tspan></text>
+<text class='f1' x='218.61871' y='102.302948'>%</text>
+<g stroke-miterlimit='10' transform='translate(268.11864,98.717836)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-3.89998,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(268.115994,98.742098)scale(-1,-1)'>
+<g transform='translate(-3.7998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(268.11864,98.717836)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(275.687561,98.742098)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(275.49082,98.717836)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L -6.93993 2.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,-6.93993,2.0)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 1.998 L -6.74026 1.998' fill='none'/>
+<g transform='matrix(-1.0,0.0,0.0,-1.0,-6.74026,1.998)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -392,35 +392,35 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='160.749256' y='116.098657'>Seek<tspan x='185.901062'>forw</tspan><tspan x='206.537108'>ard</tspan><tspan x='225.961282'>1</tspan></text>
-<text class='f1' x='233.234385' y='116.098657'>%</text>
-<g stroke-miterlimit='10' transform='translate(268.115994,112.5173)scale(0.996264,-0.996264)'>
+<text class='f10' x='160.749256' y='116.088122'>Seek<tspan x='185.894702'>forw</tspan><tspan x='206.534701'>ard</tspan><tspan x='225.963785'>1</tspan></text>
+<text class='f1' x='233.236888' y='116.088122'>%</text>
+<g stroke-miterlimit='10' transform='translate(268.11864,112.50301)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-3.89998,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(268.115994,112.5173)scale(-1,-1)'>
+<g transform='translate(-3.7998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(268.11864,112.50301)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(268.315259,112.5173)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(268.317692,112.50301)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L 6.93993 2.0' fill='none'/>
-<g transform='translate(6.93993,2.0)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 1.998 L 6.74026 1.998' fill='none'/>
+<g transform='translate(6.74026,1.998)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -441,24 +441,24 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='160.749256' y='129.873859'>Seek<tspan x='185.901062'>bac</tspan><tspan x='201.961647'>k</tspan><tspan x='211.355816'>10</tspan></text>
-<text class='f1' x='224.083463' y='129.873859'>%</text>
-<g stroke-miterlimit='10' transform='translate(269.208516,126.292501)scale(0.996264,-0.996264)'>
+<text class='f10' x='160.749256' y='129.873296'>Seek<tspan x='185.894702'>bac</tspan><tspan x='201.952884'>k</tspan><tspan x='211.345607'>10</tspan></text>
+<text class='f1' x='224.073254' y='129.873296'>%</text>
+<g stroke-miterlimit='10' transform='translate(269.210052,126.288184)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.89476 5.95204 L -7.89476 5.95204 C -8.67589 5.95204 -9.30911 5.31882 -9.30911 4.53769 L -9.30911 -4.53769 C -9.30911 -5.31882 -8.67589 -5.95204 -7.89476 -5.95204 L 7.89476 -5.95204 C 8.67589 -5.95204 9.30911 -5.31882 9.30911 -4.53769 L 9.30911 4.53769 C 9.30911 5.31882 8.67589 5.95204 7.89476 5.95204 Z M -9.30911 -5.95204'/>
+<path d='M 7.89215 5.95828 L -7.89215 5.95828 C -8.6741 5.95828 -9.308 5.32439 -9.308 4.54243 L -9.308 -4.54243 C -9.308 -5.32439 -8.6741 -5.95828 -7.89215 -5.95828 L 7.89215 -5.95828 C 8.6741 -5.95828 9.308 -5.32439 9.308 -4.54243 L 9.308 4.54243 C 9.308 5.32439 8.6741 5.95828 7.89215 5.95828 Z M -9.308 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.30911,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(269.208516,126.292501)scale(-1,-1)'>
+<g transform='translate(-7.308,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(269.210052,126.288184)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='269.208516' y='126.292501'>Ctrl</text>
+<text class='f6' x='269.210052' y='126.288184'>Ctrl</text>
</g>
</g>
</g>
@@ -469,34 +469,34 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f0' x='279.773071' y='128.699643'>+</text>
-<g stroke-miterlimit='10' transform='translate(295.831398,126.292501)scale(0.996264,-0.996264)'>
+<text class='f0' x='279.773496' y='128.697849'>+</text>
+<g stroke-miterlimit='10' transform='translate(295.828844,126.288184)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-3.89998,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(295.831398,126.292501)scale(-1,-1)'>
+<g transform='translate(-3.7998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(295.828844,126.288184)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(303.402965,126.292501)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(303.201024,126.288184)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L -6.93993 2.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,-6.93993,2.0)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 1.998 L -6.74026 1.998' fill='none'/>
+<g transform='matrix(-1.0,0.0,0.0,-1.0,-6.74026,1.998)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -517,24 +517,24 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='160.749256' y='143.64906'>Seek<tspan x='185.901062'>forw</tspan><tspan x='206.537108'>ard</tspan><tspan x='225.961282'>10</tspan></text>
-<text class='f1' x='238.688929' y='143.64906'>%</text>
-<g stroke-miterlimit='10' transform='translate(269.208516,140.067703)scale(0.996264,-0.996264)'>
+<text class='f10' x='160.749256' y='143.65847'>Seek<tspan x='185.894702'>forw</tspan><tspan x='206.534701'>ard</tspan><tspan x='225.963785'>10</tspan></text>
+<text class='f1' x='238.691431' y='143.65847'>%</text>
+<g stroke-miterlimit='10' transform='translate(269.210052,140.073358)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 7.89476 5.95204 L -7.89476 5.95204 C -8.67589 5.95204 -9.30911 5.31882 -9.30911 4.53769 L -9.30911 -4.53769 C -9.30911 -5.31882 -8.67589 -5.95204 -7.89476 -5.95204 L 7.89476 -5.95204 C 8.67589 -5.95204 9.30911 -5.31882 9.30911 -4.53769 L 9.30911 4.53769 C 9.30911 5.31882 8.67589 5.95204 7.89476 5.95204 Z M -9.30911 -5.95204'/>
+<path d='M 7.89215 5.95828 L -7.89215 5.95828 C -8.6741 5.95828 -9.308 5.32439 -9.308 4.54243 L -9.308 -4.54243 C -9.308 -5.32439 -8.6741 -5.95828 -7.89215 -5.95828 L 7.89215 -5.95828 C 8.6741 -5.95828 9.308 -5.32439 9.308 -4.54243 L 9.308 4.54243 C 9.308 5.32439 8.6741 5.95828 7.89215 5.95828 Z M -9.308 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.30911,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(269.208516,140.067703)scale(-1,-1)'>
+<g transform='translate(-7.308,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(269.210052,140.073358)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='269.208516' y='140.067703'>Ctrl</text>
+<text class='f6' x='269.210052' y='140.073358'>Ctrl</text>
</g>
</g>
</g>
@@ -545,34 +545,34 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f0' x='279.773071' y='142.474844'>+</text>
-<g stroke-miterlimit='10' transform='translate(295.831398,140.067703)scale(0.996264,-0.996264)'>
+<text class='f0' x='279.773496' y='142.483023'>+</text>
+<g stroke-miterlimit='10' transform='translate(295.828844,140.073358)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
+<path d='M 6.79665 5.95828 L -6.79665 5.95828 C -7.5786 5.95828 -8.2125 5.32439 -8.2125 4.54243 L -8.2125 -4.54243 C -8.2125 -5.32439 -7.5786 -5.95828 -6.79665 -5.95828 L 6.79665 -5.95828 C 7.5786 -5.95828 8.2125 -5.32439 8.2125 -4.54243 L 8.2125 4.54243 C 8.2125 5.32439 7.5786 5.95828 6.79665 5.95828 Z M -8.2125 -5.95828'/>
</g>
</g>
-<g transform='translate(-3.89998,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(295.831398,140.067703)scale(-1,-1)'>
+<g transform='translate(-3.7998,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(295.828844,140.073358)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(296.030663,140.067703)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(296.027896,140.073358)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
-<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L 6.93993 2.0' fill='none'/>
-<g transform='translate(6.93993,2.0)'>
-<g stroke-width='0.32'>
+<g stroke-width='0.39961'>
+<path d='M 0.0 1.998 L 6.74026 1.998' fill='none'/>
+<g transform='translate(6.74026,1.998)'>
+<g stroke-width='0.31969'>
<g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ <path d=' M -1.19962 1.59949 C -1.09964 0.99968 0.0 0.09996 0.2999 0.0 C 0.0 -0.09996 -1.09964 -0.99968 -1.19962 -1.59949 ' fill='none'/>
</g>
</g>
</g>
@@ -593,23 +593,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='160.749256' y='157.424262'>Seek<tspan x='185.901062'>to</tspan><tspan x='199.234516'>b</tspan><tspan x='205.598088'>eginning</tspan></text>
-<g stroke-miterlimit='10' transform='translate(273.196673,153.842904)scale(0.996264,-0.996264)'>
+<text class='f10' x='160.749256' y='157.443644'>Seek<tspan x='185.894702'>to</tspan><tspan x='199.225605'>b</tspan><tspan x='205.596508'>eginning</tspan></text>
+<g stroke-miterlimit='10' transform='translate(273.200094,153.858532)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 11.89787 5.95204 L -11.89787 5.95204 C -12.679 5.95204 -13.31223 5.31882 -13.31223 4.53769 L -13.31223 -4.53769 C -13.31223 -5.31882 -12.679 -5.95204 -11.89787 -5.95204 L 11.89787 -5.95204 C 12.679 -5.95204 13.31223 -5.31882 13.31223 -4.53769 L 13.31223 4.53769 C 13.31223 5.31882 12.679 5.95204 11.89787 5.95204 Z M -13.31223 -5.95204'/>
+<path d='M 11.89716 5.95828 L -11.89716 5.95828 C -12.67911 5.95828 -13.313 5.32439 -13.313 4.54243 L -13.313 -4.54243 C -13.313 -5.32439 -12.67911 -5.95828 -11.89716 -5.95828 L 11.89716 -5.95828 C 12.67911 -5.95828 13.313 -5.32439 13.313 -4.54243 L 13.313 4.54243 C 13.313 5.32439 12.67911 5.95828 11.89716 5.95828 Z M -13.313 -5.95828'/>
</g>
</g>
-<g transform='translate(-11.31223,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(273.196673,153.842904)scale(-1,-1)'>
+<g transform='translate(-11.313,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(273.200094,153.858532)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='273.196673' y='153.842904'>Home</text>
+<text class='f6' x='273.200094' y='153.858532'>Home</text>
</g>
</g>
</g>
@@ -620,23 +620,23 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f10' x='160.749256' y='171.199463'>Seek<tspan x='185.901062'>to</tspan><tspan x='199.234516'>end</tspan></text>
-<g stroke-miterlimit='10' transform='translate(269.453873,167.618106)scale(0.996264,-0.996264)'>
+<text class='f10' x='160.749256' y='171.228818'>Seek<tspan x='185.894702'>to</tspan><tspan x='199.225605'>end</tspan></text>
+<g stroke-miterlimit='10' transform='translate(269.456624,167.643705)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
<g stroke='#4c4c4c'>
<g fill='#f3f3f3'>
-<path d='M 8.14104 5.95204 L -8.14104 5.95204 C -8.92216 5.95204 -9.55539 5.31882 -9.55539 4.53769 L -9.55539 -4.53769 C -9.55539 -5.31882 -8.92216 -5.95204 -8.14104 -5.95204 L 8.14104 -5.95204 C 8.92216 -5.95204 9.55539 -5.31882 9.55539 -4.53769 L 9.55539 4.53769 C 9.55539 5.31882 8.92216 5.95204 8.14104 5.95204 Z M -9.55539 -5.95204'/>
+<path d='M 8.13965 5.95828 L -8.13965 5.95828 C -8.9216 5.95828 -9.5555 5.32439 -9.5555 4.54243 L -9.5555 -4.54243 C -9.5555 -5.32439 -8.9216 -5.95828 -8.13965 -5.95828 L 8.13965 -5.95828 C 8.9216 -5.95828 9.5555 -5.32439 9.5555 -4.54243 L 9.5555 4.54243 C 9.5555 5.32439 8.9216 5.95828 8.13965 5.95828 Z M -9.5555 -5.95828'/>
</g>
</g>
-<g transform='translate(-7.55539,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(269.453873,167.618106)scale(-1,-1)'>
+<g transform='translate(-7.5555,-2.6547)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(269.456624,167.643705)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f6' x='269.453873' y='167.618106'>End</text>
+<text class='f6' x='269.456624' y='167.643705'>End</text>
</g>
</g>
</g>
@@ -648,9 +648,9 @@ text.f10 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<a xlink:href='beamer-example-3.svg' xlink:title='beamer-example-3.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.255493' y='-70.15154' width='10.545452' height='10.403634'/>
-<text class='f9' x='357.755493' y='-60.858816'><tspan fill='#adade0'></tspan></text>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.250568' y='-70.149078' width='10.545452' height='10.403634'/>
+<text class='f9' x='357.750568' y='-60.856353'><tspan fill='#adade0'></tspan></text>
</a>
-<text class='f9' x='369.649393' y='-60.858816'><tspan fill='#bfbfbf'></tspan></text>
+<text class='f9' x='369.64693' y='-60.856353'><tspan fill='#bfbfbf'></tspan></text>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example.tex b/macros/latex/contrib/media4svg/example/beamer-example.tex
index c00834d218..5597c404d4 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example.tex
+++ b/macros/latex/contrib/media4svg/example/beamer-example.tex
@@ -1,8 +1,7 @@
\documentclass[dvisvgm,hypertex,aspectratio=169]{beamer}
-\usepackage[british]{babel}
\usefonttheme{serif}
-\usepackage[T1]{fontenc}
+\usepackage[british]{babel}
\usepackage{media4svg}
\usepackage{menukeys,siunitx,calc}
diff --git a/macros/latex/contrib/media4svg/media4svg.sty b/macros/latex/contrib/media4svg/media4svg.sty
index 58508dc662..4a3396f10a 100644
--- a/macros/latex/contrib/media4svg/media4svg.sty
+++ b/macros/latex/contrib/media4svg/media4svg.sty
@@ -23,24 +23,13 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
+\def\g@msvg@date@tl{2022/08/04}
+\def\g@msvg@version@tl{0.8}
-\def\g@msvg@date@tl{2022/05/18}
-\def\g@msvg@version@tl{0.7}
-
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{media4svg}{\g@msvg@date@tl}{\g@msvg@version@tl}
{multimedia inclusion with dvisvgm}
-\sys_if_output_pdf:T{
- \PackageError{media4svg}{
- Wrong~output~format~(PDF).\MessageBreak
- This~package~only~works~with~the~`dvisvgm'~backend.\MessageBreak
- A~TeX~engine~must~be~used~that~produces\MessageBreak
- DVI~or~XDV~output
- }{}%
-}
-
\tl_gset_eq:NN\g_msvg_date_tl\g@msvg@date@tl
\tl_gset_eq:NN\g_msvg_version_tl\g@msvg@version@tl
@@ -50,7 +39,6 @@
perhaps~it~is~spelled~incorrectly.
}
-\bool_new:N\g_msvg_dvisvgm_bool
\bool_new:N\g_msvg_pkgdraft_bool
\bool_new:N\g_msvg_pkgembed_bool
\bool_gset_true:N\g_msvg_pkgembed_bool
@@ -68,13 +56,10 @@
\tl_gset:Nn\g_msvg_pkgmtype_tl{audio/mpeg}
\keys_define:nn{media4svg}{
- dvisvgm .choice:,
- dvisvgm / true .code:n = {
- \bool_gset_true:N\g_msvg_dvisvgm_bool
-% \PassOptionsToPackage{dvisvgm}{pdfbase}
+ dvisvgm .code:n = {
+ \PassOptionsToPackage{dvisvgm}{pdfbase}
},
- dvisvgm / false .code:n = {\bool_gset_false:N\g_msvg_dvisvgm_bool},
- dvisvgm .default:n = {true},
+ dvisvgm .value_forbidden:n = true,
draft .bool_gset:N = \g_msvg_pkgdraft_bool,
@@ -145,13 +130,25 @@
\msg_error:nnx{media4svg}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{media4svg}
+\ProcessKeyOptions[media4svg]
+
+\RequirePackage{pdfbase}
+
+\sys_if_output_pdf:T{
+ \PackageError{media4svg}{
+ Wrong~output~format~(PDF).\MessageBreak
+ This~package~only~works~with~the~`dvisvgm'~backend.\MessageBreak
+ A~TeX~engine~must~be~used~that~produces\MessageBreak
+ DVI~or~XDV~output
+ }{}%
+}
\msg_set:nnnn{media4svg}{missing~driver~option}{Global~option~`dvisvgm'~no~set.}{
This~package~only~works~with~the~`dvisvgm'~backend.\\
- Set~`dvisvgm'~as~documentclass~option.
+ Set~`dvisvgm'~as~a~package~or~documentclass~option.
}
-\bool_if:NF\g_msvg_dvisvgm_bool{
+
+\bool_if:NF\g_pbs_dvisvgm_bool{
\msg_error:nn{media4svg}{missing~driver~option}
}
diff --git a/macros/latex/contrib/media9/ChangeLog b/macros/latex/contrib/media9/ChangeLog
index 455df93cc4..a0a11296e1 100644
--- a/macros/latex/contrib/media9/ChangeLog
+++ b/macros/latex/contrib/media9/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-04
+ * v1.25 : media9.sty
+ * v0.55 : pdfbase.sty
+ * fix : pkg option processing acc. to new LaTeX format 22-06-01
+
2022-03-18
* v1.24 : media9.sty
* v0.54 : pdfbase.sty
diff --git a/macros/latex/contrib/media9/doc/media9.pdf b/macros/latex/contrib/media9/doc/media9.pdf
index 9f4ede4536..2b85529903 100644
--- a/macros/latex/contrib/media9/doc/media9.pdf
+++ b/macros/latex/contrib/media9/doc/media9.pdf
Binary files differ
diff --git a/macros/latex/contrib/media9/doc/media9.tex b/macros/latex/contrib/media9/doc/media9.tex
index d7acd9d0e3..a593d7bfe9 100644
--- a/macros/latex/contrib/media9/doc/media9.tex
+++ b/macros/latex/contrib/media9/doc/media9.tex
@@ -5,16 +5,15 @@
% for the details of that license.
%
\listfiles
-%%%%%%% pdfmanagement-testphase %%%%%%
-\RequirePackage{pdfmanagement-testphase} % load the package
-\DeclareDocumentMetadata % activates the PDF management interface
+%%%%%%%% pdfmanagement-testphase %%%%%%
+\DocumentMetadata % activates the PDF management interface
{
%uncompress,
}
-%%%%%% /pdfmanagement-testphase %%%%%%
+%%%%%%% /pdfmanagement-testphase %%%%%%
\documentclass[a4paper]{article}
\frenchspacing
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc}
\usepackage{textcomp}
\usepackage[attachfiles]{media9}
%\usepackage[draft]{media9}
@@ -25,8 +24,8 @@
\usepackage[main=UKenglish,nil]{babel}
\usepackage{graphicx}
\usepackage{color}
-\usepackage[T1]{fontenc}
-%\usepackage{lmodern}
+%\usepackage[T1]{fontenc}
+%%\usepackage{lmodern}
%\usepackage[scaled=0.85]{luximono}
\usepackage[tt=false]{libertine} %override beramono (doesn't look like tt font)
\usepackage[libertine]{newtxmath}
@@ -40,7 +39,7 @@
\usepackage{hypcap}
\def\keywords{embed flash movie LaTeX pdf 3d include sound swf mp3 video mp4 h.264 aac slideshow image gallery flv audio multimedia streamed media rtmp YouTube animation JavaScript pdfLaTeX dvips ps2pdf dvipdfmx XeLaTeX u3d prc Adobe Reader Foxit RichMedia annotation LuaLaTeX}
\hypersetup{
- bookmarksnumbered,linktocpage,breaklinks,
+ bookmarksnumbered,linktocpage,%breaklinks,
pdftitle={The media9 Package},
pdfsubject={Documentation},
pdfauthor={Alexander Grahn},
diff --git a/macros/latex/contrib/media9/media9.sty b/macros/latex/contrib/media9/media9.sty
index 2c4db16dc2..c1e00febb4 100644
--- a/macros/latex/contrib/media9/media9.sty
+++ b/macros/latex/contrib/media9/media9.sty
@@ -39,26 +39,25 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
+\def\g@mix@date@tl{2022/08/04}
+\def\g@mix@version@tl{1.25}
-\def\g@mix@date@tl{2022/03/18}
-\def\g@mix@version@tl{1.24}
-
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
{acrobat-9/X~compatible~media}
\tl_gset_eq:NN\g_mix_date_tl\g@mix@date@tl
\tl_gset_eq:NN\g_mix_version_tl\g@mix@version@tl
-%package options
+% package options
-%unknown package option error message
\msg_set:nnnn{media9}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
+\msg_set:nnn{media9}{generic~msg}{#1\\#2}
+
\bool_new:N\g_mix_pkgattach_bool
\bool_new:N\g_mix_dvipdfmx_bool
\bool_new:N\g_mix_pkgdraft_bool
@@ -112,15 +111,23 @@
}
\keys_define:nn{media9}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {
- \bool_gset_true:N\g_mix_dvipdfmx_bool
+ xetex .code:n = {},
+ xetex .value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
+
+ dvipdfmx .code:n = {
\PassOptionsToPackage{dvipdfmx}{pdfbase}
+ \PassOptionsToPackage{dvipdfmx}{ocgbase}
},
- dvipdfmx / false .code:n = {\bool_gset_false:N\g_mix_dvipdfmx_bool},
- dvipdfmx .default:n = {true},
+ dvipdfmx .value_forbidden:n = true,
bigfiles .choice:,
bigfiles / true .code:n = {
@@ -290,11 +297,21 @@
\msg_error:nnx{media9}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{media9}
-\sys_if_engine_xetex:T{\bool_gset_true:N\g_mix_dvipdfmx_bool}
+\ProcessKeyOptions[media9]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{pdfbase}
+
+\bool_gset_eq:NN\g_mix_dvipdfmx_bool\g_pbs_dvipdfmx_bool
+
+\bool_if:NT\g_pbs_dvisvgm_bool{
+ \msg_error:nnnn{media9}{generic~msg}{
+ Package~`media9'~is~incompatible~with~the~`dvisvgm'~backend.
+ }{
+ Use~package~`media4svg'~instead.
+ }
+}
+
%aliases for commands from pdfbase.sty
\cs_set_eq:NN\mix_pdfobj:nnn \pbs_pdfobj:nnn
\cs_set_eq:NN\mix_pdfannot:nnnn\pbs_pdfannot:nnnn
@@ -2429,26 +2446,25 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
+\def\g@mix@date@tl{2022/08/04}
+\def\g@mix@version@tl{1.25}
-\def\g@mix@date@tl{2022/03/18}
-\def\g@mix@version@tl{1.24}
-
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
{acrobat-9/X compatible media}
\tl_gset_eq:NN\g_mix_date_tl\g@mix@date@tl
\tl_gset_eq:NN\g_mix_version_tl\g@mix@version@tl
-%package options
+% package options
-%unknown package option error message
\msg_set:nnnn{media9}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
+\msg_set:nnn{media9}{generic~msg}{#1\\#2}
+
\bool_new:N\g_mix_pkgattach_bool
\bool_new:N\g_mix_dvipdfmx_bool
\bool_new:N\g_mix_pkgdraft_bool
@@ -2502,15 +2518,23 @@
}
\keys_define:nn{media9}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {
- \bool_gset_true:N\g_mix_dvipdfmx_bool
+ xetex .code:n = {},
+ xetex .value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
+
+ dvipdfmx .code:n = {
\PassOptionsToPackage{dvipdfmx}{pdfbase}
+ \PassOptionsToPackage{dvipdfmx}{ocgbase}
},
- dvipdfmx / false .code:n = {\bool_gset_false:N\g_mix_dvipdfmx_bool},
- dvipdfmx .default:n = {true},
+ dvipdfmx .value_forbidden:n = true,
bigfiles .choice:,
bigfiles / true .code:n = {
@@ -2680,11 +2704,21 @@
\msg_error:nnx{media9}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{media9}
-\sys_if_engine_xetex:T{\bool_gset_true:N\g_mix_dvipdfmx_bool}
+\ProcessKeyOptions[media9]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{pdfbase}
+
+\bool_gset_eq:NN\g_mix_dvipdfmx_bool\g_pbs_dvipdfmx_bool
+
+\bool_if:NT\g_pbs_dvisvgm_bool{
+ \msg_error:nnnn{media9}{generic~msg}{
+ Package~`media9'~is~incompatible~with~the~`dvisvgm'~backend.
+ }{
+ Use~package~`media4svg'~instead.
+ }
+}
+
%aliases for commands from pdfbase.sty
\cs_set_eq:NN\mix_pdfobj:nnn \pbs_pdfobj:nnn
\cs_set_eq:NN\mix_pdfannot:nnnn\pbs_pdfannot:nnnn
diff --git a/macros/latex/contrib/media9/pdfbase.sty b/macros/latex/contrib/media9/pdfbase.sty
index a5cc1dcb44..67ff708ad5 100644
--- a/macros/latex/contrib/media9/pdfbase.sty
+++ b/macros/latex/contrib/media9/pdfbase.sty
@@ -156,15 +156,95 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
+\def\g@pbs@date@tl{2022/08/04}
+\def\g@pbs@version@tl{0.55}
-\def\g@pbs@date@tl{2022/03/18}
-\def\g@pbs@version@tl{0.54}
-
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
{driver~independent~access~to~low-level~PDF~features}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% package options
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
+ Package option~'#1'~is~unknown;\\
+ perhaps~it~is~spelled~incorrectly.
+}
+
+\bool_new:N\g_pbs_pkgbigfiles_bool
+\bool_new:N\g_pbs_dvipdfmx_bool
+\bool_new:N\g_pbs_dvisvgm_bool
+\str_new:N\g_pbs_backend_str
+
+\keys_define:nn{pdfbase}{
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
+
+ dvipdfmx .code:n = {
+ \str_gset:Nn\g_pbs_backend_str{dvipdfmx}
+ },
+ dvipdfmx .value_forbidden:n = true,
+
+ dvisvgm .code:n = {
+ \str_gset:Nn\g_pbs_backend_str{dvisvgm}
+ },
+ dvisvgm .value_forbidden:n = true,
+
+ bigfiles .bool_gset:N = \g_pbs_pkgbigfiles_bool,
+
+ unknown .code:n = {
+ \msg_error:nnx{pdfbase}{unknown~package~option}{\l_keys_key_tl}
+ }
+}
+\ProcessKeyOptions[pdfbase]
+
+% ensure that backend code is loaded
+% possible values for \c_sys_backend_str: pdftex, luatex, xetex, dvips, dvipdfmx, dvisvgm
+\cs_if_exist:NF\c_sys_backend_str{\sys_load_backend:n{}}
+
+\sys_if_output_pdf:TF{ % this excludes dvipdfmx, dvisvgm
+ \bool_gset_false:N\g_pbs_dvipdfmx_bool
+ \bool_gset_false:N\g_pbs_dvisvgm_bool
+}{
+ \str_case_e:nnF{\g_pbs_backend_str}{ % pdfbase options have precedence
+ {dvipdfmx}{
+ \bool_gset_true:N\g_pbs_dvipdfmx_bool
+ \bool_gset_false:N\g_pbs_dvisvgm_bool
+ }
+ {dvisvgm}{
+ \bool_gset_false:N\g_pbs_dvipdfmx_bool
+ \bool_gset_true:N\g_pbs_dvisvgm_bool
+ }
+ }{ % otherwise let the L3 backend code decide
+ \str_case_e:nn{\c_sys_backend_str}{
+ {dvisvgm}{
+ \bool_gset_false:N\g_pbs_dvipdfmx_bool
+ \bool_gset_true:N\g_pbs_dvisvgm_bool
+ }
+ {dvipdfmx}{
+ \bool_gset_true:N\g_pbs_dvipdfmx_bool
+ \bool_gset_false:N\g_pbs_dvisvgm_bool
+ }
+ }
+ }
+}
+
+\sys_if_engine_xetex:T{
+ \bool_if:NF\g_pbs_dvisvgm_bool{\bool_gset_true:N\g_pbs_dvipdfmx_bool}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\int_new:N\g_pbs_page_int %abs. page counter
%creating global definitions
@@ -172,8 +252,7 @@
\msg_set:nnn{pdfbase}{rerun}{Rerun~to~get~internal~references~right!}
-%LaTeX2e wrapper
-\cs_new_nopar:Npn\pbs@seq@push@cx#1#2{
+\cs_new_protected_nopar:Npn\pbs@seq@push@cx#1#2{
\seq_if_exist:cF{#1}{\seq_new:c{#1}}
\seq_gput_right:cx{#1}{#2}
}
@@ -191,6 +270,8 @@
\seq_new:N\g_pbs_bop_seq
\seq_new:N\g_pbs_eop_seq
+\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
+\bool_new:N\g_pbs_ocgbase_loaded_bool
\AtBeginDocument{
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\pbs@newkey[2]{}
@@ -198,65 +279,14 @@
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\pbs@seq@push@cx[2]{}
}
-}
-
-%%%%%%%%%%%%%%%%%
-%package options
-%%%%%%%%%%%%%%%%%
-%unknown package option error message
-\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
- Package option~'#1'~is~unknown;\\
- perhaps~it~is~spelled~incorrectly.
-}
-
-\bool_new:N\g_pbs_pkgbigfiles_bool
-\bool_new:N\g_pbs_dvipdfmx_bool
-\bool_new:N\g_pbs_dvisvgm_bool
-\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
-\AtBeginDocument{
\cs_if_exist:NT\landscape{%
\tl_put_right:Nn\landscape{\bool_gset_true:N\g_pbs_lscape_bool}
\tl_put_left:Nn\endlandscape{\bool_gset_false:N\g_pbs_lscape_bool}
}
+ \@ifpackageloaded{ocgbase}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}{}
}
-\keys_define:nn{pdfbase}{
- xetex .code:n = {}, %dummy, we use engine test instead
-
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {
- \bool_gset_true:N\g_pbs_dvipdfmx_bool
- \bool_gset_false:N\g_pbs_dvisvgm_bool
- },
- dvipdfmx / false .code:n = {\bool_gset_false:N\g_pbs_dvipdfmx_bool},
- dvipdfmx .default:n = {true},
-
- dvisvgm .choice:,
- dvisvgm / true .code:n = {
- \bool_gset_true:N\g_pbs_dvisvgm_bool
- \bool_gset_false:N\g_pbs_dvipdfmx_bool
- },
- dvisvgm / false .code:n = {\bool_gset_false:N\g_pbs_dvisvgm_bool},
- dvisvgm .default:n = {true},
-
- bigfiles .bool_gset:N = \g_pbs_pkgbigfiles_bool,
-
- unknown .code:n = {
- \msg_error:nnx{pdfbase}{unknown~package~option}{\l_keys_key_tl}
- }
-}
-\ProcessKeysOptions{pdfbase}
-
-\sys_if_output_pdf:T{
- \bool_gset_false:N\g_pbs_dvipdfmx_bool
- \bool_gset_false:N\g_pbs_dvisvgm_bool
-}
-
-\sys_if_engine_xetex:T{
- \bool_if:NF\g_pbs_dvisvgm_bool{\bool_gset_true:N\g_pbs_dvipdfmx_bool}
-}
-
-\cs_new_nopar:Nn\pbs_insert_properties_entry:{}
+\cs_new_protected_nopar:Nn\pbs_insert_properties_entry:{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%commands for creating PDF objects, annots etc.
@@ -281,7 +311,7 @@
\cs_set_protected:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax}
\cs_set_protected:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax}
\cs_set:Npn\pdfpageref{\pdffeedback~pageref}
- \cs_set:Npx\pdfpageresources{\pdfvariable~pageresources}
+ \cs_set_protected:Npx\pdfpageresources{\pdfvariable~pageresources}
\cs_set_eq:NN\pdfximage\saveimageresource
\cs_set_eq:NN\pdfrefximage\useimageresource
\cs_set_eq:NN\pdflastximage\lastsavedimageresourceindex
@@ -462,7 +492,7 @@
\cs_new_protected_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}}
%inserts /Properties <<...>> entry into page resources
- \cs_gset:Nn\pbs_insert_properties_entry:{
+ \cs_gset_protected:Nn\pbs_insert_properties_entry:{
\pbs_zap_properties: %purge those from previous page
\tl_set:Nx\l_tmpa_tl{\seq_if_exist:cT{pbs@props@\int_use:N\g_pbs_page_int}{
\seq_use:cn{pbs@props@\int_use:N\g_pbs_page_int}{~}}}
@@ -677,7 +707,7 @@
/Properties~<</rm@oc\int_use:N\g_pbs_oc_int\space#2>>>>}
\int_gincr:N\g_pbs_oc_int
}
- \cs_new_nopar:Nn\pbs_pdfemc:{\special{pdf:code~EMC}}
+ \cs_new_protected_nopar:Nn\pbs_pdfemc:{\special{pdf:code~EMC}}
}{
\bool_if:NTF\g_pbs_dvisvgm_bool{
\tl_gset:Nx\g_pbs_hash_tl{\token_to_str:N#}
@@ -1242,7 +1272,7 @@
}
}
}
- \cs_new_nopar:Nn\pbs_pdfemc:{\pbs_special:n{~mark~/EMC~pdfmark}}
+ \cs_new_protected_nopar:Nn\pbs_pdfemc:{\pbs_special:n{~mark~/EMC~pdfmark}}
}
}
}
@@ -1275,7 +1305,7 @@
%modify output routine for output box insertions
\bool_new:N\l_pbs_is_vertical_bool
\cs_set_eq:NN\pbs_outputpage_orig:\@outputpage
-\cs_set_nopar:Npn\@outputpage{
+\cs_set_protected_nopar:Npn\@outputpage{
\int_gincr:N\g_pbs_page_int
\box_if_vertical:cTF{@outputbox}{
\bool_set_true:N\l_pbs_is_vertical_bool
@@ -1295,10 +1325,6 @@
\pbs_outputpage_orig:
}
-\bool_new:N\g_pbs_ocgbase_loaded_bool
-\AtBeginDocument{
- \@ifpackageloaded{ocgbase}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}{}
-}
\AddToHook{shipout/foreground}{
%insert /Properties into current page's resources
\put(0,0){\pbs_insert_properties_entry:}
@@ -1513,15 +1539,95 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
+\def\g@pbs@date@tl{2022/08/04}
+\def\g@pbs@version@tl{0.55}
-\def\g@pbs@date@tl{2022/03/18}
-\def\g@pbs@version@tl{0.54}
-
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
{driver independent access to low-level PDF features}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% package options
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
+ Package option~'#1'~is~unknown;\\
+ perhaps~it~is~spelled~incorrectly.
+}
+
+\bool_new:N\g_pbs_pkgbigfiles_bool
+\bool_new:N\g_pbs_dvipdfmx_bool
+\bool_new:N\g_pbs_dvisvgm_bool
+\str_new:N\g_pbs_backend_str
+
+\keys_define:nn{pdfbase}{
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
+
+ dvipdfmx .code:n = {
+ \str_gset:Nn\g_pbs_backend_str{dvipdfmx}
+ },
+ dvipdfmx .value_forbidden:n = true,
+
+ dvisvgm .code:n = {
+ \str_gset:Nn\g_pbs_backend_str{dvisvgm}
+ },
+ dvisvgm .value_forbidden:n = true,
+
+ bigfiles .bool_gset:N = \g_pbs_pkgbigfiles_bool,
+
+ unknown .code:n = {
+ \msg_error:nnx{pdfbase}{unknown~package~option}{\l_keys_key_tl}
+ }
+}
+\ProcessKeyOptions[pdfbase]
+
+% ensure that backend code is loaded
+% possible values for \c_sys_backend_str: pdftex, luatex, xetex, dvips, dvipdfmx, dvisvgm
+\cs_if_exist:NF\c_sys_backend_str{\sys_load_backend:n{}}
+
+\sys_if_output_pdf:TF{ % this excludes dvipdfmx, dvisvgm
+ \bool_gset_false:N\g_pbs_dvipdfmx_bool
+ \bool_gset_false:N\g_pbs_dvisvgm_bool
+}{
+ \str_case_e:nnF{\g_pbs_backend_str}{ % pdfbase options have precedence
+ {dvipdfmx}{
+ \bool_gset_true:N\g_pbs_dvipdfmx_bool
+ \bool_gset_false:N\g_pbs_dvisvgm_bool
+ }
+ {dvisvgm}{
+ \bool_gset_false:N\g_pbs_dvipdfmx_bool
+ \bool_gset_true:N\g_pbs_dvisvgm_bool
+ }
+ }{ % otherwise let the L3 backend code decide
+ \str_case_e:nn{\c_sys_backend_str}{
+ {dvisvgm}{
+ \bool_gset_false:N\g_pbs_dvipdfmx_bool
+ \bool_gset_true:N\g_pbs_dvisvgm_bool
+ }
+ {dvipdfmx}{
+ \bool_gset_true:N\g_pbs_dvipdfmx_bool
+ \bool_gset_false:N\g_pbs_dvisvgm_bool
+ }
+ }
+ }
+}
+
+\sys_if_engine_xetex:T{
+ \bool_if:NF\g_pbs_dvisvgm_bool{\bool_gset_true:N\g_pbs_dvipdfmx_bool}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\int_new:N\g_pbs_page_int %abs. page counter
%creating global definitions
@@ -1529,8 +1635,7 @@
\msg_set:nnn{pdfbase}{rerun}{Rerun~to~get~internal~references~right!}
-%LaTeX2e wrapper
-\cs_new_nopar:Npn\pbs@seq@push@cx#1#2{
+\cs_new_protected_nopar:Npn\pbs@seq@push@cx#1#2{
\seq_if_exist:cF{#1}{\seq_new:c{#1}}
\seq_gput_right:cx{#1}{#2}
}
@@ -1548,6 +1653,8 @@
\seq_new:N\g_pbs_bop_seq
\seq_new:N\g_pbs_eop_seq
+\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
+\bool_new:N\g_pbs_ocgbase_loaded_bool
\AtBeginDocument{
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\pbs@newkey[2]{}
@@ -1555,66 +1662,14 @@
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\pbs@seq@push@cx[2]{}
}
-}
-
-%%%%%%%%%%%%%%%%%
-%package options
-%%%%%%%%%%%%%%%%%
-%unknown package option error message
-\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
- Package option~'#1'~is~unknown;\\
- perhaps~it~is~spelled~incorrectly.
-}
-
-\bool_new:N\g_pbs_pkgbigfiles_bool
-\bool_new:N\g_pbs_dvipdfmx_bool
-\bool_new:N\g_pbs_dvisvgm_bool
-\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env
-\AtBeginDocument{
\cs_if_exist:NT\landscape{%
\tl_put_right:Nn\landscape{\bool_gset_true:N\g_pbs_lscape_bool}
\tl_put_left:Nn\endlandscape{\bool_gset_false:N\g_pbs_lscape_bool}
}
+ \@ifpackageloaded{ocgbase}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}{}
}
-\keys_define:nn{pdfbase}{
- xetex .code:n = {}, %dummy, we use engine test instead
-
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {
- \bool_gset_true:N\g_pbs_dvipdfmx_bool
- \bool_gset_false:N\g_pbs_dvisvgm_bool
- },
- dvipdfmx / false .code:n = {\bool_gset_false:N\g_pbs_dvipdfmx_bool},
- dvipdfmx .default:n = {true},
-
- dvisvgm .choice:,
- dvisvgm / true .code:n = {
- \bool_gset_true:N\g_pbs_dvisvgm_bool
- \bool_gset_false:N\g_pbs_dvipdfmx_bool
- },
- dvisvgm / false .code:n = {\bool_gset_false:N\g_pbs_dvisvgm_bool},
- dvisvgm .default:n = {true},
-
- bigfiles .bool_gset:N = \g_pbs_pkgbigfiles_bool,
-
- unknown .code:n = {
- \msg_error:nnx{pdfbase}{unknown~package~option}{\l_keys_key_tl}
- }
-}
-\ProcessKeysOptions{pdfbase}
-
-\sys_if_output_pdf:T{
- \bool_gset_false:N\g_pbs_dvipdfmx_bool
- \bool_gset_false:N\g_pbs_dvisvgm_bool
-}
-
-\sys_if_engine_xetex:T{
- \bool_if:NF\g_pbs_dvisvgm_bool{\bool_gset_true:N\g_pbs_dvipdfmx_bool}
-}
-
-% writing to core objects in the PDF, using the new
-% pdfmanagement interface
+% writing to core objects in the PDF, using the new pdfmanagement interface
\cs_new_protected_nopar:Nn\pbs_appendtofields:n{
\pdfmanagement_add:nnx{Catalog/AcroForm}{Fields}{#1}
}
@@ -1629,7 +1684,6 @@
}{
!\int_compare_p:n{\luatexversion<95}
}{
- \cs_set:Npx\pdfpageresources{\pdfvariable~pageresources}
\cs_set_protected:Npn\pdfobj{\pdfextension~obj~}
\cs_set_protected:Npn\pdfrefobj{\pdfextension~refobj~}
\cs_set_protected:Npn\pdfannot{\pdfextension~annot~}
@@ -1641,6 +1695,7 @@
\cs_set_protected:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax}
\cs_set_protected:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax}
\cs_set:Npn\pdfpageref{\pdffeedback~pageref}
+ \cs_set_protected:Npx\pdfpageresources{\pdfvariable~pageresources}
\cs_set_eq:NN\pdfximage\saveimageresource
\cs_set_eq:NN\pdfrefximage\useimageresource
\cs_set_eq:NN\pdflastximage\lastsavedimageresourceindex
@@ -2558,7 +2613,7 @@
%modify output routine for output box insertions
\bool_new:N\l_pbs_is_vertical_bool
\cs_set_eq:NN\pbs_outputpage_orig:\@outputpage
-\cs_set_nopar:Npn\@outputpage{
+\cs_set_protected_nopar:Npn\@outputpage{
\int_gincr:N\g_pbs_page_int
\box_if_vertical:cTF{@outputbox}{
\bool_set_true:N\l_pbs_is_vertical_bool
@@ -2578,10 +2633,6 @@
\pbs_outputpage_orig:
}
-\bool_new:N\g_pbs_ocgbase_loaded_bool
-\AtBeginDocument{
- \@ifpackageloaded{ocgbase}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}{}
-}
\AddToHook{shipout/background}{
% workaround for curious AR bug (pdf annot or link placed on
% OCG remains active although OCG is hidden)
diff --git a/macros/latex/contrib/ocgx2/ChangeLog b/macros/latex/contrib/ocgx2/ChangeLog
index 2c6de07b3f..6a05dbbcb9 100644
--- a/macros/latex/contrib/ocgx2/ChangeLog
+++ b/macros/latex/contrib/ocgx2/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-04
+ * v0.55: ocgx2.sty
+ * v0.22: ocgbase.sty
+ * fix : pkg option processing acc. to new LaTeX format 22-06-01
+
2022-04-01
* v0.54: ocgx2.sty
* v0.21: ocgbase.sty
diff --git a/macros/latex/contrib/ocgx2/ocgbase.sty b/macros/latex/contrib/ocgx2/ocgbase.sty
index e8df5e87df..bf4edf432b 100644
--- a/macros/latex/contrib/ocgx2/ocgbase.sty
+++ b/macros/latex/contrib/ocgx2/ocgbase.sty
@@ -100,35 +100,42 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
-
-\def\g@ocgbase@date@tl{2022/04/01}
-\def\g@ocgbase@version@tl{0.21}
+\def\g@ocgbase@date@tl{2022/08/04}
+\def\g@ocgbase@version@tl{0.22}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
%package options
-%unknown package option error message
\msg_set:nnnn{ocgbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
\keys_define:nn{ocgbase}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
- dvipdfmx / false .code:n = {},
- dvipdfmx .default:n = {true},
+ dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+ },
+ dvipdfmx .value_forbidden:n = true,
unknown .code:n = {
\msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{ocgbase}
+\ProcessKeyOptions[ocgbase]
\RequirePackage{pdfbase}
@@ -138,7 +145,7 @@
Get~an~up~to~date~version~of~`#1'.\\
Aborting.
}
-\@ifpackagelater{pdfbase}{2017/09/29}{}{
+\@ifpackagelater{pdfbase}{2022/08/04}{}{
\msg_error:nnn{ocgbase}{support~outdated}{pdfbase.sty}
\tex_endinput:D
}
@@ -472,35 +479,42 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
-
-\def\g@ocgbase@date@tl{2022/04/01}
-\def\g@ocgbase@version@tl{0.21}
+\def\g@ocgbase@date@tl{2022/08/04}
+\def\g@ocgbase@version@tl{0.22}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
%package options
-%unknown package option error message
\msg_set:nnnn{ocgbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
}
\keys_define:nn{ocgbase}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
- dvipdfmx / false .code:n = {},
- dvipdfmx .default:n = {true},
+ dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+ },
+ dvipdfmx .value_forbidden:n = true,
unknown .code:n = {
\msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{ocgbase}
+\ProcessKeyOptions[ocgbase]
\RequirePackage{pdfbase}
@@ -510,7 +524,7 @@
Get~an~up~to~date~version~of~`#1'.\\
Aborting.
}
-\@ifpackagelater{pdfbase}{2017/09/29}{}{
+\@ifpackagelater{pdfbase}{2022/08/04}{}{
\msg_error:nnn{ocgbase}{support~outdated}{pdfbase.sty}
\tex_endinput:D
}
diff --git a/macros/latex/contrib/ocgx2/ocgx2.sty b/macros/latex/contrib/ocgx2/ocgx2.sty
index 46c42aca35..16319e52a3 100644
--- a/macros/latex/contrib/ocgx2/ocgx2.sty
+++ b/macros/latex/contrib/ocgx2/ocgx2.sty
@@ -43,10 +43,8 @@
%
% The Current Maintainer of this work is A. Grahn.
- \RequirePackage{l3keys2e}
-
- \def\g@ocgxii@date@tl{2022/04/01}
- \def\g@ocgxii@version@tl{0.54}
+ \def\g@ocgxii@date@tl{2022/08/04}
+ \def\g@ocgxii@version@tl{0.55}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -86,8 +84,8 @@
Using~`colorlinks'~instead.
}
- %package opts
- %unknown package option error message
+ % package options
+
\msg_set:nnnn{ocgx2}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
@@ -100,13 +98,22 @@
\bool_new:N\l_ocgxii_showingui_bool
\keys_define:nn{ocgx2}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
dvipdfmx .code:n = {
\PassOptionsToPackage{dvipdfmx}{ocgbase}
- \PassOptionsToPackage{dvipdfmx}{pdfbase}
- \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
},
+ dvipdfmx .value_forbidden:n = true,
viewocg .choice:,
viewocg / always .code:n={
@@ -162,11 +169,18 @@
\keys_set:nn{ocgx2}{viewocg,printocg,exportocg,showingui,tikz=false}
%process package options
- \ProcessKeysOptions{ocgx2}
- \sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
+ \ProcessKeyOptions[ocgx2]
\RequirePackage{ocgbase} %also loads pdfbase.sty
+ \bool_gset_eq:NN\g_ocgxii_dvipdfmx_bool\g_pbs_dvipdfmx_bool
+
+ \bool_if:NT\g_pbs_dvisvgm_bool{
+ \msg_error:nnn{ocgx2}{generic~msg}{
+ Package~`ocgx2'~is~incompatible~with~the~`dvisvgm'~backend.
+ }
+ }
+
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
\ocgxii_begin_ocg:nnnn{#1}{#2}{#3}{#4}
@@ -1578,10 +1592,8 @@
%
% The Current Maintainer of this work is A. Grahn.
-\RequirePackage{l3keys2e}
-
-\def\g@ocgxii@date@tl{2022/04/01}
-\def\g@ocgxii@version@tl{0.54}
+\def\g@ocgxii@date@tl{2022/08/04}
+\def\g@ocgxii@version@tl{0.55}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
@@ -1621,8 +1633,8 @@
Using~`colorlinks'~instead.
}
-%package opts
-%unknown package option error message
+% package options
+
\msg_set:nnnn{ocgx2}{unknown~package~option}{Unknown~package~option~`#1'.}{
Package option~'#1'~is~unknown;\\
perhaps~it~is~spelled~incorrectly.
@@ -1635,13 +1647,22 @@
\bool_new:N\l_ocgxii_showingui_bool
\keys_define:nn{ocgx2}{
- xetex .code:n = {}, %dummy
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
+
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
dvipdfmx .code:n = {
\PassOptionsToPackage{dvipdfmx}{ocgbase}
- \PassOptionsToPackage{dvipdfmx}{pdfbase}
- \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
},
+ dvipdfmx .value_forbidden:n = true,
viewocg .choice:,
viewocg / always .code:n={
@@ -1697,11 +1718,18 @@
\keys_set:nn{ocgx2}{viewocg,printocg,exportocg,showingui,tikz=false}
%process package options
-\ProcessKeysOptions{ocgx2}
-\sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
+\ProcessKeyOptions[ocgx2]
\RequirePackage{ocgbase} %also loads pdfbase.sty
+\bool_gset_eq:NN\g_ocgxii_dvipdfmx_bool\g_pbs_dvipdfmx_bool
+
+\bool_if:NT\g_pbs_dvisvgm_bool{
+ \msg_error:nnn{ocgx2}{generic~msg}{
+ Package~`ocgx2'~is~incompatible~with~the~`dvisvgm'~backend.
+ }
+}
+
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
\ocgxii_begin_ocg:nnnn{#1}{#2}{#3}{#4}
diff --git a/macros/latex/contrib/xsavebox/ChangeLog b/macros/latex/contrib/xsavebox/ChangeLog
index 040cc92a78..edeaa103fd 100644
--- a/macros/latex/contrib/xsavebox/ChangeLog
+++ b/macros/latex/contrib/xsavebox/ChangeLog
@@ -1,3 +1,7 @@
+2022-08-04
+ * v0.18
+ * fix : pkg option processing acc. to new LaTeX format 22-06-01
+
2022-03-10
* v0.17
* fix: content saving optimised
diff --git a/macros/latex/contrib/xsavebox/xsavebox.pdf b/macros/latex/contrib/xsavebox/xsavebox.pdf
index 39e3051880..16db549281 100644
--- a/macros/latex/contrib/xsavebox/xsavebox.pdf
+++ b/macros/latex/contrib/xsavebox/xsavebox.pdf
Binary files differ
diff --git a/macros/latex/contrib/xsavebox/xsavebox.sty b/macros/latex/contrib/xsavebox/xsavebox.sty
index 36aeaaa1d0..ddec5f4383 100644
--- a/macros/latex/contrib/xsavebox/xsavebox.sty
+++ b/macros/latex/contrib/xsavebox/xsavebox.sty
@@ -34,25 +34,24 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
+% conditions of the LaTeX Project Public License
+%
% http://mirrors.ctan.org/macros/latex/base/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
% The Current Maintainer of this work is A. Grahn.
-\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\RequirePackage{l3keys2e}
+\NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\def\g@xsb@version@tl{0.17}
-\def\g@xsb@date@tl{2022/03/10}
+\def\g@xsb@version@tl{0.18}
+\def\g@xsb@date@tl{2022/08/04}
\ProvidesExplPackage{xsavebox}{\g@xsb@date@tl}{\g@xsb@version@tl}
{saveboxes for repeating content without code replication}
+% ensure that backend code is loaded
+\cs_if_exist:NF\c_sys_backend_str{\sys_load_backend:n{}}
+
\msg_set:nnnn{xsavebox}{support~outdated}{
Support~package~`#1'~too~old.
}{
@@ -75,51 +74,54 @@
perhaps~it~is~spelled~incorrectly.
}
+% possible values for \c_sys_backend_str: pdftex, luatex, xetex, dvips, dvipdfmx, dvisvgm
%package options
-\bool_new:N\g_xsb_dvisvgm_bool %`dvisvgm' driver option
\tl_gset:Nn\g_xsb_margin_tl{3pt}
\keys_define:nn{xsavebox}{
- margin .code:n = {
- \setlength\l_tmpa_dim{#1}
- \tl_gset:Nx\g_xsb_margin_tl{\dim_use:N\l_tmpa_dim}
- },
+ pdftex.code:n = {},
+ pdftex.value_forbidden:n = true,
+
+ luatex.code:n = {},
+ luatex.value_forbidden:n = true,
+
+ xetex.code:n = {},
+ xetex.value_forbidden:n = true,
- xetex .code:n = {}, %dummy, we use engine test instead
+ dvips.code:n = {},
+ dvips.value_forbidden:n = true,
- dvipdfmx .choice:,
- dvipdfmx / true .code:n = {
- \bool_gset_false:N\g_xsb_dvisvgm_bool
+ dvipdfmx.code:n = {
\PassOptionsToPackage{dvipdfmx}{pdfbase}
},
- dvipdfmx / false .code:n = {},
- dvipdfmx .default:n = {true},
+ dvipdfmx.value_forbidden:n = true,
- dvisvgm .choice:,
- dvisvgm / true .code:n = {
- \bool_gset_true:N\g_xsb_dvisvgm_bool
+ dvisvgm.code:n = {
\PassOptionsToPackage{dvisvgm}{pdfbase}
},
- dvisvgm / false .code:n = {\bool_gset_false:N\g_xsb_dvisvgm_bool},
- dvisvgm .default:n = {true},
+ dvisvgm.value_forbidden:n = true,
+
+ margin .code:n = {
+ \setlength\l_tmpa_dim{#1}
+ \tl_gset:Nx\g_xsb_margin_tl{\dim_use:N\l_tmpa_dim}
+ },
unknown .code:n = {
\msg_error:nnx{xsavebox}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProcessKeysOptions{xsavebox}
-
-\sys_if_output_pdf:T{\bool_gset_false:N\g_xsb_dvisvgm_bool}
+\ProcessKeyOptions[xsavebox]
\RequirePackage{pdfbase}
-\@ifpackagelater{pdfbase}{2017/03/23}{}{
+\@ifpackagelater{pdfbase}{2022/08/04}{}{
\msg_error:nnn{xsavebox}{support~outdated}{pdfbase.sty}
\tex_endinput:D
}
+
\cs_gset_eq:NN\xsb_pdfxform:nnnnn\pbs_pdfxform:nnnnn
\cs_gset_eq:NN\xsb_pdflastxform:\pbs_pdflastxform:
\cs_gset_eq:NN\xsb_pdfrefxform:n\pbs_pdfrefxform:n
-\bool_if:NTF\g_xsb_dvisvgm_bool{
+\bool_if:NTF\g_pbs_dvisvgm_bool{
\tl_gset:Nn\g_xsb_margin_tl{0pt}
\cs_new_protected_nopar:Nn\xsb_updatebbox:nnn{
\special{dvisvgm:bbox~#1~#2~#3~transform}
diff --git a/macros/latex/contrib/xsavebox/xsavebox.tex b/macros/latex/contrib/xsavebox/xsavebox.tex
index 0c1cbc6f68..f2f7b6b2b9 100644
--- a/macros/latex/contrib/xsavebox/xsavebox.tex
+++ b/macros/latex/contrib/xsavebox/xsavebox.tex
@@ -6,8 +6,7 @@
%
\listfiles
%%%%%%% pdfmanagement-testphase %%%%%%
-\RequirePackage{pdfmanagement-testphase} % load the package
-\DeclareDocumentMetadata % activates the PDF management interface
+\DocumentMetadata % activates the PDF management interface
{
%uncompress,
}
diff --git a/macros/optex/README b/macros/optex/README
index 866708c535..0cd39b8770 100644
--- a/macros/optex/README
+++ b/macros/optex/README
@@ -22,6 +22,10 @@ doc/ ... PDF version of the OpTeX documentation and sources.
History:
+<1.08> Aug 2022:
+ Sorting rules for German, French, Polish, Hungarian, ... added.
+ Font files for Montserrat, STIX, XITS, STIXtwo, Overlock added.
+ Minor improvements and bug fixing.
<1.07> May 2022:
Tikz's \foreach works only in its environment.
\lipsum syntax enlarged by dot after paragraph num, example: \lipusm[3.].
diff --git a/macros/optex/base/alloc.opm b/macros/optex/base/alloc.opm
index 51bd257962..ae77d3074e 100644
--- a/macros/optex/base/alloc.opm
+++ b/macros/optex/base/alloc.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \newdimen {Allocators for registers <2022-03-07>} % preloaded in format
+\_codedecl \newdimen {Allocators for registers <2022-06-10>} % preloaded in format
\_doc -----------------------------
The limits are set first.
@@ -29,7 +29,7 @@
\_countdef\_toksalloc=15 \_toksalloc=255
\_countdef\_readalloc=16 \_readalloc=-1
\_countdef\_writealloc=17 \_writealloc=0 % should be -1 but there is bug in new luatex
-\_countdef\_famalloc=18 \_famalloc=3
+\_countdef\_famalloc=18 \_famalloc=42 % \newfam are 43, 44, 45, ...
\_countdef\_languagealloc=19 \_languagealloc=0
\_doc -----------------------------
@@ -178,6 +178,7 @@ the array-like declarator of counters.
\_endinput
+2022-06-10 \_famalloc set to 42 (answer to the biggest fundamental question)
2022-03-07 \_noattr allocated
2022-02-19 \_newlanguage introduced
2021-02-15 \_advance -> \_incr, \_decr
diff --git a/macros/optex/base/doc.opm b/macros/optex/base/doc.opm
index 82c6bde8c6..bde1dcc848 100644
--- a/macros/optex/base/doc.opm
+++ b/macros/optex/base/doc.opm
@@ -1,12 +1,17 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \printdoc {Macros for documentation printing <2021-05-15>} % loaded on demand by \load[doc]
+\_codedecl \printdoc {Macros for documentation printing <2022-07-01>} % loaded on demand by \load[doc]
\_doc -----------------------------
General decalarations.
\_cod -----------------------------
\_fontfam[lmfonts]
+
+\_let \mlinkcolor=\Red % main doc. points
+\_let \ulinkcolor=\Blue % user doc. points
+\_let \fnamecolor=\Brown % file names in listing headers
+\_def \bgverbcolor {\_setcmykcolor{0 0 .3 .03}} % background for listings
\_hyperlinks \Green \Green
\_enlang
\_enquotes
@@ -121,32 +126,30 @@
example at the beginning of this section.
\_cod -----------------------------
-\_def\_intlink{\_link[cs:\_tmpa]{\Blue}{\_csstring\\\_tmpb}}
+\_def\_intlink{\_link[cs:\_tmpa]{\ulinkcolor}{\_csstring\\\_tmpb}}
\_doc -----------------------------
The lines in the listing mode have a yellow background.
\_cod -----------------------------
-\_def\Yellow{\_setcmykcolor{0 0 .3 .03}}
-
\_def\_printcodeline#1{\_advance \_maxlines by-1
\_ifnum \_maxlines<0 \_ea \_endverbprinting \_fi
\_ifx\_printfilename\_relax \_penalty \_ttpenalty \_fi \_vskip-4pt
- \_noindent\_rlap{\Yellow \_vrule height8pt depth5pt width\_hsize}%
+ \_noindent\_rlap{\bgverbcolor \_vrule height8pt depth5pt width\_hsize}%
\_printfilename
\_indent \_printverblinenum #1\_par}
\_def\_printfilename{\_hbox to0pt{%
- \_hskip\_hsize\_vbox to0pt{\_vss\_llap{\Brown\docfile}\_kern7.5pt}\_hss}%
+ \_hskip\_hsize\_vbox to0pt{\_vss\_llap{\fnamecolor\docfile}\_kern7.5pt}\_hss}%
\_let\_printfilename=\_relax
}
\_everytt={\_let\_printverblinenum=\_relax}
\_long\_def\_endverbprinting#1\_end#2\_end{\_fi\_fi \_global\_maxlines=100000
- \_noindent\_typosize[8/]\_dots etc. (see {\_tt\Brown\docfile})}
+ \_noindent\_typosize[8/]\_dots etc. (see {\_tt\fnamecolor\docfile})}
\_doc -----------------------------
- `\docfile` is currently documented file.\nl
+ \`\docfile` is currently documented file.\nl
\`\printdoc` and \`\printdoctail` macros are defined here.
\_cod -----------------------------
@@ -174,15 +177,23 @@
\_public \vitt ;
\_doc -----------------------------
- The Index entries are without the trailing backslash. We must add it
- when printing Index.
+ The Index entries are without the trailing backslash in `.ref` file.
+ When printing Index, we distinguish the Index entries with their main
+ documentation point (they are created as links and backslash is added),
+ Index entries with only user documentation points have backslash added
+ but no link is created. Other index entries are printed as usuall
+ without backslash.
\_cod -----------------------------
\_addto \_ignoredcharsen {_} % \foo, \_foo is the same in the fist pass of sorting
-\_def\_printii #1#2&{%
- \_ismacro\_lastii{#1}\_iffalse \_newiiletter{#1}{#2}\_def\_lastii{#1}\_fi
- \_gdef\_currii{#1#2}\_the\_everyii\_noindent
- \_hskip-\_iindent \_ignorespaces\_printiiA\bslash#1#2//}
+\_let\_optexprintii=\_printii % original \_printii used for other Index entries
+\_def\_printii #1&{%
+ \_ifcsname cs:#1\_endcsname
+ \_noindent \_hskip-\_iindent {\_tt \_link[cs:#1]\ulinkcolor{\_bslash#1} }\_else
+ \_ifcsname cs:^#1\_endcsname \_noindent \_hskip-\_iindent {\_tt\_bslash#1 }\_else
+ \_afterfi{\_afterfi{\_optexprintii #1&}}\_fi\_fi
+}
+\_def\_pgprintA #1{#1} % no hyperlinks from page numbers
\_def\_printiipages#1&{\_let\_pgtype=\_undefined \_tmpnum=0
{\_rm\_printpages #1,:,\_par}}
@@ -224,18 +235,18 @@
\_ifcsname cs:\_tmp\_endcsname\_else \_dest[cs:\_tmp]\_fi
\_sxdef{cs:\_tmp}{}%
\_hbox{\_ifcsname cs:^\_tmp\_endcsname
- \_link[cs:^\_tmp]{\Red}{\_tt\_csstring\\\_tmp}\_else
- {\_tt\Red\_csstring\\\_tmp}\_fi}%
+ \_link[cs:^\_tmp]{\mlinkcolor}{\_tt\_csstring\\\_tmp}\_else
+ {\_tt\mlinkcolor\_csstring\\\_tmp}\_fi}%
}
\_def\^`#1{\_leavevmode\_edef\_tmp{\_csstring#1}\_iindex{\_tmp}%
\_hbox{\_ifcsname cs:^\_tmp\_endcsname \_else \_dest[cs:^\_tmp]\_sxdef{cs:^\_tmp}{}\_fi
- \_link[cs:\_tmp]{\Blue}{\_tt\_string#1}}%
+ \_link[cs:\_tmp]{\ulinkcolor}{\_tt\_string#1}}%
\_futurelet\_next\_cslinkA
}
\_def\_cslinkA{\_ifx\_next`\_ea\_ignoreit \_else \_ea\_ea\_ea`\_ea\_string\_fi}
\_def\~`#1{\_leavevmode\_edef\_tmp{\_csstring#1}\_iindex{\_tmp}%
- \_hbox{\_link[cs:^\_tmp]{\Blue}{\_tt\_string#1}}%
+ \_hbox{\_link[cs:^\_tmp]{\ulinkcolor}{\_tt\_string#1}}%
\_futurelet\_next\_cslinkA
}
@@ -346,6 +357,7 @@ have the same meaning: `\optexdoclink` in this example. And
\endinput
+2022-07-01 \_printii improved, colors declaration part added.
2021-05-15 \_endinput shifted after \_processinput when \_endcode is scanned.
2021-05-14 \_catcodedot, \_Doctab introduced.
2021-05-13 \def\t added, bug fixed.
diff --git a/macros/optex/base/f-montserrat.opm b/macros/optex/base/f-montserrat.opm
new file mode 100644
index 0000000000..df570ac034
--- /dev/null
+++ b/macros/optex/base/f-montserrat.opm
@@ -0,0 +1,34 @@
+%% This is part of the OpTeX project, see http://petr.olsak.net/optex
+
+\_famdecl [Montserrat] \Montserrat {Inspired from old posters in Montserat in Buenos Aires}
+ {\caps \alter \light \elight \xlight \medium \semibold} {\rm \bf \it \bi} {}
+ {[Montserrat-Regular]}
+ {\_def\_fontnamegen {[Montserrat\_alterV-\_currV]:\_capsV\_fontfeatures}}
+
+\_wlog{\_detokenize{%
+Modifiers:^^J
+ \caps ...... caps & small caps^^J
+ \alter ..... alternative characters^^J
+ \medium .... \rm \it Medium, \bf \bi ExtraBold^^J
+ \semibold .. \rm \it SemiBold, \bf \bi Black^^J
+ \light ..... \rm \it Light, \bf \bi SemiBold^^J
+ \elight .... \rm \it ExtraLight, \bf \bi Medium^^J
+ \xlight .... \rm \it Thin, \bf \bi Regular^^J
+}}
+
+\_moddef \resetmod {\_fsetV caps={},alter={} \_fvars Regular Bold Italic BoldItalic }
+\_moddef \alter {\_fsetV alter=Alternates }
+\_moddef \caps {\_fsetV caps=+smcp;\_ffonum; }
+\_moddef \xlight {\_fvars Thin Regular ThinItalic Italic }
+\_moddef \elight {\_fvars ExtraLight Medium ExtraLightItalic MediumItalic }
+\_moddef \light {\_fvars Light SemiBold LightItalic SemiBoldItalic }
+\_moddef \medium {\_fvars Medium ExtraBold MediumItalic ExtraBoldItalic }
+\_moddef \semibold {\_fvars SemiBold Black SemiboldItalic BlackItalic }
+
+\_initfontfamily % new font family must be initialized
+
+\_endcode
+
+See the file `f-heros.opm` for information about principles of such
+font-macro-files.
+
diff --git a/macros/optex/base/f-overlock.opm b/macros/optex/base/f-overlock.opm
new file mode 100644
index 0000000000..e20a32cfd0
--- /dev/null
+++ b/macros/optex/base/f-overlock.opm
@@ -0,0 +1,27 @@
+%% This is part of the OpTeX project, see http://petr.olsak.net/optex
+
+\_famdecl [Overlock] \Overlock {fonts simulate Overlock sewing technique}
+ {\caps} {\rm \bf \it \bi \kf \ki} {}
+ {[Overlock-Regular-OTF]}
+ {\_def\_fontnamegen {[Overlock-\_currV-OTF]:\_capsV\_fontfeatures}}
+
+\_wlog{\_detokenize{%
+Modifier:^^J
+ \bolder ...... \rm=Bold \bf=Black^^J
+ Warning: latin characters like Čč unavailable.^^J
+}}
+
+\_moddef \resetmod {\_fsetV caps={} \_fvars Regular Bold Italic BoldItalic }
+\_moddef \bolder {\_fvars Bold Black BoldItalic BlackItalic }
+\_moddef \caps {\_fsetV caps=+smcp;\_ffonum; } % does not work ??
+
+\_famvardef \kf {\_fsetV curr=Black \_rm}
+\_famvardef \ki {\_fsetV curr=BlackItalic \_rm}
+
+\_initfontfamily % new font family must be initialized
+
+\_endcode
+
+See the file `f-heros.opm` for information about principles of such
+font-macro-files.
+
diff --git a/macros/optex/base/f-stix.opm b/macros/optex/base/f-stix.opm
new file mode 100644
index 0000000000..ab4d8b7e63
--- /dev/null
+++ b/macros/optex/base/f-stix.opm
@@ -0,0 +1,24 @@
+%% This is part of the OpTeX project, see http://petr.olsak.net/optex
+
+\_famdecl [STIX] \Stix {Scientific and Technical Information Exchange fonts}
+ {} {\rm \bf \it \bi} {STIXMath}
+ {[STIX-Regular]}
+ {\_def\_fontnamegen {[STIX-\_currV]:\_capsV\_fontfeatures}}
+
+\_wlog{\_detokenize{%
+Modifier:^^J
+ \caps ...... caps & small caps (does not work)^^J
+}}
+
+\_moddef \resetmod {\_fsetV caps={} \_fvars Regular Bold Italic BoldItalic }
+\_moddef \caps {\_fsetV caps=+smcp;\_ffonum; }
+
+\_initfontfamily % new font family must be initialized
+
+\_loadmath {[STIXMath-Regular]}
+
+\_endcode
+
+See the file `f-heros.opm` for information about principles of such
+font-macro-files.
+
diff --git a/macros/optex/base/f-stixtwo.opm b/macros/optex/base/f-stixtwo.opm
new file mode 100644
index 0000000000..629b57a741
--- /dev/null
+++ b/macros/optex/base/f-stixtwo.opm
@@ -0,0 +1,28 @@
+%% This is part of the OpTeX project, see http://petr.olsak.net/optex
+
+\_famdecl [STIXTwo] \StixTwo {Second version of STIX}
+ {\caps} {\rm \bf \it \bi} {STIXTwoMath}
+ {[STIXTwoText-Regular]}
+ {\_def\_fontnamegen {[STIXTwoText-\_currV]:\_capsV\_fontfeatures}}
+
+\_wlog{\_detokenize{%
+Modifiers:^^J
+ \caps ...... caps & small caps,^^J
+ \medium .... \rm,\it medium,^^J
+ \bolder .... \rm,\it semibold (between medium and \bf)^^J
+}}
+
+\_moddef \resetmod {\_fsetV caps={} \_fvars Regular Bold Italic BoldItalic }
+\_moddef \medium {\_fvars Medium Bold MediumItalic BoldItalic }
+\_moddef \bolder {\_fvars SemiBold Bold SemiBoldItalic BoldItalic }
+\_moddef \caps {\_fsetV caps=+smcp;\_ffonum; }
+
+\_initfontfamily % new font family must be initialized
+
+\_loadmath {[STIXTwoMath-Regular]}
+
+\_endcode
+
+See the file `f-heros.opm` for information about principles of such
+font-macro-files.
+
diff --git a/macros/optex/base/f-xits.opm b/macros/optex/base/f-xits.opm
new file mode 100644
index 0000000000..eac2ee6b08
--- /dev/null
+++ b/macros/optex/base/f-xits.opm
@@ -0,0 +1,25 @@
+%% This is part of the OpTeX project, see http://petr.olsak.net/optex
+
+\_famdecl [XITS] \Xits {A fork of STIX with Bold Math variant}
+ {\caps} {\rm \bf \it \bi} {XITSMath}
+ {[XITS-Regular]}
+ {\_def\_fontnamegen {[XITS-\_currV]:\_capsV\_fontfeatures}}
+
+\_wlog{\_detokenize{%
+Modifier:^^J
+ \caps ...... caps & small caps (works only for \rm)^^J
+}}
+
+\_moddef \resetmod {\_fsetV caps={} \_fvars Regular Bold Italic BoldItalic }
+\_moddef \caps {\_fsetV caps=+smcp;\_ffonum; }
+
+\_initfontfamily % new font family must be initialized
+
+\_loadmath {[XITSMath-Regular]}
+\_loadboldmath {[XITSMath-Bold]} \to {[XITSMath-Regular]}
+
+\_endcode
+
+See the file `f-heros.opm` for information about principles of such
+font-macro-files.
+
diff --git a/macros/optex/base/fams-ini.opm b/macros/optex/base/fams-ini.opm
index ba334ef86a..ad3ace24f3 100644
--- a/macros/optex/base/fams-ini.opm
+++ b/macros/optex/base/fams-ini.opm
@@ -56,6 +56,19 @@
\caps: {\rm\bf} \book\caps: {\rm} }
\_famalias [NewCM] \_famalias [NewCMfonts]
+\_famfrom{STI Pub group, MicroPress Inc., Coen Hoffman}
+\_faminfo [STIX] {Scientific and Technical Information Exchange fonts} {f-stix}
+ { -: {\rm\bf\it\bi} }
+
+\_faminfo [XITS] {A fork of STIX with Bold Math variant} {f-xits}
+ { -: {\rm\bf\it\bi} \caps: {\rm} }
+
+\_famfrom{Tiro Typeworks Ltd., R. Mills, J. Hudson, P. Hanslow, C. Hoffman}
+\_faminfo [STIXTwo] {Second version of STIX} {f-stixtwo}
+ { -,\caps: {\rm\it} \medium,\caps\medium: {\rm\it} \bolder,\caps\bolder: {\rm\it}
+ -,\caps: {\bf\bi} }
+\_famalias [STIX2]
+
\_famfrom {Philipp H. Poll}
\_faminfo [Linux Libertine] {Free fonts typically installed on systems} {f-libertine}
{ -: {\rm\bf\it\bi} \semibold: {\bf\bi}
@@ -139,6 +152,10 @@
\_faminfo [ComicNeue] {Comic Neue sans serif} {f-comicneue}
{ -,\angular: {\lf\li\rm\it\bf\bi} }
+\_famfrom {tipo, Dario Manuel Muhafara}
+\_faminfo [Overlock] {fonts simulate Overlock sewing technique} {f-overlock}
+ { -: {\rm\it\bf\bi\kf\ki} }
+
\_famfrom {Eben Sorkin}
\_faminfo [Merriweather] {Modern shapes, sharp serifs} {f-merriweather}
{ -,\sans: {\lf\li\rm\it\bf\bi\kf\ki} \caps,\sans\caps: {\rm\it} }
@@ -152,6 +169,11 @@
\caps, \caps\cond: {\rm\bf\it\bi} \caps\ttset: {\rm\bf}
}
+\_famfrom {Julieta Ulanovsky, http://www.zkysky.com.ar}
+\_faminfo [Montserrat] {Inspired from old posters in Montserat in Buenos Aires} {f-montserrat}
+ { -,\caps,\alter: {\rm\bf\it\bi} \xlight,\elight,\light,-,\medium,\semibold: {\rm\it}
+ -,\medium,\semibold: {\bf\bi} }
+
\_famfrom {CTU in Prague, Roman Cernohous}
\_faminfo [Technika] {Fonts from visual style of CTU in Prague} {f-technika}
{ -,\light,\book, \caps, \caps\book: {\rm\bf\it\bi} -:{\stencil} }
diff --git a/macros/optex/base/fonts-catalog.opm b/macros/optex/base/fonts-catalog.opm
index 6576e5fb11..cdd77359f1 100644
--- a/macros/optex/base/fonts-catalog.opm
+++ b/macros/optex/base/fonts-catalog.opm
@@ -1,9 +1,10 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \_undefined {Font catalogue <2022-02-22>} % loaded on demand by \fontfam[catalog]
+\_codedecl \_undefined {Font catalogue <2022-07-11>} % loaded on demand by \fontfam[catalog]
\_tracinglostchars=1 % only to log file
\_initunifonts
+\_raggedbottom
\_begingroup
\_istoksempty\_catalogmathsample \_iftrue \_noloadmath \_fi
@@ -133,5 +134,6 @@ described in the \code{fams-ini.opm} file.
\_endcode % -------------------------------------
+2022-07-11 \_raggedbottom added
2022-02-22 \_ttfixed, \footline set as global, bug fixed
2020-02-26 released
diff --git a/macros/optex/base/if-macros.opm b/macros/optex/base/if-macros.opm
index cf28f3dccf..8f6082a27a 100644
--- a/macros/optex/base/if-macros.opm
+++ b/macros/optex/base/if-macros.opm
@@ -77,8 +77,9 @@
Note that `\foreach <list>\do {<what>}` is equivalent to `\foreach <list>\do #1{<what>}`.
Recommendation: it is better to use private variants of \`\_foreach`.
- When the user writes `\input tikz` then `\foreach` macro is redefined! The
- private variants use \`\_do` separator instead `\do` separator.
+ When the user writes `\input tikz` then `\foreach` macro is redefined in
+ each TikZ environment.
+ The private variants use \`\_do` separator instead `\do` separator.
\_cod -----------------------------
\_newcount\_frnum % the numeric variable used in \fornum
diff --git a/macros/optex/base/lang-data.opm b/macros/optex/base/lang-data.opm
index df6f43d90f..6e11f8bd9a 100644
--- a/macros/optex/base/lang-data.opm
+++ b/macros/optex/base/lang-data.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \_langdata {Language dependent data <2022-02-19>} % only en, cs preloaded in format
+\_codedecl \_langdata {Language dependent data <2022-06-28>} % only en, cs preloaded in format
\_langdata en {English} % -----------------------------------------------
\_langw en Chapter Table Figure Subject
@@ -12,9 +12,9 @@
\_sdef{_mt:today:en}{\_mtext{m\_the\_month} \_the\_day, \_the\_year}
\_quotationmarks en {“”‘’}
-\_let \_sortingdataen = \_sortingdatacs % it can be shared with Czech
-\_let \_ignoredcharsen = \_ignoredcharscs
-\_def \_compoundcharsen {}
+%\_let \_sortingdataen = \_sortingdatalatin % set already, see section 2.33, makeindex.opm
+%\_let \_ignoredcharsen = \_ignoredcharsgeneric
+%\_def \_compoundcharsen {}
\_langdata cs {Czech} % ------------------------------------------------
% Chapter Table Figure Subject
@@ -32,14 +32,20 @@
\_sdef{_mt:today:cs}{\_the\_day.~\_mtext{m\_the\_month} \_the\_year} % date format
\_quotationmarks cs {„“‚‘}
-%\_def\_sortingdatacs {...} % all these macros are preloaded in the format,
-%\_def\_compoundcharscs {...} % see section 2.33 or file makeindex.tex.
-%\_def\_ignoredcharscs {...}
+\_let \_sortingdatacs = \_sortingdatalatin
+\_let \_ignoredcharscs = \_ignoredcharsgeneric
+\_def \_compoundcharscs {ch:^^T Ch:^^U CH:^^V} % see \_compoundchars in section 2.33
+
\_langdata de {German} % ------------------------------------------------
\_langw de Kapitel Tabelle Abbildung Betreff
\_quotationmarks de {„“‚‘}
-% todo
+%todo
+\_let \_sortingdatade = \_sortingdatalatin
+\_let \_ignoredcharsde = \_ignoredcharsgeneric
+\_def \_compoundcharsde {ß:ss}
+\_def \_xcompoundcharsde {} % ß is interpreted in second pass of sorting
+%\_def \_compoundcharsde {ß:ss Ä:AE Ö:OE Ü:UE ä:ae ö:oe ü:ue} % alternative sorting
\_langdata it {Italian} % ------------------------------------------------
\_langw it Capitolo Tabella Fig. Oggetto
@@ -52,16 +58,57 @@
\_langw es Capítulo Tabla Figura Sujeto
\_quotationmarks es {“”«»}
% todo
+\_let \_sortingdataes = \_sortingdatalatin
+\_let \_ignoredcharses = \_ignoredcharsgeneric
+\_def \_compoundcharses {} % since 1994
+
\_langdata fr {French} % ------------------------------------------------
\_langw fr Chapitre Tableau Figure Matière
\_quotationmarks fr {“”«»}
-% toto
+% todo
+\_let \_sortingdatafr = \_sortingdatalatin
+\_let \_ignoredcharsfr = \_ignoredcharsgeneric
+\_def \_compoundcharsfr {}
+\_let \_secondpassfr = \_reversewords % accents in second pass are read from the end
+
\_langdata pl {Polish} % ------------------------------------------------
\_langw pl Rozdział Tabela Ilustracja Temat
\_quotationmarks pl {“”«»}
% todo
+\_let \_sortingdatapl = \_sortingdatalatin
+\_let \_ignoredcharspl = \_ignoredcharsgeneric
+\_def \_compoundcharspl {}
+
+
+\_langdata sv {Swedish} % ------------------------------------------------
+\_langw sv Kapitel Tabell Figur Föremål
+\_quotationmarks sv {””’’}
+% todo
+\_def \_sortingdatasv {% it is not a subset of \_sortingdatalatin, there is different order
+ /,{ },-,&,@,%
+ aA,bB,cC,dD,eE,fF,gG,hH,iI,jJ,kK,lL,mM,nN,oO,%
+ pP,qQ,rR,sS,tT,uU,vVwW,xX,yY,zZ,%
+ åÅ,äÄ,öÖ,%
+ 0,1,2,3,4,5,6,7,8,9,'%
+}
+\_let \_ignoredcharssv = \_ignoredcharsgeneric
+\_def \_compoundcharssv {}
+
+
+\_langdata hu {Hungarian}
+\_langw hu Fejezet Táblázat Ábra Téma
+\_quotationmarks hu {„”»«}
+%todo
+\_let \_sortingdatahu = \_sortingdatalatin
+\_let \_ignoredcharshu = \_ignoredcharsgeneric
+\_def \_compoundcharshu {cs:c^^Z Cs:C^^Z CS:C^^Z
+ dzz:d^^Z^^Z Dzz:D^^Z^^Z DZZ:D^^Z^^Z dz:d^^Z Dz:D^^Z DZ:D^^Z
+ gy:g^^Z Gy:G^^Z GY:G^^Z ly:l^^Z Ly:L^^Z LY:L^^Z ny:n^^Z Ny:N^^Z NY:N^^Z
+ sz:s^^Z Sz:S^^Z SZ:S^^Z ty:t^^Z Ty:T^^Z TY:Y^^Z
+ zs:z^^Z Zs:Z^^Z ZS:Z^^Z}
+
\_langdata el {Greek} % ------------------------------------------------
\_langw el Κεφάλαιο Πίνακας Σχήμα θέμα
@@ -75,8 +122,10 @@
\_langdata uk {Ukrainian} % -----------------------------------------------
\_langw uk Глави Таблиця Малюнок Тема
+\_quotationmarks uk {“”«»}
% todo
+
\_langdata sk {Slovak} % ------------------------------------------------
\_langw sk Kapitola Tabuľka Obrázok Vec
\_langb sk { a } { a~kol.} { vyd.} {vid.~} {ročník~} {č.~} {s.~} {~s.} {,~editor} {,~editori}
@@ -87,9 +136,10 @@
\_sdef{_mt:today:sk}{\_the\_day.~\_mtext{m\_the\_month} \_the\_year} % date format
\_quotationmarks sk {„“‚‘}
-\_let \_sortingdatask = \_sortingdatacs % it can be shared with Czech
-\_let \_compoundcharssk = \_compoundcharscs
-\_let \_ignoredcharssk = \_ignoredcharscs
+\_let \_sortingdatask = \_sortingdatalatin
+\_let \_ignoredcharssk = \_ignoredcharsgeneric
+\_let \_compoundcharssk = \_compoundcharscs % Dz Dž are sorted OK without new setting
+
\_langdata pt {Portuguese} % ------------------------------------------------
\_langw pt Capítulo Tabela Figura Assunto
@@ -100,5 +150,7 @@
\_endcode
-2022-02-19: concept finalized, but data still far of competness
+2022-06-28: Spanish, Polish, French, Swedish, Hungarian sorting rules added
+2022-06-28: German sorting rules added
+2022-02-19: concept finalized, but data still far of completness
2022-02-04: released
diff --git a/macros/optex/base/lang-decl.opm b/macros/optex/base/lang-decl.opm
index 87a13b88ce..3b9f9e727d 100644
--- a/macros/optex/base/lang-decl.opm
+++ b/macros/optex/base/lang-decl.opm
@@ -249,6 +249,8 @@
\_public \uselanguage ;
\_doc -----------------------------
+ \secc [langdata] Data for various languages
+
The \"language data" include declarations of
rules for sorting (see section~\ref[makeindex]),
language-dependent phrases and quotation marks (see section~\ref[langphrases]).
diff --git a/macros/optex/base/makeindex.opm b/macros/optex/base/makeindex.opm
index e0e7d7ad6c..ba50352559 100644
--- a/macros/optex/base/makeindex.opm
+++ b/macros/optex/base/makeindex.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \makeindex {Makeindex and sorting <2022-03-18>} % preloaded in format
+\_codedecl \makeindex {Makeindex and sorting <2022-06-28>} % preloaded in format
\_doc -----------------------------
\^`\makeindex` implements sorting algorithm at \TeX/ macro-language level.
@@ -16,95 +16,163 @@
before acute before circumflex before ring. At less priority: lowercase
letters must be before uppercase letters.
- The \`\_sortingdata``<lang-tag>` implements these rules for the language
- given by <lang-tag>. The <lang-tag> is typicaly ISO 639-1 code of the language
- and it is declared by \~`\_preplang` defined in section~\ref[langdecl].
- The \`\_sortingdatacs` for Czech rules is defined below.
+ The \`\_sortingdatalatin`
+ implements these rules for the languages with latin alphabets.
The groups between commas are not distinguished in the first
pass. The second pass distinguishes all characters mentioned in the
- `\_sortingdata<lang-tag>` (commas are ignored). The order of letters
- in the `\_sortingdata<lang-tag>` macro is significant for the sorting algorithm.
+ \^`\_sortingdatalatin` (commas are ignored). The order of letters
+ in the \^`\_sortingdatalatin` macro is significant for the sorting algorithm.
\_cod -----------------------------
-\_def \_sortingdatacs {%
+\_def \_sortingdatalatin {%
/,{ },-,&,@,%
- aAäÄáÁ,%
+ aAàÀâÂäÄáÁ,%
+ ąĄ,%
bB,%
cC,%
- čČ,%
+ ćĆčČ,%
dDďĎ,%
- eEéÉěĚ,%
+ eEèÈéÉëËêÊěĚ,%
+ ęĘ,%
fF,%
gG,%
hH,%
^^T^^U^^V,% ch Ch CH
- iIíÍ,%
+ iIíÍïÏîÎ,%
jJ,%
kK,%
lLĺĹľĽ,%
+ łŁ,%
mM,%
nNňŇ,%
+ ńŃñÑ,%
oOöÖóÓôÔ,%
pP,%
qQ,%
rRŕŔ,%
řŘ,%
- sS,%
- šŠ,%
+ sSß,%
+ śŚšŠ,%
tTťŤ,%
- uUüÜúÚůŮ,%
+ uUùÙûÛüÜúÚůŮűŰ,%
vV,%
wW,%
xX,%
- yYýÝ,%
+ yYýÝÿŸ,%
zZ,%
žŽ,%
+ źŹ,%
+ żŻ,%
+ ^^Z,% Hungarian: cz:c^^Z, etc., see \_compoundcharshu in lang-data.opm
0,1,2,3,4,5,6,7,8,9,'%
}
\_doc -----------------------------
- Characters to be ignored are declared in \`\_ignoredchars``<lang-tag>`.
- See \`\_ignoredcharscs` for Czech rules. These characters are ignored in the first pass
+ Characters to be ignored during sorting are declared in \`\_ignoredcharsgeneric`.
+ These characters are ignored in the first pass
without additional condition. All characters are taken into account in
the second pass: ASCII characters with code $\string<65$ are sorted first if they
- are not mentioned in the \^`\_sortingdata``<lang-tag>` macro.
+ are not mentioned in the `\_sortingdata...` macro.
Others not mentioned characters have undefined behavior during sorting.
+ \_cod -----------------------------
+
+\_def \_ignoredcharsgeneric {.,;?!:'"|()[]<>=+-}
- The compound characters (two or more characters interpreted as one
- character in the sorting algorithm) are mapped to single invisible characters
- in \`\_compoundchars``<lang-tag>`, see \`\_compoundcharscs` below for Czech rules,
- where ch or Ch or CH are declared as a single letter sorted between H and I.
- See \^`\_sortingdatacs` above where these declared characters are used.
+ \_doc -----------------------------
+ Sorting is always processed by rules of a given language. The macros
+ \`\_sortingdata``<lang-tag>`, \`\_ignoredchars``<lang-tag>`
+ and \`\_compoundchars``<lang-tag>` declare these rules.
+ The `<lang-tag>` is ISO code of the language: en, cs, de, pl, es for example.
+ The English language is implemented here. Other languages are implemented
+ in the `lang-data.opm` file (see section~\ref[langdata]).
\_cod -----------------------------
-\_def \_ignoredcharscs {.,;?!:'"|()[]<>=+}
-\_def \_compoundcharscs {ch:^^T Ch:^^U CH:^^V} % DZ etc. are sorted normally
+\_let \_sortingdataen = \_sortingdatalatin % English alphabet is subset of Latin
+\_let \_ignoredcharsen = \_ignoredcharsgeneric
+\_def \_compoundcharsen {} % English doesn't have compound characters like DZ
\_doc -----------------------------
+ The \^`\_compoundchars``<lang-tag>` can declare changes performed before
+ sorting. For example Czech language declares:
+ \begtt
+ \_let \_sortingdatacs = \_sortingdatalatin % Czech alphabet is subset of Latin
+ \_def \_compoundcharscs {ch:^^T Ch:^^U CH:^^V}
+ \endtt
+ It transforms two-letters `ch` to single character `^^T` because ch is
+ treated as single compound character by Czech rules and CH is sorted between H and I.
+ See \^`\_sortingdatalatin` where `^^T` is used. This declaration makes more
+ transformations of Ch and CH too. The declarations of the form `x:y` in the
+ \^`\_compoundchars``<lang-tag>` are separated by space.
+
+ You can declare a transformation from single letter to more letters too. For
+ example German rules sets ß equal to ss during sorting:
+ \begtt
+ \_let \_sortingdatade = \_sortingdatalatin % German alphabet is subset of Latin
+ \_def \_compoundcharsde {ß:ss}
+ \endtt
+ If there are two words equal after first pass of sorting: Masse (mass)
+ and Maße (measures) for example, then second pass must decide about the
+ order. DIN 5007, section 6.1 says: ss must be before ß in this case. So,
+ we want to switch off the \^`\_compoundchars` declaration for the second
+ pass and use the order of s and ß given in `\_sortingdata`. This is
+ possible if the \`\_xcompoundchars``<lang-tag>` is defined.
+ It has precedence in the second pass of sorting. We declare for German:
+ \begtt
+ \_def \_xcompoundcharsde {}
+ \endtt
+ Geman rules mention alternative sorting for phone-books or similar lists of
+ names. The letters ä ö ü should be interpreted as ae, oe and ue. So we get
+ Mueller $\lt$ Müller $\lt$ Muff. If this rule is not taken into account, we get
+ Mueller $\lt$ Muff $\lt$ Müller. The rule can be implemented by:
+ \begtt
+ \_def \_compoundcharsde {ß:ss Ä:AE Ö:OE Ü:UE ä:ae ö:oe ü:ue}
+ \endtt
+ Because u $\lt$ ü in `\_sortingdata` and because `\_xcompoundcharsde` is
+ empty, we have Mueller $\lt$ Müller after second pass of the sorting.
+
You can declare these macros for more languages if you wish to use
`\makeindex` with sorting rules with respect to your language.
Note: if you need to map compound characters to a character, don't use
`^^I`, `^^J` or `^^M` because these characters have very specific category codes.
- And use spaces to separate more mappings, like in \^`\_compoundcharscs` above.
- If you create `\_sortingdata` etc. for your language, please, send them
+ If you created `\_sortingdata` etc. for your language, please, send them
to me. I am ready to add them to the file `lang-data.opm` in a new \OpTeX/ release.
- See also section~\ref[langdecl].
-
- Preparing to primary pass is implemented by the \`\_setprimarysorting` macro.
- It is called from `\makeindex` macro and all processing of sorting is in a group.
+ See also section~\ref[langdata].
+
+ French sorting rule says: if the words are the same except for accents
+ then accented letters are sorted after unaccented leters but
+ read the words from their end in the second pass.
+ For example corect sorting is: cote $\lt$ côte $\lt$ coté
+ $\lt$ côté. This rule can be activated if the contol sequence
+ \`\_secondpass``<lang-tag>` is set to \^`\_reversewords`.
+ For example, `lang-data.opm` declares `\_let\_secondpassfr=\_reversewords`.
+
+ \bigskip
+ Preparing to primary pass is performed by the \`\_setprimarysorting` macro
+ implemented here.
+ The <lang-tag> is saved to the \^`\_sortinglang` macro when sorting is
+ initialized in \^`\_dosorting` (it is typicaly derived from current `\language` value).
+ The \^`\_setprimarysorting` is called from \^`\_dosorting` macro and all
+ processing of sorting is in a group. It sets actual
+ \^`\_sortingdata`, \^`\_compoundchars` and \^`\_ignoredchars` if given language
+ declares them. If not then warning will be printed using \`\_nold` macro
+ and English data are used. The `\lccode` of all characters from
+ \^`\_sortingdata` and \^`\_ignoredchars` are set. The sorted words will be converted
+ using \^`\_compoundchars` followed by `\lowercase` before first pass is run.
\_cod -----------------------------
\_def\_setprimarysorting {%
\_ea\_let \_ea\_sortingdata \_csname _sortingdata\_sortinglang\_endcsname
\_ea\_let \_ea\_compoundchars \_csname _compoundchars\_sortinglang\_endcsname
\_ea\_let \_ea\_ignoredchars \_csname _ignoredchars\_sortinglang\_endcsname
+ \_def\_nold{}%
\_ifx \_sortingdata\_relax \_addto\_nold{ sortingdata}%
\_let \_sortingdata = \_sortingdataen \_fi
\_ifx \_compoundchars\_relax \_addto\_nold{ compoundchars}%
\_let \_compoundchars = \_compoundcharsen \_fi
\_ifx \_ignoredchars\_relax \_addto\_nold{ ignoredchars}%
\_let \_ignoredchars = \_ignoredcharsen \_fi
+ \_ifx\_nold\_empty\_else \_opwarning{Missing\_nold\_space for language (\_sortinglang)}\_fi
\_ifx \_compoundchars\_empty \_else
\_edef \_compoundchars {\_detokenize\_ea{\_compoundchars} }\_fi % all must be catcode 12
\_def \_act ##1{\_ifx##1\_relax \_else
@@ -135,12 +203,11 @@
The \`\_preparesorting` `\,<string>` converts `<string>` to `\_tmpb`
with respect to the data initialized in \^`\_setprimarysorting` or
\^`\_setsecondarysorting`.\nl
- The compoud characters are converted to single characters by the
- \`\_docompound` macro.
+ The compoud characters are converted by the \`\_docompound` macro.
\_cod -----------------------------
\_def \_preparesorting #1{%
- \_edef \_tmpb {\_ea\_ignorefirst\_csstring #1}% \,<string> -> <string>
+ \_edef \_tmpb {\_ea\_ignoreit\_csstring #1}% \,<string> -> <string>
\_ea \_docompound \_compoundchars \_relax:{} % replace compound characters
\_lowercase \_ea{\_ea\_def \_ea\_tmpb \_ea{\_tmpb}}% convert in respect to \_sortingdata
\_ea\_replstring \_ea\_tmpb \_ea{\_csstring\^^I}{}% remove ignored characters
@@ -148,7 +215,6 @@
\_def \_docompound #1:#2 {%
\_ifx\_relax#1\_else \_replstring\_tmpb {#1}{#2}\_ea\_docompound \_fi
}
-\_def \_ignorefirst#1{}
\_doc -----------------------------
Macro \`\_isAleB` `\,<string1> \,<string2>` returns the result of comparison
@@ -160,7 +226,7 @@
comparison.
\nl
The macro
- \`\_testAleB` `<converted string1>&\_relax<converted-string2>\_relax \,<string1>\,<string2>`\nl
+ \`\_testAleB` `<converted-string1>&\_relax<converted-string2>&\_relax \,<string1>\,<string2>`\nl
does the real work. It reads the first character from both converted strings, compares them
and if it is equal then calls itself recursively else gives the result.
\_cod -----------------------------
@@ -178,17 +244,27 @@
\_else \_ifnum `#1<`#3 \_AleBtrue \_else \_AleBfalse \_fi
\_fi
}
+
+ \_doc -----------------------------
+ The \`\_testAleBsecondary` `\,<string1> \,<string2>` is run if the
+ words are equal in the primary pass. It runs \^`\_setsecondarysorting` if it
+ was not initialized already. Then prepares compared words to `\_tmpa` and
+ `\_tmpb` and corrects them by \^`\_prepsecondpass` if needed.
+ Finaly, the test is recursively done by the macro \`\_testAleBsecondaryX`
+ `<converted-string1>0\_relax<converted-string2>1\_relax`
+ \_cod -----------------------------
+
+
\_def\_testAleBsecondary#1#2{%
- \_bgroup
- \_setsecondarysorting
- \_preparesorting#1\_let\_tmpa=\_tmpb \_preparesorting#2%
- \_edef\_tmpb{\_tmpa0\_relax\_tmpb1\_relax}%
- \_ea\_testAleBsecondaryX \_tmpb
- \_egroup
+ \_setsecondarysorting \_let\_setsecondarysorting=\_relax
+ \_preparesorting#1\_let\_tmpa=\_tmpb \_preparesorting#2%
+ \_prepsecondpass
+ \_edef\_tmpb{\_tmpa0\_relax\_tmpb1\_relax}%
+ \_ea\_testAleBsecondaryX \_tmpb
}
\_def\_testAleBsecondaryX #1#2\_relax #3#4\_relax {%
\_if #1#3\_testAleBsecondaryX #2\_relax #4\_relax
- \_else \_ifnum `#1<`#3 \_global\_AleBtrue \_else \_global \_AleBfalse \_fi
+ \_else \_ifnum `#1<`#3 \_AleBtrue \_else \_AleBfalse \_fi
\_fi
}
@@ -197,7 +273,7 @@
code is created by my son Miroslav.
The \`\_mergesort` macro expects that all items in `\_iilist` are separated
by a comma when it starts. It ends with sorted items in `\_iilist` without commas.
- So `\_dosorting` macro must prepare commas between items.
+ So \^`\_dosorting` macro must prepare commas between items.
\_cod -----------------------------
\_def\_mergesort #1#2,#3{% by Miroslav Olsak
@@ -249,30 +325,53 @@
\_newifi \_ifasciisorting \_asciisortingfalse
\_def\_dosorting #1{%
\_begingroup
- \_def\_nold{}%
- \_ifx\_sotringlang\_undefined \_edef\_sortinglang{\_cs{_lan:\_the\_language}}\_fi
- \_ifasciisorting
- \_edef\_sortinglang{ASCII}%
- \_def \_preparesorting##1{\_edef\_tmpb{\_ea\_ignorefirst\_csstring##1}}%
+ \_ifasciisorting \_def\_sortinglang{ASCII}\_fi
+ \_ifx\_sortinglang\_undefined \_edef\_sortinglang{\_cs{_lan:\_the\_language}}\_fi
+ \_message{OpTeX: Sorting \_string#1 (\_sortinglang) ...^^J}%
+ \_ismacro\_sortinglang{ASCII}\_iftrue
+ \_def \_preparesorting##1{\_edef\_tmpb{\_ea\_ignoreit\_csstring##1}}%
\_let \_setsecondarysorting=\_relax
\_else
\_setprimarysorting
\_fi
- \_message{OpTeX: Sorting \_string#1 (\_sortinglang) ...^^J}%
- \_ifx\_nold\_empty\_else \_opwarning{Missing\_nold\_space for language (\_sortinglang)}\_fi
\_def \_act##1{\_preparesorting ##1\_edef##1{\_tmpb}}%
- \_ea\_xargs \_ea\_act #1;%
+ \_ea\_xargs \_ea\_act #1;% \_preparesorting for first pass of sorting applied
+ \_ifcsname _xcompoundchars\_sortinglang\_endcsname
+ \_ea\_let \_ea\_compoundchars \_csname _xcompoundchars\_sortinglang\_endcsname
+ \_fi % \_compoundchars can differ in the second pass of sorting
+ \_csname _secondpass\_sortinglang \_endcsname % activates \_reversewords if needed
\_def \_act##1{\_addto #1{##1,}}%
- \_edef #1{\_ea}\_ea\_xargs \_ea\_act #1;%
+ \_edef #1{\_ea}\_ea\_xargs \_ea\_act #1;% commas between items added, mergesort initialized
\_edef \_iilist{\_ea}\_ea\_mergesort #1\_end,\_end
\_ea\_endgroup
\_ea\_def\_ea#1\_ea{\_iilist}%
}
\_doc -----------------------------
+ French rules needs reverese reading the words in the second pass.
+ The \`\_reversewords` is activated in this case and it adds
+ new job to the macro \`\_prepsecondpass`: it reverses the letters in
+ the compared words (saved in `\_tmpa` and `\_tmpb`) by the expandable
+ \`\_sortrevers` macro. The \^`\_prepsecondpass` macro is used in the
+ \^`\_testAleBsecondary` and it is empty by default.
+ \_cod -----------------------------
+
+\_def\_prepsecondpass{}
+\_def\_reversewords{%
+ \_addto\_prepsecondpass{\_edef\_tmpa{\_ea\_sortrevers\_tmpa\_relax}%
+ \_edef\_tmpb{\_ea\_sortrevers\_tmpb\_relax}}%
+}
+\_def\_sortrevers #1#2\_relax{\_ifx^#2^#1\_else \_sortrevers#2\_relax #1\_fi}
+
+ \_doc -----------------------------
The \`\makeindex` prints the index. First, it sorts the `\_iilist`
second, it prints the sorted `\_iilist`, each item is printed
- using \^`\_printindexitem`.
+ using \^`\_printindexitem`.\nl
+ We set `\leftskip=\iindent` and we suppose that each index entry
+ starts by `\noindent\hskip-\iindent` (see the macro \~`\_printii`).
+ Then the next lines of the same index
+ entry (if the page list is broken to more pages) is indented by
+ `\leftskip=\iindent`.
\_cod -----------------------------
\_def\_makeindex{\_par
@@ -300,7 +399,7 @@
\_ifcsname _\_csstring #1\_endcsname
\_ea\_ea\_ea \_printii \_csname _\_csstring #1\_endcsname &%
\_else
- \_ea\_ea\_ea\_printii \_ea\_ignorefirst \_csstring #1&%
+ \_ea\_ea\_ea\_printii \_ea\_ignoreit \_csstring #1&%
\_fi
\_ea\_printiipages #1&
}
@@ -450,6 +549,9 @@
\_endcode % -------------------------------------
+2022-06-28 \_reversewords for French sorting introduced
+2022-06-28 \_sortingdatalatin covers more languages
+2022-06-28 \_xcompoundchars introduced, comments upgraded (German sorting mentioned)
2022-03-18 \iid didn't ignore space, bug fixed
2022-02-19 \_sotringdataen etc. moved to lang-data.opm file
2021-02-15 \_expandafter -> \_ea
diff --git a/macros/optex/base/math-preload.opm b/macros/optex/base/math-preload.opm
index fde73e7e65..9f73ef24d1 100644
--- a/macros/optex/base/math-preload.opm
+++ b/macros/optex/base/math-preload.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \normalmath {Math fonts CM + AMS preloaded <2022-02-22>} % preloaded in format
+\_codedecl \normalmath {Math fonts CM + AMS preloaded <2022-07-22>} % preloaded in format
\_doc ------------------------------
We have two math macros \`\normalmath` for the normal shape of all math
@@ -39,8 +39,6 @@
% \_setmathfamily 11 \_tenbi
\_setmathdimens
}
-\_count18=9 % families declared by \newfam are 12, 13, ...
-
\_def \normalmath {\_normalmath} \_def\boldmath {\_boldmath}
\_doc -----------------------------
@@ -171,16 +169,36 @@
\_public \setmathsizes \ptunit \ptmunit ;
\_doc -----------------------------
+ \`\_setmathparam``<luatex-param> {<factor>}` sets
+ <luatex-param> (like `\Umathspaceafterscript`) to values dependent
+ on `1em` of textfont, scriptfont, scriptscriptfont. The <factor> is
+ scaling factor of mentioned `1em`.
+ \_cod -----------------------------
+
+\_def\_setmathparam#1#2{%
+ #1\_displaystyle =#2\_fontdimen6\_textfont1
+ #1\_textstyle =#2\_fontdimen6\_textfont1
+ #1\_scriptstyle =#2\_fontdimen6\_scriptfont1
+ #1\_scriptscriptstyle =#2\_fontdimen6\_scriptscriptfont1
+}
+
+ \_doc -----------------------------
The \`\_setmathdimens` macro is used in \^`\normalmath` or \^`\boldmath`
macros. It makes math dimensions dependent on the font size (plain \TeX/ sets
them only for 10\,pt typesetting). The `\skewchar` of some math families are
- set here too.
+ set here too.\nl
+ \^`\_setmathparam \Umathspaceafterscript` is used instead `\scriptspace`
+ setting because \LuaTeX/ ingnores `\scriptspace` in most cases. There is
+ small difference from classical \TeX/: we set \"scaled"
+ `\Umathspaceafterscript` dependent on textstyle, scriptstyle, etc.\ sizes.
+ The \`\_scriptspacefactor` is set to 0.05 which gives the same result
+ as Plain \TeX/ `\scriptspace=0.5pt` at 10\,pt font size.
\_cod -----------------------------
\_def\_setmathdimens{% PlainTeX sets these dimens for 10pt size only:
\_delimitershortfall=0.5\_fontdimen6\_textfont3
\_nulldelimiterspace=0.12\_fontdimen6\_textfont3
- \_scriptspace=0.05\_fontdimen6\_textfont3
+ \_setmathparam\_Umathspaceafterscript \_scriptspacefactor
\_skewchar\_textfont1=127 \_skewchar\_scriptfont1=127
\_skewchar\_scriptscriptfont1=127
\_skewchar\_textfont2=48 \_skewchar\_scriptfont2=48
@@ -188,6 +206,7 @@
\_skewchar\_textfont6=127 \_skewchar\_scriptfont6=127
\_skewchar\_scriptscriptfont6=127
}
+\_def\_scriptspacefactor{.05}
\_doc -----------------------------
Finally, we preload a math fonts collection in [10/7/5] sizes
@@ -224,6 +243,7 @@ For example
\_endinput
+2022-07-22: \_setmathparam\_Umathspaceafterscript added.
2022-02-22: \rm, \it, etc moved to fonts-select, \_marm, \_mait etc. introduced
2020-05-06: \itfam, \ttfam removed, (Unicode math preferred)
2020-04-14: \skewchar\fam6 added
diff --git a/macros/optex/base/math-unicode.opm b/macros/optex/base/math-unicode.opm
index a092d081c2..22db1d095e 100644
--- a/macros/optex/base/math-unicode.opm
+++ b/macros/optex/base/math-unicode.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \loadmath {Unicode Math fonts <2021-08-16>} % preloaded in format
+\_codedecl \loadmath {Unicode Math fonts <2022-07-22>} % preloaded in format
\_doc -----------------------------
\`\loadmath` `{<Unicode-math font>}` loads the given font. It does:
@@ -87,6 +87,7 @@
\_def\_setunimathdimens{% PlainTeX sets these dimens for 10pt size only:
\_delimitershortfall=0.5\_fontdimen6\_textfont1
\_nulldelimiterspace=0.12\_fontdimen6\_textfont1
+ \_setmathparam\_Umathspaceafterscript \_scriptspacefactor
\_setbox0=\_hbox{\_everymath{}$\_fam1\_displaystyle{0\_atop0}$}%
\_Umathfractiondelsize\_displaystyle = \_dimexpr(\_ht0-\_Umathaxis\_displaystyle)*2\_relax
\_setbox0=\_box\_voidbox
@@ -154,11 +155,11 @@
`\<first>+1`, `\<first>+2`
etc., but \`\_umathcharholes` are skipped
(`\_umathcharholes` are parts of the Unicode table not designed for math
- alphabets but they cause that the math alphabets are
+ alphabets, they cause that the math alphabets are
not continuously spread out in the table; I mean that the
designers were under the influence of drugs when they created
this part of the Unicode table).
- The `<from>-<to>` clause includes normal letters like `A-Z`.
+ The `<from>-<to>` clause includes characters like~`A-Z`.
\nl
\`\_umahrangegreek` `\<first>` is the same as
`\_umathrange {<alpha>-<omega>}\<first>`.
@@ -203,6 +204,53 @@
\_ea\_greekdef \_fi
}
+ \_doc -----------------------------
+ \`\addUmathfont` `<fam> {[<normal-font>]}{<ffeatures>} {[<bold-font>]}{<ffeatures>} {<factor>}`
+ allocates new <fam> using \^`\newfam` and adds loading this font to the
+ \~`\normalmath` and \~`\boldmath` macros. Note that allocationos using
+ \^`\newfam` starts from 43 because numbers 1--42 are reserved for direct
+ usage without \^`\newfam`.
+ \_cod -----------------------------
+
+\_def\_addUmathfont #1#2#3#4#5#6{% #1: fam (will be set), #2#3: normal font, #4#5: bold font
+ \_ifx\_ncharrmA\_undefined \_errmessage{basic Unicode math font must be loaded first}%
+ \_else \_isfont{#2}\_iffalse \_opwarning{font #2 is unavailable}%
+ \_else
+ \_newfam#1\_relax
+ \_global\_addto\_normalmath{\_corrmsize#6 \_loadumathfamily #1 {#2}{#3} }%
+ \_ifx\_relax#4\_relax
+ \_global\_addto\_boldmath{\_corrmsize#6 \_loadumathfamily #1 {#2}{embolden=1.7;} }%
+ \_else
+ \_global\_addto\_boldmath{\_corrmsize#6 \_loadumathfamily #1 {#4}{#5} }%
+ \_fi
+ \_normalmath
+ \_wterm{add-MATH-FONT: #1=\the#1, "#2", \ifx"#4"\else bold: "#4"\fi}%
+ \_fi \_fi
+}
+
+ \_doc -----------------------------
+ \`\resetmathchars` `<fam> <list of sequences> ;`
+ saves <fam> to \`\_mafam` and applies \`\_resetmathcharsX`
+ to each sequence from <list of sequences>.
+ The `\directlua` chunk prints the 8-digits hexadecimal code of the
+ sequence followed by the sequence itself. The digts are scanned by \`\_resetmathcharsY`
+ and new `\Umathchardef` and `\Umathcode` is declared. Note that the used
+ primitives have the syntax:
+ \begtt \catcode`<=13
+ \Umathchardef <sequence> <math class> <math family> <slot number>
+ \Umathcode <code> <math class> <math family> <slot number>
+ \endtt
+ \_cod -----------------------------
+
+\_def\_resetmathchars #1{\_chardef\_mafam=#1\_relax \_xargs \_resetmathcharX}
+\_def\_resetmathcharX#1{\_ea\_resetmathcharY
+ \_directlua{tex.print(string.format("\_pcent08X", \_the#1))}#1}
+\_def\_resetmathcharY#1#2#3#4#5#6#7#8#9{% #9 is given \math-sequence
+ \_Umathchardef #9\_numexpr"#3/2\_relax \_mafam "#4#5#6#7#8
+ \_Umathcode "#4#5#6#7#8=\_numexpr"#3/2\_relax \_mafam "#4#5#6#7#8
+}
+\_public \addUmathfont \resetmathchars ;
+
\_endcode
@@ -218,25 +266,47 @@ if `<normal-font>` was sucessully loaded by the previous `\loadmath`. For exampl
\loadmath {[xitsmath-regular]}
\loadboldmath {[xitsmath-bold]} \to {[xitsmath-regular]}
\endtt
-There are very few Unicode-math fonts with full \^`\boldmath` support.
+There are very few Unicode-math fonts with full \~`\boldmath` support.
I know only XITSMath-Bold and KpMath-Bold. If \^`\loadboldmath` is not used
-then \"faked bold" created from \^`\normalmath` is used by default.
+then \"faked bold" created from \~`\normalmath` is used by default.
-The \^`\loadmath` macro was succesfully tested on:
+The {\em main math font} is loaded by \^`\loadmath` (typically indirectly using
+\^`\fontfam`) and you can load more {\em additional math fonts} by
+\^`\addUmathfont`:
+\begtt \catcode`<=13
+\addUmathfont \famname {[<normal-font>]}{<ffeatures>} {[<bold-font>]}{<ffeatures>} {<factor>}
+\endtt
+The `\famname` is a control sequence declared by \^`\addUmathfont` for later
+use. It gets math family number. The `<factor>` is decimal number for size
+corrections in view of the main math font. If it is empty then <factor>=1.
+If <bold-font> is empty, the \"faked bold" derived from <normal-font> is used.
+Example:
+\begtt
+\fontfam[lm] % does \lodmath{[latinmodern-math]}
+\addUmathfont \xits {[XITSMath-Regular]}{} {[XITSMath-Bold]}{} {}
+\endtt
+%
+declares `latinmodern-math` as main math font (its bold variant is \"faked bold")
+and the additional math font `\xits` is `XITSMath-Regular` for normal
+printing and `XITSMath-Bold` for bold printing.
+
+All characters used in math formula is printed from main math font by
+default. But you can redeclare a list of characters for printing from
+additional font by \^`\resetmathchars` `\famname <list of sequences> ;`. For
+example:
\begtt
-\loadmath{[XITSMath-Regular]} ... XITS MATH
-\loadmath{[latinmodern-math]} ... Latin Modern Math
-\loadmath{[texgyretermes-math]} ... TeXGyre Termes Math
-\loadmath{[texgyrebonum-math]} ... TeXGyre Bonum Math
-\loadmath{[texgyrepagella-math]} ... TeXGyre Pagella Math
-\loadmath{[texgyreschola-math]} ... TeXGyre Schola Math
-\loadmath{[texgyredejavu-math]} ... TeXGyre DeJaVu Math
-\loadmath{[LibertinusMath-Regular]} ... Libertinus Math
-\loadmath{[FiraMath-Regular]} ... Fira Math
-\loadmath{[Asana-Math]} ... Asana Math
-\loadmath{[KpMath-Regular]} ... KP fonts Math
+\resetmathchars \xits \stareq \triangleq \veeeq \wedgeq ;
\endtt
+%
+sets the characters `\stareq`, `\triangleq`, `\veeeq`, `\wedgeq` from
+the `\xits` additional font. You can see all possible sequences by
+`\input print-unimath.opm`.
+If you want to use whole math alphabet from additional math font, use
+`\addto\selector{\fam\famname}`, for example `\addto\cal{\fam\xits}`
+declares all `\cal` characters from the `\xits` font loaded by
+\^`\addUmathfont`.
+
\secc Unicode-math macros preloaded in the format
@@ -259,6 +329,8 @@ the section~\ref[math-macros].
\_endinput
+2022-07-22 \Umathspaceafterscript setting added.
+2022-06-10 \addUmathfont and \resetmathchars added.
2021-08-16 \_loadumathfamily simplified, used mathsize= font feature.
2021-08-16 nomathparam font feature used for families > 3 (bug fixed).
2021-08-02 ssty fontfeatures rewritten; fam2, fam3 unused, \scriptspace not set
diff --git a/macros/optex/base/more-macros.opm b/macros/optex/base/more-macros.opm
index 17e9bdd1e2..f256458184 100644
--- a/macros/optex/base/more-macros.opm
+++ b/macros/optex/base/more-macros.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \eoldef {OpTeX useful macros <2021-04-25>} % preloaded in format
+\_codedecl \eoldef {OpTeX useful macros <2022-05-24>} % preloaded in format
\_doc -----------------------------
We define \`\opinput` `{<file name>}` macro which
@@ -115,11 +115,11 @@
processor level using the negative `\romannumeral` trick.
\_cod -----------------------------
-\_def\_optdef#1[#2]{%
- \_def#1{\_opt={#2}\_isnextchar[{\_cs{_oA:\_string#1}}{\_cs{_oB:\_string#1}}}%
- \_sdef{_oA:\_string#1}[##1]{\_opt={##1}\_cs{_oB:\_string#1\_nospaceafter}}%
- \_sdef{_oB:\_string#1\_nospaceafter}%
-}
+\_def\_optdef#1[#2]{%
+ \_def#1{\_opt={#2}\_isnextchar[{\_cs{_oA:\_csstring#1}}{\_cs{_oB:\_csstring#1}}}%
+ \_sdef{_oA:\_csstring#1}[##1]{\_opt={##1}\_cs{_oB:\_csstring#1\_nospaceafter}}%
+ \_sdef{_oB:\_csstring#1\_nospaceafter}%
+}
\_def\_nospaceafter#1{\_ea#1\_romannumeral-`\.}
\_newtoks\_opt
@@ -278,6 +278,7 @@
\_endcode % -------------------------------------
+2022-05-24 \optdef: used \csstring instead \string, bug fixed.
2021-04-25 \normalcatcodes: typo fixed
2021-04-22 \the\_currctable replaced by \the\_catcodetable, bug fixed.
2020-05-22 robust \catcode newly defined in order \catcode\string.... be possible
diff --git a/macros/optex/base/optex.ini b/macros/optex/base/optex.ini
index ad6c1f408b..05e052f82b 100644
--- a/macros/optex/base/optex.ini
+++ b/macros/optex/base/optex.ini
@@ -21,7 +21,7 @@
% OpTeX version
-\def\optexversion{1.07 May 2022}
+\def\optexversion{1.08 Aug 2022}
\def\fmtname{OpTeX}
\let\fmtversion=\optexversion
diff --git a/macros/optex/base/parameters.opm b/macros/optex/base/parameters.opm
index 600fe66f15..499aee8d45 100644
--- a/macros/optex/base/parameters.opm
+++ b/macros/optex/base/parameters.opm
@@ -33,7 +33,7 @@
\_delimiterfactor=901 % parameter for scaling delimiters
\_delimitershortfall=5pt
\_nulldelimiterspace=1.2pt
-\_scriptspace=0.5pt
+%\_scriptspace=0.5pt % \Umathspaceafterscript used in \_setmathdimens, \_setunimathdimens instead
\_maxdepth=4pt
\_splitmaxdepth=\_maxdimen
\_boxmaxdepth=\_maxdimen
@@ -466,7 +466,7 @@
fonts at the beginning of your document. For example `\fontdef\rmfixed{\rm}`,
`\fontdef\itfixed{\it}`. Then use them in headline and footline:
\begtt
- \headline={\itfixed Text of headline, section: \fistmark \hss}
+ \headline={\itfixed Text of headline, section: \firstmark \hss}
\footline={\rmfixed \ifodd\pageno \hfill\fi \folio \hfil}
\endtt
\_cod -----------------------------
diff --git a/macros/optex/base/pdfuni-string.opm b/macros/optex/base/pdfuni-string.opm
index 25781ddfb4..89a479895a 100644
--- a/macros/optex/base/pdfuni-string.opm
+++ b/macros/optex/base/pdfuni-string.opm
@@ -23,7 +23,10 @@
\egroup
\_doc -----------------------------
- \`\pdfunidef``\macro{<text>}` does more things than only converting to hexadecimal PDF string.
+ \`\pdfunidef``\macro{<text>}` defines `\macro` as <text> converted to
+ Big Endian UTF-16 and enclosed to \code{<>}. Example of usage:
+ `\pdfunidef\infoauthor{Petr Olšák} \pdfinfo{/Author \infoauthor}`.\nl
+ \^`\pdfunidef` does more things than only converting to hexadecimal PDF string.
The <text> can be scanned in verbatim mode (it is true becuase \^`\_Xtoc`
reads the <text> in verbatim mode). First `\edef` do
`\_scantextokens\unexpanded` and second `\edef` expands the parameter
@@ -86,7 +89,7 @@
}
\_doc -----------------------------
- The \^`\regmacro` is used in order to sed the values of macros
+ The \^`\regmacro` is used in order to set the values of macros
`\em`, `\rm`, `\bf`, `\it`, `\bi`, `\tt`, `\/` and `~` to values usable in
PDF outlines.
\_cod -----------------------------
diff --git a/macros/optex/base/print-unimath.opm b/macros/optex/base/print-unimath.opm
index 2b1a07f30a..4ae761be25 100644
--- a/macros/optex/base/print-unimath.opm
+++ b/macros/optex/base/print-unimath.opm
@@ -2,6 +2,9 @@
\_codedecl \_undefined {Printing Unicode-math table \string<2020-06-08>}
+\_ifx\_ncharrmA\_undefined \_opwarning{No Unicode math font loaded, printing ignored}
+ \_endinput \_fi
+
\_begingroup
\_def\UnicodeMathSymbol#1#2#3#4{%
\_ifnum#1>"10000 \_endinput \_else \_printmathsymbol{#1}{#2}{#3}{#4}\_fi
diff --git a/macros/optex/base/sections.opm b/macros/optex/base/sections.opm
index 25d31cabaa..9ff2c2d436 100644
--- a/macros/optex/base/sections.opm
+++ b/macros/optex/base/sections.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \chap {Titles, chapters, sections, subsections <2021-03-03>} % preloaded in format
+\_codedecl \chap {Titles, chapters, sections, subsections <2022-08-02>} % preloaded in format
\_doc ---------------------------
We are using scaled fonts for titles
@@ -69,7 +69,7 @@
\enditems
\_cod ---------------------------
-\_def\_printchap #1{\_vfill\_supereject
+\_def\_printchap #1{\_vfill\_supereject \_prevdepth=0pt
\_vglue\_medskipamount % shifted by topkip+\medskipamount
{\_chapfont \_noindent \_mtext{chap} \_printrefnum[@]\_par
\_nobreak\_smallskip
@@ -78,13 +78,13 @@
\_firstnoindent
}
\_def\_printsec#1{\_par
- \_abovetitle{\_penalty-400}\_bigskip
+ \_abovetitle{\_penalty-151}\_bigskip
{\_secfont \_noindent \_raggedright \_printrefnum[@\_quad]#1\_nbpar}\_insertmark{#1}%
\_nobreak \_belowtitle{\_medskip}%
\_firstnoindent
}
\_def\_printsecc#1{\_par
- \_abovetitle{\_penalty-200}{\_medskip\_smallskip}
+ \_abovetitle{\_penalty-101}{\_medskip\_smallskip}
{\_seccfont \_noindent \_raggedright \_printrefnum[@\_quad]#1\_nbpar}%
\_nobreak \_belowtitle{\_medskip}%
\_firstnoindent
@@ -295,15 +295,17 @@
\_doc -----------------------------
\OpTeX/ sets `\headline={}` by default, so no running headings are printed.
- You can activate the running headings by following code, for example:
+ You can activate the running headings by following code, for example.
+ See also \ulink[https://github.com/olsak/OpTeX/issues/100]{issue 100}.
\begtt
- \addto\_chapx {\_edef\_runningchap {\_thechapnum: \_unexpanded\_ea{\_savedtitle}}}
+ \addto\_chapx {\globaldefs=0 \vfil\break % headline of previous chapter is printed
+ \xdef\_runningchap {\_thechapnum: \unexpanded\_ea{\_savedtitle}}}
\def \formathead #1#2{\isempty{#1}\iffalse #1: #2\fi}
\headline = {%
\ifodd \pageno
\hfil \ea\formathead\firstmark{}{}%
\else
- Chapter: \runningchap \hfil
+ \ifx\_runningchap\_undefined \else Chapter \_runningchap \fi \hfil
\fi
}
\endtt
@@ -459,6 +461,8 @@
\_endcode % -------------------------------------
+2022-08-02 Penalties in \_printsec, \_printsecc changed
+2022-07-11 \_printchap: \_prevdepth=0pt added, see issue 100
2021-03-03 \_captionsep introduced, \_othe used in \_thetnum, \_thefnum.
2021-02-09 \thisoutline implemented
2021-01-26 \_nl: \unskip added
diff --git a/macros/optex/base/unimath-codes.opm b/macros/optex/base/unimath-codes.opm
index ec0067890e..229ea4575d 100644
--- a/macros/optex/base/unimath-codes.opm
+++ b/macros/optex/base/unimath-codes.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \_ncharrmA {Uni math codes <2022-02-22>} % preloaded on demand by \loadmath
+\_codedecl \_ncharrmA {Uni math codes <2022-07-20>} % preloaded on demand by \loadmath
\_doc -----------------------------
The control sequences for `\alpha`, `\beta` etc are redefined here.
@@ -212,6 +212,8 @@
\_Umathcode "03A2 = 7 1 "03F4 % \varTheta
+\_Umathcode `© = 0 1 `© % usage $\copyright$ can be seen in old documents
+
\_protected\_def \_sqrt {\_Uradical 1 "0221A }
\_protected\_def \_cuberoot {\_Uradical 1 "0221B }
\_protected\_def \_fourthroot {\_Uradical 1 "0221C }
@@ -449,6 +451,7 @@ for technical details about Unicode-math.
\_endinput
History:
+2022-07-20 \Umathcode for copyright declared
2022-02-22 \rm, \bf etc. moved to font-select, \_marm, \_mabf etc. introduced
2022-02-08 several wide math accents added
2022-01-06 \varTheta corrected
diff --git a/macros/optex/doc/optex-doc.pdf b/macros/optex/doc/optex-doc.pdf
index 3539a3fdfe..bf9f70a326 100644
--- a/macros/optex/doc/optex-doc.pdf
+++ b/macros/optex/doc/optex-doc.pdf
Binary files differ
diff --git a/macros/optex/doc/optex-doc.tex b/macros/optex/doc/optex-doc.tex
index 72a21336c1..785a181b1d 100644
--- a/macros/optex/doc/optex-doc.tex
+++ b/macros/optex/doc/optex-doc.tex
@@ -21,7 +21,7 @@
\tit Format Based on Plain \TeX/ and OPmac\fnotemark1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\hfill Version 1.07
+\hfill Version 1.08
\centerline{\it Petr Olšák, 2020, 2021, 2022}
diff --git a/macros/optex/doc/optex-math.tex b/macros/optex/doc/optex-math.tex
index 030a919dbf..ab127ea762 100644
--- a/macros/optex/doc/optex-math.tex
+++ b/macros/optex/doc/optex-math.tex
@@ -205,7 +205,10 @@ Ord atoms are printed without spaces between them. The spaces are not
cumulated, so the rule about spaces mentioned above is only a rough idea.
The exact rule for horizontal spaces is given for each pairs of atoms
in the table here. The symbol 0 means no space, 1 thin space, 2 medium space,
-and 3 means thick space.
+and 3 means thick space.\fnote
+{The table presented here is built into \TeX. On the other hand,
+\LuaTeX/ allows to set arbitrary spaces between arbitrary pairs,
+see section 7.5.2 in the \LuaTeX/ manual.}
\hangindent=-8.7cm \hangafter-2
The Bin atom is automatically transformed to the
@@ -714,7 +717,7 @@ previous listing of math alphabets and sets as default:
Moreover, it defines the alphabet selectors at user level (see section 1.3.3
of the \OpTeX/ manual). For example
\begtt \typosize[10/12]
-\_def\_marm {\_inmath{\_rmavariables \_rmdigits}} % \_mamrm is used in \rm
+\_def\_marm {\_inmath{\_rmavariables \_rmdigits}} % \_marm is used in \rm
\endtt
%
`\_inmath` runs its parameter only in math mode and sets the math alphabets.
@@ -750,9 +753,7 @@ And the result from `\input print-unimath.opm` looks like the following ten
pages.
Unsupported characters can be replaced by characters from other Unicode math
-font, see
-\ulink[http://petr.olsak.net/optex/optex-tricks.html\#addumathfont]{OpTeX trick 0030}
-or section~\ref[newfam].
+font, see section~\ref[newfam].
\label[listA]\wlabel{}
@@ -984,7 +985,7 @@ and `$1+2+\unicodecdots + n$`. You get $1,2,\unicodeellipsis, n$ and
$1+2+\unicodecdots + n$. If you feel that this is better, then you can set:
`\let\dots=\unicodeellipsis \let\cdots=\unicodecdots`.
-The Unicode fonts includes compact variants `\unicodevdots` $\unicodevdots$,
+The Unicode fonts include compact variants `\unicodevdots` $\unicodevdots$,
`\unicodeddots` $\unicodeddots$ and `\unicodeadots` $\unicodeadots$ too.
@@ -1574,17 +1575,28 @@ used). So, the default `\_boldmath` macro defined by \OpTeX/ looks like:
\let\_boldmath=\_boldunimath % this is done when Unicode math is initialized
\endtt
-\secc[newfam] Example of using additional math font
-
-The font `bbold10.tfm` includes double stroked characters, for example,
-double stroked plus, double stroked Greek letters and digits.
-Try to run `pdftex testfont`, then answer the question about the name of the
-font: `bbold10` and then type command `\table\end`. The `testfont.pdf` is
-printed with the table of characters of this font.
-Most of these characters cannot be found in Unicode math fonts.
+\secc[newfam] Using additional math fonts
\new \OpTeX/
-We show an example of how to add this font to the collection of used math fonts.
+The main Unicode math font is loaded by `\loadmath` and `\loadboldmath`
+(typically processed when `\fontfam[<family-name>]` is declared). Moreover,
+you can load {\em additional Unicode math fonts} and you can combine
+characters from main math font and these additional fonts. This can be
+usable if the main math font doesn't include all desired characters or you
+dislike some character shapes from main font. \OpTeX/ enables to load
+additional math fonts by `\addUmathfont` and characters from additional
+fonts can be declared by `\resetmathchars`. See the section 2.16 of \OpTeX/
+documentation for more details about this.
+
+The rest of this section includes an example which shows another task: how
+to combine main Unicode math font with old 8-bit math font `bbold10.tfm`.
+This font includes double stroked characters, for example, double stroked
+plus, double stroked Greek letters and digits. Try to run `pdftex testfont`,
+then answer the question about the name of the font: `bbold10` and then type
+command `\table\end`. The `testfont.pdf` is printed with the table of
+characters of this font. Most of these characters cannot be found in Unicode
+math fonts.
+
We can re-define the `\_normalmath` macro by:
\begtt \typosize[10/12]
\addto\_normalmath {\_loadmathfamily 5 bbold }
@@ -1660,10 +1672,6 @@ We have to settle for normal version of the font in the `\_boldmath` macro:
\addto \_boldmath {\_loadmathfamily 5 bbold }
\endtt
-Another approach of using more Unicode math fonts in a single formula is
-shown in
-\ulink[http://petr.olsak.net/optex/optex-tricks.html\#addumathfont]{OpTeX trick 0030}.
-
\sec Index
Control sequences listed at pages \pgref[listA]--\pgref[listB] are not
diff --git a/macros/optex/doc/optex-userdoc.tex b/macros/optex/doc/optex-userdoc.tex
index 92d2d970e9..23609f7bad 100644
--- a/macros/optex/doc/optex-userdoc.tex
+++ b/macros/optex/doc/optex-userdoc.tex
@@ -2018,6 +2018,27 @@ if you really need such feature.
The `\sec` macro is reserved for sections but original Plain \TeX/ declares this
control sequence for math secant\fnote{Use \code{$\\secant(x)$} to get $\secant(x)$.}.
+\sec Related documents
+
+\begitems
+* \ulink[http://petr.olsak.net/ftp/olsak/optex/optex-math.pdf]
+ {Typesetting math with \OpTeX} --
+ More details about math typesetting.
+* \ulink[http://petr.olsak.net/ftp/olsak/optex/tex-nutshell.pdf]
+ {\TeX/ in a Nutshell} --
+ Summary about \TeX/ principles, \TeX/ primitive commands etc.
+* \ulink[http://petr.olsak.net/ftp/olsak/optex/op-catalog.pdf]
+ {\OpTeX/ catalog} --
+ All fonts collected to `\fontfam` families are shown here.
+* \ulink[http://petr.olsak.net/ftp/olsak/optex/omls.pdf]
+ {OMLS} --
+ \OpTeX/ Markup Language Standard.
+* \ulink[http://petr.olsak.net/optex/optex-tricks.html]
+ {\OpTeX/ - tips, tricks, howto} --
+ Tips of macro codes for various purposes.
+
+\enditems
+
\enddocument
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index b23aaefccc..e5434b9fce 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -210,9 +210,6 @@ $mirrors = {
},
},
'South America' => {
- 'Brazil' => {
- 'https://linorg.usp.br/CTAN/' => 1,
- },
'Chile' => {
'https://ctan.dcc.uchile.cl/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 26a28e1b2d..8d1767152e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/64039
+depend revision/64051
name 00texlive.image
category TLCore
-revision 64026
+revision 64051
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -4609,7 +4609,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 64036
+revision 64041
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -18701,7 +18701,7 @@ catalogue-version 6.101
name animate
category Package
-revision 62123
+revision 64043
shortdesc Create PDF and SVG animations from graphics files and inline graphics
relocated 1
longdesc The package provides an interface to create portable,
@@ -18709,16 +18709,16 @@ longdesc JavaScript driven PDF and SVG animations from sets of graphics
longdesc files or from inline graphics, such as LaTeX picture
longdesc environment, PSTricks or pgf/TikZ generated pictures, or just
longdesc from typeset text.
-containersize 23932
-containerchecksum 30646388abeb2df2f00f1ddb03a6b714a965ce7ed0320112ef171fd240237cd83d014456353b1c2eae6a570d577a647bc63e7b56b2e7718cddfd6369f4fa7b9c
-doccontainersize 3143284
-doccontainerchecksum 4000fe2ae0371db3097d6280231ec7288f0813cd4a48933ee1f35ba234968ac4d091439c5448c91147ce4d51c6eff29383f76c022cec8ebb2ec30c0c55100129
+containersize 23836
+containerchecksum ba48411d91c79b5e9bb2f7c071e945b07a7f8f8b8d178393841d682b049e1669901cee22e540bcefd049c638cd6cc50e4a242a6e2f8620d476500fb0c155c7ad
+doccontainersize 3143244
+doccontainerchecksum cb102aecec17d2d15dcdbdb09a08aac09f2a76a7dba8ccfe7351d48ff3c4bb99d015701ccbf4036de91fae14da576dd2adbd06959224f9540004575e971271fe
docfiles size=922
RELOC/doc/latex/animate/ChangeLog
RELOC/doc/latex/animate/README.txt
RELOC/doc/latex/animate/animate.pdf details="Package documentation"
-srccontainersize 30224
-srccontainerchecksum 64a149d70608c1867d09eebe6acd454a0b5a5655eb5b398ff013adadf016fa4a35cd091e86fbe01f996d8844e7f5ef20abe1e8c7d4ef933a1a7ab100ca4db73a
+srccontainersize 30204
+srccontainerchecksum 0cd60addeef42e00d716e3880e82da650ebcde9e8291ab13ba4f3dace40201acea92c7ac311caea29a67f9f8dcbc583139315151beaedff7ea7b1c7624f6d1f5
srcfiles size=36
RELOC/source/latex/animate/animate.tex
RELOC/source/latex/animate/files/bye_0.eps
@@ -18728,7 +18728,7 @@ srcfiles size=36
RELOC/source/latex/animate/files/click.mp3
RELOC/source/latex/animate/files/exp.mp
RELOC/source/latex/animate/files/scarab.mp
-runfiles size=35
+runfiles size=34
RELOC/tex/latex/animate/animate.sty
catalogue-contact-repository https://gitlab.com/agrahn/animate
catalogue-ctan /macros/latex/contrib/animate
@@ -82310,7 +82310,7 @@ catalogue-version 0.1
name create-theorem
category Package
-revision 64016
+revision 64044
shortdesc Multilingual support for theorem-like environments
relocated 1
longdesc This package provides commands for naming and initializing
@@ -82319,11 +82319,11 @@ longdesc interfaces and are especially useful in multilingual documents,
longdesc allowing the easy declaration of theorem-like environments that
longdesc can automatically adapt to the language settings.
depend crefthe
-containersize 9808
-containerchecksum 0cb351a1361af6062c936ab74a87051b1f39d49d247de96399ce7a69c42acebcbd1d55ee41bbf762a9fb49878c48863f3d739d40570f59325b296d44c0b5b7f7
-doccontainersize 78152
-doccontainerchecksum 320f4a580e1ca0c2cb2131732aa8933fff64ccd6031ceb9c8b2633feb9766e1f98586ca7a1cba97fffdd5ab57cbbc6297cab505bfe874f26278406b74b65eefb
-docfiles size=31
+containersize 9832
+containerchecksum a0af1b33ec93e16e9e9239467c02daed65fd139d7fd0731a57f3940bcb02323df1db566449ec835baeced0010ec862edc87ac6c44263061216008c0338c4ce00
+doccontainersize 82732
+doccontainerchecksum 4b67ba6f2c33a6c329d987db9ec7e9da012b7136bf3eb09dab7ba5718a768a56661e598cb0eec6d87f9755d59bd04215d3d3c971c05f8c38ae8da86e4409aa35
+docfiles size=33
RELOC/doc/latex/create-theorem/DEPENDS.txt
RELOC/doc/latex/create-theorem/LICENSE
RELOC/doc/latex/create-theorem/README.md details="Readme"
@@ -101189,7 +101189,7 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 63217
+revision 64045
shortdesc Easily typesetting Chinese theses or books
relocated 1
longdesc easybook is a pure academic template created based on the
@@ -101200,16 +101200,16 @@ longdesc providing multiple commands and interfaces allows users to
longdesc easily customize the thesis template. Its basic macro package
longdesc easybase can also be used with CTeX and standard document
longdesc classes.
-containersize 16556
-containerchecksum 262aaa7e7c32444c49da3daec45c9ca304700960ceb39f4e0f442ffc9a5a2e1ca80456e1566298d33ce1b1b8f49c62a71e4a79b37ea6e6c2026c2f9c4b5f8768
-doccontainersize 613284
-doccontainerchecksum 10a74bc8f8379cb6151966ff6f6c3819ccc964536a28d90ad18af5ebad972b6e9aabdadba2093d3ae6261cb2b4629b8036e42eccf25d5f2a9cce6fcf013998f2
+containersize 16584
+containerchecksum a7ae7d8e7321a9237d4254ab5b103d63f1f9f78c44b37d88dbf0f8c22a24ad0d5334d9d773acf113c32c3a122331b05af5ad52be59c60e8e0bbb1a76dbce8ff2
+doccontainersize 613152
+doccontainerchecksum 59c60a10ff52581093455cf533062a76d87e931d2389b067729404b326ac7268c8495a10761096e7664df3bb41a7bc134c583cd8fdafa7b3d54d52f556c81e17
docfiles size=167
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
RELOC/doc/latex/easybook/easybook.tex
-srccontainersize 16464
-srccontainerchecksum 2e1007bd251fa25700c946396946460ada8bcd94ef2ab26e9f27114228787039728a9d97ef41e1bcdf4a0cabab25f5fc3418989221e46cfccbf88760b6fe92a2
+srccontainersize 16484
+srccontainerchecksum a755a1d62caed8774ee061dc15e74ef85134b643de5f31b9994fc57295a1bf837213a3a4c00c4c3fb92cd0a4662bb60e3f78fa5fe33af7fff3b60eb5fc926d5b
srcfiles size=20
RELOC/source/latex/easybook/easybook.dtx
RELOC/source/latex/easybook/easybook.ins
@@ -101221,8 +101221,8 @@ catalogue-also ctex
catalogue-contact-repository https://gitee.com/texl3/easybook
catalogue-ctan /macros/latex/contrib/easybook
catalogue-license lppl1.3c
-catalogue-topics book-pub class chinese expl3
-catalogue-version 1.683
+catalogue-topics book-pub dissertation class doc-templ chinese expl3
+catalogue-version 1.69
name easyfig
category Package
@@ -199003,7 +199003,7 @@ catalogue-version 1.0
name media4svg
category Package
-revision 63330
+revision 64046
shortdesc Multimedia inclusion for the dvisvgm backend
relocated 1
longdesc This package implements an interface for embedding video and
@@ -199015,10 +199015,10 @@ longdesc engines can be used. The dvisvgm utility, which is part of all
longdesc major TeX distributions, converts the intermediate DVI to SVG.
longdesc By default, media files are embedded into the SVG output to
longdesc make self-sufficient SVG files.
-containersize 7716
-containerchecksum 1cce7560625771a7df261c1872e2236d43af3db562c8178d3225c5b0b35b9cfd35fc5c01ce9b97091e34e646107ba2d07d0fad465ea39d4c08009c357c8cb97d
-doccontainersize 126436
-doccontainerchecksum e5f2bc7040cc61d4dc404195257f9125a750b78ab5f1b3c34ce9817ae986bfa0ec5c60eb625b93b5496eca33484aa143ad6f70792f7d599117a1bc1851d7f6c2
+containersize 7720
+containerchecksum fb1e38c78e6f2d5690d206d0284166aa53c67629eac27ff99c9bd7dee9c7339718ddcd5a89a888aa2ab81dd8f1af5387c8aaba7f351d0006c0cd3afde0c5d1b4
+doccontainersize 126364
+doccontainerchecksum 3a553a2763a8efb14d5599af169de6b612294e2798eafea7866a22099e217d81f4f49fe89108f04d752cd0ed5403e1a8f9ebba701a972884124f796e94a1ec3d
docfiles size=95
RELOC/doc/latex/media4svg/ChangeLog
RELOC/doc/latex/media4svg/README.txt
@@ -199034,11 +199034,11 @@ catalogue-contact-repository https://gitlab.com/agrahn/media4svg
catalogue-ctan /macros/latex/contrib/media4svg
catalogue-license lppl
catalogue-topics multimedia expl3
-catalogue-version 0.7
+catalogue-version 0.8
name media9
category Package
-revision 62786
+revision 64047
shortdesc Multimedia inclusion package with Adobe Reader-9/X compatibility
relocated 1
longdesc The package provides an interface to embed interactive Flash
@@ -199051,16 +199051,16 @@ longdesc Player supports the efficient H.264 codec for video
longdesc compression. The package is based on the RichMedia Annotation,
longdesc an Adobe addition to the PDF specification. It replaces the now
longdesc obsolete movie15 package.
-containersize 1895700
-containerchecksum 70b0d5b653c9d99ac406ea5da10dd7ae0fec90a4f3c3f2003d36baf5aa946783ef37ef1b55e8f95b29d68fd3791a9bc876bbf2c278936dbdacf8d803f8e5576c
-doccontainersize 3725324
-doccontainerchecksum b887011919f58a61f1c2b850e1cec09bfa7d20a2b0bbbf088ac8eb9b60245c1ffc746d61e7173a4adeef38e0c07a2f7eede79963bd2cdcc74e05e86844307518
-docfiles size=921
+containersize 1895928
+containerchecksum 3eab7f0687395941f6805db51fff943b6bc795a8a5cf2fb2ed9f03f0103b4fef0bfebdf449701a051b72d8f18a8e332ec02f1893812e4be6d31a56980d50a1e4
+doccontainersize 3637360
+doccontainerchecksum e3f97ec8b1fbb345e42f641eb37f6210d4ebc2e791f6ca21af6c7ac7c7f86c149fa874cafe6a2eb1d47508e2a72aded6ea40b381393ae79e9baab5ecded73c6c
+docfiles size=899
RELOC/doc/latex/media9/ChangeLog
RELOC/doc/latex/media9/README.txt
RELOC/doc/latex/media9/media9.pdf details="Package documentation"
-srccontainersize 1776724
-srccontainerchecksum ba44da99ec8ec55ffc178d662cb0d5263ddadb199833bae7a4a5f61201b0cb0f86d03637b89e36c2d8f940899f5ca7c7533eeb2d1079bbee376fa1b4739d949c
+srccontainersize 1776700
+srccontainerchecksum 907343fbe326e491f543f104ea9335d6c69848b3d4a69469587bc5d417e3a58e2d18567a0377c71a28e8e7ee6d94959ee8a7e632819773692d34b6cc47a3cb09
srcfiles size=555
RELOC/source/latex/media9/files/3dsystem.fig
RELOC/source/latex/media9/files/3dsystem.pdf
@@ -199098,7 +199098,7 @@ srcfiles size=555
RELOC/source/latex/media9/players/StrobeMediaPlayback-license
RELOC/source/latex/media9/players/VPlayer.mxml
RELOC/source/latex/media9/players/VPlayer9.mxml
-runfiles size=534
+runfiles size=535
RELOC/tex/latex/media9/javascript/3Dmenu.js
RELOC/tex/latex/media9/javascript/3Dspintool.js
RELOC/tex/latex/media9/javascript/animation.js
@@ -199115,7 +199115,7 @@ catalogue-contact-repository https://gitlab.com/agrahn/media9
catalogue-ctan /macros/latex/contrib/media9
catalogue-license lppl
catalogue-topics multimedia expl3
-catalogue-version 1.24
+catalogue-version 1.25
name medstarbeamer
category Package
@@ -230463,7 +230463,7 @@ catalogue-version 0.5
name ocgx2
category Package
-revision 62927
+revision 64048
shortdesc Drop-in replacement for 'ocgx' and 'ocg-p'
relocated 1
longdesc This package serves as a drop-in replacement for the packages
@@ -230474,10 +230474,10 @@ longdesc known engines and back-ends including: LaTeX - dvips -
longdesc ps2pdf/Distiller (Xe)LaTeX(x) - dvipdfmx pdfLaTeX and LuaLaTeX
longdesc . It also ensures compatibility with the media9 and animate
longdesc packages.
-containersize 17216
-containerchecksum 8506d1526e1b8d98268d11b78fab61b51b2713f9c21ef34fa9e835f3cbf9344251e03cab2836d329ba60480b1b4fc18aa9324f40cf50e1c964a9115ea33546c4
-doccontainersize 6172
-doccontainerchecksum 78cdff92f4fb8edde110baa4c7e14804996fb149db18b692f3fa7a71d13aeb3154b76284105aeaf8ca46a6e73eaf8d0d4c44cf762e33425bb285b50e85e6ab2f
+containersize 17248
+containerchecksum 9d2c50821fc03d5d00bcbb5d307669307baac326ef45ede2aa2d9f92e5f671187c1f16e492a46fd1857095a530a9f38cace8cd512b953c96160a1b5c06e2eab6
+doccontainersize 6212
+doccontainerchecksum 63489d038f643ec375b77290412debd5ca6db26c8029bd6f74a978e9b2cd0d61a485a6a110190f1ef7dd0c1974c1b74ec455e10d7a6e54e24c70680e4e813b55
docfiles size=5
RELOC/doc/latex/ocgx2/ChangeLog
RELOC/doc/latex/ocgx2/README.txt
@@ -230490,7 +230490,7 @@ catalogue-contact-repository https://gitlab.com/agrahn/ocgx2
catalogue-ctan /macros/latex/contrib/ocgx2
catalogue-license lppl
catalogue-topics pdf-feat adobe-distiller expl3
-catalogue-version 0.54
+catalogue-version 0.55
name ocherokee
category Package
@@ -231389,7 +231389,7 @@ catalogue-version 0.2
name olsak-misc
category Package
-revision 63588
+revision 64042
shortdesc Collection of plain TeX macros written by Petr Olsak
relocated 1
longdesc This is a collection of various single-file plain TeX macros
@@ -231406,10 +231406,10 @@ longdesc parser of text-style mysql outputs scancsv.tex: parser of CSV
longdesc format seplist.tex: macros with alternative separators of a
longdesc parameter xmlparser.tex: parser of XML language
containersize 25856
-containerchecksum c0073b8ec00d2ee5af99ad95b58486ddd0b17dd9c3d01383bb855f33ed124ba1c9453457f9696f8d269f730c3752146224d7cbef05b9b8dc9c461c688893b0f8
-doccontainersize 43416
-doccontainerchecksum f82c68f39d16dd88b7934d8ab2024a761ec94cace66d403d1d38ecbf3f3ec69815dd60df22b52a389d047ca64bd0c8157a8ff0209a20b72725c04c2a7a11a6eb
-docfiles size=51
+containerchecksum b6c44c277127f34be77363f5cb9d270f13e02d6e4685b6d84dc6105c9ae2e83e38b50f31795b9cef75036a217378e8de38702cc08d0cff86ab788b9b2fc2bb2b
+doccontainersize 43992
+doccontainerchecksum 91977e75eed26f6e615a35bdcdf4d5774a1f001b6ac063587b290fea760aa0a00e1d4bcb6e5be4bc1e33db272e46e79776f5d40f6d2f19b551ba8b3f4d8994c7
+docfiles size=52
RELOC/doc/generic/olsak-misc/README details="Readme"
RELOC/doc/generic/olsak-misc/booklet.tex
RELOC/doc/generic/olsak-misc/cnv-pu.tex
@@ -231429,7 +231429,7 @@ catalogue-contact-home http://petr.olsak.net/ftp/olsak/makra/
catalogue-ctan /macros/generic/olsak-misc
catalogue-license pd
catalogue-topics misc-support
-catalogue-version Jun. 2022
+catalogue-version Aug. 2022
name omega
category Package
@@ -233763,7 +233763,7 @@ catalogue-version 1.0
name optex
category Package
-revision 63325
+revision 64050
shortdesc LuaTeX format based on Plain TeX and OPmac
longdesc OpTeX is a LuaTeX format based on Plain TeX macros with power
longdesc from OPmac (fonts selection system, colors, external graphics,
@@ -233780,11 +233780,11 @@ depend optex.ARCH
depend rsfs
depend unicode-data
execute AddFormat name=optex engine=luatex options="optex.ini" fmttriggers=amsfonts,cm,ec,hyphen-base,lm,rsfs,unicode-data
-containersize 811156
-containerchecksum cc03c0cbd748eeb379bcf055a4778ed7ea6a54175bfb4c9a387ab910c41e0c6c650f2e8220603fe133f31338aec95d3375c9ee5bad003f79a16c17676857e780
-doccontainersize 1451236
-doccontainerchecksum c43f1fdb8879f027ad1d018b83144846ff39aa1d323e49a14f5b539b254dd101decb359415a8d92b7ffdc75e550274a4a91ff838e87ed5db7a689474862fcde5
-docfiles size=408
+containersize 815472
+containerchecksum 2d967aa70207737b5fcc8583c9e05039b08100e5da539c393841d72ab16dc619e57dab669d088af766da0d694c61555ba8d9640eff7d6402d5c9bd4d73db9c1a
+doccontainersize 1473012
+doccontainerchecksum 0f7fabc8a716d4a32a0adc7caa4f320fe6b99eb890d749e292a2f086f4c20f546393a80b222ff6f2c30f5a003d43220e54c0ae351fee7946e7fdc4d261faa7f2
+docfiles size=413
texmf-dist/doc/man/man1/optex.1
texmf-dist/doc/man/man1/optex.man1.pdf
texmf-dist/doc/optex/base/README details="Readme"
@@ -233795,7 +233795,7 @@ docfiles size=408
texmf-dist/doc/optex/base/optex-math.tex
texmf-dist/doc/optex/base/optex-techdoc.tex
texmf-dist/doc/optex/base/optex-userdoc.tex
-runfiles size=510
+runfiles size=517
texmf-dist/tex/optex/base/alloc.opm
texmf-dist/tex/optex/base/basic-macros.opm
texmf-dist/tex/optex/base/bib-iso690.opm
@@ -233825,15 +233825,20 @@ runfiles size=510
texmf-dist/tex/optex/base/f-lido.opm
texmf-dist/tex/optex/base/f-lmfonts.opm
texmf-dist/tex/optex/base/f-merriweather.opm
+ texmf-dist/tex/optex/base/f-montserrat.opm
texmf-dist/tex/optex/base/f-newcm.opm
+ texmf-dist/tex/optex/base/f-overlock.opm
texmf-dist/tex/optex/base/f-pagella.opm
texmf-dist/tex/optex/base/f-poltawski.opm
texmf-dist/tex/optex/base/f-roboto.opm
texmf-dist/tex/optex/base/f-schola.opm
texmf-dist/tex/optex/base/f-sourcepro.opm
+ texmf-dist/tex/optex/base/f-stix.opm
+ texmf-dist/tex/optex/base/f-stixtwo.opm
texmf-dist/tex/optex/base/f-technika.opm
texmf-dist/tex/optex/base/f-termes.opm
texmf-dist/tex/optex/base/f-xcharter.opm
+ texmf-dist/tex/optex/base/f-xits.opm
texmf-dist/tex/optex/base/fams-ini.opm
texmf-dist/tex/optex/base/fnotes.opm
texmf-dist/tex/optex/base/fonts-catalog.opm
@@ -233909,7 +233914,7 @@ catalogue-contact-home http://petr.olsak.net/optex
catalogue-ctan /macros/optex
catalogue-license pd
catalogue-topics format luatex plain-ext
-catalogue-version 1.07
+catalogue-version 1.08
name optex.aarch64-linux
category Package
@@ -306174,7 +306179,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 64036
+revision 64041
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -306182,10 +306187,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 113520
-containerchecksum 8aac59fc8e274e729d6cedc8952db1e14a26707a5e960cdcf0a07d95d9eaa6c3b0798a42cd0216b439a55787de3fe37664402940c2042ba5fd46a942197d056a
+containersize 113512
+containerchecksum 6db46f2b3a835cf04147a51178c24290b78546da6ec93027b2b685baaa6b44363006c0c4bf7ad271c3ee2e175234f0f5e673ddcdf77765947a21319fe0c4e02f
doccontainersize 419224
-doccontainerchecksum b84f6917c8725eaa174ee4e9a7947f2b2104cc874a87da6bb4f458e4e68e1ff6e7d95ec4559b72890e1b7c97b77e1c53a8bd35798f262fa8cdc345dfe7fa6402
+doccontainerchecksum 86d470e0f3e07238180ca6a682cfe6d1aa7dcb4189681e7f69e909977a1209f09b01fc286e7b79192afbfc34ab39d8ae7913dd1b0f2fc470b50eff841f7aba5e
docfiles size=516
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -346823,7 +346828,7 @@ catalogue-version 0.4
name xsavebox
category Package
-revision 62604
+revision 64049
shortdesc Saveboxes for repeating content without code replication, based on PDF Form XObjects
relocated 1
longdesc The package defines commands for saving content that can be
@@ -346836,16 +346841,16 @@ longdesc modelled after the standard LaTeX commands \savebox, \sbox,
longdesc \usebox and the lrbox environment. All common TeX engines and
longdesc back-ends are supported: pdfLaTeX, LuaLaTeX LaTeX - dvips -
longdesc ps2pdf/Distiller (Xe)LaTeX - (x)dvipdfmx
-containersize 4244
-containerchecksum b58422c295ec695d22a890c453786efadd436f31b86a5ac4a0aa68466a10c1b9c50bc4f7136725f89f07b93ff8cea75c6dd2daa2cc9b48c65978e41fef38d81d
-doccontainersize 377384
-doccontainerchecksum e8da370faa00a5e103de1e3a612fbae065cefec7a05566a078825ac96fc2f8c28699e92c7aaed31f04b1cf5dcf4e2b42aed0cef2cc171254fdfe4b26ff41d7d3
+containersize 4164
+containerchecksum a88227b8f3b8adcfb3de271307e97c13db9da52c9446efa69ebc9b12289a59b2b92b608dd87dadf4837f0501599b74775671cc4e529a99ef37035dbe171cd66c
+doccontainersize 377076
+doccontainerchecksum 4acb0dcab63edd326db7736bf4632f375e4e1dabb1eab0969c0255312f6207871f087cf81e2a01bbfdb99ce956e568d6331cd82346feeae966331569d2f0c3a2
docfiles size=95
RELOC/doc/latex/xsavebox/ChangeLog
RELOC/doc/latex/xsavebox/README
RELOC/doc/latex/xsavebox/xsavebox.pdf details="Package documentation"
-srccontainersize 4256
-srccontainerchecksum 980e2bc93fa1b7a7f80a3ab898e9e6351a654ca42b500410b74368bd2fe7c3c2feae8178bb41eead98f874aeab81491822b25b5173150fe797fde4c1f0fa0d62
+srccontainersize 4220
+srccontainerchecksum 5843edad34701520c35763cbe3b66523a67f11299affdf4ffcd213ac3abc8d67b9e7cce05610132fcbad3639412f1fe04df15887d1e671c06ef066a0f859f231
srcfiles size=3
RELOC/source/latex/xsavebox/xsavebox.tex
runfiles size=3
@@ -346854,7 +346859,7 @@ catalogue-contact-repository https://gitlab.com/agrahn/xsavebox
catalogue-ctan /macros/latex/contrib/xsavebox
catalogue-license lppl
catalogue-topics boxing pdf-feat adobe-distiller expl3
-catalogue-version 0.17
+catalogue-version 0.18
name xsim
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 2e3c1bd500..8e3aceb51d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-c0c9daf0b7fbfdb2b393fe63d38837c5 texlive.tlpdb
+b0d165f51b3ae9a1ca6332c64eb15a90 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index a572fccc44..14058272a3 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-4bf9f796f398a68059c49ab0ada0a8735d8c0296ba744863a70a36fa7c7976a2d5cc13105d919477189f3db7aabd9afa9f2af46d64ef4263d92da4cbfdb55cf0 texlive.tlpdb
+c5e4d983985256617d08f8fc2e43af6c295a21485deae62657ac3ece802b5d2dad8d0b7a3dc5f420d39921ae1bf7f0b19d0208ecf5773a2e3419b556998b25f1 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 43a61b5b2c..93f6e45235 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJi6wqiAAoJEEzhh34ZQ4xwCkUIAJC0YdYUU0UTSD2hEUjdeWkv
-EUtL8+uIPvyzdNhwO3qoW7W7CINDRSns05I1s7U/1pGyywtGOCvxhKioLBPBcfjv
-pzHSkFpMBcSb+D58CLlNEspvVAgmVAWlVerSHD05v8/0/4ziL8DnE+IzX7etIRLg
-f8W2PXZ9e+HPr5NtZ0WM30+Mzg4+OzLwwL9yVbaDYfWz/jDTMP6omNH0o2ZUPT8d
-dkL4u4rz+h7evQBgGDSqaLOVPxQhuXAoMrwgyvWZiNcQfDuB+ae113rOz/e6MEux
-ZKpYlpP/1Nu77SqEDH1CButIL1ShOaDgDDlo/fWcfIZXrfvlvlNxKjIBetew54Y=
-=hDQr
+iQEcBAEBCgAGBQJi7FwcAAoJEEzhh34ZQ4xwrpwH/00vZuF2sf5CnyA+1JkSqBWY
+ZGdLI32yZjljVlGzzuUj0/xVQmmU6oFpH0BassU52q/6nGQcwonpZ7WzhtGQC4Dk
+QPbRsz7rbe6nMr0swMCAgSA/jG/RyFCD72KYyx5Y3jRZgPE9pf7BSsdR3urmKT98
+9AMR7JzGxghGli6+ve+u33GayHq2zdVAhVcVW3P6E+H0BRzIRrpXjsIDvFvTK/SO
+mKTGQogs9M2Og8lsy0fRDDFmZOgmHJipWB1cLyXC0kZ3XdreCW9612m3ph8xU4gc
+4WIR1SAshHEGxWf5BSEHiz6FaIqJDL62jejFrdnWbUJIV6FAacLw+DKfJP98YwE=
+=qZrF
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 221b50dc92..e76eae6f79 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index a1dd405de7..ad98954b22 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1659557857
+date=1659644207
lastupd=miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-x64-2.9 miktex-cjkutils-bin-x64-2.9 miktex-console-bin-x64-2.9 miktex-curl-bin-x64-2.9 miktex-cweb-bin-x64-2.9 miktex-devnag-bin-x64-2.9 miktex-doc miktex-dvicopy-bin-x64-2.9 miktex-dvipdfmx-bin-x64-2.9 miktex-dvipng-bin-x64-2.9 miktex-dvips-bin-x64-2.9
-lstdigest=789fa14d925ba159fa9aeaa81e24bac6
+lstdigest=d62858d83334e266b061acfe1f3adf73
numpkg=5847
relstate=next
-version=8250
+version=8251
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: Z8FtiYfLqPnz1nvBuakZc/cy8PW2nSmPLY+aQRGqk0Jb0aeW/i8HQiYwhLt5wt4lHraEzBztyzkq69YBz5KziShVQlQXEe6lej9Og9k5mhk0mBcd/ZJu4sHbra2NjoX3NTSGX1vBbW4UawAs5VUwC5t5S6XW2ZAKIWarj64RWe+GwlvdRXp/G8T1M3W+1j3eX6H+oSiWWmiud7KrBKjMr8a3UfAGw82+nolY86hyZV0NWYGRp4pCk6T4t6u/zzXCDFHpelwaAzWXuK25IMKF2zTvYXJLJZ+AK7+vjZJRVhMoV5q/Eiq0sH9otdCSV39BM4lYokYnRGicey7ixVJHDg==
+;;;; signature/miktex: QSZPI1l7wJIho1p3IO9xQaL4PYfvnarh4dlHMkFr+Q1JL3zhtP2X0z/Os99iuE9BY1gR4LeMzgJ776/0KOD8LsjV3oywfXU43Dr+iyDC0ll2s1iY3ss3Cl8kD/kyjbqPy5woEFRSNovlwh9EKitdhTO6hhN64+GGup5u3KmUmvC2pgnxYazEnDCyOH7lmIWOkHuAmFySAaF62FtoXFGPn1n4KUTi4YCVMhtW07SCcfmFc541qxeHr0qP4N+JATz8hAsq0mPBwDg1JllgMek1RQ4tAoHZTHTUgLpUYV0q173QvXJS7UdP+CjJLzxaH0R6hu1LlAVDjpHCzV6CyyzFfA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 64afb8d4b5..8c188538d0 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1659557486
+date=1659643877
lastupd=miktex-dvips-bin-x64-2.9 miktex-runtime-bin-x64-2.9 miktex-ucrt-bin miktex-vc140-bin apa7 apa7__doc apa7__source buctthesis buctthesis__doc buctthesis__source csassignments csassignments__doc csassignments__source exam-zh exam-zh__doc exam-zh__source fixdif fixdif__doc fixdif__source hfutthesis
-lstdigest=30a69aafdc9f96743ac0ab8fe4315fb6
+lstdigest=a8e086ede38129d806f1e0ca356c273d
numpkg=5847
relstate=stable
-version=8250
+version=8251
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: r9Hmu73tsjjwj9/7o5wUIU0x9R5LPKuPhPAHKJ8v4mKpAM3dDbBB31ApeypGiCRtZy9oRL2ZYn9jAPXumBbYS+gIjHTppyPhWawgeBs66cRpzgCI8aHGNBUiihNjY9CiL1w4s3HbBK5AmUy9nd9zM1ZhacBNKj6nD3P0tgzJoZI8IDGgIKu1masUVFyQusaNOnY1iX9EA45jT7ydcyK9O2+Mb9dhByoLIK1DCHQOatPOXTZf5PE897dQI8J8o4TOfCwQxhbV39XOcMuYu7cEuZIcVHBp3Y3kfanbHsx9Vxz6Et/DAmIpYczlxCk28klHpLq/pNbU5xAGF/WNlokGCg==
+;;;; signature/miktex: tlY0C29ib7xfiMzJRWRqKkG91WkVNSUKZ+3gb3W+UHXTCGL6OZOoeoutIE2A/v91zW9M+xNc8MiRmXUaaH1qbSLU6UbwJ77py8H6EomvzIKD2sFF+iymIcaI78wQpazoAx7qNbt1/A0bV9cISdaStbWWs4r6j/cQeAQQt6CaHaIZfhRlMbHJhexFp1Mn5/ev80vGhhmWxykU0KsgeHid2ReOuBj2FN6THSMvsGDYdIVAJszyEii3yOJsJX0kiu9Bx6C685xp1OJHMI0sD803PAwnD2ZS6N54QoGXS3WxzHGGH9V2w8wMOmWUhsSS0Ld1dbFVgLEWF2JoMdaEIENdYw==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 5c03ffdc03..d151fdb094 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2022-08-04-02-02
+2022-08-05-02-02